Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(agent): distinguish response waiting retry failure and cancellation
zqchrisa4b4d7961664
diff --git a/apps/desktop/src/renderer/__tests__/makerChatStoreLiveGeneration.test.ts b/apps/desktop/src/renderer/__tests__/makerChatStoreLiveGeneration.test.tsindex 9bb49cdfbc..458d6b3cdf 100644--- a/apps/desktop/src/renderer/__tests__/makerChatStoreLiveGeneration.test.ts+++ b/apps/desktop/src/renderer/__tests__/makerChatStoreLiveGeneration.test.ts@@ -53,7 +53,7 @@ describe('makerChatStore live generation at turn start', () => {makerChatStore.getSnapshot('another-task');expect(makerChatStore.getSnapshot(sessionId).agentStatus).toMatchObject({isRunning: false, generationActive: false,- responseSpeed: { phase: 'complete', estimated: true, recentRate: 25, samples: speed.samples },+ responseSpeed: { phase: 'complete', estimated: true, recentRate: null, outcome: 'cancelled', samples: speed.samples },});applyStatus(sessionId, { isRunning: true });expect(makerChatStore.getSnapshot(sessionId).agentStatus.responseSpeed).toBeUndefined();@@ -108,3 +108,35 @@ describe('makerChatStore live generation at turn start', () => {}});});++it('keeps a response speed failure through done/status tails and uses only actual retry events', () => {+ const id = 'speed-error-retry-lifecycle';+ const speed: ResponseSpeedSnapshot = { phase: 'generating', waitOrigin: 'turn', firstResponseMs: 1000,+ waitingMs: 0, outputTokens: 50, durationMs: 2000, estimated: true, recentRate: 30,+ averageRate: 25, samples: [{ durationMs: 2000, outputTokens: 50, rate: 30 }], sampledAt: Date.now() };+ const event = (type: 'error' | 'done' | 'text', data: Record<string, unknown>) =>+ makerChatStore.__applyStreamEventForTest(id, { sessionId: id, type, source: 'pi', data });+ try {+ applyStatus(id, { isRunning: true, responseSpeed: speed });+ event('error', { message: 'API unavailable', reason: 'api-error', isTerminal: false });+ expect(makerChatStore.getSnapshot(id).agentStatus.responseSpeed?.retrying).not.toBe(true);+ event('error', { message: 'API unavailable; retrying', reason: 'api-error', willRetry: true, isTerminal: false });+ expect(makerChatStore.getSnapshot(id).agentStatus.responseSpeed).toMatchObject({ retrying: true, recentRate: null });+ applyStatus(id, { isRunning: true, responseSpeed: speed });+ expect(makerChatStore.getSnapshot(id).agentStatus.responseSpeed?.retrying).toBe(true);+ event('text', { text: 'recovered', isFinal: false });+ expect(makerChatStore.getSnapshot(id).agentStatus.responseSpeed?.retrying).toBe(false);+ event('error', { message: 'API unavailable', reason: 'api-error', isTerminal: true });+ expect(makerChatStore.getSnapshot(id)).toMatchObject({ error: 'API unavailable', errorReason: 'api-error',+ agentStatus: { isRunning: false, responseSpeed: { phase: 'complete', outcome: 'failed', recentRate: null, samples: speed.samples } } });+ event('done', {});+ applyStatus(id, { isRunning: false, responseSpeed: { ...speed, phase: 'complete', estimated: false } });+ expect(makerChatStore.getSnapshot(id).agentStatus.responseSpeed?.outcome).toBe('failed');+ applyStatus(id, { isRunning: true });+ expect(makerChatStore.getSnapshot(id).agentStatus.responseSpeed).toBeUndefined();+ applyStatus(id, { isRunning: true, responseSpeed: speed });+ event('done', { type: 'pi/agent_settled', status: 'cancelled' });+ expect(makerChatStore.getSnapshot(id)).toMatchObject({ error: null,+ agentStatus: { responseSpeed: { outcome: 'cancelled', recentRate: null } } });+ } finally { makerChatStore.purgeSession(id); }+});diff --git a/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsx b/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsxindex 86c796ea02..cf1c222146 100644--- a/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsx+++ b/apps/desktop/src/renderer/__tests__/runningStatusBarSuppression.test.tsx@@ -284,7 +284,7 @@ it('expires a stalled live rate while preserving an inspectable curve, and distifireEvent.click(view.container.querySelector('[data-running-status-meta] button')!);expect(screen.getByRole('dialog').textContent).toContain('chat.runningStatus.currentRate');act(() => vi.advanceTimersByTime(1000));- expect(screen.getByRole('dialog').textContent).toContain('chat.runningStatus.noRecentSample');+ expect(screen.getByRole('dialog').textContent).toContain('chat.runningStatus.responsePending');expect(view.container.querySelector('[data-running-status-meta] button')?.textContent).not.toContain('chat.runningStatus.estimatedTokenRate');view.rerender(<RunningStatusBar {...props} status="Tool running"@@ -300,3 +300,23 @@ it('expires a stalled live rate while preserving an inspectable curve, and distiexpect(screen.getByRole('dialog').textContent).toContain('chat.runningStatus.responsePending');} finally { vi.useRealTimers(); }});++it.each(['failed', 'cancelled', 'retrying'] as const)('shows %s consistently in the retained entry and card', (activity) => {+ const terminal = activity !== 'retrying';+ const key = activity === 'failed' ? 'responseFailed' : activity === 'cancelled' ? 'responseCancelled' : 'responseRetrying';+ const speed: import('@cindy/maker-shared/usage-format').ResponseSpeedSnapshot = {+ phase: terminal ? 'complete' : 'paused', waitOrigin: 'turn', firstResponseMs: 1000, waitingMs: 0,+ durationMs: 2000, outputTokens: 80, estimated: true, recentRate: null, averageRate: 40,+ samples: [{ durationMs: 2000, outputTokens: 80, rate: 40 }], sampledAt: Date.now(),+ ...(terminal ? { outcome: activity as 'failed' | 'cancelled' } : { retrying: true }),+ };+ const view = render(<RunningStatusBar visible={!terminal} status="Done" startedAt={null}+ tokenUsage={500} outputTokens={80} generationDurationMs={2000} responseSpeed={speed} />);+ const trigger = view.container.querySelector('[data-running-status-meta] button')!;+ expect(trigger.textContent).toContain(`chat.runningStatus.${key}`);+ expect(trigger.textContent).not.toContain('chat.runningStatus.tokenRate');+ fireEvent.click(trigger);+ expect(screen.getByRole('dialog').textContent).toContain(`chat.runningStatus.${key}`);+ expect(screen.getByRole('dialog').textContent).not.toContain('chat.runningStatus.finalAverage');+ expect(screen.getByRole('dialog').textContent).toContain('40');+});diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsxindex 350d7a6451..aeabb20ed3 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx@@ -6123,13 +6123,15 @@ function RunningStatusBar({// side-task / 后台子任务运行中永远当成进行态 (即便上一轮 LLM 留下的 status 文案// 是 "Done", 此时任务还在跑, 显示 ✓ 完成图标会让用户以为已经做完)。- const isDone = status === 'Done' && !reconnecting && !sideTaskRunning && !backgroundTasksRunning;+ const isDone = status === 'Done' && !responseSpeed?.outcome && !responseSpeed?.retrying && !reconnecting && !sideTaskRunning && !backgroundTasksRunning;// 后台子任务模式的左段文案:上一轮残留的 status(多半是 "Done")在此语义下是// 误导信息,整体替换为后台运行提示。仅后台 Bash 时用带数量的专属文案 ——// 「模型用量仍在消耗」对不调模型的 bash 任务是错误陈述。const speedActivity = responseSpeed ? responseSpeedActivity(responseSpeed) : null;- const speedStatusKey = speedActivity === 'waiting' ? 'responsePending'- : speedActivity === 'quiet' ? 'noRecentSample'+ const speedStatusKey = speedActivity === 'failed' ? 'responseFailed'+ : speedActivity === 'cancelled' ? 'responseCancelled'+ : speedActivity === 'retrying' ? 'responseRetrying'+ : speedActivity === 'waiting' || speedActivity === 'quiet' ? 'responsePending': speedActivity === 'tool' ? 'toolRunning': speedActivity === 'paused' ? 'generationPaused': speedActivity === 'generating' ? 'responseGenerating' : null;@@ -6332,7 +6334,11 @@ function RunningStatusBar({{showRatePanel && (<RunningTokenRatePopoverresponseSpeed={responseSpeed}- elapsedText={completedSpeed ? t('chat.runningStatus.lastGeneration') : waitingText ?? (speedActivity === 'quiet' ? t('chat.runningStatus.noRecentSample') : elapsedText)}+ elapsedText={completedSpeed+ ? t(responseSpeed?.outcome === 'failed' ? 'chat.runningStatus.responseFailed'+ : responseSpeed?.outcome === 'cancelled' ? 'chat.runningStatus.responseCancelled' : 'chat.runningStatus.lastGeneration')+ : speedActivity === 'retrying' ? t('chat.runningStatus.responseRetrying')+ : waitingText ?? (speedActivity === 'quiet' ? t('chat.runningStatus.responsePending') : elapsedText)}rate={latestRateText}rateText={workflowWaiting || sideTaskRunning || backgroundTasksRunningdiff --git a/apps/desktop/src/renderer/features/cc-agent/RunningTokenRatePopover.tsx b/apps/desktop/src/renderer/features/cc-agent/RunningTokenRatePopover.tsxindex 3b7bad6414..b9e431524e 100644--- a/apps/desktop/src/renderer/features/cc-agent/RunningTokenRatePopover.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/RunningTokenRatePopover.tsx@@ -114,11 +114,14 @@ export function RunningTokenRatePopover({<div className="col-start-1 row-start-1 min-w-0 self-center"><div className="mb-1 flex items-center gap-1.5 text-12 text-[var(--text-secondary)]"><Activity size={14} aria-hidden="true" />- {t(activity === 'complete' ? 'chat.runningStatus.finalAverage'+ {t(activity === 'failed' ? 'chat.runningStatus.responseFailed'+ : activity === 'cancelled' ? 'chat.runningStatus.responseCancelled'+ : activity === 'retrying' ? 'chat.runningStatus.responseRetrying'+ : activity === 'complete' ? 'chat.runningStatus.finalAverage': activity === 'waiting' ? 'chat.runningStatus.responsePending': activity === 'tool' ? 'chat.runningStatus.toolRunning': activity === 'paused' ? 'chat.runningStatus.generationPaused'- : activity === 'quiet' ? 'chat.runningStatus.noRecentSample' : 'chat.runningStatus.currentRate')}+ : activity === 'quiet' ? 'chat.runningStatus.responsePending' : 'chat.runningStatus.currentRate')}</div><div className="flex items-baseline gap-1.5 tabular-nums"><span className="text-28 font-medium leading-none">{approximate(rate, Boolean(responseSpeed) && (responseSpeed?.phase !== 'complete' || responseSpeed.estimated)) ?? '—'}</span>diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 595c4f6e54..9453154768 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -10072,9 +10072,11 @@"streamWaitDescription": "From SDK stream start to the first content block. The earlier request wait is not observable.","lastGeneration": "Last generation","finalAverage": "Final average",- "noRecentSample": "No new output received","generationPaused": "Generation paused","responsePending": "Waiting for response",+ "responseFailed": "Request failed",+ "responseCancelled": "Stopped",+ "responseRetrying": "Retrying","responseGenerating": "Generating","toolRunning": "Running tool"},diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 75f176fa11..394580cb32 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -10050,9 +10050,11 @@"streamWaitDescription": "SDK ストリーム開始から最初のコンテンツまで。それ以前のリクエスト待機は測定できません。","lastGeneration": "前回の生成","finalAverage": "最終平均",- "noRecentSample": "新しい出力を受信していません","generationPaused": "生成を一時停止","responsePending": "応答待ち",+ "responseFailed": "リクエスト失敗",+ "responseCancelled": "停止済み",+ "responseRetrying": "再試行中","responseGenerating": "生成中","toolRunning": "ツール実行中"},diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 3d6acab9d5..f61dd365a6 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -10050,9 +10050,11 @@"streamWaitDescription": "SDK 스트림 시작부터 첫 콘텐츠까지의 시간입니다. 그 이전의 요청 대기는 측정할 수 없습니다.","lastGeneration": "지난 생성","finalAverage": "최종 평균",- "noRecentSample": "새 출력을 받지 못함","generationPaused": "생성 일시 중지","responsePending": "응답 대기 중",+ "responseFailed": "요청 실패",+ "responseCancelled": "중지됨",+ "responseRetrying": "다시 시도 중","responseGenerating": "생성 중","toolRunning": "도구 실행 중"},diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex c473262bba..1ea7207547 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -10050,9 +10050,11 @@"streamWaitDescription": "从 SDK 流开始到首个内容块,之前的请求等待不可测。","lastGeneration": "上次生成","finalAverage": "最终平均",- "noRecentSample": "暂未收到新输出","generationPaused": "生成暂停","responsePending": "等待响应",+ "responseFailed": "请求失败",+ "responseCancelled": "已停止",+ "responseRetrying": "正在重试","responseGenerating": "正在生成","toolRunning": "执行工具中"},diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex b3104f7304..039c4436aa 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -10049,9 +10049,11 @@"streamWaitDescription": "從 SDK 串流開始到首個內容區塊,之前的請求等待無法測量。","lastGeneration": "上次生成","finalAverage": "最終平均",- "noRecentSample": "暫未收到新輸出","generationPaused": "生成暫停","responsePending": "等待回應",+ "responseFailed": "請求失敗",+ "responseCancelled": "已停止",+ "responseRetrying": "正在重試","responseGenerating": "正在生成","toolRunning": "執行工具中"},diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.tsindex a6da1d41c9..83e261a388 100644--- a/apps/desktop/src/renderer/lib/makerChatStore.ts+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts@@ -1,4 +1,4 @@-import { readResponseSpeedSnapshot, stopResponseSpeed, type ResponseSpeedSnapshot } from '@cindy/maker-shared/usage-format';+import { readResponseSpeedSnapshot, stopResponseSpeed, retryResponseSpeed, resumeResponseSpeed, mergeResponseSpeedStatus, type ResponseSpeedSnapshot } from '@cindy/maker-shared/usage-format';import { readBotTaskResults } from '@cindy/maker-shared/botCollaboration';import { remotePluginSetupErrorCode, type PluginSetupCommandError } from './pluginSetupCommandError';export type { PluginSetupCommandError } from './pluginSetupCommandError';@@ -5567,10 +5567,18 @@ export function handleStreamEvent(const hasCodexReconnectRecoveryOutput = isCodexReconnectRecoveryOutput(event);const shouldClearCodexReconnectPendingCard =event.type === 'error' ? !isCodexReconnectProgress : hasCodexReconnectRecoveryOutput;- const stateBeforeReconnectCleanup =- !hasCodexReconnectRecoveryOutput || inputState.recoverableError == null- ? inputState- : { ...inputState, recoverableError: null };+ const resumedSpeed = ((event.type === 'text' || event.type === 'thinking') &&+ typeof (event.data as { text?: unknown })?.text === 'string' &&+ Boolean((event.data as { text: string }).text)) ||+ (event.type === 'tool_use' && hasCodexReconnectRecoveryOutput)+ ? resumeResponseSpeed(inputState.agentStatus.responseSpeed) : inputState.agentStatus.responseSpeed;+ const stateBeforeReconnectCleanup = resumedSpeed === inputState.agentStatus.responseSpeed &&+ (!hasCodexReconnectRecoveryOutput || inputState.recoverableError == null) ? inputState : {+ ...inputState,+ recoverableError: hasCodexReconnectRecoveryOutput ? null : inputState.recoverableError,+ agentStatus: resumedSpeed === inputState.agentStatus.responseSpeed ? inputState.agentStatus+ : { ...inputState.agentStatus, responseSpeed: resumedSpeed },+ };const messagesAfterReconnectCleanup = shouldClearCodexReconnectPendingCard? removeCodexReconnectPendingCard(stateBeforeReconnectCleanup.messages): stateBeforeReconnectCleanup.messages;@@ -6223,14 +6231,15 @@ export function handleStreamEvent(});const terminalData = event.data as- | { cancelled?: unknown; reason?: unknown; plan?: unknown; raw?: { id?: unknown; status?: unknown } }+ | { cancelled?: unknown; status?: unknown; reason?: unknown; plan?: unknown; raw?: { id?: unknown; status?: unknown } }| null| undefined;const terminalTurnId = typeof terminalData?.raw?.id === 'string' ? terminalData.raw.id : null;const terminalTurnStatus =typeof terminalData?.raw?.status === 'string' ? terminalData.raw.status : null;const terminalCancelled =- terminalData?.cancelled === true ||+ terminalData?.cancelled === true || terminalData?.status === 'cancelled' ||+ terminalData?.reason === 'send_cancelled_before_acceptance' ||terminalData?.reason === 'turn_continuation_cancelled' ||terminalData?.reason === 'user_stop_unconfirmed_wake_tasks';const doneMessages =@@ -6287,7 +6296,9 @@ export function handleStreamEvent(turnStoppedByUser: state.turnStoppedByUser || terminalCancelled,agentStatus: {...state.agentStatus,- responseSpeed: stopResponseSpeed(state.agentStatus.responseSpeed),+ responseSpeed: stopResponseSpeed(state.agentStatus.responseSpeed,+ state.turnStoppedByUser || terminalCancelled ? 'cancelled'+ : terminalTurnStatus === 'failed' || terminalData?.status === 'failed' || finalized.error ? 'failed' : undefined),generationActive: false,isRunning: false,startedAt: null,@@ -6405,6 +6416,8 @@ export function handleStreamEvent(isRunning: true,startedAt: state.agentStatus.startedAt ?? Date.now(),}),+ responseSpeed: (event.data as { willRetry?: boolean })?.willRetry === true+ ? retryResponseSpeed(state.agentStatus.responseSpeed) : state.agentStatus.responseSpeed,},};}@@ -6424,6 +6437,8 @@ export function handleStreamEvent(isStreaming: true,agentStatus: {...state.agentStatus,+ responseSpeed: (event.data as { willRetry?: boolean })?.willRetry === true+ ? retryResponseSpeed(state.agentStatus.responseSpeed) : state.agentStatus.responseSpeed,isRunning: true,startedAt: state.agentStatus.startedAt ?? Date.now(),},@@ -6516,7 +6531,9 @@ export function handleStreamEvent(// 初始 "Let's go" 文案上 shimmer 闪个不停(done 路径有同样的复位)。agentStatus: {...state.agentStatus,- responseSpeed: stopResponseSpeed(state.agentStatus.responseSpeed),+ responseSpeed: suppressAutoResumeBroadcastError || isPlannedUpgradeClose+ ? stopResponseSpeed(state.agentStatus.responseSpeed)+ : stopResponseSpeed(state.agentStatus.responseSpeed, state.turnStoppedByUser ? 'cancelled' : 'failed'),generationActive: false,isRunning: false,startedAt: null,@@ -7066,9 +7083,8 @@ function mergeLiveGenerationStatus(typeof update.generationReliable === 'boolean';if (!hasLiveFields) {return {- responseSpeed: update.isRunning- ? readResponseSpeedSnapshot(update.responseSpeed, Date.now()) ?? baseline.responseSpeed- : stopResponseSpeed(readResponseSpeedSnapshot(update.responseSpeed, Date.now()) ?? baseline.responseSpeed),+ responseSpeed: mergeResponseSpeedStatus(previous.responseSpeed,+ readResponseSpeedSnapshot(update.responseSpeed, Date.now()), update.isRunning, isTurnStart),outputTokens: baseline.outputTokens,generationDurationMs: baseline.generationDurationMs,generationActive: update.isRunning ? baseline.generationActive : false,@@ -7076,9 +7092,8 @@ function mergeLiveGenerationStatus(};}const merged = {- responseSpeed: update.isRunning- ? readResponseSpeedSnapshot(update.responseSpeed, Date.now()) ?? baseline.responseSpeed- : stopResponseSpeed(readResponseSpeedSnapshot(update.responseSpeed, Date.now()) ?? baseline.responseSpeed),+ responseSpeed: mergeResponseSpeedStatus(previous.responseSpeed,+ readResponseSpeedSnapshot(update.responseSpeed, Date.now()), update.isRunning, isTurnStart),outputTokens:typeof update.outputTokens === 'number' ? update.outputTokens : baseline.outputTokens,generationDurationMs:@@ -15613,7 +15628,7 @@ function stopSession(costUsd: s.agentStatus.costUsd,contextTokens: s.agentStatus.contextTokens,contextWindow: s.agentStatus.contextWindow,- responseSpeed: stopResponseSpeed(s.agentStatus.responseSpeed),+ responseSpeed: stopResponseSpeed(s.agentStatus.responseSpeed, 'cancelled'),generationActive: false,isRunning: false,startedAt: null,diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsxindex ddfcc43d9e..486ebd8570 100644--- a/apps/mobile/app/sessions/[sessionId].tsx+++ b/apps/mobile/app/sessions/[sessionId].tsx@@ -12116,10 +12116,12 @@ function ComposerActivityStatus({if (!visible && !completedSpeed) return null;const elapsedText = completedSpeed- ? t('session.screen.lastGeneration')+ ? t(responseSpeed?.outcome === 'failed' ? 'session.screen.responseFailed'+ : responseSpeed?.outcome === 'cancelled' ? 'session.screen.responseCancelled' : 'session.screen.lastGeneration')+ : speedActivity === 'retrying' ? t('session.screen.responseRetrying'): responseSpeed?.phase === 'waiting'? t('session.screen.responseWaiting', { seconds: ((responseSpeed.waitingMs + Math.max(0, Date.now() - responseSpeed.sampledAt)) / 1000).toFixed(1) })- : speedActivity === 'quiet' ? t('session.screen.noRecentSample') : formatComposerActivityElapsed(elapsed);+ : speedActivity === 'quiet' ? t('session.screen.responsePending') : formatComposerActivityElapsed(elapsed);const tokenCount = formatComposerActivityTokenCount(tokenUsage);const tokenText = t('session.screen.tokenCount', { tokens: tokenCount });const tokenA11yText = t('session.screen.tokenCountFull', { tokens: tokenCount });@@ -12178,8 +12180,10 @@ function ComposerActivityStatus({? 'session.screen.rateLimitRetrying': 'session.screen.networkReconnecting',)- : t(speedActivity === 'waiting' ? 'session.screen.responsePending'- : speedActivity === 'quiet' ? 'session.screen.noRecentSample'+ : t(speedActivity === 'failed' ? 'session.screen.responseFailed'+ : speedActivity === 'cancelled' ? 'session.screen.responseCancelled'+ : speedActivity === 'retrying' ? 'session.screen.responseRetrying'+ : speedActivity === 'waiting' || speedActivity === 'quiet' ? 'session.screen.responsePending': speedActivity === 'tool' ? 'session.screen.toolRunning': speedActivity === 'paused' ? 'session.screen.generationPaused': speedActivity === 'generating' ? 'session.screen.responseGenerating' : 'session.screen.thinking');diff --git a/apps/mobile/src/__tests__/remoteSessionStore.test.ts b/apps/mobile/src/__tests__/remoteSessionStore.test.tsindex a25184cb76..d27c5fe989 100644--- a/apps/mobile/src/__tests__/remoteSessionStore.test.ts+++ b/apps/mobile/src/__tests__/remoteSessionStore.test.ts@@ -6715,3 +6715,36 @@ it('retains response speed per session at completion, freezes aborts and clearsexpect(remoteSessionStore.getSessionRunStatus('tps-one').responseSpeed).toMatchObject({ phase: 'complete', estimated: false, outputTokens: 300 });});++it('keeps response speed failures through terminal tails, distinguishes cancellation and actual retries', () => {+ remoteSessionStore.clear();+ remoteSessionStore.setDeviceSessions('dev-1', 'Host', [session('speed-errors')]);+ remoteSessionStore.enterSessionMessageDetail('speed-errors');+ const speed = { phase: 'generating', waitOrigin: 'turn', firstResponseMs: 1000, waitingMs: 0,+ durationMs: 2000, outputTokens: 50, estimated: true, averageRate: 25, recentRate: 30,+ samples: [{ durationMs: 2000, outputTokens: 50, rate: 30 }], sampledAt: Date.now() };+ const event = (type: string, data: Record<string, unknown>) => remoteSessionStore.applyRemotePush('dev-1', 'maker:event', {+ sessionId: 'speed-errors', event: { type, data, source: 'pi' },+ });+ pushMakerStatus('speed-errors', { isRunning: true, responseSpeed: speed });+ event('error', { message: 'temporary warning', isTerminal: false });+ expect(remoteSessionStore.getSessionRunStatus('speed-errors').responseSpeed?.retrying).not.toBe(true);+ event('error', { message: 'API unavailable', isTerminal: false, willRetry: true });+ expect(remoteSessionStore.getSessionRunStatus('speed-errors').responseSpeed).toMatchObject({ retrying: true, recentRate: null });+ pushMakerStatus('speed-errors', { isRunning: true, responseSpeed: speed });+ expect(remoteSessionStore.getSessionRunStatus('speed-errors').responseSpeed?.retrying).toBe(true);+ event('thinking', { stage: 'delta', blockId: 'recovered-thinking', text: 'reasoning resumed' });+ expect(remoteSessionStore.getSessionRunStatus('speed-errors').responseSpeed?.retrying).toBe(false);+ event('error', { message: 'API unavailable', isTerminal: true });+ event('done', {});+ pushMakerStatus('speed-errors', { isRunning: false, responseSpeed: { ...speed, phase: 'complete', estimated: false } });+ expect(remoteSessionStore.getSessionRunStatus('speed-errors')).toMatchObject({ isRunning: false, hasTerminalError: true,+ responseSpeed: { outcome: 'failed', recentRate: null, samples: speed.samples } });+ pushMakerStatus('speed-errors', { isRunning: true, responseSpeed: speed });+ expect(remoteSessionStore.getSessionRunStatus('speed-errors').responseSpeed?.outcome).toBeUndefined();+ event('done', { type: 'pi/agent_settled', status: 'cancelled' });+ event('error', { message: 'aborted transport', isTerminal: true });+ expect(remoteSessionStore.getSessionRunStatus('speed-errors')).toMatchObject({ hasTerminalError: false,+ responseSpeed: { outcome: 'cancelled', recentRate: null } });+ remoteSessionStore.clear();+});diff --git a/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx b/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsxindex b1b80be20b..1d6627e0f1 100644--- a/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx+++ b/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx@@ -128,6 +128,8 @@ vi.mock("react-i18next", () => ({t: (key: string, args?: any) =>key.endsWith("tokenRate")? `${args.rate} tok/s`+ : key.endsWith("estimatedValue")+ ? `≈${args.value}`: key.endsWith("tokenCount")? `${args.tokens} tok`: key,@@ -226,7 +228,7 @@ it('shows waiting, execution, silent output and retained completion consistentlyawait show(generating);expect(host.textContent).toContain('session.screen.responseGenerating');await act(async () => vi.advanceTimersByTime(1000));- expect(host.textContent).toContain('session.screen.noRecentSample');+ expect(host.textContent).toContain('session.screen.responsePending');expect(card()!.textContent).not.toContain('40 tok/s—');await show({ ...generating, phase: 'paused', toolActive: true, recentRate: null });expect(host.textContent).toContain('session.screen.toolRunning');@@ -629,3 +631,21 @@ it("moves screen reader focus into the pinned card and back to the trigger, exceexpect(card()).toBeNull();expect(harness.focus).toEqual(["text:session.screen.currentRate"]);});++it.each(['failed', 'cancelled', 'retrying'] as const)('shows %s consistently in the mobile retained entry and card', async (activity) => {+ const terminal = activity !== 'retrying';+ const key = activity === 'failed' ? 'responseFailed' : activity === 'cancelled' ? 'responseCancelled' : 'responseRetrying';+ const speed: ResponseSpeedSnapshot = { phase: terminal ? 'complete' : 'paused', waitOrigin: 'turn',+ firstResponseMs: 1000, waitingMs: 0, durationMs: 2000, outputTokens: 80, estimated: true,+ recentRate: null, averageRate: 40, samples: [{ durationMs: 2000, outputTokens: 80, rate: 40 }], sampledAt: Date.now(),+ ...(terminal ? { outcome: activity as 'failed' | 'cancelled' } : { retrying: true }),+ };+ await act(async () => root.render(createElement(ActivityStatus, { ...base, visible: !terminal,+ tokenUsage: 500, sideTaskRunning: false, reconnectAttempt: null, responseSpeed: speed })));+ expect(host.textContent).toContain(`session.screen.${key}`);+ expect(host.textContent).not.toContain('session.screen.lastGeneration');+ await gesture('onPressIn'); await gesture('onPress');+ expect(card()!.textContent).toContain(`session.screen.${key}`);+ expect(card()!.textContent).not.toContain('session.screen.finalAverage');+ expect(card()!.textContent).toContain('40');+});diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.jsonindex de52a61124..92f368dbf2 100644--- a/apps/mobile/src/i18n/locales/en/session.json+++ b/apps/mobile/src/i18n/locales/en/session.json@@ -277,9 +277,11 @@"streamWaitDescription": "From SDK stream start to the first content block. The earlier request wait is not observable.","lastGeneration": "Last generation","finalAverage": "Final average",- "noRecentSample": "No new output received","generationPaused": "Generation paused","responsePending": "Waiting for response",+ "responseFailed": "Request failed",+ "responseCancelled": "Stopped",+ "responseRetrying": "Retrying","responseGenerating": "Generating","toolRunning": "Running tool"},diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.jsonindex 62a4a97d47..3d0ab5679a 100644--- a/apps/mobile/src/i18n/locales/ja/session.json+++ b/apps/mobile/src/i18n/locales/ja/session.json@@ -277,9 +277,11 @@"streamWaitDescription": "SDK ストリーム開始から最初のコンテンツまで。それ以前のリクエスト待機は測定できません。","lastGeneration": "前回の生成","finalAverage": "最終平均",- "noRecentSample": "新しい出力を受信していません","generationPaused": "生成を一時停止","responsePending": "応答待ち",+ "responseFailed": "リクエスト失敗",+ "responseCancelled": "停止済み",+ "responseRetrying": "再試行中","responseGenerating": "生成中","toolRunning": "ツール実行中"},diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.jsonindex 6c1cfba901..8cd3bd6596 100644--- a/apps/mobile/src/i18n/locales/ko/session.json+++ b/apps/mobile/src/i18n/locales/ko/session.json@@ -273,9 +273,11 @@"streamWaitDescription": "SDK 스트림 시작부터 첫 콘텐츠까지의 시간입니다. 그 이전의 요청 대기는 측정할 수 없습니다.","lastGeneration": "지난 생성","finalAverage": "최종 평균",- "noRecentSample": "새 출력을 받지 못함","generationPaused": "생성 일시 중지","responsePending": "응답 대기 중",+ "responseFailed": "요청 실패",+ "responseCancelled": "중지됨",+ "responseRetrying": "다시 시도 중","responseGenerating": "생성 중","toolRunning": "도구 실행 중"},diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.jsonindex 7556f66315..cf47e855c3 100644--- a/apps/mobile/src/i18n/locales/zh-CN/session.json+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json@@ -273,9 +273,11 @@"streamWaitDescription": "从 SDK 流开始到首个内容块,之前的请求等待不可测。","lastGeneration": "上次生成","finalAverage": "最终平均",- "noRecentSample": "暂未收到新输出","generationPaused": "生成暂停","responsePending": "等待响应",+ "responseFailed": "请求失败",+ "responseCancelled": "已停止",+ "responseRetrying": "正在重试","responseGenerating": "正在生成","toolRunning": "执行工具中"},diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.jsonindex bd097cce3d..25020acd87 100644--- a/apps/mobile/src/i18n/locales/zh-TW/session.json+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json@@ -277,9 +277,11 @@"streamWaitDescription": "從 SDK 串流開始到首個內容區塊,之前的請求等待無法測量。","lastGeneration": "上次生成","finalAverage": "最終平均",- "noRecentSample": "暫未收到新輸出","generationPaused": "生成暫停","responsePending": "等待回應",+ "responseFailed": "請求失敗",+ "responseCancelled": "已停止",+ "responseRetrying": "正在重試","responseGenerating": "正在生成","toolRunning": "執行工具中"},diff --git a/apps/mobile/src/session/RunningTokenRatePopover.tsx b/apps/mobile/src/session/RunningTokenRatePopover.tsxindex cd68cbbf14..632967c0db 100644--- a/apps/mobile/src/session/RunningTokenRatePopover.tsx+++ b/apps/mobile/src/session/RunningTokenRatePopover.tsx@@ -307,11 +307,14 @@ export function RunningTokenRatePopover({<View style={styles.top}><View style={styles.metric}><Text ref={cardFocusTarget} style={styles.label}>- {t(activity === 'complete' ? 'session.screen.finalAverage'+ {t(activity === 'failed' ? 'session.screen.responseFailed'+ : activity === 'cancelled' ? 'session.screen.responseCancelled'+ : activity === 'retrying' ? 'session.screen.responseRetrying'+ : activity === 'complete' ? 'session.screen.finalAverage': activity === 'waiting' ? 'session.screen.responsePending': activity === 'tool' ? 'session.screen.toolRunning': activity === 'paused' ? 'session.screen.generationPaused'- : activity === 'quiet' ? 'session.screen.noRecentSample' : 'session.screen.currentRate')}+ : activity === 'quiet' ? 'session.screen.responsePending' : 'session.screen.currentRate')}</Text><Text style={styles.value}>{recent === null ? '—' : approximate(formatTokenRate(recent), Boolean(responseSpeed) && (responseSpeed?.phase !== 'complete' || responseSpeed.estimated))}{" "}diff --git a/apps/mobile/src/session/remoteSessionStore.ts b/apps/mobile/src/session/remoteSessionStore.tsindex d91f573a11..f660214f06 100644--- a/apps/mobile/src/session/remoteSessionStore.ts+++ b/apps/mobile/src/session/remoteSessionStore.ts@@ -1,4 +1,4 @@-import { readResponseSpeedSnapshot, stopResponseSpeed, type ResponseSpeedSnapshot } from '@cindy/maker-shared/usage-format';+import { readResponseSpeedSnapshot, stopResponseSpeed, retryResponseSpeed, resumeResponseSpeed, mergeResponseSpeedStatus, type ResponseSpeedSnapshot } from '@cindy/maker-shared/usage-format';import { normalizeTaskTags, reconcileTaskTags } from '@cindy/maker-shared';import {createContext,@@ -4728,6 +4728,15 @@ export const remoteSessionStore = {? clearSessionReconnectAttempt(sessionId): false;const fullMessageWriteAllowed = fromList || messageWriteAllowed(sessionId);+ const outputData = isRecord(event.data) ? event.data : null;+ if (((type === 'text' || type === 'thinking') && readString(outputData, 'text')) || type === 'tool_use') {+ const current = readSessionRunStatus(sessionId);+ const responseSpeed = resumeResponseSpeed(current.responseSpeed);+ if (responseSpeed !== current.responseSpeed) {+ writeSessionRunStatus(sessionId, { ...current, responseSpeed });+ emit();+ }+ }if (type === 'text') {if (!fullMessageWriteAllowed) {if (reconnectCleared) emit();@@ -4810,11 +4819,20 @@ export const remoteSessionStore = {}}}- const terminalErrorChanged = isTerminalMakerErrorEvent(event)- && writeSessionRunStatus(sessionId, {- ...readSessionRunStatus(sessionId),- hasTerminalError: true,- });+ const terminalData = isRecord(event.data) ? event.data : null;+ const rawTurn = isRecord(terminalData?.raw) ? terminalData.raw : null;+ const current = readSessionRunStatus(sessionId);+ const cancelled = (!current.isRunning && current.responseSpeed?.outcome === 'cancelled') ||+ terminalData?.cancelled === true || terminalData?.status === 'cancelled' ||+ terminalData?.reason === 'send_cancelled_before_acceptance' ||+ terminalData?.reason === 'turn_continuation_cancelled' ||+ terminalData?.reason === 'user_stop_unconfirmed_wake_tasks';+ const failed = !cancelled && (isTerminalMakerErrorEvent(event) || rawTurn?.status === 'failed' || terminalData?.status === 'failed');+ const terminalErrorChanged = writeSessionRunStatus(sessionId, {+ ...current,+ ...(cancelled ? { hasTerminalError: false } : failed ? { hasTerminalError: true } : {}),+ responseSpeed: stopResponseSpeed(current.responseSpeed, cancelled ? 'cancelled' : failed ? 'failed' : undefined),+ });this.setSessionRunning(sessionId,false,@@ -4841,6 +4859,7 @@ export const remoteSessionStore = {...current,isRunning: true,reconnectAttempt,+ responseSpeed: data?.willRetry === true ? retryResponseSpeed(current.responseSpeed) : current.responseSpeed,startedAt: current.startedAt ?? Date.now(),});if (changed || textFlushed) emit();@@ -5018,7 +5037,8 @@ export const remoteSessionStore = {status: rawStatus ?? current.status,tokenUsage,outputTokens,- responseSpeed: readResponseSpeedSnapshot(data?.responseSpeed, Date.now()) ?? (isTurnStart ? undefined : current.responseSpeed),+ responseSpeed: mergeResponseSpeedStatus(current.responseSpeed,+ readResponseSpeedSnapshot(data?.responseSpeed, Date.now()), isRunning, isTurnStart),generationDurationMs,generationActive,generationReliable,diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 45efaef093..7ffc013199 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -16,6 +16,9 @@既有 maker status 可选携带 `responseSpeed`(等待边界、估算计数、最近/平均速度与最多60 个采样点);仅用于显示,不参与费用或上下文计数。新客户端校验该字段,旧主机省略时沿用原 usage 路径,旧客户端忽略新增字段。无需服务端更新、新通道、权限或数据库 migration。+原生重试事件可为快照附加可选 `retrying`;两端亦从既有 error / done / Stop 事件+附加可选 `outcome` 与 `retrying` 注记,+只反映明确失败、取消或自动重试;不要求主机发送新事件,不落盘,不更改错误原因或操作契约。终态真实 output 与生成 duration 的匹配沿现有消息用量记录处理。详见[`response-speed.md`](response-speed.md)。Claude 的既有 done payload 可选携带 `turnUsage`,来自 SDK result 用量的本轮增量,diff --git a/docs/dev-rules/response-speed.md b/docs/dev-rules/response-speed.mdindex fb9f7edb79..96b5ae1bfb 100644--- a/docs/dev-rules/response-speed.md+++ b/docs/dev-rules/response-speed.md@@ -32,9 +32,10 @@ Pi 重试关闭失败片段,下一请求重新等待;每轮重新清空测窗口最多 256 个聚合点,图表最多 60 个采样点,不保留文本。- 实时速率、峰值及未校准输出标「约」。真实 usage 到达后校准该响应的曲线及输出;完成时显示真实输出除以已观测生成时间的最终平均。校准后的曲线和峰值仍是估计分配。-- 工具期间不冒充正在生成,当前速度为空;Pi 的 tool_execution、Codex 的配对 item 执行边界显示「执行工具中」,不能从参数流推出执行已开始。Claude 缺少同等执行事件时只标「生成暂停」;并行模型 delta 优先显示实际生成。下一请求重新显示等待响应。静默超过观测窗口显示「暂未收到新输出」;不把没有可见内容当真实零输出。远端快照的时间戳在接收端+- 工具期间不冒充正在生成,当前速度为空;Pi 的 tool_execution、Codex 的配对 item 执行边界显示「执行工具中」,不能从参数流推出执行已开始。Claude 缺少同等执行事件时只标「生成暂停」;并行模型 delta 优先显示实际生成。下一请求重新显示等待响应。静默超过观测窗口与首响应前统一显示「等待响应」,内部仍区分请求等待与无新采样;静默不重启首响应计时,也不把没有可见内容当真实零输出或 API 失败。远端快照的时间戳在接收端归一为本地观测时间,避免用两台机器的绝对时钟差延长等待或抹掉当前速度。-- 停止/终态错误可能没有最后一份 usage,冻结最后观测并保留估算标识。+- 停止/终态错误可能没有最后一份 usage,冻结最后观测并保留估算标识。明确终态错误标「请求失败」,用户取消标「已停止」,不冒充成功完成。曲线与已观测平均保留,当前速度为空。+- 仅原生 `api_retry` / `auto_retry_start` 或明确 `willRetry: true` 的自动重试事件标「正在重试」;沿用原错误原因、重连进度与重试操作。普通警告与无输出不触发此态。实际文字/思考/工具调用输出或新输出快照恢复后撤掉重试标记;失败/取消标记保留至下一轮,普通收尾 status 不抹成成功。- 原速度入口在完成后保留「上次生成」,点击/键盘可重开详情;不依赖 hover 或先 pin,不固定几秒后隐藏。下一轮用本轮等待替换,切换任务不把别的任务的数据搬过来。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 c2d7a224db..960aa71abd 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@@ -525,6 +525,12 @@ describe('Claude Code translator is_error result guard', () => {ctx,);+ const progressIterator = queue[Symbol.asyncIterator]();+ const progress = await progressIterator.next();+ expect(progress.value).toMatchObject({ type: 'status', data: {+ isRunning: true, responseSpeed: { retrying: true, recentRate: null },+ } });+ await progressIterator.return?.();expect(queue.pending, 'retryable envelope must not close the turn').toBe(0);translateSdkMessage(diff --git a/packages/maker-core/src/agents/claude-code/translator.ts b/packages/maker-core/src/agents/claude-code/translator.tsindex 2aa2532735..dbb3134d9b 100644--- a/packages/maker-core/src/agents/claude-code/translator.ts+++ b/packages/maker-core/src/agents/claude-code/translator.ts@@ -1068,6 +1068,8 @@ function handleSystem(return;}if (msg.subtype === 'api_retry') {+ ctx.rt.generation.responseSpeed.beginRetry();+ queue.push({ type: 'status', data: ccLiveStatus(ctx, 'Working...', true), source: 'claude-code' });// SDKAPIRetryMessage 明确表示本次 API 失败仍在自动重试,不是 turn 终态。// 除日志外也暂存最后一次 retry 的错误详情,覆盖 SDK 没有额外发送// assistant.error envelope、最终 ResultMessage 又没有 result 文本的路径。diff --git a/packages/maker-core/src/agents/pi/translator.ts b/packages/maker-core/src/agents/pi/translator.tsindex 983946425d..4d94040da2 100644--- a/packages/maker-core/src/agents/pi/translator.ts+++ b/packages/maker-core/src/agents/pi/translator.ts@@ -1067,6 +1067,8 @@ export function translatePiEvent(// own tariff at message_start.ctx.pendingPriceVariants = [];if (isCurrentTurnHostAbortRequested(ctx)) return;+ ctx.responseSpeed.beginRetry();+ pushStatus(queue, ctx, 'Working…', true);// `(auto-retry N/M)` 只给过载用:mobile / Telegram 把这个后缀当成「模型服务繁忙」。// 网络类改走 `Reconnecting... N/M`,未分类 5xx / LiteLLM in-stream 仍静默。const progress = parsePiAutoRetryProgress(event);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 5fb04f9390..8f20ad7f14 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@@ -107,3 +107,43 @@ it('Codex counts the shared snapshot/delta cursor once and pauses while tools owbeginCodexGenerationTurn(rt, 'next', 16_000);pauseCodexGeneration(rt, 'next', 'cleanup', 16_000);});++it('Pi publishes even an unclassified native retry without adding an error banner, then recovers on content', () => {+ const clock = vi.spyOn(Date, 'now').mockReturnValue(1000);+ const { queue, events } = harness();+ const ctx = createPiTranslateContext(log as unknown as Logger);+ try {+ translatePiEvent({ type: 'agent_start' } as PiRpcEvent, queue, ctx);+ clock.mockReturnValue(2000);+ translatePiEvent({ type: 'auto_retry_start', attempt: 1, maxAttempts: 3,+ errorMessage: 'unclassified upstream error' } as PiRpcEvent, queue, ctx);+ expect(events.filter(event => event.type === 'error')).toHaveLength(0);+ expect(events.filter(event => event.type === 'status').at(-1)?.data).toMatchObject({+ responseSpeed: { retrying: true, recentRate: null } });+ clock.mockReturnValue(12000);+ translatePiEvent({ 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 });+ } finally { disposePiTranslateContext(ctx); }+});++it('Claude publishes its first native retry without an error banner and excludes backoff from generation', () => {+ const clock = vi.spyOn(Date, 'now').mockReturnValue(1000);+ const { queue, events } = harness();+ const turn: TurnState = { text: '', toolUses: 0, apiCalls: 0, sawCompactBoundary: false,+ hasEmittedText: false, uiEmittedText: '', pendingApiError: null, interruptRequested: false,+ generation: 0, interruptGeneration: 0, lastAssistantMsgHadSubstance: true };+ const ctx = { rt: newRuntimeState(), turn, log, getModel: () => 'test-model',+ getEffort: () => 'high', getPermissionMode: () => 'auto', onSessionId: vi.fn(),+ getSdkSessionId: () => undefined, getLogTitle: () => undefined, tracker: new UsageTracker() };+ translateSdkMessage({ type: 'system', subtype: 'api_retry', attempt: 1, max_retries: 3,+ retry_delay_ms: 10000, error_status: 500, error: 'api_error' }, queue, ctx);+ expect(events.filter(event => event.type === 'error')).toHaveLength(0);+ expect(events.filter(event => event.type === 'status').at(-1)?.data).toMatchObject({+ responseSpeed: { retrying: true, recentRate: null } });+ clock.mockReturnValue(12000);+ translateSdkMessage({ type: 'stream_event', event: { type: 'message_start', message: { id: 'recovered' } } }, queue, ctx);+ translateSdkMessage({ 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);+});diff --git a/packages/maker-core/src/agents/shared/response-speed.test.ts b/packages/maker-core/src/agents/shared/response-speed.test.tsindex 787baa04b6..c1bea31587 100644--- a/packages/maker-core/src/agents/shared/response-speed.test.ts+++ b/packages/maker-core/src/agents/shared/response-speed.test.ts@@ -1,5 +1,5 @@import { describe, expect, it } from 'vitest';-import { calibratedResponseDuration, readResponseSpeedSnapshot, stopResponseSpeed, responseSpeedHistory, responseSpeedActivity } from '@cindy/maker-shared/usage-format';+import { retryResponseSpeed, resumeResponseSpeed, mergeResponseSpeedStatus, calibratedResponseDuration, readResponseSpeedSnapshot, stopResponseSpeed, responseSpeedHistory, responseSpeedActivity } from '@cindy/maker-shared/usage-format';import { ResponseSpeedTracker } from './response-speed.js';describe('response speed', () => {@@ -201,3 +201,37 @@ describe('response speed', () => {expect(readResponseSpeedSnapshot(speed.snapshot(2_000))).toEqual(speed.snapshot(2_000));});});++it('retains incomplete history without showing success or a live rate on failure, cancellation or retry', () => {+ const tracker = new ResponseSpeedTracker();+ tracker.reset('turn', 0);+ tracker.delta('observed output', 1000);+ tracker.delta('more observed output', 2000);+ const original = tracker.snapshot(2000);+ for (const outcome of ['failed', 'cancelled'] as const) {+ const stopped = stopResponseSpeed(original, outcome)!;+ expect(responseSpeedActivity(stopped, 3000)).toBe(outcome);+ expect(responseSpeedHistory(stopped).latestRate).toBeNull();+ expect(stopped.samples).toEqual(original.samples);+ expect(stopped.averageRate).toBe(original.averageRate);+ expect(calibratedResponseDuration(stopped, stopped.outputTokens)).toBeUndefined();+ expect(mergeResponseSpeedStatus(stopped, { ...original, phase: 'complete' }, false, false)?.outcome).toBe(outcome);+ expect(mergeResponseSpeedStatus(stopped, undefined, true, true)).toBeUndefined();+ }+ const retry = retryResponseSpeed(original)!;+ expect(responseSpeedActivity(retry)).toBe('retrying');+ expect(responseSpeedHistory(retry).latestRate).toBeNull();+ expect(mergeResponseSpeedStatus(retry, original, true, false)?.retrying).toBe(true);+ expect(mergeResponseSpeedStatus(retry, { ...original, outputTokens: 1000 }, true, false)?.retrying).toBe(true);+ expect(responseSpeedActivity(mergeResponseSpeedStatus(retry, { ...original, phase: 'complete' }, true, false)!)).toBe('retrying');+ expect(mergeResponseSpeedStatus(retry, { ...original, hasRecentOutput: true,+ samples: [...original.samples, { durationMs: original.durationMs + 1000, outputTokens: 100, rate: 40 }] }, true, false)?.retrying).not.toBe(true);+ expect(mergeResponseSpeedStatus(retry, { ...original, retrying: false }, true, false)?.retrying).toBe(false);+ expect(resumeResponseSpeed(retry)?.retrying).toBe(false);+ const parallelToolRetry = retryResponseSpeed({ ...original, phase: 'paused', toolActive: true })!;+ expect(parallelToolRetry.toolActive).toBe(true);+ expect(mergeResponseSpeedStatus(parallelToolRetry, { ...original, phase: 'paused', toolActive: true }, true, false)?.retrying).toBe(true);+ expect(responseSpeedActivity(resumeResponseSpeed(parallelToolRetry)!)).toBe('tool');+ expect(readResponseSpeedSnapshot({ ...original, outcome: 'unknown' })).toBeUndefined();+ expect(readResponseSpeedSnapshot({ ...original, retrying: 'yes' })).toBeUndefined();+});diff --git a/packages/maker-core/src/agents/shared/response-speed.ts b/packages/maker-core/src/agents/shared/response-speed.tsindex d11aba8d5e..b58271b30b 100644--- a/packages/maker-core/src/agents/shared/response-speed.ts+++ b/packages/maker-core/src/agents/shared/response-speed.ts@@ -19,6 +19,8 @@ export class ResponseSpeedTracker {private openAt: number | null = null;private closedMs = 0;private phase: ResponseSpeedSnapshot['phase'] = 'waiting';+ private retrying = false;+ private retryObserved = false;private settledTokens = 0;private units = 0;private reported: number | null = null;@@ -42,6 +44,7 @@ export class ResponseSpeedTracker {this.reported = null;this.allCalibrated = this.measurable = true;this.phase = 'waiting';+ this.retrying = this.retryObserved = false;this.segment = 0;this.lastSampleAt = 0;this.lastDeltaAt = null;@@ -66,6 +69,7 @@ export class ResponseSpeedTracker {this.window = [];}this.phase = 'generating';+ this.retrying = false;this.waitingAt = null;}@@ -105,6 +109,14 @@ export class ResponseSpeedTracker {this.waitingAt = null;}+ /** A native retry event proves automatic recovery, even when no error banner is emitted. */+ beginRetry(now = Date.now()): void {+ if (this.startedAt === null) this.reset(this.origin, now);+ if (this.phase === 'complete') return;+ this.pause(now);+ this.retrying = this.retryObserved = true;+ }+toolStarted(id: string): void { if (id) this.tools.add(id); }toolEnded(id: string): boolean { return this.tools.delete(id); }@@ -145,6 +157,7 @@ export class ResponseSpeedTracker {this.allCalibrated = true;}this.phase = 'complete';+ this.retrying = false;}invalidate(): void { this.measurable = false; }@@ -170,6 +183,7 @@ export class ResponseSpeedTracker {sampledAt: now,hasRecentOutput: this.phase === 'generating' && this.window.length > 0,toolActive: this.tools.size > 0,+ ...(this.retryObserved ? { retrying: this.retrying } : {}),};}diff --git a/packages/maker-shared/src/runningTokenRateHistory.ts b/packages/maker-shared/src/runningTokenRateHistory.tsindex fc38faf2e1..f42e0c54f9 100644--- a/packages/maker-shared/src/runningTokenRateHistory.ts+++ b/packages/maker-shared/src/runningTokenRateHistory.ts@@ -21,11 +21,17 @@ export interface ResponseSpeedSnapshot {hasRecentOutput?: boolean;/** Explicit native tool execution, distinct from streamed tool arguments. */toolActive?: boolean;+ /** Display annotation from an explicit terminal event, never inferred from silence. */+ outcome?: 'failed' | 'cancelled';+ /** True requires an explicit retry event; false can acknowledge native recovery. */+ retrying?: boolean;}export function responseSpeedActivity(speed: ResponseSpeedSnapshot, now = Date.now()):- 'waiting' | 'generating' | 'quiet' | 'tool' | 'paused' | 'complete' {- if (speed.phase === 'complete' || speed.phase === 'waiting') return speed.phase;+ 'waiting' | 'generating' | 'quiet' | 'tool' | 'paused' | 'complete' | 'failed' | 'cancelled' | 'retrying' {+ if (speed.phase === 'complete') return speed.outcome ?? 'complete';+ if (speed.retrying) return 'retrying';+ if (speed.phase === 'waiting') return 'waiting';if (speed.phase === 'paused') return speed.toolActive ? 'tool' : 'paused';return now - speed.sampledAt < RATE_SAMPLE_FRESH_MS &&(speed.hasRecentOutput ?? speed.recentRate !== null) ? 'generating' : 'quiet';@@ -36,7 +42,7 @@ export function responseSpeedHistory(speed: ResponseSpeedSnapshot, now = Date.no...emptyRateHistory(null),samples: speed.samples,peak: Math.max(0, ...speed.samples.map((sample) => sample.rate)),- latestRate: speed.phase === 'generating' && now - speed.sampledAt >= RATE_SAMPLE_FRESH_MS ? null : speed.recentRate,+ latestRate: speed.outcome || speed.retrying || (speed.phase === 'generating' && now - speed.sampledAt >= RATE_SAMPLE_FRESH_MS) ? null : speed.recentRate,latestSampleAt: speed.sampledAt,};}@@ -51,6 +57,8 @@ export function readResponseSpeedSnapshot(value: unknown, observedAt?: number):!finite(speed.waitingMs) || !finite(speed.outputTokens) || !finite(speed.durationMs) ||!finite(speed.sampledAt) || (speed.hasRecentOutput !== undefined && typeof speed.hasRecentOutput !== 'boolean') ||(speed.toolActive !== undefined && typeof speed.toolActive !== 'boolean') ||+ (speed.outcome !== undefined && !['failed', 'cancelled'].includes(speed.outcome)) ||+ (speed.retrying !== undefined && typeof speed.retrying !== 'boolean') ||(speed.firstResponseMs !== null && !finite(speed.firstResponseMs)) ||(speed.recentRate !== null && !finite(speed.recentRate)) ||(speed.averageRate !== null && !finite(speed.averageRate)) || !Array.isArray(speed.samples)) return undefined;@@ -59,16 +67,48 @@ export function readResponseSpeedSnapshot(value: unknown, observedAt?: number):}/** Terminal errors/abort can lack a final provider snapshot. Freeze the last observation. */-export function stopResponseSpeed(speed: ResponseSpeedSnapshot | undefined): ResponseSpeedSnapshot | undefined {+export function stopResponseSpeed(speed: ResponseSpeedSnapshot | undefined, outcome?: ResponseSpeedSnapshot['outcome']): ResponseSpeedSnapshot | undefined {+ if (!speed || (speed.phase === 'complete' && (!outcome || speed.outcome === outcome))) return speed;+ const terminalOutcome = outcome ?? speed.outcome;+ return { ...speed, phase: 'complete', ...(terminalOutcome ? { outcome: terminalOutcome } : {}), retrying: false,+ recentRate: terminalOutcome ? null : speed.averageRate,+ estimated: Boolean(terminalOutcome) || speed.estimated || speed.phase === 'generating' || speed.phase === 'waiting' };+}++/** Pause displayed generation only after an explicit automatic retry event. */+export function retryResponseSpeed(speed: ResponseSpeedSnapshot | undefined): ResponseSpeedSnapshot | undefined {if (!speed || speed.phase === 'complete') return speed;- return { ...speed, phase: 'complete', recentRate: speed.averageRate,- estimated: speed.estimated || speed.phase === 'generating' || speed.phase === 'waiting' };+ return { ...speed, phase: 'paused', retrying: true, recentRate: null,+ hasRecentOutput: false };+}++/** Actual output ends the retry annotation without inventing a throughput sample. */+export function resumeResponseSpeed(speed: ResponseSpeedSnapshot | undefined): ResponseSpeedSnapshot | undefined {+ return speed?.retrying && speed.phase !== 'complete'+ ? { ...speed, phase: speed.toolActive ? 'paused' : 'generating', retrying: false, hasRecentOutput: false, recentRate: null }+ : speed;+}++/** Preserve terminal/retry annotations across ordinary status tails; a new turn clears them. */+export function mergeResponseSpeedStatus(previous: ResponseSpeedSnapshot | undefined,+ incoming: ResponseSpeedSnapshot | undefined, isRunning: boolean, isTurnStart: boolean): ResponseSpeedSnapshot | undefined {+ const baseline = isTurnStart ? undefined : previous;+ const next = incoming ?? baseline;+ if (!isRunning) return stopResponseSpeed(next, baseline?.outcome);+ if (baseline?.retrying && next && incoming?.retrying !== false) {+ // Usage calibration can raise tokens without any new output. Only a new+ // stream sample or explicit tool execution can recover a status-only view.+ const newSample = next.hasRecentOutput === true &&+ (next.samples.at(-1)?.durationMs ?? 0) > (baseline.samples.at(-1)?.durationMs ?? 0);+ if (!(next.toolActive && !baseline.toolActive) && !newSample) return retryResponseSpeed({ ...next, phase: 'paused' });+ }+ return next;}/** A finalized speed denominator may only pair with the same real output count. */export function calibratedResponseDuration(value: unknown, outputTokens: number): number | undefined {const speed = readResponseSpeedSnapshot(value);- return speed?.phase === 'complete' && !speed.estimated && speed.averageRate !== null &&+ return speed?.phase === 'complete' && !speed.outcome && !speed.estimated && speed.averageRate !== null &&speed.outputTokens === outputTokens && speed.durationMs > 0 ? speed.durationMs : undefined;}