@yeaft/webchat-agent 1.0.349 → 1.0.350

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.349"}
+{"version":"1.0.350"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.349",
+  "version": "1.0.350",
   "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/apply.js

@@ -2,17 +2,18 @@
  * dream/apply.js.
  *
  * Execute one merged-target action: either UPDATE an existing scope's
- * memory.md/summary.md, or CREATE a new one (currently topic-only).
+ * canonical content.md/summary.md, or CREATE a new one (currently topic-only).
+ * Atomic evidence segments remain in memory.md and are maintained separately.
  *
  * The flow per target:
  *   1. snapshot existing files into .dream-bak/<ts>/<scope>/
  *   2. if total content fits, run UPDATE (or CREATE) once
  *   3. if it doesn't, batch the sources by group (segment.batchSourcesForApply)
  *      and chain the LLM calls — each batch's output becomes the next
- *      batch's `current memory.md`. The prompt threads "this is batch K
+ *      batch's current content.md. The prompt threads "this is batch K
  *      of N" so the LLM doesn't think previous content was lost.
- *   4. write tmp + rename for memory.md and summary.md
- *   5. update the per-scope dream-state marker inside memory.md
+ *   4. atomically write content.md and summary.md
+ *   5. sync canonical content into the derived FTS scope index
  *
  * The LLM call is injected (`opts.llm`). Snapshots are injectable too
  * (`opts.snapshot`) to allow tests to skip the .dream-bak side-effect.
@@ -22,8 +23,9 @@ import { promises as fsp } from 'fs';
 import { join, dirname } from 'path';
 import { inspect } from 'util';
 
-import { writeMemory, writeSummary, readMemory, readSummary } from '../memory/store.js';
-import { withDreamMarker } from './state.js';
+import { writeContent, writeSummary, readContent, readMemory, readSummary } from '../memory/store.js';
+import { parseSegments } from '../memory/segment.js';
+import { syncScope } from '../memory/segment-sync.js';
 import { batchSourcesForApply, needsBatchedApply, truncateMessage } from './segment.js';
 import { snapshotScope } from './snapshot.js';
 import { parseJsonSafe } from './triage.js';
@@ -43,8 +45,8 @@ function rawResponseSnippet(raw) {
 
 function applySystem(language) {
   return String(language || '').toLowerCase().startsWith('zh')
-    ? '你是梦境流水线的 Apply 阶段。你会根据最近的 session 对话重写单个 scope 的 memory.md 和 summary.md。请只回复严格 JSON，不要输出说明文字或 markdown fence。memory_md 和 summary_md 的自然语言内容必须使用中文；JSON key、scope、schema 字段和代码标识符保持英文。'
-    : 'You are the Apply stage of a dream pipeline. You rewrite a single scope\'s memory.md and summary.md based on recent session conversations. Reply with strict JSON only — no prose, no fences.';
+    ? '你是梦境流水线的 Apply 阶段。你会根据最近的 session 对话重写单个 scope 的 canonical content.md 和目录 summary.md。请只回复严格 JSON，不要输出说明文字或 markdown fence。content_md 和 summary_md 的自然语言内容必须使用中文；JSON key、scope、schema 字段和代码标识符保持英文。'
+    : 'You are the Apply stage of a dream pipeline. You rewrite a single scope\'s canonical content.md and catalog summary.md based on recent session conversations. Reply with strict JSON only — no prose, no fences.';
 }
 
 function isPrimarySessionTarget(target) {
@@ -114,23 +116,25 @@ function summaryFromLines(lines, zh) {
  *
  * @param {{
  *   target: string,
- *   memoryMd: string,
+ *   contentMd?: string,
+ *   memoryMd?: string,
  *   summaryMd: string,
  *   sources: Array<{ sessionId: string, diff: Array<object> }>,
  *   batchInfo?: { index: number, total: number },
  * }} ctx
  */
 export function buildUpdatePrompt(ctx) {
+  const contentMd = typeof ctx.contentMd === 'string' ? ctx.contentMd : (ctx.memoryMd || '');
   const batchHeader = (ctx.batchInfo && ctx.batchInfo.total > 1)
     ? (String(ctx.language || '').toLowerCase().startsWith('zh')
-      ? `这是第 ${ctx.batchInfo.index}/${ctx.batchInfo.total} 批。前面的批次已经合并进下面当前的 memory.md。\n`
-      : `This is batch ${ctx.batchInfo.index} of ${ctx.batchInfo.total}.\nEarlier batches have already been folded into the current memory.md below.\n`)
+      ? `这是第 ${ctx.batchInfo.index}/${ctx.batchInfo.total} 批。前面的批次已经合并进下面当前的 content.md。\n`
+      : `This is batch ${ctx.batchInfo.index} of ${ctx.batchInfo.total}.\nEarlier batches have already been folded into the current content.md below.\n`)
     : '';
   const sources = renderSourceBlocks(ctx.sources, ctx.language);
   return render('update', {
     target: ctx.target,
     batchHeader,
-    memoryMd: ctx.memoryMd || '',
+    contentMd,
     summaryMd: ctx.summaryMd || '',
     sources,
   }, { language: ctx.language });
@@ -240,6 +244,7 @@ export function targetToScope(target) {
  *   nowIso?: () => string,
  *   onProgress?: (event: object) => void,
  *   siblingTopicsFor?: (target: string) => Promise<Array<{path:string, summary:string}>>,
+ *   segmentIndex?: import('../memory/index-db.js').SegmentIndex|null,
  * }} opts
  */
 export async function applyMergedTarget(merged, opts) {
@@ -247,17 +252,20 @@ export async function applyMergedTarget(merged, opts) {
   if (!opts.llm) throw new Error('apply.applyMergedTarget: opts.llm required');
   const ts = opts.ts || new Date().toISOString().replace(/[:.]/g, '-');
   const snapFn = opts.snapshot || snapshotScope;
-  const nowIso = opts.nowIso ? opts.nowIso() : new Date().toISOString();
   const scope = targetToScope(merged.target);
   const scopeDirRel = scopeRelDir(scope);
 
   if (opts.onProgress) opts.onProgress({ phase: 'apply', target: merged.target, status: 'snapshot' });
   await snapFn(opts.root, ts, scopeDirRel);
 
-  let memoryMd = await readMemory(scope, { root: opts.root });
+  let contentMd = await readContent(scope, { root: opts.root });
+  const legacyMemoryMd = contentMd ? '' : await readMemory(scope, { root: opts.root });
+  if (!contentMd && isLegacyCanonicalMemory(legacyMemoryMd, merged.target)) {
+    contentMd = legacyMemoryMd;
+  }
   let summaryMd = await readSummary(scope, { root: opts.root, language: opts.language });
 
-  if (merged.kind === 'create' && (memoryMd || summaryMd)) {
+  if (merged.kind === 'create' && (contentMd || summaryMd)) {
     // Race / partial state: the scope already exists. Treat as update —
     // safer than overwriting arbitrary bytes.
     merged = { ...merged, kind: 'update' };
@@ -277,26 +285,29 @@ export async function applyMergedTarget(merged, opts) {
     if (opts.onProgress) opts.onProgress({ phase: 'apply', target: merged.target, status: 'llm', batch: 1, of: 1 });
     const raw = await opts.llm({ pass: 'create', prompt, system: applySystem(opts.language) });
     const parsed = parseJsonSafe(raw);
-    if (!parsed || typeof parsed.memory_md !== 'string') {
+    const parsedContent = parsed && typeof parsed.content_md === 'string'
+      ? parsed.content_md
+      : (parsed && typeof parsed.memory_md === 'string' ? parsed.memory_md : null);
+    if (parsedContent === null) {
       throw malformedJsonError(`apply: CREATE returned malformed JSON for ${merged.target}`, raw);
     }
     const ensured = ensurePrimarySessionOutput({
       target: merged.target,
-      memoryMd: parsed.memory_md,
+      memoryMd: parsedContent,
       summaryMd: typeof parsed.summary_md === 'string' ? parsed.summary_md : '',
       sources: merged.sources,
       language: opts.language,
     });
-    memoryMd = ensured.memoryMd;
+    contentMd = ensured.memoryMd;
     summaryMd = ensured.summaryMd;
     batchesUsed = 1;
   } else {
     // UPDATE — possibly batched.
     const batches = needsBatchedApply(
-      { memoryMd, summaryMd, sources: merged.sources },
+      { memoryMd: contentMd, summaryMd, sources: merged.sources },
       maxApply,
     )
-      ? batchSourcesForApply({ memoryMd, summaryMd, sources: merged.sources }, maxApply)
+      ? batchSourcesForApply({ memoryMd: contentMd, summaryMd, sources: merged.sources }, maxApply)
       : [merged.sources];
 
     let i = 0;
@@ -304,7 +315,7 @@ export async function applyMergedTarget(merged, opts) {
       i += 1;
       const prompt = buildUpdatePrompt({
         target: merged.target,
-        memoryMd,
+        contentMd,
         summaryMd,
         sources: batch,
         batchInfo: { index: i, total: batches.length },
@@ -313,26 +324,32 @@ export async function applyMergedTarget(merged, opts) {
       if (opts.onProgress) opts.onProgress({ phase: 'apply', target: merged.target, status: 'llm', batch: i, of: batches.length });
       const raw = await opts.llm({ pass: 'update', prompt, system: applySystem(opts.language) });
       const parsed = parseJsonSafe(raw);
-      if (!parsed || typeof parsed.memory_md !== 'string') {
+      const parsedContent = parsed && typeof parsed.content_md === 'string'
+        ? parsed.content_md
+        : (parsed && typeof parsed.memory_md === 'string' ? parsed.memory_md : null);
+      if (parsedContent === null) {
         throw malformedJsonError(`apply: UPDATE batch ${i} returned malformed JSON for ${merged.target}`, raw);
       }
       const ensured = ensurePrimarySessionOutput({
         target: merged.target,
-        memoryMd: parsed.memory_md,
+        memoryMd: parsedContent,
         summaryMd: typeof parsed.summary_md === 'string' ? parsed.summary_md : summaryMd,
         sources: batch,
         language: opts.language,
       });
-      memoryMd = ensured.memoryMd;
+      contentMd = ensured.memoryMd;
       summaryMd = ensured.summaryMd;
     }
     batchesUsed = batches.length;
   }
 
-  // Stamp the per-scope dream marker, then atomically write both files.
-  const stamped = withDreamMarker(memoryMd, { lastDreamAt: nowIso });
-  await writeMemory(scope, stamped, { root: opts.root });
+  // Canonical content and the catalog summary are independent atomic files.
+  // Per-session Dream control state is stored in .dream-state by runner.js;
+  // do not mix scheduler metadata into prompt-facing content.
+  const canonicalContent = String(contentMd || '').trim();
+  await writeContent(scope, canonicalContent ? `${canonicalContent}\n` : '', { root: opts.root });
   await writeSummary(scope, summaryMd || '', { root: opts.root, language: opts.language });
+  if (opts.segmentIndex) syncScope(opts.root, opts.segmentIndex, merged.target);
 
   if (opts.onProgress) {
     // feat-dream-debug-detail: surface a truncated copy of what was
@@ -345,9 +362,12 @@ export async function applyMergedTarget(merged, opts) {
       status: 'done',
       batches: batchesUsed,
       kind: merged.kind,
-      memoryMdPreview: truncateForDebug(stamped),
+      contentMdPreview: truncateForDebug(canonicalContent),
+      contentMdLength: canonicalContent.length,
+      // Legacy debug aliases kept until the Dream panel consumes contentMd*.
+      memoryMdPreview: truncateForDebug(canonicalContent),
       summaryMdPreview: truncateForDebug(summaryMd || ''),
-      memoryMdLength: (stamped || '').length,
+      memoryMdLength: canonicalContent.length,
       summaryMdLength: (summaryMd || '').length,
     });
   }
@@ -372,12 +392,21 @@ function scopeRelDir(scope) {
 
 function oneLine(s) { return String(s || '').replace(/\s+/g, ' ').trim().slice(0, 200); }
 
+function isLegacyCanonicalMemory(memoryMd, scope) {
+  const raw = String(memoryMd || '').trim();
+  if (!raw) return false;
+  const parsed = parseSegments(raw, { defaultScope: scope });
+  // Body-only legacy prose parses as one anonymous segment. Frontmatter-backed
+  // records are evidence and must never be promoted into canonical content.
+  return parsed.length === 1 && !/^---\s*$/m.test(raw);
+}
+
 /**
  * Per-field truncation cap for debug previews emitted on `apply/done`.
  * Keep this small — the dream panel only needs a recognisable snippet.
  * Total worst-case payload is `PREVIEW_MAX * 2 * targets_per_run` per
  * dream pass; with N=50 targets that's ~200 KB. The full bytes are on
- * disk under <root>/<scope>/{memory,summary}.md anyway — these previews
+ * disk under <root>/<scope>/{content,summary}.md anyway — these previews
  * are for at-a-glance debugging only.
  */
 const PREVIEW_MAX = 2048;

package/yeaft/dream/output-snapshot.js

@@ -3,13 +3,13 @@
  *
  * Read-only projection of Dream-owned output files for UI observability.
  * The Dream write path remains `runner -> apply -> memory/store`; callers use
- * this module to load the current `memory.md` / `summary.md` contents for a
+ * this module to load current `content.md` / `memory.md` / `summary.md` for a
  * single Yeaft session when emitting status or restoring a switched session.
  */
 
 import { join } from 'node:path';
 
-import { readMemory, readSummary } from '../memory/store.js';
+import { readContent, readMemory, readSummary } from '../memory/store.js';
 import { readDreamError, readSessionState } from './state.js';
 import { buildRunDreamOpts } from './session-wiring.js';
 
@@ -33,7 +33,8 @@ export async function buildDreamOutputSnapshot(sessionLike, sessionId) {
   const scope = `sessions/${sessionId}`;
   const memoryScope = { kind: 'session', id: sessionId };
   const root = join(sessionLike.yeaftDir, 'memory');
-  const [memoryRaw, summaryRaw, state, lastError] = await Promise.all([
+  const [contentRaw, memoryRaw, summaryRaw, state, lastError] = await Promise.all([
+    readContent(memoryScope, { root }).catch(() => ''),
     readMemory(memoryScope, { root }).catch(() => ''),
     readSummary(memoryScope, { root }).catch(() => ''),
     readSessionState(root, sessionId).catch(() => ({
@@ -44,6 +45,7 @@ export async function buildDreamOutputSnapshot(sessionLike, sessionId) {
     readDreamError(root, scope).catch(() => null),
   ]);
   const totalMessageCount = await countSessionMessages(sessionLike, sessionId);
+  const content = truncateDreamText(contentRaw);
   const memory = truncateDreamText(memoryRaw);
   const summary = truncateDreamText(summaryRaw);
   return {
@@ -54,8 +56,10 @@ export async function buildDreamOutputSnapshot(sessionLike, sessionId) {
     lastDreamMessageId: state?.lastDreamMessageId || null,
     messageCount: Number.isFinite(state?.messageCount) ? state.messageCount : 0,
     totalMessageCount,
-    hasOutput: !!(memoryRaw || summaryRaw),
+    hasOutput: !!(contentRaw || memoryRaw || summaryRaw),
     lastError,
+    contentText: content.text,
+    contentTruncated: content.truncated,
     memoryText: memory.text,
     memoryTruncated: memory.truncated,
     summaryText: summary.text,

package/yeaft/dream/prompts/consolidate-topics.md

@@ -0,0 +1,31 @@
+<!-- lang:en -->
+Identify duplicate semantic topics in this catalog.
+
+Topics:
+{{topics}}
+
+Rules:
+- Merge only topics about the same durable subject whose facts belong in one canonical content document.
+- Different spelling, casing, language, PR number, release, review round, or transient status does not make a distinct topic.
+- Do not merge merely related subjects when either would lose its independent meaning.
+- Prefer a stable, general existing path as canonical; never invent a new path here.
+- Omit uncertain groups.
+
+Reply with strict JSON:
+{ "groups": [{ "canonical": "<existing path>", "merge": ["<existing path>"] }] }
+
+<!-- lang:zh -->
+识别目录中语义重复的 topics。
+
+Topics：
+{{topics}}
+
+规则：
+- 只有主题是同一持久对象、全部事实适合放入同一份 canonical content 时才合并。
+- 拼写、大小写、语言、PR 编号、release、review 轮次或短期状态不同，不构成独立 topic。
+- 仅仅相关但仍有独立含义的主题不要合并。
+- canonical 必须选已有且稳定、通用的路径；这里不得创建新路径。
+- 不确定的组不要输出。
+
+只回复严格 JSON：
+{ "groups": [{ "canonical": "<已有路径>", "merge": ["<已有路径>"] }] }

package/yeaft/dream/prompts/create.md

@@ -8,13 +8,13 @@ Source session conversations:
 
 {{siblingsBlock}}
 Task:
-1. Write memory.md from scratch with a reasonable section structure.
-2. Prioritize reusable experience: workflows, preferences, pitfalls, corrections, project conventions, review/merge/tag lessons, and rules that should change future execution.
+1. Write canonical content.md from scratch with a reasonable section structure.
+2. Preserve every concrete fact, decision, constraint, preference, workflow, pitfall, correction, project convention, and actionable state relevant to this scope. Do not replace specifics with a vague summary.
 3. Keep current PR/review/blocker detail only when it is still actionable.
-4. Write summary.md (1–3 sentences) with reusable lessons before current state.
+4. Write summary.md as a 1–3 sentence catalog description used only for later topic selection.
 
 Reply with strict JSON of the shape:
-{ "memory_md": "...", "summary_md": "..." }
+{ "content_md": "...", "summary_md": "..." }
 
 <!-- lang:zh -->
 你正在从零创建一个新的 memory scope。
@@ -26,10 +26,10 @@ Scope path: {{target}}   (must be ≤2 levels)
 
 {{siblingsBlock}}
 任务：
-1. 从零编写 memory.md，并使用合理的章节结构。
-2. 优先保留可复用经验：工作流、偏好、坑点、纠偏、项目约定、review/merge/tag 教训，以及会改变后续执行方式的规则。
+1. 从零编写 canonical content.md，并使用合理的章节结构。
+2. 保留属于当前 scope 的每条具体事实、决策、约束、偏好、工作流、坑点、纠偏、项目约定和可执行状态；不得用模糊摘要替代具体信息。
 3. 当前 PR、review、阻塞细节只有仍可执行时才保留。
-4. 编写 summary.md（1–3 句），先写可复用经验，再写当前状态。
+4. 编写 1–3 句的 summary.md 目录描述，它只用于后续 topic 选择。
 
 只回复严格 JSON，结构如下：
-{ "memory_md": "...", "summary_md": "..." }
+{ "content_md": "...", "summary_md": "..." }

package/yeaft/dream/prompts/index.js

@@ -24,6 +24,8 @@ const FILES = {
   extractTopic: 'extract-topic.md',
   // H2.e — per-scope summary compression
   summarizeScope: 'summarize-scope.md',
+  consolidateTopics: 'consolidate-topics.md',
+  mergeTopics: 'merge-topics.md',
 };
 
 /**
@@ -64,8 +66,8 @@ export function normalizePromptLanguage(language) {
 
 function languageDirective(language) {
   return normalizePromptLanguage(language) === 'zh'
-    ? '语言要求：请用中文生成所有自然语言内容，尤其是 memory_md 和 summary_md；工具名、scope、JSON key、schema 字段、代码标识符和枚举值必须保持英文。严格按要求输出 JSON 时，不要翻译 JSON key。'
-    : 'Language requirement: write all natural-language memory content in English. Keep tool names, scopes, JSON keys, schema fields, code identifiers, and enum values in English. When strict JSON is required, do not rename JSON keys.';
+    ? '语言要求：请用中文生成所有自然语言内容，尤其是 content_md 和 summary_md；工具名、scope、JSON key、schema 字段、代码标识符和枚举值必须保持英文。严格按要求输出 JSON 时，不要翻译 JSON key。'
+    : 'Language requirement: write all natural-language memory content in English, especially content_md and summary_md. Keep tool names, scopes, JSON keys, schema fields, code identifiers, and enum values in English. When strict JSON is required, do not rename JSON keys.';
 }
 
 function load(name) {

package/yeaft/dream/prompts/merge-topics.md

@@ -0,0 +1,35 @@
+<!-- lang:en -->
+Merge duplicate topic contents into one canonical topic.
+
+Canonical path: {{canonical}}
+
+Existing topic contents:
+{{topicContents}}
+
+Requirements:
+- Preserve every unique, still-valid concrete fact, decision, constraint, preference, workflow, pitfall, correction, and actionable state.
+- Resolve direct contradictions in favor of the newest explicit correction when evident; otherwise preserve both with an uncertainty note.
+- Remove duplication, stale superseded execution state, and scope-path boilerplate.
+- content_md is authoritative and may be as long as required for information completeness.
+- summary_md is only a 1–3 sentence catalog description.
+
+Reply with strict JSON:
+{ "content_md": "...", "summary_md": "..." }
+
+<!-- lang:zh -->
+把重复 topic 的内容合并到一个 canonical topic。
+
+Canonical 路径：{{canonical}}
+
+现有 topic 内容：
+{{topicContents}}
+
+要求：
+- 保留每一条独有且仍有效的具体事实、决策、约束、偏好、工作流、坑点、纠偏和可执行状态。
+- 如果能明确判断，以最新的显式纠偏解决直接冲突；否则保留双方并标注不确定性。
+- 删除重复、已被推翻的短期执行状态和 scope 路径套话。
+- content_md 是权威正文，可按信息完整性需要保留长度。
+- summary_md 只是 1–3 句的目录描述。
+
+只回复严格 JSON：
+{ "content_md": "...", "summary_md": "..." }

package/yeaft/dream/prompts/triage-pass1.md

@@ -1,7 +1,7 @@
 <!-- lang:en -->
 You are deciding whether a recent session conversation carries:
   - signals that should update the USER profile, and/or
-  - signals that should update one or more TOPIC scopes.
+  - durable signals that should update one or more existing semantic TOPIC scopes.
 
 Do NOT mention vp/, session/, feature/, or topic/ scopes — those are handled by hard rules.
 
@@ -23,7 +23,7 @@ Respond with strict JSON of the shape:
 <!-- lang:zh -->
 你要判断最近一段会话对话是否包含：
   - 应更新用户画像的信号；和/或
-  - 应更新一个或多个主题作用域的信号。
+  - 应更新一个或多个已有语义主题作用域的持久信号。
 
 不要提及 `vp/`、`session/`、`feature/` 或 `topic/` 作用域 —— 这些由硬规则处理。
 

package/yeaft/dream/prompts/triage-pass2.md

@@ -3,7 +3,8 @@ Bind a free-form topic description to an exact path under topic/.
 Rules:
   - At most TWO path segments. Reject any third level.
   - Segments may contain letters, digits, dashes, underscores, dots, CJK.
-  - Prefer matching an existing path if the description fits.
+  - Existing paths are canonical. Return "match" whenever any existing topic can contain the new information, even if wording, language, casing, a PR number, or a one-off execution state differs.
+  - Return "new" only for a stable subject that is materially distinct from every existing topic. Never create a topic merely for one PR, review run, commit, release, status, or spelling variant.
 
 Description: {{description}}
 
@@ -20,7 +21,8 @@ Reply with strict JSON, exactly one of:
 规则：
   - 最多 TWO 个路径段。拒绝任何第三级路径。
   - 路径段可包含字母、数字、短横线、下划线、点、CJK 字符。
-  - 如果描述适合已有路径，优先匹配已有路径。
+  - 已有路径是 canonical。只要任一已有 topic 能容纳新信息，即使措辞、语言、大小写、PR 编号或一次性执行状态不同，也必须返回 "match"。
+  - 只有主题稳定且与所有已有 topic 实质不同才返回 "new"。不得只因单个 PR、review 轮次、commit、release、状态或拼写变体创建 topic。
 
 描述：{{description}}
 

package/yeaft/dream/prompts/update.md

@@ -3,12 +3,12 @@ You are updating an existing memory scope.
 
 Scope: {{target}}
 {{batchHeader}}
-Current memory.md:
+Current canonical content.md:
 """
-{{memoryMd}}
+{{contentMd}}
 """
 
-Current summary.md:
+Current catalog summary.md:
 """
 {{summaryMd}}
 """
@@ -20,9 +20,10 @@ Task:
 - Extract from these conversations what is relevant to THIS scope.
 - Prefer reusable experience over chronology: workflows, preferences, pitfalls, corrections, project conventions, review/merge/tag lessons, and rules that should change future execution.
 - Keep current PR/review/blocker detail only when it is still actionable.
-- Integrate it into memory.md (reorganize sections if needed).
-- Drop stale or contradicted entries.
-- Rewrite summary.md (1–3 sentences) so the summary highlights reusable lessons first, then current state.
+- Rewrite content.md as the canonical current text (reorganize sections if needed).
+- Preserve every still-valid concrete fact, decision, constraint, preference, workflow, pitfall, correction, and actionable state from the existing content or new conversations. Do not shorten by dropping unique valid information.
+- Drop only stale, contradicted, duplicated, or scope-irrelevant entries.
+- Rewrite summary.md as a 1–3 sentence catalog description for topic selection. It is not the authoritative memory and must not be used to compensate for omissions from content.md.
 - The same conversations are being processed for OTHER scopes too.
   Only handle what is relevant here. Ignore the rest.
 
@@ -33,19 +34,19 @@ Hard rules:
   "⚠️ contradicts charter — verify which is current" and continue.
 
 Reply with strict JSON of the shape:
-{ "memory_md": "...", "summary_md": "..." }
+{ "content_md": "...", "summary_md": "..." }
 
 <!-- lang:zh -->
 你正在更新一个已有的 memory scope。
 
 Scope: {{target}}
 {{batchHeader}}
-当前 memory.md：
+当前 canonical content.md：
 """
-{{memoryMd}}
+{{contentMd}}
 """
 
-当前 summary.md：
+当前目录 summary.md：
 """
 {{summaryMd}}
 """
@@ -57,9 +58,10 @@ Scope: {{target}}
 - 从这些对话中提取与当前作用域相关的内容。
 - 优先保留可复用经验，而不是流水账：工作流、偏好、坑点、纠偏、项目约定、review/merge/tag 教训，以及会改变后续执行方式的规则。
 - 当前 PR、review、阻塞细节只有仍可执行时才保留。
-- 将内容整合进 memory.md（必要时重组章节）。
-- 删除过期或被推翻的条目。
-- 重写 summary.md（1–3 句），摘要先突出可复用经验，再写当前状态。
+- 将 content.md 重写为 canonical 当前正文（必要时重组章节）。
+- 对现有正文和新对话中的每条仍有效具体事实、决策、约束、偏好、工作流、坑点、纠偏和可执行状态都必须保留；不得为了缩短篇幅而丢掉独有的有效信息。
+- 只删除过期、被推翻、重复或不属于当前 scope 的条目。
+- 将 summary.md 重写为 1–3 句的目录描述，只用于 topic 选择；它不是权威记忆，也不能用来补偿 content.md 的信息缺失。
 - 同一批对话也会被处理到其他作用域。
   这里只处理与当前作用域相关的内容，忽略其他内容。
 
@@ -70,4 +72,4 @@ Scope: {{target}}
   "⚠️ 与章程冲突——确认哪一条是当前事实" 并继续。
 
 只回复严格 JSON，结构如下：
-{ "memory_md": "...", "summary_md": "..." }
+{ "content_md": "...", "summary_md": "..." }