@yeaft/webchat-agent 1.0.115 → 1.0.117

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.115",
+  "version": "1.0.117",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/yeaft/engine.js

@@ -379,7 +379,7 @@ export function shouldAllowGroupReflection({
  * @param {{
  *   sessionId?: string|null,
  *   ownVpId?: string|null,
- *   summaries: { user?: string, session?: string, vp?: string }
+ *   summaries: { user?: string, session?: string, vp?: string, topics?: Array<{scope:string, summary:string}> }
  * }} args
  * @returns {Array<{scope: string, summary: string}>}
  */
@@ -390,6 +390,11 @@ export function buildResidentEntries(args) {
   if (args.sessionId && summaries.session) {
     out.push({ scope: `sessions/${args.sessionId}`, summary: summaries.session });
   }
+  if (args.sessionId && Array.isArray(summaries.topics)) {
+    for (const topic of summaries.topics) {
+      if (topic?.scope && topic?.summary) out.push({ scope: topic.scope, summary: topic.summary });
+    }
+  }
   // VP per-session isolation (2026-06-09): the VP summary scope MUST be
   // session-qualified. The legacy bare `vp/<id>` scope was a structural
     // (see #loadLayerASummaries, kind:'group-vp'), so labelling it `vp/<id>`
@@ -783,12 +788,13 @@ export class Engine {
    * dream tick (Phase 6) is what populates these; on a fresh install they
    * all return ''.
    *
-   * @param {{sessionId?: string, vpId?: string, language?: string}} ctx
-   * @returns {Promise<{user:string, session:string, vp:string}>}
+   * @param {{sessionId?: string, vpId?: string, language?: string, topicScopes?: string[]}} ctx
+   * @returns {Promise<{user:string, session:string, vp:string, topics:Array<{scope:string, summary:string}>}>}
    */
-  async #loadLayerASummaries({ sessionId, vpId, language } = {}) {
-    if (!this.#yeaftDir) return { user: '', session: '', vp: '' };
+  async #loadLayerASummaries({ sessionId, vpId, language, topicScopes } = {}) {
+    if (!this.#yeaftDir) return { user: '', session: '', vp: '', topics: [] };
     const memoryRoot = `${this.#yeaftDir}/memory`;
+    const topicScopeList = Array.isArray(topicScopes) ? topicScopes.slice(0, 12) : [];
     const tasks = [
       readScopeSummary({ kind: 'user' }, { root: memoryRoot, language }).catch(() => ''),
       sessionId
@@ -797,17 +803,24 @@ export class Engine {
       vpId && sessionId
         ? readScopeSummary({ kind: 'session-vp', sessionId, id: vpId }, { root: memoryRoot, language }).catch(() => '')
         : Promise.resolve(''),
+      Promise.all(topicScopeList.map(scope => readTopicSummary(scope, { root: memoryRoot, language }))),
     ];
-    const [user, session, vp] = await Promise.all(tasks);
-    return { user: user || '', session: session || '', vp: vp || '' };
+    const [user, session, vp, topicsRaw] = await Promise.all(tasks);
+    const topics = (topicsRaw || []).filter(t => t && t.summary);
+    return { user: user || '', session: session || '', vp: vp || '', topics };
   }
 
   async #loadSessionTopicLabels(sessionId, limit = 8) {
+    return (await this.#loadSessionTopicScopes(sessionId, limit))
+      .map(scope => scope.replace(/^sessions\/[^/]+\/topic\//, ''));
+  }
+
+  async #loadSessionTopicScopes(sessionId, limit = 24) {
     if (!this.#yeaftDir || !sessionId) return [];
     const topicRoot = join(this.#yeaftDir, 'memory', 'sessions', sessionId, 'topic');
     const labels = [];
     await collectTopicLabels(topicRoot, '', labels, limit).catch(() => {});
-    return labels;
+    return labels.map(label => `sessions/${sessionId}/topic/${label}`);
   }
 
   /**
@@ -1240,7 +1253,7 @@ export class Engine {
    * without injection.
    *
    * @param {string} prompt
-   * @param {{ sessionId?: string, vpId?: string }} [ctx]
+   * @param {{ sessionId?: string, vpId?: string, extraScopes?: string[] }} [ctx]
    * @returns {Promise<{ profile: string, entries: object[], formatted: string }|null>}
    */
   async #recallMemory(prompt, ctx = {}) {
@@ -1252,6 +1265,8 @@ export class Engine {
         sessionId: ctx.sessionId,
         chatId: ctx.chatId || this.#chatId,
         vpId: ctx.vpId,
+        extraScopes: ctx.extraScopes,
+        fallbackOnEmpty: true,
       });
       memory.profile = result.profile || '';
       memory.entries = result.entries || [];
@@ -1784,11 +1799,13 @@ export class Engine {
     let memoryInjection = '';
     let recallEntryCount = 0;
 
+    const topicScopesForMemory = await this.#loadSessionTopicScopes(sessionId);
     const recallResult = await this.#recallMemory(prompt, {
       sessionId,
       vpId: vpPersona && typeof vpPersona === 'object' && typeof vpPersona.vpId === 'string'
         ? vpPersona.vpId
         : (typeof senderVpId === 'string' ? senderVpId : undefined),
+      extraScopes: topicScopesForMemory,
     });
     recallEntryCount = recallResult && Array.isArray(recallResult.entries)
       ? recallResult.entries.length
@@ -1806,6 +1823,7 @@ export class Engine {
         ? vpPersona.vpId
         : (typeof senderVpId === 'string' ? senderVpId : undefined),
       language: this.#config.language || 'en',
+      topicScopes: topicScopesForMemory,
     });
 
     // ─── AMS: populate + snapshot ───────────────────────────────
@@ -1837,9 +1855,13 @@ export class Engine {
     // frontend state. The full system prompt remains visible in the existing
     // debug-only system-prompt panel.
     const activeGroupDreamScope = sessionId ? `sessions/${sessionId}` : null;
+    const activeTopicDreamPrefix = sessionId ? `sessions/${sessionId}/topic/` : null;
     const dreamResidentLoaded = amsContext && Array.isArray(amsContext.residentEntries)
       ? amsContext.residentEntries
-        .filter(e => e && e.scope === activeGroupDreamScope && e.summary)
+        .filter(e => e && e.summary && (
+          e.scope === activeGroupDreamScope
+          || (activeTopicDreamPrefix && e.scope?.startsWith(activeTopicDreamPrefix))
+        ))
         .map(e => ({
           scope: e.scope,
           summary: String(e.summary).slice(0, 4000),
@@ -1854,7 +1876,7 @@ export class Engine {
     // only IDs + tiny labels. (Feature scope retired 2026-05-13.)
     const activeSessionTopics = Array.isArray(sessionTopics)
       ? sessionTopics
-      : await this.#loadSessionTopicLabels(sessionId);
+      : topicScopesForMemory.slice(0, 8).map(scope => scope.replace(/^sessions\/[^/]+\/topic\//, ''));
     const activeScope = {
       sessionId: sessionId || '',
       sessionMember: ownVpIdForAms || '',
@@ -3738,6 +3760,18 @@ export class Engine {
   }
 }
 
+async function readTopicSummary(scope, opts) {
+  const m = /^sessions\/([^/]+)\/topic\/(.+)$/.exec(String(scope || ''));
+  if (!m) return null;
+  const path = m[2].split('/').filter(Boolean);
+  if (path.length === 0) return null;
+  const summary = await readScopeSummary(
+    { kind: 'session-topic', sessionId: m[1], path },
+    opts,
+  ).catch(() => '');
+  return summary ? { scope, summary } : null;
+}
+
 async function collectTopicLabels(dir, prefix, labels, limit) {
   if (labels.length >= limit) return;
   let entries;

package/yeaft/memory/store.js

@@ -240,7 +240,7 @@ export function isValidTopic(scope) {
  */
 export function isVpForeign(relPath, currentVpId) {
   if (!relPath || !currentVpId) return false;
-  const m = /^(?:group|chat|session)\/[^/]+\/vp\/([^/]+)(?:\/|$)/.exec(relPath);
+  const m = /^(?:group|chat|sessions?)\/[^/]+\/vp\/([^/]+)(?:\/|$)/.exec(relPath);
   if (!m) return false;
   return m[1] !== currentVpId;
 }

package/yeaft/sessions/pre-flow.js

@@ -22,7 +22,8 @@
  * {profile, entries, formatted} shape the engine already consumes.
  */
 
-import { runPreflow as runFtsPreflow } from '../memory/preflow.js';
+import { runPreflow as runFtsPreflow, filterScopes } from '../memory/preflow.js';
+import { approxTokens } from '../memory/budget.js';
 import { resolveFallbackVp, resolveMemberId } from './roster.js';
 
 /** Matches `@vp-id` where id is [A-Za-z0-9_-]+. Captures the id. */
@@ -179,6 +180,8 @@ function scopeHeading(scope) {
   if (m) return `## Memory: Session ${m[1]} (user)`;
   m = /^session\/([^/]+)\/feature\/(.+)$/.exec(scope);
   if (m) return `## Memory: Feature ${m[2]}`;
+  m = /^sessions\/([^/]+)\/topic\/(.+)$/.exec(scope);
+  if (m) return `## Memory: Topic ${m[2]}`;
   m = /^session\/([^/]+)\/topic\/(.+)$/.exec(scope);
   if (m) return `## Memory: Topic ${m[2]}`;
   // Legacy nested group scopes (un-migrated data).
@@ -239,6 +242,8 @@ export function formatPickedForInjection(picked) {
  * @property {string[]}       [currentTags]        Contextual tags for rerank
  * @property {number}         [topK]               Max FTS rows fetched (default 50)
  * @property {number}         [budgetTokens]       Token budget for picked segments
+ * @property {boolean}        [fallbackOnEmpty]    Include bounded recent scoped segments when FTS has no hits
+ * @property {number}         [fallbackPerScope]   Max fallback segments per scope
  */
 
 /**
@@ -282,14 +287,17 @@ export function buildRelevantScopes({ sessionId, chatId, vpId, extra } = {}) {
       scopes.push(`group/${sessionId}/vp/${vpId}`);
     }
   }
-  if (Array.isArray(extra)) {
-    for (const s of extra) {
-      if (s && !scopes.includes(s)) scopes.push(s);
-    }
-  }
+  appendUniqueScopes(scopes, extra);
   return scopes;
 }
 
+function appendUniqueScopes(scopes, extra) {
+  if (!Array.isArray(extra)) return;
+  for (const s of extra) {
+    if (s && !scopes.includes(s)) scopes.push(s);
+  }
+}
+
 /**
  * Run memory pre-flow for one VP turn. Thin wrapper around
  * `memory/preflow.js::runPreflow` that:
@@ -321,7 +329,7 @@ export function runMemoryPreflow(index, opts) {
     extra: opts.extraScopes,
   });
 
-  const result = runFtsPreflow(index, {
+  let result = runFtsPreflow(index, {
     userMsg,
     relevantScopes,
     ownVpId: opts.vpId || null,
@@ -330,6 +338,25 @@ export function runMemoryPreflow(index, opts) {
     budgetTokens: opts.budgetTokens,
   });
 
+  let fallbackUsed = false;
+  if ((result.picked || []).length === 0 && opts.fallbackOnEmpty) {
+    const fallback = fallbackScopedSegments(index, {
+      relevantScopes,
+      ownVpId: opts.vpId || null,
+      budgetTokens: opts.budgetTokens,
+      perScope: opts.fallbackPerScope,
+    });
+    if (fallback.length > 0) {
+      fallbackUsed = true;
+      result = {
+        ...result,
+        picked: fallback,
+        pickedTokens: estimatePickedTokens(fallback),
+        droppedCount: result.droppedCount || 0,
+      };
+    }
+  }
+
   // Best-effort profile: pick any user-scope segment body.
   const userSeg = (result.picked || []).find(p => p.scope === 'user');
   const profile = userSeg ? (userSeg.body || '').trim() : '';
@@ -346,6 +373,61 @@ export function runMemoryPreflow(index, opts) {
       pickedTokens: result.pickedTokens,
       droppedCount: result.droppedCount,
       hitCount: (result.hits || []).length,
+      fallbackUsed,
     },
   };
 }
+
+function fallbackScopedSegments(index, opts) {
+  if (!index || typeof index.listByScope !== 'function') return [];
+  const scopes = prioritizeFallbackScopes(filterScopes(opts.relevantScopes || [], opts.ownVpId || null));
+  const perScope = Number.isFinite(opts.perScope) && opts.perScope > 0 ? Math.floor(opts.perScope) : 2;
+  const budgetTokens = Number.isFinite(opts.budgetTokens) && opts.budgetTokens > 0 ? opts.budgetTokens : 1200;
+  const buckets = [];
+  for (const scope of scopes) {
+    let segs = [];
+    try { segs = index.listByScope(scope) || []; } catch { continue; }
+    segs = [...segs]
+      .filter(seg => (seg?.body || '').trim())
+      .sort(compareSegmentRecency)
+      .slice(0, perScope);
+    if (segs.length > 0) buckets.push(segs);
+  }
+
+  const out = [];
+  let cost = 0;
+  for (let i = 0; i < perScope; i += 1) {
+    for (const bucket of buckets) {
+      const seg = bucket[i];
+      if (!seg) continue;
+      const tk = approxTokens(seg.body || '');
+      if (tk <= 0 || cost + tk > budgetTokens) continue;
+      out.push(seg);
+      cost += tk;
+    }
+  }
+  return out;
+}
+
+function prioritizeFallbackScopes(scopes) {
+  const topic = [];
+  const rest = [];
+  for (const scope of scopes) {
+    if (/^(?:sessions|session|group)\/[^/]+\/topic\//.test(scope)) topic.push(scope);
+    else rest.push(scope);
+  }
+  return [...topic, ...rest];
+}
+
+function compareSegmentRecency(a, b) {
+  return timestampOf(b) - timestampOf(a);
+}
+
+function timestampOf(seg) {
+  const t = Date.parse(seg?.updatedAt || seg?.createdAt || '');
+  return Number.isFinite(t) ? t : 0;
+}
+
+function estimatePickedTokens(segments) {
+  return (segments || []).reduce((sum, seg) => sum + approxTokens(seg?.body || ''), 0);
+}