@yeaft/webchat-agent 1.0.113 → 1.0.115

package/claude.js

@@ -2,6 +2,7 @@ import { writeFile, mkdir } from 'fs/promises';
 import { join } from 'path';
 import { query, Stream } from './sdk/index.js';
 import ctx from './context.js';
+import { recordAgentTokenUsage, recordAgentTurn } from './metrics.js';
 import { sendConversationList, sendOutput, sendError, handleAskUserQuestion } from './conversation.js';
 import { startSubagentWatcher, stopSubagentWatcher, cleanupSubagentWatchers } from './subagent.js';
 import { SYNTHETIC_TOOL_NAMES } from './synthetic-tools.js';
@@ -627,10 +628,18 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
         if (message.usage) {
           const inputDelta = (message.usage.input_tokens || 0) - (state.lastResultInputTokens || 0);
           const outputDelta = (message.usage.output_tokens || 0) - (state.lastResultOutputTokens || 0);
+          const cacheReadDelta = Math.max(0, (message.usage.cache_read_input_tokens || 0) - (state.lastResultCacheRead || 0));
+          const cacheCreationDelta = Math.max(0, (message.usage.cache_creation_input_tokens || 0) - (state.lastResultCacheCreation || 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.usage.cacheRead += cacheReadDelta;
+          state.usage.cacheCreation += cacheCreationDelta;
+          recordAgentTokenUsage({
+            inputTokens: inputDelta,
+            outputTokens: outputDelta,
+            cacheReadTokens: cacheReadDelta,
+            cacheWriteTokens: cacheCreationDelta,
+          });
           state.lastResultInputTokens = message.usage.input_tokens || 0;
           state.lastResultOutputTokens = message.usage.output_tokens || 0;
           state.lastResultCacheRead = message.usage.cache_read_input_tokens || 0;
@@ -664,6 +673,7 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
         // ★ Turn 完成：发送 turn_completed，进程继续运行等待下一条消息
         // stream-json 模式下 Claude 进程是持久运行的，for-await 在 result 后继续等待
         // 不清空 state.query 和 state.inputStream，下次用户消息直接通过同一个 inputStream 发送
+        recordAgentTurn('chat');
         state.turnResultReceived = true;
         resultHandled = true;
         state.turnActive = false;

package/connection/message-router.js

@@ -23,6 +23,7 @@ import {
   handlePingSession
 } from '../conversation.js';
 import { sendToServer, flushMessageBuffer } from './buffer.js';
+import { sendAgentMetricsSnapshot } from '../metrics.js';
 import { handleRestartAgent, handleUpgradeAgent } from './upgrade.js';
 import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getYeaftSettings, updateYeaftSettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../yeaft/config-api.js';
@@ -69,6 +70,7 @@ export async function handleMessage(msg) {
       }
 
       sendConversationList();
+      sendAgentMetricsSnapshot();
       startYeaftStatusRefresh();
 
       // fix-yeaft-session-per-agent: eagerly broadcast this agent's
@@ -120,6 +122,10 @@ export async function handleMessage(msg) {
       sendConversationList();
       break;
 
+    case 'get_agent_metrics':
+      sendAgentMetricsSnapshot();
+      break;
+
     case 'list_history_sessions':
       await handleListHistorySessions(msg);
       break;

package/context.js

@@ -21,6 +21,17 @@ export default {
   slashCommands: [],
   // Slash command 描述映射: { commandName: description } — 从 plugin commands/*.md 提取
   slashCommandDescriptions: {},
+  agentMetrics: {
+    chatTurns: 0,
+    yeaftTurns: 0,
+    sessionsCreated: 0,
+    inputTokens: 0,
+    outputTokens: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
+    totalTokens: 0,
+    lastUpdatedAt: 0,
+  },
   // MCP servers 列表 (从 ~/.claude.json 读取): [{ name, enabled, source }]
   mcpServers: [],
   // 连接相关

package/metrics.js

@@ -0,0 +1,109 @@
+import ctx from './context.js';
+
+function finiteNumber(value) {
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? n : 0;
+}
+
+function ensureMetrics() {
+  if (!ctx.agentMetrics || typeof ctx.agentMetrics !== 'object') {
+    ctx.agentMetrics = {};
+  }
+  const metrics = ctx.agentMetrics;
+  metrics.chatTurns = finiteNumber(metrics.chatTurns);
+  metrics.yeaftTurns = finiteNumber(metrics.yeaftTurns);
+  metrics.sessionsCreated = finiteNumber(metrics.sessionsCreated);
+  metrics.inputTokens = finiteNumber(metrics.inputTokens);
+  metrics.outputTokens = finiteNumber(metrics.outputTokens);
+  metrics.cacheReadTokens = finiteNumber(metrics.cacheReadTokens);
+  metrics.cacheWriteTokens = finiteNumber(metrics.cacheWriteTokens);
+  metrics.totalTokens = finiteNumber(metrics.totalTokens);
+  metrics.lastUpdatedAt = finiteNumber(metrics.lastUpdatedAt);
+  return metrics;
+}
+
+export const AGENT_METRICS_EMIT_INTERVAL_MS = 2000;
+
+let pendingMetricsEmit = null;
+let lastMetricsEmitAt = 0;
+
+function touch(metrics) {
+  metrics.lastUpdatedAt = Date.now();
+  scheduleAgentMetricsSnapshot();
+  return metrics;
+}
+
+function scheduleAgentMetricsSnapshot() {
+  if (pendingMetricsEmit) return;
+  const now = Date.now();
+  const delay = lastMetricsEmitAt > 0
+    ? Math.max(AGENT_METRICS_EMIT_INTERVAL_MS - (now - lastMetricsEmitAt), 0)
+    : AGENT_METRICS_EMIT_INTERVAL_MS;
+  pendingMetricsEmit = setTimeout(() => {
+    pendingMetricsEmit = null;
+    emitAgentMetricsSnapshot();
+  }, delay);
+}
+
+export function recordAgentTurn(kind = 'chat') {
+  const metrics = ensureMetrics();
+  if (kind === 'yeaft') metrics.yeaftTurns += 1;
+  else metrics.chatTurns += 1;
+  touch(metrics);
+}
+
+export function recordAgentSessionCreated() {
+  const metrics = ensureMetrics();
+  metrics.sessionsCreated += 1;
+  touch(metrics);
+}
+
+export function recordAgentTokenUsage(usage = {}) {
+  const metrics = ensureMetrics();
+  const inputTokens = finiteNumber(usage.inputTokens ?? usage.input_tokens ?? usage.promptTokens ?? usage.prompt_tokens);
+  const outputTokens = finiteNumber(usage.outputTokens ?? usage.output_tokens ?? usage.completionTokens ?? usage.completion_tokens);
+  const cacheReadTokens = finiteNumber(usage.cacheReadTokens ?? usage.cache_read_tokens ?? usage.cache_read_input_tokens);
+  const cacheWriteTokens = finiteNumber(usage.cacheWriteTokens ?? usage.cacheWriteInputTokens ?? usage.cache_creation_input_tokens);
+  const explicitTotal = finiteNumber(usage.totalTokens ?? usage.total_tokens);
+  const totalTokens = explicitTotal || inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens;
+
+  if (inputTokens > 0) metrics.inputTokens += inputTokens;
+  if (outputTokens > 0) metrics.outputTokens += outputTokens;
+  if (cacheReadTokens > 0) metrics.cacheReadTokens += cacheReadTokens;
+  if (cacheWriteTokens > 0) metrics.cacheWriteTokens += cacheWriteTokens;
+  if (totalTokens > 0) metrics.totalTokens += totalTokens;
+  if (inputTokens || outputTokens || cacheReadTokens || cacheWriteTokens || totalTokens) touch(metrics);
+}
+
+export function snapshotAgentMetrics() {
+  const metrics = ensureMetrics();
+  return {
+    chatTurns: metrics.chatTurns,
+    yeaftTurns: metrics.yeaftTurns,
+    totalTurns: metrics.chatTurns + metrics.yeaftTurns,
+    sessionsCreated: metrics.sessionsCreated,
+    inputTokens: metrics.inputTokens,
+    outputTokens: metrics.outputTokens,
+    cacheReadTokens: metrics.cacheReadTokens,
+    cacheWriteTokens: metrics.cacheWriteTokens,
+    totalTokens: metrics.totalTokens,
+    lastUpdatedAt: metrics.lastUpdatedAt || null,
+  };
+}
+
+function emitAgentMetricsSnapshot() {
+  lastMetricsEmitAt = Date.now();
+  if (typeof ctx.sendToServer !== 'function') return;
+  ctx.sendToServer({
+    type: 'agent_metrics',
+    metrics: snapshotAgentMetrics(),
+  });
+}
+
+export function sendAgentMetricsSnapshot() {
+  if (pendingMetricsEmit) {
+    clearTimeout(pendingMetricsEmit);
+    pendingMetricsEmit = null;
+  }
+  emitAgentMetricsSnapshot();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.113",
+  "version": "1.0.115",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/yeaft/web-bridge.js

@@ -72,6 +72,7 @@ import { buildMcpFlattenedTools } from './tools/mcp-tools.js';
 import { getAgentRegistry, agentBelongsToScope } from './tools/agent.js';
 import { isPromptableAgentStatus } from './sub-agent/status.js';
 import { perfNowMs, recordAgentPerfTrace } from './perf-trace.js';
+import { recordAgentSessionCreated, recordAgentTokenUsage, recordAgentTurn } from '../metrics.js';
 
 const LEGACY_SKILL_COMMAND_PREFIX = 'skill:';
 const YEAFT_SKILL_COMMAND_PREFIX = 'yeaft-skills:';
@@ -2211,6 +2212,9 @@ function mergedStatusForProjectRuntime(runtime) {
 
 /** Send a Yeaft Session metadata event over the legacy-compatible envelope. */
 function sendSessionEvent(event, { sessionId, chatId, vpId, turnId, threadId, perfTraceId } = {}) {
+  if (event?.type === 'loop') {
+    recordAgentTokenUsage(event.usage || {});
+  }
   sendToServer({
     type: 'yeaft_output',
     conversationId: yeaftConversationId,
@@ -2468,6 +2472,7 @@ export function handleYeaftCreateSession(msg) {
   try {
     const yeaftDir = ctx.CONFIG?.yeaftDir;
     const group = createSessionFromSpec(yeaftDir, withDefaultSessionConfig(payload));
+    recordAgentSessionCreated();
     group.config = loadSessionConfig(yeaftDir, group.id);
     sendSessionCrudResult({ op: 'create', requestId, ok: true, session: group });
     sendSessionSnapshotBroadcast();
@@ -3289,12 +3294,15 @@ function handleEngineEvent(event, hctx) {
       break;
 
     case 'turn_close':
+      recordAgentTurn('yeaft');
       sendSessionEvent({
         type: 'turn_close',
         turnId: event.turnId,
+        threadId: event.threadId,
         totalMs: event.totalMs,
         totalTokens: event.totalTokens,
         loopCount: event.loopCount,
+        ts: Date.now(),
       }, envelope);
       break;