From f571519157bc2eaf3dcf7995989c7d8266a8ddc6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 5 Jun 2025 21:43:41 -0700
Subject: [PATCH] macos: setup undo responders at the AppDelegate level

---
 macos/Sources/App/macOS/AppDelegate.swift     | 24 +++++++++++++++++++
 .../Features/Terminal/TerminalManager.swift   |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/macos/Sources/App/macOS/AppDelegate.swift b/macos/Sources/App/macOS/AppDelegate.swift
index eae8dd121..1fce7d665 100644
--- a/macos/Sources/App/macOS/AppDelegate.swift
+++ b/macos/Sources/App/macOS/AppDelegate.swift
@@ -892,6 +892,14 @@ class AppDelegate: NSObject,
         NSApplication.shared.arrangeInFront(sender)
     }
 
+    @IBAction func undo(_ sender: Any?) {
+        undoManager.undo()
+    }
+
+    @IBAction func redo(_ sender: Any?) {
+        undoManager.redo()
+    }
+
     private struct DerivedConfig {
         let initialWindow: Bool
         let shouldQuitAfterLastWindowClosed: Bool
@@ -981,6 +989,22 @@ extension AppDelegate: NSMenuItemValidation {
             // terminal window (not quick terminal).
             return NSApp.keyWindow is TerminalWindow
 
+        case #selector(undo(_:)):
+            if undoManager.canUndo {
+                item.title = "Undo \(undoManager.undoActionName)"
+            } else {
+                item.title = "Undo"
+            }
+            return undoManager.canUndo
+
+        case #selector(redo(_:)):
+            if undoManager.canRedo {
+                item.title = "Redo \(undoManager.redoActionName)"
+            } else {
+                item.title = "Redo"
+            }
+            return undoManager.canRedo
+
         default:
             return true
         }
diff --git a/macos/Sources/Features/Terminal/TerminalManager.swift b/macos/Sources/Features/Terminal/TerminalManager.swift
index 805ae6e93..050bc5563 100644
--- a/macos/Sources/Features/Terminal/TerminalManager.swift
+++ b/macos/Sources/Features/Terminal/TerminalManager.swift
@@ -228,7 +228,7 @@ class TerminalManager {
 
         // Ensure any publishers we have are cancelled
         w.closePublisher.cancel()
-
+        
         // If we remove a window, we reset the cascade point to the key window so that
         // the next window cascade's from that one.
         if let focusedWindow = NSApplication.shared.keyWindow {