@a9i5k4/dsh-auto-memory 2.5.1 → 2.5.2

package/lib/index.js

@@ -1550,19 +1550,40 @@ class MemoryEngine {
     // 审查修复轮2:路径解析前必须保证配置已加载 —— 否则首个工具调用会按默认 '~'(真实 homedir)
     // 解析集中记忆根,造成测试/早期调用写穿真实用户记忆(本次 smoke 污染的根因)。
     if (!this.configLoaded) { try { await this.loadConfig() } catch (e) {} }
-    let ws
+    let ws, wsBound = false
     try { ws = agent && agent.session && agent.session.header && agent.session.header.cwd } catch (e) {}
+    if (ws) wsBound = true
+    const sid = agent && agent.session && agent.session.id ? String(agent.session.id) : ''
+    // C 类回退(2026-09-13,工作区切换 bug·终端用户实证):header.cwd 缺失(如经 workspaceId 创建的
+    // 会话)时按会话身份解析,而不是掉到全局 state.ws / process.cwd()。workspaceRegistry 的 sessionIds
+    // 反查正是 workspaceId 绑定的权威解;持久化会话头为最后手段(带 per-sid 缓存,热路径零重复 IO)。
+    if (!ws && sid) {
+      const fb = await this.sessionWorkspaceFallback(sid)
+      if (fb) { ws = fb; wsBound = true }
+    }
     if (!ws) ws = this.state.ws || process.cwd()
-    // 无人值守模式(2026-08-26,issue 修复):锁定工作区——一旦本次会话已确定工作区,后续 refresh
-    // 若发现 agent cwd 漂移(如 subagent/工具改了 cwd),忽略新 cwd 沿用已锁定工作区,保持上下文路径稳定。
-    // 无人值守批量任务中,路径漂移会导致工具调用失败/重读文件,必须杜绝。手动或自动(夜间/托管)均生效。
-    if (this.isUnattendedNow() && this.state.ws && String(ws) !== String(this.state.ws)) {
-      ws = this.state.ws
+    // 无人值守模式(2026-08-26,issue 修复):锁定工作区防 cwd 漂移(如 subagent/工具改了 cwd),
+    // 保持上下文路径稳定;路径漂移会导致工具调用失败/重读文件,必须杜绝。手动或自动(夜间/托管)均生效。
+    // 2026-09-13 修正锁粒度:旧实现**全局**钉死 state.ws,一次定终身——多工作区人工切换场景下
+    // 整个解析被冻结(终端用户实证:面板恒主目录、切换无效)。新语义=**按会话锁定**:每个会话
+    // 首次解析出有会话身份依据(wsBound)的工作区时记入 rt.wsLocked,其后仅防**本会话内**漂移;
+    // 未绑定(全局回退值)不锁,等本会话身份明朗;无会话身份的解析(全局刷新)沿用旧全局锁。
+    if (this.isUnattendedNow()) {
+      if (sid) {
+        const rt = this.runtimeFor(agent)
+        if (rt) {
+          if (rt.wsLocked) { if (String(ws) !== String(rt.wsLocked)) ws = rt.wsLocked }
+          else if (wsBound) rt.wsLocked = ws
+        }
+      } else if (this.state.ws && String(ws) !== String(this.state.ws)) {
+        ws = this.state.ws
+      }
     }
     const userDir = this.userDirOf()
     const projectDir = this.projectDirOf(ws)
     return {
       ws,
+      wsBound,
       userDir,
       userFile: path.join(userDir, 'MEMORY.md'),
       calendarPath: path.join(userDir, 'CALENDAR.md'),
@@ -1578,6 +1599,67 @@ class MemoryEngine {
     }
   }
 
+  /** C 类会话的工作区回退解析(2026-09-13,工作区切换 bug):header.cwd 缺失时按会话身份找工作区——
+   *  ①workspaceRegistry 反查(sessionIds 命中 → path;workspaceId 创建会话的权威解,接续流程同源);
+   *  ②持久化会话日志首行的 cwd(与 buildPrevSessionPack 的折叠来源一致;头帧解码防 Node 22 崩溃)。
+   *  结果按 sid 记忆(命中长期/未命中 5 分钟),resolvePaths 是热路径,禁止每轮重复 IO。 */
+  async sessionWorkspaceFallback(sid) {
+    const id = String(sid || '')
+    if (!id) return ''
+    if (!this._wsFallbackCache) this._wsFallbackCache = new Map()
+    const hit = this._wsFallbackCache.get(id)
+    if (hit && (hit.v || Date.now() - hit.at < 300000)) return hit.v
+    let out = ''
+    try {
+      const reg = this._ctxRef && typeof this._ctxRef.get === 'function' ? this._ctxRef.get('workspaceRegistry') : null
+      if (reg && typeof reg.list === 'function') {
+        const found = (reg.list() || []).find((w) => w && Array.isArray(w.sessionIds) && w.sessionIds.includes(id))
+        if (found && found.path) out = String(found.path)
+      }
+    } catch (e) {}
+    if (!out) {
+      try {
+        const dir = await this.locateSessionDir(id)
+        const file = dir ? await this.resolveSessionFile(dir) : null
+        if (file) {
+          const buf = await readFile(file).catch(() => null)
+          const text = buf ? (file.endsWith('.zstd') ? decodeZstdFramesHead(buf) : buf.toString('utf8')) : ''
+          const firstLine = text.split('\n').find((l) => l.trim()) || ''
+          try { const head = JSON.parse(firstLine); if (head && typeof head.cwd === 'string' && head.cwd) out = head.cwd } catch (e) {}
+        }
+      } catch (e) {}
+    }
+    if (this._wsFallbackCache.size > 200) this._wsFallbackCache.clear()
+    this._wsFallbackCache.set(id, { v: out, at: Date.now() })
+    return out
+  }
+
+  /** 按会话解析路径(2026-09-13,工作区切换 bug):面板等「查看特定会话」的场景专用——
+   *  活 agent 走 resolvePaths(其内部含 C 类回退与无人值守按会话锁);无活 agent(宿主重启/冷会话)
+   *  时 registry/持久化头可直接给出工作区,不再回退到「最近活跃会话」的全局值。
+   *  wsBound=false = 本会话身份解析不出工作区(调用方应显示未取到,不得拿全局值冒充)。 */
+  async resolvePathsForSession(sessionId) {
+    const id = String(sessionId || '')
+    if (!id) return { ...(await this.resolvePaths(undefined)), wsBound: true }
+    const agent = this.agentForSessionId(id)
+    if (agent) {
+      const p = await this.resolvePaths(agent)
+      return { ...p, wsBound: p.wsBound !== false }
+    }
+    const fb = await this.sessionWorkspaceFallback(id)
+    if (fb) {
+      const projectDir = this.projectDirOf(fb)
+      return {
+        ws: fb, wsBound: true, userDir: this.userDirOf(), projectDir,
+        notesPath: path.join(projectDir, 'MEMORY.md'),
+        logPath: path.join(projectDir, `${this.memToday()}.md`),
+        handoffDir: path.join(projectDir, 'handoff'),
+        planPath: path.join(projectDir, 'handoff', 'PLAN.md'),
+      }
+    }
+    return { ...(await this.resolvePaths(undefined)), wsBound: false }
+  }
+
   // ---------- M-CM1 交接白板(PLAN.md 全貌快照 + 四段式交接账本) ----------
 
   /** 全局最近交接账本(跨工作区,新bug修复①):扫描各工作区记忆根的 handoff 目录下 handoff-*.md,取 mtime 最新一篇的绝对路径;找不到返回 ''。 */
@@ -2793,31 +2875,24 @@ class MemoryEngine {
 
   /** M-CM1 白板面板数据:PLAN 当前版+归档版本列表+账本列表;fileQ 非空时返回指定文件文本(严格白名单,限 handoff 目录内)。 */
   async handoffPanelData(fileQ, sessionId) {
+    // 配置加载守卫(2026-09-13):handoffEnabled 出厂默认 false,若宿主刚重启、面板先于任何会话活动
+    // 打开,旧实现按未加载的默认值误报「白板未启用」——与 resolvePaths 同款守卫。
+    if (!this.configLoaded) { try { await this.loadConfig() } catch (e) {} }
     if (this.config.handoffEnabled === false) return { enabled: false }
-    const handoffDir = this.state.handoffDir || (await this.resolvePaths(undefined)).handoffDir
-    const planPath = this.state.planPath || path.join(handoffDir, 'PLAN.md')
-    if (fileQ) {
-      const m = String(fileQ).match(/^(?:PLAN\.md|handoff-\d{8}-\d{6}(?:-[a-z])?\.md|archive\/PLAN-\d{8}-\d{6}\.md)$/)
-      if (!m) return { enabled: true, error: 'bad file name' }
-      const target = path.join(handoffDir, ...String(fileQ).split('/'))
-      return { enabled: true, file: fileQ, text: await this.readTextSafe(target) }
-    }
-    const versions = []
-    const archNames = await readdir(path.join(handoffDir, 'archive')).catch(() => [])
-    for (const n of archNames) {
-      if (!/^PLAN-\d{8}-\d{6}\.md$/.test(n)) continue
-      const st = await stat(path.join(handoffDir, 'archive', n)).catch(() => null)
-      if (st && st.isFile()) versions.push({ name: n, mtime: Number(st.mtimeMs) })
-    }
-    versions.sort((a, b) => b.mtime - a.mtime)
-    const ledgers = []
-    const names = await readdir(handoffDir).catch(() => [])
-    for (const n of names) {
-      if (!/^handoff-\d{8}-\d{6}(-[a-z])?\.md$/.test(n)) continue
-      const st = await stat(path.join(handoffDir, n)).catch(() => null)
-      if (st && st.isFile()) ledgers.push({ name: n, mtime: Number(st.mtimeMs) })
+    // 2026-09-13(工作区切换 bug·终端用户实证):有 sessionId 时按会话解析路径 —— 旧实现白板/账本
+    // 恒用全局单值 state.*(最近活跃会话),查看非活跃会话时张冠李戴;会话解析不出身份时如实返回
+    // wsBound:false,不再拿 dsh 启动目录(process.cwd() 回退)冒充工作区。
+    let p, wsBound = true
+    if (sessionId) {
+      p = await this.resolvePathsForSession(sessionId)
+      wsBound = p.wsBound !== false
+    } else {
+      p = (this.state.handoffDir || this.state.planPath)
+        ? { handoffDir: this.state.handoffDir || path.dirname(this.state.planPath), planPath: this.state.planPath, ws: this.state.ws }
+        : await this.resolvePaths(undefined)
     }
-    ledgers.sort((a, b) => b.mtime - a.mtime)
+    const handoffDir = p.handoffDir
+    const planPath = p.planPath || path.join(handoffDir, 'PLAN.md')
     // 水位:优先返回「该会话」的记录(实测 → 磁盘推导);未指定 sessionId 时退回全局单值(兼容旧调用方)
     let water = null
     if (sessionId) {
@@ -2856,11 +2931,44 @@ class MemoryEngine {
         live: Number(this.state.waterLevelAt) > 0,
       }
     }
+    if (!wsBound) {
+      // 会话身份解析不出工作区:白板/账本/归档一律不返回(避免跨工作区误读),水位照常(本就按会话取数);
+      // 客户端据 wsBound:false 显示「未绑定」提示,而不是展示错误路径下的空内容。
+      return {
+        enabled: true, ws: '', wsBound: false, plan: '', planPath: '', planMtime: 0,
+        planVersions: [], ledgers: [],
+        refresh: { sessionId: '', prompt: '' },
+        waterLevel: water,
+      }
+    }
+    if (fileQ) {
+      const m = String(fileQ).match(/^(?:PLAN\.md|handoff-\d{8}-\d{6}(?:-[a-z])?\.md|archive\/PLAN-\d{8}-\d{6}\.md)$/)
+      if (!m) return { enabled: true, error: 'bad file name' }
+      const target = path.join(handoffDir, ...String(fileQ).split('/'))
+      return { enabled: true, file: fileQ, text: await this.readTextSafe(target) }
+    }
+    const versions = []
+    const archNames = await readdir(path.join(handoffDir, 'archive')).catch(() => [])
+    for (const n of archNames) {
+      if (!/^PLAN-\d{8}-\d{6}\.md$/.test(n)) continue
+      const st = await stat(path.join(handoffDir, 'archive', n)).catch(() => null)
+      if (st && st.isFile()) versions.push({ name: n, mtime: Number(st.mtimeMs) })
+    }
+    versions.sort((a, b) => b.mtime - a.mtime)
+    const ledgers = []
+    const names = await readdir(handoffDir).catch(() => [])
+    for (const n of names) {
+      if (!/^handoff-\d{8}-\d{6}(-[a-z])?\.md$/.test(n)) continue
+      const st = await stat(path.join(handoffDir, n)).catch(() => null)
+      if (st && st.isFile()) ledgers.push({ name: n, mtime: Number(st.mtimeMs) })
+    }
+    ledgers.sort((a, b) => b.mtime - a.mtime)
     const planMt = await stat(planPath).then((s) => Number(s.mtimeMs)).catch(() => 0)
     // 刷新仪式的会话 id:内存态为空时走磁盘回退(宿主重启后 _lastAgent 未重建的窗口期)
     const sid = this.currentSessionId() || this.recentSessionIdFallback()
     return {
-      enabled: true, planPath,
+      enabled: true, ws: p.ws || '', wsBound,
+      planPath,
       plan: await this.readTextSafe(planPath),
       planMtime: planMt,
       planVersions: versions.slice(0, 30),

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.5.1",
+  "version": "2.5.2",
   "type": "module",
   "main": "lib/index.js",
   "exports": {