@stardustlc/dsh-dream 0.3.1 → 0.3.2

package/README.en.md

@@ -1,5 +1,7 @@
 [简体中文](README.md)
 
+![npm](https://img.shields.io/npm/v/@stardustlc/dsh-dream) ![downloads](https://img.shields.io/npm/dm/@stardustlc/dsh-dream) ![license](https://img.shields.io/github/license/STARDUSTLC666/dsh-dream) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-dream?style=social)
+
 # dsh-dream
 
 > **An agent that dreams**: session replay (dream material) → reflection (interpretation) → dream journal (memory consolidation).
@@ -8,7 +10,9 @@ Humans consolidate memories by replaying the day during sleep — dsh-dream give
 
 ## Compatibility
 
-Verified against `@deepseek-ai/dsh@0.1.2-alpha.2` (2026-08-31). Follows the cordis patch-bundle model (`cordis.patch.yml` + `dsh.bundle.patch`); no runtime imports of `@deepseek-ai/*` internals. Session reading is layout-blind with respect to the official JSONL-zstd multi-frame format and packed-chunk rows.
+Adapted to the session contracts in `@deepseek-ai/dsh@0.1.3-alpha.1`. Follows the cordis patch-bundle model (`cordis.patch.yml` + `dsh.bundle.patch`), with no runtime imports of `@deepseek-ai/*` internals. Reads v0/v1/v2 plaintext JSONL and multi-frame zstd, legacy packed chunks, and v2 embedded streams. When migrations retain older generations, only the newest canonical file is selected per session.
+
+Default data directories follow `DSH_HOME`: `sessions` for session logs and `.dsh-dream` for the journal. Without `DSH_HOME`, the base is `~/.dsh`. Explicit `sessionsRoot` and `journalDir` settings take precedence.
 
 ## Install / Uninstall
 
@@ -48,7 +52,7 @@ Read-only access to the sessions directory; appends JSONL to the journal directo
 
 ```bash
 pnpm install
-pnpm test   # build + 48 tests (multi-frame zstd fixtures, packed-chunk decoding, privacy masking, journal round-trip, bridge idempotency, stats, six tools, registration lifecycle)
+pnpm test   # build + offline tests (session generations, zstd, streams, masking, journal, bridge, registration)
 ```
 
 ## License

package/README.md

@@ -4,13 +4,15 @@
 
 > **会做梦的 agent**：会话回放（梦原料）→ 反思（解梦）→ 梦境日记（记忆巩固）。
 
-![license](https://img.shields.io/github/license/STARDUSTLC666/dsh-dream) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-dream?style=social)
+![npm](https://img.shields.io/npm/v/@stardustlc/dsh-dream) ![downloads](https://img.shields.io/npm/dm/@stardustlc/dsh-dream) ![license](https://img.shields.io/github/license/STARDUSTLC666/dsh-dream) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-dream?style=social)
 
 人睡觉时大脑回放白天的经历、巩固记忆——dsh-dream 让 DeepSeek Harness 的 agent 也拥有这个能力：读取你的历史会话（官方多帧 zstd 会话日志，零依赖解析），提炼梦原料，反思后写入永久梦境日记，下次醒来可以忆梦。
 
 ## 兼容性
 
-在 `@deepseek-ai/dsh@0.1.2-alpha.2` 上验证（2026-08-31）。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。会话读取兼容官方 JSONL-zstd 多帧格式与 packed-chunk 行（只取所需事件类型，布局无关）。
+按 `@deepseek-ai/dsh@0.1.3-alpha.1` 的会话接口适配。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。支持 v0/v1/v2 的普通 JSONL 与多帧 zstd、旧 packed-chunk 行和 v2 内嵌 stream。升级留下多个代际文件时，每个会话只读取最新规范文件。
+
+默认从 `DSH_HOME/sessions` 读取会话、在 `DSH_HOME/.dsh-dream` 保存日记；未设置 `DSH_HOME` 时使用 `~/.dsh`。配置中的 `sessionsRoot`、`journalDir` 始终优先。
 
 ## 安装
 
@@ -95,7 +97,7 @@ dream_bridge { path: "AGENTS.md", maxLessons: 10 }
 
 ```bash
 pnpm install
-pnpm test       # 构建 + 48 个测试（多帧 zstd 夹具、打包行解码、隐私脱敏、梦境日记往返、记忆桥接幂等、统计、六工具、注册生命周期）
+pnpm test       # 构建 + 离线测试（会话代际、多帧 zstd、流式记录、隐私脱敏、日记、桥接与注册生命周期）
 ```
 
 ## License

package/lib/config.d.ts

@@ -14,4 +14,4 @@ export interface ResolvedDreamConfig {
     maskSecrets: boolean;
 }
 /** 解析并校验插件配置。 */
-export declare function resolveConfig(raw?: Record<string, unknown> | null): ResolvedDreamConfig;
+export declare function resolveConfig(raw?: Record<string, unknown> | null, env?: NodeJS.ProcessEnv): ResolvedDreamConfig;

package/lib/config.js

@@ -14,12 +14,12 @@ function clamp(value, fallback, min, max) {
     return Math.min(max, Math.max(min, Math.round(value)));
 }
 /** 解析并校验插件配置。 */
-export function resolveConfig(raw) {
+export function resolveConfig(raw, env = process.env) {
     const cfg = raw ?? {};
-    const home = homedir();
+    const dshHome = str(env.DSH_HOME, join(homedir(), '.dsh'));
     return {
-        sessionsRoot: str(cfg.sessionsRoot, join(home, '.dsh', 'sessions')),
-        journalDir: str(cfg.journalDir, join(home, '.dsh', '.dsh-dream')),
+        sessionsRoot: str(cfg.sessionsRoot, join(dshHome, 'sessions')),
+        journalDir: str(cfg.journalDir, join(dshHome, '.dsh-dream')),
         maxSessions: clamp(cfg.maxSessions, 10, 1, 50),
         maxCharsPerSession: clamp(cfg.maxCharsPerSession, 6000, 500, 50000),
         maxUserMessages: clamp(cfg.maxUserMessages, 5, 1, 20),

package/lib/sessions.js

@@ -1,5 +1,5 @@
 /**
- * DSH 会话日志读取：官方格式为“多帧 zstd 拼接的 JSONL”。
+ * DSH 会话日志读取：兼容 v0/v1/v2 的 JSONL 与多帧 zstd。
  * 首个逻辑行是会话头（{ type: 'session', ... }），其后每行一条存储记录（{ type, seq, time, data }）。
  * 本模块只读不写；损坏帧/行一律容错跳过。
  *
@@ -78,7 +78,8 @@ export function digestSessionFile(filePath, maxUserMessages) {
         return null;
     let text;
     try {
-        text = decompressAll(readFileSync(filePath));
+        const bytes = readFileSync(filePath);
+        text = filePath.endsWith('.zstd') ? decompressAll(bytes) : bytes.toString('utf8');
     }
     catch {
         return null;
@@ -91,6 +92,8 @@ export function digestSessionFile(filePath, maxUserMessages) {
         const first = JSON.parse(lines[0]);
         if (first.type !== 'session')
             return null;
+        if (first.version !== undefined && ![0, 1, 2].includes(first.version))
+            return null;
         header = {
             id: String(first.id ?? ''),
             createdAt: typeof first.createdAt === 'number' ? first.createdAt : 0,
@@ -113,6 +116,31 @@ export function digestSessionFile(filePath, maxUserMessages) {
         streamTail: '',
         endedAt: null,
     };
+    const appendStreamText = (text) => {
+        digest.streamTail = (digest.streamTail + text).slice(-4000);
+    };
+    const appendToolName = (name) => {
+        if (typeof name === 'string' && name !== '' && digest.toolCalls.length < 200)
+            digest.toolCalls.push(name);
+    };
+    const readStreamRecord = (value) => {
+        if (typeof value !== 'object' || value === null)
+            return;
+        const record = value;
+        if (record.type === 'text-chunks' && Array.isArray(record.texts)) {
+            appendStreamText(record.texts.filter((part) => typeof part === 'string').join(''));
+        }
+        else if (record.type === 'tool-call-chunks') {
+            appendToolName(record.name);
+        }
+        else if (record.type === 'chunk' && typeof record.chunk === 'object' && record.chunk !== null) {
+            const chunk = record.chunk;
+            if (chunk.type === 'text-delta' && typeof chunk.text === 'string')
+                appendStreamText(chunk.text);
+            if (chunk.type === 'tool-call-start')
+                appendToolName(chunk.name);
+        }
+    };
     for (const line of lines.slice(1)) {
         let rec;
         try {
@@ -121,11 +149,20 @@ export function digestSessionFile(filePath, maxUserMessages) {
         catch {
             continue;
         }
+        if (typeof rec !== 'object' || rec === null || Array.isArray(rec))
+            continue;
         const type = String(rec.type ?? '');
         const data = rec.data;
-        const time = typeof rec.time === 'number' ? rec.time : null;
+        const time = typeof rec.time === 'number' ? rec.time : typeof rec.time0 === 'number' ? rec.time0 : null;
         if (time !== null && (digest.endedAt === null || time > digest.endedAt))
             digest.endedAt = time;
+        // v2 把流式片段内嵌进 message/attempt；v0 的独立打包行继续兼容。
+        if ((type === 'assistant/message' || type === 'assistant/attempt') && typeof data === 'object' && data !== null) {
+            const stream = data.stream;
+            if (Array.isArray(stream))
+                for (const record of stream)
+                    readStreamRecord(record);
+        }
         if (type === 'session/title') {
             digest.title = textOf(data);
         }
@@ -146,24 +183,15 @@ export function digestSessionFile(filePath, maxUserMessages) {
             }
         }
         else if (type === 'tool/call') {
-            const name = typeof data === 'object' && data !== null ? String(data.name ?? '') : '';
-            if (name !== '' && digest.toolCalls.length < 200)
-                digest.toolCalls.push(name);
-        }
-        else if (type === 'text-chunks') {
-            // 官方打包行：{ data: { texts: string[], ... } }，还原流式正文
-            const texts = typeof data === 'object' && data !== null ? data.texts : undefined;
-            if (Array.isArray(texts)) {
-                digest.streamTail += texts.filter((t) => typeof t === 'string').join('');
-                if (digest.streamTail.length > 4000)
-                    digest.streamTail = digest.streamTail.slice(-4000);
-            }
+            if (typeof data === 'object' && data !== null)
+                appendToolName(data.name);
         }
-        else if (type === 'tool-call-chunks') {
-            // 官方打包行：还原工具名足迹
-            const name = typeof data === 'object' && data !== null ? String(data.name ?? '') : '';
-            if (name !== '' && digest.toolCalls.length < 200)
-                digest.toolCalls.push(name);
+        else if (type === 'text-chunks' || type === 'tool-call-chunks') {
+            if (typeof data === 'object' && data !== null)
+                readStreamRecord({ ...data, type });
+        }
+        else if (type === 'assistant/chunk' && typeof data === 'object' && data !== null) {
+            readStreamRecord({ type: 'chunk', chunk: data.chunk });
         }
     }
     digest.userMessages = digest.userMessages.slice(0, maxUserMessages);
@@ -174,7 +202,15 @@ export function listSessionFiles(sessionsRoot, limit) {
     if (!existsSync(sessionsRoot))
         return [];
     const out = [];
-    for (const project of readdirSync(sessionsRoot)) {
+    const listDirectory = (path) => {
+        try {
+            return readdirSync(path);
+        }
+        catch {
+            return [];
+        }
+    };
+    for (const project of listDirectory(sessionsRoot)) {
         const projectDir = join(sessionsRoot, project);
         try {
             if (!statSync(projectDir).isDirectory())
@@ -183,15 +219,30 @@ export function listSessionFiles(sessionsRoot, limit) {
         catch {
             continue;
         }
-        for (const session of readdirSync(projectDir)) {
-            const file = join(projectDir, session, 'session.jsonl.zstd');
-            try {
-                if (existsSync(file))
-                    out.push({ file, mtime: statSync(file).mtimeMs });
-            }
-            catch { /* 并发删除等竞态，跳过 */ }
+        for (const session of listDirectory(projectDir)) {
+            const sessionDir = join(projectDir, session);
+            // 迁移会保留旧代文件；每个会话只读最新已提交的规范文件，避免重复或读旧副本。
+            const candidates = listDirectory(sessionDir).flatMap((name) => {
+                const match = /^session(?:\.v([1-9][0-9]*))?\.jsonl(?:\.zstd)?$/.exec(name);
+                if (match === null)
+                    return [];
+                const version = match[1] === undefined ? 0 : Number(match[1]);
+                if (!Number.isSafeInteger(version))
+                    return [];
+                const file = join(sessionDir, name);
+                try {
+                    const stat = statSync(file);
+                    return stat.isFile() ? [{ file, version, mtime: stat.mtimeMs }] : [];
+                }
+                catch {
+                    return [];
+                }
+            }).sort((a, b) => b.version - a.version || Number(b.file.endsWith('.zstd')) - Number(a.file.endsWith('.zstd')));
+            if (candidates[0] !== undefined)
+                out.push(candidates[0]);
         }
     }
     out.sort((a, b) => b.mtime - a.mtime);
-    return out.slice(0, limit).map((item) => item.file);
+    const capped = Number.isFinite(limit) ? Math.max(0, Math.floor(limit)) : 0;
+    return out.slice(0, capped).map((item) => item.file);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stardustlc/dsh-dream",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "DSH 做梦插件：agent 在会话间隙回放近期对话（dream_digest）、反思并写入梦境日记（dream_save/journal/recall），高频教训幂等桥接进 AGENTS.md（dream_bridge），六工具含健康自检。多帧 zstd 会话读取，默认隐私脱敏，零运行时依赖。",
   "type": "module",
   "main": "lib/index.js",