dsh-lite-memory 0.2.5 → 0.2.7

package/README.md

@@ -19,6 +19,8 @@ Lightweight memory for the DeepSeek Harness. Nothing in the system prompt, nothi
 | **L1** 它发现有跨会话价值的经验 | 一行灰字 `memory · keep? "X" — 要记的内容` + 一个 `keep` 按钮；标题加一句话，看得懂才点，不点就永远不写，48 小时内不重复 |
 | **L2** 常识、一次性参数、凭据的值 | 永不写入 |
 
+这些行只属于产生它的那一轮：重进会话就没了，历史里只留正文。同一件事再记一次会合并进原条目，不会长成两条。
+
 触发词：`记住`、`记一下`、`上次`、`规范`、`约定`、`路径`、`凭据怎么取`。
 
 | Case | Behaviour |
@@ -27,6 +29,8 @@ 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. Recording the same subject again merges into the existing entry instead of adding a second one.
+
 ## 点一下就存 / One click, no turn
 
 `keep` 是同源直写：不产生消息、不动输入框、不打断当前回复。按钮变 `kept` 就结束了。自动写入的行尾有个 `✕`，点它就把刚才那条移入归档。

package/TRIGGERS.md

@@ -22,7 +22,7 @@
 每次调用只占一行、灰色、12px：
 
 ```
-· memory · 2 hits · 96 chars
+· memory · 2 hits
 · memory · no hits
 · memory · saved "插件市场条目字段" — 目录条目要写应用名、一句话作用、图标地址     ✕
 · memory · keep? "发布前先跑文案检查" — 界面文字只留标签、值和动作，交付前跑脚本清零   [keep]
@@ -30,7 +30,18 @@
 · memory · dropped "插件市场条目字段"
 ```
 
-`keep` 按钮只在建议行出现。点一下直接写盘：不产生消息、不动输入框、不占用下一轮对话，按钮变 `kept` 并禁用。同源写盘通道不通时才退回旧路——插入 `保留记忆「X」` 并排队，至少不丢这条建议。自动写入的行尾带 `✕`，点了把那一条移入归档（不删文件，可从归档取回）。不点就什么都不发生，那行过一会儿只是一段灰色历史。
+`keep` 按钮只在建议行出现。点一下直接写盘：不产生消息、不动输入框、不占用下一轮对话，按钮变 `kept` 并禁用。同源写盘通道不通时才退回旧路——插入 `保留记忆「X」` 并排队，至少不丢这条建议。自动写入的行尾带 `✕`，点了把那一条移入归档（不删文件，可从归档取回）。
+
+这些行只属于产生它的那一轮：重进会话时不再显示，历史里只留正文。行出现在调用本身的位置——一轮正在跑时，那就是对话的最下面，不会悬浮在输入框上方。
+
+## 什么时候合并，什么时候新建
+
+一条约束只留一条。写入前先拿标题和摘要比一遍：够近就合并进原条目（`merges+1`），正文整篇替换；不够近才新建。
+
+- 合并：同一件事换措辞、补细节、纠正旧值。标题相邻两字重合 ≥ 0.6，或摘要重合 ≥ 0.75。
+- 新建：同一项目下的另一件事，哪怕标签一样。只共用项目名（「插件市场条目字段」对「插件市场踩坑清单」）不算合并。
+- 合并前先 `memory_read` 旧正文：正文是替换，不是追加，漏读就丢细节。
+- 判不准先 `memory_search`：命中就是同一件事，按命中那条的标题写；没命中再新建。
 
 ## 频率与退让
 

package/client.js

@@ -13,7 +13,7 @@ window.__ModuleLoader__.load({
       memory_forget: 'memory · dropping',
     };
 
-    const KEEP = { idle: 'keep', saving: 'saving', saved: 'kept', kept: 'kept' };
+    const KEEP = { idle: 'keep', saving: 'saving', saved: 'kept' };
     const ROW = { display: 'flex', alignItems: 'center', gap: '6px', padding: '1px 0', fontSize: '12px', lineHeight: '1.6', opacity: 0.7 };
     const DOT = { flex: '0 0 auto', opacity: 0.8 };
     const LABEL = { minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
@@ -41,6 +41,13 @@ window.__ModuleLoader__.load({
       return match ? match[1] : null;
     };
 
+    /** 只在产生这行的那一轮显示。 */
+    const useLive = (phase) => {
+      const live = React.useRef(phase !== 'result');
+      if (phase !== 'result') live.current = true;
+      return live.current;
+    };
+
     const post = (payload) => {
       if (typeof fetch !== 'function') return Promise.resolve(null);
       return fetch('/lite-memory/keep', {
@@ -53,37 +60,24 @@ window.__ModuleLoader__.load({
     };
 
     const Row = (props) => {
+      if (!useLive(props.phase)) return null;
       const line = props.phase === 'preparing' ? null : firstLine(settledText(props.block));
       return h('div', { 'data-tool': props.toolName, style: ROW }, h('span', { style: DOT }, '·'), h('span', { style: LABEL }, line ?? RUNNING[props.toolName] ?? 'memory'));
     };
 
     /** 建议行：一个「keep」按钮，点了直接写盘。 */
     const SuggestRow = (props) => {
+      if (!useLive(props.phase)) return null;
       const [state, setState] = React.useState('idle');
       const text = props.phase === 'preparing' ? null : settledText(props.block);
       const label = firstLine(text) ?? RUNNING.memory_suggest;
       const title = quoted(text);
       const cwd = typeof props.cwd === 'string' ? props.cwd : '';
-      const actions = props.inputActions;
       const canKeep = Boolean(title) && Boolean(cwd) && state === 'idle';
       const keep = () => {
         if (!canKeep) return;
         setState('saving');
-        /** 写盘通道不通时退回一条普通消息，至少不丢这条建议。 */
-        const fallback = () => {
-          try {
-            const message = `保留记忆「${title}」`;
-            const span = actions && typeof actions.captureInsertion === 'function' ? actions.captureInsertion() : null;
-            const inserted = span && actions && typeof actions.insertText === 'function' ? actions.insertText(message, span) : false;
-            if (inserted === false && actions && typeof actions.setDraft === 'function') actions.setDraft(message);
-            if (actions && typeof actions.submit === 'function') actions.submit();
-            setState('kept');
-          } catch {
-            setState('idle');
-          }
-        };
-        if (typeof fetch !== 'function') return fallback();
-        post({ op: 'keep', title, cwd }).then((value) => setState(value && value.ok ? 'saved' : 'kept'));
+        post({ op: 'keep', title, cwd }).then((value) => setState(value && value.ok ? 'saved' : 'idle'));
       };
       const button = title
         ? h('button', { type: 'button', onClick: keep, disabled: !canKeep, 'aria-label': '保留这条记忆', style: canKeep ? KEEP_ON : KEEP_OFF }, KEEP[state] ?? KEEP.idle)
@@ -93,6 +87,7 @@ window.__ModuleLoader__.load({
 
     /** 自动写入行：一个「✕」，点了把它移入归档。 */
     const SavedRow = (props) => {
+      if (!useLive(props.phase)) return null;
       const [state, setState] = React.useState('idle');
       const text = props.phase === 'preparing' ? null : settledText(props.block);
       const title = quoted(text);

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: {
@@ -232,7 +232,7 @@ export function apply(ctx) {
       },
       render: (value) => [{
         type: 'text',
-        text: value.count === 0 ? 'memory · no hits' : `memory · ${value.count} hits · ${value.chars} chars\n${value.index}`,
+        text: value.count === 0 ? 'memory · no hits' : `memory · ${value.count} hits\n${value.index}`,
       }],
     },
     execute: async (args, execution) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.2.5",
+  "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');