@a9i5k4/dsh-auto-memory 2.2.7 → 2.3.0

package/lib/index.js

@@ -4336,6 +4336,8 @@ class MemoryEngine {
 
   /** 调用 DSH subagent 发散/提炼一段文本(90s 超时,结果取 text 块;parent 用最近 agent)。 */
   async runSubagent(text, label, agent, timeoutMs) {
+    // 2.2.7:插件 context 已卸载(重启/禁用中)→ 不再 spawn,避免向失效 context 注册 effect
+    if (this._disposed) return ''
     const subagents = this._subagents
     if (!subagents) return ''
     // 配置性错误熔断(问题③):UNKNOWN_MODEL 等错误不会自愈,熔断期内直接返回空,不再反复 spawn(卡顿根因)
@@ -4422,6 +4424,11 @@ class MemoryEngine {
       return blocks.filter((b) => b && b.type === 'text').map((b) => b.text).join('').trim()
     } catch (e) {
       const em = e && e.message ? e.message : String(e)
+      // 2.2.7:context 已卸载导致的 effect 创建失败是重启/卸载竞态,不是功能缺陷 —— 只记一次 diag,不刷屏
+      if (/inactive context/i.test(em)) {
+        if (!this._inactiveWarned) { this._inactiveWarned = true; diag('subagent ' + label + ' skipped: plugin context inactive (宿主已卸载,重启后自动恢复)') }
+        return ''
+      }
       console.error('[dsh-auto-memory] ' + label + ' failed', em)
       diag('subagent ' + label + ' failed: ' + em)
       // 配置性错误熔断(问题③):UNKNOWN_MODEL / 无配置模型 / 供应商不含该模型——重试无意义,30 分钟内不再 spawn
@@ -4455,13 +4462,30 @@ class MemoryEngine {
       const sid = session && (session.id || (header && header.id)) ? String(session.id || header.id) : ''
       if (!sid) return { ok: false, reason: 'no-id' }
       if (!header || header.origin !== 'subagent') return { ok: false, reason: 'not-subagent' }
+      // 2.3.0:Windows 下 DSH 常持有会话文件句柄(子代理刚结束时仍在写)→ rename 抛 EPERM。
+      // 同一 sid 失败后冷却 30 分钟不再尝试(避免刷屏),占用释放后由每日 sweep 兜底回收。
+      const cool = this._gcCooldown || (this._gcCooldown = new Map())
+      const coolUntil = cool.get(sid) || 0
+      if (Date.now() < coolUntil) return { ok: false, reason: 'cooldown' }
       const dir = await this.locateSessionDir(sid, header)
       if (!dir) return { ok: false, reason: 'not-located' }
       const wsDir = path.basename(path.dirname(dir))
       const backupRoot = path.join(dshHome(), 'subagent-gc-backup')
       const dest = path.join(backupRoot, wsDir, sid)
       await mkdir(path.dirname(dest), { recursive: true })
-      await rename(dir, dest)
+      let renamed = false
+      let lastErr = null
+      for (const delay of [0, 300, 1000]) {
+        if (delay) await new Promise((r) => setTimeout(r, delay))
+        try { await rename(dir, dest); renamed = true; break } catch (e) { lastErr = e }
+      }
+      if (!renamed) {
+        cool.set(sid, Date.now() + 30 * 60 * 1000)
+        // 首次失败记 diag,后续静默(同一 sid 冷却期内不再刷屏)
+        const warned = this._gcWarned || (this._gcWarned = new Set())
+        if (!warned.has(sid)) { warned.add(sid); diag('subagent gc deferred (file locked by host): ' + sid) }
+        return { ok: false, reason: 'locked', sid }
+      }
       // 投影缓存同步移走,避免孤儿条目长期占用索引
       try {
         const cacheFile = path.join(dshHome(), 'storages', 'session_projcache', 'sessions', sid)
@@ -4511,9 +4535,11 @@ class MemoryEngine {
       const keepDays = Math.max(0, Number(this.config.subagentGcKeepDays) || 0)
       const scan = await scanPluginSubagentSessions({ sessionsRoot, labelPrefix: PLUGIN_LABEL_PREFIX, keepMs: 0 })
       const now = Date.now()
-      // 无论保留期多长,最近 10 分钟的一律不动(可能与正在运行的子代理竞争)
-      const floorMs = Math.max(keepDays * 24 * 3600 * 1000, 10 * 60 * 1000)
-      const eligible = scan.candidates.filter((c) => now - c.mtimeMs >= floorMs)
+      // 无论保留期多长,最近 60 分钟的一律不动(2.3.0:Windows 下宿主可能长期持有会话文件句柄,
+      // 10 分钟窗口不足以判断"已不再写入";占用中的目录 rename 必失败)
+      const floorMs = Math.max(keepDays * 24 * 3600 * 1000, 60 * 60 * 1000)
+      const cool = this._gcCooldown || (this._gcCooldown = new Map())
+      const eligible = scan.candidates.filter((c) => now - c.mtimeMs >= floorMs && now >= (cool.get(c.sid) || 0))
       if (!eligible.length) return { ok: true, scanned: scan.scanned, recycled: 0 }
       const res = await recycleSessions({
         candidates: eligible,
@@ -4522,6 +4548,8 @@ class MemoryEngine {
         apply: true,
       })
       diag('subagent gc sweep: recycled=' + res.moved.length + ' failed=' + res.failed.length + ' bytes=' + res.bytes)
+      // 2.3.0:被占用的目录进入 30 分钟冷却,避免每日巡检重复无效重试
+      for (const f of res.failed || []) { if (f && f.sid) cool.set(String(f.sid), Date.now() + 30 * 60 * 1000) }
       return { ok: true, scanned: scan.scanned, recycled: res.moved.length, failed: res.failed.length, bytes: res.bytes }
     } catch (e) {
       diag('subagent gc sweep failed: ' + (e && e.message ? e.message : String(e)))
@@ -6281,6 +6309,11 @@ export function apply(ctx, config) {
   const sessionQuery = ctx.get('sessionQuery')
   engine._sessionQuery = sessionQuery
   engine._subagents = ctx.get('subagents') || undefined
+  // 2.2.7 修复:宿主 context 卸载后,残留的定时器/面板请求仍会调 runSubagent,
+  // DSH 0.1.2 的 in-process 子代理会向已失效 context 注册 effect → "cannot create effect on inactive context" 刷屏。
+  // 记 dispose 标记,runSubagent 入口直接短路。
+  engine._disposed = false
+  try { ctx.on('dispose', () => { engine._disposed = true }) } catch (eDispose) {}
   // 时间检测用的服务(软获取,缺失时定时兜底自动降级)
   engine._sessionsSvc = ctx.get('sessions') || undefined
   engine._agentSvc = ctx.get('agent') || undefined

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@a9i5k4/dsh-auto-memory",
   "description": "Proactive associative memory for DSH: zero-prompt recall injected before the model speaks, three-layer auto-consolidation, skill crystallization, and Astra-style context management - handoff ledgers, PLAN whiteboard, water-level sensing. Local-first, model-agnostic, zero deps. 主动联想记忆+Astra 式上下文管理:自动唤回/自动沉淀/技能固化/交接账本与白板跨窗口续命/水位感知。",
-  "version": "2.2.7",
+  "version": "2.3.0",
   "type": "module",
   "main": "lib/index.js",
   "exports": {