memory-eternal 0.30.5 → 0.31.1

package/lib/skill-cards.js

@@ -7,15 +7,16 @@
 // 技能正文可能包含任意指令，必须由人确认后才进主库，避免绕过审核直接进入召回。
 //
 // 幂等：按 source=`skill:<name>` 对齐已有卡。
-// - 待审卡内容变了 → 原地刷新（仍是同一张待审卡，不刷屏）；
-// - 已批准卡内容变了 → 新开一张「技能更新」待审卡（旧卡继续可用，审核后再替换）；
+// - 同名多版本同时安装 → 选 semver 最高的一份；
+// - 待审卡版本/内容变了 → 原地刷新（仍是同一张待审卡，不刷屏）；
+// - 已批准卡版本/内容变了 → 生成 99-Revisions 待审修改，批准后覆盖原卡（审核前旧卡继续可用）；
 // - 驳回/删除过的卡 → 不复活（尊重人的决定）。
 
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { createHash } from 'node:crypto'
-import { writeCard, updateCardContent, ensureVault } from './vault.js'
+import { writeCard, updateCardContent, ensureVault, reviseCard } from './vault.js'
 import { getDb } from './db.js'
 
 /** 技能卡类型与目录（与 lib/vault.js 的 KIND_ROOTS 保持一致）。 */
@@ -33,6 +34,67 @@ export function skillContentHash(title, body) {
   return createHash('sha1').update(String(title || '') + '\n' + String(body || '')).digest('hex').slice(0, 12)
 }
 
+/** 宽松 semver 解析：接受 1、1.2、1.2.3 与 -pre / +build。 */
+function parseSkillVersion(v) {
+  const m = /^v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(String(v || '').trim())
+  if (!m) return null
+  return { nums: [Number(m[1]), Number(m[2] || 0), Number(m[3] || 0)], pre: m[4] || '' }
+}
+
+/**
+ * 比较两个技能版本。返回 1/0/-1；解析不出 semver 时按字符串相等判定（不猜大小）。
+ * 空版本视为「未知」：选择多份安装时低于有版本的副本；更新判断时调用方会跳过比较。
+ */
+export function compareSkillVersions(a, b) {
+  const A = parseSkillVersion(a)
+  const B = parseSkillVersion(b)
+  if (!A && !B) return String(a || '') === String(b || '') ? 0 : 0
+  if (!A) return -1
+  if (!B) return 1
+  for (let i = 0; i < 3; i++) if (A.nums[i] !== B.nums[i]) return A.nums[i] < B.nums[i] ? -1 : 1
+  if (A.pre === B.pre) return 0
+  if (!A.pre) return 1
+  if (!B.pre) return -1
+  const as = A.pre.split('.')
+  const bs = B.pre.split('.')
+  for (let i = 0; i < Math.max(as.length, bs.length); i++) {
+    const x = as[i]
+    const y = bs[i]
+    if (x === undefined) return -1
+    if (y === undefined) return 1
+    if (x === y) continue
+    const nx = /^\d+$/.test(x)
+    const ny = /^\d+$/.test(y)
+    if (nx && ny) return Number(x) < Number(y) ? -1 : 1
+    if (nx !== ny) return nx ? -1 : 1
+    return x < y ? -1 : 1
+  }
+  return 0
+}
+
+/** 从技能卡正文里读出版本标记（旧卡可能没有）。 */
+export function skillVersionFromBody(body) {
+  const m = /^-\s*(?:版本|Version)\s*[：:]\s*(.+?)\s*$/mi.exec(String(body || ''))
+  return m ? m[1].trim() : ''
+}
+
+/** 插件类技能：从最近的 package.json 读取版本（仅 node_modules 路径，避免把项目版本当成技能版本）。 */
+function packageVersionForFile(file) {
+  if (!/[\\/]node_modules[\\/]/.test(String(file || ''))) return ''
+  let dir = path.dirname(file)
+  for (let i = 0; i < 6; i++) {
+    try {
+      const raw = fs.readFileSync(path.join(dir, 'package.json'), 'utf8')
+      const version = String(JSON.parse(raw).version || '').trim()
+      if (version) return version
+    } catch { /* 继续向上 */ }
+    const parent = path.dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+  return ''
+}
+
 /** 从 SKILL.md 文本里取 frontmatter；支持 description 的单行 / 多行块写法。 */
 export function parseSkillFile(text, fallbackName = 'skill') {
   const raw = String(text || '')
@@ -63,6 +125,7 @@ export function parseSkillFile(text, fallbackName = 'skill') {
   return {
     name: name || fallbackName,
     description,
+    version: String(meta.version || meta['skill-version'] || meta.skillVersion || '').trim(),
     content: body.trim(),
     whenToUse: String(meta.whenToUse || meta['when-to-use'] || '').trim(),
     // 与 DSH skill-filesystem 的准入对齐：必须有 frontmatter，且 name / description 都不能空。
@@ -218,22 +281,24 @@ export function collectSkillFiles({ env = process.env, cwd = process.cwd(), pack
     if (isDir(nm)) found.push(...collectFromNodeModules(nm, 'plugin'))
   }
 
-  // 去重：同一真实文件只取一次；同名技能先到先得（项目 > 自定义 > 用户 > 插件 > bundled）
+  // 去重：同一真实文件只取一次；同名技能保留**版本最高**的一份。
+  // 版本相同/都未标注时保留先到先得（项目 > 自定义 > 用户 > 插件 > bundled）。
   const seenFile = new Set()
-  const seenName = new Set()
-  const out = []
+  const groups = new Map()
   for (const item of found) {
     const p = item.parsed
     if (!p || !p.name) continue
     let real = item.file
     try { real = fs.realpathSync(item.file) } catch { /* 保留原路径 */ }
     const key = real.toLowerCase()
-    if (seenFile.has(key) || seenName.has(p.name)) continue
+    if (seenFile.has(key)) continue
     seenFile.add(key)
-    seenName.add(p.name)
-    out.push({
+    const version = String(p.version || (item.source !== 'bundled' ? packageVersionForFile(item.file) : '') || '').trim()
+    if (!groups.has(p.name)) groups.set(p.name, [])
+    groups.get(p.name).push({
       name: p.name,
       description: p.description,
+      version,
       whenToUse: p.whenToUse,
       content: p.content,
       source: item.source,
@@ -242,6 +307,14 @@ export function collectSkillFiles({ env = process.env, cwd = process.cwd(), pack
       invocation: { modelInvocable: true, userInvocable: true },
     })
   }
+  const out = []
+  for (const list of groups.values()) {
+    let best = list[0]
+    for (const candidate of list) {
+      if (compareSkillVersions(candidate.version, best.version) > 0) best = candidate
+    }
+    out.push(best)
+  }
   return out
 }
 
@@ -263,6 +336,7 @@ export async function collectSkillsFromRegistry(skills, { cwd = '', signal } = {
     let content = ''
     let description = String(summary.description || '')
     let whenToUse = String(summary.whenToUse || '')
+    let version = String(summary.version || (summary.metadata && summary.metadata.version) || '')
     let file = summary.path || ''
     try {
       if (typeof skills.get === 'function') {
@@ -271,6 +345,7 @@ export async function collectSkillsFromRegistry(skills, { cwd = '', signal } = {
           content = String(def.content || '')
           description = String(def.description || description)
           whenToUse = String(def.whenToUse || whenToUse)
+          version = String(def.version || (def.metadata && def.metadata.version) || version)
           file = def.path || file
         }
       }
@@ -278,6 +353,7 @@ export async function collectSkillsFromRegistry(skills, { cwd = '', signal } = {
     out.push({
       name: summary.name,
       description,
+      version: String(summary.source || '') === 'bundled' ? '' : version,
       whenToUse,
       content,
       source: String(summary.source || 'skill'),
@@ -303,6 +379,7 @@ export function buildSkillCardBody(skill, { maxContentChars = DEFAULT_MAX_CONTEN
   const info = [
     '- 名称：' + name,
     '- 来源：' + source,
+    skill.version ? '- 版本：' + String(skill.version).trim() : '',
     skill.provider ? '- 提供方：' + skill.provider : '',
     skill.path ? '- 技能文件：' + skill.path : '',
     '- 模型可调用：' + (modelOk ? '是' : '否'),
@@ -345,6 +422,19 @@ function loadExistingSkillCards(root) {
   return map
 }
 
+/** 查一张已批准技能卡当前待审的修改副本（审核通过后会覆盖原卡）。 */
+function loadPendingRevision(root, targetPath) {
+  const db = getDb(root)
+  return db.prepare(`
+    SELECT q.path, q.title, q.body, q.source
+    FROM card_revisions r
+    JOIN quarantine q ON q.path = r.revision_path
+    WHERE r.target_path = ? AND q.status = 'pending'
+    ORDER BY r.updated_at DESC
+    LIMIT 1
+  `).get(targetPath) || null
+}
+
 /**
  * 把「实际技能」同步成 kind=skill 的待审卡。
  *
@@ -357,7 +447,7 @@ function loadExistingSkillCards(root) {
  * @param {boolean} [opts.includeFilesystem=true] 是否同时扫描磁盘技能（默认 true；
  *   false 仅用于「只信注册表」的测试/特殊部署）
  * @param {boolean} [opts.force]  忽略「已驳回/已删除不复活」的保护（仅内部/测试用）
- * @returns {Promise<{ok:boolean, source:'registry'|'filesystem'|'registry+filesystem', total:number, created:number, updated:number, pendingUpdates:number, unchanged:number, skipped:number, removed:number, errors:string[]}>}
+ * @returns {Promise<{ok:boolean, source:'registry'|'filesystem'|'registry+filesystem', total:number, created:number, updated:number, pendingUpdates:number, unchanged:number, skipped:number, removed:number, errors:string[], updates:Array}>}
  */
 export async function syncSkillCards(root, { skills, cwd = '', env = process.env, packageRoot = '', force = false, includeFilesystem = true } = {}) {
   await ensureVault(root)
@@ -373,16 +463,23 @@ export async function syncSkillCards(root, { skills, cwd = '', env = process.env
     ? 'registry+filesystem'
     : (registryList.length ? 'registry' : 'filesystem')
 
-  // 同名只保留一个：注册表优先（invocation 元数据更完整），磁盘扫描兜底/补齐。
-  // 先塞磁盘、再覆盖注册表，等价于「注册表胜出」。
+  // 同名只保留一个：**版本高的优先**；同版本注册表优先（invocation 元数据更完整）。
+  // 多个安装位置/多个版本同时存在时，不再按扫描顺序盲选。
   const byName = new Map()
-  for (const s of fileList) if (s && s.name && !byName.has(s.name)) byName.set(s.name, s)
-  for (const s of registryList) if (s && s.name) byName.set(s.name, s)
+  const consider = (s, preferRegistry) => {
+    if (!s || !s.name) return
+    const prev = byName.get(s.name)
+    if (!prev) { byName.set(s.name, s); return }
+    const cmp = compareSkillVersions(s.version, prev.version)
+    if (cmp > 0 || (cmp === 0 && preferRegistry)) byName.set(s.name, s)
+  }
+  for (const s of fileList) consider(s, false)
+  for (const s of registryList) consider(s, true)
   const skillsList = [...byName.values()].sort((a, b) => String(a.name).localeCompare(String(b.name)))
 
   const existing = loadExistingSkillCards(root)
   const currentNames = new Set(skillsList.map((s) => s.name))
-  const stats = { ok: true, source, total: skillsList.length, created: 0, updated: 0, pendingUpdates: 0, unchanged: 0, skipped: 0, removed: 0, errors: [] }
+  const stats = { ok: true, source, total: skillsList.length, created: 0, updated: 0, pendingUpdates: 0, unchanged: 0, skipped: 0, removed: 0, errors: [], updates: [] }
 
   // removed：库里曾经生成过、这次扫描不再存在（只统计，不删除）
   for (const key of existing.keys()) {
@@ -394,40 +491,81 @@ export async function syncSkillCards(root, { skills, cwd = '', env = process.env
     try {
       const built = buildSkillCardBody(skill)
       const baseSource = 'skill:' + skill.name
-      const hash = skillContentHash(built.title, built.body)
+      const incomingVersion = String(skill.version || '').trim()
       const baseRows = existing.get(baseSource) || []
       const pending = baseRows.find((r) => r.status === 'pending')
       const approved = baseRows.find((r) => r.status === 'approved')
       const rejected = baseRows.find((r) => r.status === 'rejected' || r.status === 'deleted')
+      const sameCard = (row) => !!row && sameText(row.body, built.body) && row.title === built.title
+
+      const addUpdate = (fromVersion, toVersion, title, path, targetPath) => {
+        stats.updates.push({
+          name: skill.name,
+          fromVersion: String(fromVersion || '').trim(),
+          toVersion: String(toVersion || '').trim(),
+          title,
+          path,
+          targetPath: targetPath || '',
+        })
+      }
 
       if (pending) {
-        if (!sameText(pending.body, built.body) || pending.title !== built.title) {
-          await updateCardContent(root, pending.path, { title: built.title, tags: built.tags, body: built.body, reason: '根据实际技能生成（内容有更新）' })
-          stats.updated++
-        } else stats.unchanged++
+        const currentVersion = skillVersionFromBody(pending.body)
+        const cmp = (incomingVersion && currentVersion) ? compareSkillVersions(incomingVersion, currentVersion) : 0
+        if (cmp < 0) { stats.skipped++; continue }
+        if (sameCard(pending)) { stats.unchanged++; continue }
+        await updateCardContent(root, pending.path, {
+          title: built.title,
+          tags: built.tags,
+          body: built.body,
+          reason: '根据实际技能生成（版本/内容有更新）',
+        })
+        stats.updated++
+        addUpdate(currentVersion, incomingVersion, built.title, pending.path, pending.path)
         continue
       }
 
       if (approved) {
-        if (sameText(approved.body, built.body)) { stats.unchanged++; continue }
-        const updateSource = baseSource + '#' + hash
-        const prev = existing.get(updateSource) || []
-        if (prev.some((r) => r.status === 'pending' || r.status === 'approved' || r.status === 'rejected' || r.status === 'deleted')) {
-          stats.skipped++
+        const currentVersion = skillVersionFromBody(approved.body)
+        const cmp = (incomingVersion && currentVersion) ? compareSkillVersions(incomingVersion, currentVersion) : 0
+        if (sameCard(approved) && cmp <= 0) { stats.unchanged++; continue }
+        if (cmp < 0) { stats.skipped++; continue } // 不把已批准技能降级到旧版本
+
+        const revision = loadPendingRevision(root, approved.path)
+        if (revision) {
+          const revisionVersion = skillVersionFromBody(revision.body)
+          if (sameText(revision.body, built.body)) { stats.unchanged++; continue }
+          if (incomingVersion && revisionVersion && compareSkillVersions(incomingVersion, revisionVersion) < 0) {
+            stats.skipped++
+            continue
+          }
+          const title = built.title
+          const r = await reviseCard(root, {
+            target: approved.path,
+            title,
+            tags: built.tags,
+            body: built.body,
+            reason: '技能版本/内容有更新，等待审核',
+            source: 'skill-update:' + skill.name,
+            submittedBy: 'skill-sync',
+          })
+          stats.pendingUpdates++
+          addUpdate(revisionVersion || currentVersion, incomingVersion, title, r.path, approved.path)
           continue
         }
-        const r = await writeCard(root, {
-          kind: SKILL_KIND,
-          title: skill.name + '（技能更新）',
+
+        const title = built.title
+        const r = await reviseCard(root, {
+          target: approved.path,
+          title,
           tags: built.tags,
           body: built.body,
-          source: updateSource,
+          reason: '技能版本/内容有更新，等待审核',
+          source: 'skill-update:' + skill.name,
           submittedBy: 'skill-sync',
-          status: 'pending',
-          reason: '技能内容有更新，等待审核',
-        }, { dedup: false })
-        if (r.ok) stats.pendingUpdates++
-        else stats.skipped++
+        })
+        stats.pendingUpdates++
+        addUpdate(currentVersion, incomingVersion, title, r.path, approved.path)
         continue
       }
 

package/orca-plugin/orca-plugin.json

@@ -3,7 +3,7 @@
   "id": "memory-eternal",
   "publisher": "eternalnight996",
   "name": "memory-eternal",
-  "version": "0.30.5",
+  "version": "0.31.1",
   "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.30.5",
+  "version": "0.31.1",
   "description": "记忆核心（Memory Eternal）：自研的 DeepSeek Harness 记忆插件，不移植任何既有记忆框架——对话结束后自动沉淀知识卡到本地 Markdown Vault（自研去重、自研 CJK 检索、可 git 管理），设置页提供图形化知识库（统计 / 搜索 / 知识图谱 + 侧边栏一键弹窗），Agent 通过 memory_recall 工具按需召回历史上下文。零人工干预。",
   "icon": "assets/icon.png",
   "license": "MIT",