Guard macOS restore paths for deleted worktrees

macos/Sources/Features/Terminal/BaseTerminalController.swift

@@ -869,8 +869,7 @@ class BaseTerminalController: NSWindowController,
         guard let window else { return }
 
         if derivedConfig.macosTitlebarProxyIcon == .visible {
-            // Use the 'to' URL directly
-            window.representedURL = to
+            window.representedURL = RestorablePath.existingDirectoryURL(to)
         } else {
             window.representedURL = nil
         }
@@ -1166,6 +1165,10 @@ class BaseTerminalController: NSWindowController,
             fullscreenStyle?.delegate = self
         }
 
+        if RestorablePath.existingDirectoryURL(window.representedURL) == nil {
+            window.representedURL = nil
+        }
+
         // Set our update overlay state
         updateOverlayIsVisible = defaultUpdateOverlayVisibility()
     }

macos/Sources/Features/Terminal/TerminalController.swift

@@ -361,7 +361,8 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     }
 
     func restoreWorktreeTabRootPath(_ path: String?) {
-        setWorktreeTabRootPath(path)
+        let sanitized = RestorablePath.normalizedExistingDirectoryPath(path)
+        setWorktreeTabRootPath(sanitized)
     }
 
     private static func existingWorktreeTabController(forWorktreePath path: String) -> TerminalController? {
@@ -1994,6 +1995,10 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     // Called when the window will be encoded. We handle the data encoding here in the
     // window controller.
     func window(_ window: NSWindow, willEncodeRestorableState state: NSCoder) {
+        if RestorablePath.existingDirectoryURL(window.representedURL) == nil {
+            window.representedURL = nil
+        }
+
         let data = TerminalRestorableState(from: self)
         data.encode(with: state)
     }

macos/Sources/Features/Terminal/TerminalRestorable.swift

@@ -56,7 +56,7 @@ class TerminalRestorableState: TerminalRestorable {
         self.effectiveFullscreenMode = controller.fullscreenStyle?.fullscreenMode
         self.tabColor = (controller.window as? TerminalWindow)?.tabColor ?? .none
         self.titleOverride = controller.titleOverride
-        self.worktreeTabRootPath = controller.worktreeTabRootPath
+        self.worktreeTabRootPath = RestorablePath.normalizedExistingDirectoryPath(controller.worktreeTabRootPath)
     }
 
     required init(copy other: TerminalRestorableState) {

macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift

@@ -1728,7 +1728,8 @@ extension Ghostty {
             let container = try decoder.container(keyedBy: CodingKeys.self)
             let uuid = UUID(uuidString: try container.decode(String.self, forKey: .uuid))
             var config = Ghostty.SurfaceConfiguration()
-            config.workingDirectory = try container.decode(String?.self, forKey: .pwd)
+            let decodedPwd = try container.decode(String?.self, forKey: .pwd)
+            config.workingDirectory = RestorablePath.normalizedExistingDirectoryPath(decodedPwd)
             let savedTitle = try container.decodeIfPresent(String.self, forKey: .title)
             let isUserSetTitle = try container.decodeIfPresent(Bool.self, forKey: .isUserSetTitle) ?? false
 
@@ -1746,7 +1747,8 @@ extension Ghostty {
 
         func encode(to encoder: Encoder) throws {
             var container = encoder.container(keyedBy: CodingKeys.self)
-            try container.encode(pwd, forKey: .pwd)
+            let persistedPwd = RestorablePath.normalizedExistingDirectoryPath(pwd)
+            try container.encode(persistedPwd, forKey: .pwd)
             try container.encode(id.uuidString, forKey: .uuid)
             try container.encode(title, forKey: .title)
             try container.encode(titleFromTerminal != nil, forKey: .isUserSetTitle)

macos/Sources/Helpers/RestorablePath.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+enum RestorablePath {
+    static func normalizedExistingDirectoryPath(_ path: String?) -> String? {
+        guard let path else { return nil }
+        let standardized = URL(fileURLWithPath: path).standardizedFileURL.path
+        var isDirectory: ObjCBool = false
+        guard FileManager.default.fileExists(atPath: standardized, isDirectory: &isDirectory),
+              isDirectory.boolValue else {
+            return nil
+        }
+
+        return standardized
+    }
+
+    static func existingDirectoryURL(_ url: URL?) -> URL? {
+        guard let url else { return nil }
+        let standardized = url.standardizedFileURL
+        var isDirectory: ObjCBool = false
+        guard FileManager.default.fileExists(atPath: standardized.path, isDirectory: &isDirectory),
+              isDirectory.boolValue else {
+            return nil
+        }
+
+        return standardized
+    }
+}

macos/Tests/RestorablePathTests.swift

@@ -0,0 +1,43 @@
+import Foundation
+import Testing
+@testable import Ghostree
+
+struct RestorablePathTests {
+    @Test func normalizedExistingDirectoryPathReturnsStandardizedDirectory() async throws {
+        let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString, isDirectory: true)
+        let directory = root.appendingPathComponent("worktree", isDirectory: true)
+        try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+        defer { try? FileManager.default.removeItem(at: root) }
+
+        let input = directory.appendingPathComponent("..", isDirectory: true)
+            .appendingPathComponent("worktree", isDirectory: true).path
+        let result = RestorablePath.normalizedExistingDirectoryPath(input)
+
+        #expect(result == directory.standardizedFileURL.path)
+    }
+
+    @Test func normalizedExistingDirectoryPathRejectsMissingOrFilePaths() async throws {
+        let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString, isDirectory: true)
+        try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)
+        defer { try? FileManager.default.removeItem(at: root) }
+
+        let missing = root.appendingPathComponent("missing", isDirectory: true).path
+        #expect(RestorablePath.normalizedExistingDirectoryPath(missing) == nil)
+
+        let file = root.appendingPathComponent("file.txt")
+        try "x".write(to: file, atomically: true, encoding: .utf8)
+        #expect(RestorablePath.normalizedExistingDirectoryPath(file.path) == nil)
+    }
+
+    @Test func existingDirectoryURLReturnsOnlyExistingDirectoryURLs() async throws {
+        let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString, isDirectory: true)
+        try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)
+        defer { try? FileManager.default.removeItem(at: root) }
+
+        let existing = RestorablePath.existingDirectoryURL(root)
+        #expect(existing?.path == root.standardizedFileURL.path)
+
+        let missing = root.appendingPathComponent("gone", isDirectory: true)
+        #expect(RestorablePath.existingDirectoryURL(missing) == nil)
+    }
+}