@yeaft/webchat-agent 0.1.107 → 0.1.114

package/connection/message-router.js

@@ -17,7 +17,7 @@ import {
 import {
   createCrewSession, handleCrewHumanInput, handleCrewControl,
   addRoleToSession, removeRoleFromSession,
-  handleListCrewSessions, handleCheckCrewExists, handleDeleteCrewDir, resumeCrewSession, removeFromCrewIndex,
+  handleListCrewSessions, handleCheckCrewExists, handleDeleteCrewDir, resumeCrewSession, removeFromCrewIndex, hideCrewSession,
   handleLoadCrewHistory
 } from '../crew.js';
 import { sendToServer, flushMessageBuffer } from './buffer.js';
@@ -240,7 +240,7 @@ export async function handleMessage(msg) {
       break;
 
     case 'delete_crew_session':
-      await removeFromCrewIndex(msg.sessionId);
+      await hideCrewSession(msg.sessionId);
       (await import('../conversation.js')).sendConversationList();
       break;
 

package/conversation.js

@@ -85,11 +85,11 @@ export async function sendConversationList() {
       type: 'crew',
     });
   }
-  // 追加索引中已停止的 crew sessions（不重复）
+  // 追加索引中已停止的 crew sessions（不重复，跳过 hidden）
   try {
     const index = await loadCrewIndex();
     for (const entry of index) {
-      if (!activeCrewIds.has(entry.sessionId)) {
+      if (!activeCrewIds.has(entry.sessionId) && !entry.hidden) {
         list.push({
           id: entry.sessionId,
           workDir: entry.projectDir,

package/crew/persistence.js

@@ -76,6 +76,44 @@ export async function removeFromCrewIndex(sessionId) {
   // 这些文件在 recreate 时会被复用（合并统计数据 + 恢复消息历史）
 }
 
+/**
+ * 隐藏 crew session（UI 删除 = 隐藏，不是真删）
+ * 在 crew-index 条目上标记 hidden: true + hiddenAt 时间戳，
+ * 同时从内存 crewSessions Map 中移除（停止运行态）。
+ * 不修改 session.json，不从 index 中移除条目。
+ */
+export async function hideCrewSession(sessionId) {
+  const { crewSessions } = await import('./session.js');
+
+  const index = await loadCrewIndex();
+  const entry = index.find(e => e.sessionId === sessionId);
+  if (entry) {
+    entry.hidden = true;
+    entry.hiddenAt = Date.now();
+    await saveCrewIndex(index);
+    console.log(`[Crew] Hidden session ${sessionId} in index`);
+  }
+  // 从内存中移除（停止运行态，防止 sendConversationList 加入）
+  if (crewSessions.has(sessionId)) {
+    crewSessions.delete(sessionId);
+    console.log(`[Crew] Removed session ${sessionId} from active sessions`);
+  }
+}
+
+/**
+ * 取消隐藏 crew session（用户主动恢复时调用）
+ */
+export async function unhideCrewSession(sessionId) {
+  const index = await loadCrewIndex();
+  const entry = index.find(e => e.sessionId === sessionId);
+  if (entry && entry.hidden) {
+    delete entry.hidden;
+    delete entry.hiddenAt;
+    await saveCrewIndex(index);
+    console.log(`[Crew] Unhidden session ${sessionId} in index`);
+  }
+}
+
 // =====================================================================
 // Session Metadata (.crew/session.json)
 // =====================================================================

package/crew/routing.js

@@ -27,12 +27,18 @@ export function parseRoutes(text) {
     const toMatch = block.match(/to:\s*(.+)/i);
     if (!toMatch) continue;
 
-    const summaryMatch = block.match(/summary:\s*([\s\S]+)/i);
+    // ★ 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];
+
+    // ★ 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);
 
     routes.push({
-      to: toMatch[1].trim().toLowerCase(),
+      to: toClean,
       summary: summaryMatch ? summaryMatch[1].trim() : '',
       taskId: taskMatch ? taskMatch[1].trim() : null,
       taskTitle: taskTitleMatch ? taskTitleMatch[1].trim() : null
@@ -42,6 +48,59 @@ export function parseRoutes(text) {
   return routes;
 }
 
+/**
+ * Resolve a ROUTE `to` value to an actual role name in the session.
+ *
+ * Resolution order:
+ * 1. Exact match: `to` matches a role name directly (e.g. "dev-1")
+ * 2. roleType match: `to` matches a role's roleType (e.g. "developer" → "dev-1")
+ * 3. Short prefix match: `to` matches the SHORT_PREFIX of a roleType (e.g. "dev" → "dev-1")
+ * 4. Same-group dispatch: if sender is in a multi-instance group (e.g. dev-1),
+ *    and `to` matches the roleType/prefix of another group (e.g. "reviewer"),
+ *    route to the instance with matching groupIndex (e.g. rev-1)
+ *
+ * For multi-instance matches (2/3), prefer the instance with the same groupIndex
+ * as the sender. Falls back to the first instance if no groupIndex match.
+ *
+ * @param {string} to - raw route target from ROUTE block
+ * @param {object} session - crew session
+ * @param {string} [fromRole] - sending role name (for groupIndex matching)
+ * @returns {string|null} resolved role name, or null if unresolvable
+ */
+export function resolveRoleName(to, session, fromRole) {
+  // 1. Exact match
+  if (session.roles.has(to)) return to;
+
+  // Build candidate list by roleType and short prefix
+  const fromRoleConfig = fromRole ? session.roles.get(fromRole) : null;
+  const fromGroupIndex = fromRoleConfig?.groupIndex || 0;
+
+  let candidates = [];
+
+  for (const [name, config] of session.roles) {
+    // 2. roleType match (e.g. "developer" → dev-1, dev-2, dev-3)
+    if (config.roleType === to) {
+      candidates.push({ name, groupIndex: config.groupIndex || 0 });
+    }
+    // 3. Short prefix match (e.g. "dev" → developer roleType → dev-1)
+    //    Match if the role name starts with `to-` (e.g. "dev" matches "dev-1", "dev-2")
+    else if (name.startsWith(to + '-') && /^\d+$/.test(name.slice(to.length + 1))) {
+      candidates.push({ name, groupIndex: config.groupIndex || 0 });
+    }
+  }
+
+  if (candidates.length === 0) return null;
+
+  // 4. Prefer same groupIndex as sender
+  if (fromGroupIndex > 0) {
+    const sameGroup = candidates.find(c => c.groupIndex === fromGroupIndex);
+    if (sameGroup) return sameGroup.name;
+  }
+
+  // Fall back to first candidate
+  return candidates[0].name;
+}
+
 /**
  * 执行路由
  */
@@ -68,7 +127,9 @@ export async function executeRoute(session, fromRole, route) {
     // 更新工作看板：推断状态
     const { getMessages } = await import('../crew-i18n.js');
     const m = getMessages(session.language || 'zh-CN');
-    const toRoleConfig = session.roles.get(to);
+    // ★ Use resolveRoleName for kanban status lookup too
+    const resolvedKanbanTo = resolveRoleName(to, session, fromRole);
+    const toRoleConfig = session.roles.get(resolvedKanbanTo || to);
     let status = m.kanbanStatusDev;
     if (toRoleConfig) {
       switch (toRoleConfig.roleType) {
@@ -111,13 +172,14 @@ export async function executeRoute(session, fromRole, route) {
   }
 
   // 路由到指定角色
-  if (session.roles.has(to)) {
+  const resolvedTo = resolveRoleName(to, session, fromRole);
+  if (resolvedTo) {
     if (session.humanMessageQueue.length > 0) {
       const { processHumanQueue } = await import('./human-interaction.js');
       await processHumanQueue(session);
     } else {
       const taskPrompt = buildRoutePrompt(fromRole, summary, session);
-      await dispatchToRole(session, to, taskPrompt, fromRole, taskId, taskTitle);
+      await dispatchToRole(session, resolvedTo, taskPrompt, fromRole, taskId, taskTitle);
     }
   } else {
     console.warn(`[Crew] Unknown route target: ${to}`);

package/crew/session.js

@@ -8,7 +8,7 @@ import { getMessages } from '../crew-i18n.js';
 import { initWorktrees } from './worktree.js';
 import { initSharedDir, writeRoleClaudeMd, updateSharedClaudeMd, backupMemoryContent } from './shared-dir.js';
 import {
-  loadCrewIndex, upsertCrewIndex, removeFromCrewIndex,
+  loadCrewIndex, upsertCrewIndex, removeFromCrewIndex, unhideCrewSession,
   loadSessionMeta, saveSessionMeta, loadSessionMessages, getMaxShardIndex
 } from './persistence.js';
 import { sendCrewMessage, sendCrewOutput, sendStatusUpdate } from './ui-messages.js';
@@ -121,6 +121,7 @@ async function findExistingSessionByProjectDir(projectDir) {
     e.projectDir.replace(/\/+$/, '') === normalizedDir
     && (!agentId || !e.agentId || e.agentId === agentId)
     && e.status !== 'completed'
+    && !e.hidden
   );
 
   if (match) {
@@ -428,6 +429,9 @@ export async function handleDeleteCrewDir(msg) {
 export async function resumeCrewSession(msg) {
   const { sessionId, userId, username } = msg;
 
+  // 用户主动恢复 → 清除 hidden 标记（如果有的话）
+  await unhideCrewSession(sessionId);
+
   if (crewSessions.has(sessionId)) {
     const session = crewSessions.get(sessionId);
     const roles = Array.from(session.roles.values());
@@ -465,17 +469,22 @@ export async function resumeCrewSession(msg) {
   const index = await loadCrewIndex();
   const indexEntry = index.find(e => e.sessionId === sessionId);
   if (!indexEntry) {
-    sendCrewMessage({ type: 'error', sessionId, message: 'Crew session not found in index' });
+    console.warn(`[Crew] resumeCrewSession: session ${sessionId} not found in index`);
+    sendCrewMessage({ type: 'crew_session_restore_failed', sessionId, message: 'Crew session not found in index' });
     return;
   }
 
   const meta = await loadSessionMeta(indexEntry.sharedDir);
   if (!meta) {
-    sendCrewMessage({ type: 'error', sessionId, message: 'Crew session metadata not found' });
+    console.warn(`[Crew] resumeCrewSession: session.json not found at ${indexEntry.sharedDir}`);
+    sendCrewMessage({ type: 'crew_session_restore_failed', sessionId, message: 'Crew session metadata not found' });
     return;
   }
 
   const roles = meta.roles || [];
+  if (roles.length === 0) {
+    console.warn(`[Crew] resumeCrewSession: session ${sessionId} has empty roles in session.json`);
+  }
   const decisionMaker = meta.decisionMaker || roles[0]?.name || null;
   const session = {
     id: sessionId,

package/crew.js

@@ -29,6 +29,7 @@ export {
 export {
   loadCrewIndex,
   removeFromCrewIndex,
+  hideCrewSession,
   handleLoadCrewHistory
 } from './crew/persistence.js';
 

package/index.js

@@ -78,7 +78,7 @@ const CONFIG = {
   // 最大上下文 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) || 100000
+  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.107",
+  "version": "0.1.114",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",