dsh-memu-memory 1.1.3 → 1.2.0

package/lib/remote-summary.js

@@ -1,6 +1,8 @@
 import { getSummaryConfig } from './memu-config.js'
 import { loadPromptForDomain, CONSOLIDATION_CONTRACTS } from './prompts.js'
 import { getSettings } from './state.js'
+import { normalizeEmotion } from './mood.js'
+import { record } from './activity-log.js'
 
 function parseJsonObject(text) {
   const raw = String(text || '').trim()
@@ -12,31 +14,42 @@ function parseJsonObject(text) {
   try { return JSON.parse(raw.slice(start, end + 1)) } catch { return null }
 }
 
-function cleanMemories(value) {
+// 逐条清洗。非法字段不修，只把这一条连同原因丢进 problems：一条坏数据不该让
+// 整批整理白跑，也不该被悄悄改成"看起来合法"的情绪留在库里。
+function cleanMemories(value, problems = []) {
   const list = Array.isArray(value) ? value : []
-  return list
-    .map((m) => ({
-      title: String(m?.title || '').trim().slice(0, 120),
-      content: String(m?.content || '').trim(),
-      tags: Array.isArray(m?.tags) ? m.tags.slice(0, 20).map((t) => String(t)) : [],
-      openLoop: m?.open_loop === true || m?.openLoop === true,
-      confidence: Number.isFinite(Number(m?.confidence)) ? Number(m.confidence) : 0.8,
-      layer: ['long_term', 'short_term'].includes(m?.layer) ? m.layer : 'long_term',
-      disclosure: ['can_tell', 'only_if_asked', 'never_say'].includes(m?.disclosure) ? m.disclosure : 'can_tell',
-      // A consolidation pass that forgets the field must not invent a scope: the default
-      // here has to match the tool path (`privateRemember`, which defaults to 'shared').
-      // 'session' used to be the fallback, which silently turned every sloppy summary into
-      // a memory that died with its conversation (and the level itself is gone now).
-      visibility: ['shared', 'secret'].includes(m?.visibility) ? m.visibility : 'shared',
-      owner: ['me', 'us', 'about_user', 'about_project'].includes(m?.owner) ? m.owner : 'me',
-      source: ['user_said', 'inferred', 'imagined', 'told'].includes(m?.source) ? m.source : 'inferred',
-      moodValence: Number.isFinite(m?.mood_valence) ? Math.max(-1, Math.min(1, m.mood_valence)) : null,
-      arousal: Number.isFinite(m?.arousal) ? Math.max(0, Math.min(1, m.arousal)) : null,
-      peak: m?.peak === true,
-      salientDate: typeof m?.salient_date === 'string' ? m.salient_date : null,
-    }))
-    .filter((m) => m.content)
-    .slice(0, 20)
+  const out = []
+  list.forEach((m, index) => {
+    try {
+      out.push({
+        title: String(m?.title || '').trim().slice(0, 120),
+        content: String(m?.content || '').trim(),
+        tags: Array.isArray(m?.tags) ? m.tags.slice(0, 20).map((t) => String(t)) : [],
+        openLoop: m?.open_loop === true || m?.openLoop === true,
+        confidence: Number.isFinite(Number(m?.confidence)) ? Number(m.confidence) : 0.8,
+        layer: ['long_term', 'short_term'].includes(m?.layer) ? m.layer : 'long_term',
+        disclosure: ['can_tell', 'only_if_asked', 'never_say'].includes(m?.disclosure) ? m.disclosure : 'can_tell',
+        // A consolidation pass that forgets the field must not invent a scope: the default
+        // here has to match the tool path (`privateRemember`, which defaults to 'shared').
+        // 'session' used to be the fallback, which silently turned every sloppy summary into
+        // a memory that died with its conversation (and the level itself is gone now).
+        visibility: ['shared', 'secret'].includes(m?.visibility) ? m.visibility : 'shared',
+        owner: ['me', 'us', 'about_user', 'about_project'].includes(m?.owner) ? m.owner : 'me',
+        source: ['user_said', 'inferred', 'imagined', 'told'].includes(m?.source) ? m.source : 'inferred',
+        // 缺字段是"没读到情绪"，null 才是；这里不能拿 valence 反推四轴。
+        emotion: normalizeEmotion(m?.emotion ?? null),
+        // 缺失或非法给 null 而不是 0：0 表示"明确中性"，不是"不知道"。
+        dominance: Number.isFinite(m?.dominance) ? Math.max(-1, Math.min(1, m.dominance)) : null,
+        moodValence: Number.isFinite(m?.mood_valence) ? Math.max(-1, Math.min(1, m.mood_valence)) : null,
+        arousal: Number.isFinite(m?.arousal) ? Math.max(0, Math.min(1, m.arousal)) : null,
+        peak: m?.peak === true,
+        salientDate: typeof m?.salient_date === 'string' ? m.salient_date : null,
+      })
+    } catch (error) {
+      problems.push({ index, title: String(m?.title || '').slice(0, 120), error: String(error?.message || error) })
+    }
+  })
+  return out.filter((m) => m.content).slice(0, 20)
 }
 
 // Remote mode: the configured chat endpoint does the summarizing. The session
@@ -87,7 +100,20 @@ export async function summarizeRemote({ transcript, libraryName, domain, signal,
     const text = data?.choices?.[0]?.message?.content
     const parsed = parseJsonObject(text)
     if (!parsed) throw new Error(`remote summary returned non-JSON: ${String(text || body).slice(0, 600)}`)
-    return cleanMemories(parsed.memories)
+    const problems = []
+    const memories = cleanMemories(parsed.memories, problems)
+    if (problems.length) {
+      // 远程模型的错误只能靠日志查，静默丢弃等于把问题留给下一个人复现。
+      record({
+        kind: 'consolidate',
+        scope: 'private',
+        ok: false,
+        level: 'warn',
+        message: `远程整理有 ${problems.length} 条被拒绝：${problems[0].error}`,
+        detail: { rejected: problems },
+      })
+    }
+    return memories
   } finally {
     clearTimeout(timer)
     signal?.removeEventListener?.('abort', onAbort)

package/lib/rpc.js

@@ -86,6 +86,11 @@ async function privateListView(scope) {
     decay: Math.min(1, Math.max(0, decayStrength(e) / 1.5)),
     moodValence: e?.moodValence ?? null,
     arousal: e?.arousal ?? null,
+    // 构成与掌控感分开投影：同一个 valence 说得出"多难过"，说不出"是怒还是怕"。
+    emotion: e?.emotion ?? null,
+    dominance: e?.dominance ?? null,
+    // 来源是审计字段，只读：面板显示"这个情绪是谁给的"，不给改。
+    emotionSource: e?.emotionSource ?? null,
     peak: e?.peak === true,
     salientDate: e?.salientDate || null,
     attachments: attachmentPreview(libraryId, e || {}),
@@ -453,6 +458,7 @@ async function dispatch(ctx, endpoint, payload = {}) {
       } catch {}
       const rows = Object.entries(state.sessions || {})
         .map(([sessionId, binding]) => {
+          if (binding.consolidationFork) return null
           const inFolder = binding.scopeKey === scopeKey
             || (binding.libraryId && state.libraries?.[binding.libraryId]?.scopeKey === scopeKey)
           if (!inFolder) return null
@@ -771,7 +777,9 @@ async function dispatch(ctx, endpoint, payload = {}) {
       // `source` is writable: correcting provenance is the point of showing it.
       // `salientDate` is writable for the same reason: an entry whose year was
       // dropped has to be repairable from the browser, not only from JSON.
-      const allowed = ['content', 'title', 'tags', 'status', 'openLoop', 'disclosure', 'confidence', 'owner', 'visibility', 'layer', 'source', 'salientDate', 'track', 'peak', 'moodValence', 'arousal', 'attachments', 'context']
+      // `emotion`/`dominance` 可写：面板修的是那条记忆所述事件的感受。
+      // `emotionSource` 故意不在名单里：来源是审计结论，能改就等于能伪造。
+      const allowed = ['content', 'title', 'tags', 'status', 'openLoop', 'disclosure', 'confidence', 'owner', 'visibility', 'layer', 'source', 'salientDate', 'track', 'peak', 'moodValence', 'arousal', 'emotion', 'dominance', 'attachments', 'context']
       // An unknown key used to be dropped in silence, so a typo here or in a script
       // came back as a successful save that changed nothing. Refuse instead: the
       // caller can only fix a field name it is told is wrong.

package/lib/state.js

@@ -10,7 +10,8 @@ import {
   pruneBackups, restoreFromBackup, withBackupLock,
 } from './backup.js'
 import { migrateIndexVisibility } from './visibility.js'
-import { memuDbFor, memuGlobalDbFor } from './vector-profile.js'
+import { memuDbFor, memuGlobalDbFor, removeActiveLibrary } from './vector-profile.js'
+import { normalizeEmotion, derivedValence } from './mood.js'
 
 const STATE_FILE = () => path.join(dataDir(), 'state.json')
 const GLOBAL_DB = () => path.join(dataDir(), 'global.sqlite3')
@@ -94,6 +95,12 @@ export const DEFAULT_SETTINGS = {
   // "gone", and short enough that a conversation which ended gets tidied in the
   // same sitting instead of waiting for a quiet hour that may never arrive.
   sleepAfterIdleMinutes: 3,
+  // 主动记忆：分数门槛、饥饿阈值（空闲超过它无条件检查）、两种抑制冷却（分钟；整理冷却默认 0，
+  // 薄证据的重复 fork 由评分拦截，只有用户显式配置才启用硬冷却）。
+  activeMemoryMinScore: 0.8,
+  activeMemoryStarvationMinutes: 15,
+  activeMemoryCooldownMinutes: 0,
+  activeMemoryRecallCooldownMinutes: 15,
   autoCurateEveryHours: 0,
   autoCurateSessionLimit: 8,
   // 'local' keeps every memory on this machine; 'cloud' hands MemU's own backend
@@ -343,6 +350,8 @@ export function updateSettings(patch) {
     mustRememberCap: [1, 100], randomCueChance: [0, 1], shortTermTtlHours: [0, 8760],
     unpinBudgetPerSession: [1, 20], unpinCooldownMinutes: [0, 1440], sleepAfterIdleMinutes: [1, 1440],
     autoCurateEveryHours: [0, 8760], autoCurateSessionLimit: [1, 10], purgeArchivedAfterDays: [0, 36500],
+    activeMemoryMinScore: [0, 10], activeMemoryStarvationMinutes: [1, 1440],
+    activeMemoryCooldownMinutes: [0, 10080], activeMemoryRecallCooldownMinutes: [0, 10080],
   }
   const enums = { autoInject: ['smart', 'anchor-only', 'per-turn', 'off'], memoryMode: ['local', 'cloud'], memoryBackend: ['agent', 'api'], vectorSource: ['local', 'api'], newSessionDefault: ['off', 'auto', 'global', 'both'] }
   for (const [key, value] of Object.entries(patch || {})) {
@@ -541,13 +550,20 @@ export function deleteLibrary(id) {
   const state = loadState()
   if (!state.libraries[id]) return { ok: false, error: 'library not found' }
   if (state.libraries[id].archived !== true) return { ok: false, error: 'archive the library before deleting it' }
+  const activeVectorDb = removeActiveLibrary(id)
+  const legacyVectorDb = path.join(librariesDir(), id + '.sqlite3')
   delete state.libraries[id]
   for (const [sessionId, binding] of Object.entries(state.sessions || {})) {
     if (binding?.libraryId === id) delete state.sessions[sessionId]
   }
   saveState(state)
   const removed = []
-  for (const file of [memoryDbPath(id), ...['json', 'entities.json', 'media.json', 'stats.json'].map(suffix => path.join(indexDir(), `${id}.${suffix}`))]) {
+  const vectorPrefix = id + '.'
+  const vectorGenerationFiles = fs.existsSync(librariesDir())
+    ? fs.readdirSync(librariesDir()).filter(name => name.startsWith(vectorPrefix) && name.endsWith('.sqlite3')).map(name => path.join(librariesDir(), name))
+    : []
+  for (const file of [activeVectorDb, legacyVectorDb, ...vectorGenerationFiles, ...['json', 'entities.json', 'media.json', 'stats.json'].map(suffix => path.join(indexDir(), `${id}.${suffix}`))]) {
+    if (!file) continue
     try {
       if (fs.existsSync(file)) { fs.rmSync(file, { force: true }); removed.push(file) }
     } catch {}
@@ -791,6 +807,8 @@ export function markInjected(sessionId, ids, turn) {
     for (const id of ids || []) at[id] = turn ?? Date.now()
     binding.injectedAt = at
     binding.lastInjectedTurn = turn ?? binding.lastInjectedTurn ?? 0
+    // 主动记忆抑制要一个"最近一次真正注入了记忆"的墙钟时间；turn 号不能跨会话比较。
+    binding.lastInjectedAt = stamp()
     return state
   })
 }
@@ -870,17 +888,16 @@ export function consumeCue(sessionId, cueId) {
   return true
 }
 
-// The session's running mood, kept on the binding rather than in a memory entry:
-// it is a retrieval lens, not a fact about the user, and must never be recalled
-// as a stored memory.
+// The session's running mood is a retrieval lens on the binding, not a fact about
+// the user: it must never be recalled as a stored memory.
 export function setSessionMood(sessionId, mood) {
-  return setSessionBinding(sessionId, {
-    mood: {
-      valence: Math.max(-1, Math.min(1, Number(mood?.valence) || 0)),
-      arousal: Math.max(0, Math.min(1, Number(mood?.arousal) || 0)),
-      at: Date.now(),
-    },
-  })
+  // 给了 emotion 就以四轴为准，valence 只是投影；只有 valence 的旧形状原样存，不反推四轴。
+  const emotion = normalizeEmotion(mood?.emotion ?? null)
+  const bounded = (raw, min, max) => Math.max(min, Math.min(max, Number.isFinite(raw) ? raw : 0)) // 显式 0 是读数的一部分，不能用 `|| 默认值`
+  return setSessionBinding(sessionId, { mood: {
+    valence: emotion ? derivedValence(emotion) : bounded(mood?.valence, -1, 1),
+    emotion, arousal: bounded(mood?.arousal, 0, 1), dominance: bounded(mood?.dominance, -1, 1), at: Date.now(),
+  } })
 }
 
 export function getSessionMood(sessionId) {

package/lib/tools.js

@@ -80,6 +80,28 @@ function salientTag(entry) {
   return isDatedSalientDate(entry.salientDate) ? `date=${entry.salientDate}` : `anniversary=${entry.salientDate}`
 }
 
+// 四轴名在展示层就地映射：这是给人读的一行摘要，不是本地化词条。
+const EMOTION_LABELS = { joy: '喜', anger: '怒', sorrow: '哀', fear: '惧' }
+const EMOTION_AXES_IN_ORDER = ['joy', 'anger', 'sorrow', 'fear']
+
+// 只留够显眼的份额，最多两项：四项全列会把一行标签读成噪声。
+function emotionBrief(entry) {
+  const emotion = entry.emotion
+  if (!emotion || typeof emotion !== 'object') return ''
+  const shares = EMOTION_AXES_IN_ORDER
+    .map((axis) => ({ axis, share: Number(emotion[axis]) || 0 }))
+    .filter((item) => item.share >= 0.05)
+    .sort((a, b) => b.share - a.share)
+    .slice(0, 2)
+  if (!shares.length) return ''
+  const parts = shares.map((item) => `${EMOTION_LABELS[item.axis]}${item.share.toFixed(2)}`)
+  const dominance = Number(entry.dominance)
+  if (Number.isFinite(dominance)) parts.push(`dom${dominance >= 0 ? '+' : ''}${dominance.toFixed(2)}`)
+  const arousal = Number(entry.arousal)
+  if (Number.isFinite(arousal)) parts.push(`a${arousal.toFixed(2)}`)
+  return parts.join(' · ')
+}
+
 function formatPrivateItem(item, index, options = {}) {
   const entry = item.entry || {}
   const lines = [
@@ -107,7 +129,10 @@ function formatPrivateItem(item, index, options = {}) {
   // way made "the test is tomorrow" read like a recurring commemorative date.
   const tag = salientTag(entry)
   if (tag) lines.push(`   ${tag}`)
-  if (typeof entry.moodValence === 'number' && entry.moodValence !== 0) lines.push(`   mood=${entry.moodValence.toFixed(2)}`)
+  // 有构成就讲构成：同一个 valence 可能来自怒，也可能来自哀，一个数字分不出来。
+  const brief = emotionBrief(entry)
+  if (brief) lines.push(`   emo=${brief}`)
+  else if (typeof entry.moodValence === 'number' && entry.moodValence !== 0) lines.push(`   mood=${entry.moodValence.toFixed(2)}`)
   if (item.content) {
     const body = options.query
       ? centeredSnippet(item.content, options.query)
@@ -187,8 +212,16 @@ export function registerTools(ctx) {
         description: 'Where this came from: inferred (default — you concluded it), user_said (only when the words are actually theirs and quotable), imagined, or told.',
       },
       confidence: { type: 'number', description: '0-1 confidence in this memory. Below 0.45 it is injected as a hedge, so use it honestly.' },
-      mood_valence: { type: 'number', description: 'How this moment felt, -1 (bad) to 1 (good). Omit to inherit the current conversation mood.' },
+      mood_valence: { type: 'number', description: '派生值：给了 emotion 时由四项算出，-1（坏）到 1（好）。省略则沿用当前会话读数。' },
       arousal: { type: 'number', description: 'How strongly it hit, 0-1.' },
+      emotion: {
+        type: 'object',
+        properties: { joy: { type: 'number' }, anger: { type: 'number' }, sorrow: { type: 'number' }, fear: { type: 'number' } },
+        // 四个轴是封闭集合：多写的键只会被误当成第五种情绪。
+        additionalProperties: false,
+        description: '情绪构成：喜悦/愤怒/哀伤/恐惧，四项自动归一化到和为 1。填记忆所述那件事的情绪，不是此刻整理时的心情。省略=继承当前会话读数；显式全零=明确中性；工程事实请用中性，不要因为 bug 难修或结论重要就填负面情绪。',
+      },
+      dominance: { type: 'number', description: '谁在掌控：-1 完全失控 … +1 完全掌控。省略=继承当前会话。' },
       peak: { type: 'boolean', description: 'A high point or low point of the arc — peaks and endings stay easier to recall.' },
       salient_date: { type: 'string', description: 'MM-DD for something that comes back every year (a birthday, an anniversary of an event); it resurfaces on that day each year. YYYY-MM-DD for a one-off dated commitment or appointment: it is raised the day before and on the day itself, and never again after it has passed. Use the annual form only when the day really does recur. A relative day (今天/明天/后天/today/tomorrow) must be resolved to the absolute date it points at: sending a bare MM-DD turns one appointment into a yearly reminder. If the content itself names a date, pass it here too: when this field is empty the plugin only falls back to a single unambiguous YYYY-MM-DD found in the text.' },
       track: { type: 'string', description: 'memory (default) or habit for an aggregated expression/sticker habit; do not write one habit per occurrence.' },
@@ -219,6 +252,11 @@ export function registerTools(ctx) {
         confidence: args.confidence,
         moodValence: args.mood_valence ?? null,
         arousal: args.arousal ?? null,
+        // `undefined` means "the model said nothing" and is allowed to inherit the
+        // turn's mood; `null` means "explicitly neutral" and must survive as such. Using
+        // `?? null` here would erase that difference and re-inherit on a neutral call.
+        emotion: args.emotion,
+        dominance: args.dominance ?? null,
         peak: args.peak === true,
         salientDate: args.salient_date ?? null,
       })
@@ -309,6 +347,13 @@ export function registerTools(ctx) {
       peak: { type: 'boolean', description: 'Flashbulb flag: the moment was charged. Changing it recomputes accuracy.' },
       mood_valence: { type: 'number', description: 'How the moment felt, -1..1. Used as a retrieval lens; omitted keeps the stored value.' },
       arousal: { type: 'number', description: 'How charged the moment was, 0..1. Used as a retrieval lens; omitted keeps the stored value.' },
+      emotion: {
+        type: 'object',
+        properties: { joy: { type: 'number' }, anger: { type: 'number' }, sorrow: { type: 'number' }, fear: { type: 'number' } },
+        additionalProperties: false,
+        description: '情绪构成，三项语义不同：省略=保留原值；显式 null=清除 emotion，来源变 unknown；显式对象=校验并归一化后整份替换。改的是那条记忆所述事件的感受，不是此刻的心情。',
+      },
+      dominance: { type: 'number', description: '谁在掌控：-1 完全失控 … +1 完全掌控。省略=保留原值。' },
       salient_date: { type: 'string', description: 'Re-date the memory: MM-DD for an annual anniversary, YYYY-MM-DD for a one-off dated commitment, or an empty string to remove the date. Use this to repair a date that was stored without its year.' },
     },
     async (args, exec) => {
@@ -318,6 +363,8 @@ export function registerTools(ctx) {
         layer: args.layer, owner: args.owner, visibility: args.visibility,
         source: args.source, track: args.track, peak: args.peak,
         moodValence: args.mood_valence, arousal: args.arousal,
+        // undefined 就是"省略"，必须原样传下去；换成 null 会把保留变成清除。
+        emotion: args.emotion, dominance: args.dominance,
         // Sentinel: absent means "leave the date as it is", '' means "clear it".
         salientDate: args.salient_date,
       })

package/lib/vector-profile.js

@@ -565,6 +565,33 @@ export function dbPathFor(libraryId = null) {
  * loadIndex must be synchronous; by default the authoritative raw index is read.
  * A nonempty, corrupt, quarantined or unknown-shaped index requires rebuilding.
  */
+/**
+ * Remove one library from the active database map under the manifest lock.
+ * The caller owns filesystem cleanup; returning the captured absolute path keeps
+ * the manifest mutation atomic without deleting a possibly newer generation.
+ */
+export function removeActiveLibrary(libraryId) {
+  if (!isSafeId(libraryId) || libraryId === 'global') throw vectorError(VECTOR_ERROR_CODES.PATH_ESCAPE, 'unsafe private library id: ' + JSON.stringify(libraryId))
+  let removed = null
+  updateVectorStateSync(state => {
+    const guard = liveGuard(state.writeGuard)
+    if (guard.frozen || Object.keys(guard.leases).length) {
+      throw vectorError('VECTOR_WRITE_BUSY', 'an in-flight vector write prevents deleting a library; retry shortly', { libraryId })
+    }
+    if (state.pending) {
+      throw vectorError('VECTOR_WRITE_BUSY', 'a vector generation switch prevents deleting a library; retry shortly', { libraryId })
+    }
+    const active = state.active
+    const entry = active?.databases?.libraries?.[libraryId]
+    if (!active || !entry) return null
+    removed = resolveVectorPath(entry.path)
+    const libraries = { ...active.databases.libraries }
+    delete libraries[libraryId]
+    return { ...state, active: { ...active, databases: { ...active.databases, libraries } } }
+  })
+  return removed
+}
+
 export function enrollActiveLibrary(libraryId, { loadIndex } = {}) {
   if (!isSafeId(libraryId) || libraryId === 'global') throw vectorError(VECTOR_ERROR_CODES.PATH_ESCAPE, 'unsafe private library id: ' + JSON.stringify(libraryId))
   let db = null

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-memu-memory",
   "icon": "./assets/icon.png",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "面向长篇 RP 与陪伴对话的 DeepSeek Harness 记忆插件：三层记忆、逐轮召回、来源标注、关系图、图片附件与独立 WebUI。",
   "keywords": [
     "deepseek-harness",
@@ -45,6 +45,7 @@
   "files": [
     "lib",
     "scripts",
+    "tests",
     "cordis.patch.yml",
     "requirements.lock",
     "README.md",

package/scripts/acceptance-local.mjs

@@ -699,7 +699,8 @@ await auto('G-1', 'the kept docs exist and nothing points at a retired one', asy
   for (const rel of ['assets/icon.png', 'assets/icon-256.png', 'assets/icon.svg']) {
     assert.ok(fs.existsSync(path.join(ROOT, rel)), rel + ' exists')
   }
-  assert.ok(!fs.existsSync(path.join(ROOT, 'CHANGELOG' + '.md')), 'the retired changelog is gone')
+  // Since 1.1.3 the changelog is the source for release notes (release.yml), so it is kept.
+  assert.ok(fs.existsSync(path.join(ROOT, 'CHANGELOG' + '.md')), 'CHANGELOG.md carries release notes')
   // 细节从 AGENTS.md 搬进了 docs/：索引必须短，指针必须都能落地
   const agents = fs.readFileSync(path.join(ROOT, 'AGENTS.md'), 'utf8')
   assert.ok(agents.includes('plugin:dsh-memu-memory'), 'the notes carry the real source kind, not the old one')