fix: prevent duplicate window on reopen from dock

.github/workflows/lint.yml

@@ -47,7 +47,10 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
 
       - name: Install SwiftFormat
-        run: brew install swiftformat
+        run: |
+          brew update
+          brew install swiftformat
+          swiftformat --version
 
       - name: Check formatting
         run: |

App/KasetApp.swift

@@ -1,46 +1,16 @@
 import AppKit
 import SwiftUI
 
-// MARK: - SearchFocusTriggerKey
-
-/// Environment key for triggering search focus from keyboard shortcut.
-struct SearchFocusTriggerKey: EnvironmentKey {
-    static let defaultValue: Binding<Bool> = .constant(false)
-}
-
 extension EnvironmentValues {
-    var searchFocusTrigger: Binding<Bool> {
-        get { self[SearchFocusTriggerKey.self] }
-        set { self[SearchFocusTriggerKey.self] = newValue }
-    }
-}
-
-// MARK: - NavigationSelectionKey
-
-/// Environment key for navigation selection.
-struct NavigationSelectionKey: EnvironmentKey {
-    static let defaultValue: Binding<NavigationItem?> = .constant(nil)
+    @Entry var searchFocusTrigger: Binding<Bool> = .constant(false)
 }
 
 extension EnvironmentValues {
-    var navigationSelection: Binding<NavigationItem?> {
-        get { self[NavigationSelectionKey.self] }
-        set { self[NavigationSelectionKey.self] = newValue }
-    }
-}
-
-// MARK: - CommandBarVisibilityKey
-
-/// Environment key for command bar visibility.
-struct CommandBarVisibilityKey: EnvironmentKey {
-    static let defaultValue: Binding<Bool> = .constant(false)
+    @Entry var navigationSelection: Binding<NavigationItem?> = .constant(nil)
 }
 
 extension EnvironmentValues {
-    var showCommandBar: Binding<Bool> {
-        get { self[CommandBarVisibilityKey.self] }
-        set { self[CommandBarVisibilityKey.self] = newValue }
-    }
+    @Entry var showCommandBar: Binding<Bool> = .constant(false)
 }
 
 // MARK: - KasetApp
@@ -112,7 +82,7 @@ struct KasetApp: App {
     }
 
     var body: some Scene {
-        WindowGroup {
+        Window("Kaset", id: "main") {
             // Skip UI during unit tests to prevent window spam
             if UITestConfig.isRunningUnitTests, !UITestConfig.isUITestMode {
                 Color.clear

App/VideoWindowController.swift

@@ -18,7 +18,7 @@ final class VideoWindowController {
     /// Flag to prevent re-entrant close handling
     private var isClosing = false
 
-    // Corner snapping
+    /// Corner snapping
     enum Corner: Int {
         case topLeft, topRight, bottomLeft, bottomRight
     }

Core/Models/AI/MusicIntent.swift

@@ -329,5 +329,7 @@ enum ContentSource: String, Sendable, CustomStringConvertible {
     /// Use Charts for popularity-based requests
     case charts
 
-    var description: String { rawValue }
+    var description: String {
+        rawValue
+    }
 }

Core/Models/ArtistDetail.swift

@@ -26,8 +26,13 @@ struct ArtistDetail: Sendable {
     /// Starting video ID for Mix.
     let mixVideoId: String?
 
-    var id: String { self.artist.id }
-    var name: String { self.artist.name }
+    var id: String {
+        self.artist.id
+    }
+
+    var name: String {
+        self.artist.name
+    }
 
     init(
         artist: Artist,

Core/Models/Lyrics.swift

@@ -11,7 +11,9 @@ struct Lyrics: Sendable, Equatable {
     let source: String?
 
     /// Whether the song has lyrics available.
-    var isAvailable: Bool { !self.text.isEmpty }
+    var isAvailable: Bool {
+        !self.text.isEmpty
+    }
 
     /// Lyrics split into individual lines for display.
     var lines: [String] {

Core/Models/YTMusicError.swift

@@ -153,7 +153,7 @@ enum YTMusicError: LocalizedError, Sendable {
 
 // MARK: CustomDebugStringConvertible
 
-// Make the underlying error's description accessible for logging
+/// Make the underlying error's description accessible for logging
 extension YTMusicError: CustomDebugStringConvertible {
     var debugDescription: String {
         switch self {

Core/Services/API/MockUITestYTMusicClient.swift

@@ -6,14 +6,37 @@ import Foundation
 final class MockUITestYTMusicClient: YTMusicClientProtocol {
     // MARK: - Continuation State
 
-    var hasMoreHomeSections: Bool { false }
-    var hasMoreExploreSections: Bool { false }
-    var hasMoreChartsSections: Bool { false }
-    var hasMoreMoodsAndGenresSections: Bool { false }
-    var hasMoreNewReleasesSections: Bool { false }
-    var hasMorePodcastsSections: Bool { false }
-    var hasMoreLikedSongs: Bool { false }
-    var hasMorePlaylistTracks: Bool { false }
+    var hasMoreHomeSections: Bool {
+        false
+    }
+
+    var hasMoreExploreSections: Bool {
+        false
+    }
+
+    var hasMoreChartsSections: Bool {
+        false
+    }
+
+    var hasMoreMoodsAndGenresSections: Bool {
+        false
+    }
+
+    var hasMoreNewReleasesSections: Bool {
+        false
+    }
+
+    var hasMorePodcastsSections: Bool {
+        false
+    }
+
+    var hasMoreLikedSongs: Bool {
+        false
+    }
+
+    var hasMorePlaylistTracks: Bool {
+        false
+    }
 
     // MARK: - Mock Data
 

Core/Services/API/YTMusicClient.swift

@@ -1218,12 +1218,14 @@ final class YTMusicClient: YTMusicClientProtocol {
         let brandId = self.brandIdProvider?() ?? ""
         let cacheKey = APICache.stableCacheKey(endpoint: endpoint, body: fullBody, brandId: brandId)
         self.logger.debug(
-            "Request \(endpoint): brandId=\(brandId.isEmpty ? "primary" : brandId), cacheKey=\(cacheKey)")
+            "Request \(endpoint): brandId=\(brandId.isEmpty ? "primary" : brandId), cacheKey=\(cacheKey)"
+        )
 
         // Check cache first
         if ttl != nil, let cached = APICache.shared.get(key: cacheKey) {
             self.logger.debug(
-                "Cache hit for \(endpoint) (brandId=\(brandId.isEmpty ? "primary" : brandId))")
+                "Cache hit for \(endpoint) (brandId=\(brandId.isEmpty ? "primary" : brandId))"
+            )
             return cached
         }
 
@@ -1265,7 +1267,8 @@ final class YTMusicClient: YTMusicClientProtocol {
         {
             let onBehalfOfUser = user["onBehalfOfUser"] as? String
             self.logger.debug(
-                "Making request to \(endpoint) (onBehalfOfUser=\(onBehalfOfUser ?? "primary"))")
+                "Making request to \(endpoint) (onBehalfOfUser=\(onBehalfOfUser ?? "primary"))"
+            )
         } else {
             self.logger.debug("Making request to \(endpoint) (missing context)")
         }

Core/Services/FavoritesManager.swift

@@ -15,7 +15,9 @@ final class FavoritesManager {
     private(set) var items: [FavoriteItem] = []
 
     /// Whether Favorites section should be visible.
-    var isVisible: Bool { !self.items.isEmpty }
+    var isVisible: Bool {
+        !self.items.isEmpty
+    }
 
     /// Whether this instance should skip persistence (for testing).
     private let skipPersistence: Bool

Core/Services/Player/PlayerService.swift

@@ -49,7 +49,9 @@ final class PlayerService: NSObject, PlayerServiceProtocol {
     var currentTrack: Song?
 
     /// Whether playback is active.
-    var isPlaying: Bool { self.state.isPlaying }
+    var isPlaying: Bool {
+        self.state.isPlaying
+    }
 
     /// Current playback position in seconds.
     private(set) var progress: TimeInterval = 0
@@ -64,7 +66,9 @@ final class PlayerService: NSObject, PlayerServiceProtocol {
     private var volumeBeforeMute: Double = 1.0
 
     /// Whether audio is currently muted.
-    var isMuted: Bool { self.volume == 0 }
+    var isMuted: Bool {
+        self.volume == 0
+    }
 
     /// Whether shuffle mode is enabled.
     private(set) var shuffleEnabled: Bool = false

Core/Services/SettingsManager.swift

@@ -29,7 +29,9 @@ final class SettingsManager {
         case playlists
         case lastUsed
 
-        var id: String { rawValue }
+        var id: String {
+            rawValue
+        }
 
         var displayName: String {
             switch self {

Core/ViewModels/SearchViewModel.swift

@@ -73,7 +73,9 @@ final class SearchViewModel {
         case communityPlaylists = "Community playlists"
         case podcasts = "Podcasts"
 
-        var id: String { rawValue }
+        var id: String {
+            rawValue
+        }
     }
 
     /// Filtered results based on selected filter.

Tests/KasetTests/AccountServiceTests.swift

@@ -4,7 +4,6 @@
 // Tests for AccountService using Swift Testing framework.
 
 import Testing
-
 @testable import Kaset
 
 // MARK: - AccountServiceTests

Tests/KasetTests/AccountsListParserTests.swift

@@ -4,7 +4,6 @@
 // Tests for AccountsListParser using Swift Testing framework.
 
 import Testing
-
 @testable import Kaset
 
 // MARK: - AccountsListParserTests

Tests/KasetTests/ExtensionsTests.swift

@@ -87,31 +87,31 @@ struct ExtensionsTests {
     // MARK: - URL High Quality Thumbnail Tests
 
     @Test("Upgrades ytimg URL to high quality")
-    func highQualityThumbnailYtimg() {
-        let url = URL(string: "https://i.ytimg.com/vi/abc/w60-h60-l90-rj")!
+    func highQualityThumbnailYtimg() throws {
+        let url = try #require(URL(string: "https://i.ytimg.com/vi/abc/w60-h60-l90-rj"))
         let highQuality = url.highQualityThumbnailURL
         #expect(highQuality != nil)
-        #expect(highQuality!.absoluteString.contains("w226-h226"))
+        #expect(try #require(highQuality?.absoluteString.contains("w226-h226")))
     }
 
     @Test("Upgrades googleusercontent URL to high quality")
-    func highQualityThumbnailGoogleusercontent() {
-        let url = URL(string: "https://lh3.googleusercontent.com/abc=w120-h120-l90-rj")!
+    func highQualityThumbnailGoogleusercontent() throws {
+        let url = try #require(URL(string: "https://lh3.googleusercontent.com/abc=w120-h120-l90-rj"))
         let highQuality = url.highQualityThumbnailURL
         #expect(highQuality != nil)
-        #expect(highQuality!.absoluteString.contains("w226-h226"))
+        #expect(try #require(highQuality?.absoluteString.contains("w226-h226")))
     }
 
     @Test("Returns original URL for non-YouTube URLs")
-    func highQualityThumbnailNonYouTubeURL() {
-        let url = URL(string: "https://example.com/image.jpg")!
+    func highQualityThumbnailNonYouTubeURL() throws {
+        let url = try #require(URL(string: "https://example.com/image.jpg"))
         let highQuality = url.highQualityThumbnailURL
         #expect(highQuality == url)
     }
 
     @Test("Returns same URL for already high quality thumbnails")
-    func highQualityThumbnailAlreadyHighQuality() {
-        let url = URL(string: "https://i.ytimg.com/vi/abc/w400-h400-l90-rj")!
+    func highQualityThumbnailAlreadyHighQuality() throws {
+        let url = try #require(URL(string: "https://i.ytimg.com/vi/abc/w400-h400-l90-rj"))
         let highQuality = url.highQualityThumbnailURL
         #expect(highQuality?.absoluteString == "https://i.ytimg.com/vi/abc/w400-h400-l90-rj")
     }

Tests/KasetTests/FavoritesManagerTests.swift

@@ -6,7 +6,7 @@ import Testing
 @Suite("FavoritesManager", .serialized, .tags(.service), .timeLimit(.minutes(1)))
 @MainActor
 struct FavoritesManagerTests {
-    // Use a fresh manager for each test (skipLoad to avoid disk state)
+    /// Use a fresh manager for each test (skipLoad to avoid disk state)
     var manager: FavoritesManager
 
     init() {

Tests/KasetTests/MoodCategoryViewModelTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-
 @testable import Kaset
 
 @Suite("MoodCategoryViewModel", .serialized, .tags(.viewModel), .timeLimit(.minutes(1)))

Tests/KasetTests/MoodsAndGenresViewModelTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-
 @testable import Kaset
 
 @Suite("MoodsAndGenresViewModel", .serialized, .tags(.viewModel), .timeLimit(.minutes(1)))

Tests/KasetTests/NewReleasesViewModelTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-
 @testable import Kaset
 
 @Suite("NewReleasesViewModel", .serialized, .tags(.viewModel), .timeLimit(.minutes(1)))

Tests/KasetTests/PodcastModelTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-
 @testable import Kaset
 
 /// Tests for Podcast model types.

Tests/KasetTests/PodcastsViewModelTests.swift

@@ -1,5 +1,4 @@
 import Testing
-
 @testable import Kaset
 
 @Suite(.serialized)

Tests/KasetTests/SearchSuggestionsParserTests.swift

@@ -24,7 +24,7 @@ struct SearchSuggestionsParserTests {
     // MARK: - Valid Response Tests
 
     @Test("Parse single suggestion")
-    func parseSingleSuggestion() throws {
+    func parseSingleSuggestion() {
         let data = self.makeSuggestionsResponse(queries: ["test query"])
         let suggestions = SearchSuggestionsParser.parse(data)
 
@@ -48,7 +48,7 @@ struct SearchSuggestionsParserTests {
     }
 
     @Test("Parse suggestion with multiple runs joins text")
-    func parseSuggestionWithMultipleRuns() throws {
+    func parseSuggestionWithMultipleRuns() {
         let data: [String: Any] = [
             "contents": [
                 [
@@ -77,7 +77,7 @@ struct SearchSuggestionsParserTests {
     }
 
     @Test("Parse history suggestion")
-    func parseHistorySuggestion() throws {
+    func parseHistorySuggestion() {
         let data: [String: Any] = [
             "contents": [
                 [

Tests/KasetTests/TopSongsViewModelTests.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Testing
-
 @testable import Kaset
 
 @Suite("TopSongsViewModel", .serialized, .tags(.viewModel), .timeLimit(.minutes(1)))