@yeaft/webchat-agent 0.1.69 → 0.1.73

package/claude.js

@@ -408,7 +408,7 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
 
         // 计算上下文使用百分比
         const inputTokens = message.usage?.input_tokens || 0;
-        const maxContextTokens = 128000; // API max_prompt_tokens 限制
+        const maxContextTokens = ctx.CONFIG?.maxContextTokens || 128000;
         if (inputTokens > 0) {
           ctx.sendToServer({
             type: 'context_usage',
@@ -497,6 +497,35 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
 
             console.log(`[RolePlay] Auto-continuing to role: ${to}`);
 
+            // ★ Pre-send compact check for RolePlay auto-continue
+            const rpAutoCompactThreshold = ctx.CONFIG?.autoCompactThreshold || 110000;
+            const rpEstimatedNewTokens = Math.ceil(prompt.length / 3);
+            const rpEstimatedTotal = inputTokens + rpEstimatedNewTokens;
+
+            if (rpEstimatedTotal > rpAutoCompactThreshold) {
+              console.log(`[RolePlay] Pre-send compact: estimated ${rpEstimatedTotal} tokens (last: ${inputTokens} + new: ~${rpEstimatedNewTokens}) exceeds threshold ${rpAutoCompactThreshold}`);
+              ctx.sendToServer({
+                type: 'compact_status',
+                conversationId,
+                status: 'compacting',
+                message: `Auto-compacting before RolePlay continue: estimated ${rpEstimatedTotal} tokens (threshold: ${rpAutoCompactThreshold})`
+              });
+              // Store pending message and compact first
+              const userMessage = {
+                type: 'user',
+                message: { role: 'user', content: prompt }
+              };
+              state._pendingUserMessage = userMessage;
+              state.turnActive = true;
+              state.turnResultReceived = false;
+              state.inputStream.enqueue({
+                type: 'user',
+                message: { role: 'user', content: '/compact' }
+              });
+              sendConversationList();
+              break;
+            }
+
             // Re-activate the turn
             state.turnActive = true;
             state.turnResultReceived = false;
@@ -531,6 +560,18 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
           workDir: state.workDir
         });
         sendConversationList();
+
+        // ★ Send pending user message after compact completes
+        if (state._pendingUserMessage && state.inputStream) {
+          const pendingMsg = state._pendingUserMessage;
+          state._pendingUserMessage = null;
+          console.log(`[${conversationId}] Sending pending message after compact`);
+          state.turnActive = true;
+          state.turnResultReceived = false;
+          sendOutput(conversationId, pendingMsg);
+          state.inputStream.enqueue(pendingMsg);
+          sendConversationList();
+        }
         continue;
       }
 

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/conversation.js

@@ -515,6 +515,34 @@ export async function handleUserInput(msg) {
   };
 
   console.log(`[${conversationId}] Sending: ${prompt.substring(0, 100)}...`);
+
+  // ★ Pre-send compact check: estimate total tokens and compact before sending if needed
+  const autoCompactThreshold = ctx.CONFIG?.autoCompactThreshold || 110000;
+  const lastInputTokens = state.lastResultInputTokens || 0;
+  const estimatedNewTokens = Math.ceil(effectivePrompt.length / 3); // conservative: ~3 chars per token
+  const estimatedTotal = lastInputTokens + estimatedNewTokens;
+
+  if (estimatedTotal > autoCompactThreshold && state.inputStream) {
+    console.log(`[${conversationId}] Pre-send compact: estimated ${estimatedTotal} tokens (last: ${lastInputTokens} + new: ~${estimatedNewTokens}) exceeds threshold ${autoCompactThreshold}`);
+    ctx.sendToServer({
+      type: 'compact_status',
+      conversationId,
+      status: 'compacting',
+      message: `Auto-compacting before send: estimated ${estimatedTotal} tokens (threshold: ${autoCompactThreshold})`
+    });
+    // Send /compact first, then the user message will be sent after compact completes
+    // by storing it as a pending message
+    state._pendingUserMessage = userMessage;
+    state.turnActive = true;
+    state.turnResultReceived = false;
+    sendConversationList();
+    state.inputStream.enqueue({
+      type: 'user',
+      message: { role: 'user', content: '/compact' }
+    });
+    return;
+  }
+
   state.turnActive = true;
   state.turnResultReceived = false; // 重置 per-turn 去重标志
   sendConversationList(); // 在 turnActive=true 后通知 server，确保 processing 状态正确

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/role-output.js

@@ -6,10 +6,10 @@ import { sendCrewMessage, sendCrewOutput, sendStatusUpdate, endRoleStreaming } f
 import { saveRoleSessionId, clearRoleSessionId, classifyRoleError, createRoleQuery } from './role-query.js';
 import { parseRoutes, executeRoute, dispatchToRole } from './routing.js';
 import { parseCompletedTasks, updateFeatureIndex, appendChangelog, saveRoleWorkSummary, updateKanban } from './task-files.js';
+import ctx from '../context.js';
 
-// Context 使用率阈值常量
-const MAX_CONTEXT = 128000;       // API max_prompt_tokens 限制
-const CLEAR_THRESHOLD = 0.85;     // 85% → 直接 clear + rebuild（不再走 compact）
+// Context 使用率常量（运行时从 ctx.CONFIG 读取）
+const getMaxContext = () => ctx.CONFIG?.maxContextTokens || 128000;
 
 /**
  * 处理角色的流式输出
@@ -99,14 +99,11 @@ export async function processRoleOutput(session, roleName, roleQuery, roleState)
             sessionId: session.id,
             role: roleName,
             inputTokens,
-            maxTokens: MAX_CONTEXT,
-            percentage: Math.min(100, Math.round((inputTokens / MAX_CONTEXT) * 100))
+            maxTokens: getMaxContext(),
+            percentage: Math.min(100, Math.round((inputTokens / getMaxContext()) * 100))
           });
         }
 
-        const contextPercentage = inputTokens / MAX_CONTEXT;
-        const needClear = contextPercentage >= CLEAR_THRESHOLD;
-
         // 解析路由
         const routes = parseRoutes(roleState.accumulatedText);
 
@@ -136,8 +133,8 @@ export async function processRoleOutput(session, roleName, roleQuery, roleState)
           }
         }
 
-        // 保存 accumulatedText 供后续 saveRoleWorkSummary 使用（清空前）
-        const turnText = roleState.accumulatedText;
+        // 保存本 turn 文本（供 routing.js 预检时 saveRoleWorkSummary 使用）
+        roleState.lastTurnText = roleState.accumulatedText;
         roleState.accumulatedText = '';
         roleState.turnActive = false;
 
@@ -149,57 +146,7 @@ export async function processRoleOutput(session, roleName, roleQuery, roleState)
 
         sendStatusUpdate(session);
 
-        // Context 超限：保存工作摘要后 clear + rebuild
-        if (needClear) {
-          console.log(`[Crew] ${roleName} context at ${Math.round(contextPercentage * 100)}%, clearing and rebuilding`);
-
-          // 保存工作摘要到 feature 文件
-          await saveRoleWorkSummary(session, roleName, turnText).catch(e =>
-            console.warn(`[Crew] Failed to save work summary for ${roleName}:`, e.message));
-
-          // Clear 角色
-          await clearRoleSessionId(session.sharedDir, roleName);
-          roleState.claudeSessionId = null;
-
-          if (roleState.abortController) roleState.abortController.abort();
-          roleState.query = null;
-          roleState.inputStream = null;
-
-          sendCrewMessage({
-            type: 'crew_role_cleared',
-            sessionId: session.id,
-            role: roleName,
-            contextPercentage: Math.round(contextPercentage * 100),
-            reason: 'context_limit'
-          });
-
-          // 继承 task 到路由（如有）
-          const currentTask = roleState.currentTask;
-          if (routes.length > 0) {
-            for (const route of routes) {
-              if (!route.taskId && currentTask) {
-                route.taskId = currentTask.taskId;
-                route.taskTitle = currentTask.taskTitle;
-              }
-            }
-          }
-
-          // 执行路由
-          if (routes.length > 0) {
-            session.round++;
-            const results = await Promise.allSettled(routes.map(route =>
-              executeRoute(session, roleName, route)
-            ));
-            for (const r of results) {
-              if (r.status === 'rejected') {
-                console.warn(`[Crew] Route execution failed:`, r.reason);
-              }
-            }
-          }
-          return; // query 已清空，退出
-        }
-
-        // 执行路由（无需 clear 时）
+        // 执行路由
         if (routes.length > 0) {
           session.round++;
 

package/crew/routing.js

@@ -4,8 +4,9 @@
  */
 import { join } from 'path';
 import { sendCrewMessage, sendCrewOutput, sendStatusUpdate } from './ui-messages.js';
-import { ensureTaskFile, appendTaskRecord, readTaskFile, updateKanban, readKanban } from './task-files.js';
-import { createRoleQuery } from './role-query.js';
+import { ensureTaskFile, appendTaskRecord, readTaskFile, updateKanban, readKanban, saveRoleWorkSummary } from './task-files.js';
+import { createRoleQuery, clearRoleSessionId } from './role-query.js';
+import ctx from '../context.js';
 
 /** Format role label */
 function roleLabel(r) {
@@ -193,6 +194,39 @@ export async function dispatchToRole(session, roleName, content, fromSource, tas
     timestamp: Date.now()
   });
 
+  // ★ Pre-send compact check: estimate total tokens and clear+rebuild if needed
+  const autoCompactThreshold = ctx.CONFIG?.autoCompactThreshold || 110000;
+  const lastInputTokens = roleState.lastInputTokens || 0;
+  const estimatedNewTokens = Math.ceil((typeof content === 'string' ? content.length : 0) / 3);
+  const estimatedTotal = lastInputTokens + estimatedNewTokens;
+
+  if (lastInputTokens > 0 && estimatedTotal > autoCompactThreshold) {
+    console.log(`[Crew] Pre-send compact for ${roleName}: estimated ${estimatedTotal} tokens (last: ${lastInputTokens} + new: ~${estimatedNewTokens}) exceeds threshold ${autoCompactThreshold}`);
+
+    // Save work summary before clearing (use lastTurnText since accumulatedText is cleared after result)
+    await saveRoleWorkSummary(session, roleName, roleState.lastTurnText || roleState.accumulatedText || '').catch(e =>
+      console.warn(`[Crew] Failed to save work summary for ${roleName}:`, e.message));
+
+    // Clear role session and rebuild
+    await clearRoleSessionId(session.sharedDir, roleName);
+    roleState.claudeSessionId = null;
+
+    if (roleState.abortController) roleState.abortController.abort();
+    roleState.query = null;
+    roleState.inputStream = null;
+
+    sendCrewMessage({
+      type: 'crew_role_cleared',
+      sessionId: session.id,
+      role: roleName,
+      contextPercentage: Math.round((lastInputTokens / (ctx.CONFIG?.maxContextTokens || 128000)) * 100),
+      reason: 'pre_send_compact'
+    });
+
+    // Recreate the query (fresh Claude process)
+    roleState = await createRoleQuery(session, roleName);
+  }
+
   // 发送
   roleState.lastDispatchContent = content;
   roleState.lastDispatchFrom = fromSource;

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/index.js

@@ -74,7 +74,11 @@ const CONFIG = {
     return raw.split(',').map(s => s.trim()).filter(Boolean);
   })(),
   // disallowedTools 会在 loadMcpServers() 中计算
-  disallowedTools: []
+  disallowedTools: [],
+  // 最大上下文 tokens（用于百分比计算的分母）
+  maxContextTokens: parseInt(process.env.MAX_CONTEXT_TOKENS || fileConfig.maxContextTokens, 10) || 128000,
+  // Auto-compact 阈值（tokens）：context 超过此值时自动触发 compact
+  autoCompactThreshold: parseInt(process.env.AUTO_COMPACT_THRESHOLD || fileConfig.autoCompactThreshold, 10) || 110000
 };
 
 // 初始化共享上下文

package/package.json

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