fixes

sozercan · sozercan · commit 011856f70862 · 2025-12-23T20:36:40.000-08:00
Signed-off-by: Sertac Ozercan &lt;sozercan@gmail.com&gt;
diff --git a/App/KasetApp.swift b/App/KasetApp.swift
@@ -123,7 +123,6 @@ struct KasetApp: App {
                 .environment(self.authService)
         }
         .commands {
-
             // Playback commands
             CommandMenu("Playback") {
                 // Play/Pause - Space
diff --git a/Tests/KasetTests/ExploreViewModelTests.swift b/Tests/KasetTests/ExploreViewModelTests.swift
@@ -24,6 +24,7 @@ final class ExploreViewModelTests: XCTestCase {
 
     func testLoadSuccess() async {
         // Given
+        // Note: "Charts" section is filtered out by ExploreViewModel since it's in the sidebar
         let expectedSections = [
             TestFixtures.makeHomeSection(title: "New releases"),
             TestFixtures.makeHomeSection(title: "Charts"),
@@ -37,8 +38,10 @@ final class ExploreViewModelTests: XCTestCase {
         // Then
         XCTAssertTrue(self.mockClient.getExploreCalled)
         XCTAssertEqual(self.viewModel.loadingState, .loaded)
-        XCTAssertEqual(self.viewModel.sections.count, 3)
+        // "Charts" section is filtered out, so we expect 2 sections
+        XCTAssertEqual(self.viewModel.sections.count, 2)
         XCTAssertEqual(self.viewModel.sections[0].title, "New releases")
+        XCTAssertEqual(self.viewModel.sections[1].title, "Moods & genres")
     }
 
     func testLoadError() async {
diff --git a/Tests/KasetUITests/AppLaunchUITests.swift b/Tests/KasetUITests/AppLaunchUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests that verify the app launches correctly.
+@MainActor
 final class AppLaunchUITests: KasetUITestCase {
     // MARK: - App Launch
 
diff --git a/Tests/KasetUITests/ExploreViewUITests.swift b/Tests/KasetUITests/ExploreViewUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests for the ExploreView.
+@MainActor
 final class ExploreViewUITests: KasetUITestCase {
     // MARK: - Basic Display
 
diff --git a/Tests/KasetUITests/HomeViewUITests.swift b/Tests/KasetUITests/HomeViewUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests for the HomeView.
+@MainActor
 final class HomeViewUITests: KasetUITestCase {
     // MARK: - Basic Display
 
diff --git a/Tests/KasetUITests/KasetUITestCase.swift b/Tests/KasetUITests/KasetUITestCase.swift
@@ -23,6 +23,7 @@ enum TestAccessibilityID {
 
 /// Base class for Kaset UI tests.
 /// Provides common setup, launch configuration, and helper methods.
+@MainActor
 class KasetUITestCase: XCTestCase {
     /// The application under test.
     var app: XCUIApplication!
diff --git a/Tests/KasetUITests/LibraryViewUITests.swift b/Tests/KasetUITests/LibraryViewUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests for the LibraryView (Playlists).
+@MainActor
 final class LibraryViewUITests: KasetUITestCase {
     // MARK: - Basic Display
 
diff --git a/Tests/KasetUITests/LikedMusicViewUITests.swift b/Tests/KasetUITests/LikedMusicViewUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests for the LikedMusicView.
+@MainActor
 final class LikedMusicViewUITests: KasetUITestCase {
     // MARK: - Basic Display
 
diff --git a/Tests/KasetUITests/PlayerBarUITests.swift b/Tests/KasetUITests/PlayerBarUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests for the PlayerBar.
+@MainActor
 final class PlayerBarUITests: KasetUITestCase {
     // MARK: - Player Bar Visibility
 
diff --git a/Tests/KasetUITests/SearchViewUITests.swift b/Tests/KasetUITests/SearchViewUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests for the SearchView.
+@MainActor
 final class SearchViewUITests: KasetUITestCase {
     // MARK: - Search Field
 
diff --git a/Tests/KasetUITests/SidebarUITests.swift b/Tests/KasetUITests/SidebarUITests.swift
@@ -1,6 +1,7 @@
 import XCTest
 
 /// UI tests for sidebar navigation.
+@MainActor
 final class SidebarUITests: KasetUITestCase {
     // MARK: - Navigation Items Visible
 
diff --git a/Tools/api-explorer.swift b/Tools/api-explorer.swift
@@ -670,7 +670,7 @@ func runMain() async {
     // Parse output file option
     var outputFile: String?
     for (index, arg) in args.enumerated() {
-        if (arg == "-o" || arg == "--output"), index + 1 < args.count {
+        if arg == "-o" || arg == "--output", index + 1 < args.count {
             outputFile = args[index + 1]
             break
         }
diff --git a/Views/macOS/CommandBarView.swift b/Views/macOS/CommandBarView.swift
@@ -111,12 +111,6 @@ struct CommandBarView: View {
                 .foregroundStyle(.secondary)
 
             Spacer()
-
-            Button("Search instead") {
-                self.fallbackToSearch()
-            }
-            .buttonStyle(.bordered)
-            .controlSize(.small)
         }
         .padding(12)
     }
@@ -262,10 +256,15 @@ struct CommandBarView: View {
             await self.executeIntent(response.content)
         } catch {
             // Check if this is a deserialization/generation error
+            // Check both String(describing:) and localizedDescription for coverage
             let errorDescription = String(describing: error)
-            let isDeserializationError = errorDescription.contains("deserialize") ||
-                errorDescription.contains("Generable") ||
-                errorDescription.contains("generation")
+            let localizedDesc = error.localizedDescription
+            let combinedDesc = "\(errorDescription) \(localizedDesc)"
+
+            let isDeserializationError = combinedDesc.contains("deserialize") ||
+                combinedDesc.contains("Generable") ||
+                combinedDesc.contains("generation") ||
+                combinedDesc.contains("GenericError")
 
             if isDeserializationError {
                 // Fallback: use the query directly as a search
@@ -287,7 +286,7 @@ struct CommandBarView: View {
     private func fallbackDirectSearch(query: String) async {
         // Extract action keyword and clean query
         let lowered = query.lowercased()
-        let cleanQuery: String
+        var cleanQuery: String
 
         if lowered.hasPrefix("play ") {
             cleanQuery = String(query.dropFirst(5)).trimmingCharacters(in: .whitespaces)
@@ -333,6 +332,9 @@ struct CommandBarView: View {
             cleanQuery = query
         }
 
+        // Extract mood/genre from natural language patterns like "something chill"
+        cleanQuery = self.extractMoodOrGenre(from: cleanQuery)
+
         // Default to play action with search
         await self.playSearchResult(query: cleanQuery, description: cleanQuery)
         if self.resultMessage != nil {
@@ -341,6 +343,129 @@ struct CommandBarView: View {
         }
     }
 
+    /// Extracts mood or genre from natural language queries.
+    /// Transforms "something chill" → "chill music", "something upbeat" → "upbeat music"
+    private func extractMoodOrGenre(from query: String) -> String {
+        let lowered = query.lowercased()
+
+        // Handle "something like X" or "similar to X" patterns
+        if let likeMatch = self.extractSimilarArtist(from: lowered) {
+            return likeMatch
+        }
+
+        // Handle decade patterns: "something from the 80s" → "80s music"
+        if let decadeMatch = self.extractDecade(from: lowered) {
+            return decadeMatch
+        }
+
+        // Handle "for X" activity patterns: "music for studying" → "study music"
+        if let activityMatch = self.extractActivity(from: lowered) {
+            return activityMatch
+        }
+
+        // Mood/genre keywords to detect
+        let moodsAndGenres = [
+            // Moods
+            "chill", "relaxing", "calm", "peaceful", "mellow", "cozy",
+            "upbeat", "energetic", "hype", "pump", "intense",
+            "happy", "sad", "melancholy", "romantic", "love", "emotional",
+            "focus", "concentration", "sleep", "ambient", "dreamy",
+            "party", "dance", "groovy", "funky",
+            // Genres
+            "jazz", "rock", "pop", "hip hop", "hip-hop", "rap",
+            "classical", "electronic", "edm", "house", "techno",
+            "country", "folk", "indie", "alternative", "metal",
+            "r&b", "rnb", "soul", "blues", "reggae",
+            "latin", "k-pop", "kpop", "j-pop", "jpop",
+            // Styles
+            "instrumental", "acoustic", "lo-fi", "lofi", "orchestral",
+            "piano", "guitar", "vocal", "a cappella",
+        ]
+
+        // Patterns that indicate mood-based requests
+        let moodPatterns = ["something", "some", "anything", "music that", "songs that"]
+
+        // Check if this looks like a mood-based request
+        let isMoodRequest = moodPatterns.contains { lowered.contains($0) }
+
+        if isMoodRequest {
+            // Find which mood/genre keyword is present
+            for mood in moodsAndGenres where lowered.contains(mood) {
+                return "\(mood) music"
+            }
+        }
+
+        // Clean up filler words if no specific transformation
+        let fillerWords = ["some ", "something ", "anything "]
+        var cleaned = query
+        for filler in fillerWords where cleaned.lowercased().hasPrefix(filler) {
+            cleaned = String(cleaned.dropFirst(filler.count))
+            break
+        }
+
+        return cleaned
+    }
+
+    /// Extracts artist from "something like X" or "similar to X" patterns.
+    private func extractSimilarArtist(from query: String) -> String? {
+        let patterns = [
+            "something like ", "anything like ", "similar to ",
+            "artists like ", "songs like ", "music like ",
+        ]
+
+        for pattern in patterns {
+            if let range = query.range(of: pattern) {
+                let artist = String(query[range.upperBound...]).trimmingCharacters(in: .whitespaces)
+                if !artist.isEmpty {
+                    return artist
+                }
+            }
+        }
+        return nil
+    }
+
+    /// Extracts decade from patterns like "from the 80s" or "90s hits".
+    private func extractDecade(from query: String) -> String? {
+        // Match patterns like "80s", "90s", "2000s"
+        let decadePattern = #"(19)?(20)?\d0s"#
+        if let regex = try? NSRegularExpression(pattern: decadePattern),
+           let match = regex.firstMatch(in: query, range: NSRange(query.startIndex..., in: query)),
+           let range = Range(match.range, in: query)
+        {
+            let decade = String(query[range])
+            // If query has filler words, return clean decade search
+            if query.contains("something") || query.contains("from the") {
+                return "\(decade) music"
+            }
+        }
+        return nil
+    }
+
+    /// Extracts activity from "for X" patterns.
+    private func extractActivity(from query: String) -> String? {
+        let activityMappings = [
+            "for studying": "study music",
+            "for working out": "workout music",
+            "for running": "running music",
+            "for sleeping": "sleep music",
+            "for meditation": "meditation music",
+            "for cooking": "cooking music",
+            "for driving": "driving music",
+            "for reading": "reading music",
+            "for work": "focus music",
+            "for coding": "coding music",
+            "to study": "study music",
+            "to sleep": "sleep music",
+            "to relax": "relaxing music",
+            "to work out": "workout music",
+        ]
+
+        for (pattern, replacement) in activityMappings where query.contains(pattern) {
+            return replacement
+        }
+        return nil
+    }
+
     private func executeIntent(_ intent: MusicIntent) async {
         // Build the search query from parsed components
         let searchQuery = intent.buildSearchQuery()

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,6 @@ struct KasetApp: App {`
`123`	`123`	`.environment(self.authService)`
`124`	`124`	`}`
`125`	`125`	`.commands {`
`126`		`-`
`127`	`126`	`// Playback commands`
`128`	`127`	`CommandMenu("Playback") {`
`129`	`128`	`// Play/Pause - Space`