memory-eternal 0.21.0 → 0.23.0

package/lib/vault.js

@@ -341,7 +341,7 @@ export async function listCards(root, { status, kind, agent, tag = '', limit, of
       rows.push(...db.prepare(`SELECT * FROM ${store.table} WHERE path IN (${ph})`).all(...paths))
     }
     const byPath = new Map(rows.map((r) => [r.path, rowToCard(r)]))
-    return page.map((r) => byPath.get(r.path)).filter(Boolean)
+    return attachRevisions(db, page.map((r) => byPath.get(r.path)).filter(Boolean))
   }
 
   const tail = Number.isInteger(limit) && limit > 0
@@ -355,7 +355,7 @@ export async function listCards(root, { status, kind, agent, tag = '', limit, of
     { kind, agent, tag, tail },
   )
   const finalArgs = Number.isInteger(limit) && limit > 0 ? [...args, limit, Math.max(0, offset | 0)] : args
-  return db.prepare(sql).all(...finalArgs).map(rowToCard)
+  return attachRevisions(db, db.prepare(sql).all(...finalArgs).map(rowToCard))
 }
 
 /** 计数（分页接口要用 total 判断还有没有下一页）。 */
@@ -420,13 +420,42 @@ function moveCardBetweenStores(db, from, to, rel, { status, deletedAt = null, qu
   })
 }
 
-/** 回收站：隔离区里 status=deleted，按 deleted_at 倒序。 */
+/**
+ * 回收站：隔离区里 status ∈ {deleted, rejected}。
+ *
+ * issue #57：过去只查 deleted，于是「审核里点驳回」的卡永远进不了回收站 —— 用户在回收站
+ * 怎么等都等不到，只能一张张去审核队列里删。驳回与删除都是「这张卡不会被召回」，
+ * 对清理者而言该出现在同一处；两者用 status 区分，恢复语义不同（见 restoreCard）。
+ * 排序用 COALESCE：驳回卡没有 deleted_at。
+ */
 export async function recycleList(root) {
   const db = getDb(root)
-  const rows = db.prepare('SELECT * FROM quarantine WHERE status = ? ORDER BY deleted_at DESC').all('deleted')
+  const rows = db.prepare(
+    "SELECT * FROM quarantine WHERE status IN ('deleted', 'rejected') ORDER BY COALESCE(deleted_at, updated_at) DESC"
+  ).all()
   return rows.map(rowToCard)
 }
 
+/**
+ * 永久清空回收站（deleted + rejected）。
+ *
+ * issue #57 的直接诉求：「清空」要能真清空，而不是只清 30 天前的。
+ * 与 purgeExpired 分开：那个是保留期策略（自动），这个是用户显式点「清空」，
+ * 语义是"把我在回收站看到的东西全删掉"。逐个走 deleteCard(permanent) 才会
+ * 连带清掉 card_updates / feedback / 修改副本关联。
+ */
+export async function purgeAllRecycle(root) {
+  const db = getDb(root)
+  const rows = db.prepare("SELECT path FROM quarantine WHERE status IN ('deleted', 'rejected')").all()
+  let purged = 0
+  const failed = []
+  for (const row of rows) {
+    try { await deleteCard(root, row.path, { permanent: true }); purged++ }
+    catch (e) { failed.push(row.path) }
+  }
+  return { ok: true, purged, total: rows.length, failed }
+}
+
 /** 清理超过 retentionDays 天的回收卡（永久删除）。 */
 export async function purgeExpired(root, retentionDays = 30) {
   const db = getDb(root)
@@ -464,12 +493,15 @@ export async function readCard(root, rel, { allowUnapproved = false } = {}) {
   }
   const status = String(row.status || '')
   const { text } = rowToMarkdown(row)
+  // 修改副本要带上「改的是哪张卡」，审核界面据此标注「修改」而不是「新卡」。
+  const rev = getRevision(db, rel)
+  const revision = rev ? { targetPath: rev.target_path, targetId: rev.target_id } : null
   const updates = db.prepare('SELECT content, created_at FROM card_updates WHERE card_id = ? ORDER BY created_at ASC').all(row.id)
   if (updates.length > 0) {
     const updateLines = updates.map((u) => `- ${u.created_at.slice(0, 10)}：${u.content}`)
-    return { path: rel, status, store: mainRow ? 'main' : 'quarantine', text: text + '\n## 更新记录\n\n' + updateLines.join('\n') + '\n' }
+    return { path: rel, status, store: mainRow ? 'main' : 'quarantine', text: text + '\n## 更新记录\n\n' + updateLines.join('\n') + '\n', ...(revision ? { revision } : {}) }
   }
-  return { path: rel, status, store: mainRow ? 'main' : 'quarantine', text }
+  return { path: rel, status, store: mainRow ? 'main' : 'quarantine', text, ...(revision ? { revision } : {}) }
 }
 
 /** 状态中文标签（错误信息与日志用）。 */
@@ -499,6 +531,11 @@ export async function deleteCard(root, rel, { permanent = false } = {}) {
         db.prepare('DELETE FROM card_updates WHERE card_id = ?').run(id)
         db.prepare('DELETE FROM feedback WHERE card_path = ?').run(rel)
       }
+      // 修改副本与原卡的关联也一起清掉：删原卡时，指向它的待审副本没有应用对象了
+      const revs = db.prepare('SELECT revision_path FROM card_revisions WHERE target_path = ?').all(rel)
+      for (const r of revs) db.prepare('DELETE FROM quarantine WHERE path = ?').run(r.revision_path)
+      db.prepare('DELETE FROM card_revisions WHERE target_path = ?').run(rel)
+      db.prepare('DELETE FROM card_revisions WHERE revision_path = ?').run(rel)
       db.prepare('DELETE FROM cards WHERE path = ?').run(rel)
       db.prepare('DELETE FROM quarantine WHERE path = ?').run(rel)
     })
@@ -517,11 +554,27 @@ export async function deleteCard(root, rel, { permanent = false } = {}) {
   return { ok: true, soft: true }
 }
 
-/** 恢复回收站的卡：从隔离区搬回主库，status=approved。写审计日志。 */
+/**
+ * 恢复回收站里的卡。写审计日志。
+ *
+ * 两种来源语义不同（issue #57）：
+ * - 已删除（deleted）：搬回主库，status=approved —— 它本来就是"删了一下"，恢复即可用。
+ * - 已驳回（rejected）：**只能退回审核队列（pending）**。驳回意味着"内容不该入库"，
+ *   若恢复即 approved，回收站就成了绕过审核批准一条被驳回内容的旁路。
+ *   主库物理上只存 approved（见 db.js MAIN_STATUS），所以这里原地改状态、不搬表。
+ */
 export async function restoreCard(root, rel) {
   const db = getDb(root)
   const existing = db.prepare('SELECT status FROM quarantine WHERE path = ?').get(rel)
   if (!existing) throw new Error('卡片不在回收站/隔离区: ' + rel)
+  // 修改副本不能「恢复」成一张独立卡 —— 那会跟原卡重复。它只能被批准（覆盖原卡）或删除。
+  if (getRevision(db, rel)) throw new Error('这是知识卡的修改副本：请在审核中心「批准」以覆盖原卡，或直接删除')
+  const now = new Date().toISOString()
+  if (existing.status === 'rejected') {
+    db.prepare('UPDATE quarantine SET status = ?, deleted_at = NULL, updated_at = ? WHERE path = ?').run('pending', now, rel)
+    db.prepare('INSERT INTO audit_log (card_path, old_status, new_status, changed_by, reason) VALUES (?, ?, ?, ?, ?)').run(rel, 'rejected', 'pending', 'restore', '驳回卡退回审核队列')
+    return { ok: true, restored: true, status: 'pending' }
+  }
   const r = moveCardBetweenStores(db, 'quarantine', 'cards', rel, { status: MAIN_STATUS, deletedAt: null })
   db.prepare('INSERT INTO audit_log (card_path, old_status, new_status, changed_by, reason) VALUES (?, ?, ?, ?, ?)').run(rel, existing.status, MAIN_STATUS, 'restore', '回收站恢复')
   return { ok: true, restored: true, ...r }
@@ -539,6 +592,12 @@ export async function setCardStatus(root, rel, status, { changedBy = 'system', r
   const existing = findCardRow(db, rel)
   if (!existing) throw new Error('卡片不存在: ' + rel)
 
+  // 审核制修改：待审副本被批准 = 用副本内容覆盖原卡（身份/状态/类型不变），副本随即消失。
+  if (target === MAIN_STATUS && existing.table === 'quarantine') {
+    const rev = getRevision(db, rel)
+    if (rev) return applyRevision(db, rel, rev, { changedBy, reason })
+  }
+
   if (target === MAIN_STATUS) {
     if (existing.table === 'cards') {
       db.prepare('UPDATE cards SET status = ?, updated_at = ? WHERE path = ?').run(target, new Date().toISOString(), rel)
@@ -702,6 +761,99 @@ export async function updateCardContent(root, rel, { title, tags, body, reason }
   return { ok: true, path: rel, store: found.table, updated: now }
 }
 
+// ── 审核制修改（agent 提交 → 人工审核 → 覆盖原卡）────────────────────────
+
+/** 查「待审副本 → 原卡」映射；不是修改副本时返回 null。 */
+function getRevision(db, revisionPath) {
+  return db.prepare('SELECT * FROM card_revisions WHERE revision_path = ?').get(revisionPath) || null
+}
+
+/** 给卡片对象挂上 revision 信息（审核中心据此标「修改」而不是「新卡」）。 */
+function attachRevisions(db, cards) {
+  if (!cards.length) return cards
+  const ph = cards.map(() => '?').join(',')
+  const rows = db.prepare(`SELECT revision_path, target_path, target_id FROM card_revisions WHERE revision_path IN (${ph})`).all(...cards.map((c) => c.path))
+  if (!rows.length) return cards
+  const byPath = new Map(rows.map((r) => [r.revision_path, r]))
+  const targets = [...new Set(rows.map((r) => r.target_path))]
+  const tph = targets.map(() => '?').join(',')
+  const titles = new Map(db.prepare(`SELECT path, title FROM cards WHERE path IN (${tph})`).all(...targets).map((r) => [r.path, r.title]))
+  return cards.map((c) => {
+    const r = byPath.get(c.path)
+    return r ? { ...c, revision: { targetPath: r.target_path, targetId: r.target_id, targetTitle: titles.get(r.target_path) || '' } } : c
+  })
+}
+
+/**
+ * 提交一张「审核制修改」：把已批准的卡片复制一份到隔离区（status=pending），
+ * 内容用调用方给的新标题/标签/正文。**这里绝不改原卡** —— 只有审核通过（setCardStatus）
+ * 才会用副本覆盖原卡。agent 走 /card/revise 或 MCP memory_revise，只能到这一步。
+ *
+ * 同一张卡已有待审修改时就地更新，避免审核队列里堆一串同一张卡的副本。
+ */
+export async function reviseCard(root, { target, title, tags, body, reason = '', source = '', submittedBy = '' } = {}) {
+  const db = getDb(root)
+  const rel = String(target || '').trim()
+  if (!rel) throw new Error('缺少要修改的卡片 path')
+  const found = findCardRow(db, rel)
+  if (!found) throw new Error('原卡片不存在: ' + rel)
+  if (found.table !== 'cards') throw new Error('只能修改已审核通过的卡片（当前状态：' + found.row.status + '）')
+  const targetRow = found.row
+  // 已有待审修改时，未传的字段沿用副本当前值（否则第二次提交会把上次的改动抹掉）
+  const pending = db.prepare('SELECT q.* FROM card_revisions r JOIN quarantine q ON q.path = r.revision_path WHERE r.target_path = ? AND q.status = ?').get(rel, 'pending')
+  const baseRow = pending || targetRow
+  const nextTitle = title === undefined ? baseRow.title : String(title).trim()
+  const nextTags = tags === undefined ? normalizeTags(baseRow.tags) : normalizeTags(tags)
+  const nextBody = body === undefined ? String(baseRow.body).trim() : String(body).trim()
+  if (!nextTitle) throw new Error('标题不能为空')
+  if (!nextBody) throw new Error('正文不能为空')
+  const now = new Date().toISOString()
+  if (pending) {
+    db.prepare('UPDATE quarantine SET title = ?, tags = ?, body = ?, summary = ?, updated_at = ?, reason = ? WHERE path = ?')
+      .run(nextTitle, JSON.stringify(nextTags), nextBody, nextBody.slice(0, 200), now, reason || pending.reason || '', pending.path)
+    db.prepare('UPDATE card_revisions SET updated_at = ? WHERE revision_path = ?').run(now, pending.path)
+    return { ok: true, path: pending.path, target: rel, targetId: targetRow.id, reused: true, status: 'pending' }
+  }
+  // 副本放在独立目录 99-Revisions/：不与任何 kind 根目录冲突，也永远不会被当成新卡批准进主库
+  const base = `99-Revisions/${safeSlug(targetRow.title || 'card')}`
+  let revisionPath = `${base}.md`
+  let i = 2
+  while (pathTaken(db, revisionPath)) { revisionPath = `${base}-${i}.md`; i++ }
+  const id = nextCardId(db)
+  db.prepare(`
+    INSERT INTO quarantine
+      (id, path, kind, title, tags, body, summary, status, source, submitted_by, severity, reason, created_at, updated_at, quarantined_at, quarantine_reason)
+    VALUES (?, ?, ?, ?, ?, ?, ?, 'pending', ?, ?, 'info', ?, ?, ?, datetime('now'), '修改待审')
+  `).run(id, revisionPath, targetRow.kind, nextTitle, JSON.stringify(nextTags), nextBody, nextBody.slice(0, 200), source, submittedBy, reason || ('修改知识卡：' + rel), now, now)
+  db.prepare('INSERT INTO card_revisions (revision_path, target_path, target_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?)').run(revisionPath, rel, targetRow.id, now, now)
+  db.prepare('INSERT INTO audit_log (card_path, old_status, new_status, changed_by, reason) VALUES (?, ?, ?, ?, ?)').run(revisionPath, null, 'pending', submittedBy || 'agent', '提交修改：' + rel)
+  return { ok: true, path: revisionPath, target: rel, targetId: targetRow.id, reused: false, status: 'pending' }
+}
+
+/**
+ * 审核通过修改副本：用副本内容覆盖原卡，副本及其映射一起消失。
+ * 只改内容（标题 / 标签 / 正文 / 摘要 + updated_at）；状态、类型、来源、创建时间仍属原卡。
+ */
+function applyRevision(db, revisionPath, rev, { changedBy = 'user', reason = '' } = {}) {
+  return inTransaction(db, () => {
+    const revRow = db.prepare('SELECT * FROM quarantine WHERE path = ?').get(revisionPath)
+    if (!revRow) throw new Error('修改副本不存在: ' + revisionPath)
+    const target = db.prepare('SELECT * FROM cards WHERE path = ?').get(rev.target_path)
+    if (!target) throw new Error('原卡片已不存在（可能已被删除）：' + rev.target_path)
+    const now = new Date().toISOString()
+    const tags = normalizeTags(revRow.tags)
+    db.prepare('UPDATE cards SET title = ?, tags = ?, body = ?, summary = ?, updated_at = ? WHERE path = ?')
+      .run(revRow.title, JSON.stringify(tags), revRow.body, String(revRow.body).trim().slice(0, 200), now, rev.target_path)
+    db.prepare('INSERT INTO card_updates (card_id, content, created_at) VALUES (?, ?, ?)')
+      .run(target.id, '经审核修改：' + (reason || ('由 ' + (revRow.submitted_by || 'agent') + ' 提交，' + changedBy + ' 批准')), now)
+    db.prepare('DELETE FROM quarantine WHERE path = ?').run(revisionPath)
+    db.prepare('DELETE FROM card_revisions WHERE revision_path = ?').run(revisionPath)
+    db.prepare('INSERT INTO audit_log (card_path, old_status, new_status, changed_by, reason) VALUES (?, ?, ?, ?, ?)')
+      .run(rev.target_path, MAIN_STATUS, MAIN_STATUS, changedBy, '应用修改（来源 ' + revisionPath + '）')
+    return { ok: true, status: MAIN_STATUS, store: 'cards', applied: true, path: rev.target_path, revisionPath, updated: now }
+  })
+}
+
 /** 合并多张卡为一张。 */
 export async function mergeCards(root, paths) {
   const list = (Array.isArray(paths) ? paths : []).map((p) => String(p || '').trim()).filter(Boolean)

package/orca-plugin/orca-plugin.json

@@ -3,7 +3,7 @@
   "id": "memory-eternal",
   "publisher": "eternalnight996",
   "name": "memory-eternal",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "Memory Atlas for Orca: open the local memory vault, pending review and knowledge graph from a sandboxed Orca panel.",
   "author": {
     "name": "EternalNight996",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memory-eternal",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "记忆核心（Memory Eternal）：自研的 DeepSeek Harness 记忆插件，不移植任何既有记忆框架——对话结束后自动沉淀知识卡到本地 Markdown Vault（自研去重、自研 CJK 检索、可 git 管理），设置页提供图形化知识库（统计 / 搜索 / 知识图谱 + 侧边栏一键弹窗），Agent 通过 memory_recall 工具按需召回历史上下文。零人工干预。",
   "icon": "assets/icon.png",
   "license": "MIT",
@@ -70,7 +70,7 @@
     "release": "node scripts/release.mjs",
     "release:dry": "node scripts/release.mjs --dry-run",
     "panel-check": "node scripts/panel-check.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/graph-force.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/graph-warmup.test.mjs && node tests/loading-hints.test.mjs && node tests/web-entry.test.mjs && node tests/tui-scroll.test.mjs && node tests/tui-audit-scene.test.mjs && node tests/tui-plugin-boot.test.mjs && node tests/capture-session-id.test.mjs && node tests/ssr.test.mjs && node tests/window-controls.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 && node tests/tags-normalize.test.mjs && node tests/resident-state.test.mjs && node tests/llm-route.test.mjs && node tests/host-managed.test.mjs && node tests/replace-claim.test.mjs && node tests/version-check-self.test.mjs && node tests/setup-codex.test.mjs && node tests/listener-netstat.test.mjs && node tests/issue-46-overlay.test.mjs && node tests/graph-initial-zoom.test.mjs && node tests/card-head-actions.test.mjs && node tests/card-reader-ux.test.mjs && node tests/tag-filter.test.mjs && node tests/ui-overflow.test.mjs && node tests/version-card-state.test.mjs && node tests/llm-routes-proxy.test.mjs && node tests/model-strikes.test.mjs && node tests/support-bundle.test.mjs && node tests/health-panel.test.mjs && node tests/issue-48-timeout.test.mjs && node tests/setup-node-path.test.mjs && node tests/capture-kind.test.mjs && node tests/core-memory.test.mjs && node tests/skill-cards.test.mjs && node tests/audit-search.test.mjs && node tests/news.test.mjs && node tests/news-feed.test.mjs && node tests/ledger.test.mjs && node tests/issue-55-timezone.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/graph-force.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/graph-warmup.test.mjs && node tests/loading-hints.test.mjs && node tests/web-entry.test.mjs && node tests/tui-scroll.test.mjs && node tests/tui-audit-scene.test.mjs && node tests/tui-plugin-boot.test.mjs && node tests/capture-session-id.test.mjs && node tests/ssr.test.mjs && node tests/window-controls.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 && node tests/tags-normalize.test.mjs && node tests/resident-state.test.mjs && node tests/llm-route.test.mjs && node tests/host-managed.test.mjs && node tests/replace-claim.test.mjs && node tests/version-check-self.test.mjs && node tests/setup-codex.test.mjs && node tests/listener-netstat.test.mjs && node tests/issue-46-overlay.test.mjs && node tests/graph-initial-zoom.test.mjs && node tests/card-head-actions.test.mjs && node tests/card-reader-ux.test.mjs && node tests/tag-filter.test.mjs && node tests/ui-overflow.test.mjs && node tests/version-card-state.test.mjs && node tests/llm-routes-proxy.test.mjs && node tests/model-strikes.test.mjs && node tests/support-bundle.test.mjs && node tests/health-panel.test.mjs && node tests/issue-48-timeout.test.mjs && node tests/setup-node-path.test.mjs && node tests/capture-kind.test.mjs && node tests/core-memory.test.mjs && node tests/skill-cards.test.mjs && node tests/audit-search.test.mjs && node tests/news.test.mjs && node tests/news-feed.test.mjs && node tests/ledger.test.mjs && node tests/issue-55-timezone.test.mjs && node tests/recycle-center.test.mjs && node tests/news-follows.test.mjs && node tests/news-digest.test.mjs"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1"