Make rename tab and rename project rebindable in Keymaps (#64)

Author: thdxg

Macterm/App/AppCommand.swift

@@ -146,9 +146,9 @@ enum AppCommand: String, CaseIterable, Identifiable {
         case .toggleCommandPalette: .toggleCommandPalette
         case .reloadGhosttyConfig: .reloadGhosttyConfig
         case .toggleQuickTerminal: .toggleQuickTerminal
-        case .renameTab,
-             .renameProject,
-             .removeProject,
+        case .renameTab: .renameTab
+        case .renameProject: .renameProject
+        case .removeProject,
              .replaceProjectPathWithCurrentDir,
              .applyLayout,
              .saveLayout: nil

Macterm/App/AppCommandActions.swift

@@ -44,7 +44,11 @@ extension AppCommand {
             let tabID = tab.id
             return {
                 ctx.appState.sidebarVisible = true
-                ctx.appState.renamingTabID = tabID
+                // Defer a tick so the sidebar (and its row's TextField) is in
+                // the hierarchy before we ask it to begin editing — otherwise,
+                // when the sidebar was collapsed, the field can't take first
+                // responder. Applies to every caller (palette, menu, hotkey).
+                DispatchQueue.main.async { ctx.appState.renamingTabID = tabID }
             }
         case .splitRight:
             guard let projectID else { return nil }
@@ -89,7 +93,8 @@ extension AppCommand {
             let projectID = current.id
             return {
                 ctx.appState.sidebarVisible = true
-                ctx.appState.renamingProjectID = projectID
+                // See .renameTab: defer so the sidebar row exists first.
+                DispatchQueue.main.async { ctx.appState.renamingProjectID = projectID }
             }
         case .removeProject:
             guard let projectID else { return nil }

Macterm/App/Hotkeys.swift

@@ -33,6 +33,8 @@ enum HotkeyAction: String, CaseIterable, Identifiable {
     case toggleCommandPalette = "toggle_command_palette"
     case reloadGhosttyConfig = "reload_ghostty_config"
     case toggleQuickTerminal = "toggle_quick_terminal"
+    case renameTab = "rename_tab"
+    case renameProject = "rename_project"
 
     var id: String { rawValue }
 
@@ -69,6 +71,8 @@ enum HotkeyAction: String, CaseIterable, Identifiable {
         case .toggleCommandPalette: "cmd+p"
         case .reloadGhosttyConfig: "cmd+shift+,"
         case .toggleQuickTerminal: "ctrl+`"
+        case .renameTab: "cmd+r"
+        case .renameProject: "none"
         }
     }
 }

Macterm/App/Responders.swift

@@ -247,6 +247,20 @@ final class MainAppResponder: KeyResponder {
             return .handled
         }
 
+        // Rename routes through AppCommand.action(in:) — the single source of
+        // truth shared with the palette and menu bar — so the three paths can't
+        // drift. The action defers begin-editing a tick (see AppCommandActions)
+        // so the sidebar row's TextField exists before it takes first responder.
+        for action in [HotkeyAction.renameTab, .renameProject] {
+            guard HotkeyRegistry.matches(event, action: action),
+                  let command = AppCommand.allCases.first(where: { $0.hotkeyAction == action })
+            else { continue }
+            let ctx = AppCommandContext(appState: appState, projectStore: projectStore)
+            guard let run = command.action(in: ctx) else { return .passThrough }
+            run()
+            return .handled
+        }
+
         // Cmd+1-9 tab selection. Must check after the configurable hotkeys
         // so user bindings take precedence over digits.
         if flags == .command {

MactermTests/Palette/CommandSourceTests.swift

@@ -25,6 +25,18 @@ struct CommandSourceTests {
         CommandSource().emptyItems(context: ctx)?.first { $0.title == title }
     }
 
+    /// The rename actions defer setting `renaming…ID` to the next main-queue
+    /// tick (so the sidebar row's TextField exists before it takes first
+    /// responder — see `AppCommand.action(in:)`). Spin the run loop so that
+    /// deferred work lands before asserting.
+    private func flushMainQueue() async {
+        // Enqueue behind any pending DispatchQueue.main.async work; main-queue
+        // FIFO ordering guarantees the deferred set has run once this resumes.
+        await withCheckedContinuation { continuation in
+            DispatchQueue.main.async { continuation.resume() }
+        }
+    }
+
     // MARK: - renameTab command availability
 
     @Test
@@ -50,20 +62,21 @@ struct CommandSourceTests {
     }
 
     @Test
-    func renameTab_postPaletteAction_sets_sidebarVisible_and_renamingTabID() throws {
+    func renameTab_postPaletteAction_sets_sidebarVisible_and_renamingTabID() async throws {
         let (ctx, state) = makeContext()
         let activeTabID = try #require(
             state.activeProjectID.flatMap { state.workspaces[$0]?.activeTabID }
         )
         let item = try #require(findItem(title: AppCommand.renameTab.title, in: ctx))
         item.action()
         state.postPaletteAction?()
+        await flushMainQueue()
         #expect(state.sidebarVisible)
         #expect(state.renamingTabID == activeTabID)
     }
 
     @Test
-    func renameTab_postPaletteAction_targets_active_tab_at_time_of_action() throws {
+    func renameTab_postPaletteAction_targets_active_tab_at_time_of_action() async throws {
         let (ctx, state) = makeContext()
         let projectID = try #require(state.activeProjectID)
         let ws = try #require(state.workspaces[projectID])
@@ -81,6 +94,7 @@ struct CommandSourceTests {
         ws.selectTab(firstTabID)
         item.action()
         state.postPaletteAction?()
+        await flushMainQueue()
 
         // renamingTabID should be the tab that was active when the item was built.
         #expect(state.renamingTabID == secondTab.id)
@@ -112,31 +126,34 @@ struct CommandSourceTests {
     }
 
     @Test
-    func renameProject_postPaletteAction_sets_sidebarVisible_and_renamingProjectID() throws {
+    func renameProject_postPaletteAction_sets_sidebarVisible_and_renamingProjectID() async throws {
         let (ctx, state) = makeContext()
         let projectID = try #require(state.activeProjectID)
         let item = try #require(findItem(title: AppCommand.renameProject.title, in: ctx))
         item.action()
         state.postPaletteAction?()
+        await flushMainQueue()
         #expect(state.sidebarVisible)
         #expect(state.renamingProjectID == projectID)
     }
 
     @Test
-    func renameProject_does_not_set_renamingTabID() throws {
+    func renameProject_does_not_set_renamingTabID() async throws {
         let (ctx, state) = makeContext()
         let item = try #require(findItem(title: AppCommand.renameProject.title, in: ctx))
         item.action()
         state.postPaletteAction?()
+        await flushMainQueue()
         #expect(state.renamingTabID == nil)
     }
 
     @Test
-    func renameTab_does_not_set_renamingProjectID() throws {
+    func renameTab_does_not_set_renamingProjectID() async throws {
         let (ctx, state) = makeContext()
         let item = try #require(findItem(title: AppCommand.renameTab.title, in: ctx))
         item.action()
         state.postPaletteAction?()
+        await flushMainQueue()
         #expect(state.renamingProjectID == nil)
     }
 }