@yeaft/webchat-agent 0.1.850 → 0.1.852

package/package.json

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

package/unify/conversation/persist.js

@@ -22,7 +22,7 @@ import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, rename
 import { join, basename } from 'path';
 import { isPermissionError } from '../init.js';
 import { pairSanitize } from '../pair-sanitize.js';
-import { sliceLastNTurns } from '../turn-utils.js';
+import { indexOfNthTurnFromEnd, sliceLastNTurns } from '../turn-utils.js';
 
 /**
  * Default cold-start "recent window" size, expressed in TURNS (not raw
@@ -329,6 +329,7 @@ export class ConversationStore {
   #coldDir;     // ~/.yeaft/conversation/cold
   #indexPath;   // ~/.yeaft/conversation/index.md
   #compactPath; // ~/.yeaft/conversation/compact.md
+  #compactScopedDir; // ~/.yeaft/conversation/compact/  (per-(group,vp))
   #nextSeq;     // next message sequence number (global, legacy)
   #nextSeqByThread; // Map<threadId, number> — per-thread counters (task-314)
 
@@ -342,11 +343,15 @@ export class ConversationStore {
     this.#coldDir = join(dir, 'conversation', 'cold');
     this.#indexPath = join(dir, 'conversation', 'index.md');
     this.#compactPath = join(dir, 'conversation', 'compact.md');
+    // Per-(groupId, vpId) compact summary files live here. The legacy
+    // single-file `compact.md` above is kept for backward compatibility
+    // and the "no groupId/vpId" fallback (sub-agents, legacy callers).
+    this.#compactScopedDir = join(dir, 'conversation', 'compact');
     this.#nextSeq = null;
     this.#nextSeqByThread = new Map();
 
     // Ensure directories exist (graceful on permission errors)
-    for (const d of [this.#convDir, this.#msgDir, this.#coldDir]) {
+    for (const d of [this.#convDir, this.#msgDir, this.#coldDir, this.#compactScopedDir]) {
       try {
         if (!existsSync(d)) mkdirSync(d, { recursive: true, mode: 0o755 });
       } catch (err) {
@@ -481,6 +486,111 @@ export class ConversationStore {
     return readFileSync(this.#compactPath, 'utf8');
   }
 
+  /**
+   * Sanitize one id (groupId or vpId) into a safe filename component.
+   * Anything outside `[A-Za-z0-9._-]` collapses to `_`; max 120 chars.
+   * The result is only ever used as a basename joined to `compactScopedDir`
+   * — path traversal is blocked by the basename-only `join`, not by the
+   * regex (a literal `..` stays as `..` here and becomes part of a
+   * regular filename via the `__` separator + `.md` suffix).
+   *
+   * @param {string} s
+   * @returns {string}
+   */
+  #safeIdComponent(s) {
+    return String(s).replace(/[^A-Za-z0-9._-]/g, '_').slice(0, 120);
+  }
+
+  /**
+   * Sanitize a (groupId, vpId) pair into a safe filename. We accept
+   * arbitrary user strings here (groupIds and vpIds are user-set), so
+   * the result is purely a basename — never parsed back.
+   *
+   * @param {string} groupId
+   * @param {string} vpId
+   * @returns {string|null} — full path, or null if either id missing
+   */
+  #scopedCompactPath(groupId, vpId) {
+    if (!groupId || !vpId) return null;
+    return join(this.#compactScopedDir, `${this.#safeIdComponent(groupId)}__${this.#safeIdComponent(vpId)}.md`);
+  }
+
+  /**
+   * Read a per-(groupId, vpId) compact summary. Returns '' if no summary
+   * has been written yet. Falls back to nothing — callers that need the
+   * legacy global file should call `readCompactSummary()` explicitly.
+   *
+   * The (group, vp) scoping was introduced after we noticed the legacy
+   * single-file `compact.md` was shared across every group AND every VP
+   * in a session — so each new compact would clobber/append on top of
+   * unrelated content and every VP read the same merged blob. See
+   * `engine.#runOrchestratorCompact`.
+   *
+   * @param {string} groupId
+   * @param {string} vpId
+   * @returns {string}
+   */
+  readCompactSummaryFor(groupId, vpId) {
+    const path = this.#scopedCompactPath(groupId, vpId);
+    if (!path) return '';
+    if (!existsSync(path)) return '';
+    try { return readFileSync(path, 'utf8'); }
+    catch { return ''; }
+  }
+
+  /**
+   * Append a per-(groupId, vpId) compact summary entry. Same append-only
+   * "## YYYY-MM-DD ..." structure as the legacy `updateCompactSummary`,
+   * but isolated to one file per (group, vp).
+   *
+   * @param {string} groupId
+   * @param {string} vpId
+   * @param {string} summary
+   */
+  updateCompactSummaryFor(groupId, vpId, summary) {
+    const path = this.#scopedCompactPath(groupId, vpId);
+    if (!path) return;
+    let existing = '';
+    if (existsSync(path)) {
+      try { existing = readFileSync(path, 'utf8'); }
+      catch { existing = ''; }
+    }
+    const date = new Date().toISOString().split('T')[0];
+    const entry = `\n## ${date}\n\n${summary}\n`;
+    try {
+      writeFileSync(path, existing + entry, { encoding: 'utf8', mode: 0o644 });
+    } catch (err) {
+      if (isPermissionError(err)) {
+        if (!_permissionWarned) {
+          console.warn(`[Yeaft] Cannot write scoped compact summary: ${err.code}`);
+          _permissionWarned = true;
+        }
+      } else {
+        throw err;
+      }
+    }
+  }
+
+  /**
+   * Check whether ANY per-(group, vp) compact summary exists for `groupId`.
+   * Used by the history-replay path to decide whether to flag
+   * `hasCompactSummary` for the UI without committing to one VP's view.
+   *
+   * @param {string} groupId
+   * @returns {boolean}
+   */
+  hasAnyCompactSummaryForGroup(groupId) {
+    if (!groupId) return false;
+    if (!existsSync(this.#compactScopedDir)) return false;
+    const prefix = `${this.#safeIdComponent(groupId)}__`;
+    try {
+      for (const f of readdirSync(this.#compactScopedDir)) {
+        if (f.startsWith(prefix) && f.endsWith('.md')) return true;
+      }
+    } catch { /* best-effort */ }
+    return false;
+  }
+
   /**
    * Update the conversation index.md with current state.
    *
@@ -635,6 +745,71 @@ export class ConversationStore {
     return this.loadRecentByGroup(groupId, Infinity);
   }
 
+  /**
+   * VP-scoped view of group history, used by per-VP post-turn compact.
+   *
+   * Compact must operate on what the VP actually *saw* in its context,
+   * not the union of every VP's tool calls/results — otherwise compact
+   * tries to summarize tool transcripts that were never in this VP's
+   * prompt window. The rule we settled on (with the user, 2026-06-01):
+   *
+   *   - User rows (no speakerVpId): KEEP — every VP sees the prompt.
+   *   - This VP's own assistant rows + their paired tool rows: KEEP.
+   *   - OTHER VPs' assistant rows: KEEP TEXT ONLY (strip toolCalls AND
+   *     thinkingBlocks — thinking is VP-private per Anthropic's signed-
+   *     block contract and would never appear in another VP's context).
+   *   - OTHER VPs' tool result rows (role:'tool'): DROP — they pair with
+   *     stripped tool_use ids and would orphan on replay.
+   *   - Rows with `_reflection` / `internal` / `systemOnly`: DROP — they
+   *     are engine-private and never enter another VP's context.
+   *
+   * The output is pair-safe by construction for THIS VP's tool arcs and
+   * carries only summary-relevant text for the other VPs.
+   *
+   * @param {string} groupId
+   * @param {string} vpId
+   * @returns {object[]}
+   */
+  loadGroupHistoryForVp(groupId, vpId) {
+    if (!groupId || !vpId) return [];
+    const all = this.#loadFromDir(this.#msgDir, Infinity);
+    const out = [];
+    for (const m of all) {
+      if (!m || m.groupId !== groupId) continue;
+      if (m._reflection || m.internal || m.systemOnly || m.systemOnlyMessage) continue;
+      if (m.role === 'user') {
+        out.push(m);
+        continue;
+      }
+      if (m.role === 'assistant') {
+        if (m.speakerVpId === vpId) {
+          out.push(m);
+        } else {
+          // Other VP's assistant text only — drop their toolCalls so the
+          // following role:'tool' rows (which we also drop) don't leave
+          // orphan tool_use ids in the compact input.
+          const copy = { ...m };
+          delete copy.toolCalls;
+          delete copy.thinkingBlocks;
+          out.push(copy);
+        }
+        continue;
+      }
+      if (m.role === 'tool') {
+        // Tool results belong to the assistant turn that emitted the
+        // tool_use. Only keep ours; other VPs' results were dropped via
+        // their assistant's stripped toolCalls.
+        if (m.speakerVpId === vpId) out.push(m);
+        continue;
+      }
+    }
+    // Note: we don't run `sliceLastNTurns` here. The caller
+    // (#runOrchestratorCompact) decides what's "cooling" via
+    // `partitionMessages`, and we don't want to pre-truncate before that
+    // budget calc sees the full picture.
+    return pairSanitize(out);
+  }
+
   /**
    * Pagination-cursor read: load the page of `turnsLimit` TURNS that ends
    * just before `beforeSeq` (exclusive) for the given `groupId`. Used by
@@ -695,6 +870,43 @@ export class ConversationStore {
     return { messages: sliced, oldestSeq, hasMore };
   }
 
+  /**
+   * Visible UI pagination read for one group. Unlike `loadOlderByGroup`, this
+   * projects out internal/reflection/system rows BEFORE applying the turn
+   * window, so a dense run of hidden metadata cannot force the first screen to
+   * scan and materialize the group's entire history in the web bridge.
+   *
+   * @param {string} groupId
+   * @param {number|null} beforeSeq — exclusive upper bound, or null for newest
+   * @param {number} [turnsLimit=DEFAULT_RECENT_TURNS]
+   * @returns {{ messages: object[], oldestSeq: number|null, hasMore: boolean }}
+   */
+  loadVisibleByGroup(groupId, beforeSeq, turnsLimit = DEFAULT_RECENT_TURNS) {
+    if (!groupId || !(turnsLimit > 0)) return { messages: [], oldestSeq: null, hasMore: false };
+
+    const cutoff = Number.isFinite(beforeSeq) ? beforeSeq : Infinity;
+    const hot = this.#loadVisibleFromDirByGroup(this.#msgDir, groupId, cutoff);
+    const cold = this.#loadVisibleFromDirByGroup(this.#coldDir, groupId, cutoff);
+    const visible = [...cold, ...hot];
+    if (visible.length === 0) return { messages: [], oldestSeq: null, hasMore: false };
+
+    const startIdx = indexOfNthTurnFromEnd(visible, turnsLimit);
+    const start = startIdx === -1 ? 0 : startIdx;
+    const messages = pairSanitize(visible.slice(start));
+    const oldestSeq = messages.length ? parseSeqFromId(messages[0].id) : null;
+    const firstVisibleSeq = parseSeqFromId(visible[0].id);
+    const hasMore = messages.length > 0
+      && Number.isFinite(oldestSeq)
+      && Number.isFinite(firstVisibleSeq)
+      && oldestSeq > firstVisibleSeq;
+
+    return {
+      messages,
+      oldestSeq: Number.isFinite(oldestSeq) ? oldestSeq : null,
+      hasMore,
+    };
+  }
+
   /**
    * Count hot messages.
    *
@@ -1144,6 +1356,32 @@ export class ConversationStore {
     return messages;
   }
 
+  #loadVisibleFromDirByGroup(dir, groupId, beforeSeq) {
+    if (!existsSync(dir)) return [];
+
+    const files = readdirSync(dir)
+      .filter(f => f.endsWith('.md'))
+      .sort();
+
+    const out = [];
+    for (const file of files) {
+      const seq = parseSeqFromId(basename(file, '.md'));
+      if (!Number.isFinite(seq) || seq >= beforeSeq) continue;
+
+      const raw = readFileSync(join(dir, file), 'utf8');
+      if (!raw.includes(`groupId: ${groupId}`)) continue;
+      if (!raw.includes('role: user') && !raw.includes('role: assistant')) continue;
+
+      const parsed = parseMessage(raw);
+      if (!parsed || parsed.groupId !== groupId) continue;
+      if (parsed._reflection || parsed.internal || parsed.systemOnly || parsed.systemOnlyMessage) continue;
+      if (parsed.role !== 'user' && parsed.role !== 'assistant') continue;
+      out.push(parsed);
+    }
+
+    return out;
+  }
+
   /**
    * Determine the next sequence number by scanning existing files.
    * @returns {number}

package/unify/engine.js

@@ -302,6 +302,10 @@ export class Engine {
 
   /** @type {string|null} */
   #yeaftDir;
+  /** @type {string|null} — set when this engine is bound to a specific group (per-VP fan-out path). */
+  #groupId = null;
+  /** @type {string|null} — set when this engine is bound to a specific VP (per-VP fan-out path). */
+  #vpId = null;
 
   /** @type {import('./stats/tool-usage.js').ToolUsageStats|null} — per-tool call/latency counters */
   #toolStats = null;
@@ -402,7 +406,7 @@ export class Engine {
    *   toolStats?: import('./stats/tool-usage.js').ToolUsageStats,
    * }} params
    */
-  constructor({ adapter, trace, config, conversationStore, memoryIndex, amsRegistry, toolRegistry, skillManager, mcpManager, yeaftDir, toolStats = null }) {
+  constructor({ adapter, trace, config, conversationStore, memoryIndex, amsRegistry, toolRegistry, skillManager, mcpManager, yeaftDir, toolStats = null, groupId = null, vpId = null }) {
     this.#adapter = adapter;
     this.#trace = trace;
     this.#config = config;
@@ -416,6 +420,14 @@ export class Engine {
     this.#mcpManager = mcpManager || null;
     this.#yeaftDir = yeaftDir || null;
     this.#toolStats = toolStats || null;
+    // Per-VP fan-out (2026-06-01): engine instances in the group path are
+    // keyed by ${groupId}::${vpId}::${threadId}, so binding the engine to
+    // its (groupId, vpId) pair at construction lets post-turn compact
+    // scope its read/write to THIS VP's view of the conversation instead
+    // of clobbering a session-global compact.md. Legacy / sub-agent
+    // callers leave both null → fall back to the global file.
+    this.#groupId = (typeof groupId === 'string' && groupId) ? groupId : null;
+    this.#vpId = (typeof vpId === 'string' && vpId) ? vpId : null;
 
     // PR-L: tool history reflection log. Keyed by traceId so distinct
     // engine instances don't stomp on each other's jsonl files. When
@@ -978,6 +990,16 @@ export class Engine {
    */
   #getCompactSummary() {
     if (!this.#conversationStore) return '';
+    // Per-(group, vp) scoping: when this engine is bound to a fan-out VP,
+    // read its own summary file. On a miss (empty scoped file) we fall
+    // through to the legacy global file so pre-PR sessions whose only
+    // summary lives in compact.md still surface their context — matches
+    // the OR-fallback in web-bridge's `hasCompactSummary` flag.
+    if (this.#groupId && this.#vpId
+        && typeof this.#conversationStore.readCompactSummaryFor === 'function') {
+      const scoped = this.#conversationStore.readCompactSummaryFor(this.#groupId, this.#vpId);
+      if (scoped) return scoped;
+    }
     return this.#conversationStore.readCompactSummary();
   }
 
@@ -1063,14 +1085,30 @@ export class Engine {
     const adapter = this.#adapter;
     const fastConfig = this.#fastConfig;
 
+    // Per-(group, vp) scoping: when this engine is bound to a fan-out VP
+    // (the common case in group mode), load only the rows THIS VP saw in
+    // its context — user prompts + every VP's assistant text, with other
+    // VPs' tool calls/results stripped (see persist.loadGroupHistoryForVp).
+    //
+    // Legacy / sub-agent callers (no groupId/vpId pair) keep the global
+    // loadAll() behaviour so we don't break those flows.
     let messages;
+    const scoped = !!(this.#groupId && this.#vpId
+      && typeof conversationStore.loadGroupHistoryForVp === 'function');
     try {
-      messages = conversationStore.loadAll();
+      messages = scoped
+        ? conversationStore.loadGroupHistoryForVp(this.#groupId, this.#vpId)
+        : conversationStore.loadAll();
     } catch { return null; }
     if (!Array.isArray(messages) || messages.length === 0) return null;
 
     const tokenCount = conversationStore.hotTokens();
-    const groupId = messages.find(m => m && typeof m.groupId === 'string' && m.groupId)?.groupId || null;
+    // In the scoped path, groupId is the engine's binding (authoritative).
+    // In the legacy path, fall back to scanning the messages (best-effort,
+    // used only for the group context-window gate).
+    const groupId = this.#groupId
+      || messages.find(m => m && typeof m.groupId === 'string' && m.groupId)?.groupId
+      || null;
     const groupContextGate = shouldAllowGroupReflection({
       system: '',
       messages,
@@ -1130,7 +1168,13 @@ export class Engine {
         }
       },
       archive: async (_groupIdx, groupMsgs) => {
-        for (const m of groupMsgs) if (m.id) archiveIds.push(m.id);
+        // Only collect archive ids when we'll actually use them. In the
+        // scoped (per-VP) path we never call moveToColdBatch — those
+        // rows are shared with sibling VPs in this group — so leaving
+        // the push in would be dead state a future reader has to chase.
+        if (!scoped) {
+          for (const m of groupMsgs) if (m.id) archiveIds.push(m.id);
+        }
         const turnId = groupMsgs[0]?.id || `g_${Date.now()}`;
         if (this.#yeaftDir) {
           try {
@@ -1150,10 +1194,28 @@ export class Engine {
       const out = await runCompactOrchestrator({
         messages, keepHot: 10, hooks,
       });
-      if (archiveIds.length > 0) conversationStore.moveToColdBatch(archiveIds);
-      if (out.compactSummary) conversationStore.updateCompactSummary(out.compactSummary);
-      const lastKept = messages[messages.length - 1];
-      conversationStore.updateIndex({ lastMessageId: lastKept?.id || null });
+      // Scoped path (per-(group, vp)): do NOT moveToColdBatch — those
+      // archive ids include user rows and other VPs' assistant rows that
+      // sibling VPs in this group still need in their hot context. The
+      // per-VP summary written below is the durable win; physical
+      // cold-archival across shared rows is the dream-level orchestrator's
+      // job, not post-turn compact's.
+      if (!scoped && archiveIds.length > 0) {
+        conversationStore.moveToColdBatch(archiveIds);
+      }
+      if (out.compactSummary) {
+        if (scoped && typeof conversationStore.updateCompactSummaryFor === 'function') {
+          conversationStore.updateCompactSummaryFor(this.#groupId, this.#vpId, out.compactSummary);
+        } else {
+          conversationStore.updateCompactSummary(out.compactSummary);
+        }
+      }
+      // Index update only makes sense for the legacy path that actually
+      // moved rows to cold. In the scoped path, nothing on disk changed.
+      if (!scoped) {
+        const lastKept = messages[messages.length - 1];
+        conversationStore.updateIndex({ lastMessageId: lastKept?.id || null });
+      }
 
       return {
         archivedCount: out.archivedMessages,

package/unify/web-bridge.js

@@ -602,10 +602,16 @@ function loadVisibleGroupHistoryPage(store, groupId, limit, beforeSeq = null) {
 
   let rows = [];
   try {
-    if (typeof store.loadOlderByGroup === 'function') {
-      // Use an unbounded raw prefix, then project/slice visible rows below.
-      // This preserves loadOlderByGroup's hot+cold scan without letting raw
-      // reflection/internal rows consume the UI-visible page window.
+    if (typeof store.loadVisibleByGroup === 'function') {
+      const page = store.loadVisibleByGroup(groupId, beforeSeq, limit);
+      return {
+        messages: (page.messages || []).map(projectPersistedToVisibleHistoryEntry).filter(Boolean),
+        oldestSeq: (typeof page.oldestSeq === 'number') ? page.oldestSeq : null,
+        hasMore: !!page.hasMore,
+      };
+    } else if (typeof store.loadOlderByGroup === 'function') {
+      // Compatibility fallback for older test doubles: use an unbounded raw
+      // prefix, then project/slice visible rows below.
       rows = store.loadOlderByGroup(groupId, beforeSeq, Infinity).messages || [];
     } else if (Number.isFinite(beforeSeq)) {
       const all = typeof store.loadAllByGroup === 'function'
@@ -851,6 +857,12 @@ function getOrCreateVpEngine(groupId, vpId, threadId = 'main') {
     // (`if (this.#toolStats && ...)`) is false and group VP tool calls
     // are silently dropped.
     toolStats: session.toolStats || null,
+    // Per-VP fan-out: bind the engine to its (groupId, vpId) so post-turn
+    // compact reads/writes a scoped summary instead of the legacy global
+    // compact.md (which every VP would otherwise share, producing
+    // identical, ever-growing summaries across groups).
+    groupId,
+    vpId,
   });
   vpEngines.set(key, eng);
   return eng;
@@ -3576,11 +3588,10 @@ export async function handleUnifyLoadHistory(msg) {
   }
 
   // `msg.limit` is the replay-scrollback request from the frontend (UI
-  // history pane, not engine context). Semantics changed (2026-05-01):
-  // now expressed in TURNS. The previous default (50 messages) maps to
-  // ~20–25 turns; in the turn-count world 50 turns of UI scrollback is
-  // still cheap and matches what the frontend already passes through.
-  const limit = (typeof msg.limit === 'number') ? msg.limit : 50;
+  // history pane, not engine context). Keep the bootstrap window small so
+  // opening a group can paint the latest messages quickly; older rows are
+  // paged via `unify_load_more_history` when the user scrolls upward.
+  const limit = (typeof msg.limit === 'number') ? msg.limit : 10;
   const visiblePage = groupId
     ? loadVisibleGroupHistoryPage(session.conversationStore, groupId, limit)
     : { messages: limit > 0 ? pickRecent(session.conversationStore, limit) : [], oldestSeq: null, hasMore: false };
@@ -3634,10 +3645,21 @@ export async function handleUnifyLoadHistory(msg) {
     oldestSeq = visiblePage.oldestSeq;
   }
 
+  // hasCompactSummary used to read a single session-global file, so it
+  // was always true once ANY group/VP in the session had compacted.
+  // Now we check (a) the scoped dir for any per-VP summary file in this
+  // group, falling back to (b) the legacy global file for sessions that
+  // pre-date the per-(group, vp) split.
+  let hasCompactSummaryFlag = !!compactSummary;
+  if (groupId && typeof session.conversationStore.hasAnyCompactSummaryForGroup === 'function') {
+    hasCompactSummaryFlag = session.conversationStore.hasAnyCompactSummaryForGroup(groupId)
+      || hasCompactSummaryFlag;
+  }
+
   sendUnifyEvent({
     type: 'history_loaded',
     count: replayEntries.length,
-    hasCompactSummary: !!compactSummary,
+    hasCompactSummary: hasCompactSummaryFlag,
     totalHot: session.conversationStore.countHot(),
     totalCold: session.conversationStore.countCold(),
     groupId,
@@ -3674,7 +3696,7 @@ export async function handleUnifyLoadMoreHistory(msg) {
   }
 
   const beforeSeq = (typeof msg.beforeSeq === 'number') ? msg.beforeSeq : null;
-  const turns = (typeof msg.turns === 'number' && msg.turns > 0) ? msg.turns : 20;
+  const turns = (typeof msg.turns === 'number' && msg.turns > 0) ? msg.turns : 10;
 
   let result;
   try {