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(scanner): let a fallback copy replace the failed winner's row

Corey Chiua80b672a1df5
diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rs
index a6c0148..6e95a2b 100644
--- a/crates/wake-core/src/db.rs
+++ b/crates/wake-core/src/db.rs
@@ -371,7 +371,10 @@ impl Store {
/// (2026-08-24 Codex review)。裁决与 scanner 枚举时的候选排序是同一把尺子:
/// 先比副本所属实例的 `dedup_rank`(`rank_of` 按 file_path 给出,小者胜),
/// 同级再比 mtime 新者、平局路径字典序——两条路径尺子不一,会话就会在两份
- /// 副本之间摇摆(2026-09-15 Codex review)。返回 false = 本次是败方副本,一字未写
+ /// 副本之间摇摆(2026-09-15 Codex review)。这里不认任何"占位行"——胜者解析
+ /// 失败后的回退由 scanner 先清掉失效行再来写(run_scan_inner 的回退分支),
+ /// 按 file_mtime=0 推断占位既不唯一(真实文件也可能给 0)也盖不住早先入库、
+ /// 后来损坏的副本。返回 false = 本次是败方副本,一字未写
pub fn write_session_guarded(
&self,
meta: &SessionMeta,
@@ -389,10 +392,7 @@ impl Store {
)
.optional()?;
if let Some((cur_path, cur_mtime)) = cur {
- // 既有行是 quick 阶段的占位(write_meta_only 写 file_mtime=0,正文尚未
- // 解析)时不裁决:胜者解析失败后回退副本要能接管它——旧规则里 0 天然
- // 比不过任何 mtime,位次进来后必须把这一层说明白
- if cur_path != meta.file_path && cur_mtime != 0 {
+ if cur_path != meta.file_path {
let (cur_rank, new_rank) = (rank_of(&cur_path), rank_of(&meta.file_path));
let loses = cur_rank < new_rank
|| (cur_rank == new_rank
diff --git a/crates/wake-core/src/scanner.rs b/crates/wake-core/src/scanner.rs
index 885f38c..19755c0 100644
--- a/crates/wake-core/src/scanner.rs
+++ b/crates/wake-core/src/scanner.rs
@@ -422,6 +422,19 @@ fn run_scan_inner(
item_written = true;
break;
}
+ // 库里这条 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);
+ }
match store.write_session_guarded(
&meta,
fb.mtime_ms,
diff --git a/crates/wake-core/tests/scanner_finale.rs b/crates/wake-core/tests/scanner_finale.rs
index 9985257..d7fc7fe 100644
--- a/crates/wake-core/tests/scanner_finale.rs
+++ b/crates/wake-core/tests/scanner_finale.rs
@@ -785,6 +785,23 @@ fn cursor_transcript_outranks_ide_copy() {
);
assert_eq!(corrupt.title, "Corrupt twin");
}
+
+ // 早先正常入库的转录后来损坏:胜者行已在库里、mtime 也不是占位,位次不能
+ // 让它挡住回退——回退分支先清掉失效行,IDE 副本接管(Codex review 第二轮)
+ std::fs::write(&transcript, "{\"role\":\n").unwrap();
+ 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 store = temp_store(&dir.path().join("store-false"));
+ run_scan(&vec![cli, ide], &store, &Recorder::new(), true).unwrap();
+ let taken_over = store
+ .get_session(WITH_BODY)
+ .unwrap()
+ .expect("转录损坏后会话不该消失");
+ assert!(
+ taken_over.file_path.contains("state.vscdb#"),
+ "已入库的转录损坏后由 IDE 副本接管"
+ );
+ assert_eq!(taken_over.title, "CLI twin");
}
/// 跨 agent 重叠根:文件只归**最长根**的实例(与 watcher 分派同一语义)。