@yeaft/webchat-agent 0.0.170 → 0.0.172

package/crew.js

@@ -1090,7 +1090,7 @@ async function clearRoleSessionId(sharedDir, roleName) {
 function classifyRoleError(error) {
   const msg = error.message || '';
   if (/context.*(window|limit|exceeded)|token.*limit|too.*(long|large)|max.*token/i.test(msg)) {
-    return { recoverable: true, reason: 'context_exceeded', skipResume: true, needContentTrim: true };
+    return { recoverable: true, reason: 'context_exceeded', skipResume: true };
   }
   if (/compact|compress|context.*reduc/i.test(msg)) {
     return { recoverable: true, reason: 'compact_failed', skipResume: true };
@@ -1107,22 +1107,6 @@ function classifyRoleError(error) {
   return { recoverable: true, reason: 'unknown', skipResume: false };
 }
 
-/**
- * context 超限时精简重派内容
- */
-function trimContentForRetry(content) {
-  if (typeof content === 'string' && content.length > 2000) {
-    return `[注意: 上一轮因 context 超限被截断重发]\n\n${content.substring(0, 2000)}\n\n[内容已截断，请基于已知信息继续工作]`;
-  }
-  if (Array.isArray(content)) {
-    return content.filter(b => b.type === 'text').map(b => ({
-      ...b,
-      text: b.text.length > 2000 ? b.text.substring(0, 2000) + '\n[已截断]' : b.text
-    }));
-  }
-  return content;
-}
-
 // =====================================================================
 // Role Query Management
 // =====================================================================
@@ -1187,6 +1171,7 @@ async function createRoleQuery(session, roleName) {
     _compacting: false,           // 是否正在 compact
     _compactSummaryPending: false, // 是否等待过滤 compact summary
     _pendingCompactRoutes: null,  // compact 期间缓存的待执行路由 Array|null
+    _pendingDispatch: null,       // compact 完成后待重派的内容 { content, from, taskId, taskTitle }
     _fromRole: null               // 缓存路由的来源角色
   };
 
@@ -1337,13 +1322,14 @@ summary: 请实现注册页面，包括邮箱验证
 
 \`\`\`
 ---TASKS---
-- [ ] 任务描述 @角色name
-- [x] 已完成的任务 @角色name
+- [ ] 任务描述 #task-1 @角色name
+- [x] 已完成的任务 #task-2 @角色name
 ---END_TASKS---
 \`\`\`
 
 注意：
 - 每行一个任务，[ ] 表示待办，[x] 表示已完成
+- #taskId 标注对应的 feature ID（如 #task-1），用于精确关联任务完成状态
 - @角色name 标注负责人（可选）
 - 后续回复中可更新 TASKS 块（标记完成的任务）
 - TASKS 块不需要在回复最末尾，可以放在任意位置`;
@@ -1538,6 +1524,10 @@ async function processRoleOutput(session, roleName, roleQuery, roleState) {
                   console.warn(`[Crew] Route execution failed:`, r.reason);
                 }
               }
+            } else if (roleState._pendingDispatch) {
+              const pd = roleState._pendingDispatch;
+              roleState._pendingDispatch = null;
+              await dispatchToRole(session, roleName, pd.content, pd.from, pd.taskId, pd.taskTitle);
             }
             return; // abort 后 query 已清空，退出 processRoleOutput
           }
@@ -1557,6 +1547,10 @@ async function processRoleOutput(session, roleName, roleQuery, roleState) {
                 console.warn(`[Crew] Route execution failed:`, r.reason);
               }
             }
+          } else if (roleState._pendingDispatch) {
+            const pd = roleState._pendingDispatch;
+            roleState._pendingDispatch = null;
+            await dispatchToRole(session, roleName, pd.content, pd.from, pd.taskId, pd.taskTitle);
           }
           continue; // 不要重复处理这个 compact result
         }
@@ -1740,23 +1734,46 @@ async function processRoleOutput(session, roleName, roleQuery, roleState) {
       });
 
       if (roleState.lastDispatchContent) {
-        let retryContent = roleState.lastDispatchContent;
-
-        // ★ context 超限时精简重派内容
-        if (classification.needContentTrim) {
-          retryContent = trimContentForRetry(retryContent);
-        }
-
-        if (classification.skipResume) {
+        // ★ context_exceeded: clear sessionId → rebuild query → /compact → 重派
+        if (classification.reason === 'context_exceeded') {
           await clearRoleSessionId(session.sharedDir, roleName);
+          const newState = await createRoleQuery(session, roleName);
+
+          // 缓存待重派内容，compact 完成后自动发送
+          newState._pendingDispatch = {
+            content: roleState.lastDispatchContent,
+            from: roleState.lastDispatchFrom || 'system',
+            taskId: roleState.lastDispatchTaskId,
+            taskTitle: roleState.lastDispatchTaskTitle
+          };
+          newState._compacting = true;
+          newState._compactSummaryPending = false;
+          newState.consecutiveErrors = roleState.consecutiveErrors;
+
+          newState.inputStream.enqueue({
+            type: 'user',
+            message: { role: 'user', content: '/compact' }
+          });
+
+          sendCrewMessage({
+            type: 'crew_role_compact',
+            sessionId: session.id,
+            role: roleName,
+            status: 'compacting'
+          });
+        } else {
+          // 其他可恢复错误：原有重派逻辑
+          if (classification.skipResume) {
+            await clearRoleSessionId(session.sharedDir, roleName);
+          }
+          await dispatchToRole(
+            session, roleName,
+            roleState.lastDispatchContent,
+            roleState.lastDispatchFrom || 'system',
+            roleState.lastDispatchTaskId,
+            roleState.lastDispatchTaskTitle
+          );
         }
-        await dispatchToRole(
-          session, roleName,
-          retryContent,
-          roleState.lastDispatchFrom || 'system',
-          roleState.lastDispatchTaskId,
-          roleState.lastDispatchTaskTitle
-        );
       } else {
         const msg = `角色 ${roleName} 已恢复（${classification.reason}），但无待重试消息。`;
         if (roleName !== session.decisionMaker) {
@@ -2057,6 +2074,66 @@ function findActiveRole(session) {
 // Control Operations
 // =====================================================================
 
+/**
+ * 手动压缩指定角色的上下文
+ * - 无活跃 query → 重建 query 后发 /compact
+ * - 有 query 且非 turnActive → 直接发 /compact
+ * - turnActive → 提示用户先停止该角色
+ */
+async function compactRole(session, roleName) {
+  const roleState = session.roleStates.get(roleName);
+
+  // Case 1: 角色正在 streaming，不能 compact
+  if (roleState?.turnActive) {
+    sendCrewMessage({
+      type: 'crew_role_compact',
+      sessionId: session.id,
+      role: roleName,
+      status: 'rejected',
+      reason: '角色正在工作中，请先停止该角色再压缩上下文'
+    });
+    return;
+  }
+
+  // Case 2: 已经在 compacting
+  if (roleState?._compacting) {
+    sendCrewMessage({
+      type: 'crew_role_compact',
+      sessionId: session.id,
+      role: roleName,
+      status: 'rejected',
+      reason: '该角色正在压缩中，请等待完成'
+    });
+    return;
+  }
+
+  // Case 3: 无活跃 query → 重建
+  let state = roleState;
+  if (!state || !state.query || !state.inputStream) {
+    console.log(`[Crew] ${roleName} has no active query, rebuilding for compact`);
+    state = await createRoleQuery(session, roleName);
+  }
+
+  // 发送 /compact
+  console.log(`[Crew] Manual compact requested for ${roleName}`);
+  state._compacting = true;
+  state._compactSummaryPending = false;
+  state._pendingCompactRoutes = null;
+  state._fromRole = null;
+
+  state.inputStream.enqueue({
+    type: 'user',
+    message: { role: 'user', content: '/compact' }
+  });
+
+  sendCrewMessage({
+    type: 'crew_role_compact',
+    sessionId: session.id,
+    role: roleName,
+    status: 'compacting'
+  });
+}
+
 /**
  * 处理控制命令
  */
@@ -2083,6 +2160,9 @@ export async function handleCrewControl(msg) {
         await interruptRole(session, targetRole, msg.content, 'human');
       }
       break;
+    case 'compact_role':
+      if (targetRole) await compactRole(session, targetRole);
+      break;
     case 'stop_all':
       await stopAll(session);
       break;

package/package.json

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