@yeaft/webchat-agent 0.1.429 → 0.1.431

package/crew/human-interaction.js

@@ -6,6 +6,33 @@ import { dispatchToRole } from './routing.js';
 import { sendStatusUpdate } from './ui-messages.js';
 import { debouncedSaveSessionMeta } from './persistence.js';
 
+/**
+ * Resolve @role mention from message content.
+ * Returns { target, message } if a valid role is found, null otherwise.
+ */
+export function resolveAtMention(content, session) {
+  const atMatch = content.match(/^@(\S+)\s*([\s\S]*)/);
+  if (!atMatch) return null;
+
+  const atTarget = atMatch[1];
+  const message = atMatch[2].trim() || content;
+
+  for (const [name, role] of session.roles) {
+    if (name === atTarget.toLowerCase()) {
+      return { target: name, message };
+    }
+    if (role.displayName === atTarget) {
+      return { target: name, message };
+    }
+    // Fuzzy: compound "name-displayName" pattern (e.g. "dev-1-托瓦兹" or partial displayName)
+    const compound = `${name}-${role.displayName}`;
+    if (compound.toLowerCase() === atTarget.toLowerCase()) {
+      return { target: name, message };
+    }
+  }
+  return null;
+}
+
 /**
  * 处理人的输入
  */
@@ -38,6 +65,13 @@ export async function handleCrewHumanInput(msg) {
     debouncedSaveSessionMeta(session);
   }
 
+  // Resolve @role mention from content (works regardless of targetRole from frontend)
+  const atMention = resolveAtMention(content, session);
+  // Effective target: explicit targetRole from frontend > @mention from content > null
+  const effectiveTargetRole = targetRole || (atMention ? atMention.target : null);
+  // If @mention found, use the stripped message (without @prefix); otherwise use original content
+  const effectiveContent = atMention ? atMention.message : content;
+
   // Build dispatch content (supports image attachments)
   function buildHumanContent(prefix, text) {
     if (files && files.length > 0) {
@@ -72,55 +106,35 @@ export async function handleCrewHumanInput(msg) {
     // Status changed + new human message — persist (debounced, dispatch will follow)
     debouncedSaveSessionMeta(session);
 
-    const target = targetRole || waitingContext?.fromRole || session.decisionMaker;
-    await dispatchToRole(session, target, buildHumanContent('人工回复:', content), 'human');
+    const target = effectiveTargetRole || waitingContext?.fromRole || session.decisionMaker;
+    if (effectiveTargetRole) {
+      console.log(`[Crew] @mention override in waiting_human: routing to ${target} instead of ${waitingContext?.fromRole || session.decisionMaker}`);
+    }
+    await dispatchToRole(session, target, buildHumanContent('人工回复:', effectiveContent), 'human');
     return;
   }
 
-  // 解析 @role 指令
-  const atMatch = content.match(/^@(\S+)\s*([\s\S]*)/);
-  if (atMatch) {
-    const atTarget = atMatch[1];
-    const message = atMatch[2].trim() || content;
+  // @role 指令 — effectiveTargetRole already resolved above
+  if (atMention && effectiveTargetRole) {
+    const target = effectiveTargetRole;
+    const message = effectiveContent;
 
-    let target = null;
-    for (const [name, role] of session.roles) {
-      if (name === atTarget.toLowerCase()) {
-        target = name;
-        break;
-      }
-      if (role.displayName === atTarget) {
-        target = name;
-        break;
+    // 检测纯 skill 命令（如 /context, /simplify），直接发送不加前缀
+    if (/^\/[a-zA-Z0-9_-]+(?:\s+.*)?$/s.test(message)) {
+      let roleState = session.roleStates.get(target);
+      if (!roleState || !roleState.query || !roleState.inputStream) {
+        const { createRoleQuery } = await import('./role-query.js');
+        roleState = await createRoleQuery(session, target);
       }
-    }
-
-    if (target) {
-      // 检测纯 skill 命令（如 /context, /simplify），直接发送不加前缀
-      if (/^\/[a-zA-Z0-9_-]+(?:\s+.*)?$/s.test(message)) {
-        let roleState = session.roleStates.get(target);
-        if (!roleState || !roleState.query || !roleState.inputStream) {
-          const { createRoleQuery } = await import('./role-query.js');
-          roleState = await createRoleQuery(session, target);
-        }
-        // P1-4: 守卫 stream.enqueue
-        try {
-          if (roleState.inputStream && !roleState.inputStream.isDone) {
-            roleState.inputStream.enqueue({
-              type: 'user',
-              message: { role: 'user', content: message }
-            });
-          } else {
-            console.warn(`[Crew] Skill dispatch: stream closed for ${target}, recreating`);
-            const { createRoleQuery } = await import('./role-query.js');
-            roleState = await createRoleQuery(session, target);
-            roleState.inputStream.enqueue({
-              type: 'user',
-              message: { role: 'user', content: message }
-            });
-          }
-        } catch (enqueueErr) {
-          console.error(`[Crew] Skill dispatch enqueue failed for ${target}:`, enqueueErr.message);
+      // P1-4: 守卫 stream.enqueue
+      try {
+        if (roleState.inputStream && !roleState.inputStream.isDone) {
+          roleState.inputStream.enqueue({
+            type: 'user',
+            message: { role: 'user', content: message }
+          });
+        } else {
+          console.warn(`[Crew] Skill dispatch: stream closed for ${target}, recreating`);
           const { createRoleQuery } = await import('./role-query.js');
           roleState = await createRoleQuery(session, target);
           roleState.inputStream.enqueue({
@@ -128,18 +142,27 @@ export async function handleCrewHumanInput(msg) {
             message: { role: 'user', content: message }
           });
         }
-        sendStatusUpdate(session);
-        console.log(`[Crew] Skill command dispatched to ${target}: ${message}`);
-        return;
+      } catch (enqueueErr) {
+        console.error(`[Crew] Skill dispatch enqueue failed for ${target}:`, enqueueErr.message);
+        const { createRoleQuery } = await import('./role-query.js');
+        roleState = await createRoleQuery(session, target);
+        roleState.inputStream.enqueue({
+          type: 'user',
+          message: { role: 'user', content: message }
+        });
       }
-      await dispatchToRole(session, target, buildHumanContent('人工消息:', message), 'human');
+      sendStatusUpdate(session);
+      console.log(`[Crew] Skill command dispatched to ${target}: ${message}`);
       return;
     }
+    console.log(`[Crew] @mention routing to ${target}: ${message.substring(0, 50)}...`);
+    await dispatchToRole(session, target, buildHumanContent('人工消息:', message), 'human');
+    return;
   }
 
   // 默认发给决策者
-  const target = targetRole || session.decisionMaker;
-  await dispatchToRole(session, target, buildHumanContent('人工消息:', content), 'human');
+  const target = effectiveTargetRole || session.decisionMaker;
+  await dispatchToRole(session, target, buildHumanContent('人工消息:', effectiveContent), 'human');
 }
 
 /**

package/package.json

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

package/unify/index.js

@@ -37,5 +37,6 @@ export { MCPManager, createMCPManager } from './mcp.js';
 export { SkillManager, createSkillManager, parseSkill, serializeSkill } from './skills.js';
 export { defineTool } from './tools/types.js';
 export { ToolRegistry, createEmptyRegistry } from './tools/registry.js';
+export { createFullRegistry, allTools } from './tools/index.js';
 export { loadSession } from './session.js';
 

package/unify/session.js

@@ -21,16 +21,10 @@ import { ConversationStore } from './conversation/persist.js';
 import { MemoryStore } from './memory/store.js';
 import { SkillManager, createSkillManager } from './skills.js';
 import { MCPManager } from './mcp.js';
-import { createEmptyRegistry } from './tools/registry.js';
+import { createFullRegistry } from './tools/index.js';
 import { Engine } from './engine.js';
 import { join } from 'path';
 
-// Built-in tools
-import mcpTools from './tools/mcp-tools.js';
-import skillTool from './tools/skill.js';
-import enterWorktree from './tools/enter-worktree.js';
-import exitWorktree from './tools/exit-worktree.js';
-
 /**
  * @typedef {Object} SessionOptions
  * @property {string} [dir] — Yeaft data directory override (default: ~/.yeaft)
@@ -129,15 +123,7 @@ export async function loadSession(options = {}) {
   }
 
   // ─── 8. Build tool registry ────────────────────────────
-  const toolRegistry = createEmptyRegistry();
-
-  // Register built-in tools
-  for (const tool of mcpTools) {
-    toolRegistry.register(tool);
-  }
-  toolRegistry.register(skillTool);
-  toolRegistry.register(enterWorktree);
-  toolRegistry.register(exitWorktree);
+  const toolRegistry = createFullRegistry();
 
   // Register any extra tools from caller
   for (const tool of extraTools) {

package/unify/tools/index.js

@@ -0,0 +1,37 @@
+/**
+ * tools/index.js — All built-in tools + createFullRegistry()
+ *
+ * Central barrel file that imports every built-in tool and exposes a
+ * factory function to create a ToolRegistry pre-loaded with all of them.
+ *
+ * session.js should use createFullRegistry() instead of createEmptyRegistry()
+ * to ensure all built-in tools are available to the LLM.
+ */
+
+import { ToolRegistry } from './registry.js';
+import mcpTools from './mcp-tools.js';
+import skillTool from './skill.js';
+import enterWorktree from './enter-worktree.js';
+import exitWorktree from './exit-worktree.js';
+
+/**
+ * All built-in tools, flattened into a single array.
+ * mcpTools is already an array; the rest are single ToolDef objects.
+ * @type {import('./types.js').ToolDef[]}
+ */
+export const allTools = [
+  ...mcpTools,
+  skillTool,
+  enterWorktree,
+  exitWorktree,
+];
+
+/**
+ * Create a ToolRegistry pre-loaded with all built-in tools.
+ * @returns {ToolRegistry}
+ */
+export function createFullRegistry() {
+  const registry = new ToolRegistry();
+  registry.registerAll(allTools);
+  return registry;
+}