All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
fix(dsh): read the newest session log generation (#45)
Corey Chiudcdce22dde72
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 1219d79..2f1feb6 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,5 +1,9 @@# Changelog+## [Unreleased]++- Fix: DeepSeek Harness sessions from dsh 0.1.6 and later are indexed again, and sessions dsh has upgraded to its newer log format show their latest conversation instead of an outdated copy (#45, thanks @z1HwanG)+## [0.8.2] — 2026-09-25- New: Craft Agents sessions are indexed from its workspaces — titles, models, tool calls and token counts, with archived sessions, sub-tasks and branches, whether the session ran on a Claude connection or on ChatGPT, Copilot or Google. The copy that a Claude connection also leaves in Claude Code's history is hidden while the Craft session exists, so each conversation is listed once. Workspaces kept outside `~/.craft-agent/workspaces` can be added in Settings → Session locations. Read-only, and no Open In (#44, thanks @qiajue)diff --git a/README.md b/README.mdindex f2cc90e..3ae345d 100644--- a/README.md+++ b/README.md@@ -45,7 +45,7 @@ Your agent history is scattered across `~/.claude`, `~/.codex`, and a dozen othe| Grok Build | `~/.grok/sessions/**/updates.jsonl` | ✅ | — || Kimi Code | `~/.kimi-code/sessions/**/wire.jsonl` | — | — || Antigravity CLI | `~/.gemini/antigravity-cli/conversation_summaries.db` (metadata only — transcripts are encrypted) | — | — |-| DeepSeek Harness (`dsh`) | `~/.dsh/sessions/**/session.jsonl[.zstd]` (zstd-compressed logs are decoded transparently) | ✅ | — |+| DeepSeek Harness (`dsh`) | `~/.dsh/sessions/**/session[.vN].jsonl[.zstd]` (the newest log format generation is read; zstd-compressed logs are decoded transparently) | ✅ | — || Hermes Agent | `~/.hermes/state.db` + `profiles/*/state.db` (`HERMES_HOME` is respected) | ✅ | ✅ || OpenClaw | `~/.openclaw/agents/*/agent/openclaw-agent.sqlite` + legacy `agents/*/sessions/*.jsonl` (`OPENCLAW_STATE_DIR` is respected) | ✅ | ✅ || CodeBuddy | `~/.codebuddy/projects/*/*.jsonl` (`CODEBUDDY_CONFIG_DIR` is respected) | ✅ | — |diff --git a/crates/wake-core/src/adapters/craft.rs b/crates/wake-core/src/adapters/craft.rsindex 3af27cf..b6fe20d 100644--- a/crates/wake-core/src/adapters/craft.rs+++ b/crates/wake-core/src/adapters/craft.rs@@ -396,12 +396,6 @@ fn tool_view(row: &Value) -> ToolCallView {)}-fn meta_msg(text: &str, ts: i64) -> TranscriptMessage {- let mut m = text_msg(Role::System, text, ts);- m.kind = MessageKind::Meta;- m-}-fn parse_file(path: &Path) -> Result<CraftParse> {let raw = fs::read_to_string(path).with_context(|| format!("read craft session {}", path.display()))?;diff --git a/crates/wake-core/src/adapters/cursor_ide.rs b/crates/wake-core/src/adapters/cursor_ide.rsindex 1537446..618d4e6 100644--- a/crates/wake-core/src/adapters/cursor_ide.rs+++ b/crates/wake-core/src/adapters/cursor_ide.rs@@ -589,7 +589,7 @@ impl AgentAdapter for CursorIdeAdapter {}/// 与 cursor.rs 同 key 的副本:CLI 源先、本源后(见文件头)- fn dedup_rank(&self) -> u8 {+ fn dedup_rank(&self, _path: &str) -> u8 {1}diff --git a/crates/wake-core/src/adapters/dsh.rs b/crates/wake-core/src/adapters/dsh.rsindex 7c0f119..2e88e32 100644--- a/crates/wake-core/src/adapters/dsh.rs+++ b/crates/wake-core/src/adapters/dsh.rs@@ -7,14 +7,18 @@ use std::fs;use std::io::{BufRead, BufReader};use std::path::{Path, PathBuf};-/// DeepSeek Harness(dsh):`~/.dsh/sessions/--<cwd转义>--/<id转义>/session.jsonl[.zstd]`,-/// 一目录一会话,文件名固定。默认落盘是 zstd **多帧连接**(首帧 header 行,之后每次-/// append 一帧),标准流式解码到 EOF 即可;`compression: none` 配置则是纯文本 .jsonl,-/// 两种后缀都认。首行 {type:"session",id,createdAt,cwd,…} 给权威 id/cwd/created,-/// 不反推目录名;origin=="subagent" 或 delegationDepth>0 是子代理会话,不进列表。-/// 事件行 {type,seq,time,data}:assistant/message 是流式 chunk 的最终合成体-/// (assistant/chunk 与其打包行 *-chunks 直接跳过),tool/result 按 toolCallId 回填,-/// session/title 事件 last-wins 给标题,model 在 assistant 消息的 source 里。+/// DeepSeek Harness(dsh):`~/.dsh/sessions/--<cwd转义>--/<id转义>/<日志>`,一目录一会话。+/// 日志文件名带**格式代数**:v0 是 `session.jsonl[.zstd]`,之后每代 `session.vN.jsonl[.zstd]`+/// (issue #45:0.1.6 起写 v3,master 已在写 v4)。dsh 迁移只新增下一代文件、不删旧代,+/// 读的永远是编号最大的那一代——`session_log` 单点裁决。默认落盘是 zstd **多帧连接**+/// (首帧 header 行,之后每次 append 一帧),标准流式解码到 EOF 即可;`compression: none`+/// 配置则是纯文本 .jsonl,两种后缀都认。首行 {type:"session",version,id,createdAt,cwd,…}+/// 给权威 id/cwd/created,不反推目录名;origin=="subagent" 或 delegationDepth>0 是子代理+/// 会话,不进列表。事件行 {type,seq,time,data}:assistant/message 是一次模型调用的合成体+/// (v0/v1 的 assistant/chunk 与其打包行 *-chunks 直接跳过,v2 起流嵌在消息里),tool/result+/// 按 toolCallId 回填(v0–v3 包在一个 tool-result 块里,v4 直接挂在 tool 角色消息上),+/// system/message(v3 起系统提示在对话里)与 developer/message(v4)归 Meta,session/title+/// 事件 last-wins 给标题,model 在 assistant 消息的 source 里。pub struct DshAdapter {root: PathBuf,}@@ -77,37 +81,51 @@ fn read_header(path: &Path) -> Option<DshHeader> {parse_header(&serde_json::from_str(line.trim_end()).ok()?)}-/// dsh 当前版本除内容事件外的完整事件词汇(源码 known-event-types.ts,-/// 2026-08)+ 三种 chunk 打包存储行。上游新增词汇会计入 unknown 提醒跟进。-const KNOWN_SKIP: &[&str] = &[+/// dsh 的事件词汇,照抄上游 `KNOWN_SESSION_EVENT_TYPES`(dsh-session 包的 known-event-types.ts,+/// 生成文件;当前是 v4)。上面有 match 分支的内容事件也在里面——先到先得、这里不会命中;+/// 上游换代时整段替换即可,不用挑+const UPSTREAM_EVENT_TYPES: &[&str] = &["agent-preset/selected","agent/inbox/spliced","approval/asked","approval/decided","approval/policy",- "assistant/chunk",+ "assistant/attempt",+ "assistant/message","command/done","command/run","compaction/end","compaction/prune","compaction/start","compaction/summary",+ "deliverables/presented",+ "developer/message",+ "feedback/message-delete",+ "feedback/message-put","feedback/record","goal/change","hook/invoked","hook/result",+ "image/offload","llm/retry","llm/retry-started",+ "model/selection","permission/preset","plan/mode",+ "request/context","request/header","sandbox/mode","schedule/change",+ "session-log-deepseek/delivery-accepted","session/end-seed",+ "session/title","session/title-llm-request","step/end","step/start",+ "subagent/catalog","subagent/descriptor",+ "subagent/model-selection-policy",+ "system/message","team/member","team/message/delivered","team/message/queued",@@ -118,16 +136,81 @@ const KNOWN_SKIP: &[&str] = &["tool-workflow/run-end","tool-workflow/run-start","tool/call",- "tool/code-dispatch",- "tool/code-dispatch-start",+ "tool/ptc-dispatch",+ "tool/ptc-dispatch-start",+ "tool/result","turn/end","turn/start",+ "user/message","web/deepseek-search-llm-request",+ "workspace/changes",+];++/// 上游清单已经删掉、只在老格式里出现的名字:v0/v1 的 assistant/chunk 与三种 chunk 打包+/// 存储行,v3 前的 tool/code-dispatch*。没被 dsh 重新打开过的老会话不会迁移,照样得认——+/// 只增不减+const LEGACY_EVENT_TYPES: &[&str] = &[+ "assistant/chunk","text-chunks","reasoning-chunks","tool-call-chunks",+ "tool/code-dispatch",+ "tool/code-dispatch-start",];+/// 已知最新的格式代数。更新的一代照样选中、按形状读,但 header 那一行记一笔 unknown:+/// 字段在已知事件里挪了位置时(v4 的 tool/result 就是),一个事件名都不会漏,只有这一笔+/// 能让 Clean up 知道这个会话读不全+const NEWEST_FORMAT: u64 = 4;++/// 会话日志文件名 → (格式代数, 是否 zstd)。v0 是 `session.jsonl[.zstd]`,之后每代+/// `session.vN.jsonl[.zstd]`(N 从 1 起、不带前导零——`session.v0` / `session.v03` 不是 dsh+/// 会写的名字,认了就会两个名字指同一代);别的文件(session.lock 等)给 None+fn log_generation(name: &str) -> Option<(u32, bool)> {+ let (stem, zstd) = match name.strip_suffix(".zstd") {+ Some(stem) => (stem, true),+ None => (name, false),+ };+ let version = stem.strip_suffix(".jsonl")?.strip_prefix("session")?;+ if version.is_empty() {+ return Some((0, zstd));+ }+ let digits = version.strip_prefix(".v")?;+ if digits.starts_with('0') || !digits.bytes().all(|b| b.is_ascii_digit()) {+ return None;+ }+ Some((digits.parse().ok()?, zstd))+}++/// 会话目录 → 会话引用。日志取 dsh 自己会读的那一份:编号最大的一代(迁移只新增、不删+/// 旧代,旧代的 mtime 可能更新);同一代压缩与明文并存(换过 compression 配置)时 mtime+/// 新者胜、平局 .zstd 胜。list 与 watcher(经 file_ref)两条入口共用这一处裁决——只做在+/// list 会让 watcher 把旧代的事件当主文件解析。首行 header 给权威 id(目录名是转义过的+/// id);子代理会话在此过滤+fn session_log(dir: &Path) -> Option<SessionFileRef> {+ let ((_, mtime, _), path, size) = fs::read_dir(dir)+ .ok()?+ .flatten()+ .filter_map(|entry| {+ let (generation, zstd) = log_generation(&entry.file_name().to_string_lossy())?;+ let path = entry.path();+ // fs::metadata 跟随符号链接(DirEntry::metadata 不跟)+ let meta = fs::metadata(&path)+ .ok()+ .filter(|m| m.is_file() && m.len() > 0)?;+ Some(((generation, mtime_ms(&meta), zstd), path, meta.len()))+ })+ .max_by_key(|(rank, ..)| *rank)?;+ let header = read_header(&path).filter(|h| !h.subagent)?;+ Some(SessionFileRef {+ agent: AgentId::Dsh,+ native_id: header.id,+ file_path: path.to_string_lossy().to_string(),+ mtime_ms: mtime,+ size: size as i64,+ })+}+struct DshParse {header: Option<DshHeader>,title: Option<String>,@@ -187,10 +270,31 @@ fn parse_dsh_log(path: &Path, decode_images: bool) -> Result<DshParse> {let data = row.get("data").unwrap_or(&serde_json::Value::Null);match ty {"session" => {+ if row+ .get("version")+ .and_then(|v| v.as_u64())+ .is_some_and(|v| v > NEWEST_FORMAT)+ {+ p.unknown_lines += 1;+ }if let Some(h) = parse_header(&row) {p.header = Some(h);}}+ // v3 起系统提示是对话里的一条 system/message;v4 的 developer/message 记会话中途+ // 的变更(工具增删是 tool-addition / tool-removal 块,没有文字)。都是给模型的+ // 上下文、不是对话,归 Meta。图片不解码、只留占位文字:解码了转录那边就只剩图片+ // 没有文字,这条被跳过,之后每条消息的 seq 都和索引错开一位+ "system/message" | "developer/message" => {+ let parsed = content_parts(+ data.pointer("/message/content")+ .unwrap_or(&serde_json::Value::Null),+ false,+ );+ if !parsed.text.is_empty() {+ p.messages.push(meta_msg(&parsed.text, ts));+ }+ }"user/message" => {let parsed = content_parts(data.get("content").unwrap_or(&serde_json::Value::Null),@@ -331,9 +435,14 @@ fn parse_dsh_log(path: &Path, decode_images: bool) -> Result<DshParse> {}}"tool/result" => {- // data.message.content = [tool-result 块]:toolCallId + 嵌套 content + isError- let Some(block) = data.pointer("/message/content/0") else {- continue;+ // v4:tool 角色消息自己带 toolCallId / content / isError;v0–v3:+ // data.message.content = [tool-result 块],三样包在块里+ let msg = data.get("message").unwrap_or(&serde_json::Value::Null);+ let block = if msg.get("toolCallId").is_some() {+ msg+ } else {+ msg.pointer("/content/0")+ .unwrap_or(&serde_json::Value::Null)};let Some(call_id) = block.get("toolCallId").and_then(|v| v.as_str()) else {continue;@@ -374,9 +483,9 @@ fn parse_dsh_log(path: &Path, decode_images: bool) -> Result<DshParse> {}// 信封自带 ignorable 标记 = 写端声明的纯信息性记录,读者可安全跳过_ if row.get("ignorable").and_then(|v| v.as_bool()) == Some(true) => {}- // 当前版本的其余已知词汇(含 assistant/chunk 的三种打包存储行)显式- // 列举,词汇表外才计 unknown——保住 schema 漂移金丝雀- t if KNOWN_SKIP.contains(&t) => {}+ // 其余已知词汇(上游清单 + 老格式名字)跳过,两张表外才计 unknown——保住 schema+ // 漂移金丝雀+ t if UPSTREAM_EVENT_TYPES.contains(&t) || LEGACY_EVENT_TYPES.contains(&t) => {}_ => {p.unknown_lines += 1;}@@ -431,9 +540,8 @@ impl AgentAdapter for DshAdapter {fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {let mut refs = Vec::new();- // 固定两层:<project-dir>/<session-dir>/session.jsonl[.zstd],- // 不 walkdir 全递归(会话目录还会放别的 artifacts);根目录读不了- // 就本家降级为空,不把整轮扫描炸掉+ // 固定两层:<project-dir>/<session-dir>/<日志>,不 walkdir 全递归(会话目录还会+ // 放别的 artifacts);根目录读不了就本家降级为空,不把整轮扫描炸掉let Ok(projects) = fs::read_dir(&self.root) else {return Ok(refs);};@@ -445,51 +553,29 @@ impl AgentAdapter for DshAdapter {if !session.file_type().is_ok_and(|t| t.is_dir()) {continue;}- // 两个候选名都过 file_ref 漏斗;后缀并存时 sibling 裁决保证至多一个通过- let dir = session.path();- for name in ["session.jsonl.zstd", "session.jsonl"] {- if let Some(r) = self.file_ref(&dir.join(name)) {- refs.push(r);- break;- }- }+ refs.extend(session_log(&session.path()));}}Ok(refs)}+ /// 同一会话的几份日志,新一代恒胜(位次小者胜:v0 = 255、v4 = 251),与+ /// `session_log` 的选代同一把尺子。list 只交出新一代还不够:库里已经记着旧代时+ /// (0.8.2 及以前的 Wake 只认 v0 的名字,或者同步、拷贝来的新代 mtime 反而更旧),+ /// 写库的副本裁决先比位次、再比 mtime,不给位次新代就会被挡回去+ fn dedup_rank(&self, path: &str) -> u8 {+ let generation = Path::new(path)+ .file_name()+ .and_then(|name| log_generation(&name.to_string_lossy()))+ .map_or(0, |(generation, _)| generation);+ u8::MAX - generation.min(u32::from(u8::MAX)) as u8+ }+fn file_ref(&self, path: &Path) -> Option<SessionFileRef> {- let name = path.file_name()?.to_string_lossy();- if name != "session.jsonl" && name != "session.jsonl.zstd" {- return None;- }- let meta = fs::metadata(path).ok()?;- if !meta.is_file() || meta.len() == 0 {- return None;- }- // 压缩配置换挡会新旧后缀并存:陈旧的一份让位(mtime 平局 .zstd 赢,与- // 写端当前默认一致)。裁决在此单点,list 与 watcher 两条入口共用——- // 只做在 list 会让 watcher 把陈旧 sibling 的事件当主文件解析- let sibling = if name == "session.jsonl" {- "session.jsonl.zstd"- } else {- "session.jsonl"- };- if let Ok(sib) = fs::metadata(path.with_file_name(sibling)) {- let (own_m, sib_m) = (mtime_ms(&meta), mtime_ms(&sib));- if sib_m > own_m || (sib_m == own_m && name == "session.jsonl") {- return None;- }- }- // 首行 header 给权威 id(目录名是转义过的 id);子代理会话在此过滤- let header = read_header(path).filter(|h| !h.subagent)?;- Some(SessionFileRef {- agent: AgentId::Dsh,- native_id: header.id,- file_path: path.to_string_lossy().to_string(),- mtime_ms: mtime_ms(&meta),- size: meta.len() as i64,- })+ // 名字先粗筛(session.lock、迁移临时文件等不碰磁盘就不要),再看它是不是这个目录里+ // 被读的那一代+ log_generation(&path.file_name()?.to_string_lossy())?;+ session_log(path.parent()?).filter(|r| Path::new(&r.file_path) == path)}fn parse_session(&self, r: &SessionFileRef) -> Result<ParsedSession> {@@ -513,7 +599,7 @@ impl AgentAdapter for DshAdapter {}fn session_paths(&self, meta: &SessionMeta) -> Vec<String> {- // 一目录一会话:trash 整个会话目录(session.jsonl 与未来的 artifacts 一起)+ // 一目录一会话:trash 整个会话目录(各代日志、session.lock 与 artifacts 一起)match Path::new(&meta.file_path).parent() {Some(dir) => vec![dir.to_string_lossy().to_string()],None => vec![meta.file_path.clone()],@@ -537,3 +623,28 @@ impl AgentAdapter for DshAdapter {vec![self.root.clone()]}}++#[cfg(test)]+mod tests {+ use super::log_generation;++ #[test]+ fn log_names_carry_their_format_generation() {+ assert_eq!(log_generation("session.jsonl"), Some((0, false)));+ assert_eq!(log_generation("session.jsonl.zstd"), Some((0, true)));+ assert_eq!(log_generation("session.v3.jsonl.zstd"), Some((3, true)));+ assert_eq!(log_generation("session.v12.jsonl"), Some((12, false)));+ // dsh 不会写的名字:v0 不带版本号、没有前导零;锁文件与别的 artifacts 不是日志+ for name in [+ "session.v0.jsonl",+ "session.v03.jsonl.zstd",+ "session.v.jsonl",+ "session.v3a.jsonl",+ "session.v3.jsonl.tmp",+ "session.lock",+ "notes.jsonl",+ ] {+ assert_eq!(log_generation(name), None, "{name}");+ }+ }+}diff --git a/crates/wake-core/src/adapters/mod.rs b/crates/wake-core/src/adapters/mod.rsindex b8be2a0..22e7b5d 100644--- a/crates/wake-core/src/adapters/mod.rs+++ b/crates/wake-core/src/adapters/mod.rs@@ -199,11 +199,12 @@ pub trait AgentAdapter: Send + Sync {fn excluding_data_roots(&self, _roots: &[std::path::PathBuf]) -> Option<Box<dyn AgentAdapter>> {None}- /// 同家同 native_id 多副本裁决时本实例的位次:scanner 先按它升序、同级再按- /// mtime 新者(不变量 8⑦)。默认 0。一家有多个数据源且要固定偏好某一源时- /// 覆写——Cursor 的 IDE 库实例返回 1,转录带正文时永远是 CLI 那份胜出;- /// 败方仍留作解析失败的回退顺位。远程装饰器必须转发- fn dedup_rank(&self) -> u8 {+ /// 同家同 native_id 多副本裁决时 `path` 这份副本的位次:scanner 先按它升序、同级+ /// 再按 mtime 新者(不变量 8⑦);全量扫描的候选排序与写事务内的裁决(`rank_of`)+ /// 用的都是它。默认 0。要固定偏好某一份时覆写——Cursor 的 IDE 库实例恒返回 1,+ /// 转录带正文时永远是 CLI 那份胜出;dsh 按日志格式代数给,新一代恒胜。败方仍留作+ /// 解析失败的回退顺位。远程装饰器必须转发+ fn dedup_rank(&self, _path: &str) -> u8 {0}/// `parent_links` 报的边是不是一张**全局**总表(Codex 的 state DB `thread_spawn_edges`diff --git a/crates/wake-core/src/adapters/parse_utils.rs b/crates/wake-core/src/adapters/parse_utils.rsindex 3dd81a6..2209660 100644--- a/crates/wake-core/src/adapters/parse_utils.rs+++ b/crates/wake-core/src/adapters/parse_utils.rs@@ -101,6 +101,14 @@ pub fn text_msg(role: Role, text: &str, ts: i64) -> TranscriptMessage {}}+/// 给模型看、不是对话的上下文(系统提示、状态说明等):System 角色的 Meta 消息——+/// 不进 FTS、不算 message_count、不参与标题推导+pub fn meta_msg(text: &str, ts: i64) -> TranscriptMessage {+ let mut m = text_msg(Role::System, text, ts);+ m.kind = MessageKind::Meta;+ m+}+/// seq 回填——FTS seq 与详情页序号一致(跨文件不变量 1)的统一执行点,/// 必须在消息序列定型后、入库/返回前调用pub fn assign_seq(messages: &mut [TranscriptMessage]) {diff --git a/crates/wake-core/src/adapters/remote.rs b/crates/wake-core/src/adapters/remote.rsindex 4d1e5c3..25c93d1 100644--- a/crates/wake-core/src/adapters/remote.rs+++ b/crates/wake-core/src/adapters/remote.rs@@ -209,8 +209,8 @@ impl AgentAdapter for RemoteAdapter {self.inner.supports_individual_root_removal()}- fn dedup_rank(&self) -> u8 {- self.inner.dedup_rank()+ fn dedup_rank(&self, path: &str) -> u8 {+ self.inner.dedup_rank(path)}fn parent_links_global(&self) -> bool {diff --git a/crates/wake-core/src/scanner.rs b/crates/wake-core/src/scanner.rsindex 3593405..88acb5d 100644--- a/crates/wake-core/src/scanner.rs+++ b/crates/wake-core/src/scanner.rs@@ -301,13 +301,15 @@ pub fn run_memory_sync(adapters: &[Box<dyn AgentAdapter>], store: &Arc<Store>) -}/// 写事务内副本裁决(`Store::write_session_guarded`)用的位次查询:按 file_path-/// 找拥有它的实例取 `dedup_rank`;无实例认领的路径落到该家首个实例——与枚举-/// 时的候选排序同一把尺子,全量与增量两条写库路径才给出同一个胜者+/// 找拥有它的实例、问它这份副本的 `dedup_rank`;无实例认领的路径落到该家首个+/// 实例——与枚举时的候选排序同一把尺子,全量与增量两条写库路径才给出同一个胜者fn rank_of<'a>(adapters: &'a [Box<dyn AgentAdapter>],agent: crate::models::AgentId,) -> impl Fn(&str) -> u8 + 'a {- move |path| crate::adapters::adapter_for(adapters, agent, path).map_or(0, |a| a.dedup_rank())+ move |path| {+ crate::adapters::adapter_for(adapters, agent, path).map_or(0, |a| a.dedup_rank(path))+ }}fn run_scan_inner(@@ -385,10 +387,10 @@ fn run_scan_inner(per_adapter.push(refs);}// 同家同 ID 去重:同一会话在默认根与自定义根各有一份副本时,两个文件会- // 每轮轮流改写同一行(key 相同,file_path 摇摆)。候选按 (实例 dedup_rank+ // 每轮轮流改写同一行(key 相同,file_path 摇摆)。候选按 (副本 dedup_rank// 小者, mtime 新者, 平局路径字典序小者) 排序,首位入队,其余留作**解析- // 失败的回退顺位**——rank 让一家的多个数据源固定偏好某一源(Cursor 的- // 转录源永远压过 IDE 库副本),mtime 只在同级副本之间裁决+ // 失败的回退顺位**——rank 让一家固定偏好某一份(Cursor 的转录源永远压过+ // IDE 库副本,dsh 的新一代日志永远压过旧代),mtime 只在同级副本之间裁决// ——胜者副本截断/损坏时,不能让整个会话从索引消失(Codex review P2)。// 去重域即 session_key(agent, 实例 host, native_id)——直接以它为键,// "去重域与最终 key 的分段一致"就结构性成立:两台机器各自续跑过的@@ -406,8 +408,8 @@ fn run_scan_inner(for v in candidates.values_mut() {v.sort_by(|(ia, a), (ib, b)| {adapters[*ia]- .dedup_rank()- .cmp(&adapters[*ib].dedup_rank())+ .dedup_rank(&a.file_path)+ .cmp(&adapters[*ib].dedup_rank(&b.file_path)).then_with(|| b.mtime_ms.cmp(&a.mtime_ms)).then_with(|| a.file_path.cmp(&b.file_path))});diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rsindex e6ccc1d..36762c6 100644--- a/crates/wake-core/tests/adapter_contracts.rs+++ b/crates/wake-core/tests/adapter_contracts.rs@@ -1134,8 +1134,9 @@ fn cursor_two_sources_remove_independently() {vec![env.cursor_ide_db.clone()],"roster 顺序:CLI 在前、IDE 库在后");+ let ide_copy = format!("{}#dup", env.cursor_ide_db.display());assert!(- cli.dedup_rank() < ide.dedup_rank(),+ cli.dedup_rank(&cursor_ref().file_path) < ide.dedup_rank(&ide_copy),"CLI 源必须排在 IDE 库副本之前");for a in &cursors {@@ -2142,8 +2143,8 @@ fn dsh_torn_final_frame_terminates() {fn dsh_parse_contract() {let env = setup();let adapter = DshAdapter::new();- // file_ref 是公开 API:只认 session.jsonl[.zstd],native_id 取 header 的- // 权威 id(目录名是转义过的 id);子代理会话(origin=subagent)在此过滤+ // file_ref 是公开 API:只认会话日志(session[.vN].jsonl[.zstd]),native_id 取+ // header 的权威 id(目录名是转义过的 id);子代理会话(origin=subagent)在此过滤let r = adapter.file_ref(&env.dsh_log).expect("dsh file_ref");assert_eq!(r.native_id, "dsh-e2e4-0001");let sub = env@@ -2155,7 +2156,7 @@ fn dsh_parse_contract() {.join("session.jsonl");assert!(adapter.file_ref(&sub).is_none(), "子代理会话不进列表");- // list 走 <project>/<session>/session.jsonl[.zstd] 两层布局,子代理被滤掉+ // list 走 <project>/<session>/<日志> 两层布局,子代理被滤掉let listed = adapter.list_session_files().expect("dsh list_session_files");@@ -2232,6 +2233,147 @@ fn dsh_parse_contract() {);}+#[test]+fn dsh_reads_the_newest_format_generation() {+ // dsh 迁移只新增下一代文件、不删旧代(issue #45:0.1.6 起写 session.v3.jsonl.zstd,+ // master 在写 v4):会话目录里读编号最大的那一代,旧代哪怕 mtime 更新也让位;迁移+ // 临时文件与锁文件不是日志。独立 tempdir,不扰动共享的假 HOME+ let root = tempfile::tempdir().expect("tempdir");+ let project = root.path().join("--Users-tester-Github-wakefx--");+ let header = |version: u32, id: &str| {+ format!(+ r#"{{"type":"session","version":{version},"id":"{id}","createdAt":1788000000000,"cwd":"/Users/tester/Github/wakefx","isSeeded":false,"delegationDepth":0}}"#+ ) + "\n"+ };++ // v4 会话,旁边留着迁移前的 v0 旧代(只有 header 就够:它只在新代消失时接替),+ // 旧代的 mtime 反而更新——按代裁决,不按时间+ let v4_dir = project.join("dsh-v4-0003");+ fs::create_dir_all(&v4_dir).expect("mkdir v4 session dir");+ let v4_log = v4_dir.join("session.v4.jsonl.zstd");+ let v4_plain = fs::read_to_string(fixture("dsh/session.v4.jsonl")).expect("read v4 fixture");+ fs::write(&v4_log, common::dsh_zstd(&v4_plain)).expect("write v4 log");+ let v0_log = v4_dir.join("session.jsonl.zstd");+ fs::write(&v0_log, common::dsh_zstd(&header(0, "dsh-v4-0003"))).expect("write v0 log");+ touch_forward(&v0_log, 3600);+ let migration_tmp = v4_dir.join("session.migration.k3j9.jsonl.zstd.tmp");+ fs::copy(&v4_log, &migration_tmp).expect("write migration temp");+ let lock = v4_dir.join("session.lock");+ fs::write(&lock, "4242").expect("write lock");++ // v3 会话:明文后缀(compression: none);这里只看选代,header 就够+ let v3_dir = project.join("dsh-v3-0004");+ fs::create_dir_all(&v3_dir).expect("mkdir v3 session dir");+ let v3_log = v3_dir.join("session.v3.jsonl");+ fs::write(&v3_log, header(3, "dsh-v3-0004")).expect("write v3 log");++ let adapter = DshAdapter::new().with_custom_root(root.path().to_path_buf());+ let mut listed: Vec<(String, PathBuf)> = adapter+ .list_session_files()+ .expect("dsh list_session_files")+ .into_iter()+ .map(|r| (r.native_id, PathBuf::from(r.file_path)))+ .collect();+ listed.sort();+ assert_eq!(+ listed,+ vec![+ ("dsh-v3-0004".to_string(), v3_log.clone()),+ ("dsh-v4-0003".to_string(), v4_log.clone()),+ ]+ );+ // watcher 入口同一把尺子:旧代、迁移临时文件、锁文件都不是会话的主文件+ for other in [&v0_log, &migration_tmp, &lock] {+ assert!(adapter.file_ref(other).is_none(), "{other:?}");+ }++ let r = adapter+ .file_ref(&v4_log)+ .expect("v4 log is the session's log");+ assert_seq_contract(adapter.as_ref(), &r);+ let s = adapter.parse_session(&r).expect("v4 parse_session");+ let t = adapter.parse_transcript(&r).expect("v4 parse_transcript");+ assert_eq!(s.meta.key, "dsh:dsh-v4-0003");+ assert_eq!(s.meta.title, "README 安装命令改 npx");+ assert_eq!(s.meta.project_path, "/Users/tester/Github/wakefx");+ assert_eq!(s.meta.model.as_deref(), Some("deepseek-v4-pro"));+ // 按调用累加 input + output + cacheRead:(2000+120+800) + (2300+80) + (2400+60)+ assert_eq!(s.meta.tokens_used, Some(7760));+ assert_eq!(s.meta.created_at, 1788000000000);+ assert_eq!(s.meta.updated_at, 1788000004900);+ assert_eq!(s.meta.message_count, 2);+ // 只有 hologram/beam:v2–v4 新增的词汇(assistant/attempt、tool/ptc-dispatch、+ // subagent/catalog、workspace/changes…)与 ignorable 行都不算+ assert_eq!(s.unknown_line_count, 1);+ // 系统提示归 Meta;只有工具增删的 developer/message 没有文字、不出消息;+ // 三个 step 的助手话合并成一条+ assert_eq!(+ roles_kinds(&t.mainline),+ vec![+ (Role::System, MessageKind::Meta),+ (Role::User, MessageKind::Text),+ (Role::User, MessageKind::Meta),+ (Role::Assistant, MessageKind::Text),+ ]+ );+ assert_eq!(+ s.units.iter().map(|u| u.seq).collect::<Vec<_>>(),+ vec![1, 3]+ );+ let a = &t.mainline[3];+ assert!(a.text.starts_with("我先看一下 README"));+ assert!(a.text.contains("npx @deepseek-ai/dsh web"));+ assert!(a+ .thinking+ .as_deref()+ .unwrap_or_default()+ .contains("找到安装段落"));+ // v4 的结果直接挂在 tool 角色消息上;surfaceOp replace 的裁剪版不盖原文+ assert_eq!(+ a.tool_calls+ .iter()+ .map(|tc| (+ tc.name.as_str(),+ tc.output.as_deref().unwrap_or_default(),+ tc.is_error+ ))+ .collect::<Vec<_>>(),+ vec![+ (+ "read_file",+ "## Install\nnpm install -g @deepseek-ai/dsh",+ false+ ),+ (+ "edit_file",+ "permission denied: README.md is read-only",+ true+ ),+ ]+ );++ // 比已知最新一代还新的格式:照样接替、按形状读,但记一笔 unknown——Clean up 靠它+ // 把可能读不全的会话留着+ let v5_log = v3_dir.join("session.v5.jsonl");+ fs::write(&v5_log, header(5, "dsh-v3-0004")).expect("write v5 log");+ assert!(adapter.file_ref(&v3_log).is_none());+ let r5 = adapter.file_ref(&v5_log).expect("v5 takes over");+ assert_eq!(+ adapter+ .parse_session(&r5)+ .expect("v5 parse_session")+ .unknown_line_count,+ 1+ );++ // 最新一代没了(手动删了、或同步只拉到一部分),留下的旧代接替+ fs::remove_file(&v4_log).expect("remove v4 log");+ assert_eq!(+ adapter.file_ref(&v0_log).map(|r| r.native_id),+ Some("dsh-v4-0003".to_string())+ );+}+#[test]fn seq_contract_holds_for_all_agents() {let env = setup();diff --git a/crates/wake-core/tests/common/mod.rs b/crates/wake-core/tests/common/mod.rsindex ac1fa02..ce3bfef 100644--- a/crates/wake-core/tests/common/mod.rs+++ b/crates/wake-core/tests/common/mod.rs@@ -9,6 +9,16 @@ use std::path::{Path, PathBuf};use wake_core::db::{IndexLock, Ownership};+/// dsh 默认落盘的 zstd 多帧日志:首帧 header 行、次帧事件批,帧直接连接(写端每次 append+/// 一帧,解码器解到 EOF)+pub fn dsh_zstd(plain: &str) -> Vec<u8> {+ let (header, body) = plain.split_once('\n').unwrap_or((plain, ""));+ let mut frames =+ zstd::encode_all(format!("{header}\n").as_bytes(), 3).expect("zstd header frame");+ frames.extend(zstd::encode_all(body.as_bytes(), 3).expect("zstd event frame"));+ frames+}+pub fn fixture(rel: &str) -> PathBuf {Path::new(env!("CARGO_MANIFEST_DIR")).join("tests")@@ -294,12 +304,8 @@ pub fn stage_sidecars(home: &Path) -> Sidecars {let dsh_sess = dsh_project.join("dsh-e2e4-0001");fs::create_dir_all(&dsh_sess).expect("mkdir dsh session dir");let plain = fs::read_to_string(fixture("dsh/session.jsonl")).expect("read dsh fixture");- let (header, body) = plain.split_once('\n').expect("dsh fixture header line");- let mut frames =- zstd::encode_all(format!("{header}\n").as_bytes(), 3).expect("zstd header frame");- frames.extend(zstd::encode_all(body.as_bytes(), 3).expect("zstd event frame"));let dsh_log = dsh_sess.join("session.jsonl.zstd");- fs::write(&dsh_log, frames).expect("write dsh zstd log");+ fs::write(&dsh_log, dsh_zstd(&plain)).expect("write dsh zstd log");let dsh_sub = dsh_project.join("dsh-sub-0002");fs::create_dir_all(&dsh_sub).expect("mkdir dsh subagent dir");fs::write(diff --git a/crates/wake-core/tests/fixtures/dsh/session.v4.jsonl b/crates/wake-core/tests/fixtures/dsh/session.v4.jsonlnew file mode 100644index 0000000..da75d07--- /dev/null+++ b/crates/wake-core/tests/fixtures/dsh/session.v4.jsonl@@ -0,0 +1,33 @@+{"type":"session","version":4,"id":"dsh-v4-0003","createdAt":1788000000000,"cwd":"/Users/tester/Github/wakefx","isSeeded":false,"delegationDepth":0,"agentPreset":"ptc"}+{"type":"agent-preset/selected","seq":0,"time":1788000000100,"data":{"agentPreset":"ptc"}}+{"type":"subagent/catalog","seq":1,"time":1788000000200,"data":{"entries":[]}}+{"type":"turn/start","seq":2,"time":1788000001000,"data":{"turn":1}}+{"type":"step/start","seq":3,"time":1788000001100,"data":{"turn":1,"step":1}}+{"type":"request/header","seq":4,"time":1788000001150,"data":{"header":{"tools":[{"name":"web_search","description":"Search the web","parameters":{"type":"object"}}]},"reason":{"kind":"initial"}}}+{"type":"system/message","seq":5,"time":1788000001200,"data":{"turn":1,"step":1,"message":{"id":"m-sys","role":"system","content":[{"type":"text","text":"You are dsh, a coding agent working in /Users/tester/Github/wakefx."}],"source":{"kind":"system-prompt"}}},"surfaceOp":"append"}+{"type":"developer/message","seq":6,"time":1788000001250,"data":{"turn":1,"step":1,"message":{"id":"m-dev","role":"developer","content":[{"type":"tool-addition","toolName":"web_search"}],"source":{"kind":"deferred-tools"}},"headerSeq":4},"surfaceOp":"append"}+{"type":"user/message","seq":7,"time":1788000001300,"data":{"id":"m-u1","role":"user","content":[{"type":"text","text":"把 README 里的安装命令换成 npx 形式"}],"source":{"kind":"user"}},"surfaceOp":"append"}+{"type":"user/message","seq":8,"time":1788000001350,"data":{"id":"m-ctx","role":"user","content":[{"type":"text","text":"Workspace instructions: keep README examples runnable."}],"source":{"kind":"agent-instructions"}},"surfaceOp":"append"}+{"type":"assistant/attempt","seq":9,"time":1788000001500,"data":{"turn":1,"step":1,"stream":[{"at":0,"delta":{"type":"text","text":"我先"}}]}}+{"type":"llm/retry","seq":10,"time":1788000001600,"data":{"turn":1,"step":1,"attempt":1}}+{"type":"assistant/message","seq":11,"time":1788000002000,"data":{"turn":1,"step":1,"message":{"id":"m-a1","role":"assistant","content":[{"type":"reasoning","text":"先读 README,找到安装段落"},{"type":"text","text":"我先看一下 README 的安装段落。"},{"type":"tool-call","id":"call-1","name":"read_file","arguments":"{\"path\":\"README.md\"}"}],"source":{"kind":"model","provider":"deepseek","model":"deepseek-v4-pro"}},"stream":[{"at":0,"delta":{"type":"text","text":"我先看一下 README 的安装段落。"}}],"usage":{"inputTokens":2000,"outputTokens":120,"totalTokens":2920,"cacheReadTokens":800}},"surfaceOp":"append"}+{"type":"tool/call","seq":12,"time":1788000002050,"data":{"turn":1,"step":1,"callId":"call-1","name":"read_file","arguments":"{\"path\":\"README.md\"}"}}+{"type":"tool/ptc-dispatch","seq":13,"time":1788000002150,"data":{"turn":1,"step":1,"callId":"call-1"}}+{"type":"tool/result","seq":14,"time":1788000002300,"data":{"turn":1,"step":1,"message":{"id":"m-t1","role":"tool","source":{"kind":"tool","callId":"call-1"},"toolCallId":"call-1","content":[{"type":"text","text":"## Install\nnpm install -g @deepseek-ai/dsh"}]}},"surfaceOp":"append"}+{"type":"step/end","seq":15,"time":1788000002400,"data":{"turn":1,"step":1}}+{"type":"step/start","seq":16,"time":1788000002500,"data":{"turn":1,"step":2}}+{"type":"assistant/message","seq":17,"time":1788000003000,"data":{"turn":1,"step":2,"message":{"id":"m-a2","role":"assistant","content":[{"type":"tool-call","id":"call-2","name":"edit_file","arguments":"{\"path\":\"README.md\",\"old\":\"npm install -g @deepseek-ai/dsh\",\"new\":\"npx @deepseek-ai/dsh web\"}"}],"source":{"kind":"model","provider":"deepseek","model":"deepseek-v4-pro"}},"stream":[],"usage":{"inputTokens":2300,"outputTokens":80}},"surfaceOp":"append"}+{"type":"tool/result","seq":18,"time":1788000003200,"data":{"turn":1,"step":2,"message":{"id":"m-t2","role":"tool","source":{"kind":"tool","callId":"call-2"},"toolCallId":"call-2","content":[{"type":"text","text":"permission denied: README.md is read-only"}],"isError":true},"error":{"name":"ToolError","code":"EACCES","reason":"README.md is read-only"}},"surfaceOp":"append"}+{"type":"tool/result","seq":19,"time":1788000003250,"data":{"turn":1,"step":2,"message":{"id":"m-t1-pruned","role":"tool","source":{"kind":"tool","callId":"call-1"},"toolCallId":"call-1","content":[{"type":"text","text":"[tool output pruned]"}]}},"surfaceOp":{"op":"replace","startSeq":14,"endSeq":14},"sourceEventSeqs":[14]}+{"type":"step/end","seq":20,"time":1788000003300,"data":{"turn":1,"step":2}}+{"type":"step/start","seq":21,"time":1788000003400,"data":{"turn":1,"step":3}}+{"type":"assistant/message","seq":22,"time":1788000004000,"data":{"turn":1,"step":3,"message":{"id":"m-a3","role":"assistant","content":[{"type":"text","text":"README 是只读的,没能改;安装命令应改为 npx @deepseek-ai/dsh web。"}],"source":{"kind":"model","provider":"deepseek","model":"deepseek-v4-pro"}},"stream":[],"usage":{"inputTokens":2400,"outputTokens":60}},"surfaceOp":"append"}+{"type":"step/end","seq":23,"time":1788000004100,"data":{"turn":1,"step":3}}+{"type":"workspace/changes","seq":24,"time":1788000004150,"data":{"turn":1,"files":[]}}+{"type":"deliverables/presented","seq":25,"time":1788000004200,"data":{"turn":1,"items":[]}}+{"type":"turn/end","seq":26,"time":1788000004300,"data":{"turn":1,"reason":{"kind":"completed"}}}+{"type":"session/title","seq":27,"time":1788000004500,"data":{"title":"README 安装命令改 npx"}}+{"type":"model/selection","seq":28,"time":1788000004600,"data":{"model":"deepseek-v4-pro"}}+{"type":"session-log-deepseek/delivery-accepted","seq":29,"time":1788000004700,"data":{"throughSeq":27,"sessionFormatVersion":4}}+{"type":"hologram/beam","seq":30,"time":1788000004800,"data":{}}+{"type":"future/telemetry","seq":31,"time":1788000004900,"data":{},"ignorable":true}diff --git a/crates/wake-core/tests/scanner_finale.rs b/crates/wake-core/tests/scanner_finale.rsindex 62e85de..ac7898e 100644--- a/crates/wake-core/tests/scanner_finale.rs+++ b/crates/wake-core/tests/scanner_finale.rs@@ -598,7 +598,7 @@ impl AgentAdapter for SeedAdapter {fn agent(&self) -> AgentId {self.agent}- fn dedup_rank(&self) -> u8 {+ fn dedup_rank(&self, _path: &str) -> u8 {self.rank}fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {@@ -1218,6 +1218,70 @@ fn lower_dedup_rank_beats_newer_mtime_and_still_falls_back() {);}+/// dsh 迁移后旧代原样留着(issue #45):库里已经记着旧代时(0.8.2 及以前的 Wake 只认+/// v0 的文件名),新代经 watcher(scan_files)到来必须接替——哪怕它的 mtime 反而更旧+/// (同步、拷贝来的)。写事务内的副本裁决先比 dedup_rank,dsh 按代给位次+#[test]+fn dsh_newer_generation_takes_over_an_indexed_older_one() {+ use wake_core::adapters::dsh::DshAdapter;+ const KEY: &str = "dsh:dsh-v4-0003";+ let root = tempfile::tempdir().unwrap();+ let session = root+ .path()+ .join("--Users-tester-Github-wakefx--")+ .join("dsh-v4-0003");+ std::fs::create_dir_all(&session).unwrap();+ let v0 = session.join("session.jsonl.zstd");+ std::fs::write(+ &v0,+ common::dsh_zstd(concat!(+ r#"{"type":"session","version":0,"id":"dsh-v4-0003","createdAt":1788000000000,"cwd":"/Users/tester/Github/wakefx","delegationDepth":0}"#,+ "\n",+ r#"{"type":"user/message","seq":0,"time":1788000001000,"data":{"id":"m-u","role":"user","content":[{"type":"text","text":"old generation question"}],"source":{"kind":"user"}}}"#,+ "\n",+ r#"{"type":"session/title","seq":1,"time":1788000002000,"data":{"title":"Old generation title"}}"#,+ "\n",+ )),+ )+ .unwrap();+ let adapters: Vec<Box<dyn AgentAdapter>> =+ vec![DshAdapter::new().with_custom_root(root.path().to_path_buf())];+ let dir = tempfile::tempdir().unwrap();+ let store = temp_store(dir.path());+ run_scan(&adapters, &store, &Recorder::new(), true).unwrap();+ let s = store.get_session(KEY).unwrap().expect("旧代入库");+ assert_eq!(s.file_path, v0.to_string_lossy());+ assert_eq!(s.title, "Old generation title");++ // dsh 迁移出 v4,mtime 却比 v0 旧一小时+ let v4 = session.join("session.v4.jsonl.zstd");+ let plain = std::fs::read_to_string(common::fixture("dsh/session.v4.jsonl")).unwrap();+ std::fs::write(&v4, common::dsh_zstd(&plain)).unwrap();+ std::fs::File::options()+ .write(true)+ .open(&v4)+ .unwrap()+ .set_modified(std::time::SystemTime::now() - std::time::Duration::from_secs(3600))+ .unwrap();+ let incoming = adapters[0].file_ref(&v4).expect("v4 是这个会话的日志");+ scan_files(&adapters, &store, &Recorder::new(), vec![incoming]);+ let s = store.get_session(KEY).unwrap().expect("会话仍在库");+ assert_eq!(+ s.file_path,+ v4.to_string_lossy(),+ "新代经增量写入接替,不被旧代较新的 mtime 挡住"+ );+ assert_eq!(s.title, "README 安装命令改 npx");++ // 旧代上的事件不是这个会话的日志;下一轮全量扫描也稳定在新代上+ assert!(adapters[0].file_ref(&v0).is_none());+ run_scan(&adapters, &store, &Recorder::new(), false).unwrap();+ assert_eq!(+ store.get_session(KEY).unwrap().unwrap().file_path,+ v4.to_string_lossy()+ );+}+/// Cursor 两源端到端:转录带正文的会话固定由 CLI 源胜出(它有 slug 可反推/// 项目),哪怕 IDE 库里那份 lastUpdatedAt 更新、roster 里 IDE 实例排在前面;/// 转录只剩 turn_ended 空壳的会话由 IDE 库副本胜出。按 mtime 裁决的话胜负随