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 DeepSeek Harness (dsh) adapter; Kooky CLI for non-roster agents

Corey Chiuca7e6bac03f8
diff --git a/PRODUCT.md b/PRODUCT.md
index e902113..b3fab64 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 21 测试 + CI + pre-commit,合成 fixture)。
+已实现:十三家 adapter、FTS5 trigram 搜索(<3 码点 LIKE 降级)、**搜索跳转定位**(2026-08-18:⌘K 命中直达详情页对应消息并高亮,seq 契约保证)、详情页逐消息渲染(气泡/工具折叠簇/thinking/tree-sitter 高亮;2026-08-17 由整篇 markdown 方案升级)、恢复/收藏/置顶/导出/删除(废纸篓+墓碑)、文件监听增量、测试套件(wake-core 23 测试 + CI + pre-commit,合成 fixture)。
约束:对 agent 数据目录只读;绝不写 Codex 的 SQLite;不读凭证;GPUI 无 SF Symbols(图标用 lucide SVG 自备)。
-已支持十二家 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 本机零会话格式未实测。
+已支持十三家 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 正文加密仅元数据卡片)+ DeepSeek Harness(dsh,2026-08-20,zstd 事件日志透明解压;格式由源码推断,当天用户跑出真实会话完成首验)。做不了的:Cursor IDE chats 正文加密,Windsurf/Trae 加密,Amp/Factory(Droid)/Warp 云端无本地数据,Reasonix 本机零会话格式未实测。
## Brand Commitments
diff --git a/README.md b/README.md
index 55a2808..fdefcff 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
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).
-Your agent history is scattered across `~/.claude`, `~/.codex`, and nine other private directories. Wake reads them all, read-only, and gives you one fast window into it. Everything stays local: no network requests, ever.
+Your agent history is scattered across `~/.claude`, `~/.codex`, and ten other private directories. Wake reads them all, read-only, and gives you one fast window into it. Everything stays local: no network requests, ever.
![Wake — sessions list and transcript view](imgs/screenshot-1.webp)
@@ -40,6 +40,7 @@ Your agent history is scattered across `~/.claude`, `~/.codex`, and nine other p
| 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) | — | — |
+| DeepSeek Harness (`dsh`) | `~/.dsh/sessions/**/session.jsonl[.zstd]` (zstd-compressed logs are decoded transparently) | ✅ | — |
**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.
@@ -90,7 +91,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
+│ │ # pi / omp / grok / kimi / antigravity / dsh
│ │ # (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
diff --git a/crates/wake-core/Cargo.toml b/crates/wake-core/Cargo.toml
index bd0026d..ff676f3 100644
--- a/crates/wake-core/Cargo.toml
+++ b/crates/wake-core/Cargo.toml
@@ -13,6 +13,7 @@ dirs.workspace = true
walkdir.workspace = true
notify.workspace = true
chrono.workspace = true
+zstd.workspace = true
[dev-dependencies]
tempfile = "3"
diff --git a/crates/wake-core/src/adapters/dsh.rs b/crates/wake-core/src/adapters/dsh.rs
new file mode 100644
index 0000000..25a8310
--- /dev/null
+++ b/crates/wake-core/src/adapters/dsh.rs
@@ -0,0 +1,478 @@
+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};
+
+/// DeepSeek Harness(dsh):`~/.dsh/sessions/--<cwd转义>--/<id转义>/session.jsonl[.zstd]`,
+/// 一目录一会话,文件名固定。默认落盘是 zstd **多帧连接**(首帧 header 行,之后每次
+/// append 一帧),标准流式解码到 EOF 即可;`compression: none` 配置则是纯文本 .jsonl,
+/// 两种后缀都认。首行 {type:"session",id,createdAt,cwd,…} 给权威 id/cwd/created,
+/// 不反推目录名;origin=="subagent" 或 delegationDepth>0 是子代理会话,不进列表。
+/// 事件行 {type,seq,time,data}:assistant/message 是流式 chunk 的最终合成体
+/// (assistant/chunk 与其打包行 *-chunks 直接跳过),tool/result 按 toolCallId 回填,
+/// session/title 事件 last-wins 给标题,model 在 assistant 消息的 source 里。
+pub struct DshAdapter {
+ root: PathBuf,
+}
+
+impl DshAdapter {
+ pub fn new() -> Self {
+ Self {
+ root: dirs::home_dir().unwrap_or_default().join(".dsh").join("sessions"),
+ }
+ }
+}
+
+/// 打开会话日志为行读取器,按后缀透明解压(.zstd = 多帧连接,Decoder 默认解到
+/// EOF)。cap 是缓冲尺寸:只读首行的 header 路径用小值,免得每次列举都预读兆级
+fn open_log(path: &Path, cap: usize) -> Result<Box<dyn BufRead>> {
+ let file = fs::File::open(path)?;
+ if path.extension().is_some_and(|e| e == "zstd") {
+ let dec = zstd::stream::read::Decoder::with_buffer(BufReader::with_capacity(cap, file))?;
+ Ok(Box::new(BufReader::with_capacity(cap, dec)))
+ } else {
+ Ok(Box::new(BufReader::with_capacity(cap, file)))
+ }
+}
+
+struct DshHeader {
+ id: String,
+ cwd: String,
+ created_at: i64,
+ subagent: bool,
+}
+
+fn parse_header(v: &serde_json::Value) -> Option<DshHeader> {
+ if v.get("type").and_then(|t| t.as_str()) != Some("session") {
+ return None;
+ }
+ Some(DshHeader {
+ id: v.get("id")?.as_str()?.to_string(),
+ cwd: v.get("cwd").and_then(|c| c.as_str()).unwrap_or_default().to_string(),
+ created_at: v.get("createdAt").and_then(|t| t.as_i64()).unwrap_or(0),
+ subagent: v.get("origin").and_then(|o| o.as_str()) == Some("subagent")
+ || v.get("delegationDepth").and_then(|d| d.as_i64()).unwrap_or(0) > 0,
+ })
+}
+
+/// 只读首行拿 header(zstd 惰性解码,不会解整个文件;非会话日志返回 None)
+fn read_header(path: &Path) -> Option<DshHeader> {
+ let mut reader = open_log(path, 8 << 10).ok()?;
+ let mut line = String::new();
+ reader.read_line(&mut line).ok()?;
+ parse_header(&serde_json::from_str(line.trim_end()).ok()?)
+}
+
+/// dsh 当前版本除内容事件外的完整事件词汇(源码 known-event-types.ts,
+/// 2026-08)+ 三种 chunk 打包存储行。上游新增词汇会计入 unknown 提醒跟进。
+const KNOWN_SKIP: &[&str] = &[
+ "agent-preset/selected",
+ "agent/inbox/spliced",
+ "approval/asked",
+ "approval/decided",
+ "approval/policy",
+ "assistant/chunk",
+ "command/done",
+ "command/run",
+ "compaction/end",
+ "compaction/prune",
+ "compaction/start",
+ "compaction/summary",
+ "feedback/record",
+ "goal/change",
+ "hook/invoked",
+ "hook/result",
+ "llm/retry",
+ "llm/retry-started",
+ "permission/preset",
+ "plan/mode",
+ "request/header",
+ "sandbox/mode",
+ "schedule/change",
+ "session/end-seed",
+ "session/title-llm-request",
+ "step/end",
+ "step/start",
+ "subagent/descriptor",
+ "team/member",
+ "team/message/delivered",
+ "team/message/queued",
+ "team/task",
+ "todo/write",
+ "tool-workflow/agent-end",
+ "tool-workflow/agent-start",
+ "tool-workflow/run-end",
+ "tool-workflow/run-start",
+ "tool/call",
+ "tool/code-dispatch",
+ "tool/code-dispatch-start",
+ "turn/end",
+ "turn/start",
+ "web/deepseek-search-llm-request",
+ "text-chunks",
+ "reasoning-chunks",
+ "tool-call-chunks",
+];
+
+struct DshParse {
+ header: Option<DshHeader>,
+ title: Option<String>,
+ last_ts: i64,
+ messages: Vec<TranscriptMessage>,
+ model: Option<String>,
+ tokens_used: Option<i64>,
+ unknown_lines: u32,
+}
+
+fn parse_dsh_log(path: &Path) -> Result<DshParse> {
+ let reader = open_log(path, 1 << 20)?;
+
+ let mut p = DshParse {
+ header: None,
+ title: None,
+ last_ts: 0,
+ messages: Vec::new(),
+ model: None,
+ tokens_used: None,
+ unknown_lines: 0,
+ };
+ // toolCallId → (消息下标, tool_calls 下标),tool/result 事件回填用
+ let mut tool_index: HashMap<String, (usize, usize)> = HashMap::new();
+
+ for line in reader.lines() {
+ let line = match line {
+ Ok(l) => l,
+ // 末帧可能是半写的(写端每次 append 一帧,扫描与 dsh 天然并发):
+ // zstd decoder 对断尾**反复**返回 UnexpectedEof 而非 EOF,`continue`
+ // 就是死循环——扫描线程打满 CPU、ScanFinale 永不 Drop、刷新弹窗按
+ // 不变量 6 永久锁死。截断到此为止,已解析的部分照常呈现
+ Err(_) => {
+ p.unknown_lines += 1;
+ break;
+ }
+ };
+ if line.trim().is_empty() {
+ continue;
+ }
+ let Ok(row) = serde_json::from_str::<serde_json::Value>(&line) else {
+ p.unknown_lines += 1;
+ continue;
+ };
+ let ty = row.get("type").and_then(|v| v.as_str()).unwrap_or_default();
+ // 信封顶层的 surfaceOp 是联合类型(dsh-session types.d.ts:
+ // `'append' | {op:'replace',start,end}`)——**replace 是对象不是字符串**,
+ // 按字符串比永远不命中。compaction 与工具结果裁剪都用它把 start..end 的
+ // surface 节点换成缩短版,那是喂模型的上下文;Wake 要还原用户当时看到的
+ // 原文,所以整条跳过(留下被它遮蔽的原始节点)。缺失或 append 一律照旧
+ if row.pointer("/surfaceOp/op").and_then(|v| v.as_str()) == Some("replace") {
+ continue;
+ }
+ let ts = row.get("time").and_then(|v| v.as_i64()).unwrap_or(0);
+ p.last_ts = p.last_ts.max(ts);
+ let data = row.get("data").unwrap_or(&serde_json::Value::Null);
+ match ty {
+ "session" => {
+ if let Some(h) = parse_header(&row) {
+ p.header = Some(h);
+ }
+ }
+ "user/message" => {
+ let text = blocks_text(data.get("content").unwrap_or(&serde_json::Value::Null));
+ if text.is_empty() {
+ continue;
+ }
+ let kind = data.pointer("/source/kind").and_then(|k| k.as_str());
+ let mut m = text_msg(Role::User, &text, ts);
+ // dsh 的 source.kind 权威区分真人输入与注入上下文(实测一族:
+ // "agent-instructions"/"plugin"/"skill-catalog",后续还会长)。
+ // 白名单 "user":非真人一律归 Meta,缺失时当真人(宁可多显示)
+ if kind.is_some_and(|k| k != "user") {
+ m.kind = MessageKind::Meta;
+ }
+ p.messages.push(m);
+ }
+ "assistant/message" => {
+ let msg = data.get("message").unwrap_or(&serde_json::Value::Null);
+ let content = msg.get("content").unwrap_or(&serde_json::Value::Null);
+ // 单遍分桶:text 进正文、reasoning 进 thinking、tool-call 进工具
+ // (blocks_text 类型盲,会把 reasoning 的 text 混进正文,不适用)
+ let mut text_parts: Vec<&str> = Vec::new();
+ let mut thinking_parts: Vec<&str> = Vec::new();
+ let mut tools: Vec<ToolCallView> = Vec::new();
+ for b in content.as_array().into_iter().flatten() {
+ let block_text = || b.get("text").and_then(|v| v.as_str()).map(str::trim).filter(|t| !t.is_empty());
+ match b.get("type").and_then(|v| v.as_str()) {
+ Some("text") => text_parts.extend(block_text()),
+ Some("reasoning") => thinking_parts.extend(block_text()),
+ Some("tool-call") => {
+ 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();
+ // arguments 是模型原样输出的 JSON 字符串,解析失败保留原文
+ let raw = b.get("arguments").and_then(|v| v.as_str()).unwrap_or_default();
+ let input = serde_json::from_str::<serde_json::Value>(raw)
+ .unwrap_or(serde_json::Value::String(raw.to_string()));
+ tools.push(tool_call_view(id.to_string(), name, &input, None, false));
+ }
+ _ => {}
+ }
+ }
+ // 元数据先收再判空:content 为空的 assistant/message 是 dsh 专门
+ // 用来挂 usage 的载体(dsh-session surface.d.ts:"exists only to
+ // host usage",如撞上 max-tokens 的调用),提前 continue 会把这次
+ // 调用的 model 与 token 一起丢掉——它落在会话末尾时最明显
+ let model = msg.pointer("/source/model").and_then(|v| v.as_str()).map(String::from);
+ if model.is_some() {
+ p.model = model.clone();
+ }
+ if let Some(u) = data.get("usage") {
+ // TokenUsage 是"one model call"的账、三项 input 互斥(billed =
+ // 三项之和),所以**按调用累加**,不能 last-wins:一个 turn 多个
+ // step,last-wins 只会剩最后一次调用的量
+ let sum = ["inputTokens", "outputTokens", "cacheReadTokens", "cacheWriteTokens"]
+ .iter()
+ .filter_map(|k| u.get(*k).and_then(|v| v.as_i64()))
+ .sum::<i64>();
+ if sum > 0 {
+ p.tokens_used = Some(p.tokens_used.unwrap_or(0) + sum);
+ }
+ }
+ if text_parts.is_empty() && tools.is_empty() && thinking_parts.is_empty() {
+ continue;
+ }
+ let text = text_parts.join("\n\n");
+ // 一个 turn 多个 step,每 step 一条 assistant/message;连续 assistant
+ // 行(中间只隔 tool/result)合并成一条,详情页每回合一条助手消息
+ // (合并 + 整体 clip 机制与 pi.rs 同构,改动需两侧同步)
+ 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];
+ 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;
+ }
+ }
+ // thinking 与全库其他家同压 MAX_TOOL_IO;已到上限就不再拼接
+ if !thinking_parts.is_empty()
+ && last.thinking.as_deref().map_or(0, str::len) < MAX_TOOL_IO
+ {
+ let joined = thinking_parts.join("\n\n");
+ match &mut last.thinking {
+ Some(t) => {
+ t.push_str("\n\n");
+ t.push_str(&joined);
+ if t.len() > MAX_TOOL_IO {
+ *t = clip(t, MAX_TOOL_IO).0;
+ }
+ }
+ slot => *slot = Some(clip(&joined, MAX_TOOL_IO).0),
+ }
+ }
+ 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);
+ }
+ }
+ "tool/result" => {
+ // data.message.content = [tool-result 块]:toolCallId + 嵌套 content + isError
+ let Some(block) = data.pointer("/message/content/0") else {
+ continue;
+ };
+ let Some(call_id) = block.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(block.get("content").unwrap_or(&serde_json::Value::Null));
+ if !text.is_empty() {
+ tc.output = Some(clip(&text, MAX_TOOL_IO).0);
+ }
+ if block.get("isError").and_then(|v| v.as_bool()) == Some(true)
+ || data.get("error").is_some_and(|e| !e.is_null())
+ {
+ tc.is_error = true;
+ }
+ }
+ }
+ "session/title" => {
+ if let Some(t) = data.get("title").and_then(|v| v.as_str()) {
+ let t = t.trim();
+ if !t.is_empty() {
+ p.title = Some(clean_title_candidate(t));
+ }
+ }
+ }
+ "request/context" => {
+ // 路由元数据(仅变更时记录);assistant/message 的 source.model 会覆盖
+ if p.model.is_none() {
+ if let Some(m) = data.get("model").and_then(|v| v.as_str()) {
+ p.model = Some(m.to_string());
+ }
+ }
+ }
+ // 信封自带 ignorable 标记 = 写端声明的纯信息性记录,读者可安全跳过
+ _ if row.get("ignorable").and_then(|v| v.as_bool()) == Some(true) => {}
+ // 当前版本的其余已知词汇(含 assistant/chunk 的三种打包存储行)显式
+ // 列举,词汇表外才计 unknown——保住 schema 漂移金丝雀
+ t if KNOWN_SKIP.contains(&t) => {}
+ _ => {
+ p.unknown_lines += 1;
+ }
+ }
+ }
+ assign_seq(&mut p.messages);
+ Ok(p)
+}
+
+fn build_meta(r: &SessionFileRef, p: &DshParse) -> SessionMeta {
+ let (native, cwd, created) = match &p.header {
+ Some(h) => (h.id.clone(), h.cwd.clone(), h.created_at),
+ None => (r.native_id.clone(), String::new(), 0),
+ };
+ let title = p
+ .title
+ .clone()
+ .filter(|t| !t.is_empty())
+ .or_else(|| title_from_messages(&p.messages))
+ .unwrap_or_else(|| UNTITLED.to_string());
+ SessionMeta {
+ key: format!("dsh:{native}"),
+ id: native,
+ agent: AgentId::Dsh,
+ title,
+ project_path: cwd.clone(),
+ project_name: project_name_of(&cwd),
+ file_path: r.file_path.clone(),
+ created_at: if created > 0 { created } 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 DshAdapter {
+ fn agent(&self) -> AgentId {
+ AgentId::Dsh
+ }
+
+ fn detect(&self) -> bool {
+ self.root.is_dir()
+ }
+
+ fn list_session_files(&self) -> Result<Vec<SessionFileRef>> {
+ let mut refs = Vec::new();
+ // 固定两层:<project-dir>/<session-dir>/session.jsonl[.zstd],
+ // 不 walkdir 全递归(会话目录还会放别的 artifacts);根目录读不了
+ // 就本家降级为空,不把整轮扫描炸掉
+ let Ok(projects) = fs::read_dir(&self.root) else {
+ return Ok(refs);
+ };
+ for project in projects.flatten() {
+ if !project.file_type().is_ok_and(|t| t.is_dir()) {
+ continue;
+ }
+ for session in fs::read_dir(project.path()).into_iter().flatten().flatten() {
+ if !session.file_type().is_ok_and(|t| t.is_dir()) {
+ continue;
+ }
+ // 两个候选名都过 file_ref 漏斗;后缀并存时 sibling 裁决保证至多一个通过
+ let dir = session.path();
+ for name in ["session.jsonl.zstd", "session.jsonl"] {
+ if let Some(r) = self.file_ref(&dir.join(name)) {
+ refs.push(r);
+ break;
+ }
+ }
+ }
+ }
+ Ok(refs)
+ }
+
+ fn file_ref(&self, path: &Path) -> Option<SessionFileRef> {
+ let name = path.file_name()?.to_string_lossy();
+ if name != "session.jsonl" && name != "session.jsonl.zstd" {
+ return None;
+ }
+ let meta = fs::metadata(path).ok()?;
+ if !meta.is_file() || meta.len() == 0 {
+ return None;
+ }
+ // 压缩配置换挡会新旧后缀并存:陈旧的一份让位(mtime 平局 .zstd 赢,与
+ // 写端当前默认一致)。裁决在此单点,list 与 watcher 两条入口共用——
+ // 只做在 list 会让 watcher 把陈旧 sibling 的事件当主文件解析
+ let sibling = if name == "session.jsonl" { "session.jsonl.zstd" } else { "session.jsonl" };
+ if let Ok(sib) = fs::metadata(path.with_file_name(sibling)) {
+ let (own_m, sib_m) = (mtime_ms(&meta), mtime_ms(&sib));
+ if sib_m > own_m || (sib_m == own_m && name == "session.jsonl") {
+ return None;
+ }
+ }
+ // 首行 header 给权威 id(目录名是转义过的 id);子代理会话在此过滤
+ let header = read_header(path).filter(|h| !h.subagent)?;
+ Some(SessionFileRef {
+ agent: AgentId::Dsh,
+ native_id: header.id,
+ file_path: path.to_string_lossy().to_string(),
+ mtime_ms: mtime_ms(&meta),
+ size: meta.len() as i64,
+ })
+ }
+
+ fn parse_session(&self, r: &SessionFileRef) -> Result<ParsedSession> {
+ let parsed = parse_dsh_log(Path::new(&r.file_path))?;
+ let meta = build_meta(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_dsh_log(Path::new(&r.file_path))?;
+ Ok(ParsedTranscript {
+ meta: build_meta(r, &parsed),
+ mainline: parsed.messages,
+ sidechains: Vec::new(),
+ unknown_line_count: parsed.unknown_lines,
+ })
+ }
+
+ fn session_paths(&self, meta: &SessionMeta) -> Vec<String> {
+ // 一目录一会话:trash 整个会话目录(session.jsonl 与未来的 artifacts 一起)
+ match Path::new(&meta.file_path).parent() {
+ Some(dir) => vec![dir.to_string_lossy().to_string()],
+ None => vec![meta.file_path.clone()],
+ }
+ }
+
+ fn watch_paths(&self) -> Vec<PathBuf> {
+ if self.detect() {
+ vec![self.root.clone()]
+ } else {
+ Vec::new()
+ }
+ }
+}
diff --git a/crates/wake-core/src/adapters/mod.rs b/crates/wake-core/src/adapters/mod.rs
index 3322fc4..12fdb67 100644
--- a/crates/wake-core/src/adapters/mod.rs
+++ b/crates/wake-core/src/adapters/mod.rs
@@ -3,6 +3,7 @@ pub mod claude;
pub mod codex;
pub mod copilot;
pub mod cursor;
+pub mod dsh;
pub mod gemini;
pub mod grok;
pub mod kimi;
@@ -23,7 +24,9 @@ pub trait AgentAdapter: Send + Sync {
fn agent(&self) -> AgentId;
/// 数据根目录是否存在
fn detect(&self) -> bool;
- /// 枚举全部会话文件(只 stat 不读内容)
+ /// 枚举全部会话文件。契约是"枚举必须廉价、绝不做全量解析":多数家纯 stat,
+ /// SQLite 型跑元数据查询,dsh 读有界首行(子代理标志只存在于文件头)。
+ /// 故障就地降级为空列表,不外溢炸掉整轮扫描。
fn list_session_files(&self) -> Result<Vec<SessionFileRef>>;
/// watcher 事件路径 → 本 adapter 的会话文件引用;None = 非会话文件
/// (边车、子代理转录等)。默认:非空 .jsonl,stem 即 native_id。
@@ -80,6 +83,7 @@ pub fn create_adapters() -> Vec<Box<dyn AgentAdapter>> {
Box::new(grok::GrokAdapter::new()),
Box::new(kimi::KimiAdapter::new()),
Box::new(antigravity::AntigravityAdapter::new()),
+ Box::new(dsh::DshAdapter::new()),
];
all.into_iter().filter(|a| a.detect()).collect()
}
diff --git a/crates/wake-core/src/models.rs b/crates/wake-core/src/models.rs
index eed5b0f..a460d3b 100644
--- a/crates/wake-core/src/models.rs
+++ b/crates/wake-core/src/models.rs
@@ -1,21 +1,22 @@
use serde::{Deserialize, Serialize};
/// 变体声明序即侧栏固定展示序(derive Ord 直接按此序比较)——
-/// 新增 agent 一律追加在末尾,老条目位置不动
+/// 顺序为用户指定(2026-08-20),新增 agent 问过用户再定位置,勿擅动老条目
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum AgentId {
ClaudeCode,
Codex,
- Copilot,
+ Grok,
+ Dsh,
Cursor,
Opencode,
- Kiro,
- Gemini,
Pi,
Omp,
- Grok,
+ Kiro,
Kimi,
+ Gemini,
+ Copilot,
Antigravity,
}
@@ -34,6 +35,7 @@ impl AgentId {
AgentId::Grok => "grok",
AgentId::Kimi => "kimi",
AgentId::Antigravity => "antigravity",
+ AgentId::Dsh => "dsh",
}
}
@@ -51,6 +53,7 @@ impl AgentId {
"grok" => Some(AgentId::Grok),
"kimi" => Some(AgentId::Kimi),
"antigravity" => Some(AgentId::Antigravity),
+ "dsh" => Some(AgentId::Dsh),
_ => None,
}
}
@@ -69,6 +72,7 @@ impl AgentId {
AgentId::Grok => "Grok Build",
AgentId::Kimi => "Kimi Code",
AgentId::Antigravity => "Antigravity CLI",
+ AgentId::Dsh => "DeepSeek Harness",
}
}
@@ -103,6 +107,7 @@ impl AgentId {
if dark { "brands/kimi.png" } else { "brands/kimi-light.png" }
}
AgentId::Antigravity => "brands/antigravity.png",
+ AgentId::Dsh => "brands/deepseek.png",
}
}
diff --git a/crates/wake-core/src/services/terminal.rs b/crates/wake-core/src/services/terminal.rs
index 4d76ffc..7322af9 100644
--- a/crates/wake-core/src/services/terminal.rs
+++ b/crates/wake-core/src/services/terminal.rs
@@ -75,6 +75,9 @@ pub fn agent_bin(agent: AgentId) -> Option<&'static str> {
AgentId::Grok => Some("grok"),
AgentId::Kimi => Some("kimi"),
AgentId::Antigravity => Some("agy"),
+ // dsh 官方唯一分发形态是 npx(README 只有 `npx @deepseek-ai/dsh web`,
+ // 不发全局命令);包名由 resume_args 作首参带上
+ AgentId::Dsh => Some("npx"),
}
}
@@ -92,6 +95,12 @@ fn resume_args(agent: AgentId, id: &str) -> Option<(Vec<String>, bool)> {
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)),
+ // dsh 官方 tui bundle 未发布(rc.8 shipped profile 只有 web/headless,
+ // help 里的 --profile tui --resume 当下无消费端),web 是唯一交互
+ // surface 且无 per-session 深链——resume 退而求其次:cd 到会话 cwd
+ // 按官方原样 `npx @deepseek-ai/dsh web` 拉起(workspace 由启动目录
+ // 决定),会话在 UI 里即点即续。官方发布 tui bundle 后切回定点 resume
+ AgentId::Dsh => Some((vec!["@deepseek-ai/dsh".into(), "web".into()], true)),
_ => None,
}
}
@@ -248,6 +257,58 @@ pub fn ensure_app_icons(cache_dir: &Path) -> HashMap<String, std::path::PathBuf>
out
}
+/// kooky-cli 的稳定副本(kooky ≥0.51 每次启动刷新;bundle 内那份会被
+/// Gatekeeper 拦,kooky README 指定外部工具用这份)。存在与否同时是
+/// "这台机器的 kooky 会不会说 CLI"的探测——旧版没有它。
+/// 路径构造缓存(terminals_for 挂在详情页 render 上,每帧问一次),但
+/// **存在性每次现查**:副本随 kooky 启动刷新,把 None 缓存死会让用户装/升级
+/// kooky 后仍不列 Kooky,直到重启 Wake。一次 stat 比这个代价便宜
+fn kooky_cli_path() -> Option<&'static Path> {
+ use std::sync::OnceLock;
+ static PATH: OnceLock<Option<std::path::PathBuf>> = OnceLock::new();
+ let p = PATH
+ .get_or_init(|| {
+ Some(dirs::home_dir()?.join("Library/Application Support/kooky/bin/kooky-cli"))
+ })
+ .as_deref()?;
+ p.is_file().then_some(p)
+}
+
+/// kooky 深链能点名的 agent —— 即 kooky 的 `AgentSessionScanner.supportedAgentIds`
+/// (AgentSessionHistory.swift 的 stores 表),`resumeSession` 拿它做 guard。
+/// **名单外的 agent 会被拒**(unknown agent),而 `open kooky://…` 只要 scheme
+/// 注册就退 0,Wake 这边看不出失败——所以名单外必须改走 kooky-cli 的哑管道。
+/// 注意 Antigravity 不在里面:kooky 的 stores 表注释写明其 CLI 数据布局未经
+/// 核实、"Absent by design"。新增 agent 时按 kooky 那张表核对,别默认落进深链
+const KOOKY_ROSTER: &[AgentId] = &[
+ AgentId::ClaudeCode,
+ AgentId::Codex,
+ AgentId::Copilot,
+ AgentId::Cursor,
+ AgentId::Opencode,
+ AgentId::Kiro,
+ AgentId::Gemini,
+ AgentId::Pi,
+ AgentId::Omp,
+ AgentId::Grok,
+ AgentId::Kimi,
+];
+
+/// Kooky 能否打开该 agent 的会话:roster 内走 resume 深链(旧版 kooky 也认,
+/// 不依赖 CLI 副本);名单外靠 kooky-cli 传命令文本,没有 CLI 副本就不列 Kooky
+fn kooky_speaks(agent: AgentId) -> bool {
+ KOOKY_ROSTER.contains(&agent) || kooky_cli_path().is_some()
+}
+
+/// 某会话可用的恢复目标(Kooky 按 agent 过滤,见 kooky_speaks)
+pub fn terminals_for(agent: AgentId) -> Vec<TerminalApp> {
+ installed_terminals()
+ .iter()
+ .copied()
+ .filter(|t| *t != TerminalApp::Kooky || kooky_speaks(agent))
+ .collect()
+}
+
/// 已安装终端(启动后不变,进程内缓存)
pub fn installed_terminals() -> &'static [TerminalApp] {
use std::sync::OnceLock;
@@ -355,10 +416,62 @@ fn percent_encode_query(s: &str) -> String {
out
}
+/// KOOKY_ROSTER 之外的 agent 在 kooky 里点名会被拒——改走 kooky-cli 的哑管道:
+/// `open --cwd <项目> -e "<命令>"`,与 Terminal/iTerm 收命令文本同级。
+/// 命令从 session_bin + resume_args 拼(与真终端路径同一来源),cd 由 --cwd 承担
+fn launch_kooky_cli(meta: &SessionMeta) -> ResumeOutcome {
+ let fail = |command: String, error: String| ResumeOutcome { ok: false, command, error: Some(error) };
+ let Some(cli) = kooky_cli_path() else {
+ return fail(String::new(), "kooky-cli not found — update Kooky to 0.51+".into());
+ };
+ let Some((bin, (args, _))) = session_bin(meta).zip(resume_args(meta.agent, &meta.id)) else {
+ return fail(String::new(), format!("Resume isn't supported for {} yet", meta.agent.display_name()));
+ };
+ // agent CLI 走与真终端路径同一次解析(GUI 进程 PATH 不全,过 login shell),
+ // 顺带承担"装没装"的判断:少了这步,kooky 会开出一个只写着 command not
+ // found 的 tab,而 Wake 这边照报成功
+ let Some(exe) = resolve_clis(&[bin]).get(bin).cloned().flatten() else {
+ return fail(String::new(), format!("Command {bin} not found — is it installed?"));
+ };
+ let cmd = std::iter::once(exe.as_str())
+ .chain(args.iter().map(|s| s.as_str()))
+ .map(posix_quote)
+ .collect::<Vec<_>>()
+ .join(" ");
+ let shown = format!("kooky-cli open --cwd {} -e {}", posix_quote(&meta.project_path), posix_quote(&cmd));
+ // 手动兜底的是能直接粘进任何终端跑的那条(kooky 的 --cwd 得自己 cd 回来)
+ let cwd_ok = !meta.project_path.is_empty() && Path::new(&meta.project_path).is_dir();
+ let manual = if cwd_ok {
+ format!("cd {} && {cmd}", posix_quote(&meta.project_path))
+ } else {
+ cmd.clone()
+ };
+ let bail = |reason: String| {
+ copy_to_clipboard(&manual);
+ fail(shown.clone(), format!("{reason} — command copied, run it manually"))
+ };
+ // 项目挪走了 kooky 的 --cwd 就没法落地。走同一条兜底,别让 Kooky 目标
+ // 比 Terminal 少一份可手动执行的命令
+ if !cwd_ok {
+ return bail(format!("Project directory no longer exists: {}", meta.project_path));
+ }
+ match Command::new(cli).args(["open", "--cwd", &meta.project_path, "-e", &cmd]).output() {
+ Ok(out) if out.status.success() => ResumeOutcome { ok: true, command: shown, error: None },
+ Ok(out) => {
+ let reason = String::from_utf8_lossy(&out.stderr).trim().to_string();
+ bail(if reason.is_empty() { "kooky-cli refused the request".into() } else { reason })
+ }
+ Err(e) => bail(format!("Couldn't run kooky-cli: {e}")),
+ }
+}
+
/// Kooky 深链恢复(kooky://resume,约定见 kooky 的 DeepLink.swift):
/// id 校验与 kooky 端同规则;深链失败(未发布的旧版没注册 scheme)退回激活应用。
/// 不依赖 agent CLI——kooky 自己会起 agent。
fn launch_kooky(meta: &SessionMeta) -> ResumeOutcome {
+ if !KOOKY_ROSTER.contains(&meta.agent) {
+ return launch_kooky_cli(meta);
+ }
let id_ok = meta.id.chars().next().is_some_and(|c| c.is_ascii_alphanumeric())
&& meta.id.len() <= 200
&& meta
diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rs
index 9ed8419..a931087 100644
--- a/crates/wake-core/tests/adapter_contracts.rs
+++ b/crates/wake-core/tests/adapter_contracts.rs
@@ -1,5 +1,6 @@
-//! 十二家 adapter 的解析契约测试:全部走公开 API(`AgentAdapter` trait),
-//! fixture 为全合成数据(tests/fixtures/,SQLite 型在临时 HOME 里现建)。
+//! 十三家 adapter 的解析契约测试:全部走公开 API(`AgentAdapter` trait),
+//! fixture 为全合成数据(tests/fixtures/,SQLite 型在临时 HOME 里现建,
+//! dsh 的 zstd 日志由检入的明文 fixture 在临时 HOME 里压制)。
//!
//! Copilot/OpenCode/Antigravity 的 parse 只认各自 HOME 下的库,Gemini 的 cwd
//! 反查读 `~/.gemini/projects.json`,Kimi 的 cwd 反查读
@@ -17,6 +18,7 @@ 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::dsh::DshAdapter;
use wake_core::adapters::gemini::GeminiAdapter;
use wake_core::adapters::grok::GrokAdapter;
use wake_core::adapters::kimi::KimiAdapter;
@@ -32,6 +34,7 @@ struct TestEnv {
copilot_db: PathBuf,
opencode_db: PathBuf,
antigravity_db: PathBuf,
+ dsh_log: PathBuf,
/// 假 HOME 目录本体,持有 TempDir 保证整个测试进程期间不被清理
_home: tempfile::TempDir,
}
@@ -83,11 +86,36 @@ fn setup() -> &'static TestEnv {
)
.expect("write kimi session_index");
+ // dsh:检入的明文 fixture 压成真实写端布局的 zstd 多帧文件(首帧 header
+ // 行、次帧事件批,帧直接连接),另放一个子代理会话验证 file_ref 过滤
+ let dsh_project = home.path().join(".dsh").join("sessions").join("--Users-tester-Github-wakefx--");
+ let dsh_sess = dsh_project.join("dsh-e2e4-0001");
+ fs::create_dir_all(&dsh_sess).expect("mkdir dsh session dir");
+ let plain = fs::read_to_string(fixture("dsh/session.jsonl")).expect("read dsh fixture");
+ let (header, body) = plain.split_once('\n').expect("dsh fixture header line");
+ let mut frames = zstd::encode_all(format!("{header}\n").as_bytes(), 3).expect("zstd header frame");
+ frames.extend(zstd::encode_all(body.as_bytes(), 3).expect("zstd event frame"));
+ let dsh_log = dsh_sess.join("session.jsonl.zstd");
+ fs::write(&dsh_log, frames).expect("write dsh zstd log");
+ let dsh_sub = dsh_project.join("dsh-sub-0002");
+ fs::create_dir_all(&dsh_sub).expect("mkdir dsh subagent dir");
+ fs::write(
+ dsh_sub.join("session.jsonl"),
+ concat!(
+ r#"{"type":"session","version":0,"id":"dsh-sub-0002","createdAt":1786100000000,"cwd":"/Users/tester/Github/wakefx","origin":"subagent","delegationDepth":1}"#,
+ "\n",
+ r#"{"type":"user/message","seq":0,"time":1786100001000,"data":{"id":"m","role":"user","content":[{"type":"text","text":"child task"}],"source":{"kind":"user"}}}"#,
+ "\n",
+ ),
+ )
+ .expect("write dsh subagent log");
+
std::env::set_var("HOME", home.path());
TestEnv {
copilot_db,
opencode_db,
antigravity_db,
+ dsh_log,
_home: home,
}
})
@@ -814,6 +842,109 @@ fn assert_seq_contract(adapter: &dyn AgentAdapter, r: &SessionFileRef) {
assert_eq!(s.meta.message_count, t.meta.message_count, "[{tag}] message_count 两侧不一致");
}
+#[test]
+fn dsh_torn_final_frame_terminates() {
+ // 半写的末帧:写端每次 append 一帧,扫描与 dsh 天然并发,必然读到。
+ // zstd decoder 对断尾**反复**返回 UnexpectedEof 而非 EOF——解析器不就地
+ // 收尾就是死循环:扫描线程打满 CPU、ScanFinale 永不 Drop、刷新弹窗按
+ // 不变量 6 永久锁死。独立 tempdir,不进 list 以免扰动 dsh_parse_contract
+ let env = setup();
+ let full = fs::read(&env.dsh_log).expect("read dsh zstd log");
+ let dir = tempfile::tempdir().expect("tempdir");
+ let torn = dir.path().join("session.jsonl.zstd");
+ fs::write(&torn, &full[..full.len() - 12]).expect("write torn log");
+
+ let adapter = DshAdapter::new();
+ // header 在首帧、完整,所以断尾会话照常进列表(只是内容截止到断点)
+ let r = adapter.file_ref(&torn).expect("torn file_ref");
+ let (tx, rx) = std::sync::mpsc::channel();
+ std::thread::spawn(move || {
+ tx.send(DshAdapter::new().parse_transcript(&r).is_ok()).ok();
+ });
+ let ok = rx
+ .recv_timeout(std::time::Duration::from_secs(10))
+ .expect("断尾帧把解析器卡住了(死循环)");
+ assert!(ok, "断尾应优雅收尾,不是把整个会话判失败");
+}
+
+#[test]
+fn dsh_parse_contract() {
+ let env = setup();
+ let adapter = DshAdapter::new();
+ // file_ref 是公开 API:只认 session.jsonl[.zstd],native_id 取 header 的
+ // 权威 id(目录名是转义过的 id);子代理会话(origin=subagent)在此过滤
+ let r = adapter.file_ref(&env.dsh_log).expect("dsh file_ref");
+ assert_eq!(r.native_id, "dsh-e2e4-0001");
+ let sub = env
+ .dsh_log
+ .parent()
+ .and_then(|d| d.parent())
+ .expect("dsh project dir")
+ .join("dsh-sub-0002")
+ .join("session.jsonl");
+ assert!(adapter.file_ref(&sub).is_none(), "子代理会话不进列表");
+
+ // list 走 <project>/<session>/session.jsonl[.zstd] 两层布局,子代理被滤掉
+ let listed = adapter.list_session_files().expect("dsh list_session_files");
+ assert_eq!(listed.len(), 1);
+ assert_eq!(listed[0].native_id, "dsh-e2e4-0001");
+
+ // 压缩配置换挡会两后缀并存:陈旧的一份在 file_ref 就让位(裁决单点,
+ // watcher 入口同样受保护,不会把旧文件当主文件解析)
+ let stale = env.dsh_log.with_file_name("session.jsonl");
+ fs::write(&stale, "{\"type\":\"session\",\"version\":0,\"id\":\"dsh-e2e4-0001\",\"createdAt\":1786000000000,\"cwd\":\"/Users/tester/Github/wakefx\",\"delegationDepth\":0}\n")
+ .expect("write stale sibling");
+ let hour_ago = std::time::SystemTime::now() - std::time::Duration::from_secs(3600);
+ fs::OpenOptions::new()
+ .write(true)
+ .open(&stale)
+ .and_then(|f| f.set_modified(hour_ago))
+ .expect("age stale sibling");
+ assert!(adapter.file_ref(&stale).is_none(), "陈旧 sibling 应让位");
+ assert!(adapter.file_ref(&env.dsh_log).is_some(), "较新主文件不受影响");
+ fs::remove_file(&stale).expect("remove stale sibling");
+
+ let s = adapter.parse_session(&r).expect("dsh parse_session");
+ let t = adapter.parse_transcript(&r).expect("dsh parse_transcript");
+
+ assert_eq!(s.meta.title, "QR scan dependency fix"); // session/title 事件 last-wins
+ assert_eq!(s.meta.key, "dsh:dsh-e2e4-0001");
+ assert_eq!(s.meta.project_path, "/Users/tester/Github/wakefx"); // header cwd,不反推目录名
+ assert_eq!(s.meta.model.as_deref(), Some("deepseek-chat-v4")); // assistant source.model
+ // usage 是"one model call"的账,按调用累加(1480 + 1560 + 空载体 400)。
+ // surfaceOp={op:replace} 那条是 compaction 的缩短版:整条跳过,它挂的
+ // 99999 不计——它不是新的模型调用,原始节点也不该被它遮蔽
+ assert_eq!(s.meta.tokens_used, Some(3440));
+ assert_eq!(s.meta.created_at, 1786100000000); // header createdAt(epoch ms)
+ assert_eq!(s.meta.updated_at, 1786100007000); // 最后事件 time
+ assert_eq!(s.meta.message_count, 2); // 注入上下文归 Meta 不计;replace/空载体都不产生气泡
+ assert_eq!(s.unknown_line_count, 1); // mystery-row;*-chunks 打包行与 turn/step 边界不计
+
+ // 连续 assistant step(中间只隔 tool/result)合并一条;source.kind 非 "user"
+ // 的注入上下文(plugin / agent-instructions,后者不带 system-reminder 壳)归 Meta
+ assert_eq!(
+ roles_kinds(&t.mainline),
+ vec![
+ (Role::User, MessageKind::Text),
+ (Role::Assistant, MessageKind::Text),
+ (Role::User, MessageKind::Meta),
+ (Role::User, MessageKind::Meta),
+ ]
+ );
+ let a = &t.mainline[1];
+ assert!(a.text.starts_with("我先查一下扫码组件"));
+ assert!(a.text.contains("依赖数组漏了 device"));
+ // reasoning 块分离进 thinking,不混入正文
+ assert!(a.thinking.as_deref().unwrap_or_default().contains("依赖数组遗漏"));
+ assert!(!a.text.contains("crash on unmount"));
+ assert_eq!(a.tool_calls.len(), 1);
+ assert_eq!(a.tool_calls[0].name, "read_file");
+ // tool/result 事件按 toolCallId 回填输出
+ assert!(a.tool_calls[0].output.as_deref().unwrap_or_default().contains("useEffect"));
+ assert!(!a.tool_calls[0].is_error);
+ assert_eq!(s.units.iter().map(|u| u.seq).collect::<Vec<_>>(), vec![0, 1]);
+}
+
#[test]
fn seq_contract_holds_for_all_agents() {
let env = setup();
@@ -830,6 +961,7 @@ fn seq_contract_holds_for_all_agents() {
(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")),
+ (Box::new(DshAdapter::new()), fs_ref(AgentId::Dsh, &env.dsh_log, "dsh-e2e4-0001")),
];
for (adapter, r) in &checks {
assert_seq_contract(adapter.as_ref(), r);
diff --git a/crates/wake-core/tests/fixtures/dsh/session.jsonl b/crates/wake-core/tests/fixtures/dsh/session.jsonl
new file mode 100644
index 0000000..3e16313
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/dsh/session.jsonl
@@ -0,0 +1,17 @@
+{"type":"session","version":0,"id":"dsh-e2e4-0001","createdAt":1786100000000,"cwd":"/Users/tester/Github/wakefx","delegationDepth":0}
+{"type":"turn/start","seq":0,"time":1786100001000,"data":{"turn":0}}
+{"type":"user/message","seq":1,"time":1786100001200,"data":{"id":"m-u1","role":"user","content":[{"type":"text","text":"二维码扫描闪退,帮我看看 useEffect() 的依赖"}],"source":{"kind":"user"}},"surfaceOp":"append"}
+{"type":"step/start","seq":2,"time":1786100001500,"data":{"turn":0,"step":0}}
+{"type":"request/context","seq":3,"time":1786100001600,"data":{"provider":"deepseek","model":"deepseek-chat-v4","contextWindow":131072},"ignorable":true}
+{"type":"text-chunks","seq0":4,"time0":1786100002000,"data":{"turn":0,"step":0,"index":1,"dt":[12,15],"texts":["我先","查一下","扫码组件"]}}
+{"type":"assistant/message","seq":7,"time":1786100003000,"data":{"turn":0,"step":0,"message":{"id":"m-a1","role":"assistant","content":[{"type":"reasoning","text":"crash on unmount 通常是依赖数组遗漏"},{"type":"text","text":"我先查一下扫码组件"},{"type":"tool-call","id":"call-1","name":"read_file","arguments":"{\"path\":\"src/scan.ts\"}"}],"source":{"kind":"model","provider":"deepseek","model":"deepseek-chat-v4"}},"usage":{"inputTokens":1200,"outputTokens":80,"cacheReadTokens":200}},"surfaceOp":"append","sourceEventSeqs":[4,5,6]}
+{"type":"tool/result","seq":8,"time":1786100004000,"data":{"turn":0,"step":0,"message":{"id":"m-t1","role":"user","content":[{"type":"tool-result","toolCallId":"call-1","content":[{"type":"text","text":"useEffect(() => scan(device), [])"}],"isError":false}],"source":{"kind":"tool","callId":"call-1"}}},"surfaceOp":"append"}
+{"type":"assistant/message","seq":9,"time":1786100005000,"data":{"turn":0,"step":1,"message":{"id":"m-a2","role":"assistant","content":[{"type":"text","text":"依赖数组漏了 device,补上 [device] 即可。"}],"source":{"kind":"model","provider":"deepseek","model":"deepseek-chat-v4"}},"usage":{"inputTokens":1500,"outputTokens":60}},"surfaceOp":"append"}
+{"type":"step/end","seq":10,"time":1786100005100,"data":{"turn":0,"step":1}}
+{"type":"turn/end","seq":11,"time":1786100005200,"data":{"turn":0,"reason":{"kind":"completed"}}}
+{"type":"user/message","seq":12,"time":1786100006000,"data":{"id":"m-u2","role":"user","content":[{"type":"text","text":"[fs-watch] src/scan.ts changed on disk"}],"source":{"kind":"plugin","plugin":"fs-watch","form":"notice","summary":"file changed"}},"surfaceOp":"append"}
+{"type":"user/message","seq":13,"time":1786100006200,"data":{"id":"m-u3","role":"user","content":[{"type":"text","text":"Instructions from: CLAUDE.md — 界面语言英文"}],"source":{"kind":"agent-instructions"}},"surfaceOp":"append"}
+{"type":"session/title","seq":14,"time":1786100006500,"data":{"title":"QR scan dependency fix"},"ignorable":true}
+{"type":"assistant/message","seq":15,"time":1786100006600,"surfaceOp":{"op":"replace","start":7,"end":9},"data":{"turn":0,"step":2,"message":{"id":"m-a3","role":"assistant","content":[{"type":"text","text":"[compacted] 喂模型的缩短版,不是用户当时看到的原文"}],"source":{"model":"deepseek-chat-v4"}},"usage":{"inputTokens":99999,"outputTokens":99999}}}
+{"type":"assistant/message","seq":16,"time":1786100006700,"surfaceOp":"append","data":{"turn":1,"step":0,"message":{"id":"m-a4","role":"assistant","content":[],"source":{"model":"deepseek-chat-v4"}},"usage":{"inputTokens":300,"outputTokens":100}}}
+{"type":"mystery-row","seq":17,"time":1786100007000,"data":{"x":1}}
diff --git a/crates/wake/assets/brands/deepseek.png b/crates/wake/assets/brands/deepseek.png
new file mode 100644
index 0000000..3b2b8a2
Binary files /dev/null and b/crates/wake/assets/brands/deepseek.png differ
diff --git a/crates/wake/src/assets.rs b/crates/wake/src/assets.rs
index 4889426..35e27da 100644
--- a/crates/wake/src/assets.rs
+++ b/crates/wake/src/assets.rs
@@ -53,6 +53,7 @@ brands!(
"kimi",
"kimi-light",
"antigravity",
+ "deepseek",
);
icons!(
diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rs
index 0873dd5..42fc206 100644
--- a/crates/wake/src/workbench.rs
+++ b/crates/wake/src/workbench.rs
@@ -1081,10 +1081,21 @@ impl Workbench {
.detach();
}
- fn do_resume(&mut self, term: terminal::TerminalApp, window: &mut Window, cx: &mut Context<Self>) {
+ /// remember=false:本次目标是"偏好在这个会话上不可用"时的回退值(见 render
+ /// 里的 terminals_for),点它不该把回退值写成新偏好——否则一个 dsh 会话就能
+ /// 把用户的 Kooky 偏好冲成 Terminal,再回 Claude 会话也回不去了
+ fn do_resume(
+ &mut self,
+ term: terminal::TerminalApp,
+ remember: bool,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) {
let Some(detail) = &self.detail else { return };
- self.preferred_terminal = Some(term);
- cx.notify(); // split 按钮左段立即切到本次选择
+ if remember {
+ self.preferred_terminal = Some(term);
+ cx.notify(); // split 按钮左段立即切到本次选择
+ }
let meta = detail.meta.clone();
let task = cx.background_spawn(async move { terminal::resume_session_in(&meta, term) });
Self::notify_when_done(window, cx, task, |outcome| {
@@ -1898,11 +1909,17 @@ impl Workbench {
.gap_1()
.child({
// Open In split 按钮(Codex/kooky 风):左段 = 上次
- // 目标的应用图标,点击直开;右段 chevron 展开列表
- let terms = terminal::installed_terminals();
+ // 目标的应用图标,点击直开;右段 chevron 展开列表。
+ // 目标列表按 agent 过滤(Kooky 深链不认 dsh);
+ // 偏好目标不在列表时(如 dsh 会话 + 偏好 Kooky)回退首项
+ let terms = terminal::terminals_for(meta.agent);
let current = self
.preferred_terminal
+ .filter(|t| terms.contains(t))
.or_else(|| terms.first().copied());
+ // 偏好已存在时 current 要么就是它、要么是回退值,
+ // 两种情况点左段都不该改写偏好(见 do_resume)
+ let remember_current = self.preferred_terminal.is_none();
let current_icon = current
.and_then(|t| self.terminal_icons.get(t.id()).cloned());
let term_items: Vec<(terminal::TerminalApp, Option<PathBuf>)> =
@@ -1941,9 +1958,18 @@ impl Workbench {
.text_color(theme.secondary_foreground)
.into_any_element(),
})
+ .tooltip({
+ let label: SharedString = match current {
+ Some(t) => format!("Open this session in {}", t.display_name()).into(),
+ None => "Open this session".into(),
+ };
+ move |window, cx| {
+ gpui_component::tooltip::Tooltip::new(label.clone()).build(window, cx)
+ }
+ })
.on_click(cx.listener(move |this, _, window, cx| {
if let Some(term) = current {
- this.do_resume(term, window, cx);
+ this.do_resume(term, remember_current, window, cx);
}
})),
)
@@ -1991,7 +2017,7 @@ impl Workbench {
})
.on_click(move |_, window, cx| {
entity.update(cx, |this, cx| {
- this.do_resume(term, window, cx);
+ this.do_resume(term, true, window, cx);
});
}),
);
diff --git a/scripts/test.sh b/scripts/test.sh
index 16b9a72..f583046 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,7 +1,7 @@
#!/bin/zsh
# Wake 本地测试入口——改完代码跑一跑(对齐 kooky 的 `swift test` 习惯)。
#
-# scripts/test.sh # 数据层 21 测试 + UI 编译门槛,~秒级
+# scripts/test.sh # 数据层 23 测试 + UI 编译门槛,~秒级
# scripts/test.sh --smoke # 追加真实数据冒烟:全量扫描统计(人眼对量级,
# # 基准见 CLAUDE.md;只读你本机的 agent 数据)
set -euo pipefail