@a9i5k4/dsh-auto-memory 2.2.6 → 2.3.0

package/lib/storage-manage.js

@@ -62,6 +62,22 @@ export function createStorageManagerPre(opts = {}) {
     const catalog = catalogFor(paths)
     if (!catalog) return { ok: false, reason: 'no-paths' }
     if (!io.sidecarDir) return { ok: false, reason: 'no-sidecar-dir' }
+    // 2026-09-09(no-doc-store 报障):锚定索引层(memoryAnchorEnabled → docStore)未就位时,
+    // 缺 sidecar 属预期状态而非可修复的 stale——避免「报 stale 可修、修复恒 no-doc-store」死循环。
+    // 顶层 indexEnabled=false 交 UI 提示;语料文件本身仍判 ok(健康),只是无索引可比对。
+    const ds = docStoreOf()
+    const indexEnabled = !!(ds && typeof ds.sidecarPath === 'function')
+    if (!indexEnabled) {
+      const sources = catalog.sources.map((s) => ({
+        sourceRef: s.sourceRef, kind: s.kind, scope: s.scope, file: s.file,
+        status: 'ok', reasons: [], repairable: [],
+      }))
+      return {
+        ok: true, indexEnabled: false, scannedAt: now(), version: STORAGE_MANAGE_VERSION_V1,
+        sources, stale: [],
+        counts: { total: sources.length, ok: sources.length, stale: 0, unrepairable: 0 },
+      }
+    }
     const res = loadCorpusSnapshot(catalog, io)
     const dropped = (res && res.dropped) || []
     const byRef = new Map()
@@ -81,6 +97,7 @@ export function createStorageManagerPre(opts = {}) {
     const stale = sources.filter((s) => s.status === 'stale')
     const out = {
       ok: true,
+      indexEnabled: true,
       scannedAt: now(),
       version: STORAGE_MANAGE_VERSION_V1,
       sources,

package/lib/subagent-gc.js

@@ -220,7 +220,14 @@ export async function recycleSessions(opts = {}) {
       if (await exists(destDir)) { out.skipped.push({ sid: c.sid, reason: 'backup-exists' }); continue }
       if (!apply) { out.moved.push({ sid: c.sid, label: c.label, sizeBytes: c.sizeBytes, to: destDir, dryRun: true }); out.bytes += c.sizeBytes; continue }
       await mkdir(path.dirname(destDir), { recursive: true })
-      await rename(c.dir, destDir)
+      // Windows 下 rename 对被占用目录抛 EPERM(宿主/杀软句柄未释放)→ 短退避重试,仍失败则跳过等下次
+      let renamed = false
+      let lastErr = null
+      for (const delay of [0, 250, 800, 2000]) {
+        if (delay) await new Promise((r) => setTimeout(r, delay))
+        try { await rename(c.dir, destDir); renamed = true; break } catch (e) { lastErr = e }
+      }
+      if (!renamed) throw lastErr
       out.moved.push({ sid: c.sid, label: c.label, sizeBytes: c.sizeBytes, to: destDir })
       out.bytes += c.sizeBytes
       if (projcacheRoot) {

package/lib/temporal-parse.js

@@ -0,0 +1,159 @@
+/**
+ * temporal-parse-pre —— 中文时间表达解析(P12 后新增时间检索臂 Phase 1, 2026-09-09)。
+ *
+ * 目标:把查询里的中文时间表达("上周""三天前""最近一周""上个月"等)解析为
+ * [startMs, endMs) 时间范围,供检索的软性第三臂(time arm)做 rank-space 提升。
+ * 查询无时间表达 → 返回 null → 调用方零行为变更。
+ *
+ * 边界:纯函数、零 IO、零依赖;禁止 LLM/第三方日期库;确定性(同输入同 now 逐字节相同输出)。
+ * 时刻必须经 opts.now 注入(缺省 Date.now() 仅为便利;测试一律注入)。
+ *
+ * 时区假设(显式声明):全部自然日/周/月/年边界用宿主**本地时间**计算
+ * (new Date(y,m,d) 系列本地方法)。部署机时区为 Asia/Shanghai(CST,UTC+8,无夏令时),
+ * 与记忆日志文件名日期(本地日期)一致;若部署到其他时区,范围语义跟随宿主本地时区。
+ */
+
+/** 中文数字表(支持零〇一二两三四五六七八九十百,≤999,够 366 上限)。 */
+const CN_DIGIT = { '零': 0, '〇': 0, '一': 1, '二': 2, '两': 2, '三': 3, '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, '九': 9 }
+
+/** N 的合法区间(含端点);超界视为未识别。 */
+const N_MIN = 1
+const N_MAX = 366
+
+const DAY_MS = 86400000
+
+/** 中文/阿拉伯数字 → 整数;非法返回 NaN。 */
+function numToInt(s) {
+  if (/^\d{1,3}$/.test(s)) return parseInt(s, 10)
+  let total = 0
+  let num = 0
+  for (const ch of String(s)) {
+    if (ch === '十') { total += (num || 1) * 10; num = 0 }
+    else if (ch === '百') { total += (num || 1) * 100; num = 0 }
+    else if (ch === '零' || ch === '〇') { /* 占位,跳过 */ }
+    else if (CN_DIGIT[ch] !== undefined) { num = CN_DIGIT[ch] }
+    else return NaN
+  }
+  const out = total + num
+  return out > 0 ? out : NaN
+}
+
+/** 本地自然日 00:00 的毫秒时间戳。 */
+function startOfDay(d) {
+  return new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime()
+}
+
+/** 本地自然周(周一 00:00 起)的毫秒时间戳。 */
+function startOfWeek(d) {
+  const monday = new Date(d.getFullYear(), d.getMonth(), d.getDate())
+  monday.setDate(monday.getDate() - ((monday.getDay() + 6) % 7))
+  return monday.getTime()
+}
+
+/** 本地自然月 1 日 00:00 的毫秒时间戳。 */
+function startOfMonth(d) {
+  return new Date(d.getFullYear(), d.getMonth(), 1).getTime()
+}
+
+/** 按本地月序号(可为负,自动借位)取自然月起点。 */
+function monthStartShift(d, shift) {
+  return new Date(d.getFullYear(), d.getMonth() + shift, 1).getTime()
+}
+
+/** 从 d 往前/后 n 个日历月,锚定同一日与时分秒(月末溢出由 Date 自动进位,确定性)。 */
+function nowShiftMonths(d, n) {
+  return new Date(d.getFullYear(), d.getMonth() + n, d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds(), d.getMilliseconds()).getTime()
+}
+
+/** 日期 d 所在月的下个月起点。 */
+function nextMonthStart(d) {
+  return new Date(d.getFullYear(), d.getMonth() + 1, 1).getTime()
+}
+
+/**
+ * 解析查询文本中的中文时间表达。
+ *
+ * @param {string} text 查询文本
+ * @param {{now?:number}} [opts] now:毫秒时间戳(注入以保证确定性;缺省 Date.now())
+ * @returns {null | {startMs:number, endMs:number, matched:string}}
+ *   null=未识别到时间表达(调用方零行为变更);否则为半开区间 [startMs, endMs)
+ *   与命中的原文子串 matched。多个表达命中时取**首个**(按下方模式表顺序,确定性)。
+ */
+export function parseTemporalQueryPre(text, opts = {}) {
+  try {
+    if (typeof text !== 'string' || !text) return null
+    const nowMs = Number.isFinite(opts.now) ? opts.now : Date.now()
+    const now = new Date(nowMs)
+    const today0 = startOfDay(now)
+    // 模式表(顺序即优先级:长/特异表达在前,防止子串误配,如"大前天"先于"前天"、"上上周"先于"上周")
+    const patterns = [
+      { re: /大前天/, fn: () => ({ startMs: today0 - 3 * DAY_MS, endMs: today0 - 2 * DAY_MS }) },
+      { re: /前天/, fn: () => ({ startMs: today0 - 2 * DAY_MS, endMs: today0 - DAY_MS }) },
+      { re: /昨天/, fn: () => ({ startMs: today0 - DAY_MS, endMs: today0 }) },
+      { re: /今天/, fn: () => ({ startMs: today0, endMs: today0 + DAY_MS }) },
+      { re: /上上周/, fn: () => ({ startMs: startOfWeek(now) - 14 * DAY_MS, endMs: startOfWeek(now) - 7 * DAY_MS }) },
+      { re: /上周/, fn: () => ({ startMs: startOfWeek(now) - 7 * DAY_MS, endMs: startOfWeek(now) }) },
+      { re: /本周|这一周|这个星期/, fn: () => ({ startMs: startOfWeek(now), endMs: startOfWeek(now) + 7 * DAY_MS }) },
+      { re: /上个月|上月/, fn: () => ({ startMs: monthStartShift(now, -1), endMs: startOfMonth(now) }) },
+      { re: /本月|这个月/, fn: () => ({ startMs: startOfMonth(now), endMs: nextMonthStart(now) }) },
+      { re: /去年/, fn: () => ({ startMs: new Date(now.getFullYear() - 1, 0, 1).getTime(), endMs: new Date(now.getFullYear(), 0, 1).getTime() }) },
+      { re: /今年/, fn: () => ({ startMs: new Date(now.getFullYear(), 0, 1).getTime(), endMs: new Date(now.getFullYear() + 1, 0, 1).getTime() }) },
+      // 最近 N 个自然周期:从 now 往前 N 个周期(半开区间 [now-N周期, now));月按日历月锚定 now 时刻
+      { re: /最近\s*([0-9零〇一二两三四五六七八九十百]+)\s*个?\s*月/, fn: (m) => {
+          const n = numToInt(m[1]); if (!Number.isInteger(n) || n < N_MIN || n > N_MAX) return null
+          return { startMs: nowShiftMonths(now, -n), endMs: nowMs }
+        } },
+      { re: /最近\s*([0-9零〇一二两三四五六七八九十百]+)\s*个?\s*(?:星期|周)/, fn: (m) => {
+          const n = numToInt(m[1]); if (!Number.isInteger(n) || n < N_MIN || n > N_MAX) return null
+          return { startMs: nowMs - n * 7 * DAY_MS, endMs: nowMs }
+        } },
+      { re: /最近\s*([0-9零〇一二两三四五六七八九十百]+)\s*(?:天|日)/, fn: (m) => {
+          const n = numToInt(m[1]); if (!Number.isInteger(n) || n < N_MIN || n > N_MAX) return null
+          return { startMs: nowMs - n * DAY_MS, endMs: nowMs }
+        } },
+      // N 个月前:定位到那个自然月(整月)
+      { re: /([0-9零〇一二两三四五六七八九十百]+)\s*个?\s*月前/, fn: (m) => {
+          const n = numToInt(m[1]); if (!Number.isInteger(n) || n < N_MIN || n > N_MAX) return null
+          return { startMs: monthStartShift(now, -n), endMs: monthStartShift(now, -n + 1) }
+        } },
+      // N 周(星期)前:定位到那个自然周(周一 00:00 起整周)
+      { re: /([0-9零〇一二两三四五六七八九十百]+)\s*个?\s*(?:星期|周)前/, fn: (m) => {
+          const n = numToInt(m[1]); if (!Number.isInteger(n) || n < N_MIN || n > N_MAX) return null
+          const base = startOfWeek(now) - n * 7 * DAY_MS
+          return { startMs: base, endMs: base + 7 * DAY_MS }
+        } },
+      // N 天(日)前:定位到那个自然日 00:00–24:00
+      { re: /([0-9零〇一二两三四五六七八九十百]+)\s*(?:天|日)前/, fn: (m) => {
+          const n = numToInt(m[1]); if (!Number.isInteger(n) || n < N_MIN || n > N_MAX) return null
+          const base = today0 - n * DAY_MS
+          return { startMs: base, endMs: base + DAY_MS }
+        } },
+    ]
+    for (const p of patterns) {
+      const m = p.re.exec(text)
+      if (!m) continue
+      const range = p.fn(m)
+      if (!range) continue
+      return { startMs: range.startMs, endMs: range.endMs, matched: m[0] }
+    }
+    return null
+  } catch (_) {
+    return null
+  }
+}
+
+/**
+ * 从 L0 候选 label 抽取候选时间戳(当日 00:00 本地)。
+ * label 形如日志/反思文件名(含 YYYY-MM-DD,如 "2026-09-09.md"、"reflections/2026-08-19.md");
+ * 非日期来源(".../MEMORY.md"、"~/MEMORY.md")→ null → 时间臂对该候选不参与(中性)。
+ */
+export function labelToDateMsPre(label) {
+  try {
+    const m = /(\d{4})-(\d{2})-(\d{2})/.exec(String(label || ''))
+    if (!m) return null
+    const d = new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
+    return Number.isFinite(d.getTime()) ? d.getTime() : null
+  } catch (_) {
+    return null
+  }
+}

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

package/python/worker_semantic_v1.py

@@ -959,11 +959,35 @@ class SemanticWorker(base.Worker):
         import traceback as _tb
         import sys as _sys
         try:
+            # P13:recall_rank 在 base dispatch(worker_v1.handle_frame)白名单外,在此拦截。
+            if req.get('type') == 'recall_rank':
+                return self.handle_recall_rank(req)
             return super().handle_frame(req)
         except Exception:
             _sys.stderr.write('[fv2-trace] ' + _tb.format_exc() + '\n')
             raise
 
+    def handle_recall_rank(self, req):
+        """P13:recall 的 C3 语义臂 —— 只读 dense_search(三重过滤:workspaceRef+scope+miv),
+        不写回、不改索引、不新造存储;embedder 未就绪/无 vectors/encode 失败/任何异常
+        → scores=[] fail-soft(不抛,JS 侧据此回退 C2→词法)。"""
+        p = req.get('payload') or {}
+        miv = str(p.get('memoryIndexVersion', p.get('miv', '')))
+        scores = []
+        try:
+            hits = self.dense_search(
+                str(p.get('query', '')),
+                str(p.get('workspaceKey', '')),
+                str(p.get('scope', 'Workspace')),
+                miv,
+                top_k=max(1, min(64, int(p.get('topK') or 20))),
+            )
+            scores = [{'memoryId': h['memoryId'], 'score': h['score']} for h in hits]
+        except Exception as exc:  # noqa: BLE001
+            base.diag('recall_rank-failed: ' + str(exc))
+        return [self._frame(req, 'recall_rank_result',
+                            {'scores': scores, 'miv': miv})]
+
     def handle_close_session(self, req):
         p = req.get('payload') or {}
         sid = str(p.get('sessionId', ''))
@@ -1294,7 +1318,10 @@ def run_loop(worker):
                                  'sentAt': obj.get('sentAt', 0)}
         except (UnicodeDecodeError, ValueError):
             obj = None
-        if not isinstance(obj, dict) or not base.envelope_shape_ok(obj):
+        # P13:recall_rank(JS→PY 新请求类型)在 base.envelope_shape_ok 的 JS_TYPES 白名单外,
+        # 在此显式放行(其余字段仍按协议帧校验);handler 在 SemanticWorker.handle_frame 拦截。
+        obj_type_ok = isinstance(obj, dict) and obj.get('type') == 'recall_rank'
+        if not isinstance(obj, dict) or not (obj_type_ok or base.envelope_shape_ok(obj)):
             out.write((base.dumps(worker.error_frame(req_for_error,
                                                      'invalid-envelope')) + '\n').encode('utf-8'))
             out.flush()