@yeaft/webchat-agent 0.1.213 → 0.1.217

package/crew/role-output.js

@@ -127,7 +127,8 @@ export async function processRoleOutput(session, roleName, roleQuery, roleState)
         // 决策者 turn 完成：检测 TASKS block 中新完成的任务
         const roleConfig = session.roles.get(roleName);
         if (roleConfig?.isDecisionMaker) {
-          const nowCompleted = parseCompletedTasks(roleState.accumulatedText);
+          const knownTaskIds = Array.from(session.features.keys());
+          const nowCompleted = parseCompletedTasks(roleState.accumulatedText, knownTaskIds);
           if (nowCompleted.size > 0) {
             const prev = session._completedTaskIds || new Set();
             const newlyDone = [];
@@ -197,6 +198,14 @@ export async function processRoleOutput(session, roleName, roleQuery, roleState)
       if (session.status === 'paused' && roleState.accumulatedText) {
         const routes = parseRoutes(roleState.accumulatedText);
         if (routes.length > 0 && session.pendingRoutes.length === 0) {
+          // Fill missing taskId from roleState.currentTask (same as normal path L170-175)
+          const currentTask = roleState.currentTask;
+          for (const route of routes) {
+            if (!route.taskId && currentTask) {
+              route.taskId = currentTask.taskId;
+              route.taskTitle = currentTask.taskTitle;
+            }
+          }
           session.pendingRoutes = routes.map(route => ({ fromRole: roleName, route }));
           console.log(`[Crew] Saved ${routes.length} pending route(s) from aborted ${roleName}`);
         }

package/crew/role-query.js

@@ -6,6 +6,7 @@ import { query, Stream } from '../sdk/index.js';
 import { promises as fs, mkdirSync } from 'fs';
 import { join } from 'path';
 import { getMessages } from '../crew-i18n.js';
+import { handleAskUserQuestion } from '../conversation.js';
 import ctx from '../context.js';
 
 /** Format role label */
@@ -146,6 +147,9 @@ async function _createRoleQueryInner(session, roleName) {
 
   // 继承全局 MCP disallowedTools，避免不必要的 tool schema token 消耗
   const globalDisallowed = ctx.CONFIG?.disallowedTools || [];
+  // Crew 角色禁用 Agent 工具，强制通过 ROUTE 块协作
+  const crewDisallowed = ['Agent'];
+  const effectiveDisallowed = [...globalDisallowed, ...crewDisallowed];
 
   const queryOptions = {
     cwd: roleCwd,
@@ -153,9 +157,19 @@ async function _createRoleQueryInner(session, roleName) {
     abort: abortController.signal,
     model: role.model || undefined,
     appendSystemPrompt: systemPrompt,
-    ...(globalDisallowed.length > 0 && { disallowedTools: globalDisallowed })
+    ...(effectiveDisallowed.length > 0 && { disallowedTools: effectiveDisallowed })
   };
 
+  // Only the decision maker intercepts AskUserQuestion to forward to Web UI
+  if (role.isDecisionMaker) {
+    queryOptions.canCallTool = async (toolName, input, toolCtx) => {
+      if (toolName === 'AskUserQuestion') {
+        return await handleAskUserQuestion(session.id, input, toolCtx);
+      }
+      return input;
+    };
+  }
+
   if (savedSessionId) {
     queryOptions.resume = savedSessionId;
     console.log(`[Crew] Resuming ${roleName} with sessionId: ${savedSessionId}`);

package/crew/routing.js

@@ -140,7 +140,7 @@ export async function executeRoute(session, fromRole, route) {
       }
     }
     updateKanban(session, {
-      taskId, taskTitle, assignee: to,
+      taskId, taskTitle, assignee: resolvedKanbanTo || to,
       status, summary: summary.substring(0, 100)
     }).catch(e => console.warn(`[Crew] Failed to update kanban:`, e.message));
   }

package/crew/task-files.js

@@ -92,16 +92,53 @@ export async function readTaskFile(session, taskId) {
 }
 
 /**
- * 从 TASKS block 文本中提取已完成任务的 taskId 集合
+ * 从文本中提取已完成任务的 taskId 集合。
+ *
+ * Primary: parse TASKS block (---TASKS--- / ---END_TASKS---) for checked items with #taskId.
+ * Fallback: when no TASKS block is found AND knownTaskIds are provided,
+ *   scan the full text for known taskId + completion keyword combinations.
+ *   This handles cases where the PM mentions task completion in prose without
+ *   emitting a formal TASKS block.
+ *
+ * @param {string} text - accumulated role output text
+ * @param {string[]} [knownTaskIds] - list of known task IDs to search for in fallback mode
+ * @returns {Set<string>} completed task IDs
  */
-export function parseCompletedTasks(text) {
+export function parseCompletedTasks(text, knownTaskIds) {
   const ids = new Set();
+
+  // Primary: TASKS block parsing
   const match = text.match(/---TASKS---([\s\S]*?)---END_TASKS---/);
-  if (!match) return ids;
-  for (const line of match[1].split('\n')) {
-    const m = line.match(/^-\s*\[[xX]\]\s*.+#(\S+)/);
-    if (m) ids.add(m[1]);
+  if (match) {
+    for (const line of match[1].split('\n')) {
+      const m = line.match(/^-\s*\[[xX]\]\s*.+#(\S+)/);
+      if (m) ids.add(m[1]);
+    }
+    return ids;
   }
+
+  // Fallback: scan plain text for known taskId + completion keywords
+  if (!knownTaskIds || knownTaskIds.length === 0) return ids;
+
+  const completionPatterns = [
+    /已完成/, /完成/, /已合并/, /合并/, /DONE/, /DONE_MERGED/, /MERGED/,
+    /已关闭/, /关闭/, /✅/, /通过/, /passed/i, /merged/i, /completed/i
+  ];
+
+  for (const taskId of knownTaskIds) {
+    // Search for lines/sentences containing the taskId
+    const escaped = taskId.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const re = new RegExp(`^.*${escaped}.*$`, 'gm');
+    let lineMatch;
+    while ((lineMatch = re.exec(text)) !== null) {
+      const line = lineMatch[0];
+      if (completionPatterns.some(p => p.test(line))) {
+        ids.add(taskId);
+        break;
+      }
+    }
+  }
+
   return ids;
 }
 

package/package.json

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