Skip to content

armgit / Wake

Public Imported from GitHub
0

All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.

Rust

Add 5 agents, OpenCode 2 support; release v0.2.0

Corey Chiu5ff127c4c2f0
diff --git a/.gitignore b/.gitignore
index b25458e..10bd630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,28 @@
/target
/dist
.impeccable/
-.codex/
crates/wake/assets/icon-1024.png
*.log
.DS_Store
+._*
*.local
# agent 指令/配置,本地开发用,不入库
CLAUDE.md
+AGENTS.md
+AGENT.md
+GEMINI.md
.claude/
+.codex/
+.cursor/
+.cursorrules
+.gemini/
+
+# 签名/公证凭据 —— 一旦进了公开历史就只能吊销重发
+*.p12
+*.cer
+*.pem
+AuthKey_*.p8
+*.mobileprovision
+.env
+.env.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..5f13194
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,19 @@
+# Changelog
+
+## [0.2.0] — 2026-08-20
+
+- New: 5 new supported agents — Pi, Oh My Pi, Grok Build, Kimi Code, Antigravity CLI (12 total)
+- New: OpenCode 2 (beta) support, with an `opencode2` badge and correct resume
+- New: session detail shows the session file path — click to reveal in Finder
+- New: Kiro sessions show the model used
+- Fix: sidebar agent list keeps a fixed order, no more reshuffling on refresh
+- Fix: "Reveal in Finder" for database-backed agents (Copilot, OpenCode, Antigravity)
+- Update: README supported-agents table now lists data source, model and via per agent
+
+## [0.1.0] — 2026-08-18
+
+- Initial release: browse and search local sessions from 7 coding agents (Claude Code, Codex, Copilot CLI, Cursor, OpenCode, Kiro, Gemini CLI)
+- Full-text search with jump-to-message
+- Session detail with tool calls, thinking and markdown rendering
+- Resume sessions in your terminal; star, pin, export, delete to Trash
+- Live updates and light & dark themes
diff --git a/Cargo.lock b/Cargo.lock
index 92a847f..2f4c8d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6780,7 +6780,7 @@ dependencies = [
[[package]]
name = "wake"
-version = "0.1.0"
+version = "0.2.0"
dependencies = [
"anyhow",
"chrono",
@@ -6795,7 +6795,7 @@ dependencies = [
[[package]]
name = "wake-core"
-version = "0.1.0"
+version = "0.2.0"
dependencies = [
"anyhow",
"chrono",
diff --git a/Cargo.toml b/Cargo.toml
index ac74117..f6a72d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
members = ["crates/wake-core", "crates/wake"]
[workspace.package]
-version = "0.1.0"
+version = "0.2.0"
edition = "2021"
license = "MIT"
diff --git a/PRODUCT.md b/PRODUCT.md
index 062da42..1041dd8 100644
--- a/PRODUCT.md
+++ b/PRODUCT.md
@@ -28,9 +28,9 @@ Corey 本人(独立开发者,主力工具 Claude Code 与 Codex,中文为主)。
## Capabilities and Constraints
-已实现:七家 adapter、FTS5 trigram 搜索(<3 码点 LIKE 降级)、**搜索跳转定位**(2026-08-18:⌘K 命中直达详情页对应消息并高亮,seq 契约保证)、详情页逐消息渲染(气泡/工具折叠簇/thinking/tree-sitter 高亮;2026-08-17 由整篇 markdown 方案升级)、恢复/收藏/置顶/导出/删除(废纸篓+墓碑)、文件监听增量、测试套件(wake-core 16 测试 + CI + pre-commit,合成 fixture)。
+已实现:十二家 adapter、FTS5 trigram 搜索(<3 码点 LIKE 降级)、**搜索跳转定位**(2026-08-18:⌘K 命中直达详情页对应消息并高亮,seq 契约保证)、详情页逐消息渲染(气泡/工具折叠簇/thinking/tree-sitter 高亮;2026-08-17 由整篇 markdown 方案升级)、恢复/收藏/置顶/导出/删除(废纸篓+墓碑)、文件监听增量、测试套件(wake-core 20 测试 + CI + pre-commit,合成 fixture)。
约束:对 agent 数据目录只读;绝不写 Codex 的 SQLite;不读凭证;GPUI 无 SF Symbols(图标用 lucide SVG 自备)。
-已支持七家 agent:Claude Code、Codex、Copilot CLI、Cursor(CLI transcripts)、OpenCode、Kiro、Gemini CLI(2026-08-17 P1 五家落地;Cursor IDE chats 正文加密不做,Windsurf/Trae 加密、Amp/Factory/Warp 云端无本地数据)。
+已支持十二家 agent:Claude Code、Codex、Copilot CLI、Cursor(CLI transcripts)、OpenCode(含 OpenCode 2 beta,2026-08-20 同 adapter 双表支持,v2 会话标 opencode2 徽章)、Kiro、Gemini CLI(2026-08-17 P1 五家落地)+ Pi、Oh My Pi、Grok Build、Kimi Code、Antigravity CLI(2026-08-19 对齐 kooky 内置 roster;Antigravity 正文加密仅元数据卡片)。做不了的:Cursor IDE chats 正文加密,Windsurf/Trae 加密,Amp/Factory(Droid)/Warp 云端无本地数据,Reasonix 本机零会话格式未实测。
## Brand Commitments
diff --git a/README.md b/README.md
index d48a388..e054a96 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
# Wake
-[![Release](https://img.shields.io/github/v/release/iAmCorey/Wake)](https://github.com/iAmCorey/Wake/releases)
-[![CI](https://github.com/iAmCorey/Wake/actions/workflows/ci.yml/badge.svg)](https://github.com/iAmCorey/Wake/actions/workflows/ci.yml)
-[![Platform](https://img.shields.io/badge/platform-macOS%2014%2B-black?logo=apple)](https://github.com/iAmCorey/Wake/releases)
-[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+[![License](https://img.shields.io/github/license/iAmCorey/Wake?style=flat-square)](LICENSE)
+[![Release](https://img.shields.io/github/v/release/iAmCorey/Wake?style=flat-square)](https://github.com/iAmCorey/Wake/releases/latest)
+[![Platform](https://img.shields.io/badge/platform-macOS%2014%2B-007AFF?style=flat-square)](https://github.com/iAmCorey/Wake/releases/latest)
+[![Downloads](https://img.shields.io/github/downloads/iAmCorey/Wake/total?style=flat-square)](https://github.com/iAmCorey/Wake/releases)
+[![Stars](https://img.shields.io/github/stars/iAmCorey/Wake?style=flat-square)](https://github.com/iAmCorey/Wake/stargazers)
+[![CI](https://img.shields.io/github/actions/workflow/status/iAmCorey/Wake/ci.yml?branch=main&label=CI&style=flat-square)](https://github.com/iAmCorey/Wake/actions/workflows/ci.yml)
A native macOS app that gathers every coding-agent session on your machine into one place — browse, full-text search, and resume any conversation in seconds. Built with **Rust + GPUI** (gpui 0.2 + gpui-component 0.5).
@@ -23,17 +25,25 @@ Your agent history is scattered across `~/.claude`, `~/.codex`, and five other p
## Supported agents
-| Agent | Data source |
-|---|---|
-| Claude Code | `~/.claude/projects/**/*.jsonl` |
-| Codex CLI | `~/.codex/sessions` + `state_5.sqlite` (read-only) |
-| Copilot CLI | `~/.copilot/session-store.db` |
-| Cursor (CLI transcripts) | `~/.cursor/projects/**/agent-transcripts` |
-| OpenCode | `~/.local/share/opencode/opencode.db` |
-| Kiro | `~/.kiro/sessions/cli` |
-| Gemini CLI | `~/.gemini/tmp/**/chats` |
-
-Cursor IDE chats, Windsurf, and Trae encrypt their local data; Amp, Factory, and Warp keep sessions in the cloud — none of those are supported.
+| Agent | Data source | Model | Via |
+|---|---|---|---|
+| Claude Code | `~/.claude/projects/**/*.jsonl` | ✅ | — |
+| Codex CLI | `~/.codex/sessions` + `state_5.sqlite` (read-only) | ✅ | ✅ |
+| Copilot CLI | `~/.copilot/session-store.db` | — | — |
+| Cursor (CLI transcripts) | `~/.cursor/projects/**/agent-transcripts` | — | — |
+| OpenCode | `~/.local/share/opencode/opencode.db` | ✅ | — |
+| OpenCode 2 (`opencode2`, beta) | same DB as v1, new `session_v2` tables | ✅ | — |
+| Kiro | `~/.kiro/sessions/cli` | ✅ | — |
+| Gemini CLI | `~/.gemini/tmp/**/chats` | — | — |
+| Pi | `~/.pi/agent/sessions/**/*.jsonl` | ✅ | — |
+| Oh My Pi | `~/.omp/agent/sessions/**/*.jsonl` | ✅ | — |
+| Grok Build | `~/.grok/sessions/**/updates.jsonl` | ✅ | — |
+| Kimi Code | `~/.kimi-code/sessions/**/wire.jsonl` | — | — |
+| Antigravity CLI | `~/.gemini/antigravity-cli/conversation_summaries.db` (metadata only — transcripts are encrypted) | — | — |
+
+**Model** = whether Wake shows which LLM a session used (the model the session last used). **Via** = whether Wake shows where the session was started from (CLI, IDE extension, desktop app) — only Codex records this in its local data. A "—" means the agent's local data simply doesn't record that field, not a missing feature.
+
+Cursor IDE chats, Windsurf, and Trae encrypt their local data; Amp, Factory (Droid), and Warp keep sessions in the cloud — none of those are supported. Reasonix stores sessions locally but hasn't been mapped yet.
## Privacy stance
@@ -80,6 +90,7 @@ CI runs `cargo test -p wake-core` plus a full app build on every push to main an
crates/
├── wake-core # pure data layer, no UI dependencies
│ ├── adapters/ # claude / codex / copilot / cursor / opencode / kiro / gemini
+│ │ # pi / omp / grok / kimi / antigravity
│ │ # (AgentAdapter trait — add an adapter, get the whole UI for free)
│ ├── scanner.rs # single-pass scan: meta + FTS in one go, mtime incremental
│ ├── watcher.rs # notify-based file watching → per-file incremental updates
@@ -90,6 +101,10 @@ crates/
Design notes live in [DESIGN.md](DESIGN.md), product decisions in [PRODUCT.md](PRODUCT.md).
+## Star History
+
+[![Star History Chart](https://api.star-history.com/chart?repos=iAmCorey/Wake&type=date&legend=top-left&sealed_token=ZX5h8laOXIE38b__FRNpP7ae52yRupThIRrcgidF7RI0OOzVcsKIo1iJ_iDp6UcMoxzNCL99N3RY__N7TFUszIgxzljBSBRRiAPYPt9QC9lKf7X3ShAQJg)](https://www.star-history.com/?type=date&repos=iAmCorey%2FWake)
+
## License
[MIT](LICENSE). Brand icons are from [lobe-icons](https://github.com/lobehub/lobe-icons) (MIT); agent names and logos belong to their respective owners.
diff --git a/crates/wake-core/src/adapters/antigravity.rs b/crates/wake-core/src/adapters/antigravity.rs
new file mode 100644
index 0000000..62d79db
--- /dev/null
+++ b/crates/wake-core/src/adapters/antigravity.rs
@@ -0,0 +1,216 @@
+use super::parse_utils::*;
+use super::sqlite_ro::{open_sqlite_ro, virtual_path};
+use super::{units_from_messages, AgentAdapter};
+use crate::models::*;
+use anyhow::{anyhow, Result};
+use std::collections::HashMap;
+use std::path::PathBuf;
+
+/// Antigravity CLI(Google,binary `agy`):会话正文是加密 .pb,唯一明文是
+/// `~/.gemini/antigravity-cli/conversation_summaries.db`(WAL)——只能做
+/// 元数据级会话卡片:标题在 preview 列(title 列基本为空)、时间、workspace。
+/// 详情页由一条 System 消息承载 preview 与"正文加密"说明,FTS 只搜得到它。
+/// 无每会话文件,SessionFileRef 用虚拟路径;打开一律走 sqlite_ro 三级梯度。
+pub struct AntigravityAdapter {
+ db: PathBuf,
+ /// 全表很小(元数据行),按 db mtime 缓存一轮扫描内的重复调用
+ rows_cache: MtimeCache<Vec<AgRow>>,
+}
+
+impl AntigravityAdapter {
+ pub fn new() -> Self {
+ Self {
+ db: dirs::home_dir()
+ .unwrap_or_default()
+ .join(".gemini")
+ .join("antigravity-cli")
+ .join("conversation_summaries.db"),
+ rows_cache: MtimeCache::new(),
+ }
+ }
+
+ fn rows(&self) -> Option<Vec<AgRow>> {
+ let mtime = std::fs::metadata(&self.db).map(|m| mtime_ms(&m)).unwrap_or(0);
+ self.rows_cache.get_or_try_build(mtime, || {
+ let ro = open_sqlite_ro(&self.db, "antigravity")?;
+ let mut stmt = ro
+ .conn
+ .prepare(
+ "SELECT conversation_id, title, preview, step_count, last_modified_time, workspace_uris
+ FROM conversation_summaries
+ WHERE parent_conversation_id = '' AND nesting_depth = 0",
+ )
+ .ok()?;
+ let rows = stmt
+ .query_map([], |r| {
+ Ok(AgRow {
+ id: r.get(0)?,
+ title: r.get::<_, Option<String>>(1)?.unwrap_or_default(),
+ preview: r.get::<_, Option<String>>(2)?.unwrap_or_default(),
+ step_count: r.get::<_, Option<i64>>(3)?.unwrap_or(0),
+ modified_ms: sqlite_dt_ms(r.get::<_, Option<String>>(4)?.unwrap_or_default().trim()),
+ cwd: first_workspace(&r.get::<_, Option<String>>(5)?.unwrap_or_default()),
+ })
+ })
+ .ok()?
+ .collect::<rusqlite::Result<Vec<_>>>()
+ .ok()?;
+ Some(rows)
+ })
+ }
+
+ fn build_meta(&self, r: &SessionFileRef, row: &AgRow) -> SessionMeta {
+ let title = Some(clean_title_candidate(&row.title))
+ .filter(|t| !t.is_empty())
+ .or_else(|| Some(clean_title_candidate(&row.preview)).filter(|t| !t.is_empty()))
+ .unwrap_or_else(|| UNTITLED.to_string());
+ // 库里只有 last_modified 一个时间,created/updated 同源
+ let ts = if row.modified_ms > 0 { row.modified_ms } else { r.mtime_ms };
+ SessionMeta {
+ key: format!("antigravity:{}", row.id),
+ id: row.id.clone(),
+ agent: AgentId::Antigravity,
+ title,
+ project_path: row.cwd.clone(),
+ project_name: project_name_of(&row.cwd),
+ file_path: r.file_path.clone(),
+ created_at: ts,
+ updated_at: ts,
+ message_count: row.step_count,
+ size_bytes: r.size,
+ git_branch: None,
+ model: None,
+ tokens_used: None,
+ archived: false,
+ source: None,
+ favorite: false,
+ pinned: false,
+ }
+ }
+
+ fn parse(&self, r: &SessionFileRef) -> Result<(SessionMeta, Vec<TranscriptMessage>)> {
+ let rows = self
+ .rows()
+ .ok_or_else(|| anyhow!("cannot open antigravity summaries store"))?;
+ let row = rows
+ .iter()
+ .find(|x| x.id == r.native_id)
+ .ok_or_else(|| anyhow!("antigravity conversation {} not in store", r.native_id))?;
+
+ // 正文加密不可读:一条 System 消息承载 preview,详情页与 FTS 都有着落
+ let mut text = String::new();
+ if !row.preview.trim().is_empty() {
+ text.push_str(row.preview.trim());
+ text.push_str("\n\n");
+ }
+ text.push_str("Antigravity stores conversation content encrypted — only this summary is available in Wake.");
+ let mut messages = vec![text_msg(Role::System, &text, row.modified_ms)];
+ assign_seq(&mut messages);
+ Ok((self.build_meta(r, row), messages))
+ }
+}
+
+#[derive(Clone)]
+struct AgRow {
+ id: String,
+ title: String,
+ preview: String,
+ step_count: i64,
+ modified_ms: i64,
+ cwd: String,
+}
+
+/// workspace_uris JSON 数组("[\"file:///Users/…\"]")首项 → 本地路径
+fn first_workspace(raw: &str) -> String {
+ let Ok(v) = serde_json::from_str::<serde_json::Value>(raw) else {
+ return String::new();
+ };
+ let Some(uri) = v.as_array().and_then(|a| a.first()).and_then(|x| x.as_str()) else {
+ return String::new();
+ };
+ let path = uri.strip_prefix("file://").unwrap_or(uri);
+ percent_decode(path)
+}
+
+/// file:// URI 的最小 percent-decode(路径含空格/中文时是 %XX 编码)
+fn percent_decode(s: &str) -> String {
+ let bytes = s.as_bytes();
+ let mut out: Vec<u8> = Vec::with_capacity(bytes.len());
+ let mut i = 0;
+ while i < bytes.len() {
+ if bytes[i] == b'%' && i + 2 < bytes.len() {
+ if let Ok(b) = u8::from_str_radix(&s[i + 1..i + 3], 16) {
+ out.push(b);
+ i += 3;
+ continue;
+ }
+ }
+ out.push(bytes[i]);
+ i += 1;
+ }
+ String::from_utf8_lossy(&out).to_string()
+}
+
+impl AgentAdapter for AntigravityAdapter {
+ fn agent(&self) -> AgentId {
+ AgentId::Antigravity
+ }
+
+ fn detect(&self) -> bool {
+ self.db.is_file()
+ }
+
+ fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {
+ let Some(rows) = self.rows() else {
+ return Ok(Vec::new());
+ };
+ Ok(rows
+ .into_iter()
+ .map(|row| SessionFileRef {
+ agent: AgentId::Antigravity,
+ native_id: row.id.clone(),
+ file_path: virtual_path(&self.db, &row.id),
+ mtime_ms: row.modified_ms,
+ // 正文不可读,标题/preview 长度即内容指纹(dirty 判断用)
+ size: (row.title.len() + row.preview.len()) as i64,
+ })
+ .collect())
+ }
+
+ fn quick_meta(&self, refs: &[SessionFileRef]) -> Option<HashMap<String, SessionMeta>> {
+ let rows = self.rows()?;
+ let by_id: HashMap<&str, &AgRow> = rows.iter().map(|r| (r.id.as_str(), r)).collect();
+ let mut out = HashMap::new();
+ for r in refs {
+ if let Some(row) = by_id.get(r.native_id.as_str()) {
+ out.insert(r.file_path.clone(), self.build_meta(r, row));
+ }
+ }
+ Some(out)
+ }
+
+ fn parse_session(&self, r: &SessionFileRef) -> Result<ParsedSession> {
+ let (meta, messages) = self.parse(r)?;
+ let units = units_from_messages(&messages);
+ Ok(ParsedSession {
+ meta,
+ units,
+ unknown_line_count: 0,
+ })
+ }
+
+ fn parse_transcript(&self, r: &SessionFileRef) -> Result<ParsedTranscript> {
+ let (meta, messages) = self.parse(r)?;
+ Ok(ParsedTranscript {
+ meta,
+ mainline: messages,
+ sidechains: Vec::new(),
+ unknown_line_count: 0,
+ })
+ }
+
+ fn watch_paths(&self) -> Vec<PathBuf> {
+ // SQLite 库变更 watcher 不追踪(只认 .jsonl),依赖手动/启动时刷新
+ Vec::new()
+ }
+}
diff --git a/crates/wake-core/src/adapters/grok.rs b/crates/wake-core/src/adapters/grok.rs
new file mode 100644
index 0000000..a1b998f
--- /dev/null
+++ b/crates/wake-core/src/adapters/grok.rs
@@ -0,0 +1,361 @@
+use super::parse_utils::*;
+use super::{units_from_messages, AgentAdapter};
+use crate::models::*;
+use anyhow::Result;
+use serde_json::Value;
+use std::collections::HashMap;
+use std::fs;
+use std::io::{BufRead, BufReader};
+use std::path::{Path, PathBuf};
+
+/// Grok Build(xAI 的 coding CLI):`~/.grok/sessions/<url编码cwd>/<uuid>/` 一目录
+/// 一会话。主文件 `updates.jsonl` 是 ACP 风格完整流水({timestamp(unix秒),
+/// method:"session/update",params:{update:{sessionUpdate:…}}}),chunk 流式落盘
+/// 需按角色段合并;`chat_history.jsonl` 是被压缩过的上下文快照,不能当全量史。
+/// `summary.json` 边车给 cwd/标题/git 信息。同级 `session_search.sqlite` 是
+/// Grok 自己的索引,`prompt_history.jsonl` 在 cwd 目录级——都不是会话文件。
+pub struct GrokAdapter {
+ root: PathBuf,
+}
+
+impl GrokAdapter {
+ pub fn new() -> Self {
+ Self {
+ root: dirs::home_dir().unwrap_or_default().join(".grok").join("sessions"),
+ }
+ }
+}
+
+/// summary.json 边车
+struct Summary {
+ cwd: String,
+ title: String,
+ created_ms: i64,
+ updated_ms: i64,
+ git_branch: Option<String>,
+ model: Option<String>,
+}
+
+fn read_summary(updates_path: &Path) -> Summary {
+ let mut s = Summary {
+ cwd: String::new(),
+ title: String::new(),
+ created_ms: 0,
+ updated_ms: 0,
+ git_branch: None,
+ model: None,
+ };
+ let path = updates_path.with_file_name("summary.json");
+ if let Ok(raw) = fs::read_to_string(&path) {
+ if let Ok(v) = serde_json::from_str::<Value>(&raw) {
+ if let Some(c) = v.get("info").and_then(|i| i.get("cwd")).and_then(|x| x.as_str()) {
+ s.cwd = c.to_string();
+ }
+ // generated_title 与 session_summary 通常同值,前者更语义化
+ for k in ["generated_title", "session_summary"] {
+ if let Some(t) = v.get(k).and_then(|x| x.as_str()) {
+ if !t.trim().is_empty() {
+ s.title = t.to_string();
+ break;
+ }
+ }
+ }
+ if let Some(t) = v.get("created_at").and_then(|x| x.as_str()) {
+ s.created_ms = iso_ms(t);
+ }
+ if let Some(t) = v.get("updated_at").and_then(|x| x.as_str()) {
+ s.updated_ms = iso_ms(t);
+ }
+ s.git_branch = v
+ .get("head_branch")
+ .and_then(|x| x.as_str())
+ .filter(|b| !b.is_empty())
+ .map(String::from);
+ s.model = v
+ .get("current_model_id")
+ .and_then(|x| x.as_str())
+ .filter(|m| !m.is_empty())
+ .map(String::from);
+ }
+ }
+ s
+}
+
+/// 流水重放的段状态:一个用户回合断一次,assistant 期间 thought/message/tool
+/// 交错全并入同一条助手消息
+struct Replay {
+ messages: Vec<TranscriptMessage>,
+ tool_index: HashMap<String, (usize, usize)>,
+ /// 当前累积段;None = 段外
+ cur_role: Option<Role>,
+ cur_text: String,
+ cur_thinking: String,
+ cur_tools: Vec<ToolCallView>,
+ cur_ts: i64,
+}
+
+impl Replay {
+ fn new() -> Self {
+ Self {
+ messages: Vec::new(),
+ tool_index: HashMap::new(),
+ cur_role: None,
+ cur_text: String::new(),
+ cur_thinking: String::new(),
+ cur_tools: Vec::new(),
+ cur_ts: 0,
+ }
+ }
+
+ fn flush(&mut self) {
+ let Some(role) = self.cur_role.take() else { return };
+ let text = std::mem::take(&mut self.cur_text);
+ let thinking = std::mem::take(&mut self.cur_thinking);
+ let tools = std::mem::take(&mut self.cur_tools);
+ if text.trim().is_empty() && thinking.trim().is_empty() && tools.is_empty() {
+ return;
+ }
+ let mut m = text_msg(role, &text, self.cur_ts);
+ if !thinking.trim().is_empty() {
+ m.thinking = Some(clip(thinking.trim(), MAX_TOOL_IO).0);
+ }
+ let base = self.messages.len();
+ for (ix, tc) in tools.into_iter().enumerate() {
+ self.tool_index.insert(tc.id.clone(), (base, ix));
+ m.tool_calls.push(tc);
+ }
+ self.messages.push(m);
+ }
+
+ /// 进入(或延续)一个角色段
+ fn ensure(&mut self, role: Role, ts: i64) {
+ if self.cur_role != Some(role) {
+ self.flush();
+ self.cur_role = Some(role);
+ self.cur_ts = ts;
+ }
+ }
+}
+
+/// user/agent chunk 的 content 文本({content:{type:text,text}}),借用零分配
+fn chunk_text(update: &Value) -> &str {
+ update.pointer("/content/text").and_then(Value::as_str).unwrap_or_default()
+}
+
+fn tool_content_text(content: &Value) -> String {
+ let mut parts: Vec<String> = Vec::new();
+ for item in content.as_array().into_iter().flatten() {
+ let inner = item.get("content").unwrap_or(item);
+ let t = inner.get("text").and_then(|x| x.as_str()).unwrap_or_default();
+ if !t.trim().is_empty() {
+ parts.push(t.trim().to_string());
+ }
+ }
+ parts.join("\n")
+}
+
+/// tool_call_update 回填:完成态带 content(文本输出,覆盖式取最终态),
+/// status failed 置错;初始 tool_call 缺 rawInput 时由 update 补
+fn apply_tool_update(tc: &mut ToolCallView, update: &Value) {
+ if let Some(content) = update.get("content") {
+ let t = tool_content_text(content);
+ if !t.is_empty() {
+ tc.output = Some(clip(&t, MAX_TOOL_IO).0);
+ }
+ }
+ if update.get("status").and_then(|v| v.as_str()) == Some("failed") {
+ tc.is_error = true;
+ }
+ if tc.input.is_none() {
+ if let Some(raw) = update.get("rawInput").filter(|r| !r.is_null()) {
+ tc.input_preview = make_preview(raw);
+ if let Ok(json) = serde_json::to_string_pretty(raw) {
+ tc.input = Some(clip(&json, MAX_TOOL_IO).0);
+ }
+ }
+ }
+}
+
+fn parse_grok_updates(path: &Path) -> Result<(Vec<TranscriptMessage>, u32)> {
+ let file = fs::File::open(path)?;
+ let reader = BufReader::with_capacity(1 << 20, file);
+ let mut rp = Replay::new();
+ let mut unknown = 0u32;
+
+ for line in reader.lines() {
+ let Ok(line) = line else {
+ unknown += 1;
+ continue;
+ };
+ if line.trim().is_empty() {
+ continue;
+ }
+ let Ok(row) = serde_json::from_str::<Value>(&line) else {
+ unknown += 1;
+ continue;
+ };
+ let ts = row.get("timestamp").map(to_epoch_ms).unwrap_or(0);
+ let Some(update) = row.get("params").and_then(|p| p.get("update")) else {
+ unknown += 1;
+ continue;
+ };
+ match update.get("sessionUpdate").and_then(|v| v.as_str()) {
+ Some("user_message_chunk") => {
+ rp.ensure(Role::User, ts);
+ rp.cur_text.push_str(chunk_text(update));
+ }
+ Some("agent_message_chunk") => {
+ rp.ensure(Role::Assistant, ts);
+ rp.cur_text.push_str(chunk_text(update));
+ }
+ Some("agent_thought_chunk") => {
+ rp.ensure(Role::Assistant, ts);
+ rp.cur_thinking.push_str(chunk_text(update));
+ }
+ Some("tool_call") => {
+ rp.ensure(Role::Assistant, ts);
+ let id = update.get("toolCallId").and_then(|v| v.as_str()).unwrap_or_default();
+ let name = update.get("title").and_then(|v| v.as_str()).unwrap_or_default();
+ let input = update.get("rawInput").cloned().unwrap_or(Value::Null);
+ rp.cur_tools.push(tool_call_view(id.to_string(), name, &input, None, false));
+ }
+ Some("tool_call_update") => {
+ let Some(id) = update.get("toolCallId").and_then(|v| v.as_str()) else {
+ continue;
+ };
+ // 目标 tool 可能还在当前未 flush 的段里,也可能已入 messages
+ if let Some(tc) = rp.cur_tools.iter_mut().find(|tc| tc.id == id) {
+ apply_tool_update(tc, update);
+ } else if let Some(&(mi, ti)) = rp.tool_index.get(id) {
+ apply_tool_update(&mut rp.messages[mi].tool_calls[ti], update);
+ }
+ }
+ // 已知的非内容更新:任务后台化/压缩等
+ Some(
+ "task_backgrounded"
+ | "task_completed"
+ | "auto_compact_started"
+ | "auto_compact_completed"
+ | "compaction_checkpoint"
+ | "plan"
+ | "current_mode_update",
+ ) => {}
+ _ => {
+ unknown += 1;
+ }
+ }
+ }
+ rp.flush();
+ let mut messages = rp.messages;
+ assign_seq(&mut messages);
+ Ok((messages, unknown))
+}
+
+fn build_meta(r: &SessionFileRef, side: &Summary, messages: &[TranscriptMessage]) -> SessionMeta {
+ let title = Some(clean_title_candidate(&side.title))
+ .filter(|t| !t.is_empty())
+ .or_else(|| title_from_messages(messages))
+ .unwrap_or_else(|| UNTITLED.to_string());
+ let msg_ts_max = messages.iter().filter_map(|m| m.timestamp).max().unwrap_or(0);
+ SessionMeta {
+ key: format!("grok:{}", r.native_id),
+ id: r.native_id.clone(),
+ agent: AgentId::Grok,
+ title,
+ project_path: side.cwd.clone(),
+ project_name: project_name_of(&side.cwd),
+ file_path: r.file_path.clone(),
+ created_at: if side.created_ms > 0 { side.created_ms } else { r.mtime_ms },
+ updated_at: match side.updated_ms.max(msg_ts_max) {
+ t if t > 0 => t,
+ _ => r.mtime_ms,
+ },
+ message_count: messages.iter().filter(|m| m.kind == MessageKind::Text).count() as i64,
+ size_bytes: r.size,
+ git_branch: side.git_branch.clone(),
+ model: side.model.clone(),
+ tokens_used: None,
+ archived: false,
+ source: None,
+ favorite: false,
+ pinned: false,
+ }
+}
+
+impl AgentAdapter for GrokAdapter {
+ fn agent(&self) -> AgentId {
+ AgentId::Grok
+ }
+
+ fn detect(&self) -> bool {
+ self.root.is_dir()
+ }
+
+ fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {
+ let mut refs = Vec::new();
+ let Ok(cwds) = fs::read_dir(&self.root) else {
+ return Ok(refs);
+ };
+ // session_search.sqlite 等根级文件对 read_dir 自然失败跳过;
+ // 会话主文件的判定(存在、非空、native_id)统一走 file_ref
+ for cwd_dir in cwds.flatten() {
+ let Ok(sessions) = fs::read_dir(cwd_dir.path()) else { continue };
+ for sess in sessions.flatten() {
+ if let Some(r) = self.file_ref(&sess.path().join("updates.jsonl")) {
+ refs.push(r);
+ }
+ }
+ }
+ Ok(refs)
+ }
+
+ fn file_ref(&self, path: &Path) -> Option<SessionFileRef> {
+ // 只认会话目录里的 updates.jsonl;prompt_history/chat_history/events 都不是主文件
+ if path.file_name()?.to_string_lossy() != "updates.jsonl" {
+ return None;
+ }
+ let session_dir = path.parent()?;
+ let mut r = default_file_ref(self.agent(), path)?;
+ r.native_id = session_dir.file_name()?.to_string_lossy().to_string();
+ Some(r)
+ }
+
+ fn session_paths(&self, meta: &SessionMeta) -> Vec<String> {
+ // 会话是 <uuid>/ 整个目录(summary/events/plan 等边车),整目录进废纸篓
+ Path::new(&meta.file_path)
+ .parent()
+ .map(|d| vec![d.to_string_lossy().to_string()])
+ .unwrap_or_else(|| vec![meta.file_path.clone()])
+ }
+
+ fn parse_session(&self, r: &SessionFileRef) -> Result<ParsedSession> {
+ let (messages, unknown) = parse_grok_updates(Path::new(&r.file_path))?;
+ let side = read_summary(Path::new(&r.file_path));
+ let meta = build_meta(r, &side, &messages);
+ let units = units_from_messages(&messages);
+ Ok(ParsedSession {
+ meta,
+ units,
+ unknown_line_count: unknown,
+ })
+ }
+
+ fn parse_transcript(&self, r: &SessionFileRef) -> Result<ParsedTranscript> {
+ let (messages, unknown) = parse_grok_updates(Path::new(&r.file_path))?;
+ let side = read_summary(Path::new(&r.file_path));
+ Ok(ParsedTranscript {
+ meta: build_meta(r, &side, &messages),
+ mainline: messages,
+ sidechains: Vec::new(),
+ unknown_line_count: unknown,
+ })
+ }
+
+ fn watch_paths(&self) -> Vec<PathBuf> {
+ if self.detect() {
+ vec![self.root.clone()]
+ } else {
+ Vec::new()
+ }
+ }
+}
diff --git a/crates/wake-core/src/adapters/kimi.rs b/crates/wake-core/src/adapters/kimi.rs
new file mode 100644
index 0000000..d815e72
--- /dev/null
+++ b/crates/wake-core/src/adapters/kimi.rs
@@ -0,0 +1,298 @@
+use super::parse_utils::*;
+use super::{units_from_messages, AgentAdapter};
+use crate::models::*;
+use anyhow::Result;
+use serde_json::Value;
+use std::collections::HashMap;
+use std::fs;
+use std::io::{BufRead, BufReader};
+use std::path::{Path, PathBuf};
+
+/// Kimi Code(Moonshot AI):`~/.kimi-code/sessions/wd_<名>_<hash>/session_<uuid>/`
+/// 一目录一会话,主文件 `agents/main/wire.jsonl`(事件溯源:turn.prompt 是用户
+/// 输入,context.append_message 是落入上下文的完整消息,turn.* 生命周期与
+/// config 行为已知跳过);`state.json` 边车给标题/时间("New Session" 是占位),
+/// cwd 靠根级 `session_index.jsonl` 的 sessionId→workDir 映射(目录名 hash
+/// 不可反推)。`agents/<非main>/` 是子代理,不进列表。
+pub struct KimiAdapter {
+ root: PathBuf,
+ index_path: PathBuf,
+ /// sessionId → workDir,按 index mtime 缓存(全量刷新时逐会话调用)
+ cwd_cache: MtimeCache<HashMap<String, String>>,
+}
+
+impl KimiAdapter {
+ pub fn new() -> Self {
+ let home = dirs::home_dir().unwrap_or_default().join(".kimi-code");
+ Self {
+ root: home.join("sessions"),
+ index_path: home.join("session_index.jsonl"),
+ cwd_cache: MtimeCache::new(),
+ }
+ }
+
+ fn cwd_map(&self) -> HashMap<String, String> {
+ let mtime = fs::metadata(&self.index_path).map(|m| mtime_ms(&m)).unwrap_or(0);
+ self.cwd_cache
+ .get_or_try_build(mtime, || {
+ let mut out = HashMap::new();
+ if let Ok(raw) = fs::read_to_string(&self.index_path) {
+ for line in raw.lines() {
+ let Ok(v) = serde_json::from_str::<Value>(line) else { continue };
+ if let (Some(id), Some(wd)) = (
+ v.get("sessionId").and_then(|x| x.as_str()),
+ v.get("workDir").and_then(|x| x.as_str()),
+ ) {
+ out.insert(id.to_string(), wd.to_string());
+ }
+ }
+ }
+ Some(out)
+ })
+ .unwrap_or_default()
+ }
+
+ fn cwd_for(&self, native_id: &str) -> String {
+ self.cwd_map().get(native_id).cloned().unwrap_or_default()
+ }
+}
+
+/// `…/session_<uuid>/agents/main/wire.jsonl` → 会话目录。
+/// "wire.jsonl 上三级 + session_ 前缀"这条布局知识只在此一处
+/// (read_state/native_id/session_paths 共用,漂移会 trash 错目录)。
+fn session_dir_of(wire_path: &Path) -> Option<&Path> {
+ let dir = wire_path.ancestors().nth(3)?;
+ dir.file_name()?
+ .to_string_lossy()
+ .starts_with("session_")
+ .then_some(dir)
+}
+
+/// state.json 边车(会话目录 session_<uuid>/ 下,wire.jsonl 上三级)
+struct KimiState {
+ title: String,
+ created_ms: i64,
+ updated_ms: i64,
+}
+
+fn read_state(wire_path: &Path) -> KimiState {
+ let mut s = KimiState {
+ title: String::new(),
+ created_ms: 0,
+ updated_ms: 0,
+ };
+ let Some(session_dir) = session_dir_of(wire_path) else { return s };
+ if let Ok(raw) = fs::read_to_string(session_dir.join("state.json")) {
+ if let Ok(v) = serde_json::from_str::<Value>(&raw) {
+ if let Some(t) = v.get("title").and_then(|x| x.as_str()) {
+ // "New Session" 是 Kimi 的占位标题,不当真实标题
+ if t != "New Session" {
+ s.title = t.to_string();
+ }
+ }
+ if let Some(t) = v.get("createdAt").and_then(|x| x.as_str()) {
+ s.created_ms = iso_ms(t);
+ }
+ if let Some(t) = v.get("updatedAt").and_then(|x| x.as_str()) {
+ s.updated_ms = iso_ms(t);
+ }
+ }
+ }
+ s
+}
+
+/// content parts(turn.prompt 的 input / message.content)→ 纯文本。
+/// part 可以是裸字符串或 {type:text,text};媒体 part(blobref)跳过。
+fn parts_text(v: &Value) -> String {
+ let mut parts: Vec<String> = Vec::new();
+ match v {
+ Value::String(s) => {
+ if !s.trim().is_empty() {
+ parts.push(s.trim().to_string());
+ }
+ }
+ Value::Array(arr) => {
+ for p in arr {
+ match p {
+ Value::String(s) if !s.trim().is_empty() => parts.push(s.trim().to_string()),
+ Value::Object(_) => {
+ if let Some(t) = p.get("text").and_then(|x| x.as_str()) {
+ if !t.trim().is_empty() {
+ parts.push(t.trim().to_string());
+ }
+ }
+ }
+ _ => {}
+ }
+ }
+ }
+ _ => {}
+ }
+ parts.join("\n\n")
+}
+
+fn parse_kimi_wire(path: &Path) -> Result<(Vec<TranscriptMessage>, u32)> {
+ let file = fs::File::open(path)?;
+ let reader = BufReader::with_capacity(1 << 20, file);
+ let mut messages: Vec<TranscriptMessage> = Vec::new();
+ let mut unknown = 0u32;
+
+ for line in reader.lines() {
+ let Ok(line) = line else {
+ unknown += 1;
+ continue;
+ };
+ if line.trim().is_empty() {
+ continue;
+ }
+ let Ok(row) = serde_json::from_str::<Value>(&line) else {
+ unknown += 1;
+ continue;
+ };
+ match row.get("type").and_then(|v| v.as_str()) {
+ Some("turn.prompt") | Some("turn.steer") => {
+ let text = parts_text(row.get("input").unwrap_or(&Value::Null));
+ if !text.is_empty() {
+ messages.push(text_msg(Role::User, &text, 0));
+ }
+ }
+ Some("context.append_message") => {
+ let Some(msg) = row.get("message") else {
+ unknown += 1;
+ continue;
+ };
+ let role = match msg.get("role").and_then(|v| v.as_str()) {
+ Some("assistant") => Role::Assistant,
+ // user 输入已由 turn.prompt 覆盖;tool/system 等上下文行跳过
+ _ => continue,
+ };
+ let text = parts_text(msg.get("content").unwrap_or(&Value::Null));
+ if !text.is_empty() {
+ messages.push(text_msg(role, &text, 0));
+ }
+ }
+ // 已知的配置/生命周期/工具事件行(工具明细在 loop_event 里,v1 不展开)
+ Some("metadata")
+ | Some("config.update")
+ | Some("tools.set_active_tools")
+ | Some("context.append_loop_event") => {}
+ Some(t) if t.starts_with("turn.") => {}
+ _ => {
+ unknown += 1;
+ }
+ }
+ }
+ assign_seq(&mut messages);
+ Ok((messages, unknown))
+}
+
+fn build_meta(r: &SessionFileRef, state: &KimiState, cwd: &str, messages: &[TranscriptMessage]) -> SessionMeta {
+ let title = Some(clean_title_candidate(&state.title))
+ .filter(|t| !t.is_empty())
+ .or_else(|| title_from_messages(messages))
+ .unwrap_or_else(|| UNTITLED.to_string());
+ SessionMeta {
+ key: format!("kimi:{}", r.native_id),
+ id: r.native_id.clone(),
+ agent: AgentId::Kimi,
+ title,
+ project_path: cwd.to_string(),
+ project_name: project_name_of(cwd),
+ file_path: r.file_path.clone(),
+ created_at: if state.created_ms > 0 { state.created_ms } else { r.mtime_ms },
+ updated_at: if state.updated_ms > 0 { state.updated_ms } else { r.mtime_ms },
+ message_count: messages.iter().filter(|m| m.kind == MessageKind::Text).count() as i64,
+ size_bytes: r.size,
+ git_branch: None,
+ model: None,
+ tokens_used: None,
+ archived: false,
+ source: None,
+ favorite: false,
+ pinned: false,
+ }
+}
+
+/// 会话目录名即 native_id(与 session_index.jsonl 的 sessionId 同形,
+/// resume 直接可用)
+fn native_id_of(wire_path: &Path) -> Option<String> {
+ Some(session_dir_of(wire_path)?.file_name()?.to_string_lossy().to_string())
+}
+
+impl AgentAdapter for KimiAdapter {
+ fn agent(&self) -> AgentId {
+ AgentId::Kimi
+ }
+
+ fn detect(&self) -> bool {
+ self.root.is_dir()
+ }
+
+ fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {
+ let mut refs = Vec::new();
+ let Ok(wds) = fs::read_dir(&self.root) else {
+ return Ok(refs);
+ };
+ // 主文件判定(session_ 前缀、存在、非空、native_id)统一走 file_ref
+ for wd in wds.flatten() {
+ let Ok(sessions) = fs::read_dir(wd.path()) else { continue };
+ for sess in sessions.flatten() {
+ let wire = sess.path().join("agents").join("main").join("wire.jsonl");
+ if let Some(r) = self.file_ref(&wire) {
+ refs.push(r);
+ }
+ }
+ }
+ Ok(refs)
+ }
+
+ fn file_ref(&self, path: &Path) -> Option<SessionFileRef> {
+ // 只认主代理的 wire.jsonl;agents/<其他>/ 是子代理
+ let p = path.to_string_lossy();
+ if !p.ends_with("/agents/main/wire.jsonl") {
+ return None;
+ }
+ let native = native_id_of(path)?;
+ let mut r = default_file_ref(self.agent(), path)?;
+ r.native_id = native;
+ Some(r)
+ }
+
+ fn session_paths(&self, meta: &SessionMeta) -> Vec<String> {
+ // 会话是 session_<uuid>/ 整个目录(state.json + agents/),整目录进废纸篓
+ session_dir_of(Path::new(&meta.file_path))
+ .map(|d| vec![d.to_string_lossy().to_string()])
+ .unwrap_or_else(|| vec![meta.file_path.clone()])
+ }
+
+ fn parse_session(&self, r: &SessionFileRef) -> Result<ParsedSession> {
+ let (messages, unknown) = parse_kimi_wire(Path::new(&r.file_path))?;
+ let state = read_state(Path::new(&r.file_path));
+ let meta = build_meta(r, &state, &self.cwd_for(&r.native_id), &messages);
+ let units = units_from_messages(&messages);
+ Ok(ParsedSession {
+ meta,
+ units,
+ unknown_line_count: unknown,
+ })
+ }
+
+ fn parse_transcript(&self, r: &SessionFileRef) -> Result<ParsedTranscript> {
+ let (messages, unknown) = parse_kimi_wire(Path::new(&r.file_path))?;
+ let state = read_state(Path::new(&r.file_path));
+ Ok(ParsedTranscript {
+ meta: build_meta(r, &state, &self.cwd_for(&r.native_id), &messages),
+ mainline: messages,
+ sidechains: Vec::new(),
+ unknown_line_count: unknown,
+ })
+ }
+
+ fn watch_paths(&self) -> Vec<PathBuf> {
+ if self.detect() {
+ vec![self.root.clone()]
+ } else {
+ Vec::new()
+ }
+ }
+}
diff --git a/crates/wake-core/src/adapters/kiro.rs b/crates/wake-core/src/adapters/kiro.rs
index 184f494..eb272e0 100644
--- a/crates/wake-core/src/adapters/kiro.rs
+++ b/crates/wake-core/src/adapters/kiro.rs
@@ -31,6 +31,7 @@ struct Sidecar {
title: String,
created_ms: i64,
updated_ms: i64,
+ model: Option<String>,
}
fn read_sidecar(jsonl_path: &Path) -> Sidecar {
@@ -39,6 +40,7 @@ fn read_sidecar(jsonl_path: &Path) -> Sidecar {
title: String::new(),
created_ms: 0,
updated_ms: 0,
+ model: None,
};
let json_path = jsonl_path.with_extension("json");
if let Ok(raw) = fs::read_to_string(&json_path) {
@@ -55,6 +57,12 @@ fn read_sidecar(jsonl_path: &Path) -> Sidecar {
if let Some(t) = v.get("updated_at").and_then(|x| x.as_str()) {
side.updated_ms = iso_ms(t);
}
+ side.model = v
+ .pointer("/session_state/rts_model_state/model_info/model_id")
+ .or_else(|| v.pointer("/session_state/rts_model_state/model_info/model_name"))
+ .and_then(|x| x.as_str())
+ .filter(|m| !m.is_empty())
+ .map(String::from);
}
}
side
@@ -139,7 +147,7 @@ fn build_meta(r: &SessionFileRef, side: &Sidecar, messages: &[TranscriptMessage]
message_count: messages.iter().filter(|m| m.kind == MessageKind::Text).count() as i64,
size_bytes: r.size,
git_branch: None,
- model: None,
+ model: side.model.clone(),
tokens_used: None,
archived: false,
source: None,
diff --git a/crates/wake-core/src/adapters/mod.rs b/crates/wake-core/src/adapters/mod.rs
index 51ab431..3322fc4 100644
--- a/crates/wake-core/src/adapters/mod.rs
+++ b/crates/wake-core/src/adapters/mod.rs
@@ -1,10 +1,14 @@
+pub mod antigravity;
pub mod claude;
pub mod codex;
pub mod copilot;
pub mod cursor;
pub mod gemini;
+pub mod grok;
+pub mod kimi;
pub mod kiro;
pub mod opencode;
+pub mod pi;
pub(crate) mod parse_utils;
mod sqlite_ro;
@@ -71,6 +75,11 @@ pub fn create_adapters() -> Vec<Box<dyn AgentAdapter>> {
Box::new(opencode::OpencodeAdapter::new()),
Box::new(kiro::KiroAdapter::new()),
Box::new(gemini::GeminiAdapter::new()),
+ Box::new(pi::PiAdapter::new()),
+ Box::new(pi::PiAdapter::omp()),
+ Box::new(grok::GrokAdapter::new()),
+ Box::new(kimi::KimiAdapter::new()),
+ Box::new(antigravity::AntigravityAdapter::new()),
];
all.into_iter().filter(|a| a.detect()).collect()
}
diff --git a/crates/wake-core/src/adapters/opencode.rs b/crates/wake-core/src/adapters/opencode.rs
index 495f02f..aa0bee9 100644
--- a/crates/wake-core/src/adapters/opencode.rs
+++ b/crates/wake-core/src/adapters/opencode.rs
@@ -6,24 +6,41 @@ use anyhow::{anyhow, Result};
use serde_json::Value;
use std::collections::HashMap;
use std::path::PathBuf;
-use std::sync::Mutex;
-/// OpenCode:`~/.local/share/opencode/opencode.db`。
-/// session 表自带 title/directory/tokens;正文在 part 表
-/// ({type:text|reasoning|tool},synthetic=注入),message 表只有角色与时间。
-/// parent_id 非空的是子代理会话,不进列表。
+/// OpenCode:`~/.local/share/opencode/opencode.db`,v1 与 v2 beta 共库不同表。
+/// v1:session 表 + 正文在 part 表({type:text|reasoning|tool},synthetic=注入),
+/// message 表只有角色与时间。v2(binary `opencode2`):session_v2 表 + 正文在
+/// session_message 表(type 列 user|synthetic|assistant,data JSON——user 的
+/// text 在顶层,assistant 的 content 是块数组)。v2 首次启动会把 v1 会话迁移进
+/// session_v2(version 列保留原 CLI 版本),因此 v2 表是全集;仅存于 v1 表的
+/// 会话(迁移后又用 v1 CLI 跑的)由 UNION 回捞。parent_id 非空 = 子代理,不进列表。
pub struct OpencodeAdapter {
db: PathBuf,
- /// rows() 带按会话相关子查询(全 part 表求和),按 db mtime 缓存一轮
- /// 扫描内的重复调用
- rows_cache: Mutex<Option<(i64, Vec<OcRow>)>>,
+ /// rows() 带按会话相关子查询(全 part/message 表求和),按 db mtime 缓存
+ /// 一轮扫描内的重复调用
+ rows_cache: MtimeCache<Vec<OcRow>>,
}
-const ROW_SELECT: &str = "SELECT s.id, s.directory, s.title, s.time_created, s.time_updated,
+/// 两代 session 表的公共列(别名 s;content_len 子查询两代不同,单独拼)
+const ROW_COLS: &str = "s.id, s.directory, s.title, s.time_created, s.time_updated,
s.model, s.tokens_input + s.tokens_output + s.tokens_reasoning,
- s.time_archived,
- (SELECT COALESCE(SUM(LENGTH(p.data)), 0) FROM part p WHERE p.session_id = s.id)
- FROM session s";
+ s.time_archived, s.version";
+
+fn v1_select() -> String {
+ format!(
+ "SELECT {ROW_COLS},
+ (SELECT COALESCE(SUM(LENGTH(p.data)), 0) FROM part p WHERE p.session_id = s.id)
+ FROM session s"
+ )
+}
+
+fn v2_select() -> String {
+ format!(
+ "SELECT {ROW_COLS},
+ (SELECT COALESCE(SUM(LENGTH(m.data)), 0) FROM session_message m WHERE m.session_id = s.id)
+ FROM session_v2 s"
+ )
+}
fn row_from(r: &rusqlite::Row) -> rusqlite::Result<OcRow> {
Ok(OcRow {
@@ -35,10 +52,20 @@ fn row_from(r: &rusqlite::Row) -> rusqlite::Result<OcRow> {
model_json: r.get::<_, Option<String>>(5)?.unwrap_or_default(),
tokens: r.get::<_, Option<i64>>(6)?.unwrap_or(0),
archived: r.get::<_, Option<i64>>(7)?.is_some(),
- content_len: r.get(8)?,
+ version: r.get::<_, Option<String>>(8)?.unwrap_or_default(),
+ content_len: r.get(9)?,
})
}
+fn has_v2(conn: &rusqlite::Connection) -> bool {
+ conn.query_row(
+ "SELECT 1 FROM sqlite_master WHERE type='table' AND name='session_v2'",
+ [],
+ |_| Ok(()),
+ )
+ .is_ok()
+}
+
impl OpencodeAdapter {
pub fn new() -> Self {
Self {
@@ -48,7 +75,7 @@ impl OpencodeAdapter {
.join("share")
.join("opencode")
.join("opencode.db"),
- rows_cache: Mutex::new(None),
+ rows_cache: MtimeCache::new(),
}
}
@@ -58,26 +85,27 @@ impl OpencodeAdapter {
fn rows(&self) -> Option<Vec<OcRow>> {
let mtime = std::fs::metadata(&self.db).map(|m| mtime_ms(&m)).unwrap_or(0);
- {
- let cache = self.rows_cache.lock().unwrap();
- if let Some((t, rows)) = cache.as_ref() {
- if *t == mtime {
- return Some(rows.clone());
- }
- }
- }
- let ro = self.open()?;
- let mut stmt = ro
- .conn
- .prepare(&format!("{ROW_SELECT} WHERE s.parent_id IS NULL"))
- .ok()?;
- let rows = stmt
- .query_map([], |r| row_from(r))
- .ok()?
- .collect::<rusqlite::Result<Vec<_>>>()
- .ok()?;
- *self.rows_cache.lock().unwrap() = Some((mtime, rows.clone()));
- Some(rows)
+ self.rows_cache.get_or_try_build(mtime, || {
+ let ro = self.open()?;
+ let sql = if has_v2(&ro.conn) {
+ format!(
+ "{} WHERE s.parent_id IS NULL \
+ UNION ALL \
+ {} WHERE s.parent_id IS NULL AND s.id NOT IN (SELECT id FROM session_v2)",
+ v2_select(),
+ v1_select()
+ )
+ } else {
+ format!("{} WHERE s.parent_id IS NULL", v1_select())
+ };
+ let mut stmt = ro.conn.prepare(&sql).ok()?;
+ let rows = stmt
+ .query_map([], row_from)
+ .ok()?
+ .collect::<rusqlite::Result<Vec<_>>>()
+ .ok()?;
+ Some(rows)
+ })
}
fn build_meta(&self, r: &SessionFileRef, row: &OcRow, message_count: i64) -> SessionMeta {
@@ -101,138 +129,245 @@ impl OpencodeAdapter {
model,
tokens_used: if row.tokens > 0 { Some(row.tokens) } else { None },
archived: row.archived,
- source: None,
+ source: row.source(),
favorite: false,
pinned: false,
}
}
- /// 单会话解析:一次连接,会话行与 message/part 都只查本会话
+ /// 单会话解析:一次连接;v2 行命中走 session_message,否则回落 v1 的
+ /// message + part 两表路径
fn parse(&self, r: &SessionFileRef) -> Result<(SessionMeta, Vec<TranscriptMessage>, u32)> {
let ro = self.open().ok_or_else(|| anyhow!("cannot open opencode db"))?;
- let row = ro
- .conn
- .query_row(
- &format!("{ROW_SELECT} WHERE s.id = ?1"),
- [&r.native_id],
- |x| row_from(x),
- )
- .map_err(|_| anyhow!("opencode session {} not in db", r.native_id))?;
-
- // part 按 (message_id, id) 排序分组;id 前缀时间有序
- let mut parts_by_msg: HashMap<String, Vec<Value>> = HashMap::new();
- {
- let mut stmt = ro.conn.prepare(
- "SELECT message_id, data FROM part WHERE session_id = ?1 ORDER BY message_id, id",
- )?;
- let rows = stmt.query_map([&r.native_id], |p| {
- Ok((p.get::<_, String>(0)?, p.get::<_, String>(1)?))
- })?;
- for (mid, data) in rows.flatten() {
- if let Ok(v) = serde_json::from_str::<Value>(&data) {
- parts_by_msg.entry(mid).or_default().push(v);
- }
+ let v2_row = if has_v2(&ro.conn) {
+ ro.conn
+ .query_row(&format!("{} WHERE s.id = ?1", v2_select()), [&r.native_id], row_from)
+ .ok()
+ } else {
+ None
+ };
+ let (row, messages, unknown) = match v2_row {
+ Some(row) => {
+ let (messages, unknown) = parse_v2_messages(&ro, &r.native_id)?;
+ (row, messages, unknown)
}
- }
+ None => {
+ let row = ro
+ .conn
+ .query_row(&format!("{} WHERE s.id = ?1", v1_select()), [&r.native_id], row_from)
+ .map_err(|_| anyhow!("opencode session {} not in db", r.native_id))?;
+ let (messages, unknown) = parse_v1_messages(&ro, &r.native_id)?;
+ (row, messages, unknown)
+ }
+ };
+ let count = messages.iter().filter(|m| m.kind == MessageKind::Text).count() as i64;
+ let meta = self.build_meta(r, &row, count);
+ Ok((meta, messages, unknown))
+ }
+}
- let mut messages: Vec<TranscriptMessage> = Vec::new();
- let mut unknown = 0u32;
+/// v1 正文:message 表(角色/时间)+ part 表(内容块)按 message_id 分组
+fn parse_v1_messages(ro: &SqliteRo, sid: &str) -> Result<(Vec<TranscriptMessage>, u32)> {
+ // part 按 (message_id, id) 排序分组;id 前缀时间有序
+ let mut parts_by_msg: HashMap<String, Vec<Value>> = HashMap::new();
+ {
let mut stmt = ro.conn.prepare(
- "SELECT id, data FROM message WHERE session_id = ?1 ORDER BY time_created, id",
+ "SELECT message_id, data FROM part WHERE session_id = ?1 ORDER BY message_id, id",
)?;
- let msg_rows = stmt.query_map([&r.native_id], |m| {
- Ok((m.get::<_, String>(0)?, m.get::<_, String>(1)?))
+ let rows = stmt.query_map([sid], |p| {
+ Ok((p.get::<_, String>(0)?, p.get::<_, String>(1)?))
})?;
- for (mid, data) in msg_rows.flatten() {
- let Ok(md) = serde_json::from_str::<Value>(&data) else {
- unknown += 1;
- continue;
- };
- let role = match md.get("role").and_then(|v| v.as_str()) {
- Some("user") => Role::User,
- Some("assistant") => Role::Assistant,
- _ => Role::System,
- };
- let ts = md
- .get("time")
- .and_then(|t| t.get("created"))
- .and_then(|v| v.as_i64())
- .unwrap_or(0);
- let mut text_parts: Vec<String> = Vec::new();
- let mut synthetic_parts: Vec<String> = Vec::new();
- let mut thinking_parts: Vec<String> = Vec::new();
- let mut tool_calls: Vec<ToolCallView> = Vec::new();
- for p in parts_by_msg.remove(&mid).unwrap_or_default() {
- match p.get("type").and_then(|v| v.as_str()) {
- Some("text") => {
- let t = p.get("text").and_then(|v| v.as_str()).unwrap_or("");
- if t.trim().is_empty() {
- continue;
- }
- if p.get("synthetic").and_then(|v| v.as_bool()) == Some(true) {
- synthetic_parts.push(t.trim().to_string());
- } else {
- text_parts.push(t.trim().to_string());
- }
+ for (mid, data) in rows.flatten() {
+ if let Ok(v) = serde_json::from_str::<Value>(&data) {
+ parts_by_msg.entry(mid).or_default().push(v);
+ }
+ }
+ }
+
+ let mut messages: Vec<TranscriptMessage> = Vec::new();
+ let mut unknown = 0u32;
+ let mut stmt = ro.conn.prepare(
+ "SELECT id, data FROM message WHERE session_id = ?1 ORDER BY time_created, id",
+ )?;
+ let msg_rows = stmt.query_map([sid], |m| {
+ Ok((m.get::<_, String>(0)?, m.get::<_, String>(1)?))
+ })?;
+ for (mid, data) in msg_rows.flatten() {
+ let Ok(md) = serde_json::from_str::<Value>(&data) else {
+ unknown += 1;
+ continue;
+ };
+ let role = match md.get("role").and_then(|v| v.as_str()) {
+ Some("user") => Role::User,
+ Some("assistant") => Role::Assistant,
+ _ => Role::System,
+ };
+ let ts = md
+ .get("time")
+ .and_then(|t| t.get("created"))
+ .and_then(|v| v.as_i64())
+ .unwrap_or(0);
+ let mut acc = BlockAcc::default();
+ for p in parts_by_msg.remove(&mid).unwrap_or_default() {
+ match p.get("type").and_then(|v| v.as_str()) {
+ Some("text") => {
+ let t = p.get("text").and_then(|v| v.as_str()).unwrap_or("");
+ if t.trim().is_empty() {
+ continue;
+ }
+ if p.get("synthetic").and_then(|v| v.as_bool()) == Some(true) {
+ acc.synthetic.push(t.trim().to_string());
+ } else {
+ acc.text.push(t.trim().to_string());
}
- Some("reasoning") => {
- if let Some(t) = p.get("text").and_then(|v| v.as_str()) {
- if !t.trim().is_empty() {
- thinking_parts.push(t.trim().to_string());
+ }
+ Some("reasoning") => acc.push_reasoning(&p),
+ Some("tool") => acc.push_tool(&p),
+ Some("step-start") | Some("step-finish") | Some("snapshot")
+ | Some("patch") | Some("file") => {}
+ _ => unknown += 1,
+ }
+ }
+ if let Some(m) = acc.into_message(role, ts, None) {
+ messages.push(m);
+ }
+ }
+ assign_seq(&mut messages);
+ Ok((messages, unknown))
+}
+
+/// v2 正文:session_message 单表按 seq 有序,type 列分 user/synthetic/assistant,
+/// data JSON——user 的 text 在顶层,assistant 的 content 是块数组
+fn parse_v2_messages(ro: &SqliteRo, sid: &str) -> Result<(Vec<TranscriptMessage>, u32)> {
+ let mut messages: Vec<TranscriptMessage> = Vec::new();
+ let mut unknown = 0u32;
+ let mut stmt = ro
+ .conn
+ .prepare("SELECT type, data FROM session_message WHERE session_id = ?1 ORDER BY seq")?;
+ let rows = stmt.query_map([sid], |m| {
+ Ok((m.get::<_, String>(0)?, m.get::<_, String>(1)?))
+ })?;
+ for (mtype, data) in rows.flatten() {
+ let Ok(md) = serde_json::from_str::<Value>(&data) else {
+ unknown += 1;
+ continue;
+ };
+ let ts = md
+ .get("time")
+ .and_then(|t| t.get("created"))
+ .and_then(|v| v.as_i64())
+ .unwrap_or(0);
+ match mtype.as_str() {
+ "user" => {
+ let text = md.get("text").and_then(|v| v.as_str()).unwrap_or("").trim();
+ if !text.is_empty() {
+ messages.push(text_msg(Role::User, text, ts));
+ }
+ }
+ "synthetic" => {
+ // 注入内容(编辑器上下文等),归 Meta 折叠
+ let text = md.get("text").and_then(|v| v.as_str()).unwrap_or("").trim();
+ if !text.is_empty() {
+ let mut m = text_msg(Role::User, text, ts);
+ m.kind = MessageKind::Meta;
+ messages.push(m);
+ }
+ }
+ "assistant" => {
+ let model = md
+ .pointer("/model/id")
+ .and_then(|v| v.as_str())
+ .map(String::from);
+ let mut acc = BlockAcc::default();
+ for b in md.get("content").and_then(|c| c.as_array()).into_iter().flatten() {
+ match b.get("type").and_then(|v| v.as_str()) {
+ Some("text") => {
+ if let Some(t) = b.get("text").and_then(|v| v.as_str()) {
+ if !t.trim().is_empty() {
+ acc.text.push(t.trim().to_string());
+ }
}
}
+ Some("reasoning") => acc.push_reasoning(b),
+ Some("tool") => acc.push_tool(b),
+ Some("step-start") | Some("step-finish") | Some("snapshot")
+ | Some("patch") | Some("file") => {}
+ _ => unknown += 1,
}
- Some("tool") => {
- let state = p.get("state").cloned().unwrap_or(Value::Null);
- let input = state.get("input").cloned().unwrap_or(Value::Null);
- let output = match state.get("output") {
- Some(Value::String(s)) => Some(s.clone()),
- Some(v) if !v.is_null() => serde_json::to_string(v).ok(),
- _ => None,
- };
- tool_calls.push(tool_call_view(
- p.get("callID").and_then(|v| v.as_str()).unwrap_or("").to_string(),
- p.get("tool").and_then(|v| v.as_str()).unwrap_or("tool"),
- &input,
- output,
- state.get("status").and_then(|v| v.as_str()) == Some("error"),
- ));
- }
- Some("step-start") | Some("step-finish") | Some("snapshot")
- | Some("patch") | Some("file") => {}
- _ => unknown += 1,
+ }
+ if let Some(m) = acc.into_message(Role::Assistant, ts, model) {
+ messages.push(m);
}
}
- // 只有注入内容(editor_context 等)的消息归 Meta 折叠
- let (text, kind) = if text_parts.is_empty() && !synthetic_parts.is_empty() {
- (synthetic_parts.join("\n\n"), MessageKind::Meta)
- } else {
- (text_parts.join("\n\n"), MessageKind::Text)
- };
- if text.is_empty() && thinking_parts.is_empty() && tool_calls.is_empty() {
- continue;
+ _ => unknown += 1,
+ }
+ }
+ assign_seq(&mut messages);
+ Ok((messages, unknown))
+}
+
+/// 一条消息的内容块累加器(text/synthetic/reasoning/tool),两代路径共用
+#[derive(Default)]
+struct BlockAcc {
+ text: Vec<String>,
+ synthetic: Vec<String>,
+ thinking: Vec<String>,
+ tools: Vec<ToolCallView>,
+}
+
+impl BlockAcc {
+ fn push_reasoning(&mut self, b: &Value) {
+ if let Some(t) = b.get("text").and_then(|v| v.as_str()) {
+ if !t.trim().is_empty() {
+ self.thinking.push(t.trim().to_string());
}
- let (clipped, truncated) = clip(&text, MAX_MSG_TEXT);
- messages.push(TranscriptMessage {
- seq: 0,
- role,
- kind,
- text: clipped,
- truncated,
- tool_calls,
- thinking: if thinking_parts.is_empty() {
- None
- } else {
- Some(clip(&thinking_parts.join("\n\n"), MAX_TOOL_IO).0)
- },
- timestamp: if ts > 0 { Some(ts) } else { None },
- model: None,
- });
}
- assign_seq(&mut messages);
- let count = messages.iter().filter(|m| m.kind == MessageKind::Text).count() as i64;
- let meta = self.build_meta(r, &row, count);
- Ok((meta, messages, unknown))
+ }
+
+ /// tool 块(两代同构):{callID,tool,state:{status,input,output}}
+ fn push_tool(&mut self, b: &Value) {
+ let state = b.get("state").cloned().unwrap_or(Value::Null);
+ let input = state.get("input").cloned().unwrap_or(Value::Null);
+ let output = match state.get("output") {
+ Some(Value::String(s)) => Some(s.clone()),
+ Some(v) if !v.is_null() => serde_json::to_string(v).ok(),
+ _ => None,
+ };
+ self.tools.push(tool_call_view(
+ b.get("callID").and_then(|v| v.as_str()).unwrap_or("").to_string(),
+ b.get("tool").and_then(|v| v.as_str()).unwrap_or("tool"),
+ &input,
+ output,
+ state.get("status").and_then(|v| v.as_str()) == Some("error"),
+ ));
+ }
+
+ /// 组装为消息;全空返回 None。只有注入内容的消息归 Meta 折叠。
+ fn into_message(self, role: Role, ts: i64, model: Option<String>) -> Option<TranscriptMessage> {
+ let (text, kind) = if self.text.is_empty() && !self.synthetic.is_empty() {
+ (self.synthetic.join("\n\n"), MessageKind::Meta)
+ } else {
+ (self.text.join("\n\n"), MessageKind::Text)
+ };
+ if text.is_empty() && self.thinking.is_empty() && self.tools.is_empty() {
+ return None;
+ }
+ let (clipped, truncated) = clip(&text, MAX_MSG_TEXT);
+ Some(TranscriptMessage {
+ seq: 0,
+ role,
+ kind,
+ text: clipped,
+ truncated,
+ tool_calls: self.tools,
+ thinking: if self.thinking.is_empty() {
+ None
+ } else {
+ Some(clip(&self.thinking.join("\n\n"), MAX_TOOL_IO).0)
+ },
+ timestamp: if ts > 0 { Some(ts) } else { None },
+ model,
+ })
}
}
@@ -246,9 +381,20 @@ struct OcRow {
model_json: String,
tokens: i64,
archived: bool,
+ /// 会话产生时的 CLI 版本("1.14.50" / "0.0.0-beta-17639"),v2 迁移保留原值
+ version: String,
content_len: i64,
}
+impl OcRow {
+ /// v2 会话在 UI 标 "opencode2"(官方产品名 OpenCode 2,binary 同名),
+ /// resume 据此换 opencode2 二进制;1.x/0.x 老版本不标
+ fn source(&self) -> Option<String> {
+ let v2 = self.version.starts_with('2') || self.version.contains("beta");
+ v2.then(|| "opencode2".to_string())
+ }
+}
+
impl AgentAdapter for OpencodeAdapter {
fn agent(&self) -> AgentId {
AgentId::Opencode
diff --git a/crates/wake-core/src/adapters/parse_utils.rs b/crates/wake-core/src/adapters/parse_utils.rs
index 2c0a91e..aee7a7a 100644
--- a/crates/wake-core/src/adapters/parse_utils.rs
+++ b/crates/wake-core/src/adapters/parse_utils.rs
@@ -1,7 +1,7 @@
use crate::models::*;
use serde_json::Value;
-/// 文件 mtime → epoch ms(七家 adapter 与 watcher 共用)
+/// 文件 mtime → epoch ms(各家 adapter 与 watcher 共用)
pub fn mtime_ms(meta: &std::fs::Metadata) -> i64 {
meta.modified()
.ok()
@@ -55,7 +55,7 @@ pub fn assign_seq(messages: &mut [TranscriptMessage]) {
}
}
-/// 标题推导:首条真实用户消息经清洗,七家共用的回退链
+/// 标题推导:首条真实用户消息经清洗,各家共用的回退链
pub fn title_from_messages(messages: &[TranscriptMessage]) -> Option<String> {
messages
.iter()
@@ -119,6 +119,42 @@ pub fn list_jsonl_refs(
refs
}
+/// content blocks 数组 → 纯文本(取各块 "text" 字段,trim 后 join)
+pub fn blocks_text(v: &Value) -> String {
+ v.as_array()
+ .into_iter()
+ .flatten()
+ .filter_map(|b| b.get("text").and_then(|t| t.as_str()))
+ .map(str::trim)
+ .filter(|t| !t.is_empty())
+ .collect::<Vec<_>>()
+ .join("\n\n")
+}
+
+/// 按 mtime 失效的单值缓存(边车映射/SQLite 全表在一轮扫描内的重复调用)。
+/// build 返回 None 时不缓存失败结果,mtime 不变也会在下次重试。
+pub struct MtimeCache<T: Clone>(std::sync::Mutex<Option<(i64, T)>>);
+
+impl<T: Clone> MtimeCache<T> {
+ pub fn new() -> Self {
+ Self(std::sync::Mutex::new(None))
+ }
+
+ pub fn get_or_try_build(&self, mtime: i64, build: impl FnOnce() -> Option<T>) -> Option<T> {
+ {
+ let cache = self.0.lock().unwrap();
+ if let Some((t, v)) = cache.as_ref() {
+ if *t == mtime {
+ return Some(v.clone());
+ }
+ }
+ }
+ let v = build()?;
+ *self.0.lock().unwrap() = Some((mtime, v.clone()));
+ Some(v)
+ }
+}
+
/// tool_use 块 → ToolCallView(preview + pretty-print input 三件套统一)
pub fn tool_call_view(
id: String,
diff --git a/crates/wake-core/src/adapters/pi.rs b/crates/wake-core/src/adapters/pi.rs
new file mode 100644
index 0000000..cc0b59f
--- /dev/null
+++ b/crates/wake-core/src/adapters/pi.rs
@@ -0,0 +1,275 @@
+use super::parse_utils::*;
+use super::{units_from_messages, AgentAdapter};
+use crate::models::*;
+use anyhow::Result;
+use std::collections::HashMap;
+use std::fs;
+use std::io::{BufRead, BufReader};
+use std::path::{Path, PathBuf};
+
+/// Pi / Oh My Pi(omp 是 pi 的 fork,会话格式同构,只有数据根不同):
+/// `~/.pi/agent/sessions/<有损编码目录>/<timestamp>_<uuid>.jsonl`。
+/// 首行 {type:session,version,id,timestamp,cwd}——cwd 直接在首行,无需反推
+/// 目录名;后续 {type:message,message:{role:user|assistant|toolResult,
+/// content:[{type:text|toolCall,…}]}},toolResult 是独立 role,按 toolCallId
+/// 回填;model_change/thinking_level_change 等已知行静默跳过。
+pub struct PiAdapter {
+ agent: AgentId,
+ root: PathBuf,
+}
+
+impl PiAdapter {
+ pub fn new() -> Self {
+ Self {
+ agent: AgentId::Pi,
+ root: dirs::home_dir()
+ .unwrap_or_default()
+ .join(".pi")
+ .join("agent")
+ .join("sessions"),
+ }
+ }
+
+ /// Oh My Pi 变体:`~/.omp/agent/sessions`,解析核心完全共用
+ pub fn omp() -> Self {
+ Self {
+ agent: AgentId::Omp,
+ root: dirs::home_dir()
+ .unwrap_or_default()
+ .join(".omp")
+ .join("agent")
+ .join("sessions"),
+ }
+ }
+}
+
+/// 文件名 stem `<timestamp>_<uuid>` → uuid;无 `_` 时整个 stem 兜底
+fn native_id_of(stem: &str) -> String {
+ stem.rsplit('_').next().unwrap_or(stem).to_string()
+}
+
+struct PiParse {
+ session_id: Option<String>,
+ cwd: String,
+ created_at: i64,
+ /// 最后一行消息的时间(合并后的消息保留回合首行时间,updated 单独追踪)
+ last_ts: i64,
+ messages: Vec<TranscriptMessage>,
+ model: Option<String>,
+ tokens_used: Option<i64>,
+ unknown_lines: u32,
+}
+
+fn parse_pi_jsonl(path: &Path) -> Result<PiParse> {
+ let file = fs::File::open(path)?;
+ let reader = BufReader::with_capacity(1 << 20, file);
+
+ let mut p = PiParse {
+ session_id: None,
+ cwd: String::new(),
+ created_at: 0,
+ last_ts: 0,
+ messages: Vec::new(),
+ model: None,
+ tokens_used: None,
+ unknown_lines: 0,
+ };
+ // toolCallId → (消息下标, tool_calls 下标),toolResult 行回填用
+ let mut tool_index: HashMap<String, (usize, usize)> = HashMap::new();
+
+ for line in reader.lines() {
+ let Ok(line) = line else {
+ p.unknown_lines += 1;
+ continue;
+ };
+ if line.trim().is_empty() {
+ continue;
+ }
+ let Ok(row) = serde_json::from_str::<serde_json::Value>(&line) else {
+ p.unknown_lines += 1;
+ continue;
+ };
+ match row.get("type").and_then(|v| v.as_str()) {
+ Some("session") => {
+ if let Some(id) = row.get("id").and_then(|v| v.as_str()) {
+ p.session_id = Some(id.to_string());
+ }
+ if let Some(c) = row.get("cwd").and_then(|v| v.as_str()) {
+ p.cwd = c.to_string();
+ }
+ if let Some(t) = row.get("timestamp").and_then(|v| v.as_str()) {
+ p.created_at = iso_ms(t);
+ }
+ }
+ Some("message") => {
+ let Some(msg) = row.get("message") else {
+ p.unknown_lines += 1;
+ continue;
+ };
+ let ts = row.get("timestamp").and_then(|v| v.as_str()).map(iso_ms).unwrap_or(0);
+ p.last_ts = p.last_ts.max(ts);
+ let content = msg.get("content").unwrap_or(&serde_json::Value::Null);
+ match msg.get("role").and_then(|v| v.as_str()) {
+ Some("user") => {
+ let text = blocks_text(content);
+ if !text.is_empty() {
+ p.messages.push(text_msg(Role::User, &text, ts));
+ }
+ }
+ Some("assistant") => {
+ let text = blocks_text(content);
+ let mut tools: Vec<ToolCallView> = Vec::new();
+ for b in content.as_array().into_iter().flatten() {
+ if b.get("type").and_then(|v| v.as_str()) == Some("toolCall") {
+ let id = b.get("id").and_then(|v| v.as_str()).unwrap_or_default();
+ let name = b.get("name").and_then(|v| v.as_str()).unwrap_or_default();
+ let input = b.get("arguments").cloned().unwrap_or(serde_json::Value::Null);
+ tools.push(tool_call_view(id.to_string(), name, &input, None, false));
+ }
+ }
+ if text.is_empty() && tools.is_empty() {
+ continue;
+ }
+ let model = msg.get("model").and_then(|v| v.as_str()).map(String::from);
+ if model.is_some() {
+ p.model = model.clone();
+ }
+ if let Some(t) = msg
+ .get("usage")
+ .and_then(|u| u.get("totalTokens"))
+ .and_then(|v| v.as_i64())
+ {
+ p.tokens_used = Some(t);
+ }
+ // 连续 assistant 行(中间只隔 toolResult)合并成一条,
+ // 详情页每个回合一条助手消息
+ if !matches!(p.messages.last(), Some(m) if m.role == Role::Assistant) {
+ p.messages.push(text_msg(Role::Assistant, "", ts));
+ }
+ let base = p.messages.len() - 1;
+ let last = &mut p.messages[base];
+ // 合并后统一压 MAX_MSG_TEXT 上限(整个 agentic 回合并成
+ // 一条消息,不能靠单行的 text_msg clip)
+ if !text.is_empty() && last.text.len() < MAX_MSG_TEXT {
+ if !last.text.is_empty() {
+ last.text.push_str("\n\n");
+ }
+ last.text.push_str(&text);
+ if last.text.len() > MAX_MSG_TEXT {
+ let (t, _) = clip(&last.text, MAX_MSG_TEXT);
+ last.text = t;
+ last.truncated = true;
+ }
+ }
+ if model.is_some() {
+ last.model = model;
+ }
+ for tc in tools {
+ tool_index.insert(tc.id.clone(), (base, last.tool_calls.len()));
+ last.tool_calls.push(tc);
+ }
+ }
+ Some("toolResult") => {
+ let Some(call_id) = msg.get("toolCallId").and_then(|v| v.as_str()) else {
+ continue;
+ };
+ if let Some(&(mi, ti)) = tool_index.get(call_id) {
+ let tc = &mut p.messages[mi].tool_calls[ti];
+ let text = blocks_text(content);
+ if !text.is_empty() {
+ tc.output = Some(clip(&text, MAX_TOOL_IO).0);
+ }
+ if msg.get("isError").and_then(|v| v.as_bool()) == Some(true) {
+ tc.is_error = true;
+ }
+ }
+ }
+ _ => {
+ p.unknown_lines += 1;
+ }
+ }
+ }
+ // 已知的非内容行:模型/思考档位切换等,静默跳过
+ Some("model_change") | Some("thinking_level_change") => {}
+ _ => {
+ p.unknown_lines += 1;
+ }
+ }
+ }
+ assign_seq(&mut p.messages);
+ Ok(p)
+}
+
+fn build_meta(agent: AgentId, r: &SessionFileRef, p: &PiParse) -> SessionMeta {
+ let native = p.session_id.clone().unwrap_or_else(|| r.native_id.clone());
+ let title = title_from_messages(&p.messages).unwrap_or_else(|| UNTITLED.to_string());
+ SessionMeta {
+ key: format!("{}:{native}", agent.as_str()),
+ id: native,
+ agent,
+ title,
+ project_path: p.cwd.clone(),
+ project_name: project_name_of(&p.cwd),
+ file_path: r.file_path.clone(),
+ created_at: if p.created_at > 0 { p.created_at } else { r.mtime_ms },
+ updated_at: if p.last_ts > 0 { p.last_ts } else { r.mtime_ms },
+ message_count: p.messages.iter().filter(|m| m.kind == MessageKind::Text).count() as i64,
+ size_bytes: r.size,
+ git_branch: None,
+ model: p.model.clone(),
+ tokens_used: p.tokens_used,
+ archived: false,
+ source: None,
+ favorite: false,
+ pinned: false,
+ }
+}
+
+impl AgentAdapter for PiAdapter {
+ fn agent(&self) -> AgentId {
+ self.agent
+ }
+
+ fn detect(&self) -> bool {
+ self.root.is_dir()
+ }
+
+ fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {
+ Ok(list_jsonl_refs(&self.root, self.agent, native_id_of))
+ }
+
+ fn file_ref(&self, path: &Path) -> Option<SessionFileRef> {
+ let mut r = default_file_ref(self.agent, path)?;
+ r.native_id = native_id_of(&r.native_id);
+ Some(r)
+ }
+
+ fn parse_session(&self, r: &SessionFileRef) -> Result<ParsedSession> {
+ let parsed = parse_pi_jsonl(Path::new(&r.file_path))?;
+ let meta = build_meta(self.agent, r, &parsed);
+ let units = units_from_messages(&parsed.messages);
+ Ok(ParsedSession {
+ meta,
+ units,
+ unknown_line_count: parsed.unknown_lines,
+ })
+ }
+
+ fn parse_transcript(&self, r: &SessionFileRef) -> Result<ParsedTranscript> {
+ let parsed = parse_pi_jsonl(Path::new(&r.file_path))?;
+ Ok(ParsedTranscript {
+ meta: build_meta(self.agent, r, &parsed),
+ mainline: parsed.messages,
+ sidechains: Vec::new(),
+ unknown_line_count: parsed.unknown_lines,
+ })
+ }
+
+ fn watch_paths(&self) -> Vec<PathBuf> {
+ if self.detect() {
+ vec![self.root.clone()]
+ } else {
+ Vec::new()
+ }
+ }
+}
diff --git a/crates/wake-core/src/models.rs b/crates/wake-core/src/models.rs
index 4c30b75..eed5b0f 100644
--- a/crates/wake-core/src/models.rs
+++ b/crates/wake-core/src/models.rs
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+/// 变体声明序即侧栏固定展示序(derive Ord 直接按此序比较)——
+/// 新增 agent 一律追加在末尾,老条目位置不动
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum AgentId {
ClaudeCode,
@@ -10,6 +12,11 @@ pub enum AgentId {
Opencode,
Kiro,
Gemini,
+ Pi,
+ Omp,
+ Grok,
+ Kimi,
+ Antigravity,
}
impl AgentId {
@@ -22,6 +29,11 @@ impl AgentId {
AgentId::Opencode => "opencode",
AgentId::Kiro => "kiro",
AgentId::Gemini => "gemini",
+ AgentId::Pi => "pi",
+ AgentId::Omp => "omp",
+ AgentId::Grok => "grok",
+ AgentId::Kimi => "kimi",
+ AgentId::Antigravity => "antigravity",
}
}
@@ -34,6 +46,11 @@ impl AgentId {
"opencode" => Some(AgentId::Opencode),
"kiro" => Some(AgentId::Kiro),
"gemini" => Some(AgentId::Gemini),
+ "pi" => Some(AgentId::Pi),
+ "omp" => Some(AgentId::Omp),
+ "grok" => Some(AgentId::Grok),
+ "kimi" => Some(AgentId::Kimi),
+ "antigravity" => Some(AgentId::Antigravity),
_ => None,
}
}
@@ -47,14 +64,19 @@ impl AgentId {
AgentId::Opencode => "OpenCode",
AgentId::Kiro => "Kiro",
AgentId::Gemini => "Gemini CLI",
+ AgentId::Pi => "Pi",
+ AgentId::Omp => "Oh My Pi",
+ AgentId::Grok => "Grok Build",
+ AgentId::Kimi => "Kimi Code",
+ AgentId::Antigravity => "Antigravity CLI",
}
}
/// agent 品牌图标——wake crate `Assets` 内嵌的 PNG 路径(lobe-icons 素材,
/// 与 kooky 同源)。后缀必须带上(与 SVG 图标同理,漏后缀 = 静默空白)。
- /// Copilot/Cursor/OpenCode 是单色字形(白色+alpha):深色模式用白色版,
- /// 浅色模式用 `-light`(深墨 #2B2A26)版——等效 kooky 的 template 染色;
- /// 彩色品牌(Claude/Codex/Gemini/Kiro)保持原色,两模式通用。
+ /// Copilot/Cursor/OpenCode/Pi/Grok/Kimi 是单色字形(白色+alpha):深色模式
+ /// 用白色版,浅色模式用 `-light`(深墨 #2B2A26)版——等效 kooky 的染色;
+ /// 彩色品牌(Claude/Codex/Gemini/Kiro/Omp/Antigravity)保持原色,两模式通用。
pub fn brand_icon(&self, dark: bool) -> &'static str {
match self {
AgentId::ClaudeCode => "brands/claude-code.png",
@@ -70,6 +92,17 @@ impl AgentId {
}
AgentId::Kiro => "brands/kiro.png",
AgentId::Gemini => "brands/gemini.png",
+ AgentId::Pi => {
+ if dark { "brands/pi.png" } else { "brands/pi-light.png" }
+ }
+ AgentId::Omp => "brands/omp.png",
+ AgentId::Grok => {
+ if dark { "brands/grok.png" } else { "brands/grok-light.png" }
+ }
+ AgentId::Kimi => {
+ if dark { "brands/kimi.png" } else { "brands/kimi-light.png" }
+ }
+ AgentId::Antigravity => "brands/antigravity.png",
}
}
diff --git a/crates/wake-core/src/services/terminal.rs b/crates/wake-core/src/services/terminal.rs
index f61cf98..63ada6a 100644
--- a/crates/wake-core/src/services/terminal.rs
+++ b/crates/wake-core/src/services/terminal.rs
@@ -51,6 +51,16 @@ pub fn cli_path(agent: AgentId) -> Option<String> {
resolve_clis(&[bin]).get(bin).cloned().flatten()
}
+/// 会话级二进制:OpenCode v2 beta 与 v1 并存、装为 `opencode2`,
+/// v2 会话(source = "opencode2")必须由它恢复,其余会话走 agent 默认 bin
+fn session_bin(meta: &SessionMeta) -> Option<&'static str> {
+ if meta.agent == AgentId::Opencode && meta.source.as_deref() == Some("opencode2") {
+ Some("opencode2")
+ } else {
+ agent_bin(meta.agent)
+ }
+}
+
pub fn agent_bin(agent: AgentId) -> Option<&'static str> {
match agent {
AgentId::ClaudeCode => Some("claude"),
@@ -60,6 +70,11 @@ pub fn agent_bin(agent: AgentId) -> Option<&'static str> {
AgentId::Opencode => Some("opencode"),
AgentId::Kiro => Some("kiro"),
AgentId::Gemini => Some("gemini"),
+ AgentId::Pi => Some("pi"),
+ AgentId::Omp => Some("omp"),
+ AgentId::Grok => Some("grok"),
+ AgentId::Kimi => Some("kimi"),
+ AgentId::Antigravity => Some("agy"),
}
}
@@ -69,6 +84,12 @@ fn resume_args(agent: AgentId, id: &str) -> Option<(Vec<String>, bool)> {
AgentId::Codex => Some((vec!["resume".into(), id.into()], false)),
AgentId::Copilot => Some((vec![format!("--resume={id}")], false)),
AgentId::Cursor => Some((vec!["--resume".into(), id.into()], false)),
+ // 参数形制与 kooky 的 resume 集成一致(空格/等号是各家 CLI 实测约束)
+ AgentId::Pi => Some((vec!["--session".into(), id.into()], false)),
+ AgentId::Omp => Some((vec!["--resume".into(), id.into()], false)),
+ AgentId::Grok => Some((vec!["--resume".into(), id.into()], false)),
+ AgentId::Kimi => Some((vec!["--session".into(), id.into()], false)),
+ AgentId::Antigravity => Some((vec![format!("--conversation={id}")], false)),
_ => None,
}
}
@@ -381,13 +402,14 @@ pub fn resume_session_in(meta: &SessionMeta, term: TerminalApp) -> ResumeOutcome
error: Some(format!("Resume isn't supported for {} yet", meta.agent.display_name())),
};
};
- let Some(cli) = cli_path(meta.agent) else {
+ let bin = session_bin(meta);
+ let Some(cli) = bin.and_then(|b| resolve_clis(&[b]).get(b).cloned().flatten()) else {
return ResumeOutcome {
ok: false,
command: String::new(),
error: Some(format!(
"Command {} not found — is it installed?",
- agent_bin(meta.agent).unwrap_or("?")
+ bin.unwrap_or("?")
)),
};
};
@@ -458,5 +480,11 @@ pub fn show_fatal_alert(message: &str) {
}
pub fn reveal_in_finder(path: &str) {
- let _ = Command::new("open").args(["-R", path]).status();
+ // SQLite 型会话是 <db>#<id> 虚拟路径,磁盘上不存在——reveal 库文件本体
+ let p = if Path::new(path).exists() {
+ path
+ } else {
+ path.rsplit_once('#').map(|(db, _)| db).unwrap_or(path)
+ };
+ let _ = Command::new("open").args(["-R", p]).status();
}
diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rs
index d821616..9ed8419 100644
--- a/crates/wake-core/tests/adapter_contracts.rs
+++ b/crates/wake-core/tests/adapter_contracts.rs
@@ -1,24 +1,28 @@
-//! 七家 adapter 的解析契约测试:全部走公开 API(`AgentAdapter` trait),
+//! 十二家 adapter 的解析契约测试:全部走公开 API(`AgentAdapter` trait),
//! fixture 为全合成数据(tests/fixtures/,SQLite 型在临时 HOME 里现建)。
//!
-//! Copilot/OpenCode 的 parse 只认 `~/.copilot`、`~/.local/share/opencode`
-//! (路径在 `new()` 时由 HOME 解析),Gemini 的 cwd 反查读 `~/.gemini/projects.json`,
-//! 因此测试统一把 HOME 指到临时假家目录(OnceLock 保证 set_var 先于一切
-//! adapter 构造,且只发生一次)。文件型 agent 的 SessionFileRef 直接指向
-//! fixture 路径,不依赖 HOME。
+//! Copilot/OpenCode/Antigravity 的 parse 只认各自 HOME 下的库,Gemini 的 cwd
+//! 反查读 `~/.gemini/projects.json`,Kimi 的 cwd 反查读
+//! `~/.kimi-code/session_index.jsonl`,因此测试统一把 HOME 指到临时假家目录
+//! (OnceLock 保证 set_var 先于一切 adapter 构造,且只发生一次)。文件型
+//! agent 的 SessionFileRef 直接指向 fixture 路径,不依赖 HOME。
use std::collections::HashSet;
use std::fs;
use std::path::{Path, PathBuf};
use std::sync::OnceLock;
+use wake_core::adapters::antigravity::AntigravityAdapter;
use wake_core::adapters::claude::ClaudeAdapter;
use wake_core::adapters::codex::CodexAdapter;
use wake_core::adapters::copilot::CopilotAdapter;
use wake_core::adapters::cursor::CursorAdapter;
use wake_core::adapters::gemini::GeminiAdapter;
+use wake_core::adapters::grok::GrokAdapter;
+use wake_core::adapters::kimi::KimiAdapter;
use wake_core::adapters::kiro::KiroAdapter;
use wake_core::adapters::opencode::OpencodeAdapter;
+use wake_core::adapters::pi::PiAdapter;
use wake_core::adapters::AgentAdapter;
use wake_core::models::*;
@@ -27,6 +31,7 @@ use wake_core::models::*;
struct TestEnv {
copilot_db: PathBuf,
opencode_db: PathBuf,
+ antigravity_db: PathBuf,
/// 假 HOME 目录本体,持有 TempDir 保证整个测试进程期间不被清理
_home: tempfile::TempDir,
}
@@ -60,10 +65,29 @@ fn setup() -> &'static TestEnv {
)
.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");
+
std::env::set_var("HOME", home.path());
TestEnv {
copilot_db,
opencode_db,
+ antigravity_db,
_home: home,
}
})
@@ -95,8 +119,11 @@ fn build_copilot_db(path: &Path) {
.expect("populate copilot fixture db");
}
-/// OpenCode `opencode.db` 最小同构库:session + message + part。
-/// msg-a 只有 synthetic part(应归 Meta);msg-c 带 reasoning/tool/unknown part。
+/// 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(
@@ -105,14 +132,14 @@ fn build_opencode_db(path: &Path) {
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
+ 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);
+ 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),
@@ -125,11 +152,61 @@ fn build_opencode_db(path: &Path) {
('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");
}
+/// 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 {
@@ -209,6 +286,28 @@ fn gemini_ref() -> SessionFileRef {
"session-2026-08-04T12-00-00",
)
}
+/// pi 与 omp 同构,同一份 fixture 两个 agent 复用(仅 root/AgentId 不同)
+fn pi_ref(agent: AgentId) -> SessionFileRef {
+ fs_ref(
+ agent,
+ &fixture("pi/agent/sessions/--Users-tester-Github-wakefx--/2026-08-06T10-00-00-000Z_66666666-aaaa-bbbb-cccc-000000000006.jsonl"),
+ "66666666-aaaa-bbbb-cccc-000000000006",
+ )
+}
+fn grok_ref() -> SessionFileRef {
+ fs_ref(
+ AgentId::Grok,
+ &fixture("grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/updates.jsonl"),
+ "77777777-aaaa-bbbb-cccc-000000000007",
+ )
+}
+fn kimi_ref() -> SessionFileRef {
+ fs_ref(
+ AgentId::Kimi,
+ &fixture("kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/agents/main/wire.jsonl"),
+ "session_88888888-aaaa-bbbb-cccc-000000000008",
+ )
+}
// ---------------------------------------------------------------- 每家解析
@@ -434,9 +533,10 @@ fn kiro_parse_contract() {
let s = adapter.parse_session(&r).expect("kiro parse_session");
let t = adapter.parse_transcript(&r).expect("kiro parse_transcript");
- // .json 边车给标题与 cwd
+ // .json 边车给标题、cwd 与模型(session_state.rts_model_state.model_info)
assert_eq!(s.meta.title, "Kiro QR session");
assert_eq!(s.meta.project_path, "/Users/tester/Github/wakefx");
+ assert_eq!(s.meta.model.as_deref(), Some("claude-sonnet-4"));
assert_eq!(s.meta.created_at, ms("2026-08-03T08:00:00Z"));
assert_eq!(s.meta.updated_at, ms("2026-08-03T08:30:00Z")); // 边车晚于消息时间
assert_eq!(s.meta.message_count, 2);
@@ -481,6 +581,211 @@ fn gemini_parse_contract() {
assert_eq!(s.units.iter().map(|u| u.seq).collect::<Vec<_>>(), vec![0, 1]);
}
+#[test]
+fn opencode_v2_parse_contract() {
+ let env = setup();
+ let adapter = OpencodeAdapter::new();
+
+ // 两代表 UNION:v2 会话 + 仅存于 v1 表的会话都在列表里,不重不漏
+ let ids: HashSet<String> = adapter
+ .list_session_files()
+ .expect("opencode list")
+ .into_iter()
+ .map(|r| r.native_id)
+ .collect();
+ assert!(ids.contains("ocv2-0001"), "v2 会话应在列表");
+ assert!(ids.contains("oc-0001"), "仅存于 v1 表的会话应被 UNION 回捞");
+
+ let r = db_ref(AgentId::Opencode, &env.opencode_db, "ocv2-0001");
+ let s = adapter.parse_session(&r).expect("opencode v2 parse_session");
+ let t = adapter.parse_transcript(&r).expect("opencode v2 parse_transcript");
+
+ assert_eq!(s.meta.title, "OpenCode v2 greeting");
+ assert_eq!(s.meta.model.as_deref(), Some("nemotron-3.5-lightning-free"));
+ assert_eq!(s.meta.source.as_deref(), Some("opencode2")); // beta 版本号 → 徽章/resume 换 bin
+ assert_eq!(s.meta.tokens_used, Some(17));
+ assert_eq!(s.meta.created_at, 1786100000000);
+ // wibble-row(未知消息 type)+ wibble-block(未知内容块)各计一次
+ assert_eq!(s.unknown_line_count, 2);
+
+ // user 的 text 在 data 顶层;synthetic 行归 Meta;assistant 的 content 块数组
+ assert_eq!(
+ roles_kinds(&t.mainline),
+ vec![
+ (Role::User, MessageKind::Text),
+ (Role::User, MessageKind::Meta),
+ (Role::Assistant, MessageKind::Text),
+ ]
+ );
+ assert_eq!(t.mainline[0].text, "OpenCode v2 看看二维码组件");
+ let a = &t.mainline[2];
+ assert_eq!(a.text, "看完了,组件没有泄漏。");
+ assert!(a.thinking.as_deref().unwrap_or_default().contains("扫描组件"));
+ assert_eq!(a.model.as_deref(), Some("nemotron-3.5-lightning-free"));
+ assert_eq!(s.units.iter().map(|u| u.seq).collect::<Vec<_>>(), vec![0, 2]);
+
+ // 仅存于 v1 表的会话不带 v2 标记(resume 走 v1 二进制)
+ let s1 = adapter
+ .parse_session(&db_ref(AgentId::Opencode, &env.opencode_db, "oc-0001"))
+ .expect("opencode v1 parse_session");
+ assert_eq!(s1.meta.source, None);
+}
+
+#[test]
+fn pi_parse_contract() {
+ setup();
+ let adapter = PiAdapter::new();
+ // file_ref 是公开 API:<timestamp>_<uuid>.jsonl 应剥出 uuid 作 native_id
+ let path = fixture("pi/agent/sessions/--Users-tester-Github-wakefx--/2026-08-06T10-00-00-000Z_66666666-aaaa-bbbb-cccc-000000000006.jsonl");
+ let r = adapter.file_ref(&path).expect("pi file_ref");
+ assert_eq!(r.native_id, "66666666-aaaa-bbbb-cccc-000000000006");
+
+ let s = adapter.parse_session(&r).expect("pi parse_session");
+ let t = adapter.parse_transcript(&r).expect("pi parse_transcript");
+
+ assert_eq!(s.meta.title, "Pi 查一下二维码组件的 useEffect() 清理");
+ assert_eq!(s.meta.key, "pi:66666666-aaaa-bbbb-cccc-000000000006");
+ // cwd 来自 session 首行,不反推有损编码目录名
+ assert_eq!(s.meta.project_path, "/Users/tester/Github/wakefx");
+ assert_eq!(s.meta.model.as_deref(), Some("gpt-5.5"));
+ assert_eq!(s.meta.tokens_used, Some(4300)); // 最后一条 assistant 的 totalTokens
+ assert_eq!(s.meta.message_count, 2);
+ assert_eq!(s.meta.created_at, ms("2026-08-06T10:00:00Z"));
+ assert_eq!(s.meta.updated_at, ms("2026-08-06T10:00:12Z"));
+ // wibble-line 计 unknown;model_change/thinking_level_change 不计
+ assert_eq!(s.unknown_line_count, 1);
+
+ // 连续 assistant 行(中间只隔 toolResult)合并成一条
+ assert_eq!(
+ roles_kinds(&t.mainline),
+ vec![(Role::User, MessageKind::Text), (Role::Assistant, MessageKind::Text)]
+ );
+ let a = &t.mainline[1];
+ assert_eq!(a.text, "找到泄漏点,已补清理回调。");
+ assert_eq!(a.tool_calls.len(), 1);
+ assert_eq!(a.tool_calls[0].name, "bash");
+ // toolResult 是独立 role 行,按 toolCallId 回填
+ assert!(a.tool_calls[0].output.as_deref().unwrap_or_default().contains("QrScanner"));
+ assert!(!a.tool_calls[0].is_error);
+ assert_eq!(s.units.iter().map(|u| u.seq).collect::<Vec<_>>(), vec![0, 1]);
+
+ // omp 是 pi 的 fork,同一解析核心,只有 key 前缀不同
+ let omp = PiAdapter::omp();
+ let s2 = omp.parse_session(&pi_ref(AgentId::Omp)).expect("omp parse_session");
+ assert_eq!(s2.meta.agent, AgentId::Omp);
+ assert_eq!(s2.meta.key, "omp:66666666-aaaa-bbbb-cccc-000000000006");
+ assert_eq!(s2.meta.title, "Pi 查一下二维码组件的 useEffect() 清理");
+}
+
+#[test]
+fn grok_parse_contract() {
+ setup();
+ let adapter = GrokAdapter::new();
+ // file_ref 是公开 API:只认 updates.jsonl,native_id 取会话目录名
+ let path = fixture("grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/updates.jsonl");
+ let r = adapter.file_ref(&path).expect("grok file_ref");
+ assert_eq!(r.native_id, "77777777-aaaa-bbbb-cccc-000000000007");
+ assert!(adapter.file_ref(&path.with_file_name("chat_history.jsonl")).is_none());
+
+ let s = adapter.parse_session(&r).expect("grok parse_session");
+ let t = adapter.parse_transcript(&r).expect("grok parse_transcript");
+
+ assert_eq!(s.meta.title, "Grok QR scan cleanup"); // summary.json 标题优先
+ assert_eq!(s.meta.project_path, "/Users/tester/Github/wakefx"); // info.cwd
+ assert_eq!(s.meta.git_branch.as_deref(), Some("feat/qr"));
+ assert_eq!(s.meta.model.as_deref(), Some("grok-composer-2.5-fast"));
+ assert_eq!(s.meta.created_at, ms("2026-08-06T11:00:00Z"));
+ assert_eq!(s.meta.updated_at, ms("2026-08-06T11:20:00Z"));
+ assert_eq!(s.meta.message_count, 2);
+ assert_eq!(s.unknown_line_count, 1); // wibble_update;auto_compact_started 不计
+
+ // chunk 流按角色段合并:两条 user chunk 拼成一条,thought/message/tool 全并入一条 assistant
+ assert_eq!(
+ roles_kinds(&t.mainline),
+ vec![(Role::User, MessageKind::Text), (Role::Assistant, MessageKind::Text)]
+ );
+ assert_eq!(t.mainline[0].text, "Grok 看看二维码扫描,重点 useEffect() 清理");
+ assert_eq!(t.mainline[0].timestamp, Some(1786014300000));
+ let a = &t.mainline[1];
+ assert_eq!(a.text, "已定位泄漏,补了清理回调。");
+ assert!(a.thinking.as_deref().unwrap_or_default().contains("effect 泄漏"));
+ assert_eq!(a.tool_calls.len(), 1);
+ assert_eq!(a.tool_calls[0].name, "Grep");
+ // tool_call_update 的 content 文本回填 output;字节数组 rawOutput 不碰
+ assert!(a.tool_calls[0].output.as_deref().unwrap_or_default().contains("found 2 matches"));
+ assert!(!a.tool_calls[0].is_error);
+ assert_eq!(s.units.iter().map(|u| u.seq).collect::<Vec<_>>(), vec![0, 1]);
+}
+
+#[test]
+fn kimi_parse_contract() {
+ setup();
+ let adapter = KimiAdapter::new();
+ // file_ref 是公开 API:只认 agents/main/wire.jsonl,native_id 取会话目录名
+ let path = fixture("kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/agents/main/wire.jsonl");
+ let r = adapter.file_ref(&path).expect("kimi file_ref");
+ assert_eq!(r.native_id, "session_88888888-aaaa-bbbb-cccc-000000000008");
+
+ let s = adapter.parse_session(&r).expect("kimi parse_session");
+ let t = adapter.parse_transcript(&r).expect("kimi parse_transcript");
+
+ assert_eq!(s.meta.title, "Kimi QR fix"); // state.json 标题优先
+ // cwd 靠假 HOME 的 session_index.jsonl 反查(目录名 hash 不可反推)
+ assert_eq!(s.meta.project_path, "/Users/tester/Github/wakefx");
+ assert_eq!(s.meta.created_at, ms("2026-08-06T12:00:00Z"));
+ assert_eq!(s.meta.updated_at, ms("2026-08-06T12:30:00Z"));
+ assert_eq!(s.meta.message_count, 2);
+ // wibble.record 计 unknown;metadata/config/tools/turn.*/append_loop_event 不计
+ assert_eq!(s.unknown_line_count, 1);
+
+ assert_eq!(
+ roles_kinds(&t.mainline),
+ vec![(Role::User, MessageKind::Text), (Role::Assistant, MessageKind::Text)]
+ );
+ assert_eq!(t.mainline[0].text, "Kimi 修一下二维码组件的 useEffect() 内存泄漏");
+ assert!(t.mainline[1].text.contains("QrScanner"));
+ assert_eq!(s.units.iter().map(|u| u.seq).collect::<Vec<_>>(), vec![0, 1]);
+
+ // "New Session" 是占位标题,必须回退首条用户消息
+ let placeholder = fs_ref(
+ AgentId::Kimi,
+ &fixture("kimi/sessions/wd_wakefx_abc123/session_99999999-aaaa-bbbb-cccc-000000000009/agents/main/wire.jsonl"),
+ "session_99999999-aaaa-bbbb-cccc-000000000009",
+ );
+ let s2 = adapter.parse_session(&placeholder).expect("kimi placeholder parse");
+ assert_eq!(s2.meta.title, "占位标题会话应回退到这句");
+}
+
+#[test]
+fn antigravity_parse_contract() {
+ let env = setup();
+ let adapter = AntigravityAdapter::new();
+
+ // 子会话(parent_conversation_id 非空)不进列表
+ let refs = adapter.list_session_files().expect("antigravity list");
+ assert_eq!(refs.len(), 1);
+ assert_eq!(refs[0].native_id, "ag-0001");
+
+ let r = db_ref(AgentId::Antigravity, &env.antigravity_db, "ag-0001");
+ let s = adapter.parse_session(&r).expect("antigravity parse_session");
+ let t = adapter.parse_transcript(&r).expect("antigravity parse_transcript");
+
+ assert_eq!(s.meta.title, "QR overlay polish"); // 标题在 preview 列
+ assert_eq!(s.meta.project_path, "/Users/tester/Github/wakefx"); // file:// URI 解码
+ assert_eq!(s.meta.project_name, "wakefx");
+ // 带 +00:00 偏移的 datetime 必须解析成功(不能落到 0/mtime 兜底)
+ assert_eq!(s.meta.created_at, ms("2026-08-06T13:00:00Z"));
+ assert_eq!(s.meta.message_count, 12); // step_count
+ assert!(s.meta.file_path.ends_with("#ag-0001")); // 虚拟路径
+
+ // 正文加密:唯一一条 System 消息承载 preview 与说明,FTS 搜得到 preview
+ assert_eq!(roles_kinds(&t.mainline), vec![(Role::System, MessageKind::Text)]);
+ assert!(t.mainline[0].text.contains("QR overlay polish"));
+ assert!(t.mainline[0].text.contains("encrypted"));
+ assert_eq!(s.units.len(), 1);
+ assert!(s.units[0].text.contains("QR overlay polish"));
+}
+
// ---------------------------------------------------------------- seq 契约
/// 跨文件不变量 1:FTS 单元的 seq 必须能在详情页 mainline 中找到同号消息,
@@ -510,7 +815,7 @@ fn assert_seq_contract(adapter: &dyn AgentAdapter, r: &SessionFileRef) {
}
#[test]
-fn seq_contract_holds_for_all_seven_agents() {
+fn seq_contract_holds_for_all_agents() {
let env = setup();
let checks: Vec<(Box<dyn AgentAdapter>, SessionFileRef)> = vec![
(Box::new(ClaudeAdapter::new()), claude_ref()),
@@ -520,6 +825,11 @@ fn seq_contract_holds_for_all_seven_agents() {
(Box::new(OpencodeAdapter::new()), db_ref(AgentId::Opencode, &env.opencode_db, "oc-0001")),
(Box::new(KiroAdapter::new()), kiro_ref()),
(Box::new(GeminiAdapter::new()), gemini_ref()),
+ (Box::new(PiAdapter::new()), pi_ref(AgentId::Pi)),
+ (Box::new(PiAdapter::omp()), pi_ref(AgentId::Omp)),
+ (Box::new(GrokAdapter::new()), grok_ref()),
+ (Box::new(KimiAdapter::new()), kimi_ref()),
+ (Box::new(AntigravityAdapter::new()), db_ref(AgentId::Antigravity, &env.antigravity_db, "ag-0001")),
];
for (adapter, r) in &checks {
assert_seq_contract(adapter.as_ref(), r);
diff --git a/crates/wake-core/tests/fixtures/grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/summary.json b/crates/wake-core/tests/fixtures/grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/summary.json
new file mode 100644
index 0000000..98046fb
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/summary.json
@@ -0,0 +1,18 @@
+{
+ "info": {
+ "id": "77777777-aaaa-bbbb-cccc-000000000007",
+ "cwd": "/Users/tester/Github/wakefx"
+ },
+ "session_summary": "Grok QR scan cleanup",
+ "created_at": "2026-08-06T11:00:00.000000Z",
+ "updated_at": "2026-08-06T11:20:00.000000Z",
+ "num_messages": 9,
+ "num_chat_messages": 2,
+ "current_model_id": "grok-composer-2.5-fast",
+ "chat_format_version": 1,
+ "git_root_dir": "/Users/tester/Github/wakefx/",
+ "head_branch": "feat/qr",
+ "grok_home": "/Users/tester/.grok",
+ "generated_title": "Grok QR scan cleanup",
+ "agent_name": "cursor"
+}
diff --git a/crates/wake-core/tests/fixtures/grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/updates.jsonl b/crates/wake-core/tests/fixtures/grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/updates.jsonl
new file mode 100644
index 0000000..c271132
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/grok/sessions/%2FUsers%2Ftester%2FGithub%2Fwakefx/77777777-aaaa-bbbb-cccc-000000000007/updates.jsonl
@@ -0,0 +1,9 @@
+{"timestamp":1786014300,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"user_message_chunk","content":{"type":"text","text":"Grok 看看二维码扫描,"}}}}
+{"timestamp":1786014301,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"user_message_chunk","content":{"type":"text","text":"重点 useEffect() 清理"}}}}
+{"timestamp":1786014302,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"agent_thought_chunk","content":{"type":"text","text":"用户要查扫描组件的 effect 泄漏"}}}}
+{"timestamp":1786014303,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"tool_call","toolCallId":"call-grok-1","title":"Grep","rawInput":{"pattern":"useEffect","glob":"**/*.tsx"}}}}
+{"timestamp":1786014304,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"tool_call_update","toolCallId":"call-grok-1","status":"completed","content":[{"type":"content","content":{"type":"text","text":"found 2 matches in QrScanner.tsx"}}],"rawOutput":{"type":"GrepSearch","stdout":[102,111,111]}}}}
+{"timestamp":1786014305,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"已定位泄漏,"}}}}
+{"timestamp":1786014306,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"补了清理回调。"}}}}
+{"timestamp":1786014307,"method":"_x.ai/session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"auto_compact_started","tokens_used":100,"context_window":200000}}}
+{"timestamp":1786014308,"method":"session/update","params":{"sessionId":"77777777-aaaa-bbbb-cccc-000000000007","update":{"sessionUpdate":"wibble_update"}}}
diff --git a/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/agents/main/wire.jsonl b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/agents/main/wire.jsonl
new file mode 100644
index 0000000..2d302e3
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/agents/main/wire.jsonl
@@ -0,0 +1,8 @@
+{"type":"metadata","protocol_version":"1.3","created_at":1786200000000}
+{"type":"config.update","profileName":"agent","systemPrompt":"You are Kimi Code CLI, an interactive general AI agent."}
+{"type":"tools.set_active_tools","names":["Read","Write","Bash"]}
+{"type":"turn.prompt","input":[{"type":"text","text":"Kimi 修一下二维码组件的 useEffect() 内存泄漏"}],"origin":{"kind":"user"}}
+{"type":"context.append_message","message":{"role":"assistant","content":[{"type":"text","text":"已定位 QrScanner 泄漏并补了清理回调。"}]}}
+{"type":"context.append_loop_event","event":{"type":"tool.result","toolCallId":"k1","result":{"output":"ok","isError":false}}}
+{"type":"turn.ended","turnId":1,"reason":"completed"}
+{"type":"wibble.record","x":1}
diff --git a/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/state.json b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/state.json
new file mode 100644
index 0000000..3a37693
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_88888888-aaaa-bbbb-cccc-000000000008/state.json
@@ -0,0 +1,14 @@
+{
+ "createdAt": "2026-08-06T12:00:00.000Z",
+ "updatedAt": "2026-08-06T12:30:00.000Z",
+ "title": "Kimi QR fix",
+ "isCustomTitle": true,
+ "agents": {
+ "main": {
+ "homedir": "…/agents/main",
+ "type": "main",
+ "parentAgentId": null
+ }
+ },
+ "custom": {}
+}
diff --git a/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_99999999-aaaa-bbbb-cccc-000000000009/agents/main/wire.jsonl b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_99999999-aaaa-bbbb-cccc-000000000009/agents/main/wire.jsonl
new file mode 100644
index 0000000..4333aa4
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_99999999-aaaa-bbbb-cccc-000000000009/agents/main/wire.jsonl
@@ -0,0 +1,2 @@
+{"type":"metadata","protocol_version":"1.3","created_at":1786200600000}
+{"type":"turn.prompt","input":[{"type":"text","text":"占位标题会话应回退到这句"}],"origin":{"kind":"user"}}
diff --git a/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_99999999-aaaa-bbbb-cccc-000000000009/state.json b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_99999999-aaaa-bbbb-cccc-000000000009/state.json
new file mode 100644
index 0000000..fb712fa
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/kimi/sessions/wd_wakefx_abc123/session_99999999-aaaa-bbbb-cccc-000000000009/state.json
@@ -0,0 +1,14 @@
+{
+ "createdAt": "2026-08-06T12:10:00.000Z",
+ "updatedAt": "2026-08-06T12:11:00.000Z",
+ "title": "New Session",
+ "isCustomTitle": false,
+ "agents": {
+ "main": {
+ "homedir": "…/agents/main",
+ "type": "main",
+ "parentAgentId": null
+ }
+ },
+ "custom": {}
+}
diff --git a/crates/wake-core/tests/fixtures/kiro/sessions/cli/44444444-aaaa-bbbb-cccc-000000000004.json b/crates/wake-core/tests/fixtures/kiro/sessions/cli/44444444-aaaa-bbbb-cccc-000000000004.json
index fa9c527..697e6b8 100644
--- a/crates/wake-core/tests/fixtures/kiro/sessions/cli/44444444-aaaa-bbbb-cccc-000000000004.json
+++ b/crates/wake-core/tests/fixtures/kiro/sessions/cli/44444444-aaaa-bbbb-cccc-000000000004.json
@@ -3,5 +3,15 @@
"cwd": "/Users/tester/Github/wakefx",
"title": "Kiro QR session",
"created_at": "2026-08-03T08:00:00Z",
- "updated_at": "2026-08-03T08:30:00Z"
+ "updated_at": "2026-08-03T08:30:00Z",
+ "session_state": {
+ "version": "v1",
+ "rts_model_state": {
+ "model_info": {
+ "model_name": "claude-sonnet-4",
+ "model_id": "claude-sonnet-4",
+ "context_window_tokens": 200000
+ }
+ }
+ }
}
diff --git a/crates/wake-core/tests/fixtures/pi/agent/sessions/--Users-tester-Github-wakefx--/2026-08-06T10-00-00-000Z_66666666-aaaa-bbbb-cccc-000000000006.jsonl b/crates/wake-core/tests/fixtures/pi/agent/sessions/--Users-tester-Github-wakefx--/2026-08-06T10-00-00-000Z_66666666-aaaa-bbbb-cccc-000000000006.jsonl
new file mode 100644
index 0000000..761ce61
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/pi/agent/sessions/--Users-tester-Github-wakefx--/2026-08-06T10-00-00-000Z_66666666-aaaa-bbbb-cccc-000000000006.jsonl
@@ -0,0 +1,8 @@
+{"type":"session","version":3,"id":"66666666-aaaa-bbbb-cccc-000000000006","timestamp":"2026-08-06T10:00:00.000Z","cwd":"/Users/tester/Github/wakefx"}
+{"type":"model_change","id":"m1","parentId":null,"timestamp":"2026-08-06T10:00:01.000Z","provider":"openai-codex","modelId":"gpt-5.5"}
+{"type":"thinking_level_change","id":"t1","parentId":"m1","timestamp":"2026-08-06T10:00:01.100Z","thinkingLevel":"medium"}
+{"type":"message","id":"u1","parentId":"t1","timestamp":"2026-08-06T10:00:05.000Z","message":{"role":"user","content":[{"type":"text","text":"Pi 查一下二维码组件的 useEffect() 清理"}],"timestamp":1786010405000}}
+{"type":"message","id":"a1","parentId":"u1","timestamp":"2026-08-06T10:00:08.000Z","message":{"role":"assistant","content":[{"type":"toolCall","id":"call_pi_1","name":"bash","arguments":{"command":"rg useEffect src/"}}],"api":"openai-codex-responses","provider":"openai-codex","model":"gpt-5.5","usage":{"input":100,"output":20,"cacheRead":0,"cacheWrite":0,"totalTokens":4242}}}
+{"type":"message","id":"r1","parentId":"a1","timestamp":"2026-08-06T10:00:09.000Z","message":{"role":"toolResult","toolCallId":"call_pi_1","toolName":"bash","content":[{"type":"text","text":"src/QrScanner.tsx: useEffect(() => watch())"}]}}
+{"type":"message","id":"a2","parentId":"r1","timestamp":"2026-08-06T10:00:12.000Z","message":{"role":"assistant","content":[{"type":"text","text":"找到泄漏点,已补清理回调。"}],"model":"gpt-5.5","usage":{"input":200,"output":30,"cacheRead":0,"cacheWrite":0,"totalTokens":4300}}}
+{"type":"wibble-line","id":"x1"}
diff --git a/crates/wake/assets/brands/antigravity.png b/crates/wake/assets/brands/antigravity.png
new file mode 100644
index 0000000..9f9fd8d
Binary files /dev/null and b/crates/wake/assets/brands/antigravity.png differ
diff --git a/crates/wake/assets/brands/grok-light.png b/crates/wake/assets/brands/grok-light.png
new file mode 100644
index 0000000..7a24a67
Binary files /dev/null and b/crates/wake/assets/brands/grok-light.png differ
diff --git a/crates/wake/assets/brands/grok.png b/crates/wake/assets/brands/grok.png
new file mode 100644
index 0000000..04f4b59
Binary files /dev/null and b/crates/wake/assets/brands/grok.png differ
diff --git a/crates/wake/assets/brands/kimi-light.png b/crates/wake/assets/brands/kimi-light.png
new file mode 100644
index 0000000..4914d48
Binary files /dev/null and b/crates/wake/assets/brands/kimi-light.png differ
diff --git a/crates/wake/assets/brands/kimi.png b/crates/wake/assets/brands/kimi.png
new file mode 100644
index 0000000..271213a
Binary files /dev/null and b/crates/wake/assets/brands/kimi.png differ
diff --git a/crates/wake/assets/brands/omp.png b/crates/wake/assets/brands/omp.png
new file mode 100644
index 0000000..ccc93a5
Binary files /dev/null and b/crates/wake/assets/brands/omp.png differ
diff --git a/crates/wake/assets/brands/pi-light.png b/crates/wake/assets/brands/pi-light.png
new file mode 100644
index 0000000..fcedf44
Binary files /dev/null and b/crates/wake/assets/brands/pi-light.png differ
diff --git a/crates/wake/assets/brands/pi.png b/crates/wake/assets/brands/pi.png
new file mode 100644
index 0000000..ebaaa2b
Binary files /dev/null and b/crates/wake/assets/brands/pi.png differ
diff --git a/crates/wake/src/assets.rs b/crates/wake/src/assets.rs
index 5fdae52..4889426 100644
--- a/crates/wake/src/assets.rs
+++ b/crates/wake/src/assets.rs
@@ -45,6 +45,14 @@ brands!(
"opencode-light",
"kiro",
"gemini",
+ "pi",
+ "pi-light",
+ "omp",
+ "grok",
+ "grok-light",
+ "kimi",
+ "kimi-light",
+ "antigravity",
);
icons!(
diff --git a/crates/wake/src/format.rs b/crates/wake/src/format.rs
index baeaee8..c185143 100644
--- a/crates/wake/src/format.rs
+++ b/crates/wake/src/format.rs
@@ -46,6 +46,31 @@ pub fn fmt_tokens(n: Option<i64>) -> String {
}
}
+/// 会话文件路径的展示形态(详情页路径行):SQLite 虚拟路径剥 `#<id>`、
+/// HOME 缩成 `~`、深路径折叠中段(根目录 + … + 文件名)。
+/// 仅用于展示——Reveal in Finder 仍传原始完整路径。
+pub fn display_file_path(path: &str) -> String {
+ // 虚拟路径 <db>#<id>:id 不是路径的一部分,展示到库文件为止
+ let p = path
+ .rsplit_once('#')
+ .filter(|(db, _)| db.ends_with(".db"))
+ .map(|(db, _)| db)
+ .unwrap_or(path);
+ let tilde = dirs::home_dir()
+ .map(|h| h.to_string_lossy().to_string())
+ .filter(|h| !h.is_empty() && p.starts_with(h.as_str()))
+ .map(|h| format!("~{}", &p[h.len()..]))
+ .unwrap_or_else(|| p.to_string());
+ let parts: Vec<&str> = tilde.split('/').collect();
+ match (parts.first(), parts.get(1), parts.last()) {
+ // 超过 根/次级/…/文件 四段的深路径折叠中段
+ (Some(root), Some(second), Some(file)) if parts.len() > 4 => {
+ format!("{root}/{second}/…/{file}")
+ }
+ _ => tilde,
+ }
+}
+
/// 首行截断预览
pub fn one_line(s: &str, max_chars: usize) -> String {
let joined = s.split_whitespace().collect::<Vec<_>>().join(" ");
diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rs
index b5511f7..0873dd5 100644
--- a/crates/wake/src/workbench.rs
+++ b/crates/wake/src/workbench.rs
@@ -45,7 +45,7 @@ use wake_core::services::{exporter, terminal};
use wake_core::watcher::{start_watcher, SessionWatcher};
use crate::ui::*;
-use crate::format::{abs_date, fmt_tokens, one_line, relative_time};
+use crate::format::{abs_date, display_file_path, fmt_tokens, one_line, relative_time};
actions!(wake, [ToggleSearch, RefreshSessions, PaletteUp, PaletteDown]);
@@ -574,7 +574,9 @@ impl Workbench {
.into_iter()
.filter_map(|(k, v)| AgentId::from_str(&k).map(|a| (a, v)))
.collect();
- counts.sort_by(|a, b| b.1.cmp(&a.1));
+ // 固定排序(AgentId 声明序):按会话数排会在平局时抖动
+ // (HashMap 迭代无序),每次刷新侧栏顺序都会跳
+ counts.sort_by_key(|&(a, _)| a);
self.agent_counts = counts;
self.projects = self.store.list_projects().unwrap_or_default();
self.starred_count = self.store.starred_count().unwrap_or(0);
@@ -2068,7 +2070,14 @@ impl Workbench {
.when_some(
meta.source.clone().filter(|s| !s.is_empty()),
|this, source| {
- this.child(outline_badge(source, theme.success))
+ // opencode2 是版本代际标记而非发起平台,
+ // 用 primary 蓝与 via 徽章(绿)区分
+ let color = if source == "opencode2" {
+ theme.primary
+ } else {
+ theme.success
+ };
+ this.child(outline_badge(source, color))
},
)
.child(div().min_w_0().truncate().child(stats.join(" · ")))
@@ -2087,6 +2096,23 @@ impl Workbench {
.text_color(theme.muted_foreground)
.truncate()
.child(times.join(" · "))
+ })
+ .child({
+ // 会话文件路径(header 末行):展示用折叠形态(~ 缩写 +
+ // 中段省略),点击在 Finder 中显示(传原始完整路径)
+ let file_path = meta.file_path.clone();
+ h_flex()
+ .id("detail-file-path")
+ .gap_1p5()
+ .text_size(FONT_LABEL)
+ .text_color(theme.muted_foreground)
+ .cursor_pointer()
+ .hover(|s| s.text_colored(theme.foreground, FONT_LABEL))
+ .on_click(move |_, _, _| {
+ terminal::reveal_in_finder(&file_path);
+ })
+ .child(icon("icons/file-text.svg").with_size(px(12.)).flex_shrink_0())
+ .child(div().min_w_0().truncate().child(display_file_path(&meta.file_path)))
}),
)
.child(if detail.loading {