From 1f80043928665b55460328f45f437a584f28df92 Mon Sep 17 00:00:00 2001 From: cepvor Date: Thu, 14 May 2026 15:40:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=90=E4=BB=A3?= =?UTF-8?q?=E7=90=86=20token=20=E6=B6=88=E8=80=97=E5=9C=A8=E4=B8=BB=20spin?= =?UTF-8?q?ner=20=E4=B8=AD=E5=A7=8B=E7=BB=88=E6=98=BE=E7=A4=BA=E4=B8=BA=20?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spinner.tsx 的 token 聚合循环仅统计 in_process_teammate 类型任务， 漏掉了 local_agent（后台代理/verification agent）类型。当后台代理 运行时，主界面 spinner 一直显示 "↓ 0 tokens"，因为 background agent 的 token 消耗未被纳入 teammateTokens 聚合。 同时在 inProcessRunner.ts 中，进程内队友完成时计算并设置 result （含 totalTokens/totalToolUseCount/content/usage），使详情弹窗可以 正确展示累计 token 消耗，不再仅依赖 progress.tokenCount 间歇更新。 Co-Authored-By: deepseek-v4-pro[1m] --- src/components/Spinner.tsx | 3 +- src/utils/swarm/inProcessRunner.ts | 50 +++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/components/Spinner.tsx b/src/components/Spinner.tsx index 0ef3ab4d5a..5d8e156224 100644 --- a/src/components/Spinner.tsx +++ b/src/components/Spinner.tsx @@ -23,6 +23,7 @@ import { getDefaultCharacters, type SpinnerMode } from './Spinner/index.js'; import { SpinnerAnimationRow } from './Spinner/SpinnerAnimationRow.js'; import { useSettings } from '../hooks/useSettings.js'; import { isInProcessTeammateTask } from '../tasks/InProcessTeammateTask/types.js'; +import { isLocalAgentTask } from '../tasks/LocalAgentTask/LocalAgentTask.js'; import { isBackgroundTask } from '../tasks/types.js'; import { getAllInProcessTeammateTasks } from '../tasks/InProcessTeammateTask/InProcessTeammateTask.js'; import { getEffortSuffix } from '../utils/effort.js'; @@ -214,7 +215,7 @@ function SpinnerWithVerbInner({ let teammateTokens = 0; if (!showSpinnerTree) { for (const task of Object.values(tasks)) { - if (isInProcessTeammateTask(task) && task.status === 'running') { + if (task.status === 'running' && (isInProcessTeammateTask(task) || isLocalAgentTask(task))) { if (task.progress?.tokenCount) { teammateTokens += task.progress.tokenCount; } diff --git a/src/utils/swarm/inProcessRunner.ts b/src/utils/swarm/inProcessRunner.ts index bf20202487..4d2c7e605b 100644 --- a/src/utils/swarm/inProcessRunner.ts +++ b/src/utils/swarm/inProcessRunner.ts @@ -47,6 +47,7 @@ import { import type { CustomAgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js' import { runAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/runAgent.js' import { awaitClassifierAutoApproval } from '@claude-code-best/builtin-tools/tools/BashTool/bashPermissions.js' +import type { AgentToolResult } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js' import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js' import { SEND_MESSAGE_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SendMessageTool/constants.js' import { TASK_CREATE_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/TaskCreateTool/constants.js' @@ -63,7 +64,10 @@ import { } from '../../utils/messages.js' import { evictTaskOutput } from '../../utils/task/diskOutput.js' import { evictTerminalTask } from '../../utils/task/framework.js' -import { tokenCountWithEstimation } from '../../utils/tokens.js' +import { + tokenCountWithEstimation, + getTokenCountFromUsage, +} from '../../utils/tokens.js' import { createAbortController } from '../abortController.js' import { type AgentContext, runWithAgentContext } from '../agentContext.js' import { @@ -915,6 +919,7 @@ export async function runInProcessTeammate( invokingRequestId, } = config const { setAppState } = toolUseContext + const startTime = Date.now() logForDebugging( `[inProcessRunner] Starting agent loop for ${identity.agentId}`, @@ -1463,6 +1468,48 @@ export async function runInProcessTeammate( // Mark as completed when exiting the loop let alreadyTerminal = false let toolUseId: string | undefined + + // Compute result so the detail dialog can show token usage. + // Walk backwards for the last API usage (cumulative input_tokens from the + // Anthropic API already includes all prior context). + let completionTokens = 0 + let completionToolUseCount = 0 + let lastAssistantContent: AgentToolResult['content'] = [] + let lastUsage: AgentToolResult['usage'] | undefined + for (let i = allMessages.length - 1; i >= 0; i--) { + const m = allMessages[i]! + if (m.type === 'assistant') { + const blocks = (m.message?.content ?? []) as any[] + for (const b of blocks) { + if (b?.type === 'tool_use') completionToolUseCount++ + } + const textBlocks = blocks.filter((b: any) => b?.type === 'text') + if (textBlocks.length > 0 && lastAssistantContent.length === 0) { + lastAssistantContent = textBlocks.map((b: any) => ({ + type: 'text' as const, + text: b.text, + })) + } + if (!lastUsage && m.message?.usage) { + lastUsage = m.message.usage as AgentToolResult['usage'] + completionTokens = getTokenCountFromUsage( + m.message.usage as Parameters[0], + ) + } + if (completionTokens > 0 && lastAssistantContent.length > 0) break + } + } + + const teammateResult: AgentToolResult = { + agentId: identity.agentId, + agentType: 'teammate', + content: lastAssistantContent, + totalToolUseCount: completionToolUseCount, + totalDurationMs: Date.now() - startTime, + totalTokens: completionTokens, + usage: lastUsage as AgentToolResult['usage'], + } as unknown as AgentToolResult + updateTaskState( taskId, task => { @@ -1481,6 +1528,7 @@ export async function runInProcessTeammate( status: 'completed' as const, notified: true, endTime: Date.now(), + result: teammateResult, messages: task.messages?.length ? [task.messages.at(-1)!] : undefined, pendingUserMessages: [], inProgressToolUseIDs: undefined, From b3d28bcdf1beeea470c7771b9f07d54f12f05093 Mon Sep 17 00:00:00 2001 From: cepvor Date: Thu, 14 May 2026 16:05:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=B8=BA=20cacheWarningStateBySourc?= =?UTF-8?q?e=20Map=20=E8=AE=BE=E7=BD=AE=E4=B8=8A=E9=99=90=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Map 以 querySource 为 key 存储每个来源的缓存命中率历史状态， 但 querySource 类型为 `any`，长时间会话中可能产生大量唯一值， Map 持续增长永不清理。 新增 MAX_SOURCE_ENTRIES = 50 上限，新增条目时若达到上限则 逐出最早插入的条目（Map 按插入顺序迭代）。 同时也新增 _resetCacheWarningStateForTest() 用于测试隔离。 Co-Authored-By: deepseek-v4-pro[1m] --- src/utils/cacheWarning.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/utils/cacheWarning.ts b/src/utils/cacheWarning.ts index 39ba5a599a..2e193f9a47 100644 --- a/src/utils/cacheWarning.ts +++ b/src/utils/cacheWarning.ts @@ -24,6 +24,12 @@ interface CacheWarningState { // 模块级状态，每个 querySource 独立跟踪 const cacheWarningStateBySource = new Map() +// Limit the number of tracked sources to prevent unbounded Map growth. +// querySource strings are effectively unbounded (typed as `any`), so a +// long-running session that spawns many subagents could leak memory. +// Evict the oldest entry (by insertion order) when the limit is exceeded. +const MAX_SOURCE_ENTRIES = 50 + const DEFAULT_CACHE_THRESHOLD = 80 /** @@ -81,6 +87,13 @@ export function shouldShowCacheWarning( let state = cacheWarningStateBySource.get(querySource) if (!state) { state = { lastHitRate: null, lastTimestamp: null } + // Evict oldest entry when at capacity so the Map stays bounded + if (cacheWarningStateBySource.size >= MAX_SOURCE_ENTRIES) { + const oldestKey = cacheWarningStateBySource.keys().next().value + if (oldestKey !== undefined) { + cacheWarningStateBySource.delete(oldestKey) + } + } cacheWarningStateBySource.set(querySource, state) } @@ -132,3 +145,10 @@ export function createCacheWarningMessage(info: CacheHitRateInfo): Message { isMeta: false, } as Message } + +/** + * Reset the per-source tracking state — only used in tests. + */ +export function _resetCacheWarningStateForTest(): void { + cacheWarningStateBySource.clear() +}