memory-eternal 0.17.0 → 0.18.1

package/lib/core-memory.js

@@ -0,0 +1,45 @@
+// 核心记忆（前置强制记忆）：被人工批准并标记为 core 的卡片，
+// 每次会话都注入 systemPrompt，不依赖模型主动调用 memory_recall。
+//
+// 注意：只读取主库（cards 表）里 kind='core' 的已批准卡片；
+// 待审/驳回卡永远不会进入这里。
+
+import { listCards } from './vault.js'
+
+export const CORE_KIND = 'core'
+export const CORE_HEADER = '【核心记忆 · 必须遵守】\n以下内容已被用户批准为核心记忆，每次会话都必须优先遵守；与其他记忆或默认习惯冲突时，以此处为准。'
+
+export function normalizeCoreOptions({ enabled = true, limit = 6, maxChars = 2000 } = {}) {
+  return {
+    enabled: enabled !== false,
+    limit: Math.min(Math.max(Math.floor(Number(limit) || 6), 1), 20),
+    maxChars: Math.min(Math.max(Math.floor(Number(maxChars) || 2000), 200), 10000),
+  }
+}
+
+/** 生成要注入 systemPrompt 的核心记忆文本；没有核心卡时返回空文本。 */
+export async function coreMemoryPrompt(root, opts = {}) {
+  const { enabled, limit, maxChars } = normalizeCoreOptions(opts)
+  if (!enabled) return { ok: true, count: 0, text: '', chars: 0 }
+  let cards = []
+  try {
+    cards = await listCards(root, { kind: CORE_KIND, limit })
+  } catch {
+    return { ok: false, count: 0, text: '', chars: 0 }
+  }
+  const lines = []
+  let chars = CORE_HEADER.length
+  for (const card of cards) {
+    const title = String(card.title || '').replace(/\s+/g, ' ').trim()
+    const summary = String(card.summary || '').replace(/\s+/g, ' ').trim()
+    if (!title && !summary) continue
+    let line = '- ' + (title || '核心记忆') + (summary ? '：' + summary : '')
+    if (line.length > maxChars) line = line.slice(0, maxChars)
+    if (chars + 1 + line.length > maxChars && lines.length) break
+    lines.push(line)
+    chars += 1 + line.length
+  }
+  if (!lines.length) return { ok: true, count: 0, text: '', chars: 0 }
+  const text = CORE_HEADER + '\n' + lines.join('\n')
+  return { ok: true, count: lines.length, text: text.slice(0, maxChars), chars: Math.min(chars, maxChars) }
+}

package/lib/db.js

@@ -373,6 +373,8 @@ export function checkMainStoreInvariant(root) {
  * @returns {'pending' | 'approved'}
  */
 export function enforceAudit(root, kind, submittedBy, fallback = 'pending') {
+  // 核心记忆必须人工审核：无论 auditMode / 免审名单如何配置，写入时一律待审。
+  if (String(kind) === 'core') return 'pending'
   const db = getDb(root)
   const get = (key) => { try { return db.prepare('SELECT value FROM config WHERE key = ?').get(key)?.value } catch { return null } }
   const mode = get('auditMode')

package/lib/setup.js

@@ -13,6 +13,7 @@ import { promises as fs } from 'node:fs'
 import path from 'node:path'
 import os from 'node:os'
 import { fileURLToPath } from 'node:url'
+import { nodeBinary, usesElectronBinary } from './node-bin.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 export const PACKAGE_ROOT = path.join(__dirname, '..')
@@ -63,8 +64,150 @@ async function backupOnce(file) {
   return bak
 }
 
-export function mcpCommand(nodePath = process.execPath) {
-  return { command: nodePath, args: [BIN_PATH, 'mcp'] }
+/** 这个 node 路径是否其实是 Electron 宿主二进制（直接运行会拉起 GUI）。 */
+export function needsElectronEnv(nodePath = nodeBinary()) {
+  const p = String(nodePath || '')
+  if (!p) return false
+  if (usesElectronBinary()) return true
+  if (!process.versions.electron) return false
+  try { return path.resolve(p) === path.resolve(process.execPath) } catch { return false }
+}
+
+/** 静态 hook 命令：真实 node 直接用；只能退回 Electron 二进制时补 ELECTRON_RUN_AS_NODE。 */
+export function hookCommand(nodePath = nodeBinary(), script, suffix = '') {
+  const base = `${JSON.stringify(nodePath)} ${JSON.stringify(script)}${suffix ? ' ' + suffix : ''}`
+  if (!needsElectronEnv(nodePath)) return base
+  if (process.platform === 'win32') {
+    // cmd.exe 不支持 POSIX 的 VAR=value 前缀；用 set 后再执行
+    return `cmd /d /s /c "set ELECTRON_RUN_AS_NODE=1&& ${base.replace(/"/g, '\\"')}"`
+  }
+  return `ELECTRON_RUN_AS_NODE=1 ${base}`
+}
+
+/** 历史配置自检：命令指向 Electron 二进制、却没有 ELECTRON_RUN_AS_NODE。 */
+export function isLegacyElectronCommand(command) {
+  const s = String(command || '')
+  if (!process.versions.electron) return false // 普通 node 进程不能用 execPath 名字判断
+  if (!s || /ELECTRON_RUN_AS_NODE/i.test(s)) return false
+  const exe = path.basename(process.execPath || '').toLowerCase()
+  if (!exe) return false
+  return s.toLowerCase().includes(exe)
+}
+
+export function mcpCommand(nodePath = nodeBinary()) {
+  const out = { command: nodePath, args: [BIN_PATH, 'mcp'] }
+  if (needsElectronEnv(nodePath)) out.env = { ELECTRON_RUN_AS_NODE: '1' }
+  return out
+}
+
+/**
+ * 升级自动迁移（issue #53）：只重写「我们自己写过、且指向 Electron 宿主 exe」的条目。
+ * 不碰用户自定义命令；写入前备份。返回 changed / details，方便宿主日志。
+ */
+export async function repairLegacySetup({ homeDir = home, dryRun = false, log = () => {}, legacyCheck = isLegacyElectronCommand } = {}) {
+  const root = homeDir
+  const node = nodeBinary()
+  const isLegacy = (cmd) => Boolean(legacyCheck(cmd))
+  const want = mcpCommand(node)
+  const captureScript = path.join(PACKAGE_ROOT, 'hooks', 'capture.mjs')
+  const guardScript = path.join(PACKAGE_ROOT, 'hooks', 'secret-guard.mjs')
+  const details = []
+  let changed = 0
+
+  const rewriteHooksTree = (value, agent, marker) => {
+    let hit = 0
+    const walk = (v) => {
+      if (!v) return
+      if (Array.isArray(v)) { for (const x of v) walk(x); return }
+      if (typeof v !== 'object') return
+      if (typeof v.command === 'string' && v.command.includes(marker) && isLegacy(v.command)) {
+        v.command = marker === 'secret-guard.mjs' ? hookCommand(node, guardScript) : hookCommand(node, captureScript, agent)
+        hit++
+      }
+      for (const x of Object.values(v)) walk(x)
+    }
+    walk(value)
+    return hit
+  }
+
+  // Claude Code MCP + hooks
+  const claudeJson = path.join(root, '.claude.json')
+  if (await exists(claudeJson)) {
+    try {
+      const cfg = JSON.parse(await fs.readFile(claudeJson, 'utf8'))
+      const entry = cfg?.mcpServers?.memory
+      if (entry && isLegacy(entry.command)) {
+        if (!dryRun) { await backupOnce(claudeJson); cfg.mcpServers.memory = { type: 'stdio', ...want }; await fs.writeFile(claudeJson, JSON.stringify(cfg, null, 2), 'utf8') }
+        details.push('claude.mcp'); changed++
+      }
+    } catch { /* 解析失败不碰 */ }
+  }
+  const claudeSettings = path.join(root, '.claude', 'settings.json')
+  if (await exists(claudeSettings)) {
+    try {
+      const cfg = JSON.parse(await fs.readFile(claudeSettings, 'utf8'))
+      const a = rewriteHooksTree(cfg.hooks, 'claude', 'capture.mjs')
+      const b = rewriteHooksTree(cfg.hooks, 'claude', 'secret-guard.mjs')
+      if (a + b) {
+        if (!dryRun) { await backupOnce(claudeSettings); await fs.writeFile(claudeSettings, JSON.stringify(cfg, null, 2), 'utf8') }
+        details.push('claude.hooks'); changed += a + b
+      }
+    } catch { /* 解析失败不碰 */ }
+  }
+
+  // Codex MCP + hooks
+  const codexToml = path.join(root, '.codex', 'config.toml')
+  if (await exists(codexToml)) {
+    try {
+      const text = await fs.readFile(codexToml, 'utf8')
+      const entry = parseCodexMemoryEntry(text)
+      if (entry.present && isLegacy(entry.command)) {
+        const out = alignCodexMemorySection(text, want)
+        if (out.changed) {
+          if (!dryRun) { await backupOnce(codexToml); await fs.writeFile(codexToml, out.text, 'utf8') }
+          details.push('codex.mcp'); changed++
+        }
+      }
+    } catch { /* 解析失败不碰 */ }
+  }
+  const codexHooks = path.join(root, '.codex', 'hooks.json')
+  if (await exists(codexHooks)) {
+    try {
+      const cfg = JSON.parse(await fs.readFile(codexHooks, 'utf8'))
+      const n = rewriteHooksTree(cfg.hooks, 'codex', 'capture.mjs')
+      if (n) {
+        if (!dryRun) { await backupOnce(codexHooks); await fs.writeFile(codexHooks, JSON.stringify(cfg, null, 2), 'utf8') }
+        details.push('codex.hooks'); changed += n
+      }
+    } catch { /* 解析失败不碰 */ }
+  }
+
+  // Cursor MCP + hooks
+  const cursorJson = path.join(root, '.cursor', 'mcp.json')
+  if (await exists(cursorJson)) {
+    try {
+      const cfg = JSON.parse(await fs.readFile(cursorJson, 'utf8'))
+      const entry = cfg?.mcpServers?.memory
+      if (entry && isLegacy(entry.command)) {
+        if (!dryRun) { await backupOnce(cursorJson); cfg.mcpServers.memory = want; await fs.writeFile(cursorJson, JSON.stringify(cfg, null, 2), 'utf8') }
+        details.push('cursor.mcp'); changed++
+      }
+    } catch { /* 解析失败不碰 */ }
+  }
+  const cursorHooks = path.join(root, '.cursor', 'hooks.json')
+  if (await exists(cursorHooks)) {
+    try {
+      const cfg = JSON.parse(await fs.readFile(cursorHooks, 'utf8'))
+      const n = rewriteHooksTree(cfg.hooks, 'cursor', 'capture.mjs')
+      if (n) {
+        if (!dryRun) { await backupOnce(cursorHooks); await fs.writeFile(cursorHooks, JSON.stringify(cfg, null, 2), 'utf8') }
+        details.push('cursor.hooks'); changed += n
+      }
+    } catch { /* 解析失败不碰 */ }
+  }
+
+  if (changed) log('↻ 已自动迁移旧 Electron 配置：' + details.join(' / '))
+  return { ok: true, changed, details, nodePath: node }
 }
 
 function sameMcpEntry(existing, want) {
@@ -72,12 +215,28 @@ function sameMcpEntry(existing, want) {
   if (existing.type === 'stdio' || existing.type === undefined) {
     return existing.command === want.command
       && JSON.stringify(existing.args ?? []) === JSON.stringify(want.args)
+      && (!want.env || JSON.stringify(existing.env ?? {}) === JSON.stringify(want.env))
   }
   return false
 }
 
 // 是否已写入我们（capture.mjs）的会话结束 hook。
 // marker 用于区分宿主：codex 走 hooks.json 的 Stop；cursor 走 hooks.json 的 stop/sessionEnd。
+/** hooks 文件里是否有「指向 Electron 宿主 exe、却没带 ELECTRON_RUN_AS_NODE」的历史命令。 */
+async function hooksNeedRepair(hooksJson, markers) {
+  try {
+    const cfg = JSON.parse(await fs.readFile(hooksJson, 'utf8'))
+    const walk = (v) => {
+      if (!v) return false
+      if (typeof v === 'string') return markers.some((m) => v.includes(m)) && isLegacyElectronCommand(v)
+      if (Array.isArray(v)) return v.some(walk)
+      if (typeof v === 'object') return Object.values(v).some(walk)
+      return false
+    }
+    return walk(cfg)
+  } catch { return false }
+}
+
 async function hookState(hooksJson, agent, cursorStyle = false) {
   try {
     const cfg = JSON.parse(await fs.readFile(hooksJson, 'utf8'))
@@ -148,7 +307,7 @@ async function setupClaudeHooks({ nodePath, dryRun, log }) {
   // ① SessionEnd：会话结束自动沉淀
   const want = {
     matcher: '',
-    hooks: [{ type: 'command', command: `${JSON.stringify(nodePath)} ${JSON.stringify(hookScript)} claude` }],
+    hooks: [{ type: 'command', command: hookCommand(nodePath, hookScript, 'claude') }],
   }
   const hookKey = 'SessionEnd'
   cfg.hooks[hookKey] = Array.isArray(cfg.hooks[hookKey]) ? cfg.hooks[hookKey] : []
@@ -158,7 +317,7 @@ async function setupClaudeHooks({ nodePath, dryRun, log }) {
     // 或 npm 版本装到别处），旧实现只判「有没有 capture.mjs」就跳过，于是 hook 永远
     // 指着那个旧副本（本机实测：Claude Code 一直在跑 web profile 的 0.9.23）。
     // 与 Codex 分支同样的口径：只重写自己那条命令，其它 hook 一律不动。
-    const wanted = `${JSON.stringify(nodePath)} ${JSON.stringify(hookScript)} claude`
+    const wanted = hookCommand(nodePath, hookScript, 'claude')
     let rewrote = false
     for (const c of existingCapture.hooks ?? []) {
       if (typeof c?.command === 'string' && c.command.includes('capture.mjs') && c.command !== wanted) {
@@ -184,13 +343,25 @@ async function setupClaudeHooks({ nodePath, dryRun, log }) {
   if (await exists(guardScript)) {
     const guardKey = 'PreToolUse'
     cfg.hooks[guardKey] = Array.isArray(cfg.hooks[guardKey]) ? cfg.hooks[guardKey] : []
-    if (cfg.hooks[guardKey].some((h) => h?.hooks?.some((c) => c?.command?.includes('secret-guard.mjs')))) {
-      log('✓ Claude Code PreToolUse 凭据守卫已存在，跳过')
+    const wantedGuard = hookCommand(nodePath, guardScript)
+    const existingGuard = cfg.hooks[guardKey].find((h) => h?.hooks?.some((c) => c?.command?.includes('secret-guard.mjs')))
+    if (existingGuard) {
+      // 已存在也要修命令：旧版本把 Electron 宿主 exe 写进了 hook（issue #53），
+      // 只判「有没有 secret-guard」会永远跳过修复。
+      let rewrote = false
+      for (const c of existingGuard.hooks ?? []) {
+        if (typeof c?.command === 'string' && c.command.includes('secret-guard.mjs') && c.command !== wantedGuard) {
+          c.command = wantedGuard
+          rewrote = true
+        }
+      }
+      if (rewrote) { written.push(guardKey + '(path)'); changed = true; log('↻ Claude Code PreToolUse hook 路径已更新') }
+      else log('✓ Claude Code PreToolUse 凭据守卫已存在，跳过')
     } else {
       // 只追加一个独立条目，保留用户已有的 PreToolUse 配置
       cfg.hooks[guardKey].push({
         matcher: 'Read|Bash|Grep|Glob',
-        hooks: [{ type: 'command', command: `${JSON.stringify(nodePath)} ${JSON.stringify(guardScript)}` }],
+        hooks: [{ type: 'command', command: wantedGuard }],
       })
       written.push(guardKey)
       changed = true
@@ -245,18 +416,40 @@ export function parseCodexMemoryEntry(text) {
  * 纯函数：把 `[mcp_servers.memory]` 段对齐到 want（只动这一段的两行）。
  * @returns {{text:string, changed:boolean}}
  */
+export function codexEnvLine(env) {
+  if (!env || typeof env !== 'object') return ''
+  const keys = Object.keys(env)
+  if (!keys.length) return ''
+  return 'env = { ' + keys.map((k) => `${k} = ${JSON.stringify(String(env[k]))}`).join(', ') + ' }'
+}
+
 export function alignCodexMemorySection(text, want) {
   const lines = String(text || '').split(/\r?\n/)
   let inSec = false
   let changed = false
+  let lastRelevant = -1
+  let envAt = -1
+  const wantCmd = 'command = ' + JSON.stringify(want.command)
+  const wantArgs = 'args = ' + JSON.stringify(want.args)
+  const wantEnv = codexEnvLine(want.env)
   for (let i = 0; i < lines.length; i++) {
     if (/^\s*\[/.test(lines[i])) { inSec = /^\s*\[mcp_servers\.memory\]\s*$/.test(lines[i].trim()); continue }
     if (!inSec) continue
-    // 只在**真的不同**时才算改动（幂等：已经是目标形态就不该报 changed，否则每次 setup 都像改过）
-    const wantCmd = 'command = ' + JSON.stringify(want.command)
-    const wantArgs = 'args = ' + JSON.stringify(want.args)
-    if (/^\s*command\s*=/.test(lines[i])) { if (lines[i] !== wantCmd) { lines[i] = wantCmd; changed = true } }
-    else if (/^\s*args\s*=/.test(lines[i])) { if (lines[i] !== wantArgs) { lines[i] = wantArgs; changed = true } }
+    if (/^\s*command\s*=/.test(lines[i])) {
+      if (lines[i] !== wantCmd) { lines[i] = wantCmd; changed = true }
+      lastRelevant = i
+    } else if (/^\s*args\s*=/.test(lines[i])) {
+      if (lines[i] !== wantArgs) { lines[i] = wantArgs; changed = true }
+      lastRelevant = i
+    } else if (/^\s*env\s*=/.test(lines[i])) {
+      envAt = i
+      if (wantEnv && lines[i] !== wantEnv) { lines[i] = wantEnv; changed = true }
+    }
+  }
+  if (wantEnv && envAt < 0) {
+    const at = lastRelevant >= 0 ? lastRelevant + 1 : 0
+    lines.splice(at, 0, wantEnv)
+    changed = true
   }
   return { text: changed ? lines.join('\n') : String(text || ''), changed }
 }
@@ -275,10 +468,12 @@ export async function setupCodex({ nodePath, dryRun = false, log = () => {} } =
     // issue #44 现场的教训：TOML 里可能是**单引号**（`command = 'C:\…'`），老代码只认双引号 →
     // 既读不到（status 报「配置里是 (空)」）也改不掉（`replace` 不命中），**却照样打印「已更新」**。
     // 所以：① 读写都认两种引号；② 改完必须**校验文本真的变了**，没变就如实报失败。
-    const curCmd = /command\s*=\s*["']([^"']*)["']/.exec(text)?.[1] || ''
-    const curArgs = /^args\s*=\s*\[([^\]]*)\]\s*$/m.exec(text)?.[1] || ''
-    const argsOk = want.args.every((a) => curArgs.includes(JSON.stringify(a)) || curArgs.includes("'" + a + "'"))
-    if (curCmd === want.command && argsOk) {
+    // 必须按 [mcp_servers.memory] 段读取；直接在全文抓 command 会抓到别的 server（issue #44）。
+    const entry = parseCodexMemoryEntry(text)
+    const curCmd = entry.command
+    const argsOk = entry.args.length === want.args.length && want.args.every((a, i) => entry.args[i] === a)
+    const envOk = !want.env || /ELECTRON_RUN_AS_NODE\s*=\s*["']1["']/.test(text)
+    if (curCmd === want.command && argsOk && envOk) {
       log('✓ Codex MCP 已是最新，跳过')
       return [{ agent: 'codex', ok: true, reason: 'section exists' }]
     }
@@ -303,6 +498,7 @@ export async function setupCodex({ nodePath, dryRun = false, log = () => {} } =
     '[mcp_servers.memory]',
     `command = ${JSON.stringify(want.command)}`,
     `args = ${JSON.stringify(want.args)}`,
+    ...(want.env ? [codexEnvLine(want.env)] : []),
     '',
   ].join('\n')
   if (!dryRun) {
@@ -367,9 +563,10 @@ export async function runSetup(opts = {}) {
   }
   const all = []
   const want = (name) => only.length === 0 || only.includes(name)
-  if (want('claude')) all.push(...await setupClaude({ nodePath: process.execPath, withHooks, dryRun, log }))
-  if (want('codex')) all.push(...await setupCodex({ nodePath: process.execPath, dryRun, log }))
-  if (want('cursor')) all.push(...await setupCursor({ nodePath: process.execPath, dryRun, log }))
+  const nodePath = nodeBinary()
+  if (want('claude')) all.push(...await setupClaude({ nodePath, withHooks, dryRun, log }))
+  if (want('codex')) all.push(...await setupCodex({ nodePath, dryRun, log }))
+  if (want('cursor')) all.push(...await setupCursor({ nodePath, dryRun, log }))
   return { ok: true, results: all }
 }
 
@@ -377,7 +574,7 @@ export async function runSetup(opts = {}) {
  * 只读查询各 agent 的 MCP 配置状态。不修改任何文件。
  * @returns {Promise<{ok:true, agents: Array, lastCheckedAt: number}>}
  */
-export async function getSetupStatus({ nodePath = process.execPath } = {}) {
+export async function getSetupStatus({ nodePath = nodeBinary() } = {}) {
   const agents = []
   const want = mcpCommand(nodePath)
   // claude-code
@@ -413,6 +610,10 @@ export async function getSetupStatus({ nodePath = process.execPath } = {}) {
     } else {
       agents[agents.length - 1].hook = 'missing'
     }
+    const last = agents[agents.length - 1]
+    last.mcpNeedsRepair = mcpExists && isLegacyElectronCommand(entry?.command)
+    last.hookNeedsRepair = await hooksNeedRepair(path.join(home, '.claude', 'settings.json'), ['capture.mjs', 'secret-guard.mjs'])
+    last.needsRepair = Boolean(last.mcpNeedsRepair || last.hookNeedsRepair)
   }
   // codex
   const codexToml = path.join(home, '.codex', 'config.toml')
@@ -433,12 +634,15 @@ export async function getSetupStatus({ nodePath = process.execPath } = {}) {
       servers: listCodexMcpServers(text),
       installed: true,
       mcpConfigured: has,
-      mcpMatchesCurrentNode: has && configuredNodePath === nodePath,
+      mcpMatchesCurrentNode: has && configuredNodePath === nodePath && (!want.env || /ELECTRON_RUN_AS_NODE\s*=\s*["']1["']/.test(text)),
       currentNodePath: nodePath,
       configuredNodePath,
       mcpPath: codexToml,
       hook: await hookState(path.join(home, '.codex', 'hooks.json'), 'codex'),
+      mcpNeedsRepair: has && isLegacyElectronCommand(configuredNodePath),
+      hookNeedsRepair: await hooksNeedRepair(path.join(home, '.codex', 'hooks.json'), ['capture.mjs']),
     })
+    agents[agents.length - 1].needsRepair = Boolean(agents[agents.length - 1].mcpNeedsRepair || agents[agents.length - 1].hookNeedsRepair)
   }
   // cursor
   const cursorJson = path.join(home, '.cursor', 'mcp.json')
@@ -464,7 +668,10 @@ export async function getSetupStatus({ nodePath = process.execPath } = {}) {
         configuredNodePath: entry?.command || '',
         mcpPath: cursorJson,
         hook: await hookState(path.join(home, '.cursor', 'hooks.json'), 'cursor', true),
+        mcpNeedsRepair: mcpExists && isLegacyElectronCommand(entry?.command),
+        hookNeedsRepair: await hooksNeedRepair(path.join(home, '.cursor', 'hooks.json'), ['capture.mjs']),
       })
+      agents[agents.length - 1].needsRepair = Boolean(agents[agents.length - 1].mcpNeedsRepair || agents[agents.length - 1].hookNeedsRepair)
     } catch { agents.push({ name: 'cursor', installed: true, mcpConfigured: false, mcpPath: cursorJson, reason: 'JSON 解析失败' }) }
   }
   // 兼容性探测：只列出「本机确实存在配置文件」的其它 MCP 客户端（只读，不提供挂载按钮）
@@ -484,10 +691,11 @@ export async function getSetupStatus({ nodePath = process.execPath } = {}) {
   const summary = {
     detectedAgents: agents.filter((a) => a.installed).length,
     mountedAgents: agents.filter((a) => a.mcpConfigured).length,
+    needsRepair: agents.filter((a) => a.needsRepair).length,
     totalServers: allServers.length,
     allServers,
   }
-  return { ok: true, agents, summary, lastCheckedAt: Date.now(), want: { command: nodePath, args: want.args } }
+  return { ok: true, agents, summary, lastCheckedAt: Date.now(), want: { command: nodePath, args: want.args, ...(want.env ? { env: want.env } : {}) } }
 }
 
 // -- 会话结束自动沉淀 hook（connect <agent>，agentmemory 的 `connect --with-hooks` 兜底路径）--
@@ -496,9 +704,9 @@ export async function getSetupStatus({ nodePath = process.execPath } = {}) {
 
 /** capture.mjs 的完整调用（绝对路径，避免升级后路径内嵌版本号而失效）。 */
 function captureCmd(agent) {
-  const node = process.execPath
+  const node = nodeBinary()
   const script = path.join(PACKAGE_ROOT, 'hooks', 'capture.mjs')
-  return `${JSON.stringify(node)} ${JSON.stringify(script)} ${agent}`
+  return hookCommand(node, script, agent)
 }
 
 /** 写一个幂等 hooks.json：events → [{command}]（cursor 风格）或 {hooks:[{type,command}]}（codex 风格）。
@@ -550,7 +758,7 @@ export async function connectCursorHooks(opts = {}) {
 /** 统一入口：claude 复用 setupClaude 的 SessionEnd（capture.mjs）；codex/cursor 写 capture.mjs hooks。 */
 export async function connectAgentHooks(agent, opts = {}) {
   if (agent === 'claude' || agent === 'claude-code') {
-    const results = await setupClaude({ nodePath: process.execPath, withHooks: true, log: opts.log })
+    const results = await setupClaude({ nodePath: nodeBinary(), withHooks: true, log: opts.log })
     return { ok: results.every((r) => r.ok), results }
   }
   if (agent === 'codex') return connectCodexHooks(opts)
@@ -578,13 +786,14 @@ export async function removeClaudeMcp({ dryRun = false, log = () => {} } = {}) {
   if (await exists(settingsJson)) {
     try {
       const scfg = JSON.parse(await fs.readFile(settingsJson, 'utf8'))
-      if (scfg.hooks?.SessionEnd) {
-        const kept = scfg.hooks.SessionEnd.filter((h) => !(h.hooks || []).some((c) => c?.command?.includes('capture.mjs')))
-        if (kept.length !== scfg.hooks.SessionEnd.length) {
-          if (!dryRun) { await backupOnce(settingsJson); scfg.hooks.SessionEnd = kept; await fs.writeFile(settingsJson, JSON.stringify(scfg, null, 2), 'utf8') }
-          removed = true
-        }
+      let dirty = false
+      for (const key of ['SessionEnd', 'PreToolUse']) {
+        const list = scfg.hooks?.[key]
+        if (!Array.isArray(list)) continue
+        const kept = list.filter((h) => !(h.hooks || []).some((c) => c?.command?.includes('capture.mjs') || c?.command?.includes('secret-guard.mjs')))
+        if (kept.length !== list.length) { scfg.hooks[key] = kept; dirty = true; removed = true }
       }
+      if (dirty && !dryRun) { await backupOnce(settingsJson); await fs.writeFile(settingsJson, JSON.stringify(scfg, null, 2), 'utf8') }
     } catch {}
   }
   log(removed ? (dryRun ? '[dry-run] 将卸载 Claude Code MCP' : '✓ 已卸载 Claude Code MCP') : '✓ Claude Code MCP 未配置')
@@ -599,7 +808,7 @@ export async function removeCodexMcp({ dryRun = false, log = () => {} } = {}) {
   const sectionRe = /^\s*\[mcp_servers\.memory\]\s*$/m
   if (!sectionRe.test(text)) { log('✓ Codex MCP 未配置'); return { agent: 'codex', ok: true, removed: false } }
   if (!dryRun) {
-    const newText = text.replace(/^\s*# memory-eternal.*\n?/m, '').replace(/^\s*\[mcp_servers\.memory\]\s*\n(?:command\s*=.*\n|args\s*=.*\n)+\s*/m, '')
+    const newText = text.replace(/^\s*# memory-eternal.*\n?/m, '').replace(/^\s*\[mcp_servers\.memory\]\s*\n(?:command\s*=.*\n|args\s*=.*\n|env\s*=.*\n)+\s*/m, '')
     await backupOnce(codexToml)
     await fs.writeFile(codexToml, newText.replace(/\n{3,}/g, '\n\n'), 'utf8')
   }
@@ -626,7 +835,7 @@ export async function removeCursorMcp({ dryRun = false, log = () => {} } = {}) {
 /** 对单个智能体执行安装/卸载 MCP。action: 'install' | 'uninstall'。agent: 'claude-code'|'codex'|'cursor' */
 export async function mcpAgentAction(agent, action, { dryRun = false, log = () => {} } = {}) {
   if (action === 'install') {
-    const nodePath = process.execPath
+    const nodePath = nodeBinary()
     if (agent === 'claude-code') return { ok: true, results: await setupClaude({ nodePath, dryRun, log }) }
     if (agent === 'codex') return { ok: true, results: await setupCodex({ nodePath, dryRun, log }) }
     if (agent === 'cursor') return { ok: true, results: await setupCursor({ nodePath, dryRun, log }) }

package/lib/vault.js

@@ -10,6 +10,7 @@ import { minhashSignature, lshCandidates } from './minhash.js'
 
 /** 主题目录根。 */
 export const KIND_ROOTS = {
+  core: '09-Core',
   project: '02-Projects',
   knowledge: '03-Knowledge',
   content: '04-Content',
@@ -19,6 +20,9 @@ export const KIND_ROOTS = {
   mistake: '08-Mistakes',
 }
 
+/** 核心记忆：人工批准后，每次会话注入 systemPrompt 的卡片类型。 */
+export const CORE_KIND = 'core'
+
 export const CAPTURE_KINDS = ['project', 'knowledge', 'content', 'prompt', 'business', 'tool', 'mistake']
 
 /** 从 Markdown 文本提取 frontmatter 与正文。 */
@@ -593,6 +597,22 @@ export function normalizeTags(tags) {
     .slice(0, 20)
 }
 
+/**
+ * 把一张已批准的卡片设为核心记忆（kind=core），或恢复成普通知识卡。
+ * 只有主库（approved）卡片可以设为核心；审核中的卡必须先批准。
+ */
+export async function setCardKind(root, rel, kind) {
+  const db = getDb(root)
+  const target = String(kind || '').trim()
+  const existing = findCardRow(db, rel)
+  if (!existing) throw new Error('卡片不存在: ' + rel)
+  if (existing.table !== 'cards') throw new Error('只有已批准卡片才能设为核心记忆，请先在审核中心批准')
+  if (target !== CORE_KIND && !CAPTURE_KINDS.includes(target)) throw new Error('不支持的卡片类型: ' + target)
+  const now = new Date().toISOString()
+  db.prepare('UPDATE cards SET kind = ?, updated_at = ? WHERE path = ?').run(target, now, rel)
+  return { ok: true, path: rel, kind: target, updatedAt: now }
+}
+
 export async function writeCard(root, { kind, title, tags = [], body, source = '', status = 'pending', submittedBy = '', severity = 'info', reason = '', deletedAt = '' }, { threshold = 0.62, dedup = true, dedupAgainst = null } = {}) {
   const db = getDb(root)
   const kindRoot = KIND_ROOTS[kind] || KIND_ROOTS.knowledge

package/orca-plugin/orca-plugin.json

@@ -1,36 +1,36 @@
-{
-  "manifestVersion": 1,
-  "id": "memory-eternal",
-  "publisher": "eternalnight996",
-  "name": "memory-eternal",
-  "version": "0.17.0",
-  "description": "Memory Atlas for Orca: open the local memory vault, pending review and knowledge graph from a sandboxed Orca panel.",
-  "author": {
-    "name": "EternalNight996",
-    "url": "https://github.com/EternalNight996"
-  },
-  "repository": "https://github.com/EternalNight996/memory-eternal",
-  "icon": "assets/icon.png",
-  "engines": {
-    "orca": ">=1.4.0"
-  },
-  "pluginApi": 1,
-  "contributes": {
-    "panels": [
-      {
-        "id": "memory",
-        "title": "记忆",
-        "icon": "brain",
-        "entry": "panel.html"
-      }
-    ]
-  },
-  "capabilities": [
-    {
-      "kind": "workspace:read"
-    },
-    {
-      "kind": "terminal:send"
-    }
-  ]
-}
+{
+  "manifestVersion": 1,
+  "id": "memory-eternal",
+  "publisher": "eternalnight996",
+  "name": "memory-eternal",
+  "version": "0.18.1",
+  "description": "Memory Atlas for Orca: open the local memory vault, pending review and knowledge graph from a sandboxed Orca panel.",
+  "author": {
+    "name": "EternalNight996",
+    "url": "https://github.com/EternalNight996"
+  },
+  "repository": "https://github.com/EternalNight996/memory-eternal",
+  "icon": "assets/icon.png",
+  "engines": {
+    "orca": ">=1.4.0"
+  },
+  "pluginApi": 1,
+  "contributes": {
+    "panels": [
+      {
+        "id": "memory",
+        "title": "记忆",
+        "icon": "brain",
+        "entry": "panel.html"
+      }
+    ]
+  },
+  "capabilities": [
+    {
+      "kind": "workspace:read"
+    },
+    {
+      "kind": "terminal:send"
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memory-eternal",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "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/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/ledger.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/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/ledger.test.mjs"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1"