dsh-lite-memory 0.16.4 → 0.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lite-memory",
-  "version": "0.16.4",
+  "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/client.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"
   },
@@ -33,6 +33,9 @@
     "README.md",
     "TRIGGERS.md",
     "docs",
+    "!docs/competitive-notes.md",
+    "!docs/ha-audit.md",
+    "!docs/ROADMAP.md",
     "LICENSE",
     "bench",
     "test"
@@ -63,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

@@ -260,7 +260,7 @@ function gitRoot(cwd) {
     return { root: '', reason: 'failed' };
   } catch (error) {
     const text = `${error && error.stderr ? error.stderr : ''}${error && error.message ? error.message : ''}`;
-    if (/not a git repository|不是.*git/i.test(text)) return { root: '', reason: 'not_git' };
+    if (/not a git repository|不是[\s\S]*git/i.test(text)) return { root: '', reason: 'not_git' };
     return { root: '', reason: 'failed' };
   }
 }
@@ -366,6 +366,43 @@ export function knownProjectScopes(limit = 40) {
 
 const stateFile = (scope) => path.join(scope.dir, 'state.json');
 const prevFile = (scope) => path.join(scope.dir, 'state.prev.json');
+
+/**
+ * 损坏的 state.json 先留一份原始字节，再谈恢复：只复制、不改名、不删除，
+ * 同一份坏字节重复遇到时复用已有副本，避免每次读都堆一个新文件。
+ */
+function quarantineCorrupt(scope, file) {
+  let raw;
+  try {
+    raw = fs.readFileSync(file);
+  } catch {
+    return null;
+  }
+  let names;
+  try {
+    names = fs.readdirSync(scope.dir);
+  } catch {
+    return null;
+  }
+  for (const name of names) {
+    if (!name.startsWith('state.corrupt-') || !name.endsWith('.json')) continue;
+    const candidate = path.join(scope.dir, name);
+    try {
+      if (fs.readFileSync(candidate).equals(raw)) return candidate;
+    } catch {
+      /* 再试下一个副本 */
+    }
+  }
+  const stamp = new Date().toISOString().replace(/[-:]/g, '').replace('T', '-').replace(/\..+/, '');
+  let copy = path.join(scope.dir, `state.corrupt-${stamp}.json`);
+  if (fs.existsSync(copy)) copy = path.join(scope.dir, `state.corrupt-${stamp}-${crypto.randomBytes(3).toString('hex')}.json`);
+  try {
+    writeDurable(copy, raw);
+  } catch {
+    return null;
+  }
+  return copy;
+}
 const lockFile = (scope) => path.join(scope.dir, '.lock');
 const migrationIntentFile = (scope) => path.join(scope.dir, 'migration.intent.json');
 const purgeIntentFile = (scope) => path.join(scope.dir, 'purge.intent.json');
@@ -389,6 +426,40 @@ function sleepSync(ms) {
 
 const lockDepth = new Map();
 
+/** pid 还在不在：EPERM 说明进程存在但不属于当前用户，按「活着」处理，绝不回收。 */
+function pidAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === 'EPERM';
+  }
+}
+
+/**
+ * 崩溃残留的锁：token 里的 pid 已经不在、且文件内容没被换过，才允许删。
+ * 活进程（含当前进程）的锁一律不动，迟到的新锁也不会被误删。
+ */
+function reclaimStaleLock(file) {
+  let owner;
+  try {
+    owner = fs.readFileSync(file, 'utf8').trim();
+  } catch {
+    return false;
+  }
+  if (!owner) return false;
+  const pid = Number.parseInt(owner.split(':')[0], 10);
+  if (!Number.isInteger(pid) || pid === process.pid || pidAlive(pid)) return false;
+  try {
+    if (fs.readFileSync(file, 'utf8').trim() !== owner) return false;
+    fs.rmSync(file, { force: true });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 /**
  * 跨进程一把锁：.lock 用 wx 创建，写 owner token，只释放自己那把。
  * 同进程内允许重入（读—改—写在同一个锁窗口里连续调用）。
@@ -414,6 +485,8 @@ export function withScopeLock(scope, fn) {
       fd = fs.openSync(file, 'wx');
     } catch (error) {
       if (error.code !== 'EEXIST') throw new StateError('unavailable', `记忆库加锁失败（${error.code || 'IO'}）：${file}`);
+      /** 锁主人已经不在了（崩溃/被 kill）：回收后立刻重试，不把用户卡在 500ms 的 busy 上。 */
+      if (reclaimStaleLock(file)) continue;
       if (Date.now() > deadline) {
         throw new StateError('busy', `记忆库正忙（另一个进程在写），稍后再试；若确认没有写入进程，删掉 ${file}`);
       }
@@ -462,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) {
@@ -493,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();
@@ -589,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;
 }
@@ -645,7 +725,7 @@ export function cleanStateResidue(scope) {
   }
 }
 
-function writeDurable(file, text) {
+export function writeDurable(file, text) {
   const dir = path.dirname(file);
   fs.mkdirSync(dir, { recursive: true });
   const tmp = tempOf(file);
@@ -1078,8 +1158,39 @@ export function load(scope, options = {}) {
   try {
     data = readEnvelope(current);
   } catch (error) {
-    // 校验和/结构坏了时有 prev 也不自动回滚：回滚会掩盖一次真实损坏。
-    throw error;
+    /**
+     * 损坏的 current 不当空库覆盖：先把原始字节留成 state.corrupt-<时间戳>.json，
+     * 再试 state.prev.json；prev 过了同一套校验才采用。两处都不可用就报出可执行的恢复路径。
+     */
+    if (!error || error.code !== 'corrupt') throw error;
+    const copy = quarantineCorrupt(scope, current);
+    const prev = prevFile(scope);
+    let recovered = null;
+    try {
+      recovered = readEnvelope(prev);
+    } catch {
+      recovered = null;
+    }
+    if (recovered) {
+      return {
+        state: recovered,
+        exists: true,
+        recovered: true,
+        recovery: {
+          corruptFile: copy,
+          prevFile: prev,
+          message: `记忆状态已损坏，已从上一版恢复（${prev}）；损坏副本保留在 ${copy}`,
+        },
+      };
+    }
+    const hint = new StateError('corrupt', [
+      `记忆状态已损坏，上一版也不可用，已停止读写：${current}`,
+      `损坏副本已保留：${copy || '（原文件读不出来，未生成副本）'}`,
+      `上一版路径：${prev}`,
+      `恢复步骤：先备份 ${current} 和 ${prev}；确认 ${prev} 可独立复原后把它复制成 state.json，或把损坏的 state.json 移走后重试；不要直接覆盖原文件`,
+    ].join('；'));
+    hint.recovery = { corruptFile: copy, prevFile: prev };
+    throw hint;
   }
   if (!data) {
     const hasLegacy = LEGACY_MARKERS.some((name) => fs.existsSync(path.join(scope.dir, name)));
@@ -1153,7 +1264,8 @@ export function transact(scope, options, work) {
       }].slice(-LIMITS.receipts);
     }
     validateState(draft);
-    const published = publish(scope, draft, loaded.exists);
+    /** 从 prev 恢复出来的这一轮，current 是坏的：不要把它当「上一版」写进 prev，先让好文件顶回去。 */
+    const published = publish(scope, draft, loaded.exists && !loaded.recovered);
     return { changed: true, state: draft, result: outcome.result, archived: evicted, durability: published.durability };
   });
 }