dsh-lite-memory 0.17.0 → 0.18.1

package/index.js

@@ -644,6 +644,8 @@ function refsOf(hits) {
     /** 界面要按类型分开展示（偏好/约定/流程/资料），维护字段不进正文。 */
     kind: typeof item.kind === 'string' && item.kind ? item.kind : 'note',
     when: typeof item.when === 'string' ? item.when : '',
+    /** 界面要能说「N 天前更新」，只给时间不给正文。 */
+    updated: typeof item.updated === 'string' ? item.updated : '',
   }));
 }
 
@@ -657,6 +659,10 @@ const SAVE_PARAMS = {
     when: { type: 'string', description: `前置条件或适用场景（「在哪台机器 / 哪个环境 / 什么情况下」），不超过 ${LIMITS.whenChars} 字。同一标题但前置条件不同，会存成两条，不合并；更新时不给就保留原值` },
     kind: { type: 'string', enum: ['preference', 'convention', 'procedure', 'pointer', 'pitfall', 'credential_hint', 'note'], description: '条目类型；更新时不给就保留原值' },
     tags: { type: 'array', items: { type: 'string' }, description: '最多 5 个标签；更新时不给就保留原值' },
+    supersedes: {
+      type: 'string',
+      description: '要取代的记忆 id：新内容写成新条目，旧条目标为已被取代并保留在历史里；同层才有效，已被取代过的不能再取代',
+    },
     resolution: {
       type: 'string',
       enum: ['distinct'],
@@ -795,6 +801,29 @@ function withTag(value, text) {
   return tag ? `${tag} ${text}` : text;
 }
 
+/** 候选要能自己解释「什么时候的、为什么像」，模型才好判断是更新还是另一条。 */
+function humanAge(iso) {
+  const at = Date.parse(String(iso || ''));
+  if (!Number.isFinite(at)) return '';
+  const days = Math.floor((Date.now() - at) / 86400000);
+  if (days <= 0) return '今天';
+  if (days === 1) return '昨天';
+  if (days < 30) return `${days} 天前`;
+  if (days < 365) return `${Math.floor(days / 30)} 个月前`;
+  return `${Math.floor(days / 365)} 年前`;
+}
+
+function describeCandidate(item, options = {}) {
+  const age = humanAge(item.updated);
+  const why = options.sameTopic ? '' : item.reason === 'similar_summary' ? '摘要相近' : '标题相近';
+  const parts = [`${item.id}「${item.title}」`];
+  if (age) parts.push(`${age}更新`);
+  if (item.when) parts.push(item.when);
+  if (why) parts.push(why);
+  if (item.summary) parts.push(item.summary);
+  return parts.join(' · ');
+}
+
 function statusLabel(status) {
   if (status === 'archived') return ' · 已归档';
   if (status === 'needs_context') return ' · 适用范围待确认';
@@ -907,6 +936,16 @@ export function apply(ctx, config) {
     return win.bytes + bytes <= view.REQUEST_BYTES;
   }
 
+  /** 续写轮没有新消息：沿用上一次能核对的请求上下文。 */
+  const lastRuntime = new Map();
+  const rememberRuntime = (scope, sessionId, held) => {
+    if (!held || !sessionId) return;
+    const key = `${scope.key}\u0000${sessionId}`;
+    lastRuntime.delete(key);
+    lastRuntime.set(key, held);
+    if (lastRuntime.size > 20) lastRuntime.delete(lastRuntime.keys().next().value);
+  };
+
   function openWindow(agent, { sessionId, turn, messageIds }) {
     const key = agentKey(agent);
     if (!key) return null;
@@ -1394,11 +1433,13 @@ export function apply(ctx, config) {
     const contextId = typeof optionalContextId === 'string' ? optionalContextId.trim() : '';
     if (!contextId) {
       /** 没有显式上下文时，用本请求已经路由出来的任务；这层不依赖自进化开关。 */
-      const runtime = win && win.runtime;
+      const live = win && win.runtime ? win.runtime : null;
+      const runtime = live
+        || (win && win.sessionId ? lastRuntime.get(`${scope.key}\u0000${win.sessionId}`) : null);
       const sameRequest = runtime
         && runtime.projectKey === scope.key
         && (!runtime.sessionId || runtime.sessionId === String(win.sessionId || ''))
-        && runtime.batchKey === anchor.requestBatchKey(win.messageIds || []);
+        && (runtime === live ? runtime.batchKey === anchor.requestBatchKey(win.messageIds || []) : true);
       if (sameRequest) {
         /** 普通记忆可以直接用本请求上下文；实验正文仍要求显式 contextId，不能顺手放行。 */
         return { ok: true, scope, win, context: runtime.context, held: runtime, experimental: false };
@@ -1585,7 +1626,9 @@ export function apply(ctx, config) {
           sameTopic: { type: 'boolean' },
           similarIds: { type: 'string' },
           similar: { type: 'string' },
+          supersededId: { type: 'string' },
           archived: { type: 'string' },
+          pendingConflicts: { type: 'integer' },
         },
         required: ['id', 'title', 'summary', 'when', 'revision', 'merged', 'changed', 'scope', 'needsResolution', 'archived'],
         additionalProperties: false,
@@ -1599,12 +1642,12 @@ export function apply(ctx, config) {
             ? `memory · 当前目录还不能确认属于哪个项目：「${value.title}」\n先确认项目根目录，或显式 scope="global"`
             : `memory · 归属还没定：「${value.title}」\n补 memoryClass（personal_preference / project_fact / environment_fact / portable_procedure）或显式 scope；设备事实还要给设备条件`
           : value.existingId
-            ? `memory · 已有相同记忆：「${value.title}」 · ${value.existingId}（${value.existingScope}）\n要改成另一条，加 resolution="distinct"`
+            ? `memory · 已有相同记忆：「${value.title}」（${value.existingScope}）\n要改成另一条，加 resolution="distinct"`
             : value.needsResolution
           ? `memory · 需要确认：「${value.title}」与已有条目相近${value.crossLayer ? '（在另一层）' : ''}${value.sameTopic ? '（同一主题槽位）' : ''}\n${value.similar}\n要更新它，用 id 重存；确实是另一条，加 resolution="distinct"`
           : value.changed === false
-            ? `memory · unchanged ${withTag(value, `"${value.title}"`)} · ${value.id}`
-            : `memory · ${value.merged ? 'merged' : 'saved'} ${withTag(value, `"${value.title}"`)}${value.when ? `（${value.when}）` : ''} · ${value.id}${value.similar ? ` · 相近：${value.similar}` : ''}${value.archived ? ` · 已归档「${value.archived}」腾位` : ''}${value.fullTextSaved ? ' · 完整原句已另存' : ''}`,
+            ? `memory · unchanged ${withTag(value, `"${value.title}"`)}`
+            : `memory · ${value.merged ? 'merged' : 'saved'} ${withTag(value, `"${value.title}"`)}${value.when ? `（${value.when}）` : ''}${value.similar ? ` · 相近：${value.similar}` : ''}${value.archived ? ` · 已归档「${value.archived}」腾位` : ''}${value.fullTextSaved ? ' · 完整原句已另存' : ''}${value.supersededId ? ' · 已取代旧说法' : ''}`,
       }],
     },
     execute: async (args, execution) => {
@@ -1672,8 +1715,9 @@ export function apply(ctx, config) {
           crossLayer: Boolean(saved.crossLayer),
           sameTopic: Boolean(saved.sameTopic),
           similarIds: saved.similarList.map((item) => item.id).join('、'),
-          similar: saved.similarList.map((item) => `${item.id}「${item.title}」${item.summary ? `｜${item.summary}` : ''}`).join('；'),
+          similar: saved.similarList.map((item) => describeCandidate(item, { sameTopic: saved.sameTopic })).join('；'),
           archived: '',
+          pendingConflicts: Number(saved.pendingConflicts) || 0,
         };
       }
       recordCitations(scope, sessionIdOf(execution), [saved.record]);
@@ -1693,8 +1737,10 @@ export function apply(ctx, config) {
         needsScope: false,
         needsResolution: false,
         similarIds: saved.similarList.map((item) => item.id).join('、'),
+        supersededId: String(args.supersedes || ''),
         archived: (saved.archived || []).map((item) => item.title).join('、'),
-        ...(saved.similar ? { similar: `${saved.similar.id}「${saved.similar.title}」` } : {}),
+        pendingConflicts: Number(saved.pendingConflicts) || 0,
+        ...(saved.similar ? { similar: `「${saved.similar.title}」` } : {}),
       };
     },
   }), 'lite-memory: memory_save');
@@ -1721,7 +1767,7 @@ export function apply(ctx, config) {
       render: (_args, value) => [{
         type: 'text',
         text: value.asked
-          ? `memory · suggested "${value.title}" · ${value.id}${value.targetId ? ` · 确认后更新 ${value.targetId}「${value.targetTitle}」` : ''}`
+          ? `memory · suggested "${value.title}"${value.targetId ? ` · 确认后更新「${value.targetTitle}」` : ''}`
           : `memory · skipped${value.reason ? `\n${value.reason}` : ''}`,
       }],
     },
@@ -1771,6 +1817,7 @@ export function apply(ctx, config) {
                 origin: { type: 'string' },
                 kind: { type: 'string' },
                 when: { type: 'string' },
+                updated: { type: 'string' }, // ui-copy-ignore
               },
               required: ['id', 'title', 'scope', 'revision', 'status', 'origin', 'kind', 'when'],
               additionalProperties: false,
@@ -1914,11 +1961,11 @@ export function apply(ctx, config) {
             : value.repeat
               ? 'memory · 本请求已读过这条记忆'
               : value.body
-                ? `memory · ${withTag(value, `「${value.title}」`)}${value.when ? `（${value.when}）` : ''} · ${value.id}${statusLabel(value.status)}\n${value.body}`
+                ? `memory · ${withTag(value, `「${value.title}」`)}${value.when ? `（${value.when}）` : ''}${statusLabel(value.status)}\n${value.body}`
                 : value.links !== undefined && value.status === 'ok'
                   ? `memory · 「${value.title}」的相关记忆\n${value.links || '(无)'}`
                   : value.status === 'needs_context'
-                    ? 'memory · 这条记忆的适用条件还没确认'
+                    ? 'memory · 这条记忆的适用条件还没确认，先说明当前任务再读'
                     : value.status === 'not_applicable'
                       ? 'memory · 这条记忆不适用于当前任务'
                       : value.status === 'archived'
@@ -2047,12 +2094,12 @@ export function apply(ctx, config) {
         text: value.mode === 'memory_disabled'
           ? 'memory · 本项目记忆已关闭，先在面板打开'
           : value.mode === 'purged'
-          ? `memory · forgotten "${value.title}" · ${value.id}`
+          ? `memory · forgotten "${value.title}"`
           : value.mode === 'purge_pending'
-            ? `memory · 清除未完成 · ${value.id}，重启后会继续`
+            ? `memory · 清除未完成 · 「${value.title || '这条记忆'}」，重启后会继续`
             : value.mode === 'needs_resolution'
-              ? `memory · 先确认是归档还是彻底忘掉 · ${value.id}`
-              : `memory · archived ${withTag(value, `"${value.title}"`)} · ${value.id}，可找回`,
+              ? `memory · 先确认是归档还是彻底忘掉 · 「${value.title || '这条记忆'}」`
+              : `memory · archived ${withTag(value, `"${value.title}"`)}，可找回`,
       }],
       presentationMeta: (_args, value) => ({
         kind: 'memory-forget',
@@ -2069,7 +2116,7 @@ export function apply(ctx, config) {
       const located = locate(scope, args.id);
       if (!located && !args.mode) throw new Error(`没有 ${args.id} 这条记忆`);
       if (!args.mode) {
-        return { id: args.id, mode: 'needs_resolution', scope: located.scope.key === 'global' ? 'global' : 'project' };
+        return { id: args.id, title: located.record.title || '', mode: 'needs_resolution', scope: located.scope.key === 'global' ? 'global' : 'project' };
       }
       let dropped;
       try {
@@ -2269,6 +2316,7 @@ export function apply(ctx, config) {
        */
       const runtime = runtimeFor(scope, { sessionId, query, batchKey, messageIds: ids, autoRoute: recallMode() === 'adaptive' });
       if (win && runtime) win.runtime = runtime.held;
+      rememberRuntime(scope, sessionId, runtime && runtime.held);
       if (recallMode() !== 'adaptive') {
         clearPrepared(agent);
         return decision;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "On-demand memory for the DeepSeek Harness: nothing in the system prompt, one muted line only when something is saved, hit or suggested.",
   "type": "module",
   "main": "index.js",
@@ -8,7 +8,7 @@
     "dsh": ">=0.1.5"
   },
   "scripts": {
-    "test": "node test/store.test.mjs && node test/state.test.mjs && node test/view.test.mjs && node test/anchor.test.mjs && node test/recall.test.mjs && node test/evolution-read.test.mjs && node test/lexical.test.mjs && node test/control.test.mjs && node test/learning.test.mjs && node test/scenario.test.mjs && node test/crossing.test.mjs && node test/runtime-context.test.mjs && node test/client.test.mjs && node test/palace.test.mjs && node test/contract.test.mjs",
+    "test": "node test/store.test.mjs && node test/state.test.mjs && node test/view.test.mjs && node test/anchor.test.mjs && node test/recall.test.mjs && node test/evolution-read.test.mjs && node test/lexical.test.mjs && node test/control.test.mjs && node test/learning.test.mjs && node test/scenario.test.mjs && node test/crossing.test.mjs && node test/runtime-context.test.mjs && node test/client.test.mjs && node test/palace.test.mjs && node test/contract.test.mjs && node test/safety.test.mjs && node test/ha.test.mjs && node test/record.test.mjs",
     "bench": "node bench/bench.mjs",
     "bench:evolution": "node bench/evolution.mjs"
   },
@@ -66,6 +66,9 @@
   "bugs": {
     "url": "https://github.com/regrevia/dsh-lite-memory/issues"
   },
-  "author": "regrevia",
+  "author": {
+    "name": "regrevia",
+    "url": "https://github.com/regrevia"
+  },
   "license": "MIT"
 }

package/state.js

@@ -535,13 +535,17 @@ export function emptyState(scope) {
     candidates: [],
     receipts: [],
     suppressions: [],
+    conflicts: [],
     control: { enabled: true, epoch: crypto.randomUUID(), changedAt: now },
     experimental: { projectEvolution: newEvolution() },
   };
 }
 
+/** 坏文件不自动覆盖（可能还能人工找回），但错误里必须给出下一步，不能只说「坏了」。 */
 function fail(file, why, code = 'corrupt') {
-  return new StateError(code, `记忆状态${why}，已停止读写：${file}`);
+  const name = path.basename(file);
+  const prev = name === 'state.json' ? 'state.prev.json' : `${name}.prev`;
+  return new StateError(code, `记忆状态${why}，已停止读写：${file}。恢复：把 ${name} 改名成 ${name}.bad 后重试，会自动从上一份完好的 ${prev} 恢复；${prev} 也不在就删掉整个目录重建（旧文件可人工找回）`);
 }
 
 function validEntry(entry) {
@@ -566,7 +570,7 @@ export function validateState(data) {
     if (typeof data[key] !== 'string' || !data[key]) throw new StateError('invalid', `记忆状态缺少 ${key}`);
   }
   if (!Number.isInteger(data.generation) || data.generation < 0) throw new StateError('invalid', '记忆状态 generation 不对');
-  for (const key of ['entries', 'candidates', 'receipts', 'suppressions']) {
+  for (const key of ['entries', 'candidates', 'receipts', 'suppressions', 'conflicts']) {
     if (!Array.isArray(data[key])) throw new StateError('invalid', `记忆状态 ${key} 不是数组`);
   }
   const ids = new Set();
@@ -662,9 +666,12 @@ function readEnvelope(file) {
     if (upgraded.experimental === undefined) {
       upgraded.experimental = { projectEvolution: { enabled: false, epoch: '', policyVersion: EVOLUTION_POLICY_VERSION, feedbackGeneration: 0, learning: emptyLearning() } };
     }
+    if (!Array.isArray(upgraded.conflicts)) upgraded.conflicts = [];
     validateState(upgraded);
     return upgraded;
   }
+  /** 旧库没有冲突队列：读时补空数组。 */
+  if (!Array.isArray(data.payload.conflicts)) data.payload.conflicts = [];
   validateState(data.payload);
   return data.payload;
 }

package/store.js

@@ -103,6 +103,10 @@ function toFlat(entry) {
     reviewState: maintenance.reviewState || 'active',
     created: entry.createdAt || '',
     updated: entry.updatedAt || '',
+    validFrom: typeof entry.validFrom === 'string' && entry.validFrom ? entry.validFrom : (entry.createdAt || ''),
+    validUntil: typeof entry.validUntil === 'string' ? entry.validUntil : '',
+    supersededBy: typeof entry.supersededBy === 'string' ? entry.supersededBy : '',
+    supersedeReason: typeof entry.supersedeReason === 'string' ? entry.supersedeReason : '',
     lastUsed: maintenance.lastUsed || entry.updatedAt || entry.createdAt || '',
     revision: Number(entry.revision) || 1,
     status: entry.status === 'archived' ? 'archived' : 'active',
@@ -130,6 +134,10 @@ function fromFlat(record, status) {
     ownerProjectId: record.ownerProjectId || '',
     createdAt: record.created || at,
     updatedAt: at,
+    validFrom: typeof record.validFrom === 'string' && record.validFrom ? record.validFrom : (record.created || at),
+    validUntil: typeof record.validUntil === 'string' ? record.validUntil : '',
+    supersededBy: typeof record.supersededBy === 'string' ? record.supersededBy : '',
+    supersedeReason: typeof record.supersedeReason === 'string' ? record.supersedeReason : '',
     current: {
       title: record.title || '',
       summary: record.summary || '',
@@ -203,6 +211,7 @@ export function loadIndex(scope, options = {}) {
     receipts: JSON.parse(JSON.stringify(loaded.state.receipts || [])),
     lastSuggestedAt: loaded.state.lastSuggestedAt || '',
     suppressions: JSON.parse(JSON.stringify(loaded.state.suppressions || [])),
+    conflicts: JSON.parse(JSON.stringify(loaded.state.conflicts || [])),
     __evolution: state.evolutionOf(loaded.state),
     __tasks: anchor.normalizeTasks(state.evolutionOf(loaded.state).tasks),
     __control: state.controlOf(loaded.state),
@@ -228,6 +237,7 @@ function applyFlat(scope, draft, index) {
   draft.candidates = Array.isArray(index.suggestions) ? JSON.parse(JSON.stringify(index.suggestions)) : [];
   draft.receipts = Array.isArray(index.receipts) ? JSON.parse(JSON.stringify(index.receipts)) : [];
   draft.suppressions = Array.isArray(index.suppressions) ? JSON.parse(JSON.stringify(index.suppressions)) : [];
+  draft.conflicts = Array.isArray(index.conflicts) ? JSON.parse(JSON.stringify(index.conflicts)) : [];
   draft.lastSuggestedAt = typeof index.lastSuggestedAt === 'string' ? index.lastSuggestedAt : draft.lastSuggestedAt || '';
   draft.scopeKey = draft.scopeKey || index.scope;
 }
@@ -240,9 +250,10 @@ export function saveIndex(scope, index) {
   const meta = index.__meta || { exists: false };
   const expected = meta.exists ? { generation: meta.generation, epoch: meta.epoch } : null;
   const result = state.transact(scope, { expected, expectCreate: !meta.exists }, (draft) => {
-    const before = JSON.stringify([draft.entries, draft.candidates, draft.receipts, draft.suppressions, draft.lastSuggestedAt]);
+    const stamp = () => JSON.stringify([draft.entries, draft.candidates, draft.receipts, draft.suppressions, draft.conflicts, draft.lastSuggestedAt]);
+    const before = stamp();
     applyFlat(scope, draft, index);
-    const after = JSON.stringify([draft.entries, draft.candidates, draft.receipts, draft.suppressions, draft.lastSuggestedAt]);
+    const after = stamp();
     return { changed: before !== after };
   });
   const published = result.state;
@@ -321,6 +332,7 @@ export function normalizeDraft(source, options = {}) {
   const has = (key) => Object.prototype.hasOwnProperty.call(draft, key) && draft[key] !== undefined;
   const id = typeof draft.id === 'string' && /^mem_[a-z0-9]+$/.test(draft.id) ? draft.id : '';
   if (has('id') && !id) throw new Error('id 格式不对');
+  if (has('supersedes') && !/^mem_[a-z0-9]+$/.test(String(draft.supersedes ?? ''))) throw new Error('supersedes 要给被取代的 id');
   const when = has('when') ? textField(draft.when, LIMITS.whenChars, '前置条件') : '';
   const title = textField(cleanTitle(draft.title), LIMITS.titleChars, '标题');
   /** 带 id 是更新：省略的字段保持原值，标题也一样。 */
@@ -370,7 +382,7 @@ export function normalizeDraft(source, options = {}) {
   const topicKey = has('topicKey') ? textField(draft.topicKey, LIMITS.tagChars, '主题') : undefined;
   /** 凭据扫描必须覆盖完整原文：截短后的摘要看不出凭据，原文里有也不行。 */
   const secret = detectSecret([title, summary, rawSummary, when, body, tags.join(' '), topicKey || ''].join('\n'));
-  if (secret) throw new Error(`疑似凭据（${secret}），只记位置，不记值`);
+  if (secret) throw new state.StateError('unsafe', `疑似凭据（${secret}），只记位置，不记值：正文里写「去哪取、怎么取」，不抄值`);
   return {
     id,
     title,
@@ -392,6 +404,8 @@ export function normalizeDraft(source, options = {}) {
     links,
     applicability,
     topicKey,
+    /** 显式取代：新记录写好后再给旧记录打 supersededBy/validUntil。 */
+    supersedes: has('supersedes') ? textField(draft.supersedes, 60, '取代目标') : '',
     has: {
       title: has('title') && Boolean(title),
       summary: has('summary'),
@@ -405,6 +419,7 @@ export function normalizeDraft(source, options = {}) {
       links: links !== undefined,
       applicability: applicability !== undefined,
       topicKey: topicKey !== undefined,
+      supersedes: has('supersedes'),
     },
   };
 }
@@ -695,9 +710,9 @@ const STOP_GRAMS = new Set([
   '的话', '这里', '那里', '一个', '一些', '这样', '那样', '看看', '帮我看', '继续',
 ]);
 
-const asciiWordsOf = (text) => normalizeText(text, 400).toLowerCase().match(/[a-z][a-z0-9_-]{1,}/g) || [];
-
-const wordIn = (pool, word) => new RegExp(`(^|[^a-z0-9])${word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}($|[^a-z0-9])`).test(pool);
+/** 英文整词规则只有一份，放在 view：自动召回和手动搜索必须同一个判断。 */
+const asciiWordsOf = view.asciiWordsOf;
+const wordIn = view.wordIn;
 
 /** 查询按空格/标点切成段：多段按关键词处理，整句仍按相关度处理。 */
 function queryRuns(query) {
@@ -812,7 +827,16 @@ export function similarEntries(entries, title, summary, limit = 2) {
     const titleScore = Math.max(0, ...names.map((name) => similarity(name, title)));
     const summaryScore = similarity(item.summary, summary);
     const score = Math.max(titleScore, summaryScore);
-    if (score >= MERGE.near) rows.push({ id: item.id, title: item.title, summary: item.summary, when: item.when || '', score });
+    if (score >= MERGE.near) rows.push({
+      id: item.id,
+      title: item.title,
+      summary: item.summary,
+      when: item.when || '',
+      /** 候选要能自己解释「为什么像」：标题相近，还是同一主题槽位。 */
+      updated: item.updated || item.created || '',
+      reason: titleScore >= MERGE.near ? 'similar_title' : 'similar_summary',
+      score,
+    });
   }
   rows.sort((a, b) => b.score - a.score);
   return rows.slice(0, limit);
@@ -946,36 +970,74 @@ function mergedFields(draft, record, oldBody, index, writeMode = 'patch', foreig
   return next;
 }
 
+/** 已被取代或过了有效期：默认检索看不见，明确要 history 时仍可查到并读正文。 */
+function staleRecord(record, now = Date.now()) {
+  if (record.supersededBy) return true;
+  const until = Date.parse(record.validUntil || '');
+  return Number.isFinite(until) && until <= now;
+}
+
+/** 给旧记录打上取代链：正文快照交回调用方，放进新记录的 versions 链头。 */
+function stampSupersede(scope, target, nextId, now) {
+  if (target.supersededBy) {
+    throw new state.StateError('conflict', `这条记忆已经被 ${target.supersededBy} 取代，不能再取代一次`);
+  }
+  if (target.id === nextId) throw new Error('不能取代自己');
+  const versions = snapshot(target, readBody(scope, target.id));
+  target.validUntil = now;
+  target.supersededBy = nextId;
+  target.supersedeReason = 'user_replaced';
+  return versions;
+}
+
 /**
  * 一次写入的纯业务部分：校验、身份、字节预算、版本。不改盘（正文写入由调用方在同一把锁里做）。
  */
 function applyDraft(scope, index, source, now, options = {}) {
   const draft = normalizeDraft(source);
+  scanUnsafe(draft);
   const foreign = options.foreignEntries || [];
   const distinct = source && source.resolution === 'distinct';
+  /** 取代/过期记录不参与合并判断：新内容不该再合进一条已经不是现行的记录。 */
+  const live = index.entries.filter((item) => !staleRecord(item));
+  const supersedeTarget = (selfId) => {
+    if (!draft.supersedes) return null;
+    const target = index.entries.find((item) => item.id === draft.supersedes);
+    if (!target) throw new Error(`要取代的记忆不在这一层：${draft.supersedes}`);
+    if (target.id === selfId) throw new Error('不能取代自己');
+    return target;
+  };
   let record = draft.id ? index.entries.find((item) => item.id === draft.id) : null;
   if (draft.id && !record) throw new Error('没有这条记忆，改用新增');
   let mergedFrom = null;
   let similarList = [];
   if (!record) {
     /** distinct 是用户明确说的「这是另一条」：同名也另起一条，不被规范化后的精确同名吞掉。 */
-    const hit = distinct ? null : resolveTarget(index.entries, draft);
+    const hit = distinct ? null : resolveTarget(live, draft);
     if (hit) {
       record = hit.target;
       mergedFrom = hit.target.title === draft.title ? null : hit.target.title;
     } else if (draft.has.topicKey && draft.topicKey && !distinct) {
       /** 同一槽位只留一条现行规范：同层同 topicKey + 同条件必须确认是更新还是另一条。 */
-      const slot = index.entries.find((item) => (item.topicKey || '') === draft.topicKey
+      const slot = live.find((item) => (item.topicKey || '') === draft.topicKey
         && view.conditionsKey(item.conditions) === view.conditionsKey(draft.conditions));
       if (slot) {
-        const row = { id: slot.id, title: slot.title, summary: slot.summary || '', revision: slot.revision || 1 };
+        const row = {
+          id: slot.id,
+          title: slot.title,
+          summary: slot.summary || '',
+          when: slot.when || '',
+          updated: slot.updated || slot.created || '',
+          reason: 'same_topic',
+          revision: slot.revision || 1,
+        };
         return { needsResolution: true, sameTopic: true, similarList: [row], similar: row, draft, record: null, merged: false, previousBody: null, archived: [] };
       }
-      similarList = similarEntries(index.entries, draft.title, draft.summary, 2);
+      similarList = similarEntries(live, draft.title, draft.summary, 2);
     } else {
-      similarList = similarEntries(index.entries, draft.title, draft.summary, 2);
+      similarList = similarEntries(live, draft.title, draft.summary, 2);
       /** 同名不同前置条件是用户明确表达的另一条，不走确认；只有换个说法的相近标题才拦。 */
-      const sameName = index.entries.some((item) => [item.title, ...(item.aliases || [])]
+      const sameName = live.some((item) => [item.title, ...(item.aliases || [])]
         .some((name) => String(name || '').toLowerCase() === draft.title.toLowerCase()));
       if (similarList.length > 0 && !distinct && !sameName) {
         return { needsResolution: true, similarList, similar: similarList[0], draft, record: null, merged: false, previousBody: null, archived: [] };
@@ -989,6 +1051,7 @@ function applyDraft(scope, index, source, now, options = {}) {
     }
   }
   if (record) {
+    const target = supersedeTarget(record.id);
     const oldBody = readBody(scope, record.id);
     const next = mergedFields(draft, record, oldBody, index, writeMode, foreign);
     /** 正文原样保存：摘要再长也不往正文里补尾巴；完整原句进维护区。 */
@@ -1009,7 +1072,7 @@ function applyDraft(scope, index, source, now, options = {}) {
       && next.applicability === (record.applicability || 'all_in_scope')
       && next.body === oldBody
       && summaryFull === (typeof record.summaryFull === 'string' ? record.summaryFull : '');
-    if (noop) {
+    if (noop && !target) {
       return { record, merged: true, mergedFrom: null, similar: null, similarList, draft, noop: true, previousBody: oldBody, archived: [] };
     }
     const versions = snapshot(record, oldBody);
@@ -1036,10 +1099,18 @@ function applyDraft(scope, index, source, now, options = {}) {
     const archived = assertFits(scope, index, nextRecord);
     writeBody(scope, record.id, next.body);
     Object.assign(record, nextRecord);
-    return { record, merged: true, mergedFrom, similar: null, similarList, draft, noop: false, previousBody: oldBody, archived };
+    /** 更新让这条重新成为现行版本：旧的取代链标记要摘掉。 */
+    delete record.supersededBy;
+    record.validUntil = '';
+    if (target) {
+      const chain = stampSupersede(scope, target, record.id, now);
+      record.versions = [...chain, ...(record.versions || [])].slice(0, 2);
+    }
+    return { record, merged: true, mergedFrom, similar: null, similarList, draft, noop: Boolean(noop), previousBody: oldBody, archived };
   }
   if (writeMode === 'replace_current') throw new Error('整份替换要先指明是哪条，不能用来新增');
   /** 新建也只用调用方给的正文：超长摘要的完整原句进维护区，不混进正文。 */
+  const target = supersedeTarget('');
   const createdBody = draft.body;
   draft.fullTextInBody = false;
   draft.fullTextSaved = Boolean(draft.summaryFull);
@@ -1062,6 +1133,10 @@ function applyDraft(scope, index, source, now, options = {}) {
     aliases: [],
     created: now,
     updated: now,
+    validFrom: now,
+    validUntil: '',
+    supersededBy: '',
+    supersedeReason: '',
     lastUsed: now,
     revision: 1,
     status: 'active',
@@ -1079,9 +1154,42 @@ function applyDraft(scope, index, source, now, options = {}) {
   const archived = assertFits(scope, index, created);
   writeBody(scope, created.id, created.body);
   index.entries.push(created);
+  if (target) created.versions = stampSupersede(scope, target, created.id, now);
   return { record: created, merged: false, mergedFrom: null, similar: similarList[0] || null, similarList, draft, noop: false, previousBody: null, archived };
 }
 
+/**
+ * 写入前兜底扫描：记忆会被 memory_read 原样喂回模型，所以只拦形状明确的三类——
+ * 提示注入指令、凭据原文、不可见 Unicode；提到「凭据 / 指令」的正文不算。
+ */
+const UNSAFE_TEXT = [
+  { code: 'injection', why: '像提示注入的指令', fix: '把「指令」改成对规则的描述', test: /ignore\s+(?:all\s+)?(?:previous|prior|above)\s+(?:instructions?|rules?|prompts?)/i },
+  { code: 'injection', why: '像提示注入的指令', fix: '把「指令」改成对规则的描述', test: /忽略(?:上面|以上|此前|之前)?(?:的)?(?:所有)?(?:指令|指示|要求|规则)/ },
+  { code: 'injection', why: '像提示注入的指令', fix: '把「指令」改成对规则的描述', test: /<\/?(?:system|instructions?|prompt|tool_call)[^>]*>/i },
+  { code: 'injection', why: '像提示注入的指令', fix: '把「指令」改成对规则的描述', test: /(?:^|\n)\s*(?:system|assistant)\s*[:：]/i },
+];
+const INVISIBLE = /[\u200B-\u200F\u202A-\u202E\u2060-\u2064\u2066-\u2069\uFEFF]|[\u{E0000}-\u{E007F}]/u;
+const SCAN_FIELD_NAMES = { title: '标题', summary: '摘要', when: '适用场景', body: '正文', tags: '标签', triggers: '触发词', conditions: '条件', selection: '适用范围' };
+
+function scanUnsafe(draft) {
+  const fields = [
+    ['title', draft.title], ['summary', draft.summary], ['when', draft.when], ['body', draft.body],
+    ['tags', (draft.tags || []).join('\n')], ['triggers', (draft.triggers || []).join('\n')],
+    ['conditions', JSON.stringify(draft.conditions || [])], ['selection', JSON.stringify(draft.selection || null)],
+  ];
+  for (const [field, raw] of fields) {
+    const text = typeof raw === 'string' ? raw : '';
+    if (!text) continue;
+    const name = SCAN_FIELD_NAMES[field] || field;
+    if (INVISIBLE.test(text)) {
+      throw new state.StateError('unsafe', `${name}里有看不见的字符（零宽或方向控制）；它们会跟着记忆原样回到模型，删掉再存`);
+    }
+    for (const rule of UNSAFE_TEXT) {
+      if (rule.test.test(text)) throw new state.StateError('unsafe', `${name}${rule.why}；${rule.fix}`);
+    }
+  }
+}
+
 /**
  * 单条与记录序列化两档预算：新增与更新走同一套。
  * 整层条数/正文预算由 state.transact 在发布前裁决（腾最久没读的那条，不拒绝新记忆），
@@ -1359,6 +1467,8 @@ export function search(scope, query, limit = 4, options = {}) {
       const collect = (pool, archived) => {
         for (const item of pool) {
           if (!readableRecord(item, options, index)) continue;
+          /** 被取代/过期待记录默认不出现；history:true 才列出，供模型看演化。 */
+          if (options.history !== true && staleRecord(item, options.now || Date.now())) continue;
           /** 已暂停、已过期或待确认的学习规则不进入检索结果，除非明确要病史。 */
           if (options.allowExperimental === true && options.history !== true
             && isExperimentalRecord(item) && !view.experimentalUsable(item, options.now)) continue;
@@ -1594,6 +1704,8 @@ function findCurrent(id, scope, options = {}) {
       summary: record.summary || '',
       scope: source.key === 'global' ? 'global' : 'project',
       revision: record.revision || 1,
+      validUntil: record.validUntil || '',
+      supersededBy: record.supersededBy || '',
       status: 'ok',
     };
   }
@@ -2353,6 +2465,9 @@ function crossLayerSimilar(projectScope, targetScope, draft) {
     id: item.id,
     title: item.title,
     summary: item.summary || '',
+    when: item.when || '',
+    updated: item.updated || '',
+    reason: item.reason || 'similar_title',
     revision: item.revision || 1,
     scope: other.key === 'global' ? 'global' : 'project',
   }));
@@ -2369,6 +2484,49 @@ function bindSameTopic(projectScope, ref) {
   return { topicKey: view.topicSlot(record) };
 }
 
+
+/** 冲突队列：只记待办，不预写记忆；最多 20 条。 */
+const CONFLICT_LIMIT = 20;
+
+function queueConflictLocked(scope, draft, candidates) {
+  const index = loadIndex(scope);
+  const title = normalizeText(draft && draft.title, 120);
+  if (!title) return Array.isArray(index.conflicts) ? index.conflicts.length : 0;
+  const scopeKey = scope.key === 'global' ? 'global' : 'project';
+  const now = new Date().toISOString();
+  const rows = Array.isArray(index.conflicts) ? index.conflicts : [];
+  const view = candidates.slice(0, 2).map((item) => ({
+    id: item.id, title: item.title || '', when: item.when || '', reason: item.reason || 'similar_title',
+  }));
+  const hit = rows.find((row) => row.title === title && row.scope === scopeKey);
+  if (hit) {
+    hit.candidates = view;
+    hit.updatedAt = now;
+  } else {
+    rows.push({ id: `cf_${crypto.randomUUID().replace(/-/g, '').slice(0, 12)}`, title, scope: scopeKey, candidates: view, createdAt: now, updatedAt: now });
+  }
+  index.conflicts = rows.slice(-CONFLICT_LIMIT);
+  saveIndex(scope, index);
+  return index.conflicts.length;
+}
+
+function clearConflictLocked(scope, title) {
+  const index = loadIndex(scope);
+  const rows = Array.isArray(index.conflicts) ? index.conflicts : [];
+  const norm = normalizeText(title, 120);
+  const next = rows.filter((row) => !(row.title === norm && row.scope === (scope.key === 'global' ? 'global' : 'project')));
+  if (next.length === rows.length) return rows.length;
+  index.conflicts = next;
+  saveIndex(scope, index);
+  return next.length;
+}
+
+/** 当前层还有几条没处理的冲突。 */
+export function pendingConflictsOf(scope) {
+  const rows = loadIndex(scope).conflicts;
+  return Array.isArray(rows) ? rows.length : 0;
+}
+
 /**
  * 保存的唯一入口：先路由，再在两层里查重（完全相同 → existing_ref；只是相近 → 只给候选），
  * 最后才写。写之前判不出来的范围返回 needsScope，不替用户选。
@@ -2412,6 +2570,7 @@ export function saveEntry(projectScope, source) {
       }
       const near = crossLayerSimilar(projectScope, targetScope, draft);
       if (near.length) {
+        const pendingConflicts = queueConflictLocked(targetScope, draft, near);
         return {
           needsResolution: true,
           crossLayer: true,
@@ -2419,12 +2578,19 @@ export function saveEntry(projectScope, source) {
           similar: near[0],
           draft,
           needsScope: false,
+          pendingConflicts,
           chosenScope: targetScope.key === 'global' ? 'global' : 'project',
         };
       }
     }
     const foreign = targetScope.key === 'global' ? [] : loadIndex(globalScope()).entries;
     const result = upsertLocked(targetScope, next, { foreignEntries: foreign });
+    if (!result.needsResolution) clearConflictLocked(targetScope, draft ? draft.title : next.title);
+    if (result.needsResolution) {
+      const rows = Array.isArray(result.similarList) ? result.similarList : [];
+      const pendingConflicts = queueConflictLocked(targetScope, result.draft || draft, rows);
+      return { ...result, chosenScope: targetScope.key === 'global' ? 'global' : 'project', needsScope: false, reasonCode: routed.reasonCode, pendingConflicts };
+    }
     return { ...result, chosenScope: targetScope.key === 'global' ? 'global' : 'project', needsScope: false, reasonCode: routed.reasonCode };
   });
 }