@yeaft/webchat-agent 0.1.70 → 0.1.73

package/cli.js

@@ -152,6 +152,19 @@ function upgrade() {
     } else {
       execSync(`npm install -g ${pkg.name}@latest`, { stdio: 'inherit' });
       console.log(`Successfully upgraded to ${latest}`);
+
+      // If PM2 is managing yeaft-agent, restart it so the new version takes effect
+      try {
+        const pm2List = execSync('pm2 jlist', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+        const apps = JSON.parse(pm2List);
+        if (Array.isArray(apps) && apps.some(app => app.name === 'yeaft-agent')) {
+          console.log('Restarting yeaft-agent via PM2...');
+          execSync('pm2 restart yeaft-agent', { stdio: 'inherit' });
+          console.log('PM2 service restarted.');
+        }
+      } catch {
+        // PM2 not installed or not managing yeaft-agent — nothing to do
+      }
     }
   } catch (e) {
     console.error('Upgrade failed:', e.message);
@@ -185,11 +198,11 @@ function upgradeWindows(latestVersion) {
     'echo [Upgrade] Waiting for CLI process (PID %PID%) to exit... >> "%LOGFILE%"',
     '',
     ':WAIT_LOOP',
-    'tasklist /FI "PID eq %PID%" 2>NUL | findstr /I "%PID%" >NUL',
+    'tasklist /FI "PID eq %PID%" /NH 2>NUL | findstr /C:"%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 >> "%LOGFILE%"',
+    '  echo [Upgrade] Timeout waiting for PID %PID% to exit after %MAX_WAIT% iterations >> "%LOGFILE%"',
     '  goto PID_EXITED',
     ')',
     'ping -n 3 127.0.0.1 >NUL',
@@ -210,7 +223,6 @@ function upgradeWindows(latestVersion) {
 
   writeFileSync(batPath, batLines.join('\r\n'));
   const child = spawn('cmd.exe', ['/c', batPath], {
-    detached: true,
     stdio: 'ignore',
     windowsHide: true,
   });

package/connection/upgrade.js

@@ -152,11 +152,11 @@ function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestV
   // Wait for old process to exit (PM2 already deleted before exit, so no auto-restart race)
   batLines.push(
     ':WAIT_LOOP',
-    'tasklist /FI "PID eq %PID%" 2>NUL | findstr /I "%PID%" >NUL',
+    'tasklist /FI "PID eq %PID%" /NH 2>NUL | findstr /C:"%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 >> "%LOGFILE%"',
+    '  echo [Upgrade] Timeout waiting for PID %PID% to exit after %MAX_WAIT% iterations >> "%LOGFILE%"',
     '  goto PID_EXITED',
     ')',
     'ping -n 3 127.0.0.1 >NUL',
@@ -201,7 +201,6 @@ function spawnWindowsUpgradeScript(pkgName, installDir, isGlobalInstall, latestV
 
   writeFileSync(batPath, batLines.join('\r\n'));
   const child = spawn('cmd.exe', ['/c', batPath], {
-    detached: true,
     stdio: 'ignore',
     windowsHide: true
   });

package/crew/persistence.js

@@ -62,7 +62,6 @@ export async function removeFromCrewIndex(sessionId) {
   const { crewSessions } = await import('./session.js');
 
   const index = await loadCrewIndex();
-  const entry = index.find(e => e.sessionId === sessionId);
   const filtered = index.filter(e => e.sessionId !== sessionId);
   if (filtered.length !== index.length) {
     await saveCrewIndex(filtered);
@@ -73,20 +72,8 @@ export async function removeFromCrewIndex(sessionId) {
     crewSessions.delete(sessionId);
     console.log(`[Crew] Removed session ${sessionId} from active sessions`);
   }
-  // 删除磁盘上的 session 数据文件
-  const sharedDir = entry?.sharedDir;
-  if (sharedDir) {
-    try {
-      for (const file of ['session.json', 'messages.json']) {
-        await fs.unlink(join(sharedDir, file)).catch(() => {});
-      }
-      // Clean up message shard files
-      await cleanupMessageShards(sharedDir);
-      console.log(`[Crew] Cleaned session files in ${sharedDir}`);
-    } catch (e) {
-      console.warn(`[Crew] Failed to clean session files:`, e.message);
-    }
-  }
+  // 注意：不再删除磁盘上的 session.json、messages.json 等文件
+  // 这些文件在 recreate 时会被复用（合并统计数据 + 恢复消息历史）
 }
 
 // =====================================================================

package/crew/session.js

@@ -147,6 +147,9 @@ export async function createCrewSession(msg) {
     : join(projectDir, sharedDirRel || '.crew');
   const decisionMaker = roles.find(r => r.isDecisionMaker)?.name || roles[0]?.name || null;
 
+  // 尝试读取旧 session.json，合并统计数据（deleteCrewDir 保留了该文件）
+  const oldMeta = await loadSessionMeta(sharedDir);
+
   const session = {
     id: sessionId,
     projectDir,
@@ -156,28 +159,41 @@ export async function createCrewSession(msg) {
     roleStates: new Map(),
     decisionMaker,
     status: 'initializing',
-    round: 0,
-    costUsd: 0,
-    totalInputTokens: 0,
-    totalOutputTokens: 0,
+    round: oldMeta?.round || 0,
+    costUsd: oldMeta?.costUsd || 0,
+    totalInputTokens: oldMeta?.totalInputTokens || 0,
+    totalOutputTokens: oldMeta?.totalOutputTokens || 0,
     messageHistory: [],
     uiMessages: [],
     humanMessageQueue: [],
     waitingHumanContext: null,
     pendingRoutes: [],
-    features: new Map(),
-    _completedTaskIds: new Set(),
+    features: new Map((oldMeta?.features || []).map(f => [f.taskId, f])),
+    _completedTaskIds: new Set(oldMeta?._completedTaskIds || []),
     initProgress: null,
     userId,
     username,
     agentId: ctx.CONFIG?.agentName || null,
     teamType,
     language,
-    createdAt: Date.now()
+    createdAt: oldMeta?.createdAt || Date.now()
   };
 
+  if (oldMeta) {
+    console.log(`[Crew] Merged stats from previous session: round=${session.round}, cost=$${session.costUsd.toFixed(4)}, inputTokens=${session.totalInputTokens}, outputTokens=${session.totalOutputTokens}`);
+    // 恢复旧消息历史（deleteCrewDir 保留了 messages*.json）
+    const loaded = await loadSessionMessages(sharedDir);
+    if (loaded.messages.length > 0) {
+      session.uiMessages = loaded.messages;
+      console.log(`[Crew] Restored ${loaded.messages.length} messages from previous session`);
+    }
+  }
+
   crewSessions.set(sessionId, session);
 
+  // 如果有旧消息，检查是否有更早的分片
+  const hasOlderMessages = oldMeta ? await getMaxShardIndex(sharedDir) > 0 : false;
+
   sendCrewMessage({
     type: 'crew_session_created',
     sessionId,
@@ -196,7 +212,10 @@ export async function createCrewSession(msg) {
     })),
     decisionMaker,
     userId,
-    username
+    username,
+    // 旧消息（recreate 时保留的历史）
+    uiMessages: session.uiMessages.length > 0 ? session.uiMessages : undefined,
+    hasOlderMessages: hasOlderMessages || undefined
   });
 
   sendStatusUpdate(session);
@@ -335,19 +354,39 @@ export async function handleCheckCrewExists(msg) {
 }
 
 /**
- * 删除工作目录下的 .crew 目录（保留 context/ 历史记录）
+ * 删除 Crew 定义文件（模板/角色配置），保留所有用户数据和工作产出
+ *
+ * 删除: CLAUDE.md（共享模板）、roles/（角色模板）
+ * 清空: sessions/ 下的文件（旧角色的 Claude Code session IDs，已失效）
+ * 清除: crew-index 中的旧 entry（防止 createCrewSession 走 resume 而非 create）
+ * 保留: context/、session.json、messages*.json 及任何其他生成文件（截图、设计文档等）
  */
 export async function handleDeleteCrewDir(msg) {
   const { projectDir } = msg;
   if (!isValidProjectDir(projectDir)) return;
   const crewDir = join(projectDir, '.crew');
   try {
-    const entries = await fs.readdir(crewDir);
-    await Promise.all(
-      entries
-        .filter(name => name !== 'context')
-        .map(name => fs.rm(join(crewDir, name), { recursive: true, force: true }))
-    );
+    // 删除 Crew 模板定义
+    await fs.rm(join(crewDir, 'CLAUDE.md'), { force: true }).catch(() => {});
+    await fs.rm(join(crewDir, 'roles'), { recursive: true, force: true }).catch(() => {});
+
+    // 清空 sessions/ 内容（旧角色的 session IDs 已失效），保留目录本身
+    const sessionsDir = join(crewDir, 'sessions');
+    try {
+      const sessionFiles = await fs.readdir(sessionsDir);
+      await Promise.all(
+        sessionFiles.map(f => fs.rm(join(sessionsDir, f), { recursive: true, force: true }).catch(() => {}))
+      );
+    } catch { /* sessions/ may not exist */ }
+
+    // 清除 crew-index 中的旧 entry（不删文件），确保新建时走 create → loadSessionMeta 合并统计
+    const normalizedDir = projectDir.replace(/\/+$/, '');
+    const index = await loadCrewIndex();
+    const match = index.find(e => e.projectDir.replace(/\/+$/, '') === normalizedDir);
+    if (match) {
+      await removeFromCrewIndex(match.sessionId);
+      console.log(`[Crew] Cleared index entry for ${projectDir} (sessionId: ${match.sessionId})`);
+    }
   } catch {}
 }
 

package/package.json

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