@yeaft/webchat-agent 0.0.15 → 0.0.17

package/claude.js

@@ -346,12 +346,13 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
         // stream-json 模式下 Claude 进程是持久运行的，for-await 在 result 后继续等待
         // 不清空 state.query 和 state.inputStream，下次用户消息直接通过同一个 inputStream 发送
         state.turnResultReceived = true;
-        sendOutput(conversationId, message);
-
         resultHandled = true;
         state.turnActive = false;
 
-        ctx.sendToServer({
+        // ★ await 确保 result 和 turn_completed 消息确实发送成功
+        // 不 await 会导致 encrypt 失败时消息静默丢失，前端卡在"思考中"
+        await sendOutput(conversationId, message);
+        await ctx.sendToServer({
           type: 'turn_completed',
           conversationId,
           claudeSessionId: state.claudeSessionId,
@@ -369,6 +370,9 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
   } catch (error) {
     if (error.name === 'AbortError') {
       console.log(`[SDK] Query aborted for ${conversationId}`);
+    } else if (resultHandled) {
+      // Turn 已正常完成，进程退出产生的 error 不发送给用户
+      console.warn(`[SDK] Ignoring post-result error for ${conversationId}: ${error.message}`);
     } else {
       console.error(`[SDK] Error for ${conversationId}:`, error.message);
       sendError(conversationId, error.message);

package/connection.js

@@ -17,10 +17,28 @@ import {
   sendConversationList
 } from './conversation.js';
 
+// 需要在断连期间缓冲的消息类型（Claude 输出相关的关键消息）
+const BUFFERABLE_TYPES = new Set([
+  'claude_output', 'turn_completed', 'conversation_closed',
+  'session_id_update', 'compact_status', 'slash_commands_update',
+  'background_task_started', 'background_task_output'
+]);
+
 // Send message to server (with encryption if available)
+// 断连时对关键消息类型进行缓冲，重连后自动 flush
 async function sendToServer(msg) {
   if (!ctx.ws || ctx.ws.readyState !== WebSocket.OPEN) {
-    console.warn(`[WS] Cannot send message, WebSocket not open (state: ${ctx.ws?.readyState})`);
+    // 缓冲关键消息
+    if (BUFFERABLE_TYPES.has(msg.type)) {
+      if (ctx.messageBuffer.length < ctx.messageBufferMaxSize) {
+        ctx.messageBuffer.push(msg);
+        console.log(`[WS] Buffered message: ${msg.type} (queue: ${ctx.messageBuffer.length})`);
+      } else {
+        console.warn(`[WS] Buffer full (${ctx.messageBufferMaxSize}), dropping: ${msg.type}`);
+      }
+    } else {
+      console.warn(`[WS] Cannot send message, WebSocket not open: ${msg.type}`);
+    }
     return;
   }
 
@@ -28,14 +46,31 @@ async function sendToServer(msg) {
     if (ctx.sessionKey) {
       const encrypted = await encrypt(msg, ctx.sessionKey);
       ctx.ws.send(JSON.stringify(encrypted));
-      console.log(`[WS] Sent encrypted message: ${msg.type}`);
     } else {
       ctx.ws.send(JSON.stringify(msg));
-      console.log(`[WS] Sent plain message: ${msg.type}`);
     }
   } catch (e) {
     console.error(`[WS] Error sending message ${msg.type}:`, e.message);
+    // 发送失败也缓冲
+    if (BUFFERABLE_TYPES.has(msg.type) && ctx.messageBuffer.length < ctx.messageBufferMaxSize) {
+      ctx.messageBuffer.push(msg);
+      console.log(`[WS] Send failed, buffered: ${msg.type}`);
+    }
+  }
+}
+
+// Flush 断连期间缓冲的消息
+async function flushMessageBuffer() {
+  if (ctx.messageBuffer.length === 0) return;
+
+  const buffered = ctx.messageBuffer.splice(0);
+  console.log(`[WS] Flushing ${buffered.length} buffered messages...`);
+
+  for (const msg of buffered) {
+    await sendToServer(msg);
   }
+
+  console.log(`[WS] Flush complete`);
 }
 
 // Parse incoming message (decrypt if encrypted)
@@ -80,6 +115,9 @@ async function handleMessage(msg) {
 
       sendConversationList();
 
+      // ★ Flush 断连期间缓冲的消息
+      await flushMessageBuffer();
+
       // ★ Phase 1: 通知 server 同步完成
       sendToServer({ type: 'agent_sync_complete' });
       break;
@@ -273,7 +311,7 @@ async function handleMessage(msg) {
           const pkgName = ctx.pkgName || '@yeaft/webchat-agent';
           // Check latest version (async to avoid blocking heartbeat)
           const latestVersion = await new Promise((resolve, reject) => {
-            execFile('npm', ['view', pkgName, 'version'], { stdio: 'pipe' }, (err, stdout) => {
+            execFile('npm', ['view', pkgName, 'version'], { stdio: 'pipe', shell: true }, (err, stdout) => {
               if (err) reject(err); else resolve(stdout.toString().trim());
             });
           });
@@ -285,7 +323,7 @@ async function handleMessage(msg) {
           console.log(`[Agent] Upgrading from ${ctx.agentVersion} to ${latestVersion}...`);
           // Use async execFile to avoid blocking event loop (heartbeat must keep running)
           await new Promise((resolve, reject) => {
-            execFile('npm', ['install', '-g', `${pkgName}@latest`], { stdio: 'pipe' }, (err) => {
+            execFile('npm', ['install', '-g', `${pkgName}@latest`], { stdio: 'pipe', shell: true }, (err) => {
               if (err) reject(err); else resolve();
             });
           });

package/context.js

@@ -19,6 +19,9 @@ export default {
   pendingAuthTempId: null,
   agentHeartbeatTimer: null,
   lastPongAt: 0,
+  // 断连期间的消息缓冲队列（重连后 flush）
+  messageBuffer: [],
+  messageBufferMaxSize: 5000, // 防止内存无限增长
   // 由 connection.js 注册的通信函数
   sendToServer: null,
   // 由 index.js 注册的配置保存函数

package/conversation.js

@@ -55,7 +55,7 @@ export function sendConversationList() {
 }
 
 export function sendOutput(conversationId, data) {
-  ctx.sendToServer({
+  return ctx.sendToServer({
     type: 'claude_output',
     conversationId,
     data

package/package.json

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