Yep. AI rewrote the whole thing.

Downterm/CommandNotch/Models/TerminalSession.swift

@@ -4,19 +4,21 @@ import Combine
 
 /// Wraps a single SwiftTerm TerminalView + LocalProcess pair.
 @MainActor
-class TerminalSession: NSObject, ObservableObject, LocalProcessDelegate, TerminalViewDelegate {
+class TerminalSession: NSObject, ObservableObject, LocalProcessDelegate, @preconcurrency TerminalViewDelegate {
 
     let id = UUID()
     let terminalView: TerminalView
     private var process: LocalProcess?
     private let backgroundColor = NSColor.black
+    private let configuredShellPath: String
 
     @Published var title: String = "shell"
     @Published var isRunning: Bool = true
     @Published var currentDirectory: String?
 
-    init(fontSize: CGFloat, theme: TerminalTheme) {
+    init(fontSize: CGFloat, theme: TerminalTheme, shellPath: String) {
         terminalView = TerminalView(frame: NSRect(x: 0, y: 0, width: 600, height: 300))
+        configuredShellPath = shellPath
         super.init()
 
         terminalView.terminalDelegate = self
@@ -35,21 +37,21 @@ class TerminalSession: NSObject, ObservableObject, LocalProcessDelegate, Termina
         let shellName = (shellPath as NSString).lastPathComponent
         let loginExecName = "-\(shellName)"
 
-        FileManager.default.changeCurrentDirectoryPath(NSHomeDirectory())
         let proc = LocalProcess(delegate: self)
         // Launch as a login shell so user startup files initialize PATH/tools.
         proc.startProcess(
             executable: shellPath,
             args: ["-l"],
             environment: nil,
-            execName: loginExecName
+            execName: loginExecName,
+            currentDirectory: NSHomeDirectory()
         )
         process = proc
         title = shellName
     }
 
     private func resolveShell() -> String {
-        let custom = UserDefaults.standard.string(forKey: NotchSettings.Keys.terminalShell) ?? ""
+        let custom = configuredShellPath.trimmingCharacters(in: .whitespacesAndNewlines)
         if !custom.isEmpty && FileManager.default.isExecutableFile(atPath: custom) {
             return custom
         }