On audit: WIP: multi-provider debugging attempts

index on audit: 404828c Fix setState during build using timer debounce
Fix setState during build using timer debounce
2026-02-07 14:40:47 +00:00 · 2026-02-07 14:40:47 +00:00 · 2026-02-07 14:19:10 +00:00 · 2026-02-07 14:11:55 +00:00 · 2026-02-07 14:11:42 +00:00 · 2026-02-07 13:53:59 +00:00
198 changed files with 55440 additions and 9239 deletions
@@ -0,0 +1,3 @@
 # These are the funding models supported by Ensemble
 github: CollotsSpot
 custom: https://ko-fi.com/collotsspot
@@ -31,10 +31,20 @@ jobs:
      - name: Setup Flutter
        uses: subosito/flutter-action@v2
        with:
-          flutter-version: '3.24.0'
+          flutter-version: '3.38.0'
-          channel: 'stable'
+          channel: 'master'
          cache: true
      - name: Cache Gradle dependencies
        uses: actions/cache@v4
        with:
          path: |
            ~/.gradle/caches
            ~/.gradle/wrapper
          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
          restore-keys: |
            gradle-${{ runner.os }}-
      - name: Get dependencies
        run: flutter pub get
@@ -53,10 +63,7 @@ jobs:
      - name: Setup signing keystore
        run: |
          # Decode keystore from secret (persistent key for consistent signatures)
          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > android/app/upload-keystore.jks
          # Create key.properties file
          cat > android/key.properties << EOF
          storePassword=${{ secrets.KEYSTORE_PASSWORD }}
          keyPassword=${{ secrets.KEY_PASSWORD }}
@@ -76,10 +83,5 @@ jobs:
      - name: Upload APK summary
        run: |
-          echo "## APK Build Successful! 🎉" >> $GITHUB_STEP_SUMMARY
+          echo "## APK Build Successful!" >> $GITHUB_STEP_SUMMARY
          echo "" >> $GITHUB_STEP_SUMMARY
          echo "📱 **APK Location:** \`build/app/outputs/flutter-apk/app-release.apk\`" >> $GITHUB_STEP_SUMMARY
          echo "" >> $GITHUB_STEP_SUMMARY
          echo "📦 **Download:** Check the artifacts section below" >> $GITHUB_STEP_SUMMARY
          echo "" >> $GITHUB_STEP_SUMMARY
          ls -lh build/app/outputs/flutter-apk/app-release.apk >> $GITHUB_STEP_SUMMARY
@@ -0,0 +1,182 @@
 # Player System Animation & Polish Audit
 ## Context
 This is a Music Assistant client app (Ensemble) built with Flutter. The player system has undergone extensive development and now needs a comprehensive polish audit. The goal is buttery smooth 60fps animations and a premium user experience.
 ## Architecture Overview
 The player system consists of three interconnected components:
 1. **Mini Player** (collapsed state) - Floating card at bottom, shows current track
 2. **Expanded Player** - Full-screen player with album art, controls, progress
 3. **Queue Panel** - Slides in from right of expanded player, shows playback queue
 Additionally:
 - **Player Selector** - Horizontal swipe between multiple players (collapsed mode)
 - **Device Reveal** - Swipe down from mini player to show available players
 ## Key Files
 ```
 lib/widgets/
 ├── expandable_player.dart      # Main player widget (1800+ lines)
 ├── global_player_overlay.dart  # Overlay wrapper, static accessors
 ├── player/
 │   ├── queue_panel.dart        # Queue list with great_list_view
 │   ├── chapters_panel.dart     # Audiobook chapters
 │   └── mini_player_content.dart
 ```
 ## CRITICAL CONSTRAINTS
 1. **DO NOT MODIFY the queue list implementation** - It uses `great_list_view` package with `AutomaticAnimatedListView`. This was chosen specifically to avoid Flutter's grey screen overlay bug (#103804). The current implementation works correctly.
 2. **Preserve all existing functionality** - Focus on polish, not rewrites
 3. **Test changes incrementally** - This system is complex with many interdependencies
 ## Audit Areas
 ### 1. Animation Performance Audit
 Use sub-agents to analyze each animation system:
 **Agent 1: Expand/Collapse Animation**
 - Analyze `_controller` and `_expandAnimation`
 - Check for jank during morphing transition
 - Verify lerp functions are efficient
 - Look for unnecessary rebuilds during animation
 - Check `RepaintBoundary` placement
 **Agent 2: Queue Panel Animation**
 - Analyze `_queuePanelController` and `_queuePanelAnimation`
 - Verify slide-in/out is smooth
 - Check interaction with expanded player state
 - Verify the Listener-based swipe detection doesn't cause issues
 **Agent 3: Player Selector Animation**
 - Analyze horizontal swipe between players
 - Check `_slideOffset` and peek player animations
 - Verify finger-following feels natural
 - Look for edge cases with rapid swipes
 **Agent 4: Micro-interactions**
 - Play/pause button animations
 - Progress bar interactions
 - Volume swipe overlay
 - Favorite button feedback
 - Skip button responsiveness
 ### 2. State Management Audit
 **Check for:**
 - Unnecessary `setState` calls during animations
 - ValueNotifier usage efficiency
 - Animation listener cleanup
 - Memory leaks from subscriptions
 - State synchronization between components
 ### 3. Visual Polish Audit
 **Check for:**
 - Color transitions during expand/collapse
 - Text fade/scale animations
 - Image loading placeholders
 - Shadow/elevation consistency
 - Border radius morphing smoothness
 - Safe area handling
 ### 4. Gesture Conflict Resolution
 **Verify:**
 - Vertical drag (expand/collapse) vs horizontal drag (player switch)
 - Queue panel swipe-right-to-close vs Dismissible swipe-left-to-delete
 - Edge dead zones for Android back gesture
 - Tap vs drag disambiguation
 ### 5. Edge Cases
 **Test scenarios:**
 - Rapid expand/collapse
 - Swipe during animation
 - Back button during animations
 - Track change during queue scroll
 - Network image loading failures
 - Very long track/artist names
 ## Execution Strategy
 ```
 ultrathink: true
 ```
 ### Phase 1: Discovery (Read-Only)
 Launch parallel sub-agents to analyze each file:
 - Read and understand the animation architecture
 - Map all animation controllers and their relationships
 - Identify potential performance bottlenecks
 - Document current RepaintBoundary usage
 ### Phase 2: Analysis Report
 Compile findings into categories:
 - **Critical**: Causes visible jank or bugs
 - **Important**: Noticeable but not breaking
 - **Nice-to-have**: Minor polish improvements
 ### Phase 3: Implementation Plan
 For each finding:
 - Specific file and line numbers
 - Proposed change
 - Risk assessment
 - Testing approach
 ### Phase 4: Incremental Fixes
 - One fix at a time
 - Build and test after each change
 - Verify no regressions
 ## Output Format
 Provide a structured audit report:
 ```markdown
 ## Animation Audit Report
 ### Executive Summary
 [2-3 sentences on overall state]
 ### Critical Issues
 1. [Issue]: [File:Line] - [Description] - [Proposed Fix]
 ### Important Issues
 1. [Issue]: [File:Line] - [Description] - [Proposed Fix]
 ### Polish Opportunities
 1. [Issue]: [File:Line] - [Description] - [Proposed Fix]
 ### Architecture Observations
 [Notes on overall structure, patterns noticed]
 ### Recommended Priority Order
 1. [First fix]
 2. [Second fix]
 ...
 ```
 ## Success Criteria
 After this audit and fixes:
 - All animations run at consistent 60fps
 - No jank during any transition
 - Gestures feel responsive and natural
 - State transitions are seamless
 - No visual glitches or flickers
 - Memory usage is stable during interactions
 ## Notes
 - The app uses adaptive theming (colors extracted from album art)
 - There's an `AnimationDebugger` utility for profiling
 - Position tracking uses a shared `PositionTracker` singleton
 - The player supports both music and audiobooks (different UI modes)
@@ -0,0 +1,391 @@
 # Ensemble Codebase Intensive Audit Prompt
 ## Overview
 You are tasked with conducting an intensive, comprehensive audit of the **Ensemble** Flutter application - a Music Assistant client for Android with multi-device synchronization, local playback, and Sendspin raw audio streaming capabilities.
 **Codebase Statistics:**
 - 90 Dart files, ~40,583 lines of code
 - 18 screens, 27 services, 6 providers
 - Architecture: Provider pattern with ChangeNotifier
 - Audio: just_audio + flutter_pcm_sound + audio_service
 - Networking: WebSocket (JSON-RPC) + HTTP + Sendspin binary protocol
 ---
 ## Audit Scope
 Perform a thorough audit covering ALL of the following areas. For each issue found, provide:
 1. **File path and line number(s)**
 2. **Severity**: CRITICAL / HIGH / MEDIUM / LOW
 3. **Description** of the issue
 4. **Impact** if left unfixed
 5. **Recommended fix** with code example where applicable
 ---
 ## SECTION 1: SECURITY AUDIT
 ### 1.1 Credential Storage (CRITICAL PRIORITY)
 Audit `/lib/services/settings_service.dart` for:
 - [ ] Plaintext password storage in SharedPreferences (lines 209-222)
 - [ ] Auth tokens stored without encryption
 - [ ] Serialized credentials in JSON format (lines 169-190)
 **Expected Finding:** Credentials stored insecurely. Recommend flutter_secure_storage.
 ### 1.2 Certificate Validation
 Audit `/lib/services/auth/auth_manager.dart` for:
 - [ ] HTTPS redirect handling for local IPs
 - [ ] Certificate validation disabled scenarios
 - [ ] MITM vulnerability exposure
 ### 1.3 Authentication Strategies
 Audit all files in `/lib/services/auth/`:
 - [ ] `basic_auth_strategy.dart` - Base64 encoding (not encryption)
 - [ ] `authelia_strategy.dart` - Session cookie handling, timing attack (line 159)
 - [ ] `ma_auth_strategy.dart` - Token refresh mechanism
 - [ ] `no_auth_strategy.dart` - Public server exposure
 ### 1.4 Input Validation
 Audit `/lib/services/music_assistant_api.dart`:
 - [ ] URI construction without validation (lines 1346-1360)
 - [ ] Provider/itemId injection risks
 - [ ] WebSocket message validation
 ### 1.5 Information Disclosure
 - [ ] Debug logs exposing sensitive data (check all `_logger.log()` calls)
 - [ ] Server version exposure via `server_info`
 - [ ] Error messages leaking technical details
 ---
 ## SECTION 2: MEMORY MANAGEMENT AUDIT
 ### 2.1 Static Memory Leaks
 Audit `/lib/models/player.dart`:
 - [ ] `_playerCreationTimes` static map (lines 96-144) - grows unbounded
 - [ ] Cleanup only removes 50 of 100+ entries
 ### 2.2 Unbounded Caches
 Audit `/lib/services/cache_service.dart`:
 - [ ] `_albumTracksCache` - no size limit
 - [ ] `_artistAlbumsCache` - no TTL expiration
 - [ ] `_searchCache` - never evicted
 - [ ] `_playerTrackCache` - only cleared on disconnect
 ### 2.3 Stream/Timer Cleanup
 Audit `/lib/providers/music_assistant_provider.dart`:
 - [ ] `_playerStateTimer` disposal (line 4435-4445)
 - [ ] `_notificationPositionTimer` multiple creation paths (lines 2925-2940)
 - [ ] `_localPlayerEventSubscription` cleanup
 - [ ] `_playerUpdatedEventSubscription` cleanup
 - [ ] `_playerAddedEventSubscription` cleanup
 Audit `/lib/services/hardware_volume_service.dart`:
 - [ ] `_volumeUpController` never closed (lines 74-85)
 - [ ] `_volumeDownController` never closed
 ### 2.4 Stream Subscription Leaks
 Audit `/lib/providers/music_assistant_provider.dart`:
 - [ ] `_api!.connectionState.listen()` - subscription not stored
 - [ ] Old subscriptions not cancelled before new API instance
 ---
 ## SECTION 3: RACE CONDITION AUDIT
 ### 3.1 Player State Dual Updates
 Audit `/lib/providers/music_assistant_provider.dart`:
 - [ ] Timer polling (every 5s) vs WebSocket events racing
 - [ ] `_updatePlayerState()` called from both paths
 - [ ] No mutex/lock protection
 ### 3.2 Async Method Reentrancy
 Audit `selectPlayer()` method:
 - [ ] `async` method without guard against concurrent calls
 - [ ] `_selectedPlayer` modified before and after `await`
 - [ ] State could change during await
 ### 3.3 Fire-and-Forget Operations
 Search for `unawaited(` and `() async {` patterns:
 - [ ] `_persistPlaybackState()` - database save not awaited
 - [ ] Pause operations fire-and-forget (lines 3876-3894)
 - [ ] Preload operations (line 2707)
 ### 3.4 PCM Player State Machine
 Audit `/lib/services/pcm_audio_player.dart`:
 - [ ] 9-state machine with complex transitions (lines 32-37)
 - [ ] Auto-recovery race condition (lines 215-229)
 - [ ] Feed loop during pause transition (lines 174-179)
 ---
 ## SECTION 4: ERROR HANDLING AUDIT
 ### 4.1 Silent Exception Handlers (CRITICAL)
 Find all instances of:
 ```dart
 } catch (e) {}
 } catch (_) {}
 ```
 Known locations:
 - [ ] `music_assistant_provider.dart` (multiple)
 - [ ] `player_provider.dart` (3 instances)
 - [ ] `recently_played_service.dart`
 ### 4.2 Missing Error Recovery
 - [ ] No exponential backoff on connection retry
 - [ ] No retry logic for failed API calls
 - [ ] WebSocket timeout handling (30 seconds - too long?)
 ### 4.3 Null Safety Violations
 Find all `!` (null assertion) operators:
 - [ ] `search_screen.dart` (20+ instances)
 - [ ] `models/media_item.dart`
 - [ ] `models/player.dart`
 - [ ] `item.mediaItem! as Artist` patterns
 ---
 ## SECTION 5: ARCHITECTURAL ISSUES
 ### 5.1 God Class
 Audit `/lib/providers/music_assistant_provider.dart`:
 - [ ] 4,469 lines - violates Single Responsibility
 - [ ] 386 conditional branches
 - [ ] Mixing: connection, players, library, sync, audio, position tracking
 **Recommend splitting into:**
 - ConnectionProvider (~500 LOC)
 - PlayerManager (~800 LOC)
 - LibraryProvider (~1000 LOC)
 - LocalPlaybackManager (~600 LOC)
 ### 5.2 Oversized Widget Files
 - [ ] `expandable_player.dart` - 2,485 lines (should be <500)
 - [ ] `global_player_overlay.dart` - 737 lines
 - [ ] `new_library_screen.dart` - 2,521 lines
 ### 5.3 Global Key Anti-Pattern
 Audit `/lib/widgets/global_player_overlay.dart`:
 - [ ] `globalPlayerKey` for state access
 - [ ] `_overlayStateKey` for overlay state
 - [ ] Should use Provider/context instead
 ### 5.4 Primitive Obsession
 - [ ] View modes as strings ('grid2', 'grid3', 'list')
 - [ ] Media types as strings ('track', 'album', 'artist')
 - [ ] Should be strongly-typed enums
 ---
 ## SECTION 6: CODE QUALITY ISSUES
 ### 6.1 Testing (CRITICAL)
 - [ ] **ZERO test files exist** - confirm this
 - [ ] No unit tests, widget tests, or integration tests
 - [ ] flutter_test dependency exists but unused
 ### 6.2 Hardcoded Values
 Find and document all:
 - [ ] Color hex codes (50+ instances of `Color(0xFF...`)
 - [ ] Duration values not using `Timings` constants
 - [ ] Magic numbers (16, 4, 5, 100, 50)
 - [ ] String literals for media types
 ### 6.3 Mixed Async Patterns
 - [ ] `.then()` chains alongside async/await
 - [ ] `.whenComplete()` usage
 - [ ] Consolidate to async/await
 ### 6.4 Dead Code
 - [ ] `@Deprecated` methods still implemented
 - [ ] `animation_debugger.dart` - dev-only?
 - [ ] Unused imports
 ### 6.5 TODO Comments
 Document all actionable TODOs:
 - [ ] `queue_screen.dart:214` - queue item removal
 - [ ] `audiobook_detail_screen.dart:261,312` - progress sync
 - [ ] `music_assistant_provider.dart:793,799` - playlist modification
 ---
 ## SECTION 7: UI/UX AUDIT
 ### 7.1 Accessibility (CRITICAL)
 Audit for missing:
 - [ ] `Semantics` widgets on interactive elements
 - [ ] `Tooltip` on icon buttons
 - [ ] Screen reader support
 - [ ] Touch target sizes (minimum 48dp)
 - [ ] Color contrast validation (WCAG AA)
 ### 7.2 Performance Issues
 Audit `/lib/widgets/expandable_player.dart`:
 - [ ] No `RepaintBoundary` wrappers
 - [ ] 55+ `setState()` calls
 - [ ] 3 AnimationControllers with multiple listeners
 - [ ] Title height cache invalidation (lines 118+)
 ### 7.3 Double Opacity Bug
 Audit `/lib/widgets/player/player_controls.dart`:
 ```dart
 color: (shuffle == true ? primaryColor : textColor.withOpacity(0.5))
    .withOpacity(expandedElementsOpacity),
 ```
 - [ ] Double `.withOpacity()` application
 ### 7.4 Missing Features
 - [ ] No landscape orientation support
 - [ ] No tablet layout optimization
 - [ ] No loading skeleton animations
 - [ ] No haptic feedback (except one location)
 ---
 ## SECTION 8: AUDIO PLAYBACK AUDIT
 ### 8.1 Position Interpolation
 Audit `/lib/services/position_tracker.dart`:
 - [ ] No timeout on anchor updates - unbounded drift possible
 - [ ] Duration interpolation can exceed track duration
 - [ ] Stale timestamp handling (>30 seconds)
 ### 8.2 Sendspin Protocol
 Audit `/lib/services/sendspin_service.dart`:
 - [ ] Proxy auth retry without deduplication (lines 188-209)
 - [ ] WebSocket binary frame parsing
 - [ ] Clock synchronization accuracy
 ### 8.3 Audio Resource Cleanup
 Audit `/lib/services/audio/massiv_audio_handler.dart`:
 - [ ] Audio session interrupt listeners not disposed
 - [ ] Audio focus not explicitly released
 ### 8.4 Mixed Playback Modes
 - [ ] just_audio initialized but unused during Sendspin
 - [ ] Resource allocation for unused player
 - [ ] Potential audio focus conflicts
 ---
 ## SECTION 9: NETWORKING AUDIT
 ### 9.1 WebSocket Lifecycle
 Audit `/lib/services/music_assistant_api.dart`:
 - [ ] Heartbeat interval (30s) - appropriate?
 - [ ] Reconnection logic and timing
 - [ ] Pending request cleanup on disconnect
 ### 9.2 Caching Strategy
 - [ ] No incremental/delta sync (full library every 5 minutes)
 - [ ] Cache staleness not communicated to UI
 - [ ] No query result pagination (fetches up to 5000 items)
 ### 9.3 Rate Limiting
 - [ ] No client-side rate limiting
 - [ ] Search requests not throttled
 - [ ] Could overload server
 ### 9.4 Offline Support
 Audit `/lib/services/offline_action_queue.dart`:
 - [ ] Queue execution not atomic (lines 118-130)
 - [ ] Action could execute twice on crash
 - [ ] Queue stored unencrypted
 ---
 ## SECTION 10: DATABASE AUDIT
 ### 10.1 Schema Review
 Audit `/lib/database/database.dart`:
 - [ ] Table indexes for query performance
 - [ ] Foreign key constraints
 - [ ] Migration strategy
 ### 10.2 Query Patterns
 - [ ] N+1 query prevention
 - [ ] Transaction usage for atomic operations
 - [ ] Connection pooling
 ### 10.3 Data Consistency
 - [ ] Tier 1 (DB) vs Tier 2 (API sync) race conditions
 - [ ] User modifications during background sync
 - [ ] Conflict resolution strategy
 ---
 ## Deliverables
 After completing the audit, provide:
 ### 1. Executive Summary
 - Overall code quality score (1-10)
 - Top 5 critical issues requiring immediate attention
 - Estimated technical debt in developer-hours
 ### 2. Issue Tracker
 Create a prioritized list of all issues found:
 | ID | Severity | Category | File:Line | Description | Effort |
 |----|----------|----------|-----------|-------------|--------|
 ### 3. Recommended Roadmap
 Sprint-based plan to address findings:
 - Sprint 1 (Immediate): Security fixes, silent exception handlers
 - Sprint 2-3: God class decomposition, test infrastructure
 - Sprint 4-6: Memory leak fixes, accessibility
 - Long-term: Performance optimization, monitoring
 ### 4. Code Examples
 For each CRITICAL and HIGH severity issue, provide:
 - Current problematic code
 - Recommended refactored code
 - Migration steps
 ---
 ## Files to Prioritize
 Start your audit with these critical files:
 1. `/lib/providers/music_assistant_provider.dart` (4,469 LOC) - God class
 2. `/lib/services/settings_service.dart` - Credential storage
 3. `/lib/services/music_assistant_api.dart` (2,929 LOC) - Networking
 4. `/lib/widgets/expandable_player.dart` (2,485 LOC) - UI complexity
 5. `/lib/services/auth/` directory - Security
 6. `/lib/models/player.dart` - Memory leaks
 7. `/lib/services/cache_service.dart` - Unbounded caches
 8. `/lib/services/position_tracker.dart` - Audio sync issues
 ---
 ## Known Critical Issues (Pre-Identified)
 These issues have been identified and MUST be verified and documented:
 1. **CRITICAL: Plaintext credential storage** - SharedPreferences without encryption
 2. **CRITICAL: Zero test coverage** - No unit, widget, or integration tests
 3. **CRITICAL: 4,469 line god class** - MusicAssistantProvider violates SRP
 4. **CRITICAL: Silent exception handlers** - `catch (e) {}` patterns
 5. **HIGH: Static memory leak** - `_playerCreationTimes` unbounded growth
 6. **HIGH: Race conditions** - Player state polling vs events
 7. **HIGH: No accessibility** - Missing Semantics, screen reader support
 8. **HIGH: Certificate validation disabled** - MITM vulnerability for local IPs
 9. **MEDIUM: Double opacity bug** - `.withOpacity().withOpacity()` in player controls
 10. **MEDIUM: Position tracker drift** - No timeout on anchor updates
 ---
 ## Audit Execution Notes
 - Use `Grep` tool to search for patterns across the codebase
 - Use `Read` tool to examine specific file sections
 - Document line numbers for all findings
 - Provide code snippets for context
 - Cross-reference related issues across files
 - Verify pre-identified issues exist and document their exact locations
 **Total estimated audit time: 4-6 hours for thorough coverage**
@@ -0,0 +1,419 @@
 # Ensemble Codebase - Comprehensive Audit Report
 **Audit Date:** 2026-01-01
 **Codebase:** Ensemble Flutter App (Music Assistant Client)
 **Version:** 2.7.3-beta+35
 **Total Lines of Code:** ~40,583 Dart
 **Files Analyzed:** 90 Dart files
 ---
 ## Executive Summary
 ### Overall Code Quality Score: 5.5/10
 The Ensemble codebase demonstrates **strong architectural foundations** with a well-organized service layer, effective caching strategies, and sophisticated audio handling. However, the audit revealed **critical security vulnerabilities**, **zero test coverage**, and significant **technical debt** that must be addressed before production release.
 ### Critical Statistics
 | Metric | Value | Status |
 |--------|-------|--------|
 | Test Coverage | 0% | CRITICAL |
 | God Class Size | 4,469 LOC | CRITICAL |
 | Silent Exception Handlers | 7 | CRITICAL |
 | Plaintext Credentials | 4 locations | CRITICAL |
 | Memory Leak Locations | 6 | HIGH |
 | Race Conditions | 4 | HIGH |
 | Accessibility (Semantics) | 0 widgets | CRITICAL |
 ---
 ## Issue Summary by Severity
 | Severity | Count | Categories |
 |----------|-------|------------|
 | **CRITICAL** | 12 | Security, Testing, Architecture, Accessibility |
 | **HIGH** | 18 | Memory, Race Conditions, Networking, Audio |
 | **MEDIUM** | 22 | Error Handling, UI, Caching, Code Quality |
 | **LOW** | 14 | Naming, Documentation, Minor Improvements |
 ---
 ## CRITICAL ISSUES (Immediate Action Required)
 ### 1. Plaintext Credential Storage
 **File:** `/lib/services/settings_service.dart`
 **Lines:** 131-143, 147-159, 169-190, 209-222
 Passwords and auth tokens stored in SharedPreferences without encryption.
 ```dart
 // VULNERABLE CODE
 static Future<void> setPassword(String? password) async {
  final prefs = await SharedPreferences.getInstance();
  await prefs.setString(_keyPassword, password);  // PLAINTEXT!
 }
 ```
 **Fix:** Use `flutter_secure_storage` for all sensitive data.
 ---
 ### 2. Zero Test Coverage
 **Location:** Entire codebase
 No unit tests, widget tests, or integration tests exist. The `flutter_test` dependency is unused.
 **Impact:** Cannot safely refactor, high regression risk, no confidence in correctness.
 **Fix:** Establish test infrastructure immediately. Start with:
 - Unit tests for `MusicAssistantAPI`, `CacheService`, `ErrorHandler`
 - Widget tests for player controls
 - Integration tests for playback flows
 ---
 ### 3. God Class - MusicAssistantProvider
 **File:** `/lib/providers/music_assistant_provider.dart`
 **Size:** 4,469 lines, ~140 methods, 744 conditional branches
 Single class handles: connection, players, library, cache, audio, sync, offline queue.
 **Fix:** Split into:
 - `ConnectionManager` (~500 LOC)
 - `PlayerManager` (~800 LOC)
 - `LibraryCacheService` (~600 LOC)
 - `SendspinManager` (~400 LOC)
 - `MusicAssistantProvider` - Facade composing above (~800 LOC)
 ---
 ### 4. Zero Accessibility Support
 **Files:** `/lib/widgets/`, `/lib/screens/` (all)
 - **0** `Semantics` widgets
 - **0** `semanticLabel` properties
 - **1** `Tooltip` (entire app)
 - Screen readers cannot navigate the app
 **Fix:** Add Semantics to all interactive elements:
 ```dart
 Semantics(
  button: true,
  label: isPlaying ? 'Pause playback' : 'Play',
  child: IconButton(...)
 )
 ```
 ---
 ### 5. Silent Exception Handlers
 **Locations:** 7 instances across codebase
 | File | Line | Code |
 |------|------|------|
 | player_provider.dart | 567, 575, 584 | `catch (e) {}` |
 | music_assistant_provider.dart | 2690 | `catch (e) {}` |
 | music_assistant_api.dart | 2542 | `catch (e) {}` |
 | recently_played_service.dart | 154, 206 | `catch (_) {}` |
 **Fix:** Add logging or use `firstWhereOrNull` instead of try/catch around `firstWhere`.
 ---
 ### 6. Audio Session Listeners Not Disposed
 **File:** `/lib/services/audio/massiv_audio_handler.dart`
 **Lines:** 45-73
 Stream subscriptions created but never cancelled - causes memory leaks and zombie listeners.
 **Fix:** Store subscriptions and cancel in dispose():
 ```dart
 StreamSubscription? _interruptionSubscription;
 _interruptionSubscription = session.interruptionEventStream.listen(...);
 void dispose() {
  _interruptionSubscription?.cancel();
 }
 ```
 ---
 ## HIGH SEVERITY ISSUES
 ### 7. Connection State Subscription Not Stored
 **File:** `/lib/providers/music_assistant_provider.dart:575-614`
 The `connectionState.listen()` return value is not stored - causes listener accumulation on reconnect.
 ---
 ### 8. Player State Race Condition
 **File:** `/lib/providers/music_assistant_provider.dart`
 Timer polling (every 5s) and WebSocket events can race to update `_selectedPlayer` and `_currentTrack` without mutex protection.
 ---
 ### 9. Async Method Reentrancy
 **File:** `/lib/providers/music_assistant_provider.dart:2713-2841`
 `selectPlayer()` is `void async` with no guard against concurrent calls. Multiple rapid player switches can interleave.
 ---
 ### 10. Unbounded Search Cache
 **File:** `/lib/services/cache_service.dart:31-32`
 `_searchCache` map has no size limit or proactive TTL eviction. Grows indefinitely with user searches.
 ---
 ### 11. Static Memory Leak
 **File:** `/lib/models/player.dart:96, 139-144`
 `_playerCreationTimes` static map cleanup only removes 50 of 100+ entries, allowing unbounded growth.
 ---
 ### 12. No Database Indexes
 **File:** `/lib/database/database.dart`
 No secondary indexes defined. Query performance degrades as database grows.
 ---
 ### 13. No Incremental Sync
 **File:** `/lib/services/sync_service.dart:150-165`
 Full library fetch (up to 4000 items) on every sync instead of delta updates.
 ---
 ### 14. Offline Queue Not Atomic
 **File:** `/lib/services/offline_action_queue.dart:80-108`
 Queue persistence happens after all processing - crash during processing loses successful actions.
 ---
 ### 15. Auth Retry Without Deduplication
 **File:** `/lib/services/sendspin_service.dart:189-209`
 Multiple auth messages can be sent during rapid reconnection attempts.
 ---
 ### 16. Pending Requests Not Completed on Disconnect
 **File:** `/lib/services/music_assistant_api.dart:2911`
 `_pendingRequests.clear()` abandons Completers without completing them with errors.
 ---
 ### 17. HTTP Fallback for Local IPs
 **File:** `/lib/services/auth/auth_manager.dart:51-58`
 HTTPS failures silently fall back to HTTP on local networks - MITM vulnerability.
 ---
 ### 18. Certificate Validation Bypassed
 **File:** `/lib/services/auth/auth_manager.dart:210-236`
 HTTPS redirects explicitly refused for local IPs due to expected certificate failures.
 ---
 ## MEDIUM SEVERITY ISSUES
 ### 19. Double Opacity Bug
 **File:** `/lib/widgets/player/player_controls.dart:62-63, 99-100`
 ```dart
 // BUG: .withOpacity(0.5).withOpacity(expandedElementsOpacity) compounds opacity
 color: (shuffle == true ? primaryColor : textColor.withOpacity(0.5))
    .withOpacity(expandedElementsOpacity),
 ```
 ---
 ### 20. Mixed Async Patterns
 **Locations:** 13 instances
 `.then()` chains mixed with `async/await` throughout the codebase.
 ---
 ### 21. Hardcoded Colors
 **Locations:** 55 instances
 `Color(0xFF604CEC)`, `Color(0xFF1a1a1a)` scattered across theme files and widgets.
 ---
 ### 22. View Modes as Strings
 **Locations:** 80+ instances
 `'grid2'`, `'grid3'`, `'list'` should be enums.
 ---
 ### 23. Fire-and-Forget Pause Commands
 **File:** `/lib/providers/music_assistant_provider.dart:3875-3894`
 Server pause command uses `unawaited()` - errors are silently lost.
 ---
 ### 24. Position Tracker Anchor Timeout Missing
 **File:** `/lib/services/position_tracker.dart:24-26`
 No timeout on stale anchor - interpolation can drift indefinitely.
 ---
 ### 25. PCM Buffer No Overflow Protection
 **File:** `/lib/services/pcm_audio_player.dart:68, 236-247`
 Audio buffer grows unbounded if data arrives faster than consumption.
 ---
 ### 26. No Client-Side Rate Limiting
 **Location:** App-wide
 No throttling on API requests during rapid user interactions.
 ---
 ### 27. Portrait-Only Lock
 **File:** `/lib/main.dart:64-68`
 No landscape orientation support.
 ---
 ### 28. Touch Targets Below 48dp
 **Files:** player_controls.dart, queue_panel.dart, player_card.dart
 Multiple buttons at 28x28 and 44x44 instead of minimum 48x48.
 ---
 ### 29. WCAG Contrast Not Validated
 **File:** `/lib/theme/palette_helper.dart`
 Uses 0.4 threshold instead of proper WCAG 4.5:1 contrast ratio calculation.
 ---
 ### 30. StreamControllers Not Closed
 **File:** `/lib/services/hardware_volume_service.dart:18-19, 74-85`
 `_volumeUpController` and `_volumeDownController` never closed in dispose().
 ---
 ## LOW SEVERITY ISSUES
 ### 31-34. Naming Inconsistencies
 Mixed patterns: `_isLoading` vs `_isLoadingPlaylists`, various cache variable names.
 ### 35-38. Missing TODO Implementations
 6 actionable TODOs identified (queue removal, audiobook progress sync, playlist modification).
 ### 39-42. Dead/Unused Code
 - `@Deprecated` methods still implemented
 - `library_stats.dart` appears unused
 - `animation_debugger.dart` disabled by default
 ### 43-44. Minor Documentation Gaps
 Missing method documentation, no architecture diagram.
 ---
 ## Recommended Remediation Roadmap
 ### Sprint 1 (Week 1-2): Security & Critical Fixes
 1. Migrate credentials to `flutter_secure_storage`
 2. Add logging to all silent catch blocks
 3. Store connection state subscription
 4. Fix audio session listener disposal
 5. Add basic test infrastructure (10% coverage target)
 ### Sprint 2 (Week 3-4): Memory & Race Conditions
 6. Add mutex to player state updates
 7. Add reentrancy guard to `selectPlayer()`
 8. Implement bounded caches with LRU eviction
 9. Fix static memory leak in Player model
 10. Store and cancel all stream subscriptions
 ### Sprint 3 (Week 5-6): Architecture Refactoring
 11. Split `MusicAssistantProvider` into 5 smaller classes
 12. Split `expandable_player.dart` into component widgets
 13. Replace GlobalKey anti-patterns with Provider
 14. Convert string constants to enums
 15. Extract hardcoded colors to constants file
 ### Sprint 4 (Week 7-8): Accessibility & UI
 16. Add Semantics to all interactive elements
 17. Increase touch targets to 48dp minimum
 18. Implement WCAG contrast validation
 19. Fix double opacity bug
 20. Add landscape orientation support
 ### Sprint 5 (Week 9-10): Performance & Polish
 21. Add database indexes
 22. Implement incremental sync
 23. Add client-side rate limiting
 24. Fix atomic offline queue processing
 25. Achieve 30% test coverage target
 ---
 ## Files Requiring Most Attention
 | File | LOC | Issues | Priority |
 |------|-----|--------|----------|
 | `music_assistant_provider.dart` | 4,469 | 12 | CRITICAL |
 | `settings_service.dart` | 811 | 4 | CRITICAL |
 | `expandable_player.dart` | 2,485 | 6 | HIGH |
 | `music_assistant_api.dart` | 2,929 | 5 | HIGH |
 | `cache_service.dart` | 370 | 4 | HIGH |
 | `massiv_audio_handler.dart` | 296 | 2 | CRITICAL |
 | `player.dart` | 422 | 2 | HIGH |
 | `auth_manager.dart` | 300 | 3 | HIGH |
 ---
 ## Estimated Technical Debt
 | Category | Effort (Dev-Days) |
 |----------|-------------------|
 | Security Fixes | 3-5 |
 | Test Infrastructure | 10-15 |
 | Architecture Refactoring | 15-20 |
 | Memory Leak Fixes | 3-5 |
 | Accessibility | 5-8 |
 | UI/UX Polish | 3-5 |
 | Performance | 5-8 |
 | **Total** | **44-66 dev-days** |
 ---
 ## Conclusion
 The Ensemble app has a solid foundation with well-designed patterns for caching, audio handling, and multi-device synchronization. However, **critical security vulnerabilities** (plaintext credentials), **zero test coverage**, and a **4,469-line god class** represent significant risks that must be addressed before any production deployment.
 The most urgent priorities are:
 1. **Secure credential storage** - immediate security risk
 2. **Add test infrastructure** - enables safe refactoring
 3. **Split the god class** - enables maintainability
 4. **Add accessibility** - legal/compliance requirement
 With focused effort over 8-10 weeks, the codebase can be brought to production-quality standards.
 ---
 *Audit conducted using 6 parallel specialized sub-agents analyzing security, memory management, race conditions, architecture, UI/UX, and audio/networking.*
@@ -0,0 +1,119 @@
 # Ensemble Codebase Audit Prompt
 Run this prompt with Claude Code to perform a comprehensive audit of the Ensemble Flutter app.
 ---
 ## Prompt
 You are performing a comprehensive code audit on the Ensemble Flutter app. This is a music/audiobook/podcast player app with 93+ Dart files.
 **CRITICAL RULES:**
 1. DO NOT remove or break any existing functionality
 2. All changes must be on the current branch: `audit/code-quality-review`
 3. Run `flutter analyze` after each set of changes to verify no regressions
 4. Commit changes in logical, reviewable chunks
 **AUDIT PHASES:**
 ### Phase 1: Code Quality Analysis (Read-Only)
 First, analyze the codebase without making changes. Create a report covering:
 1. **Large File Analysis** - Review these files for refactoring opportunities:
   - `lib/screens/new_library_screen.dart` (122KB)
   - `lib/screens/search_screen.dart` (129KB)
   - `lib/widgets/expandable_player.dart` (107KB)
   - `lib/screens/album_details_screen.dart` (48KB)
   - `lib/screens/artist_details_screen.dart` (45KB)
 2. **Pattern Inconsistencies** - Look for:
   - Inconsistent naming conventions (camelCase vs snake_case)
   - Mixed widget composition patterns
   - Inconsistent error handling approaches
   - Duplicate code across screens/widgets
 3. **Performance Red Flags** - Identify:
   - Unnecessary rebuilds (missing const constructors)
   - Heavy computations in build methods
   - Missing list item caching (ListView.builder vs ListView)
   - Inefficient state management patterns
 4. **Scroll Performance Issues** - Specifically audit:
   - ScrollController usage and disposal
   - Sliver implementations
   - AnimatedBuilder/AnimatedWidget usage
   - Image loading in scrollable lists
   - Any jank-inducing patterns
 ### Phase 2: Quick Wins (Low Risk, High Impact)
 Apply these fixes first:
 1. Add missing `const` constructors throughout
 2. Fix any `flutter analyze` warnings
 3. Remove dead code and unused imports
 4. Standardize formatting with `dart format`
 ### Phase 3: Scroll Animation Optimization
 Focus on smoother scrolling:
 1. **Image Optimization**
   - Ensure CachedNetworkImage is used consistently
   - Add appropriate cacheWidth/cacheHeight
   - Implement proper placeholder/error widgets
 2. **List Performance**
   - Convert any ListView to ListView.builder where appropriate
   - Add itemExtent where possible for fixed-height items
   - Implement AutomaticKeepAliveClientMixin where needed
   - Consider RepaintBoundary for complex list items
 3. **Animation Smoothing**
   - Use `Curves.easeOutCubic` or similar for scroll-linked animations
   - Ensure animations run at 60fps (avoid heavy computations during animation)
   - Review CustomScrollView/Sliver implementations
 ### Phase 4: Code Consistency Improvements
 1. **Widget Extraction**
   - Extract repeated UI patterns into reusable widgets
   - Ensure extracted widgets follow existing naming patterns
 2. **State Management**
   - Verify Provider usage is consistent
   - Check for proper disposal of controllers/streams
 3. **Error Handling**
   - Standardize try/catch patterns
   - Ensure consistent loading/error state UI
 ### Phase 5: Verification
 After all changes:
 1. Run `flutter analyze` - must pass with 0 issues
 2. Run `flutter test` if tests exist
 3. Create a summary of all changes made
 4. List any recommendations that were NOT implemented (too risky)
 ---
 ## Execution Instructions
 ```bash
 # Start the audit
 cd /home/home-server/Ensemble
 git checkout audit/code-quality-review
 # After each phase, commit your changes
 git add -A && git commit -m "Audit Phase X: [description]"
 # Verify no regressions
 flutter analyze
 ```
 ---
 ## Expected Deliverables
 1. `AUDIT_REPORT.md` - Findings from Phase 1
 2. Multiple commits with clear messages for each phase
 3. `AUDIT_SUMMARY.md` - Final summary of all changes and remaining recommendations
@@ -0,0 +1,257 @@
 # Ensemble Codebase Audit Report
 **Date**: 2026-01-14
 **Scope**: Full codebase audit (104 Dart files, 18 screens)
 **Focus Areas**: UI Continuity, Performance, Logic/Best Practices
 ---
 ## Executive Summary
 The Ensemble codebase is a **mature, feature-rich Flutter application** with many good patterns already in place. However, the audit identified **significant architectural debt** that should be addressed:
 | Severity | Count | Key Themes |
 |----------|-------|------------|
 | **Critical** | 6 | God classes (5,443 & 4,209 lines), design token adoption, startup blocking |
 | **High** | 15 | Touch targets, batch DB operations, over-notification, code duplication |
 | **Medium** | 25+ | Inconsistencies, memory issues, missing error boundaries |
 | **Low** | 15+ | Minor polish items |
 **Top 3 Priorities:**
 1. **Split `MusicAssistantProvider` (5,443 lines)** - God object handling everything
 2. **Split `new_library_screen.dart` (4,209 lines)** - 10 scroll controllers, 15+ view modes
 3. **Fix startup performance** - Sequential blocking ops could save 1-8 seconds
 ---
 ## Critical Issues
 ### 1. God Object: MusicAssistantProvider (5,443 lines)
 **File**: `lib/providers/music_assistant_provider.dart`
 - 54 `notifyListeners()` calls
 - 30+ state variables
 - 100+ public methods
 - Handles: connection, auth, players, library, search, caching, local playback, Sendspin
 - **Fix**: Split into ConnectionManager, PlayerStateManager, LibraryStateManager, SearchStateManager
 ### 2. God Object: NewLibraryScreen (4,209 lines)
 **File**: `lib/screens/new_library_screen.dart`
 - 10 scroll controllers
 - 15+ view mode states
 - 15+ sort order states
 - Handles: Music, Books, Podcasts, Radio tabs
 - **Fix**: Extract to ArtistsTab, AlbumsTab, TracksTab, PlaylistsTab, BooksTab, PodcastsTab, RadioTab
 ### 3. Sequential Blocking Startup (500-1500ms wasted)
 **File**: `lib/main.dart:33-66`
 ```dart
 await DatabaseService.instance.initialize();
 await ProfileService.instance.migrateFromOwnerName();
 await SettingsService.migrateToSecureStorage();
 await SyncService.instance.loadFromCache();
 audioHandler = await AudioService.init(...);
 ```
 - **Fix**: Parallelize with `Future.wait()`, defer AudioService to post-first-frame
 ### 4. Design Tokens Exist But Unused
 **File**: `lib/theme/design_tokens.dart`
 - `Spacing.*` used in only ~6 of 34+ widget files
 - `Radii.*` used in only ~5 files
 - `IconSizes.*` used in only ~4 files
 - **Fix**: Systematic replacement of hardcoded values
 ### 5. Touch Targets Too Small (32x32)
 **File**: `lib/screens/new_library_screen.dart:1805-1867`
 - Sort, favorites, view mode buttons are 32x32
 - Material Design minimum: 48x48
 - **Fix**: Increase to 48x48 or add padding for hit area
 ### 6. No Batch Database Inserts
 **File**: `lib/services/sync_service.dart:212-273`
 - 1000 albums = 1000 separate DB transactions
 - **Fix**: Wrap in single transaction or use Drift batch insert
 ---
 ## High Severity Issues
 ### Performance
 | Issue | File | Impact |
 |-------|------|--------|
 | `context.watch()` in nested tabs | new_library_screen.dart:2960 | All tabs rebuild on any provider change |
 | Consumer wrapping 800-line player | expandable_player.dart:1234 | Full rebuild on every state change |
 | Inline sorting during build | new_library_screen.dart:3647 | 5-20ms for 1000+ albums |
 | Multiple setState for author images | new_library_screen.dart:1017 | 20+ rebuilds as images load |
 | SecureStorage migration every startup | secure_storage_service.dart:103 | 100-300ms wasted |
 ### Architecture
 | Issue | File | Impact |
 |-------|------|--------|
 | State duplication across 4 providers | providers/*.dart | Maintenance burden, sync issues |
 | 8 duplicate `_cycle*ViewMode()` methods | new_library_screen.dart:251-402 | DRY violation |
 | 60+ duplicate getter/setter pairs | settings_service.dart:500-1000 | Code bloat |
 | Global singleton NavigationProvider | navigation_provider.dart:40 | Untestable |
 | CacheService duplicated in providers | Multiple | Memory waste, inconsistency |
 ### UI/UX
 | Issue | File | Impact |
 |-------|------|--------|
 | Hardcoded bottom spacing (140, 164, 100) | Multiple detail screens | Content obscured by player |
 | Inconsistent button sizes (44 vs 50) | Multiple screens | Visual disharmony |
 | No debounce on card taps | album_card.dart:118 | Double navigation possible |
 | Missing PopScope on AudiobookSeriesScreen | audiobook_series_screen.dart:276 | Adaptive colors not cleared |
 ### Error Handling
 | Issue | File | Impact |
 |-------|------|--------|
 | No Flutter error boundaries | main.dart | Red error screen on build failure |
 | API returns empty list on error | music_assistant_api.dart | Can't distinguish error from empty |
 ---
 ## Medium Severity Issues
 ### Performance
 - PaletteGenerator on main isolate (10-30ms blocking)
 - Multiple `SharedPreferences.getInstance()` calls (132 occurrences)
 - AppStartup polling loop with fixed 250ms delay
 - SystemThemeHelper FutureBuilder recreated on every build
 ### UI Consistency
 - Border radius varies: 8, 12, 20, 22, 25 for same element types
 - `SizedBox(height: 8)` appears 40+ times instead of `Spacing.vGap8`
 - Hardcoded colors for status (Colors.red, Colors.green)
 - Inconsistent icon sizes across screens
 ### State Management
 - Over-notification (multiple notifyListeners in single methods)
 - Wide Consumer scope (watch instead of select)
 - Missing dispose() in some providers
 - Inconsistent async state handling (loading/error)
 ### Navigation
 - `isQueuePanelOpen` vs `isQueuePanelTargetOpen` inconsistency
 - `popToHome()` doesn't clear adaptive colors
 - Infinite navigation loop possible (Album → Artist → Album)
 - Orphaned Hero animations in podcast_card, radio_station_card
 ### Data/Caching
 - Unbounded `_podcastCoverCache`
 - SyncService listener not removed on error
 - Redundant API calls between providers
 - Fire-and-forget persistence race condition
 ### Error Handling
 - No zone error handler for async exceptions
 - `retryCritical()` retries all errors including non-recoverable
 - No user notification of offline queue status
 - DisconnectedState not used consistently
 ---
 ## Quick Wins (High Impact, Low Effort)
 | # | Task | File(s) | Effort |
 |---|------|---------|--------|
 | 1 | Replace hardcoded bottom spacing with `BottomSpacing.withMiniPlayer` | Detail screens | 30 min |
 | 2 | Add navigation debounce to card widgets | album_card, artist_card, etc. | 1 hr |
 | 3 | Fix touch targets to 48x48 minimum | new_library_screen.dart | 15 min |
 | 4 | Add migration skip flag for SecureStorage | secure_storage_service.dart | 30 min |
 | 5 | Add Flutter error boundary | main.dart | 30 min |
 | 6 | Use `context.select()` instead of `context.watch()` | global_player_overlay, etc. | 2 hr |
 | 7 | Cache `SharedPreferences.getInstance()` | settings_service.dart | 30 min |
 ---
 ## Refactoring Roadmap
 ### Phase 1: Quick Wins (1-2 days)
 - Fix touch targets
 - Fix bottom spacing
 - Add navigation debounce
 - Add error boundaries
 - Cache SharedPreferences singleton
 ### Phase 2: Performance (3-5 days)
 - Parallelize startup operations
 - Replace `context.watch()` with `context.select()`
 - Batch database inserts
 - Add SecureStorage migration skip flag
 - Fix over-notification in provider
 ### Phase 3: Design System (1 week)
 - Systematic design token adoption
 - Standardize button sizes (44 vs 50)
 - Standardize border radius values
 - Create StatusColors semantic tokens
 - Replace all magic numbers
 ### Phase 4: Architecture (2-3 weeks)
 - ~~Split MusicAssistantProvider into focused managers~~ **DEFERRED** - MusicAssistantProvider has evolved with Sendspin, Cast-Sendspin ID mapping, position tracker integration. Splitting would require ~1600 lines of sync work. Code is working and tested.
 - ~~Split new_library_screen into tab widgets~~ **DEFERRED** - Tabs have tight state coupling (15+ view modes, 15+ sort orders, 10 scroll controllers). Extraction would require InheritedWidget/callbacks for all shared state. Risk outweighs benefit.
 - ✅ Extract generic helpers for SettingsService - Reduced from 1,031 to 874 lines (~15%)
 - ✅ Remove/integrate unused providers - Deleted PlayerProvider (964 lines), LibraryProvider, ConnectionProvider (651 lines total)
 - ~~Split music_assistant_api.dart by domain~~ **DEFERRED** - All methods share WebSocket connection and auth state. Clean extraction would require connection manager abstraction.
 ---
 ## Positive Findings
 The codebase already demonstrates many good practices:
 - **Performance awareness**: `// PERF:` comments, RepaintBoundary (55 occurrences), image caching (80 memCacheWidth/Height)
 - **Caching**: Multi-tier caching with LRU eviction, proper TTLs, proper DB indexes
 - **Error handling**: DebugLogger, RetryHelper, OfflineActionQueue well-implemented
 - **Theme system**: Material You support, adaptive colors from album art
 - **Offline support**: Cache-first loading, graceful degradation
 - **Navigation**: Consistent FadeSlidePageRoute, proper Hero animations (mostly)
 ---
 ## Files by Priority
 | Priority | File | Lines | Key Issues |
 |----------|------|-------|------------|
 | 1 | music_assistant_provider.dart | 5,443 | God object, over-notification |
 | 2 | new_library_screen.dart | 4,209 | God class, performance, touch targets |
 | 3 | main.dart | 549 | Startup blocking, error boundaries |
 | 4 | music_assistant_api.dart | 3,434 | Silent failures, needs splitting |
 | 5 | settings_service.dart | 1,019 | Code duplication, no caching |
 | 6 | expandable_player.dart | ~800 | Wide Consumer scope |
 | 7 | global_player_overlay.dart | ~500 | BottomSpacing source, Consumer scope |
 | 8 | All detail screens | Various | Hardcoded bottom spacing |
 | 9 | All card widgets | Various | Navigation debounce, design tokens |
 ---
 ## Audit Methodology
 This audit was conducted using 9 parallel sub-agents analyzing:
 **UI Continuity (3 agents)**
 1. Navigation & Flow - back button, Hero animations, tab preservation
 2. Visual Consistency - design tokens, spacing, typography
 3. Component Placement - touch targets, bottom spacing, modals
 **Performance (3 agents)**
 4. Rendering Performance - ListView.builder, const, rebuilds
 5. Data & Caching - streams, invalidation, memory bounds
 6. Startup & Load Time - blocking operations, initialization order
 **Logic/Best Practices (3 agents)**
 7. State Management - Provider patterns, notification frequency
 8. Error Handling - try-catch, boundaries, resilience
 9. Code Quality - file size, duplication, SOLID principles
 ---
 ## Conclusion
 The Ensemble app is well-architected at the macro level but has accumulated technical debt in its largest files. The most impactful improvements would be:
 1. **Splitting the two 4,000+ line files** into focused components
 2. **Adopting design tokens systematically** for visual consistency
 3. **Optimizing startup sequence** for faster app launch
 4. **Using granular state management** (select vs watch) for better performance
 The quick wins section provides immediate value with minimal risk, while the roadmap offers a path to sustainable improvement.
@@ -0,0 +1,57 @@
 # Audit Summary
 **Branch:** `audit/code-quality-review`
 **Date:** January 4, 2026
 ## Changes Applied
 ### Phase 1: Analysis Complete
 - Created `AUDIT_REPORT.md` with comprehensive findings
 - 4 parallel subagents analyzed const constructors, scroll performance, code duplication, and dead code
 ### Phase 2: Deprecated API Fixes (18 files)
 - Replaced all `colorScheme.background` with `colorScheme.surface` (Material 3 compliance)
 **Files modified:**
 - lib/screens/library_artists_screen.dart
 - lib/screens/library_albums_screen.dart
 - lib/screens/library_playlists_screen.dart
 - lib/screens/library_tracks_screen.dart
 - lib/screens/artist_details_screen.dart
 - lib/screens/new_home_screen.dart
 - lib/screens/login_screen.dart
 - lib/screens/settings_screen.dart
 - lib/screens/album_details_screen.dart
 - lib/screens/search_screen.dart
 - lib/screens/new_library_screen.dart
 ### Phase 3: Scroll Performance Optimization
 - Added `memCacheWidth` and `memCacheHeight` to CachedNetworkImage instances
 **lib/screens/new_library_screen.dart:**
 - Line 1400-1401: Author list tile image (128x128 cache)
 - Line 1487-1488: Author grid card image (256x256 cache)
 - Line 1577-1578: Audiobook list tile cover (256x256 cache)
 - Line 1749-1750: Audiobook grid cover (512x512 cache)
 - Line 1970-1971: Series list tile cover (256x256 cache)
 - Line 2986-2987: Album list tile cover (256x256 cache)
 ## Recommendations NOT Implemented (Low Priority)
 These were identified but NOT changed to preserve functionality:
 1. **View mode cycling refactor** - 8 similar functions could be consolidated
 2. **Color constant extraction** - Duplicated colors in 3 files
 3. **EdgeInsets.zero const** - 64 instances (build-time only, minimal impact)
 4. **BorderRadius.circular const** - 40+ instances
 ## Verification
 Changes should be verified by:
 1. GitHub Actions build (triggered automatically)
 2. Manual UI testing of scroll smoothness
 3. Verify no visual regressions in dark/light themes
 ## Build Trigger
 GitHub Actions workflow triggered on branch `audit/code-quality-review`
@@ -0,0 +1,529 @@
 # Ensemble Flutter Music Application - Codebase Audit Report
 **Generated:** 2026-02-07
 **Project Location:** `/home/chris/Ensemble`
 **Code Size:** ~6,180 lines in main provider, ~50K+ total lines
 **Flutter Version:** 3.0+
 **Auditor:** Claude Code Analysis
 ---
 ## Executive Summary
 This comprehensive audit examined the Ensemble Flutter music streaming application for security vulnerabilities, performance issues, code quality concerns, and architectural problems. The audit identified **23 distinct issues** across severity levels.
 ### Severity Breakdown
 - **Critical:** 2 issues
 - **High:** 6 issues
 - **Medium:** 10 issues
 - **Low:** 5 issues
 ### Overall Health Assessment: **GOOD** (with areas for improvement)
 The codebase demonstrates:
 - ✅ Strong secure storage practices (flutter_secure_storage with encryptedSharedPreferences)
 - ✅ Comprehensive dispose() cleanup across widgets
 - ✅ Good mounted check usage in most async operations
 - ⚠️ One critical file requiring splitting (6,180 lines)
 - ⚠️ Some timer callback issues
 - ⚠️ Several .then() chains that should use async/await
 ---
 ## 1. CRITICAL ISSUES
 ### 1.1 Massive Single File - `music_assistant_provider.dart`
 **File:** `/home/chris/Ensemble/lib/providers/music_assistant_provider.dart`
 **Lines:** 6,180
 **Severity:** Critical
 **Category:** Maintainability
 **Description:**
 The main provider file is extremely large (6,180 lines), making it difficult to navigate, test, and maintain. This violates single responsibility principle and increases the risk of merge conflicts.
 **Recommendation:**
 Split into smaller focused providers:
 - `MusicAssistantProvider` (core coordination)
 - `PlayerStateProvider` (player management)
 - `LibraryStateProvider` (library data)
 - `ConnectionProvider` (already exists but not fully utilized)
 **Impact:** High complexity, difficult onboarding, increased bug risk
 ---
 ### 1.2 Empty setState() Call
 **File:** `/home/chris/Ensemble/lib/screens/debug_log_screen.dart:367`
 **Severity:** Critical
 **Category:** Performance
 **Code:**
 ```dart
 onPressed: () {
  setState(() {});
  if (_scrollController.hasClients) {
    _scrollController.animateTo(...)
  }
 },
 ```
 **Description:**
 An empty setState() triggers a complete widget rebuild without any state changes, wasting CPU cycles.
 **Recommendation:**
 ```dart
 onPressed: () {
  if (_scrollController.hasClients) {
    _scrollController.animateTo(...)
  }
 },
 ```
 Or if state update is needed:
 ```dart
 onPressed: () {
  setState(() => _lastRefreshTime = DateTime.now());
  if (_scrollController.hasClients) {
    _scrollController.animateTo(...)
  }
 },
 ```
 ---
 ## 2. HIGH SEVERITY ISSUES
 ### 2.1 Timer Callback Without Mounted Check
 **File:** `/home/chris/Ensemble/lib/providers/sleep_timer_provider.dart:76-77`
 **Severity:** High
 **Category:** Performance/Stability
 **Code:**
 ```dart
 _sleepTimerDisplayTimer = Timer.periodic(const Duration(seconds: 1), (_) {
  notifyListeners(); // Update UI with remaining time
 });
 ```
 **Description:**
 Timer callback calls notifyListeners() without checking if the widget is still mounted. If the provider is disposed but timer fires, it could cause issues.
 **Recommendation:**
 Add a flag to track disposal state:
 ```dart
 bool _disposed = false;
 _sleepTimerDisplayTimer = Timer.periodic(const Duration(seconds: 1), (_) {
  if (!_disposed) {
    notifyListeners();
  }
 });
@override
 void dispose() {
  _disposed = true;
  _cancelInternal();
  super.dispose();
 }
 ```
 ---
 ### 2.2 Multiple .then() Chains (Should Use async/await)
 **Files:**
 - `/home/chris/Ensemble/lib/screens/playlist_details_screen.dart:598`
 - `/home/chris/Ensemble/lib/widgets/expandable_player.dart:468, 502, 521, 577, 601, 1644, 1773`
 - `/home/chris/Ensemble/lib/widgets/playlist_card.dart:258`
 - `/home/chris/Ensemble/lib/widgets/podcast_card.dart:264`
 - `/home/chris/Ensemble/lib/widgets/player/queue_panel.dart:212`
 - `/home/chris/Ensemble/lib/widgets/player/player_reveal_overlay.dart:83, 115, 191`
 - `/home/chris/Ensemble/lib/widgets/album_card.dart:335`
 - `/home/chris/Ensemble/lib/widgets/artist_card.dart:321`
 - `/home/chris/Ensemble/lib/screens/new_library_screen.dart:1213`
 **Severity:** High
 **Category:** Code Quality
 **Example:**
 ```dart
 // Current (.then pattern)
 maProvider.addTracksToQueue(player.playerId, _tracks).then((_) {
  if (mounted) {
    ScaffoldMessenger.of(context).showSnackBar(...);
  }
 });
 ```
 **Recommendation:**
 ```dart
 // Preferred (async/await)
 try {
  await maProvider.addTracksToQueue(player.playerId, _tracks);
  if (mounted) {
    ScaffoldMessenger.of(context).showSnackBar(...);
  }
 } catch (e) {
  // Handle error
 }
 ```
 **Impact:** async/await provides better error handling and readability
 ---
 ### 2.3 TODO Comments for Unimplemented Features
 **Files:**
 - `/home/chris/Ensemble/lib/providers/music_assistant_provider.dart:1418, 1424`
 - `/home/chris/Ensemble/lib/screens/audiobook_detail_screen.dart:351, 402`
 - `/home/chris/Ensemble/lib/screens/queue_screen.dart:283`
 **Severity:** Medium-High
 **Category:** Functionality
 **Description:**
 Important features are marked as TODO but not implemented:
 - Playlist modification functionality
 - Server-side audiobook progress updates
 - Queue item removal via API
 **Recommendation:**
 Create GitHub issues for these features and track implementation progress.
 ---
 ### 2.4 Unused Dependencies Detection
 **File:** `/home/chris/Ensemble/pubspec.yaml`
 **Severity:** High (if truly unused)
 **Category:** Bundle Size
 **Potential Unused Packages:**
 - `package_info_plus` (used in debug_logger.dart - ✅ KEEP)
 - `device_info_plus` (used in debug_logger.dart - ✅ KEEP)
 - `share_plus` (used in debug_log_screen.dart - ✅ KEEP)
 - `url_launcher` (used in settings_screen.dart - ✅ KEEP)
 **Conclusion:** All listed packages are actually in use. No action needed.
 ---
 ### 2.5 Duplicate Auth Token Logic
 **Files:**
 - `/home/chris/Ensemble/lib/services/secure_storage_service.dart`
 - `/home/chris/Ensemble/lib/services/auth/auth_manager.dart`
 - `/home/chris/Ensemble/lib/services/settings_service.dart` (not reviewed but mentioned in plan)
 **Severity:** High
 **Category:** Maintainability
 **Description:**
 Auth token storage exists in multiple places with slight variations:
 - `SecureStorageService` has `getAuthToken()`, `getMaAuthToken()`
 - `AuthManager` stores its own `_accessToken`, `_longLivedToken`
 - Potential for inconsistencies
 **Recommendation:**
 Consolidate to single source of truth - make AuthManager the only place tokens are stored in memory, with SecureStorageService only for persistence.
 ---
 ## 3. MEDIUM SEVERITY ISSUES
 ### 3.1 Hardcoded WebSocket Port
 **File:** `/home/chris/Ensemble/lib/constants/network.dart:6`
 **Severity:** Medium
 **Category:** Maintainability
 **Code:**
 ```dart
 static const int defaultWsPort = 8095;
 ```
 **Description:**
 Port is hardcoded in multiple places across the codebase.
 **Recommendation:**
 ✅ Already extracted to `NetworkConstants.defaultWsPort` - GOOD PRACTICE!
 However, the port is still hardcoded in:
 - `/home/chris/Ensemble/lib/services/auth/auth_manager.dart:182`
 - `/home/chris/Ensemble/lib/services/music_assistant_api.dart`
 **Fix:**
 Replace `port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095)` with:
 ```dart
 port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? NetworkConstants.defaultHttpsPort : NetworkConstants.defaultWsPort)
 ```
 ---
 ### 3.2 Timer Cleanup Issues
 **Files:**
 - `/home/chris/Ensemble/lib/services/sendspin_service.dart:646`
 - `/home/chris/Ensemble/lib/widgets/expandable_player.dart:2369, 349`
 - `/home/chris/Ensemble/lib/widgets/player/queue_panel.dart:562, 675`
 - `/home/chris/Ensemble/lib/screens/search_screen.dart:364`
 **Severity:** Medium
 **Category:** Memory Leaks
 **Description:**
 Multiple timers are created throughout the codebase. Need to verify all are properly cancelled in dispose().
 **Recommendation:**
 Audit each timer creation to ensure corresponding cancel() in dispose().
 ---
 ### 3.3 Deep Nesting in Detail Screens
 **Files:**
 - `/home/chris/Ensemble/lib/screens/artist_details_screen.dart`
 - `/home/chris/Ensemble/lib/screens/album_details_screen.dart`
 - `/home/chris/Ensemble/lib/screens/audiobook_detail_screen.dart`
 **Severity:** Medium
 **Category:** Code Quality
 **Description:**
 These screens have deeply nested code (4+ levels) making them harder to read and maintain.
 **Recommendation:**
 Extract nested logic into separate methods:
 ```dart
 // Instead of:
 void build() {
  if (condition) {
    if (another) {
      if (third) {
        // do something
      }
    }
  }
 }
 // Do:
 void build() {
  if (condition && another && third) {
    _doSomething();
  }
 }
 void _doSomething() {
  // logic here
 }
 ```
 ---
 ### 3.4 Potential Memory Leak - ImageStream Listeners
 **File:** `/home/chris/Ensemble/lib/widgets/expandable_player.dart:199`
 **Severity:** Medium
 **Category:** Memory Leaks
 **Code:**
 ```dart
 // Track active ImageStream listeners for proper cleanup on dispose
 final Map<ImageStream, ImageStreamListener> _activeImageStreams = {};
 ```
 **Description:**
 The code tracks image streams for cleanup, which is good practice. However, need to verify all listeners are properly removed.
 **Recommendation:**
 Ensure dispose() method includes:
 ```dart
 _activeImageStreams.forEach((stream, listener) => stream.removeListener(listener));
 _activeImageStreams.clear();
 ```
 ---
 ## 4. LOW SEVERITY ISSUES
 ### 4.1 Ignore Comments in Generated Files
 **Files:**
 - `/home/chris/Ensemble/lib/l10n/app_localizations_*.dart`
 **Severity:** Low
 **Category:** Code Quality
 **Description:**
 Generated localization files have `// ignore: unused_import` comments.
 **Recommendation:**
 This is acceptable for generated files. No action needed.
 ---
 ### 4.2 Debug Print Statements
 **File:** `/home/chris/Ensemble/lib/services/debug_logger.dart:77, 104`
 **Severity:** Low
 **Category:** Security (potential)
 **Code:**
 ```dart
 debugPrint(entry.formatted);
 debugPrint('Stack trace: $stackTrace');
 ```
 **Description:**
 Debug logger outputs to console. Need to verify no sensitive data (tokens, passwords) is logged.
 **Recommendation:**
 Add sanitization for sensitive data patterns:
 - Filter out auth tokens
 - Filter out passwords
 - Filter out API keys
 ---
 ## 5. SECURITY AUDIT
 ### 5.1 Credential Storage - ✅ SECURE
 **File:** `/home/chris/Ensemble/lib/services/secure_storage_service.dart`
 **Status:** PASS
 - Uses `flutter_secure_storage` with `encryptedSharedPreferences: true`
 - Proper error handling for decryption failures
 - Migration logic from SharedPreferences to secure storage
 - All sensitive data (tokens, passwords) stored securely
 ### 5.2 Network Security - ✅ GOOD
 **Files:**
 - `/home/chris/Ensemble/lib/services/music_assistant_api.dart`
 - `/home/chris/Ensemble/lib/services/sendspin_service.dart`
 - `/home/chris/Ensemble/lib/services/auth/auth_manager.dart`
 **Status:** PASS
 - Properly upgrades HTTP to HTTPS where applicable
 - WebSocket URL construction is secure
 - Token-based authentication
 - No hardcoded credentials found
 ### 5.3 Token Exposure Risk - ⚠️ REVIEW NEEDED
 **Files:** Multiple (logging statements)
 **Status:** NEEDS REVIEW
 - Debug logger may expose tokens in logs
 - Recommend adding token sanitization to logger
 ---
 ## 6. PERFORMANCE AUDIT
 ### 6.1 Provider Usage - ✅ GOOD
 **Pattern:** Mostly using `context.read<>` correctly
 **Status:** PASS
 - `context.read<>` used for method calls (correct)
 - `context.select<>` used where appropriate (expandable_player.dart:1796)
 - No obvious unnecessary rebuilds detected
 ### 6.2 State Management - ✅ GOOD
 **Status:** PASS
 - Provider pattern used consistently
 - ChangeNotifier properly implemented
 - dispose() methods properly cancel timers and close streams
 ### 6.3 Stream Subscriptions - ✅ GOOD
 **Files:** Multiple
 **Status:** PASS
 - All StreamSubscriptions are properly tracked
 - dispose() methods cancel subscriptions
 ---
 ## 7. DEPENDENCY AUDIT
 ### Package Health Check
 | Package | Version | Status | Notes |
 |---------|---------|--------|-------|
 | flutter_secure_storage | 9.2.2 | ✅ Current | Good |
 | provider | 6.1.1 | ✅ Current | Good |
 | drift | 2.22.0 | ✅ Current | Good |
 | just_audio | 0.9.36 | ✅ Current | Good |
 | audio_service | 0.18.12 | ⚠️ Check | May have updates |
 | cached_network_image | 3.3.1 | ✅ Current | Good |
 | web_socket_channel | 2.4.0 | ⚠️ Check | May have updates |
 **Recommendation:** Run `flutter pub outdated` to check for available updates.
 ---
 ## 8. ARCHITECTURE ASSESSMENT
 ### 8.1 Strengths
 - ✅ Clear separation of concerns (services, providers, screens, widgets)
 - ✅ Consistent state management with Provider
 - ✅ Proper use of secure storage
 - ✅ Comprehensive dispose() cleanup
 - ✅ Good error handling in most places
 ### 8.2 Areas for Improvement
 - ⚠️ Main provider file too large (6,180 lines)
 - ⚠️ Some duplicate auth logic
 - ⚠️ Deep nesting in detail screens
 - ⚠️ .then() chains should be async/await
 ### 8.3 Recommended Refactoring
 1. Split `MusicAssistantProvider` into smaller focused providers
 2. Consolidate auth token management
 3. Reduce nesting in detail screens
 4. Convert .then() chains to async/await
 5. Add token sanitization to logger
 ---
 ## 9. PRIORITIZED REMEDIATION PLAN
 ### Phase 1: Critical Fixes (1-2 days)
 1. Fix empty setState() in debug_log_screen.dart
 2. Add disposed flag to SleepTimerProvider
 ### Phase 2: High Priority (1 week)
 1. Convert all .then() chains to async/await
 2. Consolidate auth token logic
 3. Add token sanitization to debug logger
 ### Phase 3: Medium Priority (2-3 weeks)
 1. Split MusicAssistantProvider into smaller providers
 2. Reduce nesting in detail screens
 3. Verify all timers are properly cancelled
 4. Update outdated dependencies
 ### Phase 4: Low Priority (Ongoing)
 1. Implement TODO features (playlist modification, etc.)
 2. Add unit tests for critical paths
 3. Set up dependency update automation
 ---
 ## 10. FILES REQUIRING IMMEDIATE ATTENTION
 | File | Issue | Severity | Lines |
 |------|-------|----------|-------|
 | music_assistant_provider.dart | Too large | Critical | 6180 |
 | sleep_timer_provider.dart:76 | No mounted check | High | 76-77 |
 | debug_log_screen.dart:367 | Empty setState | Critical | 367 |
 | playlist_details_screen.dart:598 | .then() chain | High | 598 |
 ---
 ## 11. CONCLUSION
 The Ensemble codebase is **well-structured and secure** with good practices for:
 - Secure credential storage
 - Proper resource cleanup
 - State management
 The main areas for improvement are:
 1. File size (need to split the main provider)
 2. Code modernization (async/await instead of .then())
 3. Some timer safety checks
 Overall, this is a **healthy codebase** that would benefit from focused refactoring rather than major restructuring.
 ---
 **Report End**
@@ -0,0 +1,212 @@
 # Multi-Provider Split Plan
 ## Current Status (2026-02-07)
 ### Completed
 | Provider | Lines | File | Status |
 |----------|-------|------|--------|
 | ConnectionProvider | 245 | lib/providers/connection_provider.dart | ✅ Created |
 | UIStateProvider | 167 | lib/providers/ui_state_provider.dart | ✅ Created & Committed |
 | LibraryProvider | 290 | lib/providers/library_provider.dart | ✅ Created & Committed |
 | PlayerProvider | 589 | lib/providers/player_provider.dart | ✅ Created & Integrated |
 | LocalPlayerProvider | 370 | lib/providers/local_player_provider.dart | ✅ Created & Integrated |
 **Main Provider: 5928 lines** (down from 6180 original)
 ### Integration Status
 ✅ **Phase 1 Complete**: All 5 providers created
 ✅ **Phase 2 Complete**: Integration into main.dart completed
 - All providers added to MultiProvider tree
 - Shared services (CacheService, PositionTracker, ImageHelperService) properly initialized
 - QueueManagerService circular dependency resolved
 - Build successful (debug APK tested)
 ✅ **Critical Bug Fixed**: Red screen after login resolved (commit: ebf4e53)
 - Fixed setState during build error in LibraryStatusMixin (using Future.microtask)
 - Fixed context.select inside PageView.builder error (replaced with context.watch)
 ### Remaining Work
 | Task | Complexity | Notes |
 |------|------------|-------|
 | Update MusicAssistantProvider facade | Medium | Accept providers in constructor, delegate methods |
 | Migrate consumers incrementally | High | Start with less critical screens |
 | Remove facade when complete | Low | After all consumers migrated |
 ---
 ## Architecture Overview
 ```
 ┌─────────────────────────────────────────────────────────────────────┐
 │                      MusicAssistantProvider                         │
 │                      (Facade - during transition)                   │
 │                                                                     │
 │  ┌───────────────────────────────────────────────────────────────┐  │
 │  │  Delegates to sub-providers:                                  │  │
 │  │  • ConnectionProvider - connect/disconnect, auth              │  │
 │  │  • UIStateProvider - search, filters, loading state            │  │
 │  │  • LibraryProvider - artists, albums, tracks, podcasts        │  │
 │  │  • PlayerProvider - player selection, controls, queue (TODO)  │  │
 │  │  • LocalPlayerProvider - local audio engine (TODO)            │  │
 │  └───────────────────────────────────────────────────────────────┘  │
 └─────────────────────────────────────────────────────────────────────┘
 ```
 ---
 ## Next Steps
 ### Phase 1: Complete Provider Creation (Current)
 1. **Create PlayerProvider** (~800 lines)
   - Extract player selection and switching logic
   - Extract play/pause/stop/seek controls
   - Extract queue management
   - Extract sleep timer functionality
 2. **Create LocalPlayerProvider** (~500 lines)
   - Extract local audio playback engine
   - Extract Sendspin integration
   - Extract player registration
   - Extract volume and power control
 ### Phase 2: Integration
 3. **Update main.dart**
   - Add all providers to MultiProvider
   - Keep MusicAssistantProvider as facade initially
 4. **Migrate one consumer at a time**
   - Start with less critical screens
   - Test thoroughly after each migration
   - Use facade to maintain compatibility during transition
 5. **Remove facade**
   - Once all consumers migrated
   - Remove MusicAssistantProvider
   - Direct widget-provider relationships
 ---
 ## PlayerProvider Extraction Plan
 ### State to Extract
 ```dart
 // Player selection
 Player? _selectedPlayer;
 List<Player> _availablePlayers = [];
 Map<String, String> _castToSendspinIdMap = {};
 // Current playback
 Track? _currentTrack;
 Audiobook? _currentAudiobook;
 String? _currentPodcastName;
 // Sleep timer
 Timer? _sleepTimer;
 DateTime? _sleepTimerEndTime;
 int? _sleepTimerMinutes;
 Timer? _sleepTimerDisplayTimer;
 // Timers
 Timer? _playerStateTimer;
 Timer? _notificationPositionTimer;
 Timer? _idleServiceTimer;
 // Position tracking
 PositionTracker _positionTracker;
 ```
 ### Methods to Extract
 ```dart
 // Player selection
 Future<void> _loadAndSelectPlayers({bool forceRefresh, bool coldStart});
 Future<void> selectPlayer(Player player, {bool? sendToSendspin});
 // Playback controls
 Future<void> playPause();
 Future<void> stop();
 Future<void> nextTrack();
 Future<void> previousTrack();
 Future<void> seek(Duration position);
 Future<void> setVolume(String playerId, int volumeLevel);
 // Queue management
 Future<PlayerQueue?> getQueue(String playerId);
 Future<void> playTracks(String playerId, List<Track> tracks, {int? startIndex});
 // Sleep timer
 Future<void> setSleepTimer(int minutes);
 Future<void> cancelSleepTimer();
 ```
 ### Dependencies to Inject
 - MusicAssistantAPI
 - DatabaseService
 - SettingsService
 - QueueManagerService
 - PositionTracker
 - PlayerSyncState
 - AudioHandler (from audio_service)
 ---
 ## Estimated Timeline
 | Task | Time | Notes |
 |------|------|-------|
 | Create PlayerProvider | 2-3 hours | Complex, many dependencies |
 | Create LocalPlayerProvider | 2-3 hours | Sendspin integration is complex |
 | Integration & Testing | 3-4 hours | Update main.dart, migrate consumers |
 | Bug Fixes | 1-2 hours | Edge cases in player switching |
 **Total: ~8-12 hours of focused development**
 ---
 ## Risk Mitigation
 1. **Keep facade during transition** - Maintain backward compatibility
 2. **Migrate incrementally** - One screen/consumer at a time
 3. **Test on device** - Test player controls thoroughly
 4. **Commit frequently** - Each provider as it's completed
 5. **Keep backup** - Can revert to monolithic provider if needed
 ---
 ## Success Criteria
 - [ ] All 5 providers created and building
 - [ ] Main.dart updated with all providers
 - [ ] At least 3 screens migrated to new providers
 - [ ] Player controls working correctly on device
 - [ ] No regressions in core functionality
 - [ ] Main provider reduced to < 1000 lines (or removed)
 ---
 ## Files Created So Far
 ```
 lib/providers/
 ├── connection_provider.dart   (245 lines)  ✅
 ├── ui_state_provider.dart      (167 lines)  ✅
 ├── library_provider.dart       (290 lines)  ✅
 ├── player_provider.dart        (TODO)       ⏳
 └── local_player_provider.dart  (TODO)       ⏳
 ```
 ---
 ## Notes from Analysis
 1. **Player selection logic is complex** - Involves Cast-to-Sendspin mapping, filtering, smart sorting
 2. **Sendspin integration is tricky** - Need to handle both MA 2.7.0+ (Sendspin) and older versions
 3. **Queue management already extracted** - QueueManagerService handles most queue logic
 4. **Position tracking is separate** - PositionTracker service handles interpolation
 5. **Event handlers need coordination** - Player events update both provider and position tracker
@@ -1,6 +1,11 @@
 <div align="center">
  <img src="assets/images/ensemble_logo.png" alt="Ensemble Logo" height="200">
  [![GitHub release](https://img.shields.io/github/v/release/CollotsSpot/Ensemble?style=for-the-badge&logo=github)](https://github.com/CollotsSpot/Ensemble/releases)
  [![License: MIT](https://img.shields.io/badge/License-MIT-purple.svg?style=for-the-badge)](https://opensource.org/licenses/MIT)
  [![GitHub Sponsors](https://img.shields.io/badge/Sponsor-GitHub-EA4AAA?style=for-the-badge&logo=GitHub%20Sponsors&logoColor=white)](https://github.com/sponsors/CollotsSpot)
  [![Ko-fi](https://img.shields.io/badge/Ko--fi-FF5E5B?style=for-the-badge&logo=Ko-fi&logoColor=white)](https://ko-fi.com/collotsspot)
 ---
  <p><strong>An unofficial mobile client for Music Assistant</strong></p>
@@ -17,47 +22,75 @@ This application was built with AI-assisted development using **Claude Code** an
 ---
 ## Also See
 **[Ensemble TV](https://github.com/CollotsSpot/ensemble-tv)** - A simple Android TV client for Music Assistant that displays what's currently playing on your TV with remote control support.
 ---
 ## Features
 ### Local Playback
- **Stream to Your Phone** - Play music from your Music Assistant library directly on your mobile device
+- **Stream to Your Phone** - Play music from your Music Assistant library directly on your mobile device via Sendspin protocol
 - **Background Playback** - Music continues playing when the app is minimized
 - **Media Notifications** - Control playback from your notification shade with album art display
 - **Instant Response** - Pause/resume in ~300ms
 ### Remote Control
 - **Multi-Player Support** - Control any speaker or device connected to Music Assistant
- **Device Selector** - Quickly switch between your phone and other players
+- **Device Selector** - Swipe down on mini player to reveal all your devices
 - **Multi-Room Grouping** - Long-press any player to sync it with the current player
 - **Full Playback Controls** - Play, pause, skip, seek, and adjust volume
- **Queue Management** - View and manage the playback queue
+- **Volume Precision Mode** - Hold the volume slider for fine-grained control with haptic feedback
 - **Power Control** - Turn players on/off directly from the mini player
 ### Queue Management
 - **View & Manage Queue** - See upcoming tracks in the playback queue
 - **Drag to Reorder** - Instant drag handles for reordering tracks
 - **Swipe left to Delete** - Remove tracks with a simple swipe gesture
 - **Swipe right to play next** - Move tracks with a simple swipe gesture
 ### Home Screen
- **Customizable Rows** - Toggle Recently Played, Discover Artists, and Discover Albums
+- **Customizable Rows** - Toggle and reorder: Recently Played, Discover Artists, Discover Albums
- **Favorites Rows** - Optional rows for Favorite Albums, Artists, and Tracks
+- **Favorites Rows** - Optional rows for Favorite Albums, Artists, Tracks, Playlists, and Radio Stations
 - **Adaptive Layout** - Rows scale properly for different screen sizes and aspect ratios
 - **Pull to Refresh** - Refresh content with a simple pull gesture
-### Library Browsing
+### Library
- **Browse Your Collection** - Artists, albums, playlists, and tracks from all your music sources
+- **Music** - Browse artists, albums, playlists, and tracks from all your music sources
 - **Radio Stations** - Browse and play radio stations with list or grid view
 - **Podcasts** - Browse podcasts, view episodes with descriptions and publish dates
 - **Audiobooks** - Browse by title, series, or author with progress tracking
 - **Favorites Filter** - Toggle to show only your favorite items
- **Album Details** - View track listings with artwork
+- **Providers Filter** - Toggle to show only specific provider items
- **Artist Details** - View artist albums and top tracks
+- **Letter Scrollbar** - Fast navigation through long lists
- **Playlist Support** - Browse and play your playlists
+- **Provider Icons** - Provider icons on library covers
- **Search** - Find music across your entire library
+
 ### Search
 - **Universal Search** - Find music, podcasts, radio stations, playlists, and audiobooks
 - **Fuzzy Matching** - Typo-tolerant search (e.g., "beetles" finds "Beatles")
 - **Smart Scoring** - Results ranked by relevance with colored type indicators
 - **Search History** - Quickly access your recent searches
 - **Quick Actions** - Long-press any result to add to queue or play next
 ### Audiobooks
 - **Audiobooks Tab** - Browse your audiobook library with grid/list view options
 - **Series Support** - View audiobooks organized by series with collage cover art
 - **Author Browsing** - Browse audiobooks by author
 - **Chapter Navigation** - Jump between chapters with timestamp display
 - **Progress Tracking** - Track your listening progress across sessions
 - **Continue Listening** - Pick up where you left off
 - **Mark as Finished/Unplayed** - Manage your reading progress
 - **Series Support** - View audiobooks organized by series with collage cover art
 ### Podcasts
 - **Episode Browser** - View full episode list with artwork and descriptions
 - **Skip Controls** - Skip forward/backward during playback
 - **High-Resolution Artwork** - Fetched via iTunes for best quality
 ### Smart Features
 - **Instant App Restore** - App loads instantly with cached library data while syncing in background
 - **Auto-Reconnect** - Automatically reconnects when connection is lost
 - **Offline Browsing** - Browse your cached library even when disconnected
 - **Hero Animations** - Smooth transitions between screens
 - **Welcome Screen** - Guided onboarding for first-time users
 ### Theming
 - **Material You** - Dynamic theming based on your device's wallpaper
@@ -67,14 +100,18 @@ This application was built with AI-assisted development using **Claude Code** an
 ## Screenshots
 <div align="center">
-  <img src="assets/screenshots/1.png?v=2" alt="Connection Screen" width="150">
+  <img src="assets/screenshots/1.png?v=4" alt="Screenshot 1" width="150">
-  <img src="assets/screenshots/2.png?v=2" alt="Home Screen" width="150">
+  <img src="assets/screenshots/2.png?v=4" alt="Screenshot 2" width="150">
-  <img src="assets/screenshots/3.png?v=2" alt="Album Details" width="150">
+  <img src="assets/screenshots/3.png?v=4" alt="Screenshot 3" width="150">
-  <img src="assets/screenshots/4.png?v=2" alt="Now Playing" width="150">
+  <img src="assets/screenshots/4.png?v=4" alt="Screenshot 4" width="150">
-  <img src="assets/screenshots/5.png?v=2" alt="Queue" width="150">
+  <img src="assets/screenshots/5.png?v=4" alt="Screenshot 5" width="150">
-  <img src="assets/screenshots/6.png?v=2" alt="Settings" width="150">
+  <img src="assets/screenshots/6.png?v=4" alt="Screenshot 6" width="150">
-  <img src="assets/screenshots/7.png?v=2" alt="Audiobooks" width="150">
+  <img src="assets/screenshots/7.png?v=4" alt="Screenshot 7" width="150">
-  <img src="assets/screenshots/8.png?v=2" alt="Audiobook Player" width="150">
+  <img src="assets/screenshots/8.png?v=4" alt="Screenshot 8" width="150">
  <img src="assets/screenshots/9.png?v=4" alt="Screenshot 9" width="150">
  <img src="assets/screenshots/10.png?v=4" alt="Screenshot 10" width="150">
  <img src="assets/screenshots/11.png?v=4" alt="Screenshot 11" width="150">
  <img src="assets/screenshots/12.png?v=4" alt="Screenshot 12" width="150">
 </div>
 ## Download
@@ -84,26 +121,32 @@ Download the latest release from the [Releases page](https://github.com/CollotsS
 ## Setup
 1. Launch the app
-2. Enter your Music Assistant server URL (e.g., `music.example.com` or `192.168.1.100`)
+2. Enter your Music Assistant server URL
 3. Connect to your server
-4. Start playing! Music plays on your phone by default, or tap the device icon to choose a different player.
+4. Start playing! Music plays on your phone by default, or swipe down on the mini player to choose a different player.
-## Authentication
+### Finding Your Server URL
-Ensemble supports multiple authentication methods:
+**Important:** You need the **Music Assistant** URL, not your Home Assistant URL.
-| Method | Status |
+To find the correct URL:
-|--------|--------|
+1. Open Music Assistant web UI
-| Music Assistant native auth | Tested |
+2. Go to **Settings** > **About**
-| No authentication | Tested |
+3. Look for **Base URL** (e.g., `http://192.168.1.100:8095`)
 | Authelia | Implemented, not recently tested |
 | HTTP Basic Auth | Implemented, not recently tested |
-**Note:** Development and testing is done against Music Assistant beta with native authentication enabled.
+### Home Assistant Add-on Users
 If you run Music Assistant as a Home Assistant add-on:
 - Use the IP address of your Home Assistant server
 - Do **not** use your Home Assistant URL or ingress URL
 ### Remote Access
 For access outside your home network, you'll need to expose Music Assistant through a reverse proxy (e.g., Traefik, Nginx Proxy Manager, Cloudflare Tunnel).
 ## Requirements
- Music Assistant server (v2.7.0 beta 20 or later)
+- Music Assistant server (v2.7.0 beta 20 or later recommended)
 - Network connectivity to your Music Assistant server
 - Android device (Android 5.0+)
 - Audiobookshelf provider configured in Music Assistant (for audiobook features)
@@ -0,0 +1,78 @@
 # Release Notes Draft
 ## v2.9.2-beta (TBD)
 ### New Features
 #### Context Menus
 - **Long-press context menus on all media items**: Albums, artists, tracks, playlists, podcasts, and radio stations now all support long-press to show a context menu with Play, Add to Library, and Favorite options.
 #### Podcasts
 - **Podcast episode detail screen**: Tap "View Details" from episode context menu to see full scrollable description, publish date, duration, with Play, Play On, and Add to Queue actions.
 - **Episode sorting**: Sort podcast episodes by newest first, oldest first, alphabetical, or duration.
 #### Audio Quality
 - **Hi-res audio badge**: Track listings now show a hi-res badge when high quality audio is available.
 ### Improvements
 #### UI/UX
 - **New library icon**: Replaced confusing library icon with clearer book icon (book_2) across bottom nav, search filter, detail screens, and context menus. Filled when in library, outlined when not.
 - **Player selector**: Replaced popup dialog with player select overlay for queue actions.
 - **Search library filter**: Filled icon indicates active filter state without background highlight.
 - **Context menu polish**: Slightly larger buttons (46px), wider menu (185px), consistent text colors that don't pick up adaptive theming.
 - **Navigation transitions**: Smoother fade/slide animations between screens.
 - **Hero animations**: Podcast episode images animate smoothly to detail screen.
 #### Performance
 - **Library list optimization**: Standardized list item heights with itemExtent, reduced image cache sizes for smoother scrolling.
 - **Palette extraction**: Moved to isolate for better UI responsiveness during color extraction.
 - **Provider selects**: Optimized provider state watching to reduce unnecessary rebuilds.
 ### Bug Fixes
 #### Audiobooks
 - **Fixed audiobooks not loading after provider re-add**: When removing and re-adding an AudiobookShelf provider, the app would show 0 audiobooks because saved library paths referenced the old provider instance ID. Now automatically clears stale settings and falls back to the library_items API.
 - **Fixed duplicate provider filter options**: After re-adding a provider, two entries for the same provider could appear in the library filter menu. Now deduplicates providers by name, keeping the one with more items.
 - **Fixed multiple accounts of same service not showing**: When you have multiple accounts of the same service (e.g., two Spotify accounts for different family members), only one would appear in the library menu provider toggles. Now all accounts with distinct names are shown.
 - **Fixed audiobook year sorting**: Sort by year now works correctly for audiobooks. Fixed two issues:
  - Year data is now properly extracted from ABS's `metadata.release_date` field (handles both "2024" and "2024-01-15" formats)
  - Sort handler now properly supports ascending and descending year sorts
 #### Library Sorting
 - **Fixed letter scrollbar showing irrelevant letters**: When sorting by date or play count, the scrollbar popup now hides instead of showing meaningless letters. Shows contextual info based on sort type (letters for alphabetical, years for year sort, hidden for date/count sorts).
 - **Fixed sorting not working for date added, last played, play count**: These sort options now correctly preserve server-side sorting instead of re-sorting alphabetically on the client. Affected albums, artists, and tracks tabs.
 - **Fixed playlists sorting**: Modified, last played, and play count sorting now works for playlists by properly requesting sorted data from the server.
 - **Fixed ascending/descending not working**: Sort direction now properly applies for all sort types across albums, artists, playlists, and audiobooks.
 - **Fixed list not updating when sort order changes**: Added sort order to ListView/GridView keys to force UI rebuilds when changing sort direction.
 #### Provider Management
 - **Fixed stale provider IDs persisting in settings**: When toggling providers, stale provider instance IDs (from removed providers) are now automatically cleaned up from saved settings.
 #### Playback
 - **Fixed Spotify external source detection** (issue #27): Properly detects when Spotify is the music provider.
 - **Fixed foreground service not stopping** (issue #51): Auto-stops after 30 minutes idle.
 - **Fixed Sendspin proxy auth**: Now works correctly for local network connections.
 #### UI Fixes
 - **Fixed nav bar hidden when no player selected**: Navigation bar now always visible.
 - **Fixed Flutter 3.38 slider grey rectangles**: Volume and seek sliders render correctly.
 - **Fixed library tab scroll position**: Maintains position when switching tabs.
 ### Technical Changes
 - Flutter 3.38 compatibility
 - Simplified authentication using MA built-in auth
 - Added `material_symbols_icons` package for book_2 icon
 - Added `ScrollbarDisplayMode` enum (`letter`, `year`, `count`, `none`) for contextual scrollbar popups
 - Added `updateCachedAlbums()`, `updateCachedArtists()`, `updateCachedPlaylists()` methods to SyncService for proper cache synchronization with sorted data
 - Provider filter now validates against available providers when toggling, not just on initial load
 - Removed Selector caching from albums and artists tabs to ensure proper rebuilds when source tracking updates
 - Options menu provider toggles now use Consumer to watch Provider state directly
 - Centralized player selector logic in GlobalPlayerOverlay.showPlayerSelectorForAction()
@@ -29,8 +29,8 @@ if (keystorePropertiesFile.exists()) {
 }
 android {
-    namespace "com.musicassistant.music_assistant"
+    namespace "com.collotsspot.ensemble"
-    compileSdk 35
+    compileSdk 36
    ndkVersion flutter.ndkVersion
    compileOptions {
@@ -58,8 +58,8 @@ android {
    }
    defaultConfig {
-        applicationId "com.musicassistant.music_assistant"
+        applicationId "com.collotsspot.ensemble"
-        minSdk 21
+        minSdkVersion flutter.minSdkVersion
        targetSdk 35
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
@@ -70,6 +70,11 @@ android {
            signingConfig keystorePropertiesFile.exists() ? signingConfigs.release : signingConfigs.debug
        }
    }
    dependenciesInfo {
        includeInApk = false
        includeInBundle = false
    }
 }
 flutter {
@@ -1,5 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-permission android:name="android.permission.INTERNET"/>
    <queries>
        <intent>
            <action android:name="android.intent.action.VIEW" />
            <data android:scheme="https" />
        </intent>
    </queries>
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.WAKE_LOCK"/>
@@ -11,6 +17,7 @@
        android:label="Ensemble"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
        android:appCategory="audio"
        android:usesCleartextTraffic="true"
        android:networkSecurityConfig="@xml/network_security_config">
        <activity
@@ -1,4 +1,4 @@
-package com.musicassistant.music_assistant
+package com.collotsspot.ensemble
 import android.util.Log
 import android.view.KeyEvent
@@ -10,7 +10,7 @@ import io.flutter.plugin.common.MethodChannel
 // while also intercepting volume button events
 class MainActivity: AudioServiceActivity() {
    private val TAG = "EnsembleVolume"
-    private val CHANNEL = "com.musicassistant.music_assistant/volume_buttons"
+    private val CHANNEL = "com.collotsspot.ensemble/volume_buttons"
    private var methodChannel: MethodChannel? = null
    private var isListening = false
@@ -0,0 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
  <background android:drawable="@color/ic_launcher_background"/>
  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <color name="launch_background_color">#1a1a1a</color>
-</resources>
+	<color name="ic_launcher_background">#1a1a1a</color>
 </resources>
@@ -1,12 +1,15 @@
 buildscript {
-    ext.kotlin_version = '1.9.10'
+    ext.kotlin_version = '2.1.0'
    repositories {
        google()
        // Use Maven Central mirrors as fallback for 403 errors
        maven { url 'https://maven.aliyun.com/repository/central' }
        maven { url 'https://maven.aliyun.com/repository/google' }
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.9.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }
@@ -14,6 +17,9 @@ buildscript {
 allprojects {
    repositories {
        google()
        // Use Maven Central mirrors as fallback for 403 errors
        maven { url 'https://maven.aliyun.com/repository/central' }
        maven { url 'https://maven.aliyun.com/repository/google' }
        mavenCentral()
    }
 }
@@ -0,0 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
@@ -0,0 +1,37 @@
 // Force all repositories to use mirrors first
 allprojects {
    repositories {
        all { ArtifactRepository repo ->
            if (repo instanceof MavenArtifactRepository) {
                def url = repo.url.toString()
                if (url.contains('repo.maven.apache.org') || url.contains('repo1.maven.org')) {
                    remove repo
                }
            }
        }
        // Add mirrors before Maven Central
        maven { url 'https://maven.aliyun.com/repository/central' }
        maven { url 'https://maven.aliyun.com/repository/google' }
        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
        maven { url 'https://maven.aliyun.com/repository/public' }
    }
 }
 settingsEvaluated { settings ->
    settings.pluginManagement {
        repositories {
            all { ArtifactRepository repo ->
                if (repo instanceof MavenArtifactRepository) {
                    def url = repo.url.toString()
                    if (url.contains('repo.maven.apache.org') || url.contains('repo1.maven.org')) {
                        remove repo
                    }
                }
            }
            maven { url 'https://maven.aliyun.com/repository/central' }
            maven { url 'https://maven.aliyun.com/repository/google' }
            maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
            maven { url 'https://maven.aliyun.com/repository/public' }
        }
    }
 }
@@ -22,8 +22,8 @@ pluginManagement {
 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
+    id "com.android.application" version "8.9.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 include ":app"
@@ -0,0 +1,336 @@
 # Per-Provider Sync Implementation
 ## Date: January 17, 2026
 ## Overview
 This document details the implementation of per-provider sync with source tracking, enabling instant client-side filtering that properly differentiates between multiple accounts of the same provider type (e.g., two different Spotify accounts).
 ## Problem Statement
 ### The Core Issue
 When a user has multiple accounts of the same provider type (e.g., two Spotify accounts: "Chris Laycock" and "Bababagoly"), the existing provider filter couldn't differentiate between them.
 **Why?** Music Assistant's `provider_mappings` field on media items shows which providers **CAN PLAY** an item, not which provider **ADDED** it. When both Spotify accounts can play the same artist, both appear in `provider_mappings`, making client-side filtering impossible.
 ### Previous Approach (Failed)
 The initial implementation tried to filter client-side using `provider_mappings`:
 ```dart
 bool isItemAllowedByProviderFilter(MediaItem item) {
  final mappings = item.providerMappings;
  for (final mapping in mappings) {
    if (_providerFilter.contains(mapping.providerInstance)) {
      return true;
    }
  }
  return false;
 }
 ```
 **Result:** Both Spotify accounts showed the same items because `provider_mappings` contained both account IDs for shared content.
 ### Race Condition Issue
 Additionally, when rapidly toggling providers, a race condition occurred:
 1. User toggles Provider A off
 2. Sync starts for remaining providers
 3. User toggles Provider B off before sync completes
 4. First sync completes with wrong filter state
 5. UI shows incorrect results
 ## Solution: Per-Provider Sync with Source Tracking
 ### Concept
 Instead of relying on `provider_mappings`, we:
 1. **Sync each provider separately** using the MA API's `provider` parameter
 2. **Tag each item** with which provider instance(s) returned it
 3. **Store source tracking** in the local database
 4. **Filter client-side** using the source tracking data (instant)
 5. **Background sync** keeps data fresh without blocking UI
 ### Why This Works
 When we call the MA API with `provider: ["spotify--RKnr3jKx"]`, the server returns **only items from that specific account's library**. By syncing each provider separately and remembering which provider returned each item, we can accurately filter.
 ## Implementation Details
 ### 1. Database Schema Update
 **File:** `lib/database/database.dart`
 Added `sourceProviders` column to `LibraryCache` table:
 ```dart
 class LibraryCache extends Table {
  // ... existing columns ...
  /// Provider instance IDs that provided this item (JSON array)
  /// Used for client-side filtering by source provider
  TextColumn get sourceProviders => text().withDefault(const Constant('[]'))();
 }
 ```
 **Schema version:** 5 → 6
 **Migration:**
 ```dart
 if (from < 6) {
  await customStatement(
    "ALTER TABLE library_cache ADD COLUMN source_providers TEXT NOT NULL DEFAULT '[]'"
  );
 }
 ```
 ### 2. Database Service Updates
 **File:** `lib/services/database_service.dart`
 Added `sourceProvider` parameter to `cacheItem()`:
 ```dart
 Future<void> cacheItem<T>({
  required String itemType,
  required String itemId,
  required Map<String, dynamic> data,
  String? sourceProvider,  // NEW: tracks which provider this item came from
 })
 ```
 Added new method to retrieve items with source tracking:
 ```dart
 Future<List<(Map<String, dynamic>, List<String>)>> getCachedItemsWithProviders(String itemType)
 ```
 Returns tuples of `(itemData, sourceProviderIds)`.
 ### 3. SyncService Rewrite
 **File:** `lib/services/sync_service.dart`
 #### New Fields
 ```dart
 // Source provider tracking for client-side filtering
 Map<String, List<String>> _albumSourceProviders = {};
 Map<String, List<String>> _artistSourceProviders = {};
 Map<String, List<String>> _audiobookSourceProviders = {};
 Map<String, List<String>> _playlistSourceProviders = {};
 ```
 #### Per-Provider Sync Logic
 ```dart
 Future<void> syncFromApi(MusicAssistantAPI api, {
  bool force = false,
  List<String>? providerInstanceIds,
 }) async {
  // If specific providers are requested, sync each separately
  if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
    for (final providerId in providerInstanceIds) {
      // Fetch from this specific provider
      final results = await Future.wait([
        api.getAlbums(limit: 1000, providerInstanceIds: [providerId]),
        api.getArtists(limit: 1000, providerInstanceIds: [providerId]),
        // ... etc
      ]);
      // Track source provider for each item
      for (final album in albums) {
        albumMap[album.itemId] = album;
        _albumSourceProviders.putIfAbsent(album.itemId, () => []);
        if (!_albumSourceProviders[album.itemId]!.contains(providerId)) {
          _albumSourceProviders[album.itemId]!.add(providerId);
        }
      }
    }
  }
 }
 ```
 #### Client-Side Filtering Methods
 ```dart
 /// Filter albums by source provider (instant, no network)
 List<Album> getAlbumsFilteredByProviders(Set<String> enabledProviderIds) {
  if (enabledProviderIds.isEmpty || _albumSourceProviders.isEmpty) {
    return _cachedAlbums;
  }
  return _cachedAlbums.where((album) {
    final sources = _albumSourceProviders[album.itemId];
    if (sources == null || sources.isEmpty) return true; // No tracking = show
    return sources.any((s) => enabledProviderIds.contains(s));
  }).toList();
 }
 // Similar methods for artists, audiobooks, playlists
 ```
 ### 4. Library Screen Updates
 **File:** `lib/screens/new_library_screen.dart`
 #### Hybrid Provider Toggle Handler
 ```dart
 void _handleProviderToggle(String providerId, bool enabled) {
  final maProvider = context.read<MusicAssistantProvider>();
  // Instant UI update via global provider toggle
  maProvider.toggleProviderEnabled(providerId, enabled);
  setState(() {}); // Rebuild with client-side filtering
  // Background sync after 1.5s debounce
  _providerFilterDebounce?.cancel();
  _providerFilterDebounce = Timer(const Duration(milliseconds: 1500), () async {
    if (mounted) {
      await maProvider.forceLibrarySync();
      if (mounted) setState(() {});
    }
  });
 }
 ```
 #### Updated Tab Builders
 Artists tab now uses source tracking:
 ```dart
 Widget _buildArtistsTab(BuildContext context, S l10n) {
  return Selector<MusicAssistantProvider, (List<Artist>, bool, Set<String>)>(
    selector: (_, provider) => (
      provider.artists,
      provider.isLoading,
      provider.enabledProviderIds.toSet()
    ),
    builder: (context, data, _) {
      final (allArtists, isLoading, enabledProviders) = data;
      // Client-side filtering using SyncService source tracking
      final syncService = SyncService.instance;
      final filteredArtists = syncService.hasSourceTracking && enabledProviders.isNotEmpty
          ? syncService.getArtistsFilteredByProviders(enabledProviders)
          : allArtists;
      // ... rest of build
    },
  );
 }
 ```
 Similar updates for albums, playlists, and audiobooks tabs.
 ### 5. Provider Instance Model
 **File:** `lib/models/provider_instance.dart` (new file)
 ```dart
 class ProviderInstance {
  final String instanceId;  // e.g., "spotify--abc123"
  final String domain;      // e.g., "spotify"
  final String name;        // e.g., "Spotify (John's Account)"
  final bool available;
  /// Known music provider domains
  static const Set<String> musicProviderDomains = {
    'spotify', 'tidal', 'qobuz', 'deezer', 'ytmusic', 'soundcloud',
    'apple_music', 'amazon_music', 'plex', 'subsonic', 'opensubsonic',
    'jellyfin', 'emby', 'navidrome', 'audiobookshelf', 'filesystem',
    'tunein', 'radiobrowser', 'snapcast', 'fully_kiosk',
  };
  bool get isMusicProvider => musicProviderDomains.contains(domain);
 }
 ```
 ## Data Flow
 ```
 ┌─────────────────────────────────────────────────────────────────┐
 │                     User Toggles Provider                        │
 └─────────────────────────────────────────────────────────────────┘
                                │
                                ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │  1. MusicAssistantProvider.toggleProviderEnabled()              │
 │     - Updates enabledProviderIds                                │
 │     - Triggers setState() for instant UI update                 │
 └─────────────────────────────────────────────────────────────────┘
                                │
                                ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │  2. UI Rebuilds Immediately                                     │
 │     - Selector detects enabledProviderIds change                │
 │     - Calls SyncService.getArtistsFilteredByProviders()         │
 │     - Filters using source tracking (instant, no network)       │
 └─────────────────────────────────────────────────────────────────┘
                                │
                                ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │  3. Background Sync (after 1.5s debounce)                       │
 │     - forceLibrarySync() called                                 │
 │     - Syncs each enabled provider separately                    │
 │     - Updates source tracking in database                       │
 │     - UI refreshes with fresh data                              │
 └─────────────────────────────────────────────────────────────────┘
 ```
 ## Files Changed
 | File | Changes |
 |------|---------|
 | `lib/database/database.dart` | Added `sourceProviders` column, schema v6, migration |
 | `lib/database/database.g.dart` | Auto-generated from schema changes |
 | `lib/services/database_service.dart` | Added `sourceProvider` param, `getCachedItemsWithProviders()` |
 | `lib/services/sync_service.dart` | Per-provider sync, source tracking maps, filtering methods |
 | `lib/screens/new_library_screen.dart` | Hybrid toggle handler, updated tab builders |
 | `lib/models/provider_instance.dart` | New model for provider instances |
 ## Testing Checklist
 - [ ] Fresh install: First sync should populate source tracking
 - [ ] Toggle single provider: UI updates instantly
 - [ ] Toggle multiple providers rapidly: Debounce prevents race conditions
 - [ ] Two Spotify accounts: Toggling one only shows that account's items
 - [ ] Mixed providers: Toggling Spotify doesn't affect Audiobookshelf items
 - [ ] Legacy cache: Items without source tracking show regardless of filter
 - [ ] Pull to refresh: Refreshes source tracking data
 ## Known Limitations
 1. **First sync required:** Source tracking only works after at least one sync with providers enabled
 2. **Network cost:** Per-provider sync makes N API calls (one per provider) vs. 1 call for all providers
 3. **Items in multiple accounts:** If the same item exists in both Spotify accounts, it will show when either is enabled
 ## Future Improvements
 1. **Incremental sync:** Only sync changed items instead of full library
 2. **Provider-specific cache age:** Different sync intervals per provider
 3. **Offline source tracking:** Persist source tracking independently of full cache
 ## Branch
 All changes are on the `feature/per-provider-sync` branch.
 ```bash
 git checkout feature/per-provider-sync
 ```
 ## Commit
 ```
 feat: Add per-provider sync with source tracking for instant filtering
 - Add sourceProviders column to database schema (v6) for tracking which
  provider instance each item came from
 - Update SyncService to sync each enabled provider separately and tag
  items with their source provider
 - Add client-side filtering methods that use source tracking to properly
  differentiate between multiple accounts of the same provider type
 - Update library UI to use instant client-side filtering with background
  sync for data freshness
 ```
@@ -0,0 +1,217 @@
 # Provider Filter Implementation Notes
 ## Overview
 This document captures the context and learnings from an attempted implementation of provider filtering in the Ensemble app. The goal was to allow users to filter their library to show only items from a specific music provider (e.g., only one Spotify account when multiple are configured).
 ## The Problem
 Users with multiple music provider accounts (e.g., two Spotify accounts: one personal, one family) want to filter their library view to show only items from one specific account. The Music Assistant (MA) web UI successfully implements this feature.
 ## What Works vs What Failed
 ### Works: Different Provider Types
 Filtering between different provider types (e.g., Spotify vs Tidal vs Plex) works correctly. Each provider type has distinct `provider_mappings` entries.
 ### Failed: Multiple Accounts of Same Provider
 Filtering between multiple Spotify accounts (e.g., `spotify--abc123` vs `spotify--xyz789`) does NOT work correctly. The same library items appear regardless of which Spotify account is selected.
 ## Root Cause Analysis
 ### The provider_mappings Problem
 MA's `provider_mappings` field on media items does NOT indicate "which account ADDED this item to the library." Instead, it indicates "which providers CAN PLAY this item."
 Example: An artist "Ari Mason" that exists ONLY in User A's Spotify library will show provider_mappings containing BOTH Spotify accounts:
 ```json
 {
  "provider_mappings": [
    {"provider_instance": "spotify--userA_id", "item_id": "..."},
    {"provider_instance": "spotify--userB_id", "item_id": "..."}
  ]
 }
 ```
 This happens because:
 1. MA's internal database stores that the artist exists
 2. MA knows both Spotify accounts CAN play this artist (Spotify has the content)
 3. MA doesn't track WHICH account originally added the item to the library
 ### MA Web UI Behavior
 The MA web UI's provider filter works differently - it appears to use server-side filtering via the `provider` parameter on library_items API calls. When you select a single provider in MA settings, the API returns only items from that provider's library.
 ## API Investigation
 ### Server-Side Filtering Parameter
 The MA server's `library_items` method accepts a `provider` parameter:
 - Parameter name: `provider` (string or list of strings)
 - Endpoint: `music/{type}/library_items` (e.g., `music/artists/library_items`)
 - Expected behavior: Filter to only return items from the specified provider's library
 ### What We Tried
 1. **Client-side filtering based on provider_mappings**
   - Result: Failed - all Spotify accounts appear in mappings regardless of which added the item
 2. **Server-side filtering with `provider` parameter**
   - Result: Partially implemented but behavior was inconsistent
   - The API accepts the parameter but may not filter correctly for same-provider-type accounts
 3. **Using `provider_instance_id_or_domain` parameter**
   - Result: This parameter is for getting specific items by ID, not for filtering library_items
 ## Code Locations
 ### Files Modified (in stash)
 The implementation attempt is preserved in git stash:
 ```bash
 git stash list  # Look for "provider-filter-and-dropdown-work"
 git stash show -p stash@{0}  # View the changes
 ```
 Key files that were modified:
 1. **lib/providers/music_assistant_provider.dart**
   - `_disabledProviders`: List of disabled provider instance IDs (local app setting)
   - `selectedProviderForFilter`: Returns single enabled provider for server-side filtering
   - `toggleProviderEnabled()`: Toggle provider on/off and trigger re-sync
   - `loadDisabledProviders()`: Load from local settings
   - `filterByProvider()`: Client-side filtering (enhanced version)
   - `isItemAllowedByProviderFilter()`: Check if item should be visible
 2. **lib/services/music_assistant_api.dart**
   - Added `provider` parameter to: `getArtists`, `getAlbums`, `getTracks`, `getRandomArtists`, `getRandomAlbums`
   - Added `MusicProvider` model parsing from `/providers` endpoint
   - `musicProviders` getter: List of available music providers
 3. **lib/services/sync_service.dart**
   - Added `provider` parameter to `syncFromApi()` and `forceSync()`
   - Pass provider filter to API calls during sync
 4. **lib/services/settings_service.dart**
   - `getDisabledMusicProviders()`: Get list of disabled provider IDs
   - `setDisabledMusicProviders()`: Save disabled providers
   - `toggleProviderEnabled()`: Toggle and persist
 5. **lib/screens/settings_screen.dart**
   - UI for toggling individual providers on/off
   - Display provider name and instance ID
 6. **lib/screens/new_library_screen.dart**
   - Integration with provider filtering
 7. **lib/models/music_provider.dart** (new file)
   - Model for MA provider instances
   - Fields: `instanceId`, `domain`, `name`, `available`
 ## Race Condition Issue
 A race condition was identified where:
 1. Initial app sync starts WITHOUT provider filter
 2. User toggles provider filter
 3. `clearCache()` is called
 4. New sync with provider filter tries to start
 5. "Sync already in progress" - new sync is skipped
 6. Result: Old unfiltered data remains
 Fix attempted: Reset `_isSyncing = false` in `clearCache()` to allow fresh sync.
 ## Potential Solutions to Explore
 ### 1. Investigate MA Server-Side Filtering
 The MA server should support filtering by provider. Need to verify:
 - Does the `provider` parameter work for filtering between same-type providers?
 - Is there a different parameter or API endpoint?
 - Check MA source code: https://github.com/music-assistant/server
 ### 2. Library Sync Per Provider
 Instead of syncing all items and filtering, sync each provider's library separately:
 ```dart
 for (final provider in enabledProviders) {
  final items = await api.getAlbums(provider: provider.instanceId);
  // Store with provider association
 }
 ```
 ### 3. Track Item Origin
 Store which provider originally added each item:
 - Modify database schema to track `source_provider`
 - When syncing, record which provider the item came from
 - Filter based on source, not playability
 ### 4. Use MA's Internal Library State
 MA might have internal state about which items are in which provider's library. Investigate:
 - `/music/library/items` endpoint
 - Provider-specific library endpoints
 - MA's database schema for library associations
 ### 5. Check MA User Settings
 The MA web UI's provider filter might be stored in user settings:
 ```dart
 final userInfo = await api.getCurrentUserInfo();
 // Check for provider_filter or similar field
 ```
 ## Testing Notes
 ### Log Messages to Watch
 ```
 🔌 Selected provider for filter: spotify--xxxxx
 🔍 API getArtists args: {limit: 1000, provider: spotify--xxxxx}
 🔍 API getArtists returned XXX items
 🔌 filterByProvider: XXX → YYY (disabled=[...])
 ```
 ### Test Scenario
 1. Configure two Spotify accounts in MA
 2. Add different artists to each account's library
 3. In Ensemble, select only one Spotify account
 4. Verify library shows ONLY that account's items
 5. Switch to other account, verify different items
 ### Expected vs Actual
 - **Expected**: Artist "Ari Mason" (only in Account A) should NOT appear when Account B is selected
 - **Actual**: Artist appears regardless of which account is selected
 ## MA API Reference
 ### Get Providers
 ```
 Command: providers
 Returns: List of provider instances with type, domain, instanceId, name, available
 ```
 ### Library Items with Filter
 ```
 Command: music/artists/library_items
 Args: {
  limit: int,
  offset: int,
  provider: string | list<string>,  // Filter to specific provider(s)
  album_artists_only: bool,
  order_by: string
 }
 ```
 ### Relevant MA Source Files
 - `music_assistant/server/controllers/music.py` - Library item retrieval
 - `music_assistant/server/models/provider.py` - Provider model
 - `music_assistant/server/providers/` - Individual provider implementations
 ## Conclusion
 The core challenge is that MA's `provider_mappings` indicates playability, not ownership. Server-side filtering via the `provider` parameter should work but needs further investigation to understand why it doesn't differentiate between multiple accounts of the same provider type.
 The implementation is preserved in the git stash for future reference. The sorting/dropdown improvements were extracted and committed separately.
@@ -0,0 +1,271 @@
 # Audiobook Provider Filtering Fix
 ## Date: January 17, 2026 (Continuation)
 ## Overview
 This session focused on fixing provider filtering issues discovered after the initial provider filtering improvements:
 1. Audiobooks were not responding to provider filter changes (browse API ignoring `providerInstanceIds`)
 2. UI not updating instantly when toggling providers (missing `notifyListeners()` call)
 3. Audiobook tabs not rebuilding on provider changes (using `context.read` instead of `Selector`)
 ---
 ## Problem Statement
 After implementing capability-based provider filtering for the music library, two issues remained:
 ### Issue 1: Audiobooks Not Filtering During Sync
 The bug report showed:
 ```
 📊 Source tracking: 252 albums, 87 artists have provider info
 📚 Total audiobooks from browse: 186
 ```
 - Albums and artists had provider source tracking
 - Audiobooks had NO provider source tracking (not listed)
 - All 186 audiobooks were returned regardless of provider selection
 ### Issue 2: UI Not Updating Instantly
 When toggling providers in the library menu:
 - Music tabs weren't updating immediately
 - Audiobooks required manual pull-to-refresh
 - Changes only appeared after ~600ms (debounce timer)
 ---
 ## Root Cause Analysis
 ### Cause 1: Browse API Ignoring Provider Filter
 In `lib/services/music_assistant_api.dart`, when ABS library filtering is enabled, the `getAudiobooks()` function uses the browse API but was **ignoring** the `providerInstanceIds` parameter:
 ```dart
 // BEFORE: providerInstanceIds was ignored when using browse API
 if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
  return await _getAudiobooksFromBrowse(enabledLibraries, favoriteOnly: favoriteOnly);
 }
 ```
 ### Cause 2: `notifyListeners()` Called Too Late
 In `lib/providers/music_assistant_provider.dart`, the `toggleProviderEnabled()` function only called `notifyListeners()` **inside** the 600ms debounce timer:
 ```dart
 // BEFORE: notifyListeners only called after 600ms debounce
 _providerFilterDebounceTimer = Timer(const Duration(milliseconds: 600), () {
  forceLibrarySync();
  notifyListeners();  // Too late! UI should update immediately
 });
 ```
 ### Cause 3: Audiobook Tabs Not Listening for Changes
 The audiobook tabs used `context.read<MusicAssistantProvider>()` which doesn't trigger rebuilds when the provider changes:
 ```dart
 // BEFORE: context.read doesn't listen for changes
 Widget _buildBooksAuthorsTab(BuildContext context, S l10n) {
  final maProvider = context.read<MusicAssistantProvider>();
  final enabledProviders = maProvider.enabledProviderIds.toSet();
  // ... widget doesn't rebuild when enabledProviders changes
 }
 ```
 ---
 ## Solutions
 ### Fix 1: Browse API Provider Filtering
 **File:** `lib/services/music_assistant_api.dart` (lines 760-785)
 Added logic to filter library paths by provider ID before browsing:
 ```dart
 if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
  _logger.log('📚 getAudiobooks: enabledLibraries=$enabledLibraries, providerInstanceIds=$providerInstanceIds');
  // If specific providers are requested, filter libraries to only matching providers
  // Library paths start with provider ID (e.g., "audiobookshelf--abc123://lb...")
  var librariesToBrowse = enabledLibraries;
  if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
    librariesToBrowse = enabledLibraries.where((libPath) {
      // Extract provider ID from library path (everything before "://")
      final providerEnd = libPath.indexOf('://');
      if (providerEnd == -1) return false;
      final providerId = libPath.substring(0, providerEnd);
      return providerInstanceIds.contains(providerId);
    }).toList();
    // If no libraries match the requested providers, return empty
    if (librariesToBrowse.isEmpty) {
      return [];
    }
  }
  return await _getAudiobooksFromBrowse(librariesToBrowse, favoriteOnly: favoriteOnly);
 }
 ```
 ### Fix 2: Immediate `notifyListeners()` Call
 **File:** `lib/providers/music_assistant_provider.dart` (line 1149)
 Moved `notifyListeners()` to fire immediately after `_enabledProviderIds` changes:
 ```dart
 // Reload the enabled providers
 final savedEnabled = await SettingsService.getEnabledMusicProviders();
 _enabledProviderIds = savedEnabled ?? [];
 // Notify listeners IMMEDIATELY so UI rebuilds with client-side filtering
 // This enables instant UI updates using cached data with source tracking
 notifyListeners();
 // Cancel any pending debounce timer
 _providerFilterDebounceTimer?.cancel();
 // Start debounced sync - waits 600ms for user to finish toggling
 // This refreshes the cache with new data from enabled providers
 _providerFilterDebounceTimer = Timer(const Duration(milliseconds: 600), () {
  _logger.log('🔄 Debounce complete, starting library sync...');
  forceLibrarySync();
 });
 ```
 ### Fix 3: Audiobook Tabs Use Selector
 **File:** `lib/screens/new_library_screen.dart`
 Wrapped `_buildBooksAuthorsTab` and `_buildAllBooksTab` in `Selector` to rebuild when `enabledProviderIds` changes:
 ```dart
 Widget _buildBooksAuthorsTab(BuildContext context, S l10n) {
  // Use Selector to rebuild when enabledProviderIds changes
  return Selector<MusicAssistantProvider, Set<String>>(
    selector: (_, provider) => provider.enabledProviderIds.toSet(),
    builder: (context, enabledProviders, _) {
      final syncService = SyncService.instance;
      // Client-side filtering using SyncService source tracking for instant updates
      var audiobooks = syncService.hasSourceTracking && enabledProviders.isNotEmpty
          ? syncService.getAudiobooksFilteredByProviders(enabledProviders)
          : List<Audiobook>.from(_audiobooks);
      // ... rest of widget
    },
  );
 }
 ```
 ### Fix 4: Enhanced Sync Logging
 **File:** `lib/services/sync_service.dart`
 Added audiobook counts to logging:
 ```dart
 // Per-provider log (line 237)
 _logger.log('  📥 Got ${albums.length} albums, ${artists.length} artists, ${audiobooks.length} audiobooks from $providerId');
 // Source tracking summary (line 323)
 _logger.log('📊 Source tracking: ${_albumSourceProviders.length} albums, ${_artistSourceProviders.length} artists, ${_audiobookSourceProviders.length} audiobooks have provider info');
 ```
 ---
 ## Data Flow After Fixes
 ```
 ┌─────────────────────────────────────────────────────────────────┐
 │                    User Toggles Provider                         │
 │                                                                  │
 │   1. toggleProviderEnabled() called                             │
 │   2. _enabledProviderIds updated                                │
 │   3. notifyListeners() called IMMEDIATELY                       │
 └─────────────────────────────────────────────────────────────────┘
                              │
                              ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │                    Selectors Detect Change                       │
 │                                                                  │
 │   Music tabs: Selector<..., (List, bool, Set<String>)>         │
 │   Audiobook tabs: Selector<..., Set<String>>                    │
 │                                                                  │
 │   → All tabs rebuild immediately                                 │
 └─────────────────────────────────────────────────────────────────┘
                              │
                              ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │                Client-Side Filtering (Instant)                   │
 │                                                                  │
 │   syncService.getAlbumsFilteredByProviders(enabledProviders)    │
 │   syncService.getArtistsFilteredByProviders(enabledProviders)   │
 │   syncService.getAudiobooksFilteredByProviders(enabledProviders)│
 │                                                                  │
 │   → Uses EXISTING cache with source tracking                    │
 │   → Instant UI update, no network required                      │
 └─────────────────────────────────────────────────────────────────┘
                              │
                              ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │              Background Sync (After 600ms Debounce)              │
 │                                                                  │
 │   - Refreshes cache with new data from enabled providers        │
 │   - Updates source tracking                                      │
 │   - Only needed when ENABLING providers (to fetch new data)     │
 └─────────────────────────────────────────────────────────────────┘
 ```
 ---
 ## Files Changed
 | File | Changes |
 |------|---------|
 | `lib/services/music_assistant_api.dart` | Added provider filtering to browse API path in `getAudiobooks()`, added debug logging |
 | `lib/services/sync_service.dart` | Added audiobook counts to per-provider and summary logs |
 | `lib/providers/music_assistant_provider.dart` | Moved `notifyListeners()` to fire immediately on provider toggle |
 | `lib/screens/new_library_screen.dart` | Wrapped audiobook tabs in `Selector` to rebuild on provider changes |
 ---
 ## Expected Behavior After Fixes
 1. **Instant UI Updates:** When you toggle a provider, the library immediately updates using client-side filtering
 2. **Audiobook Source Tracking:** Audiobooks now have provider source tracking (visible in logs)
 3. **Audiobook Tab Rebuilds:** Both audiobook tabs (Authors and All Books) rebuild instantly on provider toggle
 4. **Music Tab Consistency:** Music tabs continue to work as before, now with immediate rebuilds
 ---
 ## Testing Checklist
 - [ ] Toggle a music provider, verify instant UI update (no 600ms delay)
 - [ ] Toggle between different Spotify accounts, verify correct filtering
 - [ ] Sync with ABS library filtering enabled
 - [ ] Verify audiobooks appear in source tracking log
 - [ ] Toggle ABS provider off in library menu
 - [ ] Verify audiobooks list becomes empty immediately (no pull-to-refresh needed)
 - [ ] Toggle ABS provider back on
 - [ ] Verify audiobooks reappear after sync completes
 - [ ] Test with multiple providers (Spotify audiobooks + ABS)
 ---
 ## Related Documentation
 - `docs/SESSION_2026_01_17_PROVIDER_FILTERING.md` - Initial provider filtering implementation
 - `docs/PER_PROVIDER_SYNC_IMPLEMENTATION.md` - Per-provider sync architecture
 ---
 ## Known Limitations
 1. **Series Tab:** The Series tab still doesn't filter by provider. Series are fetched as `AudiobookSeries` objects without per-provider tracking.
 2. **Mixed Provider Scenario:** If user has both Spotify audiobooks and ABS audiobooks, and ABS library filtering is enabled, Spotify audiobooks may not be fetched because the browse API path is taken. This is a pre-existing architectural limitation.
 3. **Enabling Providers:** When ENABLING a previously disabled provider, the UI updates immediately but shows empty until the background sync completes (because the cache doesn't have that provider's data yet). This is expected behavior.
@@ -0,0 +1,217 @@
 # Session 2026-01-17: Optimistic Updates & Podcast Provider Filtering
 ## Overview
 This session focused on fixing provider filtering for podcasts, resolving iTunes podcast provider issues, and implementing optimistic updates for library buttons across detail screens.
 ## Issues Addressed
 ### 1. Podcast Provider Counts Showing Incorrectly
 **Problem**: All Spotify accounts showed the same podcast count instead of only counting podcasts owned by each account.
 **Root Cause**: The podcast counting logic wasn't checking the `inLibrary` field on provider mappings.
 **Solution**:
 - Added `inLibrary` field to `ProviderMapping` model
 - Updated `getProvidersWithPodcasts()` to only count mappings where `inLibrary == true`
 - Updated podcast filtering in library screen to check `inLibrary` field
 **Files Modified**:
 - `lib/models/media_item.dart` - Added `inLibrary` field
 - `lib/providers/music_assistant_provider.dart` - Updated counting logic
 - `lib/screens/new_library_screen.dart` - Updated filtering logic
 ### 2. iTunes Podcasts Not Appearing in Library
 **Problem**: Podcasts added from iTunes search weren't showing in library and iTunes provider filter showed 0 count.
 **Investigation**:
 - Added `itunes_podcasts` to provider capabilities and music provider domains
 - Added synthetic provider instance creation for search-only providers
 - Added debug logging to understand podcast loading
 **Resolution**: The issue was with Music Assistant's iTunes podcast provider itself - podcasts added via iTunes weren't being properly stored in the MA library. The user removed the iTunes provider from MA and re-added podcasts via Spotify search as a workaround.
 **Files Modified**:
 - `lib/models/provider_instance.dart` - Added `itunes_podcasts` to capabilities
 ### 3. Episode Loading Failing for Non-Library Podcasts
 **Problem**: When a podcast was removed from library, the old library ID became invalid and episodes wouldn't load.
 **Solution**: Added fallback logic to try loading episodes via provider mappings when the primary ID fails.
 **Files Modified**:
 - `lib/screens/podcast_detail_screen.dart` - Added fallback episode loading
 ### 4. Search Filtering Rework
 **Problem**: Server-side provider filtering was being applied to search results when it should only apply when the "in library" toggle is enabled.
 **Solution**:
 - Removed `filterSearchResults()` calls from search methods
 - Added client-side `_filterByEnabledProviders()` helper
 - Applied filtering only when `_libraryOnly` toggle is ON
 **Files Modified**:
 - `lib/providers/music_assistant_provider.dart` - Removed filterSearchResults calls
 - `lib/screens/search_screen.dart` - Added client-side filtering
 ### 5. Library Buttons Not Updating Immediately
 **Problem**: Add/remove library buttons on detail screens waited for API response before updating, causing perceived lag.
 **Solution**: Implemented optimistic updates - update UI immediately, revert on failure.
 **Files Modified**:
 - `lib/screens/podcast_detail_screen.dart`
 - `lib/screens/album_details_screen.dart`
 - `lib/screens/artist_details_screen.dart`
 ## Code Changes
 ### ProviderMapping.inLibrary Field
 ```dart
 // lib/models/media_item.dart
 class ProviderMapping {
  final String itemId;
  final String providerDomain;
  final String providerInstance;
  final bool available;
  final Map<String, dynamic>? audioFormat;
  final bool inLibrary;  // NEW: indicates ownership
  factory ProviderMapping.fromJson(Map<String, dynamic> json) {
    return ProviderMapping(
      // ... other fields ...
      inLibrary: json['in_library'] == true || json['in_library'] == 1,
    );
  }
 }
 ```
 ### Podcast Provider Counting
 ```dart
 // lib/providers/music_assistant_provider.dart
 Map<String, int> getProvidersWithPodcasts() {
  final counts = <String, int>{};
  for (final item in _podcasts) {
    final mappings = item.providerMappings;
    if (mappings != null) {
      for (final mapping in mappings) {
        // Only count if this provider "owns" the item
        if (mapping.inLibrary) {
          final instanceId = mapping.providerInstance;
          if (instanceId.isNotEmpty) {
            counts[instanceId] = (counts[instanceId] ?? 0) + 1;
          }
        }
      }
    }
  }
  return counts;
 }
 ```
 ### Optimistic Update Pattern
 ```dart
 // Example from podcast_detail_screen.dart
 Future<void> _toggleLibrary() async {
  final newState = !_isInLibrary;
  // OPTIMISTIC UPDATE: Update UI immediately
  setState(() {
    _isInLibrary = newState;
  });
  if (mounted) {
    ScaffoldMessenger.of(context).showSnackBar(
      SnackBar(content: Text(S.of(context)!.addedToLibrary)),
    );
  }
  // Fire and forget - API call happens in background
  maProvider.addToLibrary(...).catchError((e) {
    // Revert on failure
    if (mounted) {
      setState(() {
        _isInLibrary = !newState;
      });
    }
  });
 }
 ```
 ### Client-Side Search Filtering
 ```dart
 // lib/screens/search_screen.dart
 Map<String, List<MediaItem>> _filterByEnabledProviders(
  Map<String, List<MediaItem>> results,
  Set<String> enabledProviders,
 ) {
  if (enabledProviders.isEmpty) return results;
  bool isItemAllowed(MediaItem item) {
    final mappings = item.providerMappings;
    if (mappings == null || mappings.isEmpty) return true;
    return mappings.any((m) => m.inLibrary && enabledProviders.contains(m.providerInstance));
  }
  return {
    for (final entry in results.entries)
      entry.key: entry.value.where(isItemAllowed).toList(),
  };
 }
 // Applied when setting results:
 if (_libraryOnly) {
  final enabledProviders = provider.enabledProviderIds.toSet();
  combinedResults = _filterByEnabledProviders(combinedResults, enabledProviders);
 }
 ```
 ## Provider Capabilities Update
 ```dart
 // lib/models/provider_instance.dart
 static const Map<String, Set<String>> providerCapabilities = {
  'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
  'ytmusic': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
  'apple_music': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
  'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
  'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
  'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
  'audiobookshelf': {'audiobooks', 'podcasts'},
  'itunes_podcasts': {'podcasts'},  // NEW
  'tunein': {'radio', 'podcasts'},
  // ... other providers
 };
 ```
 ## Summary of All Modified Files
 | File | Changes |
 |------|---------|
 | `lib/models/media_item.dart` | Added `inLibrary` field to ProviderMapping |
 | `lib/models/provider_instance.dart` | Added `itunes_podcasts`, podcasts to capabilities |
 | `lib/providers/music_assistant_provider.dart` | Updated podcast counting, removed filterSearchResults |
 | `lib/screens/new_library_screen.dart` | Updated podcast filtering with inLibrary check |
 | `lib/screens/search_screen.dart` | Added client-side filtering for in-library mode |
 | `lib/screens/podcast_detail_screen.dart` | Optimistic updates, fallback episode loading |
 | `lib/screens/album_details_screen.dart` | Optimistic updates for library button |
 | `lib/screens/artist_details_screen.dart` | Optimistic updates for library button |
 ## Key Learnings
 1. **inLibrary field**: Music Assistant's provider mappings include an `in_library` field that indicates whether the user added the item from that specific provider account. This is essential for accurate per-provider filtering.
 2. **iTunes podcast provider**: The MA iTunes podcast provider is for search only - it doesn't properly store items in the library. Users should add podcasts from streaming providers like Spotify instead.
 3. **Optimistic updates**: For better UX, library toggle buttons should update immediately and only revert if the API call fails, rather than waiting for API response.
 4. **Search vs Library filtering**: Server-side provider filtering should only apply to library views, not search results (unless the "in library" toggle is enabled).
@@ -0,0 +1,263 @@
 # Provider Filtering Improvements
 ## Date: January 17, 2026
 ## Overview
 This session focused on improving the provider filtering system across the app, building on the per-provider sync implementation. Key improvements include a cleaner capability-based architecture, fixing filter visibility bugs, and extending filtering to the audiobooks library.
 ---
 ## Changes Made
 ### 1. Provider Capability Mapping
 **File:** `lib/models/provider_instance.dart`
 Replaced the clunky item-count-based filtering with a static capability map that defines what content types each provider domain supports.
 ```dart
 static const Map<String, Set<String>> providerCapabilities = {
  // Music streaming services
  'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
  'tidal': {'artists', 'albums', 'tracks', 'playlists'},
  'qobuz': {'artists', 'albums', 'tracks', 'playlists'},
  'deezer': {'artists', 'albums', 'tracks', 'playlists'},
  'ytmusic': {'artists', 'albums', 'tracks', 'playlists'},
  'soundcloud': {'artists', 'albums', 'tracks', 'playlists'},
  'apple_music': {'artists', 'albums', 'tracks', 'playlists'},
  'amazon_music': {'artists', 'albums', 'tracks', 'playlists'},
  // Self-hosted media servers (can have music and audiobooks)
  'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
  'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
  'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
  // Music-only servers
  'subsonic': {'artists', 'albums', 'tracks', 'playlists'},
  'opensubsonic': {'artists', 'albums', 'tracks', 'playlists'},
  'navidrome': {'artists', 'albums', 'tracks', 'playlists'},
  'filesystem': {'artists', 'albums', 'tracks', 'playlists'},
  // Audiobook-only providers
  'audiobookshelf': {'audiobooks'},
  // Radio providers
  'tunein': {'radio'},
  'radiobrowser': {'radio'},
  // Player/system providers (no library content)
  'snapcast': <String>{},
  'fully_kiosk': <String>{},
 };
 ```
 **Added helper methods:**
 ```dart
 Set<String> get supportedContentTypes => providerCapabilities[domain] ?? <String>{};
 bool supportsContentType(String category) => supportedContentTypes.contains(category);
 ```
 **Benefits:**
 - Radio providers never show in Artists tab (by design, not by count)
 - Works immediately, even with empty libraries
 - Disabled providers still show in menu (if they support the content type)
 - Clean separation of concerns
 ---
 ### 2. Updated Provider Filtering in MusicAssistantProvider
 **File:** `lib/providers/music_assistant_provider.dart`
 Updated `getRelevantProvidersForCategory()` to filter by capability:
 ```dart
 List<(ProviderInstance, int)> getRelevantProvidersForCategory(String category) {
  // ... get counts ...
  final result = <(ProviderInstance, int)>[];
  for (final provider in _availableMusicProviders) {
    // Only include providers that support this content type
    if (provider.supportsContentType(category)) {
      final count = counts[provider.instanceId] ?? 0;
      result.add((provider, count));
    }
  }
  // ...
 }
 ```
 ---
 ### 3. Simplified Library Menu Provider Filter
 **File:** `lib/screens/new_library_screen.dart`
 Simplified the options menu overlay to show all providers that support the current category:
 **Before (clunky):**
 ```dart
 if (widget.relevantProviders.where((p) {
  final hasItems = p.$2 > 0;
  final isDisabledByUser = widget.enabledProviderIds.isNotEmpty &&
      !widget.enabledProviderIds.contains(p.$1.instanceId);
  return hasItems || isDisabledByUser;
 }).length > 1) ...[
 ```
 **After (clean):**
 ```dart
 // relevantProviders is pre-filtered by capability
 if (widget.relevantProviders.length > 1) ...[
  // Show all providers that support this category
  ...widget.relevantProviders.map((providerData) {
 ```
 ---
 ### 4. Removed Provider Toggles from Settings Screen
 **File:** `lib/screens/settings_screen.dart`
 Removed the "Music Providers" section entirely since provider filtering is now handled in the library menu:
 - Removed `_providerEnabled` state variable
 - Removed provider loading code from `_loadSettings()`
 - Removed the entire Music Providers UI section (~100 lines)
 **Rationale:** Single source of truth - provider toggles now only appear in the library menu where they're contextually relevant.
 ---
 ### 5. Fixed Audiobooks Library Provider Filtering
 **File:** `lib/screens/new_library_screen.dart`
 The audiobooks tabs were not filtering by provider - they loaded data once and displayed it without responding to provider changes.
 **Fixed `_buildBooksAuthorsTab()`:**
 ```dart
 final syncService = SyncService.instance;
 final enabledProviders = maProvider.enabledProviderIds.toSet();
 // Client-side filtering using SyncService source tracking
 var audiobooks = syncService.hasSourceTracking && enabledProviders.isNotEmpty
    ? syncService.getAudiobooksFilteredByProviders(enabledProviders)
    : List<Audiobook>.from(_audiobooks);
 // Filter by favorites if enabled
 if (_showFavoritesOnly) {
  audiobooks = audiobooks.where((a) => a.favorite == true).toList();
 }
 // Group filtered audiobooks by author (dynamic, not cached)
 final groupedByAuthor = <String, List<Audiobook>>{};
 for (final book in audiobooks) {
  final authorName = book.authorsString;
  groupedByAuthor.putIfAbsent(authorName, () => []).add(book);
 }
 ```
 **Fixed `_buildAllBooksTab()`:**
 - Same provider filtering pattern
 - Dynamic sorting after filtering
 - Updated PageStorageKey to include provider count for proper rebuild
 ---
 ## Bug Fixes
 ### Provider Filter Menu Disappearing
 **Problem:** When providers were deselected, the background sync would clear the cache and only fetch data for enabled providers. Disabled providers then had 0 items, and the menu required `> 1 providers WITH items` to show. The entire Providers section would disappear.
 **Solution:** Changed to capability-based filtering. The menu now shows all providers that support the category, regardless of item count.
 ### Audiobooks Not Filtering by Provider
 **Problem:** Audiobooks tabs loaded data once into `_audiobooks` and displayed it without provider filtering. Toggling providers in the menu had no effect.
 **Solution:** Added inline provider filtering during build (same pattern as music tabs).
 ---
 ## Files Changed
 | File | Changes |
 |------|---------|
 | `lib/models/provider_instance.dart` | Added `providerCapabilities` map and helper methods |
 | `lib/providers/music_assistant_provider.dart` | Updated `getRelevantProvidersForCategory()` to filter by capability |
 | `lib/screens/new_library_screen.dart` | Simplified menu filter logic, added audiobook provider filtering |
 | `lib/screens/settings_screen.dart` | Removed Music Providers section |
 ---
 ## Architecture
 ```
 ┌─────────────────────────────────────────────────────────────────┐
 │                    Provider Capability Map                       │
 │         (ProviderInstance.providerCapabilities)                  │
 │                                                                  │
 │   spotify → {artists, albums, tracks, playlists, audiobooks}    │
 │   audiobookshelf → {audiobooks}                                 │
 │   tunein → {radio}                                              │
 └─────────────────────────────────────────────────────────────────┘
                              │
                              ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │            getRelevantProvidersForCategory(category)             │
 │                                                                  │
 │   - Filters _availableMusicProviders by capability              │
 │   - Returns only providers that support the category            │
 │   - Includes item counts for display                            │
 └─────────────────────────────────────────────────────────────────┘
                              │
                              ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │                    Library Menu (Options)                        │
 │                                                                  │
 │   - Shows providers section if > 1 providers support category   │
 │   - All relevant providers shown (can toggle on/off)            │
 │   - Instant UI update via setState()                            │
 │   - Background sync after 1.5s debounce                         │
 └─────────────────────────────────────────────────────────────────┘
                              │
                              ▼
 ┌─────────────────────────────────────────────────────────────────┐
 │                   Tab Build Methods                              │
 │                                                                  │
 │   - Get enabledProviderIds from MusicAssistantProvider          │
 │   - Filter data using SyncService source tracking               │
 │   - Display filtered results                                    │
 └─────────────────────────────────────────────────────────────────┘
 ```
 ---
 ## Known Limitations
 1. **Series Tab:** The Series tab in audiobooks doesn't filter by provider yet. Series are fetched separately as `AudiobookSeries` objects and don't have the same source tracking as individual audiobooks.
 2. **First Sync Required:** Source tracking only works after at least one sync with providers enabled.
 ---
 ## Testing Checklist
 - [x] Music tabs filter by provider correctly
 - [x] Provider menu shows only relevant providers per category
 - [x] Radio providers don't appear in Artists/Albums tabs
 - [x] Spotify appears in Audiobooks tab (has audiobooks)
 - [x] Audiobooks Authors tab filters by provider
 - [x] Audiobooks All Books tab filters by provider
 - [ ] Audiobooks Series tab filters by provider (not implemented)
 - [x] Disabled providers can be re-enabled from menu
 - [x] Settings screen no longer has provider toggles
 ---
 ## Related Documentation
 - `docs/PER_PROVIDER_SYNC_IMPLEMENTATION.md` - Original per-provider sync implementation
@@ -0,0 +1,242 @@
 # Discovery Rows Submenu - Implementation Plan
 ## Option: Hybrid with Discovery Badge
 ### Overview
 Transform the "Discovery Mixes" toggle into a section that:
 1. Shows individual discovery row toggles
 2. Adds those rows to the main home row list with visual distinction
 3. Allows full reordering alongside other rows
 ---
 ## UI Design
 ### Settings Screen - Discovery Section
 ```
 ┌─────────────────────────────────────────────┐
 │ ⚬ Discovery Mixes                        ● │
 │   Show discovery-based rows on home screen │
 │   ──────────────────────────────────────── │
 │   Discovery rows from Music Assistant:     │
 │                                            │
 │   ☑ New Releases                        ● │
 │   ☑ Recently Played                     ● │
 │   ☐ Recommended Albums                  ○ │
 │   ☐ For You                             ○ │
 │                                            │
 │   [Refresh available rows]                │
 └─────────────────────────────────────────────┘
 ```
 ### Main Home Row List - With Badge
 Discovery rows appear interleaved with a badge:
 ```
 ┌─────────────────────────────────────────────┐
 │ ⋮ ☑ Recent Albums                        ● │
 │ ⋮ ☑ Discovery: New Releases    ●  [MUSIC] │ ← Badge
 │ ⋮ ☑ Discover Artists                     ● │
 │ ⋮ ☐ Discovery: For You           ○  [MUSIC] │
 │ ⋮ ☑ Favorite Albums                      ● │
 └─────────────────────────────────────────────┘
 ```
 Badge style: Small chip/icon indicating this is a dynamic discovery row.
 ---
 ## Technical Changes
 ### 1. Settings Screen (`lib/screens/settings_screen.dart`)
 **Add state for discovery folders:**
 ```dart
 List<RecommendationFolder> _discoveryFolders = [];
 Map<String, bool> _discoveryRowEnabled = {}; // itemId -> enabled
 bool _isDiscoveryFoldersExpanded = false;
 ```
 **New methods:**
 ```dart
 Future<void> _loadDiscoveryFolders() async { }
 Future<void> _refreshDiscoveryFolders() async { }
 void _toggleDiscoveryRow(String itemId, bool enabled) { }
 void _toggleDiscoveryMixes(bool enabled) { }
 Widget _buildDiscoverySection() { }
 ```
 **Modify existing:**
 - `_loadSettings()` - load discovery row preferences
 - Home row list builder - filter out individual discovery rows
 - Add discovery section before home row list
 ### 2. Settings Service (`lib/services/settings_service.dart`)
 **New methods:**
 ```dart
 static Future<bool> getShowDiscoveryFolders() async { }
 static Future<void> setShowDiscoveryFolders(bool value) async { }
 // Per-row discovery preferences
 static Future<Map<String, bool>> getDiscoveryRowPreferences() async { }
 static Future<void> setDiscoveryRowPreference(String itemId, bool enabled) async { }
 static Future<void> setDiscoveryRowPreferences(Map<String, bool> prefs) async { }
 ```
 **Storage key pattern:**
 - `discovery_folders_enabled` (bool)
 - `discovery_row_{itemId}` (bool per row)
 ### 3. Provider (`lib/providers/music_assistant_provider.dart`)
 **Already has:** `getDiscoveryFoldersWithCache()`
 **Add method:**
 ```dart
 Future<void> refreshDiscoveryFolders() async {
  // Clear cache and refetch from API
  _cacheService.clearDiscoveryFoldersCache();
  await getDiscoveryFoldersWithCache();
 }
 ```
 ### 4. Home Screen (`lib/screens/new_home_screen.dart`)
 **Changes to row rendering:**
 Instead of a single `_discoveryFolders` list, discovery rows are integrated into `_homeRowOrder`:
 ```dart
 // Before: static list of row IDs
 List<String> _homeRowOrder = ['recent-albums', 'discover-artists', ...];
 // After: can include discovery row IDs
 List<String> _homeRowOrder = [
  'recent-albums',
  'discovery:abc123',  // Discovery row ID
  'discover-artists',
  'discovery:def456',
  ...
 ];
 ```
 **New method:**
 ```dart
 bool _isDiscoveryRowId(String rowId) {
  return rowId.startsWith('discovery:');
 }
 String _getDiscoveryRowItemId(String rowId) {
  return rowId.substring('discovery:'.length);
 }
 ```
 **Modify row rendering:**
 - Check if rowId is a discovery row
 - If yes, render DiscoveryRow widget with that folder
 - Cache discovery folders for quick lookup
 ### 5. Localization (`lib/l10n/app_en.arb`)
 **Add strings:**
 ```json
 {
  "discoveryMixesDescription": "Show personalized recommendations from Music Assistant",
  "discoveryRows": "Discovery rows from Music Assistant",
  "refreshDiscoveryRows": "Refresh available rows",
  "noDiscoveryRows": "No discovery rows available",
  "discoveryRowBadge": "Music Assistant"
 }
 ```
 ### 6. Models (`lib/models/recommendation_folder.dart`)
 **Add property:**
 ```dart
 class RecommendationFolder {
  ...
  /// Unique ID for use in row ordering and settings
  String get rowId => 'discovery:$itemId';
 }
 ```
 ---
 ## Data Flow
 ```
 ┌─────────────────────────────────────────────────────────────────┐
 │                          Settings Screen                        │
 ├─────────────────────────────────────────────────────────────────┤
 │  1. Load discovery folders from Provider                        │
 │  2. Load per-row enabled state from Settings                    │
 │  3. Render section with toggles                                 │
 │  4. User toggles row → save to Settings                         │
 │  5. User toggles main → save to Settings + update home row list │
 │  6. User refreshes → Provider.fetch → update UI                 │
 └─────────────────────────────────────────────────────────────────┘
                              ↓
 ┌─────────────────────────────────────────────────────────────────┐
 │                        Home Screen                              │
 ├─────────────────────────────────────────────────────────────────┤
 │  1. Load home row order from Settings                           │
 │  2. Identify discovery row IDs (prefix "discovery:")             │
 │  3. For discovery rows: look up folder from Provider cache      │
 │  4. Render appropriate widget (DiscoveryRow or other)           │
 │  5. Handle reordering including discovery rows                  │
 └─────────────────────────────────────────────────────────────────┘
 ```
 ---
 ## Migration Path
 ### Phase 1: Settings Screen (No breaking changes)
 - Add discovery section to settings
 - Load and display discovery folders
 - Individual row toggles (but don't affect home screen yet)
 - Refresh button
 ### Phase 2: Home Screen Integration
 - Modify home row order to support discovery row IDs
 - Render discovery rows in main list
 - Add badge visual distinction
 ### Phase 3: Polish
 - Translations
 - Edge cases (folder disappears from MA)
 - Performance (lazy loading)
 ---
 ## Edge Cases & Considerations
 | Issue | Solution |
 |-------|----------|
 | Discovery folder no longer returned by MA | Keep user preference, hide row if not found |
 | User reorders then MA returns new folders | New folders appended to end of discovery section |
 | All discovery rows disabled | Discovery section shows but appears empty/minimized |
 | Many discovery folders (10+) | Show scrollable sublist, keep main setting compact |
 | Row ID collision | Use `discovery:{itemId}` prefix ensures uniqueness |
 ---
 ## Implementation Checklist
 - [ ] Settings: Add `_discoveryFolders` state
 - [ ] Settings: Add `_discoveryRowEnabled` map
 - [ ] Settings: Implement `_loadDiscoveryFolders()`
 - [ ] Settings: Implement `_buildDiscoverySection()`
 - [ ] Settings: Add refresh button handler
 - [ ] SettingsService: Add discovery row preference methods
 - [ ] Provider: Add `refreshDiscoveryFolders()`
 - [ ] HomeScreen: Support discovery row IDs in order list
 - [ ] HomeScreen: Render discovery rows with badge
 - [ ] Localization: Add new strings
 - [ ] Test: Toggle discovery rows on/off
 - [ ] Test: Reorder discovery rows
 - [ ] Test: Refresh discovery folders
 - [ ] Test: Migrate existing preference to new system
@@ -0,0 +1,221 @@
 # Feature: Replace "Play On" Popups with Player Selector
 ## Overview
 Replace the `PlayerPickerSheet` popup modal with the existing Player Selector (reveal overlay) when users tap "Play on" buttons throughout the app. This provides a consistent, richer player selection experience.
 ## Current State
 ### PlayerPickerSheet Popup
 Used in 7+ places:
 - `album_details_screen.dart` - Play Album, Play From Here, Play Radio
 - `playlist_details_screen.dart` - Play Playlist, Play Radio
 - `search_screen.dart` - Play album/playlist/audiobook/radio from search
 - `podcast_detail_screen.dart` - Play Episode
 - `audiobook_detail_screen.dart` - Play Audiobook
 - `queue_screen.dart` - Transfer Queue (special case - keep popup)
 ### Player Selector (Reveal Overlay)
 - Location: `lib/widgets/player/player_reveal_overlay.dart`
 - Shows vertical list of all players with artwork, current track, sync status
 - Has hints above player list: "Long-press to sync" & "Swipe to adjust volume"
 - Triggered by pull-down gesture or device button tap
 ## Proposed Changes
 ### 1. Modify PlayerRevealOverlay
 **File:** `lib/widgets/player/player_reveal_overlay.dart`
 Add new optional parameters:
 ```dart
 class PlayerRevealOverlay extends StatefulWidget {
  final VoidCallback onDismiss;
  final double miniPlayerBottom;
  final double miniPlayerHeight;
  final bool showOnboardingHints;
  // NEW: Callback when player is selected for a pending action
  final void Function(Player player)? onPlayerSelected;
  // NEW: Context hint to display instead of default hints
  // e.g., "Select player to play album"
  final String? contextHint;
  // NEW: Icon for context hint (default: speaker icon)
  final IconData? contextHintIcon;
 ```
 ### 2. Modify Hint Display
 **File:** `lib/widgets/player/player_reveal_overlay.dart` (around line 386-394)
 ```dart
 // Current:
 : Column(
    mainAxisSize: MainAxisSize.min,
    children: [
      buildHintRow(Icons.lightbulb_outline, S.of(context)!.holdToSync),
      const SizedBox(height: 4),
      buildHintRow(Icons.lightbulb_outline, S.of(context)!.swipeToAdjustVolume),
    ],
  ),
 // New:
 : widget.contextHint != null
    ? buildHintRow(
        widget.contextHintIcon ?? Icons.play_circle_outline,
        widget.contextHint!,
      )
    : Column(
        mainAxisSize: MainAxisSize.min,
        children: [
          buildHintRow(Icons.lightbulb_outline, S.of(context)!.holdToSync),
          const SizedBox(height: 4),
          buildHintRow(Icons.lightbulb_outline, S.of(context)!.swipeToAdjustVolume),
        ],
      ),
 ```
 ### 3. Modify Player Card onTap
 **File:** `lib/widgets/player/player_reveal_overlay.dart` (around line 437-441 and 490-494)
 ```dart
 // Current:
 onTap: () {
  HapticFeedback.mediumImpact();
  maProvider.selectPlayer(data.player);
  dismiss();
 },
 // New:
 onTap: () {
  HapticFeedback.mediumImpact();
  if (widget.onPlayerSelected != null) {
    // Execute the pending action with selected player
    widget.onPlayerSelected!(data.player);
  } else {
    // Default behavior: just select the player
    maProvider.selectPlayer(data.player);
  }
  dismiss();
 },
 ```
 ### 4. Add Helper Method to GlobalPlayerOverlay
 **File:** `lib/widgets/global_player_overlay.dart`
 Add a static method to show player selector with pending action:
 ```dart
 /// Show player selector for a "Play on" action
 ///
 /// [contextHint] - Message shown instead of default hints
 /// [onPlayerSelected] - Called when user taps a player
 ///
 /// Example:
 /// ```dart
 /// GlobalPlayerOverlay.showPlayerSelectorForAction(
 ///   contextHint: "Select player to play album",
 ///   onPlayerSelected: (player) {
 ///     provider.playAlbum(albumId, playerId: player.playerId);
 ///   },
 /// );
 /// ```
 static void showPlayerSelectorForAction({
  required String contextHint,
  required void Function(Player player) onPlayerSelected,
  IconData? hintIcon,
 }) {
  // Implementation: trigger the player reveal overlay with these parameters
  // May need to store pending action in state and pass to overlay
 }
 ```
 ### 5. Update Calling Sites
 Replace `showPlayerPickerSheet()` calls with new method:
 **Example - album_details_screen.dart:**
 ```dart
 // Current (around line 1305-1316):
 showPlayerPickerSheet(
  context: context,
  title: 'Play Album',
  onPlayerSelected: (player) async {
    GlobalPlayerOverlay.hidePlayer();
    await maProvider.playAlbum(albumId, playerId: player.playerId);
    GlobalPlayerOverlay.showPlayer();
  },
 );
 // New:
 GlobalPlayerOverlay.showPlayerSelectorForAction(
  contextHint: S.of(context)!.selectPlayerToPlayAlbum, // Add localization
  onPlayerSelected: (player) async {
    await maProvider.playAlbum(albumId, playerId: player.playerId);
  },
 );
 ```
 ### 6. Add Localizations
 **File:** `lib/l10n/app_en.arb` (and other language files)
 ```json
 "selectPlayerToPlay": "Select player to play",
 "selectPlayerToPlayAlbum": "Select player to play album",
 "selectPlayerToPlayPlaylist": "Select player to play playlist",
 "selectPlayerToPlayRadio": "Select player to start radio",
 "selectPlayerToPlayEpisode": "Select player to play episode",
 "selectPlayerToPlayAudiobook": "Select player to play audiobook"
 ```
 ## Files to Modify
 1. `lib/widgets/player/player_reveal_overlay.dart` - Add parameters, modify hints & onTap
 2. `lib/widgets/global_player_overlay.dart` - Add helper method
 3. `lib/screens/album_details_screen.dart` - Replace 3 popup calls
 4. `lib/screens/playlist_details_screen.dart` - Replace 2 popup calls
 5. `lib/screens/search_screen.dart` - Replace ~5 popup calls
 6. `lib/screens/podcast_detail_screen.dart` - Replace 1 popup call
 7. `lib/screens/audiobook_detail_screen.dart` - Replace 1 popup call
 8. `lib/l10n/app_en.arb` - Add new strings
 9. `lib/l10n/app_de.arb`, `app_fr.arb`, `app_es.arb` - Translations
 ## Exception: Queue Transfer
 **Keep the popup for `queue_screen.dart`** because:
 - Needs to filter out current player (can't transfer to self)
 - Needs to filter out certain player types
 - Different UX intent (transfer vs play)
 ## Implementation Order
 1. Modify `PlayerRevealOverlay` to accept new parameters
 2. Add helper method to `GlobalPlayerOverlay`
 3. Test with one screen (album_details_screen.dart)
 4. Add localizations
 5. Migrate remaining screens
 6. Clean up unused code from PlayerPickerSheet if no longer needed elsewhere
 ## Testing Checklist
 - [ ] Album details: Play Album button
 - [ ] Album details: Play From Here (track context menu)
 - [ ] Album details: Play Radio (track context menu)
 - [ ] Playlist details: Play Playlist button
 - [ ] Playlist details: Play Radio (track context menu)
 - [ ] Search: Play album from results
 - [ ] Search: Play playlist from results
 - [ ] Search: Play radio from results
 - [ ] Podcast detail: Play episode
 - [ ] Audiobook detail: Play audiobook
 - [ ] Queue transfer still works with popup
 - [ ] Long-press to sync still works in player selector
 - [ ] Dismiss by tapping backdrop works
 - [ ] Dismiss by swiping down works
@@ -0,0 +1,328 @@
 # Remote Connection - Future Implementation Guide
 ## Overview
 This document provides guidance for implementing remote connection to Music Assistant servers via WebRTC. Remote connection allows the Ensemble app to connect to MA servers outside the local network using Nabu Casa's WebRTC signaling infrastructure.
 ## Current Status: On Hold
 Remote connection was partially implemented but put on hold due to a critical bug where the `ma-api` data channel becomes one-way after 1-3 minutes. See `MA_WEBRTC_BUG_REPORT.md` for details.
 ---
 ## Architecture
 ### How It Works
 ```
 ┌─────────────────┐     WebSocket      ┌──────────────────────────┐
 │  Ensemble App   │◄──────────────────►│  MA Server (local WS)    │
 └─────────────────┘                    └──────────────────────────┘
        │                                         │
        │ (when local unavailable)                │
        ▼                                         ▼
 ┌─────────────────┐                    ┌──────────────────────────┐
 │  SignalingClient│◄──── WebSocket ───►│ signaling.music-assistant│
 └─────────────────┘                    │        .io/ws            │
        │                              └──────────────────────────┘
        │ ICE candidates, SDP                     │
        ▼                                         ▼
 ┌─────────────────┐                    ┌──────────────────────────┐
 │  WebRTC Peer    │◄═══ Data Channel ══►│  MA Server WebRTC       │
 │  Connection     │    (ma-api)         │  Endpoint               │
 └─────────────────┘                    └──────────────────────────┘
 ```
 ### Components
 1. **SignalingClient** - WebSocket connection to `wss://signaling.music-assistant.io/ws`
 2. **WebRTCConnection** - Manages RTCPeerConnection and data channels
 3. **RemoteBridge** - Bridges local WebSocket API to remote WebRTC connection
 ### Data Channels
 | Channel | Purpose | Traffic Pattern |
 |---------|---------|-----------------|
 | `ma-api` | JSON API requests/responses | High volume, large payloads |
 | `sendspin` | Audio streaming + control | Low JSON, binary audio data |
 ---
 ## Key Files to Create/Modify
 ### New Files
 | File | Purpose |
 |------|---------|
 | `lib/services/remote/signaling_client.dart` | WebSocket client for signaling server |
 | `lib/services/remote/webrtc_connection.dart` | WebRTC peer connection management |
 | `lib/services/remote/remote_bridge.dart` | Bridges API calls to WebRTC |
 ### Files to Modify
 | File | Changes |
 |------|---------|
 | `lib/services/music_assistant_api.dart` | Add remote connection fallback |
 | `lib/providers/music_assistant_provider.dart` | Expose remote connection state |
 | `pubspec.yaml` | Add `flutter_webrtc` dependency |
 ---
 ## Implementation Steps
 ### Step 1: Add Dependencies
 ```yaml
 # pubspec.yaml
 dependencies:
  flutter_webrtc: ^0.12.0  # or latest
 ```
 ### Step 2: Implement SignalingClient
 The signaling client connects to Music Assistant's signaling server and exchanges WebRTC offers/answers.
 ```dart
 class SignalingClient {
  WebSocket? _socket;
  Future<void> connect(String serverId) async {
    _socket = await WebSocket.connect('wss://signaling.music-assistant.io/ws');
    // Send connect request
    _send({
      'type': 'connect-request',
      'server_id': serverId,
    });
    // Listen for messages
    _socket!.listen(_handleMessage);
  }
  void _handleMessage(dynamic data) {
    final message = jsonDecode(data);
    switch (message['type']) {
      case 'answer':
        onAnswer?.call(message['sdp']);
        break;
      case 'ice-candidate':
        onIceCandidate?.call(message['candidate']);
        break;
    }
  }
 }
 ```
 ### Step 3: Implement WebRTCConnection
 ```dart
 class WebRTCConnection {
  RTCPeerConnection? _peerConnection;
  RTCDataChannel? _apiChannel;
  RTCDataChannel? _sendspinChannel;
  Future<void> connect(SignalingClient signaling) async {
    // Create peer connection with STUN/TURN servers
    _peerConnection = await createPeerConnection({
      'iceServers': [
        {'urls': 'stun:stun.l.google.com:19302'},
        // TURN servers provided by signaling
      ],
    });
    // Create data channels BEFORE creating offer
    _apiChannel = await _peerConnection!.createDataChannel(
      'ma-api',
      RTCDataChannelInit()..ordered = true,
    );
    _sendspinChannel = await _peerConnection!.createDataChannel(
      'sendspin',
      RTCDataChannelInit()..ordered = true,
    );
    // Create and send offer
    final offer = await _peerConnection!.createOffer();
    await _peerConnection!.setLocalDescription(offer);
    signaling.sendOffer(offer.sdp!);
    // Handle answer from server
    signaling.onAnswer = (sdp) async {
      await _peerConnection!.setRemoteDescription(
        RTCSessionDescription(sdp, 'answer'),
      );
    };
  }
 }
 ```
 ### Step 4: Implement RemoteBridge
 The bridge translates between the local WebSocket API format and WebRTC data channel messages.
 ```dart
 class RemoteBridge {
  final WebRTCConnection _webrtc;
  final StreamController<String> _messageController;
  void sendCommand(String json) {
    _webrtc.sendToApiChannel(json);
  }
  Stream<String> get messages => _messageController.stream;
 }
 ```
 ### Step 5: Integrate with MusicAssistantAPI
 ```dart
 class MusicAssistantAPI {
  WebSocket? _localSocket;
  RemoteBridge? _remoteBridge;
  Future<void> connect(String host, {String? serverId}) async {
    try {
      // Try local connection first
      _localSocket = await WebSocket.connect('ws://$host/ws');
    } catch (e) {
      // Fall back to remote if serverId provided
      if (serverId != null) {
        _remoteBridge = RemoteBridge();
        await _remoteBridge!.connect(serverId);
      }
    }
  }
 }
 ```
 ---
 ## Critical Implementation Details
 ### 1. Channel Creation Order
 The client MUST create data channels BEFORE sending the WebRTC offer. The server expects the client to create:
 - `ma-api` - for API traffic
 - `sendspin` - for audio streaming (optional)
 ### 2. Health Monitoring
 Implement aggressive health checks because data channels can silently die:
 ```dart
 // Track message counts
 int _sentCount = 0;
 int _recvCount = 0;
 DateTime _lastRecvTime = DateTime.now();
 // Health check every 10 seconds
 void _healthCheck() {
  final timeSinceRecv = DateTime.now().difference(_lastRecvTime);
  if (timeSinceRecv.inSeconds > 30) {
    // Channel is dead, trigger reconnection
    _reconnect();
  }
 }
 ```
 ### 3. Keepalive Messages
 Send periodic keepalive on the data channel itself (not just signaling):
 ```dart
 void _sendKeepalive() {
  _apiChannel?.send(RTCDataChannelMessage(
    jsonEncode({'type': 'ping', 'timestamp': DateTime.now().toIso8601String()}),
  ));
 }
 ```
 ### 4. Flow Control
 Monitor buffer to prevent overflow:
 ```dart
 void sendMessage(String json) {
  if (_apiChannel!.bufferedAmount > 1048576) {  // 1MB
    // Queue message, don't send
    _sendQueue.add(json);
    return;
  }
  _apiChannel!.send(RTCDataChannelMessage(json));
 }
 ```
 ---
 ## Known Issues & Pitfalls
 ### 1. One-Way Channel Death (CRITICAL - UNSOLVED)
 The `ma-api` channel stops receiving after 1-3 minutes while `sendspin` continues working. This occurs in both flutter_webrtc and WebView implementations.
 **Workaround options:**
 - Detect via health check and force reconnection
 - Try single-channel multiplexing (see `PLAN_B_SINGLE_CHANNEL.md`)
 - Report to MA team and wait for server-side fix
 ### 2. flutter_webrtc Quirks
 - `RTCDataChannel.state` may show "open" when actually dead
 - `bufferedAmount` accuracy varies by platform
 - `onBufferedAmountLow` callback support inconsistent
 ### 3. Android Background Throttling
 Android aggressively throttles background WebRTC. Consider:
 - Foreground service for sustained connections
 - Reconnection on app resume
 ### 4. ICE/TURN Issues
 - aiortc (server-side) has known TURN + DataChannel bugs
 - May need ICE restart on network changes
 ---
 ## Testing Checklist
 - [ ] Connect via remote when local unavailable
 - [ ] Verify API commands work (players/all, library queries)
 - [ ] Test sustained connection (30+ minutes)
 - [ ] Test app backgrounding and resume
 - [ ] Test network transitions (WiFi ↔ cellular)
 - [ ] Verify reconnection after channel death
 - [ ] Test sendspin audio streaming (if implemented)
 ---
 ## Useful Resources
 - [Music Assistant Remote Access Docs](https://music-assistant.io/docs/remote-access/)
 - [flutter_webrtc Package](https://pub.dev/packages/flutter_webrtc)
 - [WebRTC Data Channel MDN](https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel)
 - Signaling server: `wss://signaling.music-assistant.io/ws`
 ---
 ## Files in This Directory
 | File | Description |
 |------|-------------|
 | `FUTURE_IMPLEMENTATION_GUIDE.md` | This file - implementation guide |
 | `MA_WEBRTC_BUG_REPORT.md` | Bug report for MA team |
 | `WEBRTC_DISCONNECT_FIXES.md` | All fixes attempted |
 | `WEBRTC_PROGRESS.md` | Progress log |
 | `PLAN_B_SINGLE_CHANNEL.md` | Alternative single-channel approach |
 | `webrtc-failure-logs.txt` | Raw failure logs |
 | `console-export-*.log` | Browser console exports |
 ---
 ## Quick Start for Future Implementation
 1. Read this guide fully
 2. Review `WEBRTC_DISCONNECT_FIXES.md` for all attempted fixes
 3. Check if MA team has fixed server-side issues
 4. Start with basic implementation, add health monitoring early
 5. Test extensively before shipping - the failure mode is subtle
@@ -0,0 +1,127 @@
 # WebRTC Data Channel Failure on Android - Bug Report
 ## Summary
 When connecting to Music Assistant via WebRTC remote access (Nabu Casa), the `ma-api` data channel becomes **one-way** (can send, cannot receive) after 1-3 minutes of use, while the `sendspin` channel continues working normally.
 ## Environment
 - **MA Server**: 2.8.0b7 (Home Assistant add-on)
 - **Client**: Android app (Flutter) connecting via Nabu Casa remote access
 - **Remote Access**: WebRTC via `wss://signaling.music-assistant.io/ws`
 ## Reproduction Steps
 1. Connect to MA server via WebRTC remote access (not local network)
 2. Use the app normally - browse library, view players
 3. After 1-3 minutes, the connection degrades
 4. Commands time out, but signaling ping/pong continues working
 ## Observed Behavior
 ### Timeline from logs:
 ```
 07:14:20 - Working normally
           Health: API sent:51 recv:54 (balanced)
 07:15:57 - Receive stops
           Health: API sent:97 recv:97, lastRecv:12s ago
 07:16:02 - Timeouts begin
           "TimeoutException: Command timeout: players/all"
 07:16:17 - Sendspin still works!
           "Sendspin: Received server/time response"
           Health: API sent:114 recv:97, lastRecv:27s ago
 07:17:30 - Forced reconnect
           Health: API sent:137 recv:97, lastRecv:42s ago
           "Health check detected stale connection"
 ```
 ### Key Observation
 | Channel | Traffic Pattern | Status |
 |---------|-----------------|--------|
 | `ma-api` | High (10+ msg/s, large payloads) | **FAILS** - stops receiving |
 | `sendspin` | Low (~1 msg/5s, small payloads) | **SURVIVES** - continues working |
 | Signaling | Ping/pong every 15s | **SURVIVES** - continues working |
 The WebRTC peer connection remains in "connected" state. ICE connection shows "completed". Only the ma-api data channel stops receiving.
 ## Testing Performed
 ### Test 1: flutter_webrtc (Native WebRTC)
 - **Result**: ma-api channel dies after 1-3 minutes
 - **Sendspin**: Continues working
 ### Test 2: WebView-based WebRTC (Browser engine)
 - **Hypothesis**: Use Android WebView's browser-native WebRTC, since MA Web UI works
 - **Implementation**: Hidden InAppWebView running JavaScript WebRTC engine
 - **Result**: **Same failure mode** - ma-api dies, sendspin survives
 - **Conclusion**: Not a flutter_webrtc bug
 ### Test 3: Various Data Channel Settings
 - Tried `ordered: false` with `maxRetransmits: 3`
 - Tried letting server create channels (failed - server expects client to create)
 - No improvement
 ## Analysis
 The identical failure in both native and WebView WebRTC implementations suggests the issue is:
 1. **Server-side** - Different handling of ma-api vs sendspin channels
 2. **TURN relay** - High-traffic channel may hit limits
 3. **Not client-specific** - Both implementations fail identically
 ### Questions for MA Team
 1. Are the two data channels (`ma-api`, `sendspin`) created with different settings?
 2. Is there any server-side buffering or rate limiting that could affect high-traffic channels?
 3. Does the MA Web UI use different data channel configurations?
 4. Are there known issues with the TURN relay for sustained high-traffic channels?
 ## Comparison: MA Web UI vs Android App
 | Aspect | MA Web UI | Android App |
 |--------|-----------|-------------|
 | Platform | Browser tab (visible, active) | Background-capable app |
 | WebRTC | Browser native | flutter_webrtc / WebView |
 | Result | Works | Fails after 1-3 min |
 The MA Web UI runs in a **visible, active browser tab**. Android may throttle background apps differently, but this doesn't explain why sendspin survives while ma-api dies on the same connection.
 ## Logs
 ### Health Check Pattern (shows channel death)
 ```
 07:14:25 API sent:51 recv:54, lastRecv:2s ago   <- Working
 07:15:35 API sent:87 recv:91, lastRecv:2s ago   <- Working
 07:16:05 API sent:108 recv:97, lastRecv:17s ago <- DYING (gap growing)
 07:16:15 API sent:114 recv:97, lastRecv:27s ago <- DEAD
 07:16:45 API sent:130 recv:97, lastRecv:27s ago <- Still sending, no receive
 07:17:30 API sent:137 recv:97, lastRecv:42s ago <- Forced reconnect
 ```
 ### Sendspin Still Working During Failure
 ```
 07:16:17 Sendspin: Received server/time response  <- Still alive!
 07:16:47 Sendspin: Received server/time response  <- Still alive!
 ```
 ## Requested Information
 1. Data channel creation code/settings for both channels
 2. Any server-side differences in channel handling
 3. TURN server configuration details
 4. Whether this has been reported by other Android/mobile clients
 ## Workaround
 Currently using local WebSocket connection when on same network. Remote access via WebRTC is unusable for sustained use.
 ---
 **Reporter**: Ensemble Android App Developer
 **Date**: 2026-01-24
@@ -0,0 +1,149 @@
 # Plan B: Single Data Channel Multiplexing
 ## Why This Might Be Needed
 If upgrading flutter_webrtc doesn't fix the one-way channel failure, the root cause is likely a bug in how flutter_webrtc (or underlying libwebrtc) handles **multiple data channels**.
 Evidence:
 - MA Web UI works fine with local playback (same server, browser WebRTC)
 - Our app uses flutter_webrtc which has known issues:
  - [Issue #1428](https://github.com/flutter-webrtc/flutter-webrtc/issues/1428): Threading issues causing data loss
  - [Issue #974](https://github.com/flutter-webrtc/flutter-webrtc/issues/974): EventChannel intermittently fails
 - Pattern matches: second channel survives while first dies
 ## Current Architecture
 ```
 ┌─────────────────────────────────────────────────┐
 │              WebRTC Peer Connection             │
 ├────────────────────┬────────────────────────────┤
 │   ma-api channel   │     sendspin channel       │
 │   (JSON API)       │   (JSON + binary audio)    │
 │   SCTP stream 0    │     SCTP stream 1          │
 └────────────────────┴────────────────────────────┘
 ```
 ## Proposed Architecture
 ```
 ┌─────────────────────────────────────────────────┐
 │              WebRTC Peer Connection             │
 ├─────────────────────────────────────────────────┤
 │              unified channel                     │
 │    (multiplexed: API + Sendspin text + binary)  │
 │              SCTP stream 0                       │
 └─────────────────────────────────────────────────┘
 ```
 ## Multiplexing Protocol
 ### Message Framing
 Each message has a 1-byte type prefix:
 | Prefix | Type | Content |
 |--------|------|---------|
 | 0x00 | API | JSON text (MA API request/response) |
 | 0x01 | Sendspin Text | JSON text (Sendspin control messages) |
 | 0x02 | Sendspin Binary | Raw bytes (PCM audio data) |
 ### Implementation
 #### Sending (Client → Server)
 ```dart
 void sendApiMessage(String json) {
  final prefix = Uint8List.fromList([0x00]);
  final payload = utf8.encode(json);
  final message = Uint8List(1 + payload.length);
  message[0] = 0x00;
  message.setRange(1, message.length, payload);
  _dataChannel.send(RTCDataChannelMessage.fromBinary(message));
 }
 void sendSendspinText(String json) {
  final prefix = Uint8List.fromList([0x01]);
  final payload = utf8.encode(json);
  final message = Uint8List(1 + payload.length);
  message[0] = 0x01;
  message.setRange(1, message.length, payload);
  _dataChannel.send(RTCDataChannelMessage.fromBinary(message));
 }
 void sendSendspinBinary(Uint8List audio) {
  final message = Uint8List(1 + audio.length);
  message[0] = 0x02;
  message.setRange(1, message.length, audio);
  _dataChannel.send(RTCDataChannelMessage.fromBinary(message));
 }
 ```
 #### Receiving (Server → Client)
 ```dart
 void _onMessage(RTCDataChannelMessage message) {
  final data = message.binary;
  if (data == null || data.isEmpty) return;
  final type = data[0];
  final payload = data.sublist(1);
  switch (type) {
    case 0x00: // API
      final json = utf8.decode(payload);
      _handleApiMessage(json);
      break;
    case 0x01: // Sendspin text
      final json = utf8.decode(payload);
      _handleSendspinText(json);
      break;
    case 0x02: // Sendspin binary
      _handleSendspinBinary(payload);
      break;
  }
 }
 ```
 ## Server-Side Changes Required
 The Music Assistant server would need to:
 1. Accept a single "unified" data channel instead of separate ma-api and sendspin channels
 2. Multiplex responses using the same framing protocol
 3. This requires changes to the MA remote connection code
 **Alternative**: Keep server unchanged, do multiplexing in a proxy layer on the client.
 ## Client-Only Approach (No Server Changes)
 If we can't change the server, we could:
 1. Still create two channels to the server (ma-api + sendspin)
 2. But internally route them through a single "virtual" channel for flutter_webrtc
 3. This is more complex and may not avoid the underlying bug
 ## Files to Modify
 | File | Changes |
 |------|---------|
 | `webrtc_connection.dart` | Single channel creation, multiplexing logic |
 | `remote_bridge.dart` | Route messages based on type prefix |
 ## Risks
 1. **Server compatibility**: Requires MA server changes or complex client proxy
 2. **Performance**: Extra byte per message, decode overhead
 3. **Binary handling**: Must handle all messages as binary (not text)
 ## Testing Plan
 1. Implement client-side changes
 2. Test with modified server (if available) or mock
 3. Verify both API and Sendspin traffic flows correctly
 4. Long-duration stability test
 ## Decision Point
 Try this approach if:
 - flutter_webrtc 0.14.x doesn't fix the issue
 - The one-way failure pattern continues
 - We've confirmed the issue is multi-channel specific
@@ -0,0 +1,406 @@
 # WebRTC Data Channel Disconnect Fixes
 ## Document Purpose
 Track all fixes attempted for the WebRTC data channel disconnection issues in Ensemble's remote connection feature. This document should be referenced when debugging future disconnection problems.
 ---
 ## Problem Summary
 The WebRTC data channel between the Ensemble mobile app and Music Assistant server can fail in several ways:
 1. **One-way failure**: Data channel appears "open" but only sends work, receives stop
 2. **Silent disconnect**: No error events fire, channel just stops working
 3. **ICE failure**: ICE connection fails, properly detected but causes disconnect
 4. **Signaling disconnect**: Signaling WebSocket closes, causing ICE/WebRTC to fail
 ---
 ## Key Files
 | File | Purpose |
 |------|---------|
 | `lib/services/remote/webrtc_connection.dart` | WebRTC peer connection, data channel management |
 | `lib/services/remote/remote_bridge.dart` | WebSocket bridge, health monitoring, reconnection logic |
 | `lib/services/remote/signaling_client.dart` | Signaling server WebSocket connection |
 ---
 ## Implemented Fixes (Chronological)
 ### Fix 1: Data Channel Keepalive (Original)
 **Problem**: Data channel could silently die without any error events firing.
 **Solution**: Added periodic keepalive ping/pong on the data channel itself.
 **Code** (`webrtc_connection.dart`):
 - `_keepaliveTimer`: Runs every 10 seconds
 - `_checkKeepalive()`: Checks time since last data received
 - `_sendKeepalivePing()`: Sends JSON ping message
 - `_recordDataReceived()`: Called on every message receipt
 **Constants**:
 ```dart
 static const _keepaliveInterval = Duration(seconds: 10);
 static const _keepaliveTimeout = Duration(seconds: 20);  // Reduced from 30
 static const _maxKeepaliveMisses = 2;  // Reduced from 3
 ```
 ### Fix 2: ICE Recovery
 **Problem**: ICE connection could temporarily disconnect and might auto-recover.
 **Solution**: Added ICE recovery timer before declaring failure.
 **Code** (`webrtc_connection.dart`):
 - `_startIceRecovery()`: Starts 5-second timer when ICE disconnects
 - `_cancelIceRecovery()`: Cancels if ICE recovers on its own
 - `_attemptIceRestart()`: Calls `restartIce()` if recovery timer expires
 ### Fix 3: Flow Control (Buffer Overflow Prevention)
 **Problem**: Fire-and-forget sends could overflow the 16MB SCTP buffer, causing silent channel death.
 **Solution**: Added send-side flow control with buffering.
 **Code** (`webrtc_connection.dart`):
 ```dart
 static const _maxBufferedAmount = 1048576;  // 1MB threshold
 static const _bufferLowThreshold = 65536;   // 64KB resume threshold
 bool _sendPaused = false;
 final _sendQueue = <String>[];
 ```
 **Modified `sendRaw()`**:
 - Checks `bufferedAmount` before sending
 - Queues messages if buffer > 1MB
 - `onBufferedAmountLow` callback drains queue
 ### Fix 4: Health Check Stale Detection
 **Problem**: Health check could see "30s since last data" but not trigger reconnection.
 **Solution**: Reduced stale detection threshold from 45s to 30s.
 **Code** (`remote_bridge.dart`):
 ```dart
 if (_state == RemoteBridgeState.connected && timeSinceLastData > 30 && !_isReconnecting) {
  // Force reconnection
 }
 ```
 ### Fix 5: Reduced Keepalive Timeouts
 **Problem**: 30s timeout × 3 misses = 90s minimum before detection.
 **Solution**: Reduced to 20s timeout × 2 misses = ~40s detection.
 ### Fix 6: Recv Stagnation Detection
 **Problem**: One-way failure where recv stops but sent continues not detected quickly enough.
 **Solution**: Track recv count across health checks. If recv stuck while sent increases for 2 consecutive checks (20s), force reconnection.
 **Code** (`remote_bridge.dart`):
 ```dart
 // Track across health checks
 int _lastHealthCheckRecvCount = 0;
 int _lastHealthCheckSentCount = 0;
 int _recvStagnationCount = 0;
 // In health check:
 if (recvStuck && sentIncreased) {
  _recvStagnationCount++;
  if (_recvStagnationCount >= 2) {
    // Force reconnection - channel is one-way
  }
 }
 ```
 **Detection time**: ~20 seconds (2 × 10s health check interval)
 ---
 ## Log Patterns to Watch For
 ### Healthy Connection
 ```
 Health check - API sent:93 recv:88 ... lastRecv:0s ago
 ```
 - `sent` and `recv` both increasing
 - `lastRecv` low (< 5s typically)
 ### One-Way Failure (CRITICAL)
 ```
 Health check - API sent:206 recv:163 ... lastRecv:30s ago
 Health check - API sent:218 recv:163 ... lastRecv:40s ago
 ```
 - `sent` increases, `recv` STUCK
 - `lastRecv` keeps increasing
 - Data channel still shows "open"
 ### Signaling Disconnect
 ```
 WebRTC: Signaling disconnected
 ... (6-16 seconds later) ...
 WebRTC: ICE connection state: RTCIceConnectionStateDisconnected
 WebRTC: ICE connection state: RTCIceConnectionStateFailed
 ```
 ### Network Failure (DNS)
 ```
 Signaling: WebSocket closed
 ... (reconnection attempt) ...
 Signaling: Failed to connect: SocketException: Failed host lookup: 'signaling.music-assistant.io'
 ```
 This indicates the phone lost network connectivity entirely.
 ### Reconnection Storm (Signaling Instability)
 ```
 Signaling: Connecting to wss://signaling.music-assistant.io/ws
 Signaling: Sending connect-request
 Signaling: WebSocket closed  ← Closes within 100-500ms
 WebRTC: Signaling disconnected
 RemoteBridge: Scheduling reconnect attempt X/10 in Ys
 ```
 Rapid reconnection loop - signaling never stays connected long enough.
 ### Flow Control Engaged
 ```
 WebRTC: ⚠️ Buffer full (1234567 bytes) or paused - queueing message
 WebRTC: Buffer drained to 12345 bytes - draining 5 queued messages
 WebRTC: ✅ Send queue drained (5 messages) - resuming normal sends
 ```
 ### Keepalive Detection
 ```
 WebRTC: ⚠️ Keepalive timeout! No data for 22s (missed: 1/2)
 WebRTC: ❌ Data channel appears dead - triggering reconnection
 ```
 ---
 ## Known Issues / Limitations
 ### 1. flutter_webrtc Limitations
 - `RTCDataChannel.state` may show "open" when actually dead (Issue #843)
 - `bufferedAmount` may not be accurate on all platforms
 - `onBufferedAmountLow` callback support varies
 ### 2. SCTP Receive Window
 - If server sends faster than client processes, receive window fills
 - This causes server-side to stop sending, client sees no data
 - No way to monitor receive-side buffer from client
 ### 3. TURN Server Issues
 - aiortc (server-side) has known issues with TURN + DataChannel (#1156)
 - Data channel may fail silently when using TURN relay
 ### 4. Network Transitions
 - WiFi → Cellular or vice versa can cause ICE to fail
 - App backgrounding on mobile can close WebSocket/WebRTC
 ---
 ## Root Cause Categories
 ### Category A: Network Issues (Not Code Bugs)
 These are environmental issues, not bugs in our code:
 - **DNS failure**: `Failed host lookup` - Phone lost internet
 - **WiFi/Cellular switch**: Network changed, connections dropped
 - **Server unreachable**: Signaling server down or blocked
 - **Firewall/NAT issues**: TURN relay needed but unavailable
 **Evidence**: Signaling WebSocket closes, DNS lookups fail, reconnection attempts fail repeatedly.
 ### Category B: WebRTC/SCTP Issues (Partial Code Control)
 These can be mitigated but not fully prevented:
 - **One-way channel death**: Channel appears open but data stops flowing
 - **Buffer overflow**: Too much data sent, SCTP buffer exceeded
 - **ICE failure**: Network path lost, no recovery possible
 **Evidence**: Data channel shows "open" but `recv` stuck, `lastRecv` increasing.
 ### Category C: Code Bugs (Fixable)
 Issues in our implementation:
 - **Detection too slow**: Timeouts too long, misses too many
 - **Recovery not triggered**: State checks wrong, reconnection not started
 - **Resource leaks**: Timers not cancelled, connections not cleaned up
 **Evidence**: Logs show problem but no action taken, or wrong action taken.
 ---
 ## Debugging Checklist
 When investigating a disconnect:
 1. **Find the last successful response**:
   ```
   grep "WebRTC API → WS" logs.txt | head -5
   ```
 2. **Check health check progression**:
   ```
   grep "Health check" logs.txt
   ```
   Look for `recv` getting stuck while `sent` increases.
 3. **Check for signaling issues**:
   ```
   grep -i "signaling" logs.txt
   ```
 4. **Check ICE state changes**:
   ```
   grep "ICE connection state" logs.txt
   ```
 5. **Check for keepalive detection**:
   ```
   grep -i "keepalive" logs.txt
   ```
 6. **Check buffer status**:
   ```
   grep -E "(buffer|queue|paused)" logs.txt
   ```
 ---
 ## Potential Future Improvements
 ### 1. Server-Side Backpressure
 MA protocol doesn't have explicit backpressure. Could add:
 - Client-side request throttling
 - Application-level ACKs for critical messages
 ### 2. More Aggressive Detection
 - Track recv count across health checks, detect stagnation
 - Shorter keepalive interval (5s instead of 10s)
 ### 3. Proactive Health Signals
 - Monitor `bufferedAmount` trend (increasing = problem)
 - Track round-trip latency of keepalive pings
 ### 4. Connection Quality Metrics
 - Expose packet loss, jitter from WebRTC stats
 - Use to predict imminent failure
 ---
 ## Test Scenarios
 | Scenario | How to Test | Expected Behavior |
 |----------|-------------|-------------------|
 | Normal usage | Browse library, play music | No warnings |
 | Heavy sync | Pull-to-refresh library | Buffer may queue, should drain |
 | Long session | Leave connected 2+ hours | Should stay connected |
 | Rapid navigation | Quick tab switching | Brief queue usage, recovers |
 | Network change | WiFi → Cellular | Should detect and reconnect |
 | App background | Background for 5+ min | May disconnect, should reconnect |
 ---
 ## Observed Failure Patterns
 ### Pattern 1: One-Way Death After Library Sync
 **Observed**: 2026-01-23 (multiple times)
 ```
 17:13:06.175 - Last response (playlists sync)
 17:13:06.264 - Local batch save
 -- 5 seconds silence --
 17:13:11.005 - Send players/all → NO RESPONSE
 17:13:13.914 - ICE state: completed (looks healthy!)
 17:13:28 - Keepalive detects timeout
 17:13:38 - Reconnection triggered
 ```
 **Characteristics**:
 - Often happens after library sync (large batch responses)
 - ICE shows "completed" even though data channel is dead
 - Signaling ping/pong continues working
 - Only data channel receive is affected
 **Hypothesis**:
 - Server-side SCTP buffer exhausted from sending large responses?
 - Client receive window full, server blocks?
 - flutter_webrtc onMessage callback stops firing?
 ### Pattern 2: Reconnection Storm / Signaling Instability
 **Observed**: 2026-01-23 17:30-17:31
 ```
 17:31:05.093 - Signaling: Connecting
 17:31:05.216 - Signaling: Sending connect-request
 17:31:05.218 - Signaling: WebSocket closed (123ms later!)
 17:31:05.218 - WebRTC: Signaling disconnected
 ```
 **Characteristics**:
 - Signaling WebSocket closes almost immediately after connect
 - Multiple rapid reconnection attempts (storm)
 - Connection never stable long enough for data flow
 - Often happens after network instability
 - Artist detail, albums etc don't load because connection keeps failing
 **Possible Causes**:
 - Network instability (WiFi/cellular issues)
 - Signaling server rate limiting
 - DNS resolution failures
 - Server rejecting rapid reconnection attempts
 **Side Effects**:
 - UI shows errors like "Not connected to Music Assistant server"
 - Artist/album detail screens fail to load
 - Players list empty or stale
 ### Pattern 3: API Channel Dies While Sendspin Lives
 **Observed**: 2026-01-23 17:53
 ```
 17:53:35.755 - Send album_tracks request → NO RESPONSE
 17:53:40.596 - Health check: recv stuck at 197, sent increased
 17:53:55.204 - Sendspin channel RECEIVES server/time response!
 17:54:02.790 - Keepalive detects dead API channel
 ```
 **Characteristics**:
 - API data channel (ma-api) stops receiving
 - Sendspin data channel continues working normally
 - Same WebRTC peer connection, different data channels
 - This proves it's NOT a network issue - Sendspin traffic flows fine
 **Hypothesis**:
 - flutter_webrtc bug where `onMessage` callback stops firing for one channel
 - Possible memory/GC issue with the callback
 - Server-side might be sending to wrong channel?
 **Key Evidence**:
 - Recv count stays at 197 for API
 - Sendspin recv count increases (7→8)
 - Both channels use same peer connection
 ---
 ## Version History
 | Date | Build | Changes |
 |------|-------|---------|
 | 2026-01-23 | ~v49 | Initial flow control implementation |
 | 2026-01-23 | ~v49 | Reduced keepalive timeout 30→20s, misses 3→2 |
 | 2026-01-23 | ~v49 | Reduced health check stale threshold 45→30s |
 | 2026-01-23 | ~v49 | Fixed excessive "queue drained" logging |
 | 2026-01-23 | ~v49 | Created WEBRTC_DISCONNECT_FIXES.md documentation |
 | 2026-01-23 | ~v49 | Added recv stagnation detection (20s detection) |
 | 2026-01-23 | ~v49 | Documented Pattern 2: Reconnection storm / signaling instability |
 | 2026-01-23 | ~v49 | Fixed race condition in _scheduleReconnect (multiple simultaneous calls) |
 | 2026-01-23 | ~v49 | Added WebSocket close code/reason logging to signaling |
 | 2026-01-23 | ~v49 | **CRITICAL FIX**: _reconnectWebRTC() was returning immediately due to _isReconnecting already being true |
 | 2026-01-23 | ~v49 | Fixed old WebRTC callbacks firing during reconnection cleanup (clear callbacks before disconnect) |
 | 2026-01-23 | ~v49 | Fixed onStateChanged handler calling _handleWebRTCDisconnection during active reconnection |
 ---
 ## References
 - flutter_webrtc Issue #843: Data channel state unreliable
 - aiortc Issue #1156: TURN + DataChannel bugs
 - WebRTC SCTP: Max buffer is 16MB, recommended threshold 1MB
 - Music Assistant remote protocol: No explicit flow control
@@ -0,0 +1,118 @@
 # WebRTC Remote Connection Progress
 ## Problem Statement
 The flutter_webrtc library has reliability issues causing data channel failures during remote connections via Nabu Casa. The ma-api data channel becomes one-way (can send, but receives stop) after some time, while the sendspin channel continues working.
 ## Approaches Tried
 ### 1. Original Implementation (flutter_webrtc)
 - **Status**: Fails
 - **Issue**: ma-api data channel goes one-way after some time
 - **Files**: `lib/services/remote/webrtc_connection.dart`
 ### 2. WebView-based WebRTC Implementation
 - **Status**: Same failure mode
 - **Hypothesis**: Use browser-native WebRTC via InAppWebView, since MA Web UI works
 - **Result**: Same one-way channel death occurs
 - **Key Finding**: This proves the issue is NOT specific to flutter_webrtc
 ## Key Observations
 From the logs:
 ```
 lastRecv:26s ago          <- No messages received in 26 seconds
 API sent:674 recv:618     <- Gap growing, responses stopped
 ```
 - Signaling ping/pong continues working
 - Sendspin channel continues receiving (`server/time` responses)
 - Only ma-api channel becomes one-way
 - WebRTC peer connection itself remains "connected"
 ## Differences from Working MA Web UI
 The MA Web UI runs in a **visible, active browser tab**. Our implementations:
 1. flutter_webrtc: Native WebRTC in background app
 2. WebView: Browser WebRTC in **hidden 1x1 pixel WebView**
 Android aggressively throttles hidden WebViews to save battery.
 ## Current Implementation (WebView)
 ### Files Created
 | File | Purpose |
 |------|---------|
 | `lib/services/remote/webview_webrtc_connection.dart` | Dart WebView wrapper |
 | `assets/webrtc_engine.js` | JavaScript WebRTC engine |
 ### Files Modified
 | File | Changes |
 |------|---------|
 | `pubspec.yaml` | Added `flutter_inappwebview: ^6.0.0` |
 | `lib/services/remote/remote_bridge.dart` | Uses `WebViewWebRTCConnection` |
 | `lib/providers/music_assistant_provider.dart` | Exposes WebView widget |
 | `lib/main.dart` | Adds WebView to widget tree |
 ### Architecture
 ```
 MusicAssistantAPI -> localhost WebSocket -> RemoteBridge
                                              |
                                   WebViewWebRTCConnection
                                              |
                                   Hidden InAppWebView
                                              |
                                   JavaScript WebRTC Engine
                                              |
                                   MA Server via TURN
 ```
 ## Current Fixes Being Tested
 ### 1. Prevent WebView Throttling
 - Changed WebView position from off-screen (-10,-10) to on-screen (0,0) with Opacity(0)
 - Added various InAppWebViewSettings to prevent background throttling
 ### 2. Data Channel Settings
 - Changed from `ordered: true` to `ordered: false` with `maxRetransmits: 3`
 - Hypothesis: Ordered delivery may cause buffer bloat issues
 ### 3. Buffer Monitoring
 - Added `bufferedAmount` checking in JavaScript
 - Logs warning when buffer exceeds 1MB
 - Added `getChannelHealth()` function for diagnostics
 ### 4. Reduced Logging
 - Removed per-message logging (was filling logs too fast)
 - Keep only state changes, errors, and warnings
 ## Experiments Completed
 ### 5. Server-Created Channels (Failed)
 - **Hypothesis**: Let server create data channels to avoid ID collisions
 - **Result**: Connection timeout - server expects CLIENT to create channels
 - **Learning**: Client must create channels before sending offer
 ## Next Steps to Try
 1. **Make WebView actually visible** - Android may still throttle Opacity(0) WebView
 2. **Single data channel** - Use only ma-api, disable sendspin
 3. **Periodic channel recreation** - Detect stale channel and recreate
 4. **Report to MA team** - Browser WebRTC also fails, suggesting server-side issue
 ## Test APK Location
 `/home/chris/Ensemble/ensemble-webview-webrtc.apk`
 ## Useful Debug Commands
 Check channel health (in JS console or via Dart):
 ```javascript
 getChannelHealth()
 // Returns: { peerConnection, iceConnection, apiChannel, apiBuffered, sendspinChannel, sendspinBuffered, signalingConnected }
 ```
 ## Open Questions
 1. Why does sendspin channel survive when ma-api dies?
 2. Is there a difference in how MA server handles the two channels?
 3. Does MA Web UI use different data channel settings?
 4. Is there a TURN relay issue specific to high-traffic channels?
@@ -0,0 +1,2 @@
 New package ID (com.collotsspot.ensemble) - reinstall required.
 Prepares for F-Droid and Play Store submission.
@@ -0,0 +1 @@
 Add fastlane metadata for F-Droid.
@@ -0,0 +1 @@
 Disable dependency metadata in APK for F-Droid compliance.
@@ -0,0 +1,13 @@
 Ensemble is an unofficial, community-built mobile client for Music Assistant, providing both local playback and remote control of your music library.
 Features:
 * Stream music directly to your phone with background playback
 * Control any speaker or device connected to Music Assistant
 * Multi-room grouping capabilities
 * Queue management with drag-to-reorder
 * Background playback with media notifications
 * Fast ~300ms response for play/pause controls
 Ensemble supports both local playback (streaming to your phone) and remote control of any Music Assistant player in your home.
 Note: Requires a running Music Assistant server. This is a community project and is not affiliated with the official Music Assistant team.
@@ -0,0 +1 @@
 Unofficial mobile client for Music Assistant
@@ -0,0 +1 @@
 Ensemble
@@ -25,4 +25,28 @@ class HeroTags {
  /// Audiobook author image hero tag prefix
  static const String authorImage = 'author_image_';
  /// Podcast cover hero tag prefix
  static const String podcastCover = 'podcast_cover_';
  /// Podcast title hero tag prefix
  static const String podcastTitle = 'podcast_title_';
  /// Podcast episode cover hero tag prefix
  static const String podcastEpisodeCover = 'podcast_episode_cover_';
  /// Podcast episode title hero tag prefix
  static const String podcastEpisodeTitle = 'podcast_episode_title_';
  /// Playlist cover hero tag prefix
  static const String playlistCover = 'playlist_cover_';
  /// Playlist title hero tag prefix
  static const String playlistTitle = 'playlist_title_';
  /// Radio station cover hero tag prefix
  static const String radioCover = 'radio_cover_';
  /// Radio station title hero tag prefix
  static const String radioTitle = 'radio_title_';
 }
@@ -10,4 +10,7 @@ class NetworkConstants {
  /// Default HTTP port
  static const int defaultHttpPort = 80;
  /// Maximum number of pending WebSocket requests to prevent memory leaks
  static const int maxPendingRequests = 100;
 }
@@ -8,6 +8,9 @@ class Timings {
  /// Player state polling interval (for selected player updates)
  static const Duration playerPollingInterval = Duration(seconds: 5);
  /// Notification position update interval (for updating playback position in notification)
  static const Duration notificationPositionUpdate = Duration(seconds: 1);
  /// Local player state report interval
  /// Note: Sendspin protocol only requires state on changes, not periodic reports.
  /// This is mainly for local UI position tracking. Set to 5s to reduce server traffic.
@@ -31,6 +34,9 @@ class Timings {
  /// Search debounce delay
  static const Duration searchDebounce = Duration(milliseconds: 500);
  /// Navigation debounce to prevent double-tap navigation
  static const Duration navigationDebounce = Duration(milliseconds: 500);
  /// Delay after track change before updating state
  static const Duration trackChangeDelay = Duration(milliseconds: 500);
 }
@@ -51,3 +57,62 @@ class LibraryConstants {
  /// Default limit for recent/random items
  static const int defaultRecentLimit = 10;
 }
 /// Image/artwork size constants
 class ImageSizes {
  ImageSizes._();
  /// Default image size for artwork (256x256)
  static const int defaultSize = 256;
  /// High resolution image size for player/overlay (512x512)
  static const int highRes = 512;
  /// Maximum image size for large displays
  static const int max = 1024;
 }
 /// Volume control constants
 class VolumeConstants {
  VolumeConstants._();
  /// Minimum volume level
  static const int min = 0;
  /// Maximum volume level
  static const int max = 100;
  /// Volume range for validation (0-100)
  static const int range = 100;
 }
 /// Player state constants
 class PlayerStates {
  PlayerStates._();
  /// Player is playing media
  static const String playing = 'playing';
  /// Player is paused
  static const String paused = 'paused';
  /// Player is idle/nothing loaded
  static const String idle = 'idle';
  /// Player is off/disconnected
  static const String off = 'off';
 }
 /// Repeat mode constants
 class RepeatModes {
  RepeatModes._();
  /// Repeat is off
  static const String off = 'off';
  /// Repeat all tracks
  static const String all = 'all';
  /// Repeat single track
  static const String one = 'one';
 }
@@ -25,6 +25,8 @@ class Profiles extends Table {
 }
 /// Recently played items - scoped by profile
@TableIndex(name: 'idx_recently_played_profile', columns: {#profileUsername})
@TableIndex(name: 'idx_recently_played_profile_played', columns: {#profileUsername, #playedAt})
 class RecentlyPlayed extends Table {
  /// Auto-incrementing ID
  IntColumn get id => integer().autoIncrement()();
@@ -55,6 +57,8 @@ class RecentlyPlayed extends Table {
 }
 /// Cached library items for fast startup
@TableIndex(name: 'idx_library_cache_type', columns: {#itemType})
@TableIndex(name: 'idx_library_cache_type_deleted', columns: {#itemType, #isDeleted})
 class LibraryCache extends Table {
  /// Composite key: provider + item_id
  TextColumn get cacheKey => text()();
@@ -74,6 +78,10 @@ class LibraryCache extends Table {
  /// Whether this item was deleted on the server
  BoolColumn get isDeleted => boolean().withDefault(const Constant(false))();
  /// Provider instance IDs that provided this item (JSON array)
  /// Used for client-side filtering by source provider
  TextColumn get sourceProviders => text().withDefault(const Constant('[]'))();
  @override
  Set<Column> get primaryKey => {cacheKey};
 }
@@ -139,6 +147,8 @@ class CachedPlayers extends Table {
 }
 /// Cached queue items for selected player
@TableIndex(name: 'idx_cached_queue_player', columns: {#playerId})
@TableIndex(name: 'idx_cached_queue_player_position', columns: {#playerId, #position})
 class CachedQueue extends Table {
  /// Auto-incrementing ID for ordering
  IntColumn get id => integer().autoIncrement()();
@@ -185,7 +195,7 @@ class AppDatabase extends _$AppDatabase {
  AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
  @override
-  int get schemaVersion => 4;
+  int get schemaVersion => 6;
  @override
  MigrationStrategy get migration {
@@ -208,6 +218,22 @@ class AppDatabase extends _$AppDatabase {
        if (from < 4) {
          await m.createTable(searchHistory);
        }
        // Migration from v4 to v5: Add indexes for query performance
        if (from < 5) {
          // RecentlyPlayed indexes
          await customStatement('CREATE INDEX IF NOT EXISTS idx_recently_played_profile ON recently_played (profile_username)');
          await customStatement('CREATE INDEX IF NOT EXISTS idx_recently_played_profile_played ON recently_played (profile_username, played_at)');
          // LibraryCache indexes
          await customStatement('CREATE INDEX IF NOT EXISTS idx_library_cache_type ON library_cache (item_type)');
          await customStatement('CREATE INDEX IF NOT EXISTS idx_library_cache_type_deleted ON library_cache (item_type, is_deleted)');
          // CachedQueue indexes
          await customStatement('CREATE INDEX IF NOT EXISTS idx_cached_queue_player ON cached_queue (player_id)');
          await customStatement('CREATE INDEX IF NOT EXISTS idx_cached_queue_player_position ON cached_queue (player_id, position)');
        }
        // Migration from v5 to v6: Add source_providers column for client-side filtering
        if (from < 6) {
          await customStatement("ALTER TABLE library_cache ADD COLUMN source_providers TEXT NOT NULL DEFAULT '[]'");
        }
      },
    );
  }
@@ -350,20 +376,57 @@ class AppDatabase extends _$AppDatabase {
  // ============================================
  /// Cache a library item
  /// [sourceProvider] - the provider instance ID that provided this item (for filtering)
  Future<void> cacheItem({
    required String itemType,
    required String itemId,
    required String data,
    String? sourceProvider,
  }) async {
    final cacheKey = '${itemType}_$itemId';
-    await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
+    // If sourceProvider is specified, we need to merge with existing providers
-      cacheKey: cacheKey,
+    if (sourceProvider != null) {
-      itemType: itemType,
+      final existing = await getCachedItem(itemType, itemId);
-      itemId: itemId,
+      List<String> providers = [];
-      data: data,
+      if (existing != null) {
-      lastSynced: DateTime.now(),
+        try {
-    ));
+          final existingProviders = existing.sourceProviders;
          if (existingProviders.isNotEmpty && existingProviders != '[]') {
            providers = List<String>.from(
              (await Future.value(existingProviders))
                  .replaceAll('[', '')
                  .replaceAll(']', '')
                  .replaceAll('"', '')
                  .split(',')
                  .where((s) => s.trim().isNotEmpty)
                  .map((s) => s.trim()),
            );
          }
        } catch (_) {}
      }
      if (!providers.contains(sourceProvider)) {
        providers.add(sourceProvider);
      }
      final sourceProvidersJson = '[${providers.map((p) => '"$p"').join(',')}]';
      await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
        cacheKey: cacheKey,
        itemType: itemType,
        itemId: itemId,
        data: data,
        lastSynced: DateTime.now(),
        sourceProviders: Value(sourceProvidersJson),
      ));
    } else {
      await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
        cacheKey: cacheKey,
        itemType: itemType,
        itemId: itemId,
        data: data,
        lastSynced: DateTime.now(),
      ));
    }
  }
  /// Get cached items by type
@@ -632,4 +695,66 @@ class AppDatabase extends _$AppDatabase {
  Future<void> clearSearchHistory() async {
    await delete(searchHistory).go();
  }
  // ============================================
  // Batch Cache Operations
  // ============================================
  /// Batch size for chunked inserts to prevent SQLite limits
  static const int _batchChunkSize = 500;
  /// Batch cache multiple items efficiently using drift batch API
  /// This is much faster than individual inserts for large datasets.
  /// Items are chunked into batches of 500 to prevent SQLite variable limits.
  ///
  /// [items] - List of items to cache, each containing:
  ///   - itemType: 'album', 'artist', 'track', 'playlist', 'audiobook', etc.
  ///   - itemId: the item's ID
  ///   - data: JSON string of the item
  ///   - sourceProviders: list of provider instance IDs
  Future<void> batchCacheItems(List<BatchCacheItem> items) async {
    if (items.isEmpty) return;
    // Process in chunks to avoid SQLite variable limits
    for (var i = 0; i < items.length; i += _batchChunkSize) {
      final chunk = items.skip(i).take(_batchChunkSize).toList();
      await batch((b) {
        for (final item in chunk) {
          final cacheKey = '${item.itemType}_${item.itemId}';
          final sourceProvidersJson = item.sourceProviders.isEmpty
              ? '[]'
              : '[${item.sourceProviders.map((p) => '"$p"').join(',')}]';
          b.insert(
            libraryCache,
            LibraryCacheCompanion.insert(
              cacheKey: cacheKey,
              itemType: item.itemType,
              itemId: item.itemId,
              data: item.data,
              lastSynced: DateTime.now(),
              sourceProviders: Value(sourceProvidersJson),
            ),
            mode: InsertMode.insertOrReplace,
          );
        }
      });
    }
  }
 }
 /// Data class for batch cache operations
 class BatchCacheItem {
  final String itemType;
  final String itemId;
  final String data;
  final List<String> sourceProviders;
  const BatchCacheItem({
    required this.itemType,
    required this.itemId,
    required this.data,
    this.sourceProviders = const [],
  });
 }
@@ -68,6 +68,12 @@
  "tracks": "Songs",
  "playlists": "Wiedergabelisten",
  "audiobooks": "Hörbücher",
  "music": "Musik",
  "radio": "Radio",
  "stations": "Sender",
  "selectLibrary": "Bibliothek auswählen",
  "noRadioStations": "Keine Radiosender",
  "addRadioStationsHint": "Füge Radiosender in Music Assistant hinzu",
  "searchFailed": "Suche fehlgeschlagen. Bitte überprüfe deine Verbindung.",
  "queue": "Warteschlange",
@@ -197,6 +203,7 @@
  "english": "Englisch",
  "german": "Deutsch",
  "spanish": "Spanisch",
  "french": "Französisch",
  "noTracksInPlaylist": "Keine Songs in Wiedergabeliste",
  "sortAlphabetically": "Alphabetisch sortieren",
@@ -287,5 +294,16 @@
  "showHints": "Hinweise anzeigen",
  "showHintsDescription": "Hilfreiche Tipps zum Entdecken von Funktionen anzeigen",
  "pullToSelectPlayers": "Ziehen um Geräte auszuwählen",
-  "holdToSync": "Gerät gedrückt halten zum Synchronisieren"
+  "holdToSync": "Gedrückt halten zum Sync",
  "swipeToAdjustVolume": "Wischen für Lautstärke",
  "aboutAndSupport": "Über & Unterstützung",
  "supportDevelopment": "Entwicklung unterstützen",
  "ensembleIsUnofficial": "Ensemble ist ein inoffizieller, von der Community erstellter Client. Erwäge, die Entwicklung zu unterstützen.",
  "sponsorOnGitHub": "Auf GitHub sponsoren",
  "buyMeAKoFi": "Kauf mir einen Ko-fi",
  "aboutEnsemble": "Über Ensemble",
  "version": "Version",
  "visitGitHubRepo": "GitHub-Repository besuchen",
  "reportABug": "Einen Fehler melden"
 }
@@ -51,7 +51,7 @@
    "description": "Hint for port field"
  },
-  "portDescription": "Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.",
+  "portDescription": "Leave blank unless using a custom port",
  "@portDescription": {
    "description": "Description for port field"
  },
@@ -221,6 +221,36 @@
    "description": "Home screen section title"
  },
  "discoveryMixes": "Discovery Mixes",
  "@discoveryMixes": {
    "description": "Provider discovery mixes (e.g., Tidal playlists)"
  },
  "discoveryMixesDescription": "Show provider recommendation mixes (e.g., Tidal Daily Mixes, Discover Weekly) on home screen",
  "@discoveryMixesDescription": {
    "description": "Description for discovery mixes setting"
  },
  "discoveryRows": "Discovery rows from Music Assistant",
  "@discoveryRows": {
    "description": "Label for discovery rows section"
  },
  "refreshDiscoveryRows": "Refresh available rows",
  "@refreshDiscoveryRows": {
    "description": "Button to refresh discovery rows"
  },
  "noDiscoveryRows": "No discovery rows available",
  "@noDiscoveryRows": {
    "description": "Empty state when no discovery rows available"
  },
  "discoveryRowBadge": "Music Assistant",
  "@discoveryRowBadge": {
    "description": "Badge label for discovery rows"
  },
  "continueListening": "Continue Listening",
  "@continueListening": {
    "description": "Home screen section title"
@@ -251,6 +281,21 @@
    "description": "Home screen section title"
  },
  "favoritePlaylists": "Favorite Playlists",
  "@favoritePlaylists": {
    "description": "Home screen section title"
  },
  "favoriteRadioStations": "Favorite Radio Stations",
  "@favoriteRadioStations": {
    "description": "Home screen section title"
  },
  "favoritePodcasts": "Favorite Podcasts",
  "@favoritePodcasts": {
    "description": "Home screen section title"
  },
  "searchMusic": "Search music...",
  "@searchMusic": {
    "description": "Search placeholder text"
@@ -316,6 +361,36 @@
    "description": "Audiobooks category"
  },
  "music": "Music",
  "@music": {
    "description": "Music category"
  },
  "radio": "Radio",
  "@radio": {
    "description": "Radio category"
  },
  "stations": "Stations",
  "@stations": {
    "description": "Radio stations subcategory"
  },
  "selectLibrary": "Select Library",
  "@selectLibrary": {
    "description": "Title for library type selection bottom sheet"
  },
  "noRadioStations": "No radio stations",
  "@noRadioStations": {
    "description": "Empty state when no radio stations are available"
  },
  "addRadioStationsHint": "Add radio stations in Music Assistant",
  "@addRadioStationsHint": {
    "description": "Hint for adding radio stations"
  },
  "searchFailed": "Search failed. Please check your connection.",
  "@searchFailed": {
    "description": "Search error message"
@@ -559,6 +634,11 @@
  "tracksAddedToQueue": "Tracks added to queue",
  "@tracksAddedToQueue": {
    "description": "Snackbar message for tracks added to queue"
  },
  "trackAddedToQueue": "Track added to queue",
  "@trackAddedToQueue": {
    "description": "Confirmation when tracks added"
  },
@@ -630,6 +710,16 @@
    "description": "Radio button label"
  },
  "playingRadioStation": "Playing {name}",
  "@playingRadioStation": {
    "description": "Status when playing radio station",
    "placeholders": {
      "name": {
        "type": "String"
      }
    }
  },
  "addedToQueue": "Added to queue",
  "@addedToQueue": {
    "description": "Confirmation when item added to queue"
@@ -1005,10 +1095,19 @@
    "description": "Spanish language"
  },
  "french": "French",
  "@french": {
    "description": "French language"
  },
  "noTracksInPlaylist": "No tracks in playlist",
  "sortAlphabetically": "Sort alphabetically",
  "sortByYear": "Sort by year",
  "sortBySeriesOrder": "Sort by series order",
  "sortByDuration": "Sort by duration",
  "newestFirst": "Newest first",
  "oldestFirst": "Oldest first",
  "viewDetails": "View details",
  "listView": "List view",
  "gridView": "Grid view",
  "noBooksInSeries": "No books found in this series",
@@ -1022,10 +1121,17 @@
  "showFavoriteAlbums": "Show a row of your favorite albums",
  "showFavoriteArtists": "Show a row of your favorite artists",
  "showFavoriteTracks": "Show a row of your favorite tracks",
  "showFavoritePlaylists": "Show a row of your favorite playlists",
  "showFavoriteRadioStations": "Show a row of your favorite radio stations",
  "showFavoritePodcasts": "Show a row of your favorite podcasts",
  "extractColorsFromArtwork": "Extract colors from album and artist artwork",
  "chooseHomeScreenRows": "Choose which rows to display on the home screen",
  "favorite": "Favorite",
  "addedToFavorites": "Added to favorites",
  "removedFromFavorites": "Removed from favorites",
  "addedToLibrary": "Added to library",
  "removedFromLibrary": "Removed from library",
  "addToLibrary": "Add",
  "unknown": "Unknown",
  "noUpcomingTracks": "No upcoming tracks",
  "showAll": "Show all",
@@ -1036,6 +1142,10 @@
  "shows": "Shows",
  "podcasts": "Podcasts",
  "podcastSupportComingSoon": "Podcast support coming soon",
  "noPodcasts": "No podcasts",
  "addPodcastsHint": "Subscribe to podcasts in Music Assistant",
  "episodes": "Episodes",
  "episode": "Episode",
  "playlist": "Playlist",
  "connectionError": "Connection Error",
  "twoColumnGrid": "2-column grid",
@@ -1070,6 +1180,10 @@
  "audiobookLibraries": "Audiobook Libraries",
  "chooseAudiobookLibraries": "Choose which Audiobookshelf libraries to include",
  "unknownLibrary": "Unknown Library",
  "musicProviders": "Music Providers",
  "musicProvidersDescription": "Choose which accounts to show in your library",
  "libraryRefreshing": "Refreshing library...",
  "cannotDisableLastProvider": "Cannot disable the last provider",
  "noSeriesFound": "No Series Found",
  "ensembleBugReport": "Ensemble Bug Report",
  "byOwner": "By {owner}",
@@ -1133,11 +1247,21 @@
    "description": "Bottom sheet title for adding album to queue"
  },
  "addToQueue": "Add to queue",
  "@addToQueue": {
    "description": "Add item to queue on selected player"
  },
  "addToQueueOn": "Add to queue on...",
  "@addToQueueOn": {
    "description": "Bottom sheet title for adding to queue"
  },
  "startRadio": "Start radio",
  "@startRadio": {
    "description": "Start radio on selected player"
  },
  "startRadioOn": "Start {name} radio on...",
  "@startRadioOn": {
    "description": "Bottom sheet title for starting radio",
@@ -1168,6 +1292,11 @@
    "description": "Singular form of track for search type indicator"
  },
  "podcastSingular": "Podcast",
  "@podcastSingular": {
    "description": "Singular form of podcast for search type indicator"
  },
  "trackCount": "{count} {count, plural, =1{track} other{tracks}}",
  "@trackCount": {
    "description": "Track count with plural",
@@ -1213,6 +1342,16 @@
    "description": "Description for smart sort players setting"
  },
  "disableAutoSwitch": "Disable Auto-Switch",
  "@disableAutoSwitch": {
    "description": "Setting to disable automatic player switching"
  },
  "disableAutoSwitchDescription": "Never automatically switch to a different player",
  "@disableAutoSwitchDescription": {
    "description": "Description for disable auto-switch setting"
  },
  "playerStateUnavailable": "Unavailable",
  "@playerStateUnavailable": {
    "description": "Player state when unavailable"
@@ -1268,16 +1407,46 @@
    "description": "Description for show hints toggle"
  },
  "volumePrecisionMode": "Volume Precision Mode",
  "@volumePrecisionMode": {
    "description": "Setting for fine volume control"
  },
  "volumePrecisionModeDescription": "Hold still while adjusting volume for fine control",
  "@volumePrecisionModeDescription": {
    "description": "Description for volume precision mode setting"
  },
  "display": "Display",
  "@display": {
    "description": "Settings section title for display options"
  },
  "showProviderIcons": "Show Provider Icons",
  "@showProviderIcons": {
    "description": "Toggle label for showing provider icons on album art"
  },
  "showProviderIconsDescription": "Display provider logos on album art",
  "@showProviderIconsDescription": {
    "description": "Description for show provider icons toggle"
  },
  "pullToSelectPlayers": "Pull to select players",
  "@pullToSelectPlayers": {
    "description": "Hint shown when mini player bounces"
  },
-  "holdToSync": "Tap and hold a player to sync",
+  "holdToSync": "Long-press to sync",
  "@holdToSync": {
    "description": "Hint for long-press to sync players"
  },
  "swipeToAdjustVolume": "Swipe to adjust volume",
  "@swipeToAdjustVolume": {
    "description": "Hint for swiping left/right to adjust player volume"
  },
  "selectPlayerHint": "Choose a player, or dismiss by swiping down",
  "@selectPlayerHint": {
    "description": "First-time hint for selecting a player in device selector"
@@ -1301,5 +1470,303 @@
  "dismissPlayerHint": "Swipe down, tap outside, or press back to return",
  "@dismissPlayerHint": {
    "description": "Hint explaining how to dismiss the player selector"
  },
  "playingAlbum": "Playing {albumName}",
  "@playingAlbum": {
    "description": "Message shown when starting to play an album",
    "placeholders": {
      "albumName": {
        "type": "String"
      }
    }
  },
  "playingPlaylist": "Playing {playlistName}",
  "@playingPlaylist": {
    "description": "Message shown when starting to play a playlist",
    "placeholders": {
      "playlistName": {
        "type": "String"
      }
    }
  },
  "noTracks": "No tracks",
  "@noTracks": {
    "description": "Empty state title when no tracks exist in library"
  },
  "addTracksHint": "Add some music to your library to see tracks here",
  "@addTracksHint": {
    "description": "Hint for adding tracks to library"
  },
  "noFavoriteRadioStations": "No favorite radio stations",
  "@noFavoriteRadioStations": {
    "description": "Empty state when no favorite radio stations"
  },
  "longPressRadioHint": "Long-press a station and tap the heart to add it to favorites",
  "@longPressRadioHint": {
    "description": "Hint for favoriting radio stations"
  },
  "noFavoritePodcasts": "No favorite podcasts",
  "@noFavoritePodcasts": {
    "description": "Empty state when no favorite podcasts"
  },
  "longPressPodcastHint": "Long-press a podcast and tap the heart to add it to favorites",
  "@longPressPodcastHint": {
    "description": "Hint for favoriting podcasts"
  },
  "failedToPlayRadioStation": "Failed to play radio station: {error}",
  "@failedToPlayRadioStation": {
    "description": "Error when playing radio station fails",
    "placeholders": {
      "error": {
        "type": "String"
      }
    }
  },
  "itemAlreadyInLibrary": "Item is already in library",
  "@itemAlreadyInLibrary": {
    "description": "Message when trying to add item already in library"
  },
  "failedToAddToLibrary": "Failed to add to library",
  "@failedToAddToLibrary": {
    "description": "Error when adding to library fails"
  },
  "cannotFindLibraryId": "Cannot find library ID for removal",
  "@cannotFindLibraryId": {
    "description": "Error when library ID not found for removal"
  },
  "failedToRemoveFromLibrary": "Failed to remove from library",
  "@failedToRemoveFromLibrary": {
    "description": "Error when removing from library fails"
  },
  "failedToPlayAlbum": "Failed to play album: {error}",
  "@failedToPlayAlbum": {
    "description": "Error when playing album fails",
    "placeholders": {
      "error": {
        "type": "String"
      }
    }
  },
  "playingOnPlayer": "Playing {name} on {playerName}",
  "@playingOnPlayer": {
    "description": "Status when playing item on specific player",
    "placeholders": {
      "name": {
        "type": "String"
      },
      "playerName": {
        "type": "String"
      }
    }
  },
  "failedToPlayPlaylist": "Failed to play playlist: {error}",
  "@failedToPlayPlaylist": {
    "description": "Error when playing playlist fails",
    "placeholders": {
      "error": {
        "type": "String"
      }
    }
  },
  "failedToPlayAudiobook": "Failed to play audiobook: {error}",
  "@failedToPlayAudiobook": {
    "description": "Error when playing audiobook fails",
    "placeholders": {
      "error": {
        "type": "String"
      }
    }
  },
  "noOtherPlayersAvailable": "No other players available",
  "@noOtherPlayersAvailable": {
    "description": "Message when no other players available for transfer"
  },
  "transferQueue": "Transfer queue",
  "@transferQueue": {
    "description": "Tooltip for transfer queue button"
  },
  "clearQueue": "Clear queue",
  "@clearQueue": {
    "description": "Tooltip for clear queue button"
  },
  "syncingPlayer": "Syncing {playerName}...",
  "@syncingPlayer": {
    "description": "Status when syncing player",
    "placeholders": {
      "playerName": {
        "type": "String"
      }
    }
  },
  "switchPlayer": "Switch Player",
  "@switchPlayer": {
    "description": "Label for switch player action"
  },
  "logsCopiedToClipboard": "Logs copied to clipboard",
  "@logsCopiedToClipboard": {
    "description": "Confirmation when logs copied"
  },
  "auto": "Auto",
  "@auto": {
    "description": "Auto option for language selection"
  },
  "transferQueueTo": "Transfer Queue To",
  "@transferQueueTo": {
    "description": "Title for transfer queue dialog"
  },
  "queueTransferredTo": "Queue transferred to {playerName}",
  "@queueTransferredTo": {
    "description": "Success message when queue transferred",
    "placeholders": {
      "playerName": {
        "type": "String"
      }
    }
  },
  "failedToTransferQueue": "Failed to transfer queue: {error}",
  "@failedToTransferQueue": {
    "description": "Error when queue transfer fails",
    "placeholders": {
      "error": {
        "type": "String"
      }
    }
  },
  "failedToLoadQueue": "Failed to load queue: {error}",
  "@failedToLoadQueue": {
    "description": "Error when queue loading fails",
    "placeholders": {
      "error": {
        "type": "String"
      }
    }
  },
  "transferTo": "Transfer to...",
  "@transferTo": {
    "description": "Label for transfer destination selection"
  },
  "transferQueueToPlayer": "Transfer queue to another player",
  "@transferQueueToPlayer": {
    "description": "Tooltip for transfer queue button"
  },
  "selectPlayerToPlay": "Select a player",
  "@selectPlayerToPlay": {
    "description": "Generic hint for selecting a player in player selector"
  },
  "selectPlayerToPlayAlbum": "Select player to play album",
  "@selectPlayerToPlayAlbum": {
    "description": "Hint for selecting player to play album"
  },
  "selectPlayerToPlayPlaylist": "Select player to play playlist",
  "@selectPlayerToPlayPlaylist": {
    "description": "Hint for selecting player to play playlist"
  },
  "selectPlayerForRadio": "Select player for radio",
  "@selectPlayerForRadio": {
    "description": "Hint for selecting player to start radio"
  },
  "selectPlayerForEpisode": "Select player for episode",
  "@selectPlayerForEpisode": {
    "description": "Hint for selecting player to play episode"
  },
  "selectPlayerForAudiobook": "Select player for audiobook",
  "@selectPlayerForAudiobook": {
    "description": "Hint for selecting player to play audiobook"
  },
  "selectPlayerToAddToQueue": "Select player to add to queue",
  "@selectPlayerToAddToQueue": {
    "description": "Hint for selecting player to add to queue"
  },
  "aboutAndSupport": "About & Support",
  "@aboutAndSupport": {
    "description": "About and support section title"
  },
  "supportDevelopment": "Support Development",
  "@supportDevelopment": {
    "description": "Support development section"
  },
  "ensembleIsUnofficial": "Ensemble is an unofficial, community-built client. Consider supporting its development.",
  "@ensembleIsUnofficial": {
    "description": "Description about Ensemble being unofficial"
  },
  "sponsorOnGitHub": "Sponsor on GitHub",
  "@sponsorOnGitHub": {
    "description": "GitHub Sponsors button label"
  },
  "buyMeAKoFi": "Buy me a Ko-fi",
  "@buyMeAKoFi": {
    "description": "Ko-fi donation button label"
  },
  "aboutEnsemble": "About Ensemble",
  "@aboutEnsemble": {
    "description": "About Ensemble section"
  },
  "version": "Version",
  "@version": {
    "description": "Version label"
  },
  "visitGitHubRepo": "Visit GitHub Repository",
  "@visitGitHubRepo": {
    "description": "Link to GitHub repo"
  },
  "reportABug": "Report a Bug",
  "@reportABug": {
    "description": "Link to report issues"
  },
  "noRowsEnabled": "No rows enabled",
  "@noRowsEnabled": {
    "description": "Empty state when no home screen rows are enabled"
  },
  "pullToRefreshHint": "Pull down to refresh or enable rows in settings",
  "@pullToRefreshHint": {
    "description": "Hint when home screen is empty"
  }
 }
@@ -66,6 +66,12 @@
  "tracks": "Canciones",
  "playlists": "Listas de reproducción",
  "audiobooks": "Audiolibros",
  "music": "Música",
  "radio": "Radio",
  "stations": "Emisoras",
  "selectLibrary": "Seleccionar Biblioteca",
  "noRadioStations": "No hay emisoras de radio",
  "addRadioStationsHint": "Añade emisoras de radio en Music Assistant",
  "searchFailed": "Búsqueda fallida. Por favor, verifica tu conexión.",
  "queue": "Cola",
  "playerQueue": "Cola de {playerName}",
@@ -354,6 +360,7 @@
  "english": "Inglés",
  "german": "Alemán",
  "spanish": "Español",
  "french": "Francés",
  "noTracksInPlaylist": "No hay canciones en la lista",
  "sortAlphabetically": "Ordenar alfabéticamente",
  "sortByYear": "Ordenar por año",
@@ -483,5 +490,16 @@
  "showHints": "Mostrar Sugerencias",
  "showHintsDescription": "Mostrar consejos útiles para descubrir funciones",
  "pullToSelectPlayers": "Desliza para seleccionar dispositivos",
-  "holdToSync": "Mantén presionado un dispositivo para sincronizar"
+  "holdToSync": "Mantén presionado para sync",
  "swipeToAdjustVolume": "Desliza para ajustar volumen",
  "aboutAndSupport": "Acerca de y Soporte",
  "supportDevelopment": "Apoyar el Desarrollo",
  "ensembleIsUnofficial": "Ensemble es un cliente no oficial creado por la comunidad. Considera apoyar su desarrollo.",
  "sponsorOnGitHub": "Patrocina en GitHub",
  "buyMeAKoFi": "Cómprame un Ko-fi",
  "aboutEnsemble": "Acerca de Ensemble",
  "version": "Versión",
  "visitGitHubRepo": "Visitar Repositorio GitHub",
  "reportABug": "Reportar un Error"
 }
@@ -1,18 +1,30 @@
 import 'dart:async';
 import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:audio_service/audio_service.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'l10n/app_localizations.dart';
 import 'providers/connection_provider.dart';
 import 'providers/library_provider.dart';
 import 'providers/locale_provider.dart';
 import 'providers/local_player_provider.dart';
 import 'providers/music_assistant_provider.dart';
 import 'providers/navigation_provider.dart';
 import 'providers/player_provider.dart';
 import 'providers/sleep_timer_provider.dart';
 import 'providers/ui_state_provider.dart';
 import 'screens/home_screen.dart';
 import 'screens/login_screen.dart';
 import 'services/cache_service.dart';
 import 'services/settings_service.dart';
 import 'services/database_service.dart';
 import 'services/image_helper_service.dart';
 import 'services/position_tracker.dart';
 import 'services/queue_manager_service.dart';
 import 'services/profile_service.dart';
 import 'services/provider_filter_service.dart';
 import 'services/sync_service.dart';
 import 'services/audio/massiv_audio_handler.dart';
 import 'services/auth/auth_manager.dart';
@@ -22,6 +34,7 @@ import 'services/music_assistant_api.dart' show MAConnectionState;
 import 'theme/theme_provider.dart';
 import 'theme/app_theme.dart';
 import 'theme/system_theme_helper.dart';
 import 'utils/player_sync_state.dart';
 import 'widgets/global_player_overlay.dart';
 // Global audio handler instance
@@ -33,6 +46,10 @@ final _logger = DebugLogger();
 Future<void> main() async {
  WidgetsFlutterBinding.ensureInitialized();
  // Initialize SharedPreferences cache early for performance
  await SettingsService.initialize();
  _logger.log('⚡ SharedPreferences cached');
  // Initialize local database
  await DatabaseService.instance.initialize();
  _logger.log('💾 Database initialized');
@@ -40,6 +57,10 @@ Future<void> main() async {
  // Migrate existing ownerName to profile (one-time for existing users)
  await ProfileService.instance.migrateFromOwnerName();
  // Migrate credentials to secure storage (one-time for existing users)
  await SettingsService.migrateToSecureStorage();
  _logger.log('🔐 Secure storage migration complete');
  // Load library from cache for instant startup
  await SyncService.instance.loadFromCache();
  _logger.log('📦 Library cache loaded');
@@ -67,17 +88,42 @@ Future<void> main() async {
    DeviceOrientation.portraitDown,
  ]);
-  // Set system UI overlay style
+  // Set initial system UI overlay style based on platform brightness
  // SystemUIWrapper will update this dynamically when theme changes
  final platformBrightness = WidgetsBinding.instance.platformDispatcher.platformBrightness;
  final isDark = platformBrightness == Brightness.dark;
  SystemChrome.setSystemUIOverlayStyle(
-    const SystemUiOverlayStyle(
+    SystemUiOverlayStyle(
      statusBarColor: Colors.transparent,
-      statusBarIconBrightness: Brightness.light,
+      statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
-      systemNavigationBarColor: Color(0xFF1a1a1a),
+      systemNavigationBarColor: isDark ? const Color(0xFF1a1a1a) : const Color(0xFFF5F5F5),
-      systemNavigationBarIconBrightness: Brightness.light,
+      systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
    ),
  );
-  runApp(const MusicAssistantApp());
+  // Set up Flutter error boundary to catch and log widget build errors
  FlutterError.onError = (FlutterErrorDetails details) {
    _logger.error('Flutter error: ${details.exceptionAsString()}', context: 'FlutterError');
    _logger.error('Stack trace:\n${details.stack}', context: 'FlutterError');
    // Still report to Flutter's default handler in debug mode
    FlutterError.presentError(details);
  };
  // Catch errors from the platform dispatcher (platform channel errors)
  PlatformDispatcher.instance.onError = (error, stack) {
    _logger.error('Platform error: $error', context: 'PlatformDispatcher');
    _logger.error('Stack trace:\n$stack', context: 'PlatformDispatcher');
    return true; // Handled
  };
  // Wrap app in zone to catch async errors
  runZonedGuarded(
    () => runApp(const MusicAssistantApp()),
    (error, stackTrace) {
      _logger.error('Uncaught async error: $error', context: 'ZoneError');
      _logger.error('Stack trace:\n$stackTrace', context: 'ZoneError');
    },
  );
 }
 class MusicAssistantApp extends StatefulWidget {
@@ -91,6 +137,21 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
  late MusicAssistantProvider _musicProvider;
  late ThemeProvider _themeProvider;
  late LocaleProvider _localeProvider;
  // New multi-provider architecture
  late ConnectionProvider _connectionProvider;
  late UIStateProvider _uiStateProvider;
  late LibraryProvider _libraryProvider;
  late PlayerProvider _playerProvider;
  late LocalPlayerProvider _localPlayerProvider;
  late SleepTimerProvider _sleepTimerProvider;
  late NavigationProvider _navigationProvider;
  // Shared services
  late final CacheService _cacheService = CacheService();
  late final PositionTracker _positionTracker = PositionTracker();
  late ImageHelperService _imageHelper;
  final _hardwareVolumeService = HardwareVolumeService();
  StreamSubscription? _volumeUpSub;
  StreamSubscription? _volumeDownSub;
@@ -103,9 +164,91 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
  @override
  void initState() {
    super.initState();
    _musicProvider = MusicAssistantProvider();
    _themeProvider = ThemeProvider();
    _localeProvider = LocaleProvider();
    _navigationProvider = NavigationProvider();
    _sleepTimerProvider = SleepTimerProvider();
    // Initialize connection provider first (others depend on it)
    _connectionProvider = ConnectionProvider();
    _uiStateProvider = UIStateProvider();
    // Initialize shared image helper service
    _imageHelper = ImageHelperService(
      api: _connectionProvider.api,
      getCachedTrackForPlayer: (playerId) => _cacheService.getCachedTrackForPlayer(playerId),
    );
    // Initialize library provider (needs API from connection)
    _libraryProvider = LibraryProvider(
      api: _connectionProvider.api,
      logger: DebugLogger(),
      cacheService: _cacheService,
      settings: null, // Will use static methods
      providerFilterService: ProviderFilterService(
        providerFilter: _connectionProvider.providerFilter,
        playerFilter: _connectionProvider.playerFilter,
        availableMusicProviders: [],
        artists: [],
        albums: [],
        tracks: [],
        podcasts: [],
        radioStations: [],
      ),
    );
    // Initialize local player provider
    _localPlayerProvider = LocalPlayerProvider(
      audioHandler: audioHandler,
      settings: null, // Will use static methods
    );
    // Initialize player provider (depends on several others)
    // Note: queueManager will be set later to avoid circular dependency
    _playerProvider = PlayerProvider(
      api: _connectionProvider.api,
      logger: DebugLogger(),
      cacheService: _cacheService,
      settings: null, // Will use static methods
      positionTracker: _positionTracker,
      queueManager: null, // Will be set after initialization
      sleepTimerProvider: _sleepTimerProvider,
      imageHelper: _imageHelper,
      playerSyncState: PlayerSyncState(
        availablePlayers: [],
        castToSendspinIdMap: {},
      ),
      audioHandler: audioHandler,
    );
    // Create queue manager with functions that access provider state
    final queueManager = QueueManagerService(
      api: _connectionProvider.api,
      database: DatabaseService.instance,
      logger: DebugLogger(),
      getAvailablePlayers: () => _playerProvider.availablePlayers,
      getCastToSendspinMap: () => _playerProvider.castToSendspinIdMap,
      playTracks: (playerId, tracks, {int? startIndex, bool? clearQueue}) async {
        await _connectionProvider.api?.playTracks(playerId, tracks, startIndex: startIndex, clearQueue: clearQueue ?? true);
      },
    );
    // Set the queue manager after creation (breaks circular dependency)
    _playerProvider.queueManager = queueManager;
    // Initialize main provider (will act as facade)
    // For now, don't pass providers - MusicAssistantProvider doesn't accept them yet
    // It will delegate to the new providers gradually
    _musicProvider = MusicAssistantProvider();
    // Wire up player provider callbacks
    _playerProvider.onPlayerChanged = () {
      setState(() {}); // Trigger rebuild on player change
    };
    _playerProvider.onTrackChanged = () {
      setState(() {}); // Trigger rebuild on track change
    };
    WidgetsBinding.instance.addObserver(this);
    _initHardwareVolumeControl();
    // Listen to player selection changes to toggle volume interception
@@ -172,7 +315,7 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
  @override
  Future<bool> didPopRoute() async {
    // Intercept back button at app level - runs BEFORE Navigator processes it
-    // Priority order: device list > expanded player > normal navigation
+    // Priority order: device list > queue panel > expanded player > normal navigation
    // Device list has highest priority - dismiss it first
    if (GlobalPlayerOverlay.isPlayerRevealVisible) {
@@ -180,9 +323,18 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
      return true; // We handled it, don't let Navigator process it
    }
    // Queue panel second - close it before collapsing player
    // Use target state (not animation value) to handle rapid open-close timing
    // Use withHaptic: false because Android back gesture provides system haptic
    if (GlobalPlayerOverlay.isQueuePanelTargetOpen) {
      GlobalPlayerOverlay.closeQueuePanel(withHaptic: false);
      return true; // We handled it, don't let Navigator process it
    }
    // Then check expanded player
    // No haptic - Android back gesture provides its own
    if (GlobalPlayerOverlay.isPlayerExpanded) {
-      GlobalPlayerOverlay.collapsePlayer();
+      GlobalPlayerOverlay.collapsePlayer(withHaptic: false);
      return true; // We handled it, don't let Navigator process it
    }
@@ -209,9 +361,21 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
  Widget build(BuildContext context) {
    return MultiProvider(
      providers: [
        // Core facade provider (will be removed after migration)
        ChangeNotifierProvider.value(value: _musicProvider),
        // Theme providers
        ChangeNotifierProvider.value(value: _themeProvider),
        ChangeNotifierProvider.value(value: _localeProvider),
        ChangeNotifierProvider.value(value: _navigationProvider),
        // New multi-provider architecture (available for gradual migration)
        ChangeNotifierProvider.value(value: _connectionProvider),
        ChangeNotifierProvider.value(value: _uiStateProvider),
        ChangeNotifierProvider.value(value: _libraryProvider),
        ChangeNotifierProvider.value(value: _playerProvider),
        ChangeNotifierProvider.value(value: _localPlayerProvider),
        ChangeNotifierProvider.value(value: _sleepTimerProvider),
      ],
      child: Consumer2<ThemeProvider, LocaleProvider>(
        builder: (context, themeProvider, localeProvider, _) {
@@ -225,10 +389,17 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
              ColorScheme? darkColorScheme;
              if (themeProvider.useMaterialTheme && snapshot.hasData && snapshot.data != null) {
-                // Use system color schemes
+                // Use system color schemes, but override background to match app design
                // Material You doesn't set background consistently, causing black screen issues
                final (light, dark) = snapshot.data!;
-                lightColorScheme = light;
+                lightColorScheme = light.copyWith(
-                darkColorScheme = dark;
+                  surface: light.surface,
                  background: const Color(0xFFFAFAFA), // App's preferred light background
                );
                darkColorScheme = dark.copyWith(
                  surface: const Color(0xFF2a2a2a), // App's preferred dark surface
                  background: const Color(0xFF1a1a1a), // App's preferred dark background
                );
              } else {
                // Use custom color from theme provider
                lightColorScheme = generateLightColorScheme(themeProvider.customColor);
@@ -252,6 +423,29 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
                  ],
                  supportedLocales: S.supportedLocales,
                  locale: localeProvider.locale,
                  // Fallback to English when locale is not supported
                  localeListResolutionCallback: (locales, supportedLocales) {
                    // If user has set a specific locale, try to use it
                    if (localeProvider.locale != null) {
                      for (final supported in supportedLocales) {
                        if (supported.languageCode == localeProvider.locale!.languageCode) {
                          return supported;
                        }
                      }
                    }
                    // Try to match system locales
                    if (locales != null) {
                      for (final locale in locales) {
                        for (final supported in supportedLocales) {
                          if (supported.languageCode == locale.languageCode) {
                            return supported;
                          }
                        }
                      }
                    }
                    // Fallback to English (not German)
                    return const Locale('en');
                  },
                  themeMode: themeProvider.themeMode,
                  theme: AppTheme.lightTheme(colorScheme: lightColorScheme),
                  darkTheme: AppTheme.darkTheme(colorScheme: darkColorScheme),
@@ -328,8 +522,8 @@ class _SystemUIWrapperState extends State<SystemUIWrapper> {
          statusBarColor: Colors.transparent,
          statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
          systemNavigationBarColor: isDark
-              ? widget.darkColorScheme.background
+              ? widget.darkColorScheme.surface
-              : widget.lightColorScheme.background,
+              : widget.lightColorScheme.surface,
          systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
        ),
      );
@@ -377,94 +571,120 @@ class _AppStartupState extends State<AppStartup> {
  @override
  void initState() {
    super.initState();
-    _loadSettingsFirst();
+    try {
      _loadSettingsFirst();
    } catch (e) {
      _logger.error('AppStartup init error: $e');
      // Fallback - mark as loaded so app can continue
      if (mounted) {
        setState(() {
          _settingsLoaded = true;
          _hasCompletedOnboarding = true;
        });
      }
    }
  }
  /// Load settings BEFORE checking connection.
  /// This ensures we know if this is a first-time user before transitioning.
  Future<void> _loadSettingsFirst() async {
-    // Load onboarding state first - this is critical for determining
+    try {
-    // when to transition to HomeScreen
+      // Load onboarding state first - this is critical for determining
-    _hasCompletedOnboarding = await SettingsService.getHasCompletedOnboarding();
+      // when to transition to HomeScreen
      _hasCompletedOnboarding = await SettingsService.getHasCompletedOnboarding();
-    if (!mounted) return;
+      if (!mounted) return;
-    setState(() {
+      setState(() {
-      _settingsLoaded = true;
+        _settingsLoaded = true;
-    });
+      });
-    _logger.log('🚀 AppStartup: Settings loaded, hasCompletedOnboarding=$_hasCompletedOnboarding');
+      _logger.log('🚀 AppStartup: Settings loaded, hasCompletedOnboarding=$_hasCompletedOnboarding');
    } catch (e) {
      _logger.error('AppStartup settings load error: $e');
      if (mounted) {
        setState(() {
          _settingsLoaded = true;
          _hasCompletedOnboarding = true; // Default to true on error
        });
      }
    }
    // Now check connection
    _checkAndConnect();
  }
  Future<void> _checkAndConnect() async {
-    final serverUrl = await SettingsService.getServerUrl();
+    try {
      final serverUrl = await SettingsService.getServerUrl();
-    if (!mounted) return;
+      if (!mounted) return;
    setState(() {
      _savedServerUrl = serverUrl;
    });
    // If we have a saved server URL, attempt auto-connection
    if (serverUrl != null && serverUrl.isNotEmpty) {
      setState(() {
-        _isConnecting = true;
+        _savedServerUrl = serverUrl;
      });
-      final provider = context.read<MusicAssistantProvider>();
+      // If we have a saved server URL, attempt auto-connection
      if (serverUrl != null && serverUrl.isNotEmpty) {
        setState(() {
          _isConnecting = true;
        });
-      // Connection is handled by MusicAssistantProvider._initialize()
+        final provider = context.read<MusicAssistantProvider>();
      // Just wait for it to complete or timeout
      _logger.log('🚀 AppStartup: Waiting for provider auto-connection to $serverUrl');
-      // For first-time users, we need to wait for both connection AND player selection
+        // Connection is handled by MusicAssistantProvider._initialize()
-      // so the welcome overlay can appear immediately without home screen flash.
+        // Just wait for it to complete or timeout
-      // For returning users, just wait for connection.
+        _logger.log('🚀 AppStartup: Waiting for provider auto-connection to $serverUrl');
      final needsWelcome = !_hasCompletedOnboarding;
-      // Give the provider time to connect (it restores credentials and connects in _initialize)
+        // For first-time users, we need to wait for both connection AND player selection
-      // Check connection state periodically
+        // so the welcome overlay can appear immediately without home screen flash.
-      for (var i = 0; i < 20; i++) {
+        // For returning users, just wait for connection.
-        await Future.delayed(const Duration(milliseconds: 250));
+        final needsWelcome = !_hasCompletedOnboarding;
-        if (needsWelcome) {
+        // Give the provider time to connect (it restores credentials and connects in _initialize)
-          // First-time user: wait for connection + player selection
+        // Check connection state periodically
-          if (provider.isConnected && provider.selectedPlayer != null) {
+        for (var i = 0; i < 20; i++) {
-            _logger.log('🚀 AppStartup: First-time user ready (connected + player selected)');
+          await Future.delayed(const Duration(milliseconds: 250));
-            break;
+
          if (needsWelcome) {
            // First-time user: wait for connection + player selection
            if (provider.isConnected && provider.selectedPlayer != null) {
              _logger.log('🚀 AppStartup: First-time user ready (connected + player selected)');
              break;
            }
          } else {
            // Returning user: just wait for connection
            if (provider.isConnected) {
              _logger.log('🚀 AppStartup: Connection established');
              break;
            }
          }
-        } else {
+
-          // Returning user: just wait for connection
+          if (provider.connectionState == MAConnectionState.error) {
-          if (provider.isConnected) {
+            _logger.log('🚀 AppStartup: Connection failed with error');
            _logger.log('🚀 AppStartup: Connection established');
            break;
          }
        }
-        if (provider.connectionState == MAConnectionState.error) {
+        if (!provider.isConnected) {
-          _logger.log('🚀 AppStartup: Connection failed with error');
+          _logger.log('🚀 AppStartup: Connection still pending or failed');
-          break;
+        }
        if (mounted) {
          setState(() {
            _isConnecting = false;
          });
        }
      }
-
+    } catch (e) {
-      if (!provider.isConnected) {
+      _logger.error('AppStartup connection error: $e');
        _logger.log('🚀 AppStartup: Connection still pending or failed');
      }
      if (mounted) {
        setState(() {
          _isConnecting = false;
          _connectionAttempted = true;
        });
      }
    } else {
      setState(() {
        _connectionAttempted = true;
      });
    }
    _connectionAttempted = true;
  }
  @override
@@ -16,6 +16,10 @@ class ProviderMapping {
  final String providerInstance;
  final bool available;
  final Map<String, dynamic>? audioFormat;
  /// Whether this item is in the library for this specific provider instance.
  /// True = this provider "owns" the item (user added it from this account)
  /// False = item exists but wasn't added from this provider
  final bool inLibrary;
  ProviderMapping({
    required this.itemId,
@@ -23,6 +27,7 @@ class ProviderMapping {
    required this.providerInstance,
    required this.available,
    this.audioFormat,
    this.inLibrary = true,
  });
  factory ProviderMapping.fromJson(Map<String, dynamic> json) {
@@ -32,6 +37,8 @@ class ProviderMapping {
      providerInstance: json['provider_instance'] as String? ?? '',
      available: json['available'] as bool? ?? true,
      audioFormat: json['audio_format'] as Map<String, dynamic>?,
      // Parse in_library field - MA uses 1/0 or true/false
      inLibrary: json['in_library'] == true || json['in_library'] == 1,
    );
  }
@@ -42,6 +49,7 @@ class ProviderMapping {
      'provider_instance': providerInstance,
      'available': available,
      if (audioFormat != null) 'audio_format': audioFormat,
      'in_library': inLibrary,
    };
  }
 }
@@ -118,6 +126,23 @@ class MediaItem {
      if (duration != null) 'duration': duration!.inSeconds,
    };
  }
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
      other is MediaItem &&
          runtimeType == other.runtimeType &&
          itemId == other.itemId &&
          provider == other.provider;
  @override
  int get hashCode => Object.hash(itemId, provider);
  /// Check if this item is in the user's library
  bool get inLibrary {
    if (provider == 'library') return true;
    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
  }
 }
 class Artist extends MediaItem {
@@ -146,6 +171,12 @@ class Artist extends MediaItem {
    );
  }
  /// Check if this artist is in the user's library
  bool get inLibrary {
    if (provider == 'library') return true;
    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
  }
  @override
  Map<String, dynamic> toJson() => super.toJson();
 }
@@ -267,6 +298,12 @@ class Track extends MediaItem {
  String get artistsString =>
      artists?.map((a) => a.name).join(', ') ?? 'Unknown Artist';
  /// Check if this track is in the user's library
  bool get inLibrary {
    if (provider == 'library') return true;
    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
  }
  @override
  Map<String, dynamic> toJson() {
    final json = super.toJson();
@@ -313,6 +350,12 @@ class Playlist extends MediaItem {
      favorite: item.favorite,
    );
  }
  /// Check if this playlist is in the user's library
  bool get inLibrary {
    if (provider == 'library') return true;
    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
  }
 }
 class Chapter {
@@ -421,9 +464,20 @@ class Audiobook extends MediaItem {
  factory Audiobook.fromJson(Map<String, dynamic> json) {
    final item = MediaItem.fromJson(json);
-    // Parse year
+    // Parse year - check top level first, then metadata.release_date (ABS format)
    int? year;
-    final yearValue = json['year'];
+    final metadata = json['metadata'] as Map<String, dynamic>?;
    dynamic yearValue = json['year'];
    if (yearValue == null && metadata != null) {
      // ABS stores year in metadata.release_date (can be "2024" or "2024-01-15")
      final releaseDate = metadata['release_date'];
      if (releaseDate is String && releaseDate.isNotEmpty) {
        // Extract year from date string (handles both "2024" and "2024-01-15" formats)
        yearValue = releaseDate.split('-').first;
      } else if (releaseDate is int) {
        yearValue = releaseDate;
      }
    }
    if (yearValue is int) {
      year = yearValue;
    } else if (yearValue is String) {
@@ -453,8 +507,6 @@ class Audiobook extends MediaItem {
    // Parse chapters - check top level first, then metadata
    List<Chapter>? chapters;
    final metadata = json['metadata'] as Map<String, dynamic>?;
    dynamic chaptersData = json['chapters'];
    if (chaptersData == null && metadata != null) {
      chaptersData = metadata['chapters'];
@@ -500,6 +552,12 @@ class Audiobook extends MediaItem {
  String get narratorsString =>
      narrators?.map((n) => n.name).join(', ') ?? 'Unknown Narrator';
  /// Check if this audiobook is in the user's library
  bool get inLibrary {
    if (provider == 'library') return true;
    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
  }
  /// Get progress as a percentage (0.0 to 1.0)
  double get progress {
    if (fullyPlayed == true) return 1.0;
@@ -17,6 +17,7 @@ class Player {
  final String? activeSource; // The currently active source for this player
  final bool isExternalSource; // True when an external source (optical, Spotify, etc.) is active
  final String? appId; // The app_id from MA - 'music_assistant' when MA is playing, else external source
  final String? activeQueue; // The active_queue from MA - has value when MA is controlling playback
  Player({
    required this.playerId,
@@ -35,6 +36,7 @@ class Player {
    this.activeSource,
    this.isExternalSource = false,
    this.appId,
    this.activeQueue,
  });
  /// Create a copy of this Player with some fields replaced
@@ -55,6 +57,7 @@ class Player {
    String? activeSource,
    bool? isExternalSource,
    String? appId,
    String? activeQueue,
  }) {
    return Player(
      playerId: playerId ?? this.playerId,
@@ -73,6 +76,7 @@ class Player {
      activeSource: activeSource ?? this.activeSource,
      isExternalSource: isExternalSource ?? this.isExternalSource,
      appId: appId ?? this.appId,
      activeQueue: activeQueue ?? this.activeQueue,
    );
  }
@@ -87,8 +91,31 @@ class Player {
  bool get isGroupLeader => groupMembers != null && groupMembers!.length > 1 && syncedTo == null;
  bool get isGroupChild => syncedTo != null;
  // A player is manually synced if it's synced TO another player (child of a sync group)
  // This excludes pre-configured MA speaker groups which have groupMembers but no syncedTo
  // Used for yellow border highlight - only shows for players the user manually synced
  bool get isManuallySynced => syncedTo != null;
  // Track when this Player object was created (for local interpolation fallback)
  static final Map<String, double> _playerCreationTimes = {};
  static const int _maxCreationTimesEntries = 50;
  /// Clean up old creation time entries using LRU eviction
  static void _cleanupCreationTimes() {
    if (_playerCreationTimes.length <= _maxCreationTimesEntries) return;
    // Sort by timestamp value (oldest first) for true LRU eviction
    final sortedEntries = _playerCreationTimes.entries.toList()
      ..sort((a, b) => a.value.compareTo(b.value));
    // Remove oldest entries until we're at target size
    final entriesToRemove = sortedEntries.take(
      _playerCreationTimes.length - _maxCreationTimesEntries,
    );
    for (final entry in entriesToRemove) {
      _playerCreationTimes.remove(entry.key);
    }
  }
  // Calculate current elapsed time (interpolated if playing)
  double get currentElapsedTime {
@@ -130,13 +157,8 @@ class Player {
    if (!_playerCreationTimes.containsKey(creationKey)) {
      // First time seeing this elapsed_time - record when we saw it
      _playerCreationTimes[creationKey] = now;
-      // Clean up old entries to prevent memory leak
+      // Clean up old entries to prevent memory leak (LRU eviction)
-      if (_playerCreationTimes.length > 100) {
+      _cleanupCreationTimes();
        final keysToRemove = _playerCreationTimes.keys.take(50).toList();
        for (final key in keysToRemove) {
          _playerCreationTimes.remove(key);
        }
      }
    }
    final creationTime = _playerCreationTimes[creationKey]!;
@@ -200,50 +222,61 @@ class Player {
    // Parse active_source - the currently active source for this player
    final activeSource = json['active_source'] as String?;
-    // Detect external source (optical, Spotify, AirPlay, etc.)
+    // Parse active_queue - this is the key indicator for MA-controlled playback
-    // Primary indicator: app_id - if not 'music_assistant', it's an external source
+    // When MA is playing: active_queue = 'uuid:...' or similar queue ID
-    // Secondary indicators: URI patterns and media_type
+    // When external source: active_queue = null
    final activeQueue = json['active_queue'] as String?;
    // Parse app_id - helps distinguish external sources on DLNA players
    final appId = json['app_id'] as String?;
    // Detect external source (optical, Spotify Connect, AirPlay, etc.)
    //
    // Detection logic priority:
    // 1. If app_id == 'music_assistant' -> MA is playing, NOT external
    // 2. If active_queue has a value -> MA has a queue, NOT external
    //    (This handles Spotify as music provider where URI is spotify:// but MA controls playback)
    // 3. If app_id is set and NOT 'music_assistant' -> external source (e.g., 'http', 'spotify')
    // 4. Fallback: Check URI patterns for simple external IDs (optical, line_in, etc.)
    bool isExternalSource = false;
-    // Check app_id first - this is the most reliable indicator for DLNA players
+    // If MA explicitly says it's playing, trust that
-    // When MA is playing: app_id = 'music_assistant'
+    if (appId == 'music_assistant') {
-    // When external source: app_id = 'http', 'spotify', etc.
+      isExternalSource = false;
-    final appId = json['app_id'] as String?;
+    }
-    if (appId != null && appId.isNotEmpty && appId != 'music_assistant') {
+    // If there's an active queue, MA is controlling playback (even with spotify:// URIs)
-      // app_id is set but not 'music_assistant' - external source is active
+    else if (activeQueue != null && activeQueue.isNotEmpty) {
      isExternalSource = false;
    }
    // If app_id is set to something else (http, spotify, etc.), it's external
    else if (appId != null && appId.isNotEmpty) {
      isExternalSource = true;
    }
-
+    // Fallback: check current_media for simple external source indicators
-    // Also check current_media for additional external source indicators
+    // Only check these when we have no app_id and no active_queue
-    if (!isExternalSource && json.containsKey('current_media')) {
+    else if (json.containsKey('current_media')) {
      final currentMedia = json['current_media'] as Map<String, dynamic>?;
      if (currentMedia != null) {
        final uri = currentMedia['uri'] as String?;
        final mediaType = currentMedia['media_type'] as String?;
-        // External source indicators:
+        // Only check for simple external source identifiers (physical inputs)
-        // 1. URI is a simple identifier like 'optical', 'line_in', 'bluetooth', 'hdmi'
+        // Do NOT flag spotify://, airplay://, etc. as external here -
-        // 2. URI starts with external protocols: 'spotify://', 'airplay://', etc.
+        // those should only be external if app_id indicates external control
        // 3. Media type is 'unknown' (MA doesn't recognize the source)
        if (uri != null) {
          final uriLower = uri.toLowerCase();
          // Simple external source identifiers (no :// or /)
          // These are physical inputs that are always external
          final isSimpleExternalId = !uri.contains('://') && !uri.contains('/') &&
              (uriLower == 'optical' || uriLower == 'line_in' || uriLower == 'bluetooth' ||
               uriLower == 'hdmi' || uriLower == 'tv' || uriLower == 'aux' ||
               uriLower == 'coaxial' || uriLower == 'toslink');
          // External streaming protocols
          final isExternalProtocol = uriLower.startsWith('spotify://') ||
              uriLower.startsWith('airplay://') ||
              uriLower.startsWith('cast://') ||
              uriLower.startsWith('bluetooth://');
-          isExternalSource = isSimpleExternalId || isExternalProtocol;
+          isExternalSource = isSimpleExternalId;
        }
-        // Also check media_type - 'unknown' often indicates external source
+        // Also check media_type - 'unknown' with non-MA URI indicates external source
        if (!isExternalSource && mediaType == 'unknown') {
          // If media_type is unknown and URI doesn't look like MA content, it's external
          final uri = currentMedia['uri'] as String?;
          if (uri != null && !uri.startsWith('library://') && !uri.contains('://track/')) {
            isExternalSource = true;
@@ -269,6 +302,7 @@ class Player {
      activeSource: activeSource,
      isExternalSource: isExternalSource,
      appId: appId,
      activeQueue: activeQueue,
    );
  }
@@ -290,6 +324,7 @@ class Player {
      if (activeSource != null) 'active_source': activeSource,
      'is_external_source': isExternalSource,
      if (appId != null) 'app_id': appId,
      if (activeQueue != null) 'active_queue': activeQueue,
    };
  }
 }
@@ -0,0 +1,128 @@
 /// Represents a music provider instance from Music Assistant.
 ///
 /// Each provider (like Spotify, Tidal) can have multiple instances
 /// (e.g., two different Spotify accounts). This class represents
 /// a single provider instance with its unique ID.
 class ProviderInstance {
  /// Unique identifier for this provider instance (e.g., "spotify--abc123")
  final String instanceId;
  /// The provider domain/type (e.g., "spotify", "tidal", "qobuz")
  final String domain;
  /// Display name for this instance (e.g., "Spotify (John's Account)")
  final String name;
  /// Whether this provider is currently available/connected
  final bool available;
  ProviderInstance({
    required this.instanceId,
    required this.domain,
    required this.name,
    required this.available,
  });
  /// Provider capabilities - maps domain to supported content types
  /// This determines which tabs/categories show which providers
  static const Map<String, Set<String>> providerCapabilities = {
    // Music streaming services (support artists, albums, tracks, playlists)
    // Spotify also has audiobooks and podcasts
    'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
    'tidal': {'artists', 'albums', 'tracks', 'playlists'},
    'qobuz': {'artists', 'albums', 'tracks', 'playlists'},
    'deezer': {'artists', 'albums', 'tracks', 'playlists'},
    'ytmusic': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
    'soundcloud': {'artists', 'albums', 'tracks', 'playlists'},
    'apple_music': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
    'amazon_music': {'artists', 'albums', 'tracks', 'playlists'},
    // Self-hosted media servers (can have music, audiobooks, and podcasts)
    'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
    'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
    'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
    // Music-only servers
    'subsonic': {'artists', 'albums', 'tracks', 'playlists'},
    'opensubsonic': {'artists', 'albums', 'tracks', 'playlists'},
    'navidrome': {'artists', 'albums', 'tracks', 'playlists'},
    'filesystem': {'artists', 'albums', 'tracks', 'playlists'},
    // Audiobook and podcast providers
    'audiobookshelf': {'audiobooks', 'podcasts'},
    'itunes_podcasts': {'podcasts'},
    // Radio providers (tunein also has podcasts)
    'tunein': {'radio', 'podcasts'},
    'radiobrowser': {'radio'},
    // Player/system providers (no library content)
    'snapcast': <String>{},
    'fully_kiosk': <String>{},
  };
  /// Known music provider domains that provide library content
  static const Set<String> musicProviderDomains = {
    // Streaming services
    'spotify',
    'tidal',
    'qobuz',
    'deezer',
    'ytmusic',
    'soundcloud',
    'apple_music',
    'amazon_music',
    // Self-hosted / local
    'plex',
    'subsonic',
    'opensubsonic',
    'jellyfin',
    'emby',
    'navidrome',
    'audiobookshelf',
    'filesystem',
    'itunes_podcasts',
    // Other
    'tunein',
    'radiobrowser',
    'snapcast',
    'fully_kiosk',
  };
  /// Whether this is a music provider (vs. player provider, metadata provider, etc.)
  bool get isMusicProvider => musicProviderDomains.contains(domain);
  /// Get supported content types for this provider
  Set<String> get supportedContentTypes =>
      providerCapabilities[domain] ?? <String>{};
  /// Check if this provider supports a specific content type/category
  bool supportsContentType(String category) =>
      supportedContentTypes.contains(category);
  factory ProviderInstance.fromJson(Map<String, dynamic> json) {
    return ProviderInstance(
      instanceId: json['instance_id'] as String? ?? '',
      domain: json['domain'] as String? ?? json['type'] as String? ?? '',
      name: json['name'] as String? ?? json['instance_id'] as String? ?? 'Unknown',
      available: json['available'] as bool? ?? true,
    );
  }
  Map<String, dynamic> toJson() {
    return {
      'instance_id': instanceId,
      'domain': domain,
      'name': name,
      'available': available,
    };
  }
  @override
  String toString() => 'ProviderInstance($instanceId: $name)';
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
      other is ProviderInstance &&
          runtimeType == other.runtimeType &&
          instanceId == other.instanceId;
  @override
  int get hashCode => instanceId.hashCode;
 }
@@ -0,0 +1,65 @@
 /// Represents a provider manifest from Music Assistant.
 ///
 /// Contains metadata about a provider type including its icons.
 /// This is separate from ProviderInstance which represents a configured
 /// instance of a provider.
 class ProviderManifest {
  /// The provider domain/type (e.g., "spotify", "tidal", "qobuz")
  final String domain;
  /// Display name for this provider type
  final String name;
  /// Description of the provider
  final String? description;
  /// SVG icon as XML string
  final String? iconSvg;
  /// SVG icon for dark theme as XML string
  final String? iconSvgDark;
  /// Monochrome SVG icon as XML string
  final String? iconSvgMonochrome;
  /// Material Design icon name (fallback)
  final String? icon;
  ProviderManifest({
    required this.domain,
    required this.name,
    this.description,
    this.iconSvg,
    this.iconSvgDark,
    this.iconSvgMonochrome,
    this.icon,
  });
  /// Whether this manifest has any SVG icon available
  bool get hasSvgIcon =>
      iconSvg != null || iconSvgDark != null || iconSvgMonochrome != null;
  /// Get the best available SVG icon for the given brightness
  /// Prefers dark icon for dark themes, falls back to regular or monochrome
  String? getSvgIcon({bool isDark = false}) {
    if (isDark && iconSvgDark != null) {
      return iconSvgDark;
    }
    return iconSvg ?? iconSvgMonochrome;
  }
  factory ProviderManifest.fromJson(Map<String, dynamic> json) {
    return ProviderManifest(
      domain: json['domain'] as String? ?? '',
      name: json['name'] as String? ?? '',
      description: json['description'] as String?,
      iconSvg: json['icon_svg'] as String?,
      iconSvgDark: json['icon_svg_dark'] as String?,
      iconSvgMonochrome: json['icon_svg_monochrome'] as String?,
      icon: json['icon'] as String?,
    );
  }
  @override
  String toString() => 'ProviderManifest($domain: $name)';
 }
@@ -0,0 +1,69 @@
 import 'media_item.dart';
 class RecommendationFolder {
  final String itemId;
  final String provider;
  final String name;
  final String? uri;
  final List<MediaItem> items;
  RecommendationFolder({
    required this.itemId,
    required this.provider,
    required this.name,
    this.uri,
    required this.items,
  });
  /// Unique ID for use in row ordering and settings
  /// Uses 'discovery:' prefix to distinguish from static row IDs
  String get rowId => 'discovery:$itemId';
  factory RecommendationFolder.fromJson(Map<String, dynamic> json) {
    final itemsJson = json['items'] as List<dynamic>?;
    final parsedItems = itemsJson
        ?.whereType<Map<String, dynamic>>()
        .map(_parseMediaItemJson)
        .toList() ?? <MediaItem>[];
    return RecommendationFolder(
      itemId: json['item_id']?.toString() ?? json['id']?.toString() ?? '',
      provider: json['provider'] as String? ?? 'unknown',
      name: json['name'] as String? ?? '',
      uri: json['uri'] as String?,
      items: parsedItems,
    );
  }
  Map<String, dynamic> toJson() {
    return {
      'item_id': itemId,
      'provider': provider,
      'name': name,
      if (uri != null) 'uri': uri,
      'items': items.map((item) => item.toJson()).toList(),
    };
  }
 }
 /// Polymorphic parser for media items in recommendation folders
 /// Handles heterogeneous items (playlists, radio, etc.)
 MediaItem _parseMediaItemJson(Map<String, dynamic> json) {
  final mediaType = json['media_type'] as String? ?? '';
  switch (mediaType) {
    case 'playlist':
      return Playlist.fromJson(json);
    case 'album':
      return Album.fromJson(json);
    case 'artist':
      return Artist.fromJson(json);
    case 'track':
      return Track.fromJson(json);
    case 'audiobook':
      return Audiobook.fromJson(json);
    default:
      // For radio, podcast, podcast_episode - use MediaItem base class
      return MediaItem.fromJson(json);
  }
 }
@@ -2,168 +2,80 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import '../services/music_assistant_api.dart';
 import '../services/settings_service.dart';
 import '../services/database_service.dart';
 import '../services/profile_service.dart';
 import '../services/debug_logger.dart';
 import '../services/error_handler.dart';
 import '../services/auth/auth_manager.dart';
 import '../services/cache_service.dart';
-/// Provider for managing connection state to Music Assistant server
+/// Callback types for connection events
-/// Handles WebSocket connection, authentication, and reconnection
+typedef OnConnected = Future<void> Function();
 typedef OnAuthenticated = Future<void> Function();
 typedef OnDisconnected = void Function();
 /// Provider for connection state management.
 ///
 /// Extracted from MusicAssistantProvider to handle:
 /// - WebSocket connection lifecycle
 /// - Authentication flow (MA token, credentials)
 /// - Reconnection logic
 /// - Connection state broadcasting
 ///
 /// Note: This is a partial extraction. Full integration requires updating
 /// all consumers to use this provider directly.
 class ConnectionProvider with ChangeNotifier {
  MusicAssistantAPI? _api;
  final AuthManager _authManager = AuthManager();
  final DebugLogger _logger = DebugLogger();
-  final CacheService _cacheService = CacheService();
+  final AuthManager _authManager = AuthManager();
-  MAConnectionState _connectionState = MAConnectionState.disconnected;
+  MusicAssistantAPI? _api;
  String? _serverUrl;
  String? _error;
  MAConnectionState _connectionState = MAConnectionState.disconnected;
-  // Callbacks for post-connection initialization
+  StreamSubscription? _connectionStateSubscription;
  VoidCallback? onConnected;
  VoidCallback? onAuthenticated;
  VoidCallback? onDisconnected;
-  MAConnectionState get connectionState => _connectionState;
+  // Callbacks for connection events - set by the facade provider
-  String? get serverUrl => _serverUrl;
+  OnConnected? onConnected;
-  String? get error => _error;
+  OnAuthenticated? onAuthenticated;
-  bool get isConnected => _connectionState == MAConnectionState.connected ||
+  OnDisconnected? onDisconnected;
-                          _connectionState == MAConnectionState.authenticated;
+
  // User settings captured during authentication
  List<String> _providerFilter = [];
  List<String> _playerFilter = [];
  // ============================================================================
  // GETTERS
  // ============================================================================
  MusicAssistantAPI? get api => _api;
  AuthManager get authManager => _authManager;
-  CacheService get cacheService => _cacheService;
+  String? get serverUrl => _serverUrl;
  String? get error => _error;
  MAConnectionState get connectionState => _connectionState;
-  ConnectionProvider() {
+  bool get isConnected =>
-    _initialize();
+      _connectionState == MAConnectionState.connected ||
-  }
+      _connectionState == MAConnectionState.authenticated;
-  Future<void> _initialize() async {
+  List<String> get providerFilter => _providerFilter;
-    _serverUrl = await SettingsService.getServerUrl();
+  List<String> get playerFilter => _playerFilter;
    if (_serverUrl != null && _serverUrl!.isNotEmpty) {
      await _restoreAuthCredentials();
      await connectToServer(_serverUrl!);
    }
  }
-  /// Restore auth credentials from persistent storage
+  // ============================================================================
-  Future<void> _restoreAuthCredentials() async {
+  // CONNECTION
-    final savedCredentials = await SettingsService.getAuthCredentials();
+  // ============================================================================
    if (savedCredentials != null) {
      _logger.log('🔐 Restoring saved auth credentials...');
      _authManager.deserializeCredentials(savedCredentials);
      _logger.log('🔐 Auth credentials restored: ${_authManager.currentStrategy?.name ?? "none"}');
    } else {
      _logger.log('🔐 No saved auth credentials found');
    }
  }
-  /// Handle Music Assistant native authentication after WebSocket connection
+  /// Connect to the Music Assistant server
-  Future<bool> handleMaAuthentication() async {
+  Future<void> connect(String serverUrl) async {
    if (_api == null) return false;
    try {
      // First, try stored MA token
      final storedToken = await SettingsService.getMaAuthToken();
      if (storedToken != null) {
        _logger.log('🔐 Trying stored MA token...');
        final success = await _api!.authenticateWithToken(storedToken);
        if (success) {
          _logger.log('✅ MA authentication with stored token successful');
          await _fetchAndSetUserProfileName();
          return true;
        }
        _logger.log('⚠️ Stored MA token invalid, clearing...');
        await SettingsService.clearMaAuthToken();
      }
      // No valid token - try stored credentials
      final username = await SettingsService.getUsername();
      final password = await SettingsService.getPassword();
      if (username != null && password != null && username.isNotEmpty && password.isNotEmpty) {
        _logger.log('🔐 Trying stored credentials...');
        final accessToken = await _api!.loginWithCredentials(username, password);
        if (accessToken != null) {
          _logger.log('✅ MA login with stored credentials successful');
          final longLivedToken = await _api!.createLongLivedToken();
          if (longLivedToken != null) {
            await SettingsService.setMaAuthToken(longLivedToken);
            _logger.log('✅ Saved new long-lived MA token');
          } else {
            await SettingsService.setMaAuthToken(accessToken);
          }
          await _fetchAndSetUserProfileName();
          return true;
        }
      }
      _logger.log('❌ MA authentication failed - no valid token or credentials');
      return false;
    } catch (e) {
      _logger.log('❌ MA authentication error: $e');
      return false;
    }
  }
  /// Fetch user profile from MA and set owner name + create/activate local profile
  Future<void> _fetchAndSetUserProfileName() async {
    if (_api == null) return;
    try {
      final userInfo = await _api!.getCurrentUserInfo();
      if (userInfo == null) {
        _logger.log('⚠️ Could not fetch user profile');
        return;
      }
      final displayName = userInfo['display_name'] as String?;
      final username = userInfo['username'] as String?;
      _logger.log('🔍 Profile data: display_name="$displayName", username="$username"');
      final profileName = (displayName != null && displayName.isNotEmpty)
          ? displayName
          : username;
      if (profileName != null && profileName.isNotEmpty) {
        await SettingsService.setOwnerName(profileName);
        _logger.log('✅ Set owner name from MA profile: $profileName');
        // Create/activate profile in local database
        if (DatabaseService.instance.isInitialized && username != null) {
          await ProfileService.instance.onMaAuthenticated(
            username: username,
            displayName: displayName,
          );
          _logger.log('✅ Local profile activated: $username');
        }
      } else {
        _logger.log('⚠️ No valid name in profile');
      }
    } catch (e) {
      _logger.log('⚠️ Could not fetch user profile (non-fatal): $e');
    }
  }
  Future<void> connectToServer(String serverUrl) async {
    try {
      _error = null;
      _serverUrl = serverUrl;
      await SettingsService.setServerUrl(serverUrl);
-      // Disconnect existing connection
+      // Dispose the old API to stop any pending reconnects
-      await _api?.disconnect();
+      _api?.dispose();
      _api = MusicAssistantAPI(serverUrl, _authManager);
-      // Listen to connection state changes
+      _connectionStateSubscription?.cancel();
-      _api!.connectionState.listen(
+      _connectionStateSubscription = _api!.connectionState.listen(
        (state) async {
          _connectionState = state;
          notifyListeners();
@@ -173,9 +85,8 @@ class ConnectionProvider with ChangeNotifier {
            if (_api!.authRequired && !_api!.isAuthenticated) {
              _logger.log('🔐 MA auth required, attempting authentication...');
-              final authenticated = await handleMaAuthentication();
+              final authenticated = await _handleAuthentication();
              if (!authenticated) {
                _logger.log('❌ MA authentication failed - stopping connection flow');
                _error = 'Authentication required. Please log in again.';
                notifyListeners();
                return;
@@ -183,15 +94,13 @@ class ConnectionProvider with ChangeNotifier {
              return;
            }
-            // No auth required - notify connected
+            // No auth required, trigger callback
-            onConnected?.call();
+            await onConnected?.call();
          } else if (state == MAConnectionState.authenticated) {
            _logger.log('✅ MA authentication successful');
-            onAuthenticated?.call();
+            await onAuthenticated?.call();
          } else if (state == MAConnectionState.disconnected) {
-            // DON'T clear caches on disconnect - keep showing cached data
+            _logger.log('📡 Disconnected - keeping cached data for instant resume');
            // This allows instant UI display when app resumes or reconnects
            // Caches will be refreshed when connection is restored
            onDisconnected?.call();
          }
        },
@@ -214,44 +123,122 @@ class ConnectionProvider with ChangeNotifier {
    }
  }
  Future<bool> _handleAuthentication() async {
    if (_api == null) return false;
    try {
      final storedToken = await SettingsService.getMaAuthToken();
      if (storedToken != null) {
        _logger.log('🔐 Trying stored MA token...');
        final success = await _api!.authenticateWithToken(storedToken);
        if (success) {
          _logger.log('✅ MA authentication with stored token successful');
          await _fetchUserSettings();
          return true;
        }
        _logger.log('⚠️ Stored MA token invalid, clearing...');
        await SettingsService.clearMaAuthToken();
      }
      final username = await SettingsService.getUsername();
      final password = await SettingsService.getPassword();
      if (username != null &&
          password != null &&
          username.isNotEmpty &&
          password.isNotEmpty) {
        _logger.log('🔐 Trying stored credentials...');
        final accessToken = await _api!.loginWithCredentials(username, password);
        if (accessToken != null) {
          _logger.log('✅ MA login with stored credentials successful');
          final longLivedToken = await _api!.createLongLivedToken();
          if (longLivedToken != null) {
            await SettingsService.setMaAuthToken(longLivedToken);
            _logger.log('✅ Saved new long-lived MA token');
          } else {
            await SettingsService.setMaAuthToken(accessToken);
          }
          await _fetchUserSettings();
          return true;
        }
      }
      _logger.log('❌ MA authentication failed - no valid token or credentials');
      return false;
    } catch (e) {
      _logger.log('❌ MA authentication error: $e');
      return false;
    }
  }
  Future<void> _fetchUserSettings() async {
    if (_api == null) return;
    try {
      final userInfo = await _api!.getCurrentUserInfo();
      if (userInfo == null) return;
      // Set profile name
      final displayName = userInfo['display_name'] as String?;
      final username = userInfo['username'] as String?;
      final profileName =
          (displayName != null && displayName.isNotEmpty) ? displayName : username;
      if (profileName != null && profileName.isNotEmpty) {
        await SettingsService.setOwnerName(profileName);
        _logger.log('✅ Set owner name from MA profile: $profileName');
      }
      // Capture provider filter
      final providerFilterRaw = userInfo['provider_filter'];
      if (providerFilterRaw is List) {
        _providerFilter = providerFilterRaw.cast<String>().toList();
        if (_providerFilter.isNotEmpty) {
          _logger.log(
              '🔒 Provider filter active: ${_providerFilter.length} providers allowed');
        }
      } else {
        _providerFilter = [];
      }
      // Capture player filter
      final playerFilterRaw = userInfo['player_filter'];
      if (playerFilterRaw is List) {
        _playerFilter = playerFilterRaw.cast<String>().toList();
        if (_playerFilter.isNotEmpty) {
          _logger.log(
              '🔒 Player filter active: ${_playerFilter.length} players allowed');
        }
      } else {
        _playerFilter = [];
      }
    } catch (e) {
      _logger.log('⚠️ Could not fetch user settings (non-fatal): $e');
    }
  }
  /// Disconnect from the server
  Future<void> disconnect() async {
    _connectionStateSubscription?.cancel();
    await _api?.disconnect();
    _connectionState = MAConnectionState.disconnected;
    // DON'T clear caches on disconnect - keep showing cached data for instant reconnect
    notifyListeners();
  }
-  /// Clear all caches and state (for logout or server change)
+  /// Check connection and reconnect if needed
  void clearCachesOnLogout() {
    _cacheService.clearAll();
    notifyListeners();
  }
  /// Check connection and reconnect if needed (called when app resumes)
  Future<void> checkAndReconnect() async {
-    _logger.log('🔄 checkAndReconnect called - state: $_connectionState');
+    if (_serverUrl != null && !isConnected) {
-
+      _logger.log('🔄 Attempting reconnection...');
-    if (_serverUrl == null) {
+      await connect(_serverUrl!);
      _logger.log('🔄 No server URL saved, skipping reconnect');
      return;
    }
    if (_connectionState != MAConnectionState.connected &&
        _connectionState != MAConnectionState.authenticated) {
      _logger.log('🔄 Not connected, attempting reconnect to $_serverUrl');
      try {
        await connectToServer(_serverUrl!);
        _logger.log('🔄 Reconnection successful');
      } catch (e) {
        _logger.log('🔄 Reconnection failed: $e');
      }
    } else {
      _logger.log('🔄 Already connected, connection verified');
    }
  }
  @override
  void dispose() {
    _connectionStateSubscription?.cancel();
    _api?.dispose();
    super.dispose();
  }
@@ -1,383 +1,287 @@
 import 'package:flutter/foundation.dart';
 import '../models/media_item.dart';
 import '../services/music_assistant_api.dart';
 import '../services/debug_logger.dart';
 import '../services/error_handler.dart';
 import '../services/cache_service.dart';
 import '../constants/timings.dart';
 import '../models/media_item.dart';
 import '../services/cache_service.dart';
 import '../services/debug_logger.dart';
 import '../services/library_status_service.dart';
 import '../services/music_assistant_api.dart';
 import '../services/provider_filter_service.dart';
 import '../services/settings_service.dart';
 import '../services/sync_service.dart';
-/// Provider for managing library data (artists, albums, tracks, playlists)
+/// Provider for library data management.
-class LibraryProvider with ChangeNotifier {
+///
-  final DebugLogger _logger = DebugLogger();
+/// Manages:
 /// - Artists, albums, tracks lists
 /// - Radio stations and podcasts
 /// - Library loading and refresh
 /// - Provider filtering
 /// - Background sync
 ///
 /// Extracted from MusicAssistantProvider to isolate library logic.
 class LibraryProvider extends ChangeNotifier {
  final MusicAssistantAPI? _api;
  final DebugLogger _logger;
  final CacheService _cacheService;
  final SettingsService? _settings;
  final ProviderFilterService _providerFilterService;
-  MusicAssistantAPI? _api;
+  // Library data
-
+  List<dynamic> _artists = [];
-  List<Artist> _artists = [];
+  List<dynamic> _albums = [];
-  List<Album> _albums = [];
+  List<dynamic> _tracks = [];
-  List<Track> _tracks = [];
+  List<dynamic> _radioStations = [];
-  bool _isLoading = false;
+  List<dynamic> _podcasts = [];
  String? _error;
  // Search state persistence
  String _lastSearchQuery = '';
  Map<String, List<MediaItem>> _lastSearchResults = {
    'artists': [],
    'albums': [],
    'tracks': [],
  };
  // Getters
-  List<Artist> get artists => _artists;
+  List<dynamic> get artists => _artists;
-  List<Album> get albums => _albums;
+  List<dynamic> get albums => _albums;
-  List<Track> get tracks => _tracks;
+  List<dynamic> get tracks => _tracks;
-  bool get isLoading => _isLoading;
+  List<dynamic> get radioStations => _radioStations;
-  String? get error => _error;
+  List<dynamic> get podcasts => _podcasts;
  String get lastSearchQuery => _lastSearchQuery;
  Map<String, List<MediaItem>> get lastSearchResults => _lastSearchResults;
-  LibraryProvider(this._cacheService);
+  // Expose typed lists for convenience
  List<Artist> get artistList => _artists.cast<Artist>();
  List<Album> get albumList => _albums.cast<Album>();
  List<Track> get trackList => _tracks.cast<Track>();
-  /// Initialize with API reference after connection
+  // Callback for when library status changes
-  void initialize(MusicAssistantAPI api) {
+  Function()? onLibraryChanged;
    _api = api;
  }
-  void saveSearchState(String query, Map<String, List<MediaItem>> results) {
+  LibraryProvider({
-    _lastSearchQuery = query;
+    required MusicAssistantAPI? api,
-    _lastSearchResults = results;
+    required DebugLogger logger,
-  }
+    required CacheService cacheService,
-
+    SettingsService? settings,
-  void clearSearchState() {
+    required ProviderFilterService providerFilterService,
-    _lastSearchQuery = '';
+  })  : _api = api,
-    _lastSearchResults = {
+        _logger = logger,
-      'artists': [],
+        _cacheService = cacheService,
-      'albums': [],
+        _settings = settings,
-      'tracks': [],
+        _providerFilterService = providerFilterService;
    };
  }
  // ============================================================================
  // HOME SCREEN DATA
  // ============================================================================
  /// Get recently played albums with caching
  Future<List<Album>> getRecentAlbumsWithCache({bool forceRefresh = false}) async {
    if (_cacheService.isRecentAlbumsCacheValid(forceRefresh: forceRefresh)) {
      _logger.log('📦 Using cached recent albums');
      return _cacheService.getCachedRecentAlbums()!;
    }
    if (_api == null) return _cacheService.getCachedRecentAlbums() ?? [];
    try {
      _logger.log('🔄 Fetching fresh recent albums...');
      final albums = await _api!.getRecentAlbums(limit: LibraryConstants.defaultRecentLimit);
      _cacheService.setCachedRecentAlbums(albums);
      return albums;
    } catch (e) {
      _logger.log('❌ Failed to fetch recent albums: $e');
      return _cacheService.getCachedRecentAlbums() ?? [];
    }
  }
  /// Get discover artists (random) with caching
  Future<List<Artist>> getDiscoverArtistsWithCache({bool forceRefresh = false}) async {
    if (_cacheService.isDiscoverArtistsCacheValid(forceRefresh: forceRefresh)) {
      _logger.log('📦 Using cached discover artists');
      return _cacheService.getCachedDiscoverArtists()!;
    }
    if (_api == null) return _cacheService.getCachedDiscoverArtists() ?? [];
    try {
      _logger.log('🔄 Fetching fresh discover artists...');
      final artists = await _api!.getRandomArtists(limit: LibraryConstants.defaultRecentLimit);
      _cacheService.setCachedDiscoverArtists(artists);
      return artists;
    } catch (e) {
      _logger.log('❌ Failed to fetch discover artists: $e');
      return _cacheService.getCachedDiscoverArtists() ?? [];
    }
  }
  /// Get discover albums (random) with caching
  Future<List<Album>> getDiscoverAlbumsWithCache({bool forceRefresh = false}) async {
    if (_cacheService.isDiscoverAlbumsCacheValid(forceRefresh: forceRefresh)) {
      _logger.log('📦 Using cached discover albums');
      return _cacheService.getCachedDiscoverAlbums()!;
    }
    if (_api == null) return _cacheService.getCachedDiscoverAlbums() ?? [];
    try {
      _logger.log('🔄 Fetching fresh discover albums...');
      final albums = await _api!.getRandomAlbums(limit: LibraryConstants.defaultRecentLimit);
      _cacheService.setCachedDiscoverAlbums(albums);
      return albums;
    } catch (e) {
      _logger.log('❌ Failed to fetch discover albums: $e');
      return _cacheService.getCachedDiscoverAlbums() ?? [];
    }
  }
  /// Invalidate home screen cache (call on pull-to-refresh)
  void invalidateHomeCache() {
    _cacheService.invalidateHomeCache();
  }
  // ============================================================================
  // LIBRARY DATA
  // ============================================================================
  /// Load library data from API with caching
  Future<void> loadLibrary() async {
    if (_api == null) return;
    try {
-      _isLoading = true;
+      _logger.log('📚 Loading library from cache (instant)...');
-      _error = null;
+
      // Load from database cache first (instant)
      final syncService = SyncService.instance;
      if (syncService.hasCache) {
        _albums = syncService.cachedAlbums;
        _artists = syncService.cachedArtists;
        _logger.log('📦 Loaded ${_albums.length} albums, ${_artists.length} artists from cache');
        _syncLibraryStatusToService();
        notifyListeners();
      }
      // Fetch tracks from API (not cached - too many items)
      try {
        _tracks = await _api!.getTracks(
          limit: LibraryConstants.maxLibraryItems,
          providerInstanceIds: _providerIdsForApiCalls(),
        );
        _logger.log('📥 Fetched ${_tracks.length} tracks from MA');
      } catch (e) {
        _logger.log('⚠️ Failed to fetch tracks: $e');
      }
      notifyListeners();
-      final results = await Future.wait([
+      // Trigger background sync (non-blocking)
-        _api!.getArtists(limit: LibraryConstants.maxLibraryItems),
+      _syncLibraryInBackground();
        _api!.getAlbums(limit: LibraryConstants.maxLibraryItems),
        _api!.getTracks(limit: LibraryConstants.maxLibraryItems),
      ]);
      _artists = results[0] as List<Artist>;
      _albums = results[1] as List<Album>;
      _tracks = results[2] as List<Track>;
      _isLoading = false;
      notifyListeners();
    } catch (e) {
-      final errorInfo = ErrorHandler.handleError(e, context: 'Load library');
+      _logger.log('❌ Error loading library: $e');
      _error = errorInfo.userMessage;
      _isLoading = false;
      notifyListeners();
    }
  }
-  Future<void> loadArtists({int? limit, int? offset, String? search}) async {
+  /// Load artists from library
  Future<void> loadArtists({int? limit, int? offset, String? search, String? orderBy}) async {
    if (_api == null) return;
    try {
-      _isLoading = true;
+      final artists = await _api!.getArtists(
      _error = null;
      notifyListeners();
      _artists = await _api!.getArtists(
        limit: limit ?? LibraryConstants.maxLibraryItems,
        offset: offset,
        search: search,
        albumArtistsOnly: false,
        orderBy: orderBy,
      );
-      _isLoading = false;
+      // Update SyncService cache
      SyncService.instance.updateCachedArtists(artists);
      _artists = artists;
      _syncLibraryStatusToService();
      notifyListeners();
    } catch (e) {
-      final errorInfo = ErrorHandler.handleError(e, context: 'Load artists');
+      _logger.log('⚠️ Failed to load artists: $e');
      _error = errorInfo.userMessage;
      _isLoading = false;
      notifyListeners();
    }
  }
-  Future<void> loadAlbums({int? limit, int? offset, String? search, String? artistId}) async {
+  /// Load albums from library
  Future<void> loadAlbums({int? limit, int? offset, String? search, String? artistId, String? orderBy}) async {
    if (_api == null) return;
    try {
-      _isLoading = true;
+      final albums = await _api!.getAlbums(
      _error = null;
      notifyListeners();
      _albums = await _api!.getAlbums(
        limit: limit ?? LibraryConstants.maxLibraryItems,
        offset: offset,
        search: search,
        artistId: artistId,
        orderBy: orderBy,
      );
-      _isLoading = false;
+      // Update SyncService cache
      SyncService.instance.updateCachedAlbums(albums);
      _albums = albums;
      _syncLibraryStatusToService();
      notifyListeners();
    } catch (e) {
-      final errorInfo = ErrorHandler.handleError(e, context: 'Load albums');
+      _logger.log('⚠️ Failed to load albums: $e');
-      _error = errorInfo.userMessage;
+    }
-      _isLoading = false;
+  }
  /// Load radio stations
  Future<void> loadRadioStations({String? orderBy}) async {
    if (_api == null) return;
    try {
      _radioStations = await _api!.getRadioStations(limit: 100, orderBy: orderBy);
      notifyListeners();
    } catch (e) {
      _logger.log('⚠️ Failed to load radio stations: $e');
    }
  }
-  // ============================================================================
+  /// Load podcasts
-  // DETAIL SCREEN DATA
+  Future<void> loadPodcasts({String? orderBy}) async {
-  // ============================================================================
+    if (_api == null) return;
  /// Get album tracks with caching
  Future<List<Track>> getAlbumTracksWithCache(String provider, String itemId, {bool forceRefresh = false}) async {
    final cacheKey = '${provider}_$itemId';
    if (_cacheService.isAlbumTracksCacheValid(cacheKey, forceRefresh: forceRefresh)) {
      _logger.log('📦 Using cached album tracks for $cacheKey');
      return _cacheService.getCachedAlbumTracks(cacheKey)!;
    }
    if (_api == null) return _cacheService.getCachedAlbumTracks(cacheKey) ?? [];
    try {
-      _logger.log('🔄 Fetching fresh album tracks for $cacheKey...');
+      _podcasts = await _api!.getPodcasts(limit: 100, orderBy: orderBy);
-      final tracks = await _api!.getAlbumTracks(provider, itemId);
+      _logger.log('🎙️ Loaded ${_podcasts.length} podcasts');
-      _cacheService.setCachedAlbumTracks(cacheKey, tracks);
+      notifyListeners();
      return tracks;
    } catch (e) {
-      _logger.log('❌ Failed to fetch album tracks: $e');
+      _logger.log('⚠️ Failed to load podcasts: $e');
      return _cacheService.getCachedAlbumTracks(cacheKey) ?? [];
    }
  }
-  /// Get playlist tracks with caching
+  /// Get playlists with provider filtering
-  Future<List<Track>> getPlaylistTracksWithCache(String provider, String itemId, {bool forceRefresh = false}) async {
+  Future<List<Playlist>> getPlaylists({int? limit, bool? favoriteOnly, String? orderBy}) async {
    final cacheKey = '${provider}_$itemId';
    if (_cacheService.isPlaylistTracksCacheValid(cacheKey, forceRefresh: forceRefresh)) {
      _logger.log('📦 Using cached playlist tracks for $cacheKey');
      return _cacheService.getCachedPlaylistTracks(cacheKey)!;
    }
    if (_api == null) return _cacheService.getCachedPlaylistTracks(cacheKey) ?? [];
    try {
      _logger.log('🔄 Fetching fresh playlist tracks for $cacheKey...');
      final tracks = await _api!.getPlaylistTracks(provider, itemId);
      _cacheService.setCachedPlaylistTracks(cacheKey, tracks);
      return tracks;
    } catch (e) {
      _logger.log('❌ Failed to fetch playlist tracks: $e');
      return _cacheService.getCachedPlaylistTracks(cacheKey) ?? [];
    }
  }
  /// Get artist albums with caching
  Future<List<Album>> getArtistAlbumsWithCache(String artistName, {bool forceRefresh = false}) async {
    final cacheKey = artistName.toLowerCase();
    if (_cacheService.isArtistAlbumsCacheValid(cacheKey, forceRefresh: forceRefresh)) {
      _logger.log('📦 Using cached artist albums for "$artistName"');
      return _cacheService.getCachedArtistAlbums(cacheKey)!;
    }
    if (_api == null) return _cacheService.getCachedArtistAlbums(cacheKey) ?? [];
    try {
      _logger.log('🔄 Fetching albums for artist "$artistName"...');
      final libraryAlbums = await _api!.getAlbums();
      final artistAlbums = libraryAlbums.where((album) {
        final albumArtists = album.artists;
        if (albumArtists == null || albumArtists.isEmpty) return false;
        return albumArtists.any((a) => a.name.toLowerCase() == artistName.toLowerCase());
      }).toList();
      final searchResults = await _api!.search(artistName);
      final searchAlbums = searchResults['albums'] as List<MediaItem>? ?? [];
      final providerAlbums = searchAlbums.whereType<Album>().where((album) {
        final albumArtists = album.artists;
        if (albumArtists == null || albumArtists.isEmpty) return false;
        return albumArtists.any((a) => a.name.toLowerCase() == artistName.toLowerCase());
      }).toList();
      final allAlbums = <Album>[];
      final seenNames = <String>{};
      for (final album in [...artistAlbums, ...providerAlbums]) {
        final key = album.name.toLowerCase();
        if (!seenNames.contains(key)) {
          seenNames.add(key);
          allAlbums.add(album);
        }
      }
      _cacheService.setCachedArtistAlbums(cacheKey, allAlbums);
      return allAlbums;
    } catch (e) {
      _logger.log('❌ Failed to fetch artist albums: $e');
      return _cacheService.getCachedArtistAlbums(cacheKey) ?? [];
    }
  }
  /// Invalidate album tracks cache
  void invalidateAlbumTracksCache(String albumId) {
    _cacheService.invalidateAlbumTracksCache(albumId);
  }
  /// Invalidate playlist tracks cache
  void invalidatePlaylistTracksCache(String playlistId) {
    _cacheService.invalidatePlaylistTracksCache(playlistId);
  }
  // ============================================================================
  // SEARCH
  // ============================================================================
  /// Search with caching
  Future<Map<String, List<MediaItem>>> searchWithCache(String query, {bool forceRefresh = false}) async {
    final cacheKey = query.toLowerCase().trim();
    if (cacheKey.isEmpty) return {'artists': [], 'albums': [], 'tracks': []};
    if (_cacheService.isSearchCacheValid(cacheKey, forceRefresh: forceRefresh)) {
      _logger.log('📦 Using cached search results for "$query"');
      return _cacheService.getCachedSearchResults(cacheKey)!;
    }
    if (_api == null) {
      return _cacheService.getCachedSearchResults(cacheKey) ?? {'artists': [], 'albums': [], 'tracks': []};
    }
    try {
      _logger.log('🔄 Searching for "$query"...');
      final results = await _api!.search(query);
      final cachedResults = <String, List<MediaItem>>{
        'artists': results['artists'] ?? [],
        'albums': results['albums'] ?? [],
        'tracks': results['tracks'] ?? [],
      };
      _cacheService.setCachedSearchResults(cacheKey, cachedResults);
      return cachedResults;
    } catch (e) {
      _logger.log('❌ Search failed: $e');
      return _cacheService.getCachedSearchResults(cacheKey) ?? {'artists': [], 'albums': [], 'tracks': []};
    }
  }
  Future<Map<String, List<MediaItem>>> search(String query, {bool libraryOnly = false}) async {
    if (_api == null) return {'artists': [], 'albums': [], 'tracks': []};
    try {
      return await _api!.search(query, libraryOnly: libraryOnly);
    } catch (e) {
      ErrorHandler.logError('Search', e);
      return {'artists': [], 'albums': [], 'tracks': []};
    }
  }
  Future<List<Track>> getAlbumTracks(String provider, String itemId) async {
    if (_api == null) return [];
    try {
-      return await _api!.getAlbumTracks(provider, itemId);
+      final playlists = await _api!.getPlaylists(limit: limit, favoriteOnly: favoriteOnly, orderBy: orderBy);
      return _providerFilterService.filterByProvider(playlists);
    } catch (e) {
-      ErrorHandler.logError('Get album tracks', e);
+      _logger.log('❌ Failed to fetch playlists: $e');
      return [];
    }
  }
-  void clearState() {
+  /// Get audiobooks with provider filtering
-    _artists = [];
+  Future<List<Audiobook>> getAudiobooks({int? limit, bool? favoriteOnly}) async {
-    _albums = [];
+    if (_api == null) return [];
-    _tracks = [];
+    try {
-    _isLoading = false;
+      final audiobooks = await _api!.getAudiobooks(limit: limit, favoriteOnly: favoriteOnly ?? false);
-    _error = null;
+      return _providerFilterService.filterByProvider(audiobooks);
-    clearSearchState();
+    } catch (e) {
-    notifyListeners();
+      _logger.log('❌ Failed to fetch audiobooks: $e');
      return [];
    }
  }
  /// Sync library data in background without blocking UI
  void _syncLibraryInBackground() {
    if (_api == null) return;
    final syncService = SyncService.instance;
    // Listen for sync completion to update our lists
    void onSyncComplete() {
      if (syncService.status == SyncStatus.completed) {
        _albums = syncService.cachedAlbums;
        _artists = syncService.cachedArtists;
        _logger.log('🔄 Updated library from background sync: ${_albums.length} albums, ${_artists.length} artists');
        _syncLibraryStatusToService();
        notifyListeners();
        onLibraryChanged?.call();
      }
      syncService.removeListener(onSyncComplete);
    }
    syncService.addListener(onSyncComplete);
    syncService.syncFromApi(_api!, providerInstanceIds: _providerIdsForApiCalls());
  }
  /// Sync library status to centralized service for reactive UI updates
  void _syncLibraryStatusToService() {
    final service = LibraryStatusService.instance;
    service.syncFromLibrary(
      mediaType: 'album',
      items: _albums,
      getInLibrary: (a) => (a as Album).inLibrary,
      getFavorite: (a) => (a as Album).favorite ?? false,
      getProvider: (a) => (a as Album).provider,
      getItemId: (a) => (a as Album).itemId,
    );
    service.syncFromLibrary(
      mediaType: 'artist',
      items: _artists,
      getInLibrary: (a) => (a as Artist).inLibrary,
      getFavorite: (a) => (a as Artist).favorite ?? false,
      getProvider: (a) => (a as Artist).provider,
      getItemId: (a) => (a as Artist).itemId,
    );
    service.syncFromLibrary(
      mediaType: 'track',
      items: _tracks,
      getInLibrary: (t) => (t as Track).inLibrary,
      getFavorite: (t) => (t as Track).favorite ?? false,
      getProvider: (t) => (t as Track).provider,
      getItemId: (t) => (t as Track).itemId,
    );
  }
  /// Get provider instance IDs for API calls (respects user filter)
  List<String> _providerIdsForApiCalls() {
    // For now, always return empty list to use all available providers
    // Provider filtering can be re-enabled later with async approach
    return [];
  }
  /// Update the API reference
  void setApi(MusicAssistantAPI? api) {
    if (_api != api) {
      // Note: We don't dispose the old API here as it's managed by ConnectionProvider
      // This is just updating the reference
    }
  }
  /// Load library from cache for instant display
  Future<void> loadFromCache() async {
    try {
      final syncService = SyncService.instance;
      if (!syncService.hasCache) {
        await syncService.loadFromCache();
      }
      if (syncService.hasCache) {
        _albums = syncService.cachedAlbums;
        _artists = syncService.cachedArtists;
        _logger.log('📦 Pre-loaded library: ${_albums.length} albums, ${_artists.length} artists');
        _syncLibraryStatusToService();
        notifyListeners();
      }
    } catch (e) {
      _logger.log('⚠️ Error loading library from cache: $e');
    }
  }
 }
@@ -0,0 +1,371 @@
 import 'dart:async';
 import 'dart:ui';
 import 'package:audio_service/audio_service.dart' as audio_service;
 import 'package:flutter/foundation.dart';
 import '../constants/timings.dart';
 import '../services/audio/massiv_audio_handler.dart';
 import '../services/auth/auth_manager.dart';
 import '../services/debug_logger.dart';
 import '../services/device_id_service.dart';
 import '../services/local_player_service.dart';
 import '../services/pcm_audio_player.dart';
 import '../services/sendspin_service.dart';
 import '../services/settings_service.dart';
 /// Provider for local audio playback and Sendspin integration.
 ///
 /// Manages:
 /// - LocalPlayerService for audio playback
 /// - SendspinService integration (MA 2.7.0b20+)
 /// - PcmAudioPlayer for raw audio streaming
 /// - Player registration with Music Assistant
 /// - Volume and power control
 /// - Event handling from Sendspin
 ///
 /// Extracted from MusicAssistantProvider to isolate local player logic.
 class LocalPlayerProvider extends ChangeNotifier {
  final AuthManager _authManager;
  final DebugLogger _logger;
  final SettingsService? _settings;
  // Local player service
  late final LocalPlayerService _localPlayer;
  // Sendspin service (MA 2.7.0b20+ replacement for builtin_player)
  SendspinService? _sendspinService;
  bool _sendspinConnected = false;
  // PCM audio player for raw Sendspin audio streaming
  PcmAudioPlayer? _pcmAudioPlayer;
  // Local player state
  bool _isLocalPlayerPowered = true;
  int _localPlayerVolume = VolumeConstants.max;
  bool _builtinPlayerAvailable = true;
  // State reporting timer
  Timer? _localPlayerStateReportTimer;
  // Audio handler (from audio_service package)
  final MassivAudioHandler _audioHandler;
  // Server info
  String? _serverUrl;
  // Callbacks
  Function()? onSendspinConnected;
  Function()? onSendspinDisconnected;
  Function(Map<String, dynamic>)? onLocalPlayerEvent;
  LocalPlayerProvider({
    AuthManager? authManager,
    DebugLogger? logger,
    SettingsService? settings,
    required MassivAudioHandler audioHandler,
  })  : _authManager = authManager ?? AuthManager(),
        _logger = logger ?? DebugLogger(),
        _settings = settings,
        _audioHandler = audioHandler {
    _localPlayer = LocalPlayerService(_authManager);
  }
  // Getters
  bool get isLocalPlayerPowered => _isLocalPlayerPowered;
  int get localPlayerVolume => _localPlayerVolume;
  bool get sendspinConnected => _sendspinConnected;
  bool get builtinPlayerAvailable => _builtinPlayerAvailable;
  bool get isPcmPlaying => _sendspinConnected && _pcmAudioPlayer != null && _pcmAudioPlayer!.isPlaying;
  LocalPlayerService get localPlayer => _localPlayer;
  SendspinService? get sendspinService => _sendspinService;
  PcmAudioPlayer? get pcmAudioPlayer => _pcmAudioPlayer;
  // ============================================================================
  // INITIALIZATION
  // ============================================================================
  /// Initialize local playback engine
  Future<void> initialize() async {
    await _localPlayer.initialize();
    _isLocalPlayerPowered = true;
    // Wire up notification button callbacks
    _wireNotificationCallbacks();
    _logger.log('🔊 Local player initialized');
  }
  /// Register the built-in/local player with Music Assistant
  Future<String?> registerLocalPlayer() async {
    if (_serverUrl == null) {
      _logger.log('⚠️ Cannot register player: no server URL');
      return null;
    }
    try {
      final deviceId = await DeviceIdService.getOrCreateDevicePlayerId();
      final ownerName = await SettingsService.getOwnerName() ?? 'Ensemble User';
      _logger.log('📱 Registering local player: $deviceId');
      // Check if server uses Sendspin (MA 2.7.0b20+)
      if (_serverUsesSendspin()) {
        return await _registerSendspinPlayer(deviceId, ownerName);
      } else {
        return await _registerBuiltinPlayer(deviceId, ownerName);
      }
    } catch (e) {
      _logger.log('❌ Failed to register local player: $e');
      return null;
    }
  }
  /// Check if server version is >= 2.7.0b20 (uses Sendspin)
  bool _serverUsesSendspin() {
    // This would check the server version from API
    // For now, we'll try both methods
    return true; // Default to Sendspin for modern MA
  }
  /// Register using Sendspin protocol (MA 2.7.0b20+)
  Future<String?> _registerSendspinPlayer(String deviceId, String ownerName) async {
    _logger.log('📡 Registering via Sendspin protocol...');
    try {
      // Initialize Sendspin service
      _sendspinService = SendspinService(_serverUrl!);
      _builtinPlayerAvailable = false;
      // Initialize PCM audio player
      _pcmAudioPlayer = PcmAudioPlayer();
      final pcmInitialized = await _pcmAudioPlayer!.initialize();
      if (!pcmInitialized) {
        _logger.log('⚠️ Failed to initialize PCM audio player');
      }
      // Connect Sendspin events
      _wireSendspinEvents();
      // Try direct connection first
      final localSendspinUrl = '$_serverUrl/sendspin/$deviceId';
      final connected = await _sendspinService!.connectWithUrl(localSendspinUrl);
      if (!connected) {
        // Try proxy connection
        final proxyUrl = '$_serverUrl/sendspin/proxy/$deviceId';
        final proxyConnected = await _sendspinService!.connectWithUrl(proxyUrl, useProxyAuth: true);
        if (!proxyConnected) {
          _logger.log('⚠️ Sendspin connection failed, will retry on connect');
          return null;
        }
      }
      // Connect PCM audio player to Sendspin audio stream
      if (_pcmAudioPlayer != null && pcmInitialized) {
        await _pcmAudioPlayer!.connectToStream(_sendspinService!.audioDataStream);
      }
      _sendspinConnected = true;
      _startStateReporting();
      onSendspinConnected?.call();
      _logger.log('✅ Sendspin player registered: $deviceId');
      return deviceId;
    } catch (e) {
      _logger.log('❌ Sendspin registration failed: $e');
      return null;
    }
  }
  /// Register using legacy builtin_player protocol
  Future<String?> _registerBuiltinPlayer(String deviceId, String ownerName) async {
    _logger.log('📻 Registering via builtin_player protocol...');
    // Legacy registration would go here
    return deviceId;
  }
  // ============================================================================
  // SENDSPIN EVENT HANDLERS
  // ============================================================================
  void _wireSendspinEvents() {
    if (_sendspinService == null) return;
    _sendspinService!.onPlay = _handleSendspinPlay;
    _sendspinService!.onPause = _handleSendspinPause;
    _sendspinService!.onStop = _handleSendspinStop;
    _sendspinService!.onSeek = _handleSendspinSeek;
    _sendspinService!.onVolume = _handleSendspinVolume;
    _sendspinService!.onStreamStart = _handleSendspinStreamStart;
    _sendspinService!.onStreamEnd = _handleSendspinStreamEnd;
  }
  void _handleSendspinPlay(String streamUrl, Map<String, dynamic> trackInfo) {
    _logger.log('📡 Sendspin: Play $streamUrl');
    _pcmAudioPlayer?.play();
    notifyListeners();
  }
  void _handleSendspinPause() {
    _logger.log('📡 Sendspin: Pause');
    _pcmAudioPlayer?.pause();
    notifyListeners();
  }
  void _handleSendspinStop() {
    _logger.log('📡 Sendspin: Stop');
    _pcmAudioPlayer?.stop();
    notifyListeners();
  }
  void _handleSendspinSeek(int positionSeconds) {
    _logger.log('📡 Sendspin: Seek to $positionSeconds');
    _pcmAudioPlayer?.resetPosition();
    notifyListeners();
  }
  void _handleSendspinVolume(int volumeLevel) {
    _logger.log('📡 Sendspin: Set volume to $volumeLevel');
    _localPlayerVolume = volumeLevel;
    notifyListeners();
  }
  void _handleSendspinStreamStart(Map<String, dynamic>? trackInfo) {
    _logger.log('📡 Sendspin: Stream start');
    _pcmAudioPlayer?.play();
    notifyListeners();
  }
  void _handleSendspinStreamEnd() {
    _logger.log('📡 Sendspin: Stream end');
    _pcmAudioPlayer?.stop();
    notifyListeners();
  }
  // ============================================================================
  // LOCAL PLAYER CONTROLS
  // ============================================================================
  Future<void> setPower(bool powered) async {
    _isLocalPlayerPowered = powered;
    notifyListeners();
  }
  Future<void> setVolume(int volumeLevel) async {
    _localPlayerVolume = volumeLevel;
    _localPlayer.setVolume(volumeLevel / 100);
    // Report to Sendspin if connected
    if (_sendspinConnected && _sendspinService != null) {
      _sendspinService!.reportState(volume: volumeLevel);
    }
    notifyListeners();
  }
  Future<void> playUrl(String url) async {
    await _localPlayer.playUrl(url);
    // Report to Sendspin if connected
    if (_sendspinConnected && _sendspinService != null) {
      _sendspinService!.reportState(playing: true, paused: false);
    }
  }
  Future<void> pause() async {
    await _localPlayer.pause();
    if (_sendspinConnected && _sendspinService != null) {
      _sendspinService!.reportState(playing: false, paused: true);
    }
  }
  Future<void> stop() async {
    await _localPlayer.stop();
    if (_sendspinConnected && _sendspinService != null) {
      _sendspinService!.reportState(playing: false, paused: false);
    }
  }
  Future<void> seek(Duration position) async {
    await _localPlayer.seek(position);
    if (_sendspinConnected && _sendspinService != null) {
      _sendspinService!.reportState(position: position.inSeconds);
    }
  }
  // ============================================================================
  // NOTIFICATION CALLBACKS
  // ============================================================================
  void _wireNotificationCallbacks() {
    _audioHandler.onPlay = () {
      _logger.log('🎵 Notification: Play pressed');
      // This would be handled by PlayerProvider
    };
    _audioHandler.onPause = () {
      _logger.log('🎵 Notification: Pause pressed');
      // This would be handled by PlayerProvider
    };
    _audioHandler.onSkipToNext = () {
      _logger.log('🎵 Notification: Skip to next pressed');
      // This would be handled by PlayerProvider
    };
    _audioHandler.onSkipToPrevious = () {
      _logger.log('🎵 Notification: Skip to previous pressed');
      // This would be handled by PlayerProvider
    };
  }
  // ============================================================================
  // STATE REPORTING
  // ============================================================================
  void _startStateReporting() {
    _localPlayerStateReportTimer?.cancel();
    _localPlayerStateReportTimer = Timer.periodic(
      Timings.localPlayerReportInterval,
      (_) => _reportState(),
    );
  }
  Future<void> _reportState() async {
    if (!_sendspinConnected || _sendspinService == null) return;
    final isPlaying = _localPlayer.isPlaying;
    final position = _localPlayer.position.inSeconds;
    final volume = _localPlayerVolume;
    final muted = _localPlayerVolume == 0;
    _sendspinService!.reportState(
      playing: isPlaying,
      paused: !isPlaying,
      position: position,
      volume: volume,
      muted: muted,
    );
  }
  // ============================================================================
  // SERVER URL MANAGEMENT
  // ============================================================================
  void setServerUrl(String? serverUrl) {
    _serverUrl = serverUrl;
  }
  // ============================================================================
  // CLEANUP
  // ============================================================================
  @override
  void dispose() {
    _localPlayerStateReportTimer?.cancel();
    _pcmAudioPlayer?.dispose();
    _sendspinService?.dispose();
    _localPlayer.dispose();
    super.dispose();
  }
 }
@@ -31,6 +31,10 @@ class LocaleProvider extends ChangeNotifier {
        return 'English';
      case 'de':
        return 'Deutsch';
      case 'es':
        return 'Español';
      case 'fr':
        return 'Français';
      case null:
        return 'System';
      default:
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`New package ID (com.collotsspot.ensemble) - reinstall required.`
							`Prepares for F-Droid and Play Store submission.`
		`@@ -0,0 +1 @@`
							`Disable dependency metadata in APK for F-Droid compliance.`
		`@@ -0,0 +1 @@`
							`Unofficial mobile client for Music Assistant`