@yeaft/webchat-agent 0.0.12 → 0.0.13

package/claude.js

@@ -34,6 +34,7 @@ export async function startClaudeQuery(conversationId, workDir, resumeSessionId)
     createdAt: Date.now(),
     abortController,
     turnActive: false, // 是否有 turn 正在处理中
+    turnResultReceived: false, // 当前 turn 是否已收到 result（用于抑制重复 result）
     // Metadata from system init message
     tools: [],
     slashCommands: [],
@@ -324,6 +325,7 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
 
       // 捕获 result 消息中的 usage 信息
       if (message.type === 'result') {
+        // 累计 usage（无论是否重复，始终统计）
         if (message.usage) {
           state.usage.inputTokens += message.usage.input_tokens || 0;
           state.usage.outputTokens += message.usage.output_tokens || 0;
@@ -333,9 +335,17 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
         state.usage.totalCostUsd += message.total_cost_usd || 0;
         console.log(`[SDK] Query completed for ${conversationId}, cost: $${state.usage.totalCostUsd.toFixed(4)}`);
 
+        // ★ Guard：当前 turn 已收到过 result，抑制 SDK 发出的重复 result
+        // （长任务场景下 SDK 可能先发 result/success 再发 result/error_during_execution）
+        if (state.turnResultReceived) {
+          console.warn(`[SDK] Suppressing duplicate result for ${conversationId} (subtype: ${message.subtype || 'unknown'})`);
+          continue;
+        }
+
         // ★ Turn 完成：发送 turn_completed，进程继续运行等待下一条消息
         // stream-json 模式下 Claude 进程是持久运行的，for-await 在 result 后继续等待
         // 不清空 state.query 和 state.inputStream，下次用户消息直接通过同一个 inputStream 发送
+        state.turnResultReceived = true;
         sendOutput(conversationId, message);
 
         resultHandled = true;

package/conversation.js

@@ -360,6 +360,7 @@ export async function handleUserInput(msg) {
 
   console.log(`[${conversationId}] Sending: ${prompt.substring(0, 100)}...`);
   state.turnActive = true;
+  state.turnResultReceived = false; // 重置 per-turn 去重标志
   sendConversationList(); // 在 turnActive=true 后通知 server，确保 processing 状态正确
   state.inputStream.enqueue(userMessage);
 }

package/history.js

@@ -168,7 +168,7 @@ export function loadSessionHistory(workDir, claudeSessionId, limit = 500) {
 }
 
 export async function handleListHistorySessions(msg) {
-  const { workDir, requestId } = msg;
+  const { workDir, requestId, _requestClientId } = msg;
   const effectiveWorkDir = workDir || ctx.CONFIG.workDir;
 
   console.log(`Listing history sessions for: ${effectiveWorkDir}`);
@@ -178,6 +178,7 @@ export async function handleListHistorySessions(msg) {
     ctx.sendToServer({
       type: 'history_sessions_list',
       requestId,
+      _requestClientId,
       workDir: effectiveWorkDir,
       sessions
     });
@@ -186,6 +187,7 @@ export async function handleListHistorySessions(msg) {
     ctx.sendToServer({
       type: 'history_sessions_list',
       requestId,
+      _requestClientId,
       workDir: effectiveWorkDir,
       sessions: [],
       error: e.message
@@ -195,7 +197,7 @@ export async function handleListHistorySessions(msg) {
 
 // 列出 Claude projects 目录下的所有 folder (工作目录)
 export async function handleListFolders(msg) {
-  const { requestId } = msg;
+  const { requestId, _requestClientId } = msg;
   const projectsDir = getClaudeProjectsDir();
 
   console.log(`Listing folders from: ${projectsDir}`);
@@ -268,6 +270,7 @@ export async function handleListFolders(msg) {
     ctx.sendToServer({
       type: 'folders_list',
       requestId,
+      _requestClientId,
       folders
     });
     console.log(`folders_list sent with ${folders.length} folders`);
@@ -276,6 +279,7 @@ export async function handleListFolders(msg) {
     ctx.sendToServer({
       type: 'folders_list',
       requestId,
+      _requestClientId,
       folders: [],
       error: e.message
     });

package/package.json

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