@yeaft/webchat-agent 1.0.406 → 1.0.407

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.406"}
+{"version":"1.0.407"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.406",
+  "version": "1.0.407",
   "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/dream/triage.js

@@ -145,6 +145,7 @@ export function buildPass2Prompt(ctx) {
  * Run soft classification for one segment of one group's diff.
  *
  * @param {{
+ *   root?: string,
  *   sessionId: string,
  *   messages: Array<object>,
  *   topicSummaries: Array<{ path: string, summary: string }>,
@@ -152,7 +153,7 @@ export function buildPass2Prompt(ctx) {
  * }} args
  * @returns {Promise<Array<{ kind: 'update'|'create', scope: string }>>}
  */
-export async function classifySoft({ sessionId, messages, topicSummaries, llm, language }) {
+export async function classifySoft({ root, sessionId, messages, topicSummaries, llm, language }) {
   if (!llm) throw new Error('triage.classifySoft: llm callable required');
   const pass1Prompt = buildPass1Prompt({ sessionId, messages, topicSummaries, language });
   const pass1Raw = await llm({ pass: 'triage-pass1', prompt: pass1Prompt, system: triageSystem(language) });
@@ -183,8 +184,8 @@ export async function classifySoft({ sessionId, messages, topicSummaries, llm, l
     const segs = path.split('/').filter(Boolean);
     if (!sessionId || sessionId === '_no-session') continue;
     if (!isValidTopic({ kind: 'session-topic', sessionId, path: segs })) continue;
-    const redirected = args.root
-      ? resolveTopicRedirect(args.root, sessionId, segs.join('/'))
+    const redirected = root
+      ? resolveTopicRedirect(root, sessionId, segs.join('/'))
       : segs.join('/');
     const scope = `sessions/${sessionId}/topic/${redirected}`;
     if (pass2.decision === 'match') {

package/yeaft/engine.js

@@ -1486,7 +1486,7 @@ export class Engine {
    * without injection.
    *
    * @param {string} prompt
-   * @param {{ sessionId?: string, vpId?: string, extraScopes?: string[] }} [ctx]
+   * @param {{ sessionId?: string, vpId?: string, extraScopes?: string[], strictScopes?: string[] }} [ctx]
    * @returns {Promise<{ profile: string, entries: object[], formatted: string }|null>}
    */
   async #recallMemory(prompt, ctx = {}) {
@@ -1499,6 +1499,7 @@ export class Engine {
         chatId: ctx.chatId || this.#chatId,
         vpId: ctx.vpId,
         extraScopes: ctx.extraScopes,
+        strictScopes: ctx.strictScopes,
         pickLimit: resolveMemoryRecallLimit(this.#config),
         uniqueScopes: true,
         canonicalOnly: true,
@@ -2300,11 +2301,8 @@ export class Engine {
     const projectScopesForMemory = Array.isArray(projectSessionIds)
       ? projectSessionIds.flatMap(id => [
           `sessions/${id}`,
-          `sessions/${id}/user`,
           `session/${id}`,
-          `session/${id}/user`,
           `group/${id}`,
-          `group/${id}/user`,
         ])
       : [];
     const recallResult = await this.#recallMemory(prompt, {
@@ -2313,6 +2311,10 @@ export class Engine {
         ? vpPersona.vpId
         : (typeof senderVpId === 'string' ? senderVpId : undefined),
       extraScopes: [...topicScopesForMemory, ...projectScopesForMemory],
+      // Global user memory and Project siblings are much broader than the
+      // active Session. A single generic OR-FTS hit must not pull an entire
+      // historical content.md into the provider prompt.
+      strictScopes: ['user', ...projectScopesForMemory],
     });
     recallEntryCount = recallResult && Array.isArray(recallResult.entries)
       ? recallResult.entries.length

package/yeaft/memory/ams.js

@@ -18,6 +18,7 @@ import { approxTokens } from './budget.js';
 import {
   cleanMemoryPromptText,
   filterMemoryPromptTextForPrompt,
+  filterRelatedSessionPromptText,
   isDuplicateMemoryText,
   rememberMemoryText,
 } from './prompt-cleanup.js';
@@ -172,11 +173,11 @@ export class ActiveMemorySet {
     const { picked: resPicked, cost: resCost } = pickMemoryItems({
       items: [...this._resident.entries()].map(([scope, entry]) => ({
         scope,
-        // Related-Session summaries are explicitly historical context. Keep the
-        // bounded prose intact and label it as experience instead of dropping
-        // the whole paragraph because it mentions an old PR/tag/task state.
+        // Related-Session content is broad historical context. Even after FTS
+        // selects its scope, keep only chunks supported by the current user turn;
+        // otherwise one weak term can drag an entire old PR/session into prompt.
         summary: entry.category === 'experience'
-          ? cleanMemoryPromptText(entry.summary)
+          ? filterRelatedSessionPromptText(entry.summary, userMsg)
           : filterMemoryPromptTextForPrompt(entry.summary, userMsg),
         ...(entry.category ? { category: entry.category } : {}),
       })),

package/yeaft/memory/keywords.js

@@ -36,7 +36,6 @@ const STOP_WORDS = new Set([
   '当前', '状态', '任务', '工作', '工作项', '待办', '下一步', '完成', '合并',
   '评审', '发布', '标签', '记忆', '主题', '阻塞', '正在', '上下文', '最新',
 ]);
-
 /**
  * Extract keywords from a prompt (pure rules, no LLM).
  *

package/yeaft/memory/preflow.js

@@ -18,8 +18,10 @@
 import { extractKeywords } from './keywords.js';
 import { approxTokens } from './budget.js';
 import { isVpForeign } from './store.js';
+import { isTransientMemoryText, promptRelevanceTokens } from './prompt-cleanup.js';
 
 export const DEFAULT_PICK_LIMIT = 8;
+const STRICT_SCOPE_MIN_QUERY_TERMS = 2;
 
 /**
  * @typedef {object} PreflowOptions
@@ -32,6 +34,7 @@ export const DEFAULT_PICK_LIMIT = 8;
  * @property {number}       [pickLimit]          max picked segments (default 8)
  * @property {boolean}      [uniqueScopes]       pick at most one best hit per scope
  * @property {boolean}      [canonicalOnly]      search canonical content records only
+ * @property {string[]}     [strictScopes]       scopes that require multiple distinct query-term matches
  */
 
 /**
@@ -42,6 +45,7 @@ export const DEFAULT_PICK_LIMIT = 8;
  * @property {import('./segment.js').Segment[]}          picked
  * @property {number}                                     pickedTokens
  * @property {number}                                     droppedCount
+ * @property {number}                                     droppedByRelevance
  */
 
 /**
@@ -61,12 +65,13 @@ export function runPreflow(index, opts) {
     ? opts.budgetTokens : Infinity;
   const pickLimit = Number.isFinite(opts.pickLimit) && opts.pickLimit > 0
     ? Math.floor(opts.pickLimit) : DEFAULT_PICK_LIMIT;
+  const strictScopes = new Set(Array.isArray(opts.strictScopes) ? opts.strictScopes : []);
 
   const keywords = extractKeywords(userMsg);
   if (keywords.length === 0) {
     return {
       keywords: [], ftsQuery: '', hits: [],
-      picked: [], pickedTokens: 0, droppedCount: 0,
+      picked: [], pickedTokens: 0, droppedCount: 0, droppedByRelevance: 0,
     };
   }
 
@@ -75,7 +80,7 @@ export function runPreflow(index, opts) {
   if (scopeFilter.length === 0) {
     return {
       keywords, ftsQuery, hits: [],
-      picked: [], pickedTokens: 0, droppedCount: 0,
+      picked: [], pickedTokens: 0, droppedCount: 0, droppedByRelevance: 0,
     };
   }
 
@@ -91,7 +96,13 @@ export function runPreflow(index, opts) {
   const pickedScopes = new Set();
   let cost = 0;
   let dropped = 0;
+  let droppedByRelevance = 0;
   for (const h of reranked) {
+    if (strictScopes.has(h.scope) && !passesStrictScopeGate(h, userMsg)) {
+      dropped += 1;
+      droppedByRelevance += 1;
+      continue;
+    }
     if (opts.uniqueScopes && pickedScopes.has(h.scope)) {
       dropped += 1;
       continue;
@@ -108,10 +119,77 @@ export function runPreflow(index, opts) {
 
   return {
     keywords, ftsQuery, hits: reranked,
-    picked, pickedTokens: cost, droppedCount: dropped,
+    picked, pickedTokens: cost, droppedCount: dropped, droppedByRelevance,
   };
 }
 
+function passesStrictScopeGate(hit, userMsg) {
+  const queryTerms = promptRelevanceTokens(userMsg);
+  if (matchedStrictQueryTermCount(hit, queryTerms) >= STRICT_SCOPE_MIN_QUERY_TERMS) return true;
+
+  // Broad scopes still need a narrow path for exact entity lookups. The
+  // canonical record's tags are derived from its entire body, so an exact tag is
+  // not strong evidence. Require the whole one-term query to equal an authored
+  // Markdown heading instead; generic sentences and body-only hits stay gated.
+  return isSingleDiscriminativeQuery(userMsg, queryTerms) && hasExactCanonicalHeading(hit, userMsg);
+}
+
+function isSingleDiscriminativeQuery(userMsg, queryTerms) {
+  if (queryTerms.size !== 1 || isTransientMemoryText(userMsg)) return false;
+  const words = String(userMsg || '')
+    .normalize('NFKC')
+    .toLowerCase()
+    .match(/[\p{L}\p{N}_]+/gu) || [];
+  return words.length === 1;
+}
+
+function matchedStrictQueryTermCount(hit, queryTerms) {
+  const haystack = promptRelevanceTokens(
+    `${hit?.body || ''}\n${Array.isArray(hit?.tags) ? hit.tags.join(' ') : ''}`,
+  );
+  let matched = 0;
+  for (const term of queryTerms) {
+    if (haystack.has(term)) matched += 1;
+  }
+  return matched;
+}
+
+function hasExactCanonicalHeading(hit, userMsg) {
+  const query = normalizeStrongEvidenceText(userMsg);
+  if (!query) return false;
+
+  let fence = null;
+  for (const line of String(hit?.body || '').split(/\r?\n/)) {
+    if (fence) {
+      const closing = /^ {0,3}(`{3,}|~{3,})[ \t]*$/.exec(line);
+      if (closing && closing[1][0] === fence.marker && closing[1].length >= fence.length) {
+        fence = null;
+      }
+      continue;
+    }
+
+    const opening = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(line);
+    if (opening && !(opening[1][0] === '`' && opening[2].includes('`'))) {
+      fence = { marker: opening[1][0], length: opening[1].length };
+      continue;
+    }
+    if (/^(?: {4}| {0,3}\t)/.test(line)) continue;
+
+    const match = /^ {0,3}#{1,6}[ \t]+(.+?)(?:[ \t]+#+)?[ \t]*$/.exec(line);
+    if (match && normalizeStrongEvidenceText(match[1]) === query) return true;
+  }
+  return false;
+}
+
+function normalizeStrongEvidenceText(text) {
+  return String(text || '')
+    .normalize('NFKC')
+    .toLowerCase()
+    .replace(/[`*_~[\]()<>{}.,，。:：;；!！?？"'“”‘’]/g, ' ')
+    .replace(/\s+/g, ' ')
+    .trim();
+}
+
 /**
  * Compose an FTS5 MATCH query from keywords. Each keyword is OR'd with
  * a prefix wildcard so morphological variants match. We escape any

package/yeaft/memory/prompt-cleanup.js

@@ -20,9 +20,15 @@ const COMMON_INTENT_TOKENS = new Set([
   'merge', 'merged', 'review', 'reviewed', 'release', 'tag', 'tags',
   'pr', 'pull', 'request', 'issue', 'fix', 'feat', 'test', 'tests',
   'dream', 'memory', 'session', 'topic', 'status', 'blocker', 'blocked',
-  '当前', '状态', '任务', '工作', '工作项', '待办', '下一步', '完成', '已完成',
-  '合并', '评审', '发布', '标签', '记忆', '主题', '阻塞', '正在',
+  'yeaft',
 ]);
+const COMMON_CJK_INTENT_PHRASES = [
+  '当前', '状态', '任务', '工作项', '工作', '待办', '下一步', '完成', '已完成',
+  '合并', '评审', '发布', '标签', '记忆', '主题', '阻塞', '正在',
+  '内容', '用户', '要求', '需求', '设计', '决策', '搜索', '发现', '需要', '应该',
+  '添加', '无关', '不相干', '完全', '明细', '看看', '还有', '这个',
+  '比如', '每个', '如果',
+].sort((a, b) => b.length - a.length);
 
 /**
  * Remove Dream scheduler metadata blocks from memory text.
@@ -126,6 +132,43 @@ export function filterMemoryPromptTextForPrompt(text, userText) {
   return joinMemoryPromptChunks(kept).trim();
 }
 
+/**
+ * Project sibling content is a broad historical source, not resident state for
+ * the active Session. Keep only chunks with concrete lexical support from the
+ * current user turn; if none match, the sibling contributes no prompt block.
+ *
+ * @param {string} text
+ * @param {string} userText
+ * @returns {string}
+ */
+export function filterRelatedSessionPromptText(text, userText) {
+  const cleaned = cleanMemoryPromptText(text);
+  if (!cleaned || !userText) return '';
+  const kept = [];
+  let governingHeading = '';
+  let emittedHeading = '';
+  for (const chunk of splitMemoryPromptChunks(cleaned)) {
+    if (/^#{1,6}\s+\S/.test(chunk)) {
+      governingHeading = chunk;
+      continue;
+    }
+    const headingRelevant = governingHeading && isMemoryPromptRelevant(governingHeading, userText);
+    const chunkRelevant = isMemoryPromptRelevant(chunk, userText);
+    const headingCarriesSpecificTerm = headingRelevant && hasSpecificPromptTerms(governingHeading);
+    if (!chunkRelevant && (
+      !headingCarriesSpecificTerm
+      || !hasConcretePromptTerms(chunk)
+      || hasOperationalMemoryMarker(chunk)
+    )) continue;
+    if (governingHeading && emittedHeading !== governingHeading) {
+      kept.push(governingHeading);
+      emittedHeading = governingHeading;
+    }
+    kept.push(chunk);
+  }
+  return joinMemoryPromptChunks(kept).trim();
+}
+
 function splitMemoryPromptChunks(text) {
   const chunks = [];
   for (const block of String(text || '').split(/\n{2,}/)) {
@@ -177,13 +220,41 @@ export function promptRelevanceTokens(text) {
     if (!COMMON_INTENT_TOKENS.has(token)) out.add(token);
   }
   for (const match of cleaned.matchAll(CJK_RUN_RE)) {
-    for (const token of cjkBigrams(match[0])) {
-      if (!COMMON_INTENT_TOKENS.has(token)) out.add(token);
+    for (const run of removeCommonCjkIntentPhrases(match[0])) {
+      for (const token of cjkBigrams(run)) out.add(token);
     }
   }
   return out;
 }
 
+function hasConcretePromptTerms(text) {
+  return promptRelevanceTokens(text).size > 0;
+}
+
+function hasOperationalMemoryMarker(text) {
+  return /\b(work\s*item|todo|next\s+step|blocker|blocked|pr\s*#?\d+|pull\s+request|review|merge\s+commit|release\s+tag|tag\s+v\d|v\d+\.\d+\.\d+)\b|(?:工作项|当前(?:状态|任务|工作)|正在|待办|下一步|阻塞|评审|合并|发布|已推|已合并|已完成)/i.test(String(text || ''));
+}
+
+function hasSpecificPromptTerms(text) {
+  const cleaned = cleanMemoryPromptText(text).toLowerCase();
+  for (const match of cleaned.matchAll(ASCII_WORD_RE)) {
+    const token = match[0];
+    if (!COMMON_INTENT_TOKENS.has(token) && token !== 'yeaft') return true;
+  }
+  for (const match of cleaned.matchAll(CJK_RUN_RE)) {
+    const run = match[0];
+    if (run.length === 2 && !COMMON_CJK_INTENT_PHRASES.includes(run)) return true;
+    if (removeCommonCjkIntentPhrases(run).some(part => part.length >= 2)) return true;
+  }
+  return false;
+}
+
+function removeCommonCjkIntentPhrases(text) {
+  let cleaned = text;
+  for (const phrase of COMMON_CJK_INTENT_PHRASES) cleaned = cleaned.split(phrase).join(' ');
+  return cleaned.match(CJK_RUN_RE) || [];
+}
+
 function cjkBigrams(text) {
   const out = [];
   for (let i = 0; i < text.length - 1; i += 1) out.push(text.slice(i, i + 2));

package/yeaft/memory/segment-store.js

@@ -72,8 +72,8 @@ export function writeScope(memoryRoot, scope, segments) {
 export function readCanonicalContentRecord(memoryRoot, scope) {
   const path = join(memoryRoot, scope, 'content.md');
   if (!existsSync(path)) return null;
-  const body = readFileSync(path, 'utf8').trim();
-  if (!body) return null;
+  const body = readFileSync(path, 'utf8');
+  if (!body.trim()) return null;
   const stat = statSync(path);
   const timestamp = stat.mtime.toISOString();
   const digest = createHash('sha256').update(scope).digest('hex').slice(0, 12);

package/yeaft/sessions/pre-flow.js

@@ -262,6 +262,7 @@ export function formatPickedForInjection(picked) {
  * @property {number}         [pickLimit]          Max picked segments (default 8)
  * @property {boolean}        [uniqueScopes]       Pick only the best hit per scope
  * @property {boolean}        [canonicalOnly]      Search canonical content records only
+ * @property {string[]}       [strictScopes]       Additional scopes that require multiple distinct query-term matches
  * @property {boolean}        [fallbackOnEmpty]    Include bounded recent scoped segments when FTS has no hits
  * @property {number}         [fallbackPerScope]   Max fallback segments per scope
  */
@@ -359,6 +360,7 @@ export function runMemoryPreflow(index, opts) {
     pickLimit: opts.pickLimit,
     uniqueScopes: opts.uniqueScopes === true,
     canonicalOnly: opts.canonicalOnly === true,
+    strictScopes: opts.strictScopes,
   });
 
   let fallbackUsed = false;
@@ -396,6 +398,7 @@ export function runMemoryPreflow(index, opts) {
       ftsQuery: result.ftsQuery,
       pickedTokens: result.pickedTokens,
       droppedCount: result.droppedCount,
+      droppedByRelevance: result.droppedByRelevance || 0,
       hitCount: (result.hits || []).length,
       fallbackUsed,
     },