dsh-memu-memory 1.1.2 → 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

@@ -16,9 +16,11 @@ import { maybeMigrateLibraries } from './migrate.js'
 import { getPromptStates, savePromptOverride, resetPrompt, resetAllPrompts } from './prompts.js'
 import { statsView } from './stats.js'
 import { getMemuConfig, saveMemuConfig, setEmbeddingSource, testMemuConfig, getSummaryConfig, getVisionConfig } from './memu-config.js'
+import { getLocalVectorState, downloadLocalVectorModel, installLocalVectorRuntime, selectLocalVectorModel, switchLocalVectorProfile, rollbackLocalVectorProfile, abortLocalVectorMigration, testLocalVector } from './local-vector-service.js'
 import { webUiHtml, WEBUI_PATH, standaloneHtml, standaloneAsset, SETTINGS_PATH } from './webui.js'
 import { getGraph, listEntities, createEntity, renameEntity, linkEntries, unlinkEntry, getRelationship, updateRelationship, graphExport, restoreGraphData } from './graph.js'
 import { getAttachment, attachmentThumbnail, attachmentPreview, exportMediaBundle, importMediaBundle, streamMediaExport, importMediaStream } from './media.js'
+import { listEvents, logStats, clearEvents } from './activity-log.js'
 
 const ENDPOINT = '/dsh-memu-memory'
 
@@ -84,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 || {}),
@@ -95,7 +102,7 @@ async function privateListView(scope) {
     content: String(content ?? e?.content ?? '').slice(0, 4000),
   })
   try {
-    const result = await privateList(scope)
+    const result = await privateList({ ...scope, preferIndex: true })
     return {
       libraryId: result.libraryId,
       source: result.source || 'engine',
@@ -451,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
@@ -492,6 +500,7 @@ async function dispatch(ctx, endpoint, payload = {}) {
         memuConfig: getMemuConfig(),
         summaryConfig: getSummaryConfig(),
         visionConfig: getVisionConfig(),
+        localVector: getLocalVectorState(),
         settings: getSettings(),
         libraries: libraryView(),
         archivedLibraries: archivedLibraryView(),
@@ -524,6 +533,9 @@ async function dispatch(ctx, endpoint, payload = {}) {
           newSessionDefault: getSettings().newSessionDefault || 'both',
         },
         libraries: listLibraries().map(({ id, name, scopeKey: key }) => ({ id, name, scopeKey: key })),
+        // Memory domains accepted by setDomain. Prompt page types are a different
+        // concept (getPromptDomains), so this stays a fixed list.
+        domains: ['rp', 'coding', 'general', 'mixed'],
         // A folder with both layers off never prompts: there is nothing to ask.
         folder,
         shouldPrompt: folder.useLibrary !== false || folder.useGlobal !== false,
@@ -550,7 +562,7 @@ async function dispatch(ctx, endpoint, payload = {}) {
     case 'resetSettings': {
       const patch = {}
       for (const key of [
-        'autoInject', 'privateTopK', 'globalTopK', 'anchorTokens', 'turnTokens', 'dedupeTurns',
+        'autoInject', 'privateTopK', 'globalTopK', 'anchorTokens', 'turnTokens', 'injectionTotalTokens', 'dedupeTurns',
         'globalEveryNTurns', 'minUserChars', 'mustRememberCap', 'randomCueChance',
         'autoInstallEngine', 'newSessionPromptDismissed', 'newSessionDefault', 'habitsInjection',
         'sleepConsolidation', 'sleepAfterIdleMinutes', 'autoCurateEveryHours',
@@ -564,7 +576,7 @@ async function dispatch(ctx, endpoint, payload = {}) {
     case 'setSettings': {
       const patch = payload?.patch && typeof payload.patch === 'object' ? payload.patch : {}
       const allowed = new Set([
-        'autoInject', 'privateTopK', 'globalTopK', 'anchorTokens', 'turnTokens',
+        'autoInject', 'privateTopK', 'globalTopK', 'anchorTokens', 'turnTokens', 'injectionTotalTokens',
         'relevanceThreshold', 'dedupeTurns', 'globalEveryNTurns', 'minUserChars',
         // newSessionDefault has to be writable here: "remember my choice" stores
         // it, and a dropped patch silently turned every remembered answer into
@@ -765,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.
@@ -880,8 +894,10 @@ async function dispatch(ctx, endpoint, payload = {}) {
       const sessionId = payload?.sessionId || null
       const exec = sessionId ? execFor(sessionId) : { agent: null }
       try {
-        const result = await globalList({ exec, domain: payload?.domain })
+        const result = await globalList({ exec, domain: payload?.domain, preferIndex: true })
         return {
+          warning: result.warning || null,
+          source: result.source || null,
           files: (result.files || []).map((f) => ({
             id: f.name,
             title: f.entry?.title || f.description || '',
@@ -1086,6 +1102,24 @@ async function dispatch(ctx, endpoint, payload = {}) {
       })
     case 'testMemuConfig':
       return testMemuConfig()
+    case 'getLocalVectorState':
+      return getLocalVectorState()
+    case 'downloadLocalVectorModel':
+      return await downloadLocalVectorModel(String(payload?.id || ''), { confirmed: payload?.confirmed === true })
+    case 'selectLocalVectorModel':
+      return selectLocalVectorModel(String(payload?.id || ''))
+    case 'installLocalVectorRuntime':
+      return await installLocalVectorRuntime({ modelId: payload?.id || null, confirmed: payload?.confirmed === true })
+    case 'switchLocalVectorProfile':
+      if (payload?.confirmed !== true) throw new Error('switching the local vector profile requires explicit confirmation')
+      return await switchLocalVectorProfile({ id: payload?.id })
+    case 'rollbackLocalVectorProfile':
+      if (payload?.confirmed !== true) throw new Error('rolling back the local vector profile requires explicit confirmation')
+      return await rollbackLocalVectorProfile()
+    case 'abortLocalVectorMigration':
+      return abortLocalVectorMigration()
+    case 'testLocalVector':
+      return await testLocalVector()
     case 'savePrompt': {
       const key = String(payload?.key || '')
       const text = String(payload?.text ?? '')
@@ -1104,6 +1138,21 @@ async function dispatch(ctx, endpoint, payload = {}) {
       return { sizes: engineVersionSizes() }
     case 'getEngine':
       return engineView()
+    case 'getActivityLog':
+      return {
+        events: listEvents({
+          limit: payload?.limit,
+          kind: payload?.kind,
+          level: payload?.level,
+          scope: payload?.scope,
+          sessionId: payload?.sessionId,
+          since: payload?.since,
+          q: payload?.q,
+        }),
+        stats: logStats(),
+      }
+    case 'clearActivityLog':
+      return clearEvents()
     default:
       throw new Error(`unknown endpoint: ${endpoint}`)
   }