dsh-lite-memory 0.2.6 → 0.2.7

package/README.md

@@ -19,7 +19,7 @@ Lightweight memory for the DeepSeek Harness. Nothing in the system prompt, nothi
 | **L1** 它发现有跨会话价值的经验 | 一行灰字 `memory · keep? "X" — 要记的内容` + 一个 `keep` 按钮；标题加一句话，看得懂才点，不点就永远不写，48 小时内不重复 |
 | **L2** 常识、一次性参数、凭据的值 | 永不写入 |
 
-这些行只属于产生它的那一轮：重进会话就没了，历史里只留正文。
+这些行只属于产生它的那一轮：重进会话就没了，历史里只留正文。同一件事再记一次会合并进原条目，不会长成两条。
 
 触发词：`记住`、`记一下`、`上次`、`规范`、`约定`、`路径`、`凭据怎么取`。
 
@@ -29,7 +29,7 @@ Lightweight memory for the DeepSeek Harness. Nothing in the system prompt, nothi
 | **L1** it spots something worth keeping | one muted line `memory · keep? "X" — what would be remembered` with a single `keep` button — readable before you click, nothing written unless you click, at most once per two days |
 | **L2** common sense, one-off parameters, credential values | never written |
 
-Those lines belong to the turn that made them: reopening the session drops them, leaving only the prose in history.
+Those lines belong to the turn that made them: reopening the session drops them, leaving only the prose in history. Recording the same subject again merges into the existing entry instead of adding a second one.
 
 ## 点一下就存 / One click, no turn
 

package/TRIGGERS.md

@@ -34,6 +34,15 @@
 
 这些行只属于产生它的那一轮：重进会话时不再显示，历史里只留正文。行出现在调用本身的位置——一轮正在跑时，那就是对话的最下面，不会悬浮在输入框上方。
 
+## 什么时候合并，什么时候新建
+
+一条约束只留一条。写入前先拿标题和摘要比一遍：够近就合并进原条目（`merges+1`），正文整篇替换；不够近才新建。
+
+- 合并：同一件事换措辞、补细节、纠正旧值。标题相邻两字重合 ≥ 0.6，或摘要重合 ≥ 0.75。
+- 新建：同一项目下的另一件事，哪怕标签一样。只共用项目名（「插件市场条目字段」对「插件市场踩坑清单」）不算合并。
+- 合并前先 `memory_read` 旧正文：正文是替换，不是追加，漏读就丢细节。
+- 判不准先 `memory_search`：命中就是同一件事，按命中那条的标题写；没命中再新建。
+
 ## 频率与退让
 
 - 建议：同一项目 48 小时一条、一次对话最多一条；同一主题存过就不再建议。

package/index.js

@@ -156,7 +156,7 @@ export function apply(ctx) {
 
   ctx.effect(() => tools.register({
     name: 'memory_save',
-    description: `保存一条记忆。用户明确说「记住」时直接调用；用户自己的话已经是长期规则（「以后都这样」「别再 X」）时也直接调用，不要先问。用户点了「保留」或发「保留记忆「X」」时，用那条建议的内容调用。${NOTES}`,
+    description: `保存一条记忆。用户明确说「记住」时直接调用；用户自己的话已经是长期规则（「以后都这样」「别再 X」）时也直接调用，不要先问。用户点了「保留」或发「保留记忆「X」」时，用那条建议的内容调用。更新已知主题时先 memory_read 旧正文再写：标题相同、或标题与摘要高度相近时，会合并进原来那条（merges+1），正文整篇替换，不新增条目。${NOTES}`,
     parameters: SAVE_PARAMS,
     output: {
       schema: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "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",

package/store.js

@@ -125,14 +125,44 @@ export function trimIndex(scope, index) {
   }
 }
 
+/** 同一主题的判定线。跨过就合并成一条，跨不过就新建。 */
+export const MERGE = { title: 0.6, summary: 0.75 };
+
+/** 相邻两字为一组：中文没有空格，按词切分永远对不上，按字片才认得出改写的同一件事。 */
+function bigrams(text) {
+  const plain = normalizeText(text, 400).toLowerCase().replace(/[^\p{L}\p{N}]+/gu, '');
+  if (!plain) return new Set();
+  if (plain.length < 2) return new Set([plain]);
+  const out = new Set();
+  for (let i = 0; i + 1 < plain.length; i += 1) out.add(plain.slice(i, i + 2));
+  return out;
+}
+
 function similarity(a, b) {
-  const words = (text) => new Set(normalizeText(text, 400).toLowerCase().split(/[^\p{L}\p{N}]+/u).filter((w) => w.length > 1));
-  const left = words(a);
-  const right = words(b);
+  const left = bigrams(a);
+  const right = bigrams(b);
   if (left.size === 0 || right.size === 0) return 0;
   let shared = 0;
-  for (const word of left) if (right.has(word)) shared += 1;
-  return shared / Math.max(left.size, right.size);
+  for (const gram of left) if (right.has(gram)) shared += 1;
+  return shared / (left.size + right.size - shared);
+}
+
+/** 同标题必合并；否则标题或摘要够像，也当作同一主题的又一次记录。 */
+function mergeCandidate(entries, title, summary) {
+  let best = null;
+  let bestScore = 0;
+  for (const item of entries) {
+    if (item.title === title) return item;
+    const titleScore = similarity(item.title, title);
+    const summaryScore = similarity(item.summary, summary);
+    if (titleScore < MERGE.title && summaryScore < MERGE.summary) continue;
+    const score = Math.max(titleScore, summaryScore);
+    if (score > bestScore) {
+      best = item;
+      bestScore = score;
+    }
+  }
+  return best;
 }
 
 /**
@@ -151,7 +181,7 @@ export function upsert(scope, draft) {
 
   const index = loadIndex(scope);
   const now = new Date().toISOString();
-  const existing = index.entries.find((item) => item.title === title) || index.entries.find((item) => similarity(item.summary, summary.text) > 0.8);
+  const existing = mergeCandidate(index.entries, title, summary.text);
   const id = existing ? existing.id : `mem_${Date.now().toString(36)}${crypto.randomBytes(2).toString('hex')}`;
   const record = {
     id,
@@ -172,7 +202,7 @@ export function upsert(scope, draft) {
   index.suggestions = (index.suggestions || []).filter((item) => item.title !== title).slice(-19);
   trimIndex(scope, index);
   saveIndex(scope, index);
-  return { record, merged: Boolean(existing) };
+  return { record, merged: Boolean(existing), mergedFrom: existing && existing.title !== title ? existing.title : null };
 }
 
 export function search(scope, query, limit = 4) {

package/test/store.test.mjs

@@ -63,3 +63,18 @@ assert.ok(trimmed.totalBytes <= store.LIMITS.totalBytes);
 
 fs.rmSync(home, { recursive: true, force: true });
 console.log('store: 16 checks passed');
+
+// 同一主题换个说法：合并，不新增。
+const mergeScope = store.scopeOf('/tmp/project-merge');
+store.upsert(mergeScope, { title: '插件市场条目规范', summary: '市场上传指南的位置与要点', body: '见 UPLOAD-GUIDE.md' });
+const paraphrase = store.upsert(mergeScope, { title: '插件市场条目规范（改写）', summary: '市场上传指南的位置与要点', body: '见 UPLOAD-GUIDE.md#第二节' });
+assert.equal(paraphrase.merged, true);
+assert.equal(paraphrase.mergedFrom, '插件市场条目规范');
+assert.equal(store.loadIndex(mergeScope).entries.length, 1);
+
+// 同一项目下的另一件事：不合并。
+const sibling = store.upsert(mergeScope, { title: '插件市场踩坑清单', summary: '卡片不刷新与抓取失败的已知原因', body: 'y' });
+assert.equal(sibling.merged, false);
+assert.equal(store.loadIndex(mergeScope).entries.length, 2);
+
+console.log('store: merge rules ok');