From 4f7fcc48d1f760ab6057d0964f009c05b753456a Mon Sep 17 00:00:00 2001 From: Pitchfork-and-Torch Date: Thu, 9 Jul 2026 21:11:52 -0400 Subject: fix: follow foreground cwd for new terminals refs #1245 --- src/app/api/layouts.rs | 9 +++------ src/app/api/panes.rs | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/app/api') diff --git a/src/app/api/layouts.rs b/src/app/api/layouts.rs index 851221b4..0fdbaba0 100644 --- a/src/app/api/layouts.rs +++ b/src/app/api/layouts.rs @@ -341,11 +341,8 @@ impl App { let follow_cwd = replace_target.and_then(|(_, tab_idx)| { let ws = self.state.workspaces.get(ws_idx)?; let tab = ws.tabs.get(tab_idx)?; - tab.cwd_for_pane( - tab.layout.focused(), - &self.state.terminals, - &self.terminal_runtimes, - ) + let pane_id = tab.layout.focused(); + tab.follow_cwd_for_pane(pane_id, &self.state.terminals, &self.terminal_runtimes) }); self.resolve_new_terminal_cwd( follow_cwd.or_else(|| self.focused_pane_cwd_in_workspace(ws_idx)), @@ -399,7 +396,7 @@ impl App { .cwd .as_ref() .map(PathBuf::from) - .or_else(|| self.cwd_for_pane_in_workspace(ws_idx, target_pane_id)); + .or_else(|| self.follow_cwd_for_pane_in_workspace(ws_idx, target_pane_id)); let extra_env = super::env::normalize_launch_env(pane.env.clone()) .map_err(|(_, message)| message.to_string())?; let direction = match direction { diff --git a/src/app/api/panes.rs b/src/app/api/panes.rs index 9f64dd51..58dbeb19 100644 --- a/src/app/api/panes.rs +++ b/src/app/api/panes.rs @@ -53,7 +53,7 @@ impl App { }; let (rows, cols) = self.state.estimate_pane_size(); let split_cwd = params.cwd.map(std::path::PathBuf::from).or_else(|| { - let follow_cwd = self.cwd_for_pane_in_workspace(ws_idx, target_pane_id); + let follow_cwd = self.follow_cwd_for_pane_in_workspace(ws_idx, target_pane_id); Some(self.resolve_new_terminal_cwd(follow_cwd)) }); let default_shell = self.state.default_shell.clone(); -- cgit v1.2.3