Skip to content

armgit / Wake

Public Imported from GitHub
0

All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.

Rust

fix(cursor): let the transcript outrank its IDE copy and survive NULL bubbles

Corey Chiu8a5b34c09238
diff --git a/PRODUCT.md b/PRODUCT.md
index 7ad1679..088a7e8 100644
--- a/PRODUCT.md
+++ b/PRODUCT.md
@@ -30,7 +30,7 @@ Corey 本人(独立开发者,主力工具 Claude Code 与 Codex,中文为主)。
已实现:十八家 adapter、FTS5 trigram 搜索(<3 码点 LIKE 降级)、**搜索跳转定位**(2026-08-18:⌘K 命中直达详情页对应消息并高亮,seq 契约保证)、详情页逐消息渲染(气泡/工具折叠簇/thinking/tree-sitter 高亮;2026-08-17 由整篇 markdown 方案升级)、恢复/收藏/置顶/导出/删除(废纸篓+墓碑)、文件监听增量、Insights 统计页(0.3.0:活跃热力图与 streak、时段/星期/月份分布、Agents·Projects·Models 三榜单按 sessions/tokens/prompts 切换;2026-09-03 加 Last 7 days 周对比行与 Over time 近 53 周按 agent 堆叠的每周 prompts 趋势图;口径=主线用户消息,规格见 DESIGN.md)、Updates 页与 macOS Wake 菜单手动检查 GitHub 最新正式版并打开 Release 页更新(不后台联网、不自动替换应用包)、测试套件(adapter 契约、DB 往返、scanner 回归 + CI 三平台 + pre-commit,合成 fixture)、三端桌面(macOS 主平台;Linux/Windows experimental,终端恢复/废纸篓·回收站/剪贴板按平台原生实现,发版 CI 自动出六产物)、窗口记忆(0.3.6:记住所在屏幕/屏内位置/最大化/全屏,重启与 Dock 重开都回到原处,Settings 开在主窗所在屏)、完整 macOS 菜单栏(0.3.6:标准 Edit/Window 菜单、⌘W、Window → Main Window,主窗关闭后 About/Settings/Updates 仍可用)、导出 Markdown 与保存图片走系统「另存为」并记住上次目录(0.3.6,issue #25)、远程 host(0.4.0,issue #21:Settings → Remote hosts 配 SSH 目标,rsync 白名单镜像会话数据到本地缓存后与本地会话同列同搜,`@host` 徽章标识;阶段 1 只读——不动远端文件、远程会话禁删,resume 以 Copy SSH command 形态提供;分期计划见 CLAUDE.md「远程 host」节)、**MCP 接入**(0.5.0:随应用打包的只读 `wake-mcp` stdio server,四个工具 wake_search / wake_list_sessions / wake_get_session / wake_list_projects,Claude Code / Codex / Cursor 等任何 MCP 客户端可搜历史、按项目列会话、分页读转录;Settings → Connect 展示路径与可复制配置片段,只展示不代写别家配置;零 LLM、零网络、不写库;完整参考 docs/mcp.md)、**命令行与 Skill**(0.6.0:并排打包的只读 `wake-cli`,四个子命令 search / sessions / show / projects 加 setup,给"能跑 shell 但不说 MCP"的 agent 和真人用——它不新写查询逻辑,argv 翻成 JSON 喂同一批工具,输出与 MCP 客户端看到的**逐字节相同**(仅 CLI 末尾补一个换行)并由测试卡住,所以文档只需描述一份格式;`skills/wake/SKILL.md` 是可一行安装的 skill(`npx skills add iAmCorey/Wake`),用触发条件而非名词解释写 description,让 agent 自己想得起来去翻会话历史;完整参考 docs/cli.md;0.6.3 加 `wake-cli index`——装了 Wake 却从没启动过时,agent 自己跑一条就能把索引建起来继续干活,而不是停下来问人。它**只建不存在的索引**,已有的库原样交给 GUI:扫描落在旁边的临时库、扫完才原子占位,所以被中途杀掉可重试、撞上 GUI 首扫就退让)、Connect 页四区块(0.6.1:MCP server / MCP clients / Command line / Skill,每个面的第一块挂自己的文档链接)。后续边界(2026-09-07 定):摘要层(需 LLM、opt-in、明示会把会话正文发给用户配置的端点)只在 MCP 接入有真实使用之后再做;Timeline / Profile 一类视图建立在摘要之上;不做 ChatGPT / Claude.ai 导出导入主线、不做实体本体与知识图谱、不做 Chrome 扩展注入。
约束:对 agent 数据目录只读;绝不写 Codex 的 SQLite;不读凭证;GPUI 无 SF Symbols(图标用 lucide SVG 自备)。
-已支持十八家 agent:Claude Code、Codex(0.6.6 起排除可识别的内部线程:guardian auto-review、`/review`、compaction、memory consolidation、thread_spawn 子代理与用户会话同树,adapter 文件边界按首行 session_meta 的 source / thread_source 认出即不枚举;老格式或读不出的首行保守放行,`codex exec --thread-source` 打了标签的自动化线程照常收录,issue #30)、Qoder CLI(`~/.qoder/projects` JSONL,active-leaf 分支恢复、tool result 回挂、`QODER_CONFIG_DIR`)、Copilot CLI、Cursor(CLI transcripts)、OpenCode(含 OpenCode 2 next,stable 的 `opencode.db` 与 next 的 `opencode-next.db` 同时扫描;逐会话兼容 `message+part`、真实 `session+session_message` 及早期 `session_v2` schema;preview 会话标 opencode2 徽章)、Kiro、Gemini CLI(2026-08-17 P1 五家落地)+ Pi、Oh My Pi、Grok Build、Kimi Code、Antigravity CLI(2026-08-19 对齐 kooky 内置 roster;Antigravity 正文加密仅元数据卡片)+ DeepSeek Harness(dsh,2026-08-20,zstd 事件日志透明解压;格式由源码推断,当天用户跑出真实会话完成首验)+ Hermes Agent(2026-09-03,多档案 state.db,无 cwd 故 project 留空)、OpenClaw(2026-09-03,两代存储同扫;本机零会话,格式由源码推断未经真机验证)、CodeBuddy(2026-09-14,issue #27:`~/.codebuddy/projects` 的 Responses 形 JSONL,custom / ai / topic 三级标题,`CODEBUDDY_CONFIG_DIR`;本机零会话,格式由官方 CLI 文档与三家第三方实现交叉推断、未经真机验证)、WorkBuddy(同日,CodeBuddy 的孪生实例:同一解析核心,`~/.workbuddy/projects`、`WORKBUDDY_CONFIG_DIR`;桌面 app 无 CLI,不提供 resume;同构只有 cc-switch 一家佐证)。做不了的:Cursor IDE chats 正文加密,Windsurf/Trae 加密,Amp/Factory(Droid)/Warp 云端无本地数据,Reasonix 本机零会话格式未实测。
+已支持十八家 agent:Claude Code、Codex(0.6.6 起排除可识别的内部线程:guardian auto-review、`/review`、compaction、memory consolidation、thread_spawn 子代理与用户会话同树,adapter 文件边界按首行 session_meta 的 source / thread_source 认出即不枚举;老格式或读不出的首行保守放行,`codex exec --thread-source` 打了标签的自动化线程照常收录,issue #30)、Qoder CLI(`~/.qoder/projects` JSONL,active-leaf 分支恢复、tool result 回挂、`QODER_CONFIG_DIR`)、Copilot CLI、Cursor(CLI 转录 + 0.6.7 起 IDE Chat/Composer 历史,PR #32:`globalStorage/state.vscdb` 明文 KV 库,composerData 给顺序、bubbleId 行给正文;转录带正文的会话归转录源,库只补转录缺失或只剩 turn_ended 空壳的会话;库里多数老会话没存工作区路径,落 Unknown project)、OpenCode(含 OpenCode 2 next,stable 的 `opencode.db` 与 next 的 `opencode-next.db` 同时扫描;逐会话兼容 `message+part`、真实 `session+session_message` 及早期 `session_v2` schema;preview 会话标 opencode2 徽章)、Kiro、Gemini CLI(2026-08-17 P1 五家落地)+ Pi、Oh My Pi、Grok Build、Kimi Code、Antigravity CLI(2026-08-19 对齐 kooky 内置 roster;Antigravity 正文加密仅元数据卡片)+ DeepSeek Harness(dsh,2026-08-20,zstd 事件日志透明解压;格式由源码推断,当天用户跑出真实会话完成首验)+ Hermes Agent(2026-09-03,多档案 state.db,无 cwd 故 project 留空)、OpenClaw(2026-09-03,两代存储同扫;本机零会话,格式由源码推断未经真机验证)、CodeBuddy(2026-09-14,issue #27:`~/.codebuddy/projects` 的 Responses 形 JSONL,custom / ai / topic 三级标题,`CODEBUDDY_CONFIG_DIR`;本机零会话,格式由官方 CLI 文档与三家第三方实现交叉推断、未经真机验证)、WorkBuddy(同日,CodeBuddy 的孪生实例:同一解析核心,`~/.workbuddy/projects`、`WORKBUDDY_CONFIG_DIR`;桌面 app 无 CLI,不提供 resume;同构只有 cc-switch 一家佐证)。做不了的:Windsurf/Trae 加密,Amp/Factory(Droid)/Warp 云端无本地数据,Reasonix 本机零会话格式未实测。
## Brand Commitments
diff --git a/README.md b/README.md
index 88d6b8d..87515de 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Your agent history is scattered across `~/.claude`, `~/.codex`, and a dozen othe
| Codex CLI | `~/.codex/sessions` + `state_5.sqlite` (read-only) | ✅ | ✅ |
| Qoder CLI | `~/.qoder/projects/*/*.jsonl` (`QODER_CONFIG_DIR` is respected) | ✅ | — |
| Copilot CLI | `~/.copilot/session-store.db` | — | — |
-| Cursor (CLI transcripts) | `~/.cursor/projects/**/agent-transcripts` | — | — |
+| Cursor | `~/.cursor/projects/**/agent-transcripts` (agent transcripts) + `~/Library/Application Support/Cursor/User/globalStorage/state.vscdb` (IDE Chat/Composer history, read-only) | — | — |
| OpenCode | `~/.local/share/opencode/opencode.db` | ✅ | — |
| OpenCode 2 (`opencode2`) | `~/.local/share/opencode/{opencode.db,opencode-next.db}` (`session_v2` or `session` + `session_message`); both paths are scanned | ✅ | — |
| Kiro | `~/.kiro/sessions/cli` | ✅ | — |
@@ -55,7 +55,9 @@ Your agent history is scattered across `~/.claude`, `~/.codex`, and a dozen othe
Codex writes its background threads — the guardian auto-review, `/review`, compaction, memory consolidation and spawned sub-agents — into the same `sessions` directory as your conversations. Wake recognises them from the metadata on their first line and skips them; a file it cannot identify stays visible rather than risk hiding a real conversation.
-Cursor IDE chats, Windsurf, and Trae encrypt their local data; Amp, Factory (Droid), and Warp keep sessions in the cloud — none of those are supported. Reasonix stores sessions locally but hasn't been mapped yet.
+Cursor keeps two stores. A chat that has a full transcript under `~/.cursor/projects` is read from there (the transcript knows the project folder); chats that only live in Cursor's own database — older ones, or Cursor versions that leave nothing but a `turn_ended` marker in the transcript — are read from `state.vscdb`. Older IDE chats that Cursor stored without a workspace show up under *Unknown project*.
+
+Windsurf and Trae encrypt their local data; Amp, Factory (Droid), and Warp keep sessions in the cloud — none of those are supported. Reasonix stores sessions locally but hasn't been mapped yet.
## Remote hosts
diff --git a/crates/wake-core/src/adapters/cursor.rs b/crates/wake-core/src/adapters/cursor.rs
index f49d611..cc2f98e 100644
--- a/crates/wake-core/src/adapters/cursor.rs
+++ b/crates/wake-core/src/adapters/cursor.rs
@@ -13,8 +13,11 @@ use std::path::{Path, PathBuf};
/// 从有损 slug 目录名 DFS 反推真实路径。
///
/// **同一家的另一个源**:IDE 面板(Chat/Composer)的会话正文在
-/// `globalStorage/state.vscdb`,由 cursor_ide.rs 读;它在本源只留
-/// `{"type":"turn_ended"}` 空壳,枚举时按 `is_turn_marker_only` 跳过。
+/// `globalStorage/state.vscdb`,由 cursor_ide.rs 读。某些 Cursor 版本的 IDE
+/// 会话在本源只留 `{"type":"turn_ended"}` 空壳,枚举时按 `is_turn_marker_only`
+/// 跳过;转录带正文时两源各有一份,scanner 的副本裁决按 `dedup_rank` 固定让
+/// 本源胜出——本源有 slug 可反推项目,IDE 库里多数会话没有工作区路径,按写盘
+/// 先后轮流胜出会让同一会话在项目之间跳(2026-09-15 实测,Cursor 3.18)。
pub struct CursorAdapter {
root: PathBuf,
}
@@ -133,10 +136,13 @@ fn parse_cursor_jsonl(path: &Path, decode_images: bool) -> Result<CursorParse> {
let mut created_at = 0i64;
let mut updated_at = 0i64;
let mut unknown_lines = 0u32;
+ // 读不出/不是 JSON 的行(截断、损坏),与"认得出 JSON 但类型未知"分开计
+ let mut malformed_lines = 0u32;
for line in reader.lines() {
let Ok(line) = line else {
unknown_lines += 1;
+ malformed_lines += 1;
continue;
};
if line.trim().is_empty() {
@@ -146,6 +152,7 @@ fn parse_cursor_jsonl(path: &Path, decode_images: bool) -> Result<CursorParse> {
Ok(v) => v,
Err(_) => {
unknown_lines += 1;
+ malformed_lines += 1;
continue;
}
};
@@ -245,6 +252,13 @@ fn parse_cursor_jsonl(path: &Path, decode_images: bool) -> Result<CursorParse> {
}
flush_assistant(&mut pending, &mut messages);
assign_seq(&mut messages);
+ // 一条消息都没解出来、却有坏行:这是截断/损坏的转录(如只剩 `{"role":`,
+ // 它过得了 is_turn_marker_only 的空壳判定),不是空会话。按失败报出去,
+ // scanner 才会按裁决顺位回退到 IDE 库那份副本;返回 Ok 零消息会让
+ // dedup_rank 靠前的坏转录压过完整副本(2026-09-15 Codex review)
+ if messages.is_empty() && malformed_lines > 0 {
+ anyhow::bail!("no messages parsed, {malformed_lines} unreadable line(s)");
+ }
Ok(CursorParse {
messages,
created_at,
@@ -575,6 +589,28 @@ mod tests {
}
}
+ /// 截断成 `{"role":` 的转录过得了空壳判定,却一条消息都解不出:必须按解析
+ /// 失败报出去,scanner 才会回退到 IDE 库副本,而不是让零消息的坏文件胜出
+ #[test]
+ fn truncated_transcript_is_a_parse_failure() {
+ let dir = tempfile::tempdir().expect("tempdir");
+ let truncated = write(dir.path(), "truncated.jsonl", "{\"role\":\n");
+ assert!(!is_turn_marker_only(&truncated), "含 role 字样,不是空壳");
+ assert!(
+ parse_cursor_jsonl(&truncated, false).is_err(),
+ "零消息 + 坏行 = 解析失败"
+ );
+ // 有消息就照常成功——尾部一条坏行只计 unknown,不推翻整个会话
+ let intact = write(
+ dir.path(),
+ "intact.jsonl",
+ "{\"role\":\"user\",\"message\":{\"content\":[{\"type\":\"text\",\"text\":\"hi\"}]}}\n{\"role\":\n",
+ );
+ let parsed = parse_cursor_jsonl(&intact, false).expect("有正文的转录照常解析");
+ assert_eq!(parsed.messages.len(), 1);
+ assert_eq!(parsed.unknown_lines, 1);
+ }
+
/// 读不到的文件不下结论:判为"非空壳"交给解析阶段,
/// 绝不能因为打不开就把一个真会话从索引里抹掉
#[test]
diff --git a/crates/wake-core/src/adapters/cursor_ide.rs b/crates/wake-core/src/adapters/cursor_ide.rs
index 946fc84..421debc 100644
--- a/crates/wake-core/src/adapters/cursor_ide.rs
+++ b/crates/wake-core/src/adapters/cursor_ide.rs
@@ -12,8 +12,11 @@ use std::path::PathBuf;
/// **与 cursor.rs 是同一家的两个数据源**:CLI(`cursor-agent`)把完整对话写
/// `~/.cursor/.../agent-transcripts/*.jsonl`,IDE 面板只把回合标记
/// (`{"type":"turn_ended"}`)写进那里、正文全留在本库——所以 IDE 会话在只读
-/// JSONL 的旧实现里是空壳。两源同 native_id 的重叠由 scanner 按 mtime/size
-/// 裁决(不变量 8⑦),这里不做二选一。
+/// JSONL 的旧实现里是空壳。两源同 native_id 的重叠交 scanner 的副本裁决,
+/// 本源以 `dedup_rank` 排在 CLI 源之后:转录带正文时 CLI 那份胜出(它有 slug
+/// 可反推项目,本库多数会话没有工作区路径),本源那份留作解析失败的回退;
+/// 只有转录缺失或只剩空壳的会话才由本源胜出。不按 mtime 定胜负——两边写盘
+/// 先后不固定,同一会话会在项目之间跳(2026-09-15 实测)。
///
/// 库结构(VS Code 的 KV 表):
/// - `cursorDiskKV`:`composerData:<composerId>` 是会话元数据 + 气泡顺序
@@ -195,7 +198,12 @@ impl CursorIdeAdapter {
let mut found = stmt.query(rusqlite::params![&prefix, cut, &upper])?;
while let Some(row) = found.next()? {
let id: String = row.get(0)?;
- let body: String = row.get(1)?;
+ // Cursor 清理过的气泡会留下 value 为 NULL 的行(本机 2.5 GB 库里
+ // 983 行、波及 107 个会话),按"已被清理"跳过——当成错误会让
+ // 整个会话解析失败
+ let Some(body) = row.get::<_, Option<String>>(1)? else {
+ continue;
+ };
if let Ok(v) = serde_json::from_str::<Value>(&body) {
bubbles.insert(id, v);
}
@@ -437,6 +445,11 @@ impl AgentAdapter for CursorIdeAdapter {
AgentId::Cursor
}
+ /// 与 cursor.rs 同 key 的副本:CLI 源先、本源后(见文件头)
+ fn dedup_rank(&self) -> u8 {
+ 1
+ }
+
fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {
let Some(rows) = self.rows() else {
return Ok(Vec::new());
diff --git a/crates/wake-core/src/adapters/mod.rs b/crates/wake-core/src/adapters/mod.rs
index dfa2c41..a5428f4 100644
--- a/crates/wake-core/src/adapters/mod.rs
+++ b/crates/wake-core/src/adapters/mod.rs
@@ -144,6 +144,13 @@ 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 {
+ 0
+ }
}
/// 入库前的自定义根归一化:把用户选中的目录整形成本家"该存哪一层"的形态。
diff --git a/crates/wake-core/src/adapters/remote.rs b/crates/wake-core/src/adapters/remote.rs
index 0e40381..4933870 100644
--- a/crates/wake-core/src/adapters/remote.rs
+++ b/crates/wake-core/src/adapters/remote.rs
@@ -177,6 +177,10 @@ impl AgentAdapter for RemoteAdapter {
self.inner.supports_individual_root_removal()
}
+ fn dedup_rank(&self) -> u8 {
+ self.inner.dedup_rank()
+ }
+
fn excluding_data_roots(&self, roots: &[std::path::PathBuf]) -> Option<Box<dyn AgentAdapter>> {
let inner = self.inner.excluding_data_roots(roots)?;
Some(Box::new(Self::new(inner, self.host.clone())))
diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rs
index 9633867..a6c0148 100644
--- a/crates/wake-core/src/db.rs
+++ b/crates/wake-core/src/db.rs
@@ -368,12 +368,16 @@ impl Store {
/// 增量写入的并发安全版:胜者比较与写入**同一事务**——先查后写分开时,
/// 败方副本的事件能与全量扫描交错、后发落库,让 file_path 违背 mtime 裁决
- /// (2026-08-24 Codex review)。返回 false = 本次是败方副本,一字未写
+ /// (2026-08-24 Codex review)。裁决与 scanner 枚举时的候选排序是同一把尺子:
+ /// 先比副本所属实例的 `dedup_rank`(`rank_of` 按 file_path 给出,小者胜),
+ /// 同级再比 mtime 新者、平局路径字典序——两条路径尺子不一,会话就会在两份
+ /// 副本之间摇摆(2026-09-15 Codex review)。返回 false = 本次是败方副本,一字未写
pub fn write_session_guarded(
&self,
meta: &SessionMeta,
file_mtime: i64,
units: &[IndexUnit],
+ rank_of: &dyn Fn(&str) -> u8,
) -> Result<bool> {
let mut conn = self.write.lock().unwrap();
let tx = conn.transaction()?;
@@ -385,11 +389,19 @@ impl Store {
)
.optional()?;
if let Some((cur_path, cur_mtime)) = cur {
- let loses = cur_path != meta.file_path
- && (cur_mtime > file_mtime
- || (cur_mtime == file_mtime && cur_path.as_str() < meta.file_path.as_str()));
- if loses {
- return Ok(false); // 事务未提交即弃
+ // 既有行是 quick 阶段的占位(write_meta_only 写 file_mtime=0,正文尚未
+ // 解析)时不裁决:胜者解析失败后回退副本要能接管它——旧规则里 0 天然
+ // 比不过任何 mtime,位次进来后必须把这一层说明白
+ if cur_path != meta.file_path && cur_mtime != 0 {
+ let (cur_rank, new_rank) = (rank_of(&cur_path), rank_of(&meta.file_path));
+ let loses = cur_rank < new_rank
+ || (cur_rank == new_rank
+ && (cur_mtime > file_mtime
+ || (cur_mtime == file_mtime
+ && cur_path.as_str() < meta.file_path.as_str())));
+ if loses {
+ return Ok(false); // 事务未提交即弃
+ }
}
}
write_session_tx(&tx, meta, file_mtime, units)?;
diff --git a/crates/wake-core/src/scanner.rs b/crates/wake-core/src/scanner.rs
index f739375..885f38c 100644
--- a/crates/wake-core/src/scanner.rs
+++ b/crates/wake-core/src/scanner.rs
@@ -162,6 +162,16 @@ pub fn run_scan(
result
}
+/// 写事务内副本裁决(`Store::write_session_guarded`)用的位次查询:按 file_path
+/// 找拥有它的实例取 `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())
+}
+
fn run_scan_inner(
adapters: &[Box<dyn AgentAdapter>],
store: &Arc<Store>,
@@ -230,8 +240,10 @@ fn run_scan_inner(
per_adapter.push(refs);
}
// 同家同 ID 去重:同一会话在默认根与自定义根各有一份副本时,两个文件会
- // 每轮轮流改写同一行(key 相同,file_path 摇摆)。候选按 (mtime 新者,
- // 平局路径字典序小者) 排序,首位入队,其余留作**解析失败的回退顺位**
+ // 每轮轮流改写同一行(key 相同,file_path 摇摆)。候选按 (实例 dedup_rank
+ // 小者, mtime 新者, 平局路径字典序小者) 排序,首位入队,其余留作**解析
+ // 失败的回退顺位**——rank 让一家的多个数据源固定偏好某一源(Cursor 的
+ // 转录源永远压过 IDE 库副本),mtime 只在同级副本之间裁决
// ——胜者副本截断/损坏时,不能让整个会话从索引消失(Codex review P2)。
// 去重域即 session_key(agent, 实例 host, native_id)——直接以它为键,
// "去重域与最终 key 的分段一致"就结构性成立:两台机器各自续跑过的
@@ -247,9 +259,11 @@ fn run_scan_inner(
}
}
for v in candidates.values_mut() {
- v.sort_by(|(_, a), (_, b)| {
- b.mtime_ms
- .cmp(&a.mtime_ms)
+ v.sort_by(|(ia, a), (ib, b)| {
+ adapters[*ia]
+ .dedup_rank()
+ .cmp(&adapters[*ib].dedup_rank())
+ .then_with(|| b.mtime_ms.cmp(&a.mtime_ms))
.then_with(|| a.file_path.cmp(&b.file_path))
});
}
@@ -379,7 +393,12 @@ fn run_scan_inner(
// 全量写入也走事务内副本裁决:扫描快照里的旧副本不得覆盖
// watcher 并发间隙写入的更新副本(启动扫描与手动刷新期间
// watcher 都活着,2026-08-24 Codex review P1)
- match store.write_session_guarded(&meta, item.r.mtime_ms, &parsed.units) {
+ match store.write_session_guarded(
+ &meta,
+ item.r.mtime_ms,
+ &parsed.units,
+ &rank_of(adapters, meta.agent),
+ ) {
Ok(written) => item_written = written,
Err(e) => eprintln!("[scanner] write failed {}: {e}", item.r.file_path),
}
@@ -403,7 +422,12 @@ fn run_scan_inner(
item_written = true;
break;
}
- match store.write_session_guarded(&meta, fb.mtime_ms, &parsed.units) {
+ match store.write_session_guarded(
+ &meta,
+ fb.mtime_ms,
+ &parsed.units,
+ &rank_of(adapters, meta.agent),
+ ) {
Ok(written) => item_written = written,
Err(e) => eprintln!(
"[scanner] fallback write failed {}: {e}",
@@ -592,7 +616,12 @@ fn reparse_for_parent_change(
if meta.key != key || store.is_key_tombstoned(&meta.key) {
return false;
}
- match store.write_session_guarded(&meta, reference.mtime_ms, &parsed.units) {
+ match store.write_session_guarded(
+ &meta,
+ reference.mtime_ms,
+ &parsed.units,
+ &rank_of(adapters, agent),
+ ) {
Ok(written) => written,
Err(error) => {
eprintln!("[scanner] detached session write failed {file_path}: {error}");
@@ -662,7 +691,12 @@ pub fn scan_files(
// 全量扫描并发交错时,败方能后发落库违背 mtime 裁决
//(rsync 刷备份目录带旧 mtime 的事件串,2026-08-24 Codex review)
if store
- .write_session_guarded(&meta, r.mtime_ms, &parsed.units)
+ .write_session_guarded(
+ &meta,
+ r.mtime_ms,
+ &parsed.units,
+ &rank_of(adapters, meta.agent),
+ )
.unwrap_or(false)
{
changed = true;
diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rs
index d826b71..36eb006 100644
--- a/crates/wake-core/tests/adapter_contracts.rs
+++ b/crates/wake-core/tests/adapter_contracts.rs
@@ -710,13 +710,25 @@ fn qoder_explicit_null_active_leaf_is_empty() {
/// IDE 会话会一起消失(反之亦然)。
#[test]
fn cursor_two_sources_remove_independently() {
- let _env = setup();
+ let env = setup();
let roster = wake_core::adapters::create_adapters();
let cursors: Vec<&Box<dyn wake_core::adapters::AgentAdapter>> = roster
.iter()
.filter(|a| a.agent() == AgentId::Cursor)
.collect();
assert_eq!(cursors.len(), 2, "Cursor 应有 CLI 与 IDE 两个数据源");
+ // 同一会话两源各有一份时,scanner 的副本裁决按 dedup_rank 固定让 CLI 源
+ // 胜出、IDE 副本作回退(端到端见 scanner_finale::cursor_transcript_outranks_ide_copy)
+ let (cli, ide) = (cursors[0], cursors[1]);
+ assert_eq!(
+ ide.data_roots(),
+ vec![env.cursor_ide_db.clone()],
+ "roster 顺序:CLI 在前、IDE 库在后"
+ );
+ assert!(
+ cli.dedup_rank() < ide.dedup_rank(),
+ "CLI 源必须排在 IDE 库副本之前"
+ );
for a in &cursors {
assert!(
a.supports_individual_root_removal(),
@@ -790,7 +802,8 @@ fn cursor_ide_parse_contract() {
let env = setup();
let adapter = CursorIdeAdapter::new();
- // 枚举:零气泡的草稿不进列表,有正文的三条都在
+ // 枚举:零气泡的草稿不进列表,有正文的都在——含与 CLI 转录同 id 的
+ // 3333…03(谁胜出由 scanner 按 dedup_rank 定,本源只管如实枚举)
let mut ids: Vec<String> = adapter
.list_session_files()
.expect("cursor ide list")
@@ -798,7 +811,17 @@ fn cursor_ide_parse_contract() {
.map(|r| r.native_id)
.collect();
ids.sort();
- assert_eq!(ids, vec!["cide-0001", "cide-0002", "cide-0004"]);
+ assert_eq!(
+ ids,
+ vec![
+ "33333333-aaaa-bbbb-cccc-000000000003",
+ "44444444-aaaa-bbbb-cccc-000000000004",
+ "55555555-aaaa-bbbb-cccc-000000000005",
+ "cide-0001",
+ "cide-0002",
+ "cide-0004"
+ ]
+ );
let r = db_ref(AgentId::Cursor, &env.cursor_ide_db, "cide-0001");
let s = adapter.parse_session(&r).expect("cursor ide parse_session");
@@ -818,7 +841,8 @@ fn cursor_ide_parse_contract() {
assert!(s.meta.file_path.ends_with("#cide-0001"));
assert_eq!(s.unknown_line_count, 0);
- // 空壳流式气泡(bb)与已被清理的气泡(cc)都不产出消息
+ // 空壳流式气泡(bb)、已被清理的气泡(cc)与 value 为 NULL 的气泡行(dd)
+ // 都不产出消息,也不让整段解析失败
assert_eq!(
roles_kinds(&t.mainline),
vec![
diff --git a/crates/wake-core/tests/common/mod.rs b/crates/wake-core/tests/common/mod.rs
index fd6dc6c..d196604 100644
--- a/crates/wake-core/tests/common/mod.rs
+++ b/crates/wake-core/tests/common/mod.rs
@@ -466,12 +466,19 @@ pub fn build_antigravity_db(path: &Path) {
/// 这条是防回归的主要断言。含 thinking 气泡、工具气泡(rawArgs 形态)、
/// **只有 params 没有 rawArgs 的终端气泡**(实测占工具调用的 11%,且
/// 结果是 `{"output":…}` 对象而非字符串)、空壳流式气泡
-/// (Cursor 每个分片都落一条,绝大多数没有 text),以及一条顺序表里有、
-/// KV 里已被清理的气泡。
+/// (Cursor 每个分片都落一条,绝大多数没有 text),一条顺序表里有、
+/// KV 里已被清理的气泡,以及一条 KV 里 value 为 NULL 的气泡行(Cursor 清理
+/// 过的会话常见,真实库里一条就曾让整个会话解析失败)。
/// - `cide-0002`:`name` 为空且无 lastUpdatedAt,验证标题回退首条用户消息、
/// updated_at 回退末条气泡的 ISO createdAt。
/// - `cide-0003`:零气泡的草稿 composer,不进列表。
/// - `cide-0004`:子代理会话,composerHeaders 给出 parentComposerId。
+/// - `33333333-…-03`:与 CLI 转录 fixture 同 id 的 IDE 副本——转录带正文,
+/// scanner 按 dedup_rank 让 CLI 那份胜出(scanner_finale 有端到端)。
+/// - `44444444-…-04`:转录只剩 turn_ended 空壳(fixtures/cursor 下同名文件),
+/// CLI 源丢弃、IDE 副本胜出。
+/// - `55555555-…-05`:scanner_finale 在测试里给它写一份截断成 `{"role":` 的
+/// 坏转录——过得了空壳判定、解不出消息,必须按解析失败回退到这份 IDE 副本。
pub fn build_cursor_ide_db(path: &Path) {
let conn = rusqlite::Connection::open(path).expect("create cursor ide fixture db");
conn.execute_batch(
@@ -497,6 +504,7 @@ pub fn build_cursor_ide_db(path: &Path) {
{"bubbleId":"nn-term-1","type":2,"createdAt":"2026-08-09T10:00:09.500Z"},
{"bubbleId":"bb-empty-1","type":2,"createdAt":"2026-08-09T10:00:10.000Z"},
{"bubbleId":"cc-gone-1","type":2,"createdAt":"2026-08-09T10:00:11.000Z"},
+ {"bubbleId":"dd-null-1","type":2,"createdAt":"2026-08-09T10:00:11.500Z"},
{"bubbleId":"kk-final-1","type":2,"createdAt":"2026-08-09T10:00:12.000Z"}]}'),
('bubbleId:cide-0001:zz-user-1',
'{"_v":3,"type":1,"bubbleId":"zz-user-1","createdAt":"2026-08-09T10:00:05.000Z",
@@ -516,7 +524,9 @@ pub fn build_cursor_ide_db(path: &Path) {
"params":{"command":"cargo test -p wakefx","cwd":""},
"result":{"output":"test result: ok. 3 passed","rejected":false}}}'),
('bubbleId:cide-0001:bb-empty-1',
- '{"_v":3,"type":2,"bubbleId":"bb-empty-1","createdAt":"2026-08-09T10:00:10.000Z","text":""}'), ('bubbleId:cide-0001:kk-final-1',
+ '{"_v":3,"type":2,"bubbleId":"bb-empty-1","createdAt":"2026-08-09T10:00:10.000Z","text":""}'),
+ ('bubbleId:cide-0001:dd-null-1', NULL),
+ ('bubbleId:cide-0001:kk-final-1',
'{"_v":3,"type":2,"bubbleId":"kk-final-1","createdAt":"2026-08-09T10:00:12.000Z",
"text":"找到泄漏点,已在清理回调里停止扫描。"}'),
@@ -542,7 +552,28 @@ pub fn build_cursor_ide_db(path: &Path) {
"workspaceIdentifier":{"id":"ws1","uri":{"fsPath":"/Users/tester/Github/wakefx","path":"/Users/tester/Github/wakefx","scheme":"file"}},
"fullConversationHeadersOnly":[{"bubbleId":"s1","type":1}]}'),
('bubbleId:cide-0004:s1',
- '{"_v":3,"type":1,"bubbleId":"s1","createdAt":"2026-08-09T12:00:00.000Z","text":"child task"}');
+ '{"_v":3,"type":1,"bubbleId":"s1","createdAt":"2026-08-09T12:00:00.000Z","text":"child task"}'),
+
+ ('composerData:33333333-aaaa-bbbb-cccc-000000000003',
+ '{"_v":18,"composerId":"33333333-aaaa-bbbb-cccc-000000000003","name":"CLI twin",
+ "createdAt":1786340000000,"lastUpdatedAt":1786340100000,
+ "fullConversationHeadersOnly":[{"bubbleId":"t1","type":1}]}'),
+ ('bubbleId:33333333-aaaa-bbbb-cccc-000000000003:t1',
+ '{"_v":3,"type":1,"bubbleId":"t1","createdAt":"2026-08-09T13:00:00.000Z","text":"IDE 库里的同一会话"}'),
+
+ ('composerData:44444444-aaaa-bbbb-cccc-000000000004',
+ '{"_v":18,"composerId":"44444444-aaaa-bbbb-cccc-000000000004","name":"Stub twin",
+ "createdAt":1786350000000,"lastUpdatedAt":1786350100000,
+ "fullConversationHeadersOnly":[{"bubbleId":"u1","type":1}]}'),
+ ('bubbleId:44444444-aaaa-bbbb-cccc-000000000004:u1',
+ '{"_v":3,"type":1,"bubbleId":"u1","createdAt":"2026-08-09T14:00:00.000Z","text":"只有空壳转录的会话"}'),
+
+ ('composerData:55555555-aaaa-bbbb-cccc-000000000005',
+ '{"_v":18,"composerId":"55555555-aaaa-bbbb-cccc-000000000005","name":"Corrupt twin",
+ "createdAt":1786360000000,"lastUpdatedAt":1786360100000,
+ "fullConversationHeadersOnly":[{"bubbleId":"v1","type":1}]}'),
+ ('bubbleId:55555555-aaaa-bbbb-cccc-000000000005:v1',
+ '{"_v":3,"type":1,"bubbleId":"v1","createdAt":"2026-08-09T15:00:00.000Z","text":"转录已损坏的会话"}');
INSERT INTO composerHeaders
(composerId, workspaceId, createdAt, lastUpdatedAt, isArchived, isSubagent, recency, checkpointAt, value, subagentTypeName)
diff --git a/crates/wake-core/tests/db_roundtrip.rs b/crates/wake-core/tests/db_roundtrip.rs
index c3524b5..b5d69c7 100644
--- a/crates/wake-core/tests/db_roundtrip.rs
+++ b/crates/wake-core/tests/db_roundtrip.rs
@@ -657,7 +657,7 @@ fn guarded_write_respects_winner() {
let mut loser = meta("codex:g", "败方");
loser.file_path = "/backup/g.jsonl".into();
assert!(
- !store.write_session_guarded(&loser, 5, &[]).unwrap(),
+ !store.write_session_guarded(&loser, 5, &[], &|_| 0).unwrap(),
"败方不该写入"
);
assert_eq!(
@@ -666,13 +666,39 @@ fn guarded_write_respects_winner() {
);
assert!(
- store.write_session_guarded(&loser, 12, &[]).unwrap(),
+ store
+ .write_session_guarded(&loser, 12, &[], &|_| 0)
+ .unwrap(),
"反超应接管"
);
assert_eq!(
store.get_session("codex:g").unwrap().unwrap().file_path,
"/backup/g.jsonl"
);
+
+ // 位次压过 mtime(与 scanner 枚举时的候选排序同一把尺子):库里是 rank
+ // 靠后的较新副本(Cursor IDE 库),rank 靠前的较旧副本(转录)到来仍接管;
+ // 反向的较新 IDE 副本不得反超(2026-09-15 Codex review)
+ let rank_of = |path: &str| if path.contains('#') { 1 } else { 0 };
+ let mut ide = meta("cursor:h", "IDE 副本");
+ ide.file_path = "/store/state.vscdb#h".into();
+ store.write_session(&ide, 9, &[]).unwrap();
+ let mut cli = meta("cursor:h", "转录");
+ cli.file_path = "/cli/h.jsonl".into();
+ assert!(
+ store.write_session_guarded(&cli, 5, &[], &rank_of).unwrap(),
+ "rank 靠前的较旧副本应接管"
+ );
+ assert_eq!(
+ store.get_session("cursor:h").unwrap().unwrap().file_path,
+ "/cli/h.jsonl"
+ );
+ assert!(
+ !store
+ .write_session_guarded(&ide, 12, &[], &rank_of)
+ .unwrap(),
+ "rank 靠后的较新副本不得反超"
+ );
}
/// Insights 统计口径:archived=0、prompts 只数主线 user、daily/hourly 按
diff --git a/crates/wake-core/tests/fixtures/cursor/projects/wakefx-cursor-proj/agent-transcripts/44444444-aaaa-bbbb-cccc-000000000004/44444444-aaaa-bbbb-cccc-000000000004.jsonl b/crates/wake-core/tests/fixtures/cursor/projects/wakefx-cursor-proj/agent-transcripts/44444444-aaaa-bbbb-cccc-000000000004/44444444-aaaa-bbbb-cccc-000000000004.jsonl
new file mode 100644
index 0000000..973f4db
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/cursor/projects/wakefx-cursor-proj/agent-transcripts/44444444-aaaa-bbbb-cccc-000000000004/44444444-aaaa-bbbb-cccc-000000000004.jsonl
@@ -0,0 +1,2 @@
+{"type":"turn_ended","status":"success"}
+{"type":"turn_ended","status":"success"}
diff --git a/crates/wake-core/tests/scanner_finale.rs b/crates/wake-core/tests/scanner_finale.rs
index 403f0fa..4402ff1 100644
--- a/crates/wake-core/tests/scanner_finale.rs
+++ b/crates/wake-core/tests/scanner_finale.rs
@@ -2,6 +2,8 @@
//! 还是 adapter 出错,都必须发出一次 scanning=false 的终态进度事件——
//! UI 的模态刷新弹窗只认这个事件收场,收不到就永久锁死。
+mod common;
+
use std::path::Path;
use std::sync::{Arc, Mutex};
@@ -12,7 +14,7 @@ use wake_core::adapters::AgentAdapter;
use wake_core::db::Store;
use wake_core::mcp::tools::{self, TranscriptCache};
use wake_core::models::*;
-use wake_core::scanner::{refresh_parent_links, run_scan, ScanEvents, ScanProgress};
+use wake_core::scanner::{refresh_parent_links, run_scan, scan_files, ScanEvents, ScanProgress};
/// 收集全部进度事件与变更通知计数,供断言终态/刷新契约
struct Recorder(Mutex<Vec<ScanProgress>>, Mutex<usize>);
@@ -438,12 +440,16 @@ struct SeedAdapter {
quick_key: Option<String>,
manages_links: bool,
parent_links: Vec<(String, String)>,
+ rank: u8,
}
impl AgentAdapter for SeedAdapter {
fn agent(&self) -> AgentId {
self.agent
}
+ fn dedup_rank(&self) -> u8 {
+ self.rank
+ }
fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {
Ok(vec![self.r.clone()])
}
@@ -500,6 +506,7 @@ impl AgentAdapter for SeedAdapter {
quick_key: self.quick_key.clone(),
manages_links: self.manages_links,
parent_links: self.parent_links.clone(),
+ rank: self.rank,
})
}
}
@@ -541,6 +548,7 @@ fn seed(agent: AgentId, root: &str, path: &str, native_id: &str, mtime: i64) ->
quick_key: None,
manages_links: false,
parent_links: Vec::new(),
+ rank: 0,
}
}
@@ -587,6 +595,7 @@ fn tombstoned_session_does_not_resurrect_on_rescan() {
quick_key: None,
manages_links: false,
parent_links: Vec::new(),
+ rank: 0,
})];
let rec = Recorder::new();
@@ -632,6 +641,150 @@ fn duplicate_session_across_roots_resolves_to_newest() {
}
}
+/// 副本裁决先看实例的 dedup_rank、同级才比 mtime:一家的多个数据源可以固定
+/// 偏好某一源,而不随两边写盘先后翻转;败方仍是解析失败的回退顺位
+#[test]
+fn lower_dedup_rank_beats_newer_mtime_and_still_falls_back() {
+ let dir = tempfile::tempdir().unwrap();
+ let store = temp_store(dir.path());
+ let mut secondary = seed(AgentId::Cursor, "/ide", "/ide/db#dup", "dup", 9);
+ secondary.rank = 1;
+ let primary = seed(AgentId::Cursor, "/cli", "/cli/dup.jsonl", "dup", 5);
+ let adapters: Vec<Box<dyn AgentAdapter>> = vec![Box::new(secondary), Box::new(primary)];
+ run_scan(&adapters, &store, &Recorder::new(), true).unwrap();
+ let s = store
+ .get_session("cursor:dup")
+ .unwrap()
+ .expect("会话应在库");
+ assert_eq!(
+ s.file_path, "/cli/dup.jsonl",
+ "rank 小者胜出,即使 mtime 更旧、roster 里排在后面"
+ );
+
+ let dir = tempfile::tempdir().unwrap();
+ let store = temp_store(dir.path());
+ let mut secondary = seed(AgentId::Cursor, "/ide", "/ide/db#dup", "dup", 9);
+ secondary.rank = 1;
+ let mut broken_primary = seed(AgentId::Cursor, "/cli", "/cli/dup.jsonl", "dup", 5);
+ broken_primary.fail_parse = true;
+ let adapters: Vec<Box<dyn AgentAdapter>> = vec![Box::new(broken_primary), Box::new(secondary)];
+ run_scan(&adapters, &store, &Recorder::new(), true).unwrap();
+ let s = store
+ .get_session("cursor:dup")
+ .unwrap()
+ .expect("胜者损坏后会话不该消失");
+ assert_eq!(s.file_path, "/ide/db#dup", "rank 靠后的副本仍是回退顺位");
+
+ // 增量路径同一把尺子:库里已是 rank 靠后的较新副本(转录曾缺失或只剩空壳,
+ // IDE 副本胜出过),rank 靠前的较旧副本经 scan_files(watcher 路径)到来
+ // 仍要接管,不被 write_session_guarded 的 mtime 比较挡住(2026-09-15 Codex review)
+ let dir = tempfile::tempdir().unwrap();
+ let store = temp_store(dir.path());
+ let mut ide_only = seed(AgentId::Cursor, "/ide", "/ide/db#dup", "dup", 9);
+ ide_only.rank = 1;
+ let only_ide: Vec<Box<dyn AgentAdapter>> = vec![Box::new(ide_only)];
+ run_scan(&only_ide, &store, &Recorder::new(), true).unwrap();
+ assert_eq!(
+ store.get_session("cursor:dup").unwrap().unwrap().file_path,
+ "/ide/db#dup"
+ );
+ let mut secondary = seed(AgentId::Cursor, "/ide", "/ide/db#dup", "dup", 9);
+ secondary.rank = 1;
+ let primary = seed(AgentId::Cursor, "/cli", "/cli/dup.jsonl", "dup", 5);
+ let incoming = primary.r.clone();
+ let both: Vec<Box<dyn AgentAdapter>> = vec![Box::new(secondary), Box::new(primary)];
+ scan_files(&both, &store, &Recorder::new(), vec![incoming]);
+ assert_eq!(
+ store.get_session("cursor:dup").unwrap().unwrap().file_path,
+ "/cli/dup.jsonl",
+ "增量写入也按 rank 接管,不被库里较新的 IDE 副本挡住"
+ );
+}
+
+/// Cursor 两源端到端:转录带正文的会话固定由 CLI 源胜出(它有 slug 可反推
+/// 项目),哪怕 IDE 库里那份 lastUpdatedAt 更新、roster 里 IDE 实例排在前面;
+/// 转录只剩 turn_ended 空壳的会话由 IDE 库副本胜出。按 mtime 裁决的话胜负随
+/// 两边写盘先后翻转,IDE 副本没有工作区路径,一翻就从项目里掉进 Unknown project
+/// (2026-09-15 实测,Cursor 3.18)
+#[test]
+fn cursor_transcript_outranks_ide_copy() {
+ use wake_core::adapters::cursor::CursorAdapter;
+ use wake_core::adapters::cursor_ide::CursorIdeAdapter;
+ const WITH_BODY: &str = "cursor:33333333-aaaa-bbbb-cccc-000000000003";
+ const STUB_ONLY: &str = "cursor:44444444-aaaa-bbbb-cccc-000000000004";
+ const CORRUPT: &str = "cursor:55555555-aaaa-bbbb-cccc-000000000005";
+
+ let dir = tempfile::tempdir().unwrap();
+ let projects = dir.path().join("projects");
+ common::copy_tree(&common::fixture("cursor/projects"), &projects);
+ let ide_db = dir.path().join("state.vscdb");
+ common::build_cursor_ide_db(&ide_db);
+ // 转录的 mtime 压到 IDE 库里 lastUpdatedAt(1786340100000)之前,
+ // 让 mtime 裁决与 rank 裁决给出相反答案
+ let transcript = projects.join(
+ "wakefx-cursor-proj/agent-transcripts/33333333-aaaa-bbbb-cccc-000000000003/33333333-aaaa-bbbb-cccc-000000000003.jsonl",
+ );
+ std::fs::File::options()
+ .write(true)
+ .open(&transcript)
+ .unwrap()
+ .set_modified(std::time::UNIX_EPOCH + std::time::Duration::from_millis(1786000000000))
+ .unwrap();
+ // 截断成 `{"role":` 的坏转录:过得了空壳判定、解不出一条消息——不能靠
+ // rank 压过完整的 IDE 副本,要按解析失败回退过去(2026-09-15 Codex review)
+ let corrupt_dir =
+ projects.join("wakefx-cursor-proj/agent-transcripts/55555555-aaaa-bbbb-cccc-000000000005");
+ std::fs::create_dir_all(&corrupt_dir).unwrap();
+ std::fs::write(
+ corrupt_dir.join("55555555-aaaa-bbbb-cccc-000000000005.jsonl"),
+ "{\"role\":\n",
+ )
+ .unwrap();
+
+ for ide_first in [true, false] {
+ let cli: Box<dyn AgentAdapter> = CursorAdapter::new().with_custom_root(projects.clone());
+ let ide: Box<dyn AgentAdapter> = CursorIdeAdapter::new().with_custom_root(ide_db.clone());
+ let adapters: Vec<Box<dyn AgentAdapter>> = if ide_first {
+ vec![ide, cli]
+ } else {
+ vec![cli, ide]
+ };
+ let store = temp_store(&dir.path().join(format!("store-{ide_first}")));
+ run_scan(&adapters, &store, &Recorder::new(), true).unwrap();
+
+ let body = store
+ .get_session(WITH_BODY)
+ .unwrap()
+ .expect("带正文的会话在库");
+ assert_eq!(
+ body.file_path,
+ transcript.to_string_lossy(),
+ "ide_first={ide_first}:转录带正文时 CLI 那份胜出,不看 mtime 与 roster 顺序"
+ );
+ assert_eq!(
+ body.project_path, "/wakefx/cursor/proj",
+ "项目来自转录的 slug"
+ );
+ let stub = store
+ .get_session(STUB_ONLY)
+ .unwrap()
+ .expect("空壳转录的会话在库");
+ assert!(
+ stub.file_path.contains("state.vscdb#"),
+ "ide_first={ide_first}:转录只剩空壳时由 IDE 库副本胜出"
+ );
+ let corrupt = store
+ .get_session(CORRUPT)
+ .unwrap()
+ .expect("坏转录的会话不该消失");
+ assert!(
+ corrupt.file_path.contains("state.vscdb#"),
+ "ide_first={ide_first}:坏转录按解析失败回退到 IDE 库副本"
+ );
+ assert_eq!(corrupt.title, "Corrupt twin");
+ }
+}
+
/// 跨 agent 重叠根:文件只归**最长根**的实例(与 watcher 分派同一语义)。
/// 旧行为两家轮流认领——先写的一家留下错误归属,后写的撞 file_path UNIQUE
#[test]