All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
fix(codex): exclude guardian review sessions
Siyang Oblivionisaa98eb59a30d
diff --git a/crates/wake-core/src/adapters/codex.rs b/crates/wake-core/src/adapters/codex.rsindex 3b884dc..ba3bdc9 100644--- a/crates/wake-core/src/adapters/codex.rs+++ b/crates/wake-core/src/adapters/codex.rs@@ -42,6 +42,37 @@ fn rollout_file_name(path: &str) -> &str {path.rsplit(['/', '\\']).next().unwrap_or(path)}+/// Codex Desktop 会为内部命令审批启动 guardian reviewer,并把它们写进与用户+/// 会话相同的 rollout 树。Desktop/TUI 不把这类内部线程当会话展示,Wake 也应在+/// adapter 边界排除,而不是让 UI、FTS 与 MCP 各自猜一次。+///+/// `source.subagent.other = "guardian"` 是目前最稳定的结构化标记;早期/过渡格式+/// 也可能只给出 `thread_source = "guardian_review"`。只读首条 session_meta,+/// 解析失败时保守地保留文件,避免因半写入或未来格式变化误伤真实会话。+fn is_guardian_review(path: &Path) -> bool {+ let Ok(file) = fs::File::open(path) else {+ return false;+ };+ let mut first_line = String::new();+ if BufReader::new(file).read_line(&mut first_line).ok() == Some(0) {+ return false;+ }+ let Ok(row) = serde_json::from_str::<Value>(&first_line) else {+ return false;+ };+ if row.get("type").and_then(Value::as_str) != Some("session_meta") {+ return false;+ }+ let Some(payload) = row.get("payload") else {+ return false;+ };+ payload+ .pointer("/source/subagent/other")+ .and_then(Value::as_str)+ == Some("guardian")+ || payload.get("thread_source").and_then(Value::as_str) == Some("guardian_review")+}+/// rollout 存储本体(用户选中的是数据目录而非 codex home):自身不含/// sessions/archived 子目录,且顶层有 YYYY 日期目录(sessions 树)**或**/// 平铺的 rollout-*.jsonl(archived_sessions 的真实布局,实测平铺)。@@ -732,6 +763,7 @@ impl AgentAdapter for CodexAdapter {rollout_native_id,));}+ refs.retain(|r| !is_guardian_review(Path::new(&r.file_path)));Ok(refs)}@@ -798,6 +830,9 @@ impl AgentAdapter for CodexAdapter {fn file_ref(&self, path: &Path) -> Option<SessionFileRef> {let mut r = default_file_ref(self.agent(), path)?;+ if is_guardian_review(path) {+ return None;+ }r.native_id = rollout_native_id(&r.native_id);Some(r)}diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rsindex 735b6ef..67dea8d 100644--- a/crates/wake-core/tests/adapter_contracts.rs+++ b/crates/wake-core/tests/adapter_contracts.rs@@ -460,6 +460,103 @@ fn codex_parse_contract() {);}+#[test]+fn codex_guardian_reviews_are_excluded_without_hiding_regular_subagents() {+ setup();+ let home = tempfile::tempdir().unwrap();+ let day = home.path().join("sessions/2026/09/14");+ fs::create_dir_all(&day).unwrap();++ let cases = [+ (+ "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa",+ serde_json::json!({+ "source": { "subagent": { "other": "guardian" } },+ "thread_source": "subagent"+ }),+ false,+ ),+ (+ "bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb",+ serde_json::json!({+ "source": { "subagent": { "other": "guardian" } }+ }),+ false,+ ),+ (+ "cccccccc-cccc-4ccc-8ccc-cccccccccccc",+ serde_json::json!({+ "source": "cli",+ "thread_source": "guardian_review"+ }),+ false,+ ),+ (+ "dddddddd-dddd-4ddd-8ddd-dddddddddddd",+ serde_json::json!({+ "parent_thread_id": "eeeeeeee-eeee-4eee-8eee-eeeeeeeeeeee",+ "source": {+ "subagent": {+ "thread_spawn": {+ "parent_thread_id": "eeeeeeee-eeee-4eee-8eee-eeeeeeeeeeee",+ "depth": 1,+ "agent_path": "/root/research"+ }+ }+ },+ "thread_source": "subagent"+ }),+ true,+ ),+ ];++ let mut expected = HashSet::new();+ for (index, (id, source_fields, visible)) in cases.iter().enumerate() {+ let mut payload = serde_json::json!({+ "id": id,+ "timestamp": "2026-09-14T00:00:00.000Z",+ "cwd": "/work/wake",+ "originator": "codex_work_desktop"+ });+ payload+ .as_object_mut()+ .unwrap()+ .extend(source_fields.as_object().unwrap().clone());+ let path = day.join(format!("rollout-2026-09-14T00-00-0{index}-{id}.jsonl"));+ fs::write(+ &path,+ format!(+ "{}\n",+ serde_json::json!({+ "timestamp": "2026-09-14T00:00:00.000Z",+ "type": "session_meta",+ "payload": payload+ })+ ),+ )+ .unwrap();++ let adapter = CodexAdapter::new().with_custom_root(home.path().to_path_buf());+ assert_eq!(+ adapter.file_ref(&path).is_some(),+ *visible,+ "watcher file_ref visibility for {id}"+ );+ if *visible {+ expected.insert((*id).to_string());+ }+ }++ let adapter = CodexAdapter::new().with_custom_root(home.path().to_path_buf());+ let actual: HashSet<String> = adapter+ .list_session_files()+ .unwrap()+ .into_iter()+ .map(|r| r.native_id)+ .collect();+ assert_eq!(actual, expected, "full scan must use the same boundary");+}+#[test]fn codex_review_output_is_readable_and_not_duplicated() {setup();