All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.
Rust
fix(ui): line up the Settings nav and the sidebar status with the axis
Corey Chiuc1ae55f70b4c
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex f34bbd3..a97c86d 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -3,7 +3,7 @@## [Unreleased]- New: Grok Bot conversations show up in Wake, read from what the Grok Bot desktop app keeps on this computer — the latest messages of your recent conversations; in group chats each message shows which bot sent it. A conversation the app no longer keeps stays listed with its last message, and deleting one in Wake only hides it, since the conversation itself lives in Grok Bot's cloud-- Fix: The Settings title lines up with the window buttons and the icons below it, as the main window's title already did+- Fix: The Settings sidebar lines up with the main window's: its title sits under the window buttons, and its icons and labels start where the main sidebar's do. The refresh status at the bottom of the main sidebar lines up with the icons above it too- 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)## [0.9.1] — 2026-10-10diff --git a/DESIGN.md b/DESIGN.mdindex 72081d2..d9b3ac6 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -106,7 +106,8 @@ Wake 的目标不是展示技术感,而是让用户在几秒内重新找到并| 组头(Agents / Projects) | `axis_inset(NAV_ICON, SIDEBAR_EDGE)` | 9.25 | 15px 折叠 chevron 按自己的框居中压轴,不占 18px 槽位(2026-09-22 起;原先靠首字母字形宽度反推 `GROUP_HEAD_INSET` = 12.125,已删) || 标题 | `sidebar_title(…)` | 现量 | 首字字宽(advance)的一半压轴,字号字重就是标题自己的:主窗 "Wake" / "Memory"、设置窗 "Settings" 共用,换页、换语言都对得上(2026-10-11 起;原先按 "Wake" 的 W 写死 `TITLE_INSET` = 9,Memory 页与设置窗标题都偏) || 底部工具条 | `FOOTER_LEAD_INSET` | 12.75 | 26.75 − 14(28px 按钮半宽),工具条贴侧栏左缘、没有容器边距 |-| 设置窗导航项 | `NAV_ITEM_INSET` | 11.25 | 26.75 − 7.5(15px 图标半宽) − 8(`NAV_EDGE`,导航列容器内边距);原先 12,图标中心落在 27.5 |+| 底部状态行 | `STATUS_LEAD_INSET` | 20.75 | 26.75 − 6(12px 行首框半宽),与工具条同样没有容器边距;转圈、出错图标都是 12px,"Live updates off" 的 7px 圆点在框里居中(2026-10-11 起;原先 20,转圈中心 26.0、圆点 23.5) |+| 设置窗导航项 | `NAV_ITEM_INSET` | 9.75 | 与主窗导航行同一个 18px 槽位(15px 图标在里面居中)+ `ICON_TEXT_GAP`:26.75 − 9(槽位半宽) − 8(`NAV_EDGE`,导航列容器内边距),文字起点 41.75 与主窗一致(2026-10-11 起;原先图标不进槽位、间距补成 8 凑近,文字在 42.25) || 分组项缩进 | `SUB_INDENT` | 12 | 分组项行首中心落在 38.75,表达从属 |三条硬约束:diff --git a/crates/wake/src/settings.rs b/crates/wake/src/settings.rsindex daf1b39..b62e529 100644--- a/crates/wake/src/settings.rs+++ b/crates/wake/src/settings.rs@@ -15,7 +15,7 @@ use crate::format::tilde_path;use crate::ui::{action_button, axis_inset, overlay_layers, rails_factor, show_in_fm, sidebar_title, zpx, Zpx,BUTTON_SM_H, FONT_BODY, FONT_CAPTION, FONT_DISPLAY, FONT_LABEL, FONT_TITLE, ICON_TEXT_GAP,- NAV_ICON, RADIUS_BUTTON, SPACE_LG, SPACE_MD, SPACE_SM, SPACE_XL, SPACE_XS, SPACE_XXL,+ LEAD_BOX, NAV_ICON, RADIUS_BUTTON, SPACE_LG, SPACE_MD, SPACE_SM, SPACE_XL, SPACE_XS, SPACE_XXL,};use crate::update::{self, UpdateStatus};use crate::workbench::{@@ -31,9 +31,10 @@ const SETTINGS_SIDEBAR_W: Zpx = Zpx(180.);const SETTINGS_TITLEBAR_H: Zpx = Zpx(34.);/// 导航列的容器内边距(上下两组共用)const NAV_EDGE: Zpx = SPACE_SM;-/// 导航项左内边距:图标中心压在侧栏中轴(红灯中心线)上,26.75 − 7.5(图标半宽) − 8(NAV_EDGE)。-/// 原先是 12,图标中心落在 27.5-const NAV_ITEM_INSET: Zpx = axis_inset(NAV_ICON, NAV_EDGE);+/// 导航项左内边距:行首槽位(与主窗侧栏同一个 LEAD_BOX,图标在里面居中)的中心压在侧栏中轴+/// (红灯中心线)上,26.75 − 9(槽位半宽) − 8(NAV_EDGE)。槽位加 ICON_TEXT_GAP 让文字起点与+/// 主窗导航行一致——原先图标不进槽位、间距补成 8 凑近;只把间距改成 6 的话文字反而左移 1.5+const NAV_ITEM_INSET: Zpx = axis_inset(LEAD_BOX, NAV_EDGE);const SETTINGS_PAGE_TOP: Zpx = Zpx(38.);/// Connect 页两条 Setup guide 的去处:MCP 面与命令行面各自的完整文档const CONNECT_GUIDE_URL: &str = "https://github.com/iAmCorey/Wake/blob/main/docs/mcp.md";@@ -393,7 +394,7 @@ impl SettingsView {.w_full().pl(NAV_ITEM_INSET).pr(SPACE_MD)- .gap(SPACE_SM)+ .gap(ICON_TEXT_GAP).items_center().rounded(theme.radius).cursor_pointer()@@ -408,7 +409,13 @@ impl SettingsView {.on_click(move |_, _, cx| {workbench.update(cx, |this, cx| this.select_settings_page(page, cx));})- .child(icon(icon_path).with_size(NAV_ICON).flex_shrink_0())+ .child(+ h_flex()+ .w(LEAD_BOX)+ .flex_shrink_0()+ .justify_center()+ .child(icon(icon_path).with_size(NAV_ICON)),+ )// 放大档位下侧栏可能比标签窄:单行截断,行高是定的,换成两行会压到下一项.child(div()diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rsindex afe1b26..9bc4c48 100644--- a/crates/wake/src/workbench.rs+++ b/crates/wake/src/workbench.rs@@ -5652,13 +5652,13 @@ impl Workbench {.flex_shrink_0().child(Spinner::new()- .with_size(zpx(12.))+ .with_size(STATUS_LEAD).color(theme.muted_foreground),).into_any_element()} else {icon("icons/refresh-cw.svg")- .with_size(zpx(12.))+ .with_size(STATUS_LEAD).flex_shrink_0().into_any_element()};@@ -5678,11 +5678,11 @@ impl Workbench {.gap(ICON_TEXT_GAP).text_color(theme.muted_foreground).child(- div()- .size(zpx(7.))- .rounded_full()+ h_flex()+ .w(STATUS_LEAD).flex_shrink_0()- .bg(theme.warning),+ .justify_center()+ .child(div().size(zpx(7.)).rounded_full().bg(theme.warning)),).child(div().min_w_0().truncate().child(t("Live updates off"))).into_any_element(),@@ -5740,7 +5740,8 @@ impl Workbench {.when_some(status, |this, status| {this.child(v_flex()- .px(SPACE_XL)+ .pl(STATUS_LEAD_INSET)+ .pr(SPACE_XL).pt(SPACE_MD).gap(SPACE_SM).text_size(FONT_LABEL)@@ -9602,6 +9603,10 @@ fn sidebar_footer_width() -> Pixels {/// 工具条左内边距 = 26.75(侧栏中轴,红绿灯红灯中心)− 14(按钮半宽),工具条贴着侧栏左缘、/// 没有容器边距:最左那颗图标的中心压在与导航行行首同一条轴上(用户 2026-09-21)const FOOTER_LEAD_INSET: Zpx = axis_inset(FOOTER_BTN, Zpx(0.));+/// 侧栏底部状态行的行首框:转圈、出错图标都是这么宽,"Live updates off" 的圆点在框里居中+const STATUS_LEAD: Zpx = Zpx(12.);+/// 状态行左内边距:行首框中心压在侧栏中轴上,与上面的导航行、下面的工具条同一条线+const STATUS_LEAD_INSET: Zpx = axis_inset(STATUS_LEAD, Zpx(0.));/// 底部工具条的图标按钮(Zed 状态栏 / Xcode 导航条同款图标条,不带盒子):透明底、/// hover 才出色;`active`(当前页 / 清理模式)用侧栏行的选中色做圆角底 + 选中前景,