Fix quitting from Dock or AppleScript (#271)

Co-authored-by: Sertac Ozercan <sozercan@gmail.com>
Co-authored-by: Sertaç Özercan <852750+sozercan@users.noreply.github.com>

Author: itsmeshibintmz

Sources/Kaset/AppDelegate.swift

@@ -15,6 +15,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     /// Using strong reference to prevent deallocation when window is hidden.
     private var mainWindow: NSWindow?
 
+    /// Tracks when the app is quitting so we can allow window closures.
+    private var isTerminating = false
+
     func applicationDidFinishLaunching(_: Notification) {
         DiagnosticsLogger.app.info("AppDelegate: applicationDidFinishLaunching")
         // Set up notification center delegate to show notifications in foreground
@@ -46,6 +49,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         DiagnosticsLogger.player.info("Application will terminate - saved queue for persistence")
     }
 
+    func applicationShouldTerminate(_: NSApplication) -> NSApplication.TerminateReply {
+        self.isTerminating = true
+        return .terminateNow
+    }
+
     /// Registers for system sleep and wake notifications to handle playback appropriately.
     private func registerForSleepWakeNotifications() {
         let notificationCenter = NSWorkspace.shared.notificationCenter
@@ -250,7 +258,7 @@ extension AppDelegate: NSWindowDelegate {
     /// In UI test mode, close normally to avoid process conflicts.
     func windowShouldClose(_ sender: NSWindow) -> Bool {
         // In UI test mode, allow normal close behavior
-        if UITestConfig.isUITestMode {
+        if UITestConfig.isUITestMode || self.isTerminating {
             return true
         }
 

Sources/Kaset/Resources/Kaset.sdef

@@ -9,6 +9,13 @@
             <cocoa class="NSQuitCommand"/>
         </command>
 
+        <class name="application" code="capp" description="Kaset's top-level scripting object.">
+            <cocoa class="NSApplication"/>
+            <responds-to command="quit">
+                <cocoa method="terminate:"/>
+            </responds-to>
+        </class>
+
     </suite>
 
     <!-- Kaset Suite -->

Tests/KasetTests/ScriptingDefinitionTests.swift

@@ -0,0 +1,27 @@
+import Foundation
+import Testing
+
+@Suite(.serialized, .tags(.service))
+struct ScriptingDefinitionTests {
+    @Test("Standard quit command is bound to NSApplication terminate")
+    func standardQuitCommandIsBoundToApplicationTerminate() throws {
+        let testFileURL = URL(fileURLWithPath: #filePath)
+        let repositoryRoot = testFileURL
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+        let sdefURL = repositoryRoot.appendingPathComponent("Sources/Kaset/Resources/Kaset.sdef")
+        let data = try Data(contentsOf: sdefURL)
+        let document = try XMLDocument(data: data)
+
+        let quitCommandNodes = try document.nodes(
+            forXPath: "//suite[@name='Standard Suite']/command[@name='quit' and @code='aevtquit']/cocoa[@class='NSQuitCommand']"
+        )
+        #expect(!quitCommandNodes.isEmpty)
+
+        let terminateBindingNodes = try document.nodes(
+            forXPath: "//suite[@name='Standard Suite']/class[@name='application' and @code='capp']/responds-to[@command='quit']/cocoa[@method='terminate:']"
+        )
+        #expect(!terminateBindingNodes.isEmpty)
+    }
+}