@yolk_vat-y/dsh-project-memory 0.5.6 → 0.5.8

package/src/recall.js

@@ -101,6 +101,21 @@ export function insightToEntry(ins) {
   }
 }
 
+/**
+ * 一条 insight 的**打分文本**（BM25 与 IDF 覆盖率必须用同一份）。
+ *
+ * 为什么要有这个函数：提示通道的"这条查询离语料有多远"（`idfCoverage` 的 df）曾经用
+ * `insightMatchText` 计算，而排序用 `insightToEntry`（含 fix/solution/reason/steps）。
+ * 于是"只在解药里有匹配"的查询词 df=0 → supportRatio=0 → **整条提示通道本轮沉默**，
+ * 而排序明明给了它高分。两份文本永远来自同一个 entry，才不会再漂移。
+ * @param {object} ins
+ * @returns {string}
+ */
+export function insightScoringText(ins) {
+  const e = insightToEntry(ins)
+  return [e.title, e.summary, e.terms, ...(e.keywords || [])].filter(Boolean).join('\n')
+}
+
 /**
  * 召回可见的 insight 集合：作用域可见性跟随会话绑定。
  *   - project / global：始终可见（归档除外）；
@@ -127,6 +142,9 @@ export function visibleInsights({ store = null, globalStore = null, boundTaskId
     const task = store.getTask(boundTaskId)
     for (const it of (task && task.insights) || []) {
       if (!it || it.archived) continue
+      // 任务级也要挡草稿：reflection 写的是 draft:true，未确认前不该被 query_memory 召回
+      // （project/global 一直有这道闸，任务级漏了）。
+      if (it.draft === true) continue
       out.push({ ...it, scope: it.scope || 'task' })
     }
   }
@@ -163,15 +181,17 @@ export function recallItems(opts = {}) {
   if (want.has('doc') || want.has('symbol')) {
     const pool = (entries || (store && typeof store.allEntries === 'function' ? store.allEntries() : []) || [])
       .filter((e) => e && (e.type === 'doc' || e.type === 'symbol') && want.has(e.type))
-    const scored = rankEntriesStreaming(pool, qs, idf, limit)
-    const byLayer = new Map([['doc', []], ['symbol', []]])
-    for (const { entry, score } of scored) {
-      const prior = entry.type === 'doc' ? normativePrior(entry) : LAYER_PRIORS.symbol
-      byLayer.get(entry.type).push({ item: entry, score, prior, weightedScore: score * prior })
-    }
+    // 每层各自 top-k（不变量 #2）：一次跨类型取 top-k 会让文档把符号挤出结果——
+    // 20 条命中文档 + 1 条命中符号、limit 8 时符号层直接消失。分类型各取一次再分桶。
     for (const layer of ['doc', 'symbol']) {
-      const hits = byLayer.get(layer)
-      if (!hits.length) continue
+      const layerPool = pool.filter((e) => e.type === layer)
+      if (!layerPool.length) continue
+      const scored = rankEntriesStreaming(layerPool, qs, idf, limit)
+      if (!scored.length) continue
+      const hits = scored.map(({ entry, score }) => {
+        const prior = layer === 'doc' ? normativePrior(entry) : LAYER_PRIORS.symbol
+        return { item: entry, score, prior, weightedScore: score * prior }
+      })
       hits.sort((a, b) => b.weightedScore - a.weightedScore)
       const top = hits[0].weightedScore || 1
       buckets.push({

package/src/setup/taskbridge.js

@@ -2,7 +2,7 @@
 // 事实依据：dsh session/event 签名 (session, event)；todo/write data.todos；
 // tool/call data.arguments 为 JSON 字符串；fs 工具名 read/write/edit/read_image，参数 file_path。
 import path from 'node:path'
-import { createHash } from 'node:crypto'
+import { createHash, randomUUID } from 'node:crypto'
 import { memoryRootFor } from '../util/fs.js'
 import { findProjectRoot } from '../lazy.js'
 import { ProjectMemoryStore } from '../store.js'
@@ -27,7 +27,9 @@ export function slugifyTitle(text) {
 
 export function genTaskId(projectRoot, title) {
   const slug = slugifyTitle(title) || 'task'
-  return `tsk_${hash8(projectRoot)}_${slug}_${Date.now()}`
+  // 毫秒不是唯一性保证：两个会话在同一毫秒建同名任务会拿到同一个 id，
+  // addTask 变成"同一 id 两次"，两个会话的绑定互相串台。补 6 位随机后缀。
+  return `tsk_${hash8(projectRoot)}_${slug}_${Date.now().toString(36)}_${randomUUID().slice(0, 6)}`
 }
 
 /** 项目根推导：findProjectRoot 期望文件路径，传目录会从父级起跳，故用目录内探针路径。 */
@@ -138,13 +140,7 @@ export function hotSortFiles(files, meta) {
 /** 触碰文件后更新元数据并重排 task.files（写 vs 读分别记时间/次数）。 */
 export function touchTaskFile(task, rel, kind, now) {
   task.fileMeta = task.fileMeta || {}
-  if (!task.files.includes(rel)) {
-    task.files.push(rel)
-    if (task.files.length > MAX_FILES_PER_TASK) {
-      const dropped = task.files.shift()
-      delete task.fileMeta[dropped]
-    }
-  }
+  if (!task.files.includes(rel)) task.files.push(rel)
   const m = task.fileMeta[rel] || {}
   m.n = (m.n || 0) + 1 // 兼容旧字段：读+写总数（保留，避免老任务语义漂移）
   // 读/写分计数（先只采集，不消费 —— 排序与注入仍只用 lastWriteAt/lastReadAt）
@@ -157,6 +153,12 @@ export function touchTaskFile(task, rel, kind, now) {
   m.lastReadAt = now
   task.fileMeta[rel] = m
   task.files = hotSortFiles(task.files, task.fileMeta)
+  // 超限丢最冷的：列表已按热度降序，末尾即最冷。旧代码在**重排前** shift()，
+  // 而那时 files 本身就是热序，shift 恰好把最热的那个文件（刚写的）丢掉、留下最冷的。
+  while (task.files.length > MAX_FILES_PER_TASK) {
+    const dropped = task.files.pop()
+    delete task.fileMeta[dropped]
+  }
 }
 
 /**

package/src/store.js

@@ -17,6 +17,14 @@ const SHARDS_DIR = 'shards'
 const storeCache = new Map()
 const STORE_CACHE_MAX = 32
 
+/** 已就"无法迁移的旧 store"告警过的目录：避免每次 load() 都刷一行。 */
+const migrationWarned = new Set()
+
+/** 纯对象判定（排除 null / 数组）：磁盘读入的 JSON 形状校验统一走它。 */
+function isRecord(value) {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
+}
+
 function loadJson(filePath, fallback) {
   let raw
   try {
@@ -82,7 +90,9 @@ export class ProjectMemoryStore {
   load() {
     const key = path.resolve(this.dir)
     const hot = storeCache.get(key)
-    if (hot && hot !== this) return hot
+    // 缓存命中即返回：`hot === this` 时再读一遍盘会静默丢弃本实例尚未 save() 的变更
+    // （_loadSharded/_loadInsights 会重新赋值 experience/tasks/insights…）。
+    if (hot) return hot
     this._migrateLegacyIfNeeded()
     this._loadSharded()
     this._loadInsights()
@@ -114,9 +124,34 @@ export class ProjectMemoryStore {
     }
     const legacyEntriesPath = path.join(this.dir, ENTRIES_FILE)
     if (!existsSafe(legacyEntriesPath)) return
-    const index = loadJson(path.join(this.dir, INDEX_FILE), {})
-    const files = index.files || {}
-    const entries = loadJson(legacyEntriesPath, {})
+    const legacyIndexPath = path.join(this.dir, INDEX_FILE)
+    // 先读两份旧文件：损坏的那份会在这里被 loadJson 备份为 .corrupt（保留现场）。
+    const index = loadJson(legacyIndexPath, null)
+    const entries = loadJson(legacyEntriesPath, null)
+    if (!isRecord(index) || !isRecord(entries)) {
+      const hasEntries = isRecord(entries) && Object.keys(entries).length > 0
+      if (!hasEntries) {
+        // entries 损坏（已备份）或本就是空的：没有可保护的数据，按空旧库收尾。
+        writeJsonAtomic(formatPath, { version: 2, layout: 'sharded' })
+        for (const stale of [legacyEntriesPath, legacyIndexPath]) {
+          try {
+            unlinkSync(stale)
+          } catch {
+            // already renamed away by corrupt backup, or gone; nothing to do
+          }
+        }
+        return
+      }
+      // index.json 是 entries.json → rel 的唯一映射。它缺失或损坏时继续迁移，会写出 0 个
+      // shard、打上 v2 标记、再把**完好的** entries.json 删掉——等于一次静默的数据清空。
+      // 保留现场，不写 format 标记，等 index.json 修好后再迁（每次进程只提示一次）。
+      if (!migrationWarned.has(this.dir)) {
+        migrationWarned.add(this.dir)
+        console.error(`[dsh-project-memory] legacy store at ${this.dir} has ${ENTRIES_FILE} but no readable ${INDEX_FILE}; migration skipped to protect it`)
+      }
+      return
+    }
+    const files = isRecord(index.files) ? index.files : {}
     const orphans = Object.keys(entries).filter((rel) => !(rel in files))
     if (orphans.length) {
       console.error(
@@ -147,9 +182,11 @@ export class ProjectMemoryStore {
     }
     for (const name of shardNames) {
       const shard = loadJson(path.join(this.dir, SHARDS_DIR, name), null)
-      if (!shard || typeof shard.relPath !== 'string' || !shard.record) continue
+      if (!shard || typeof shard.relPath !== 'string' || !isRecord(shard.record)) continue
       this.files[shard.relPath] = shard.record
-      this.entries[shard.relPath] = shard.entries || []
+      // 畸形 shard（entries 被写成对象/null）不能让 allEntries() 在 `for…of` 上抛错，
+      // 否则一个坏文件会拖垮整个进程的每一次读取。
+      this.entries[shard.relPath] = Array.isArray(shard.entries) ? shard.entries.filter(isRecord) : []
     }
     this.experience = loadJson(path.join(this.dir, EXPERIENCE_FILE), [])
     this.tasks = loadJson(path.join(this.dir, TASKS_FILE), [])
@@ -165,7 +202,10 @@ export class ProjectMemoryStore {
   // migratedAt 落盘保证跨进程/崩溃幂等。销毁式收敛放到 recall 统一 PR。
   _loadInsights() {
     const doc = loadJson(path.join(this.dir, INSIGHTS_FILE), null)
-    this.insights = doc && typeof doc === 'object' && Array.isArray(doc.items) ? doc : { version: 1, migratedAt: null, items: [] }
+    this.insights = isRecord(doc) && Array.isArray(doc.items)
+      // items 里混进 null/非对象（手改或旧版写入）会让迁移与召回逐个 `.title` 抛错——过滤掉。
+      ? { ...doc, items: doc.items.filter(isRecord) }
+      : { version: 1, migratedAt: null, items: [] }
     this._migrateExperienceToInsights()
     // PR3：v1 → v2 懒回填派生 trigger（纯确定性、幂等；不调用模型，不改写已有字段）
     if (backfillDerivedTriggers(this.insights)) this._dirtyInsights = true
@@ -551,15 +591,14 @@ export class ProjectMemoryStore {
     return result
   }
 
-  applyFileUpdate(relPath, { expectedHash, hash, entries, meta, deleted, type, size }) {
-    const cur = this.fileRecord(relPath)
-    if (!deleted && (cur?.sha256 ?? null) !== (expectedHash ?? null)) {
-      return { skipped: true }
-    }
-    if (deleted) {
-      this.removeFile(relPath)
-      return { ok: true }
-    }
+  /**
+   * 写入一条文件更新，以 expectedHash 做 CAS。
+   * @returns {boolean} true = 已写入；false = 文件自扫描后又被改动，本次拒绝
+   *   （调用方让该条目保持未落快照，下一轮重试）。
+   * 移除条目不经过这里：调用方在 commit 里直接 removeFile（见 index-pipeline.js）。
+   */
+  applyFileUpdate(relPath, { expectedHash, hash, entries, type, size }) {
+    if ((this.fileRecord(relPath)?.sha256 ?? null) !== (expectedHash ?? null)) return false
     this.markFile(relPath, {
       sha256: hash,
       size,
@@ -567,7 +606,7 @@ export class ProjectMemoryStore {
       indexedAt: new Date().toISOString(),
     })
     this.setEntries(relPath, entries)
-    return { ok: true }
+    return true
   }
 }
 

package/src/symbols.js

@@ -144,18 +144,57 @@ function extractTypeSignature(line) {
   return sig
 }
 
-function extractInterfaceOrType(line) {
-  // interface User { name: string; age: number }
-  const ifaceMatch = line.match(/^interface\s+(\w+)\s*(?:extends\s+[^{]+)?\s*\{([^}]*)\}/)
-  if (ifaceMatch) {
-    return `{ ${ifaceMatch[2].trim()} }`
+function braceDelta(s) {
+  let d = 0
+  for (const ch of s) {
+    if (ch === '{') d++
+    else if (ch === '}') d--
   }
-  // type UserMap = Map<string, User>
-  const typeMatch = line.match(/^type\s+(\w+)\s*=\s*([^;{]+)/)
-  if (typeMatch) {
-    return `= ${typeMatch[2].trim()}`
+  return d
+}
+
+/**
+ * 读取一条 interface / type 声明，支持 `export`（含 `declare`）与多行形态。
+ * 旧实现要求 `^interface`（不吃 export）且 `}` 必须在本行，于是
+ * `export interface X {…}`、任何多行 interface、`export type X = …` 在 L1 正则扫描器里
+ * 全都产出 0 个符号（TS 增强器可用时才被补回来；没有 typescript 的项目就彻底看不到）。
+ * @returns {{kind: 'interface'|'type', name: string, text: string, endIdx: number} | null}
+ */
+function readTypeDeclaration(rawLines, startIdx) {
+  const first = rawLines[startIdx].trim()
+  const m = first.match(/^(?:export\s+)?(?:declare\s+)?(interface|type)\s+([A-Za-z_$][\w$]*)/)
+  if (!m) return null
+  const kind = m[1]
+  const parts = [first]
+  let depth = braceDelta(first)
+  let endIdx = startIdx
+  const complete = () => (kind === 'interface'
+    ? depth <= 0 && parts[parts.length - 1].includes('}')
+    : depth <= 0 && /[;}]/.test(parts[parts.length - 1]))
+  for (let j = startIdx + 1; j < rawLines.length && j - startIdx <= 20 && !complete(); j++) {
+    const t = rawLines[j].trim()
+    if (!t) {
+      if (depth <= 0) break
+      parts.push(t)
+      endIdx = j
+      continue
+    }
+    // 归零后遇到下一条声明开头就收尾（TS 的 type 别名常不写分号）
+    if (depth <= 0 && j > startIdx && /^(?:export\s+)?(?:declare\s+)?(?:interface|type|function|class|const|let|var|import|enum)\b/.test(t)) break
+    parts.push(t)
+    depth += braceDelta(t)
+    endIdx = j
   }
-  return ''
+  return { kind, name: m[2], text: parts.join(' '), endIdx }
+}
+
+function formatTypeDeclaration({ kind, text }) {
+  if (kind === 'interface') {
+    const body = text.match(/\{([\s\S]*)\}/)
+    return body ? `{ ${body[1].replace(/\s+/g, ' ').trim()} }` : ''
+  }
+  const eq = text.match(/=\s*([\s\S]+?);?\s*$/)
+  return eq ? `= ${eq[1].replace(/\s+/g, ' ').trim()}` : ''
 }
 
 function extractOverloads(masked, startIdx) {
@@ -226,6 +265,7 @@ function scanJsLike(masked, relPath, rawLines) {
   const symbols = []
   let prevOpensBlock = false
   for (let i = 0; i < masked.length; i++) {
+    const declStart = i // 多行声明会推进 i，符号行号要记声明的**首行**
     const rawText = rawLines[i].trim()
     const maskedText = masked[i].trim()
     if (!rawText) continue
@@ -233,13 +273,12 @@ function scanJsLike(masked, relPath, rawLines) {
     let matched = null
     let joinedText = null
     
-    // Check for interface / type alias first (on raw line, not masked)
-    const ifaceSig = extractInterfaceOrType(rawText)
-    if (ifaceSig) {
-      const nameMatch = rawText.match(/^(?:export\s+)?(?:interface|type)\s+(\w+)/)
-      if (nameMatch) {
-        matched = { name: nameMatch[1], kind: 'interface', typeSig: ifaceSig }
-      }
+    // interface / type（支持 export 与多行；没有 TS 增强器时这是唯一来源）
+    const typeDecl = readTypeDeclaration(rawLines, i)
+    if (typeDecl) {
+      const sig = formatTypeDeclaration(typeDecl)
+      if (sig) matched = { name: typeDecl.name, kind: typeDecl.kind, typeSig: sig }
+      i = typeDecl.endIdx
     }
     
     if (!matched) {
@@ -294,7 +333,7 @@ function scanJsLike(masked, relPath, rawLines) {
         if (overloads.length > 1) matched.overloads = overloads
       }
       
-      symbols.push(buildSymbol(matched, relPath, rawLines[i], i + 1))
+      symbols.push(buildSymbol(matched, relPath, rawLines[declStart], declStart + 1))
     }
     
     prevOpensBlock = masked[i].trim().endsWith('{')
@@ -433,7 +472,7 @@ function buildSymbol(matched, relPath, rawLine, lineNo) {
 export function scanSymbols(a, b, c) {
   // Backward compatible: old signature (filePath, content) or new (relPath, filePath, content)
   const [relPath, filePath, content] = c === undefined ? [a, a, b] : [a, b, c]
-  const ext = relPath.slice(relPath.lastIndexOf('.'))
+  const ext = relPath.slice(relPath.lastIndexOf('.')).toLowerCase()
   const lines = content.split(/\r?\n/)
   if (JS_LIKE.has(ext)) return scanJsLike(maskTokens(lines, JS_MASKER), relPath, lines)
   if (PYTHON.has(ext)) return scanPython(maskTokens(lines, PY_MASKER), relPath, lines)

package/src/tools/forget.js

@@ -1,5 +1,5 @@
 import { defineTool } from '@deepseek-ai/dsh-tools'
-import { memoryRootFor, resolveIndexRoot } from '../util/fs.js'
+import { assertIndexRoot, memoryRootFor, resolveIndexRoot } from '../util/fs.js'
 import { ProjectMemoryStore } from '../store.js'
 
 export function forgetTool(config) {
@@ -24,6 +24,7 @@ export function forgetTool(config) {
     },
     async execute(args, exec) {
       const root = resolveIndexRoot(exec, args.root)
+      assertIndexRoot(root, args.root || root)
       const memoryDir = memoryRootFor(root, config.memoryDir)
       const store = new ProjectMemoryStore(memoryDir).load()
       return store.commit((s) => {

package/src/tools/index-doc.js

@@ -2,6 +2,7 @@ import { defineTool } from '@deepseek-ai/dsh-tools'
 import path from 'node:path'
 import { assertReadableFile, memoryRootFor, sha256OfFile, storeKey } from '../util/fs.js'
 import { buildDocEntries } from '../doc-pipeline.js'
+import { docEntriesNeedBackfill } from '../doc-index.js'
 import { linkEntries } from '../link.js'
 import { ProjectMemoryStore } from '../store.js'
 import { findProjectRoot } from '../lazy.js'
@@ -38,7 +39,9 @@ export function indexDocTool(ctx, config) {
       const rel = storeKey(path.relative(root, filePath).split(path.sep).join('/'))
       const { hash, size } = await sha256OfFile(filePath)
       const existing = store.fileRecord(rel)
-      if (existing && existing.sha256 === hash) {
+      // 与 index_repo/watch/lazy 同一条判据：哈希未变但旧条目缺 terms 时仍要重抽一次（一次性回填）。
+      // 少了这一步，terms 回填就是"路径相关"的——只有走 index_repo 才生效。
+      if (existing && existing.sha256 === hash && !docEntriesNeedBackfill(store.entries[rel])) {
         return `Skipped (unchanged): ${rel}\nAlready indexed with ${(store.entries[rel] || []).length} entry/entries.`
       }
 

package/src/tools/index-repo.js

@@ -1,11 +1,8 @@
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import path from 'node:path'
 import { statSync } from 'node:fs'
-import { assertIndexRoot, isSupportedCode, isSupportedDoc, looksLikeDump, memoryRootFor, readFileForIndex, relativePath, storeKey, walkDir } from '../util/fs.js'
-import { buildDocEntries } from '../doc-pipeline.js'
-import { docEntriesNeedBackfill } from '../doc-index.js'
-import { scanSymbols } from '../symbols.js'
-import { linkEntries } from '../link.js'
+import { assertIndexRoot, memoryRootFor, relativePath, storeKey, walkDir } from '../util/fs.js'
+import { DROP, OVERSIZE, UNCHANGED, commitFileUpdates, fileKind, planFileIndex, toFileUpdate } from '../index-pipeline.js'
 import { ProjectMemoryStore } from '../store.js'
 import { onFileIndexed, isTypeScriptFile } from '../enhancer.js'
 
@@ -16,109 +13,59 @@ export async function indexRepository(ctx, config, root, { reindex = false } = {
   const memoryDir = memoryRootFor(root, config.memoryDir)
   const store = new ProjectMemoryStore(memoryDir).load()
 
-  const files = walkDir(root)
   const seen = new Set()
+  const updates = []
+  const failures = []
   let indexed = 0
   let updated = 0
   let skipped = 0
-  let removed = 0
-  const failures = []
-
-  // First pass: collect all file info and compute hashes/entries (async work outside commit)
-  const fileUpdates = []
 
-  for (const filePath of files) {
+  for (const filePath of walkDir(root)) {
     const rel = storeKey(relativePath(root, filePath))
     seen.add(rel)
-    const ext = path.extname(filePath).toLowerCase()
-    if (!isSupportedDoc(ext) && !isSupportedCode(ext)) continue
+    const kind = fileKind(path.extname(filePath).toLowerCase())
+    if (!kind) continue
 
     try {
       const size = statSync(filePath).size
-        const existing = store.fileRecord(rel)
-      if (isSupportedCode(ext) && config.maxFileSizeMb && size > config.maxFileSizeMb * 1024 * 1024) {
-        fileUpdates.push({ rel, deleted: true })
+      const record = store.fileRecord(rel)
+      const plan = await planFileIndex({ rel, filePath, kind, config, record, existingEntries: store.entries[rel], size, force: reindex })
+      if (plan.key === UNCHANGED) {
         skipped++
         continue
       }
-
-      // 单次读盘：同一 buffer 供哈希与正文使用（不再 sha256OfFile + readFileSync 读两遍）
-      const { hash, buffer } = readFileForIndex(filePath)
-      // 旧 store 的 doc 条目缺 terms → 即使哈希未变也重抽一次（一次性回填）
-      const needsBackfill = isSupportedDoc(ext) && docEntriesNeedBackfill(store.entries[rel])
-      if (!reindex && existing && existing.sha256 === hash && !needsBackfill) {
+      if (plan.key === OVERSIZE) {
+        // 体积超限的代码文件：旧记录一律清掉，避免检索命中一个已经不索引的文件。
+        updates.push({ rel, drop: true })
         skipped++
         continue
       }
-
-      let entries
-      if (isSupportedCode(ext)) {
-        entries = scanSymbols(rel, filePath, buffer.toString('utf8'))
-        fileUpdates.push({ rel, expectedHash: existing?.sha256, hash, size, entries, type: 'code' })
-        updated++
-      } else {
-        const content = buffer.toString('utf8')
-        if (looksLikeDump(content)) {
-          fileUpdates.push({ rel, deleted: true })
-          skipped++
-          continue
-        }
-        entries = await buildDocEntries(rel, filePath, {
-          chunkChars: config.chunkChars,
-          maxChunks: config.maxChunksPerFile,
-          maxFileSizeMb: config.maxFileSizeMb,
-          maxPdfPages: config.maxPdfPages,
-        })
-        if (entries === null) {
-          fileUpdates.push({ rel, deleted: true })
-          skipped++
-          continue
-        }
-        fileUpdates.push({ rel, expectedHash: existing?.sha256, hash, size, entries, type: 'doc' })
-        indexed++
-      }
-    } catch (err) {
+      updates.push(toFileUpdate(rel, plan, record))
+      if (plan.key === DROP) skipped++
+      else if (plan.type === 'code') updated++
+      else indexed++
+    } catch {
       failures.push(rel)
     }
   }
 
-  // Second pass: single commit with all updates
-  const report = store.commit((s) => {
-    for (const update of fileUpdates) {
-      const result = s.applyFileUpdate(update.rel, update)
-      if (result.skipped) {
-        // CAS failed - file was modified concurrently, skip
-        continue
-      }
-    }
-
-    // Remove files not seen
-    for (const rel of Object.keys(s.files)) {
-      if (!seen.has(rel)) {
-        s.removeFile(rel)
-        removed++
-      }
-    }
-
-    linkEntries(s)
-    const stats = s.stats()
-    let report =
-      `Indexed project: ${root}\n` +
-      `docs indexed: ${indexed}, code symbols updated: ${updated}, unchanged skipped: ${skipped}, removed: ${removed}\n` +
-      `memory store: ${stats.files} files, ${stats.entries} entries, ${stats.experience} experience notes`
-    if (failures.length) {
-      report += `\nfailed to index ${failures.length} file(s): ${failures.join(', ')}`
-    }
-    return report
-  })
+  // 单事务提交：写入 + 清理本轮未见到的旧条目 + 重建链接。
+  const { removed } = commitFileUpdates(store, { updates, unseen: seen })
+  const stats = store.stats()
+  let report =
+    `Indexed project: ${root}\n` +
+    `docs indexed: ${indexed}, code symbols updated: ${updated}, unchanged skipped: ${skipped}, removed: ${removed}\n` +
+    `memory store: ${stats.files} files, ${stats.entries} entries, ${stats.experience} experience notes`
+  if (failures.length) {
+    report += `\nfailed to index ${failures.length} file(s): ${failures.join(', ')}`
+  }
 
   // Trigger TS enhancement for code files (TS/JS only)
-  for (const update of fileUpdates) {
-    if (update.type === 'code') {
-      const filePath = path.join(root, update.rel)
-      if (isTypeScriptFile(filePath)) {
-        onFileIndexed(store, update.rel, filePath, config, root)
-      }
+  for (const update of updates) {
+    if (update.type !== 'code') continue
+    const filePath = path.join(root, update.rel)
+    if (isTypeScriptFile(filePath)) {
+      onFileIndexed(store, update.rel, filePath, config, root)
     }
   }
 

package/src/tools/lesson-tools.js

@@ -1,5 +1,5 @@
 import { defineTool } from '@deepseek-ai/dsh-tools'
-import { memoryRootFor, resolveIndexRoot } from '../util/fs.js'
+import { assertIndexRoot, memoryRootFor, resolveIndexRoot } from '../util/fs.js'
 import { ProjectMemoryStore } from '../store.js'
 import { truncate } from '../util/text.js'
 import { cfgInsight, saveInsight, defaultGlobalFile, GlobalStore } from '../insight-store.js'
@@ -77,6 +77,7 @@ export function lessonTool(config) {
     output: { schema: { type: 'string' }, render: (_a, v) => [{ type: 'text', text: v }] },
     async execute(args, exec) {
       const root = resolveIndexRoot(exec, args.root)
+      assertIndexRoot(root, args.root || root)
       const memoryDir = memoryRootFor(root, config.memoryDir)
       const store = new ProjectMemoryStore(memoryDir).load()
       const cfg = cfgInsight(config)

package/src/tools/query-memory.js

@@ -4,13 +4,22 @@ import { memoryRootFor, resolveIndexRoot } from '../util/fs.js'
 import { ProjectMemoryStore, storeOverview } from '../store.js'
 import { expandQuery } from '../llm.js'
 import { resolveRoute } from '../llm-route.js'
-import { GlobalStore, cfgInsight, defaultGlobalFile } from '../insight-store.js'
+import { GlobalStore, cfgInsight, defaultGlobalFile, recordHit } from '../insight-store.js'
 import { recallItems } from '../recall.js'
 import { truncate } from '../util/text.js'
 function toAbs(root, rel) {
   return path.isAbsolute(rel) ? rel : path.join(root, rel)
 }
 
+/** 步骤在历史数据里可能是字符串或 {content|text, status}：TaskBridge/注入/反思都按 content||text 读。 */
+function stepContent(s) {
+  if (typeof s === 'string') return s
+  return s?.content ?? s?.text ?? ''
+}
+function stepStatus(s) {
+  return typeof s === 'string' ? 'pending' : (s?.status || 'pending')
+}
+
 export function queryMemoryTool(ctx, config) {
   return defineTool({
     name: 'query_memory',
@@ -46,6 +55,11 @@ export function queryMemoryTool(ctx, config) {
     },
     async execute(args, exec) {
       const root = resolveIndexRoot(exec, args.root)
+      // 空查询不是"全部"：recallItems 会过滤空串，rankEntriesStreaming 随即返回
+      // entries.slice(0, limit)（任意条目、分数 0），task 分支的 includes('') 更是命中所有任务。
+      if (!String(args.query ?? '').trim()) {
+        return 'query must not be empty. Use memory_stats to see what the store contains.'
+      }
       const store = new ProjectMemoryStore(memoryRootFor(root, config.memoryDir)).load()
       const type = args.type || 'all'
       const limit = Math.max(1, Math.min(Number(args.limit) || 8, 20))
@@ -79,6 +93,17 @@ export function queryMemoryTool(ctx, config) {
       })
 
       const lines = []
+      // 使用记账：检索命中也是"被用到"（活跃度/衰减用得上它，见 recordHit）。查询是热路径
+      // （p50 2.6ms），这里只改内存 + 标脏，**不**强制落盘——注入路径会立即落盘，这条路
+      // 靠下一次自然 save 带上。记账失败绝不影响查询结果。
+      if (wantInsight) {
+        try {
+          const bucket = recalled.layers.find((l) => l.layer === 'insight')
+          recordHit({ store, globalStore, ids: (bucket?.hits || []).map((h) => h.item?.insightId) })
+        } catch {
+          /* ignore：记账是旁路 */
+        }
+      }
       if (wantMemory) {
         // doc/symbol 同源同尺度：合并后按加权分排序（规范段提权已计入 weightedScore）
         const memHits = recalled.layers
@@ -146,16 +171,16 @@ export function queryMemoryTool(ctx, config) {
       if (type === 'task') {
         const q = (queries[0] || '').toLowerCase()
         const matched = tasks
-          .filter((t) => !t.archived && (t.title.toLowerCase().includes(q) || (t.steps || []).some((s) => s.text?.toLowerCase().includes(q)) || (t.files || []).some((f) => f.toLowerCase().includes(q))))
+          .filter((t) => !t.archived && (t.title.toLowerCase().includes(q) || (t.steps || []).some((s) => stepContent(s).toLowerCase().includes(q)) || (t.files || []).some((f) => f.toLowerCase().includes(q))))
           .slice(0, limit)
         if (!matched.length) {
           return `任务记录: 0 套匹配 "${args.query}"（list_tasks 查看全部，select_task 续做）`
         }
         for (const t of matched) {
-          const done = (t.steps || []).filter((s) => s.status === 'completed').length
+          const done = (t.steps || []).filter((s) => stepStatus(s) === 'completed').length
           const total = (t.steps || []).length
           const stepsText = (t.steps || []).length
-            ? (t.steps || []).map((s) => `- [${s.status === 'completed' ? 'x' : s.status === 'in_progress' ? '*' : ' '}] ${s.text}`).join('\n')
+            ? (t.steps || []).map((s) => `- [${stepStatus(s) === 'completed' ? 'x' : stepStatus(s) === 'in_progress' ? '*' : ' '}] ${stepContent(s)}`).join('\n')
             : '（无步骤）'
           const files = (t.files || []).slice(0, 8).join(', ')
           lines.push(`### ${t.title} (${done}/${total} 完成)\n${stepsText}\n- 文件: ${files || '无'}`)

package/src/tools/remember.js

@@ -1,5 +1,5 @@
 import { defineTool } from '@deepseek-ai/dsh-tools'
-import { memoryRootFor, resolveIndexRoot } from '../util/fs.js'
+import { assertIndexRoot, memoryRootFor, resolveIndexRoot } from '../util/fs.js'
 import { ProjectMemoryStore } from '../store.js'
 
 export function rememberTool(config) {
@@ -35,6 +35,8 @@ export function rememberTool(config) {
     },
     async execute(args, exec) {
       const root = resolveIndexRoot(exec, args.root)
+      // 写盘前校验根：否则一个拼错的 root 会被 mkdir 成字面量目录（连同 .dsh-project-memory）。
+      assertIndexRoot(root, args.root || root)
       const memoryDir = memoryRootFor(root, config.memoryDir)
       const store = new ProjectMemoryStore(memoryDir).load()
       return store.commit((s) => {