All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
Fix Windows correctness issues found in review
Claudef5987c43a2ac
diff --git a/README.md b/README.mdindex 1da2740..eb65970 100644--- a/README.md+++ b/README.md@@ -51,7 +51,7 @@ Cursor IDE chats, Windsurf, and Trae encrypt their local data; Amp, Factory (Dro- Agent data directories are opened **read-only**; Wake never writes to another tool's files or databases- Credential files (`auth.json` and friends) are never read- Zero network requests — Wake never constructs or calls an HTTP client (GPUI's dependency tree bundles one; Wake doesn't reach for it)-- Wake's own index lives at `~/Library/Application Support/wake/wake.db` (Linux: `~/.local/share/wake`, Windows: `%APPDATA%\wake`) and can be rebuilt from scratch at any time (stars/pins live in a separate table and survive rebuilds)+- Wake's own index lives at `~/Library/Application Support/wake/wake.db` (Linux: `~/.local/share/wake`, Windows: `%LOCALAPPDATA%\wake`) and can be rebuilt from scratch at any time (stars/pins live in a separate table and survive rebuilds)## Performancediff --git a/crates/wake-core/Cargo.toml b/crates/wake-core/Cargo.tomlindex 872ef70..b7810a4 100644--- a/crates/wake-core/Cargo.toml+++ b/crates/wake-core/Cargo.toml@@ -15,14 +15,21 @@ notify.workspace = truechrono.workspace = truezstd.workspace = true-# Linux/Windows 废纸篓:freedesktop Trash spec / IFileOperation 回收站的-# 纯库实现(macOS 走 Finder/osascript,行为已验证不动)-[target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]+# Linux 废纸篓:freedesktop Trash spec 的纯库实现+# (macOS 走 Finder/osascript,行为已验证不动)+[target.'cfg(target_os = "linux")'.dependencies]trash = "5"+[target.'cfg(target_os = "windows")'.dependencies]+# Windows 回收站(IFileOperation)。**必须** coinit_multithreaded:trash 默认+# 的 apartmentthreaded 会在已是 MTA 的线程上让 CoInitializeEx 返回+# RPC_E_CHANGED_MODE,而 trash 对此是 panic! 而非 Err——delete 跑在 gpui 的+# background_spawn 上,其 Windows 派发器用 WinRT ThreadPool(worker 恒 MTA),+# 于是"删除到回收站"必崩,且 panic 要穿过 extern "system" 的 WinRT 委托+trash = { version = "5", default-features = false, features = ["coinit_multithreaded", "chrono"] }+# Win32 原语:MessageBox 致命弹窗、CF_UNICODETEXT 剪贴板(clip.exe 按控制台# codepage 解码 stdin,非 ASCII 命令必乱,不走子进程管道)、进程创建旗标-[target.'cfg(target_os = "windows")'.dependencies]windows-sys = { version = "0.61", features = ["Win32_Foundation","Win32_System_DataExchange",diff --git a/crates/wake-core/src/adapters/antigravity.rs b/crates/wake-core/src/adapters/antigravity.rsindex 36bf631..ae61702 100644--- a/crates/wake-core/src/adapters/antigravity.rs+++ b/crates/wake-core/src/adapters/antigravity.rs@@ -20,7 +20,7 @@ pub struct AntigravityAdapter {impl AntigravityAdapter {pub fn new() -> Self {Self {- db: dirs::home_dir()+ db: super::home_dir().unwrap_or_default().join(".gemini").join("antigravity-cli")diff --git a/crates/wake-core/src/adapters/claude.rs b/crates/wake-core/src/adapters/claude.rsindex 80d2cf0..d8cd996 100644--- a/crates/wake-core/src/adapters/claude.rs+++ b/crates/wake-core/src/adapters/claude.rs@@ -28,7 +28,7 @@ pub struct ClaudeAdapter {impl ClaudeAdapter {pub fn new() -> Self {- let root = dirs::home_dir()+ let root = super::home_dir().unwrap_or_default().join(".claude").join("projects");diff --git a/crates/wake-core/src/adapters/codex.rs b/crates/wake-core/src/adapters/codex.rsindex ec346a4..e7b9703 100644--- a/crates/wake-core/src/adapters/codex.rs+++ b/crates/wake-core/src/adapters/codex.rs@@ -23,7 +23,7 @@ impl CodexAdapter {// 指向空目录的机器整家会话凭空消失(与 opencode 探库文件同一规则)let root = super::env_dir("CODEX_HOME").filter(|p| p.join("sessions").is_dir() || p.join("archived_sessions").is_dir())- .unwrap_or_else(|| dirs::home_dir().unwrap_or_default().join(".codex"));+ .unwrap_or_else(|| super::home_dir().unwrap_or_default().join(".codex"));Self {sessions_dir: root.join("sessions"),archived_dir: root.join("archived_sessions"),diff --git a/crates/wake-core/src/adapters/copilot.rs b/crates/wake-core/src/adapters/copilot.rsindex 26462c0..29d3462 100644--- a/crates/wake-core/src/adapters/copilot.rs+++ b/crates/wake-core/src/adapters/copilot.rs@@ -21,7 +21,7 @@ pub struct CopilotAdapter {impl CopilotAdapter {pub fn new() -> Self {Self {- db: dirs::home_dir()+ db: super::home_dir().unwrap_or_default().join(".copilot").join("session-store.db"),diff --git a/crates/wake-core/src/adapters/cursor.rs b/crates/wake-core/src/adapters/cursor.rsindex 88f9b8f..b390611 100644--- a/crates/wake-core/src/adapters/cursor.rs+++ b/crates/wake-core/src/adapters/cursor.rs@@ -18,7 +18,7 @@ pub struct CursorAdapter {impl CursorAdapter {pub fn new() -> Self {Self {- root: dirs::home_dir()+ root: super::home_dir().unwrap_or_default().join(".cursor").join("projects"),diff --git a/crates/wake-core/src/adapters/dsh.rs b/crates/wake-core/src/adapters/dsh.rsindex f25e299..477484b 100644--- a/crates/wake-core/src/adapters/dsh.rs+++ b/crates/wake-core/src/adapters/dsh.rs@@ -22,7 +22,7 @@ pub struct DshAdapter {impl DshAdapter {pub fn new() -> Self {Self {- root: dirs::home_dir().unwrap_or_default().join(".dsh").join("sessions"),+ root: super::home_dir().unwrap_or_default().join(".dsh").join("sessions"),}}}diff --git a/crates/wake-core/src/adapters/gemini.rs b/crates/wake-core/src/adapters/gemini.rsindex 65dd3bf..521ea42 100644--- a/crates/wake-core/src/adapters/gemini.rs+++ b/crates/wake-core/src/adapters/gemini.rs@@ -21,7 +21,7 @@ pub struct GeminiAdapter {impl GeminiAdapter {pub fn new() -> Self {- let home = dirs::home_dir().unwrap_or_default().join(".gemini");+ let home = super::home_dir().unwrap_or_default().join(".gemini");Self {root: home.join("tmp"),projects_json: home.join("projects.json"),diff --git a/crates/wake-core/src/adapters/grok.rs b/crates/wake-core/src/adapters/grok.rsindex 136c58f..1d890bd 100644--- a/crates/wake-core/src/adapters/grok.rs+++ b/crates/wake-core/src/adapters/grok.rs@@ -21,7 +21,7 @@ pub struct GrokAdapter {impl GrokAdapter {pub fn new() -> Self {Self {- root: dirs::home_dir().unwrap_or_default().join(".grok").join("sessions"),+ root: super::home_dir().unwrap_or_default().join(".grok").join("sessions"),}}}diff --git a/crates/wake-core/src/adapters/kimi.rs b/crates/wake-core/src/adapters/kimi.rsindex 8b759a9..5a2bf38 100644--- a/crates/wake-core/src/adapters/kimi.rs+++ b/crates/wake-core/src/adapters/kimi.rs@@ -23,7 +23,7 @@ pub struct KimiAdapter {impl KimiAdapter {pub fn new() -> Self {- let home = dirs::home_dir().unwrap_or_default().join(".kimi-code");+ let home = super::home_dir().unwrap_or_default().join(".kimi-code");Self {root: home.join("sessions"),index_path: home.join("session_index.jsonl"),diff --git a/crates/wake-core/src/adapters/kiro.rs b/crates/wake-core/src/adapters/kiro.rsindex a2a98ab..d616377 100644--- a/crates/wake-core/src/adapters/kiro.rs+++ b/crates/wake-core/src/adapters/kiro.rs@@ -17,7 +17,7 @@ pub struct KiroAdapter {impl KiroAdapter {pub fn new() -> Self {Self {- root: dirs::home_dir()+ root: super::home_dir().unwrap_or_default().join(".kiro").join("sessions")diff --git a/crates/wake-core/src/adapters/mod.rs b/crates/wake-core/src/adapters/mod.rsindex 1c29323..3bb5c82 100644--- a/crates/wake-core/src/adapters/mod.rs+++ b/crates/wake-core/src/adapters/mod.rs@@ -118,6 +118,16 @@ pub(crate) fn env_dir(key: &str) -> Option<std::path::PathBuf> {.map(std::path::PathBuf::from)}+/// 各家数据根共用的 HOME。**全部 adapter 必须走这里**,不要直接+/// `dirs::home_dir()`——`WAKE_HOME` 是整组 adapter 的统一改道开关:+/// 契约测试靠它把十三家指向 fixture 目录,而 `dirs::home_dir()` 只在+/// POSIX 上看 `$HOME`,Windows 上走 SHGetKnownFolderPath、无论如何都指向+/// 真实用户目录(于是 Windows 上的契约测试全部落空,2026-08-25 review)。+/// 对用户它顺带是便携安装/多档案切换的手动开关。+pub(crate) fn home_dir() -> Option<std::path::PathBuf> {+ env_dir("WAKE_HOME").or_else(dirs::home_dir)+}+/// 全量十三家 roster,**不按 detect 过滤**。这是全应用唯一的构造点:/// scanner/watcher/resume/Session locations 面板共享 Workbench 启动时的/// 同一份实例。缺根的家由各自 list_session_files 降级为 Ok(空)(scanner@@ -186,10 +196,19 @@ pub fn create_adapters_for(store: &crate::db::Store) -> Vec<Box<dyn AgentAdapter/// std::path::is_separator(Windows 上 `\` 与 `/` 都算),POSIX 上行为/// 与旧 '/' 字面量逐位相同。pub fn path_owns(root: &str, path: &str) -> bool {+ // 空根不拥有任何东西(data_roots() 里 to_string_lossy 出的空 PathBuf):+ // 走通用分支的话 strip_prefix("") 会原样返回整条路径,于是空根拥有+ // 一切绝对路径+ if root.is_empty() {+ return false;+ }// 文件系统根("/"、Windows 的 "C:\"):strip_prefix 剥掉的正是分隔符// 本身,通用分支会把一切后代判为界外(2026-08-24 Codex review)。- // "根"即无父目录;空串 parent 也是 None,先挡掉,别让空根拥有一切- if !root.is_empty() && Path::new(root).parent().is_none() {+ // 判据必须是"自身以分隔符收尾"而**不是** parent().is_none():后者在+ // Windows 上对 UNC 共享根(`\\nas\agents`,components = [Prefix, RootDir])+ // 同样为 None,而它不以分隔符收尾——裸 starts_with 会把 `\\nas\agents-old`+ // 判为界内,正是本函数存在要防的那个 bug(2026-08-25 review)+ if root.ends_with(std::path::is_separator) {return path.starts_with(root);}match path.strip_prefix(root) {diff --git a/crates/wake-core/src/adapters/opencode.rs b/crates/wake-core/src/adapters/opencode.rsindex 7b181a3..ad6b7a9 100644--- a/crates/wake-core/src/adapters/opencode.rs+++ b/crates/wake-core/src/adapters/opencode.rs@@ -71,7 +71,7 @@ fn has_v2(conn: &rusqlite::Connection) -> bool {/// 疑似如此)。Dock 启动的 Wake 读不到用户 shell 的 env,故两处都探、以实际/// 存在的那个为准fn db_path() -> PathBuf {- let default = dirs::home_dir()+ let default = super::home_dir().unwrap_or_default().join(".local").join("share")diff --git a/crates/wake-core/src/adapters/pi.rs b/crates/wake-core/src/adapters/pi.rsindex 6a9ad33..d2fcb1d 100644--- a/crates/wake-core/src/adapters/pi.rs+++ b/crates/wake-core/src/adapters/pi.rs@@ -22,7 +22,7 @@ impl PiAdapter {pub fn new() -> Self {Self {agent: AgentId::Pi,- root: dirs::home_dir()+ root: super::home_dir().unwrap_or_default().join(".pi").join("agent")@@ -34,7 +34,7 @@ impl PiAdapter {pub fn omp() -> Self {Self {agent: AgentId::Omp,- root: dirs::home_dir()+ root: super::home_dir().unwrap_or_default().join(".omp").join("agent")diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rsindex af7eb2e..20577de 100644--- a/crates/wake-core/src/db.rs+++ b/crates/wake-core/src/db.rs@@ -832,11 +832,20 @@ pub fn now_ms() -> i64 {chrono::Utc::now().timestamp_millis()}-/// 索引库路径:<dirs::data_dir>/wake/wake.db —— macOS 为-/// ~/Library/Application Support,Linux 为 ~/.local/share,Windows 为-/// %APPDATA%(从旧 vibex 路径一次性迁移,保留收藏等 user_data)+/// 索引库路径:macOS 为 ~/Library/Application Support/wake,Linux 为+/// ~/.local/share/wake,Windows 为 %LOCALAPPDATA%\wake+/// (从旧 vibex 路径一次性迁移,保留收藏等 user_data)。+///+/// Windows 取 data_local_dir 而非 data_dir:后者是漫游 %APPDATA%,而本库+/// 开 WAL——WAL 要 -shm 共享内存映射,重定向到网络盘的漫游目录上根本打不开+/// (域环境 Folder Redirection 是标配),Wake 会在启动即致命退出;何况这是+/// 可随时重建的索引,几百 MB 跟着登录/注销来回同步纯属浪费(2026-08-25 review)pub fn default_db_path() -> std::path::PathBuf {- let data = dirs::data_dir().unwrap_or_else(|| std::path::PathBuf::from("."));+ #[cfg(target_os = "windows")]+ let data = dirs::data_local_dir();+ #[cfg(not(target_os = "windows"))]+ let data = dirs::data_dir();+ let data = data.unwrap_or_else(|| std::path::PathBuf::from("."));let dir = data.join("wake");let db = dir.join("wake.db");if !db.exists() {diff --git a/crates/wake-core/src/services/terminal/mod.rs b/crates/wake-core/src/services/terminal/mod.rsindex c5506d7..8379881 100644--- a/crates/wake-core/src/services/terminal/mod.rs+++ b/crates/wake-core/src/services/terminal/mod.rs@@ -166,7 +166,9 @@ pub fn resume_session_in(meta: &SessionMeta, term: TerminalApp) -> ResumeOutcome};let cwd_ok = !meta.project_path.is_empty() && Path::new(&meta.project_path).is_dir();let cwd = cwd_ok.then(|| meta.project_path.as_str());- let command = compose_command(&cli, &args, cwd);+ // 按用户选的宿主取方言:command 既是成功 toast 的展示面,也是失败时+ // 塞进剪贴板的那条,必须与真正跑的一致(Windows 的 cmd 宿主方言不同)+ let command = compose_command(term, &cli, &args, cwd);if requires_cwd && !cwd_ok {let hint = clipboard_fallback(&command);return ResumeOutcome {diff --git a/crates/wake-core/src/services/terminal/posix.rs b/crates/wake-core/src/services/terminal/posix.rsindex 49427d7..831e7b5 100644--- a/crates/wake-core/src/services/terminal/posix.rs+++ b/crates/wake-core/src/services/terminal/posix.rs@@ -54,9 +54,15 @@ pub(crate) fn posix_quote(s: &str) -> String {format!("'{}'", s.replace('\'', r"'\''"))}-/// 展示/剪贴板/启动共用的一条可执行命令(POSIX 就是实际启动串;Windows 的-/// 对应物是 PowerShell 方言的"手动可粘"形态,见 windows.rs)-pub(super) fn compose_command(cli: &str, args: &[String], cwd: Option<&str>) -> String {+/// 展示/剪贴板/启动共用的一条可执行命令。POSIX 双端只有一种 shell 方言,+/// 与宿主无关,`_term` 只为对齐 Windows 的同名接缝(那边按宿主分+/// cmd/PowerShell 两派,见 windows.rs)+pub(super) fn compose_command(+ _term: super::TerminalApp,+ cli: &str,+ args: &[String],+ cwd: Option<&str>,+) -> String {let core = std::iter::once(cli).chain(args.iter().map(|s| s.as_str())).map(posix_quote)diff --git a/crates/wake-core/src/services/terminal/windows.rs b/crates/wake-core/src/services/terminal/windows.rsindex 0751b53..c97aa43 100644--- a/crates/wake-core/src/services/terminal/windows.rs+++ b/crates/wake-core/src/services/terminal/windows.rs@@ -69,6 +69,15 @@ impl TerminalApp {TerminalApp::WezTerm => "wezterm",}}++ /// 此宿主自身不是 shell,得再装一个 PowerShell 会话才跑得起命令+ /// (terminals_for 据此在没有 PowerShell 的机器上藏掉它们)+ fn needs_powershell(&self) -> bool {+ matches!(+ self,+ TerminalApp::WindowsTerminal | TerminalApp::Alacritty | TerminalApp::WezTerm+ )+ }}/// PATH × PATHEXT 纯 Rust 遍历,语义即 CreateProcess 的查找规则。不走@@ -97,7 +106,10 @@ pub(super) fn probe_clis(missing: &[&str]) -> HashMap<String, String> {if pending.is_empty() {break;}- if dir.as_os_str().is_empty() {+ // 相对 PATH 项(`.`、`bin`,或快捷方式 "起始位置" 带进来的)一律跳过:+ // 缓存里的路径会直接喂给 Command::new 和用户可粘的命令串,相对项会+ // 让两者各自解析到不同的东西(POSIX 侧同样只收 `/` 开头的结果)+ if dir.as_os_str().is_empty() || !dir.is_absolute() {continue;}pending.retain(|(want, names)| {@@ -122,32 +134,83 @@ fn ps_quote(s: &str) -> String {format!("'{}'", s.replace('\'', "''"))}-/// cmd 方言 quote:整体双引号包裹(Windows 文件名不允许 `"`,无内层转义-/// 面);`%` 在引号内仍会展开是 cmd 关不掉的固有行为,路径/会话 id 命中-/// 概率视为零。裸词直通条件比 POSIX 版多放行 `\`(盘符路径)。+/// cmd 方言 quote:一律双引号包裹(Windows 文件名不允许 `"`,无内层转义面)。+/// 不留裸词快路径——cmd 的引号保全规则按"整行引号个数 + 首字符是否引号"+/// 分支,让引号数随内容浮动等于让 mangling 随机出现;定长形制配合 cmd_line+/// 的 `call` 前缀,行首恒为裸词,规则可预测。+///+/// `%` 无法在此中和:命令行(非批处理)语境下 `%%` 不折叠、引号内 `^` 是+/// 字面量,故含 `%` 的会话交由 launch_shell 拒绝走 cmd 宿主,不静默改写fn cmd_quote(s: &str) -> String {- if !s.is_empty()- && s.chars()- .all(|c| c.is_ascii_alphanumeric() || "_-./:\\=".contains(c))- {- return s.to_string();- }format!("\"{s}\"")}-/// 展示/剪贴板形态 = PowerShell 方言:`Set-Location -LiteralPath 'dir';-/// & 'cli' 'args…'`。-LiteralPath 防路径里的 `[ ]` 被当通配符;分隔用 `;`-/// 而非 `&&`——Windows PowerShell 5.1 不认 `&&`,而 cwd 已在 mod.rs 验过-/// 存在,cd 失败只剩竞态窗口。cmd 用户是唯一粘不动的群体,而 cmd 宿主由-/// launch_shell 直接注入、不经剪贴板,失败兜底选覆盖面最大的方言。-pub(super) fn compose_command(cli: &str, args: &[String], cwd: Option<&str>) -> String {+/// cmd 方言整行。`call` 前缀让行首恒为裸词:cmd 对 `/K` 载荷有一条遗留+/// 规则——首字符是引号且全行引号数不为二时,砍掉首尾各一个引号——路径+/// 带空格(`C:\Program Files\…`)时整条命令会被腰斩成 `C:\Program`,而+/// spawn 成功、Wake 照报 ok(2026-08-25 review)。`call` 对 exe 与+/// bat/cmd 同样是同步调用,语义不变。+/// `/d`:跨盘符 cd 也生效(会话在 D: 而 cmd 起在 C: 的情形)。+fn cmd_line(cli: &str, args: &[String], cwd: Option<&str>) -> String {+ let mut line = String::new();+ if let Some(dir) = cwd {+ line.push_str(&format!("cd /d {} && ", cmd_quote(dir)));+ }+ line.push_str("call ");+ line.push_str(&cmd_quote(cli));+ for a in args {+ line.push(' ');+ line.push_str(&cmd_quote(a));+ }+ line+}++/// cmd 宿主无法安全承载的内容:`%VAR%` 在双引号内照样展开,而命令行语境+/// 下没有任何转义能关掉它——含 `%` 就会静默跑成另一条命令。会话 id 取自+/// 文件名(parse_utils),用户目录更是任意,概率并非零。+fn cmd_hostile(cli: &str, args: &[String], cwd: Option<&str>) -> bool {+ std::iter::once(cli)+ .chain(args.iter().map(|s| s.as_str()))+ .chain(cwd)+ .any(|s| s.contains('%'))+}++/// PowerShell 方言:`Set-Location -LiteralPath 'dir' -ErrorAction Stop;+/// & 'cli' 'args…'`。-LiteralPath 防路径里的 `[ ]` 被当通配符;+/// **-ErrorAction Stop 不可省**:Windows PowerShell 5.1 不认 `&&`,而+/// Set-Location 默认是 non-terminating error,裸 `;` 会在 cd 失败后照样+/// 起 agent——落进错误的工作目录且 Wake 已报成功(dsh 的 workspace 完全+/// 由启动目录决定,后果尤重)。加了它才与 POSIX 的 `cd X && cmd`、+/// cmd 宿主的 `cd /d X && …` 同为失败即止(2026-08-25 review)。+fn ps_line(cli: &str, args: &[String], cwd: Option<&str>) -> String {let core = ps_call(cli, args);match cwd {- Some(dir) => format!("Set-Location -LiteralPath {}; {core}", ps_quote(dir)),+ Some(dir) => format!(+ "Set-Location -LiteralPath {} -ErrorAction Stop; {core}",+ ps_quote(dir)+ ),None => core,}}+/// 展示/剪贴板/启动共用的那一条命令,**按用户实际选的宿主取方言**。+/// 三端共有的契约是 ResumeOutcome.command 即真正跑的那条(workbench 的+/// 成功 toast 与失败兜底都渲染它);早先 Windows 恒给 PowerShell 形态,+/// 于是选了 Command Prompt 的用户会拿到一条粘进 cmd 必报语法错的命令+/// ——而失败兜底的两个触发点(cwd 不存在、spawn 失败)都在 launch_shell+/// 之前/之外,"cmd 用户不经剪贴板"的假设不成立(2026-08-25 review)+pub(super) fn compose_command(+ term: TerminalApp,+ cli: &str,+ args: &[String],+ cwd: Option<&str>,+) -> String {+ match term {+ TerminalApp::Cmd => cmd_line(cli, args, cwd),+ _ => ps_line(cli, args, cwd),+ }+}+/// 纯调用段(无 cd、无分号):`& 'cli' 'args…'`。wt 宿主用它配合 `-d`/// 传工作目录——wt 对命令行做无视引号的 `;` 分面板切分,脚本里带分号/// 必被腰斩,cd 只能交给 wt 自己的 -d。@@ -192,9 +255,17 @@ pub fn installed_terminals() -> &'static [TerminalApp] {})}-/// 某会话可用的恢复目标(Windows 无按 agent 过滤的目标,一律全量)+/// 某会话可用的恢复目标。Windows 不按 agent 过滤,但 wt/Alacritty/WezTerm+/// 只是宿主、内部还要装一个 PowerShell 会话——两个 PowerShell 都不在 PATH+/// 时它们同样起不来,得跟着藏掉(macOS 用同一个钩子藏 Kooky)。否则用户点+/// 下去只能拿到 "PowerShell not found" 加一条自己没有 shell 去跑的命令pub fn terminals_for(_agent: AgentId) -> Vec<TerminalApp> {- installed_terminals().to_vec()+ let has_ps = powershell_bin().is_ok();+ installed_terminals()+ .iter()+ .copied()+ .filter(|t| has_ps || !t.needs_powershell())+ .collect()}/// wt/第三方宿主内装的 shell:优先 pwsh(用户装了 7+ 就是它的默认),@@ -224,21 +295,15 @@ pub(super) fn launch_shell(let mut cmd = Command::new(&exe);match term {TerminalApp::Cmd => {- // cmd 方言内联注入(**不得**改用 command:那是 PowerShell 方言)。- // raw_arg 绕过 std 的 argv 引号规则——cmd 不做 argv 解析,std 把- // 整串再包一层引号反而会毁掉内层结构;串首是 `cd`/裸词而非引号,- // cmd 的引号保全规则生效,内层 "…" 原样送达- let mut line = String::from("/K ");- if let Some(dir) = cwd {- // /d:跨盘符 cd 也生效(会话在 D: 而 cmd 起在 C: 的情形)- line.push_str(&format!("cd /d {} && ", cmd_quote(dir)));- }- line.push_str(&cmd_quote(cli));- for a in args {- line.push(' ');- line.push_str(&cmd_quote(a));+ if cmd_hostile(cli, args, cwd) {+ // 拒绝而非静默改写:调用方会把 command(此刻已是 cmd 方言)+ // 送进剪贴板兜底,用户仍拿得到可手动执行的那条+ anyhow::bail!("path or session id contains '%', which Command Prompt would expand — pick another terminal");}- cmd.raw_arg(line);+ // raw_arg 绕过 std 的 argv 引号规则——cmd 不做 argv 解析,std 把+ // 整串再包一层引号反而会毁掉内层结构。command 即 compose_command+ // 给的 cmd 方言原文(见 cmd_line 的 `call` 前缀说明)+ cmd.raw_arg(format!("/K {command}"));}TerminalApp::Pwsh | TerminalApp::WindowsPowershell => {cmd.args(PS_SESSION).arg(command);@@ -290,47 +355,89 @@ pub fn ensure_app_icons(_cache_dir: &Path) -> HashMap<String, PathBuf> {/// Win32 剪贴板(CF_UNICODETEXT),UTF-16 直达。别家占着剪贴板时/// OpenClipboard 会瞬时失败(剪贴板管理器常见),小步重试几轮;仍失败/// 返回 false——调用方(clipboard_fallback)据此决定还敢不敢说 "copied"。+///+/// **必须带 owner 窗口**:OpenClipboard(NULL) 之后 EmptyClipboard 会把+/// clipboard owner 置空,而 owner 为空时 SetClipboardData 按文档必失败+/// ——即"清掉用户剪贴板 + 永远写不进去"。wake-core 够不到 gpui 的窗口,+/// 故就地开一个 message-only 窗口(HWND_MESSAGE 父级,不进 z-order、不+/// 收广播、无绘制),用完即毁。类名借系统预注册的 "STATIC",免注册。+///+/// 另:写入成功前不碰 EmptyClipboard——失败路径不该顺手毁掉用户已有内容。pub(super) fn copy_to_clipboard(text: &str) -> bool {use windows_sys::Win32::System::DataExchange::{CloseClipboard, EmptyClipboard, OpenClipboard, SetClipboardData,};+ // GlobalFree 归 Foundation(windows-sys 的分模块与 MSDN 头文件不同名)+ use windows_sys::Win32::Foundation::GlobalFree;use windows_sys::Win32::System::Memory::{GlobalAlloc, GlobalLock, GlobalUnlock, GMEM_MOVEABLE};+ use windows_sys::Win32::UI::WindowsAndMessaging::{+ CreateWindowExW, DestroyWindow, HWND_MESSAGE,+ };// windows-sys 里它归 Win32_System_Ole feature,为一个钉死的小常量不拉const CF_UNICODETEXT: u32 = 13;- let wide = wide(text);- let bytes = wide.len() * 2;+ let wide_text = wide(text);+ let bytes = wide_text.len() * 2;unsafe {+ let class = wide("STATIC");+ // 样式在 windows-sys 里是裸 u32(非 windows crate 的 newtype)+ let owner = CreateWindowExW(+ 0,+ class.as_ptr(),+ std::ptr::null(),+ 0,+ 0,+ 0,+ 0,+ 0,+ HWND_MESSAGE,+ std::ptr::null_mut(),+ std::ptr::null_mut(),+ std::ptr::null_mut(),+ );+ if owner.is_null() {+ return false;+ }let mut opened = false;for _ in 0..5 {- if OpenClipboard(std::ptr::null_mut()) != 0 {+ if OpenClipboard(owner) != 0 {opened = true;break;}std::thread::sleep(std::time::Duration::from_millis(20));}if !opened {+ DestroyWindow(owner);return false;}let ok = 'set: {- if EmptyClipboard() == 0 {- break 'set false;- }+ // 先备好数据,拿到手再清——清完才发现分配不出来的话,用户+ // 原有剪贴板就白丢了let hmem = GlobalAlloc(GMEM_MOVEABLE, bytes);if hmem.is_null() {break 'set false;}let dst = GlobalLock(hmem);if dst.is_null() {- // hmem 就地泄漏:一次性小块,不为它多拉 GlobalFree 绑定+ GlobalFree(hmem);break 'set false;}- std::ptr::copy_nonoverlapping(wide.as_ptr().cast::<u8>(), dst.cast::<u8>(), bytes);+ std::ptr::copy_nonoverlapping(wide_text.as_ptr().cast::<u8>(), dst.cast::<u8>(), bytes);GlobalUnlock(hmem);+ if EmptyClipboard() == 0 {+ GlobalFree(hmem);+ break 'set false;+ }+ if SetClipboardData(CF_UNICODETEXT, hmem).is_null() {+ // 交接失败,所有权仍在我们手上+ GlobalFree(hmem);+ break 'set false;+ }// 成功后内存归系统所有,不得再碰- !SetClipboardData(CF_UNICODETEXT, hmem).is_null()+ true};CloseClipboard();+ DestroyWindow(owner);ok}}@@ -359,11 +466,27 @@ pub(super) fn alert_dialog(message: &str) {}}+/// explorer.exe 的绝对路径。裸名走 CreateProcess 查找序,而那个序列把+/// **当前目录排在 System32 之前**——Wake 从解包目录(zip 直接解到下载夹)+/// 启动时,旁边放一个 explorer.exe 就会被当成它执行。本文件其余 spawn 都+/// 用 resolve_cli 给的绝对路径,这两处不能例外。+fn explorer_exe() -> PathBuf {+ let root = std::env::var_os("SystemRoot").unwrap_or_else(|| r"C:\Windows".into());+ PathBuf::from(root).join("explorer.exe")+}++/// 资源管理器只认反斜杠:`/` 拼出来的路径它会当成参数解析失败、转而打开+/// 默认视图(既不进目录也不选中)。展示层可以留用户手输的形态,交给+/// explorer 前必须归一。+fn win_path(path: &str) -> String {+ path.replace('/', "\\")+}+/// 在资源管理器里进入目录(explorer 常驻单实例、前台进程即刻退出,/// 且退出码恒非零,spawn 成功即算送达)pub(super) fn open_dir(path: &str) {- let mut cmd = Command::new("explorer.exe");- cmd.arg(path);+ let mut cmd = Command::new(explorer_exe());+ cmd.arg(win_path(path));let _ = spawn_and_reap(cmd);}@@ -371,7 +494,7 @@ pub(super) fn open_dir(path: &str) {/// 整体一个参数且引号形制固定——explorer 自解析命令行、不吃 argv 转义,/// raw_arg 原样直达。pub(super) fn reveal_path(path: &str) {- let mut cmd = Command::new("explorer.exe");- cmd.raw_arg(format!("/select,\"{path}\""));+ let mut cmd = Command::new(explorer_exe());+ cmd.raw_arg(format!("/select,\"{}\"", win_path(path)));let _ = spawn_and_reap(cmd);}diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rsindex 6d74bd6..5f3525a 100644--- a/crates/wake-core/tests/adapter_contracts.rs+++ b/crates/wake-core/tests/adapter_contracts.rs@@ -110,6 +110,9 @@ fn setup() -> &'static TestEnv {).expect("write dsh subagent log");+ // WAKE_HOME 是 adapter 侧的统一改道开关,三端一致;HOME 仍设一份供+ // 其他 POSIX 依赖使用(Windows 上 dirs 不看 HOME,单设它等于没设)+ std::env::set_var("WAKE_HOME", home.path());std::env::set_var("HOME", home.path());// 测试只受这个假 HOME 支配:opencode 认 XDG_DATA_HOME、codex 认// CODEX_HOME,开发者或 CI 机器上设了它们,adapter 就会绕过 fixture@@ -1297,6 +1300,30 @@ fn path_owns_boundaries() {assert!(path_owns("/a/store.db", "/a/store.db#42"));assert!(path_owns("/", "/anything/below"));assert!(!path_owns("/b", "/a/x"));+ // 空根不拥有任何东西:通用分支的 strip_prefix("") 会原样返回整条路径+ assert!(!path_owns("", "/a/x"));+}++/// path_owns 的 Windows 形态。**只能在 Windows 上跑**:`is_separator('\\')`+/// 在 Unix 上是 false(反斜杠在那里是合法文件名字符),同一组断言在 Linux+/// 上恒不成立——这也正是下面这个 bug 只在 Windows 上现形的原因。+/// 卡住的是"根判据必须是自身以分隔符收尾":一度用过 `parent().is_none()`,+/// 而 UNC 共享根在 Windows 上恰好 parent 为 None 且**不**以分隔符收尾,+/// 于是退化成裸前缀匹配、把 agents-old 吞进 agents(2026-08-25 review)+#[test]+#[cfg(target_os = "windows")]+fn path_owns_windows_shapes() {+ use wake_core::adapters::path_owns;+ // UNC 共享根:兄弟共享必须判在界外+ assert!(path_owns(r"\\nas\agents", r"\\nas\agents\x.jsonl"));+ assert!(!path_owns(r"\\nas\agents", r"\\nas\agents-old\x.jsonl"));+ // 盘符根以分隔符收尾,一切后代在界内+ assert!(path_owns(r"C:\", r"C:\Users\me\x.jsonl"));+ // 反斜杠边界与 POSIX 同规+ assert!(path_owns(r"C:\Users\me\.claude", r"C:\Users\me\.claude\p\x.jsonl"));+ assert!(!path_owns(r"C:\Users\me\.claude", r"C:\Users\me\.claude-old\x.jsonl"));+ // SQLite 虚拟路径+ assert!(path_owns(r"C:\Users\me\store.db", r"C:\Users\me\store.db#42"));}/// 裸 Codex 数据目录按目录名保角色(2026-08-24 Codex review):独立 archiveddiff --git a/crates/wake/src/format.rs b/crates/wake/src/format.rsindex d398a1e..dfa8e54 100644--- a/crates/wake/src/format.rs+++ b/crates/wake/src/format.rs@@ -51,7 +51,12 @@ pub fn fmt_tokens(n: Option<i64>) -> String {fn cached_home() -> Option<&'static str> {static HOME: std::sync::OnceLock<Option<String>> = std::sync::OnceLock::new();HOME.get_or_init(|| {- dirs::home_dir()+ // 与 adapter 侧同一个 HOME(wake_core::adapters::home_dir 的+ // WAKE_HOME 开关):两边不一致时,改道过的数据根不会折成 `~`+ std::env::var_os("WAKE_HOME")+ .map(std::path::PathBuf::from)+ .filter(|p| !p.as_os_str().is_empty())+ .or_else(dirs::home_dir).map(|h| h.to_string_lossy().to_string()).filter(|h| !h.is_empty())})diff --git a/crates/wake/src/main.rs b/crates/wake/src/main.rsindex 02d1350..5cd5fba 100644--- a/crates/wake/src/main.rs+++ b/crates/wake/src/main.rs@@ -76,7 +76,7 @@ fn main() {traffic_light_position: None,}};- cx.open_window(+ let window = cx.open_window(WindowOptions {titlebar: Some(titlebar),window_bounds: Some(WindowBounds::Windowed(bounds)),@@ -107,8 +107,17 @@ fn main() {window.focus(&workbench.read(cx).focus_handle(cx));cx.new(|cx| Root::new(workbench, window, cx))},- )- .expect("failed to open window");+ );+ // 开窗失败必须自己报:release 的 Windows 子系统没有 stderr,panic+ // 消息无处可去,用户看到的就是任务栏闪一下然后什么都没有+ //(GPU/驱动起不来、RDP 会话等都会走到这)。show_fatal_alert 会弹+ // 系统对话框,并始终先往 stderr 落一份(2026-08-25 review)+ if let Err(e) = window {+ wake_core::services::terminal::show_fatal_alert(&format!(+ "Wake couldn't open its window: {e}"+ ));+ std::process::exit(1);+ }cx.activate(true);});}diff --git a/crates/wake/src/theme.rs b/crates/wake/src/theme.rsindex 818385c..af051bf 100644--- a/crates/wake/src/theme.rs+++ b/crates/wake/src/theme.rs@@ -159,8 +159,11 @@ pub fn apply_wake_theme(cx: &mut App) {theme.overlay = gpui::hsla(0., 0., 0., 0.25);}- // 系统字体与 macOS 圆角习惯- theme.font_family = ".AppleSystemUIFont".into();+ // 系统字体与 macOS 圆角习惯。`.SystemUIFont` 是 gpui 各平台后端都认的+ // 别名(macOS 解到 .AppleSystemUIFont,Windows 的 DirectWrite 后端解到+ // 系统 UI 字体);写死 `.AppleSystemUIFont` 会让非 mac 平台每个字重都+ // 走一遍"找不到→回落"的错误路径(2026-08-25 review)+ theme.font_family = ".SystemUIFont".into();theme.font_size = gpui::px(14.);theme.radius = gpui::px(8.);theme.radius_lg = gpui::px(12.);diff --git a/crates/wake/src/ui.rs b/crates/wake/src/ui.rsindex bd6f4c2..bca3964 100644--- a/crates/wake/src/ui.rs+++ b/crates/wake/src/ui.rs@@ -45,11 +45,29 @@ pub const REVEAL_IN_FM: &str = if cfg!(target_os = "macos") {"Reveal in File Manager"};-/// 系统回收站的平台名词(macOS 与 freedesktop 都叫 Trash,Windows 是-/// Recycle Bin)。删除确认/成功通知/菜单项一律引用,与 wake-core-/// windows.rs 失败文案的名词保持同一个词。-pub const TRASH_NOUN: &str =- if cfg!(target_os = "windows") { "Recycle Bin" } else { "Trash" };+// 系统回收站的平台名词(macOS 与 freedesktop 都叫 Trash,Windows 是+// Recycle Bin)与由它派生的三句删除文案。名词只写一次、整句由 concat!+// 拼出:三处分别手写 cfg! 链的话,没有任何东西能拦住它们说不同的词+// ——与 wake-core 各平台 trash_existing 的失败文案也得是同一个词。+//+// 全部是 &'static str 而非调用点 format!:确认框内容活在 **dialog builder+// 闭包**里,面板开着时每帧重跑(见 show_data_sources 处那条注释),留+// format! 在里面就是每帧堆分配。+macro_rules! trash_copy {+ ($noun:literal, $body:literal) => {+ /// 删除确认框主按钮 / 更多菜单项+ pub const MOVE_TO_TRASH: &str = concat!("Move to ", $noun);+ /// 删除成功通知+ pub const SESSION_TRASHED: &str = concat!("Session moved to ", $noun);+ /// 删除确认框正文首句(冠词随名词变,故整句单列)+ pub const TRASH_CONFIRM_BODY: &str =+ concat!("The session file will be moved to ", $body, ". You can restore it anytime:");+ };+}+#[cfg(target_os = "windows")]+trash_copy!("Recycle Bin", "the Recycle Bin");+#[cfg(not(target_os = "windows"))]+trash_copy!("Trash", "Trash");/// ⌘K 面板的唯一绑定串——main.rs 的 bind_keys 与下方徽标同源,改键只动这里pub const SEARCH_KEYSTROKE: &str = "secondary-k";diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rsindex 0c36c25..740f221 100644--- a/crates/wake/src/workbench.rs+++ b/crates/wake/src/workbench.rs@@ -959,7 +959,14 @@ impl Workbench {FormTarget::Add => ("Add location", "Add", AgentId::ClaudeCode, "".into()),FormTarget::Edit { agent, path, .. } => ("Edit location", "Save", *agent, path.clone()),};- let path_input = cx.new(|cx| InputState::new(window, cx).placeholder("/absolute/folder/path"));+ // 占位符须与校验规则(Path::is_absolute)同形:Windows 上没有盘符+ // 的 `/absolute/...` 并不算绝对路径,照着占位符敲会被拒+ let placeholder = if cfg!(target_os = "windows") {+ r"C:\absolute\folder\path"+ } else {+ "/absolute/folder/path"+ };+ let path_input = cx.new(|cx| InputState::new(window, cx).placeholder(placeholder));if !init_path.is_empty() {let v = init_path.clone();path_input.update(cx, |st, cx| st.set_value(v, window, cx));@@ -1262,16 +1269,22 @@ impl Workbench {cx: &mut Context<Self>,) -> bool {let expanded = expand_tilde(raw_text.trim());- // 尾分隔符归一(展示与重叠判定都吃这份);裸根("/"、"C:\")剪完会- // 失去绝对性,原样保留。is_absolute 三端同判据——starts_with('/')- // 会把所有 Windows 盘符路径误拒(空串它也判 false,无需单独挡)- let trimmed = expanded.trim_end_matches(std::path::is_separator);- let path = if std::path::Path::new(trimmed).is_absolute() { trimmed } else { &expanded };- if !std::path::Path::new(path).is_absolute() {+ // 绝对性先判、只判一次:is_absolute 三端同判据(starts_with('/') 会把+ // 所有 Windows 盘符路径误拒),空串它也判 false,无需另设 is_empty 关。+ // **必须判在剪尾之前**:`//` 剪完是空串,若拿剪后的结果去判就会退回+ // 未剪形态放行,而旧版是拒的(2026-08-25 review)+ if !std::path::Path::new(&expanded).is_absolute() {window.push_notification(Notification::warning("Enter an absolute folder path"), cx);return false;}- let path = path.to_string();+ // 尾分隔符归一(展示与重叠判定都吃这份);裸根("/"、"C:\")剪完会+ // 失去绝对性,原样保留+ let trimmed = expanded.trim_end_matches(std::path::is_separator);+ let path = if std::path::Path::new(trimmed).is_absolute() {+ trimmed.to_string()+ } else {+ expanded.clone()+ };// 各家归一化(codex:直选 sessions 树/平铺 archived 上提到家层,侧档// 找回)。静态分派,不依赖该家实例是否还在 roster(默认被移除时也要// 生效);归一化后再做无改动/重叠判定,选中默认根数据子目录会正确判"已覆盖"@@ -1989,10 +2002,7 @@ impl Workbench {if this.detail.as_ref().is_some_and(|d| d.meta.key == key) {this.detail = None;}- window.push_notification(- Notification::success(format!("Session moved to {TRASH_NOUN}")),- cx,- );+ window.push_notification(Notification::success(SESSION_TRASHED), cx);// 立刻把它从列表摘掉,不等 watcher 那 800ms 去抖this.refresh(window, cx);}@@ -2031,16 +2041,14 @@ impl Workbench {.confirm().button_props(gpui_component::dialog::DialogButtonProps::default()- .ok_text(format!("Move to {TRASH_NOUN}"))+ .ok_text(MOVE_TO_TRASH).ok_variant(gpui_component::button::ButtonVariant::Danger),).child(v_flex().gap(SPACE_SM).text_size(FONT_BODY)- .child(format!(- "The session file will be moved to {TRASH_NOUN}. You can restore it anytime:"- ))+ .child(TRASH_CONFIRM_BODY).child(div().px(SPACE_SM)@@ -2048,7 +2056,10 @@ impl Workbench {.rounded(theme.radius).bg(theme.muted).text_size(FONT_CAPTION)- .font_family("Menlo")+ // 等宽走主题 token(Menlo 只有 macOS 有;+ // Windows 上找不到会静默回落到比例字体的+ // 系统 UI 字体,与其他路径 chip 不一致)+ .font_family(theme.mono_font_family.clone()).child(meta.file_path.clone()),).when(meta.agent == AgentId::Codex, |this| {@@ -2689,7 +2700,7 @@ impl Workbench {).separator().item(- PopupMenuItem::new(format!(" Move to {TRASH_NOUN}"))+ PopupMenuItem::new(format!(" {MOVE_TO_TRASH}")).icon(icon("icons/trash-2.svg").with_size(px(15.))).on_click(move |_, window, cx| {delete_entity.update(cx, |this, cx| {diff --git a/scripts/make-windows.ps1 b/scripts/make-windows.ps1index 2639735..01d124e 100644--- a/scripts/make-windows.ps1+++ b/scripts/make-windows.ps1@@ -12,7 +12,10 @@ $ErrorActionPreference = "Stop"Set-Location (Join-Path $PSScriptRoot "..")$version = (Select-String -Path Cargo.toml -Pattern '^version = "(.*)"').Matches[0].Groups[1].Value-$arch = if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { "arm64" } else { "x86_64" }+# 架构取自实际构建目标(rustc 的 host triple),不是 PowerShell 进程的架构:+# 后者在 ARM64 机器上跑 x64 模拟壳时会报 AMD64,给 ARM64 产物贴上 x86_64 标签+$hostTriple = (rustc -vV | Select-String '^host: (.*)$').Matches[0].Groups[1].Value+$arch = if ($hostTriple -like "aarch64*") { "arm64" } else { "x86_64" }$targetDir = if ($env:CARGO_TARGET_DIR) { $env:CARGO_TARGET_DIR } else { "target" }cargo build --release -p wake