@yeaft/webchat-agent 0.1.377 → 0.1.379

package/crew/control.js

@@ -19,13 +19,23 @@ import { processHumanQueue } from './human-interaction.js';
  */
 export async function handleCrewControl(msg) {
   // Lazy import to avoid circular dependency
-  const { crewSessions } = await import('./session.js');
+  const { crewSessions, resumeCrewSession } = await import('./session.js');
 
   const { sessionId, action, targetRole } = msg;
-  const session = crewSessions.get(sessionId);
+  let session = crewSessions.get(sessionId);
   if (!session) {
-    console.warn(`[Crew] Session not found: ${sessionId}`);
-    return;
+    // Auto-resume: try to restore from disk before giving up
+    console.log(`[Crew] Session ${sessionId} not in memory, attempting auto-resume...`);
+    try {
+      await resumeCrewSession({ sessionId });
+      session = crewSessions.get(sessionId);
+    } catch (e) {
+      console.warn(`[Crew] Auto-resume failed for ${sessionId}:`, e.message);
+    }
+    if (!session) {
+      console.warn(`[Crew] Session not found: ${sessionId} (even after auto-resume)`);
+      return;
+    }
   }
 
   switch (action) {

package/crew/human-interaction.js

@@ -11,13 +11,23 @@ import { debouncedSaveSessionMeta } from './persistence.js';
  */
 export async function handleCrewHumanInput(msg) {
   // Lazy import to avoid circular dependency
-  const { crewSessions } = await import('./session.js');
+  const { crewSessions, resumeCrewSession } = await import('./session.js');
 
   const { sessionId, content, targetRole, files } = msg;
-  const session = crewSessions.get(sessionId);
+  let session = crewSessions.get(sessionId);
   if (!session) {
-    console.warn(`[Crew] Session not found: ${sessionId}`);
-    return;
+    // Auto-resume: try to restore from disk before giving up
+    console.log(`[Crew] Session ${sessionId} not in memory, attempting auto-resume...`);
+    try {
+      await resumeCrewSession({ sessionId });
+      session = crewSessions.get(sessionId);
+    } catch (e) {
+      console.warn(`[Crew] Auto-resume failed for ${sessionId}:`, e.message);
+    }
+    if (!session) {
+      console.warn(`[Crew] Session not found: ${sessionId} (even after auto-resume)`);
+      return;
+    }
   }
 
   // Build dispatch content (supports image attachments)

package/crew/role-management.js

@@ -17,13 +17,23 @@ function roleLabel(r) {
  */
 export async function addRoleToSession(msg) {
   // Lazy import to avoid circular dependency
-  const { crewSessions, expandRoles } = await import('./session.js');
+  const { crewSessions, expandRoles, resumeCrewSession } = await import('./session.js');
 
   const { sessionId, role } = msg;
-  const session = crewSessions.get(sessionId);
+  let session = crewSessions.get(sessionId);
   if (!session) {
-    console.warn(`[Crew] Session not found: ${sessionId}`);
-    return;
+    // Auto-resume: try to restore from disk before giving up
+    console.log(`[Crew] Session ${sessionId} not in memory, attempting auto-resume...`);
+    try {
+      await resumeCrewSession({ sessionId });
+      session = crewSessions.get(sessionId);
+    } catch (e) {
+      console.warn(`[Crew] Auto-resume failed for ${sessionId}:`, e.message);
+    }
+    if (!session) {
+      console.warn(`[Crew] Session not found: ${sessionId} (even after auto-resume)`);
+      return;
+    }
   }
 
   const rolesToAdd = expandRoles([role]);
@@ -104,13 +114,23 @@ export async function addRoleToSession(msg) {
  * 从 session 移除角色
  */
 export async function removeRoleFromSession(msg) {
-  const { crewSessions } = await import('./session.js');
+  const { crewSessions, resumeCrewSession } = await import('./session.js');
 
   const { sessionId, roleName } = msg;
-  const session = crewSessions.get(sessionId);
+  let session = crewSessions.get(sessionId);
   if (!session) {
-    console.warn(`[Crew] Session not found: ${sessionId}`);
-    return;
+    // Auto-resume: try to restore from disk before giving up
+    console.log(`[Crew] Session ${sessionId} not in memory, attempting auto-resume...`);
+    try {
+      await resumeCrewSession({ sessionId });
+      session = crewSessions.get(sessionId);
+    } catch (e) {
+      console.warn(`[Crew] Auto-resume failed for ${sessionId}:`, e.message);
+    }
+    if (!session) {
+      console.warn(`[Crew] Session not found: ${sessionId} (even after auto-resume)`);
+      return;
+    }
   }
 
   const role = session.roles.get(roleName);

package/crew/role-query.js

@@ -149,8 +149,12 @@ async function _createRoleQueryInner(session, roleName) {
 
   // 继承全局 MCP disallowedTools，避免不必要的 tool schema token 消耗
   const globalDisallowed = ctx.CONFIG?.disallowedTools || [];
-  // Crew 角色禁用 Agent 工具，强制通过 ROUTE 块协作
-  const crewDisallowed = ['Agent'];
+  // Crew 角色禁用 Agent 和 Skill 工具：
+  // - Agent: 角色间协作必须通过 ROUTE 块，不能自行启动 sub-agent
+  // - Skill: skills 的 trigger 词会和角色职能冲突（如 review-code、commit），
+  //   导致 Claude 调用 Skill 而不是输出 ROUTE 块。从 schema 层面移除比
+  //   canCallTool throw 更可靠（完全不消耗 tool schema token）
+  const crewDisallowed = ['Agent', 'Skill'];
   const effectiveDisallowed = [...globalDisallowed, ...crewDisallowed];
 
   const queryOptions = {
@@ -164,14 +168,11 @@ async function _createRoleQueryInner(session, roleName) {
 
   // Intercept AskUserQuestion for all roles — forward to Web UI for interactive answering.
   // Without this, non-DM roles' AskCard buttons stay disabled (no askRequestId).
-  // Also block yeaft-skills in crew mode — they inject personas/workflows that interfere with role behavior.
+  // Note: Skill tool is fully disallowed via disallowedTools above, so no canCallTool guard needed.
   queryOptions.canCallTool = async (toolName, input, toolCtx) => {
     if (toolName === 'AskUserQuestion') {
       return await handleAskUserQuestion(session.id, input, toolCtx);
     }
-    if (toolName === 'Skill' && input?.skill && input.skill.startsWith('yeaft')) {
-      throw new Error('yeaft-skills are disabled in crew mode — crew roles use ROUTE protocol instead');
-    }
     return input;
   };
 

package/crew/routing.js

@@ -50,7 +50,8 @@ export function parseRoutes(text) {
     // ★ 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();
-    const toClean = toRaw.split(/[\s(]/)[0];
+    // 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);
@@ -114,9 +115,28 @@ export function resolveRoleName(to, session, fromRole) {
     }
   }
 
+  // 4. displayName match (e.g. "乔布斯" → pm)
+  if (candidates.length === 0) {
+    for (const [name, config] of session.roles) {
+      if (config.displayName && config.displayName.toLowerCase() === to) {
+        candidates.push({ name, groupIndex: config.groupIndex || 0 });
+      }
+    }
+  }
+
+  // 5. name-displayName compound match (e.g. "pm-乔布斯" → pm)
+  //    Claude sometimes concatenates role name + display name with a hyphen
+  if (candidates.length === 0) {
+    for (const [name, config] of session.roles) {
+      if (to.startsWith(name + '-') && to.length > name.length + 1) {
+        candidates.push({ name, groupIndex: config.groupIndex || 0 });
+      }
+    }
+  }
+
   if (candidates.length === 0) return null;
 
-  // 4. Prefer same groupIndex as sender
+  // 6. Prefer same groupIndex as sender
   if (fromGroupIndex > 0) {
     const sameGroup = candidates.find(c => c.groupIndex === fromGroupIndex);
     if (sameGroup) return sameGroup.name;
@@ -215,8 +235,9 @@ export async function executeRoute(session, fromRole, route, turnImages = []) {
       await dispatchToRole(session, resolvedTo, taskPrompt, fromRole, taskId, taskTitle);
     }
   } else {
-    console.warn(`[Crew] Unknown route target: ${to}`);
-    const errorMsg = `路由目标 "${to}" 不存在。来自 ${fromRole} 的消息: ${summary}`;
+    const availableRoles = Array.from(session.roles.keys()).join(', ');
+    console.warn(`[Crew] Unknown route target: ${to} (available: ${availableRoles})`);
+    const errorMsg = `路由目标 "${to}" 不存在。可用角色: ${availableRoles}\n来自 ${fromRole} 的消息: ${summary}`;
     await dispatchToRole(session, session.decisionMaker, errorMsg, 'system');
   }
 }

package/package.json

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