From 37bdff5bbe7f6b50dce2d8920a08bdaafd4fecda Mon Sep 17 00:00:00 2001
From: Ogulcan Celik <ogulcancelik@gmail.com>
Date: Thu, 28 May 2026 04:18:55 +0300
Subject: [PATCH] fix: seed workspace rename from live cwd

---
 src/app/input/modal.rs    | 11 ++++++++---
 src/app/input/navigate.rs | 31 +++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/app/input/modal.rs b/src/app/input/modal.rs
index 6821e64a..6cde98b5 100644
--- a/src/app/input/modal.rs
+++ b/src/app/input/modal.rs
@@ -280,10 +280,15 @@ pub(crate) fn handle_keybind_help_key(state: &mut AppState, key: KeyEvent) {
     }
 }
 
-pub(super) fn open_rename_workspace(state: &mut AppState, ws_idx: usize) {
+pub(super) fn open_rename_workspace(
+    state: &mut AppState,
+    terminal_runtimes: &crate::terminal::TerminalRuntimeRegistry,
+    ws_idx: usize,
+) {
     state.selected = ws_idx;
     state.rename_pane_target = None;
-    state.name_input = state.workspaces[ws_idx].display_name();
+    state.name_input =
+        state.workspaces[ws_idx].display_name_from(&state.terminals, terminal_runtimes);
     state.name_input_replace_on_type = false;
     state.mode = Mode::RenameWorkspace;
 }
@@ -660,7 +665,7 @@ pub(super) fn apply_context_menu_action(
             ContextMenuKind::Workspace { ws_idx } | ContextMenuKind::GitWorkspace { ws_idx, .. },
             Some("Rename"),
         ) => {
-            open_rename_workspace(state, ws_idx);
+            open_rename_workspace(state, terminal_runtimes, ws_idx);
         }
         (
             ContextMenuKind::Workspace { ws_idx } | ContextMenuKind::GitWorkspace { ws_idx, .. },
diff --git a/src/app/input/navigate.rs b/src/app/input/navigate.rs
index 032ba8ae..e524c304 100644
--- a/src/app/input/navigate.rs
+++ b/src/app/input/navigate.rs
@@ -684,7 +684,7 @@ pub(super) fn execute_navigate_action_in_context(
         }
         NavigateAction::RenameWorkspace => {
             if let Some(ws_idx) = workspace_action_target(state, context) {
-                super::modal::open_rename_workspace(state, ws_idx);
+                super::modal::open_rename_workspace(state, terminal_runtimes, ws_idx);
             }
         }
         NavigateAction::CloseWorkspace => {
@@ -963,7 +963,9 @@ mod tests {
 
     use super::super::{state_with_workspaces, unique_temp_path, wait_for_file};
     use super::*;
-    use crate::{app::App, config::Config, input::TerminalKey, workspace::Workspace};
+    use crate::{
+        app::App, config::Config, input::TerminalKey, terminal::TerminalState, workspace::Workspace,
+    };
 
     fn mark_worktree_space_member(state: &mut AppState, ws_idx: usize, key: &str) {
         state.workspaces[ws_idx].worktree_space = Some(crate::workspace::WorktreeSpaceMembership {
@@ -1001,6 +1003,31 @@ mod tests {
         assert_eq!(state.name_input, "test");
     }
 
+    #[test]
+    fn rename_workspace_prefills_live_terminal_cwd_label() {
+        let mut state = state_with_workspaces(&["stale"]);
+        let root = state.workspaces[0].tabs[0].root_pane;
+        let terminal_id = state.workspaces[0].panes[&root]
+            .attached_terminal_id
+            .clone();
+        state.workspaces[0].custom_name = None;
+        state.workspaces[0].identity_cwd = "/__herdr_original__".into();
+        state.terminals.insert(
+            terminal_id.clone(),
+            TerminalState::new(terminal_id, "/__herdr_projects__".into()),
+        );
+        state.keybinds.rename_workspace = crate::config::ActionKeybinds::prefix("g");
+
+        handle_navigate_key(
+            &mut state,
+            KeyEvent::new(KeyCode::Char('g'), KeyModifiers::empty()),
+        );
+
+        assert_eq!(state.mode, Mode::RenameWorkspace);
+        assert_eq!(state.name_input, "__herdr_projects__");
+        assert_eq!(state.workspaces[0].display_name(), "__herdr_original__");
+    }
+
     #[test]
     fn prefix_rename_workspace_targets_active_workspace_not_stale_selection() {
         let mut state = state_with_workspaces(&["main", "issue"]);