@yeaft/webchat-agent 0.1.448 → 0.1.450

package/crew/role-output.js

@@ -12,6 +12,34 @@ import ctx from '../context.js';
 // Context 使用率常量（运行时从 ctx.CONFIG 读取）
 const getMaxContext = () => ctx.CONFIG?.maxContextTokens || 128000;
 
+/**
+ * Detect routing intent in text that lacks a proper ROUTE block.
+ * Returns true if keywords suggest the role intended to route to someone.
+ * @param {string} text
+ * @returns {boolean}
+ */
+export function _detectRouteIntent(text) {
+  if (!text || text.length < 10) return false;
+  // Check only the last 1000 chars (routing intent is usually at the end)
+  const tail = text.slice(-1000);
+  // Chinese patterns: 提交给/交给/请.*审查/转给/发给/route to
+  // English patterns: route to/submit to/forward to/hand off to/pass to
+  const intentPatterns = [
+    /提交给\s*\S+/,
+    /交给\s*\S+/,
+    /请\s*\S+\s*审查/,
+    /转给\s*\S+/,
+    /发给\s*\S+/,
+    /route\s+to\s+\S+/i,
+    /submit\s+to\s+\S+/i,
+    /forward\s+to\s+\S+/i,
+    /hand\s*off\s+to\s+\S+/i,
+    /pass\s+to\s+\S+/i,
+    /ROUTE[→:]\s*\S+/,  // shorthand that parseRoutes might have already caught, but as safety net
+  ];
+  return intentPatterns.some(p => p.test(tail));
+}
+
 /**
  * 处理角色的流式输出
  */
@@ -224,8 +252,21 @@ export async function processRoleOutput(session, roleName, roleQuery, roleState)
           });
           sendStatusUpdate(session);
         } else {
-          const { processHumanQueue } = await import('./human-interaction.js');
-          await processHumanQueue(session);
+          // ★ Route intent detection: if no ROUTE block but text suggests routing intent,
+          // auto-forward to PM so the message doesn't get lost
+          if (_detectRouteIntent(roleState.lastTurnText) && roleName !== session.decisionMaker) {
+            console.log(`[Crew] ${roleName} turn ended without ROUTE but has routing intent — auto-forwarding to PM`);
+            const autoSummary = `[auto-forward: ${roleName} 的输出包含路由意图但缺少 ROUTE 块]\n${(roleState.lastTurnText || '').slice(-500).trim()}`;
+            await executeRoute(session, roleName, {
+              to: session.decisionMaker,
+              summary: autoSummary,
+              taskId: roleState.currentTask?.taskId || null,
+              taskTitle: roleState.currentTask?.taskTitle || null,
+            });
+          } else {
+            const { processHumanQueue } = await import('./human-interaction.js');
+            await processHumanQueue(session);
+          }
         }
       }
     }

package/crew/routing.js

@@ -38,42 +38,102 @@ function _appendTextToContent(content, text) {
  */
 export function parseRoutes(text) {
   const routes = [];
+
+  // ─── Pre-pass: Strip fenced code blocks to avoid parsing quoted ROUTE examples ──
+  // Replaces ```...``` content with whitespace of same length to preserve positions
+  text = text.replace(/```[\s\S]*?```/g, m => ' '.repeat(m.length));
+
+  // ─── Phase 1: Standard ROUTE blocks (with END_ROUTE) ──────────
   // ★ Tolerate both underscore and space variants: ---END_ROUTE--- or ---END ROUTE---
-  const regex = /---ROUTE---\s*\n([\s\S]*?)---END[_ ]ROUTE---/g;
+  // ★ Use negative lookahead to not cross another ---ROUTE--- boundary
+  const regex = /---ROUTE---\s*\n((?:(?!---ROUTE---)[\s\S])*?)---END[_ ]ROUTE---/g;
   let match;
+  const matchedRanges = []; // track matched ranges to avoid double-parsing
 
   while ((match = regex.exec(text)) !== null) {
-    const block = match[1];
-    const toMatch = block.match(/to:\s*(.+)/i);
-    if (!toMatch) continue;
-
-    // ★ Clean `to` value: take only the first word (strip parenthetical notes, extra text)
-    // e.g. "pm (决策者)" → "pm", "dev-1 // main dev" → "dev-1"
-    const toRaw = toMatch[1].trim().toLowerCase();
-    // Strip trailing punctuation (commas, semicolons, colons, etc.)
-    const toClean = toRaw.split(/[\s(]/)[0].replace(/[,;:!?。，；：!？]+$/, '');
-
-    // ★ summary: match until next known field (task:/taskTitle:) or end of block
-    const summaryMatch = block.match(/summary:\s*([\s\S]+?)(?=\n\s*(?:task|taskTitle)\s*:|$)/i);
-    const taskMatch = block.match(/^task:\s*(.+)/im);
-    const taskTitleMatch = block.match(/^taskTitle:\s*(.+)/im);
-
-    let summary = summaryMatch ? summaryMatch[1].trim() : '';
-    if (!summary) {
-      summary = '[该角色未提供消息摘要]';
-    }
+    matchedRanges.push({ start: match.index, end: match.index + match[0].length });
+    const parsed = _parseRouteBlock(match[1]);
+    if (parsed) routes.push(parsed);
+  }
 
-    routes.push({
-      to: toClean,
-      summary,
-      taskId: taskMatch ? taskMatch[1].trim() : null,
-      taskTitle: taskTitleMatch ? taskTitleMatch[1].trim() : null
-    });
+  // ─── Phase 2: Fallback — ROUTE block missing END_ROUTE ────────
+  // Match ---ROUTE--- without a closing ---END_ROUTE---
+  // Take content until next ---ROUTE--- or EOF
+  const openRegex = /---ROUTE---\s*\n/g;
+  while ((match = openRegex.exec(text)) !== null) {
+    // Skip if this range was already captured by Phase 1
+    const pos = match.index;
+    if (matchedRanges.some(r => pos >= r.start && pos < r.end)) continue;
+
+    const blockStart = pos + match[0].length;
+    // End at next ---ROUTE--- or EOF
+    const nextRoute = text.indexOf('---ROUTE---', blockStart);
+    const blockEnd = nextRoute !== -1 ? nextRoute : text.length;
+    const block = text.slice(blockStart, blockEnd);
+
+    const parsed = _parseRouteBlock(block);
+    if (parsed) routes.push(parsed);
+  }
+
+  // ─── Phase 3: Shorthand — "ROUTE → target" / "ROUTE: target" ─
+  // Matches single-line shorthands like: ROUTE → dev-1: summary here
+  // or: ROUTE: dev-1, summary here
+  const shorthandRegex = /^ROUTE\s*[→:]\s*(\S+)[,:\s]*(.*)$/gm;
+  while ((match = shorthandRegex.exec(text)) !== null) {
+    // Skip if inside an already-matched ROUTE block range
+    const pos = match.index;
+    if (matchedRanges.some(r => pos >= r.start && pos < r.end)) continue;
+    // Also skip if the line is inside a ---ROUTE--- block (even unclosed)
+    const precedingText = text.slice(0, pos);
+    const lastRouteOpen = precedingText.lastIndexOf('---ROUTE---');
+    const lastRouteClose = Math.max(
+      precedingText.lastIndexOf('---END_ROUTE---'),
+      precedingText.lastIndexOf('---END ROUTE---')
+    );
+    if (lastRouteOpen > lastRouteClose) continue; // inside an open block
+
+    const toRaw = match[1].trim().toLowerCase().replace(/[,;:!?。，；：!？]+$/, '');
+    const summary = match[2] ? match[2].trim() : '[该角色未提供消息摘要]';
+
+    routes.push({ to: toRaw, summary, taskId: null, taskTitle: null });
   }
 
   return routes;
 }
 
+/**
+ * Parse fields from a ROUTE block body (the content between ---ROUTE--- and ---END_ROUTE---).
+ * @param {string} block — raw block content
+ * @returns {{ to: string, summary: string, taskId: string|null, taskTitle: string|null } | null}
+ */
+function _parseRouteBlock(block) {
+  const toMatch = block.match(/to:\s*(.+)/i);
+  if (!toMatch) return null;
+
+  // ★ Clean `to` value: take only the first word (strip parenthetical notes, extra text)
+  // e.g. "pm (决策者)" → "pm", "dev-1 // main dev" → "dev-1"
+  const toRaw = toMatch[1].trim().toLowerCase();
+  // Strip trailing punctuation (commas, semicolons, colons, etc.)
+  const toClean = toRaw.split(/[\s(]/)[0].replace(/[,;:!?。，；：!？]+$/, '');
+
+  // ★ summary: match until next known field (task:/taskTitle:) or end of block
+  const summaryMatch = block.match(/summary:\s*([\s\S]+?)(?=\n\s*(?:task|taskTitle)\s*:|$)/i);
+  const taskMatch = block.match(/^task:\s*(.+)/im);
+  const taskTitleMatch = block.match(/^taskTitle:\s*(.+)/im);
+
+  let summary = summaryMatch ? summaryMatch[1].trim() : '';
+  if (!summary) {
+    summary = '[该角色未提供消息摘要]';
+  }
+
+  return {
+    to: toClean,
+    summary,
+    taskId: taskMatch ? taskMatch[1].trim() : null,
+    taskTitle: taskTitleMatch ? taskTitleMatch[1].trim() : null
+  };
+}
+
 /**
  * Resolve a ROUTE `to` value to an actual role name in the session.
  *

package/package.json

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