dsh-prime-memory 0.18.2 → 0.19.0

package/dist/store/trace.js

@@ -0,0 +1,149 @@
+/**
+ * §F 结构化追踪(memorax-absorb Wave 4 / task_28)——recall/distill 事件流。
+ *
+ * 模块级单例(token-cost.ts 同款):trace() 埋点拿不到 store 实例(store 在
+ * index.ts 运行时才有 dataDir),initTraceStore 启动时注入;未初始化或
+ * trace.enabled=false 时 trace() 为零副作用 no-op。
+ *
+ * 存储:按天 JSONL(`dataDir/trace/trace-YYYY-MM-DD.jsonl`,appendJsonl 原语),
+ * 文件名即日期 → 保留期清理在切日时触发(删除超 retentionDays 的旧文件);
+ * 单文件 >5MB 停写 + 写入一行 trace_truncated marker(防无限增长);
+ * 写失败静默(filelog 同款纪律——追踪绝不影响主链路)。
+ *
+ * 隐私默认 metadata-only:recall 事件只带 queryChars+querySha,
+ * captureContent=true 才存 queryText(截断 200)——由埋点方决定字段,本模块不感知。
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import { appendJsonl, dayKey, readJsonl } from '../util/io.js';
+const TRACE_DIR = 'trace';
+const DEFAULT_MAX_FILE_BYTES = 5 * 1024 * 1024;
+export class TraceStore {
+    dataDir;
+    opts;
+    /** 已停写的日期(5MB 上限触发;当日内后续事件丢弃,次日自动恢复)。 */
+    truncatedDays = new Set();
+    lastPruneDay = '';
+    chain = Promise.resolve();
+    constructor(dataDir, opts) {
+        this.dataDir = dataDir;
+        this.opts = opts;
+    }
+    /** 追加事件(异步串行链,失败静默)。 */
+    append(event) {
+        const day = dayKey(event.ts);
+        if (this.truncatedDays.has(day))
+            return;
+        this.chain = this.chain
+            .then(() => this.writeOne(day, event))
+            .catch(() => {
+            /* 静默:追踪失败不影响主链路 */
+        });
+    }
+    /** 等待挂起的写入排空(dispose 序用)。 */
+    flush() {
+        return this.chain;
+    }
+    /**
+     * 尾部读取:从最近的日期文件倒序收集,按 kind 过滤,返回至多 `lines` 条
+     * (按写入顺序 = 时间升序)。坏行跳过(readJsonl 同款)。
+     */
+    async tail(lines, kind) {
+        const limit = Math.max(1, Math.min(500, Math.round(lines) || 100));
+        const files = this.recentFiles();
+        const collected = [];
+        for (let i = files.length - 1; i >= 0 && collected.length < limit; i--) {
+            const rows = await readJsonl(files[i]);
+            for (let j = rows.length - 1; j >= 0 && collected.length < limit; j--) {
+                const row = rows[j];
+                if (!row || typeof row !== 'object' || !row.kind)
+                    continue;
+                if (kind && row.kind !== kind)
+                    continue;
+                collected.push(row);
+            }
+        }
+        return collected.reverse();
+    }
+    dir() {
+        return path.join(this.dataDir, TRACE_DIR);
+    }
+    fileFor(day) {
+        return path.join(this.dir(), `trace-${day}.jsonl`);
+    }
+    recentFiles() {
+        try {
+            return fs
+                .readdirSync(this.dir())
+                .filter((f) => f.startsWith('trace-') && f.endsWith('.jsonl'))
+                .sort()
+                .map((f) => path.join(this.dir(), f));
+        }
+        catch {
+            return [];
+        }
+    }
+    async writeOne(day, event) {
+        if (day !== this.lastPruneDay) {
+            this.lastPruneDay = day;
+            this.pruneOldDays(day);
+        }
+        const file = this.fileFor(day);
+        try {
+            const stat = await fs.promises.stat(file);
+            if (stat.size > (this.opts.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES)) {
+                this.truncatedDays.add(day);
+                await appendJsonl(file, [
+                    { kind: 'trace_truncated', ts: event.ts, note: '单日文件超上限,当日停写(次日自动恢复)' },
+                ]);
+                return;
+            }
+        }
+        catch {
+            /* 文件不存在 = 首写,继续 */
+        }
+        await appendJsonl(file, [event]);
+    }
+    /** 删除超过保留期的旧日文件(retentionDays 0 = 永久)。 */
+    pruneOldDays(today) {
+        if (this.opts.retentionDays <= 0)
+            return;
+        let files;
+        try {
+            files = fs.readdirSync(this.dir());
+        }
+        catch {
+            return;
+        }
+        const todayMs = Date.parse(`${today}T00:00:00`);
+        for (const f of files) {
+            const m = /^trace-(\d{4}-\d{2}-\d{2})\.jsonl$/.exec(f);
+            if (!m)
+                continue;
+            const dayMs = Date.parse(`${m[1]}T00:00:00`);
+            if (!Number.isFinite(dayMs) || !Number.isFinite(todayMs))
+                continue;
+            if (todayMs - dayMs > this.opts.retentionDays * 86_400_000) {
+                fs.promises.rm(path.join(this.dir(), f), { force: true }).catch(() => { });
+            }
+        }
+    }
+}
+// ── 模块级单例(token-cost.ts 同款) ──
+let store = null;
+/** 插件启动时注入(index.ts 调用);enabled=false 或 0 天保留不影响初始化本身。 */
+export function initTraceStore(dataDir, opts) {
+    store = new TraceStore(dataDir, opts);
+}
+/** 测试/卸载:清空单例。 */
+export function resetTraceStore() {
+    store = null;
+}
+/** 埋点入口:未初始化 = no-op。fire-and-forget,永不抛。 */
+export function trace(event) {
+    store?.append(event);
+}
+/** RPC tail 数据源;未初始化返回 undefined(端点回空集)。 */
+export function getTraceStore() {
+    return store;
+}

package/dist/tools/index.js

@@ -4,9 +4,30 @@ import { listConflictPairs, renderConflictResolution, renderConflicts, resolveCo
 import { WING_CATALOG, WING_FALLBACK, normPersistence, normScope, resolveRecordScope } from '../types.js';
 import { scopeFilterOf, workspaceIdOf } from '../workspace.js';
 import { GRAPH_STATUS_LABELS } from '../prompts/graph-projection.js';
+import { redactSecrets } from '../util/redact.js';
 const OFF_NOTICE = '本会话的记忆档位为"关闭":该会话对记忆系统完全隐身,不读取也不写入记忆。';
 const WRITE_ONLY_NOTICE = '本会话为只写模式:记忆照常沉淀,但不读取。';
 const GLOBAL_OFF_NOTICE = '记忆注入已全局停用:本会话不读取记忆(沉淀照常)。';
+/** §C 一次性告警标记:手动写入路径的脱敏失败只提示一次(不阻断写入)。 */
+let manualRedactWarnedOnce = false;
+/**
+ * §C 手动写入路径脱敏(memorax-absorb / task_18):memory_add / memory_import
+ * 与捕获路径走同一 8 类词表,两条 L1 写入边界语义一致。
+ * 红线:脱敏失败放行原文 + 一次性 warn(不阻断写入)。
+ */
+function applyManualRedaction(record, cfg, logger) {
+    if (cfg.capture?.redactSecrets === false)
+        return;
+    try {
+        record.content = redactSecrets(record.content).text;
+    }
+    catch (err) {
+        if (!manualRedactWarnedOnce) {
+            manualRedactWarnedOnce = true;
+            logger.warn(`[memory] 手动写入脱敏失败,放行原文(一次性提示): ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+}
 export function registerMemoryTools(ctx, cfg, stores, logger, modes, live, 
 /** 反刍控制器(可选:未装配时 ruminate 工具返回未启用提示)。 */
 ruminate) {
@@ -362,6 +383,7 @@ ruminate) {
                 return { notice: 'content 为空,未写入' };
             const scene = typeof args.scene === 'string' && args.scene.trim() ? args.scene.trim().slice(0, 120) : '__manual__';
             const record = buildRecord(args, scene, Date.now(), workspaceIdOf(exec));
+            applyManualRedaction(record, cfg, logger);
             await stores.l1.appendNew([record]);
             logger.info(`[memory] 高权限写入记忆(${record.type}${record.metadata?.hall ? '/' + String(record.metadata.hall) : ''},时间轴 ${record.persistence ?? '?'}):${record.content.slice(0, 120)}`);
             return { id: record.id };
@@ -455,7 +477,9 @@ ruminate) {
                     return;
                 }
                 seen.add(key);
-                records.push(buildRecord(item, scene, now, workspaceIdOf(exec)));
+                const record = buildRecord(item, scene, now, workspaceIdOf(exec));
+                applyManualRedaction(record, cfg, logger);
+                records.push(record);
             });
             if (records.length > 0)
                 await stores.l1.appendNew(records);

package/dist/util/redact.d.ts

@@ -0,0 +1,27 @@
+/**
+ * §C 载荷脱敏(memorax-absorb Wave 2 / task_14)——捕获边界的密钥擦除。
+ *
+ * 用户在对话里贴入的密钥(PEM/Bearer/JWT/Cookie/厂商 API key/邮箱/长号/高熵 ID)
+ * 若原样进 L0/L1,会被逐轮召回注入上下文并在 UI 展示。本模块在捕获单点把它们
+ * 替换为类型化占位符 `[REDACTED:<KIND>]`——占位符保留类别语义,关键词检索仍可命中。
+ *
+ * 词表/正则/allowlist/span 合并算法以 memorax `payload-redaction.ts` 为基准逐条移植
+ * (全文快照见计划 evidence/payload-redaction-snapshot.ts;findings.md 有等价内联)。
+ *
+ * 契约(sanitize 同款,tests/redact.test.ts 钉住):
+ * - 纯函数,零 I/O 零时钟零随机;输入原样返回(未命中)= 引用不变无关紧要,字符串不可变;
+ * - **幂等**:已是 `[REDACTED:KIND]` 的值不会被二次匹配;
+ * - 安全值 allowlist 命中不脱(`example`/`change-me`/`$VAR`/`${{…}}` 等);
+ * - 本函数**永不抛错**的保证由调用方 try/catch 兜底(capture 接线层,§C 红线:失败放行原文)。
+ */
+export type RedactionKind = 'PRIVATE_KEY' | 'AUTH_TOKEN' | 'COOKIE' | 'API_KEY' | 'CREDENTIAL' | 'EMAIL' | 'LONG_NUMBER' | 'OPAQUE_ID';
+export interface RedactionResult {
+    text: string;
+    counts: Partial<Record<RedactionKind, number>>;
+    redacted: boolean;
+}
+/**
+ * 对文本执行 8 类脱敏。规则各自扫描 → 收集值级 span → 合并重叠 → 重拼插入占位符。
+ * 同一位置被多条规则命中时取更长/更高优先级的 span。
+ */
+export declare function redactSecrets(text: string): RedactionResult;

package/dist/util/redact.js

@@ -0,0 +1,228 @@
+/**
+ * §C 载荷脱敏(memorax-absorb Wave 2 / task_14)——捕获边界的密钥擦除。
+ *
+ * 用户在对话里贴入的密钥(PEM/Bearer/JWT/Cookie/厂商 API key/邮箱/长号/高熵 ID)
+ * 若原样进 L0/L1,会被逐轮召回注入上下文并在 UI 展示。本模块在捕获单点把它们
+ * 替换为类型化占位符 `[REDACTED:<KIND>]`——占位符保留类别语义,关键词检索仍可命中。
+ *
+ * 词表/正则/allowlist/span 合并算法以 memorax `payload-redaction.ts` 为基准逐条移植
+ * (全文快照见计划 evidence/payload-redaction-snapshot.ts;findings.md 有等价内联)。
+ *
+ * 契约(sanitize 同款,tests/redact.test.ts 钉住):
+ * - 纯函数,零 I/O 零时钟零随机;输入原样返回(未命中)= 引用不变无关紧要,字符串不可变;
+ * - **幂等**:已是 `[REDACTED:KIND]` 的值不会被二次匹配;
+ * - 安全值 allowlist 命中不脱(`example`/`change-me`/`$VAR`/`${{…}}` 等);
+ * - 本函数**永不抛错**的保证由调用方 try/catch 兜底(capture 接线层,§C 红线:失败放行原文)。
+ */
+const PLACEHOLDER_VALUE_PATTERN = /^\[REDACTED:[A-Z_]+\]$/;
+const SENSITIVE_KEY_SOURCE = String.raw `(?:[A-Za-z_$][A-Za-z0-9_$-]*)?(?:password|passwd|pwd|client[-_$]?secret|consumer[-_$]?secret|api[-_$]?key|access[-_$]?token|refresh[-_$]?token|auth[-_$]?token|id[-_$]?token|private[-_$]?key|secret[-_$]?access[-_$]?key|secret[-_$]?key|credential|secret|token)`;
+const CREDENTIAL_VALUE_SOURCE = String.raw `(?:\[REDACTED:[A-Z_]+\]|\$\{\{[^\r\n]*?\}\}|\{\{[^\r\n]*?\}\}|\$\{[^}\r\n]+\}|\$[A-Za-z_][A-Za-z0-9_]*|"(?:\\.|[^"\\\r\n])*"|'(?:\\.|[^'\\\r\n])*'|[^,;#}\]\)\r\n]+)`;
+/** 安全值 allowlist:命中即放行(示例/占位/环境变量引用/类型名等,脱了只会毁记忆)。 */
+const SAFE_CREDENTIAL_VALUE_PATTERN = /^(?:\[REDACTED:[A-Z_]+\]|\$\{\{[^\r\n]*\}\}|\{\{[^\r\n]*\}\}|\$\{[A-Z_][A-Z0-9_]*\}|\$[A-Z_][A-Z0-9_]*|(?:process\.)?env\.[A-Z_][A-Z0-9_]*|<[^>]+>|--\S+|x{2,}|\*{2,}|\.{3}|sk[_-]x+|example|sample|change-?me|(?:your|replace)[-_][a-z0-9_-]+|string|str|number|boolean|unknown|any|null|undefined|none)$/i;
+const RULES = [
+    {
+        // PEM 私钥块:至对应 END,截断文件时取到文末
+        pattern: /-----BEGIN ((?:(?:RSA|EC|DSA|OPENSSH|ENCRYPTED) )?PRIVATE KEY|PGP PRIVATE KEY BLOCK)-----[\s\S]*?(?:-----END \1-----|$)/gi,
+        kind: 'PRIVATE_KEY',
+        priority: 100,
+    },
+    {
+        pattern: /(?:^|[\r\n])[ \t]*(?:Proxy-)?Authorization[ \t]*:[ \t]*([^ \t\r\n][^\r\n]*)/gim,
+        group: 1,
+        kind: 'AUTH_TOKEN',
+        priority: 95,
+    },
+    {
+        pattern: /(?:^|[^A-Za-z0-9_-])(?:Bearer|Basic)\s+["']?([A-Za-z0-9._~+/=-]{16,})(?![A-Za-z0-9._~+/=-])/gi,
+        group: 1,
+        kind: 'AUTH_TOKEN',
+        priority: 94,
+    },
+    {
+        // JWT 三段形态
+        pattern: /\beyJ[A-Za-z0-9_-]{5,}\.eyJ[A-Za-z0-9_-]{5,}\.[A-Za-z0-9_-]{16,}\b/g,
+        kind: 'AUTH_TOKEN',
+        priority: 94,
+    },
+    {
+        pattern: /(?:^|[\r\n])[ \t]*(?:Set-Cookie|Cookie)\s*:\s*([^\r\n]+)/gim,
+        group: 1,
+        kind: 'COOKIE',
+        priority: 92,
+    },
+    {
+        // 声明式赋值:key: value / key = value(含 export/const/let/var 前缀与引号键)
+        pattern: new RegExp(String.raw `(?:^|[\r\n;,{}])[ \t]*(?:-[ \t]+)?(?:(?:export|const|let|var)[ \t]+)*["']?${SENSITIVE_KEY_SOURCE}["']?[ \t]*[:=][ \t]*(${CREDENTIAL_VALUE_SOURCE})`, 'gim'),
+        group: 1,
+        kind: 'CREDENTIAL',
+        priority: 85,
+        accept: (value) => !isSafeCredentialValue(value),
+    },
+    {
+        // CLI 形态:--api-key value / --api-key=value
+        pattern: new RegExp(String.raw `--${SENSITIVE_KEY_SOURCE}(?![A-Za-z0-9_$-])(?:[ \t]+|=[ \t]*)(${CREDENTIAL_VALUE_SOURCE})`, 'gi'),
+        group: 1,
+        kind: 'CREDENTIAL',
+        priority: 85,
+        accept: (value) => !isSafeCredentialValue(value),
+    },
+    {
+        // URL query 形态:?api_key=...
+        pattern: new RegExp(String.raw `[?&]${SENSITIVE_KEY_SOURCE}(?![A-Za-z0-9_$-])=([^&#\s"'<>]+)`, 'gi'),
+        group: 1,
+        kind: 'CREDENTIAL',
+        priority: 85,
+        accept: (value) => !isSafeCredentialValue(value),
+    },
+    {
+        // URL userinfo 形态:scheme://user:pass@
+        pattern: /\b[A-Za-z][A-Za-z0-9+.-]*:\/\/[^\s/:@]*:([^\s/@]+)@/g,
+        group: 1,
+        kind: 'CREDENTIAL',
+        priority: 85,
+        accept: (value) => !isSafeCredentialValue(value),
+    },
+    // ── 已知厂商 API key 形态(9 条) ──
+    { pattern: /\bsk-(?:proj-)?[A-Za-z0-9_-]{16,}[A-Za-z0-9]\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\bsk_[A-Za-z0-9_-]{8,}\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\b(?:gh[pousr]_[A-Za-z0-9]{20,}|github_pat_[A-Za-z0-9_]{20,})\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\b(?:AKIA|ASIA)[A-Z0-9]{16}\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\bxox[baprs]-[A-Za-z0-9-]{16,}[A-Za-z0-9]\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\b(?:(?:sk|rk)_live_[A-Za-z0-9]{16,}|whsec_[A-Za-z0-9]{16,})\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\bglpat-[A-Za-z0-9_-]{16,}[A-Za-z0-9]\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\bAIza[0-9A-Za-z_-]{35}\b/g, kind: 'API_KEY', priority: 80 },
+    { pattern: /\bnpm_[A-Za-z0-9]{36}\b/g, kind: 'API_KEY', priority: 80 },
+    {
+        // 邮箱(前后向断言防误切)
+        pattern: /(?<![A-Z0-9._%+-])[A-Z0-9._%+-]{1,64}@[A-Z0-9](?:[A-Z0-9.-]{0,251}[A-Z0-9])?\.[A-Z]{2,63}(?![A-Z0-9-]|\.[A-Z0-9])/gi,
+        kind: 'EMAIL',
+        priority: 70,
+    },
+    {
+        // UUID
+        pattern: /(?<![A-Za-z0-9])[0-9A-Fa-f]{8}-(?:[0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}(?![A-Za-z0-9])/g,
+        kind: 'OPAQUE_ID',
+        priority: 60,
+    },
+    {
+        // hex 64/40/32(含字母才脱——纯数字是普通长号,交 LONG_NUMBER)
+        pattern: /(?<![A-Za-z0-9])(?:[0-9A-Fa-f]{64}|[0-9A-Fa-f]{40}|[0-9A-Fa-f]{32})(?![A-Za-z0-9])/g,
+        kind: 'OPAQUE_ID',
+        priority: 60,
+        accept: (value) => /[A-Fa-f]/.test(value),
+    },
+    {
+        // ≥24 位字母数字高熵启发式(熵参数见 looksLikeHighEntropyOpaqueId)
+        pattern: /(?<![A-Za-z0-9])[A-Za-z0-9]{24,}(?![A-Za-z0-9])/g,
+        kind: 'OPAQUE_ID',
+        priority: 60,
+        accept: looksLikeHighEntropyOpaqueId,
+    },
+    {
+        // ≥9 位数字串(含电话形);日期形放行
+        pattern: /(?<![A-Za-z0-9.])\+?(?:\d|\(\d)[\d ()-]*\d[Xx]?\)?(?![A-Za-z0-9]|\.\d)/g,
+        kind: 'LONG_NUMBER',
+        priority: 50,
+        accept: (value) => {
+            if (value.replace(/\D/g, '').length < 9)
+                return false;
+            const normalized = value.trim().replace(/[()]/g, '');
+            return (!/^(?:19|20)\d{2}-\d{1,2}-\d{1,2}(?:[ T-]\d{1,2})?$/.test(normalized) &&
+                !/^(?:19|20)\d{2}\s+\d{1,2}\s+\d{1,2}(?:\s+\d{1,2})?$/.test(normalized));
+        },
+    },
+];
+/**
+ * 对文本执行 8 类脱敏。规则各自扫描 → 收集值级 span → 合并重叠 → 重拼插入占位符。
+ * 同一位置被多条规则命中时取更长/更高优先级的 span。
+ */
+export function redactSecrets(text) {
+    if (!text)
+        return { text, counts: {}, redacted: false };
+    const spans = [];
+    for (const rule of RULES)
+        collectRuleSpans(text, rule, spans);
+    const selected = mergeOverlappingSpans(spans);
+    if (selected.length === 0)
+        return { text, counts: {}, redacted: false };
+    const counts = {};
+    const output = [];
+    let offset = 0;
+    for (const span of selected) {
+        output.push(text.slice(offset, span.start), `[REDACTED:${span.kind}]`);
+        counts[span.kind] = (counts[span.kind] ?? 0) + 1;
+        offset = span.end;
+    }
+    output.push(text.slice(offset));
+    return { text: output.join(''), counts, redacted: true };
+}
+function collectRuleSpans(text, rule, spans) {
+    rule.pattern.lastIndex = 0;
+    for (const match of text.matchAll(rule.pattern)) {
+        const value = match[rule.group ?? 0];
+        if (match.index === undefined || !value || PLACEHOLDER_VALUE_PATTERN.test(value.trim()))
+            continue;
+        if (rule.accept && !rule.accept(value))
+            continue;
+        const relativeStart = match[0].lastIndexOf(value);
+        if (relativeStart < 0)
+            continue;
+        spans.push({
+            start: match.index + relativeStart,
+            end: match.index + relativeStart + value.length,
+            kind: rule.kind,
+            priority: rule.priority,
+        });
+    }
+}
+function isSafeCredentialValue(rawValue) {
+    let value = rawValue.trim();
+    if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+        value = value.slice(1, -1).trim();
+    }
+    return !value || SAFE_CREDENTIAL_VALUE_PATTERN.test(value);
+}
+/** 高熵判定:小写≥2 ∧ 大写≥2 ∧ 数字≥2 ∧ 字符类切换≥4 ∧ 最长连续字母段≤5 ∧ 去重字符≥12。 */
+function looksLikeHighEntropyOpaqueId(value) {
+    let lowercase = 0;
+    let uppercase = 0;
+    let digits = 0;
+    let transitions = 0;
+    let letterRun = 0;
+    let longestLetterRun = 0;
+    let previousWasDigit;
+    const unique = new Set();
+    for (const character of value) {
+        const isDigit = character >= '0' && character <= '9';
+        if (isDigit) {
+            digits += 1;
+            letterRun = 0;
+        }
+        else {
+            if (character >= 'a' && character <= 'z')
+                lowercase += 1;
+            else
+                uppercase += 1;
+            letterRun += 1;
+            longestLetterRun = Math.max(longestLetterRun, letterRun);
+        }
+        if (previousWasDigit !== undefined && previousWasDigit !== isDigit)
+            transitions += 1;
+        previousWasDigit = isDigit;
+        unique.add(character);
+    }
+    return lowercase >= 2 && uppercase >= 2 && digits >= 2 && transitions >= 4 && longestLetterRun <= 5 && unique.size >= 12;
+}
+function mergeOverlappingSpans(spans) {
+    const sorted = [...spans].sort((left, right) => left.start - right.start || right.end - left.end || right.priority - left.priority);
+    const merged = [];
+    for (const span of sorted) {
+        const previous = merged.at(-1);
+        if (!previous || span.start >= previous.end) {
+            merged.push({ ...span });
+            continue;
+        }
+        previous.end = Math.max(previous.end, span.end);
+    }
+    return merged;
+}

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "dsh-prime-memory",
   "name": "dsh-prime-memory",
-  "version": "0.17.0-dsh0.1.7.3",
+  "version": "0.19.0-dsh0.2.0.1",
   "description": {
     "en": "Layered distilled memory plugin (L0 capture → L1 atomic memory → L2 scenes → L3 persona) with automatic recall injection before each model step.",
     "zh": "L0~L3 分层蒸馏记忆插件:自动捕获对话、抽取原子记忆、整合场景块、蒸馏核心画像,并在模型步骤前自动召回注入。"
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "engines": {
-    "dsh": ">=0.1.7-rc.1 <0.1.8-0"
+    "dsh": ">=0.2.0-rc.1 <0.2.1-0"
   },
   "components": {
     "host": "dist/index.js",

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "dsh-prime-memory",
-  "version": "0.18.2",
+  "version": "0.19.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public",
-    "tag": "dsh-0.1.7"
+    "tag": "dsh-0.2.0"
   },
   "description": "L0~L3 分层蒸馏记忆插件 for DeepSeek Harness：自动捕获对话（L0）、抽取原子记忆（L1）、整合场景块（L2）、蒸馏核心画像/团队方法论（L3），并在模型步骤前自动召回注入。移植自 MemoryCore (TencentDB Agent Memory) 的管线设计。",
   "type": "module",
@@ -61,7 +61,7 @@
   },
   "engines": {
     "node": ">=22.16.0",
-    "dsh": ">=0.1.7-rc.1 <0.1.8-0"
+    "dsh": ">=0.2.0-rc.1 <0.2.1-0"
   },
   "keywords": [
     "dsh",
@@ -83,15 +83,15 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": ">=0.1.1-rc.2 <0.1.2-0 || >=0.1.2-rc.1 <0.1.3-0 || >=0.1.3-rc.1 <0.1.4-0 || >=0.1.5-rc.2 <0.1.8-0",
-    "@deepseek-ai/dsh-client-connection": ">=0.1.7-rc.1 <0.1.8-0",
-    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.7-rc.1 <0.1.8-0",
-    "@deepseek-ai/dsh-home-paths": ">=0.1.1-rc.2 <0.1.2-0 || >=0.1.2-rc.1 <0.1.3-0 || >=0.1.3-rc.1 <0.1.4-0 || >=0.1.5-rc.2 <0.1.8-0",
-    "@deepseek-ai/dsh-llm": ">=0.1.1-rc.2 <0.1.2-0 || >=0.1.2-rc.1 <0.1.3-0 || >=0.1.3-rc.1 <0.1.4-0 || >=0.1.5-rc.2 <0.1.8-0",
-    "@deepseek-ai/dsh-session": ">=0.1.1-rc.2 <0.1.2-0 || >=0.1.2-rc.1 <0.1.3-0 || >=0.1.3-rc.1 <0.1.4-0 || >=0.1.5-rc.2 <0.1.8-0",
-    "@deepseek-ai/dsh-settings": ">=0.1.1-rc.2 <0.1.2-0 || >=0.1.2-rc.1 <0.1.3-0 || >=0.1.3-rc.1 <0.1.4-0 || >=0.1.5-rc.2 <0.1.8-0",
-    "@deepseek-ai/dsh-system-prompt": ">=0.1.1-rc.2 <0.1.2-0 || >=0.1.2-rc.1 <0.1.3-0 || >=0.1.3-rc.1 <0.1.4-0 || >=0.1.5-rc.2 <0.1.8-0",
-    "@deepseek-ai/dsh-tools": ">=0.1.1-rc.2 <0.1.2-0 || >=0.1.2-rc.1 <0.1.3-0 || >=0.1.3-rc.1 <0.1.4-0 || >=0.1.5-rc.2 <0.1.8-0"
+    "@deepseek-ai/dsh-agent": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-client-connection": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-client-ui-primitives": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-home-paths": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-llm": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-session": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-settings": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-system-prompt": ">=0.2.0-rc.1 <0.2.1-0",
+    "@deepseek-ai/dsh-tools": ">=0.2.0-rc.1 <0.2.1-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-agent": {
@@ -125,15 +125,15 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
     "@deepseek-ai/cordis-plugin-loader": "^1.0.5",
-    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-default-model": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-connection": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-agent": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-agent-default-model": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-connection": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-home-paths": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-session": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.2.0-rc.1",
+    "@deepseek-ai/dsh-tools": "0.2.0-rc.1",
     "@deepseek-ai/schemastery": "^3.18.4",
     "@eslint/js": "^10.0.1",
     "@types/node": "^22.0.0",
@@ -143,6 +143,7 @@
     "globals": "^17.12.0",
     "typescript": "^5.6.0",
     "typescript-eslint": "^8.69.0",
-    "vitest": "^4.1.11"
+    "vitest": "^4.1.11",
+    "@deepseek-ai/dsh-compaction": "0.2.0-rc.1"
   }
 }