@yeaft/webchat-agent 0.0.134 → 0.0.136

package/connection.js

@@ -420,7 +420,10 @@ async function handleMessage(msg) {
             const pid = process.pid;
             const configDir = getConfigDir();
             mkdirSync(configDir, { recursive: true });
+            const logDir = join(configDir, 'logs');
+            mkdirSync(logDir, { recursive: true });
             const batPath = join(configDir, 'upgrade.bat');
+            const logPath = join(logDir, 'upgrade.log');
             const isPm2 = !!process.env.pm_id;
             const installDirWin = installDir.replace(/\//g, '\\');
 
@@ -430,14 +433,18 @@ async function handleMessage(msg) {
               `set PID=${pid}`,
               `set PKG=${pkgName}@latest`,
               `set INSTALL_DIR=${installDirWin}`,
+              `set LOGFILE=${logPath}`,
               `set MAX_WAIT=30`,
               `set COUNT=0`,
+              '',
+              ':: Redirect all output to log file',
+              'echo [Upgrade] Started at %date% %time% > "%LOGFILE%"',
               ':WAIT_LOOP',
               'tasklist /FI "PID eq %PID%" 2>NUL | find /I "%PID%" >NUL',
               'if errorlevel 1 goto PID_EXITED',
               'set /A COUNT+=1',
               'if %COUNT% GEQ %MAX_WAIT% (',
-              '  echo [Upgrade] Timeout waiting for PID %PID% to exit after 60s',
+              '  echo [Upgrade] Timeout waiting for PID %PID% to exit after 60s >> "%LOGFILE%"',
               '  goto PID_EXITED',
               ')',
               'timeout /T 2 /NOBREAK >NUL',
@@ -446,10 +453,10 @@ async function handleMessage(msg) {
             ];
 
             if (isPm2) {
-              // pm2 可能已自动重启旧代码（exit 1 触发），先 stop 释放文件锁
+              // pm2 可能已自动重启旧代码（exit 触发），先 stop 释放文件锁
               batLines.push(
-                'echo [Upgrade] Stopping pm2 agent to release file locks...',
-                'call pm2 stop yeaft-agent 2>NUL',
+                'echo [Upgrade] Stopping pm2 agent to release file locks... >> "%LOGFILE%"',
+                'call pm2 stop yeaft-agent >> "%LOGFILE%" 2>&1',
                 'timeout /T 3 /NOBREAK >NUL',
               );
             }
@@ -459,23 +466,26 @@ async function handleMessage(msg) {
               : 'cd /d "%INSTALL_DIR%" && call npm install %PKG%';
 
             batLines.push(
-              'echo [Upgrade] Installing %PKG%...',
-              npmBatCmd,
+              'echo [Upgrade] Installing %PKG%... >> "%LOGFILE%"',
+              `${npmBatCmd} >> "%LOGFILE%" 2>&1`,
               'if errorlevel 1 (',
-              '  echo [Upgrade] npm install failed with exit code %errorlevel%',
-              ') else (',
-              '  echo [Upgrade] Successfully installed %PKG%',
+              '  echo [Upgrade] npm install failed with exit code %errorlevel% >> "%LOGFILE%"',
+              '  goto CLEANUP',
               ')',
+              'echo [Upgrade] Successfully installed %PKG% >> "%LOGFILE%"',
             );
 
             if (isPm2) {
               batLines.push(
-                'echo [Upgrade] Starting agent via pm2...',
-                'call pm2 start yeaft-agent',
+                'echo [Upgrade] Starting agent via pm2... >> "%LOGFILE%"',
+                'call pm2 start yeaft-agent >> "%LOGFILE%" 2>&1',
               );
             }
 
-            batLines.push(`del /F /Q "${batPath}"`);
+            batLines.push(
+              ':CLEANUP',
+              `del /F /Q "${batPath}"`,
+            );
 
             writeFileSync(batPath, batLines.join('\r\n'));
             const child = spawn('cmd.exe', ['/c', batPath], {
@@ -486,6 +496,11 @@ async function handleMessage(msg) {
             child.unref();
             console.log(`[Agent] Spawned upgrade script (PID wait for ${pid}, pm2=${isPm2}, dir=${installDir}): ${batPath}`);
             sendToServer({ type: 'upgrade_agent_ack', success: true, version: latestVersion, pendingRestart: true });
+
+            if (isPm2) {
+              // PM2 环境：先同步 pm2 stop 防止 autorestart 竞态，再 exit
+              try { execSync('pm2 stop yeaft-agent', { timeout: 5000 }); } catch {}
+            }
           } else {
             // Linux/macOS: 生成 detached shell 脚本，先停止服务再升级再启动
             // 避免在升级过程中 systemd 不断重启已删除的旧版本

package/crew.js

@@ -1501,13 +1501,31 @@ async function dispatchToRole(session, roleName, content, fromSource, taskId, ta
  * 处理人的输入
  */
 export async function handleCrewHumanInput(msg) {
-  const { sessionId, content, targetRole } = msg;
+  const { sessionId, content, targetRole, files } = msg;
   const session = crewSessions.get(sessionId);
   if (!session) {
     console.warn(`[Crew] Session not found: ${sessionId}`);
     return;
   }
 
+  // Build dispatch content (supports image attachments)
+  function buildHumanContent(prefix, text) {
+    if (files && files.length > 0) {
+      const blocks = [];
+      for (const file of files) {
+        if (file.isImage || file.mimeType?.startsWith('image/')) {
+          blocks.push({
+            type: 'image',
+            source: { type: 'base64', media_type: file.mimeType, data: file.data }
+          });
+        }
+      }
+      blocks.push({ type: 'text', text: `${prefix}\n${text}` });
+      return blocks;
+    }
+    return `${prefix}\n${text}`;
+  }
+
   // 注意：不在这里发送人的消息到 Web（前端已本地添加，避免重复）
   // 但需要记录到 uiMessages 用于恢复时重放
   session.uiMessages.push({
@@ -1525,8 +1543,7 @@ export async function handleCrewHumanInput(msg) {
 
     // 发给请求人工介入的角色，或指定的目标角色
     const target = targetRole || waitingContext?.fromRole || session.decisionMaker;
-    const humanPrompt = `人工回复:\n${content}`;
-    await dispatchToRole(session, target, humanPrompt, 'human');
+    await dispatchToRole(session, target, buildHumanContent('人工回复:', content), 'human');
     return;
   }
 
@@ -1553,13 +1570,23 @@ export async function handleCrewHumanInput(msg) {
       // 检查目标角色是否正在忙
       const targetState = session.roleStates.get(target);
       if (targetState?.turnActive) {
-        // 排队
-        session.humanMessageQueue.push({ target, content: message, timestamp: Date.now() });
-        console.log(`[Crew] Human message queued for ${target} (busy)`);
+        if (msg.interrupt) {
+          // 中断模式：立即打断角色
+          await interruptRole(session, target, buildHumanContent('人工消息（中断）:', message), 'human');
+        } else {
+          // 排队
+          session.humanMessageQueue.push({ target, content: message, timestamp: Date.now() });
+          console.log(`[Crew] Human message queued for ${target} (busy)`);
+          sendCrewMessage({
+            type: 'crew_message_queued',
+            sessionId: session.id,
+            target,
+            queueLength: session.humanMessageQueue.filter(m => m.target === target).length
+          });
+        }
         return;
       }
-      const humanPrompt = `人工消息:\n${message}`;
-      await dispatchToRole(session, target, humanPrompt, 'human');
+      await dispatchToRole(session, target, buildHumanContent('人工消息:', message), 'human');
       return;
     }
   }
@@ -1572,11 +1599,16 @@ export async function handleCrewHumanInput(msg) {
   if (targetState?.turnActive) {
     session.humanMessageQueue.push({ target, content, timestamp: Date.now() });
     console.log(`[Crew] Human message queued for ${target} (busy)`);
+    sendCrewMessage({
+      type: 'crew_message_queued',
+      sessionId: session.id,
+      target,
+      queueLength: session.humanMessageQueue.filter(m => m.target === target).length
+    });
     return;
   }
 
-  const humanPrompt = `人工消息:\n${content}`;
-  await dispatchToRole(session, target, humanPrompt, 'human');
+  await dispatchToRole(session, target, buildHumanContent('人工消息:', content), 'human');
 }
 
 /**
@@ -1644,6 +1676,11 @@ export async function handleCrewControl(msg) {
     case 'stop_role':
       if (targetRole) await stopRole(session, targetRole);
       break;
+    case 'interrupt_role':
+      if (targetRole && msg.content) {
+        await interruptRole(session, targetRole, msg.content, 'human');
+      }
+      break;
     case 'stop_all':
       await stopAll(session);
       break;
@@ -1726,6 +1763,58 @@ async function resumeSession(session) {
 /**
  * 停止单个角色
  */
+/**
+ * 中断角色当前 turn 并发送新消息
+ */
+async function interruptRole(session, roleName, newContent, fromSource = 'human') {
+  const roleState = session.roleStates.get(roleName);
+  if (!roleState) {
+    console.warn(`[Crew] Cannot interrupt ${roleName}: no roleState`);
+    return;
+  }
+
+  console.log(`[Crew] Interrupting ${roleName}`);
+
+  // 结束 streaming 状态
+  endRoleStreaming(session, roleName);
+
+  // 保存 sessionId 用于 resume 上下文连续性
+  if (roleState.claudeSessionId) {
+    await saveRoleSessionId(session.sharedDir, roleName, roleState.claudeSessionId)
+      .catch(e => console.warn(`[Crew] Failed to save sessionId for ${roleName}:`, e.message));
+  }
+
+  // Abort 当前 query
+  if (roleState.abortController) {
+    roleState.abortController.abort();
+  }
+
+  // 清理旧状态
+  roleState.query = null;
+  roleState.inputStream = null;
+  roleState.turnActive = false;
+  roleState.accumulatedText = '';
+
+  // 通知前端中断
+  sendCrewMessage({
+    type: 'crew_turn_completed',
+    sessionId: session.id,
+    role: roleName,
+    interrupted: true
+  });
+
+  sendStatusUpdate(session);
+
+  // 系统消息记录
+  sendCrewOutput(session, 'system', 'system', {
+    type: 'assistant',
+    message: { role: 'assistant', content: [{ type: 'text', text: `${roleName} 被中断` }] }
+  });
+
+  // 创建新 query 并 dispatch
+  await dispatchToRole(session, roleName, newContent, fromSource);
+}
+
 async function stopRole(session, roleName) {
   const roleState = session.roleStates.get(roleName);
   if (roleState) {
@@ -1911,6 +2000,32 @@ function sendCrewOutput(session, roleName, outputType, rawMessage, extra = {}) {
         }
       }
     }
+    // Check for image blocks in tool_result content
+    const resultContent = rawMessage?.message?.content;
+    if (Array.isArray(resultContent)) {
+      for (const item of resultContent) {
+        if (item.type === 'image' && item.source?.type === 'base64') {
+          sendCrewMessage({
+            type: 'crew_image',
+            sessionId: session.id,
+            role: roleName,
+            roleIcon,
+            roleName: displayName,
+            toolId: toolId || '',
+            mimeType: item.source.media_type,
+            data: item.source.data,
+            taskId, taskTitle
+          });
+          session.uiMessages.push({
+            role: roleName, roleIcon, roleName: displayName,
+            type: 'image', toolId: toolId || '',
+            mimeType: item.source.media_type,
+            taskId, taskTitle,
+            timestamp: Date.now()
+          });
+        }
+      }
+    }
   }
   // tool 只保存精简信息（toolName + 摘要），不存完整 toolInput/toolResult
 }

package/package.json

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