Skip to content

armgit / Wake

Public Imported from GitHub
0

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

Rust

feat: leave subagent sessions out of Insights session and prompt counts

Corey Chiud9d596871c18
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 373de55..6b526e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
- Fix: DeepSeek Harness subagent sessions are indexed and listed under the session that started them, titled with their task; a subagent or forked session no longer repeats the conversation it started from, and its tokens are its own. Existing indexes are re-read once after upgrading (#63, thanks @ztcngadget888)
- Update: Subagent sessions from OpenCode, Kilo Code, ZCode, Antigravity and OpenClaw are listed under the session that started them. ZCode side chats and workflow steps sit under their task too, and ZCode workflow tasks are listed
- Fix: ZCode forks no longer repeat the task they were forked from, and their tokens are their own; side chats are titled with their first question instead of "Selection side chat"
+- Update: Insights no longer counts subagent sessions, or the prompts in them, as yours; their tokens still count
## [0.9.1] — 2026-10-10
diff --git a/DESIGN.md b/DESIGN.md
index 984e3ec..7ac4f8b 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -215,13 +215,13 @@ emoji 不再承担界面或正文结构图标职责。
侧栏底部工具条的 Insights 钮(chart-column)进入;它是与全部导航行互斥的**整页目的地**——打开时替换会话流与阅读区,点任意导航行(或工具条的 Sessions 钮)退出并落回 All Sessions。页头右端有 Refresh。设置仍是独立场景,Insights 不是。
- 页面用 `background` 材质整片承载;顶部 88px 标题区与中栏同节奏(Insights 22px semibold + Label 11 副行,副行只说 "Since {首会话月份}"),兼窗口拖拽区。内容限 720px 阅读宽居中,区块之间只用 32px 留白与 Body 14 semibold 组头分隔——**不做卡片墙、零投影**,延续"避免每个区域加边框"的层级原则。
-- 统计口径与主 UI 一致(archived 不计):"Prompts" 一律指主线用户消息。数据在打开与每次 Refresh 后后台重算,不阻塞浏览。
+- 统计口径与主 UI 一致(archived 不计):"Prompts" 一律指主线用户消息。agent 派出去的子会话(子代理、工作流里的一步)不算会话、里面的话也不算提问——开头那句是派活的 agent 写的;它们的 tokens 照算(2026-10-12)。数据在打开与每次 Refresh 后后台重算,不阻塞浏览。
- 概览行:28px semibold 大数字 + Caption 标签,序为 Sessions / Tokens / Prompts / Agents / Projects / Active days(用户钉序,2026-08-27);Tokens 仅在有 agent 报过用量时出现。数字千分位。
- Last 7 days(概览下方):同序的三个度量(Sessions / Prompts / Active days;Tokens 是会话终身累计量、没有时间维度,不进周对比),值 Heading 16 semibold + Caption 标签 + Label 11 的相对变化行("+12% vs last week" / "Same as last week" / "New this week" / "No activity");上涨用 `primary`,持平与下降 `muted_foreground`,不引入第四种文字色。会话按创建日归属,prompts 按消息日,对比窗为滚动 7 天对前 7 天(不按自然周,免得周一早上全是零)。
- Over time(热力图下方):近 53 周每周 prompts 的堆叠柱,列宽与步距与热力图完全一致(9px 柱 + 3px 缝,左侧留出热力图的 26px 星期标签列),两图的周列上下对齐,月份刻度同规则。按总量取前五个序列各自着色自下而上堆叠:agent 用品牌色(theme.rs `agent_series_color`,彩色品牌取内嵌 PNG 主色、单色字形的六家给固定备选色,同一家在任何机器上不变),模型按排名取 `SERIES_PALETTE` 六色分类色板;其余合并为 "Other"(`muted_foreground` 35%)。曾试单色 `primary` 五档阶梯,用户否决(分不清)。零周留 2px `muted` 基线;柱按窗口内峰值周归一。只按 agent 分层、不按模型(messages 表没有逐条 model,会话级 model 是末态,切周会改写历史);caption 点名本周领先者("Prompts per week by agent · Claude Code leads this week")。图例在刻度下方:9px 色块 + Label 11 名称,可换行。tooltip 给 "Week of Aug 3 · 120 prompts" 与前三层明细。
- 活跃热力图:53 周 × 7 天(周一起始,最右列为本周),9px 方格 + 3px 缝,总宽 662px。热力格、分布柱和图例统一使用 `RADIUS_CELL` 2px 圆角;强度 = `muted` 空格 + `primary` 25/50/75/100% 四档(按窗口内峰值分位);未来日期留白。月份与 Mon/Wed/Fri 标签用 Label 11 muted;每格 tooltip 给 "N prompts · Aug 3, 2026"。底注左侧为 streak 与最忙一日(Label 11,` · ` 分隔),右侧 Less–More 固定满阶梯图例。
- 分布图:hour(24 柱)/ weekday(7 柱)/ month(12 柱)三个维度共用一张竖柱图,组头右侧 ‹ › ghost 按钮循环切换(纯视图状态,数据三份常驻不重查);峰值柱全饱和 `primary`、其余 55%,零值保留 2px `muted` 基线;柱数越少缝越大(4/8/6px)。hour 只标 6 小时锚点(靠左),weekday/month 每柱标签与柱居中;组头副行点出峰值("Most active around 2 PM" / "on Sundays" / "in August")。
-- Agents / Projects / Models 三个榜单同构:24px 条形行 = 行首(品牌图 15px 原色 / folder 图标 / 无)+ 名称列定宽 truncate + 6px 圆头轨道条(`muted` 轨、`primary` 填充,按组内峰值归一)+ 右对齐 Label 计数。三个组头都挂 ‹ › 切换度量,循环序与概览行一致:Sessions / Tokens / Prompts;**当前档位名(首字母大写的裸名词)显示在两键中间**——64px 定宽居中,Caption muted,按钮位置不随文本跳动;榜单组头因此为单行(标题与按钮组居中对齐),分布图组头保留 caption 双行、按钮中间无标签(其标题本身就是档位名)。每个榜单各自记忆档位,行按当前度量降序重排后取 top-N(Agents 全量、Projects/Models 各 6;截断在排序之后,换度量不漏项);Tokens 档只列报过用量的组、值用 K/M 缩写,组内无人报 token 时该档不进循环。
+- Agents / Projects / Models 三个榜单同构:24px 条形行 = 行首(品牌图 15px 原色 / folder 图标 / 无)+ 名称列定宽 truncate + 6px 圆头轨道条(`muted` 轨、`primary` 填充,按组内峰值归一)+ 右对齐 Label 计数。三个组头都挂 ‹ › 切换度量,循环序与概览行一致:Sessions / Tokens / Prompts;**当前档位名(首字母大写的裸名词)显示在两键中间**——64px 定宽居中,Caption muted,按钮位置不随文本跳动;榜单组头因此为单行(标题与按钮组居中对齐),分布图组头保留 caption 双行、按钮中间无标签(其标题本身就是档位名)。每个榜单各自记忆档位,行按当前度量降序重排后取 top-N(Agents 全量、Projects/Models 各 6;截断在排序之后,换度量不漏项);每一档只列这一档有数的组(Tokens 的 0 是没报用量;Sessions 的 0 是这一组只有子会话),Tokens 值用 K/M 缩写,组内无人报 token 时该档不进循环。
- 空态沿用详情空态形制("No activity yet" + "Refresh sessions to see your activity here.");加载用居中 Spinner,已有数据时静默换新不闪烁。
### Memory
diff --git a/PRODUCT.md b/PRODUCT.md
index d641052..3301689 100644
--- a/PRODUCT.md
+++ b/PRODUCT.md
@@ -28,7 +28,7 @@ Corey 本人(独立开发者,主力工具 Claude Code 与 Codex,中文为主)。
## Capabilities and Constraints
-已实现:二十三家 adapter、FTS5 trigram 搜索(<3 码点 LIKE 降级)、**搜索跳转定位**(2026-08-18:⌘K 命中直达详情页对应消息并高亮,seq 契约保证)、详情页逐消息渲染(气泡/工具折叠簇/thinking/tree-sitter 高亮;2026-08-17 由整篇 markdown 方案升级)、恢复/收藏/置顶/导出/删除(废纸篓+墓碑)、文件监听增量、Insights 统计页(0.3.0:活跃热力图与 streak、时段/星期/月份分布、Agents·Projects·Models 三榜单按 sessions/tokens/prompts 切换;2026-09-03 加 Last 7 days 周对比行与 Over time 近 53 周按 agent 堆叠的每周 prompts 趋势图;口径=主线用户消息,规格见 DESIGN.md)、Updates 页与 macOS Wake 菜单手动检查 GitHub 最新正式版并打开 Release 页更新(不后台联网、不自动替换应用包)、测试套件(adapter 契约、DB 往返、scanner 回归 + CI 三平台 + pre-commit,合成 fixture)、三端桌面(macOS 主平台;Linux/Windows experimental,终端恢复/废纸篓·回收站/剪贴板按平台原生实现,发版 CI 自动出六产物)、窗口记忆(0.3.6:记住所在屏幕/屏内位置/最大化/全屏,重启与 Dock 重开都回到原处,Settings 开在主窗所在屏)、完整 macOS 菜单栏(0.3.6:标准 Edit/Window 菜单、⌘W、Window → Main Window,主窗关闭后 About/Settings/Updates 仍可用)、导出 Markdown 与保存图片走系统「另存为」并记住上次目录(0.3.6,issue #25)、远程 host(0.4.0,issue #21:Settings → Remote hosts 配 SSH 目标,rsync 白名单镜像会话数据到本地缓存后与本地会话同列同搜,`@host` 徽章标识;阶段 1 只读——不动远端文件、远程会话禁删,resume 以 Copy SSH command 形态提供;分期计划见 CLAUDE.md「远程 host」节)、**MCP 接入**(0.5.0:随应用打包的只读 `wake-mcp` stdio server,四个工具 wake_search / wake_list_sessions / wake_get_session / wake_list_projects,Claude Code / Codex / Cursor 等任何 MCP 客户端可搜历史、按项目列会话、分页读转录;Settings → Connect 展示路径与可复制配置片段,只展示不代写别家配置;零 LLM、零网络、不写库;完整参考 docs/mcp.md)、**命令行与 Skill**(0.6.0:并排打包的只读 `wake-cli`,四个子命令 search / sessions / show / projects 加 setup,给"能跑 shell 但不说 MCP"的 agent 和真人用——它不新写查询逻辑,argv 翻成 JSON 喂同一批工具,输出与 MCP 客户端看到的**逐字节相同**(仅 CLI 末尾补一个换行)并由测试卡住,所以文档只需描述一份格式;`skills/wake/SKILL.md` 是可一行安装的 skill(`npx skills add iAmCorey/Wake`),用触发条件而非名词解释写 description,让 agent 自己想得起来去翻会话历史;完整参考 docs/cli.md;0.6.3 加 `wake-cli index`——装了 Wake 却从没启动过时,agent 自己跑一条就能把索引建起来继续干活,而不是停下来问人。它**只建不存在的索引**,已有的库原样交给 GUI:扫描落在旁边的临时库、扫完才原子占位,所以被中途杀掉可重试、撞上 GUI 首扫就退让;2026-09-22 加 `wake-cli refresh`,issue #43:app 不开时增量刷新已有索引,给靠 MCP / CLI 用 Wake、只在浏览时开 app 的人用 launch agent / systemd timer 定时跑,Wake 开着窗或还有扫描在写就退让——GUI 与两个写命令共用一把索引写锁,锁跟 Workbench 与写线程走、关窗即放,GUI 启动会等正在跑的 refresh 收尾)、Connect 页四区块(0.6.1:MCP server / MCP clients / Command line / Skill,每个面的第一块挂自己的文档链接)、**记忆可见层**(2026-09-17 起,只读:把各家 agent 自己写下的记忆——Claude Code 的按项目 auto-memory、Codex 的 memories 与逐会话摘要、ZCode 的按项目记忆——按项目聚合;GUI 的 Memory 页是侧栏底部的整页目的地,侧栏在这一页换成按记忆计数的 All Memory / Agents / Projects 导航;MCP 加第五个工具 `wake_list_memories`,`wake_get_session` 认 `wake://memory/…` 引用现场读文件,`wake_search` 末尾附记忆命中;CLI 加 `memories`;记忆的项目归属按它挂的会话在读时解析,永远跟着索引走。二期(2026-09-21)把用户写给 agent 的指令文件也收进来:各家 home 里的 CLAUDE.md / AGENTS.md(与 `rules/*.rules`)/ GEMINI.md,以及已索引项目根下的 CLAUDE.md / AGENTS.md / GEMINI.md / `.cursor/rules` / `.cursorrules` / `.kiro/steering` / `.github/copilot-instructions.md`,与记忆同列同搜、不另作区分;Settings 加 Memory locations 页,与 Session locations 同形制:逐来源开关、添加自定义目录或文件、Restore defaults。不编辑、不同步、不删除——写别家数据破铁律,要改一个 Reveal 就到;也不做"把会话自动写成记忆")。后续边界(2026-09-07 定):摘要层(需 LLM、opt-in、明示会把会话正文发给用户配置的端点)只在 MCP 接入有真实使用之后再做;Timeline / Profile 一类视图建立在摘要之上;不做 ChatGPT / Claude.ai 导出导入主线、不做实体本体与知识图谱、不做 Chrome 扩展注入。
+已实现:二十三家 adapter、FTS5 trigram 搜索(<3 码点 LIKE 降级)、**搜索跳转定位**(2026-08-18:⌘K 命中直达详情页对应消息并高亮,seq 契约保证)、详情页逐消息渲染(气泡/工具折叠簇/thinking/tree-sitter 高亮;2026-08-17 由整篇 markdown 方案升级)、恢复/收藏/置顶/导出/删除(废纸篓+墓碑)、文件监听增量、Insights 统计页(0.3.0:活跃热力图与 streak、时段/星期/月份分布、Agents·Projects·Models 三榜单按 sessions/tokens/prompts 切换;2026-09-03 加 Last 7 days 周对比行与 Over time 近 53 周按 agent 堆叠的每周 prompts 趋势图;口径=主线用户消息,agent 派出去的子会话不算会话与提问、token 照算(2026-10-12),规格见 DESIGN.md)、Updates 页与 macOS Wake 菜单手动检查 GitHub 最新正式版并打开 Release 页更新(不后台联网、不自动替换应用包)、测试套件(adapter 契约、DB 往返、scanner 回归 + CI 三平台 + pre-commit,合成 fixture)、三端桌面(macOS 主平台;Linux/Windows experimental,终端恢复/废纸篓·回收站/剪贴板按平台原生实现,发版 CI 自动出六产物)、窗口记忆(0.3.6:记住所在屏幕/屏内位置/最大化/全屏,重启与 Dock 重开都回到原处,Settings 开在主窗所在屏)、完整 macOS 菜单栏(0.3.6:标准 Edit/Window 菜单、⌘W、Window → Main Window,主窗关闭后 About/Settings/Updates 仍可用)、导出 Markdown 与保存图片走系统「另存为」并记住上次目录(0.3.6,issue #25)、远程 host(0.4.0,issue #21:Settings → Remote hosts 配 SSH 目标,rsync 白名单镜像会话数据到本地缓存后与本地会话同列同搜,`@host` 徽章标识;阶段 1 只读——不动远端文件、远程会话禁删,resume 以 Copy SSH command 形态提供;分期计划见 CLAUDE.md「远程 host」节)、**MCP 接入**(0.5.0:随应用打包的只读 `wake-mcp` stdio server,四个工具 wake_search / wake_list_sessions / wake_get_session / wake_list_projects,Claude Code / Codex / Cursor 等任何 MCP 客户端可搜历史、按项目列会话、分页读转录;Settings → Connect 展示路径与可复制配置片段,只展示不代写别家配置;零 LLM、零网络、不写库;完整参考 docs/mcp.md)、**命令行与 Skill**(0.6.0:并排打包的只读 `wake-cli`,四个子命令 search / sessions / show / projects 加 setup,给"能跑 shell 但不说 MCP"的 agent 和真人用——它不新写查询逻辑,argv 翻成 JSON 喂同一批工具,输出与 MCP 客户端看到的**逐字节相同**(仅 CLI 末尾补一个换行)并由测试卡住,所以文档只需描述一份格式;`skills/wake/SKILL.md` 是可一行安装的 skill(`npx skills add iAmCorey/Wake`),用触发条件而非名词解释写 description,让 agent 自己想得起来去翻会话历史;完整参考 docs/cli.md;0.6.3 加 `wake-cli index`——装了 Wake 却从没启动过时,agent 自己跑一条就能把索引建起来继续干活,而不是停下来问人。它**只建不存在的索引**,已有的库原样交给 GUI:扫描落在旁边的临时库、扫完才原子占位,所以被中途杀掉可重试、撞上 GUI 首扫就退让;2026-09-22 加 `wake-cli refresh`,issue #43:app 不开时增量刷新已有索引,给靠 MCP / CLI 用 Wake、只在浏览时开 app 的人用 launch agent / systemd timer 定时跑,Wake 开着窗或还有扫描在写就退让——GUI 与两个写命令共用一把索引写锁,锁跟 Workbench 与写线程走、关窗即放,GUI 启动会等正在跑的 refresh 收尾)、Connect 页四区块(0.6.1:MCP server / MCP clients / Command line / Skill,每个面的第一块挂自己的文档链接)、**记忆可见层**(2026-09-17 起,只读:把各家 agent 自己写下的记忆——Claude Code 的按项目 auto-memory、Codex 的 memories 与逐会话摘要、ZCode 的按项目记忆——按项目聚合;GUI 的 Memory 页是侧栏底部的整页目的地,侧栏在这一页换成按记忆计数的 All Memory / Agents / Projects 导航;MCP 加第五个工具 `wake_list_memories`,`wake_get_session` 认 `wake://memory/…` 引用现场读文件,`wake_search` 末尾附记忆命中;CLI 加 `memories`;记忆的项目归属按它挂的会话在读时解析,永远跟着索引走。二期(2026-09-21)把用户写给 agent 的指令文件也收进来:各家 home 里的 CLAUDE.md / AGENTS.md(与 `rules/*.rules`)/ GEMINI.md,以及已索引项目根下的 CLAUDE.md / AGENTS.md / GEMINI.md / `.cursor/rules` / `.cursorrules` / `.kiro/steering` / `.github/copilot-instructions.md`,与记忆同列同搜、不另作区分;Settings 加 Memory locations 页,与 Session locations 同形制:逐来源开关、添加自定义目录或文件、Restore defaults。不编辑、不同步、不删除——写别家数据破铁律,要改一个 Reveal 就到;也不做"把会话自动写成记忆")。后续边界(2026-09-07 定):摘要层(需 LLM、opt-in、明示会把会话正文发给用户配置的端点)只在 MCP 接入有真实使用之后再做;Timeline / Profile 一类视图建立在摘要之上;不做 ChatGPT / Claude.ai 导出导入主线、不做实体本体与知识图谱、不做 Chrome 扩展注入。
约束:对 agent 数据目录只读;绝不写 Codex 的 SQLite;不读凭证;GPUI 无 SF Symbols(图标用 lucide SVG 自备)。
已支持二十三家 agent:Claude Code、Codex(0.6.6 起排除可识别的内部线程:guardian auto-review、`/review`、compaction、memory consolidation 与用户会话同树,adapter 文件边界按首行 session_meta 的 source / thread_source 认出即不枚举;老格式或读不出的首行保守放行,`codex exec --thread-source` 打了标签的自动化线程照常收录,issue #30。`spawn_agent` 子代理是其中唯一的例外,issue #42:那是用户自己派出去的活,收录后挂在派它的会话下面、以任务名为标题,fork 进来的父线程历史折成一条不入库的占位,父会话的对话不会被索引两遍)、Qoder CLI(`~/.qoder/projects` JSONL,active-leaf 分支恢复、tool result 回挂、`QODER_CONFIG_DIR`)、Copilot CLI、Cursor(CLI 转录 + 0.6.7 起 IDE Chat/Composer 历史,PR #32:`globalStorage/state.vscdb` 明文 KV 库,composerData 给顺序、bubbleId 行给正文;转录带正文的会话归转录源,库只补转录缺失或只剩 turn_ended 空壳的会话;库里多数老会话没存工作区路径,落 Unknown project)、OpenCode(含 OpenCode 2 next,stable 的 `opencode.db` 与 next 的 `opencode-next.db` 同时扫描;逐会话兼容 `message+part`、真实 `session+session_message` 及早期 `session_v2` schema;preview 会话标 opencode2 徽章;2026-10-12 起 task 工具派出的子代理会话也收录,挂在派它的会话下)、Kiro、Gemini CLI(2026-08-17 P1 五家落地)+ Pi、Oh My Pi、Grok Build、Kimi Code、Antigravity(2026-08-19 对齐 kooky 内置 roster,起初只有 `antigravity-cli` 会话索引里的元数据卡片——正文是加密 .pb;2026-10-08 起读新版本桌面端与 IDE 写在 `~/.gemini/antigravity/brain`、`~/.gemini/antigravity-ide/brain` 的明文转录,含工具输出、模型与用户贴图,IDE 会话挂 via 徽章,同一会话转录与卡片按 id 只出一份、没有转录的仍列卡片;显示名由 Antigravity CLI 改为 Antigravity;2026-10-12 起索引里记了父会话的子会话挂在父会话下。格式取自 PR #52 @iroha3 对真实数据的整理,本机 brain 目录还没有转录,未经真机验证)+ DeepSeek Harness(dsh,2026-08-20,zstd 事件日志透明解压;格式由源码推断,当天用户跑出真实会话完成首验;2026-10-11 起委派出去的子代理会话也收录,挂在派它的会话下、以任务名为标题,issue #63,fork 出来的会话开头复制的父会话历史折成一条,token 只算自己的)+ Hermes Agent(2026-09-03,多档案 state.db,无 cwd 故 project 留空)、OpenClaw(2026-09-03,两代存储同扫;2026-10-12 起派生的子代理与面板上开的子会话挂在父会话下;本机零会话,格式由源码推断未经真机验证)、CodeBuddy(2026-09-14,issue #27:`~/.codebuddy/projects` 的 Responses 形 JSONL,custom / ai / topic 三级标题,`CODEBUDDY_CONFIG_DIR`;本机零会话,格式由官方 CLI 文档与三家第三方实现交叉推断、未经真机验证)、WorkBuddy(同日,CodeBuddy 的孪生实例:同一解析核心,`~/.workbuddy/projects`、`WORKBUDDY_CONFIG_DIR`;桌面 app 无 CLI,不提供 resume;同构只有 cc-switch 一家佐证)、ZCode(2026-09-21:Z.ai 的 GLM-5.3 官方 harness,桌面 app;运行时是 OpenCode 衍生物——`~/.zcode/cli/db/db.sqlite` 的 session/message/part 与 OpenCode v1 同形、part 解码复用,但 session 表没有 model/tokens 列故另起一家;`v2/tasks-index.sqlite` 只借 deleted / migration_source 两个过滤位;照桌面端自己的分法列:任务列表里的 interactive / fork / workflow_parent 顶层列出,辅助对话、子代理与工作流的子会话挂在父任务下(2026-10-12);分叉开头从父任务复制来的历史折成一条,辅助对话以首条提问为标题;`semantics.transcriptVisibility == hidden` 与用户消息 `origin != real_user` 归 Meta、compact_summary 折成一条、字段缺席放行;`ZCODE_STORAGE_DIR`;桌面 app 无 CLI、`zcode://` 没有按会话打开的深链,不提供 resume;本机 3.14.0 真会话首验通过,同日开源(Apache-2.0)后语义全部按源码核对)、Craft Agents(2026-09-24,issue #44:Craft Docs 的开源桌面 app,自己不带引擎——Anthropic 连接跑 Claude Agent SDK、其余连接(ChatGPT / Codex 订阅、Copilot、Google)跑 Pi SDK,另记一份给用户看的 `~/.craft-agent/workspaces/<工作区>/sessions/<id>/session.jsonl`,Wake 读这一份;子任务与分支挂回原会话,分支从父会话复制来的那段折成一条;Claude 连接在 `~/.claude/projects` 留下的引擎副本由通用的"认领"机制藏掉,原件还在才藏;工作区可建在任意位置,但登记表带 server token 不读,别处的工作区走 Session locations;桌面 app 无 CLI,不提供 resume;本机 0.13.5 真会话首验通过,ChatGPT 与 Claude 连接各一条)、Devin(2026-09-24,issue #46:`~/.local/share/devin/cli/sessions.db` 单库两表,message_nodes 森林按 `main_chain_id` 叶子沿 `parent_node_id` 取主链,hidden 会话与零正文不列,逐消息 `generation_model` 与 `metrics` 按主链累计;`XDG_DATA_HOME`;`devin --resume <id>` 按 cwd 分桶 resume;格式按本机真库验证)、Kilo Code(2026-10-07,issue #59:一家两源——2026-04 起的新版 VS Code 扩展、`kilo` CLI 与 JetBrains 插件是 OpenCode 分支,三端共用 `~/.local/share/kilo/kilo.db`,表与 OpenCode 同形、按 OpenCode 的孪生实例读,子代理会话同样挂在父会话下;session_message 里只有实验开关零星双写的 shell 一类记录时读 message + part(OpenCode 同一条规则);旧版扩展(Roo / Cline 系)每个任务一个目录,在各个 VS Code 系编辑器的 `globalStorage/kilocode.kilo-code/tasks` 里,正文是 Anthropic 消息数组,`<task>` / `<feedback>` / `<answer>` 才是人打的字、编辑器快照丢掉,旧任务用新版导入时给的 `ses_migrated_` id,导入过的那份 kilo.db 胜出;新版 `kilo --session` 在原项目目录续,旧任务没有 Open In、也不实时监听(任务目录里有整份 checkpoints 影子仓库);kilo.db 里同库存着凭证,远程只同步 vscode-server 下的旧任务;本机零会话,新版的表结构按源码的建库语句核过,数据形状由源码推断、未经真机验证)、Grok Bot(2026-10-11:xAI 的常驻 agent,桌面 app 由 Cursor 出品,bot 跑在云端电脑上,对话也存在那里;本机只有桌面端的滚动缓存 `<userData>/sand-client-persistence`——每个对话只留最近 200 条、最多 24 个对话、7 天没写过的被 app 自己清掉。用户定"跟着缓存走":缓存里有的对话出完整消息(你的话、bot 的话、群聊里标出是哪个 bot、bot 之间互发的消息、提问卡片与你的回答、邮件草稿、审批),被清出缓存的退成侧栏列表里的一张卡片(描述 + 最后一条预览),不会从 Wake 里消失;对话本体在云端,删除只隐藏、不动缓存文件;没有命令行,不提供 resume;不做远程同步;格式按 0.68.1 的 app 源码与本机 14 个真实对话核对)。做不了的:Windsurf/Trae 加密,Amp/Factory(Droid)/Warp 云端无本地数据,Reasonix 本机零会话格式未实测。
diff --git a/crates/wake-core/src/adapters/antigravity.rs b/crates/wake-core/src/adapters/antigravity.rs
index 68fafa0..d560da5 100644
--- a/crates/wake-core/src/adapters/antigravity.rs
+++ b/crates/wake-core/src/adapters/antigravity.rs
@@ -178,6 +178,7 @@ fn base_meta(r: &SessionFileRef) -> SessionMeta {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
@@ -198,6 +199,7 @@ fn card_meta(r: &SessionFileRef, row: &AgRow) -> SessionMeta {
updated_at: ts,
message_count: row.step_count,
source: surface(&row.app),
+ spawned: row.parent.is_some(),
..base_meta(r)
}
}
@@ -254,6 +256,7 @@ fn transcript(
message_count: t.messages.len() as i64,
model: t.model,
source: surface(app),
+ spawned: row.is_some_and(|row| row.parent.is_some()),
..base_meta(r)
};
Ok((meta, t.messages, t.unknown_lines))
diff --git a/crates/wake-core/src/adapters/claude.rs b/crates/wake-core/src/adapters/claude.rs
index 37d3b3c..2b99f60 100644
--- a/crates/wake-core/src/adapters/claude.rs
+++ b/crates/wake-core/src/adapters/claude.rs
@@ -887,6 +887,7 @@ fn build_meta(r: &SessionFileRef, p: &ParseResult) -> SessionMeta {
},
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/codebuddy.rs b/crates/wake-core/src/adapters/codebuddy.rs
index 2e631a2..0d88ac4 100644
--- a/crates/wake-core/src/adapters/codebuddy.rs
+++ b/crates/wake-core/src/adapters/codebuddy.rs
@@ -402,6 +402,7 @@ fn build_meta(agent: AgentId, r: &SessionFileRef, parsed: &ParseResult) -> Sessi
tokens_used: (parsed.tokens_used > 0).then_some(parsed.tokens_used),
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/codex.rs b/crates/wake-core/src/adapters/codex.rs
index 240e288..d371cef 100644
--- a/crates/wake-core/src/adapters/codex.rs
+++ b/crates/wake-core/src/adapters/codex.rs
@@ -938,6 +938,7 @@ fn build_meta(r: &SessionFileRef, p: &CodexParse, archived_dir: &Path) -> Sessio
.file_path
.starts_with(&archived_dir.to_string_lossy().to_string()),
source: p.source.clone(),
+ spawned: p.spawn.is_some(),
favorite: false,
pinned: false,
}
@@ -1076,11 +1077,11 @@ impl AgentAdapter for CodexAdapter {
let Some(row) = by_name.get(path_tail(&r.file_path)) else {
continue;
};
- // 结构化 source(对象)= 子代理线程。它的 `title` 是 Codex 按首条
- // 消息自动生成的,而子线程开头是 fork 进来的父线程对话——用它会让
- // 子会话又变成父会话标题的副本(0.6.6 修掉的那个症状)。这类行只
- // 认用户手工命名的 `name`,其余交回解析侧合成的任务名
- let auto_title_is_parents = row
+ // 结构化 source(对象)= 子代理线程(列得出来的只剩 spawn_agent 派的,内部
+ // 线程枚举时就滤掉了)。它的 `title` 是 Codex 按首条消息自动生成的,而子线程
+ // 开头是 fork 进来的父线程对话——用它会让子会话又变成父会话标题的副本(0.6.6
+ // 修掉的那个症状)。这类行只认用户手工命名的 `name`,其余交回解析侧合成的任务名
+ let subagent_thread = row
.source
.as_deref()
.is_some_and(|source| source.trim_start().starts_with('{'));
@@ -1090,7 +1091,7 @@ impl AgentAdapter for CodexAdapter {
.filter(|n| !n.trim().is_empty())
.map(String::from)
.or_else(|| {
- if auto_title_is_parents {
+ if subagent_thread {
return None;
}
// Codex 自家 state DB 会把注入文本存进 title,同样要过滤
@@ -1126,6 +1127,7 @@ impl AgentAdapter for CodexAdapter {
tokens_used: row.tokens_used,
archived: row.archived,
source: row.source.clone(),
+ spawned: subagent_thread,
favorite: false,
pinned: false,
},
diff --git a/crates/wake-core/src/adapters/copilot.rs b/crates/wake-core/src/adapters/copilot.rs
index 2e57070..26b9130 100644
--- a/crates/wake-core/src/adapters/copilot.rs
+++ b/crates/wake-core/src/adapters/copilot.rs
@@ -109,6 +109,7 @@ impl CopilotAdapter {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/craft.rs b/crates/wake-core/src/adapters/craft.rs
index b6fe20d..a242495 100644
--- a/crates/wake-core/src/adapters/craft.rs
+++ b/crates/wake-core/src/adapters/craft.rs
@@ -574,6 +574,7 @@ fn build_meta(r: &SessionFileRef, p: &CraftParse) -> SessionMeta {
.get("triggeredBy")
.is_some_and(|t| t.is_object())
.then(|| "automation".to_string()),
+ spawned: str_at(h, "taskRunId").is_some() || str_at(h, "taskNodeId").is_some(),
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/cursor.rs b/crates/wake-core/src/adapters/cursor.rs
index 9e3c870..f6146e8 100644
--- a/crates/wake-core/src/adapters/cursor.rs
+++ b/crates/wake-core/src/adapters/cursor.rs
@@ -81,6 +81,8 @@ impl CursorAdapter {
tokens_used: None,
archived: false,
source: None,
+ // 子代理的转录在父会话目录的 subagents/ 里,不作为顶层转录列出;子代理会话由 IDE 库那一路标
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/cursor_ide.rs b/crates/wake-core/src/adapters/cursor_ide.rs
index 8d1ed91..9517cdb 100644
--- a/crates/wake-core/src/adapters/cursor_ide.rs
+++ b/crates/wake-core/src/adapters/cursor_ide.rs
@@ -257,7 +257,8 @@ impl CursorIdeAdapter {
COALESCE(json_extract(CAST(k.value AS TEXT), '$.fullConversationHeadersOnly[#-1].createdAt'), ''),
json_array_length(CAST(k.value AS TEXT), '$.fullConversationHeadersOnly'),
COALESCE(json_extract(CAST(k.value AS TEXT), '$.workspaceIdentifier.uri.fsPath'), ''),
- COALESCE(json_extract(CAST(k.value AS TEXT), '$.trackedGitRepos[0].repoPath'), '')
+ COALESCE(json_extract(CAST(k.value AS TEXT), '$.trackedGitRepos[0].repoPath'), ''),
+ json_extract(CAST(k.value AS TEXT), '$.subagentInfo') IS NOT NULL
FROM cursorDiskKV k
WHERE k.key LIKE '{COMPOSER_PREFIX}%'
AND json_array_length(CAST(k.value AS TEXT), '$.fullConversationHeadersOnly') > 0",
@@ -280,6 +281,7 @@ impl CursorIdeAdapter {
updated_ms: pick_updated(updated, last_bubble_ms, created),
bubble_count: r.get(5)?,
cwd: if fs_path.is_empty() { repo_path } else { fs_path },
+ subagent: r.get(8)?,
})
})
.ok()?
@@ -327,6 +329,7 @@ impl CursorIdeAdapter {
tokens_used: usage.tokens,
archived: false,
source: None,
+ spawned: row.subagent,
favorite: false,
pinned: false,
}
@@ -433,6 +436,11 @@ fn parent_links_from(db: &std::path::Path) -> Option<Vec<(String, String)>> {
)
}
+/// 子代理会话:composer 带 subagentInfo(与 `rows` 的 SQL 同一判据)
+fn has_subagent_info(data: &Value) -> bool {
+ data.get("subagentInfo").is_some_and(|info| !info.is_null())
+}
+
/// updated_at 的三段回退,见 `rows` 的说明
fn pick_updated(last_updated: i64, last_bubble: i64, created: i64) -> i64 {
if last_updated > 0 {
@@ -541,6 +549,8 @@ struct IdeRow {
updated_ms: i64,
bubble_count: i64,
cwd: String,
+ /// 子代理会话(composer 带 subagentInfo;父子关系另由 composerHeaders 给)
+ subagent: bool,
}
impl IdeRow {
@@ -568,6 +578,7 @@ impl IdeRow {
updated_ms: pick_updated(int("lastUpdatedAt"), last_bubble, int("createdAt")),
bubble_count: heads.map_or(0, |h| h.len() as i64),
cwd: project_path_from_data(data).unwrap_or_default().to_string(),
+ subagent: has_subagent_info(data),
}
}
}
diff --git a/crates/wake-core/src/adapters/devin.rs b/crates/wake-core/src/adapters/devin.rs
index ba77c27..0608c72 100644
--- a/crates/wake-core/src/adapters/devin.rs
+++ b/crates/wake-core/src/adapters/devin.rs
@@ -207,6 +207,7 @@ fn build_meta(
tokens_used: (tokens > 0).then_some(tokens),
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/dsh.rs b/crates/wake-core/src/adapters/dsh.rs
index 5a1feaf..fc01cf7 100644
--- a/crates/wake-core/src/adapters/dsh.rs
+++ b/crates/wake-core/src/adapters/dsh.rs
@@ -140,6 +140,8 @@ struct DshHeader {
id: String,
cwd: String,
created_at: i64,
+ /// 委派出去的子代理会话(origin subagent / delegationDepth > 0)
+ subagent: bool,
/// 派出这个子代理会话的会话 id(首行的 parentSession)。用户自己 fork 出来的会话也写
/// parentSession,但那是一段独立的对话——dsh 自己也只把子代理当成父会话的孩子——不挂
parent: Option<String>,
@@ -176,6 +178,7 @@ fn parse_header(v: &serde_json::Value) -> Option<DshHeader> {
created_at: v.get("createdAt").and_then(|t| t.as_i64()).unwrap_or(0),
seeded: true_at(v, "isSeeded") || seed_length.is_some(),
id,
+ subagent,
parent,
seed_length,
})
@@ -635,6 +638,7 @@ fn build_meta(r: &SessionFileRef, p: &DshParse) -> SessionMeta {
tokens_used: p.tokens_used,
archived: false,
source: None,
+ spawned: p.header.as_ref().is_some_and(|h| h.subagent),
favorite: false,
pinned: false,
}
@@ -803,6 +807,14 @@ mod tests {
None
);
assert_eq!(parent(r#","origin":"subagent""#), None);
+
+ // Insights 不算子会话的提问:子代理是 agent 派出去的,用户 fork 的仍是用户自己的对话
+ let spawned = |extra: &str| header(extra).subagent;
+ assert!(spawned(r#","origin":"subagent""#));
+ assert!(spawned(r#","delegationDepth":2,"parentSession":"p1""#));
+ assert!(!spawned(
+ r#","isSeeded":true,"delegationDepth":0,"parentSession":"p1""#
+ ));
}
/// v0 / v1 没有截点标记(那时的 session/end-seed 不带 inherited):截点在首行的 seedLength,
diff --git a/crates/wake-core/src/adapters/gemini.rs b/crates/wake-core/src/adapters/gemini.rs
index 7c93fa9..133981d 100644
--- a/crates/wake-core/src/adapters/gemini.rs
+++ b/crates/wake-core/src/adapters/gemini.rs
@@ -184,6 +184,7 @@ fn build_meta(r: &SessionFileRef, p: &GeminiParse, cwd: &str) -> SessionMeta {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/grok.rs b/crates/wake-core/src/adapters/grok.rs
index 8f75a63..793be9c 100644
--- a/crates/wake-core/src/adapters/grok.rs
+++ b/crates/wake-core/src/adapters/grok.rs
@@ -431,6 +431,7 @@ fn build_meta(
tokens_used: None,
archived: false,
source: None,
+ spawned: grok_group::is_subagent(group, &r.native_id),
favorite: false,
pinned: false,
}
@@ -453,6 +454,11 @@ impl AgentAdapter for GrokAdapter {
Some(grok_group::parent_links(&self.group_ctx()))
}
+ /// 登记表里的子会话都是 subagent 派出去的,而登记长在父会话目录里
+ fn linked_children_are_spawned(&self) -> bool {
+ true
+ }
+
fn is_snapshot_event(&self, path: &Path) -> bool {
path.strip_prefix(&self.root).ok().is_some_and(|relative| {
relative
diff --git a/crates/wake-core/src/adapters/grok_bot.rs b/crates/wake-core/src/adapters/grok_bot.rs
index ffa5d2b..c0d696b 100644
--- a/crates/wake-core/src/adapters/grok_bot.rs
+++ b/crates/wake-core/src/adapters/grok_bot.rs
@@ -412,6 +412,7 @@ fn base_meta(r: &SessionFileRef) -> SessionMeta {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/grok_group.rs b/crates/wake-core/src/adapters/grok_group.rs
index e68c7e4..0fb0b3d 100644
--- a/crates/wake-core/src/adapters/grok_group.rs
+++ b/crates/wake-core/src/adapters/grok_group.rs
@@ -41,20 +41,27 @@ pub fn load_group_ctx(sessions_root: &Path, grok_home: &Path) -> Arc<GroupCtx> {
/// 扁平到 root,否则局部快照提前压平会丢失跨 location 的后半段父链。
pub fn parent_links(ctx: &GroupCtx) -> Vec<(String, String)> {
ctx.parents
- .iter()
- .filter_map(|(child_id, parent)| {
- if parent.parent_id.is_empty() || parent.parent_id == *child_id {
- None
- } else {
- Some((
- format!("grok:{child_id}"),
- format!("grok:{}", parent.parent_id),
- ))
- }
+ .keys()
+ .filter_map(|child_id| {
+ let parent_id = direct_parent(ctx, child_id)?;
+ Some((format!("grok:{child_id}"), format!("grok:{parent_id}")))
})
.collect()
}
+/// 这条会话是不是某个会话 `subagents/` 下记着的子代理
+pub fn is_subagent(ctx: &GroupCtx, id: &str) -> bool {
+ direct_parent(ctx, id).is_some()
+}
+
+/// 登记表里这条会话的直接父会话(指回自己的不算)
+fn direct_parent<'a>(ctx: &'a GroupCtx, id: &str) -> Option<&'a str> {
+ ctx.parents
+ .get(id)
+ .map(|parent| parent.parent_id.as_str())
+ .filter(|parent_id| !parent_id.is_empty() && *parent_id != id)
+}
+
pub fn canonical_project(
cwd: &str,
remotes: &[String],
diff --git a/crates/wake-core/src/adapters/hermes.rs b/crates/wake-core/src/adapters/hermes.rs
index 6cc587c..a78bfa6 100644
--- a/crates/wake-core/src/adapters/hermes.rs
+++ b/crates/wake-core/src/adapters/hermes.rs
@@ -53,6 +53,7 @@ struct HermesSchema {
cache_write: bool,
reasoning_tokens: bool,
msg_reasoning: bool,
+ model_config: bool,
}
impl HermesSchema {
@@ -65,6 +66,7 @@ impl HermesSchema {
cache_write: sessions.contains("cache_write_tokens"),
reasoning_tokens: sessions.contains("reasoning_tokens"),
msg_reasoning: messages.contains("reasoning"),
+ model_config: sessions.contains("model_config"),
}
}
}
@@ -165,6 +167,7 @@ impl HermesAdapter {
archived: false,
// cli 是默认启动面,徽章只给非 cli 的(telegram/discord/…)
source: row.source.clone().filter(|s| !s.is_empty() && s != "cli"),
+ spawned: row.delegated,
favorite: false,
pinned: false,
}
@@ -308,6 +311,10 @@ struct HermesRow {
/// `/branch`、上下文压缩续段、子代理委派都会设它;这些仍是用户可见的
/// 会话,照常列出,但按父子关系挂到父会话下(parent_links)
parent_id: Option<String>,
+ /// 委派出去的子代理:model_config 带 `_delegate_from`(上游 hermes_state_sessions.py 的
+ /// `_delegate_from_json`;/branch 带的是 `_branched_from`,压缩续段是父会话以 compression
+ /// 结束,这两种都是用户自己的对话)
+ delegated: bool,
}
/// Hermes 全部时间戳恒为 unix 秒(写端 time.time()),不做秒/毫秒猜测
@@ -330,12 +337,19 @@ fn query_rows(ro: &SqliteRo, db: &HermesDb) -> Option<Vec<HermesRow>> {
} else {
"''"
};
+ // 坏 JSON 上的 json_extract 会让整条查询报错,先 json_valid(CASE 按顺序求值)
+ let delegated_col = if schema.model_config {
+ "CASE WHEN json_valid(s.model_config)
+ THEN json_extract(s.model_config, '$._delegate_from') IS NOT NULL ELSE 0 END"
+ } else {
+ "0"
+ };
let sql = format!(
"SELECT s.id, s.source, s.model, {title_col}, s.started_at, s.ended_at,
COALESCE(s.input_tokens,0) + COALESCE(s.output_tokens,0) + {} + {} + {},
COUNT(m.id), COALESCE(MAX(m.timestamp), 0),
COALESCE(SUM(LENGTH(COALESCE(m.content,'')) + LENGTH(COALESCE(m.tool_calls,''))), 0),
- s.parent_session_id
+ s.parent_session_id, {delegated_col}
FROM sessions s LEFT JOIN messages m ON m.session_id = s.id
GROUP BY s.id",
col(schema.cache_read, "cache_read_tokens"),
@@ -359,6 +373,7 @@ fn query_rows(ro: &SqliteRo, db: &HermesDb) -> Option<Vec<HermesRow>> {
message_count: r.get(7)?,
content_len: r.get(9)?,
parent_id: r.get::<_, Option<String>>(10)?.filter(|p| !p.is_empty()),
+ delegated: r.get(11)?,
})
})
.ok()?
diff --git a/crates/wake-core/src/adapters/kilo.rs b/crates/wake-core/src/adapters/kilo.rs
index 9e60ff0..2c4896c 100644
--- a/crates/wake-core/src/adapters/kilo.rs
+++ b/crates/wake-core/src/adapters/kilo.rs
@@ -414,6 +414,11 @@ fn id_timestamp(task_id: &str) -> i64 {
0
}
+/// 派出这个任务的任务:new_task 子任务在自己的元数据里记着 parentTaskId(指回自己的不算)
+fn parent_task_id(item: Option<&Value>, task_id: &str) -> Option<String> {
+ optional_string(item.and_then(|item| item.get("parentTaskId"))).filter(|p| p != task_id)
+}
+
fn build_meta(
r: &SessionFileRef,
task_id: &str,
@@ -464,6 +469,7 @@ fn build_meta(
tokens_used: (tokens > 0).then_some(tokens),
archived: false,
source: editor.map(String::from),
+ spawned: parent_task_id(item, task_id).is_some(),
favorite: false,
pinned: false,
}
@@ -989,18 +995,14 @@ impl AgentAdapter for KiloLegacyAdapter {
};
let task_id = entry.file_name().to_string_lossy().to_string();
let parent = match read_item_file(&task_dir) {
- Ok(Some(item)) => optional_string(item.get("parentTaskId")),
+ Ok(Some(item)) => parent_task_id(Some(&item), &task_id),
Ok(None) => {
let index = index.get_or_insert_with(|| root.index()).as_ref()?;
- optional_string(
- index
- .get(&task_id)
- .and_then(|item| item.get("parentTaskId")),
- )
+ parent_task_id(index.get(&task_id), &task_id)
}
Err(_) => return None,
};
- if let Some(parent) = parent.filter(|p| *p != task_id) {
+ if let Some(parent) = parent {
links.push((
session_key(AgentId::Kilo, "", &r.native_id),
legacy_task_key(&parent),
diff --git a/crates/wake-core/src/adapters/kimi.rs b/crates/wake-core/src/adapters/kimi.rs
index 46db4f0..0560d76 100644
--- a/crates/wake-core/src/adapters/kimi.rs
+++ b/crates/wake-core/src/adapters/kimi.rs
@@ -609,6 +609,7 @@ fn build_meta(
tokens_used: None,
archived: state.archived,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/kiro.rs b/crates/wake-core/src/adapters/kiro.rs
index ad8e1ea..9e01b85 100644
--- a/crates/wake-core/src/adapters/kiro.rs
+++ b/crates/wake-core/src/adapters/kiro.rs
@@ -150,6 +150,7 @@ fn build_meta(r: &SessionFileRef, side: &Sidecar, messages: &[TranscriptMessage]
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/mod.rs b/crates/wake-core/src/adapters/mod.rs
index f9a8ceb..3d80179 100644
--- a/crates/wake-core/src/adapters/mod.rs
+++ b/crates/wake-core/src/adapters/mod.rs
@@ -260,6 +260,13 @@ pub trait AgentAdapter: Send + Sync {
fn children_outlive_parent(&self) -> bool {
false
}
+ /// `parent_links` 只记 agent 派出去的子会话(Grok 的 subagents 登记表)时为 true:关系同步
+ /// 把挂上的子会话标成 `SessionMeta::spawned`。这类标记出自别的会话的边车,解析子会话时
+ /// 未必看得见——父会话在另一个 location、登记晚于子会话最后一次写入才落盘——合并了全部
+ /// location 的关系同步才说得准;解析时照常按看得见的填。远程装饰器必须转发
+ fn linked_children_are_spawned(&self) -> bool {
+ false
+ }
/// 本家会话在**别家**目录里的替身。外壳产品(Craft Agents)跑的是别家的引擎,
/// 引擎自己也往自家目录落了一份转录(Claude Agent SDK → `~/.claude/projects`),
/// 同一段对话就会以两家身份各列一次。返回那些替身的 `(别家, 别家 native id)`:
diff --git a/crates/wake-core/src/adapters/openclaw.rs b/crates/wake-core/src/adapters/openclaw.rs
index 7d0ade1..72e38a8 100644
--- a/crates/wake-core/src/adapters/openclaw.rs
+++ b/crates/wake-core/src/adapters/openclaw.rs
@@ -172,6 +172,7 @@ impl OpenclawAdapter {
channel: None,
created_ms: 0,
updated_ms: norm_ms(v.get("updatedAt").and_then(Value::as_i64).unwrap_or(0)),
+ spawned: entry_spawned(v),
}
}
@@ -217,6 +218,7 @@ impl OpenclawAdapter {
archived: false,
// 频道即启动面(telegram/discord/webchat…);cli/空不打徽章
source: hint.channel.clone().filter(|c| !c.is_empty() && c != "cli"),
+ spawned: hint.spawned,
favorite: false,
pinned: false,
}
@@ -311,6 +313,19 @@ struct RowHint {
channel: Option<String>,
created_ms: i64,
updated_ms: i64,
+ /// agent 派生出来的子会话(`entry_spawned`);面板上新建的子会话、频道里的话题只记了
+ /// parentSessionKey,那是用户自己的对话
+ spawned: bool,
+}
+
+/// 条目是 agent 派生出来的:spawn 时写 spawnedBy / spawnedBySessionId;sessions_spawn 起的
+/// 可见子会话只记 parentSessionKey,但 spawnDepth 一定 ≥ 1——上游的派生层级只由 spawn 声明,
+/// 面板新建、fork、频道话题一律是 0
+fn entry_spawned(entry: &Value) -> bool {
+ ["spawnedBy", "spawnedBySessionId"]
+ .iter()
+ .any(|key| text_at(entry, key).is_some())
+ || entry.get("spawnDepth").and_then(Value::as_i64).unwrap_or(0) > 0
}
/// 子会话指向父会话的线索
@@ -391,7 +406,9 @@ fn query_rows(conn: &rusqlite::Connection) -> Option<Vec<ClawRow>> {
r.get::<_, Option<String>>(ix)
.map(|key| key.filter(|key| !key.is_empty()))
};
- let own_key = key_at(1)?.or(key_at(16)?);
+ let spawned_by = key_at(1)?;
+ let spawned = spawned_by.is_some() || (is_current && entry_spawned(&entry));
+ let own_key = spawned_by.or(key_at(16)?);
Ok(ClawRow {
session_key: r.get(15)?,
parent: ParentRef::of(is_current.then_some(&entry), own_key),
@@ -407,6 +424,7 @@ fn query_rows(conn: &rusqlite::Connection) -> Option<Vec<ClawRow>> {
.into_iter()
.max()
.unwrap_or(0),
+ spawned,
},
session_id,
})
diff --git a/crates/wake-core/src/adapters/opencode.rs b/crates/wake-core/src/adapters/opencode.rs
index 5c40f37..fae5954 100644
--- a/crates/wake-core/src/adapters/opencode.rs
+++ b/crates/wake-core/src/adapters/opencode.rs
@@ -345,6 +345,7 @@ impl OpencodeAdapter {
},
archived: row.archived,
source: self.flavor.marks_preview.then(|| row.source(db)).flatten(),
+ spawned: row.parent.is_some(),
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/pi.rs b/crates/wake-core/src/adapters/pi.rs
index 9a2aa36..b35cb36 100644
--- a/crates/wake-core/src/adapters/pi.rs
+++ b/crates/wake-core/src/adapters/pi.rs
@@ -153,6 +153,7 @@ fn build_meta(agent: AgentId, r: &SessionFileRef, p: &PiParse) -> SessionMeta {
tokens_used: p.tokens_used,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/qoder.rs b/crates/wake-core/src/adapters/qoder.rs
index 4293747..1cfc64f 100644
--- a/crates/wake-core/src/adapters/qoder.rs
+++ b/crates/wake-core/src/adapters/qoder.rs
@@ -614,6 +614,7 @@ fn build_meta(r: &SessionFileRef, parsed: &QoderParse) -> SessionMeta {
tokens_used: (parsed.tokens_used > 0).then_some(parsed.tokens_used),
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/adapters/remote.rs b/crates/wake-core/src/adapters/remote.rs
index fdd22df..945f360 100644
--- a/crates/wake-core/src/adapters/remote.rs
+++ b/crates/wake-core/src/adapters/remote.rs
@@ -238,6 +238,10 @@ impl AgentAdapter for RemoteAdapter {
self.inner.children_outlive_parent()
}
+ fn linked_children_are_spawned(&self) -> bool {
+ self.inner.linked_children_are_spawned()
+ }
+
fn manages_claims(&self) -> bool {
self.inner.manages_claims()
}
diff --git a/crates/wake-core/src/adapters/zcode.rs b/crates/wake-core/src/adapters/zcode.rs
index 577abb6..f69f048 100644
--- a/crates/wake-core/src/adapters/zcode.rs
+++ b/crates/wake-core/src/adapters/zcode.rs
@@ -118,6 +118,9 @@ struct ZcRow {
content_len: i64,
/// 挂在哪个会话下(`CHILD_TYPES`;fork 也带 parent_id,但不挂)
parent: Option<String>,
+ /// agent 派出去的:子代理、工作流的子会话(辅助对话不算,里面的话是用户打的);老库没有
+ /// task_type 时挂着的都算
+ spawned: bool,
}
/// ALTER 追加的列各自在不在(初始 schema 的列不用探)
@@ -322,6 +325,7 @@ fn build_meta(r: &SessionFileRef, row: &ZcRow, parsed: &Parsed) -> SessionMeta {
archived: row.archived,
// 列出的都是桌面端里的任务或任务里的会话,没有可打的 via 徽章
source: None,
+ spawned: row.spawned,
favorite: false,
pinned: false,
}
@@ -385,6 +389,14 @@ fn query_rows(
let rows = stmt.query_map([id], |r| {
let task_type = r.get::<_, Option<String>>(9)?;
let side_chat = task_type.as_deref() == Some("selection_side_chat");
+ let parent = r
+ .get::<_, Option<String>>(8)?
+ .filter(|parent| !parent.is_empty())
+ .filter(|_| {
+ task_type
+ .as_deref()
+ .is_none_or(|t| CHILD_TYPES.contains(&t))
+ });
Ok(ZcRow {
id: r.get(0)?,
directory: r.get::<_, Option<String>>(1)?.unwrap_or_default(),
@@ -398,14 +410,8 @@ fn query_rows(
updated_ms: r.get::<_, Option<i64>>(5)?.unwrap_or(0),
archived: r.get::<_, Option<i64>>(6)?.is_some(),
content_len: r.get::<_, Option<i64>>(7)?.unwrap_or(0),
- parent: r
- .get::<_, Option<String>>(8)?
- .filter(|parent| !parent.is_empty())
- .filter(|_| {
- task_type
- .as_deref()
- .is_none_or(|t| CHILD_TYPES.contains(&t))
- }),
+ spawned: parent.is_some() && !side_chat,
+ parent,
})
})?;
rows.collect()
diff --git a/crates/wake-core/src/cleanup.rs b/crates/wake-core/src/cleanup.rs
index b24a662..b8287f5 100644
--- a/crates/wake-core/src/cleanup.rs
+++ b/crates/wake-core/src/cleanup.rs
@@ -1161,6 +1161,7 @@ mod tests {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rs
index 1f6dfca..0708794 100644
--- a/crates/wake-core/src/db.rs
+++ b/crates/wake-core/src/db.rs
@@ -46,7 +46,8 @@ CREATE TABLE IF NOT EXISTS sessions (
file_mtime INTEGER DEFAULT 0,
unknown_lines INTEGER DEFAULT 0,
parent_key TEXT NOT NULL DEFAULT '',
- host TEXT NOT NULL DEFAULT ''
+ host TEXT NOT NULL DEFAULT '',
+ spawned INTEGER NOT NULL DEFAULT 0
);
CREATE INDEX IF NOT EXISTS idx_sessions_updated ON sessions(updated_at DESC);
CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent_id, updated_at DESC);
@@ -227,8 +228,10 @@ CREATE TABLE IF NOT EXISTS claimed_sessions (
/// "13" = dsh 的子代理会话收录、挂到派它的会话下(issue #63),fork 出来的会话折掉从父会话
/// 复制来的一段、标题 / 模型 / 用量只算截点之后的,老行靠这轮重解析回填;
/// "14" = ZCode 的分叉折掉从父任务复制来的一段、辅助对话的固定标题退回首条提问,两者的
-/// token / 模型只算复制边界之后的,时间线分隔条不再计未知行,老行靠这轮重解析回填。
-pub const FTS_FORMAT: &str = "14";
+/// token / 模型只算复制边界之后的,时间线分隔条不再计未知行,老行靠这轮重解析回填;
+/// "15" = 各家把 agent 派出去的子会话标出来(sessions.spawned,Insights 的提问数与会话数不算
+/// 它),老行靠这轮重解析写对。
+pub const FTS_FORMAT: &str = "15";
/// FTS 压缩的节奏(见 `Store::compact_fts`):距上次压缩满一天、或从没压过才压。没有记录
/// 就算到期——老库升级后、新建库首轮扫描收尾各压一次;`FTS_FORMAT` 换代时 open_conn 把
@@ -319,6 +322,14 @@ fn open_conn(path: &Path) -> Result<Connection> {
[],
)?;
}
+ // agent 派出去的子会话(2026-10-12):Insights 的提问数与会话数不算它。只有 GUI 的 Insights
+ // 读,不进 NEWEST_COLUMN(只读旁路不查它);老行是 0,FTS_FORMAT "15" 的重解析把它写对
+ if !table_has_column(&conn, "sessions", "spawned")? {
+ conn.execute(
+ "ALTER TABLE sessions ADD COLUMN spawned INTEGER NOT NULL DEFAULT 0",
+ [],
+ )?;
+ }
// 记忆来源列(记忆可见层二期,2026-09-21):source = 所属来源的 id。memories 表还
// 没发布过,但开发机上的库已按旧 DDL 建过;老行 source 为空,下一轮扫描按来源
// 指纹重写(开发机上短暂存在过的 origin 列留着不碍事,DDL 与读写都不再提它)
@@ -1107,6 +1118,37 @@ impl Store {
}))
}
+ /// 把这些会话标成 agent 派出去的(sessions.spawned;`AgentAdapter::linked_children_are_spawned`
+ /// 的家在关系同步时调)。已经标过的不动:一条都不用改时只在读连接上看一眼、不开写事务——
+ /// watcher 每批 Grok 事件都会走到这里
+ pub fn mark_spawned<'a>(&self, keys: impl IntoIterator<Item = &'a str>) -> Result<()> {
+ let pending = {
+ let conn = self.read.lock().unwrap();
+ let mut stmt =
+ conn.prepare_cached("SELECT 1 FROM sessions WHERE key = ?1 AND spawned = 0")?;
+ let mut pending = Vec::new();
+ for key in keys {
+ if stmt.exists(params![key])? {
+ pending.push(key);
+ }
+ }
+ pending
+ };
+ if pending.is_empty() {
+ return Ok(());
+ }
+ let mut conn = self.write.lock().unwrap();
+ let tx = conn.transaction()?;
+ {
+ let mut stmt = tx.prepare_cached("UPDATE sessions SET spawned = 1 WHERE key = ?1")?;
+ for key in pending {
+ stmt.execute(params![key])?;
+ }
+ }
+ tx.commit()?;
+ Ok(())
+ }
+
/// 出库、不记墓碑:扫描与 watcher 发现文件已经不在了。用户删除走
/// `remove_trashed_sessions`,批量清理走 `complete_cleanup`
pub fn remove_session(&self, key: &str) -> Result<()> {
@@ -2525,11 +2567,17 @@ impl Store {
.ok()
.filter(|d| *d <= today)
};
+ // 会话数与提问数只算用户自己开的会话:agent 派出去的子会话(子代理、工作流里的一步)
+ // 不算一场会话,它开头那句"用户消息"是派活的 agent 写的,也不算提问(会话内部的
+ // sidechain 本来就不算);token 照常全算,那是模型实际花掉的(2026-10-12)
+ const OWN_SESSION: &str = "s.spawned = 0";
// "一条 prompt" 的行集(主线用户消息)——整页口径共用这一个片段,
// 内联多份的话谓词一漂移,总数就会与分桶/榜单悄悄不一致
- const PROMPT_ROWS: &str = "FROM messages m JOIN sessions s ON s.key = m.session_key
+ let prompt_rows = format!(
+ "FROM messages m JOIN sessions s ON s.key = m.session_key
WHERE s.archived = 0 AND m.role = 'user' AND m.sidechain_id IS NULL
- AND s.key IN canonical_sessions";
+ AND {OWN_SESSION} AND s.key IN canonical_sessions"
+ );
// 临时连接,不与 UI 的 read 连接抢锁:WAL 多读并发,几十毫秒的
// 统计扫描不该让导航点击的列表查询排队(2026-08-27 Codex review)
@@ -2570,10 +2618,12 @@ impl Store {
data.first_ts,
data.project_count,
) = conn.query_row(
- "SELECT COUNT(*), COALESCE(SUM(tokens_used),0),
- COALESCE(MIN(NULLIF(created_at,0)),0),
- COUNT(DISTINCT NULLIF(project_path,''))
- FROM sessions WHERE archived = 0 AND key IN canonical_sessions",
+ &format!(
+ "SELECT COUNT(*) FILTER (WHERE {OWN_SESSION}), COALESCE(SUM(s.tokens_used),0),
+ COALESCE(MIN(NULLIF(s.created_at,0)),0),
+ COUNT(DISTINCT NULLIF(s.project_path,''))
+ FROM sessions s WHERE s.archived = 0 AND s.key IN canonical_sessions"
+ ),
[],
|r| Ok((r.get(0)?, r.get(1)?, r.get(2)?, r.get(3)?)),
)?;
@@ -2585,7 +2635,7 @@ impl Store {
"SELECT CASE WHEN m.ts > 0 THEN date(m.ts/1000,'unixepoch','localtime') END d,
CASE WHEN m.ts > 0 THEN CAST(strftime('%H', m.ts/1000,'unixepoch','localtime') AS INTEGER) END h,
COUNT(*)
- {PROMPT_ROWS}
+ {prompt_rows}
GROUP BY d, h ORDER BY d"
))?;
let rows = stmt.query_map([], |r| {
@@ -2626,7 +2676,7 @@ impl Store {
"SELECT s.agent_id, s.project_path, COALESCE(s.model,''),
CASE WHEN m.ts > 0 THEN date(m.ts/1000,'unixepoch','localtime') END d,
COUNT(*)
- {PROMPT_ROWS}
+ {prompt_rows}
GROUP BY 1, 2, 3, 4"
))?;
let rows = stmt.query_map([], |r| {
@@ -2674,9 +2724,10 @@ impl Store {
prompts: &HashMap<String, i64>|
-> Result<Vec<UsageTally>> {
let sql = format!(
- "SELECT {display}, {group}, COUNT(*), COALESCE(SUM(s.tokens_used),0)
+ "SELECT {display}, {group}, COUNT(*) FILTER (WHERE {OWN_SESSION}) AS own,
+ COALESCE(SUM(s.tokens_used),0)
FROM sessions s WHERE s.archived = 0 AND s.key IN canonical_sessions{filter}
- GROUP BY {group} ORDER BY COUNT(*) DESC, {display}"
+ GROUP BY {group} ORDER BY own DESC, {display}"
);
let mut stmt = conn.prepare_cached(&sql)?;
let rows = stmt.query_map([], |r| {
@@ -2717,12 +2768,12 @@ impl Store {
// 会话按创建日分桶(Last 7 days 的 sessions 对比用)。date() 对超出
// 其范围的正数(微秒戳、脏值)返回 NULL——按 Option 读,坏行跳过,
// 不能让一条脏 created_at 掀翻整张快照(2026-09-03 Codex review)
- let mut stmt = conn.prepare_cached(
- "SELECT date(created_at/1000,'unixepoch','localtime'), COUNT(*)
- FROM sessions WHERE archived = 0 AND created_at > 0
- AND key IN canonical_sessions
- GROUP BY 1 ORDER BY 1",
- )?;
+ let mut stmt = conn.prepare_cached(&format!(
+ "SELECT date(s.created_at/1000,'unixepoch','localtime'), COUNT(*)
+ FROM sessions s WHERE s.archived = 0 AND s.created_at > 0 AND {OWN_SESSION}
+ AND s.key IN canonical_sessions
+ GROUP BY 1 ORDER BY 1"
+ ))?;
let rows = stmt.query_map([], |r| {
Ok((r.get::<_, Option<String>>(0)?, r.get::<_, i64>(1)?))
})?;
@@ -3273,6 +3324,7 @@ fn row_to_meta(r: &rusqlite::Row<'_>) -> rusqlite::Result<SessionMeta> {
tokens_used: r.get(10)?,
model: r.get(11)?,
source: r.get(12)?,
+ spawned: false,
archived: r.get::<_, i64>(13)? == 1,
file_path: r.get(14)?,
size_bytes: r.get(15)?,
@@ -3452,8 +3504,8 @@ fn upsert_session(tx: &rusqlite::Transaction<'_>, m: &SessionMeta, file_mtime: i
tx.execute(
"INSERT INTO sessions(key, agent_id, native_id, title, project_path, project_name,
git_branch, created_at, updated_at, message_count, tokens_used, model, source,
- archived, file_path, file_size, file_mtime, unknown_lines, host)
- VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9,?10,?11,?12,?13,?14,?15,?16,?17,0,?18)
+ archived, file_path, file_size, file_mtime, unknown_lines, host, spawned)
+ VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9,?10,?11,?12,?13,?14,?15,?16,?17,0,?18,?19)
ON CONFLICT(key) DO UPDATE SET
title=excluded.title, project_path=excluded.project_path,
project_name=excluded.project_name, git_branch=excluded.git_branch,
@@ -3461,7 +3513,7 @@ fn upsert_session(tx: &rusqlite::Transaction<'_>, m: &SessionMeta, file_mtime: i
message_count=excluded.message_count, tokens_used=excluded.tokens_used,
model=excluded.model, source=excluded.source, archived=excluded.archived,
file_path=excluded.file_path, file_size=excluded.file_size,
- file_mtime=excluded.file_mtime, host=excluded.host",
+ file_mtime=excluded.file_mtime, host=excluded.host, spawned=excluded.spawned",
params![
m.key,
m.agent.as_str(),
@@ -3481,6 +3533,7 @@ fn upsert_session(tx: &rusqlite::Transaction<'_>, m: &SessionMeta, file_mtime: i
m.size_bytes,
file_mtime,
m.host,
+ m.spawned as i64,
],
)?;
Ok(())
diff --git a/crates/wake-core/src/models.rs b/crates/wake-core/src/models.rs
index bfe1ffe..772e74b 100644
--- a/crates/wake-core/src/models.rs
+++ b/crates/wake-core/src/models.rs
@@ -281,6 +281,13 @@ pub struct SessionMeta {
pub tokens_used: Option<i64>,
pub archived: bool,
pub source: Option<String>,
+ /// agent 派出去的子会话(子代理、工作流里的一步):开头那句"用户消息"是派活的 agent 写的,
+ /// Insights 的提问数与会话数不算它(token 照算)。用户自己分出去的分支 / 分叉、侧聊不是。
+ /// 由各家解析时填,扫描写进 sessions.spawned;共享的会话行读取(SESSION_COLS)不取它——只读
+ /// 旁路也走那套 SELECT,取了就得把 NEWEST_COLUMN 改指它、对还没被 GUI 迁移过的库拒开。所以
+ /// 从库里读回来的 SessionMeta 这一位恒为 false,别拿读回来的 meta 写回库
+ #[serde(default)]
+ pub spawned: bool,
// app 自有状态(user_data 表)
pub favorite: bool,
pub pinned: bool,
@@ -541,7 +548,7 @@ pub struct InsightsData {
pub weekday: [i64; 7],
/// 月份分布(1–12 月聚合到 12 桶,跨年叠加)
pub monthly: [i64; 12],
- /// 每家 agent 的三个度量,按会话数降序;UI 切换度量时自行重排
+ /// 每家 agent 的三个度量,按会话数(不含子会话)降序;UI 切换度量时自行重排
pub agents: Vec<UsageTally>,
/// 全量项目——不截断,top-N 由 UI 按当前度量排序后取(SQL 里加 LIMIT
/// 会让 Prompts/Tokens 榜漏掉会话数排不进前列的项)
@@ -589,6 +596,12 @@ impl TrendSeries {
pub const TREND_WEEKS: usize = 53;
impl InsightsData {
+ /// 有没有可看的:任何一条未归档的会话,agent 派出去的子会话也算——会话数不算它们,
+ /// 它们的 token 与榜单照样要显示,不能拿 `sessions > 0` 判(榜单每家 agent 一行,含子会话)
+ pub fn has_activity(&self) -> bool {
+ !self.agents.is_empty()
+ }
+
/// 活跃天数 = daily 长度(派生不另存,免第二个写入点失步)
pub fn active_days(&self) -> i64 {
self.daily.len() as i64
diff --git a/crates/wake-core/src/scanner.rs b/crates/wake-core/src/scanner.rs
index d9a8569..24b4d19 100644
--- a/crates/wake-core/src/scanner.rs
+++ b/crates/wake-core/src/scanner.rs
@@ -987,6 +987,14 @@ fn sync_parent_links(
let mut desired: Vec<(String, String)> = desired_map.into_iter().collect();
desired.sort();
changed |= store.replace_parent_links(agent, &desired)?;
+ // 关系只记派出去的子会话的家(Grok):挂上的就是派出去的。解析时子会话所在的实例未必
+ // 看得见登记,合并了全部 location 的这一步才说得准
+ if adapters
+ .iter()
+ .any(|adapter| adapter.agent() == agent && adapter.linked_children_are_spawned())
+ {
+ store.mark_spawned(desired.iter().map(|(child, _)| child.as_str()))?;
+ }
}
Ok(changed)
}
diff --git a/crates/wake-core/src/services/terminal/macos.rs b/crates/wake-core/src/services/terminal/macos.rs
index fba7001..32159c1 100644
--- a/crates/wake-core/src/services/terminal/macos.rs
+++ b/crates/wake-core/src/services/terminal/macos.rs
@@ -674,6 +674,7 @@ mod tests {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
};
diff --git a/crates/wake-core/src/services/terminal/mod.rs b/crates/wake-core/src/services/terminal/mod.rs
index 202a7ff..50917a1 100644
--- a/crates/wake-core/src/services/terminal/mod.rs
+++ b/crates/wake-core/src/services/terminal/mod.rs
@@ -614,6 +614,7 @@ mod tests {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rs
index 2597780..5262316 100644
--- a/crates/wake-core/tests/adapter_contracts.rs
+++ b/crates/wake-core/tests/adapter_contracts.rs
@@ -173,6 +173,16 @@ fn sorted_links(adapter: &dyn AgentAdapter) -> Vec<(String, String)> {
links
}
+/// 列出来的会话里哪些标成了 agent 派出去的(`SessionMeta.spawned`),按 id 排序
+fn spawned_ids(adapter: &dyn AgentAdapter) -> Vec<String> {
+ let mut refs = adapter.list_session_files().unwrap();
+ refs.sort_by(|a, b| a.native_id.cmp(&b.native_id));
+ refs.iter()
+ .filter(|r| adapter.parse_session(r).unwrap().meta.spawned)
+ .map(|r| r.native_id.clone())
+ .collect()
+}
+
/// 一条父子关系:(子会话 key, 父会话 key)
fn edge(child: &str, parent: &str) -> (String, String) {
(child.to_string(), parent.to_string())
@@ -811,6 +821,10 @@ fn codex_spawned_subagent_keeps_only_its_own_turns() {
parsed.meta.title, "review_issue17",
"标题取 spawn_agent 的任务名:子线程自己没有用户消息"
);
+ // Insights 不把 agent 派出去的子会话算成一场会话
+ assert!(parsed.meta.spawned);
+ let parent = refs.iter().find(|r| r.native_id == parent_id).unwrap();
+ assert!(!adapter.parse_session(parent).unwrap().meta.spawned);
let transcript = adapter.parse_transcript(child).unwrap();
let visible: Vec<&TranscriptMessage> = transcript
@@ -1024,9 +1038,13 @@ fn codex_spawn_title_survives_codex_auto_title() {
let refs = adapter.list_session_files().unwrap();
let child = refs.iter().find(|r| r.native_id == child_id).unwrap();
let quick = adapter.quick_meta(&refs).expect("state db readable");
+ // quick 先入库的那一刻也要标对:结构化 source 只剩子代理线程
+ assert!(quick.get(&child.file_path).unwrap().spawned);
+ assert!(quick.values().any(|m| m.id != child_id && !m.spawned));
let parsed = adapter.parse_session(child).unwrap();
let merged = adapter.merge_quick_meta(parsed.meta, quick.get(&child.file_path).unwrap());
assert_eq!(merged.title, "review_issue17");
+ assert!(merged.spawned);
// 用户手工命名(name 列)仍然说了算
let conn = rusqlite::Connection::open(home.path().join("state_5.sqlite")).unwrap();
@@ -1471,6 +1489,10 @@ fn cursor_ide_parse_contract() {
"cursor:cide-0001".to_string()
)]
);
+ // 子代理是 agent 派出去的,Insights 不算它
+ assert!(!s.meta.spawned);
+ let r4 = db_ref(AgentId::Cursor, &env.cursor_ide_db, "cide-0004");
+ assert!(adapter.parse_session(&r4).unwrap().meta.spawned);
}
#[test]
@@ -1997,6 +2019,34 @@ fn grok_parse_contract() {
);
}
+/// 主会话 `subagents/` 下登记过的子代理会话是 agent 派出去的,Insights 不算它
+#[test]
+fn grok_registered_subagents_are_spawned() {
+ setup();
+ let home = tempfile::tempdir().unwrap();
+ common::copy_tree(&fixture("grok"), home.path());
+ let project = home
+ .path()
+ .join("sessions")
+ .join("%2FUsers%2Ftester%2FGithub%2Fwakefx");
+ let child = project.join("aaaaaaaa-aaaa-bbbb-cccc-0000000000aa");
+ fs::create_dir_all(&child).unwrap();
+ fs::copy(
+ project
+ .join("77777777-aaaa-bbbb-cccc-000000000007")
+ .join("updates.jsonl"),
+ child.join("updates.jsonl"),
+ )
+ .unwrap();
+
+ let adapter = GrokAdapter::new().with_custom_root(home.path().to_path_buf());
+ adapter.begin_scan();
+ assert_eq!(
+ spawned_ids(adapter.as_ref()),
+ ["aaaaaaaa-aaaa-bbbb-cccc-0000000000aa"]
+ );
+}
+
/// 没发过消息就关掉的 Grok 会话只剩插件钩子之类的流水,不列(PR #55)。判据与解析器是
/// 同一个分类:只有思考、只有工具调用的会话照列,列出来的都解析得出消息,空壳一条都没有。
/// 钩子行的真实格式还没见过样本,这里只要它不是会起消息的更新;current_mode_update 是
@@ -2350,6 +2400,10 @@ fn antigravity_parse_contract() {
assert!(t.mainline[0].text.contains("encrypted"));
assert_eq!(s.units.len(), 1);
assert!(s.units[0].text.contains("QR overlay polish"));
+ // 子会话是 agent 派出去的,Insights 不算它
+ assert!(!s.meta.spawned);
+ let r2 = db_ref(AgentId::Antigravity, &env.antigravity_db, "ag-0002");
+ assert!(adapter.parse_session(&r2).unwrap().meta.spawned);
}
/// 新版本写下的明文转录(PR #52 整理的格式,合成 fixture):转录与索引卡片都如实列出,
@@ -2439,6 +2493,12 @@ fn antigravity_transcripts_replace_index_cards() {
// 同一个 id 的卡片与转录同时出现时,转录胜出
assert_eq!(adapter.dedup_rank(&refs[1].file_path), 0);
assert_eq!(adapter.dedup_rank(&refs[0].file_path), 1);
+ // 子会话的转录与卡片都标成派出去的;没进索引的转录(ag-4)认不出,按用户的算
+ let spawned = |ix: usize| adapter.parse_session(&refs[ix]).unwrap().meta.spawned;
+ assert_eq!(
+ (0..refs.len()).map(spawned).collect::<Vec<_>>(),
+ vec![false, false, false, true, true, false]
+ );
let r = &refs[1];
let s = adapter.parse_session(r).expect("ag-1 parse_session");
@@ -2819,6 +2879,7 @@ fn dsh_parse_contract() {
assert_eq!(s.meta.title, "QR scan dependency fix"); // session/title 事件 last-wins
assert_eq!(s.meta.key, "dsh:dsh-e2e4-0001");
+ assert!(!s.meta.spawned);
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)。
@@ -2882,6 +2943,7 @@ fn dsh_subagent_keeps_only_its_own_turns() {
.parse_transcript(&r)
.expect("dsh subagent parse_transcript");
assert_eq!(s.meta.key, "dsh:dsh-sub-0002");
+ assert!(s.meta.spawned, "委派出去的子代理会话");
assert_eq!(s.meta.title, "Audit the scanner effects"); // 复制来的 session/title 不算
assert_eq!(s.meta.model.as_deref(), Some("deepseek-v4-flash"));
assert_eq!(s.meta.tokens_used, Some(1820)); // 复制来的 1480 是父会话的
@@ -3367,6 +3429,31 @@ fn write_craft_session(workspace: &Path, session: &str, header: serde_json::Valu
fs::write(dir.join("session.jsonl"), format!("{header}\n{line}\n")).unwrap();
}
+/// Tasks Conductor 跑出来的子节点(首行带 taskRunId / taskNodeId)是 agent 派出去的,Insights
+/// 不算。只带 parentSessionId 的子任务分不出是看板上手建的(提示词是用户写的标题)还是 agent
+/// 用 spawn_session 派的——两条路落盘一模一样——照用户的算
+#[test]
+fn craft_conductor_nodes_are_spawned() {
+ let tmp = tempfile::tempdir().unwrap();
+ let ws = tmp.path().join("notes");
+ write_craft_session(&ws, "260901-task", serde_json::json!({"taskSlug": "ship"}));
+ write_craft_session(
+ &ws,
+ "260902-node",
+ serde_json::json!({
+ "parentSessionId": "260901-task", "taskSlug": "ship",
+ "taskRunId": "run_1", "taskNodeId": "build"
+ }),
+ );
+ write_craft_session(
+ &ws,
+ "260903-subtask",
+ serde_json::json!({"parentSessionId": "260901-task"}),
+ );
+ let adapter = CraftAdapter::new().with_custom_root(ws);
+ assert_eq!(spawned_ids(adapter.as_ref()), ["notes/260902-node"]);
+}
+
#[test]
fn craft_keys_are_namespaced_by_the_workspace_id() {
// 会话 id 只在工作区内唯一:两个同名文件夹的工作区同一天各生成一条同名会话,key 不能撞
@@ -3678,6 +3765,16 @@ fn zcode_parse_contract() {
assert_eq!(s9.meta.model.as_deref(), Some("GLM-5.3-Flash"));
assert_eq!(s9.meta.message_count, 2);
assert!(s9.units.iter().all(|u| !u.text.contains("二维码")));
+
+ // Insights 不算 agent 派出去的子会话:子代理与工作流的一步算;fork 与辅助对话里的话
+ // 是用户自己打的,不算
+ let spawned = |id: &str| {
+ let r = db_ref(AgentId::Zcode, &env.zcode_db, id);
+ adapter.parse_session(&r).unwrap().meta.spawned
+ };
+ assert!(spawned("zc-0005") && spawned("zc-0012"));
+ assert!(!spawned("zc-0001") && !spawned("zc-0008") && !spawned("zc-0009"));
+ assert!(!spawned("zc-0011"), "工作流的父任务是用户开的");
}
/// 老库缺列(title_source / task_type / sequence 是 ALTER 追加的;parent_id 在
@@ -3723,6 +3820,9 @@ fn zcode_degrades_on_old_schema_and_missing_task_index() {
assert_eq!(s.meta.project_path, "/work/old");
assert_eq!(s.meta.message_count, 1);
assert!(!s.meta.archived);
+ assert!(!s.meta.spawned);
+ // 分不出类型时挂着的都算派出去的
+ assert!(adapter.parse_session(&refs[1]).unwrap().meta.spawned);
}
/// 库在却读不出(不是 SQLite、表结构对不上)时列表报错,父子关系给 None:scanner 冻结这一家
@@ -3760,6 +3860,43 @@ fn unreadable_session_databases_freeze_instead_of_emptying() {
assert_eq!(openclaw.parent_links(), None);
}
+/// 只有 agent 派生的子会话不算 Insights 里的会话:sessions_spawn 起的可见子会话只记
+/// parentSessionKey,靠 spawnDepth 认出来;面板上新建的子会话(spawnDepth 0)是用户自己的
+/// 对话,照样挂在父会话下,但算数
+#[test]
+fn openclaw_spawn_depth_marks_visible_spawns() {
+ setup();
+ let tmp = tempfile::tempdir().unwrap();
+ let main = openclaw_copy(tmp.path());
+ rusqlite::Connection::open(main.join("agent").join("openclaw-agent.sqlite"))
+ .unwrap()
+ .execute_batch(
+ r#"UPDATE session_windows SET spawned_by = NULL WHERE session_id = 'claw-0002';
+ UPDATE session_nodes SET entry_json =
+ '{"sessionId":"claw-0002","updatedAt":1786266100000,"parentSessionKey":"agent:main:main","spawnDepth":1}'
+ WHERE session_key = 'agent:main:subagent:sub1';"#,
+ )
+ .unwrap();
+ let index = main.join("sessions").join("sessions.json");
+ let dashboard = fs::read_to_string(&index).unwrap().replace(
+ r#""spawnedBy":"agent:main:main""#,
+ r#""parentSessionKey":"agent:main:main""#,
+ );
+ fs::write(&index, dashboard).unwrap();
+
+ let adapter = OpenclawAdapter::new().with_custom_root(tmp.path().join("agents"));
+ assert_eq!(
+ spawned_ids(adapter.as_ref()),
+ vec!["claw-0002", "claw-0004", "claw-0005"]
+ );
+ let links = sorted_links(adapter.as_ref());
+ assert!(links.contains(&edge("openclaw:claw-0002", "openclaw:claw-0001")));
+ assert!(links.contains(&edge(
+ "openclaw:dddddddd-aaaa-bbbb-cccc-000000000018",
+ "openclaw:cccccccc-aaaa-bbbb-cccc-000000000017"
+ )));
+}
+
/// OpenClaw 的检入 fixture(旧版 jsonl + 现版库)拷进临时目录,返回 `agents/main`;要改文件的
/// 测试用它,共用的假 HOME 只读
fn openclaw_copy(tmp: &Path) -> PathBuf {
@@ -4251,7 +4388,11 @@ fn kilo_parse_contract() {
assert_eq!(p.meta.tokens_used, Some(150));
assert_eq!(p.meta.source, None, "opencode2 徽章是 OpenCode 自己的");
assert!(!p.meta.archived);
+ assert!(!p.meta.spawned);
assert_eq!(p.unknown_line_count, 0, "agent / retry 是已知的 part");
+ // 子代理会话不算 Insights 里的会话与提问
+ let r3 = db_ref(AgentId::Kilo, &env.kilo_db, "ses_kilo_0003");
+ assert!(kilo.parse_session(&r3).unwrap().meta.spawned);
let t = kilo.parse_transcript(&r1).unwrap();
assert_eq!(
roles_kinds(&t.mainline),
@@ -4479,6 +4620,16 @@ fn kilo_legacy_parse_contract() {
links.contains(&(legacy_task_key(KILO_T3), legacy_task_key(KILO_T2))),
"{links:?}"
);
+ // 子任务是 agent 用 new_task 派出去的,Insights 不算它
+ let spawned = |id: &str| {
+ legacy
+ .parse_session(&kilo_task_ref(&env.kilo_tasks, id))
+ .unwrap()
+ .meta
+ .spawned
+ };
+ assert!(spawned(KILO_T3));
+ assert!(!spawned(KILO_T2));
// 装在 Cursor 里的旧版:via 写的是 Cursor
let r7 = kilo_task_ref(&env.kilo_cursor_tasks, "cursor-task-0007");
@@ -4816,6 +4967,38 @@ fn hermes_legacy_schema_still_parses() {
assert_eq!(s.meta.title, "老库里的会话");
assert_eq!(s.meta.tokens_used, Some(15));
assert_eq!(s.meta.message_count, 2);
+ assert!(!s.meta.spawned, "没有 model_config 列就认不出委派");
+}
+
+/// 委派出去的子代理(model_config 带 `_delegate_from`,上游 delegate_tool 写)是 agent 派出去的,
+/// Insights 不算;/branch 带的是 `_branched_from`,压缩续段只有 parent_session_id,都是用户自己
+/// 的对话。model_config 写坏了也不能让整家读不出来
+#[test]
+fn hermes_delegated_sessions_are_spawned() {
+ setup();
+ let dir = tempfile::tempdir().unwrap();
+ let db = dir.path().join("state.db");
+ common::build_hermes_db(&db);
+ let conn = rusqlite::Connection::open(&db).unwrap();
+ conn.execute_batch(
+ r#"
+ UPDATE sessions SET model_config = '{"_branched_from":"hs-0001"}' WHERE id = 'hs-0005';
+ INSERT INTO sessions (id, source, model, model_config, started_at, ended_at,
+ message_count, parent_session_id) VALUES
+ ('hs-0006', 'cli', 'gpt-5.4', '{"_delegate_from":"hs-0001"}', 1786176400.0,
+ 1786176401.0, 1, 'hs-0001'),
+ ('hs-0007', 'cli', 'gpt-5.4', 'not json', 1786176500.0, 1786176501.0, 1, NULL);
+ INSERT INTO messages (session_id, role, content, timestamp) VALUES
+ ('hs-0006', 'user', 'delegated by hs-0001', 1786176400.5),
+ ('hs-0007', 'user', 'model_config is broken', 1786176500.5);
+ "#,
+ )
+ .unwrap();
+ drop(conn);
+
+ let adapter = HermesAdapter::new().with_custom_root(db);
+ assert_eq!(spawned_ids(adapter.as_ref()), ["hs-0006"]);
+ assert!(sorted_links(adapter.as_ref()).contains(&edge("hermes:hs-0006", "hermes:hs-0001")));
}
#[test]
@@ -4859,6 +5042,16 @@ fn openclaw_parse_contract() {
),
]
);
+ // 派生出来的子代理(库里窗口的 spawned_by、旧版条目的 spawnedBy)Insights 不算
+ assert_eq!(
+ spawned_ids(&adapter),
+ vec![
+ "claw-0002",
+ "claw-0004",
+ "claw-0005",
+ "dddddddd-aaaa-bbbb-cccc-000000000018"
+ ]
+ );
// —— 现版 SQLite:active_events 给出可见分支,死分支 a2-dead 不出现
let r = db_ref(AgentId::Openclaw, &env.openclaw_db, "claw-0001");
@@ -4987,11 +5180,8 @@ fn openclaw_parse_contract() {
fn mk_meta(agent: AgentId, key: &str, id: &str, title: &str, source: Option<&str>) -> SessionMeta {
SessionMeta {
- host: String::new(),
- key: key.to_string(),
id: id.to_string(),
agent,
- title: title.to_string(),
project_path: "/Users/tester/Github/wakefx".to_string(),
project_name: "wakefx".to_string(),
file_path: "/dev/null".to_string(),
@@ -4999,13 +5189,8 @@ fn mk_meta(agent: AgentId, key: &str, id: &str, title: &str, source: Option<&str
updated_at: 2,
message_count: 0,
size_bytes: 0,
- git_branch: None,
- model: None,
- tokens_used: None,
- archived: false,
source: source.map(String::from),
- favorite: false,
- pinned: false,
+ ..common::meta(key, title)
}
}
diff --git a/crates/wake-core/tests/common/mod.rs b/crates/wake-core/tests/common/mod.rs
index c4bdee1..2f8fd89 100644
--- a/crates/wake-core/tests/common/mod.rs
+++ b/crates/wake-core/tests/common/mod.rs
@@ -31,6 +31,7 @@ pub fn meta(key: &str, title: &str) -> SessionMeta {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
}
@@ -1068,7 +1069,8 @@ pub fn stage_antigravity_transcript(brain: &Path, id: &str, uploads: &[i64]) ->
/// - `cide-0002`:`name` 为空且无 lastUpdatedAt,验证标题回退首条用户消息、
/// updated_at 回退末条气泡的 ISO createdAt。
/// - `cide-0003`:零气泡的草稿 composer,不进列表。
-/// - `cide-0004`:子代理会话,composerHeaders 给出 parentComposerId。
+/// - `cide-0004`:子代理会话,composerHeaders 给出 parentComposerId(composerData 里也带同一份
+/// subagentInfo,与真机一致)。
/// - `33333333-…-03`:与 CLI 转录 fixture 同 id 的 IDE 副本——转录带正文,
/// scanner 按 dedup_rank 让 CLI 那份胜出(scanner_finale 有端到端)。
/// - `44444444-…-04`:转录只剩 turn_ended 空壳(fixtures/cursor 下同名文件),
@@ -1151,6 +1153,7 @@ pub fn build_cursor_ide_db(path: &Path) {
('composerData:cide-0004',
'{"_v":18,"composerId":"cide-0004","name":"Explore subagent",
+ "subagentInfo":{"subagentType":3,"parentComposerId":"cide-0001","subagentTypeName":"explore"},
"createdAt":1786330000000,"lastUpdatedAt":1786330100000,
"workspaceIdentifier":{"id":"ws1","uri":{"fsPath":"/Users/tester/Github/wakefx","path":"/Users/tester/Github/wakefx","scheme":"file"}},
"fullConversationHeadersOnly":[{"bubbleId":"s1","type":1}]}'),
diff --git a/crates/wake-core/tests/db_roundtrip.rs b/crates/wake-core/tests/db_roundtrip.rs
index 9c83d84..08da209 100644
--- a/crates/wake-core/tests/db_roundtrip.rs
+++ b/crates/wake-core/tests/db_roundtrip.rs
@@ -1236,6 +1236,76 @@ fn insights_snapshot_and_streaks() {
assert_eq!((d.current_streak, d.longest_streak), (0, 3));
}
+/// agent 派出去的子会话(sessions.spawned)不算 Insights 里的会话,也不算提问:开头那句"用户
+/// 消息"是派活的 agent 写的。token 照算——那是模型实际花掉的
+#[test]
+fn insights_leave_out_spawned_sessions() {
+ let (_dir, store) = temp_store();
+ let turn = [
+ unit(0, Role::User, "do the thing"),
+ unit(1, Role::Assistant, "done"),
+ ];
+ let codex = |key: &str, model: &str, tokens: i64, spawned: bool| SessionMeta {
+ agent: AgentId::Codex,
+ model: Some(model.into()),
+ tokens_used: Some(tokens),
+ spawned,
+ ..meta(key, key)
+ };
+ let own = codex("codex:own", "gpt-5", 100, false);
+ let mut child = codex("codex:child", "gpt-5-mini", 40, true);
+ let today = chrono::NaiveDate::from_ymd_opt(2026, 1, 13).unwrap();
+
+ // 只剩子会话(父会话归档了、自定义目录里只有子线程)也有可看的:会话数是 0,token 照列
+ store
+ .write_session(&child, child.updated_at, &turn)
+ .unwrap();
+ let d = store.insights(today).unwrap();
+ assert_eq!((d.sessions, d.prompts, d.tokens), (0, 0, 40));
+ assert!(d.has_activity());
+
+ store.write_session(&own, own.updated_at, &turn).unwrap();
+ let d = store.insights(today).unwrap();
+ assert_eq!((d.sessions, d.prompts, d.tokens), (1, 1, 140));
+ assert_eq!(d.daily.iter().map(|(_, n)| n).sum::<i64>(), 1);
+ assert_eq!(d.daily_sessions.iter().map(|(_, n)| n).sum::<i64>(), 1);
+ assert_eq!(
+ d.agents,
+ vec![UsageTally {
+ name: "codex".into(),
+ sessions: 1,
+ prompts: 1,
+ tokens: 140,
+ }]
+ );
+ // 只给子代理用过的模型:会话与提问都是 0,token 照列
+ assert_eq!(
+ d.models,
+ vec![
+ UsageTally {
+ name: "gpt-5".into(),
+ sessions: 1,
+ prompts: 1,
+ tokens: 100,
+ },
+ UsageTally {
+ name: "gpt-5-mini".into(),
+ sessions: 0,
+ prompts: 0,
+ tokens: 40,
+ },
+ ]
+ );
+
+ // 重写时标记跟着改(判据变了、FTS_FORMAT 换代重解析)
+ child.spawned = false;
+ store
+ .write_session(&child, child.updated_at, &turn)
+ .unwrap();
+ let d = store.insights(today).unwrap();
+ assert_eq!((d.sessions, d.prompts), (2, 2));
+}
+
/// 老库(无 host 列)打开即迁移;既有行落 ''(本地域),写入远程行后
/// host_counts 只统计非空 host。remote_hosts 配置与同步状态可往返。
#[test]
diff --git a/crates/wake-core/tests/scanner_finale.rs b/crates/wake-core/tests/scanner_finale.rs
index bfb2827..b16bd89 100644
--- a/crates/wake-core/tests/scanner_finale.rs
+++ b/crates/wake-core/tests/scanner_finale.rs
@@ -371,6 +371,9 @@ fn parent_links_from_multiple_locations_are_merged_by_winning_file() {
// parent location;child 的胜出 updates.jsonl 则来自另一 location。
parent.manages_links = true;
parent.parent_links = vec![("grok:child".into(), "grok:parent".into())];
+ // 登记只在 parent 那边:child 自己的实例看不见,解析时标不出是派出去的,关系同步来标
+ child.links_spawn = true;
+ parent.links_spawn = true;
let adapters: Vec<Box<dyn AgentAdapter>> = vec![Box::new(child), Box::new(parent)];
run_scan(&adapters, &store, &Recorder::new(), true).unwrap();
@@ -387,6 +390,12 @@ fn parent_links_from_multiple_locations_are_merged_by_winning_file() {
.project_path,
"/Users/tester/Github/source"
);
+ let today = chrono::NaiveDate::from_ymd_opt(2026, 1, 13).unwrap();
+ assert_eq!(
+ store.insights(today).unwrap().sessions,
+ 1,
+ "子会话是派出去的,Insights 只算 parent"
+ );
}
#[test]
@@ -731,6 +740,8 @@ struct SeedAdapter {
parent_links: Vec<(String, String)>,
/// 模拟"这一刻读不出关系"(state DB 打不开):parent_links 交 None
links_unknown: bool,
+ /// 关系只记派出去的子会话(Grok 的登记表)
+ links_spawn: bool,
rank: u8,
}
@@ -774,6 +785,9 @@ impl AgentAdapter for SeedAdapter {
fn parent_links(&self) -> Option<Vec<(String, String)>> {
(!self.links_unknown).then(|| self.parent_links.clone())
}
+ fn linked_children_are_spawned(&self) -> bool {
+ self.links_spawn
+ }
fn parse_session(&self, _: &SessionFileRef) -> Result<ParsedSession> {
if self.fail_parse {
bail!("simulated corrupt copy")
@@ -803,6 +817,7 @@ impl AgentAdapter for SeedAdapter {
manages_links: self.manages_links,
parent_links: self.parent_links.clone(),
links_unknown: self.links_unknown,
+ links_spawn: self.links_spawn,
rank: self.rank,
})
}
@@ -1183,11 +1198,8 @@ fn seed(agent: AgentId, root: &str, path: &str, native_id: &str, mtime: i64) ->
size: 1,
},
meta: SessionMeta {
- host: String::new(),
- key: format!("{}:{native_id}", agent.as_str()),
id: native_id.into(),
agent,
- title: "seed".into(),
project_path: "/tmp/p".into(),
project_name: "p".into(),
file_path: path.into(),
@@ -1195,13 +1207,7 @@ fn seed(agent: AgentId, root: &str, path: &str, native_id: &str, mtime: i64) ->
updated_at: mtime,
message_count: 0,
size_bytes: 1,
- git_branch: None,
- model: None,
- tokens_used: None,
- archived: false,
- source: None,
- favorite: false,
- pinned: false,
+ ..common::meta(&format!("{}:{native_id}", agent.as_str()), "seed")
},
fail_parse: false,
fail_list: false,
@@ -1209,6 +1215,7 @@ fn seed(agent: AgentId, root: &str, path: &str, native_id: &str, mtime: i64) ->
manages_links: false,
parent_links: Vec::new(),
links_unknown: false,
+ links_spawn: false,
rank: 0,
}
}
@@ -1220,11 +1227,7 @@ fn tombstoned_session_does_not_resurrect_on_rescan() {
let dir = tempfile::tempdir().unwrap();
let store = temp_store(dir.path());
let meta = SessionMeta {
- host: String::new(),
- key: "codex:ghost".into(),
- id: "ghost".into(),
agent: AgentId::Codex,
- title: "残留会话".into(),
project_path: "/tmp/p".into(),
project_name: "p".into(),
file_path: "/tmp/fixtures/ghost.jsonl".into(),
@@ -1232,13 +1235,7 @@ fn tombstoned_session_does_not_resurrect_on_rescan() {
updated_at: 2,
message_count: 0,
size_bytes: 1,
- git_branch: None,
- model: None,
- tokens_used: None,
- archived: false,
- source: None,
- favorite: false,
- pinned: false,
+ ..common::meta("codex:ghost", "残留会话")
};
let r = SessionFileRef {
agent: AgentId::Codex,
@@ -1258,6 +1255,7 @@ fn tombstoned_session_does_not_resurrect_on_rescan() {
manages_links: false,
parent_links: Vec::new(),
links_unknown: false,
+ links_spawn: false,
rank: 0,
})];
let rec = Recorder::new();
diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rs
index 22444a2..f59d016 100644
--- a/crates/wake/src/workbench.rs
+++ b/crates/wake/src/workbench.rs
@@ -1071,6 +1071,7 @@ mod session_group_tests {
tokens_used: None,
archived: false,
source: None,
+ spawned: false,
favorite: false,
pinned,
}
@@ -6662,7 +6663,7 @@ impl Workbench {
let theme = cx.theme();
// 副标题只说 "Since {首会话月份}"(用户定稿);拿不到时间时回落默认句
let subtitle: SharedString = match &self.insights {
- Some(d) if d.sessions > 0 => match month_year(d.first_ts) {
+ Some(d) if d.has_activity() => match month_year(d.first_ts) {
my if my.is_empty() => t("Your coding agent activity").into(),
my => crate::tf!("Since {}", my).into(),
},
@@ -6670,7 +6671,7 @@ impl Workbench {
};
let body: AnyElement = match &self.insights {
- Some(d) if d.sessions > 0 => self.render_insights_content(d, cx),
+ Some(d) if d.has_activity() => self.render_insights_content(d, cx),
_ if self.insights_loading => div()
.flex_1()
.flex()
@@ -6914,8 +6915,9 @@ impl Workbench {
);
let mut sorted: Vec<&UsageTally> = rows
.iter()
- // Tokens 档只列报了用量的组:空条不是"用了 0",是没数据
- .filter(|u| metric != Tokens || u.tokens > 0)
+ // 只列这一档有数的组:Tokens 的空条不是"用了 0",是没数据;Sessions 是 0 的组
+ // 只有 agent 派出去的子会话(不算会话,token 照算)
+ .filter(|u| metric.value(u) > 0)
.collect();
// stable sort:平局保持 SQL 的 sessions desc + 名称序
sorted.sort_by_key(|u| std::cmp::Reverse(metric.value(u)));
diff --git a/crates/wake/src/workbench/cleanup/filter.rs b/crates/wake/src/workbench/cleanup/filter.rs
index 1c6e343..dd2ea06 100644
--- a/crates/wake/src/workbench/cleanup/filter.rs
+++ b/crates/wake/src/workbench/cleanup/filter.rs
@@ -686,6 +686,7 @@ mod tests {
tokens_used: None,
archived,
source: None,
+ spawned: false,
favorite: false,
pinned: false,
};