A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.
Rust agentagent-orchestrationaiai-agentsclaude-codecodexcoding-agentlinuxmacosmultiplayermultiplexerrustterminalterminal-emulatorterminal-multiplexertmuxtuiweztermwindows
feat(gui): remember whether the right sidebar was open
RoversX23cc125d4e55
diff --git a/thinkterm-i18n/i18n/de-DE.ftl b/thinkterm-i18n/i18n/de-DE.ftlindex bdb53d7b..d1e6fae7 100644--- a/thinkterm-i18n/i18n/de-DE.ftl+++ b/thinkterm-i18n/i18n/de-DE.ftl@@ -1004,6 +1004,8 @@ settings-about-data-folder = Datenordner# --- Seitenleiste ----------------------------------------------------------settings-section-sidebar = Seitenleiste & Pluginssettings-sidebar-description = Wählen Sie aus, welche Panels die rechte Seitenleiste anbietet. Schalten Sie alle aus, verschwindet die Seitenleiste.+settings-remember-right-sidebar = Rechte Seitenleiste merken+settings-remember-right-sidebar-description = War die rechte Seitenleiste zuletzt offen, öffnen neue Fenster und der nächste Start sie ebenfalls. Ausgeschaltet beginnt sie immer geschlossen.settings-sidebar-files-description = Durchsuchen Sie das Arbeitsverzeichnis und Remote-Verzeichnisse über SFTP.settings-sidebar-notes-description = Markdown-Notizen, die beim Projekt liegen.settings-sidebar-snippets-description = Gespeicherte Befehle und Texte, die Sie in ein Pane einfügen können.diff --git a/thinkterm-i18n/i18n/en-US.ftl b/thinkterm-i18n/i18n/en-US.ftlindex ca5e7e65..5edf6dde 100644--- a/thinkterm-i18n/i18n/en-US.ftl+++ b/thinkterm-i18n/i18n/en-US.ftl@@ -1004,6 +1004,8 @@ settings-about-data-folder = Data Folder# --- Sidebar ---------------------------------------------------------------settings-section-sidebar = Sidebar & Pluginssettings-sidebar-description = Choose which panels the right sidebar offers. Turn them all off and the sidebar goes away.+settings-remember-right-sidebar = Remember the right sidebar+settings-remember-right-sidebar-description = If the right sidebar was left open, new windows and the next launch open it too. Off, it always starts closed.settings-sidebar-files-description = Browse the working directory, and remote directories over SFTP.settings-sidebar-notes-description = Markdown notes kept alongside the project.settings-sidebar-snippets-description = Saved commands and text you can paste into a pane.diff --git a/thinkterm-i18n/i18n/fr-FR.ftl b/thinkterm-i18n/i18n/fr-FR.ftlindex 0306ffb7..f24e5f41 100644--- a/thinkterm-i18n/i18n/fr-FR.ftl+++ b/thinkterm-i18n/i18n/fr-FR.ftl@@ -998,6 +998,8 @@ settings-about-data-folder = Dossier de données# --- Barre latérale --------------------------------------------------------settings-section-sidebar = Panneaux et extensionssettings-sidebar-description = Choisissez les panneaux proposés par la barre latérale droite. Désactivez-les tous et elle disparaît.+settings-remember-right-sidebar = Mémoriser la barre latérale droite+settings-remember-right-sidebar-description = Si la barre latérale droite était ouverte, les nouvelles fenêtres et le prochain lancement l’ouvrent aussi. Désactivé, elle démarre toujours fermée.settings-sidebar-files-description = Parcourir le répertoire de travail, et les répertoires distants via SFTP.settings-sidebar-notes-description = Notes Markdown conservées avec le projet.settings-sidebar-snippets-description = Commandes et textes enregistrés, à coller dans un panneau.diff --git a/thinkterm-i18n/i18n/ja-JP.ftl b/thinkterm-i18n/i18n/ja-JP.ftlindex e450814b..d0fe817a 100644--- a/thinkterm-i18n/i18n/ja-JP.ftl+++ b/thinkterm-i18n/i18n/ja-JP.ftl@@ -974,6 +974,8 @@ settings-about-data-folder = データフォルダ# --- サイドバー ------------------------------------------------------------settings-section-sidebar = サイドバーとプラグインsettings-sidebar-description = 右サイドバーに表示するパネルを選びます。すべてオフにするとサイドバー自体が消えます。+settings-remember-right-sidebar = 右サイドバーの開閉を記憶+settings-remember-right-sidebar-description = 右サイドバーを開いたままにしておくと、新しいウィンドウや次回の起動でも開いた状態になります。オフにすると、毎回閉じた状態で始まります。settings-sidebar-files-description = 作業ディレクトリと、SFTP 経由のリモートディレクトリを閲覧します。settings-sidebar-notes-description = プロジェクトと一緒に置く Markdown のノートです。settings-sidebar-snippets-description = 保存したコマンドやテキストを、ペインに貼り付けられます。diff --git a/thinkterm-i18n/i18n/zh-CN.ftl b/thinkterm-i18n/i18n/zh-CN.ftlindex ce8f33f3..dd949a0c 100644--- a/thinkterm-i18n/i18n/zh-CN.ftl+++ b/thinkterm-i18n/i18n/zh-CN.ftl@@ -974,6 +974,8 @@ settings-about-data-folder = 数据目录# --- 侧栏 ------------------------------------------------------------------settings-section-sidebar = 侧栏与插件settings-sidebar-description = 选择右侧栏提供哪些面板。全部关掉,侧栏就不显示了。+settings-remember-right-sidebar = 记住右侧栏的开关状态+settings-remember-right-sidebar-description = 右侧栏上次开着,新窗口和下次启动时也开着。关掉这个开关,每次都收起。settings-sidebar-files-description = 浏览工作目录,以及通过 SFTP 浏览远程目录。settings-sidebar-notes-description = 与项目放在一起的 Markdown 笔记。settings-sidebar-snippets-description = 保存的命令和文本,可以粘贴到面板中。diff --git a/wezterm-gui/src/native_settings.rs b/wezterm-gui/src/native_settings.rsindex 33cc2989..3ed162d8 100644--- a/wezterm-gui/src/native_settings.rs+++ b/wezterm-gui/src/native_settings.rs@@ -1017,6 +1017,12 @@ pub(crate) struct NativeChromeSettings {/// or as source; the last choice is kept.pub(crate) right_sidebar_markdown_preview_rendered: Option<bool>,pub(crate) right_sidebar_width: Option<usize>,+ /// Whether a new window's right sidebar opens the way the last one was+ /// left. Absent means on; off, it starts closed every time.+ pub(crate) remember_right_sidebar: Option<bool>,+ /// Whether the right sidebar was left open. Kept either way, so turning+ /// `remember_right_sidebar` on starts from how it really was left.+ pub(crate) right_sidebar_shown: Option<bool>,pub(crate) right_sidebar_file_preview_width: Option<usize>,pub(crate) right_sidebar_note_pane_width: Option<usize>,pub(crate) right_sidebar_note_pane_expanded: Option<bool>,@@ -2742,6 +2748,28 @@ pub(crate) fn save_workspace_sidebar_shown(shown: bool) {}}+/// Whether a new window starts with the right sidebar open: as the last one+/// was left, while that is remembered.+pub(crate) fn right_sidebar_starts_shown(chrome: &NativeChromeSettings) -> bool {+ chrome.remember_right_sidebar.unwrap_or(true) && chrome.right_sidebar_shown.unwrap_or(false)+}++/// Remember whether the right sidebar is open, as+/// [`save_workspace_sidebar_shown`] does for the left one; Settings decides+/// whether new windows go by it. Skipped when nothing changed: dragging the+/// edge open calls this on every pointer move. The open Settings window is+/// brought up to it, as it saves its whole copy.+pub(crate) fn save_right_sidebar_shown(shown: bool) {+ if load_shared().chrome.right_sidebar_shown.unwrap_or(false) == shown {+ return;+ }+ if let Err(err) = update_ui_state_and_settings_window(|settings| {+ settings.chrome.right_sidebar_shown = Some(shown)+ }) {+ log::warn!("failed to save right sidebar visibility: {err:#}");+ }+}+/// Hover-reveal of the collapsed left sidebar. On unless explicitly turned/// off, so `None` reads as enabled. `load_shared` rather than `load`: this is/// asked once per mouse event and once per frame, and `load` deep-clones.@@ -3025,6 +3053,24 @@ pub(crate) fn main_window_renderer(mod tests {use super::*;+ #[test]+ fn the_right_sidebar_starts_as_it_was_left_while_that_is_remembered() {+ let chrome = |json: &str| -> NativeChromeSettings { serde_json::from_str(json).unwrap() };+ // Never opened: closed.+ assert!(!right_sidebar_starts_shown(&chrome("{}")));+ // Remembered unless turned off: as it was left.+ assert!(right_sidebar_starts_shown(&chrome(+ r#"{"right_sidebar_shown":true}"#+ )));+ assert!(!right_sidebar_starts_shown(&chrome(+ r#"{"right_sidebar_shown":false}"#+ )));+ // Not remembered: closed, however it was left.+ assert!(!right_sidebar_starts_shown(&chrome(+ r#"{"remember_right_sidebar":false,"right_sidebar_shown":true}"#+ )));+ }+#[test]fn keymap_entries_read_the_config_file_form_and_skip_bad_ones() {use config::keyassignment::KeyAssignment;diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rsindex 94353f36..ad25ca60 100644--- a/wezterm-gui/src/settings_window.rs+++ b/wezterm-gui/src/settings_window.rs@@ -1336,6 +1336,10 @@ impl SettingsSection {].iter().any(|key| crate::i18n::tr(key).to_lowercase().contains(query)))+ || (self == Self::Sidebar+ && crate::i18n::tr("settings-remember-right-sidebar")+ .to_lowercase()+ .contains(query))|| (self == Self::Terminal&& ["settings-terminal-mouse-heading",@@ -1838,6 +1842,8 @@ enum SettingsAction {Hint(&'static str),/// Turn one right-sidebar panel on or off.ToggleRightSidebarPanel(crate::termwindow::RightSidebarMode),+ /// Whether new windows open the right sidebar the way it was left.+ ToggleRememberRightSidebar,/// Turn a plugin on or off. Carries `plugin_key(id)`, as RevokeWebToken/// carries its token's: the list can change between press and release.TogglePlugin(u64),@@ -6753,6 +6759,19 @@ impl SettingsWindow {}}}+ SettingsAction::ToggleRememberRightSidebar => {+ self.ui.open_dropdown = None;+ let chrome = &mut self.native_settings.chrome;+ let remember = !chrome.remember_right_sidebar.unwrap_or(true);+ chrome.remember_right_sidebar = Some(remember);+ // Read only as a window opens, so saved without the+ // configuration reload a whole-copy save sets off.+ if let Err(err) = crate::native_settings::update_ui_state(|settings| {+ settings.chrome.remember_right_sidebar = Some(remember)+ }) {+ self.status = format!("Unable to save sidebar setting: {err:#}");+ }+ }SettingsAction::TabIconSelect(index) => {if let Some(id) = self.ui.tab_icon_cards.get(index as usize).cloned() {self.select_tab_icon(id);@@ -8164,6 +8183,10 @@ impl SettingsWindow {/// The bubble for the ⓘ under the pointer, painted after everything/// else so it sits on top; nothing when no ⓘ is hovered.+ /// The ⓘ's text, set as the main window's hover tags are+ /// (`termwindow::render::hover`): regular weight, as wide as the text+ /// needs up to a limit, in the menu card's colours with a hairline and+ /// the soft shadow.fn paint_hint_overlay(&mut self,layers: &mut TripleLayerQuadAllocator<'_>,@@ -8173,17 +8196,28 @@ impl SettingsWindow {let Some((key, icon_x, icon_y, icon_size)) = self.ui.hint.take() else {return Ok(());};- let palette = self.palette();- let body_font = Rc::clone(&self.body_font);+ let mut card = self.chrome_palette.as_menu_card();+ crate::native_settings::apply_ui_colors(&mut card, configuration().ui_colors.as_ref());+ let font = self.fonts.command_palette_font_with_size_and_weight(+ crate::native_settings::settings_font_size(&self.native_settings),+ 400,+ )?;let text = crate::i18n::tr(key);- let pad = self.ui_px(12.0);- let bubble_width = self.ui_px(380.0).min(max_width);- let lines = self.wrap_settings_text(&body_font, &text, bubble_width - pad * 2.0);- let line_step = self.metrics.cell_size.height as f32 + self.ui_px(4.0);- let height = pad * 2.0 + line_step * lines.len().max(1) as f32;+ let (pad_x, pad_y) = (self.ui_px(18.0), self.ui_px(10.0));+ let widest = self.ui_px(560.0).min(max_width);+ let lines = self.wrap_settings_text(&font, &text, widest - pad_x * 2.0);+ let text_width = lines+ .iter()+ .map(|line| self.measure_text_width(&font, line))+ .fold(0.0f32, f32::max);+ let bubble_width = (text_width.ceil() + pad_x * 2.0).min(widest);+ let line_height = self.metrics.cell_size.height as f32;+ let spacing = self.ui_px(2.0);+ let count = lines.len().max(1) as f32;+ let height = pad_y * 2.0 + line_height * count + spacing * (count - 1.0);// Left-aligned with the icon and above it; below when the top of// the content is too close.- let bubble_x = (icon_x - pad)+ let bubble_x = (icon_x - pad_x).min(content_x + max_width - bubble_width).max(content_x);let gap = self.ui_px(8.0);@@ -8192,27 +8226,33 @@ impl SettingsWindow {} else {icon_y + icon_size + gap};- self.draw_rounded_frame(+ let ctx = crate::ui::draw::DrawContext::new(+ self.render_state+ .as_ref()+ .context("settings render state")?,+ self.dimensions,+ &self.metrics,+ );+ let shadow = if card.is_dark() { 0.58 } else { 0.43 };+ ctx.draw_elevated_surface(layers,2,- bubble_x,- bubble_y,- bubble_width,- height,- palette.control_bg,- palette.control_border,- self.ui_px(10.0),+ euclid::rect(bubble_x, bubble_y, bubble_width, height),+ card.control_bg,+ card.control_border,+ LinearRgba::with_components(0.0, 0.0, 0.0, shadow),+ self.ui_px(16.0),)?;for (index, line) in lines.iter().enumerate() {self.draw_text_on_layer(layers,2,- &body_font,- bubble_x + pad,- bubble_y + pad + line_step * index as f32,+ &font,+ bubble_x + pad_x,+ bubble_y + pad_y + (line_height + spacing) * index as f32,line,- palette.text,- bubble_width - pad * 2.0,+ card.text,+ bubble_width - pad_x * 2.0,)?;}Ok(())@@ -15488,7 +15528,45 @@ impl SettingsWindow {palette.secondary_text,max_width,)?;- let (grid_y, _) = self.settings_card_geometry(section_y, 0);+ let (card_y, _) = self.settings_card_geometry(section_y, 0);+ let card_padding = self.ui_px(36.0);+ let row_x = x + card_padding;+ let row_width = max_width - card_padding * 2.0;+ // The band carries its own air, so the card adds little.+ let layout = CardLayout {+ top: self.ui_px(12.0),+ bottom: self.ui_px(12.0),+ ..self.card_layout()+ };+ let card_bottom =+ self.paint_card_as(layers, x, card_y, max_width, layout, |this, layers, top| {+ let band = this.compact_row_step();+ let (tx, tw) = this.paint_band_tile(+ layers,+ row_x,+ top,+ band,+ row_width,+ SvgIcon::PanelRightOpen,+ TileColor::Blue,+ )?;+ this.paint_toggle_setting_row_with_hint(+ layers,+ tx,+ top,+ tw,+ band,+ &crate::i18n::tr("settings-remember-right-sidebar"),+ "settings-remember-right-sidebar-description",+ this.native_settings+ .chrome+ .remember_right_sidebar+ .unwrap_or(true),+ SettingsAction::ToggleRememberRightSidebar,+ )?;+ Ok(top + band)+ })?;+ let grid_y = card_bottom + self.settings_section_card_gap();let grid_bottom = self.paint_panel_cards(layers, x, grid_y, max_width)?;// The plugins below the panels: whatever a plugin shows, it shows in// the sidebar.diff --git a/wezterm-gui/src/termwindow/mod.rs b/wezterm-gui/src/termwindow/mod.rsindex 12efbc63..c7f99498 100644--- a/wezterm-gui/src/termwindow/mod.rs+++ b/wezterm-gui/src/termwindow/mod.rs@@ -4625,6 +4625,17 @@ impl TermWindow {let padding_left = config.window_padding.left.evaluate_as_pixels(h_context) as usize;let workspace_sidebar_width =ui::workspace_sidebar_width_for_metrics(&render_metrics, dpi as usize);+ // A right sidebar that starts open, as it was left, takes its width+ // beside the terminal rather than out of it: the shell starts at the+ // size asked for instead of being resized as the window opens.+ let right_sidebar_shown =+ crate::native_settings::right_sidebar_starts_shown(&native_settings.chrome)+ && RightSidebarMode::any_panel_enabled();+ let right_sidebar_width = if right_sidebar_shown {+ ui::right_sidebar_width_for_metrics(&render_metrics, dpi as usize)+ } else {+ 0+ };let padding_right = resize::effective_right_padding(&config, h_context) as usize;let v_context = DimensionContext {dpi: dpi as f32,@@ -4637,6 +4648,7 @@ impl TermWindow {let mut dimensions = Dimensions {pixel_width: (terminal_size.pixel_width+ workspace_sidebar_width+ + right_sidebar_width+ padding_left+ padding_right) as usize,pixel_height: ((terminal_size.rows * render_metrics.cell_size.height as usize)@@ -4942,7 +4954,7 @@ impl TermWindow {workspace_notification_snapshot: None,workspace_notification_pulse_started_at: None,right_sidebar_width: ui::right_sidebar_width_for_metrics(&render_metrics, dpi as usize),- right_sidebar_collapsed: true,+ right_sidebar_collapsed: !right_sidebar_shown,right_sidebar_mode: RightSidebarMode::initial(),right_sidebar_agents_scroll: 0.0,right_sidebar_agents_open_subtasks: HashSet::new(),diff --git a/wezterm-gui/src/termwindow/ui/right_sidebar.rs b/wezterm-gui/src/termwindow/ui/right_sidebar.rsindex 50745681..15e90813 100644--- a/wezterm-gui/src/termwindow/ui/right_sidebar.rs+++ b/wezterm-gui/src/termwindow/ui/right_sidebar.rs@@ -2470,6 +2470,7 @@ impl crate::TermWindow {self.right_sidebar_hover.suppress_until_pointer_leaves();self.right_sidebar_hover_was_presented = false;self.right_sidebar_collapsed = !self.right_sidebar_collapsed;+ crate::native_settings::save_right_sidebar_shown(!self.right_sidebar_collapsed);if self.right_sidebar_collapsed {self.right_sidebar_contents_scratch.clear();if self.right_sidebar_mode == RightSidebarMode::Tasks {@@ -2494,6 +2495,7 @@ impl crate::TermWindow {self.right_sidebar_hover.suppress_until_pointer_leaves();self.right_sidebar_hover_was_presented = false;self.right_sidebar_collapsed = false;+ crate::native_settings::save_right_sidebar_shown(true);self.kick_right_sidebar_file_rescan_cycle();self.request_right_sidebar_remote_files_connect(false);if self.right_sidebar_mode == RightSidebarMode::Tasks {