All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
fix(insights): drop model trend and token week-compare, tolerate bad created_at
Corey Chiu77e859f52897
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex afe16d9..1ca9ed4 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -2,8 +2,8 @@## Unreleased-- New: Insights shows a "Last 7 days" row — sessions, tokens, prompts and active days with the change against the previous 7 days-- New: Insights "Over time" chart — prompts per week for the past year, stacked by agent or by model, aligned with the activity heatmap+- New: Insights shows a "Last 7 days" row — sessions, prompts and active days with the change against the previous 7 days+- New: Insights "Over time" chart — prompts per week for the past year stacked by agent in brand colors, aligned with the activity heatmap## [0.4.2] — 2026-09-03diff --git a/DESIGN.md b/DESIGN.mdindex 6110d17..75d5439 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -213,8 +213,8 @@ emoji 不再承担界面或正文结构图标职责。- 页面用 `background` 材质整片承载;顶部 88px 标题区与中栏同节奏(Insights 22px semibold + Label 11 副行,副行只说 "Since {首会话月份}"),兼窗口拖拽区。内容限 720px 阅读宽居中,区块之间只用 32px 留白与 Body 14 semibold 组头分隔——**不做卡片墙、零投影**,延续"避免每个区域加边框"的层级原则。- 统计口径与主 UI 一致(archived 不计):"Prompts" 一律指主线用户消息。数据在打开与每次 Refresh 后后台重算,不阻塞浏览。- 概览行:28px semibold 大数字 + Caption 标签,序为 Sessions / Tokens / Prompts / Agents / Projects / Active days(用户钉序,2026-08-27);Tokens 仅在有 agent 报过用量时出现。数字千分位。-- Last 7 days(概览下方):同序的四个度量(Sessions / Tokens / Prompts / Active days),值 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` 基线;柱按窗口内峰值周归一。组头 ‹ Agents/Models › 二选一切换(无模型序列时不给切换钮),caption 点名本周领先者("Prompts per week by agent · Claude Code leads this week")。图例在刻度下方:9px 色块 + Label 11 名称,可换行。tooltip 给 "Week of Aug 3 · 120 prompts" 与前三层明细。+- 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 时该档不进循环。diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rsindex 3f9e482..d5afbd1 100644--- a/crates/wake-core/src/db.rs+++ b/crates/wake-core/src/db.rs@@ -1226,13 +1226,13 @@ impl Store {drop(stmt);// 第二遍:榜单 prompts 按(agent,项目,模型,日)一次分组(行数 = 组合数×- // 活跃日,千级),拆三张榜单 map + 两组周桶回填——榜单求和不看日期- // (无 ts / 未来行也计),周桶只收落在趋势窗内的日+ // 活跃日,千级),拆三张榜单 map + agent 周桶回填——榜单求和不看日期+ // (无 ts / 未来行也计),周桶只收落在趋势窗内的日。模型不出周桶:+ // s.model 是会话末态,按它切周会把整段历史归给最后用的模型let mut prompts_by_agent: HashMap<String, i64> = HashMap::new();let mut prompts_by_project: HashMap<String, i64> = HashMap::new();let mut prompts_by_model: HashMap<String, i64> = HashMap::new();let mut by_agent: HashMap<String, Vec<i64>> = HashMap::new();- let mut by_model: HashMap<String, Vec<i64>> = HashMap::new();let mut stmt = conn.prepare_cached(&format!("SELECT s.agent_id, s.project_path, COALESCE(s.model,''),CASE WHEN m.ts > 0 THEN date(m.ts/1000,'unixepoch','localtime') END d,@@ -1254,7 +1254,7 @@ impl Store {*prompts_by_agent.entry(agent.clone()).or_default() += n;*prompts_by_project.entry(project).or_default() += n;if !model.is_empty() {- *prompts_by_model.entry(model.clone()).or_default() += n;+ *prompts_by_model.entry(model).or_default() += n;}let Some(ix) = d.as_deref()@@ -1266,23 +1266,14 @@ impl Store {by_agent.entry(agent).or_insert_with(|| vec![0; TREND_WEEKS])[ix] += n;- if !model.is_empty() {- by_model- .entry(model)- .or_insert_with(|| vec![0; TREND_WEEKS])[ix] += n;- }}drop(stmt);- let into_series = |map: HashMap<String, Vec<i64>>| -> Vec<TrendSeries> {- let mut v: Vec<TrendSeries> = map- .into_iter()- .map(|(name, weekly)| TrendSeries { name, weekly })- .collect();- v.sort_by(|a, b| b.total().cmp(&a.total()).then_with(|| a.name.cmp(&b.name)));- v- };- data.trend_agents = into_series(by_agent);- data.trend_models = into_series(by_model);+ data.trend_agents = by_agent+ .into_iter()+ .map(|(name, weekly)| TrendSeries { name, weekly })+ .collect();+ data.trend_agents+ .sort_by(|a, b| b.total().cmp(&a.total()).then_with(|| a.name.cmp(&b.name)));// 榜单主体只查 sessions 表(几百行),prompts 由上面的 map 回填。// display 与 group 分开传:项目按 path 分组、按名展示(同名异路径@@ -1334,23 +1325,21 @@ impl Store {&prompts_by_model,)?;- // 会话按创建日分桶(Last 7 days 的 sessions/tokens 对比用)+ // 会话按创建日分桶(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(*), COALESCE(SUM(tokens_used),0)+ "SELECT date(created_at/1000,'unixepoch','localtime'), COUNT(*)FROM sessions WHERE archived = 0 AND created_at > 0GROUP BY 1 ORDER BY 1",)?;let rows = stmt.query_map([], |r| {- Ok((- r.get::<_, String>(0)?,- r.get::<_, i64>(1)?,- r.get::<_, i64>(2)?,- ))+ Ok((r.get::<_, Option<String>>(0)?, r.get::<_, i64>(1)?))})?;for row in rows {- let (d, n, tokens) = row?;- if let Some(day) = day_of(&d) {- data.daily_sessions.push((day, n, tokens));+ let (d, n) = row?;+ if let Some(day) = d.as_deref().and_then(day_of) {+ data.daily_sessions.push((day, n));}}drop(stmt);diff --git a/crates/wake-core/src/models.rs b/crates/wake-core/src/models.rsindex e23cee2..ee88ae4 100644--- a/crates/wake-core/src/models.rs+++ b/crates/wake-core/src/models.rs@@ -428,22 +428,23 @@ pub struct InsightsData {pub projects: Vec<UsageTally>,/// 全量模型,同上pub models: Vec<UsageTally>,- /// 按会话创建日的 (日, 会话数, tokens) 序列(升序,仅有效日期、不含未来日)。- /// "Last 7 days" 周对比由它与 daily 派生- pub daily_sessions: Vec<(chrono::NaiveDate, i64, i64)>,+ /// 按会话创建日的 (日, 会话数) 序列(升序,仅有效日期、不含未来日)。+ /// "Last 7 days" 周对比由它与 daily 派生。tokens 不进这里:`tokens_used`+ /// 是会话终身累计量,没有时间维度,按创建日切窗会把十天前开的长会话的+ /// 全部用量记到上一窗(2026-09-03 Codex review)+ pub daily_sessions: Vec<(chrono::NaiveDate, i64)>,/// 各 agent 近 53 周(周一起始,末项 = as_of 所在周)的每周 prompts;- /// 与热力图同一时间窗,按总量降序+ /// 与热力图同一时间窗,按总量降序。**不按模型出趋势**:messages 表没有+ /// 逐条 model,会话级 `model` 是末态,按它归因会把整段历史改写成最后+ /// 用的那个模型(同一 review)pub trend_agents: Vec<TrendSeries>,- /// 各模型同上(无模型的会话不计)- pub trend_models: Vec<TrendSeries>,}-/// 时间窗内的四个度量(Last 7 days 与其前 7 天各一份)+/// 时间窗内的度量(Last 7 days 与其前 7 天各一份)#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]pub struct WindowStats {pub sessions: i64,pub prompts: i64,- pub tokens: i64,pub active_days: i64,}@@ -484,13 +485,12 @@ impl InsightsData {w.prompts += n;w.active_days += 1;}- let from = self.daily_sessions.partition_point(|(d, _, _)| *d < start);- for (_, sessions, tokens) in self.daily_sessions[from..]+ let from = self.daily_sessions.partition_point(|(d, _)| *d < start);+ for (_, sessions) in self.daily_sessions[from..].iter()- .take_while(|(d, _, _)| *d <= ending)+ .take_while(|(d, _)| *d <= ending){w.sessions += sessions;- w.tokens += tokens;}w}diff --git a/crates/wake-core/tests/db_roundtrip.rs b/crates/wake-core/tests/db_roundtrip.rsindex 4f112d1..a797b35 100644--- a/crates/wake-core/tests/db_roundtrip.rs+++ b/crates/wake-core/tests/db_roundtrip.rs@@ -725,7 +725,7 @@ fn insights_snapshot_and_streaks() {.single().expect("unambiguous local time").date_naive();- assert_eq!(d.daily_sessions, vec![(created_day, 2, 500)]);+ assert_eq!(d.daily_sessions, vec![(created_day, 2)]);// 趋势:as_of=1/13(周二)→ 本周从 1/12 起是末列 52;1/7、1/10、1/11 落在// 1/5 那周 = 51。未来行与无 ts 行不进周桶let claude = &d.trend_agents[0];@@ -735,13 +735,6 @@ fn insights_snapshot_and_streaks() {let codex = &d.trend_agents[1];assert_eq!((codex.name.as_str(), codex.total()), ("codex", 2));assert_eq!(codex.weekly[51], 2);- assert_eq!(- d.trend_models- .iter()- .map(|s| (s.name.as_str(), s.total()))- .collect::<Vec<_>>(),- vec![("claude-opus", 4), ("gpt-5-codex", 2)]- );// Last 7 days(1/7–1/13)对前 7 天(12/31–1/6):prompts 6 / 0,活跃日 4 / 0;// 会话创建在 2023,两窗都是 0let (cur, prev) = d.last_week_pair();@@ -750,12 +743,22 @@ fn insights_snapshot_and_streaks() {WindowStats {sessions: 0,prompts: 6,- tokens: 0,active_days: 4});assert_eq!(prev, WindowStats::default());+ // 超出 SQLite date() 范围的正 created_at(微秒戳/脏值):date() 回 NULL,+ // 该行跳过,快照不得整体失败(2026-09-03 Codex review)+ let mut bad = meta("codex:i-bad", "脏 created_at");+ bad.created_at = 9_000_000_000_000_000;+ store+ .write_session(&bad, bad.updated_at, &[at(0, Role::User, Some(ts(12, 8)))])+ .unwrap();+ let d2 = store.insights(today).expect("bad created_at must not abort insights");+ assert_eq!(d2.sessions, d.sessions + 1);+ assert_eq!(d2.daily_sessions, vec![(created_day, 2)]);+// 断档超过一天 → current 归零,longest 保留let far = chrono::NaiveDate::from_ymd_opt(2026, 2, 1).unwrap();let d = store.insights(far).unwrap();diff --git a/crates/wake/src/theme.rs b/crates/wake/src/theme.rsindex fa2adab..3345a93 100644--- a/crates/wake/src/theme.rs+++ b/crates/wake/src/theme.rs@@ -107,16 +107,8 @@ pub fn agent_series_color(agent: wake_core::models::AgentId) -> u32 {}}-/// 趋势图模型序列的分类色板(按排名取色);模型没有品牌可依,六色足够区分-/// 前五 + Other-pub const SERIES_PALETTE: [u32; 6] = [- 0x4C8DFF,- CLAUDE_ORANGE,- 0x2BB454,- 0x9148FF,- 0xE4739E,- 0xE0B040,-];+/// 趋势图里库内冒出未知 agent_id(降级防御)时的备选序列色+pub const SERIES_FALLBACK: u32 = 0x4C8DFF;/// 在 gpui-component 默认主题之上覆写 Wake 的 token。/// 每次外观切换后都要重新调用(sync_system_appearance 会重置为默认)。diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rsindex daf4ae1..d3a3536 100644--- a/crates/wake/src/workbench.rs+++ b/crates/wake/src/workbench.rs@@ -2003,8 +2003,6 @@ pub struct Workbench {insights_range: InsightsRange,/// 三个榜单各自的度量档,按 UsageBoard 序数索引insights_metrics: [InsightsMetric; 3],- /// 趋势图当前分组(agent / 模型),纯视图状态- insights_trend: TrendBoard,/// 进行中的统计查询;新查询覆盖旧值即取消,扫描风暴下不堆积读锁竞争insights_task: Option<Task<()>>,@@ -2094,50 +2092,6 @@ impl InsightsMetric {}}-/// 趋势图("Over time")的分组维度,‹ › 二选一切换;数据两份常驻,切换不重查-#[derive(Clone, Copy, PartialEq, Eq)]-enum TrendBoard {- Agents,- Models,-}--impl TrendBoard {- fn caption(self) -> &'static str {- match self {- Self::Agents => "Agents",- Self::Models => "Models",- }- }-- fn unit(self) -> &'static str {- match self {- Self::Agents => "agent",- Self::Models => "model",- }- }-- fn series(self, d: &InsightsData) -> &[TrendSeries] {- match self {- Self::Agents => &d.trend_agents,- Self::Models => &d.trend_models,- }- }-- fn label(self, raw: &str) -> SharedString {- match self {- Self::Agents => agent_label(raw),- Self::Models => raw.to_string().into(),- }- }-- fn toggle(self) -> Self {- match self {- Self::Agents => Self::Models,- Self::Models => Self::Agents,- }- }-}-/// 三个榜单的静态规格。`Workbench::insights_metrics` 按其序数索引各自/// 记忆档位——同一个渲染方法靠它读写自己的状态,不必外传 setter#[derive(Clone, Copy)]@@ -2366,7 +2320,6 @@ impl Workbench {insights_loading: false,insights_range: InsightsRange::Hour,insights_metrics: [InsightsMetric::Sessions; 3],- insights_trend: TrendBoard::Agents,insights_task: None,scan_events,watcher,@@ -5929,38 +5882,16 @@ impl Workbench {.into_any_element()}- /// 趋势区块:近 53 周每周 prompts 按 agent / 模型堆叠,‹ › 二选一。- /// 模型序列为空(没有一家报模型)时只剩 Agents,不给切换钮+ /// 趋势区块:近 53 周每周 prompts 按 agent 堆叠。不按模型出图——+ /// messages 表没有逐条 model,会话级 model 是末态,切周即改写历史fn render_trend_section(&self, d: &InsightsData, cx: &Context<Self>) -> AnyElement {- let has_models = !d.trend_models.is_empty();- let board = if has_models {- self.insights_trend- } else {- TrendBoard::Agents- };- let flip = || {- cx.listener(|this, _, _window, cx| {- this.insights_trend = this.insights_trend.toggle();- cx.notify();- })- };- let arrows = has_models.then(|| {- insight_arrows(- "trend-arrow",- Some(board.caption().into()),- flip(),- flip(),- cx,- )- .into_any_element()- });- let layers = trend_layers(board, board.series(d), cx);+ let layers = trend_layers(&d.trend_agents, cx);v_flex().gap(SPACE_MD).child(switch_section_head("Over time",- Some(trend_caption(board, &layers).into()),- arrows,+ Some(trend_caption(&layers).into()),+ None,cx,)).child(render_trend(d.trend_start(), layers, cx))@@ -7118,8 +7049,8 @@ fn agent_label(raw: &str) -> SharedString {.unwrap_or_else(|| raw.to_string().into())}-/// 趋势图堆叠的序列数上限:前五个按总量降序各自着色(agent 品牌色 / 模型-/// 色板,见 theme.rs),其余合并为 "Other" 用 muted_foreground 淡层+/// 趋势图堆叠的序列数上限:前五个按总量降序各自着 agent 品牌色(见 theme.rs),+/// 其余合并为 "Other" 用 muted_foreground 淡层const TREND_TOP: usize = 5;/// 趋势图的一层:名称、色、TREND_WEEKS 周值;`other` 是合并层(不参评领先者)@@ -7132,23 +7063,18 @@ struct TrendLayer {/// series → 图层投影。caption、图例、柱子共用这一份:图例里没有的名字不会/// 出现在 caption 里。Rc 让 53 个 tooltip 闭包只各持一个指针,hover 才格式化-fn trend_layers(board: TrendBoard, series: &[TrendSeries], cx: &App) -> Rc<Vec<TrendLayer>> {+fn trend_layers(series: &[TrendSeries], cx: &App) -> Rc<Vec<TrendLayer>> {let theme = cx.theme();- let palette = crate::theme::SERIES_PALETTE;let mut layers: Vec<TrendLayer> = series.iter().take(TREND_TOP)- .enumerate()- .map(|(rank, s)| {- // agent 用品牌色(未知 agent_id 退分类色板),模型按排名取色板- let hex = match board {- TrendBoard::Agents => AgentId::from_str(&s.name)- .map(crate::theme::agent_series_color)- .unwrap_or(palette[rank % palette.len()]),- TrendBoard::Models => palette[rank % palette.len()],- };+ .map(|s| {+ // agent 用品牌色;库里冒出未知 agent_id(降级防御)退备选色+ let hex = AgentId::from_str(&s.name)+ .map(crate::theme::agent_series_color)+ .unwrap_or(crate::theme::SERIES_FALLBACK);TrendLayer {- name: board.label(&s.name),+ name: agent_label(&s.name),color: rgb(hex).into(),weekly: s.weekly.clone(),other: false,@@ -7172,8 +7098,7 @@ fn trend_layers(board: TrendBoard, series: &[TrendSeries], cx: &App) -> Rc<Vec<TRc::new(layers)}-fn trend_caption(board: TrendBoard, layers: &[TrendLayer]) -> String {- let unit = board.unit();+fn trend_caption(layers: &[TrendLayer]) -> String {// 本周领先者:as_of 所在周 prompts 最多的一层(本周为空则退回上一周)let leader = [TREND_WEEKS - 1, TREND_WEEKS - 2].into_iter()@@ -7185,13 +7110,14 @@ fn trend_caption(board: TrendBoard, layers: &[TrendLayer]) -> String {.map(|l| l.name.clone())});match leader {- Some(name) => format!("Prompts per week by {unit} · {name} leads this week"),- None => format!("Prompts per week by {unit}"),+ Some(name) => format!("Prompts per week by agent · {name} leads this week"),+ None => "Prompts per week by agent".to_string(),}}-/// "Last 7 days" 对比行:四个度量各带与前 7 天的相对变化。上涨用 primary,-/// 持平/下降 muted——不引入第四种文字色+/// "Last 7 days" 对比行:三个度量各带与前 7 天的相对变化。上涨用 primary,+/// 持平/下降 muted——不引入第四种文字色。Tokens 不在这里:会话级累计量没有+/// 时间维度,按创建日切窗会颠倒结果(2026-09-03 Codex review)fn render_week_section(d: &InsightsData, cx: &App) -> AnyElement {let theme = cx.theme();let (cur, prev) = d.last_week_pair();@@ -7228,11 +7154,6 @@ fn render_week_section(d: &InsightsData, cx: &App) -> AnyElement {.gap(px(40.)).items_start().child(stat("Sessions", cur.sessions, prev.sessions, &thousands))- .when(d.tokens > 0, |row| {- row.child(stat("Tokens", cur.tokens, prev.tokens, &|n| {- fmt_tokens(Some(n))- }))- }).child(stat("Prompts", cur.prompts, prev.prompts, &thousands)).child(stat("Active days",