@yeaft/webchat-agent 0.0.135 → 0.0.137

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

@@ -1567,25 +1567,6 @@ export async function handleCrewHumanInput(msg) {
     }
 
     if (target) {
-      // 检查目标角色是否正在忙
-      const targetState = session.roleStates.get(target);
-      if (targetState?.turnActive) {
-        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;
-      }
       await dispatchToRole(session, target, buildHumanContent('人工消息:', message), 'human');
       return;
     }
@@ -1594,20 +1575,6 @@ export async function handleCrewHumanInput(msg) {
   // 没有 @ 指定目标，默认发给决策者（PM）
   const target = targetRole || session.decisionMaker;
 
-  // 检查目标是否忙
-  const targetState = session.roleStates.get(target);
-  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;
-  }
-
   await dispatchToRole(session, target, buildHumanContent('人工消息:', content), 'human');
 }
 
@@ -1976,11 +1943,22 @@ function sendCrewOutput(session, roleName, outputType, rawMessage, extra = {}) {
     if (Array.isArray(content)) {
       for (const block of content) {
         if (block.type === 'tool_use') {
+          // Save trimmed toolInput for restore — only key fields, skip large content
+          const input = block.input || {};
+          const trimmedInput = {};
+          if (input.file_path) trimmedInput.file_path = input.file_path;
+          if (input.command) trimmedInput.command = input.command.substring(0, 200);
+          if (input.pattern) trimmedInput.pattern = input.pattern;
+          if (input.old_string) trimmedInput.old_string = input.old_string.substring(0, 100);
+          if (input.new_string) trimmedInput.new_string = input.new_string.substring(0, 100);
+          if (input.url) trimmedInput.url = input.url;
+          if (input.query) trimmedInput.query = input.query;
           session.uiMessages.push({
             role: roleName, roleIcon, roleName: displayName,
             type: 'tool',
             toolName: block.name,
             toolId: block.id,
+            toolInput: Object.keys(trimmedInput).length > 0 ? trimmedInput : null,
             content: `${block.name} ${block.input?.file_path || block.input?.command?.substring(0, 60) || ''}`,
             hasResult: false,
             taskId, taskTitle,

package/package.json

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