memory-eternal 0.10.26 → 0.10.28

package/lib/db.js

@@ -4,7 +4,7 @@
 // 首次启动自动从 .md 文件迁移（幂等）
 
 import { DatabaseSync } from 'node:sqlite'
-import { promises as fs, mkdirSync } from 'node:fs'
+import { promises as fs, mkdirSync, existsSync, renameSync, copyFileSync } from 'node:fs'
 import path from 'node:path'
 import { parseCard, KIND_ROOTS } from './vault.js'
 
@@ -441,6 +441,112 @@ export function closeAllDb() {
  * SQLite 备份：用 VACUUM INTO 创建紧凑副本。
  * 保留最近 maxKeep 个备份，自动清理旧的。
  */
+/**
+ * 拿只读连接**当场**检查一个 .db 文件是否可用（quick_check），并尽可能数出卡片数。
+ * 为什么不复用 dbStatus()：那是**缓存**的打开时结论，文件可能在那之后被写坏/替换 ——
+ * 恢复流程必须看**此刻**的真相。
+ * @returns {{ok:boolean, cards:number, error:string}}
+ */
+export function probeDbFile(file) {
+  let probe = null
+  try {
+    probe = new DatabaseSync(file, { readOnly: true })
+    const row = probe.prepare('PRAGMA quick_check').get()
+    const verdict = String((row && (row.quick_check || Object.values(row)[0])) || '')
+    if (verdict.toLowerCase() !== 'ok') return { ok: false, cards: -1, error: 'quick_check 未通过：' + verdict }
+    let cards = -1
+    try { cards = Number(probe.prepare('SELECT count(*) AS n FROM cards').get().n) } catch { cards = -1 }
+    return { ok: true, cards, error: '' }
+  } catch (e) {
+    return { ok: false, cards: -1, error: String((e && e.message) || e) }
+  } finally {
+    try { probe && probe.close() } catch { /* 忽略 */ }
+  }
+}
+
+/**
+ * 从备份恢复数据库（issue #31 的现实出路：WAL 头一旦损坏，代码修不了**数据**，只能用备份重建）。
+ *
+ * 硬约束 —— **宁可拒绝，也不破坏现场**：
+ *   1. **不删任何东西**：当前库连同 -wal/-shm 一律改名成 `*.corrupt-<时间戳>` 留证；
+ *   2. 替换前先**校验备份真的可用**（能打开 + `PRAGMA quick_check` 通过 + 能数出卡片）；
+ *   3. 拒绝「拿正在使用的库当备份」（自己替换自己）；
+ *   4. 当前库**明明可写**时需要显式 `force`（防止手滑覆盖好数据）；
+ *   5. 恢复后**复核**（重新打开 + 写探针 + 卡片数），结果如实返回。
+ *
+ * @param {string} root vault 目录
+ * @param {{from?:string, force?:boolean, dryRun?:boolean}} opts from：'latest' | 备份文件名 | 绝对路径
+ */
+export async function restoreFromBackup(root, { from = '', force = false, dryRun = false } = {}) {
+  const dir = path.resolve(root)
+  const dbPath = path.join(dir, DB_FILE)
+  const backupsDir = path.join(dir, 'backups')
+  let src = String(from || '').trim()
+  if (!src) return { ok: false, error: '缺少备份来源（--restore latest 或 --restore <备份文件名>' + '）' }
+  if (src === 'latest') {
+    const files = (await fs.readdir(backupsDir).catch(() => []))
+      .filter((f) => f.startsWith('memory-eternal-') && f.endsWith('.db')).sort().reverse()
+    if (!files.length) return { ok: false, error: '没有可用备份：' + backupsDir }
+    src = path.join(backupsDir, files[0])
+  } else if (!src.includes('/') && !src.includes('\\')) {
+    src = path.join(backupsDir, src)
+  }
+  src = path.resolve(src)
+  if (src === path.resolve(dbPath)) return { ok: false, error: '备份文件不能是正在使用的库本身' }
+  let st
+  try { st = await fs.stat(src) } catch { return { ok: false, error: '备份文件不存在：' + src } }
+  if (!st.isFile()) return { ok: false, error: '不是文件：' + src }
+
+  // ② 校验备份可用（只读连接 + quick_check + 卡片数）
+  const backup = probeDbFile(src)
+  if (!backup.ok) return { ok: false, error: '备份不可用（' + src + '）：' + backup.error }
+  const cards = backup.cards
+
+  // ④ 当前库**此刻**仍然健康时要求显式 force（手滑保护）—— 用当场探测，别信缓存
+  const curNow = existsSync(dbPath) ? probeDbFile(dbPath) : { ok: false }
+  if (curNow.ok && !force) {
+    return { ok: false, code: 'DB_HEALTHY', error: '当前库此刻是完好的（quick_check 通过），恢复会覆盖它 —— 确认要恢复请加 --force', cards }
+  }
+  if (dryRun) return { ok: true, dryRun: true, from: src, cards, note: '仅演练：未改任何文件' }
+
+  // ① 先关掉本进程里这个库的连接（Windows 上不关会改名失败）
+  try { closeDb(dir) } catch { /* 忽略 */ }
+  // ② 现场留证：库 + -wal + -shm 全部改名（**不删**）
+  const stamp = new Date().toISOString().replace(/[:.]/g, '-')
+  const movedAside = []
+  for (const suffix of ['', '-wal', '-shm']) {
+    const f = dbPath + suffix
+    if (!existsSync(f)) continue
+    const to = f + '.corrupt-' + stamp
+    try { renameSync(f, to); movedAside.push(to) } catch (e) {
+      return { ok: false, error: '现场留证失败（' + f + '）：' + String((e && e.message) || e) + '（未做任何替换）', movedAside }
+    }
+  }
+  // ③ 备份 → 库
+  try { copyFileSync(src, dbPath) } catch (e) {
+    return { ok: false, error: '写入新库失败：' + String((e && e.message) || e), movedAside }
+  }
+  // ⑤ 复核
+  try {
+    const db = getDb(dir)
+    const health = checkDbHealth(db)
+    const n = Number(db.prepare('SELECT count(*) AS n FROM cards').get().n)
+    return {
+      ok: Boolean(health.writable),
+      from: src,
+      cards: n,
+      backupCards: cards,
+      health,
+      movedAside,
+      note: health.writable
+        ? '已用备份重建；原现场已改名留证（可人工检查后再删）'
+        : '已替换文件，但写探针仍失败：请贴 doctor 输出',
+    }
+  } catch (e) {
+    return { ok: false, error: '复核失败：' + String((e && e.message) || e), movedAside, from: src }
+  }
+}
+
 export async function backupDb(root, { maxKeep = 7 } = {}) {
   const resolved = path.resolve(root)
   const dbPath = path.join(resolved, DB_FILE)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memory-eternal",
-  "version": "0.10.26",
+  "version": "0.10.28",
   "description": "记忆核心（Memory Eternal）：自研的 DeepSeek Harness 记忆插件，不移植任何既有记忆框架——对话结束后自动沉淀知识卡到本地 Markdown Vault（自研去重、自研 CJK 检索、可 git 管理），设置页提供图形化知识库（统计 / 搜索 / 知识图谱 + 侧边栏一键弹窗），Agent 通过 memory_recall 工具按需召回历史上下文。零人工干预。",
   "license": "MIT",
   "repository": {
@@ -64,7 +64,7 @@
     "prepublishOnly": "node build.mjs",
     "release": "node scripts/release.mjs",
     "release:dry": "node scripts/release.mjs --dry-run",
-    "test": "node build.mjs && node tests/vault.test.mjs && node tests/capture.test.mjs && node tests/capture-route.test.mjs && node tests/stall.test.mjs && node tests/vault-path.test.mjs && node tests/vault-resolve.test.mjs && node tests/minhash.test.mjs && node tests/settings-save.test.mjs && node tests/config-coverage.test.mjs && node tests/config-sync.test.mjs && node tests/config-merge.test.mjs && node tests/sse.test.mjs && node tests/api.test.mjs && node tests/import-roundtrip.test.mjs && node tests/graph-perf.test.mjs && node tests/settings-compat.test.mjs && node tests/node-bin.test.mjs && node tests/watchdog-lock.test.mjs && node tests/markdown.test.mjs && node tests/feedback.test.mjs && node tests/graph-lod.test.mjs && node tests/ssr.test.mjs && node tests/web-assets.test.mjs && node tests/manifests.test.mjs && node tests/two-store.test.mjs && node tests/noise-gate.test.mjs && node tests/e2e-recall.test.mjs && node tests/issue-fixes.test.mjs && node tests/issue-fixes-2.test.mjs && node tests/issue-fixes-3.test.mjs && node tests/watchdog-orphans.test.mjs && node tests/watchdog-restart.test.mjs && node tests/readme-i18n.test.mjs && node tests/issue-fixes-4.test.mjs && node tests/host-drain.test.mjs && node tests/e2e-host-drain.mjs && node tests/issue-fixes-5.test.mjs && node tests/issue-fixes-6.test.mjs && node tests/capture-json-repair.test.mjs && node tests/csrf-origin.test.mjs && node tests/watchdog-orphan-web.test.mjs && node tests/config-validate.test.mjs && node tests/issue-fixes-8.test.mjs && node tests/issue-fixes-9.test.mjs && node tests/release-verify.test.mjs && node tests/refine.test.mjs"
+    "test": "node build.mjs && node tests/vault.test.mjs && node tests/capture.test.mjs && node tests/capture-route.test.mjs && node tests/stall.test.mjs && node tests/vault-path.test.mjs && node tests/vault-resolve.test.mjs && node tests/minhash.test.mjs && node tests/settings-save.test.mjs && node tests/config-coverage.test.mjs && node tests/config-sync.test.mjs && node tests/config-merge.test.mjs && node tests/sse.test.mjs && node tests/api.test.mjs && node tests/import-roundtrip.test.mjs && node tests/graph-perf.test.mjs && node tests/settings-compat.test.mjs && node tests/node-bin.test.mjs && node tests/watchdog-lock.test.mjs && node tests/markdown.test.mjs && node tests/feedback.test.mjs && node tests/graph-lod.test.mjs && node tests/ssr.test.mjs && node tests/web-assets.test.mjs && node tests/manifests.test.mjs && node tests/two-store.test.mjs && node tests/noise-gate.test.mjs && node tests/e2e-recall.test.mjs && node tests/issue-fixes.test.mjs && node tests/issue-fixes-2.test.mjs && node tests/issue-fixes-3.test.mjs && node tests/watchdog-orphans.test.mjs && node tests/watchdog-restart.test.mjs && node tests/readme-i18n.test.mjs && node tests/issue-fixes-4.test.mjs && node tests/host-drain.test.mjs && node tests/e2e-host-drain.mjs && node tests/issue-fixes-5.test.mjs && node tests/issue-fixes-6.test.mjs && node tests/capture-json-repair.test.mjs && node tests/csrf-origin.test.mjs && node tests/watchdog-orphan-web.test.mjs && node tests/config-validate.test.mjs && node tests/issue-fixes-8.test.mjs && node tests/issue-fixes-9.test.mjs && node tests/release-verify.test.mjs && node tests/refine.test.mjs && node tests/db-restore.test.mjs && node tests/align.test.mjs"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1"

package/scripts/release.mjs

@@ -166,10 +166,22 @@ if (SKIP_NPM) {
     }
     // **不信 stdout，只信 registry**：publish 返回 0 不代表包真的上去了（0.10.21 实测：
     // 本地 packument/npm view 缓存会假装没有，边缘缓存又会假装有）—— 用 version 端点实证。
+    // 端点滞后（实测可达数分钟）不该中断后面的 tag/push/Release —— 但也**绝不能**当成已发布：
+    // 记进问题清单，继续跑完，最后汇总 + 非零退出（0.10.22 / 0.10.26 都因这里超时中断过一次发布）。
     if (!(await waitNpmVersion(pkg.version))) {
-      throw new Error(`npm 上查不到 ${pkg.version}（version 端点超时）：发布可能未生效，请手动 \`npm publish --access public\` 后复核 https://registry.npmjs.org/memory-eternal/${pkg.version}`)
+      // 端点滞后可能有几分钟（实测 0.10.26：publish 先"暂存"、稍后才落地）。再打一次 publish 探针：
+      // npm 若回「previously staged / previously published / 409」——那**恰好证明版本确实进去了**。
+      const probe = run('npm', ['publish', '--access', 'public'], { allowFail: true })
+      const txt = String(probe.out || '')
+      if (/previously staged version|previously published version|EPUBLISHCONFLICT|409/i.test(txt)) {
+        say('npm version 端点滞后，但 publish 探针回报「版本已存在 / 已暂存」→ 视为**已发布**')
+      } else {
+        say(`⚠ npm version 端点仍未可见：https://registry.npmjs.org/memory-eternal/${pkg.version}（可能只是 CDN 滞后）`)
+        problems.push(`npm 上暂时查不到 ${pkg.version} → 稍后复核（200 才算真的发布成功）：https://registry.npmjs.org/memory-eternal/${pkg.version}`)
+      }
+    } else {
+      say(`npm 校验通过：https://registry.npmjs.org/memory-eternal/${pkg.version} → 200`)
     }
-    say(`npm 校验通过：https://registry.npmjs.org/memory-eternal/${pkg.version} → 200`)
   }
 }