@yeaft/webchat-agent 0.1.585 → 0.1.587

package/package.json

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

package/unify/engine.js

@@ -297,7 +297,7 @@ export class Engine {
    * @param {string} [userProfile] — user profile from user-memory shard store
    * @returns {string}
    */
-  #buildSystemPrompt(memory, compactSummary, prompt, memoryInjection, userProfile) {
+  #buildSystemPrompt(memory, compactSummary, prompt, memoryInjection, userProfile, vpPersona) {
     // Get relevant skill content if SkillManager is wired
     let skillContent = '';
     if (this.#skillManager && prompt) {
@@ -317,6 +317,7 @@ export class Engine {
       compactSummary,
       skillContent,
       userProfile,
+      vpPersona,
       // task-334f: memory_trace tool is now registered (49 → 51 tools), so
       // unlock the core_memory meta-line behind 334e's feature flag.
       memoryTraceAvailable: true,
@@ -329,7 +330,7 @@ export class Engine {
    * @param {AbortSignal} [signal]
    * @returns {object}
    */
-  #buildToolContext(signal) {
+  #buildToolContext(signal, vpCtx) {
     return {
       signal,
       yeaftDir: this.#yeaftDir,
@@ -348,6 +349,13 @@ export class Engine {
       imageAllowlist: Array.isArray(this.#config?.unify?.imageAllowlist)
         ? this.#config.unify.imageAllowlist
         : [],
+      // Bug 4 fix — VP / routing context for RouteForward (and any other
+      // VP-aware tool). Undefined when running in non-group / no-VP flows.
+      router: vpCtx?.router,
+      senderVpId: vpCtx?.senderVpId,
+      inboundEnvelope: vpCtx?.inboundEnvelope,
+      taskId: vpCtx?.taskId,
+      taskMembers: vpCtx?.taskMembers,
     };
   }
 
@@ -510,7 +518,7 @@ export class Engine {
    *   SCENARIO_EFFORT. Unknown values fall through to 'high'.
    * @yields {EngineEvent}
    */
-  async *query({ prompt, messages = [], signal, userEffort = null, scenario = 'chat' }) {
+  async *query({ prompt, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers } = {}) {
     if (!prompt || typeof prompt !== 'string' || !prompt.trim()) {
       yield {
         type: 'error',
@@ -561,7 +569,7 @@ export class Engine {
     const runSignal = abortCtrl.signal;
 
     try {
-      yield* this.#runQuery({ prompt: effectivePrompt, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario });
+      yield* this.#runQuery({ prompt: effectivePrompt, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers });
     } finally {
       if (signal) {
         try { signal.removeEventListener('abort', onExternalAbort); } catch { /* ignore */ }
@@ -579,7 +587,7 @@ export class Engine {
    * in a try/finally without indenting the whole loop.
    * @private
    */
-  async *#runQuery({ prompt, messages, signal, userEffort = null, scenario = 'chat' }) {
+  async *#runQuery({ prompt, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers }) {
 
     // ─── Pre-query: Memory Injection (task-287) + Compact Summary ──
     // Two-layer recall:
@@ -618,7 +626,7 @@ export class Engine {
 
     const compactSummary = this.#getCompactSummary();
     const userProfile = recallResult?.profile || '';
-    const systemPrompt = this.#buildSystemPrompt(undefined, compactSummary, prompt, memoryInjection, userProfile);
+    const systemPrompt = this.#buildSystemPrompt(undefined, compactSummary, prompt, memoryInjection, userProfile, vpPersona);
 
     // Build conversation: existing messages + new user message
     const conversationMessages = [
@@ -883,7 +891,7 @@ export class Engine {
       }
 
       // Execute tool calls and feed results back
-      const toolCtx = this.#buildToolContext(signal);
+      const toolCtx = this.#buildToolContext(signal, { router, senderVpId, inboundEnvelope, taskId, taskMembers });
 
       // task-325a: track whether we aborted mid tool-loop so we can
       // break out of the outer while-loop cleanly once the current

package/unify/pipeline/dispatcher.js

@@ -164,6 +164,7 @@ export class Dispatcher {
     transientMeta.set(entry, {
       messageId: opts.messageId || undefined,
       override: opts.override || undefined,
+      queryOpts: opts.queryOpts || undefined,
     });
     const snapshot = this.#queueSnapshot();
     return { entry, snapshot };
@@ -299,7 +300,8 @@ export class Dispatcher {
     }
 
     try {
-      for await (const event of instance.query({ prompt: claimed.text, signal })) {
+      const queryOpts = (transientMeta.get(claimed) || {}).queryOpts || {};
+      for await (const event of instance.query({ prompt: claimed.text, signal, ...queryOpts })) {
         yield { type: 'engine_event', threadId: targetThreadId, event };
       }
       inputQueue.markRouted(claimed.id, targetThreadId);

package/unify/prompts.js

@@ -192,6 +192,9 @@ const PROMPTS = {
     userProfileHeader: '## user_profile',
     coreMemoryHeader: '## core_memory',
     coreMemoryMeta: 'To open the original message behind any entry above, call `memory_trace`.',
+    vpPersonaHeader: '## active_persona',
+    vpPersonaIntro: (name, role) =>
+      `For this turn you are speaking as **${name}**${role ? ` (${role})` : ''}. Stay in character; the persona below overrides the generic Yeaft identity for tone, expertise, and decision style.`,
   },
   zh: {
     identity: '你是 Yeaft，一个有用的 AI 助手。',
@@ -210,6 +213,9 @@ const PROMPTS = {
     userProfileHeader: '## user_profile',
     coreMemoryHeader: '## core_memory',
     coreMemoryMeta: '如需原始 message，调 `memory_trace`。',
+    vpPersonaHeader: '## active_persona',
+    vpPersonaIntro: (name, role) =>
+      `本轮你以 **${name}**${role ? `（${role}）` : ''} 的身份说话。请保持人设：以下 persona 在语气、专业方向与判断风格上覆盖默认的 Yeaft 身份。`,
   },
 };
 
@@ -289,6 +295,7 @@ export function buildSystemPrompt({
   userProfile,
   coreMemory,
   memoryTraceAvailable = false,
+  vpPersona,
 } = {}) {
   // Fallback to English for unknown languages
   const lang = PROMPTS[language] || PROMPTS.en;
@@ -308,6 +315,14 @@ export function buildSystemPrompt({
   // ─── 2. Date Metadata ──────────────────────────────────
   parts.push(lang.date(new Date().toISOString().split('T')[0]));
 
+  // ─── 2.5 VP Persona Override (Bug 3 fix) ───────────────
+  // When the caller (web-bridge / dispatcher) addressed a specific VP via
+  // @-mention, inject that VP's persona body so the LLM stops speaking as
+  // generic Yeaft and adopts the VP's voice. Placed AFTER base identity so
+  // the persona section's directive ("override generic Yeaft") wins.
+  const vpBlock = renderVpPersona(vpPersona, lang);
+  if (vpBlock) parts.push(vpBlock);
+
   // ─── 3. Mode-Specific Instructions ─────────────────────
   // task-297: single unified mode for all normal operation.
   // `dream` is retained for background memory maintenance.
@@ -382,6 +397,36 @@ export function buildSystemPrompt({
 
 // ─── task-334e helpers ───────────────────────────────────────────
 
+/**
+ * Render the `## active_persona` block when the engine is running on
+ * behalf of an addressed VP. Accepts `{ displayName, role?, persona }` —
+ * `persona` is the body text from the VP's role.md (loaded by the engine
+ * via readVp). When `persona` is empty we still emit the intro line so
+ * the LLM at least knows whose voice to adopt; if even displayName is
+ * missing we omit the whole block (no useful signal).
+ *
+ * @param {object} vpPersona
+ * @param {string} vpPersona.displayName
+ * @param {string} [vpPersona.role]
+ * @param {string} [vpPersona.persona]
+ * @param {object} lang
+ * @returns {string}
+ */
+function renderVpPersona(vpPersona, lang) {
+  if (!vpPersona || typeof vpPersona !== 'object') return '';
+  const name = typeof vpPersona.displayName === 'string'
+    ? vpPersona.displayName.trim() : '';
+  if (!name) return '';
+  const role = typeof vpPersona.role === 'string' ? vpPersona.role.trim() : '';
+  const body = typeof vpPersona.persona === 'string' ? vpPersona.persona.trim() : '';
+  const lines = [
+    lang.vpPersonaHeader,
+    lang.vpPersonaIntro(name, role),
+  ];
+  if (body) lines.push('', body);
+  return lines.join('\n');
+}
+
 const DEFAULT_TASK_MEMORY_TOP = 5;
 const DEFAULT_RELATED_TASK_TOP = 3;
 const DEFAULT_RELATED_TASK_MEMORY_TOP = 2;

package/unify/threads/engine-instance.js

@@ -97,7 +97,7 @@ export class EngineInstance {
    * @param {AbortSignal} [params.signal]
    * @yields {object} EngineEvent with { ...event, threadId }
    */
-  async *query({ prompt, mode, signal }) {
+  async *query({ prompt, mode, signal, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers } = {}) {
     if (this.#terminated) {
       yield {
         type: 'error',
@@ -173,7 +173,7 @@ export class EngineInstance {
       curToolResults = [];
     }
 
-    for await (const event of this.#engine.query({ prompt, mode, messages: snapshot, signal })) {
+    for await (const event of this.#engine.query({ prompt, mode, messages: snapshot, signal, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers })) {
       // Re-tag every event with the bound threadId. Non-object events
       // (shouldn't happen — all engine events are objects) are passed
       // through untouched.

package/unify/web-bridge.js

@@ -28,6 +28,7 @@ import ctx from '../context.js';
 import { getThreadStore, MAIN_THREAD_ID } from './threads/store.js';
 import { handleVpSubscribe } from './vp/vp-bridge.js';
 import { createVp, updateVp, deleteVp, readVp, VpCrudError } from './vp/vp-crud.js';
+import { createRouter } from './routing/router.js';
 import { handleUnifyTaskMessage as _handleUnifyTaskMessage } from './task-message.js';
 import {
   handleUnifyUserMemoryWrite as _handleUnifyUserMemoryWrite,
@@ -1165,6 +1166,10 @@ export async function handleUnifyGroupChat(msg) {
         groupId,
         vpId,
         speakerVpId: vpId,
+        // Bug 4: hand the coordinator down so handleUnifyChat can build a
+        // Router for the RouteForward tool. Field is namespaced with `_`
+        // to mark it as an internal hop, never sent over WS.
+        _groupCoordinator: coord,
       });
     } catch (err) {
       console.warn('[Unify] unify_group_chat: per-vp dispatch failed', vpId, err?.message || err);
@@ -1181,6 +1186,42 @@ export async function handleUnifyGroupChat(msg) {
   }
 }
 
+/**
+ * Build the per-query VP context for the Engine.
+ *
+ * - Loads the addressed VP's persona via readVp() so the system prompt
+ *   speaks in that VP's voice (Bug 3 fix).
+ * - When a GroupCoordinator handle is supplied, wraps it in a Router so
+ *   the RouteForward tool actually forwards instead of returning
+ *   `router_unavailable` (Bug 4 fix).
+ *
+ * Returns `undefined` when we have nothing to inject — keeps the legacy
+ * single-agent path identical to before.
+ */
+function buildVpQueryOpts({ vpId, groupCoordinator }) {
+  if (!vpId) return undefined;
+  const out = { senderVpId: vpId };
+  try {
+    const vp = readVp(vpId);
+    if (vp) {
+      out.vpPersona = {
+        displayName: vp.displayName || vpId,
+        role: vp.role || '',
+        persona: vp.persona || '',
+      };
+    }
+  } catch { /* persona load is best-effort */ }
+  if (groupCoordinator && typeof groupCoordinator.ingest === 'function') {
+    try {
+      out.router = createRouter({ coordinator: groupCoordinator });
+    } catch {
+      // Router build failure is non-fatal — RouteForward will report
+      // router_unavailable and the VP can pivot.
+    }
+  }
+  return out;
+}
+
 /**
  * Handle a unify_chat message from the web UI.
  *
@@ -1191,6 +1232,12 @@ export async function handleUnifyGroupChat(msg) {
 export async function handleUnifyChat(msg) {
   const { prompt, mode } = msg;
   if (!prompt?.trim()) return;
+  // Bug 3 / Bug 4 — when the upstream group dispatcher addresses a specific
+  // VP, it stamps `vpId` (and optionally a coordinator handle in
+  // `_groupCoordinator`). Hoist them now so they survive the lazy-init
+  // branch and reach the dispatcher.submit() queryOpts.
+  const vpId = typeof msg.vpId === 'string' && msg.vpId.trim() ? msg.vpId.trim() : null;
+  const groupCoordinator = msg._groupCoordinator || null;
 
   // Deprecation warning — task-297 removed chat/work mode distinction
   if (mode !== undefined && mode !== null) {
@@ -1302,6 +1349,7 @@ export async function handleUnifyChat(msg) {
     const { entry } = session.dispatcher.submit(cleanedPrompt, {
       messageId: msg.messageId,
       override: override || undefined,
+      queryOpts: buildVpQueryOpts({ vpId, groupCoordinator }),
     });
     sendUnifyEvent({
       type: 'input_queue_updated',