From 797c10af37aa71c0e36c569d6d47faa761f1614b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 6 Jun 2025 15:50:30 -0700
Subject: [PATCH] macos: undo new window

---
 .../Terminal/TerminalController.swift         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 3210eda0c..f90490c3f 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -205,6 +205,27 @@ class TerminalController: BaseTerminalController {
             c.showWindow(self)
         }
 
+        // Setup our undo
+        if let undoManager = c.undoManager {
+            undoManager.setActionName("New Window")
+            undoManager.registerUndo(
+                withTarget: c,
+                expiresAfter: c.undoExpiration) { target in
+                // Close the window when undoing
+                target.closeWindow(nil)
+
+                // Register redo action
+                undoManager.registerUndo(
+                    withTarget: ghostty,
+                    expiresAfter: target.undoExpiration) { ghostty in
+                    _ = TerminalController.newWindow(
+                        ghostty,
+                        withBaseConfig: baseConfig,
+                        withParent: explicitParent)
+                }
+            }
+        }
+
         return c
     }