@yeaft/webchat-agent 0.0.146 → 0.0.149

package/claude.js

@@ -346,14 +346,21 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
 
       // 捕获 result 消息中的 usage 信息
       if (message.type === 'result') {
-        // 累计 usage（无论是否重复，始终统计）
+        // 差值计算：usage 中的值是 query 实例级累计值
         if (message.usage) {
-          state.usage.inputTokens += message.usage.input_tokens || 0;
-          state.usage.outputTokens += message.usage.output_tokens || 0;
-          state.usage.cacheRead += message.usage.cache_read_input_tokens || 0;
-          state.usage.cacheCreation += message.usage.cache_creation_input_tokens || 0;
+          const inputDelta = (message.usage.input_tokens || 0) - (state.lastResultInputTokens || 0);
+          const outputDelta = (message.usage.output_tokens || 0) - (state.lastResultOutputTokens || 0);
+          if (inputDelta > 0) state.usage.inputTokens += inputDelta;
+          if (outputDelta > 0) state.usage.outputTokens += outputDelta;
+          state.usage.cacheRead += Math.max(0, (message.usage.cache_read_input_tokens || 0) - (state.lastResultCacheRead || 0));
+          state.usage.cacheCreation += Math.max(0, (message.usage.cache_creation_input_tokens || 0) - (state.lastResultCacheCreation || 0));
+          state.lastResultInputTokens = message.usage.input_tokens || 0;
+          state.lastResultOutputTokens = message.usage.output_tokens || 0;
+          state.lastResultCacheRead = message.usage.cache_read_input_tokens || 0;
+          state.lastResultCacheCreation = message.usage.cache_creation_input_tokens || 0;
         }
-        state.usage.totalCostUsd += message.total_cost_usd || 0;
+        // total_cost_usd 是全局累计值，直接赋值
+        state.usage.totalCostUsd = message.total_cost_usd || 0;
 
         // 计算上下文使用百分比
         const inputTokens = message.usage?.input_tokens || 0;

package/crew.js

@@ -977,7 +977,9 @@ async function createRoleQuery(session, roleName) {
     abortController,
     accumulatedText: '',
     turnActive: false,
-    claudeSessionId: savedSessionId
+    claudeSessionId: savedSessionId,
+    lastInputTokens: 0,
+    lastOutputTokens: 0
   };
 
   session.roleStates.set(roleName, roleState);
@@ -1242,14 +1244,18 @@ async function processRoleOutput(session, roleName, roleQuery, roleState) {
         // ★ 修复2: 反向搜索该角色最后一条 streaming 消息并结束
         endRoleStreaming(session, roleName);
 
-        // 更新费用
-        if (message.total_cost_usd) {
-          session.costUsd += message.total_cost_usd;
+        // 更新费用（total_cost_usd 是全局进程级累计值，直接赋值）
+        if (message.total_cost_usd != null) {
+          session.costUsd = message.total_cost_usd;
         }
-        // 更新 token 用量
+        // 更新 token 用量（差值计算：usage 是 query 实例级累计值）
         if (message.usage) {
-          session.totalInputTokens += message.usage.input_tokens || 0;
-          session.totalOutputTokens += message.usage.output_tokens || 0;
+          const inputDelta = (message.usage.input_tokens || 0) - (roleState.lastInputTokens || 0);
+          const outputDelta = (message.usage.output_tokens || 0) - (roleState.lastOutputTokens || 0);
+          if (inputDelta > 0) session.totalInputTokens += inputDelta;
+          if (outputDelta > 0) session.totalOutputTokens += outputDelta;
+          roleState.lastInputTokens = message.usage.input_tokens || 0;
+          roleState.lastOutputTokens = message.usage.output_tokens || 0;
         }
 
         // ★ 持久化 sessionId（每次 turn 完成后保存，用于后续 resume）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.0.146",
+  "version": "0.0.149",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",