All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
fix(scanner): decide the failed winner's yield inside the write transaction
Corey Chiufbab8af5e16a
diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rsindex 6e95a2b..4eb5a2e 100644--- a/crates/wake-core/src/db.rs+++ b/crates/wake-core/src/db.rs@@ -371,16 +371,19 @@ impl Store {/// (2026-08-24 Codex review)。裁决与 scanner 枚举时的候选排序是同一把尺子:/// 先比副本所属实例的 `dedup_rank`(`rank_of` 按 file_path 给出,小者胜),/// 同级再比 mtime 新者、平局路径字典序——两条路径尺子不一,会话就会在两份- /// 副本之间摇摆(2026-09-15 Codex review)。这里不认任何"占位行"——胜者解析- /// 失败后的回退由 scanner 先清掉失效行再来写(run_scan_inner 的回退分支),- /// 按 file_mtime=0 推断占位既不唯一(真实文件也可能给 0)也盖不住早先入库、- /// 后来损坏的副本。返回 false = 本次是败方副本,一字未写+ /// 副本之间摇摆(2026-09-15 Codex review)。`supersedes` 是刚解析失败的那份+ /// 副本的路径(scanner 回退分支传入):库里这条 key 的行若正是它(quick 阶段+ /// 为它写的占位,或早先入库、后来损坏的转录),它已不是竞争者,本次写入直接+ /// 接管——判定与写入必须同一事务,先查再删再写会让 watcher 并发写入的第三份+ /// 副本被误删;按 file_mtime=0 推断占位也不行,真实文件同样可能给 0+ /// (Codex review 第二、三轮)。返回 false = 本次是败方副本,一字未写pub fn write_session_guarded(&self,meta: &SessionMeta,file_mtime: i64,units: &[IndexUnit],rank_of: &dyn Fn(&str) -> u8,+ supersedes: Option<&str>,) -> Result<bool> {let mut conn = self.write.lock().unwrap();let tx = conn.transaction()?;@@ -392,7 +395,8 @@ impl Store {).optional()?;if let Some((cur_path, cur_mtime)) = cur {- if cur_path != meta.file_path {+ let yields = supersedes.is_some_and(|failed| failed == cur_path);+ if cur_path != meta.file_path && !yields {let (cur_rank, new_rank) = (rank_of(&cur_path), rank_of(&meta.file_path));let loses = cur_rank < new_rank|| (cur_rank == new_rankdiff --git a/crates/wake-core/src/scanner.rs b/crates/wake-core/src/scanner.rsindex 19755c0..c92d7e1 100644--- a/crates/wake-core/src/scanner.rs+++ b/crates/wake-core/src/scanner.rs@@ -398,6 +398,7 @@ fn run_scan_inner(item.r.mtime_ms,&parsed.units,&rank_of(adapters, meta.agent),+ None,) {Ok(written) => item_written = written,Err(e) => eprintln!("[scanner] write failed {}: {e}", item.r.file_path),@@ -424,22 +425,15 @@ fn run_scan_inner(}// 库里这条 key 的行若正是刚解析失败的胜者(quick 阶段// 的占位,或早先入库、后来损坏的转录),位次会让它挡住- // 回退副本——先清掉失效行:它的正文已经读不出来,留着- // 只会让详情页永远打不开(2026-09-15 Codex review 第二轮)- if store- .key_for_path(&item.r.file_path)- .ok()- .flatten()- .as_deref()- == Some(meta.key.as_str())- {- let _ = store.remove_session(&meta.key, false);- }+ // 回退副本——把它作为 supersedes 交给写事务:它的正文+ // 已经读不出来,留着只会让详情页永远打不开;让位的判定+ // 与写入同一事务,不在这里先删(Codex review 第二、三轮)match store.write_session_guarded(&meta,fb.mtime_ms,&parsed.units,&rank_of(adapters, meta.agent),+ Some(&item.r.file_path),) {Ok(written) => item_written = written,Err(e) => eprintln!(@@ -634,6 +628,7 @@ fn reparse_for_parent_change(reference.mtime_ms,&parsed.units,&rank_of(adapters, agent),+ None,) {Ok(written) => written,Err(error) => {@@ -709,6 +704,7 @@ pub fn scan_files(r.mtime_ms,&parsed.units,&rank_of(adapters, meta.agent),+ None,).unwrap_or(false){diff --git a/crates/wake-core/tests/db_roundtrip.rs b/crates/wake-core/tests/db_roundtrip.rsindex b5d69c7..5cd1638 100644--- a/crates/wake-core/tests/db_roundtrip.rs+++ b/crates/wake-core/tests/db_roundtrip.rs@@ -657,7 +657,9 @@ 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, &[], &|_| 0).unwrap(),+ !store+ .write_session_guarded(&loser, 5, &[], &|_| 0, None)+ .unwrap(),"败方不该写入");assert_eq!(@@ -667,7 +669,7 @@ fn guarded_write_respects_winner() {assert!(store- .write_session_guarded(&loser, 12, &[], &|_| 0)+ .write_session_guarded(&loser, 12, &[], &|_| 0, None).unwrap(),"反超应接管");@@ -686,7 +688,9 @@ fn guarded_write_respects_winner() {let mut cli = meta("cursor:h", "转录");cli.file_path = "/cli/h.jsonl".into();assert!(- store.write_session_guarded(&cli, 5, &[], &rank_of).unwrap(),+ store+ .write_session_guarded(&cli, 5, &[], &rank_of, None)+ .unwrap(),"rank 靠前的较旧副本应接管");assert_eq!(@@ -695,10 +699,37 @@ fn guarded_write_respects_winner() {);assert!(!store- .write_session_guarded(&ide, 12, &[], &rank_of)+ .write_session_guarded(&ide, 12, &[], &rank_of, None).unwrap(),"rank 靠后的较新副本不得反超");++ // supersedes:库里的行正是刚解析失败的那份副本时它让位,回退副本直接接管+ //(判定与写入同一事务);库里若已被并发写成另一份副本,照常裁决、不误删+ //(2026-09-15 Codex review 第三轮)+ assert!(+ store+ .write_session_guarded(&ide, 12, &[], &rank_of, Some("/cli/h.jsonl"))+ .unwrap(),+ "失效的胜者行让位给回退副本"+ );+ assert_eq!(+ store.get_session("cursor:h").unwrap().unwrap().file_path,+ "/store/state.vscdb#h"+ );+ // 同级(都是 IDE 库副本)且更旧的第三份:库里已不是让位的那份,照常裁决+ let mut third = meta("cursor:h", "第三份副本");+ third.file_path = "/store2/state.vscdb#h".into();+ assert!(+ !store+ .write_session_guarded(&third, 3, &[], &rank_of, Some("/cli/h.jsonl"))+ .unwrap(),+ "库里已是别的副本时 supersedes 不生效,按位次与 mtime 照常裁决"+ );+ assert_eq!(+ store.get_session("cursor:h").unwrap().unwrap().file_path,+ "/store/state.vscdb#h"+ );}/// Insights 统计口径:archived=0、prompts 只数主线 user、daily/hourly 按