@a9i5k4/dsh-auto-memory 0.1.19 → 0.1.21

package/cordis.patch.yml

@@ -5,5 +5,5 @@
 # the `dsh.client` declaration in package.json makes the browser half
 # (exports "./client", served at /plugins/<id>/client.js) load in the web GUI.
 - insert:
-    - id: auto-memory-dev
-      name: '@deepseek-ai/dsh-auto-memory'
+    - id: auto-memory
+      name: '@a9i5k4/dsh-auto-memory'

package/lib/client.js

@@ -324,6 +324,15 @@ window.__ModuleLoader__.load({
 
     // ───────────────────────── 更新弹窗 / 首次指导 ─────────────────────────
     var CHANGELOG = {
+      '0.1.21': { zh: [
+        '上下文与缓存:动态记忆改为运行时快照，静态规则保持稳定；切换模型、跨天和记忆刷新不再反复击穿前缀缓存。',
+        '记忆系统:三层记忆、普通检索与多关键词 recall、自动沉淀已完成运行时验证，写入、读取和检索链路稳定。',
+        '可靠性与成本:修复重启后与会话消息提取问题；自动沉淀增加最小内容门槛、冷却时间、每日上限和反递归保护，减少无效子代理调用。',
+      ], en: [
+        'Context and cache: dynamic memory now uses runtime snapshots while static rules stay stable; model switches, day changes, and refreshes no longer repeatedly break prefix caching.',
+        'Memory system: three-layer memory, standard search, multi-keyword recall, and auto-consolidation have passed runtime verification for writing, reading, and retrieval.',
+        'Reliability and cost: fixed restart and session-message extraction issues; auto-consolidation now has a content threshold, cooldown, daily cap, and recursion guard to reduce unnecessary subagent calls.',
+      ] },
       '0.1.19': { zh: [
         '稳定版:整合 0.1.16~0.1.19 全部修复与优化',
         '核心:上下文缓存策略重写——记忆注入迁至运行时上下文快照,系统提示词保持稳定,DeepSeek 前缀缓存全程命中,不再白白消耗 token(命中率恢复 95%+)',

package/lib/index.js

@@ -17,7 +17,7 @@
  *   - 路由:/api/dsh-auto-memory/{state,list,file,recall,config,reflect}(loopback-only)
  */
 
-import { readFile, writeFile, mkdir, readdir, stat, rm, copyFile } from 'node:fs/promises'
+import { readFile, writeFile, mkdir, readdir, stat, rm, copyFile, appendFile } from 'node:fs/promises'
 import { createReadStream, existsSync } from 'node:fs'
 import { exec as cpExec } from 'node:child_process'
 import { promisify } from 'node:util'
@@ -82,7 +82,11 @@ const DEFAULT_CONFIG = {
   /** 每轮对话结束自动沉淀记忆(subagent 判断+提炼,有 API 成本;默认开)。 */
   autoConsolidate: true,
   /** 自动沉淀内容门槛:本轮 user+assistant 文本总字符数低于此值视为寒暄,跳过。 */
-  autoConsolidateMinChars: 60,
+  autoConsolidateMinChars: 240,
+  /** 自动沉淀冷却分钟:避免连续短轮反复调用 subagent。 */
+  autoConsolidateCooldownMinutes: 5,
+  /** 自动沉淀每日最多调用次数(跨插件实例应只保留一个实例)。 */
+  autoConsolidateDailyMax: 8,
   /** 暂离阈值(分钟):距上次活动超过该值视为暂离,回归时自动弹出记忆窗口并欢迎。默认 60。 */
   awayMinutes: 60,
   /** 自动总结时间点(24h "HH:MM" 数组,如 ["12:00","18:00","22:00"]):到点自动生成本时段总结并弹窗展示。空数组=关闭。 */
@@ -136,6 +140,16 @@ function dshHome() {
   return path.join(homedir(), '.dsh')
 }
 
+/** 诊断输出:写 ~/.dsh/dsh-auto-memory-diagnose.log(append)+console.log 双保险。验证完移除。 */
+let _diagChain = Promise.resolve()
+function diag(msg) {
+  try {
+    const line = new Date().toISOString() + ' ' + msg + '\n'
+    _diagChain = _diagChain.then(() => appendFile(path.join(dshHome(), 'dsh-auto-memory-diagnose.log'), line, 'utf8')).catch(() => {})
+    console.log('[dsh-auto-memory] ' + msg)
+  } catch (e) {}
+}
+
 /** 记忆引擎:路径解析、缓存、文件读写、检索、反思状态。 */
 class MemoryEngine {
   constructor() {
@@ -158,6 +172,9 @@ class MemoryEngine {
     this._lastAgent = undefined // 最近一次 agent 引用(subagent parent 需要完整 agent 对象)
     this._lastTurnByAgent = undefined // Map<agentId, turn>:自动沉淀去重(每轮只写一次)
     this._consolidating = undefined // 自动沉淀进行中标记(防重入)
+    this._autoCallDate = ''
+    this._autoCallCount = 0
+    this._lastConsolidateStartedAt = 0
     this._budgets = undefined // 每日写入预算:用户级4000/项目级3000字/天(所有会话共享,跨天重置)
     this.autoStats = { count: 0, lastAt: 0, lastText: '', lastDate: '' } // 自动沉淀统计(GUI 即时反馈)
     this.external = new ExternalMemory(this)
@@ -842,6 +859,8 @@ class MemoryEngine {
   async recall(query, limit = 8, agent) {
     const q = String(query || '').toLowerCase().trim()
     if (!q) return 'memory_recall: query 为空。'
+    // 多词查询:按空白/中文标点分词,任一词命中即算命中(OR),按命中词数排序取相关度最高的
+    const terms = q.split(/[\s,，、;；。:：]+/).filter((t) => t.length > 0)
     const p = await this.resolvePaths(agent)
     const out = []
     const hits = []
@@ -850,12 +869,17 @@ class MemoryEngine {
       if (!text) return
       const matched = []
       for (const line of text.split('\n')) {
-        if (line.toLowerCase().includes(q)) {
-          matched.push(line.trim().slice(0, 200))
-          if (matched.length >= maxMatches) break
+        const low = line.toLowerCase()
+        const score = terms.reduce((a, t) => a + (low.includes(t) ? 1 : 0), 0)
+        if (score > 0) {
+          matched.push({ line: line.trim().slice(0, 200), score })
+          if (matched.length >= maxMatches * 4) break
         }
       }
-      if (matched.length) target.push({ where: label, matches: matched })
+      if (matched.length) {
+        matched.sort((a, b) => b.score - a.score)
+        target.push({ where: label, matches: matched.slice(0, maxMatches).map((m) => m.line) })
+      }
     }
     // 读取顺序:progress(日志/反思)先行,再读 memory(用户级/项目笔记)
     const logs = await this.listDailyLogs(p.projectDir, 40)
@@ -1180,7 +1204,10 @@ class MemoryEngine {
       heartbeat,
       autoConsolidate: {
         enabled: this.config.autoConsolidate !== false,
-        minChars: Math.max(Number(this.config.autoConsolidateMinChars) || 60, 20),
+        minChars: Math.max(Number(this.config.autoConsolidateMinChars) || 240, 80),
+        cooldownMinutes: Math.max(Number(this.config.autoConsolidateCooldownMinutes) || 5, 1),
+        dailyMax: Math.max(Number(this.config.autoConsolidateDailyMax) || 8, 1),
+        callCountToday: this._autoCallCount || 0,
         consolidating: !!this._consolidating,
         pendingQueue: (this._pendingConsolidations || []).length,
         stats: this.autoStats,
@@ -1422,9 +1449,9 @@ class MemoryEngine {
     try {
       const sessionsSvc = this._sessionsSvc
       const agentSvc = this._agentSvc
-      if (!sessionsSvc || !agentSvc || typeof sessionsSvc.list !== 'function') return
+      if (!sessionsSvc || !agentSvc || typeof sessionsSvc.list !== 'function') { diag('restoreLastAgent: svc missing sessions=' + !!sessionsSvc + ' agent=' + !!agentSvc); return }
       const sessions = sessionsSvc.list()
-      if (!sessions || !sessions.length) return
+      if (!sessions || !sessions.length) { diag('restoreLastAgent: no sessions'); return }
       // 找最近活跃的顶层会话(log 最后事件时间最大)
       let best = null, bestTime = 0
       for (const s of sessions) {
@@ -1432,10 +1459,15 @@ class MemoryEngine {
         try { const last = s.log && s.log[s.log.length - 1]; if (last && last.time) t = last.time } catch (e) {}
         if (t >= bestTime) { bestTime = t; best = s }
       }
-      if (!best || typeof agentSvc.get !== 'function') return
+      if (!best || typeof agentSvc.get !== 'function') { diag('restoreLastAgent: no best session or no get'); return }
       const a = agentSvc.get(best.id)
-      if (a && a.session && a.session.header && a.session.header.parentSession === undefined) this._lastAgent = a
-    } catch (e) {}
+      if (a && a.session && a.session.header && a.session.header.parentSession === undefined) {
+        this._lastAgent = a
+        diag('restoreLastAgent: recovered agent id=' + a.id + ' session=' + a.session.id + ' logEvents=' + ((a.session.events && a.session.events.length) || 0))
+      } else {
+        diag('restoreLastAgent: candidate rejected (id=' + (a && a.id) + ' hasSession=' + !!(a && a.session) + ' parent=' + (a && a.session && a.session.header && a.session.header.parentSession) + ')')
+      }
+    } catch (e) { diag('restoreLastAgent error: ' + (e && e.message)) }
   }
 
   /** 自动总结:按时间点推断时段,生成总结并置 pendingSummary(供 client 弹窗)。 */
@@ -1496,6 +1528,10 @@ class MemoryEngine {
     if (!subagents) return ''
     // parent 必须是完整 agent 对象(captureDelegatedPolicyOverrides 读 parent.ctx/parent.session);路由调用用缓存的最近 agent
     const parent = agent || this._lastAgent
+    if (!parent || !parent.session || !parent.ctx || typeof parent.ctx.get !== 'function') {
+      diag('subagent ' + label + ' skipped: incomplete parent context')
+      return ''
+    }
     // 动态选择可用的 subagent provider(优先 spawn,否则取已注册的第一个)
     let providerName = 'spawn'
     let registered = []
@@ -1517,7 +1553,9 @@ class MemoryEngine {
       const blocks = result && result.output ? result.output : []
       return blocks.filter((b) => b && b.type === 'text').map((b) => b.text).join('').trim()
     } catch (e) {
-      console.error('[dsh-auto-memory] ' + label + ' failed', e && e.message ? e.message : e)
+      const em = e && e.message ? e.message : String(e)
+      console.error('[dsh-auto-memory] ' + label + ' failed', em)
+      diag('subagent ' + label + ' failed: ' + em)
       return ''
     } finally {
       clearTimeout(timer)
@@ -1538,31 +1576,41 @@ class MemoryEngine {
 
   /** 每轮对话结束自动沉淀:取本轮 user+assistant 消息 → subagent 判断/提炼 → 写今日日志+升格。 */
   async consolidateTurn(turn, agent) {
-    if (this._consolidating) return
+    const why = (reason) => diag('consolidate skip: ' + reason + ' (turn=' + JSON.stringify(turn) + ' agentId=' + ((agent && (agent.id || (agent.session && agent.session.id))) || '?') + ')')
+    if (this._consolidating) { why('_consolidating busy'); return }
     if (!this.configLoaded) { try { await this.loadConfig() } catch (e) {} }
-    if (this.config.autoConsolidate === false) return
-    if (!agent || !agent.session) return
+    if (this.config.autoConsolidate === false) { why('config.autoConsolidate=false'); return }
+    if (!agent || !agent.session) { why('no agent/session'); return }
     // 只处理顶层会话(子代理/接续会话的 header.parentSession 非空,避免子代理轮次误沉淀)
-    try { if (agent.session.header && agent.session.header.parentSession) return } catch (e) {}
-    const minChars = Math.max(Number(this.config.autoConsolidateMinChars) || 60, 20)
+    try { if (agent.session.header && agent.session.header.parentSession) { why('parentSession sub-agent'); return } } catch (e) {}
+    const minChars = Math.max(Number(this.config.autoConsolidateMinChars) || 240, 80)
+    const today = this.memToday()
+    if (this._autoCallDate !== today) { this._autoCallDate = today; this._autoCallCount = 0 }
+    const cooldownMs = Math.max(Number(this.config.autoConsolidateCooldownMinutes) || 5, 1) * 60000
+    const dailyMax = Math.max(Number(this.config.autoConsolidateDailyMax) || 8, 1)
+    if (this._autoCallCount >= dailyMax) { why('daily subagent cap=' + dailyMax); return }
+    if (this._lastConsolidateStartedAt && Date.now() - this._lastConsolidateStartedAt < cooldownMs) { why('cooldown'); return }
     // 按 turn 去重:同一 agent 的同一轮只处理一次
     const agentId = agent.id || (agent.session && agent.session.id) || '?'
     if (!this._lastTurnByAgent) this._lastTurnByAgent = new Map()
     const lastTurn = this._lastTurnByAgent.get(agentId)
-    if (lastTurn === turn) return
+    if (lastTurn === turn) { why('dup turn'); return }
     this._lastTurnByAgent.set(agentId, turn)
     // 取本轮最后一条 user + 最后一条 assistant(模型可见消息序列)
     const messages = extractSessionMessages(agent)
-    if (messages.length < 2) return
+    if (messages.length < 2) { why('messages<2 got=' + messages.length + ' seqs=' + ((agent.session.surface && agent.session.surface.nodes && (Array.isArray(agent.session.surface.nodes) ? agent.session.surface.nodes.length : 'set')) || 'none') + ' events=' + ((agent.session.events && agent.session.events.length) || 'none')); return }
     let userText = ''
     let assistantText = ''
     for (const m of messages) {
       if (m.role === 'user') userText = m.text
       else if (m.role === 'assistant' && m.text) assistantText = m.text
     }
-    if (!userText.trim() || !assistantText.trim()) return
+    if (!userText.trim() || !assistantText.trim()) { why('empty text user=' + userText.length + ' asst=' + assistantText.length); return }
     const combined = userText + '\n' + assistantText
-    if (combined.length < minChars) return
+    if (combined.length < minChars) { why('too short combined=' + combined.length + ' min=' + minChars); return }
+    this._lastConsolidateStartedAt = Date.now()
+    this._autoCallCount++
+    diag('consolidate subagent start count=' + this._autoCallCount + '/' + dailyMax + ' inputChars=' + Math.min(combined.length, 6000))
     this._consolidating = (async () => {
       try {
         await this.refresh(agent)
@@ -1599,6 +1647,7 @@ class MemoryEngine {
         ].join('\n')
         const text = await this.runSubagent(prompt, 'auto-memory-consolidate', agent)
         if (!text) {
+          diag('consolidate: subagent returned empty text (queued for retry)')
           // subagent 失败(返回空):入重试队列,由后台轮询兜底重试
           if (!this._pendingConsolidations) this._pendingConsolidations = []
           if (this._pendingConsolidations.length < 5) this._pendingConsolidations.push({ turn, agent })
@@ -2136,6 +2185,12 @@ class ExternalMemory {
   async search(query, limit = 6) {
     const q = String(query || '').toLowerCase().trim()
     if (!q) return []
+    // 多词查询:任一词命中即算命中(OR),按命中词数排序取相关度最高的
+    const terms = q.split(/[\s,，、;；。:：]+/).filter((t) => t.length > 0)
+    const scoreLine = (line) => {
+      const low = line.toLowerCase()
+      return terms.reduce((a, t) => a + (low.includes(t) ? 1 : 0), 0)
+    }
     const srcs = await this.discover(false)
     const out = []
     for (const s of srcs) {
@@ -2147,22 +2202,28 @@ class ExternalMemory {
           if (hits.length >= 3 || scanned >= 8 || out.length >= limit) break
           scanned++
           const text = await this.extractSessionText(f.path)
+          const matched = []
           for (const line of text.split('\n')) {
-            if (line.toLowerCase().includes(q)) {
-              hits.push('(' + path.basename(f.path).slice(0, 20) + ') ' + line.trim().slice(0, 200))
-              if (hits.length >= 3) break
+            const score = scoreLine(line)
+            if (score > 0) {
+              matched.push({ line: '(' + path.basename(f.path).slice(0, 20) + ') ' + line.trim().slice(0, 200), score })
+              if (matched.length >= 6) break
             }
           }
+          matched.sort((a, b) => b.score - a.score)
+          hits.push(...matched.slice(0, 3).map((m) => m.line))
         }
       } else {
         const matched = []
         for (const line of s.content.split('\n')) {
-          if (line.toLowerCase().includes(q)) {
-            matched.push(line.trim().slice(0, 200))
-            if (matched.length >= 3) break
+          const score = scoreLine(line)
+          if (score > 0) {
+            matched.push({ line: line.trim().slice(0, 200), score })
+            if (matched.length >= 9) break
           }
         }
-        hits.push(...matched)
+        matched.sort((a, b) => b.score - a.score)
+        hits.push(...matched.slice(0, 3).map((m) => m.line))
       }
       if (hits.length) out.push({ source: s.name, tool: s.tool, kind: s.kind, lines: hits })
     }
@@ -2201,28 +2262,46 @@ class ExternalMemory {
   }
 }
 
-/** 从 agent.session 提取模型可见消息序列 [{role,text,sourceKind}]。 */
+/** 从 session 提取消息。surface 不是完整可靠的 user 来源,因此失败时回退完整事件日志。 */
+function messageOfEvent(ev) {
+  if (!ev) return null
+  if (ev.type === 'user/message') return ev.data && ev.data.message ? ev.data.message : ev.data
+  if (ev.type === 'assistant/message' || ev.type === 'tool/result') return ev.data && ev.data.message
+  return null
+}
+function textOfContent(content) {
+  const out = []
+  const walk = (v, depth) => {
+    if (depth > 8 || v == null) return
+    if (typeof v === 'string') { out.push(v); return }
+    if (Array.isArray(v)) { for (const x of v) walk(x, depth + 1); return }
+    if (typeof v !== 'object') return
+    if (typeof v.text === 'string') out.push(v.text)
+    else if (typeof v.input_text === 'string') out.push(v.input_text)
+    if (v.content !== undefined) walk(v.content, depth + 1)
+  }
+  walk(content, 0)
+  return out.join('')
+}
 function extractSessionMessages(agent) {
   try {
     const session = agent && agent.session
     if (!session) return []
-    const nodes = session.surface && session.surface.nodes
-    if (!nodes) return []
-    const seqs = Array.isArray(nodes) ? nodes : (nodes instanceof Set ? Array.from(nodes) : [])
-    if (!seqs.length) return []
     const events = session.events || []
+    const seqs = []
+    try {
+      const nodes = session.surface && session.surface.nodes
+      if (Array.isArray(nodes)) seqs.push(...nodes)
+      else if (nodes instanceof Set) seqs.push(...Array.from(nodes))
+    } catch (e) {}
+    // surface 可能遗漏刚提交的 user/message;追加完整事件序列并去重。
+    for (let i = 0; i < events.length; i++) if (!seqs.includes(i)) seqs.push(i)
     const out = []
     for (const seq of seqs) {
       const ev = events[seq]
-      if (!ev) continue
-      let msg = null
-      if (ev.type === 'user/message') msg = ev.data
-      else if (ev.type === 'assistant/message' || ev.type === 'tool/result') msg = ev.data && ev.data.message
+      const msg = messageOfEvent(ev)
       if (!msg || !msg.role || !Array.isArray(msg.content)) continue
-      const text = msg.content
-        .filter((b) => b && typeof b === 'object' && typeof b.text === 'string')
-        .map((b) => b.text).join('')
-      out.push({ role: msg.role, text, sourceKind: msg.source && msg.source.kind })
+      out.push({ role: msg.role, text: textOfContent(msg.content), sourceKind: msg.source && msg.source.kind })
     }
     return out
   } catch (e) { return [] }
@@ -2302,11 +2381,12 @@ export function apply(ctx, config) {
     // 记录最后活动时间(判断暂离回来用)
     try { engine._lastActiveAt = Date.now() } catch (e) {}
     // 每轮自动沉淀:取本轮消息 → subagent 判断/提炼 → 写今日日志([自动沉淀])+升格长期记忆
-    // 注意:turn-stopping payload 只有 {turn, signal},没有 agent 字段,必须用 _lastAgent 兜底
     try {
       const agent = (payload && payload.agent) || engine._lastAgent
-      if (agent && agent.session) void engine.consolidateTurn(payload.turn, agent)
-    } catch (e) {}
+      const hasAgent = !!(agent && agent.session)
+      diag('turn-stopping fired: turn=' + JSON.stringify(payload && payload.turn) + ' hasAgent=' + hasAgent + ' payloadKeys=' + (payload ? Object.keys(payload).join(',') : 'null') + ' _lastAgent=' + !!(engine._lastAgent && engine._lastAgent.session))
+      if (hasAgent) void engine.consolidateTurn(payload.turn, agent)
+    } catch (e) { diag('turn-stopping handler error: ' + (e && e.message)) }
   })
   // 注入层保障:systemPrompt section.text 是同步函数不能 await,state 异步加载会导致首轮注入为空。
   // pre-step 是 waterfall(可 await),在放行每个 step 前条件性刷新:
@@ -2316,7 +2396,7 @@ export function apply(ctx, config) {
       const agent = (payload && payload.agent) || engine._lastAgent
       // 兜底恢复 _lastAgent(仅启动后首次为空时设置一次,不每步覆盖):重启后恢复的会话不触发 session-start,
       // 导致 turn-stopping 自动沉淀拿不到 agent 而永久失效;首次 pre-step 即恢复,之后由 session-start 正常维护
-      try { if (!engine._lastAgent && agent && agent.session && agent.session.header && agent.session.header.parentSession === undefined) engine._lastAgent = agent } catch (e) {}
+      try { if (!engine._lastAgent && agent && agent.session && agent.session.header && agent.session.header.parentSession === undefined) { engine._lastAgent = agent; diag('pre-step recovered _lastAgent id=' + agent.id) } } catch (e) {}
       // 只刷新顶层会话:子代理(自动沉淀/固化的 subagent)session 无 cwd,刷新会把 state 切到错误工作区
       let skip = false
       try { if (agent && agent.session && agent.session.header && agent.session.header.parentSession) skip = true } catch (e) {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@a9i5k4/dsh-auto-memory",
   "description": "DSH 自动记忆插件:三层记忆(用户级/项目笔记/每日日志)自动注入与检索、每轮对话自动沉淀、每日反思、可视化面板与设置页,支持继承其他 AI 工具的记忆。",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "module",
   "main": "lib/index.js",
   "exports": {