@modusensus/dsh-mneme 0.3.2 → 0.3.3

package/README.md

@@ -5,7 +5,7 @@
 [![npm version](https://img.shields.io/npm/v/@modusensus/dsh-mneme?color=blue&label=npm)](https://www.npmjs.com/package/@modusensus/dsh-mneme)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![Awesome](https://awesome-dsh-plugin.com/badge.svg)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)
-[![tests](https://img.shields.io/badge/tests-404%20passed-success)](https://github.com/modusensus/dsh-mneme)
+[![tests](https://img.shields.io/badge/tests-429%20passed-success)](https://github.com/modusensus/dsh-mneme)
 
 > 给 DeepSeek Harness 的跨会话记忆插件：让 Agent 记住你、记住项目、自动整理记忆。**Mneme**（Μνήμη）——希腊记忆女神 Mnemosyne 之名，掌管记忆与梦境，正如 autoDream 在后台巩固记忆。
 
@@ -180,7 +180,7 @@ dsh web
 | `localEmbedBatchSize` | `8` | 本地 embedding 批大小（1-64） |
 | `ollamaBaseUrl` | `http://localhost:11434` | Ollama 服务地址 |
 | `ollamaModel` | `nomic-embed-text` | Ollama embedding 模型 |
-| `embedModelCacheDir` | 空 | 模型缓存目录（空 = transformers 默认缓存） |
+| `embedModelCacheDir` | 空 | 模型缓存目录（空 = 用户级 `~/.dsh/mneme/models`） |
 | `embedModelMirror` | `https://hf-mirror.com` | 模型下载镜像源 |
 | `vectorSearchTopK` | `20` | 向量搜索返回 Top-K |
 | `vectorSearchThreshold` | `0.65` | 向量搜索相似度阈值 |
@@ -243,7 +243,7 @@ src/
 lib/
 ├── client.js         # Web 面板（手写 ModuleLoader bundle）
 └── *.js              # src 的同步分发产物
-test/                 # 404 个 node:test 测试（含审计与三轴线压测不变量）
+test/                 # 429 个 node:test 测试（含审计与三轴线压测不变量）
 scripts/              # e2e-dsh.js 端到端演示 · stress-dsh.js 三轴线压测 · sync-lib.js 同步
 ```
 
@@ -252,7 +252,7 @@ scripts/              # e2e-dsh.js 端到端演示 · stress-dsh.js 三轴线压
 ```bash
 cd dsh-mneme
 npm install        # 安装 peer 依赖（以 devDependencies 形式，用于本地测试）
-npm test           # 运行 404 个测试
+npm test           # 运行 429 个测试
 npm run stress     # 三轴线压测：长会话检索 / 冲突仲裁 / 多 Agent 并发（离线 mock LLM）
 npm run sync       # 把 src/ 同步到 lib/（发布时由 prepack 钩子自动执行）
 ```

package/lib/config.js

@@ -42,7 +42,9 @@ export const Config = z.object({
   ollamaBaseUrl: z.string().default("http://localhost:11434"),
   ollamaModel: z.string().default("nomic-embed-text"),
 
-  // Model download/cache.
+  // Model download/cache. When empty (default), models are cached under the
+  // user-level path ~/.dsh/mneme/models (resolved in local-embedder/reranker);
+  // a non-empty value is used verbatim.
   embedModelCacheDir: z.string().default(""),
   embedModelMirror: z.string().default("https://hf-mirror.com"),
 

package/lib/local-embedder.js

@@ -3,6 +3,9 @@
 // old embedding.js logic). All classes share one interface so the orchestrator
 // can pick a backend by provider name and degrade gracefully on failure.
 // Methods throw on error — the caller decides the fallback chain.
+import os from "node:os";
+import path from "node:path";
+
 const DEFAULT_TIMEOUT_MS = 15000;
 
 /** djb2 — stable, fast fingerprint for a provider/model string. */
@@ -47,7 +50,9 @@ export class LocalEmbedder {
     this._dimension = opts.dimension || 512;
     this.device = opts.device || "cpu";
     this.batchSize = opts.batchSize || 8;
-    this.cacheDir = String(opts.cacheDir ?? "").trim();
+    this.cacheDir =
+      String(opts.cacheDir ?? "").trim() ||
+      path.join(os.homedir(), ".dsh", "mneme", "models");
     this.useDtype = opts.useDtype || "q8";
     this.logger = opts.logger ?? null;
     // Test hook: replace the pipeline factory without touching modules.

package/lib/reranker.js

@@ -1,3 +1,6 @@
+import os from "node:os";
+import path from "node:path";
+
 // Cross-encoder re-ranker for dsh-mneme recall candidates. Uses
 // bge-reranker-base through transformers.js: tries the native `rerank` task
 // first, then the sequence-classification head (sigmoid on the logit delta),
@@ -65,7 +68,9 @@ export class LocalReranker {
     this.maxCandidates = opts.maxCandidates || 30;
     this.scoreThreshold = opts.scoreThreshold ?? 0.1;
     this.device = opts.device || "cpu";
-    this.cacheDir = String(opts.cacheDir ?? "").trim();
+    this.cacheDir =
+      String(opts.cacheDir ?? "").trim() ||
+      path.join(os.homedir(), ".dsh", "mneme", "models");
     this.logger = opts.logger ?? null;
     this.engineFactory = opts.engineFactory || defaultPipelineLoader;
     // Injectable seam: async (query, passage) => number. When set, init()

package/lib/service.js

@@ -391,8 +391,12 @@ export function createService({ store, mirror, config, onWrite, logger }) {
         const hasDiff = (patch.title !== undefined && existing.title !== patch.title)
           || (patch.content !== undefined && existing.content !== patch.content);
         if (!hasDiff) continue;
-        store.update(edit.id, patch);
+        // 人工编辑回灌后触发 re-embed（issue #3 残留修复）：向量必须与
+        // 新 title/content 一致。scheduleEmbed 为 fire-and-forget，
+        // 内部 try/catch 吞错，失败不影响主流程。
+        const merged = store.update(edit.id, patch);
         applied++;
+        scheduleEmbed(merged);
       }
     }
     if (applied) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@modusensus/dsh-mneme",
   "description": "Cross-session memory plugin for DeepSeek Harness with autoDream consolidation: SQLite store, Markdown mirrors, 6 model tools, automatic injection, session summarization, user profile/rules, custom slash commands, vector (semantic) search, and a Web GUI panel",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",

package/src/config.js

@@ -42,7 +42,9 @@ export const Config = z.object({
   ollamaBaseUrl: z.string().default("http://localhost:11434"),
   ollamaModel: z.string().default("nomic-embed-text"),
 
-  // Model download/cache.
+  // Model download/cache. When empty (default), models are cached under the
+  // user-level path ~/.dsh/mneme/models (resolved in local-embedder/reranker);
+  // a non-empty value is used verbatim.
   embedModelCacheDir: z.string().default(""),
   embedModelMirror: z.string().default("https://hf-mirror.com"),
 

package/src/local-embedder.js

@@ -3,6 +3,9 @@
 // old embedding.js logic). All classes share one interface so the orchestrator
 // can pick a backend by provider name and degrade gracefully on failure.
 // Methods throw on error — the caller decides the fallback chain.
+import os from "node:os";
+import path from "node:path";
+
 const DEFAULT_TIMEOUT_MS = 15000;
 
 /** djb2 — stable, fast fingerprint for a provider/model string. */
@@ -47,7 +50,9 @@ export class LocalEmbedder {
     this._dimension = opts.dimension || 512;
     this.device = opts.device || "cpu";
     this.batchSize = opts.batchSize || 8;
-    this.cacheDir = String(opts.cacheDir ?? "").trim();
+    this.cacheDir =
+      String(opts.cacheDir ?? "").trim() ||
+      path.join(os.homedir(), ".dsh", "mneme", "models");
     this.useDtype = opts.useDtype || "q8";
     this.logger = opts.logger ?? null;
     // Test hook: replace the pipeline factory without touching modules.

package/src/reranker.js

@@ -1,3 +1,6 @@
+import os from "node:os";
+import path from "node:path";
+
 // Cross-encoder re-ranker for dsh-mneme recall candidates. Uses
 // bge-reranker-base through transformers.js: tries the native `rerank` task
 // first, then the sequence-classification head (sigmoid on the logit delta),
@@ -65,7 +68,9 @@ export class LocalReranker {
     this.maxCandidates = opts.maxCandidates || 30;
     this.scoreThreshold = opts.scoreThreshold ?? 0.1;
     this.device = opts.device || "cpu";
-    this.cacheDir = String(opts.cacheDir ?? "").trim();
+    this.cacheDir =
+      String(opts.cacheDir ?? "").trim() ||
+      path.join(os.homedir(), ".dsh", "mneme", "models");
     this.logger = opts.logger ?? null;
     this.engineFactory = opts.engineFactory || defaultPipelineLoader;
     // Injectable seam: async (query, passage) => number. When set, init()

package/src/service.js

@@ -391,8 +391,12 @@ export function createService({ store, mirror, config, onWrite, logger }) {
         const hasDiff = (patch.title !== undefined && existing.title !== patch.title)
           || (patch.content !== undefined && existing.content !== patch.content);
         if (!hasDiff) continue;
-        store.update(edit.id, patch);
+        // 人工编辑回灌后触发 re-embed（issue #3 残留修复）：向量必须与
+        // 新 title/content 一致。scheduleEmbed 为 fire-and-forget，
+        // 内部 try/catch 吞错，失败不影响主流程。
+        const merged = store.update(edit.id, patch);
         applied++;
+        scheduleEmbed(merged);
       }
     }
     if (applied) {

package/test/mirror-dirty.test.js

@@ -17,8 +17,9 @@ import { createSettings } from "../src/settings.js";
  *  - store.js 新增 mirror_state 表 + set/getMirrorState + markMirrorDirty/Clean
  *  - service.syncMirror 失败写 dirty（dirty=1+last_error+last_attempt）、成功写
  *    clean（dirty=0+last_error=null+success_at）；状态写入各自 try/catch 不向外抛
- *  - service.recoverMirror() 启动时 dirty 则尝试一次同步，失败保持 dirty 下次再试
- *  - api.js /api/dsh-mneme/health 返回 mirror 状态
+ *  - service.recoverMirror() 启动时 dirty 则做有界重试（最多 3 次）收敛镜像，
+ *    仍失败保持 dirty 下次再试；返回 { recovered, error }，绝不向外抛
+ *  - service.getMirrorHealth() 供 api.js /api/dsh-mneme/health 使用
  *  - index.js 启动时调 recoverMirror()
  *
  * 测试点由 Kimi K2.7 设计（TC-F-03-001~011）。
@@ -134,20 +135,22 @@ test("F-NEW-03: syncMirror 成功 → dirty=0+last_error=null+success_at，镜
   }
 });
 
-// ── TC-F-03-006：recoverMirror dirty+成功 → 恢复 clean，恰好一次 ────────────
+// ── TC-F-03-006：recoverMirror dirty+成功 → 恢复 clean，首试即中恰好一次 ────
 
-test("F-NEW-03: recoverMirror dirty→成功恢复 clean，sync 恰好一次，镜像收敛", () => {
+test("F-NEW-03: recoverMirror dirty→成功恢复 clean，首试即中、镜像收敛、返回 recovered", () => {
   const { dir, mirrorDir, store, mirror, service } = setup();
   try {
     // 制造 dirty（失败一次）
     const { original } = throwingMirrorSync(mirror);
     service.saveWithDedupe({ type: "project", title: "启动恢复", content: "Dirty 数据", importance: 3 });
     assert.equal(service.getMirrorState().dirty, true, "前置：必须 dirty");
-    // 恢复后包计数，recoverMirror 应只调一次
+    // 恢复后包计数，recoverMirror 首次尝试即成功 → sync 恰好一次
     mirror.sync = original;
     const counter = countingSync(mirror);
-    assert.doesNotThrow(() => service.recoverMirror(), "recoverMirror 不得抛");
-    assert.equal(counter.calls(), 1, "recover 必须只尝试一次（有界）");
+    const result = service.recoverMirror();
+    assert.equal(result.recovered, true, "恢复成功必须返回 recovered=true");
+    assert.equal(result.error, null);
+    assert.equal(counter.calls(), 1, "首试即中：sync 必须只调一次");
     const state = service.getMirrorState();
     assert.equal(state.dirty, false, "恢复成功必须清 dirty");
     assert.equal(state.last_error, null);
@@ -160,26 +163,49 @@ test("F-NEW-03: recoverMirror dirty→成功恢复 clean，sync 恰好一次，
   }
 });
 
-// ── TC-F-03-007：recoverMirror 失败保持 dirty，恰好一次，不抛 ───────────────
+// ── TC-F-03-007：recoverMirror 失败保持 dirty，有界重试后放弃，不抛 ─────────
 
-test("F-NEW-03: recoverMirror 仍失败 → dirty 保持 1、last_error/attempt 更新，不抛", () => {
+test("F-NEW-03: recoverMirror 仍失败 → dirty 保持、返回 recovered=false+error，不抛", () => {
   const { dir, store, mirror, service } = setup();
   try {
-    const { original, err } = throwingMirrorSync(mirror);
+    const { original } = throwingMirrorSync(mirror);
     try {
       service.saveWithDedupe({ type: "project", title: "再失败", content: "x", importance: 3 });
       const dirtyState = service.getMirrorState();
       assert.equal(dirtyState.dirty, true, "前置：必须 dirty");
-      const counter = countingSync(mirror); // 注意：仍抛错
-      // countingSync 换掉了 mock；需要保留抛错行为 —— 用原 mock 再次包计数
-      mirror.sync = () => { counter.calls(); throw new Error("still broken"); };
+      const counter = countingSync(mirror); // 包装的仍是抛错 mock → 每次尝试都失败
       assert.doesNotThrow(() => service.recoverMirror(), "recoverMirror 失败也不得抛");
       const after = service.getMirrorState();
       assert.equal(after.dirty, true, "失败后 dirty 必须保持，供下次启动再试");
-      assert.equal(after.last_error, "still broken", "last_error 须更新为新错误");
+      assert.ok(after.last_error, "last_error 须有值");
       assert.ok(after.last_attempt >= dirtyState.last_attempt, "last_attempt 须更新");
       assert.equal(after.success_at, null);
-      assert.ok(counter.calls() >= 1, "recover 只应尝试一次");
+      // 有界性：失败路径最多重试 MAX_ATTEMPTS(3) 次后放弃，不得无限循环
+      assert.ok(counter.calls() <= 3, `recover 失败必须是有界重试，实际 ${counter.calls()} 次`);
+    } finally {
+      mirror.sync = original;
+    }
+  } finally {
+    store.close();
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+// ── 有界性（Kimi 风险点 3）：recoverMirror 重试次数精确 ≤3 ──────────────────
+
+test("F-NEW-03: recoverMirror 失败路径恰好重试 3 次后放弃（有界不无限）", () => {
+  const { dir, store, mirror, service } = setup();
+  try {
+    const { original } = throwingMirrorSync(mirror);
+    try {
+      service.saveWithDedupe({ type: "project", title: "有界", content: "x", importance: 3 });
+      assert.equal(service.getMirrorState().dirty, true, "前置：必须 dirty");
+      const counter = countingSync(mirror);
+      const result = service.recoverMirror();
+      assert.equal(counter.calls(), 3, "失败路径必须恰好尝试 3 次（MAX_ATTEMPTS）");
+      assert.equal(result.recovered, false, "3 次耗尽仍失败 → recovered=false");
+      assert.ok(result.error, "必须携带失败原因 error");
+      assert.equal(service.getMirrorState().dirty, true, "放弃后 dirty 保持，下次启动再试");
     } finally {
       mirror.sync = original;
     }
@@ -191,18 +217,21 @@ test("F-NEW-03: recoverMirror 仍失败 → dirty 保持 1、last_error/attempt
 
 // ── TC-F-03-008：recoverMirror 不 dirty 时 no-op ────────────────────────────
 
-test("F-NEW-03: recoverMirror 不 dirty → 不重渲染、状态不变", () => {
+test("F-NEW-03: recoverMirror 不 dirty → 不重渲染、状态不变、返回 recovered=true", () => {
   const { dir, store, mirror, service } = setup();
   try {
     const counter = countingSync(mirror);
-    assert.doesNotThrow(() => service.recoverMirror(), "空表 recoverMirror 不得抛");
+    const result = service.recoverMirror();
     assert.equal(counter.calls(), 0, "不 dirty 时必须 no-op，不调 sync");
+    assert.equal(result.recovered, true, "本来干净 → recovered=true 且不调 sync");
     const state = service.getMirrorState();
     assert.equal(state.dirty, false, "状态不得改变");
-    // 已有数据但 dirty=0 同样 no-op
+    // 已有数据但 dirty=0 同样 no-op（saveWithDedupe 自身会同步一次，记录基线）
     service.saveWithDedupe({ type: "project", title: "干净数据", content: "x", importance: 3 });
     assert.equal(service.getMirrorState().dirty, false);
-    assert.equal(counter.calls(), 0, "干净状态下 recoverMirror 不得触发同步");
+    const before = counter.calls();
+    service.recoverMirror();
+    assert.equal(counter.calls(), before, "干净状态下 recoverMirror 不得触发同步");
   } finally {
     store.close();
     rmSync(dir, { recursive: true, force: true });