All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
fix: re-read agent databases on refresh instead of trusting their mtime (#70)
Corey Chiu22c0bf8cdde0
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex befc244..97c43d7 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,5 +1,9 @@# Changelog+## [Unreleased]++- Fix: Refresh picks up sessions you deleted in OpenCode while it was still running, instead of listing them until Wake restarts (#70, thanks @lin-code-world)+## [0.9.3] — 2026-10-13- New: Sessions you hide in Wake can be brought back: Settings → Data lists them, and Unhide puts each one back with the sessions hidden along with itdiff --git a/crates/wake-core/src/adapters/copilot.rs b/crates/wake-core/src/adapters/copilot.rsindex 26b9130..f531414 100644--- a/crates/wake-core/src/adapters/copilot.rs+++ b/crates/wake-core/src/adapters/copilot.rs@@ -1,5 +1,5 @@use super::parse_utils::*;-use super::sqlite_ro::{open_sqlite_ro, virtual_path};+use super::sqlite_ro::{has_table, open_sqlite_ro, virtual_path};use super::AgentAdapter;use crate::models::*;use anyhow::{anyhow, Result};@@ -13,7 +13,7 @@ use std::sync::Mutex;/// size 取 turns 正文总长,二者共同构成增量扫描的 dirty 判断。pub struct CopilotAdapter {db: PathBuf,- /// rows() 的全表聚合较贵,按 db mtime 缓存一轮扫描内的重复调用+ /// rows() 的全表聚合较贵,按库戳(`db_cache_stamp`)缓存一轮扫描内的重复调用/// (list_session_files 与 quick_meta 各调一次)rows_cache: Mutex<Option<(i64, Vec<CopilotRow>)>>,/// 指令文件(项目根下的)与自定义来源按指纹缓存,每轮扫描只 stat@@ -32,21 +32,26 @@ impl CopilotAdapter {}}- fn db_mtime(&self) -> i64 {+ fn db_stamp(&self) -> i64 {super::sqlite_ro::db_cache_stamp(&self.db)}fn rows(&self) -> Option<Vec<CopilotRow>> {- let mtime = self.db_mtime();+ let stamp = self.db_stamp();{let cache = self.rows_cache.lock().unwrap();if let Some((t, rows)) = cache.as_ref() {- if *t == mtime {+ if *t == stamp {return Some(rows.clone());}}}let ro = open_sqlite_ro(&self.db, "copilot")?;+ // 库在、表还没建 = 确实没有会话;读不出(None)才是不知道+ if !(has_table(&ro.conn, "sessions").ok()? && has_table(&ro.conn, "turns").ok()?) {+ *self.rows_cache.lock().unwrap() = Some((stamp, Vec::new()));+ return Some(Vec::new());+ }let mut stmt = ro.conn.prepare(@@ -73,7 +78,7 @@ impl CopilotAdapter {.ok()?.collect::<rusqlite::Result<Vec<_>>>().ok()?;- *self.rows_cache.lock().unwrap() = Some((mtime, rows.clone()));+ *self.rows_cache.lock().unwrap() = Some((stamp, rows.clone()));Some(rows)}@@ -199,9 +204,14 @@ impl AgentAdapter for CopilotAdapter {}fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {- let Some(rows) = self.rows() else {+ // 库不在 = 没有会话;库在却读不出报 Err,scanner 冻结这一家这一轮(不变量 8①)——+ // 当成没有会话的话,这一轮会把整家会话当"磁盘已删"清掉+ if !self.db.is_file() {return Ok(Vec::new());- };+ }+ let rows = self+ .rows()+ .ok_or_else(|| anyhow!("{} exists but could not be read", self.db.display()))?;Ok(rows.into_iter().filter(|row| row.turn_count > 0)diff --git a/crates/wake-core/src/adapters/cursor_ide.rs b/crates/wake-core/src/adapters/cursor_ide.rsindex d449237..0eb9dde 100644--- a/crates/wake-core/src/adapters/cursor_ide.rs+++ b/crates/wake-core/src/adapters/cursor_ide.rs@@ -1,5 +1,5 @@use super::parse_utils::*;-use super::sqlite_ro::{open_sqlite_ro, virtual_path};+use super::sqlite_ro::{has_table, open_sqlite_ro, virtual_path};use super::AgentAdapter;use crate::models::*;use anyhow::{anyhow, Result};@@ -247,9 +247,13 @@ impl CursorIdeAdapter {/// ISO `createdAt`,再缺退 `createdAt`(该字段实测全覆盖)。/// 项目路径优先 `workspaceIdentifier.uri.fsPath`,回退首个 git 仓库路径。fn rows(&self) -> Option<Vec<IdeRow>> {- let mtime = super::sqlite_ro::db_cache_stamp(&self.db);- self.rows_cache.get_or_try_build(mtime, || {+ let stamp = super::sqlite_ro::db_cache_stamp(&self.db);+ self.rows_cache.get_or_try_build(stamp, || {let ro = open_sqlite_ro(&self.db, "cursor-ide")?;+ // 库在、没有 cursorDiskKV(还没开过 Composer 的老库)= 确实没有会话;读不出才是 None+ if !has_table(&ro.conn, "cursorDiskKV").ok()? {+ return Some(Vec::new());+ }let mut stmt = ro.conn.prepare(&format!(@@ -597,9 +601,13 @@ impl AgentAdapter for CursorIdeAdapter {}fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {- let Some(rows) = self.rows() else {+ // 库不在 = 没有会话;库在却读不出报 Err,scanner 冻结这一家这一轮(不变量 8①)+ if !self.db.is_file() {return Ok(Vec::new());- };+ }+ let rows = self+ .rows()+ .ok_or_else(|| anyhow!("{} exists but could not be read", self.db.display()))?;Ok(rows.into_iter().map(|row| SessionFileRef {@@ -657,9 +665,9 @@ impl AgentAdapter for CursorIdeAdapter {fn parent_links(&self) -> Option<Vec<(String, String)>> {// 库读不出 = None(scanner 保留库里的关系),不折成空- let mtime = super::sqlite_ro::db_cache_stamp(&self.db);+ let stamp = super::sqlite_ro::db_cache_stamp(&self.db);self.links_cache- .get_or_try_build(mtime, || parent_links_from(&self.db))+ .get_or_try_build(stamp, || parent_links_from(&self.db))}fn with_custom_root(&self, dir: PathBuf) -> Box<dyn AgentAdapter> {diff --git a/crates/wake-core/src/adapters/hermes.rs b/crates/wake-core/src/adapters/hermes.rsindex a78bfa6..2b85c6e 100644--- a/crates/wake-core/src/adapters/hermes.rs+++ b/crates/wake-core/src/adapters/hermes.rs@@ -1,5 +1,5 @@use super::parse_utils::*;-use super::sqlite_ro::{open_sqlite_ro, strip_virtual_path, virtual_path, SqliteRo};+use super::sqlite_ro::{has_table, open_sqlite_ro, strip_virtual_path, virtual_path, SqliteRo};use super::AgentAdapter;use crate::models::*;use anyhow::{anyhow, Result};@@ -324,6 +324,10 @@ fn secs_to_ms(secs: f64) -> i64 {/// 全表聚合行(list/quick/parse 共用,经 MtimeCache 一轮只跑一次)fn query_rows(ro: &SqliteRo, db: &HermesDb) -> Option<Vec<HermesRow>> {+ // 库在、表还没建 = 确实没有会话;读不出(None)才是不知道+ if !(has_table(&ro.conn, "sessions").ok()? && has_table(&ro.conn, "messages").ok()?) {+ return Some(Vec::new());+ }let schema = *db.schema.get_or_init(|| HermesSchema::probe(&ro.conn));let col = |present: bool, name: &str| {if present {@@ -431,8 +435,10 @@ impl AgentAdapter for HermesAdapter {fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {let mut out = Vec::new();- for db in &self.dbs {- let Some(rows) = Self::rows(db) else { continue };+ // 库不在 = 没有会话;库在却读不出报 Err,scanner 冻结这一家这一轮(不变量 8①)+ for db in self.dbs.iter().filter(|db| db.path.is_file()) {+ let rows = Self::rows(db)+ .ok_or_else(|| anyhow!("{} exists but could not be read", db.path.display()))?;out.extend(rows.into_iter()// 空会话(刚起就退)与 session_search 工具内部的检索会话不列diff --git a/crates/wake-core/src/adapters/opencode.rs b/crates/wake-core/src/adapters/opencode.rsindex 3579f55..f45db95 100644--- a/crates/wake-core/src/adapters/opencode.rs+++ b/crates/wake-core/src/adapters/opencode.rs@@ -1,5 +1,5 @@use super::parse_utils::*;-use super::sqlite_ro::{open_sqlite_ro, strip_virtual_path, virtual_path, SqliteRo};+use super::sqlite_ro::{has_table, open_sqlite_ro, strip_virtual_path, virtual_path, SqliteRo};use super::AgentAdapter;use crate::models::*;use anyhow::{anyhow, Result};@@ -82,19 +82,6 @@ fn select_from(table: &str, content_len: &str, v2_messages: &str) -> String {)}-/// 查不到是没有这张表;查询本身出错(文件不是 SQLite、读到一半出错)往上交,别当成没有-fn has_table(conn: &rusqlite::Connection, name: &str) -> rusqlite::Result<bool> {- match conn.query_row(- "SELECT 1 FROM sqlite_master WHERE type='table' AND name=?1",- [name],- |_| Ok(()),- ) {- Ok(()) => Ok(true),- Err(rusqlite::Error::QueryReturnedNoRows) => Ok(false),- Err(e) => Err(e),- }-}-/// 根据库内真实表组合生成一次枚举 SQL。新版 next 与 v1 共用 session 表,/// 所以必须逐会话看 session_message 是否有正文;仅检查 session_v2 会把真实/// next 会话误走 part 路径并以 content_len=0 全部过滤(GitHub #2)。@@ -287,8 +274,8 @@ impl OpencodeAdapter {/// None = 库在却读不出(打不开、查询出错)fn rows(&self, db: &OcDb) -> Option<Arc<Vec<OcRow>>> {- let mtime = super::sqlite_ro::db_cache_stamp(&db.path);- db.rows_cache.get_or_try_build(mtime, || {+ let stamp = super::sqlite_ro::db_cache_stamp(&db.path);+ db.rows_cache.get_or_try_build(stamp, || {let ro = self.open(&db.path)?;query_rows(&ro.conn, None).ok().map(Arc::new)})diff --git a/crates/wake-core/src/adapters/sqlite_ro.rs b/crates/wake-core/src/adapters/sqlite_ro.rsindex 908dc37..9f55d02 100644--- a/crates/wake-core/src/adapters/sqlite_ro.rs+++ b/crates/wake-core/src/adapters/sqlite_ro.rs@@ -1,7 +1,9 @@use rusqlite::{Connection, OpenFlags};use std::collections::HashSet;use std::fs;+use std::hash::{Hash as _, Hasher as _};use std::path::{Path, PathBuf};+use std::sync::atomic::{AtomicU64, Ordering};/// 只读打开的别家 SQLite 连接;若走了 copy 降级,临时目录随 drop 清理。pub struct SqliteRo {@@ -33,7 +35,6 @@ pub fn open_sqlite_ro(db: &Path, tag: &str) -> Option<SqliteRo> {// 多 host 镜像)并发走到这里时不能共用一个目录,否则互相覆盖 db.sqlite、先退出的// 一方 remove_dir_all 把另一方的连接从脚下抽走(2026-09-22 review)let path_hash = {- use std::hash::{Hash as _, Hasher as _};let mut h = std::collections::hash_map::DefaultHasher::new();db.hash(&mut h);h.finish()@@ -59,6 +60,20 @@ pub fn open_sqlite_ro(db: &Path, tag: &str) -> Option<SqliteRo> {})}+/// 查不到是没有这张表;查询本身出错(文件不是 SQLite、读到一半出错)往上交,别当成没有——+/// 拷贝那一档不探测,不是 SQLite 的文件也"打得开",查表才报错+pub fn has_table(conn: &Connection, name: &str) -> rusqlite::Result<bool> {+ match conn.query_row(+ "SELECT 1 FROM sqlite_master WHERE type='table' AND name=?1",+ [name],+ |_| Ok(()),+ ) {+ Ok(()) => Ok(true),+ Err(rusqlite::Error::QueryReturnedNoRows) => Ok(false),+ Err(e) => Err(e),+ }+}+/// 某张表现有的列名;表不存在或读不出给空集。逐版 ALTER 的别家库靠它做列级/// 降级——缺列给默认值,老库不得整家消失(ZCode 按库 mtime 缓存探测结果;/// Hermes 的 `HermesSchema` 是同一件事的 OnceLock 版)@@ -99,9 +114,20 @@ pub fn strip_virtual_path(path: &str) -> &str {}}-/// 行缓存的失效戳:主库与 `-wal` 的 mtime 取新者。WAL 库的新写入往往只落-/// `-wal`(写端尚未 checkpoint;远程 rsync 镜像更是永远没人 checkpoint 主库),-/// 只看主库 mtime 会让缓存抱着旧快照不放、新会话直到重启才出现。+/// 扫描代次:用户要的刷新(全量扫描、记忆同步)开头加一(scanner `enter_scan_gate`),+/// `db_cache_stamp` 把它算进戳+static SCAN_EPOCH: AtomicU64 = AtomicU64::new(0);++pub(crate) fn next_scan_epoch() {+ SCAN_EPOCH.fetch_add(1, Ordering::Relaxed);+}++/// 行缓存的失效戳(只拿来比相等):主库与 `-wal` 的 mtime 取新者,再带上扫描代次。+/// WAL 库的新写入往往只落 `-wal`(写端尚未 checkpoint;远程 rsync 镜像更是永远没人+/// checkpoint 主库),只看主库 mtime 会让缓存抱着旧快照不放、新会话直到重启才出现。+/// 扫描代次让每次刷新至少重读一次源库,一轮之内照旧按 mtime 省掉重复读取:别家库的+/// mtime 不总会动——Windows 的 NTFS 在写句柄关掉之前不保证更新修改时间,OpenCode+/// 这类常驻进程一直开着自己的库,在它里面删掉的会话刷新后照样列着、直到重启 Wake(#70)pub fn db_cache_stamp(db: &Path) -> i64 {let stamp = |p: &Path| {std::fs::metadata(p)@@ -110,5 +136,8 @@ pub fn db_cache_stamp(db: &Path) -> i64 {};let mut wal = db.as_os_str().to_owned();wal.push("-wal");- stamp(db).max(stamp(Path::new(&wal)))+ let mtime = stamp(db).max(stamp(Path::new(&wal)));+ let mut h = std::collections::hash_map::DefaultHasher::new();+ (mtime, SCAN_EPOCH.load(Ordering::Relaxed)).hash(&mut h);+ h.finish() as i64}diff --git a/crates/wake-core/src/scanner.rs b/crates/wake-core/src/scanner.rsindex 23136e6..348c01d 100644--- a/crates/wake-core/src/scanner.rs+++ b/crates/wake-core/src/scanner.rs@@ -63,6 +63,19 @@ impl Drop for ScanFinale<'_> {/// 互代:按扫描粒度拿文件锁会与 GUI 的常驻持有自锁(同进程第二个文件描述是另一把 flock)static SCAN_GATE: std::sync::Mutex<()> = std::sync::Mutex::new(());+/// 进扫描门。`reread` = 用户要的刷新(⌘R / 刷新钮的全量扫描、记忆同步):别家库的行缓存+/// 这一轮至少重读一次,不只看 mtime(`sqlite_ro::db_cache_stamp`)。启动扫描本来就是空缓存,+/// 远程同步、换 roster 之后补的增量扫描用不着重读+fn enter_scan_gate(reread: bool) -> std::sync::MutexGuard<'static, ()> {+ let gate = SCAN_GATE+ .lock()+ .unwrap_or_else(std::sync::PoisonError::into_inner);+ if reread {+ crate::adapters::sqlite_ro::next_scan_epoch();+ }+ gate+}+/// `build_index` / `refresh_index` 的收场;措辞由 bin 翻。退让不是失败pub enum Outcome {/// 干完了,库里现在有这些@@ -268,9 +281,7 @@ pub fn run_scan(events: &dyn ScanEvents,full: bool,) -> Result<()> {- let gate = SCAN_GATE- .lock()- .unwrap_or_else(std::sync::PoisonError::into_inner);+ let gate = enter_scan_gate(full);let mut fin = ScanFinale {events,progress: ScanProgress {@@ -398,9 +409,7 @@ fn maintain_index(store: &Store) {/// 串行——它收尾也对 memories 对账,两边别同时写同一组。阻塞执行,调用方放后台;/// 返回库里有没有改动pub fn run_memory_sync(adapters: &[Box<dyn AgentAdapter>], store: &Arc<Store>) -> bool {- let _gate = SCAN_GATE- .lock()- .unwrap_or_else(std::sync::PoisonError::into_inner);+ let _gate = enter_scan_gate(true);sync_memories(adapters, store)}diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rsindex 0ba18e6..5d80497 100644--- a/crates/wake-core/tests/adapter_contracts.rs+++ b/crates/wake-core/tests/adapter_contracts.rs@@ -4453,22 +4453,41 @@ fn unreadable_session_databases_freeze_instead_of_emptying() {fs::write(path, b"not a sqlite database").unwrap();};- let bad = tmp.path().join("bad").join("opencode.db");- not_sqlite(&bad);- let opencode = OpencodeAdapter::new().with_custom_root(bad);+ let bad = |file: &str| {+ let path = tmp.path().join("bad").join(file);+ not_sqlite(&path);+ path+ };+ let fresh = |file: &str| {+ let path = tmp.path().join("fresh").join(file);+ fs::create_dir_all(path.parent().unwrap()).unwrap();+ rusqlite::Connection::open(&path)+ .unwrap()+ .execute_batch("CREATE TABLE other (x)")+ .unwrap();+ path+ };++ let opencode = OpencodeAdapter::new().with_custom_root(bad("opencode.db"));assert!(opencode.list_session_files().is_err());assert_eq!(opencode.parent_links(), None);-- let fresh = tmp.path().join("fresh").join("opencode.db");- fs::create_dir_all(fresh.parent().unwrap()).unwrap();- rusqlite::Connection::open(&fresh)- .unwrap()- .execute_batch("CREATE TABLE other (x)")- .unwrap();- let opencode = OpencodeAdapter::new().with_custom_root(fresh);+ let opencode = OpencodeAdapter::new().with_custom_root(fresh("opencode.db"));assert!(opencode.list_session_files().unwrap().is_empty());assert_eq!(opencode.parent_links(), Some(Vec::new()));+ // 刷新一定重读别家库之后(#70),读不出不再有缓存兜着:折成空列表就是整家会话被清掉+ let builds: [(&str, fn() -> Box<dyn AgentAdapter>); 3] = [+ ("session-store.db", || Box::new(CopilotAdapter::new())),+ ("state.vscdb", || Box::new(CursorIdeAdapter::new())),+ ("state.db", || Box::new(HermesAdapter::new())),+ ];+ for (file, build) in builds {+ let adapter = build().with_custom_root(bad(file));+ assert!(adapter.list_session_files().is_err(), "{file}");+ let adapter = build().with_custom_root(fresh(file));+ assert!(adapter.list_session_files().unwrap().is_empty(), "{file}");+ }+let agents = tmp.path().join(".openclaw").join("agents");not_sqlite(&agents.join("main/agent/openclaw-agent.sqlite"));let openclaw = OpenclawAdapter::new().with_custom_root(agents);diff --git a/crates/wake-core/tests/scanner_finale.rs b/crates/wake-core/tests/scanner_finale.rsindex 5b5871d..e07a4a2 100644--- a/crates/wake-core/tests/scanner_finale.rs+++ b/crates/wake-core/tests/scanner_finale.rs@@ -2990,3 +2990,34 @@ fn craft_parent_links_follow_the_childs_winning_copy() {run_scan(&adapters, &store, &Recorder::new(), false).unwrap();assert_eq!(parent_of(), None, "落选副本里的旧关系不该被采纳");}++/// 刷新至少重读一次别家的库,不只看 mtime(#70):Windows 的 NTFS 在写句柄关掉之前不保证+/// 更新修改时间,OpenCode 运行时一直开着自己的库,在它里面删掉的会话原先刷新后照样列着、+/// 直到重启 Wake。这里删完把库的 mtime 改回去,任何平台上都是那个情形+#[test]+fn a_refresh_rereads_a_database_whose_mtime_did_not_move() {+ use wake_core::adapters::opencode::OpencodeAdapter;+ let tmp = tempfile::tempdir().unwrap();+ let db = tmp.path().join("opencode.db");+ common::build_opencode_db(&db);+ let adapters: Vec<Box<dyn AgentAdapter>> =+ vec![OpencodeAdapter::new().with_custom_root(db.clone())];+ let store = temp_store(tmp.path());+ run_scan(&adapters, &store, &Recorder::new(), false).unwrap();+ let indexed = || store.get_session("opencode:oc-0001").unwrap().is_some();+ assert!(indexed());++ let mtime = std::fs::metadata(&db).unwrap().modified().unwrap();+ rusqlite::Connection::open(&db)+ .unwrap()+ .execute("DELETE FROM session WHERE id = 'oc-0001'", [])+ .unwrap();+ std::fs::File::options()+ .write(true)+ .open(&db)+ .unwrap()+ .set_modified(mtime)+ .unwrap();+ run_scan(&adapters, &store, &Recorder::new(), true).unwrap();+ assert!(!indexed(), "库的 mtime 没动,刷新也得看见会话已经删了");+}