Fix Gateway start timeout and Pair phone navigation

On start timeout, terminate the child process so Stop is not required to clear a stranded gateway.
Open Settings Pair phone through durable page and pairing flags instead of delayed notifications.

Author: jatinkrmalik

Sources/VocaMac/App/VocaMacApp.swift

@@ -12,24 +12,25 @@ final class SettingsWindowManager: ObservableObject {
     private var settingsWindow: NSWindow?
     private var closeObserver: NSObjectProtocol?
 
-    func open(appState: AppState, page: SettingsPage? = nil) {
+    /// Sidebar page to apply when Settings appears. Survives first-open timing.
+    @Published private(set) var requestedPage: SettingsPage?
+    /// Pair-phone sheet to present when Gateway settings appears.
+    @Published private(set) var pendingPairingPresentation = false
+
+    func open(appState: AppState, page: SettingsPage? = nil, showPairing: Bool = false) {
+        recordOpenRequest(page: page, showPairing: showPairing)
+
         // If window already exists, just bring it to front
         if let window = settingsWindow, window.isVisible {
             window.makeKeyAndOrderFront(nil)
             NSApp.activate(ignoringOtherApps: true)
-            if let page {
-                NotificationCenter.default.post(
-                    name: .selectSettingsPage,
-                    object: nil,
-                    userInfo: ["page": page.rawValue]
-                )
-            }
             return
         }
 
         // Create the settings view
-        let settingsView = SettingsView()
+        let settingsView = SettingsView(initialPage: requestedPage ?? .dictation)
             .environmentObject(appState)
+            .environmentObject(self)
 
         // Create a new window
         let window = NSWindow(
@@ -50,14 +51,6 @@ final class SettingsWindowManager: ObservableObject {
         DockVisibilityCoordinator.shared.windowDidOpen()
         NSApp.activate(ignoringOtherApps: true)
 
-        if let page {
-            NotificationCenter.default.post(
-                name: .selectSettingsPage,
-                object: nil,
-                userInfo: ["page": page.rawValue]
-            )
-        }
-
         // Held so it can be removed on close — a block-based observer lives
         // until its token is released, so opening repeatedly would otherwise
         // stack up observers.
@@ -77,6 +70,33 @@ final class SettingsWindowManager: ObservableObject {
             }
         }
     }
+
+    /// Stores a sidebar page and/or pair-phone request until Settings consumes it.
+    func recordOpenRequest(page: SettingsPage? = nil, showPairing: Bool = false) {
+        if let page {
+            requestedPage = page
+        }
+        if showPairing {
+            pendingPairingPresentation = true
+            if requestedPage == nil {
+                requestedPage = .gateway
+            }
+        }
+    }
+
+    /// Returns and clears the requested sidebar page, if any.
+    func consumeRequestedPage() -> SettingsPage? {
+        guard let page = requestedPage else { return nil }
+        requestedPage = nil
+        return page
+    }
+
+    /// Returns whether a pair-phone sheet was requested, then clears the flag.
+    func consumePendingPairingPresentation() -> Bool {
+        guard pendingPairingPresentation else { return false }
+        pendingPairingPresentation = false
+        return true
+    }
 }
 
 /// Manages the standalone update details window.

Sources/VocaMac/Services/GatewayEmbedController.swift

@@ -223,44 +223,33 @@ final class GatewayEmbedController: ObservableObject {
         do {
             try spawnNativeProcess(executable: binaryPath)
         } catch {
-            status = .error(error.localizedDescription)
-            lastErrorMessage = error.localizedDescription
+            let message = error.localizedDescription
+            status = .error(message)
+            lastErrorMessage = message
+            await terminateSpawnedProcess()
             return
         }
 
         for _ in 0..<40 {
             try? await Task.sleep(nanoseconds: 250_000_000)
             await refreshStatus()
             if isLive { return }
-            if case .error = status { return }
+            if case .error = status {
+                await terminateSpawnedProcess()
+                return
+            }
         }
 
         if !isLive {
             let message = "Gateway did not become reachable on port \(GatewayPaths.defaultPort)."
             status = .error(message)
             lastErrorMessage = message
+            await terminateSpawnedProcess()
         }
     }
 
     func stop() async {
-        if let process, process.isRunning {
-            process.terminate()
-            let deadline = Date().addingTimeInterval(2)
-            while process.isRunning, Date() < deadline {
-                try? await Task.sleep(nanoseconds: 50_000_000)
-            }
-            if process.isRunning {
-                process.interrupt()
-            }
-        }
-        stdoutPipe?.fileHandleForReading.readabilityHandler = nil
-        self.process = nil
-        self.stdoutPipe = nil
-
-        isLive = false
-        isReady = false
-        pairingPayload = nil
-        pairingPayloadRaw = nil
+        await terminateSpawnedProcess()
         status = .stopped
         lastErrorMessage = nil
     }
@@ -427,6 +416,28 @@ final class GatewayEmbedController: ObservableObject {
 
     // MARK: - Private
 
+    /// SIGTERM/SIGINT the spawned child and drop the retained `Process`.
+    /// Does not change `status` — callers record `.stopped` or `.error`.
+    private func terminateSpawnedProcess() async {
+        if let process, process.isRunning {
+            process.terminate()
+            let deadline = Date().addingTimeInterval(2)
+            while process.isRunning, Date() < deadline {
+                try? await Task.sleep(nanoseconds: 50_000_000)
+            }
+            if process.isRunning {
+                process.interrupt()
+            }
+        }
+        stdoutPipe?.fileHandleForReading.readabilityHandler = nil
+        self.process = nil
+        self.stdoutPipe = nil
+        isLive = false
+        isReady = false
+        pairingPayload = nil
+        pairingPayloadRaw = nil
+    }
+
     private func spawnNativeProcess(executable: String) throws {
 #if os(macOS)
         let process = Process()

Sources/VocaMac/Views/GatewaySettingsTab.swift

@@ -9,15 +9,9 @@ import AppKit
 import CoreImage
 import CoreImage.CIFilterBuiltins
 
-extension Notification.Name {
-    /// Menu bar asks Settings to select Gateway and show the pair sheet.
-    static let showGatewayPairing = Notification.Name("com.vocamac.showGatewayPairing")
-    /// Select a settings sidebar page (`userInfo["page"]` = SettingsPage.rawValue).
-    static let selectSettingsPage = Notification.Name("com.vocamac.selectSettingsPage")
-}
-
 struct GatewaySettingsTab: View {
     @ObservedObject private var gateway = GatewayEmbedController.shared
+    @EnvironmentObject private var settingsWindowManager: SettingsWindowManager
     @State private var showingPairSheet = false
     @State private var copiedURL = false
 
@@ -208,10 +202,12 @@ struct GatewaySettingsTab: View {
         .task {
             await gateway.refreshStatus()
         }
-        .onReceive(NotificationCenter.default.publisher(for: .showGatewayPairing)) { _ in
-            if gateway.status.allowsPairing {
-                showingPairSheet = true
-            }
+        .onAppear {
+            presentPendingPairingIfNeeded()
+        }
+        .onChange(of: settingsWindowManager.pendingPairingPresentation) { _, pending in
+            guard pending else { return }
+            presentPendingPairingIfNeeded()
         }
         .sheet(isPresented: $showingPairSheet) {
             GatewayPairPhoneSheet(
@@ -226,6 +222,13 @@ struct GatewaySettingsTab: View {
         }
     }
 
+    private func presentPendingPairingIfNeeded() {
+        guard settingsWindowManager.consumePendingPairingPresentation() else { return }
+        if gateway.status.allowsPairing {
+            showingPairSheet = true
+        }
+    }
+
     private var isStopDisabled: Bool {
         switch gateway.status {
         case .stopped:

Sources/VocaMac/Views/MenuBarView.swift

@@ -572,15 +572,7 @@ struct MenuBarView: View {
 
             if gateway.status.allowsPairing {
                 Button {
-                    settingsManager.open(appState: appState)
-                    NotificationCenter.default.post(
-                        name: .selectSettingsPage,
-                        object: nil,
-                        userInfo: ["page": SettingsPage.gateway.rawValue]
-                    )
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
-                        NotificationCenter.default.post(name: .showGatewayPairing, object: nil)
-                    }
+                    settingsManager.open(appState: appState, page: .gateway, showPairing: true)
                 } label: {
                     HStack {
                         Image(systemName: "qrcode")

Sources/VocaMac/Views/SettingsView.swift

@@ -13,13 +13,19 @@ extension Notification.Name {
 
 struct SettingsView: View {
     @EnvironmentObject var appState: AppState
+    @EnvironmentObject var settingsWindowManager: SettingsWindowManager
 
-    @State private var selectedPage: SettingsPage? = .dictation
+    @State private var selectedPage: SettingsPage?
     @State private var searchText = ""
     @State private var pageBeforeSearch: SettingsPage = .dictation
     /// Manual sidebar visibility. Avoids NavigationSplitView relocating system toggles.
     @State private var isSidebarVisible = true
 
+    init(initialPage: SettingsPage = .dictation) {
+        _selectedPage = State(initialValue: initialPage)
+        _pageBeforeSearch = State(initialValue: initialPage)
+    }
+
     private var matchCounts: [SettingsPage: Int] {
         SettingsSearchIndex.matchCounts(query: searchText)
     }
@@ -81,12 +87,18 @@ struct SettingsView: View {
             }
         }
         .frame(minWidth: 720, minHeight: 520)
-        .onReceive(NotificationCenter.default.publisher(for: .selectSettingsPage)) { note in
-            if let raw = note.userInfo?["page"] as? String,
-               let page = SettingsPage(rawValue: raw) {
-                selectedPage = page
-            }
+        .onAppear {
+            applyRequestedSettingsPage()
         }
+        .onChange(of: settingsWindowManager.requestedPage) { _, page in
+            guard page != nil else { return }
+            applyRequestedSettingsPage()
+        }
+    }
+
+    private func applyRequestedSettingsPage() {
+        guard let page = settingsWindowManager.consumeRequestedPage() else { return }
+        selectedPage = page
     }
 
     private var settingsSidebar: some View {

Tests/VocaMacTests/SettingsWindowManagerTests.swift

@@ -0,0 +1,50 @@
+// SettingsWindowManagerTests.swift
+// VocaMac Tests
+//
+// Durable Settings navigation: requested page and pair-phone presentation
+// must survive until SettingsView / GatewaySettingsTab consume them.
+
+import XCTest
+@testable import VocaMac
+
+@MainActor
+final class SettingsWindowManagerTests: XCTestCase {
+
+    func testRequestedPageIsDurableUntilConsumed() {
+        let manager = SettingsWindowManager()
+        manager.recordOpenRequest(page: .gateway)
+
+        XCTAssertEqual(manager.requestedPage, .gateway)
+        XCTAssertEqual(manager.consumeRequestedPage(), .gateway)
+        XCTAssertNil(manager.requestedPage)
+        XCTAssertNil(manager.consumeRequestedPage())
+    }
+
+    func testPairingPresentationIsDurableUntilConsumed() {
+        let manager = SettingsWindowManager()
+        manager.recordOpenRequest(page: .gateway, showPairing: true)
+
+        XCTAssertTrue(manager.pendingPairingPresentation)
+        XCTAssertTrue(manager.consumePendingPairingPresentation())
+        XCTAssertFalse(manager.pendingPairingPresentation)
+        XCTAssertFalse(manager.consumePendingPairingPresentation())
+    }
+
+    func testPairingRequestDefaultsToGatewayPage() {
+        let manager = SettingsWindowManager()
+        manager.recordOpenRequest(showPairing: true)
+
+        XCTAssertEqual(manager.requestedPage, .gateway)
+        XCTAssertTrue(manager.pendingPairingPresentation)
+        XCTAssertEqual(manager.consumeRequestedPage(), .gateway)
+        XCTAssertTrue(manager.consumePendingPairingPresentation())
+    }
+
+    func testPageRequestDoesNotImplyPairing() {
+        let manager = SettingsWindowManager()
+        manager.recordOpenRequest(page: .audio)
+
+        XCTAssertEqual(manager.requestedPage, .audio)
+        XCTAssertFalse(manager.pendingPairingPresentation)
+    }
+}