@a9i5k4/dsh-auto-memory 0.1.34 → 0.1.36

package/README.md

@@ -5,11 +5,11 @@
 </p>
 
 <p align="center">
-  <a href="docs/screenshots/promo/promo-1-hero.png"><img width="820" alt="dsh-auto-memory hero: she remembers, unbidden" src="docs/screenshots/promo/promo-1-hero.png"></a>
+  <a href="docs/screenshots/promo/promo-0-banner-v2.png"><img width="820" alt="dsh-auto-memory hero: she remembers, unbidden" src="docs/screenshots/promo/promo-0-banner-v2.png"></a>
 </p>
 
 <p align="center">
-  <a href="docs/screenshots/promo/promo-1-hero.png"><img width="130" alt="hero" src="docs/screenshots/promo/promo-1-hero.png"></a>
+  <a href="docs/screenshots/promo/promo-0-banner-v2.png"><img width="130" alt="hero" src="docs/screenshots/promo/promo-0-banner-v2.png"></a>
   <a href="docs/screenshots/promo/promo-2-tour.png"><img width="130" alt="welcome tour" src="docs/screenshots/promo/promo-2-tour.png"></a>
   <a href="docs/screenshots/promo/promo-3-recall.png"><img width="130" alt="recall & crystallization" src="docs/screenshots/promo/promo-3-recall.png"></a>
   <a href="docs/screenshots/promo/promo-4-unattended.png"><img width="130" alt="unattended mode" src="docs/screenshots/promo/promo-4-unattended.png"></a>

package/README.zh-CN.md

@@ -5,11 +5,11 @@
 </p>
 
 <p align="center">
-  <a href="docs/screenshots/promo/promo-1-hero.png"><img width="820" alt="dsh-auto-memory 主视觉：不用吩咐，她自己记得" src="docs/screenshots/promo/promo-1-hero.png"></a>
+  <a href="docs/screenshots/promo/promo-0-banner-v2.png"><img width="820" alt="dsh-auto-memory 主视觉：不用吩咐，她自己记得" src="docs/screenshots/promo/promo-0-banner-v2.png"></a>
 </p>
 
 <p align="center">
-  <a href="docs/screenshots/promo/promo-1-hero.png"><img width="130" alt="主视觉" src="docs/screenshots/promo/promo-1-hero.png"></a>
+  <a href="docs/screenshots/promo/promo-0-banner-v2.png"><img width="130" alt="主视觉" src="docs/screenshots/promo/promo-0-banner-v2.png"></a>
   <a href="docs/screenshots/promo/promo-2-tour.png"><img width="130" alt="欢迎向导" src="docs/screenshots/promo/promo-2-tour.png"></a>
   <a href="docs/screenshots/promo/promo-3-recall.png"><img width="130" alt="唤起与固化" src="docs/screenshots/promo/promo-3-recall.png"></a>
   <a href="docs/screenshots/promo/promo-4-unattended.png"><img width="130" alt="无人值守" src="docs/screenshots/promo/promo-4-unattended.png"></a>

package/lib/client.js

@@ -3539,6 +3539,15 @@ window.__ModuleLoader__.load({
           try {
             var seen = localStorage.getItem('dsh-auto-memory.seenVersion')
             var majorPending = !localStorage.getItem(MAJOR_TOUR_KEY)
+            // 老用户(有使用痕迹)seen < 0.1.30(大更新前版本)升级上来 → 强制触发一次欢迎向导(含引擎下载引导)。
+            // 不依赖一次性标记:0.1.29→0.1.34 升级即使曾看过旧版向导也要重放,确保模型下载引导不漏。
+            var isExisting = !!seen || !!localStorage.getItem('dsh-auto-memory.firstRunDone') || !!localStorage.getItem('dsh-auto-memory.semWizardDone')
+            var seenBeforeMajor = isExisting && (!seen || cmpVersion(seen, '0.1.30') < 0)
+            if (seenBeforeMajor && !localStorage.getItem('dsh-auto-memory.semWizardDone')) {
+              openDialog({ kind: 'welcomeTour' })
+              try { localStorage.setItem(MAJOR_TOUR_KEY, '1') } catch (eM) {}
+              return
+            }
             if (majorPending && (d.current === '0.1.30' || seen)) {
               // 大更新触达(老用户:seen<current 或已有使用痕迹;新装用户走 first 流程不重复打扰)
               openDialog({ kind: 'welcomeTour' })

package/lib/index.js

@@ -668,6 +668,10 @@ class MemoryEngine {
     this._autoCallDate = ''
     this._autoCallCount = 0
     this._lastConsolidateStartedAt = 0
+    this._globalLastActiveAt = 0 // 全局活动时间戳:任意会话/工作区任一活动即更新(暂离检测统揽全局,不按工作区)
+    this._ownSubagents = new WeakSet() // 本插件 spawn 的子代理(防套娃:其生命周期事件零处理;WeakSet 不阻止 GC)
+    this._subagentInflight = 0 // 子代理并发闸门(启动瞬间多路 spawn 叠加是卡顿根因之一)
+    this._subagentCircuit = null // 配置性错误熔断 { until, reason }(UNKNOWN_MODEL 等,重试无意义)
     this._smartRecallFlight = undefined
     this._budgets = undefined // 每日写入预算:用户级4000/项目级3000字/天(所有会话共享,跨天重置)
     // M2: 进程级观察统计(无 owner 而无法归属 runtime 的事件只在这里留痕,绝不落入 default runtime)
@@ -1375,6 +1379,42 @@ class MemoryEngine {
     }
   }
 
+  /** 全局层路径:每日总结/时段问候跨工作区统揽(不落在任何单一工作区)。 */
+  globalPaths() {
+    const userDir = this.userDirOf()
+    return {
+      userDir,
+      summariesDir: path.join(userDir, 'summaries'),
+      greetDir: path.join(userDir, 'greetings'),
+      greetPath: path.join(userDir, 'greetings', `${this.memToday()}.json`),
+    }
+  }
+
+  /**
+   * 全局日志扫描:聚合所有工作区指定日期的日志条目(统揽全局,而非单工作区)。
+   * 返回 [{ ws, date, text, lines:[...] }],按工作区名排序,读文件失败的工作区跳过。
+   */
+  async listAllWorkspaceLogs(date) {
+    const out = []
+    try {
+      if (!this.configLoaded) { try { await this.loadConfig() } catch (e) {} }
+      const root = this.expandUserPath(this.config.memoryRoot) || path.join(dshHome(), 'memory', 'workspaces')
+      let entries = []
+      try { entries = await readdir(root, { withFileTypes: true }) } catch (e) { return out }
+      for (const ent of entries) {
+        if (!ent.isDirectory()) continue
+        const ws = ent.name
+        const logFile = path.join(root, ws, `${date}.md`)
+        let text = ''
+        try { text = await this.readTextSafe(logFile) } catch (e) { continue }
+        if (!text) continue
+        out.push({ ws, date, text, lines: text.split('\n').map((l) => l.trim()).filter((l) => l.startsWith('- ')).map((l) => l.replace(/^- /, '')) })
+      }
+    } catch (e) {}
+    out.sort((a, b) => String(a.ws).localeCompare(String(b.ws)))
+    return out
+  }
+
   // ---------- 更新检查(registry 自动检查 + profile 探测) ----------
   /** 找 dsh web profile 目录(含 dsh-auto-memory 依赖/bundle 的那个)。 */
   async findProfileDir() {
@@ -1655,6 +1695,15 @@ class MemoryEngine {
     return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
   }
 
+  /** 记忆日偏移:memToday() 基础上加减 N 天(供"昨天"日志回看)。 */
+  memTodayOfOffset(days) {
+    const s = this.memToday()
+    const [y, m, dd] = s.split('-').map(Number)
+    const d = new Date(y, m - 1, dd)
+    d.setDate(d.getDate() + Number(days || 0))
+    return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
+  }
+
   /**
    * 是否应处于无人值守模式(2026-08-26,roadmap「自动检测」)。
    * 优先级:手动 unattendedMode=true → 恒 true;否则 unattendedAuto=true 且(命中非工作时间窗
@@ -1949,7 +1998,9 @@ class MemoryEngine {
     }
     // 暂离回来提示:距上次活动>1小时,要求 agent 在回复开头写欢迎语并提示打开记忆窗口
     // ——无人值守模式下剥离(不注入社交性/行为性指令,避免无人值守任务浪费 token 在寒暄上)
-    if (!this.isUnattendedNow() && this._lastActiveAt && Date.now() - this._lastActiveAt > 3600000) {
+    let lastActiveGlobal = this._globalLastActiveAt || 0
+    try { for (const rt of this.runtimes.values()) { const t = Number(rt.lastActiveAt) || 0; if (t > lastActiveGlobal) lastActiveGlobal = t } } catch (e) {}
+    if (!this.isUnattendedNow() && lastActiveGlobal && Date.now() - lastActiveGlobal > 3600000) {
       lines.push('\n' + L('snapshotWelcomeTitle'))
       lines.push(L('snapshotWelcomeBody'))
     }
@@ -2679,16 +2730,11 @@ class MemoryEngine {
 
   /** 生活化总结:调用 DSH 的 AI(subagent)发散地总结某时段的工作(完成/收尾/烦恼/暂停的事)。 */
   async summarizePeriod(period, agent, force) {
-    const ps = this.periodSummary()
-    const groups = ps.groups || {}
-    const items = (period === '昨天') ? (this.state.recentLogs[0] ? this.state.recentLogs[0].text.split('\n').map((l) => l.trim()).filter((l) => l.startsWith('- ')).map((l) => l.replace(/^- /, '')) : []) : (groups[period] || [])
-    if (!items.length) return { summary: '', works: [], cached: true, generatedAt: Date.now() }
-    // 缓存文件(.dsh-memory/summaries/),force=false 且缓存存在时直接返回,不重复生成
-    let cacheFile = ''
-    try {
-      const p = await this.resolvePaths(agent)
-      cacheFile = path.join(p.projectDir, 'summaries', this.memToday() + '-' + period + '.json')
-    } catch (e) {}
+    // 全局统揽(2026-09-01):时段总结不再绑定单一工作区——聚合所有工作区的日志,
+    // 源文件列表与缓存都走用户级目录(~/.dsh/memory/summaries/),换工作区总结内容与缓存不变。
+    const today = this.memToday()
+    const gp = this.globalPaths()
+    const cacheFile = path.join(gp.summariesDir, today + '-' + period + '.json')
     if (!force && cacheFile) {
       try {
         const raw = await this.readTextSafe(cacheFile)
@@ -2698,14 +2744,27 @@ class MemoryEngine {
         }
       } catch (e) {}
     }
-    const paths = await this.resolvePaths(agent)
-    const sourceFile = period === '昨天'
-      ? (this.state.recentLogs[0] ? path.join(paths.projectDir, this.state.recentLogs[0].date + '.md') : '')
-      : paths.logPath
+    // 候选条目:全局扫描所有工作区(当前时段用今天的日志,昨天用昨天的)
+    const scanDate = (period === '昨天') ? (this.state.recentLogs[0] ? this.state.recentLogs[0].date : this.memTodayOfOffset(-1)) : today
+    const wsLogs = await this.listAllWorkspaceLogs(scanDate)
+    // 兼容:若全局扫描为空(如记忆根迁移中),降级到当前工作区旧路径
+    let items = wsLogs.flatMap((w) => w.lines)
+    let sourceFiles = wsLogs.map((w) => path.join(this.expandUserPath(this.config.memoryRoot) || path.join(dshHome(), 'memory', 'workspaces'), w.ws, `${w.date}.md`))
+    if (!wsLogs.length) {
+      try {
+        const paths = await this.resolvePaths(agent)
+        const legacy = (period === '昨天')
+          ? (this.state.recentLogs[0] ? [{ file: path.join(paths.projectDir, this.state.recentLogs[0].date + '.md'), text: this.state.recentLogs[0].text }] : [])
+          : [{ file: paths.logPath, text: '' }]
+        items = (period === '昨天') ? legacy.flatMap((x) => x.text.split('\n').map((l) => l.trim()).filter((l) => l.startsWith('- ')).map((l) => l.replace(/^- /, ''))) : (this.periodSummary().groups || {})[period] || []
+        sourceFiles = legacy.map((x) => x.file)
+      } catch (e) {}
+    }
+    if (!items.length) return { summary: '', works: [], cached: true, generatedAt: Date.now() }
     const prompt = [
-      '你是一个温暖、细腻的生活助理。请使用文件读取工具读取下面的绝对路径，不要要求用户粘贴内容：',
-      sourceFile || '(文件不可用)',
-      '从文件中只筛选“' + period + '”时段的工作条目（昨天则读取整份昨天日志），共有约 ' + items.length + ' 条候选记录。',
+      '你是一个温暖、细腻的生活助理。请使用文件读取工具依次读取下面的绝对路径（跨多个工作区的记忆日志，请统揽全局），不要要求用户粘贴内容：',
+      ...sourceFiles.map((f, i) => (i + 1) + '. ' + f),
+      '从这些文件中只筛选“' + period + '”时段的工作条目（昨天则读取整份昨天日志），共有约 ' + items.length + ' 条候选记录。',
       '1. 写一段生活化总结(80-160字),像朋友聊天:概括完成的事、是否收尾、可能的烦恼(温和带过,看不出就跳过);不要列表、不要小标题、不要"总结:"前缀。',
       '2. 把原始记录归纳成若干项“工作”(3-6项),每项给简短标题(8-16字),并列出细点(每项2-4条)。',
       '输出格式(严格遵守,不要多余文字):',
@@ -2740,9 +2799,15 @@ class MemoryEngine {
   // ---------- 时间检测(每 15s 心跳 tick):暂离状态 / _lastAgent 定时兜底 / 自动总结时间点 ----------
   tickTime() {
     try {
-      // 1) 暂离检测:距上次活动(lastActive)超过 awayMinutes 视为暂离
+      // 1) 暂离检测(全局统揽):取所有 runtime 里最近一次活动时间(跨工作区),而非当前 runtime 的孤立时间戳。
+      let lastActive = this._globalLastActiveAt || 0
+      try { for (const rt of this.runtimes.values()) { const t = Number(rt.lastActiveAt) || 0; if (t > lastActive) lastActive = t } } catch (e) {}
+      this._globalLastActiveAt = lastActive
       const awayMs = Math.max(Number(this.config.awayMinutes) || 60, 1) * 60000
-      this.state.away = !!(this._lastActiveAt && Date.now() - this._lastActiveAt > awayMs)
+      const away = !!(lastActive && Date.now() - lastActive > awayMs)
+      // 广播到所有 runtime(面板/注入读各自 runtime 的 state.away,值一致=全局语义)
+      try { for (const rt of this.runtimes.values()) rt.state.away = away } catch (e) {}
+      this.state.away = away
       // 2) _lastAgent 定时兜底(重启恢复会话不触发 session-start;pre-step 兜底之外的第二保险)
       if (!this._lastAgent) this.restoreLastAgent()
       // 3) 自动总结时间点:命中配置的 HH:MM 且当天未生成过 → 生成时段总结并标记展示
@@ -2811,8 +2876,9 @@ class MemoryEngine {
     const hour = new Date().getHours()
     const seg = hour < 6 ? 'morning' : hour < 9 ? 'morning' : hour < 12 ? 'forenoon' : hour < 14 ? 'noon' : hour < 18 ? 'afternoon' : 'evening'
     const segLabel = { morning: '早上', forenoon: '上午', noon: '中午', afternoon: '下午', evening: '晚上' }[seg]
-    const p = await this.resolvePaths(agent)
-    const greetFile = path.join(p.greetDir, this.memToday() + '.json')
+    // 全局统揽(2026-09-01):问候缓存迁用户级目录(跨工作区共享同一份),引用条目聚合全部工作区今日日志
+    const gp = this.globalPaths()
+    const greetFile = path.join(gp.greetDir, this.memToday() + '.json')
     // 已有该时段缓存 → 直接返回
     try {
       const raw = await this.readTextSafe(greetFile)
@@ -2821,8 +2887,13 @@ class MemoryEngine {
         if (j && j[seg]) return { greeting: j[seg], cached: true }
       }
     } catch (e) {}
-    // 今日记录(供问候引用最近几条)
-    const items = (this.state.logText || '').split('\n').map((l) => l.trim()).filter((l) => l.startsWith('- ')).map((l) => l.replace(/^- \d{2}:\d{2} /, '').replace(/^- /, '')).slice(-6)
+    // 今日记录(供问候引用最近几条;聚合所有工作区,统揽全局)
+    const wsLogs = await this.listAllWorkspaceLogs(this.memToday())
+    let items = wsLogs.flatMap((w) => w.lines.map((l) => l.replace(/^- \d{2}:\d{2} /, '').replace(/^- /, ''))).slice(-6)
+    if (!items.length) {
+      // 兼容降级:全局扫描为空时回落当前工作区
+      items = (this.state.logText || '').split('\n').map((l) => l.trim()).filter((l) => l.startsWith('- ')).map((l) => l.replace(/^- \d{2}:\d{2} /, '').replace(/^- /, '')).slice(-6)
+    }
     const prompt = [
       '你是一个温暖的生活助理。现在是' + segLabel + ',请给用户写一句简短的拟人化问候(30-60字),像朋友一样:',
       '- 按时间段自然问候(' + segLabel + '好/辛苦了之类),自然提起今天完成的主要工作(挑1-2件最重要的),可以带一句贴心提醒(如早点休息)',
@@ -2838,7 +2909,7 @@ class MemoryEngine {
     let all = {}
     try { const raw = await this.readTextSafe(greetFile); if (raw) { const j = JSON.parse(raw); if (j) all = j } } catch (e) {}
     all[seg] = text
-    try { await mkdir(p.greetDir, { recursive: true }); await writeFile(greetFile, JSON.stringify(all, null, 2), 'utf8') } catch (e) {}
+    try { await mkdir(gp.greetDir, { recursive: true }); await writeFile(greetFile, JSON.stringify(all, null, 2), 'utf8') } catch (e) {}
     return { greeting: text, cached: false }
   }
 
@@ -2846,6 +2917,18 @@ class MemoryEngine {
   async runSubagent(text, label, agent, timeoutMs) {
     const subagents = this._subagents
     if (!subagents) return ''
+    // 配置性错误熔断(问题③):UNKNOWN_MODEL 等错误不会自愈,熔断期内直接返回空,不再反复 spawn(卡顿根因)
+    try {
+      if (this._subagentCircuit && Date.now() < this._subagentCircuit.until) {
+        diag('subagent ' + label + ' circuit-open: ' + this._subagentCircuit.reason)
+        return ''
+      }
+    } catch (e) {}
+    // 并发闸门(问题②):同时在飞的子代理 ≥3 时拒绝新 spawn(启动瞬间多路叠加导致卡顿)
+    if (this._subagentInflight >= 3) {
+      diag('subagent ' + label + ' skipped: inflight=' + this._subagentInflight)
+      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') {
@@ -2865,6 +2948,7 @@ class MemoryEngine {
     try {
       // prompt 必须是 block 数组(createUserMessage 校验 content.some)
       const subModel = String(this.config.subagentModel || '').trim()
+      this._subagentInflight = (this._subagentInflight || 0) + 1
       run = await subagents.start(providerName, {
         label,
         prompt: [{ type: 'text', text }],
@@ -2873,6 +2957,8 @@ class MemoryEngine {
         // 设置页「总结/问候默认模型」:非空时覆盖子代理的模型选择(空=跟随路由默认)
         ...(subModel ? { agentOptions: { model: subModel } } : {}),
       })
+      // 套娃防护(问题②):登记本插件 spawn 的子代理,其生命周期事件在 pre-step/turn-stopping 零处理
+      try { if (run && run.agent) this._ownSubagents.add(run.agent) } catch (eReg) {}
       // UNKNOWN_MODEL 自保:子代理路由为两源拼接(provider 继承父会话 + 模型落宿主全局默认),
       // 父 provider 目录可能不含该模型(如 opencode-go-free × deepseek-v4-flash);
       // 此时回退用父会话抽屉当前模型(settings.yaml agent-default-model)重试一次。
@@ -2910,8 +2996,15 @@ class MemoryEngine {
       const em = e && e.message ? e.message : String(e)
       console.error('[dsh-auto-memory] ' + label + ' failed', em)
       diag('subagent ' + label + ' failed: ' + em)
+      // 配置性错误熔断(问题③):UNKNOWN_MODEL / 无配置模型 / 供应商不含该模型——重试无意义,30 分钟内不再 spawn
+      // (匹配收紧:避免普通网络错误的 message 恰含 "provider" 字样被误熔断)
+      if (/UNKNOWN_MODEL|has no configured model|no configured provider|provider.*(not|no).*(config|model)|cannot find package/i.test(em)) {
+        this._subagentCircuit = { until: Date.now() + 30 * 60000, reason: em.slice(0, 120) }
+        diag('subagent circuit OPEN for 30min: ' + em.slice(0, 120))
+      }
       return ''
     } finally {
+      this._subagentInflight = Math.max(0, (this._subagentInflight || 1) - 1)
       clearTimeout(timer)
       if (controller.signal.aborted && run && typeof run.dispose === 'function') {
         try { await run.dispose() } catch (e2) {}
@@ -3077,11 +3170,21 @@ class MemoryEngine {
         // 超时兜底:subagent 挂起(如会话收尾期)时 40s 后放弃并走重试队列,避免 _consolidating 永久占用导致后续轮次全部 skip busy
         const text = await this.withTimeout(this.runSubagent(prompt, 'auto-memory-consolidate', agent), 40000, '')
         if (!text) {
+          // 配置性错误熔断中(问题③):UNKNOWN_MODEL 等不会自愈,不入队重试(重试=反复 spawn 卡顿)
+          if (this._subagentCircuit && Date.now() < this._subagentCircuit.until) {
+            diag('consolidate: circuit open (' + this._subagentCircuit.reason + ') — not queued')
+            return
+          }
           diag('consolidate: subagent returned empty text (queued for retry)')
-          // subagent 失败(返回空):入重试队列,由后台轮询兜底重试
-          if (runtime.pendingConsolidations.length < 5) runtime.pendingConsolidations.push({ turn, agent })
+          // subagent 失败(返回空):入重试队列,由后台轮询兜底重试;每条最多 3 次、存活 30 分钟(过期丢弃)
+          const item = { turn, agent, tries: ((runtime._cqTries && runtime._cqTries.get(turn)) || 0) + 1, enqueuedAt: Date.now() }
+          runtime._cqTries = runtime._cqTries || new Map()
+          runtime._cqTries.set(turn, item.tries)
+          if (item.tries <= 3 && runtime.pendingConsolidations.length < 5) runtime.pendingConsolidations.push(item)
+          else { try { runtime._cqTries.delete(turn) } catch (e) {} }
           return
         }
+        try { if (runtime._cqTries) runtime._cqTries.delete(turn) } catch (e) {}
         if (text.includes('(无)')) return
         const logPts = []
         const notePts = []
@@ -3373,6 +3476,10 @@ class MemoryEngine {
       // 时间检测:暂离状态 / 待展示的自动总结 / 相关配置
       away: !!this.state.away,
       awayMinutes: Math.max(Number(this.config.awayMinutes) || 60, 1),
+      // 子代理熔断状态(问题③):配置性错误(如所选模型不在供应商目录)时置位,30 分钟后自动恢复
+      subagentCircuit: (this._subagentCircuit && Date.now() < this._subagentCircuit.until)
+        ? { until: this._subagentCircuit.until, reason: this._subagentCircuit.reason }
+        : null,
       autoPopupEnabled: this.config.autoPopupEnabled !== false,
       autoSummaryTimes: Array.isArray(this.config.autoSummaryTimes) ? this.config.autoSummaryTimes : [],
       pendingSummary: this.state.pendingSummary || null,
@@ -4447,6 +4554,10 @@ export function apply(ctx, config) {
       if (hasAgent) {
         // 最后活动时间写入该 agent 自己的 runtime(不再落到 currentRuntime()/default)
         try { engine.runtimeFor(agent).lastActiveAt = Date.now() } catch (e) {}
+        // 全局活动戳同步更新(暂离检测统揽全局,见 tickTime)
+        engine._globalLastActiveAt = Date.now()
+        // 套娃防护(问题②):本插件 spawn 的子代理事件零处理——其 turn 结束不得再触发沉淀/路由
+        try { if (engine._ownSubagents && engine._ownSubagents.has(agent)) return } catch (e) {}
         try { engine.ingestAgentLifecycle(agent, 'agent/turn-stopping', { turn: payload && payload.turn, payload: { turn: payload && payload.turn } }) } catch (e) {}
       }
       diag('turn-stopping fired: turn=' + JSON.stringify(payload && payload.turn) + ' hasAgent=' + hasAgent + ' payloadKeys=' + (payload ? Object.keys(payload).join(',') : 'null'))
@@ -4464,8 +4575,12 @@ export function apply(ctx, config) {
   ctx.on('agent/pre-step', async (payload, next) => {
     try {
       const agent = payload && payload.agent   // M1: 精确取当前 agent 的 runtime,不猜
+      // 套娃防护(问题②):本插件 spawn 的子代理 pre-step 零处理(不登记 runtime/不刷状态/不再触发任何派生)
+      try { if (engine._ownSubagents && engine._ownSubagents.has(agent)) return next() } catch (e) {}
       // 审查修复轮2:无 session 身份的 agent 不登记 runtime、不进 stateFor/refresh,直接放行
       if (agent && engine.hasReliableSessionIdentity(agent)) {
+        // 全局活动戳(pre-step 也是用户活动信号;暂离检测统揽全局)
+        engine._globalLastActiveAt = Date.now()
         // 首步即登记 runtime(重启恢复的会话也可能不触发 session-start,这里补登记)
         const rt = engine.runtimeFor(agent)
         // M7.5:pre-step 边界先冲刷 CoT 缓冲——保证本轮 context_push 的 window 携带最新思维链
@@ -5581,6 +5696,12 @@ export function apply(ctx, config) {
     void (async () => {
       try {
         for (const rt of engine.runtimes.values()) {
+          // 过期丢弃(问题③):队列条目存活 30 分钟,过期不再重试(防配置性错误无限循环 spawn)
+          while (rt.pendingConsolidations.length) {
+            const it = rt.pendingConsolidations[0]
+            if (it && it.enqueuedAt && Date.now() - it.enqueuedAt > 30 * 60000) { rt.pendingConsolidations.shift(); try { if (rt._cqTries) rt._cqTries.delete(it.turn) } catch (e) {} continue }
+            break
+          }
           if (rt.pendingConsolidations.length && !rt.consolidating) {
             const item = rt.pendingConsolidations.shift()
             if (item && item.agent) void engine.withAgent(item.agent, () => engine.consolidateTurn(item.turn, item.agent))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@a9i5k4/dsh-auto-memory",
   "description": "主动联想记忆插件:记忆不靠模型调用,自己被唤回——Host 观察情境,NLP+向量化双轨检索,固定边界注入不破坏前缀缓存。三层记忆自动沉淀、欢迎向导、唤起回顾、无人值守、AI 问候与反思、日历、跨工具记忆继承。Proactive associative memory for DSH: zero-call recall, three-layer auto-consolidation, welcome tour, unattended mode.",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "type": "module",
   "main": "lib/index.js",
   "exports": {