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(remote): probe hosts before rsync so partial installs sync fully and deletions propagate

Corey Chiu039d7ba5261f
diff --git a/crates/wake-core/src/adapters/codex.rs b/crates/wake-core/src/adapters/codex.rs
index f6478a4..3b884dc 100644
--- a/crates/wake-core/src/adapters/codex.rs
+++ b/crates/wake-core/src/adapters/codex.rs
@@ -35,26 +35,11 @@ impl CodexAdapter {
scan_archived: true,
}
}
+}
- /// state DB 的 threads.rollout_path 是**写库那台机器**上的绝对路径——
- /// 远程缓存与自定义根下和本实例枚举出的 file_path 对不上,按
- /// sessions/archived_sessions 尾段重定位到本实例目录(默认根下恒等)。
- /// 认不出形状(如 Windows 反斜杠路径)原样返回,退回全路径精确匹配。
- fn remap_rollout_path(&self, raw: &str) -> String {
- for (marker, base) in [
- ("/archived_sessions/", &self.archived_dir),
- ("/sessions/", &self.sessions_dir),
- ] {
- if let Some(pos) = raw.rfind(marker) {
- let mut p = base.clone();
- for seg in raw[pos + marker.len()..].split('/') {
- p.push(seg);
- }
- return p.to_string_lossy().into_owned();
- }
- }
- raw.to_string()
- }
+/// 路径末段,`/` 与 `\` 都算分隔符(state DB 可能是 Windows 机器写的)
+fn rollout_file_name(path: &str) -> &str {
+ path.rsplit(['/', '\\']).next().unwrap_or(path)
}
/// rollout 存储本体(用户选中的是数据目录而非 codex home):自身不含
@@ -752,13 +737,16 @@ impl AgentAdapter for CodexAdapter {
fn quick_meta(&self, refs: &[SessionFileRef]) -> Option<HashMap<String, SessionMeta>> {
let rows = read_threads(&self.state_db)?;
- let by_path: HashMap<String, &ThreadRow> = rows
+ // state DB 的 rollout_path 是**写库那台机器**上的绝对路径——远程缓存、
+ // 自定义根下与本实例枚举出的 file_path 对不上;rollout 文件名(时间戳 +
+ // uuid)全局唯一,按文件名匹配即可,与根/host/平台分隔符都无关
+ let by_name: HashMap<&str, &ThreadRow> = rows
.iter()
- .map(|r| (self.remap_rollout_path(&r.rollout_path), r))
+ .map(|r| (rollout_file_name(&r.rollout_path), r))
.collect();
let mut out = HashMap::new();
for r in refs {
- let Some(row) = by_path.get(r.file_path.as_str()) else {
+ let Some(row) = by_name.get(rollout_file_name(&r.file_path)) else {
continue;
};
let title = row
diff --git a/crates/wake-core/src/adapters/remote.rs b/crates/wake-core/src/adapters/remote.rs
index 29c9edc..be2d0d5 100644
--- a/crates/wake-core/src/adapters/remote.rs
+++ b/crates/wake-core/src/adapters/remote.rs
@@ -167,10 +167,10 @@ impl AgentAdapter for RemoteAdapter {
fn with_custom_root(&self, dir: std::path::PathBuf) -> Box<dyn AgentAdapter> {
// 远程实例没有自定义 location 的产品入口;保持装饰不变量以防未来误用
- Box::new(Self {
- inner: self.inner.with_custom_root(dir),
- host: self.host.clone(),
- })
+ Box::new(Self::new(
+ self.inner.with_custom_root(dir),
+ self.host.clone(),
+ ))
}
fn supports_individual_root_removal(&self) -> bool {
@@ -178,9 +178,7 @@ impl AgentAdapter for RemoteAdapter {
}
fn excluding_data_roots(&self, roots: &[std::path::PathBuf]) -> Option<Box<dyn AgentAdapter>> {
- Some(Box::new(Self {
- inner: self.inner.excluding_data_roots(roots)?,
- host: self.host.clone(),
- }))
+ let inner = self.inner.excluding_data_roots(roots)?;
+ Some(Box::new(Self::new(inner, self.host.clone())))
}
}
diff --git a/crates/wake-core/src/remote.rs b/crates/wake-core/src/remote.rs
index fb964a6..19ce37f 100644
--- a/crates/wake-core/src/remote.rs
+++ b/crates/wake-core/src/remote.rs
@@ -10,6 +10,14 @@
//! 确保 GUI 进程(无 TTY)绝不挂在交互认证上——密钥要么已在 agent 里,
//! 要么明确失败并把 stderr 记进 `remote_hosts.last_sync_error`。
//!
+//! 一次同步 = **先探测再镜像**:`ssh host sh -c '…'` 逐个 `[ -e ]` 白名单
+//! 路径,只把远端真实存在的交给 `rsync -R --delete`,远端整个不存在的在
+//! 缓存里就地删掉。不能把整张白名单直接喂 rsync(2026-09-02 本机实测):
+//! ①openrsync(macOS 15+ 的 /usr/bin/rsync)做发送端时,某个源连父目录
+//! 都不存在会让它中止整份文件列表,排在后面的源全部静默不传,退出码却
+//! 只是 23;②rsync 家族只要发送端遇到任何 I/O 错误(缺源即算)就整体跳过
+//! 删除阶段——没有哪台机器十四家全装,`--delete` 就永远不会生效。
+//!
//! 同步跑在**独立于扫描的线程**(Workbench::spawn_remote_sync):本地扫描
//! 不等网络,不可达 host 只拖慢自己;缓存落盘由 watcher 增量收编,同步
//! 完成事件再补一轮增量兜底。
@@ -21,6 +29,7 @@
use crate::db::Store;
use crate::models::AgentId;
+use crate::services::terminal::sh_quote;
use std::path::{Path, PathBuf};
/// 一家 agent 在远程 home 下的数据布局。
@@ -32,7 +41,8 @@ pub struct RemoteAgentLayout {
pub mount: &'static str,
/// rsync 白名单源(相对远程 home 的 POSIX 路径;目录整树,文件单拉)。
/// SQLite 库连 `-wal` 一起拉(数据在 wal 里),`-shm` 是运行时产物不拉
- ///(缺了 sqlite_ro 的 copy 梯度兜底)
+ ///(缺了 sqlite_ro 的 copy 梯度兜底)。字符集限 `[A-Za-z0-9._/-]`——
+ /// 它们不加引号直接进探测脚本(sh -c 单引号串内)与 rsync 源参数(单测卡)
pub sync_paths: &'static [&'static str],
}
@@ -168,11 +178,47 @@ pub fn host_cache_dir(db_dir: &Path, host: &str) -> PathBuf {
db_dir.join("remotes").join(host)
}
-/// 单 host 的 rsync 参数(不含程序名)。纯函数,单测卡命令形状。
-/// `-R`(--relative)让 `host:./<相对路径>` 在目标重建相对布局;
-/// `--delete` 让远程删除传播到缓存(watcher 收 Remove 后清库内行);
-/// 缺失的源(该家没装)由 rsync 跳过并以 exit 23 报部分传输,视为软成功。
-pub fn rsync_args(host: &str, dest: &Path) -> Vec<String> {
+/// ssh 的批处理选项:探测与 rsync 的 `-e` 同一份——认证/超时行为两步一致,
+/// 探测过了 rsync 就不会再卡在认证上
+const SSH_OPTS: [&str; 2] = ["-oBatchMode=yes", "-oConnectTimeout=10"];
+
+/// 白名单全部 sync_paths,按 REMOTE_LAYOUTS 顺序(探测脚本、rsync 源列表、
+/// 缺席清理三处同序)
+fn all_sync_paths() -> impl Iterator<Item = &'static str> {
+ REMOTE_LAYOUTS
+ .iter()
+ .flat_map(|layout| layout.sync_paths.iter().copied())
+}
+
+/// 远端存在性探测的 ssh 参数(不含程序名)。远端命令是一整条
+/// `sh -c '…'`:ssh 把它交给登录 shell 再解析,单引号串在 fish/csh 里同样
+/// 原样传给 sh,循环语法不依赖登录 shell 方言(quote 走 terminal::sh_quote,
+/// 与本地/远程 resume 命令同一实现)。存在的路径按行回显;循环体用 if 而非
+/// `&&`,末项缺席不会把命令退出码带成非零——非零退出只表示 ssh 本身失败
+///(认证/不可达/远端无 sh)。
+fn probe_args(host: &str) -> Vec<String> {
+ let list = all_sync_paths().collect::<Vec<_>>().join(" ");
+ let script =
+ format!("for p in {list}; do if [ -e \"$p\" ]; then printf \"%s\\n\" \"$p\"; fi; done");
+ SSH_OPTS
+ .iter()
+ .map(|s| s.to_string())
+ .chain([host.to_string(), format!("sh -c {}", sh_quote(&script))])
+ .collect()
+}
+
+/// 探测输出 → 白名单顺序的存在路径。只认与白名单**逐字相等**的行:远端
+/// rc 文件的 echo、MOTD、警告之类都不能变成 rsync 的源参数。
+fn present_remote_paths(stdout: &str) -> Vec<&'static str> {
+ let lines: std::collections::HashSet<&str> = stdout.lines().map(str::trim).collect();
+ all_sync_paths().filter(|p| lines.contains(p)).collect()
+}
+
+/// 单 host 的 rsync 参数(不含程序名),`paths` 是探测确认存在的源。纯函数,
+/// 单测卡命令形状。`-R`(--relative)让 `host:./<相对路径>` 在目标重建相对
+/// 布局;`--delete` 让远程删除传播到缓存(watcher 收 Remove 后清库内行)——
+/// 它只作用于各源树**内部**,整棵源消失由 sync_host 的缺席清理负责。
+fn rsync_args(host: &str, dest: &Path, paths: &[&str]) -> Vec<String> {
let mut args = vec![
"-az".to_string(),
"-R".to_string(),
@@ -181,20 +227,16 @@ pub fn rsync_args(host: &str, dest: &Path) -> Vec<String> {
"--exclude=session_search.sqlite*".to_string(),
"--timeout=120".to_string(),
"-e".to_string(),
- "ssh -oBatchMode=yes -oConnectTimeout=10".to_string(),
+ format!("ssh {}", SSH_OPTS.join(" ")),
];
- for layout in REMOTE_LAYOUTS {
- for path in layout.sync_paths {
- args.push(format!("{host}:./{path}"));
- }
- }
+ args.extend(paths.iter().map(|path| format!("{host}:./{path}")));
args.push(dest.to_string_lossy().to_string());
args
}
/// 同步指定 host(调用方给"全部启用的"或单个新加的)。**绝不 panic、绝不
/// Err**——任何失败只记进 `remote_hosts.last_sync_error`,面板展示,后续
-/// 扫描照常消费既有缓存。各 host 的 rsync 彼此独立(纯网络等待),并行跑,
+/// 扫描照常消费既有缓存。各 host 的同步彼此独立(纯网络等待),并行跑,
/// 总耗时 = 最慢一台而非各台之和;状态写库经 write Mutex 天然串行。
pub fn sync_hosts(store: &Store, names: &[String]) {
let Some(db_dir) = store.db_dir() else {
@@ -206,7 +248,7 @@ pub fn sync_hosts(store: &Store, names: &[String]) {
scope.spawn(move || {
// 已入库的 host 也再卡一道:老库可能被未来版本写入过更宽的名字
let error = if valid_host_name(name) {
- run_rsync(name, &dest).err()
+ sync_host(name, &dest).err()
} else {
Some("invalid host name".to_string())
};
@@ -216,50 +258,148 @@ pub fn sync_hosts(store: &Store, names: &[String]) {
});
}
-/// 起 rsync 并归类退出码。0 = 全量成功;23(部分源缺失,该家远端没装)与
-/// 24(传输中源文件消失)是多源白名单同步的常态,同样算成功。
-fn run_rsync(host: &str, dest: &Path) -> Result<(), String> {
+/// 单 host 的一次同步:探测 → 缺席清理 → rsync。探测失败即整体失败,缓存
+/// 一字不动(不能把"连不上"当成"远端空了"去清缓存)。探测到 rsync 之间隔着
+/// 一次握手,远端 agent 恰好在这个空档退出会把 `-wal` 之类删掉,rsync 对
+/// 命令行源 link_stat 失败报 23 且整轮跳过 --delete——只含 ENOENT 的 23
+/// 重探一轮再镜像(第二轮拿到的源集合已经是消失后的),第二轮结果照实报。
+fn sync_host(host: &str, dest: &Path) -> Result<(), String> {
if let Err(e) = std::fs::create_dir_all(dest) {
return Err(format!("cannot create cache dir {}: {e}", dest.display()));
}
- let output = std::process::Command::new("rsync")
- .args(rsync_args(host, dest))
- .stdin(std::process::Stdio::null())
- .output();
- let output = match output {
- Ok(o) => o,
- Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
- return Err("rsync not found on PATH — install rsync to sync remote hosts".into());
+ let mut retried = false;
+ loop {
+ let present = probe_remote(host)?;
+ // 远端整个不存在的白名单项(该家卸了、库被清了):镜像也删。rsync 的
+ // --delete 只作用于它拿到的源树内部,整棵源消失只有这里能传播
+ for path in all_sync_paths() {
+ if !present.contains(&path) {
+ remove_cached(&dest.join(path))?;
+ }
+ }
+ if present.is_empty() {
+ return Ok(());
+ }
+ match run_rsync(host, dest, &present) {
+ Ok(()) => return Ok(()),
+ Err(RsyncError::SourcesVanished(_)) if !retried => retried = true,
+ Err(RsyncError::SourcesVanished(msg) | RsyncError::Other(msg)) => return Err(msg),
+ }
+ }
+}
+
+/// 删缓存里的一个白名单项(目录整树 / 单文件),不存在即无事;删不掉(权限、
+/// 锁着的库文件、瞬时 I/O 错误)要当同步失败上报——否则远端已删的会话留在
+/// 缓存和索引里,面板却显示同步成功
+fn remove_cached(path: &Path) -> Result<(), String> {
+ let not_found = |e: &std::io::Error| e.kind() == std::io::ErrorKind::NotFound;
+ let meta = match std::fs::symlink_metadata(path) {
+ Ok(m) => m,
+ Err(e) if not_found(&e) => return Ok(()),
+ Err(e) => {
+ return Err(format!(
+ "cannot inspect stale cache {}: {e}",
+ path.display()
+ ))
}
- Err(e) => return Err(format!("failed to run rsync: {e}")),
};
+ let removed = if meta.is_dir() {
+ std::fs::remove_dir_all(path)
+ } else {
+ std::fs::remove_file(path)
+ };
+ match removed {
+ Ok(()) => Ok(()),
+ Err(e) if not_found(&e) => Ok(()),
+ Err(e) => Err(format!("cannot remove stale cache {}: {e}", path.display())),
+ }
+}
+
+/// 起 ssh 探测。ssh 非零退出(255 = 连接/认证失败)整体报错,stderr 末几行
+/// 是用户能看懂的原话("Permission denied (publickey)"、"Host key
+/// verification failed")
+fn probe_remote(host: &str) -> Result<Vec<&'static str>, String> {
+ let output = run_tool("ssh", "OpenSSH", &probe_args(host))?;
+ classify("ssh", &output, &[])?;
+ Ok(present_remote_paths(&String::from_utf8_lossy(
+ &output.stdout,
+ )))
+}
+
+enum RsyncError {
+ /// 只含 ENOENT 的 exit 23:探测过的源在传输前消失(附 rsync 原话,
+ /// 调用方重探失败时照实报)
+ SourcesVanished(String),
+ Other(String),
+}
+
+/// 起 rsync。源已经过探测,缺源不再是常态:0 = 全量成功;24(传输中源文件
+/// 消失,agent 正在写,下轮自愈)算软成功;23 是"部分传输失败"泛码——错误
+/// 行全是 ENOENT 时是探测后消失的源,交调用方重探,权限/读错误同样报 23,
+/// 照常报错(记成功会隐藏真实缺数据)。
+fn run_rsync(host: &str, dest: &Path, paths: &[&str]) -> Result<(), RsyncError> {
+ let output =
+ run_tool("rsync", "rsync", &rsync_args(host, dest, paths)).map_err(RsyncError::Other)?;
+ if output.status.code() == Some(23) && only_missing_sources(&output.stderr) {
+ return Err(RsyncError::SourcesVanished(exit_error("rsync", &output)));
+ }
+ classify("rsync", &output, &[24]).map_err(RsyncError::Other)
+}
+
+/// rsync 的错误行是否**全部**是"源不存在"。GNU rsync 报
+/// `rsync: [sender] link_stat "…" failed: No such file or directory (2)`,
+/// openrsync 报 `rsync(pid): error: …: (l)stat: No such file or directory`;
+/// 总结行(some files/attrs were not transferred)不算错误行;一行错误都
+/// 没有的 23 不认(形状未知,当真错误报)
+fn only_missing_sources(stderr: &[u8]) -> bool {
+ let stderr = String::from_utf8_lossy(stderr);
+ let mut errors = stderr
+ .lines()
+ .filter(|l| l.contains("rsync") && (l.contains("error") || l.contains("failed")))
+ .filter(|l| !l.contains("some files/attrs were not transferred"))
+ .peekable();
+ errors.peek().is_some() && errors.all(|l| l.contains("No such file or directory"))
+}
+
+/// 起一个外部工具:程序不在 PATH → 安装提示,起不来 → 原因;退出码不在这里
+/// 裁决(见 classify),调用方还要看原始 stderr
+fn run_tool(
+ bin: &str,
+ install_hint: &str,
+ args: &[String],
+) -> Result<std::process::Output, String> {
+ let output = std::process::Command::new(bin)
+ .args(args)
+ .stdin(std::process::Stdio::null())
+ .output();
+ match output {
+ Ok(o) => Ok(o),
+ Err(e) if e.kind() == std::io::ErrorKind::NotFound => Err(format!(
+ "{bin} not found on PATH — install {install_hint} to sync remote hosts"
+ )),
+ Err(e) => Err(format!("failed to run {bin}: {e}")),
+ }
+}
+
+/// 退出码归类:{0} ∪ `soft_ok` 通过,其余给 exit_error
+fn classify(bin: &str, output: &std::process::Output, soft_ok: &[i32]) -> Result<(), String> {
+ match output.status.code() {
+ Some(0) => Ok(()),
+ Some(c) if soft_ok.contains(&c) => Ok(()),
+ _ => Err(exit_error(bin, output)),
+ }
+}
+
+/// `<bin> exited with N: <stderr 末几行>`——ssh/rsync 都把决定性错误留在
+/// 最后,字符封顶防单行巨量输出
+fn exit_error(bin: &str, output: &std::process::Output) -> String {
let stderr = String::from_utf8_lossy(&output.stderr);
+ let mut lines: Vec<&str> = stderr.trim().lines().rev().take(3).collect();
+ lines.reverse();
+ let tail: String = lines.join("; ").chars().take(500).collect();
match output.status.code() {
- // 24 = 传输中源文件消失(agent 正在写,下轮自愈)
- Some(0) | Some(24) => Ok(()),
- // 23 是"部分传输失败"泛码:白名单里的源在远端不存在(那台只装了
- // 部分 agent)是常态,豁免;但权限/读写错误同样报 23,把它们记成功
- // 会隐藏真实缺数据——只有 stderr 里的错误行**全部**是 ENOENT 才算软
- // 成功(总结行不算错误行;openrsync/rsync 的缺源消息都带这句话)
- Some(23)
- if stderr
- .lines()
- .filter(|l| l.contains("rsync") && (l.contains("error") || l.contains("failed")))
- .filter(|l| !l.contains("some files/attrs were not transferred"))
- .all(|l| l.contains("No such file or directory")) =>
- {
- Ok(())
- }
- code => {
- // 取末几行(rsync 把决定性错误留在最后),字符封顶防单行巨量输出
- let mut lines: Vec<&str> = stderr.trim().lines().rev().take(3).collect();
- lines.reverse();
- let tail: String = lines.join("; ").chars().take(500).collect();
- Err(match code {
- Some(c) => format!("rsync exited with {c}: {tail}"),
- None => format!("rsync terminated by signal: {tail}"),
- })
- }
+ Some(c) => format!("{bin} exited with {c}: {tail}"),
+ None => format!("{bin} terminated by signal: {tail}"),
}
}
@@ -267,6 +407,47 @@ fn run_rsync(host: &str, dest: &Path) -> Result<(), String> {
mod tests {
use super::*;
+ #[test]
+ fn only_missing_sources_recognizes_both_rsync_dialects() {
+ // GNU rsync(Linux 远端做发送端,经本地客户端转出)
+ let gnu = b"rsync: [sender] link_stat \"/home/u/.codex/state_5.sqlite-wal\" failed: No such file or directory (2)\n\
+ rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1338)\n";
+ assert!(only_missing_sources(gnu));
+ // openrsync(macOS 远端做发送端)
+ let openrsync =
+ b"rsync(63771): error: .codex/state_5.sqlite-wal: (l)stat: No such file or directory\n";
+ assert!(only_missing_sources(openrsync));
+ // 混进一条权限错误就不算"只是消失"
+ let mixed = b"rsync: [sender] link_stat \"/x\" failed: No such file or directory (2)\n\
+ rsync: [sender] send_files failed to open \"/y\": Permission denied (13)\n";
+ assert!(!only_missing_sources(mixed));
+ // 一行错误都没有的 23:形状未知,不认
+ assert!(!only_missing_sources(b""));
+ assert!(!only_missing_sources(
+ b"rsync error: some files/attrs were not transferred (code 23)\n"
+ ));
+ }
+
+ #[test]
+ fn remove_cached_reports_failures_but_not_absence() {
+ let dir = tempfile::tempdir().unwrap();
+ // 不存在:无事
+ assert_eq!(remove_cached(&dir.path().join("nope")), Ok(()));
+ // 文件与目录都删得掉
+ let file = dir.path().join("f");
+ std::fs::write(&file, b"x").unwrap();
+ assert_eq!(remove_cached(&file), Ok(()));
+ assert!(!file.exists());
+ let sub = dir.path().join("d/e");
+ std::fs::create_dir_all(&sub).unwrap();
+ assert_eq!(remove_cached(&dir.path().join("d")), Ok(()));
+ assert!(!sub.exists());
+ // 路径穿过一个普通文件(ENOTDIR):不是"不存在",必须报错
+ std::fs::write(&file, b"x").unwrap();
+ let err = remove_cached(&file.join("child")).unwrap_err();
+ assert!(err.contains("cannot inspect stale cache"), "{err}");
+ }
+
#[test]
fn layouts_cover_every_agent_exactly_once() {
// 新增 agent 忘了补远程布局表,这里就是第一道报警
@@ -304,22 +485,75 @@ mod tests {
assert!(!valid_host_name(".hidden"));
}
+ #[test]
+ fn sync_paths_are_shell_safe() {
+ // 白名单路径不加引号直接进探测脚本(sh -c 单引号串内)与 rsync 源参数
+ for path in all_sync_paths() {
+ assert!(
+ path.chars()
+ .all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '_' | '/' | '-')),
+ "sync path {path:?} needs quoting"
+ );
+ }
+ // 凭证绝不在名单上
+ assert!(!all_sync_paths().any(|p| p.contains("auth.json") || p.contains("oauth_creds")));
+ }
+
+ #[test]
+ fn probe_args_shape() {
+ let args = probe_args("devbox");
+ assert_eq!(
+ args[..3].to_vec(),
+ ["-oBatchMode=yes", "-oConnectTimeout=10", "devbox"]
+ );
+ // 一整条 sh -c '…':每个白名单路径都在 for 列表里,循环体按行回显存在项
+ let script = &args[3];
+ assert!(script.starts_with("sh -c 'for p in "));
+ for path in all_sync_paths() {
+ assert!(
+ script.contains(&format!(" {path} ")) || script.contains(&format!(" {path};")),
+ "{path} 不在探测列表里"
+ );
+ }
+ assert!(script.ends_with("; do if [ -e \"$p\" ]; then printf \"%s\\n\" \"$p\"; fi; done'"));
+ }
+
+ #[test]
+ fn present_remote_paths_keeps_only_whitelist_in_layout_order() {
+ // 乱序、重复、rc 文件的杂音、白名单项的父目录/子路径、绝对路径都要滤掉
+ let out = "Welcome to devbox\n.grok/sessions\n.codex/sessions\n.codex\n\
+ .codex/sessions\n .claude/projects \n.claude/projects/evil\n/etc/passwd\n";
+ assert_eq!(
+ present_remote_paths(out),
+ vec![".claude/projects", ".codex/sessions", ".grok/sessions"]
+ );
+ assert!(present_remote_paths("").is_empty());
+ }
+
#[test]
fn rsync_args_shape() {
- let args = rsync_args("devbox", Path::new("/tmp/cache/devbox"));
+ let present = [".claude/projects", ".codex/state_5.sqlite"];
+ let args = rsync_args("devbox", Path::new("/tmp/cache/devbox"), &present);
assert_eq!(args[0], "-az");
assert!(args.contains(&"-R".to_string()));
assert!(args.contains(&"--delete".to_string()));
assert!(args
.iter()
.any(|a| a == "ssh -oBatchMode=yes -oConnectTimeout=10"));
- // 源都是 host:./ 锚定的 home 相对路径
- assert!(args.contains(&"devbox:./.claude/projects".to_string()));
- assert!(args.contains(&"devbox:./.codex/state_5.sqlite".to_string()));
+ // 只有探测确认存在的源,且都是 host:./ 锚定的 home 相对路径
+ let sources: Vec<&str> = args
+ .iter()
+ .filter(|a| a.starts_with("devbox:"))
+ .map(String::as_str)
+ .collect();
+ assert_eq!(
+ sources,
+ vec![
+ "devbox:./.claude/projects",
+ "devbox:./.codex/state_5.sqlite"
+ ]
+ );
// 目标在最后
assert_eq!(args.last().unwrap(), "/tmp/cache/devbox");
- // 凭证绝不在名单上
- assert!(!args.iter().any(|a| a.contains("auth.json")));
- assert!(!args.iter().any(|a| a.contains("oauth_creds")));
}
}
diff --git a/crates/wake-core/src/scanner.rs b/crates/wake-core/src/scanner.rs
index 69375d7..f979e37 100644
--- a/crates/wake-core/src/scanner.rs
+++ b/crates/wake-core/src/scanner.rs
@@ -127,6 +127,10 @@ fn run_scan_inner(
.max_by_key(|(root, _)| root.len())
.map(|(_, ix)| *ix)
};
+ // 墓碑查询与去重域共用的会话 key:按枚举实例的 host 构造(远程三段),
+ // 下面四处同一口径,别各自 format
+ let key_of =
+ |ix: usize, r: &SessionFileRef| session_key(r.agent, adapters[ix].host(), &r.native_id);
// 第一遍:全量枚举 + 归属过滤
let mut per_adapter: Vec<Vec<SessionFileRef>> = Vec::with_capacity(adapters.len());
for (ix, adapter) in adapters.iter().enumerate() {
@@ -138,8 +142,7 @@ fn run_scan_inner(
//(2026-08-24 Codex review P1)。key 按实例 host 构造(远程三段)
// ——阶段 1 远程禁删故无远程墓碑,但格式先写对,放开时不欠债
.filter(|r| {
- !store.is_tombstoned(&r.file_path)
- && !store.is_key_tombstoned(&session_key(r.agent, adapter.host(), &r.native_id))
+ !store.is_tombstoned(&r.file_path) && !store.is_key_tombstoned(&key_of(ix, r))
})
// 无任何根认领的引用(越界枚举或合成测试)保守放行给枚举者;
// 过滤只裁决"确有更深的根拥有它"的情形
@@ -159,7 +162,7 @@ fn run_scan_inner(
for (ix, refs) in per_adapter.iter().enumerate() {
for r in refs {
candidates
- .entry(session_key(r.agent, adapters[ix].host(), &r.native_id))
+ .entry(key_of(ix, r))
.or_default()
.push((ix, r.clone()));
}
@@ -174,7 +177,7 @@ fn run_scan_inner(
for (ix, refs) in per_adapter.iter_mut().enumerate() {
refs.retain(|r| {
candidates
- .get(&session_key(r.agent, adapters[ix].host(), &r.native_id))
+ .get(&key_of(ix, r))
.is_none_or(|v| v[0].1.file_path == r.file_path)
});
}
@@ -194,7 +197,7 @@ fn run_scan_inner(
}
}
- for (adapter, refs) in adapters.iter().zip(per_adapter) {
+ for (ix, (adapter, refs)) in adapters.iter().zip(per_adapter).enumerate() {
let force_adapter = force_grok_backfill && adapter.agent() == AgentId::Grok;
for r in &refs {
seen_paths.insert(r.file_path.clone());
@@ -241,7 +244,7 @@ fn run_scan_inner(
.as_ref()
.and_then(|m| m.get(&r.file_path).cloned());
let fallbacks = candidates
- .get(&session_key(r.agent, adapter.host(), &r.native_id))
+ .get(&key_of(ix, &r))
.filter(|v| v.len() > 1)
.map(|v| v[1..].to_vec())
.unwrap_or_default();
diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rs
index 5284dd9..21e31a2 100644
--- a/crates/wake-core/tests/adapter_contracts.rs
+++ b/crates/wake-core/tests/adapter_contracts.rs
@@ -29,6 +29,9 @@ use wake_core::adapters::qoder::QoderAdapter;
use wake_core::adapters::AgentAdapter;
use wake_core::models::*;
+mod common;
+use common::fixture;
+
// ---------------------------------------------------------------- 测试环境
struct TestEnv {
@@ -52,67 +55,9 @@ fn setup() -> &'static TestEnv {
.tempdir()
.expect("create fake home");
- let copilot_dir = home.path().join(".copilot");
- fs::create_dir_all(&copilot_dir).expect("mkdir .copilot");
- let copilot_db = copilot_dir.join("session-store.db");
- build_copilot_db(&copilot_db);
-
- let oc_dir = home.path().join(".local").join("share").join("opencode");
- fs::create_dir_all(&oc_dir).expect("mkdir opencode dir");
- let opencode_db = oc_dir.join("opencode.db");
- build_opencode_db(&opencode_db);
- let opencode_next_db = oc_dir.join("opencode-next.db");
- build_opencode_next_db(&opencode_next_db);
-
- let gem_dir = home.path().join(".gemini");
- fs::create_dir_all(&gem_dir).expect("mkdir .gemini");
- fs::write(
- gem_dir.join("projects.json"),
- r#"{"projects":{"/Users/tester/Github/wakefx":"wakefx-gem"}}"#,
- )
- .expect("write projects.json");
-
- let ag_dir = gem_dir.join("antigravity-cli");
- fs::create_dir_all(&ag_dir).expect("mkdir antigravity-cli");
- let antigravity_db = ag_dir.join("conversation_summaries.db");
- build_antigravity_db(&antigravity_db);
-
- let kimi_dir = home.path().join(".kimi-code");
- fs::create_dir_all(&kimi_dir).expect("mkdir .kimi-code");
- fs::write(
- kimi_dir.join("session_index.jsonl"),
- concat!(
- r#"{"sessionId":"session_88888888-aaaa-bbbb-cccc-000000000008","sessionDir":"/x","workDir":"/Users/tester/Github/wakefx"}"#,
- "\n",
- r#"{"sessionId":"session_99999999-aaaa-bbbb-cccc-000000000009","sessionDir":"/x","workDir":"/Users/tester/Github/wakefx"}"#,
- "\n",
- ),
- )
- .expect("write kimi session_index");
-
- // dsh:检入的明文 fixture 压成真实写端布局的 zstd 多帧文件(首帧 header
- // 行、次帧事件批,帧直接连接),另放一个子代理会话验证 file_ref 过滤
- let dsh_project = home.path().join(".dsh").join("sessions").join("--Users-tester-Github-wakefx--");
- 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");
- let dsh_sub = dsh_project.join("dsh-sub-0002");
- fs::create_dir_all(&dsh_sub).expect("mkdir dsh subagent dir");
- fs::write(
- dsh_sub.join("session.jsonl"),
- concat!(
- r#"{"type":"session","version":0,"id":"dsh-sub-0002","createdAt":1786100000000,"cwd":"/Users/tester/Github/wakefx","origin":"subagent","delegationDepth":1}"#,
- "\n",
- r#"{"type":"user/message","seq":0,"time":1786100001000,"data":{"id":"m","role":"user","content":[{"type":"text","text":"child task"}],"source":{"kind":"user"}}}"#,
- "\n",
- ),
- )
- .expect("write dsh subagent log");
+ // 侧档与 SQLite fixture 库的搭建在 tests/common(remote_sync 的假远端
+ // home 复用同一份,两边不会各自漂移)
+ let sc = common::stage_sidecars(home.path());
// WAKE_HOME 是 adapter 侧的统一改道开关,三端一致;HOME 仍设一份供
// 其他 POSIX 依赖使用(Windows 上 dirs 不看 HOME,单设它等于没设)
@@ -125,185 +70,18 @@ fn setup() -> &'static TestEnv {
std::env::remove_var("CODEX_HOME");
std::env::remove_var("QODER_CONFIG_DIR");
TestEnv {
- copilot_db,
- opencode_db,
- opencode_next_db,
- antigravity_db,
- dsh_log,
+ copilot_db: sc.copilot_db,
+ opencode_db: sc.opencode_db,
+ opencode_next_db: sc.opencode_next_db,
+ antigravity_db: sc.antigravity_db,
+ dsh_log: sc.dsh_log,
_home: home,
}
})
}
-/// Copilot `session-store.db` 最小同构库:sessions + turns。
-/// cop-0002 的 summary 为空,验证标题回退首条用户消息。
-fn build_copilot_db(path: &Path) {
- let conn = rusqlite::Connection::open(path).expect("create copilot fixture db");
- conn.execute_batch(
- r#"
- CREATE TABLE sessions (
- id TEXT PRIMARY KEY, cwd TEXT, branch TEXT, summary TEXT,
- created_at TEXT, updated_at TEXT
- );
- CREATE TABLE turns (
- id INTEGER PRIMARY KEY, session_id TEXT, turn_index INTEGER,
- user_message TEXT, assistant_response TEXT, timestamp TEXT
- );
- INSERT INTO sessions VALUES
- ('cop-0001','/Users/tester/Github/wakefx','main','Copilot QR fix','2026-08-05 09:00:00','2026-08-05 09:30:00'),
- ('cop-0002','/Users/tester/Github/wakefx','','','2026-08-05 10:00:00','2026-08-05 10:05:00');
- INSERT INTO turns VALUES
- (1,'cop-0001',0,'Copilot 看看二维码扫描为何闪退,是不是 useEffect() 的问题','是依赖数组问题,我给出了修复补丁。','2026-08-05 09:05:00'),
- (2,'cop-0001',1,'谢谢,合并了',NULL,'2026-08-05 09:30:00'),
- (3,'cop-0002',0,'空 summary 会话的兜底标题应取这句','好的。','2026-08-05 10:05:00');
- "#,
- )
- .expect("populate copilot fixture db");
-}
-
-/// OpenCode `opencode.db` 最小同构库,v1 与 v2 两代表并存(v2 迁移后形态):
-/// v1:session + message + part,msg-a 只有 synthetic part(应归 Meta),
-/// msg-c 带 reasoning/tool/unknown part;oc-0001 只存在于 v1 表(模拟迁移后
-/// 又用 v1 CLI 跑的会话),必须被 UNION 回捞。
-/// v2:session_v2 + session_message,ocv2-0001 是 opencode2 beta 会话。
-fn build_opencode_db(path: &Path) {
- let conn = rusqlite::Connection::open(path).expect("create opencode fixture db");
- conn.execute_batch(
- r#"
- CREATE TABLE session (
- id TEXT PRIMARY KEY, parent_id TEXT, directory TEXT, title TEXT,
- time_created INTEGER, time_updated INTEGER, model TEXT,
- tokens_input INTEGER, tokens_output INTEGER, tokens_reasoning INTEGER,
- time_archived INTEGER, version TEXT
- );
- CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT, data TEXT, time_created INTEGER);
- CREATE TABLE part (id TEXT PRIMARY KEY, session_id TEXT, message_id TEXT, data TEXT);
- INSERT INTO session VALUES
- ('oc-0001', NULL, '/Users/tester/Github/wakefx', 'OpenCode 二维码排查',
- 1786000000000, 1786000600000, '{"providerID":"anthropic","id":"claude-sonnet-4-5"}',
- 100, 50, 25, NULL, '1.14.50');
- INSERT INTO message VALUES
- ('msg-a','oc-0001','{"id":"msg-a","role":"user","time":{"created":1786000050000}}',1786000050000),
- ('msg-b','oc-0001','{"id":"msg-b","role":"user","time":{"created":1786000100000}}',1786000100000),
- ('msg-c','oc-0001','{"id":"msg-c","role":"assistant","time":{"created":1786000200000}}',1786000200000);
- INSERT INTO part VALUES
- ('prt-a-01','oc-0001','msg-a','{"type":"text","text":"editor context: QrScanner.tsx is open","synthetic":true}'),
- ('prt-b-01','oc-0001','msg-b','{"type":"text","text":"OpenCode 查一下二维码组件的 useEffect() 泄漏"}'),
- ('prt-c-01','oc-0001','msg-c','{"type":"step-start"}'),
- ('prt-c-02','oc-0001','msg-c','{"type":"reasoning","text":"先查 effect 依赖和清理函数"}'),
- ('prt-c-03','oc-0001','msg-c','{"type":"tool","callID":"oc_call_1","tool":"grep","state":{"status":"completed","input":{"pattern":"useEffect"},"output":"src/QrScanner.tsx: useEffect(() => watch())"}}'),
- ('prt-c-04','oc-0001','msg-c','{"type":"text","text":"找到泄漏点,已在清理回调里停止扫描。"}'),
- ('prt-c-05','oc-0001','msg-c','{"type":"wibble-part"}');
- CREATE TABLE session_v2 (
- id TEXT PRIMARY KEY, parent_id TEXT, directory TEXT, title TEXT,
- time_created INTEGER, time_updated INTEGER, model TEXT,
- tokens_input INTEGER, tokens_output INTEGER, tokens_reasoning INTEGER,
- time_archived INTEGER, version TEXT
- );
- CREATE TABLE session_message (
- id TEXT PRIMARY KEY, session_id TEXT, type TEXT, seq INTEGER,
- time_created INTEGER, time_updated INTEGER, data TEXT
- );
- INSERT INTO session_v2 VALUES
- ('ocv2-0001', NULL, '/Users/tester/Github/wakefx', 'OpenCode v2 greeting',
- 1786100000000, 1786100300000, '{"id":"nemotron-3.5-lightning-free","providerID":"opencode"}',
- 10, 5, 2, NULL, '0.0.0-beta-17639');
- INSERT INTO session_message VALUES
- ('m2-0','ocv2-0001','user',0,1786100000000,1786100000000,
- '{"text":"OpenCode v2 看看二维码组件","time":{"created":1786100000000},"files":[],"agents":[]}'),
- ('m2-1','ocv2-0001','synthetic',1,1786100001000,1786100001000,
- '{"text":"<system-reminder>Note: the user opened QrScanner.tsx</system-reminder>","time":{"created":1786100001000}}'),
- ('m2-2','ocv2-0001','assistant',2,1786100002000,1786100002000,
- '{"agent":"build","model":{"id":"nemotron-3.5-lightning-free","providerID":"opencode","variant":"default"},"time":{"created":1786100002000},"content":[{"type":"reasoning","text":"用户要看扫描组件"},{"type":"text","text":"看完了,组件没有泄漏。"},{"type":"wibble-block"}]}'),
- ('m2-3','ocv2-0001','wibble-row',3,1786100003000,1786100003000,'{}');
- "#,
- )
- .expect("populate opencode fixture db");
-}
-
-/// `opencode-ai@next`/binary `opencode2` 的真实同构布局(GitHub #2):数据库名
-/// `opencode-next.db`,会话元数据仍在 session,新正文才在 session_message。
-/// message/part 两张 v1 表仍随 migration 存在但本会话没有对应行——只检查
-/// session_v2 或只对 part 求长度都会把它静默过滤。
-fn build_opencode_next_db(path: &Path) {
- let conn = rusqlite::Connection::open(path).expect("create opencode next fixture db");
- conn.execute_batch(
- r#"
- CREATE TABLE session (
- id TEXT PRIMARY KEY, parent_id TEXT, directory TEXT, title TEXT,
- time_created INTEGER, time_updated INTEGER, model TEXT,
- tokens_input INTEGER, tokens_output INTEGER, tokens_reasoning INTEGER,
- time_archived INTEGER, version TEXT
- );
- CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT, data TEXT, time_created INTEGER);
- CREATE TABLE part (id TEXT PRIMARY KEY, session_id TEXT, message_id TEXT, data TEXT);
- CREATE TABLE session_message (
- id TEXT PRIMARY KEY, session_id TEXT, type TEXT, seq INTEGER,
- time_created INTEGER, time_updated INTEGER, data TEXT
- );
- INSERT INTO session VALUES
- ('ocnext-0001', NULL, '/Users/tester/Github/wakefx', 'OpenCode next real schema',
- 1786200000000, 1786200300000,
- '{"id":"gpt-5.6","providerID":"openai","variant":"default"}',
- 20, 8, 4, NULL, '0.0.0-next-202606270058');
- INSERT INTO session_message VALUES
- ('next-m0','ocnext-0001','user',0,1786200000000,1786200000000,
- '{"text":"OpenCode next 检查二维码组件","time":{"created":1786200000000},"files":[],"agents":[]}'),
- ('next-m1','ocnext-0001','synthetic',1,1786200001000,1786200001000,
- '{"sessionID":"ocnext-0001","text":"editor context: QrScanner.tsx","time":{"created":1786200001000}}'),
- ('next-m2','ocnext-0001','assistant',2,1786200002000,1786200002000,
- '{"agent":"build","model":{"id":"gpt-5.6","providerID":"openai","variant":"default"},"time":{"created":1786200002000},"content":[{"type":"reasoning","id":"rsn-1","text":"检查 effect 清理"},{"type":"tool","id":"tool-1","name":"grep","state":{"status":"completed","input":{"pattern":"useEffect"},"structured":{},"content":[{"type":"text","text":"src/QrScanner.tsx:42"}],"result":{"matches":1}},"time":{"created":1786200002100,"completed":1786200002200}},{"type":"text","id":"txt-1","text":"next schema 解析成功。"}]}'),
- ('next-m3','ocnext-0001','system',3,1786200003000,1786200003000,
- '{"text":"system notice","time":{"created":1786200003000}}'),
- ('next-m4','ocnext-0001','shell',4,1786200004000,1786200004000,
- '{"callID":"shell-1","command":"cargo test","output":"ok","time":{"created":1786200004000,"completed":1786200004100}}'),
- ('next-m5','ocnext-0001','compaction',5,1786200005000,1786200005000,
- '{"reason":"auto","summary":"保留二维码排查上下文","recent":"","time":{"created":1786200005000}}'),
- ('next-m6','ocnext-0001','agent-switched',6,1786200006000,1786200006000,
- '{"agent":"build","time":{"created":1786200006000}}'),
- ('next-m7','ocnext-0001','wibble-next',7,1786200007000,1786200007000,'{}');
- "#,
- )
- .expect("populate opencode next fixture db");
-}
-
-/// Antigravity `conversation_summaries.db` 最小同构库:标题在 preview 列
-/// (title 列常空);ag-0002 是子会话(parent 非空),必须被过滤。
-fn build_antigravity_db(path: &Path) {
- let conn = rusqlite::Connection::open(path).expect("create antigravity fixture db");
- conn.execute_batch(
- r#"
- CREATE TABLE conversation_summaries (
- conversation_id text, title text NOT NULL DEFAULT "",
- preview text NOT NULL DEFAULT "", step_count integer NOT NULL DEFAULT 0,
- last_modified_time datetime NOT NULL, workspace_uris text NOT NULL,
- parent_conversation_id text NOT NULL DEFAULT "",
- nesting_depth integer NOT NULL DEFAULT 0,
- last_user_input_time datetime NOT NULL,
- PRIMARY KEY (conversation_id)
- );
- INSERT INTO conversation_summaries
- (conversation_id, title, preview, step_count, last_modified_time,
- workspace_uris, parent_conversation_id, nesting_depth, last_user_input_time)
- VALUES
- ('ag-0001', '', 'QR overlay polish', 12, '2026-08-06 13:00:00.000000+00:00',
- '["file:///Users/tester/Github/wakefx"]', '', 0, '2026-08-06 13:00:00.000000+00:00'),
- ('ag-0002', '', 'Child convo', 3, '2026-08-06 13:05:00.000000+00:00',
- '["file:///Users/tester/Github/wakefx"]', 'ag-0001', 1, '0001-01-01 00:00:00+00:00');
- "#,
- )
- .expect("populate antigravity fixture db");
-}
-
// ---------------------------------------------------------------- 小工具
-fn fixture(rel: &str) -> PathBuf {
- Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("tests")
- .join("fixtures")
- .join(rel)
-}
-
/// 文件型 agent 的 SessionFileRef(直接指 fixture,不走 list_session_files)
fn fs_ref(agent: AgentId, path: &Path, native_id: &str) -> SessionFileRef {
let meta =
@@ -2296,7 +2074,7 @@ fn remote_codex_merge_keeps_host_key() {
}
/// state DB 的 rollout_path 是**写库那台机器**上的绝对路径(rsync 原样
-/// 镜像过来)——远程缓存下必须按 sessions 尾段重映射到实例目录再匹配,
+/// 镜像过来)——远程缓存下必须按 rollout 文件名(时间戳 + uuid,全局唯一)匹配,
/// 否则远程 Codex 的手工标题与 thread-key 全部静默丢失(2026-09-02 review)
#[test]
fn remote_codex_state_matches_despite_foreign_rollout_path() {
diff --git a/crates/wake-core/tests/common/mod.rs b/crates/wake-core/tests/common/mod.rs
new file mode 100644
index 0000000..884dbb9
--- /dev/null
+++ b/crates/wake-core/tests/common/mod.rs
@@ -0,0 +1,295 @@
+//! 集成测试共用的 fixture 搭建:合成 fixtures → 一个像真机 home 的目录树。
+//! adapter_contracts 用它建假 HOME,remote_sync 用它建"远端 home"——同一份
+//! 侧档/SQLite 库/dsh zstd 压制,两边不会各自漂移。fixture 全合成,绝不放
+//! 真实会话数据。
+#![allow(dead_code)] // 每个测试二进制只用到其中一部分
+
+use std::fs;
+use std::path::{Path, PathBuf};
+
+pub fn fixture(rel: &str) -> PathBuf {
+ Path::new(env!("CARGO_MANIFEST_DIR"))
+ .join("tests")
+ .join("fixtures")
+ .join(rel)
+}
+
+pub fn copy_tree(src: &Path, dst: &Path) {
+ fs::create_dir_all(dst).unwrap();
+ for entry in fs::read_dir(src).unwrap() {
+ let entry = entry.unwrap();
+ let to = dst.join(entry.file_name());
+ if entry.file_type().unwrap().is_dir() {
+ copy_tree(&entry.path(), &to);
+ } else {
+ fs::copy(entry.path(), &to).unwrap();
+ }
+ }
+}
+
+/// 目录型 fixtures 摆进 home:fixture 目录名即各家 home 下的尾段(pi 的树
+/// 同时复制成 omp——omp fork 自 pi,布局同构)
+pub fn stage_dir_fixtures(home: &Path) {
+ for (src, dst) in [
+ ("claude", ".claude"),
+ ("codex", ".codex"),
+ ("cursor", ".cursor"),
+ ("gemini", ".gemini"),
+ ("grok", ".grok"),
+ ("kimi", ".kimi-code"),
+ ("kiro", ".kiro"),
+ ("pi", ".pi"),
+ ("pi", ".omp"),
+ ("qoder", ".qoder"),
+ ] {
+ copy_tree(&fixture(src), &home.join(dst));
+ }
+}
+
+/// stage_sidecars 建出的库/日志路径(契约测试按路径直开)
+pub struct Sidecars {
+ pub copilot_db: PathBuf,
+ pub opencode_db: PathBuf,
+ pub opencode_next_db: PathBuf,
+ pub antigravity_db: PathBuf,
+ pub dsh_log: PathBuf,
+}
+
+/// 侧档与 SQLite 型 fixture 库:copilot/opencode(两代)/antigravity 现建库,
+/// gemini 的 projects.json、kimi 的 session_index.jsonl,dsh 的 zstd 日志与
+/// 一个子代理会话(验证 file_ref 过滤)。
+pub fn stage_sidecars(home: &Path) -> Sidecars {
+ let copilot_dir = home.join(".copilot");
+ fs::create_dir_all(&copilot_dir).expect("mkdir .copilot");
+ let copilot_db = copilot_dir.join("session-store.db");
+ build_copilot_db(&copilot_db);
+
+ let oc_dir = home.join(".local").join("share").join("opencode");
+ fs::create_dir_all(&oc_dir).expect("mkdir opencode dir");
+ let opencode_db = oc_dir.join("opencode.db");
+ build_opencode_db(&opencode_db);
+ let opencode_next_db = oc_dir.join("opencode-next.db");
+ build_opencode_next_db(&opencode_next_db);
+
+ let gem_dir = home.join(".gemini");
+ fs::create_dir_all(&gem_dir).expect("mkdir .gemini");
+ fs::write(
+ gem_dir.join("projects.json"),
+ r#"{"projects":{"/Users/tester/Github/wakefx":"wakefx-gem"}}"#,
+ )
+ .expect("write projects.json");
+
+ let ag_dir = gem_dir.join("antigravity-cli");
+ fs::create_dir_all(&ag_dir).expect("mkdir antigravity-cli");
+ let antigravity_db = ag_dir.join("conversation_summaries.db");
+ build_antigravity_db(&antigravity_db);
+
+ let kimi_dir = home.join(".kimi-code");
+ fs::create_dir_all(&kimi_dir).expect("mkdir .kimi-code");
+ fs::write(
+ kimi_dir.join("session_index.jsonl"),
+ concat!(
+ r#"{"sessionId":"session_88888888-aaaa-bbbb-cccc-000000000008","sessionDir":"/x","workDir":"/Users/tester/Github/wakefx"}"#,
+ "\n",
+ r#"{"sessionId":"session_99999999-aaaa-bbbb-cccc-000000000009","sessionDir":"/x","workDir":"/Users/tester/Github/wakefx"}"#,
+ "\n",
+ ),
+ )
+ .expect("write kimi session_index");
+
+ // dsh:检入的明文 fixture 压成真实写端布局的 zstd 多帧文件(首帧 header
+ // 行、次帧事件批,帧直接连接),另放一个子代理会话验证 file_ref 过滤
+ let dsh_project = home
+ .join(".dsh")
+ .join("sessions")
+ .join("--Users-tester-Github-wakefx--");
+ 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");
+ let dsh_sub = dsh_project.join("dsh-sub-0002");
+ fs::create_dir_all(&dsh_sub).expect("mkdir dsh subagent dir");
+ fs::write(
+ dsh_sub.join("session.jsonl"),
+ concat!(
+ r#"{"type":"session","version":0,"id":"dsh-sub-0002","createdAt":1786100000000,"cwd":"/Users/tester/Github/wakefx","origin":"subagent","delegationDepth":1}"#,
+ "\n",
+ r#"{"type":"user/message","seq":0,"time":1786100001000,"data":{"id":"m","role":"user","content":[{"type":"text","text":"child task"}],"source":{"kind":"user"}}}"#,
+ "\n",
+ ),
+ )
+ .expect("write dsh subagent log");
+
+ Sidecars {
+ copilot_db,
+ opencode_db,
+ opencode_next_db,
+ antigravity_db,
+ dsh_log,
+ }
+}
+
+/// Copilot `session-store.db` 最小同构库:sessions + turns。
+/// cop-0002 的 summary 为空,验证标题回退首条用户消息。
+pub fn build_copilot_db(path: &Path) {
+ let conn = rusqlite::Connection::open(path).expect("create copilot fixture db");
+ conn.execute_batch(
+ r#"
+ CREATE TABLE sessions (
+ id TEXT PRIMARY KEY, cwd TEXT, branch TEXT, summary TEXT,
+ created_at TEXT, updated_at TEXT
+ );
+ CREATE TABLE turns (
+ id INTEGER PRIMARY KEY, session_id TEXT, turn_index INTEGER,
+ user_message TEXT, assistant_response TEXT, timestamp TEXT
+ );
+ INSERT INTO sessions VALUES
+ ('cop-0001','/Users/tester/Github/wakefx','main','Copilot QR fix','2026-08-05 09:00:00','2026-08-05 09:30:00'),
+ ('cop-0002','/Users/tester/Github/wakefx','','','2026-08-05 10:00:00','2026-08-05 10:05:00');
+ INSERT INTO turns VALUES
+ (1,'cop-0001',0,'Copilot 看看二维码扫描为何闪退,是不是 useEffect() 的问题','是依赖数组问题,我给出了修复补丁。','2026-08-05 09:05:00'),
+ (2,'cop-0001',1,'谢谢,合并了',NULL,'2026-08-05 09:30:00'),
+ (3,'cop-0002',0,'空 summary 会话的兜底标题应取这句','好的。','2026-08-05 10:05:00');
+ "#,
+ )
+ .expect("populate copilot fixture db");
+}
+
+/// OpenCode `opencode.db` 最小同构库,v1 与 v2 两代表并存(v2 迁移后形态):
+/// v1:session + message + part,msg-a 只有 synthetic part(应归 Meta),
+/// msg-c 带 reasoning/tool/unknown part;oc-0001 只存在于 v1 表(模拟迁移后
+/// 又用 v1 CLI 跑的会话),必须被 UNION 回捞。
+/// v2:session_v2 + session_message,ocv2-0001 是 opencode2 beta 会话。
+pub fn build_opencode_db(path: &Path) {
+ let conn = rusqlite::Connection::open(path).expect("create opencode fixture db");
+ conn.execute_batch(
+ r#"
+ CREATE TABLE session (
+ id TEXT PRIMARY KEY, parent_id TEXT, directory TEXT, title TEXT,
+ time_created INTEGER, time_updated INTEGER, model TEXT,
+ tokens_input INTEGER, tokens_output INTEGER, tokens_reasoning INTEGER,
+ time_archived INTEGER, version TEXT
+ );
+ CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT, data TEXT, time_created INTEGER);
+ CREATE TABLE part (id TEXT PRIMARY KEY, session_id TEXT, message_id TEXT, data TEXT);
+ INSERT INTO session VALUES
+ ('oc-0001', NULL, '/Users/tester/Github/wakefx', 'OpenCode 二维码排查',
+ 1786000000000, 1786000600000, '{"providerID":"anthropic","id":"claude-sonnet-4-5"}',
+ 100, 50, 25, NULL, '1.14.50');
+ INSERT INTO message VALUES
+ ('msg-a','oc-0001','{"id":"msg-a","role":"user","time":{"created":1786000050000}}',1786000050000),
+ ('msg-b','oc-0001','{"id":"msg-b","role":"user","time":{"created":1786000100000}}',1786000100000),
+ ('msg-c','oc-0001','{"id":"msg-c","role":"assistant","time":{"created":1786000200000}}',1786000200000);
+ INSERT INTO part VALUES
+ ('prt-a-01','oc-0001','msg-a','{"type":"text","text":"editor context: QrScanner.tsx is open","synthetic":true}'),
+ ('prt-b-01','oc-0001','msg-b','{"type":"text","text":"OpenCode 查一下二维码组件的 useEffect() 泄漏"}'),
+ ('prt-c-01','oc-0001','msg-c','{"type":"step-start"}'),
+ ('prt-c-02','oc-0001','msg-c','{"type":"reasoning","text":"先查 effect 依赖和清理函数"}'),
+ ('prt-c-03','oc-0001','msg-c','{"type":"tool","callID":"oc_call_1","tool":"grep","state":{"status":"completed","input":{"pattern":"useEffect"},"output":"src/QrScanner.tsx: useEffect(() => watch())"}}'),
+ ('prt-c-04','oc-0001','msg-c','{"type":"text","text":"找到泄漏点,已在清理回调里停止扫描。"}'),
+ ('prt-c-05','oc-0001','msg-c','{"type":"wibble-part"}');
+ CREATE TABLE session_v2 (
+ id TEXT PRIMARY KEY, parent_id TEXT, directory TEXT, title TEXT,
+ time_created INTEGER, time_updated INTEGER, model TEXT,
+ tokens_input INTEGER, tokens_output INTEGER, tokens_reasoning INTEGER,
+ time_archived INTEGER, version TEXT
+ );
+ CREATE TABLE session_message (
+ id TEXT PRIMARY KEY, session_id TEXT, type TEXT, seq INTEGER,
+ time_created INTEGER, time_updated INTEGER, data TEXT
+ );
+ INSERT INTO session_v2 VALUES
+ ('ocv2-0001', NULL, '/Users/tester/Github/wakefx', 'OpenCode v2 greeting',
+ 1786100000000, 1786100300000, '{"id":"nemotron-3.5-lightning-free","providerID":"opencode"}',
+ 10, 5, 2, NULL, '0.0.0-beta-17639');
+ INSERT INTO session_message VALUES
+ ('m2-0','ocv2-0001','user',0,1786100000000,1786100000000,
+ '{"text":"OpenCode v2 看看二维码组件","time":{"created":1786100000000},"files":[],"agents":[]}'),
+ ('m2-1','ocv2-0001','synthetic',1,1786100001000,1786100001000,
+ '{"text":"<system-reminder>Note: the user opened QrScanner.tsx</system-reminder>","time":{"created":1786100001000}}'),
+ ('m2-2','ocv2-0001','assistant',2,1786100002000,1786100002000,
+ '{"agent":"build","model":{"id":"nemotron-3.5-lightning-free","providerID":"opencode","variant":"default"},"time":{"created":1786100002000},"content":[{"type":"reasoning","text":"用户要看扫描组件"},{"type":"text","text":"看完了,组件没有泄漏。"},{"type":"wibble-block"}]}'),
+ ('m2-3','ocv2-0001','wibble-row',3,1786100003000,1786100003000,'{}');
+ "#,
+ )
+ .expect("populate opencode fixture db");
+}
+
+/// `opencode-ai@next`/binary `opencode2` 的真实同构布局(GitHub #2):数据库名
+/// `opencode-next.db`,会话元数据仍在 session,新正文才在 session_message。
+/// message/part 两张 v1 表仍随 migration 存在但本会话没有对应行——只检查
+/// session_v2 或只对 part 求长度都会把它静默过滤。
+pub fn build_opencode_next_db(path: &Path) {
+ let conn = rusqlite::Connection::open(path).expect("create opencode next fixture db");
+ conn.execute_batch(
+ r#"
+ CREATE TABLE session (
+ id TEXT PRIMARY KEY, parent_id TEXT, directory TEXT, title TEXT,
+ time_created INTEGER, time_updated INTEGER, model TEXT,
+ tokens_input INTEGER, tokens_output INTEGER, tokens_reasoning INTEGER,
+ time_archived INTEGER, version TEXT
+ );
+ CREATE TABLE message (id TEXT PRIMARY KEY, session_id TEXT, data TEXT, time_created INTEGER);
+ CREATE TABLE part (id TEXT PRIMARY KEY, session_id TEXT, message_id TEXT, data TEXT);
+ CREATE TABLE session_message (
+ id TEXT PRIMARY KEY, session_id TEXT, type TEXT, seq INTEGER,
+ time_created INTEGER, time_updated INTEGER, data TEXT
+ );
+ INSERT INTO session VALUES
+ ('ocnext-0001', NULL, '/Users/tester/Github/wakefx', 'OpenCode next real schema',
+ 1786200000000, 1786200300000,
+ '{"id":"gpt-5.6","providerID":"openai","variant":"default"}',
+ 20, 8, 4, NULL, '0.0.0-next-202606270058');
+ INSERT INTO session_message VALUES
+ ('next-m0','ocnext-0001','user',0,1786200000000,1786200000000,
+ '{"text":"OpenCode next 检查二维码组件","time":{"created":1786200000000},"files":[],"agents":[]}'),
+ ('next-m1','ocnext-0001','synthetic',1,1786200001000,1786200001000,
+ '{"sessionID":"ocnext-0001","text":"editor context: QrScanner.tsx","time":{"created":1786200001000}}'),
+ ('next-m2','ocnext-0001','assistant',2,1786200002000,1786200002000,
+ '{"agent":"build","model":{"id":"gpt-5.6","providerID":"openai","variant":"default"},"time":{"created":1786200002000},"content":[{"type":"reasoning","id":"rsn-1","text":"检查 effect 清理"},{"type":"tool","id":"tool-1","name":"grep","state":{"status":"completed","input":{"pattern":"useEffect"},"structured":{},"content":[{"type":"text","text":"src/QrScanner.tsx:42"}],"result":{"matches":1}},"time":{"created":1786200002100,"completed":1786200002200}},{"type":"text","id":"txt-1","text":"next schema 解析成功。"}]}'),
+ ('next-m3','ocnext-0001','system',3,1786200003000,1786200003000,
+ '{"text":"system notice","time":{"created":1786200003000}}'),
+ ('next-m4','ocnext-0001','shell',4,1786200004000,1786200004000,
+ '{"callID":"shell-1","command":"cargo test","output":"ok","time":{"created":1786200004000,"completed":1786200004100}}'),
+ ('next-m5','ocnext-0001','compaction',5,1786200005000,1786200005000,
+ '{"reason":"auto","summary":"保留二维码排查上下文","recent":"","time":{"created":1786200005000}}'),
+ ('next-m6','ocnext-0001','agent-switched',6,1786200006000,1786200006000,
+ '{"agent":"build","time":{"created":1786200006000}}'),
+ ('next-m7','ocnext-0001','wibble-next',7,1786200007000,1786200007000,'{}');
+ "#,
+ )
+ .expect("populate opencode next fixture db");
+}
+
+/// Antigravity `conversation_summaries.db` 最小同构库:标题在 preview 列
+/// (title 列常空);ag-0002 是子会话(parent 非空),必须被过滤。
+pub fn build_antigravity_db(path: &Path) {
+ let conn = rusqlite::Connection::open(path).expect("create antigravity fixture db");
+ conn.execute_batch(
+ r#"
+ CREATE TABLE conversation_summaries (
+ conversation_id text, title text NOT NULL DEFAULT "",
+ preview text NOT NULL DEFAULT "", step_count integer NOT NULL DEFAULT 0,
+ last_modified_time datetime NOT NULL, workspace_uris text NOT NULL,
+ parent_conversation_id text NOT NULL DEFAULT "",
+ nesting_depth integer NOT NULL DEFAULT 0,
+ last_user_input_time datetime NOT NULL,
+ PRIMARY KEY (conversation_id)
+ );
+ INSERT INTO conversation_summaries
+ (conversation_id, title, preview, step_count, last_modified_time,
+ workspace_uris, parent_conversation_id, nesting_depth, last_user_input_time)
+ VALUES
+ ('ag-0001', '', 'QR overlay polish', 12, '2026-08-06 13:00:00.000000+00:00',
+ '["file:///Users/tester/Github/wakefx"]', '', 0, '2026-08-06 13:00:00.000000+00:00'),
+ ('ag-0002', '', 'Child convo', 3, '2026-08-06 13:05:00.000000+00:00',
+ '["file:///Users/tester/Github/wakefx"]', 'ag-0001', 1, '0001-01-01 00:00:00+00:00');
+ "#,
+ )
+ .expect("populate antigravity fixture db");
+}
diff --git a/crates/wake-core/tests/remote_sync.rs b/crates/wake-core/tests/remote_sync.rs
new file mode 100644
index 0000000..6e5b162
--- /dev/null
+++ b/crates/wake-core/tests/remote_sync.rs
@@ -0,0 +1,352 @@
+//! 远程同步的端到端(假 ssh + 真 rsync + 真实 roster/scanner):
+//!
+//! 卡 2026-09-02 本机实测出的两个 bug——①缺父目录的源让 openrsync 发送端
+//! 截断文件列表、后面的源静默不传;②任何缺源都让 rsync 跳过 --delete。修法
+//! 是先探测再镜像,这里断言的就是"远端缺一大半 agent 时,存在的照样全到、
+//! 删除照样传播",再接上 `create_adapter_roster_for` + `run_scan`,确认远程
+//! 会话以 `{agent}:{host}:{native}` 入库、Remove host 后按"磁盘已删"出清。
+//!
+//! 假 ssh 把远端命令交给 sh 在假 home 里跑,与真 ssh 把命令串交给远端登录
+//! shell 的行为同形;rsync 用系统真身(macOS 是 openrsync,CI ubuntu 是 GNU
+//! rsync,两种发送端都覆盖)。Windows 无 sh/rsync,整文件不编译。
+//! PATH/WAKE_HOME 是进程级环境:默认只跑一个用例(live 那个默认 ignore、
+//! 手动单跑),不会有两个线程同时改 env。
+#![cfg(unix)]
+
+use std::collections::HashSet;
+use std::fs;
+use std::os::unix::fs::PermissionsExt;
+use std::path::Path;
+use std::sync::Arc;
+use wake_core::adapters::create_adapter_roster_for;
+use wake_core::db::{RemoteHost, Store};
+use wake_core::models::{AgentId, SessionFilter};
+use wake_core::scanner::{run_scan, NullEvents};
+
+fn write_exec(path: &Path, content: &str) {
+ fs::write(path, content).unwrap();
+ fs::set_permissions(path, fs::Permissions::from_mode(0o755)).unwrap();
+}
+
+fn touch(path: &Path, content: &str) {
+ fs::create_dir_all(path.parent().unwrap()).unwrap();
+ fs::write(path, content).unwrap();
+}
+
+fn host_row(store: &Store, name: &str) -> RemoteHost {
+ store
+ .list_remote_hosts()
+ .unwrap()
+ .into_iter()
+ .find(|h| h.name == name)
+ .unwrap_or_else(|| panic!("remote host {name} not configured"))
+}
+
+mod common;
+
+/// 把合成 fixtures 摆成一台远程机器的 home(与契约测试同一份搭建),再把
+/// Copilot 整个拿掉:`.copilot` 是白名单里唯一"连父目录都不存在"的形状,
+/// 且排在 cursor…dsh 之前——正是截断 bug 的触发条件,也是"远端只装了一部分
+/// agent"的常态。
+fn build_remote_home(home: &Path) {
+ common::stage_dir_fixtures(home);
+ common::stage_sidecars(home);
+ fs::remove_dir_all(home.join(".copilot")).unwrap();
+ // 凭证在白名单外,必须留在远端
+ touch(&home.join(".codex/auth.json"), "NOT-A-REAL-SECRET");
+}
+
+/// 假远端上装着的 agent(Copilot 故意缺席,见 build_remote_home)
+fn remote_agents() -> impl Iterator<Item = AgentId> {
+ AgentId::ALL.into_iter().filter(|a| *a != AgentId::Copilot)
+}
+
+const CLAUDE_U1: &str =
+ ".claude/projects/-Users-tester-Github-wakefx/11111111-aaaa-bbbb-cccc-000000000001.jsonl";
+const CODEX_R2: &str =
+ ".codex/sessions/2026/08/02/rollout-2026-08-02T09-15-00-22222222-aaaa-bbbb-cccc-000000000002.jsonl";
+const GROK_S7: &str =
+ ".grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007";
+const DSH_LOG: &str =
+ ".dsh/sessions/--Users-tester-Github-wakefx--/dsh-e2e4-0001/session.jsonl.zstd";
+
+#[test]
+fn remote_pipeline_end_to_end() {
+ if std::process::Command::new("rsync")
+ .arg("--version")
+ .output()
+ .is_err()
+ {
+ eprintln!("rsync not installed; skipping remote sync e2e");
+ return;
+ }
+ let tmp = tempfile::tempdir().unwrap();
+ let home = tmp.path().join("remote-home");
+ let bin = tmp.path().join("bin");
+ let local_home = tmp.path().join("local-home");
+ fs::create_dir_all(&bin).unwrap();
+ fs::create_dir_all(&local_home).unwrap();
+ // 假 ssh:吞掉 -o 选项与 host;host 为 down 模拟连不上(ssh 的 255);
+ // 其余把拼接后的远端命令交给 sh 在假 home 里执行——探测脚本与 rsync 的
+ // --server 都走这条路。WAKE_TEST_VANISH 指向一个文件时,第一次
+ // rsync --server 起跑前把它删掉(只删一次,.done 标记),模拟"探测到
+ // rsync 之间远端 agent 退出删了 -wal"的竞争
+ write_exec(
+ &bin.join("ssh"),
+ &format!(
+ "#!/bin/sh\n\
+ while [ $# -gt 0 ]; do case \"$1\" in -*) shift;; *) break;; esac; done\n\
+ host=$1; shift\n\
+ if [ \"$host\" = down ]; then \
+ echo 'ssh: connect to host down port 22: Connection refused' >&2; exit 255; \
+ fi\n\
+ if [ -n \"$WAKE_TEST_VANISH\" ] && [ ! -e \"$WAKE_TEST_VANISH.done\" ]; then \
+ case \"$*\" in *'rsync --server'*) rm -f \"$WAKE_TEST_VANISH\"; : > \"$WAKE_TEST_VANISH.done\";; esac; \
+ fi\n\
+ export HOME='{home}'\n\
+ cd \"$HOME\" || exit 99\n\
+ exec sh -c \"$*\"\n",
+ home = home.display()
+ ),
+ );
+ std::env::set_var(
+ "PATH",
+ format!(
+ "{}:{}",
+ bin.display(),
+ std::env::var("PATH").unwrap_or_default()
+ ),
+ );
+ // 本地 roster 指向一个空 home:库里出现的只能是远程行,也不会读到这台
+ // 开发机的真实数据;env 根覆盖一并清掉
+ std::env::set_var("WAKE_HOME", &local_home);
+ std::env::set_var("HOME", &local_home);
+ for var in ["XDG_DATA_HOME", "CODEX_HOME", "QODER_CONFIG_DIR"] {
+ std::env::remove_var(var);
+ }
+ build_remote_home(&home);
+
+ let store = Arc::new(Store::open(&tmp.path().join("wake.db")).unwrap());
+ store.add_remote_host("devbox").unwrap();
+ store.add_remote_host("down").unwrap();
+ let db_dir = store.db_dir().unwrap();
+ let cache = wake_core::remote::host_cache_dir(&db_dir, "devbox");
+ let devbox = || host_row(&store, "devbox");
+
+ // ① 首次同步:.copilot(缺父目录)之后的 cursor…dsh 必须到位,exclude 与凭证
+ // 不进缓存。同时让 opencode-next.db 在探测之后、rsync 之前消失:rsync 报
+ // 只含 ENOENT 的 23,sync_host 必须重探一轮并成功,而不是记成 Sync failed
+ let vanish = home.join(".local/share/opencode/opencode-next.db");
+ let vanish_marker = Path::new(&format!("{}.done", vanish.display())).to_path_buf();
+ std::env::set_var("WAKE_TEST_VANISH", &vanish);
+ wake_core::remote::sync_hosts(&store, &["devbox".to_string()]);
+ std::env::remove_var("WAKE_TEST_VANISH");
+ assert!(vanish_marker.exists(), "假 ssh 没触发消失钩子");
+ assert_eq!(
+ devbox().last_sync_error,
+ None,
+ "探测后消失的源应重探一轮,不是报错"
+ );
+ assert!(devbox().last_sync_at.is_some());
+ assert!(
+ !cache
+ .join(".local/share/opencode/opencode-next.db")
+ .exists(),
+ "消失的源不该进缓存"
+ );
+ assert!(cache.join(".local/share/opencode/opencode.db").is_file());
+ for rel in [
+ CLAUDE_U1,
+ CODEX_R2,
+ ".gemini/projects.json",
+ ".kimi-code/session_index.jsonl",
+ DSH_LOG,
+ ] {
+ assert!(cache.join(rel).is_file(), "{rel} 没同步到缓存");
+ }
+ assert!(
+ cache.join(GROK_S7).join("updates.jsonl").is_file(),
+ "缺席源之后的目录型源被截断"
+ );
+ assert!(!cache.join(".codex/auth.json").exists(), "凭证进了缓存");
+ assert!(!cache.join(".copilot").exists());
+ assert!(
+ cache
+ .join(".gemini/antigravity-cli/conversation_summaries.db")
+ .is_file(),
+ "SQLite 型的文件源没到"
+ );
+
+ // ② 真实 roster + 全量扫描:十三家远程会话以三段 key 入库,host/id/file_path 都对
+ let roster = create_adapter_roster_for(&store);
+ run_scan(&roster.active, &store, &NullEvents, true).expect("scan ok");
+ let all = SessionFilter {
+ include_archived: true,
+ limit: 1000,
+ ..Default::default()
+ };
+ let (sessions, total) = store.list_sessions(&all).unwrap();
+ assert!(total > 0, "没有任何远程会话入库");
+ let cache_prefix = cache.to_string_lossy().to_string();
+ for s in &sessions {
+ assert_eq!(s.host, "devbox", "{}", s.key);
+ assert!(
+ s.key.starts_with(&format!("{}:devbox:", s.agent.as_str())),
+ "key 不是三段格式: {}",
+ s.key
+ );
+ assert!(!s.id.contains(':'), "native id 混进了 host 段: {}", s.id);
+ assert!(
+ s.file_path.starts_with(&cache_prefix),
+ "file_path 不在缓存树内: {}",
+ s.file_path
+ );
+ }
+ let agents: HashSet<AgentId> = sessions.iter().map(|s| s.agent).collect();
+ for expected in remote_agents() {
+ assert!(agents.contains(&expected), "{expected:?} 的远程会话没进库");
+ }
+ assert_eq!(
+ store.host_counts().unwrap().get("devbox").copied(),
+ Some(total),
+ "Remote hosts 面板计数与列表不一致"
+ );
+ let count_of = |agent: AgentId| {
+ let f = SessionFilter {
+ agents: vec![agent],
+ ..all.clone()
+ };
+ store.list_sessions(&f).unwrap().1
+ };
+ let claude_before = count_of(AgentId::ClaudeCode);
+
+ // ③ 远端变化:删一个 grok 会话目录、整个卸掉 Codex、新增一个 claude 文件;
+ // 再同步 + 增量扫描,三种变化都要传播到缓存与库
+ fs::remove_dir_all(home.join(GROK_S7)).unwrap();
+ fs::remove_dir_all(home.join(".codex")).unwrap();
+ let added =
+ ".claude/projects/-Users-tester-Github-wakefx/eeeeeeee-aaaa-bbbb-cccc-00000000000e.jsonl";
+ fs::copy(home.join(CLAUDE_U1), home.join(added)).unwrap();
+ wake_core::remote::sync_hosts(&store, &["devbox".to_string()]);
+ assert_eq!(devbox().last_sync_error, None);
+ assert!(
+ !cache.join(GROK_S7).exists(),
+ "源树内的删除未传播(--delete 被缺源压掉)"
+ );
+ assert!(
+ !cache.join(".codex/sessions").exists(),
+ "整棵源消失未传播到缓存"
+ );
+ assert!(cache.join(added).is_file(), "新增文件没同步到缓存");
+ assert!(cache.join(CLAUDE_U1).is_file(), "无关的树被误删");
+ run_scan(&roster.active, &store, &NullEvents, false).expect("rescan ok");
+ assert_eq!(count_of(AgentId::Grok), 0, "远端删掉的 grok 会话还挂在库里");
+ assert_eq!(
+ count_of(AgentId::Codex),
+ 0,
+ "远端卸掉的 codex 会话还挂在库里"
+ );
+ assert!(count_of(AgentId::ClaudeCode) >= claude_before);
+
+ // ④ 连不上的 host:错误落库、缓存一字不动(不能把"连不上"当"远端空了")
+ let down_cache = wake_core::remote::host_cache_dir(&db_dir, "down");
+ touch(&down_cache.join(".claude/projects/p/keep.jsonl"), "{}\n");
+ wake_core::remote::sync_hosts(&store, &["down".to_string()]);
+ let down = host_row(&store, "down");
+ let err = down
+ .last_sync_error
+ .expect("unreachable host must record an error");
+ assert!(err.contains("Connection refused"), "{err}");
+ assert!(down.last_sync_at.is_none());
+ assert!(
+ down_cache.join(".claude/projects/p/keep.jsonl").is_file(),
+ "探测失败不得清缓存"
+ );
+
+ // ⑤ Remove host 的数据面:配置删掉 → roster 不再含该 host → 扫描把行按
+ // "磁盘已删"出清 → 孤儿缓存清理只删它、不碰仍配置着的 down
+ store.remove_remote_host("devbox").unwrap();
+ let roster = create_adapter_roster_for(&store);
+ assert!(
+ roster.active.iter().all(|a| a.host() != "devbox"),
+ "移除后的 host 仍在 roster 里"
+ );
+ run_scan(&roster.active, &store, &NullEvents, false).expect("rescan ok");
+ assert_eq!(
+ store.host_counts().unwrap().get("devbox"),
+ None,
+ "移除 host 后它的会话还在库里"
+ );
+ wake_core::remote::purge_orphan_caches(&store);
+ assert!(!cache.exists(), "移除 host 的缓存目录没清");
+ assert!(down_cache.exists(), "仍配置着的 host 缓存被误清");
+}
+
+fn count_files(dir: &Path) -> usize {
+ let Ok(entries) = fs::read_dir(dir) else {
+ return 0;
+ };
+ entries
+ .flatten()
+ .map(|e| {
+ if e.file_type().map(|t| t.is_dir()).unwrap_or(false) {
+ count_files(&e.path())
+ } else {
+ 1
+ }
+ })
+ .sum()
+}
+
+/// 手动 live 检查:对着一台**真实** host(`~/.ssh/config` 别名,或 scratchpad
+/// 里的 Docker 容器)跑同一条管线——真 ssh、真远端登录 shell、真 rsync 发送端,
+/// 是假 ssh 覆盖不到的那一层。默认 ignore:
+/// `WAKE_LIVE_REMOTE_HOST=<host> cargo test -p wake-core --test remote_sync live -- --ignored --nocapture`
+/// 不做 fixture 级断言,只要求同步无错、缓存非空、扫描后有该 host 的会话入库,
+/// 分家数量打印出来人工看。临时库与缓存都在 tempdir,不碰真实索引。
+#[test]
+#[ignore]
+fn live_remote_host() {
+ let Ok(host) = std::env::var("WAKE_LIVE_REMOTE_HOST") else {
+ eprintln!("WAKE_LIVE_REMOTE_HOST not set; nothing to do");
+ return;
+ };
+ let tmp = tempfile::tempdir().unwrap();
+ let local_home = tmp.path().join("local-home");
+ fs::create_dir_all(&local_home).unwrap();
+ // 本地 roster 指向空 home(HOME 保留,ssh 要读 ~/.ssh)
+ std::env::set_var("WAKE_HOME", &local_home);
+ for var in ["XDG_DATA_HOME", "CODEX_HOME", "QODER_CONFIG_DIR"] {
+ std::env::remove_var(var);
+ }
+ let store = Arc::new(Store::open(&tmp.path().join("wake.db")).unwrap());
+ store.add_remote_host(&host).unwrap();
+ let cache = wake_core::remote::host_cache_dir(&store.db_dir().unwrap(), &host);
+
+ wake_core::remote::sync_hosts(&store, std::slice::from_ref(&host));
+ let row = host_row(&store, &host);
+ assert_eq!(row.last_sync_error, None, "sync failed");
+ let files = count_files(&cache);
+ eprintln!(
+ "[live] {files} files mirrored from {host} into {}",
+ cache.display()
+ );
+ assert!(files > 0, "cache is empty after a successful sync");
+
+ let roster = create_adapter_roster_for(&store);
+ run_scan(&roster.active, &store, &NullEvents, true).expect("scan ok");
+ let (sessions, total) = store
+ .list_sessions(&SessionFilter {
+ include_archived: true,
+ limit: 1000,
+ ..Default::default()
+ })
+ .unwrap();
+ let mut per_agent: std::collections::BTreeMap<&str, i64> = Default::default();
+ for s in &sessions {
+ assert_eq!(s.host, host, "{}", s.key);
+ *per_agent.entry(s.agent.as_str()).or_default() += 1;
+ }
+ eprintln!("[live] {total} remote sessions from {host}: {per_agent:?}");
+ assert!(total > 0, "no remote sessions indexed");
+}
diff --git a/crates/wake/src/settings.rs b/crates/wake/src/settings.rs
index 66e56ff..ac317b8 100644
--- a/crates/wake/src/settings.rs
+++ b/crates/wake/src/settings.rs
@@ -1030,7 +1030,7 @@ impl SettingsView {
/// Settings → Remote hosts:SSH 会话聚合(阶段 1:只读镜像)。
/// 行结构仿 Locations:名称 + 状态行 + Switch + Remove。
- fn render_remotes(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
+ fn render_remotes(&mut self, cx: &mut Context<Self>) -> AnyElement {
let theme = cx.theme();
let rows = self.workbench.read(cx).remote_hosts_snapshot();
let syncing = self.workbench.read(cx).remote_sync_in_progress();
@@ -1245,7 +1245,7 @@ impl Render for SettingsView {
let content = match selected_page {
SettingsPage::General => self.render_general(cx),
SettingsPage::Locations => self.render_locations(cx).into_any_element(),
- SettingsPage::Remotes => self.render_remotes(window, cx),
+ SettingsPage::Remotes => self.render_remotes(cx),
SettingsPage::Data => self.render_data(cx),
SettingsPage::Updates => self.render_updates(cx),
SettingsPage::About => self.render_about(cx),
diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rs
index 48147b1..93d5a83 100644
--- a/crates/wake/src/workbench.rs
+++ b/crates/wake/src/workbench.rs
@@ -3618,7 +3618,7 @@ impl Workbench {
.adapters
.iter()
.flat_map(|a| a.watch_paths())
- .any(|p| p.is_dir() && watched.is_none_or(|w| !w.contains(&p)));
+ .any(|p| watched.is_none_or(|w| !w.contains(&p)) && p.is_dir());
if grown {
self.remount_watcher();
}
@@ -6058,34 +6058,30 @@ impl Workbench {
h_flex()
.flex_shrink_0()
.gap(SPACE_XS)
- .child(if let [single] =
+ .child(if let [terminal::ResumeTarget::CopySshCommand] =
terminal::resume_targets(&meta).as_slice()
{
- // 单目标(阶段 1 的远程会话只有 Copy SSH command):
- // 单段控件用现成 Button,无 chevron 无记忆(split
- // 按钮手搓只因它要双段共壳)
- let target = *single;
- let (label, tip) = match target {
- terminal::ResumeTarget::App(t) => (
- format!("Open in {}", t.display_name()),
- "Open this session".to_string(),
- ),
- terminal::ResumeTarget::CopySshCommand => (
- "Copy SSH command".to_string(),
- "Copy the SSH command that resumes this session on its host"
- .to_string(),
- ),
- };
+ // 远程会话(阶段 1 只有 Copy SSH command):单段控件用
+ // 现成 Button,无 chevron 无记忆(split 按钮手搓只因它
+ // 要双段共壳)。本地会话即便只剩一个终端也走 split
+ // 按钮,品牌图标与 per-agent 记忆不丢
crate::settings::settings_button(
Button::new("open-in-single"),
cx,
)
.h(px(28.))
.icon(icon("icons/terminal.svg").with_size(px(13.)))
- .label(label)
- .tooltip(tip)
- .on_click(cx.listener(move |this, _, window, cx| {
- this.do_resume(target, false, window, cx);
+ .label("Copy SSH command")
+ .tooltip(
+ "Copy the SSH command that resumes this session on its host",
+ )
+ .on_click(cx.listener(|this, _, window, cx| {
+ this.do_resume(
+ terminal::ResumeTarget::CopySshCommand,
+ false,
+ window,
+ cx,
+ );
}))
.into_any_element()
} else {