All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
fix(codex): read legacy rollouts from 2025
Corey Chiu9252cf8d21fd
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 9f3249b..50fb878 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -2,6 +2,7 @@## [Unreleased]+- Fix: Sessions recorded by older Codex versions show their messages and titles instead of appearing empty- Fix: Clean Up no longer refuses Codex sessions written by recent versions- Fix: Open In → iTerm resumes the session in a new iTerm window instead of failing with an AppleScript error (#73, thanks @quintus-lab)- Fix: Conversations from the Antigravity CLI show their full messages, not just a summary (#71, thanks @dingtwo)diff --git a/crates/wake-core/src/adapters/codex.rs b/crates/wake-core/src/adapters/codex.rsindex de2782a..20d839e 100644--- a/crates/wake-core/src/adapters/codex.rs+++ b/crates/wake-core/src/adapters/codex.rs@@ -517,6 +517,21 @@ fn format_review_json(text: &str) -> Option<String> {format_review_output(&review)}+/// 2025 年 9 月前后的老格式首行:`{id, timestamp, instructions, git}`,没有 type 信封;之后是+/// `{"record_type":"state"}` 标记与不带信封的 response item(message / reasoning / function_call …)+fn is_legacy_header(row: &Value) -> bool {+ row.get("type").is_none() && row.get("id").is_some() && row.get("timestamp").is_some()+}++/// `<environment_context>` 注入块里的工作目录:session_meta 与 turn_context 都没给 cwd 时的兜底+/// (老格式只有它)。认块的写法与 `is_injected_user_content` 一致+fn environment_cwd(text: &str) -> Option<String> {+ text.trim_start()+ .starts_with("<environment_context")+ .then(|| tag_inner(text, "cwd"))+ .flatten()+}+fn parse_rollout(path: &Path, decode_images: bool) -> Result<CodexParse> {let _image_budget = transcript_image_decode_budget(decode_images);let file = fs::File::open(path)?;@@ -540,15 +555,24 @@ fn parse_rollout(path: &Path, decode_images: bool) -> Result<CodexParse> {let mut history_start: Option<i64> = None;// 子线程里"父线程历史到此为止"的下标(messages / event_fallback 各一)let mut inherited: Option<(usize, usize)> = None;+ // 老格式(is_legacy_header):条目本身就是 response_item 的 payload+ let mut legacy = false;// 用量记录里整个线程的累计,只在文件里没有 token_count 时用let mut usage_record_tokens: i64 = 0;- for row in jsonl_values(reader) {+ for (i, row) in jsonl_values(reader).enumerate() {let Some(row) = row? else {unknown_lines += 1;continue;};let ts = row.get("timestamp").map(to_epoch_ms).unwrap_or(0);+ if i == 0 && is_legacy_header(&row) {+ legacy = true;+ // 条目都不带时间,只有首行有;updated_at 留给文件 mtime(build_meta 的兜底)+ created_at = ts;+ git_branch = optional_string(row.pointer("/git/branch"));+ continue;+ }if ts > 0 {if created_at == 0 {created_at = ts;@@ -569,12 +593,21 @@ fn parse_rollout(path: &Path, decode_images: bool) -> Result<CodexParse> {inherited = Some((messages.len(), event_fallback.len()));}}- let typ = row.get("type").and_then(|v| v.as_str()).unwrap_or("");- let Some(payload) = row.get("payload") else {- if typ != "compacted" && typ != "world_state" {- unknown_lines += 1;+ let (typ, payload) = if legacy {+ // 每轮之间的 `{"record_type":"state"}` 是写端的状态标记+ if row.get("record_type").is_some() {+ continue;}- continue;+ ("response_item", &row)+ } else {+ let typ = row.get("type").and_then(|v| v.as_str()).unwrap_or("");+ let Some(payload) = row.get("payload") else {+ if typ != "compacted" && typ != "world_state" {+ unknown_lines += 1;+ }+ continue;+ };+ (typ, payload)};match typ {@@ -631,6 +664,9 @@ fn parse_rollout(path: &Path, decode_images: bool) -> Result<CodexParse> {for block in blocks {let mut parsed = content_parts(block, decode_images);let text = if role == "user" {+ if cwd.is_empty() {+ cwd = environment_cwd(&parsed.text).unwrap_or_default();+ }clean_user_text(&parsed.text)} else {parsed.text.trim().to_string()diff --git a/crates/wake-core/src/adapters/kilo.rs b/crates/wake-core/src/adapters/kilo.rsindex 2c4896c..c7ce3c6 100644--- a/crates/wake-core/src/adapters/kilo.rs+++ b/crates/wake-core/src/adapters/kilo.rs@@ -477,13 +477,6 @@ fn build_meta(// ---------------------------------------------------------------- 正文-/// `<tag>…</tag>` 的内文(去首尾空白);没有或为空 = None-fn tag_inner(text: &str, tag: &str) -> Option<String> {- extract_tag(text, tag)- .map(|s| s.trim().to_string())- .filter(|s| !s.is_empty())-}-/// 截掉每轮附带的 `<environment_details>` 及其后的内容(它总在消息末尾)fn strip_env_details(text: &str) -> &str {text.find("<environment_details>")diff --git a/crates/wake-core/src/adapters/parse_utils.rs b/crates/wake-core/src/adapters/parse_utils.rsindex 36a3820..4c467f2 100644--- a/crates/wake-core/src/adapters/parse_utils.rs+++ b/crates/wake-core/src/adapters/parse_utils.rs@@ -1351,6 +1351,7 @@ pub fn clean_prompt_line(raw: &str) -> String {/// 两者共用的清洗;`whole_command` 定 slash 命令写成 `/name args`,还是只留参数(没有参数退/// 命令名)fn clean_user_text(raw: &str, whole_command: bool) -> String {+ let raw = codex_ide_request(raw).unwrap_or(raw);let mut s = strip_tag_block(raw, "system-reminder");s = strip_tag_block(&s, "local-command-caveat");s = strip_tag_block(&s, "local-command-stdout");@@ -1396,6 +1397,17 @@ fn clean_user_text(raw: &str, whole_command: bool) -> String {crate::text::one_line(&out.replace(IMAGE_PLACEHOLDER, " "), MAX_TITLE)}+/// Codex IDE 扩展把编辑器上下文(活动文件、打开的标签页、选中的代码)包在提问外面,+/// `## My request for Codex:` 之后才是用户的话。只给标题与交接用:正文原样保留,选中的+/// 代码是用户特意附上的+fn codex_ide_request(text: &str) -> Option<&str> {+ let (_, request) = text+ .trim_start()+ .strip_prefix("# Context from my IDE setup:")?+ .split_once("## My request for Codex:")?;+ Some(request)+}+fn strip_tag_block(s: &str, tag: &str) -> String {let open = format!("<{tag}>");let close = format!("</{tag}>");@@ -1427,6 +1439,13 @@ pub(crate) fn extract_tag(s: &str, tag: &str) -> Option<String> {Some(s[i + open.len()..i + open.len() + j].to_string())}+/// `<tag>…</tag>` 的内文(去首尾空白);没有或为空 = None+pub(crate) fn tag_inner(text: &str, tag: &str) -> Option<String> {+ extract_tag(text, tag)+ .map(|s| s.trim().to_string())+ .filter(|s| !s.is_empty())+}+/// IDE/CLI 注入型"用户"消息:非用户手打,详情里应归 Meta 折叠,不参与标题推导。pub fn is_injected_user_content(text: &str) -> bool {let t = text.trim_start();@@ -1766,6 +1785,17 @@ mod tests {);let request = unwrap_file_preamble(wrapped).expect("wrapped request");assert_eq!(strip_image_tags(&request), "看看这里 怎么了");+ // IDE 扩展的编辑器上下文只在标题与交接里拆掉;正文不经这里,选中的代码还在+ let ide = concat!(+ "# Context from my IDE setup:\n\n",+ "## Active file: src/login.rs\n\n",+ "## Active selection of the file:\nfn login() {}\n\n",+ "## My request for Codex:\n",+ "修一下登录按钮\n"+ );+ assert_eq!(unwrap_file_preamble(ide), None);+ assert_eq!(clean_title_candidate(ide), "修一下登录按钮");+ assert_eq!(clean_prompt_line(ide), "修一下登录按钮");let ordinary = "为什么 <image src=\"avatar.png\"></image> 没有显示?";assert_eq!(strip_image_tags(ordinary), ordinary);assert_eq!(clean_title_candidate("[image] 看看这里"), "看看这里");diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rsindex 664cc81..d8e3c23 100644--- a/crates/wake-core/src/db.rs+++ b/crates/wake-core/src/db.rs@@ -244,8 +244,11 @@ CREATE TABLE IF NOT EXISTS claimed_sessions (/// Qoder、Kimi)作为子会话入库、标 spawned,`<git-context>` 不进标题;旧版监听当顶层会话收进来/// 的 Workflow 转录(sidechain 行被滤掉、零消息)文件没变、引用也没变,靠这轮重解析写对;/// "17" = Claude Code 转录里桌面端的占位标题 "New session" 不算名字(退回桌面会话的名字或首条-/// 提问);桌面端已经没有记录的老会话引用不变,靠这轮重解析写对。-pub const FTS_FORMAT: &str = "17";+/// 提问);桌面端已经没有记录的老会话引用不变,靠这轮重解析写对;+/// "18" = Codex 2025 年的老格式 rollout(首行没有信封、条目不带 payload)读得出消息、标题与工作+/// 目录;标题不再是 IDE 扩展的编辑器上下文包装(`# Context from my IDE setup`),取其后的+/// 提问。文件早就不再变,原先入库的是空会话,靠这轮重解析写对。+pub const FTS_FORMAT: &str = "18";/// FTS 压缩的节奏(见 `Store::compact_fts`):距上次压缩满一天、或从没压过才压。没有记录/// 就算到期——老库升级后、新建库首轮扫描收尾各压一次;`FTS_FORMAT` 换代时 open_conn 把diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rsindex bf40563..f441ad7 100644--- a/crates/wake-core/tests/adapter_contracts.rs+++ b/crates/wake-core/tests/adapter_contracts.rs@@ -1564,6 +1564,94 @@ fn codex_usage_and_realtime_records_are_known() {);}+/// 2025 年 9 月前后的老格式:首行 `{id, timestamp, instructions, git}` 没有信封,每轮之间夹着+/// `{"record_type":"state"}`,条目是不带信封的 response item、也不带时间。原先整份落进未知行、+/// 入库成 0 条消息的 Untitled(本机 17 条);工作目录只在 `<environment_context>` 里。这些会话+/// 在 state DB 里没有行,标题全靠首条提问——IDE 扩展把编辑器上下文包在提问外面,标题只取+/// 提问,正文原样保留(选中的代码是用户特意附上的)+#[test]+fn codex_legacy_rollouts_are_read() {+ setup();+ let home = tempfile::tempdir().unwrap();+ let day = home.path().join("sessions/2025/09/05");+ fs::create_dir_all(&day).unwrap();+ let id = "5aa9ab7a-0000-4000-8000-000000002025";+ let lines = [+ serde_json::json!({"id": id, "timestamp": "2025-09-05T02:54:37.123Z", "instructions": null,+ "git": {"commit_hash": "abc123", "branch": "main", "repository_url": "[email protected]:me/legacy.git"}}),+ serde_json::json!({"record_type": "state"}),+ serde_json::json!({"type": "message", "id": null, "role": "user", "content": [{"type": "input_text",+ "text": "<environment_context>\n <cwd>/work/legacy-proj</cwd>\n <approval_policy>on-request</approval_policy>\n</environment_context>"}]}),+ serde_json::json!({"type": "message", "id": null, "role": "user", "content": [{"type": "input_text",+ "text": "# Context from my IDE setup:\n\n## Active file: src/login.rs\n\n## Active selection of the file:\nfn login() {}\n\n## My request for Codex:\nFix the login button\n"}]}),+ serde_json::json!({"record_type": "state"}),+ serde_json::json!({"type": "reasoning", "id": "rs_1", "content": null, "encrypted_content": "gAAA",+ "summary": [{"type": "summary_text", "text": "Looking at the click handler"}]}),+ serde_json::json!({"type": "function_call", "id": "fc_1", "name": "shell",+ "arguments": "{\"command\":[\"rg\",\"login\"]}", "call_id": "call_1"}),+ serde_json::json!({"type": "function_call_output", "call_id": "call_1",+ "output": "{\"output\":\"src/login.rs:12\",\"metadata\":{\"exit_code\":0}}"}),+ serde_json::json!({"type": "message", "id": "msg_1", "role": "assistant",+ "content": [{"type": "output_text", "text": "Fixed the handler in src/login.rs."}]}),+ serde_json::json!({"record_type": "state"}),+ ];+ let path = day.join(format!("rollout-2025-09-05T10-54-37-{id}.jsonl"));+ let body: String = lines.iter().map(|l| format!("{l}\n")).collect();+ fs::write(&path, body).unwrap();++ let adapter = CodexAdapter::new().with_custom_root(home.path().to_path_buf());+ let r = adapter.file_ref(&path).expect("老格式照常列出");+ assert_eq!(r.native_id, id);+ let transcript = adapter.parse_transcript(&r).unwrap();+ assert_eq!(transcript.unknown_line_count, 0);+ let visible: Vec<&TranscriptMessage> = transcript+ .mainline+ .iter()+ .filter(|m| m.kind != MessageKind::Meta)+ .collect();+ let texts: Vec<&str> = visible+ .iter()+ .map(|m| m.text.as_str())+ .filter(|t| !t.is_empty())+ .collect();+ assert!(+ texts[0].starts_with("# Context from my IDE setup:") && texts[0].contains("fn login() {}"),+ "正文原样保留:{}",+ texts[0]+ );+ assert_eq!(texts[1..], ["Fixed the handler in src/login.rs."]);+ let tools: Vec<&ToolCallView> = visible.iter().flat_map(|m| &m.tool_calls).collect();+ assert_eq!(tools.len(), 1);+ assert_eq!(tools[0].name, "shell");+ assert!(+ tools[0]+ .output+ .as_deref()+ .unwrap_or("")+ .contains("src/login.rs:12"),+ "{:?}",+ tools[0].output+ );+ assert!(visible+ .iter()+ .any(|m| m.thinking.as_deref() == Some("Looking at the click handler")));++ let session = adapter.parse_session(&r).unwrap();+ assert_eq!(session.meta.title, "Fix the login button");+ assert_eq!(session.meta.project_path, "/work/legacy-proj");+ assert_eq!(session.meta.git_branch.as_deref(), Some("main"));+ assert_eq!(+ session.meta.created_at,+ ms("2025-09-05T02:54:37.123Z"),+ "创建时间取首行"+ );+ assert_eq!(+ session.meta.updated_at, r.mtime_ms,+ "条目不带时间,活动时间退回文件 mtime"+ );+ assert_seq_contract(adapter.as_ref(), &r);+}+#[test]fn qoder_parse_contract() {setup();