WIP on feature/remote-bridge: 8cf35cf Add robust reconnection for remote mode

index on feature/remote-bridge: 8cf35cf Add robust reconnection for remote mode
Add robust reconnection for remote mode
2026-01-23 22:16:58 +00:00 · 2026-01-23 22:16:58 +00:00 · 2026-01-23 12:40:53 +00:00 · 2026-01-23 11:54:38 +00:00 · 2026-01-23 11:03:43 +00:00 · 2026-01-23 10:43:07 +00:00
126 changed files with 9734 additions and 15068 deletions
@@ -1,3 +0,0 @@
-# These are the funding models supported by Ensemble
-github: CollotsSpot
-custom: https://ko-fi.com/collotsspot
@@ -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`
@@ -1,11 +1,6 @@
 <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>
@@ -22,12 +17,6 @@ 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
@@ -138,11 +127,25 @@ To find the correct URL:

 If you run Music Assistant as a Home Assistant add-on:
 - Use the IP address of your Home Assistant server
+- Enter `8095` in the port field
 - 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).
+For access outside your home network, you'll need to expose Music Assistant through a reverse proxy (e.g., Nginx Proxy Manager, Cloudflare Tunnel).
+
+## Authentication
+
+Ensemble supports multiple authentication methods:
+
+| Method | Status |
+|--------|--------|
+| Music Assistant native auth | Tested |
+| No authentication | Tested |
+| 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.

 ## Requirements

@@ -151,12 +154,6 @@ For access outside your home network, you'll need to expose Music Assistant thro
 - Android device (Android 5.0+)
 - Audiobookshelf provider configured in Music Assistant (for audiobook features)

-## Sponsors
-
-A huge thank you to my sponsors! 💖
-
-<a href="https://github.com/pcsokonay"><img src="https://github.com/pcsokonay.png" width="60px" alt="pcsokonay" /></a>
-
 ## License

 MIT License
@@ -2,33 +2,6 @@

 ## 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
@@ -56,23 +29,9 @@
 #### 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.collotsspot.ensemble"
-    compileSdk 36
+    namespace "com.musicassistant.music_assistant"
+    compileSdk 35
    ndkVersion flutter.ndkVersion

    compileOptions {
@@ -58,7 +58,7 @@ android {
    }

    defaultConfig {
-        applicationId "com.collotsspot.ensemble"
+        applicationId "com.musicassistant.music_assistant"
        minSdkVersion flutter.minSdkVersion
        targetSdk 35
        versionCode flutterVersionCode.toInteger()
@@ -70,11 +70,6 @@ android {
            signingConfig keystorePropertiesFile.exists() ? signingConfigs.release : signingConfigs.debug
        }
    }
-
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
 }

 flutter {
@@ -1,11 +1,5 @@
 <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"/>
@@ -1,229 +0,0 @@
-package com.collotsspot.ensemble
-
-import android.content.Context
-import android.database.ContentObserver
-import android.media.AudioManager
-import android.os.Handler
-import android.os.Looper
-import android.provider.Settings
-import android.util.Log
-import android.view.KeyEvent
-import com.ryanheise.audioservice.AudioServiceActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodChannel
-
-// Extend AudioServiceActivity instead of FlutterActivity to support audio_service package
-// while also intercepting volume button events
-class MainActivity: AudioServiceActivity() {
-    private val TAG = "EnsembleVolume"
-    private val CHANNEL = "com.collotsspot.ensemble/volume_buttons"
-    private var methodChannel: MethodChannel? = null
-    private var isListening = false
-
-    // Volume observer for lockscreen volume changes
-    // Watches system STREAM_MUSIC volume and mirrors changes to the MA player
-    // when a remote/group player is active
-    private var audioManager: AudioManager? = null
-    private var volumeObserver: VolumeContentObserver? = null
-    private var isObservingVolume = false
-    private var lastKnownVolume: Int = -1
-    // Guard flag to ignore volume changes triggered by our own setStreamVolume calls
-    private var ignoringVolumeChange = false
-
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-        super.configureFlutterEngine(flutterEngine)
-        Log.d(TAG, "Configuring Flutter engine, setting up MethodChannel")
-
-        audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
-
-        methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
-        methodChannel?.setMethodCallHandler { call, result ->
-            Log.d(TAG, "Received method call: ${call.method}")
-            when (call.method) {
-                "startListening" -> {
-                    isListening = true
-                    Log.d(TAG, "Volume listening ENABLED")
-                    result.success(null)
-                }
-                "stopListening" -> {
-                    isListening = false
-                    Log.d(TAG, "Volume listening DISABLED")
-                    result.success(null)
-                }
-                "startVolumeObserver" -> {
-                    // Start observing system volume for lockscreen volume changes.
-                    // Optional: initialVolume (0-100) sets the system volume to match
-                    // the MA player's current volume for a consistent HUD display.
-                    val initialVolume = call.argument<Int>("initialVolume")
-                    startVolumeObserver(initialVolume)
-                    result.success(null)
-                }
-                "stopVolumeObserver" -> {
-                    stopVolumeObserver()
-                    result.success(null)
-                }
-                "syncSystemVolume" -> {
-                    // Sync system volume to match MA player volume (0-100)
-                    val volume = call.argument<Int>("volume") ?: 0
-                    syncSystemVolume(volume)
-                    result.success(null)
-                }
-                else -> {
-                    Log.d(TAG, "Unknown method: ${call.method}")
-                    result.notImplemented()
-                }
-            }
-        }
-    }
-
-    /// Start observing system STREAM_MUSIC volume changes.
-    /// When a change is detected, sends an "absoluteVolumeChange" event to Flutter
-    /// with the new volume mapped to 0-100 scale.
-    private fun startVolumeObserver(initialVolume: Int?) {
-        if (isObservingVolume) return
-
-        val am = audioManager ?: return
-
-        // Optionally set system volume to match the MA player's current volume
-        if (initialVolume != null) {
-            syncSystemVolume(initialVolume)
-        }
-
-        lastKnownVolume = am.getStreamVolume(AudioManager.STREAM_MUSIC)
-
-        volumeObserver = VolumeContentObserver(Handler(Looper.getMainLooper()))
-        contentResolver.registerContentObserver(
-            Settings.System.CONTENT_URI,
-            true,
-            volumeObserver!!
-        )
-        isObservingVolume = true
-        Log.d(TAG, "Volume observer STARTED, initial system volume: $lastKnownVolume")
-    }
-
-    /// Stop observing system volume changes.
-    private fun stopVolumeObserver() {
-        if (!isObservingVolume) return
-
-        volumeObserver?.let {
-            contentResolver.unregisterContentObserver(it)
-        }
-        volumeObserver = null
-        isObservingVolume = false
-        Log.d(TAG, "Volume observer STOPPED")
-    }
-
-    /// Set the system STREAM_MUSIC volume to match an MA player volume (0-100).
-    /// Maps MA's 0-100 range to the device's 0-maxVolume range.
-    private fun syncSystemVolume(maVolume: Int) {
-        val am = audioManager ?: return
-        val maxSystemVolume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-        val systemVolume = (maVolume * maxSystemVolume / 100).coerceIn(0, maxSystemVolume)
-
-        ignoringVolumeChange = true
-        am.setStreamVolume(AudioManager.STREAM_MUSIC, systemVolume, 0)
-        lastKnownVolume = systemVolume
-        ignoringVolumeChange = false
-        Log.d(TAG, "Synced system volume: MA $maVolume% -> system $systemVolume/$maxSystemVolume")
-    }
-
-    /// ContentObserver that watches for system volume changes.
-    /// When volume changes (e.g., from lockscreen hardware buttons),
-    /// maps the change to a 0-100 value and sends to Flutter.
-    inner class VolumeContentObserver(handler: Handler) : ContentObserver(handler) {
-        override fun onChange(selfChange: Boolean) {
-            super.onChange(selfChange)
-
-            if (ignoringVolumeChange) return
-
-            val am = audioManager ?: return
-            val currentVolume = am.getStreamVolume(AudioManager.STREAM_MUSIC)
-
-            if (currentVolume != lastKnownVolume) {
-                val maxVolume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-                val maVolume = if (maxVolume > 0) (currentVolume * 100 / maxVolume) else 0
-
-                Log.d(TAG, "Volume observer: system $lastKnownVolume -> $currentVolume (MA: $maVolume%)")
-                lastKnownVolume = currentVolume
-
-                // Send the absolute volume (0-100) to Flutter
-                methodChannel?.invokeMethod("absoluteVolumeChange", maVolume)
-            }
-        }
-    }
-
-    // Use dispatchKeyEvent instead of onKeyDown - Flutter's engine uses dispatchKeyEvent
-    // and may consume events before they reach onKeyDown
-    override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-        if (event == null) {
-            return super.dispatchKeyEvent(event)
-        }
-
-        val keyCode = event.keyCode
-        val action = event.action
-
-        Log.d(TAG, "dispatchKeyEvent: keyCode=$keyCode, action=$action, isListening=$isListening")
-
-        // Only handle KEY_DOWN events to avoid double-triggering (down + up)
-        if (action != KeyEvent.ACTION_DOWN) {
-            // For volume keys when listening, also consume ACTION_UP to fully block system volume
-            if (isListening && (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
-                Log.d(TAG, "Consuming ACTION_UP for volume key")
-                return true
-            }
-            return super.dispatchKeyEvent(event)
-        }
-
-        if (!isListening) {
-            Log.d(TAG, "Not listening, passing to super")
-            return super.dispatchKeyEvent(event)
-        }
-
-        return when (keyCode) {
-            KeyEvent.KEYCODE_VOLUME_UP -> {
-                Log.d(TAG, "VOLUME UP pressed - sending to Flutter")
-                methodChannel?.invokeMethod("volumeUp", null)
-                true // Consume the event to prevent system volume change
-            }
-            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                Log.d(TAG, "VOLUME DOWN pressed - sending to Flutter")
-                methodChannel?.invokeMethod("volumeDown", null)
-                true // Consume the event to prevent system volume change
-            }
-            else -> {
-                Log.d(TAG, "Other key, passing to super")
-                super.dispatchKeyEvent(event)
-            }
-        }
-    }
-
-    // Pause volume interception when app goes to background so hardware buttons
-    // only control the system volume (e.g., YouTube, phone ringer) as expected.
-    private var wasListeningBeforePause = false
-    private var wasObservingBeforePause = false
-
-    override fun onPause() {
-        wasListeningBeforePause = isListening
-        wasObservingBeforePause = isObservingVolume
-        isListening = false
-        stopVolumeObserver()
-        Log.d(TAG, "onPause: suspended volume interception (wasListening=$wasListeningBeforePause, wasObserving=$wasObservingBeforePause)")
-        super.onPause()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (wasListeningBeforePause) {
-            isListening = true
-        }
-        if (wasObservingBeforePause) {
-            startVolumeObserver(null)
-        }
-        Log.d(TAG, "onResume: restored volume interception (listening=$isListening, observing=$isObservingVolume)")
-    }
-
-    override fun onDestroy() {
-        stopVolumeObserver()
-        super.onDestroy()
-    }
-}
@@ -0,0 +1,87 @@
+package com.musicassistant.music_assistant
+
+import android.util.Log
+import android.view.KeyEvent
+import com.ryanheise.audioservice.AudioServiceActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+
+// Extend AudioServiceActivity instead of FlutterActivity to support audio_service package
+// while also intercepting volume button events
+class MainActivity: AudioServiceActivity() {
+    private val TAG = "EnsembleVolume"
+    private val CHANNEL = "com.musicassistant.music_assistant/volume_buttons"
+    private var methodChannel: MethodChannel? = null
+    private var isListening = false
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        Log.d(TAG, "Configuring Flutter engine, setting up MethodChannel")
+
+        methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
+        methodChannel?.setMethodCallHandler { call, result ->
+            Log.d(TAG, "Received method call: ${call.method}")
+            when (call.method) {
+                "startListening" -> {
+                    isListening = true
+                    Log.d(TAG, "Volume listening ENABLED")
+                    result.success(null)
+                }
+                "stopListening" -> {
+                    isListening = false
+                    Log.d(TAG, "Volume listening DISABLED")
+                    result.success(null)
+                }
+                else -> {
+                    Log.d(TAG, "Unknown method: ${call.method}")
+                    result.notImplemented()
+                }
+            }
+        }
+    }
+
+    // Use dispatchKeyEvent instead of onKeyDown - Flutter's engine uses dispatchKeyEvent
+    // and may consume events before they reach onKeyDown
+    override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
+        if (event == null) {
+            return super.dispatchKeyEvent(event)
+        }
+
+        val keyCode = event.keyCode
+        val action = event.action
+
+        Log.d(TAG, "dispatchKeyEvent: keyCode=$keyCode, action=$action, isListening=$isListening")
+
+        // Only handle KEY_DOWN events to avoid double-triggering (down + up)
+        if (action != KeyEvent.ACTION_DOWN) {
+            // For volume keys when listening, also consume ACTION_UP to fully block system volume
+            if (isListening && (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
+                Log.d(TAG, "Consuming ACTION_UP for volume key")
+                return true
+            }
+            return super.dispatchKeyEvent(event)
+        }
+
+        if (!isListening) {
+            Log.d(TAG, "Not listening, passing to super")
+            return super.dispatchKeyEvent(event)
+        }
+
+        return when (keyCode) {
+            KeyEvent.KEYCODE_VOLUME_UP -> {
+                Log.d(TAG, "VOLUME UP pressed - sending to Flutter")
+                methodChannel?.invokeMethod("volumeUp", null)
+                true // Consume the event to prevent system volume change
+            }
+            KeyEvent.KEYCODE_VOLUME_DOWN -> {
+                Log.d(TAG, "VOLUME DOWN pressed - sending to Flutter")
+                methodChannel?.invokeMethod("volumeDown", null)
+                true // Consume the event to prevent system volume change
+            }
+            else -> {
+                Log.d(TAG, "Other key, passing to super")
+                super.dispatchKeyEvent(event)
+            }
+        }
+    }
+}
@@ -2,11 +2,14 @@ buildscript {
    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.9.1'
+        classpath 'com.android.tools.build:gradle:8.7.0'
        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()
    }
 }
@@ -2,4 +2,4 @@ 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
@@ -22,7 +22,7 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.9.1" apply false
+    id "com.android.application" version "8.7.0" apply false
    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }

@@ -1,242 +0,0 @@
-# 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
@@ -1,328 +0,0 @@
-# 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
@@ -1,127 +0,0 @@
-# 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
@@ -1,149 +0,0 @@
-# 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
@@ -1,406 +0,0 @@
-# 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
@@ -1,118 +0,0 @@
-# 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?
@@ -1,2 +0,0 @@
-New package ID (com.collotsspot.ensemble) - reinstall required.
-Prepares for F-Droid and Play Store submission.
@@ -1 +0,0 @@
-Add fastlane metadata for F-Droid.
@@ -1 +0,0 @@
-Disable dependency metadata in APK for F-Droid compliance.
@@ -1,13 +0,0 @@
-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.
@@ -1 +0,0 @@
-Unofficial mobile client for Music Assistant
@@ -1 +0,0 @@
-Ensemble
@@ -32,12 +32,6 @@ class HeroTags {
  /// 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_';

@@ -2996,8 +2996,7 @@ final class $$ProfilesTableReferences

  $$RecentlyPlayedTableProcessedTableManager get recentlyPlayedRefs {
    final manager = $$RecentlyPlayedTableTableManager($_db, $_db.recentlyPlayed)
-        .filter((f) => f.profileUsername.username
-            .sqlEquals($_itemColumn<String>('username')!));
+        .filter((f) => f.profileUsername.username($_item.username));

    final cache = $_typedResult.readTableOrNull(_recentlyPlayedRefsTable($_db));
    return ProcessedTableManager(
@@ -3190,8 +3189,7 @@ class $$ProfilesTableTableManager extends RootTableManager<
              getPrefetchedDataCallback: (items) async {
                return [
                  if (recentlyPlayedRefs)
-                    await $_getPrefetchedData<Profile, $ProfilesTable,
-                            RecentlyPlayedData>(
+                    await $_getPrefetchedData(
                        currentTable: table,
                        referencedTable: $$ProfilesTableReferences
                            ._recentlyPlayedRefsTable(db),
@@ -3256,10 +3254,8 @@ final class $$RecentlyPlayedTableReferences extends BaseReferences<
          db.recentlyPlayed.profileUsername, db.profiles.username));

  $$ProfilesTableProcessedTableManager get profileUsername {
-    final $_column = $_itemColumn<String>('profile_username')!;
-
    final manager = $$ProfilesTableTableManager($_db, $_db.profiles)
-        .filter((f) => f.username.sqlEquals($_column));
+        .filter((f) => f.username($_item.profileUsername));
    final item = $_typedResult.readTableOrNull(_profileUsernameTable($_db));
    if (item == null) return manager;
    return ProcessedTableManager(
@@ -295,15 +295,5 @@
  "showHintsDescription": "Hilfreiche Tipps zum Entdecken von Funktionen anzeigen",
  "pullToSelectPlayers": "Ziehen um Geräte auszuwählen",
  "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"
+  "swipeToAdjustVolume": "Wischen für Lautstärke"
 }
@@ -51,7 +51,7 @@
    "description": "Hint for port field"
  },

-  "portDescription": "Leave blank unless using a custom port",
+  "portDescription": "Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.",
  "@portDescription": {
    "description": "Description for port field"
  },
@@ -221,36 +221,6 @@
    "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"
@@ -634,11 +604,6 @@

  "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"
  },

@@ -1104,10 +1069,6 @@
  "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",
@@ -1126,12 +1087,11 @@
  "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",
+  "addToLibrary": "Add to library",
  "unknown": "Unknown",
  "noUpcomingTracks": "No upcoming tracks",
  "showAll": "Show all",
@@ -1247,21 +1207,11 @@
    "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",
@@ -1407,16 +1357,6 @@
    "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"
@@ -1715,58 +1655,53 @@
    "description": "Hint for selecting player to add to queue"
  },

-  "aboutAndSupport": "About & Support",
-  "@aboutAndSupport": {
-    "description": "About and support section title"
+  "localConnection": "Server URL",
+  "@localConnection": {
+    "description": "Direct connection mode toggle label"
  },

-  "supportDevelopment": "Support Development",
-  "@supportDevelopment": {
-    "description": "Support development section"
+  "remoteConnection": "Remote Access ID",
+  "@remoteConnection": {
+    "description": "HA Remote Access connection mode toggle label"
  },

-  "ensembleIsUnofficial": "Ensemble is an unofficial, community-built client. Consider supporting its development.",
-  "@ensembleIsUnofficial": {
-    "description": "Description about Ensemble being unofficial"
+  "remoteAccessId": "Remote Access ID",
+  "@remoteAccessId": {
+    "description": "Remote access ID field label"
  },

-  "sponsorOnGitHub": "Sponsor on GitHub",
-  "@sponsorOnGitHub": {
-    "description": "GitHub Sponsors button label"
+  "remoteAccessIdHint": "Find this in Music Assistant Settings → Remote Access",
+  "@remoteAccessIdHint": {
+    "description": "Hint for remote access ID field"
  },

-  "buyMeAKoFi": "Buy me a Ko-fi",
-  "@buyMeAKoFi": {
-    "description": "Ko-fi donation button label"
+  "remoteAccessNote": "For Home Assistant add-on users only",
+  "@remoteAccessNote": {
+    "description": "Note about remote access availability"
  },

-  "aboutEnsemble": "About Ensemble",
-  "@aboutEnsemble": {
-    "description": "About Ensemble section"
+  "pleaseEnterRemoteId": "Please enter your Remote Access ID",
+  "@pleaseEnterRemoteId": {
+    "description": "Validation message for remote access ID"
  },

-  "version": "Version",
-  "@version": {
-    "description": "Version label"
+  "remoteConnectionFailed": "Remote connection failed. Please check your Remote Access ID and credentials.",
+  "@remoteConnectionFailed": {
+    "description": "Error message when remote connection fails"
  },

-  "visitGitHubRepo": "Visit GitHub Repository",
-  "@visitGitHubRepo": {
-    "description": "Link to GitHub repo"
+  "scanQrCode": "Scan QR Code",
+  "@scanQrCode": {
+    "description": "Title for QR code scanner screen"
  },

-  "reportABug": "Report a Bug",
-  "@reportABug": {
-    "description": "Link to report issues"
+  "pointCameraAtQr": "Point your camera at the Remote Access QR code in Music Assistant settings",
+  "@pointCameraAtQr": {
+    "description": "Instructions for scanning QR code"
  },

-  "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"
+  "cameraPermissionDenied": "Camera permission is required to scan QR codes",
+  "@cameraPermissionDenied": {
+    "description": "Error message when camera permission is denied"
  }
 }
@@ -491,15 +491,5 @@
  "showHintsDescription": "Mostrar consejos útiles para descubrir funciones",
  "pullToSelectPlayers": "Desliza para seleccionar dispositivos",
  "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"
+  "swipeToAdjustVolume": "Desliza para ajustar volumen"
 }
@@ -1396,15 +1396,5 @@
        "type": "String"
      }
    }
-  },
-
-  "aboutAndSupport": "À propos et Support",
-  "supportDevelopment": "Soutenir le Développement",
-  "ensembleIsUnofficial": "Ensemble est un client non officiel créé par la communauté. Envisagez de soutenir son développement.",
-  "sponsorOnGitHub": "Sponsoriser sur GitHub",
-  "buyMeAKoFi": "Offrez-moi un Ko-fi",
-  "aboutEnsemble": "À propos d'Ensemble",
-  "version": "Version",
-  "visitGitHubRepo": "Visiter le Dépôt GitHub",
-  "reportABug": "Signaler un Bug"
+  }
 }
@@ -164,7 +164,7 @@ abstract class S {
  /// Description for port field
  ///
  /// In en, this message translates to:
-  /// **'Leave blank unless using a custom port'**
+  /// **'Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.'**
  String get portDescription;

  /// Username field label
@@ -359,42 +359,6 @@ abstract class S {
  /// **'Discover Albums'**
  String get discoverAlbums;

-  /// Provider discovery mixes (e.g., Tidal playlists)
-  ///
-  /// In en, this message translates to:
-  /// **'Discovery Mixes'**
-  String get discoveryMixes;
-
-  /// Description for discovery mixes setting
-  ///
-  /// In en, this message translates to:
-  /// **'Show provider recommendation mixes (e.g., Tidal Daily Mixes, Discover Weekly) on home screen'**
-  String get discoveryMixesDescription;
-
-  /// Label for discovery rows section
-  ///
-  /// In en, this message translates to:
-  /// **'Discovery rows from Music Assistant'**
-  String get discoveryRows;
-
-  /// Button to refresh discovery rows
-  ///
-  /// In en, this message translates to:
-  /// **'Refresh available rows'**
-  String get refreshDiscoveryRows;
-
-  /// Empty state when no discovery rows available
-  ///
-  /// In en, this message translates to:
-  /// **'No discovery rows available'**
-  String get noDiscoveryRows;
-
-  /// Badge label for discovery rows
-  ///
-  /// In en, this message translates to:
-  /// **'Music Assistant'**
-  String get discoveryRowBadge;
-
  /// Home screen section title
  ///
  /// In en, this message translates to:
@@ -797,18 +761,12 @@ abstract class S {
  /// **'Album added to queue'**
  String get albumAddedToQueue;

-  /// Snackbar message for tracks added to queue
+  /// Confirmation when tracks added
  ///
  /// In en, this message translates to:
  /// **'Tracks added to queue'**
  String get tracksAddedToQueue;

-  /// Confirmation when tracks added
-  ///
-  /// In en, this message translates to:
-  /// **'Track added to queue'**
-  String get trackAddedToQueue;
-
  /// Play button label
  ///
  /// In en, this message translates to:
@@ -1271,30 +1229,6 @@ abstract class S {
  /// **'Sort by series order'**
  String get sortBySeriesOrder;

-  /// No description provided for @sortByDuration.
-  ///
-  /// In en, this message translates to:
-  /// **'Sort by duration'**
-  String get sortByDuration;
-
-  /// No description provided for @newestFirst.
-  ///
-  /// In en, this message translates to:
-  /// **'Newest first'**
-  String get newestFirst;
-
-  /// No description provided for @oldestFirst.
-  ///
-  /// In en, this message translates to:
-  /// **'Oldest first'**
-  String get oldestFirst;
-
-  /// No description provided for @viewDetails.
-  ///
-  /// In en, this message translates to:
-  /// **'View details'**
-  String get viewDetails;
-
  /// No description provided for @listView.
  ///
  /// In en, this message translates to:
@@ -1403,12 +1337,6 @@ abstract class S {
  /// **'Choose which rows to display on the home screen'**
  String get chooseHomeScreenRows;

-  /// No description provided for @favorite.
-  ///
-  /// In en, this message translates to:
-  /// **'Favorite'**
-  String get favorite;
-
  /// No description provided for @addedToFavorites.
  ///
  /// In en, this message translates to:
@@ -1436,7 +1364,7 @@ abstract class S {
  /// No description provided for @addToLibrary.
  ///
  /// In en, this message translates to:
-  /// **'Add'**
+  /// **'Add to library'**
  String get addToLibrary;

  /// No description provided for @unknown.
@@ -1745,24 +1673,12 @@ abstract class S {
  /// **'Add album to queue on...'**
  String get addAlbumToQueueOn;

-  /// Add item to queue on selected player
-  ///
-  /// In en, this message translates to:
-  /// **'Add to queue'**
-  String get addToQueue;
-
  /// Bottom sheet title for adding to queue
  ///
  /// In en, this message translates to:
  /// **'Add to queue on...'**
  String get addToQueueOn;

-  /// Start radio on selected player
-  ///
-  /// In en, this message translates to:
-  /// **'Start radio'**
-  String get startRadio;
-
  /// Bottom sheet title for starting radio
  ///
  /// In en, this message translates to:
@@ -1919,18 +1835,6 @@ abstract class S {
  /// **'Display helpful tips for discovering features'**
  String get showHintsDescription;

-  /// Setting for fine volume control
-  ///
-  /// In en, this message translates to:
-  /// **'Volume Precision Mode'**
-  String get volumePrecisionMode;
-
-  /// Description for volume precision mode setting
-  ///
-  /// In en, this message translates to:
-  /// **'Hold still while adjusting volume for fine control'**
-  String get volumePrecisionModeDescription;
-
  /// Settings section title for display options
  ///
  /// In en, this message translates to:
@@ -2219,71 +2123,65 @@ abstract class S {
  /// **'Select player to add to queue'**
  String get selectPlayerToAddToQueue;

-  /// About and support section title
+  /// Direct connection mode toggle label
  ///
  /// In en, this message translates to:
-  /// **'About & Support'**
-  String get aboutAndSupport;
+  /// **'Server URL'**
+  String get localConnection;

-  /// Support development section
+  /// HA Remote Access connection mode toggle label
  ///
  /// In en, this message translates to:
-  /// **'Support Development'**
-  String get supportDevelopment;
+  /// **'Remote Access ID'**
+  String get remoteConnection;

-  /// Description about Ensemble being unofficial
+  /// Remote access ID field label
  ///
  /// In en, this message translates to:
-  /// **'Ensemble is an unofficial, community-built client. Consider supporting its development.'**
-  String get ensembleIsUnofficial;
+  /// **'Remote Access ID'**
+  String get remoteAccessId;

-  /// GitHub Sponsors button label
+  /// Hint for remote access ID field
  ///
  /// In en, this message translates to:
-  /// **'Sponsor on GitHub'**
-  String get sponsorOnGitHub;
+  /// **'Find this in Music Assistant Settings → Remote Access'**
+  String get remoteAccessIdHint;

-  /// Ko-fi donation button label
+  /// Note about remote access availability
  ///
  /// In en, this message translates to:
-  /// **'Buy me a Ko-fi'**
-  String get buyMeAKoFi;
+  /// **'For Home Assistant add-on users only'**
+  String get remoteAccessNote;

-  /// About Ensemble section
+  /// Validation message for remote access ID
  ///
  /// In en, this message translates to:
-  /// **'About Ensemble'**
-  String get aboutEnsemble;
+  /// **'Please enter your Remote Access ID'**
+  String get pleaseEnterRemoteId;

-  /// Version label
+  /// Error message when remote connection fails
  ///
  /// In en, this message translates to:
-  /// **'Version'**
-  String get version;
+  /// **'Remote connection failed. Please check your Remote Access ID and credentials.'**
+  String get remoteConnectionFailed;

-  /// Link to GitHub repo
+  /// Title for QR code scanner screen
  ///
  /// In en, this message translates to:
-  /// **'Visit GitHub Repository'**
-  String get visitGitHubRepo;
+  /// **'Scan QR Code'**
+  String get scanQrCode;

-  /// Link to report issues
+  /// Instructions for scanning QR code
  ///
  /// In en, this message translates to:
-  /// **'Report a Bug'**
-  String get reportABug;
+  /// **'Point your camera at the Remote Access QR code in Music Assistant settings'**
+  String get pointCameraAtQr;

-  /// Empty state when no home screen rows are enabled
+  /// Error message when camera permission is denied
  ///
  /// In en, this message translates to:
-  /// **'No rows enabled'**
-  String get noRowsEnabled;
-
-  /// Hint when home screen is empty
-  ///
-  /// In en, this message translates to:
-  /// **'Pull down to refresh or enable rows in settings'**
-  String get pullToRefreshHint;
+  /// **'Camera permission is required to scan QR codes'**
+  String get cameraPermissionDenied;
 }

 class _SDelegate extends LocalizationsDelegate<S> {
@@ -151,25 +151,6 @@ class SDe extends S {
  @override
  String get discoverAlbums => 'Alben entdecken';

-  @override
-  String get discoveryMixes => 'Discovery Mixes';
-
-  @override
-  String get discoveryMixesDescription =>
-      'Show provider recommendation mixes (e.g., Tidal Daily Mixes, Discover Weekly) on home screen';
-
-  @override
-  String get discoveryRows => 'Discovery rows from Music Assistant';
-
-  @override
-  String get refreshDiscoveryRows => 'Refresh available rows';
-
-  @override
-  String get noDiscoveryRows => 'No discovery rows available';
-
-  @override
-  String get discoveryRowBadge => 'Music Assistant';
-
  @override
  String get continueListening => 'Weiterhoren';

@@ -392,9 +373,6 @@ class SDe extends S {
  @override
  String get tracksAddedToQueue => 'Songs zur Warteschlange hinzugefügt';

-  @override
-  String get trackAddedToQueue => 'Track added to queue';
-
  @override
  String get play => 'Abspielen';

@@ -668,18 +646,6 @@ class SDe extends S {
  @override
  String get sortBySeriesOrder => 'Nach Serienreihenfolge sortieren';

-  @override
-  String get sortByDuration => 'Sort by duration';
-
-  @override
-  String get newestFirst => 'Newest first';
-
-  @override
-  String get oldestFirst => 'Oldest first';
-
-  @override
-  String get viewDetails => 'View details';
-
  @override
  String get listView => 'Listenansicht';

@@ -739,9 +705,6 @@ class SDe extends S {
  String get chooseHomeScreenRows =>
      'Wähle welche Zeilen auf dem Startbildschirm angezeigt werden';

-  @override
-  String get favorite => 'Favorite';
-
  @override
  String get addedToFavorites => 'Zu Favoriten hinzugefügt';

@@ -755,7 +718,7 @@ class SDe extends S {
  String get removedFromLibrary => 'Removed from library';

  @override
-  String get addToLibrary => 'Add';
+  String get addToLibrary => 'Add to library';

  @override
  String get unknown => 'Unbekannt';
@@ -924,15 +887,9 @@ class SDe extends S {
  @override
  String get addAlbumToQueueOn => 'Album zur Warteschlange hinzufügen auf...';

-  @override
-  String get addToQueue => 'Add to queue';
-
  @override
  String get addToQueueOn => 'Zur Warteschlange hinzufügen auf...';

-  @override
-  String get startRadio => 'Start radio';
-
  @override
  String startRadioOn(String name) {
    return '$name Radio starten auf...';
@@ -1027,13 +984,6 @@ class SDe extends S {
  String get showHintsDescription =>
      'Hilfreiche Tipps zum Entdecken von Funktionen anzeigen';

-  @override
-  String get volumePrecisionMode => 'Volume Precision Mode';
-
-  @override
-  String get volumePrecisionModeDescription =>
-      'Hold still while adjusting volume for fine control';
-
  @override
  String get display => 'Display';

@@ -1207,37 +1157,36 @@ class SDe extends S {
  String get selectPlayerToAddToQueue => 'Select player to add to queue';

  @override
-  String get aboutAndSupport => 'Über & Unterstützung';
+  String get localConnection => 'Server URL';

  @override
-  String get supportDevelopment => 'Entwicklung unterstützen';
+  String get remoteConnection => 'Remote Access ID';

  @override
-  String get ensembleIsUnofficial =>
-      'Ensemble ist ein inoffizieller, von der Community erstellter Client. Erwäge, die Entwicklung zu unterstützen.';
+  String get remoteAccessId => 'Remote Access ID';

  @override
-  String get sponsorOnGitHub => 'Auf GitHub sponsoren';
+  String get remoteAccessIdHint =>
+      'Find this in Music Assistant Settings → Remote Access';

  @override
-  String get buyMeAKoFi => 'Kauf mir einen Ko-fi';
+  String get remoteAccessNote => 'For Home Assistant add-on users only';

  @override
-  String get aboutEnsemble => 'Über Ensemble';
+  String get pleaseEnterRemoteId => 'Please enter your Remote Access ID';

  @override
-  String get version => 'Version';
+  String get remoteConnectionFailed =>
+      'Remote connection failed. Please check your Remote Access ID and credentials.';

  @override
-  String get visitGitHubRepo => 'GitHub-Repository besuchen';
+  String get scanQrCode => 'Scan QR Code';

  @override
-  String get reportABug => 'Einen Fehler melden';
+  String get pointCameraAtQr =>
+      'Point your camera at the Remote Access QR code in Music Assistant settings';

  @override
-  String get noRowsEnabled => 'No rows enabled';
-
-  @override
-  String get pullToRefreshHint =>
-      'Pull down to refresh or enable rows in settings';
+  String get cameraPermissionDenied =>
+      'Camera permission is required to scan QR codes';
 }
@@ -39,7 +39,8 @@ class SEn extends S {
  String get portHint => 'e.g., 8095 or leave blank';

  @override
-  String get portDescription => 'Leave blank unless using a custom port';
+  String get portDescription =>
+      'Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.';

  @override
  String get username => 'Username';
@@ -148,25 +149,6 @@ class SEn extends S {
  @override
  String get discoverAlbums => 'Discover Albums';

-  @override
-  String get discoveryMixes => 'Discovery Mixes';
-
-  @override
-  String get discoveryMixesDescription =>
-      'Show provider recommendation mixes (e.g., Tidal Daily Mixes, Discover Weekly) on home screen';
-
-  @override
-  String get discoveryRows => 'Discovery rows from Music Assistant';
-
-  @override
-  String get refreshDiscoveryRows => 'Refresh available rows';
-
-  @override
-  String get noDiscoveryRows => 'No discovery rows available';
-
-  @override
-  String get discoveryRowBadge => 'Music Assistant';
-
  @override
  String get continueListening => 'Continue Listening';

@@ -387,9 +369,6 @@ class SEn extends S {
  @override
  String get tracksAddedToQueue => 'Tracks added to queue';

-  @override
-  String get trackAddedToQueue => 'Track added to queue';
-
  @override
  String get play => 'Play';

@@ -662,18 +641,6 @@ class SEn extends S {
  @override
  String get sortBySeriesOrder => 'Sort by series order';

-  @override
-  String get sortByDuration => 'Sort by duration';
-
-  @override
-  String get newestFirst => 'Newest first';
-
-  @override
-  String get oldestFirst => 'Oldest first';
-
-  @override
-  String get viewDetails => 'View details';
-
  @override
  String get listView => 'List view';

@@ -731,9 +698,6 @@ class SEn extends S {
  String get chooseHomeScreenRows =>
      'Choose which rows to display on the home screen';

-  @override
-  String get favorite => 'Favorite';
-
  @override
  String get addedToFavorites => 'Added to favorites';

@@ -747,7 +711,7 @@ class SEn extends S {
  String get removedFromLibrary => 'Removed from library';

  @override
-  String get addToLibrary => 'Add';
+  String get addToLibrary => 'Add to library';

  @override
  String get unknown => 'Unknown';
@@ -915,15 +879,9 @@ class SEn extends S {
  @override
  String get addAlbumToQueueOn => 'Add album to queue on...';

-  @override
-  String get addToQueue => 'Add to queue';
-
  @override
  String get addToQueueOn => 'Add to queue on...';

-  @override
-  String get startRadio => 'Start radio';
-
  @override
  String startRadioOn(String name) {
    return 'Start $name radio on...';
@@ -1018,13 +976,6 @@ class SEn extends S {
  String get showHintsDescription =>
      'Display helpful tips for discovering features';

-  @override
-  String get volumePrecisionMode => 'Volume Precision Mode';
-
-  @override
-  String get volumePrecisionModeDescription =>
-      'Hold still while adjusting volume for fine control';
-
  @override
  String get display => 'Display';

@@ -1198,37 +1149,36 @@ class SEn extends S {
  String get selectPlayerToAddToQueue => 'Select player to add to queue';

  @override
-  String get aboutAndSupport => 'About & Support';
+  String get localConnection => 'Server URL';

  @override
-  String get supportDevelopment => 'Support Development';
+  String get remoteConnection => 'Remote Access ID';

  @override
-  String get ensembleIsUnofficial =>
-      'Ensemble is an unofficial, community-built client. Consider supporting its development.';
+  String get remoteAccessId => 'Remote Access ID';

  @override
-  String get sponsorOnGitHub => 'Sponsor on GitHub';
+  String get remoteAccessIdHint =>
+      'Find this in Music Assistant Settings → Remote Access';

  @override
-  String get buyMeAKoFi => 'Buy me a Ko-fi';
+  String get remoteAccessNote => 'For Home Assistant add-on users only';

  @override
-  String get aboutEnsemble => 'About Ensemble';
+  String get pleaseEnterRemoteId => 'Please enter your Remote Access ID';

  @override
-  String get version => 'Version';
+  String get remoteConnectionFailed =>
+      'Remote connection failed. Please check your Remote Access ID and credentials.';

  @override
-  String get visitGitHubRepo => 'Visit GitHub Repository';
+  String get scanQrCode => 'Scan QR Code';

  @override
-  String get reportABug => 'Report a Bug';
+  String get pointCameraAtQr =>
+      'Point your camera at the Remote Access QR code in Music Assistant settings';

  @override
-  String get noRowsEnabled => 'No rows enabled';
-
-  @override
-  String get pullToRefreshHint =>
-      'Pull down to refresh or enable rows in settings';
+  String get cameraPermissionDenied =>
+      'Camera permission is required to scan QR codes';
 }
@@ -152,25 +152,6 @@ class SEs extends S {
  @override
  String get discoverAlbums => 'Descubrir álbumes';

-  @override
-  String get discoveryMixes => 'Discovery Mixes';
-
-  @override
-  String get discoveryMixesDescription =>
-      'Show provider recommendation mixes (e.g., Tidal Daily Mixes, Discover Weekly) on home screen';
-
-  @override
-  String get discoveryRows => 'Discovery rows from Music Assistant';
-
-  @override
-  String get refreshDiscoveryRows => 'Refresh available rows';
-
-  @override
-  String get noDiscoveryRows => 'No discovery rows available';
-
-  @override
-  String get discoveryRowBadge => 'Music Assistant';
-
  @override
  String get continueListening => 'Continuar escuchando';

@@ -395,9 +376,6 @@ class SEs extends S {
  @override
  String get tracksAddedToQueue => 'Canciones añadidas a la cola';

-  @override
-  String get trackAddedToQueue => 'Track added to queue';
-
  @override
  String get play => 'Reproducir';

@@ -672,18 +650,6 @@ class SEs extends S {
  @override
  String get sortBySeriesOrder => 'Ordenar por orden de serie';

-  @override
-  String get sortByDuration => 'Sort by duration';
-
-  @override
-  String get newestFirst => 'Newest first';
-
-  @override
-  String get oldestFirst => 'Oldest first';
-
-  @override
-  String get viewDetails => 'View details';
-
  @override
  String get listView => 'Vista de lista';

@@ -746,9 +712,6 @@ class SEs extends S {
  String get chooseHomeScreenRows =>
      'Elige qué filas mostrar en la pantalla de inicio';

-  @override
-  String get favorite => 'Favorite';
-
  @override
  String get addedToFavorites => 'Añadido a favoritos';

@@ -762,7 +725,7 @@ class SEs extends S {
  String get removedFromLibrary => 'Removed from library';

  @override
-  String get addToLibrary => 'Add';
+  String get addToLibrary => 'Add to library';

  @override
  String get unknown => 'Desconocido';
@@ -932,15 +895,9 @@ class SEs extends S {
  @override
  String get addAlbumToQueueOn => 'Añadir álbum a la cola en...';

-  @override
-  String get addToQueue => 'Add to queue';
-
  @override
  String get addToQueueOn => 'Añadir a la cola en...';

-  @override
-  String get startRadio => 'Start radio';
-
  @override
  String startRadioOn(String name) {
    return 'Iniciar radio de $name en...';
@@ -1035,13 +992,6 @@ class SEs extends S {
  String get showHintsDescription =>
      'Mostrar consejos útiles para descubrir funciones';

-  @override
-  String get volumePrecisionMode => 'Volume Precision Mode';
-
-  @override
-  String get volumePrecisionModeDescription =>
-      'Hold still while adjusting volume for fine control';
-
  @override
  String get display => 'Display';

@@ -1215,37 +1165,36 @@ class SEs extends S {
  String get selectPlayerToAddToQueue => 'Select player to add to queue';

  @override
-  String get aboutAndSupport => 'Acerca de y Soporte';
+  String get localConnection => 'Server URL';

  @override
-  String get supportDevelopment => 'Apoyar el Desarrollo';
+  String get remoteConnection => 'Remote Access ID';

  @override
-  String get ensembleIsUnofficial =>
-      'Ensemble es un cliente no oficial creado por la comunidad. Considera apoyar su desarrollo.';
+  String get remoteAccessId => 'Remote Access ID';

  @override
-  String get sponsorOnGitHub => 'Patrocina en GitHub';
+  String get remoteAccessIdHint =>
+      'Find this in Music Assistant Settings → Remote Access';

  @override
-  String get buyMeAKoFi => 'Cómprame un Ko-fi';
+  String get remoteAccessNote => 'For Home Assistant add-on users only';

  @override
-  String get aboutEnsemble => 'Acerca de Ensemble';
+  String get pleaseEnterRemoteId => 'Please enter your Remote Access ID';

  @override
-  String get version => 'Versión';
+  String get remoteConnectionFailed =>
+      'Remote connection failed. Please check your Remote Access ID and credentials.';

  @override
-  String get visitGitHubRepo => 'Visitar Repositorio GitHub';
+  String get scanQrCode => 'Scan QR Code';

  @override
-  String get reportABug => 'Reportar un Error';
+  String get pointCameraAtQr =>
+      'Point your camera at the Remote Access QR code in Music Assistant settings';

  @override
-  String get noRowsEnabled => 'No rows enabled';
-
-  @override
-  String get pullToRefreshHint =>
-      'Pull down to refresh or enable rows in settings';
+  String get cameraPermissionDenied =>
+      'Camera permission is required to scan QR codes';
 }
@@ -153,25 +153,6 @@ class SFr extends S {
  @override
  String get discoverAlbums => 'Découvrir des albums';

-  @override
-  String get discoveryMixes => 'Discovery Mixes';
-
-  @override
-  String get discoveryMixesDescription =>
-      'Show provider recommendation mixes (e.g., Tidal Daily Mixes, Discover Weekly) on home screen';
-
-  @override
-  String get discoveryRows => 'Discovery rows from Music Assistant';
-
-  @override
-  String get refreshDiscoveryRows => 'Refresh available rows';
-
-  @override
-  String get noDiscoveryRows => 'No discovery rows available';
-
-  @override
-  String get discoveryRowBadge => 'Music Assistant';
-
  @override
  String get continueListening => 'Continuer l\'écoute';

@@ -396,9 +377,6 @@ class SFr extends S {
  @override
  String get tracksAddedToQueue => 'Pistes ajoutées a la file d\'attente';

-  @override
-  String get trackAddedToQueue => 'Track added to queue';
-
  @override
  String get play => 'Lire';

@@ -673,18 +651,6 @@ class SFr extends S {
  @override
  String get sortBySeriesOrder => 'Trier par ordre de série';

-  @override
-  String get sortByDuration => 'Sort by duration';
-
-  @override
-  String get newestFirst => 'Newest first';
-
-  @override
-  String get oldestFirst => 'Oldest first';
-
-  @override
-  String get viewDetails => 'View details';
-
  @override
  String get listView => 'Vue en liste';

@@ -750,9 +716,6 @@ class SFr extends S {
  String get chooseHomeScreenRows =>
      'Choisir les rangees a afficher sur l\'ecran d\'accueil';

-  @override
-  String get favorite => 'Favorite';
-
  @override
  String get addedToFavorites => 'Ajoute aux favoris';

@@ -939,15 +902,9 @@ class SFr extends S {
  String get addAlbumToQueueOn =>
      'Ajouter l\'album a la file d\'attente sur...';

-  @override
-  String get addToQueue => 'Add to queue';
-
  @override
  String get addToQueueOn => 'Ajouter a la file d\'attente sur...';

-  @override
-  String get startRadio => 'Start radio';
-
  @override
  String startRadioOn(String name) {
    return 'Demarrer la radio $name sur...';
@@ -1043,13 +1000,6 @@ class SFr extends S {
  String get showHintsDescription =>
      'Afficher des conseils utiles pour découvrir les fonctionnalites';

-  @override
-  String get volumePrecisionMode => 'Volume Precision Mode';
-
-  @override
-  String get volumePrecisionModeDescription =>
-      'Hold still while adjusting volume for fine control';
-
  @override
  String get display => 'Display';

@@ -1224,37 +1174,36 @@ class SFr extends S {
  String get selectPlayerToAddToQueue => 'Select player to add to queue';

  @override
-  String get aboutAndSupport => 'À propos et Support';
+  String get localConnection => 'Server URL';

  @override
-  String get supportDevelopment => 'Soutenir le Développement';
+  String get remoteConnection => 'Remote Access ID';

  @override
-  String get ensembleIsUnofficial =>
-      'Ensemble est un client non officiel créé par la communauté. Envisagez de soutenir son développement.';
+  String get remoteAccessId => 'Remote Access ID';

  @override
-  String get sponsorOnGitHub => 'Sponsoriser sur GitHub';
+  String get remoteAccessIdHint =>
+      'Find this in Music Assistant Settings → Remote Access';

  @override
-  String get buyMeAKoFi => 'Offrez-moi un Ko-fi';
+  String get remoteAccessNote => 'For Home Assistant add-on users only';

  @override
-  String get aboutEnsemble => 'À propos d\'Ensemble';
+  String get pleaseEnterRemoteId => 'Please enter your Remote Access ID';

  @override
-  String get version => 'Version';
+  String get remoteConnectionFailed =>
+      'Remote connection failed. Please check your Remote Access ID and credentials.';

  @override
-  String get visitGitHubRepo => 'Visiter le Dépôt GitHub';
+  String get scanQrCode => 'Scan QR Code';

  @override
-  String get reportABug => 'Signaler un Bug';
+  String get pointCameraAtQr =>
+      'Point your camera at the Remote Access QR code in Music Assistant settings';

  @override
-  String get noRowsEnabled => 'No rows enabled';
-
-  @override
-  String get pullToRefreshHint =>
-      'Pull down to refresh or enable rows in settings';
+  String get cameraPermissionDenied =>
+      'Camera permission is required to scan QR codes';
 }
@@ -31,85 +31,82 @@ late MassivAudioHandler audioHandler;
 // Global debug logger instance
 final _logger = DebugLogger();

-void main() {
-  // All initialization must run inside the same zone as runApp() to avoid
-  // "Zone mismatch" errors from Flutter's binding system
+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');
+
+  // 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');
+
+  // Create auth manager for streaming headers
+  final authManager = AuthManager();
+
+  // Initialize audio_service with our custom handler
+  audioHandler = await AudioService.init(
+    builder: () => MassivAudioHandler(authManager: authManager),
+    config: const AudioServiceConfig(
+      androidNotificationChannelId: 'io.github.collotsspot.massiv.audio',
+      androidNotificationChannelName: 'Ensemble Audio',
+      androidNotificationOngoing: false,  // Must be false when androidStopForegroundOnPause is false
+      androidNotificationIcon: 'drawable/ic_notification',
+      androidShowNotificationBadge: false,
+      androidStopForegroundOnPause: false,  // Keep service alive when paused for background playback
+    ),
+  );
+  _logger.log('🎵 AudioService initialized - background playback and media notifications ENABLED');
+
+  // Set preferred orientations
+  SystemChrome.setPreferredOrientations([
+    DeviceOrientation.portraitUp,
+    DeviceOrientation.portraitDown,
+  ]);
+
+  // 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(
+    SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent,
+      statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
+      systemNavigationBarColor: isDark ? const Color(0xFF1a1a1a) : const Color(0xFFF5F5F5),
+      systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
+    ),
+  );
+
+  // 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(
-    () 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');
-
-      // 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');
-
-      // Create auth manager for streaming headers
-      final authManager = AuthManager();
-
-      // Initialize audio_service with our custom handler
-      audioHandler = await AudioService.init(
-        builder: () => MassivAudioHandler(authManager: authManager),
-        config: const AudioServiceConfig(
-          androidNotificationChannelId: 'io.github.collotsspot.massiv.audio',
-          androidNotificationChannelName: 'Ensemble Audio',
-          androidNotificationOngoing: false,  // Must be false when androidStopForegroundOnPause is false
-          androidNotificationIcon: 'drawable/ic_notification',
-          androidShowNotificationBadge: false,
-          androidStopForegroundOnPause: false,  // Keep service alive when paused for background playback
-        ),
-      );
-      _logger.log('🎵 AudioService initialized - background playback and media notifications ENABLED');
-
-      // Set preferred orientations
-      SystemChrome.setPreferredOrientations([
-        DeviceOrientation.portraitUp,
-        DeviceOrientation.portraitDown,
-      ]);
-
-      // 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(
-        SystemUiOverlayStyle(
-          statusBarColor: Colors.transparent,
-          statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
-          systemNavigationBarColor: isDark ? const Color(0xFF1a1a1a) : const Color(0xFFF5F5F5),
-          systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
-        ),
-      );
-
-      // 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
-      };
-
-      runApp(const MusicAssistantApp());
-    },
+    () => runApp(const MusicAssistantApp()),
    (error, stackTrace) {
      _logger.error('Uncaught async error: $error', context: 'ZoneError');
      _logger.error('Stack trace:\n$stackTrace', context: 'ZoneError');
@@ -131,7 +128,6 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
  final _hardwareVolumeService = HardwareVolumeService();
  StreamSubscription? _volumeUpSub;
  StreamSubscription? _volumeDownSub;
-  StreamSubscription? _absoluteVolumeSub;
  String? _lastSelectedPlayerId;
  String? _builtinPlayerId;

@@ -162,12 +158,6 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
      _volumeDownSub = _hardwareVolumeService.onVolumeDown.listen((_) {
        _adjustVolume(-_volumeStep);
      });
-
-      // Listen for absolute volume changes from lockscreen/background
-      // (ContentObserver on system STREAM_MUSIC volume)
-      _absoluteVolumeSub = _hardwareVolumeService.onAbsoluteVolumeChange.listen((volume) {
-        _setAbsoluteVolume(volume);
-      });
    } catch (e, stack) {
      _logger.error('Hardware volume init failed', context: 'VolumeInit', error: e, stackTrace: stack);
    }
@@ -183,41 +173,18 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
  }

  /// Enable/disable volume button interception based on selected player.
-  /// Also manages the volume observer for lockscreen volume routing.
  Future<void> _updateVolumeInterception() async {
-    final player = _musicProvider.selectedPlayer;
    final isBuiltinPlayer = _builtinPlayerId != null &&
-        player?.playerId == _builtinPlayerId;
+        _musicProvider.selectedPlayer?.playerId == _builtinPlayerId;
    await _hardwareVolumeService.setIntercepting(!isBuiltinPlayer);
-
-    // Start/stop volume observer for lockscreen volume changes.
-    // When a remote/group player is active, observe system volume changes
-    // so lockscreen hardware buttons route to the MA player.
-    if (!isBuiltinPlayer && player != null) {
-      // Get the effective volume to sync the system volume HUD
-      final effectiveVolume = _musicProvider.groupVolumeManager.isGroupPlayer(player)
-          ? (_musicProvider.groupVolumeManager.getEffectiveVolumeLevel(
-                  player, _musicProvider.availablePlayersUnfiltered) ?? player.volume)
-          : player.volume;
-      await _hardwareVolumeService.startVolumeObserver(initialVolume: effectiveVolume);
-    } else {
-      await _hardwareVolumeService.stopVolumeObserver();
-    }
  }

  Future<void> _adjustVolume(int delta) async {
    final player = _musicProvider.selectedPlayer;
    if (player == null) return;

-    // Use effective volume for group players (player.volume returns 0
-    // because MA API returns null for group player volume_level)
-    final currentVolume = _musicProvider.groupVolumeManager.isGroupPlayer(player)
-        ? (_musicProvider.groupVolumeManager.getEffectiveVolumeLevel(
-                player, _musicProvider.availablePlayersUnfiltered) ?? player.volume)
-        : player.volume;
-
-    final newVolume = (currentVolume + delta).clamp(0, 100);
-    if (newVolume != currentVolume) {
+    final newVolume = (player.volume + delta).clamp(0, 100);
+    if (newVolume != player.volume) {
      try {
        await _musicProvider.setVolume(player.playerId, newVolume);
      } catch (e) {
@@ -226,29 +193,11 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
    }
  }

-  /// Handle absolute volume change from lockscreen/background.
-  /// Called when the ContentObserver detects a system volume change
-  /// while a remote/group player is active.
-  Future<void> _setAbsoluteVolume(int volume) async {
-    final player = _musicProvider.selectedPlayer;
-    if (player == null) return;
-
-    // Don't route to builtin player - that's handled by the system directly
-    if (_builtinPlayerId != null && player.playerId == _builtinPlayerId) return;
-
-    try {
-      await _musicProvider.setVolume(player.playerId, volume.clamp(0, 100));
-    } catch (e) {
-      _logger.error('Lockscreen volume change failed', context: 'VolumeControl', error: e);
-    }
-  }
-
  @override
  void dispose() {
    _musicProvider.removeListener(_onProviderChanged);
    _volumeUpSub?.cancel();
    _volumeDownSub?.cancel();
-    _absoluteVolumeSub?.cancel();
    _hardwareVolumeService.dispose();
    WidgetsBinding.instance.removeObserver(this);
    super.dispose();
@@ -380,13 +329,28 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
                  theme: AppTheme.lightTheme(colorScheme: lightColorScheme),
                  darkTheme: AppTheme.darkTheme(colorScheme: darkColorScheme),
                  builder: (context, child) {
-                    // Wrap entire app with global player overlay.
-                    // Provide an Overlay ancestor so BottomNavigationBar/Tooltip can render safely.
-                    return Overlay(
-                      initialEntries: [
-                        OverlayEntry(
-                          builder: (context) => GlobalPlayerOverlay(
-                            child: child ?? const SizedBox.shrink(),
+                    // Wrap entire app with global player overlay
+                    // Also include hidden WebView for remote WebRTC bridge
+                    final musicProvider = context.read<MusicAssistantProvider>();
+                    return Stack(
+                      children: [
+                        GlobalPlayerOverlay(child: child ?? const SizedBox.shrink()),
+                        // WebView for WebRTC - must be VISIBLE to avoid Android throttling
+                        // A tiny 4x4 pixel dot at bottom-right, nearly invisible but keeps WebView active
+                        Positioned(
+                          right: 4,
+                          bottom: 4,
+                          child: Container(
+                            width: 4,
+                            height: 4,
+                            decoration: BoxDecoration(
+                              color: Colors.black.withOpacity(0.1), // Nearly invisible dot
+                              borderRadius: BorderRadius.circular(2),
+                            ),
+                            child: ClipRRect(
+                              borderRadius: BorderRadius.circular(2),
+                              child: musicProvider.remoteBridgeWebView,
+                            ),
                          ),
                        ),
                      ],
@@ -535,9 +499,6 @@ class _AppStartupState extends State<AppStartup> {
  Future<void> _checkAndConnect() async {
    final serverUrl = await SettingsService.getServerUrl();

-    // DEBUG: Log where server URL is coming from
-    _logger.log('🐛 DEBUG: Server URL from SharedPreferences: $serverUrl');
-
    if (!mounted) return;

    setState(() {
@@ -546,7 +507,6 @@ class _AppStartupState extends State<AppStartup> {

    // If we have a saved server URL, attempt auto-connection
    if (serverUrl != null && serverUrl.isNotEmpty) {
-      _logger.log('🐛 DEBUG: Auto-connecting because server URL exists');
      setState(() {
        _isConnecting = true;
      });
@@ -31,14 +31,20 @@ class ProviderMapping {
  });

  factory ProviderMapping.fromJson(Map<String, dynamic> json) {
+    // Parse in_library field - MA uses 1/0 or true/false
+    // Default to true if not present (items from library_items API are in library)
+    final inLibraryValue = json['in_library'];
+    final inLibrary = inLibraryValue == null
+        ? true  // Default: items fetched from library are in library
+        : inLibraryValue == true || inLibraryValue == 1;
+
    return ProviderMapping(
      itemId: json['item_id'] as String? ?? '',
      providerDomain: json['provider_domain'] as String? ?? '',
      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,
+      inLibrary: inLibrary,
    );
  }

@@ -137,12 +143,6 @@ class MediaItem {

  @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 {
@@ -171,12 +171,6 @@ 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();
 }
@@ -298,12 +292,6 @@ 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();
@@ -350,12 +338,6 @@ 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 {
@@ -552,12 +534,6 @@ 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,7 +17,6 @@ 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,
@@ -36,7 +35,6 @@ class Player {
    this.activeSource,
    this.isExternalSource = false,
    this.appId,
-    this.activeQueue,
  });

  /// Create a copy of this Player with some fields replaced
@@ -57,7 +55,6 @@ class Player {
    String? activeSource,
    bool? isExternalSource,
    String? appId,
-    String? activeQueue,
  }) {
    return Player(
      playerId: playerId ?? this.playerId,
@@ -76,7 +73,6 @@ class Player {
      activeSource: activeSource ?? this.activeSource,
      isExternalSource: isExternalSource ?? this.isExternalSource,
      appId: appId ?? this.appId,
-      activeQueue: activeQueue ?? this.activeQueue,
    );
  }

@@ -222,61 +218,50 @@ class Player {
    // Parse active_source - the currently active source for this player
    final activeSource = json['active_source'] as String?;

-    // Parse active_queue - this is the key indicator for MA-controlled playback
-    // When MA is playing: active_queue = 'uuid:...' or similar queue ID
-    // 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.)
+    // Detect external source (optical, Spotify, AirPlay, etc.)
+    // Primary indicator: app_id - if not 'music_assistant', it's an external source
+    // Secondary indicators: URI patterns and media_type
    bool isExternalSource = false;

-    // If MA explicitly says it's playing, trust that
-    if (appId == 'music_assistant') {
-      isExternalSource = false;
-    }
-    // If there's an active queue, MA is controlling playback (even with spotify:// URIs)
-    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) {
+    // Check app_id first - this is the most reliable indicator for DLNA players
+    // When MA is playing: app_id = 'music_assistant'
+    // When external source: app_id = 'http', 'spotify', etc.
+    final appId = json['app_id'] as String?;
+    if (appId != null && appId.isNotEmpty && appId != 'music_assistant') {
+      // app_id is set but not 'music_assistant' - external source is active
      isExternalSource = true;
    }
-    // Fallback: check current_media for simple external source indicators
-    // Only check these when we have no app_id and no active_queue
-    else if (json.containsKey('current_media')) {
+
+    // Also check current_media for additional external source indicators
+    if (!isExternalSource && 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?;

-        // Only check for simple external source identifiers (physical inputs)
-        // Do NOT flag spotify://, airplay://, etc. as external here -
-        // those should only be external if app_id indicates external control
+        // External source indicators:
+        // 1. URI is a simple identifier like 'optical', 'line_in', 'bluetooth', 'hdmi'
+        // 2. URI starts with external protocols: 'spotify://', 'airplay://', etc.
+        // 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;
+          isExternalSource = isSimpleExternalId || isExternalProtocol;
        }

-        // Also check media_type - 'unknown' with non-MA URI indicates external source
+        // Also check media_type - 'unknown' often 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;
@@ -302,7 +287,6 @@ class Player {
      activeSource: activeSource,
      isExternalSource: isExternalSource,
      appId: appId,
-      activeQueue: activeQueue,
    );
  }

@@ -324,7 +308,6 @@ class Player {
      if (activeSource != null) 'active_source': activeSource,
      'is_external_source': isExternalSource,
      if (appId != null) 'app_id': appId,
-      if (activeQueue != null) 'active_queue': activeQueue,
    };
  }
 }
@@ -1,69 +0,0 @@
-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);
-  }
-}
@@ -1,20 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import '../models/media_item.dart';
 import '../providers/music_assistant_provider.dart';
 import '../widgets/global_player_overlay.dart';
-import '../widgets/media_context_menu.dart';
 import '../theme/theme_provider.dart';
 import '../services/settings_service.dart';
 import '../services/metadata_service.dart';
-import '../services/debug_logger.dart';
 import '../utils/page_transitions.dart';
 import '../constants/hero_tags.dart';
 import '../l10n/app_localizations.dart';
-import '../theme/design_tokens.dart';
 import 'audiobook_detail_screen.dart';
 import '../widgets/provider_icon.dart';

@@ -37,7 +33,6 @@ class AudiobookAuthorScreen extends StatefulWidget {
 }

 class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
-  final _logger = DebugLogger();
  late List<Audiobook> _audiobooks;
  ColorScheme? _lightColorScheme;
  ColorScheme? _darkColorScheme;
@@ -121,149 +116,6 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
    }
  }

-  /// Toggle favorite status for an audiobook
-  Future<void> _toggleAudiobookFavorite(Audiobook book) async {
-    final maProvider = context.read<MusicAssistantProvider>();
-    final newState = !(book.favorite ?? false);
-
-    try {
-      bool success;
-      if (newState) {
-        // Add to favorites
-        String actualProvider = book.provider;
-        String actualItemId = book.itemId;
-
-        if (book.providerMappings != null && book.providerMappings!.isNotEmpty) {
-          final mapping = book.providerMappings!.firstWhere(
-            (m) => m.available && m.providerInstance != 'library',
-            orElse: () => book.providerMappings!.firstWhere(
-              (m) => m.available,
-              orElse: () => book.providerMappings!.first,
-            ),
-          );
-          actualProvider = mapping.providerInstance;
-          actualItemId = mapping.itemId;
-        }
-
-        success = await maProvider.addToFavorites(
-          mediaType: 'audiobook',
-          itemId: actualItemId,
-          provider: actualProvider,
-        );
-      } else {
-        // Remove from favorites
-        int? libraryItemId;
-        if (book.provider == 'library') {
-          libraryItemId = int.tryParse(book.itemId);
-        } else if (book.providerMappings != null) {
-          final libraryMapping = book.providerMappings!.firstWhere(
-            (m) => m.providerInstance == 'library',
-            orElse: () => book.providerMappings!.first,
-          );
-          if (libraryMapping.providerInstance == 'library') {
-            libraryItemId = int.tryParse(libraryMapping.itemId);
-          }
-        }
-
-        if (libraryItemId != null) {
-          success = await maProvider.removeFromFavorites(
-            mediaType: 'audiobook',
-            libraryItemId: libraryItemId,
-          );
-        } else {
-          success = false;
-        }
-      }
-
-      if (success && mounted) {
-        setState(() {
-          final index = _audiobooks.indexWhere((b) => b.itemId == book.itemId);
-          if (index != -1) {
-            _audiobooks[index] = Audiobook(
-              itemId: book.itemId,
-              provider: book.provider,
-              name: book.name,
-              sortName: book.sortName,
-              uri: book.uri,
-              providerMappings: book.providerMappings,
-              favorite: newState,
-              metadata: book.metadata,
-              year: book.year,
-            );
-          }
-        });
-      }
-    } catch (e) {
-      _logger.log('Error toggling audiobook favorite: $e');
-    }
-  }
-
-  /// Toggle library status for an audiobook
-  Future<void> _toggleAudiobookLibrary(Audiobook book) async {
-    final maProvider = context.read<MusicAssistantProvider>();
-    final newState = !book.inLibrary;
-
-    try {
-      bool success;
-      if (newState) {
-        // Add to library
-        String? actualProvider;
-        String? actualItemId;
-
-        if (book.providerMappings != null && book.providerMappings!.isNotEmpty) {
-          final mapping = book.providerMappings!.firstWhere(
-            (m) => m.available && m.providerInstance != 'library',
-            orElse: () => book.providerMappings!.first,
-          );
-          if (mapping.providerInstance != 'library') {
-            actualProvider = mapping.providerInstance;
-            actualItemId = mapping.itemId;
-          }
-        }
-
-        if (actualProvider != null && actualItemId != null) {
-          success = await maProvider.addToLibrary(
-            mediaType: 'audiobook',
-            itemId: actualItemId,
-            provider: actualProvider,
-          );
-        } else {
-          success = false;
-        }
-      } else {
-        // Remove from library
-        int? libraryItemId;
-        if (book.provider == 'library') {
-          libraryItemId = int.tryParse(book.itemId);
-        } else if (book.providerMappings != null) {
-          final libraryMapping = book.providerMappings!.firstWhere(
-            (m) => m.providerInstance == 'library',
-            orElse: () => book.providerMappings!.first,
-          );
-          if (libraryMapping.providerInstance == 'library') {
-            libraryItemId = int.tryParse(libraryMapping.itemId);
-          }
-        }
-
-        if (libraryItemId != null) {
-          success = await maProvider.removeFromLibrary(
-            mediaType: 'audiobook',
-            libraryItemId: libraryItemId,
-          );
-        } else {
-          success = false;
-        }
-      }
-
-      if (success) {
-        // Refresh would require reloading from parent - for now just show success
-        _logger.log('Audiobook library status toggled');
-      }
-    } catch (e) {
-      _logger.log('Error toggling audiobook library: $e');
-    }
-  }
-
  @override
  Widget build(BuildContext context) {
    final adaptiveTheme = context.select<ThemeProvider, bool>(
@@ -298,13 +150,11 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
        backgroundColor: colorScheme.surface,
        body: LayoutBuilder(
          builder: (context, constraints) {
-            // Responsive cover size: 50% of screen width, clamped between 140-200 (matches artist detail)
-            final coverSize = (constraints.maxWidth * 0.5).clamp(140.0, 200.0);
-            final expandedHeight = coverSize + 25;
+            // Responsive cover size: 70% of screen width, clamped between 160-280 (same as artist detail)
+            final coverSize = (constraints.maxWidth * 0.7).clamp(160.0, 280.0);
+            final expandedHeight = coverSize + 100;

-            return Stack(
-              children: [
-                CustomScrollView(
+            return CustomScrollView(
          slivers: [
            SliverAppBar(
              expandedHeight: expandedHeight,
@@ -370,112 +220,83 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
            ),
            SliverToBoxAdapter(
              child: Padding(
-                padding: const EdgeInsets.fromLTRB(24.0, 8.0, 24.0, 24.0),
-                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
+                padding: const EdgeInsets.all(24.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
-                    // Author info on the left
-                    Expanded(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            widget.authorName,
-                            style: textTheme.headlineMedium?.copyWith(
-                              color: colorScheme.onSurface,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          const SizedBox(height: 8),
-                          Text(
-                            S.of(context)!.audiobookCount(_audiobooks.length),
-                            style: textTheme.bodyLarge?.copyWith(
-                              color: colorScheme.onSurface.withOpacity(0.7),
-                            ),
-                          ),
-                        ],
+                    Text(
+                      widget.authorName,
+                      style: textTheme.headlineMedium?.copyWith(
+                        color: colorScheme.onSurface,
+                        fontWeight: FontWeight.bold,
                      ),
                    ),
-                    // Three-dot Menu Button on the right
-                    SizedBox(
-                      height: 50,
-                      width: 50,
-                      child: Builder(
-                        builder: (buttonContext) => FilledButton.tonal(
-                          onPressed: () {
-                            final RenderBox box = buttonContext.findRenderObject() as RenderBox;
-                            final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
-                            MediaContextMenu.show(
-                              context: context,
-                              position: position,
-                              mediaType: ContextMenuMediaType.audiobook,
-                              item: _audiobooks.isNotEmpty ? _audiobooks.first : null,
-                              isFavorite: false,
-                              isInLibrary: false,
-                              adaptiveColorScheme: adaptiveScheme,
-                              showTopRow: false,
-                              sortOrder: _sortOrder,
-                              onToggleSort: _toggleSortOrder,
-                              viewMode: _viewMode,
-                              onCycleView: _cycleViewMode,
-                            );
-                          },
-                          style: FilledButton.styleFrom(
-                            padding: EdgeInsets.zero,
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(12),
-                            ),
-                          ),
-                          child: Icon(
-                            Icons.more_vert,
-                            size: 25,
-                            color: Colors.white70,
-                          ),
-                        ),
+                    const SizedBox(height: 8),
+                    Text(
+                      S.of(context)!.audiobookCount(_audiobooks.length),
+                      style: textTheme.bodyLarge?.copyWith(
+                        color: colorScheme.onSurface.withOpacity(0.7),
                      ),
                    ),
                  ],
                ),
              ),
            ),
-            // Audiobooks Section Header
+            // Audiobooks Section Header with controls
            SliverToBoxAdapter(
              child: Padding(
-                padding: const EdgeInsets.fromLTRB(24.0, 8.0, 24.0, 8.0),
-                child: Text(
-                  S.of(context)!.audiobooks,
-                  style: textTheme.titleLarge?.copyWith(
-                    color: colorScheme.onSurface,
-                    fontWeight: FontWeight.bold,
-                  ),
+                padding: const EdgeInsets.fromLTRB(24.0, 8.0, 12.0, 8.0),
+                child: Row(
+                  children: [
+                    Text(
+                      S.of(context)!.audiobooks,
+                      style: textTheme.titleLarge?.copyWith(
+                        color: colorScheme.onSurface,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const Spacer(),
+                    // Sort toggle
+                    IconButton(
+                      icon: Icon(
+                        _sortOrder == 'alpha' ? Icons.sort_by_alpha : Icons.calendar_today,
+                        color: colorScheme.primary,
+                        size: 20,
+                      ),
+                      tooltip: _sortOrder == 'alpha' ? S.of(context)!.sortByYear : S.of(context)!.sortAlphabetically,
+                      onPressed: _toggleSortOrder,
+                      visualDensity: VisualDensity.compact,
+                      padding: EdgeInsets.zero,
+                      constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
+                    ),
+                    // View mode toggle
+                    IconButton(
+                      icon: Icon(
+                        _viewMode == 'list'
+                            ? Icons.view_list
+                            : _viewMode == 'grid3'
+                                ? Icons.grid_view
+                                : Icons.grid_on,
+                        color: colorScheme.primary,
+                        size: 20,
+                      ),
+                      tooltip: _viewMode == 'grid2'
+                          ? S.of(context)!.threeColumnGrid
+                          : _viewMode == 'grid3'
+                              ? S.of(context)!.listView
+                              : S.of(context)!.twoColumnGrid,
+                      onPressed: _cycleViewMode,
+                      visualDensity: VisualDensity.compact,
+                      padding: EdgeInsets.zero,
+                      constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
+                    ),
+                  ],
                ),
              ),
            ),
            _buildAudiobookSliver(),
            SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)),
          ],
-            ),
-                Positioned(
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
-                  height: BottomSpacing.withMiniPlayer,
-                  child: IgnorePointer(
-                    child: DecoratedBox(
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.topCenter,
-                          end: Alignment.bottomCenter,
-                          colors: [
-                            colorScheme.surface.withOpacity(0.0),
-                            colorScheme.surface,
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ],
            );
          },
        ),
@@ -523,31 +344,10 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
    final textTheme = Theme.of(context).textTheme;
    final heroSuffix = 'author${_heroTagSuffix}';

-    // Get adaptive scheme for context menu
-    final themeProvider = context.read<ThemeProvider>();
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-    final adaptiveScheme = themeProvider.adaptiveTheme
-        ? (isDark ? _darkColorScheme : _lightColorScheme)
-        : null;
-
-    return GestureDetector(
-      onLongPressStart: (details) {
-        MediaContextMenu.show(
-          context: context,
-          position: details.globalPosition,
-          mediaType: ContextMenuMediaType.audiobook,
-          item: book,
-          isFavorite: book.favorite ?? false,
-          isInLibrary: book.inLibrary,
-          adaptiveColorScheme: adaptiveScheme,
-          onToggleFavorite: () => _toggleAudiobookFavorite(book),
-          onToggleLibrary: () => _toggleAudiobookLibrary(book),
-        );
-      },
-      child: InkWell(
-        onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+    return InkWell(
+      onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          AspectRatio(
            aspectRatio: 1.0,
@@ -638,8 +438,7 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
              maxLines: 1,
              overflow: TextOverflow.ellipsis,
            ),
-          ],
-        ),
+        ],
      ),
    );
  }
@@ -651,30 +450,9 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
    final textTheme = Theme.of(context).textTheme;
    final heroSuffix = 'author${_heroTagSuffix}';

-    // Get adaptive scheme for context menu
-    final themeProvider = context.read<ThemeProvider>();
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-    final adaptiveScheme = themeProvider.adaptiveTheme
-        ? (isDark ? _darkColorScheme : _lightColorScheme)
-        : null;
-
-    return GestureDetector(
-      onLongPressStart: (details) {
-        MediaContextMenu.show(
-          context: context,
-          position: details.globalPosition,
-          mediaType: ContextMenuMediaType.audiobook,
-          item: book,
-          isFavorite: book.favorite ?? false,
-          isInLibrary: book.inLibrary,
-          adaptiveColorScheme: adaptiveScheme,
-          onToggleFavorite: () => _toggleAudiobookFavorite(book),
-          onToggleLibrary: () => _toggleAudiobookLibrary(book),
-        );
-      },
-      child: ListTile(
-        contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-        leading: Hero(
+    return ListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+      leading: Hero(
        tag: HeroTags.audiobookCover + (book.uri ?? book.itemId) + '_$heroSuffix',
        child: ClipRRect(
          borderRadius: BorderRadius.circular(4),
@@ -755,8 +533,7 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
              ),
            )
          : null,
-        onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
-      ),
+      onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
    );
  }

@@ -1,14 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:material_symbols_icons/symbols.dart';
 import '../models/media_item.dart';
 import '../providers/music_assistant_provider.dart';
 import '../widgets/global_player_overlay.dart';
 import '../widgets/provider_icon.dart';
-import '../widgets/media_context_menu.dart';
 import '../theme/palette_helper.dart';
 import '../theme/theme_provider.dart';
 import '../services/debug_logger.dart';
@@ -38,7 +35,6 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
  final _logger = DebugLogger();
  bool _isDescriptionExpanded = false;
  bool _isFavorite = false;
-  bool _isInLibrary = false;
  ColorScheme? _lightColorScheme;
  ColorScheme? _darkColorScheme;
  int? _expandedChapterIndex;
@@ -50,24 +46,17 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
  // Use full audiobook if loaded, otherwise use widget audiobook
  Audiobook get _audiobook => _fullAudiobook ?? widget.audiobook;

-  /// Check if audiobook is in library
-  bool _checkIfInLibrary(Audiobook audiobook) {
-    if (audiobook.provider == 'library') return true;
-    return audiobook.providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
-  }
-
  @override
  void initState() {
    super.initState();
    _isFavorite = widget.audiobook.favorite ?? false;
-    _isInLibrary = _checkIfInLibrary(widget.audiobook);

-    // Mark that we're on a detail screen and extract colors immediately
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (mounted) {
-        markDetailScreenEntered(context);
-        _extractColors(); // Extract colors immediately - async so won't block
-      }
+      Future.delayed(const Duration(milliseconds: 350), () {
+        if (mounted) {
+          _extractColors();
+        }
+      });
      // Load full audiobook details with chapters
      _loadAudiobookDetails();
    });
@@ -118,18 +107,15 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
    if (imageUrl == null) return;

    try {
-      // Use isolate-based extraction to avoid blocking the main thread
-      final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
+      final colorSchemes = await PaletteHelper.extractColorSchemes(
+        CachedNetworkImageProvider(imageUrl),
+      );

      if (colorSchemes != null && mounted) {
        setState(() {
          _lightColorScheme = colorSchemes.$1;
          _darkColorScheme = colorSchemes.$2;
        });
-
-        // Update ThemeProvider so nav bar uses adaptive colors
-        final themeProvider = context.read<ThemeProvider>();
-        themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
      }
    } catch (e) {
      _logger.log('Failed to extract colors for audiobook: $e');
@@ -223,88 +209,6 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
    }
  }

-  /// Toggle library status
-  Future<void> _toggleLibrary() async {
-    final maProvider = context.read<MusicAssistantProvider>();
-
-    try {
-      final newState = !_isInLibrary;
-
-      if (newState) {
-        String? actualProvider;
-        String? actualItemId;
-
-        if (widget.audiobook.providerMappings != null && widget.audiobook.providerMappings!.isNotEmpty) {
-          final nonLibraryMapping = widget.audiobook.providerMappings!.where(
-            (m) => m.providerInstance != 'library' && m.providerDomain != 'library',
-          ).firstOrNull;
-
-          if (nonLibraryMapping != null) {
-            actualProvider = nonLibraryMapping.providerDomain;
-            actualItemId = nonLibraryMapping.itemId;
-          }
-        }
-
-        if (actualProvider == null || actualItemId == null) {
-          if (widget.audiobook.provider != 'library') {
-            actualProvider = widget.audiobook.provider;
-            actualItemId = widget.audiobook.itemId;
-          } else {
-            return;
-          }
-        }
-
-        setState(() => _isInLibrary = newState);
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(S.of(context)!.addedToLibrary),
-            duration: const Duration(seconds: 1),
-          ),
-        );
-
-        maProvider.addToLibrary(
-          mediaType: 'audiobook',
-          provider: actualProvider,
-          itemId: actualItemId,
-        ).catchError((e) {
-          if (mounted) setState(() => _isInLibrary = !newState);
-        });
-      } else {
-        int? libraryItemId;
-        if (widget.audiobook.provider == 'library') {
-          libraryItemId = int.tryParse(widget.audiobook.itemId);
-        } else if (widget.audiobook.providerMappings != null) {
-          final libraryMapping = widget.audiobook.providerMappings!.firstWhere(
-            (m) => m.providerInstance == 'library',
-            orElse: () => widget.audiobook.providerMappings!.first,
-          );
-          if (libraryMapping.providerInstance == 'library') {
-            libraryItemId = int.tryParse(libraryMapping.itemId);
-          }
-        }
-
-        if (libraryItemId == null) return;
-
-        setState(() => _isInLibrary = newState);
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(S.of(context)!.removedFromLibrary),
-            duration: const Duration(seconds: 1),
-          ),
-        );
-
-        maProvider.removeFromLibrary(
-          mediaType: 'audiobook',
-          libraryItemId: libraryItemId,
-        ).catchError((e) {
-          if (mounted) setState(() => _isInLibrary = !newState);
-        });
-      }
-    } catch (e) {
-      _logger.log('Error toggling audiobook library: $e');
-    }
-  }
-
  void _showPlayOnMenu(BuildContext context) {
    final maProvider = context.read<MusicAssistantProvider>();

@@ -523,9 +427,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
            final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
            final expandedHeight = coverSize + 70;

-            return Stack(
-              children: [
-                CustomScrollView(
+            return CustomScrollView(
          slivers: [
            SliverAppBar(
              expandedHeight: expandedHeight,
@@ -654,7 +556,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
            ),
            SliverToBoxAdapter(
              child: Padding(
-                padding: const EdgeInsets.fromLTRB(24.0, 8.0, 24.0, 24.0),
+                padding: const EdgeInsets.all(24.0),
                child: Column(
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
@@ -750,6 +652,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                      children: [
                        // Play/Resume Button
                        Expanded(
+                          flex: 2,
                          child: SizedBox(
                            height: 50,
                            child: ElevatedButton.icon(
@@ -783,33 +686,26 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                                  borderRadius: BorderRadius.circular(12),
                                ),
                              ),
-                              child: const Icon(Icons.replay, size: 25),
+                              child: const Icon(Icons.replay),
                            ),
                          ),
                        ],

                        const SizedBox(width: 12),

-                        // Library Button
+                        // Play On Button
                        SizedBox(
                          height: 50,
                          width: 50,
                          child: FilledButton.tonal(
-                            onPressed: _toggleLibrary,
+                            onPressed: () => _showPlayOnMenu(context),
                            style: FilledButton.styleFrom(
                              padding: EdgeInsets.zero,
                              shape: RoundedRectangleBorder(
                                borderRadius: BorderRadius.circular(12),
                              ),
                            ),
-                            child: Icon(
-                              Symbols.book_2,
-                              size: 25,
-                              fill: _isInLibrary ? 1 : 0,
-                              color: _isInLibrary
-                                  ? colorScheme.primary
-                                  : Colors.white70,
-                            ),
+                            child: const Icon(Icons.speaker_group_outlined),
                          ),
                        ),

@@ -828,50 +724,10 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                              ),
                            ),
                            child: Icon(
-                              Icons.favorite,
-                              size: 25,
+                              _isFavorite ? Icons.favorite : Icons.favorite_border,
                              color: _isFavorite
                                  ? colorScheme.error
-                                  : Colors.white70,
-                            ),
-                          ),
-                        ),
-
-                        const SizedBox(width: 12),
-
-                        // Three-dot Menu Button
-                        SizedBox(
-                          height: 50,
-                          width: 50,
-                          child: Builder(
-                            builder: (buttonContext) => FilledButton.tonal(
-                              onPressed: () {
-                                final RenderBox box = buttonContext.findRenderObject() as RenderBox;
-                                final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
-                                MediaContextMenu.show(
-                                  context: context,
-                                  position: position,
-                                  mediaType: ContextMenuMediaType.audiobook,
-                                  item: widget.audiobook,
-                                  isFavorite: _isFavorite,
-                                  isInLibrary: _isInLibrary,
-                                  onToggleFavorite: _toggleFavorite,
-                                  onToggleLibrary: _toggleLibrary,
-                                  adaptiveColorScheme: adaptiveScheme,
-                                  showTopRow: false,
-                                );
-                              },
-                              style: FilledButton.styleFrom(
-                                padding: EdgeInsets.zero,
-                                shape: RoundedRectangleBorder(
-                                  borderRadius: BorderRadius.circular(12),
-                                ),
-                              ),
-                              child: Icon(
-                                Icons.more_vert,
-                                size: 25,
-                                color: Colors.white70,
-                              ),
+                                  : colorScheme.onSurfaceVariant,
                            ),
                          ),
                        ),
@@ -931,29 +787,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {

            SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)),
          ],
-        ),
-                Positioned(
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
-                  height: BottomSpacing.withMiniPlayer,
-                  child: IgnorePointer(
-                    child: DecoratedBox(
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.topCenter,
-                          end: Alignment.bottomCenter,
-                          colors: [
-                            colorScheme.surface.withOpacity(0.0),
-                            colorScheme.surface,
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            );
+        );
          },
        ),
      ),
@@ -271,8 +271,7 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
  Widget build(BuildContext context) {
    final colorScheme = Theme.of(context).colorScheme;
    final textTheme = Theme.of(context).textTheme;
-    // Use read since we only need the provider for non-reactive operations (getImageUrl)
-    final maProvider = context.read<MusicAssistantProvider>();
+    final maProvider = context.watch<MusicAssistantProvider>();
    final l10n = S.of(context)!;

    return Scaffold(
@@ -283,9 +282,7 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
          final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
          final expandedHeight = coverSize + 70;

-          return Stack(
-            children: [
-              CustomScrollView(
+          return CustomScrollView(
        slivers: [
          // App bar with series cover collage (matches audiobook detail screen)
          SliverAppBar(
@@ -459,29 +456,7 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
            child: SizedBox(height: BottomSpacing.withMiniPlayer),
          ),
        ],
-      ),
-              Positioned(
-                left: 0,
-                right: 0,
-                bottom: 0,
-                height: BottomSpacing.withMiniPlayer,
-                child: IgnorePointer(
-                  child: DecoratedBox(
-                    decoration: BoxDecoration(
-                      gradient: LinearGradient(
-                        begin: Alignment.topCenter,
-                        end: Alignment.bottomCenter,
-                        colors: [
-                          colorScheme.surface.withOpacity(0.0),
-                          colorScheme.surface,
-                        ],
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          );
+      );
        },
      ),
    );
@@ -41,10 +41,12 @@ class _DebugLogScreenState extends State<DebugLogScreen> {
      _logger.entries.where((e) => e.level.index >= _filterLevel.index).toList();

  void _copyLogs() {
-    Clipboard.setData(ClipboardData(text: _logger.getAllLogs()));
+    // Copy only the filtered entries that are currently displayed
+    final filteredLogs = _filteredEntries.map((e) => e.formatted).join('\n');
+    Clipboard.setData(ClipboardData(text: filteredLogs));
    ScaffoldMessenger.of(context).showSnackBar(
      SnackBar(
-        content: Text(S.of(context)!.logsCopied),
+        content: Text('${S.of(context)!.logsCopied} (${_filteredEntries.length} entries)'),
        backgroundColor: Colors.green,
        duration: const Duration(seconds: 2),
      ),
@@ -61,6 +63,8 @@ class _DebugLogScreenState extends State<DebugLogScreen> {
        report,
        subject: S.of(context)!.ensembleBugReport,
      );
+    } catch (e) {
+      _logger.error('Share failed', error: e);
    } finally {
      if (mounted) {
        setState(() => _isGeneratingReport = false);
@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import 'package:material_symbols_icons/symbols.dart';
 import '../l10n/app_localizations.dart';
-import '../providers/music_assistant_provider.dart';
 import '../providers/navigation_provider.dart';
-import '../theme/theme_provider.dart';
 import '../widgets/global_player_overlay.dart';
 import 'new_home_screen.dart';
 import 'new_library_screen.dart';
@@ -22,7 +19,6 @@ class HomeScreen extends StatefulWidget {
 class _HomeScreenState extends State<HomeScreen> {
  final GlobalKey<SearchScreenState> _searchScreenKey = GlobalKey<SearchScreenState>();
  DateTime? _lastBackPress;
-  final _cachedNavColor = _CachedNavColor();

  @override
  void initState() {
@@ -109,15 +105,7 @@ class _HomeScreenState extends State<HomeScreen> {
          },
          child: Scaffold(
            backgroundColor: colorScheme.surface,
-            // extendBody: true preserves the existing layout where content fills the
-            // full screen and screens manage their own bottom padding (BottomSpacing).
-            // Without this, Scaffold would constrain the body above the nav bar,
-            // causing double bottom spacing.
-            extendBody: true,
-            // BottomNavigationBar requires an Overlay ancestor (for Tooltip);
-            // Scaffold inside Navigator provides one. Previously it was in
-            // GlobalPlayerOverlay's Stack (outside Navigator) causing crashes.
-            bottomNavigationBar: _buildBottomNavigationBar(context, colorScheme),
+            // No bottomNavigationBar here - it's now in GlobalPlayerOverlay
            body: Stack(
              children: [
                // Home and Library use IndexedStack for state preservation
@@ -143,162 +131,4 @@ class _HomeScreenState extends State<HomeScreen> {
      },
    );
  }
-
-  /// Build the bottom navigation bar with adaptive colors and player expansion animation.
-  /// Moved here from GlobalPlayerOverlay so it has proper Overlay ancestry
-  /// (required by BottomNavigationBar's internal Tooltip widgets).
-  Widget? _buildBottomNavigationBar(BuildContext context, ColorScheme colorScheme) {
-    // Hide nav bar when not connected
-    final isConnected = context.select<MusicAssistantProvider, bool>(
-      (p) => p.isConnected,
-    );
-    if (!isConnected) return null;
-
-    return Consumer<ThemeProvider>(
-      builder: (context, themeProvider, _) {
-        final isDark = Theme.of(context).brightness == Brightness.dark;
-
-        return ValueListenableBuilder<PlayerExpansionState>(
-          valueListenable: playerExpansionNotifier,
-          builder: (context, expansionState, _) {
-            // Nav bar color logic - only use adaptive colors when:
-            // 1. Player is expanding/expanded, OR
-            // 2. On a detail screen (isOnDetailScreen)
-            // On home screen with collapsed player: always use default theme colors
-            final bool useAdaptiveColors = themeProvider.adaptiveTheme &&
-                (expansionState.progress > 0 || themeProvider.isOnDetailScreen);
-
-            // Nav bar background color
-            final Color navBgColor;
-            if (expansionState.progress > 0 && expansionState.backgroundColor != null) {
-              // Player is expanding - blend from surface to player's adaptive color
-              navBgColor = Color.lerp(colorScheme.surface, expansionState.backgroundColor, expansionState.progress)!;
-            } else if (useAdaptiveColors) {
-              // On a detail screen - use adaptive surface color for nav bar
-              final adaptiveBg = themeProvider.getAdaptiveSurfaceColorFor(Theme.of(context).brightness);
-              navBgColor = adaptiveBg ?? colorScheme.surface;
-            } else {
-              // Home screen with collapsed player - use default surface color
-              navBgColor = colorScheme.surface;
-            }
-
-            // Icon color - only use adaptive colors when appropriate
-            final Color baseSourceColor = (useAdaptiveColors && themeProvider.adaptiveColors != null)
-                ? themeProvider.adaptiveColors!.primary
-                : colorScheme.primary;
-
-            // Blend icon color with player's primary color during expansion
-            Color sourceColor = baseSourceColor;
-            if (themeProvider.adaptiveTheme && expansionState.progress > 0 && expansionState.primaryColor != null) {
-              sourceColor = Color.lerp(baseSourceColor, expansionState.primaryColor!, expansionState.progress)!;
-            }
-            final navSelectedColor = _cachedNavColor.getAdjustedColor(sourceColor, isDark);
-
-            // Fade out and slide down nav bar as player expands
-            // Use IgnorePointer when faded to prevent accidental taps
-            final navOpacity = (1.0 - expansionState.progress * 2).clamp(0.0, 1.0);
-            final navSlideDown = expansionState.progress * 20; // Slide down 20px as it fades
-
-            return IgnorePointer(
-              ignoring: navOpacity < 0.1,
-              child: Transform.translate(
-                offset: Offset(0, navSlideDown),
-                child: Opacity(
-                  opacity: navOpacity,
-                  child: Container(
-                    decoration: BoxDecoration(
-                      color: navBgColor,
-                      boxShadow: expansionState.progress < 0.5
-                          ? [
-                              BoxShadow(
-                                color: Colors.black.withOpacity(0.1),
-                                blurRadius: 10,
-                                offset: const Offset(0, -2),
-                              ),
-                            ]
-                          : null,
-                    ),
-                    child: BottomNavigationBar(
-                      currentIndex: navigationProvider.selectedIndex,
-                      onTap: (index) {
-                        if (GlobalPlayerOverlay.isPlayerExpanded) {
-                          GlobalPlayerOverlay.collapsePlayer();
-                        }
-                        navigationProvider.navigatorKey.currentState?.popUntil((route) => route.isFirst);
-                        // Clear adaptive colors when switching tabs (detail screen colors shouldn't persist)
-                        themeProvider.clearAdaptiveColors();
-                        if (index == 3) {
-                          GlobalPlayerOverlay.hidePlayer();
-                        } else if (navigationProvider.selectedIndex == 3) {
-                          GlobalPlayerOverlay.showPlayer();
-                        }
-                        navigationProvider.setSelectedIndex(index);
-                      },
-                      backgroundColor: Colors.transparent,
-                      selectedItemColor: navSelectedColor,
-                      unselectedItemColor: colorScheme.onSurface.withOpacity(0.54),
-                      elevation: 0,
-                      type: BottomNavigationBarType.fixed,
-                      selectedFontSize: 12,
-                      unselectedFontSize: 12,
-                      items: [
-                        BottomNavigationBarItem(
-                          icon: const Icon(Icons.home_outlined),
-                          activeIcon: const Icon(Icons.home_rounded),
-                          label: S.of(context)!.home,
-                        ),
-                        BottomNavigationBarItem(
-                          icon: const Icon(Symbols.book_2, fill: 0),
-                          activeIcon: const Icon(Symbols.book_2, fill: 1),
-                          label: S.of(context)!.library,
-                        ),
-                        BottomNavigationBarItem(
-                          icon: const Icon(Icons.search_rounded),
-                          activeIcon: const Icon(Icons.search_rounded),
-                          label: S.of(context)!.search,
-                        ),
-                        BottomNavigationBarItem(
-                          icon: const Icon(Icons.settings_outlined),
-                          activeIcon: const Icon(Icons.settings_rounded),
-                          label: S.of(context)!.settings,
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-}
-
-/// Cached color with contrast adjustment for nav bar icon colors.
-/// Avoids expensive HSL conversions during scroll/animation.
-class _CachedNavColor {
-  Color? _sourceColor;
-  bool? _isDark;
-  Color? _adjustedColor;
-
-  Color getAdjustedColor(Color sourceColor, bool isDark) {
-    if (_sourceColor == sourceColor && _isDark == isDark && _adjustedColor != null) {
-      return _adjustedColor!;
-    }
-
-    var navSelectedColor = sourceColor;
-    if (isDark && navSelectedColor.computeLuminance() < 0.2) {
-      final hsl = HSLColor.fromColor(navSelectedColor);
-      navSelectedColor = hsl.withLightness((hsl.lightness + 0.3).clamp(0.0, 0.8)).toColor();
-    } else if (!isDark && navSelectedColor.computeLuminance() > 0.8) {
-      final hsl = HSLColor.fromColor(navSelectedColor);
-      navSelectedColor = hsl.withLightness((hsl.lightness - 0.3).clamp(0.2, 1.0)).toColor();
-    }
-
-    _sourceColor = sourceColor;
-    _isDark = isDark;
-    _adjustedColor = navSelectedColor;
-    return navSelectedColor;
-  }
 }
@@ -43,6 +43,7 @@ class _LibraryPlaylistsScreenState extends State<LibraryPlaylistsScreen> {

  @override
  Widget build(BuildContext context) {
+    final provider = context.watch<MusicAssistantProvider>();
    final colorScheme = Theme.of(context).colorScheme;
    final textTheme = Theme.of(context).textTheme;

@@ -65,13 +66,11 @@ class _LibraryPlaylistsScreenState extends State<LibraryPlaylistsScreen> {
        ),
        centerTitle: true,
      ),
-      body: _buildPlaylistsList(context),
+      body: _buildPlaylistsList(context, provider),
    );
  }

-  Widget _buildPlaylistsList(BuildContext context) {
-    // Use read since we only need the provider for non-reactive operations
-    final provider = context.read<MusicAssistantProvider>();
+  Widget _buildPlaylistsList(BuildContext context, MusicAssistantProvider provider) {
    final colorScheme = Theme.of(context).colorScheme;

    // Show cached data immediately if available, even while loading
@@ -11,6 +11,7 @@ class LibraryTracksScreen extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final provider = context.watch<MusicAssistantProvider>();
    final colorScheme = Theme.of(context).colorScheme;
    final textTheme = Theme.of(context).textTheme;

@@ -33,41 +34,35 @@ class LibraryTracksScreen extends StatelessWidget {
        ),
        centerTitle: true,
      ),
-      body: _buildTracksList(context),
+      body: _buildTracksList(context, provider),
    );
  }

-  Widget _buildTracksList(BuildContext context) {
-    // Use select to only rebuild when tracks or isLoading changes
-    final (tracks, isLoading) = context.select<MusicAssistantProvider, (List, bool)>(
-      (p) => (p.tracks, p.isLoading),
-    );
+  Widget _buildTracksList(
+      BuildContext context, MusicAssistantProvider provider) {
    final colorScheme = Theme.of(context).colorScheme;

    // Show cached data immediately if available, even while loading
    // Only show spinner if we have no data at all AND we're loading
-    if (tracks.isEmpty && isLoading) {
+    if (provider.tracks.isEmpty && provider.isLoading) {
      return Center(
        child: CircularProgressIndicator(color: colorScheme.primary),
      );
    }

-    if (tracks.isEmpty) {
-      return EmptyState.tracks(
-        context: context,
-        onRefresh: context.read<MusicAssistantProvider>().loadLibrary,
-      );
+    if (provider.tracks.isEmpty) {
+      return EmptyState.tracks(context: context, onRefresh: provider.loadLibrary);
    }

    return ListView.builder(
-      itemCount: tracks.length,
+      itemCount: provider.tracks.length,
      padding: const EdgeInsets.all(8),
      cacheExtent: 500, // Prebuild items off-screen for smoother scrolling
      addAutomaticKeepAlives: false, // Tiles don't need individual keep-alive
      addRepaintBoundaries: false, // We add RepaintBoundary manually to tiles
      itemBuilder: (context, index) {
-        final track = tracks[index] as Track;
-        return _buildTrackTile(context, track, index);
+        final track = provider.tracks[index];
+        return _buildTrackTile(context, track, provider, index);
      },
    );
  }
@@ -75,9 +70,9 @@ class LibraryTracksScreen extends StatelessWidget {
  Widget _buildTrackTile(
    BuildContext context,
    Track track,
+    MusicAssistantProvider maProvider,
    int index,
  ) {
-    final maProvider = context.read<MusicAssistantProvider>();
    final imageUrl = track.album != null
        ? maProvider.getImageUrl(track.album!, size: 128)
        : null;
@@ -1,15 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import '../l10n/app_localizations.dart';
-import '../models/recommendation_folder.dart';
 import '../providers/music_assistant_provider.dart';
-import '../providers/navigation_provider.dart';
 import '../services/settings_service.dart';
 import '../services/debug_logger.dart';
 import '../services/sync_service.dart';
 import '../widgets/global_player_overlay.dart';
-import '../widgets/player/mini_player_content.dart' show MiniPlayerLayout;
 import '../widgets/player_selector.dart';
 import '../widgets/album_row.dart';
 import '../widgets/artist_row.dart';
@@ -19,7 +17,6 @@ import '../widgets/series_row.dart';
 import '../widgets/playlist_row.dart';
 import '../widgets/radio_station_row.dart';
 import '../widgets/podcast_row.dart';
-import '../widgets/discovery_row.dart';
 import '../widgets/common/disconnected_state.dart';
 import 'settings_screen.dart';
 import 'search_screen.dart';
@@ -31,10 +28,9 @@ class NewHomeScreen extends StatefulWidget {
  State<NewHomeScreen> createState() => _NewHomeScreenState();
 }

-class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveClientMixin {
+class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
  static final _logger = DebugLogger();
-  final ValueNotifier<int> _refreshSignal = ValueNotifier<int>(0);
-  double? _cachedRowHeight; // Cached to avoid size jumps when nav bar toggles
+  Key _refreshKey = UniqueKey();
  // Main rows (default on)
  bool _showRecentAlbums = true;
  bool _showDiscoverArtists = true;
@@ -52,10 +48,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
  bool _showDiscoverSeries = false;
  // Row order (loaded from settings)
  List<String> _homeRowOrder = List.from(SettingsService.defaultHomeRowOrder);
-  // Discovery folders (dynamic rows from provider recommendations)
-  List<RecommendationFolder> _discoveryFolders = [];
-  // Discovery row preferences (itemId -> enabled)
-  Map<String, bool> _discoveryRowEnabled = {};

  @override
  bool get wantKeepAlive => true;
@@ -65,82 +57,25 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
  SyncStatus? _lastSyncStatus;
  int _lastArtistCount = 0;
  MusicAssistantProvider? _providerListeningTo;
-  int _lastHomeRefreshCounter = 0;  // Track home refresh counter to force row refreshes

  @override
  void initState() {
    super.initState();
+    WidgetsBinding.instance.addObserver(this);
    _loadSettings();
    // Listen to sync completion to refresh favorite rows when data becomes available
    SyncService.instance.addListener(_onSyncChanged);
    _lastSyncStatus = SyncService.instance.status;
    _checkInitialFavoriteState();
-
-    // Always listen to provider for home refresh counter changes
-    final provider = context.read<MusicAssistantProvider>();
-    _lastHomeRefreshCounter = provider.homeRefreshCounter;
-    _providerListeningTo = provider;
-    provider.addListener(_onProviderChanged);
-
-    // Reload settings only when switching back to home from settings tab
-    navigationProvider.addListener(_onNavigationChanged);
-  }
-
-  int _lastNavIndex = 0;
-
-  void _onNavigationChanged() {
-    final newIndex = navigationProvider.selectedIndex;
-    // Reload preferences when leaving settings tab (3) for home tab (0)
-    if (_lastNavIndex == 3 && newIndex == 0) {
-      _reloadPreferencesOnly();
-    }
-    _lastNavIndex = newIndex;
-  }
-
-  /// Reload only local preferences (no API calls). Used when switching back from settings.
-  Future<void> _reloadPreferencesOnly() async {
-    final showRecent = await SettingsService.getShowRecentAlbums();
-    final showDiscArtists = await SettingsService.getShowDiscoverArtists();
-    final showDiscAlbums = await SettingsService.getShowDiscoverAlbums();
-    final showFavAlbums = await SettingsService.getShowFavoriteAlbums();
-    final showFavArtists = await SettingsService.getShowFavoriteArtists();
-    final showFavTracks = await SettingsService.getShowFavoriteTracks();
-    final showFavPlaylists = await SettingsService.getShowFavoritePlaylists();
-    final showFavRadio = await SettingsService.getShowFavoriteRadioStations();
-    final showFavPodcasts = await SettingsService.getShowFavoritePodcasts();
-    final showContAudiobooks = await SettingsService.getShowContinueListeningAudiobooks();
-    final showDiscAudiobooks = await SettingsService.getShowDiscoverAudiobooks();
-    final showDiscSeries = await SettingsService.getShowDiscoverSeries();
-    final rowOrder = await SettingsService.getHomeRowOrder();
-    final discoveryRowPrefs = await SettingsService.getDiscoveryRowPreferences();
-    if (mounted) {
-      setState(() {
-        _showRecentAlbums = showRecent;
-        _showDiscoverArtists = showDiscArtists;
-        _showDiscoverAlbums = showDiscAlbums;
-        _showFavoriteAlbums = showFavAlbums;
-        _showFavoriteArtists = showFavArtists;
-        _showFavoriteTracks = showFavTracks;
-        _showFavoritePlaylists = showFavPlaylists;
-        _showFavoriteRadioStations = showFavRadio;
-        _showFavoritePodcasts = showFavPodcasts;
-        _showContinueListeningAudiobooks = showContAudiobooks;
-        _showDiscoverAudiobooks = showDiscAudiobooks;
-        _showDiscoverSeries = showDiscSeries;
-        _homeRowOrder = rowOrder;
-        _discoveryRowEnabled = discoveryRowPrefs;
-      });
-    }
  }

  @override
  void dispose() {
-    navigationProvider.removeListener(_onNavigationChanged);
    SyncService.instance.removeListener(_onSyncChanged);
-    // Clean up provider listener
+    // Clean up provider listener if attached
    _providerListeningTo?.removeListener(_onProviderChanged);
    _providerListeningTo = null;
-    _refreshSignal.dispose();
+    WidgetsBinding.instance.removeObserver(this);
    super.dispose();
  }

@@ -162,31 +97,21 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
    });
  }

-  /// Called when MusicAssistantProvider changes (for cache load detection and home refresh)
+  /// Called when MusicAssistantProvider changes (for cache load detection)
  void _onProviderChanged() {
-    if (!mounted || _providerListeningTo == null) return;
-
-    final provider = _providerListeningTo!;
-    final currentRefreshCounter = provider.homeRefreshCounter;
-
-    // Check if home refresh counter changed (indicates authentication completed and cache was invalidated)
-    if (currentRefreshCounter != _lastHomeRefreshCounter) {
-      _logger.log('🔄 Home: refresh counter changed ($_lastHomeRefreshCounter -> $currentRefreshCounter), refreshing all rows');
-      _lastHomeRefreshCounter = currentRefreshCounter;
-      _refreshSignal.value++;
-      return;  // Don't process other refresh conditions in this cycle
-    }
-
-    // Check for artists cache load (when favorites were empty on load)
-    if (_hadEmptyFavoritesOnLoad) {
-      final currentCount = provider.artists.length;
-      if (_lastArtistCount == 0 && currentCount > 0) {
-        _logger.log('🔄 Home: artists loaded from cache ($currentCount), refreshing rows');
-        _hadEmptyFavoritesOnLoad = false;
-        _refreshSignal.value++;
-      }
-      _lastArtistCount = currentCount;
+    if (!mounted || !_hadEmptyFavoritesOnLoad || _providerListeningTo == null) return;
+    final currentCount = _providerListeningTo!.artists.length;
+    // If artists went from 0 to non-zero, refresh
+    if (_lastArtistCount == 0 && currentCount > 0) {
+      _logger.log('🔄 Home: artists loaded from cache ($currentCount), refreshing rows');
+      _hadEmptyFavoritesOnLoad = false;
+      _providerListeningTo!.removeListener(_onProviderChanged);
+      _providerListeningTo = null;
+      setState(() {
+        _refreshKey = UniqueKey();
+      });
    }
+    _lastArtistCount = currentCount;
  }

  /// Called when SyncService status changes
@@ -202,12 +127,21 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
      _providerListeningTo?.removeListener(_onProviderChanged);
      _providerListeningTo = null;
      if (mounted) {
-        _refreshSignal.value++;
+        setState(() {
+          _refreshKey = UniqueKey();
+        });
      }
    }
    _lastSyncStatus = newStatus;
  }

+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    // Reload settings when app resumes (coming back from settings)
+    if (state == AppLifecycleState.resumed) {
+      _loadSettings();
+    }
+  }

  Future<void> _loadSettings() async {
    final showRecent = await SettingsService.getShowRecentAlbums();
@@ -223,7 +157,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
    final showDiscAudiobooks = await SettingsService.getShowDiscoverAudiobooks();
    final showDiscSeries = await SettingsService.getShowDiscoverSeries();
    final rowOrder = await SettingsService.getHomeRowOrder();
-    final discoveryRowPrefs = await SettingsService.getDiscoveryRowPreferences();
    if (mounted) {
      setState(() {
        _showRecentAlbums = showRecent;
@@ -239,63 +172,8 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
        _showDiscoverAudiobooks = showDiscAudiobooks;
        _showDiscoverSeries = showDiscSeries;
        _homeRowOrder = rowOrder;
-        _discoveryRowEnabled = discoveryRowPrefs;
      });
    }
-
-    // Load discovery folders dynamically (after settings load)
-    // Skip if already loaded to avoid unnecessary rebuilds on settings reload
-    if (_discoveryFolders.isEmpty) {
-      await _loadDiscoveryFolders(forceRefresh: false);
-    } else {
-      // Just re-sync the row order with current enabled state (no API call)
-      setState(() {
-        _syncDiscoveryRowOrder(_discoveryFolders);
-      });
-    }
-  }
-
-  Future<void> _loadDiscoveryFolders({bool forceRefresh = false}) async {
-    if (!mounted) return;
-    final provider = context.read<MusicAssistantProvider>();
-
-    try {
-      var folders = await provider.getDiscoveryFoldersWithCache();
-      // If cached result is empty, force a refresh to get from API/database
-      if (folders.isEmpty && !forceRefresh) {
-        _logger.log('🔄 Discovery: Cached folders empty, forcing refresh...');
-        folders = await provider.getDiscoveryFoldersWithCache(forceRefresh: true);
-      }
-      final discoveryRowPrefs = await SettingsService.getDiscoveryRowPreferences();
-      if (mounted) {
-        setState(() {
-          _discoveryFolders = folders;
-          _discoveryRowEnabled = discoveryRowPrefs;
-          _syncDiscoveryRowOrder(folders);
-        });
-      }
-    } catch (e) {
-      _logger.log('⚠️ Failed to load discovery folders: $e');
-    }
-  }
-
-  /// Sync discovery row order without calling setState. Only adds new folders, never removes.
-  /// Visibility is controlled by _discoveryRowEnabled / _isRowEnabled().
-  bool _syncDiscoveryRowOrder(List<RecommendationFolder> folders) {
-    bool didModify = false;
-
-    for (final folder in folders) {
-      final discoveryRowId = 'discovery:${folder.itemId}';
-      if (!_homeRowOrder.contains(discoveryRowId)) {
-        _homeRowOrder.add(discoveryRowId);
-        didModify = true;
-      }
-    }
-
-    if (didModify) {
-      SettingsService.setHomeRowOrder(_homeRowOrder);
-    }
-    return didModify;
  }

  Future<void> _onRefresh() async {
@@ -310,7 +188,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
    await _loadSettings();

    if (mounted) {
-      _refreshSignal.value++;
+      setState(() {
+        _refreshKey = UniqueKey();
+      });
    }
  }

@@ -347,6 +227,21 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
        titleSpacing: 0,
        centerTitle: false,
        actions: [
+          // Copy logs button for debugging
+          IconButton(
+            icon: const Icon(Icons.bug_report_outlined, size: 20),
+            onPressed: () {
+              final logs = DebugLogger().entries.map((e) => e.formatted).join('\n');
+              Clipboard.setData(ClipboardData(text: logs));
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text('${DebugLogger().entries.length} log entries copied'),
+                  duration: const Duration(seconds: 2),
+                ),
+              );
+            },
+            tooltip: 'Copy logs',
+          ),
          // Sync indicator - shows when library is syncing in background
          ListenableBuilder(
            listenable: SyncService.instance,
@@ -452,12 +347,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl

  /// Check if a specific row is enabled
  bool _isRowEnabled(String rowId) {
-    // Discovery folders use the pattern 'discovery:{itemId}'
-    if (rowId.startsWith('discovery:')) {
-      final itemId = rowId.substring('discovery:'.length);
-      // Default to true if not explicitly set
-      return _discoveryRowEnabled[itemId] ?? false;
-    }
    switch (rowId) {
      case 'recent-albums': return _showRecentAlbums;
      case 'discover-artists': return _showDiscoverArtists;
@@ -482,30 +371,15 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
      builder: (context, constraints) {
        // Each row is always 1/3 of screen height
        // 1 row = 1/3, 2 rows = 2/3, 3 rows = full screen, 4+ rows scroll
-        // With extendBody: true, constraints include the area behind the nav bar.
-        // Only subtract mini player space (not nav bar) since nav bar is Scaffold chrome.
-        final miniPlayerSpace = MiniPlayerLayout.height + 12.0 + 22.0; // 72 + 12 + 22 = 106
-        final availableHeight = constraints.maxHeight - miniPlayerSpace;
+        final availableHeight = constraints.maxHeight - BottomSpacing.withMiniPlayer;

-        // Account for margins between rows (2px each, 2 margins for 3 rows).
-        // Always use the 3-row margin calculation so rowHeight stays stable
-        // regardless of how many rows are currently enabled (avoids jitter on reload).
+        // Account for margins between rows (2px each)
+        // Only adjust for margins when ≤3 rows (so they fit exactly without scroll)
+        // For 4+ rows, use original calculation so 4th row stays hidden (scrollable)
        const marginSize = 2.0;
        final enabledRows = _countEnabledRows();
-        const marginsInView = 2 * marginSize; // always 2 margins for 3-row layout
-        final candidateRowHeight = (availableHeight - marginsInView) / 3;
-
-        // Cache rowHeight to prevent size jumps when the bottom nav bar toggles
-        // on connect/disconnect. The nav bar hides when disconnected, giving more
-        // vertical space and taller rows. When it reappears, rows shrink visibly.
-        // Fix: always ratchet down to the smaller (nav-bar-present) value, and
-        // only allow increases on large changes like screen rotation.
-        if (_cachedRowHeight == null || (candidateRowHeight - _cachedRowHeight!).abs() > 50) {
-          _cachedRowHeight = candidateRowHeight;
-        } else if (candidateRowHeight < _cachedRowHeight!) {
-          _cachedRowHeight = candidateRowHeight;
-        }
-        final rowHeight = _cachedRowHeight!;
+        final marginsInView = enabledRows > 1 && enabledRows <= 3 ? (enabledRows - 1) * marginSize : 0.0;
+        final rowHeight = (availableHeight - marginsInView) / 3;

        // Use Android 12+ stretch overscroll effect
        return NotificationListener<ScrollNotification>(
@@ -527,18 +401,11 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
            behavior: const _StretchScrollBehavior(),
            child: SingleChildScrollView(
              physics: const AlwaysScrollableScrollPhysics(),
-              // For ≤3 rows: no padding needed (rows + miniPlayerSpace = viewport)
-              // For 4+ rows: pad by miniPlayerSpace so last row scrolls above mini player
-              padding: enabledRows >= 4
-                  ? EdgeInsets.only(bottom: miniPlayerSpace)
-                  : EdgeInsets.zero,
-              child: SizedBox(
-                // Ensure minimum height for pull-to-refresh when empty
-                height: enabledRows == 0 ? availableHeight : null,
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: _buildOrderedRows(provider, rowHeight, enabledRows == 0),
-                ),
+              padding: EdgeInsets.only(bottom: BottomSpacing.withMiniPlayer),
+              child: Column(
+                key: _refreshKey,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: _buildOrderedRows(provider, rowHeight),
              ),
            ),
          ),
@@ -548,51 +415,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
  }

  /// Build rows in the user's configured order
-  List<Widget> _buildOrderedRows(MusicAssistantProvider provider, double rowHeight, bool isEmpty) {
+  List<Widget> _buildOrderedRows(MusicAssistantProvider provider, double rowHeight) {
    final rows = <Widget>[];

-    // Show empty state with refresh hint when no rows are enabled
-    if (isEmpty) {
-      final colorScheme = Theme.of(context).colorScheme;
-      final textTheme = Theme.of(context).textTheme;
-      rows.add(
-        SizedBox.expand(
-          child: Center(
-            child: Padding(
-              padding: const EdgeInsets.all(32.0),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  Icon(
-                    Icons.home_rounded,
-                    size: 64,
-                    color: colorScheme.onSurface.withOpacity(0.3),
-                  ),
-                  const SizedBox(height: 16),
-                  Text(
-                    S.of(context)!.noRowsEnabled,
-                    style: textTheme.titleMedium?.copyWith(
-                      color: colorScheme.onSurface.withOpacity(0.6),
-                    ),
-                    textAlign: TextAlign.center,
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    S.of(context)!.pullToRefreshHint,
-                    style: textTheme.bodySmall?.copyWith(
-                      color: colorScheme.onSurface.withOpacity(0.4),
-                    ),
-                    textAlign: TextAlign.center,
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      );
-      return rows;
-    }
-
    for (final rowId in _homeRowOrder) {
      final widget = _buildRowWidget(rowId, provider, rowHeight);
      if (widget != null) {
@@ -617,7 +442,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
          title: S.of(context)!.recentlyPlayed,
          loadAlbums: () => provider.getRecentAlbumsWithCache(),
          getCachedAlbums: () => provider.getCachedRecentAlbums(),
-          refreshSignal: _refreshSignal,
          rowHeight: rowHeight,
        );
      case 'discover-artists':
@@ -627,7 +451,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
          title: S.of(context)!.discoverArtists,
          loadArtists: () => provider.getDiscoverArtistsWithCache(),
          getCachedArtists: () => provider.getCachedDiscoverArtists(),
-          refreshSignal: _refreshSignal,
          rowHeight: rowHeight,
        );
      case 'discover-albums':
@@ -637,7 +460,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
          title: S.of(context)!.discoverAlbums,
          loadAlbums: () => provider.getDiscoverAlbumsWithCache(),
          getCachedAlbums: () => provider.getCachedDiscoverAlbums(),
-          refreshSignal: _refreshSignal,
          rowHeight: rowHeight,
        );
      case 'continue-listening':
@@ -673,7 +495,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
          key: const ValueKey('favorite-albums'),
          title: S.of(context)!.favoriteAlbums,
          loadAlbums: () => provider.getFavoriteAlbums(),
-          refreshSignal: _refreshSignal,
          rowHeight: rowHeight,
        );
      case 'favorite-artists':
@@ -682,7 +503,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
          key: const ValueKey('favorite-artists'),
          title: S.of(context)!.favoriteArtists,
          loadArtists: () => provider.getFavoriteArtists(),
-          refreshSignal: _refreshSignal,
          rowHeight: rowHeight,
        );
      case 'favorite-tracks':
@@ -721,29 +541,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
          rowHeight: rowHeight,
        );
      default:
-        // Handle dynamic discovery folders
-        if (rowId.startsWith('discovery:')) {
-          final folderId = rowId.substring('discovery:'.length);
-          // Check per-row preference
-          final isEnabled = _discoveryRowEnabled[folderId] ?? false;
-          if (!isEnabled) return null;
-
-          try {
-            final folder = _discoveryFolders.firstWhere(
-              (f) => f.itemId == folderId,
-            );
-            return DiscoveryRow(
-              key: ValueKey(rowId),
-              title: folder.name,
-              loadItems: () => provider.getDiscoveryFolderItems(folderId),
-              getCachedItems: () => provider.getCachedDiscoveryFolderItems(folderId),
-              heroTagSuffix: 'home',
-              rowHeight: rowHeight,
-            );
-          } catch (e) {
-            // Folder not found, skip this row
-          }
-        }
        return null;
    }
  }
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import '../models/media_item.dart';
@@ -11,8 +10,6 @@ import '../services/debug_logger.dart';
 import '../services/recently_played_service.dart';
 import '../widgets/global_player_overlay.dart';
 import '../widgets/provider_icon.dart';
-import '../widgets/hires_badge.dart';
-import '../widgets/media_context_menu.dart';
 import '../l10n/app_localizations.dart';
 import '../theme/design_tokens.dart';

@@ -44,9 +41,9 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
  List<Track> _tracks = [];
  bool _isLoading = true;
  bool _isFavorite = false;
-  late bool _isInLibrary;
  ColorScheme? _lightColorScheme;
  ColorScheme? _darkColorScheme;
+  int? _expandedTrackIndex;

  String get _heroTagSuffix => widget.heroTagSuffix != null ? '_${widget.heroTagSuffix}' : '';

@@ -58,15 +55,15 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
  void initState() {
    super.initState();
    _isFavorite = widget.playlist.favorite ?? false;
-    _isInLibrary = widget.playlist.inLibrary;
    _loadTracks();

-    // Mark that we're on a detail screen and extract colors immediately
+    // Defer color extraction until after hero animation completes
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (mounted) {
-        markDetailScreenEntered(context);
-        _extractColors(); // Extract colors immediately - async so won't block
-      }
+      Future.delayed(const Duration(milliseconds: 350), () {
+        if (mounted) {
+          _extractColors();
+        }
+      });
    });
  }

@@ -77,18 +74,15 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
    if (imageUrl == null) return;

    try {
-      // Use isolate-based extraction to avoid blocking the main thread
-      final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
+      final colorSchemes = await PaletteHelper.extractColorSchemes(
+        CachedNetworkImageProvider(imageUrl),
+      );

      if (colorSchemes != null && mounted) {
        setState(() {
          _lightColorScheme = colorSchemes.$1;
          _darkColorScheme = colorSchemes.$2;
        });
-
-        // Update ThemeProvider so nav bar uses adaptive colors
-        final themeProvider = context.read<ThemeProvider>();
-        themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
      }
    } catch (e) {
      _logger.log('Failed to extract colors for playlist: $e');
@@ -233,86 +227,6 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
    }
  }

-  Future<void> _toggleLibrary() async {
-    final maProvider = context.read<MusicAssistantProvider>();
-    final newState = !_isInLibrary;
-
-    try {
-      if (newState) {
-        String? actualProvider;
-        String? actualItemId;
-
-        if (widget.playlist.providerMappings != null && widget.playlist.providerMappings!.isNotEmpty) {
-          final nonLibraryMapping = widget.playlist.providerMappings!.where(
-            (m) => m.providerInstance != 'library' && m.providerDomain != 'library',
-          ).firstOrNull;
-
-          if (nonLibraryMapping != null) {
-            actualProvider = nonLibraryMapping.providerDomain;
-            actualItemId = nonLibraryMapping.itemId;
-          }
-        }
-
-        if (actualProvider == null || actualItemId == null) {
-          if (widget.playlist.provider != 'library') {
-            actualProvider = widget.playlist.provider;
-            actualItemId = widget.playlist.itemId;
-          } else {
-            return;
-          }
-        }
-
-        setState(() => _isInLibrary = newState);
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(S.of(context)!.addedToLibrary),
-            duration: const Duration(seconds: 1),
-          ),
-        );
-
-        maProvider.addToLibrary(
-          mediaType: 'playlist',
-          provider: actualProvider,
-          itemId: actualItemId,
-        ).catchError((e) {
-          if (mounted) setState(() => _isInLibrary = !newState);
-        });
-      } else {
-        int? libraryItemId;
-        if (widget.playlist.provider == 'library') {
-          libraryItemId = int.tryParse(widget.playlist.itemId);
-        } else if (widget.playlist.providerMappings != null) {
-          final libraryMapping = widget.playlist.providerMappings!.firstWhere(
-            (m) => m.providerInstance == 'library',
-            orElse: () => widget.playlist.providerMappings!.first,
-          );
-          if (libraryMapping.providerInstance == 'library') {
-            libraryItemId = int.tryParse(libraryMapping.itemId);
-          }
-        }
-
-        if (libraryItemId == null) return;
-
-        setState(() => _isInLibrary = newState);
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(S.of(context)!.removedFromLibrary),
-            duration: const Duration(seconds: 1),
-          ),
-        );
-
-        maProvider.removeFromLibrary(
-          mediaType: 'playlist',
-          libraryItemId: libraryItemId,
-        ).catchError((e) {
-          if (mounted) setState(() => _isInLibrary = !newState);
-        });
-      }
-    } catch (e) {
-      // Silent failure
-    }
-  }
-
  Future<void> _toggleTrackFavorite(int trackIndex) async {
    if (trackIndex < 0 || trackIndex >= _tracks.length) return;

@@ -410,89 +324,6 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
    }
  }

-  Future<void> _toggleTrackLibrary(int trackIndex) async {
-    if (trackIndex < 0 || trackIndex >= _tracks.length) return;
-
-    final track = _tracks[trackIndex];
-    final maProvider = context.read<MusicAssistantProvider>();
-    final currentInLibrary = track.inLibrary;
-
-    try {
-      if (!currentInLibrary) {
-        // Add to library
-        String? actualProvider;
-        String? actualItemId;
-
-        if (track.providerMappings != null && track.providerMappings!.isNotEmpty) {
-          final nonLibraryMapping = track.providerMappings!.where(
-            (m) => m.providerInstance != 'library' && m.providerDomain != 'library',
-          ).firstOrNull;
-
-          if (nonLibraryMapping != null) {
-            actualProvider = nonLibraryMapping.providerDomain;
-            actualItemId = nonLibraryMapping.itemId;
-          }
-        }
-
-        if (actualProvider == null || actualItemId == null) {
-          if (track.provider != 'library') {
-            actualProvider = track.provider;
-            actualItemId = track.itemId;
-          } else {
-            return;
-          }
-        }
-
-        await maProvider.addToLibrary(
-          mediaType: 'track',
-          provider: actualProvider,
-          itemId: actualItemId,
-        );
-
-        if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(S.of(context)!.addedToLibrary),
-              duration: const Duration(seconds: 1),
-            ),
-          );
-        }
-      } else {
-        // Remove from library
-        int? libraryItemId;
-        if (track.provider == 'library') {
-          libraryItemId = int.tryParse(track.itemId);
-        } else if (track.providerMappings != null) {
-          final libraryMapping = track.providerMappings!.firstWhere(
-            (m) => m.providerInstance == 'library',
-            orElse: () => track.providerMappings!.first,
-          );
-          if (libraryMapping.providerInstance == 'library') {
-            libraryItemId = int.tryParse(libraryMapping.itemId);
-          }
-        }
-
-        if (libraryItemId == null) return;
-
-        await maProvider.removeFromLibrary(
-          mediaType: 'track',
-          libraryItemId: libraryItemId,
-        );
-
-        if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(S.of(context)!.removedFromLibrary),
-              duration: const Duration(seconds: 1),
-            ),
-          );
-        }
-      }
-    } catch (e) {
-      _logger.log('Error toggling track library: $e');
-    }
-  }
-
  Future<void> _playPlaylist() async {
    if (_tracks.isEmpty) return;

@@ -556,130 +387,158 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
    );
  }

-  void _showMoreMenu(BuildContext context, ColorScheme colorScheme) {
+  void _addPlaylistToQueue() {
    final maProvider = context.read<MusicAssistantProvider>();
+    final players = maProvider.availablePlayers;
+
+    GlobalPlayerOverlay.hidePlayer();

    showModalBottomSheet(
      context: context,
-      backgroundColor: colorScheme.surface,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
-      ),
-      builder: (context) => SafeArea(
+      backgroundColor: Colors.transparent,
+      builder: (context) => Container(
+        decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.surface,
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+        ),
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [
-            const SizedBox(height: 8),
-            Container(
-              width: 32,
-              height: 4,
-              decoration: BoxDecoration(
-                color: colorScheme.onSurfaceVariant.withOpacity(0.4),
-                borderRadius: BorderRadius.circular(2),
+            Spacing.vGap16,
+            Text(
+              S.of(context)!.addToQueueOn,
+              style: Theme.of(context).textTheme.titleLarge,
+            ),
+            Spacing.vGap16,
+            if (players.isEmpty)
+              Padding(
+                padding: const EdgeInsets.all(32.0),
+                child: Text(S.of(context)!.noPlayersAvailable),
+              )
+            else
+              Flexible(
+                child: ListView.builder(
+                  shrinkWrap: true,
+                  itemCount: players.length,
+                  itemBuilder: (context, playerIndex) {
+                    final player = players[playerIndex];
+                    return ListTile(
+                      leading: Icon(
+                        Icons.speaker,
+                        color: Theme.of(context).colorScheme.onSurface,
+                      ),
+                      title: Text(player.name),
+                      onTap: () async {
+                        Navigator.pop(context);
+                        try {
+                          _logger.log('Adding playlist to queue on ${player.name}');
+                          await maProvider.playTracks(
+                            player.playerId,
+                            _tracks,
+                            startIndex: 0,
+                            clearQueue: false,
+                          );
+                          _logger.log('Playlist added to queue on ${player.name}');
+                          if (mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(S.of(context)!.tracksAddedToQueue),
+                                duration: const Duration(seconds: 1),
+                              ),
+                            );
+                          }
+                        } catch (e) {
+                          _logger.log('Error adding playlist to queue: $e');
+                          _showError('Failed to add playlist to queue: $e');
+                        }
+                      },
+                    );
+                  },
+                ),
              ),
-            ),
-            const SizedBox(height: 16),
-            ListTile(
-              leading: Icon(Icons.speaker_group_outlined, color: colorScheme.onSurface),
-              title: Text(S.of(context)!.playOn, style: TextStyle(color: colorScheme.onSurface)),
-              onTap: () {
-                Navigator.pop(context);
-                _showPlayOnMenu(context);
-              },
-            ),
-            ListTile(
-              leading: Icon(Icons.playlist_add, color: colorScheme.onSurface),
-              title: Text(S.of(context)!.addToQueue, style: TextStyle(color: colorScheme.onSurface)),
-              onTap: () {
-                Navigator.pop(context);
-                // Add to queue on selected player
-                final player = maProvider.selectedPlayer;
-                if (player != null) {
-                  maProvider.addTracksToQueue(player.playerId, _tracks).then((_) {
-                    if (mounted) {
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(S.of(context)!.tracksAddedToQueue),
-                          duration: const Duration(seconds: 1),
-                        ),
-                      );
-                    }
-                  });
-                } else {
-                  _showError(S.of(context)!.noPlayerSelected);
-                }
-              },
-            ),
-            ListTile(
-              leading: Icon(Icons.queue_music, color: colorScheme.onSurface),
-              title: Text(S.of(context)!.addToQueueOn, style: TextStyle(color: colorScheme.onSurface)),
-              onTap: () {
-                Navigator.pop(context);
-                _addPlaylistToQueue();
-              },
-            ),
-            const SizedBox(height: 8),
+            SizedBox(height: MediaQuery.of(context).padding.bottom + 16),
          ],
        ),
      ),
-    );
-  }
-
-  void _addPlaylistToQueue() {
-    final maProvider = context.read<MusicAssistantProvider>();
-
-    GlobalPlayerOverlay.showPlayerSelectorForAction(
-      contextHint: S.of(context)!.addToQueueOn,
-      onPlayerSelected: (player) async {
-        try {
-          _logger.log('Adding playlist to queue on ${player.name}');
-          await maProvider.addTracksToQueue(
-            player.playerId,
-            _tracks,
-          );
-          _logger.log('Playlist added to queue on ${player.name}');
-          if (mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text(S.of(context)!.tracksAddedToQueue),
-                duration: const Duration(seconds: 1),
-              ),
-            );
-          }
-        } catch (e) {
-          _logger.log('Error adding playlist to queue: $e');
-          _showError('Failed to add playlist to queue: $e');
-        }
-      },
-    );
+    ).whenComplete(() {
+      GlobalPlayerOverlay.showPlayer();
+    });
  }

  void _addTrackToQueue(BuildContext context, int index) {
    final maProvider = context.read<MusicAssistantProvider>();
+    final players = maProvider.availablePlayers;

-    GlobalPlayerOverlay.showPlayerSelectorForAction(
-      contextHint: S.of(context)!.addToQueueOn,
-      onPlayerSelected: (player) async {
-        try {
-          await maProvider.addTracksToQueue(
-            player.playerId,
-            _tracks,
-            startIndex: index,
-          );
-          if (mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text(S.of(context)!.tracksAddedToQueue),
-                duration: const Duration(seconds: 1),
+    GlobalPlayerOverlay.hidePlayer();
+
+    showModalBottomSheet(
+      context: context,
+      backgroundColor: Colors.transparent,
+      builder: (context) => Container(
+        decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.surface,
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Spacing.vGap16,
+            Text(
+              S.of(context)!.addToQueueOn,
+              style: Theme.of(context).textTheme.titleLarge,
+            ),
+            Spacing.vGap16,
+            if (players.isEmpty)
+              Padding(
+                padding: const EdgeInsets.all(32.0),
+                child: Text(S.of(context)!.noPlayersAvailable),
+              )
+            else
+              Flexible(
+                child: ListView.builder(
+                  shrinkWrap: true,
+                  itemCount: players.length,
+                  itemBuilder: (context, playerIndex) {
+                    final player = players[playerIndex];
+                    return ListTile(
+                      leading: Icon(
+                        Icons.speaker,
+                        color: Theme.of(context).colorScheme.onSurface,
+                      ),
+                      title: Text(player.name),
+                      onTap: () async {
+                        Navigator.pop(context);
+                        try {
+                          await maProvider.playTracks(
+                            player.playerId,
+                            _tracks,
+                            startIndex: index,
+                            clearQueue: false,
+                          );
+                          if (mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(S.of(context)!.tracksAddedToQueue),
+                                duration: const Duration(seconds: 1),
+                              ),
+                            );
+                          }
+                        } catch (e) {
+                          _logger.log('Error adding to queue: $e');
+                          _showError('Failed to add to queue: $e');
+                        }
+                      },
+                    );
+                  },
+                ),
              ),
-            );
-          }
-        } catch (e) {
-          _logger.log('Error adding to queue: $e');
-          _showError('Failed to add to queue: $e');
-        }
-      },
-    );
+            SizedBox(height: MediaQuery.of(context).padding.bottom + 16),
+          ],
+        ),
+      ),
+    ).whenComplete(() {
+      GlobalPlayerOverlay.showPlayer();
+    });
  }

  void _showPlayRadioMenu(BuildContext context, int trackIndex) {
@@ -797,9 +656,7 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
            final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
            final expandedHeight = coverSize + 70;

-            return Stack(
-              children: [
-                CustomScrollView(
+            return CustomScrollView(
              slivers: [
                SliverAppBar(
                  expandedHeight: expandedHeight,
@@ -884,7 +741,7 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
                ),
                SliverToBoxAdapter(
                  child: Padding(
-                    padding: const EdgeInsets.fromLTRB(24.0, 8.0, 24.0, 12.0),
+                    padding: const EdgeInsets.fromLTRB(24.0, 24.0, 24.0, 12.0),
                    child: Column(
                      crossAxisAlignment: CrossAxisAlignment.start,
                      children: [
@@ -925,6 +782,7 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
                          children: [
                            // Main Play Button
                            Expanded(
+                              flex: 2,
                              child: SizedBox(
                                height: 50,
                                child: ElevatedButton.icon(
@@ -944,6 +802,42 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
                            ),
                            const SizedBox(width: 12),

+                            // "Play on..." Button
+                            SizedBox(
+                              height: 50,
+                              width: 50,
+                              child: FilledButton.tonal(
+                                onPressed: _isLoading || _tracks.isEmpty ? null : () => _showPlayOnMenu(context),
+                                style: FilledButton.styleFrom(
+                                  padding: EdgeInsets.zero,
+                                  shape: RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.circular(12),
+                                  ),
+                                ),
+                                child: const Icon(Icons.speaker_group_outlined),
+                              ),
+                            ),
+
+                            const SizedBox(width: 12),
+
+                            // "Add to Queue" Button
+                            SizedBox(
+                              height: 50,
+                              width: 50,
+                              child: FilledButton.tonal(
+                                onPressed: _isLoading || _tracks.isEmpty ? null : _addPlaylistToQueue,
+                                style: FilledButton.styleFrom(
+                                  padding: EdgeInsets.zero,
+                                  shape: RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.circular(12),
+                                  ),
+                                ),
+                                child: const Icon(Icons.playlist_add),
+                              ),
+                            ),
+
+                            const SizedBox(width: 12),
+
                            // Favorite Button
                            SizedBox(
                              height: 50,
@@ -957,53 +851,10 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
                                  ),
                                ),
                                child: Icon(
-                                  Icons.favorite,
-                                  size: 25,
+                                  _isFavorite ? Icons.favorite : Icons.favorite_border,
                                  color: _isFavorite
                                      ? colorScheme.error
-                                      : Colors.white70,
-                                ),
-                              ),
-                            ),
-
-                            const SizedBox(width: 12),
-
-                            // Three-dot Menu Button
-                            SizedBox(
-                              height: 50,
-                              width: 50,
-                              child: Builder(
-                                builder: (buttonContext) => FilledButton.tonal(
-                                  onPressed: () {
-                                    if (_isLoading || _tracks.isEmpty) return;
-                                    final RenderBox box = buttonContext.findRenderObject() as RenderBox;
-                                    final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
-                                    MediaContextMenu.show(
-                                      context: context,
-                                      position: position,
-                                      mediaType: ContextMenuMediaType.playlist,
-                                      item: widget.playlist,
-                                      isFavorite: _isFavorite,
-                                      isInLibrary: _isInLibrary,
-                                      onToggleFavorite: _toggleFavorite,
-                                      onToggleLibrary: _toggleLibrary,
-                                      adaptiveColorScheme: adaptiveScheme,
-                                      showTopRow: false,
-                                    );
-                                  },
-                                  style: FilledButton.styleFrom(
-                                    padding: EdgeInsets.zero,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(12),
-                                    ),
-                                  ),
-                                  child: Icon(
-                                    Icons.more_vert,
-                                    size: 25,
-                                    color: _isLoading || _tracks.isEmpty
-                                        ? Colors.white70.withOpacity(0.38)
-                                        : Colors.white70,
-                                  ),
+                                      : colorScheme.onSurfaceVariant,
                                ),
                              ),
                            ),
@@ -1037,112 +888,168 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
                    delegate: SliverChildBuilderDelegate(
                      (context, index) {
                        final track = _tracks[index];
+                        final isExpanded = _expandedTrackIndex == index;
                        final trackImageUrl = context.read<MusicAssistantProvider>().getImageUrl(track, size: 80);

-                        return GestureDetector(
-                          onLongPressStart: (details) {
-                            MediaContextMenu.show(
-                              context: context,
-                              position: details.globalPosition,
-                              mediaType: ContextMenuMediaType.track,
-                              item: track,
-                              isFavorite: track.favorite ?? false,
-                              isInLibrary: track.inLibrary,
-                              onToggleFavorite: () => _toggleTrackFavorite(index),
-                              onToggleLibrary: () => _toggleTrackLibrary(index),
-                              adaptiveColorScheme: adaptiveScheme,
-                            );
-                          },
-                          child: ListTile(
-                            contentPadding: const EdgeInsets.only(left: 12, right: 20),
-                            leading: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                // Track number
-                                SizedBox(
-                                  width: 24,
-                                  child: Text(
-                                    '${index + 1}',
-                                    style: textTheme.bodyMedium?.copyWith(
-                                      color: colorScheme.onSurface.withOpacity(0.5),
+                        return Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            ListTile(
+                              leading: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  // Track number
+                                  SizedBox(
+                                    width: 28,
+                                    child: Text(
+                                      '${index + 1}',
+                                      style: textTheme.bodyMedium?.copyWith(
+                                        color: colorScheme.onSurface.withOpacity(0.5),
+                                      ),
+                                      textAlign: TextAlign.right,
                                    ),
-                                    textAlign: TextAlign.right,
                                  ),
-                                ),
-                                const SizedBox(width: 16),
-                                // Track artwork
-                                ClipRRect(
-                                  borderRadius: BorderRadius.circular(4),
-                                  child: Container(
-                                    width: 48,
-                                    height: 48,
-                                    color: colorScheme.surfaceContainerHighest,
-                                    child: trackImageUrl != null
-                                        ? CachedNetworkImage(
-                                            imageUrl: trackImageUrl,
-                                            fit: BoxFit.cover,
-                                            memCacheWidth: 96,
-                                            memCacheHeight: 96,
-                                            fadeInDuration: Duration.zero,
-                                            fadeOutDuration: Duration.zero,
-                                            placeholder: (_, __) => const SizedBox(),
-                                            errorWidget: (_, __, ___) => Icon(
+                                  const SizedBox(width: 12),
+                                  // Track artwork
+                                  ClipRRect(
+                                    borderRadius: BorderRadius.circular(4),
+                                    child: Container(
+                                      width: 48,
+                                      height: 48,
+                                      color: colorScheme.surfaceContainerHighest,
+                                      child: trackImageUrl != null
+                                          ? CachedNetworkImage(
+                                              imageUrl: trackImageUrl,
+                                              fit: BoxFit.cover,
+                                              memCacheWidth: 96,
+                                              memCacheHeight: 96,
+                                              fadeInDuration: Duration.zero,
+                                              fadeOutDuration: Duration.zero,
+                                              placeholder: (_, __) => const SizedBox(),
+                                              errorWidget: (_, __, ___) => Icon(
+                                                Icons.music_note,
+                                                size: 24,
+                                                color: colorScheme.onSurfaceVariant,
+                                              ),
+                                            )
+                                          : Icon(
                                              Icons.music_note,
                                              size: 24,
                                              color: colorScheme.onSurfaceVariant,
                                            ),
-                                          )
-                                        : Icon(
-                                            Icons.music_note,
-                                            size: 24,
-                                            color: colorScheme.onSurfaceVariant,
-                                          ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                            title: Text(
-                              track.name,
-                              style: textTheme.bodyLarge?.copyWith(
-                                color: colorScheme.onSurface,
-                                fontWeight: FontWeight.w500,
-                              ),
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                            subtitle: Text(
-                              track.artistsString,
-                              style: textTheme.bodyMedium?.copyWith(
-                                color: colorScheme.onSurface.withOpacity(0.6),
-                              ),
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                            trailing: Padding(
-                              padding: const EdgeInsets.only(right: 4),
-                              child: Row(
-                                mainAxisSize: MainAxisSize.min,
-                                children: [
-                                  if (HiResBadge.getTooltip(track) != null) ...[
-                                    HiResBadge.fromTrack(track, primaryColor: colorScheme.primary)!,
-                                    const SizedBox(width: 12),
-                                  ],
-                                  if (track.duration != null)
-                                    SizedBox(
-                                      width: 40,
-                                      child: Text(
-                                        _formatDuration(track.duration!),
-                                        style: textTheme.bodySmall?.copyWith(
-                                          color: colorScheme.onSurface.withOpacity(0.5),
-                                        ),
-                                        textAlign: TextAlign.right,
-                                      ),
                                    ),
+                                  ),
                                ],
                              ),
+                              title: Text(
+                                track.name,
+                                style: textTheme.bodyLarge?.copyWith(
+                                  color: colorScheme.onSurface,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                              subtitle: Text(
+                                track.artistsString,
+                                style: textTheme.bodyMedium?.copyWith(
+                                  color: colorScheme.onSurface.withOpacity(0.6),
+                                ),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                              trailing: track.duration != null
+                                  ? Text(
+                                      _formatDuration(track.duration!),
+                                      style: textTheme.bodySmall?.copyWith(
+                                        color: colorScheme.onSurface.withOpacity(0.5),
+                                      ),
+                                    )
+                                  : null,
+                              onTap: () {
+                                if (isExpanded) {
+                                  setState(() {
+                                    _expandedTrackIndex = null;
+                                  });
+                                } else {
+                                  _playTrack(index);
+                                }
+                              },
+                              onLongPress: () {
+                                setState(() {
+                                  _expandedTrackIndex = isExpanded ? null : index;
+                                });
+                              },
                            ),
-                            onTap: () => _playTrack(index),
-                          ),
+                            // Expandable action buttons
+                            AnimatedSize(
+                              duration: const Duration(milliseconds: 300),
+                              curve: Curves.easeInOut,
+                              child: isExpanded
+                                  ? Padding(
+                                      padding: const EdgeInsets.only(right: 16.0, bottom: 12.0, top: 4.0),
+                                      child: Row(
+                                        mainAxisAlignment: MainAxisAlignment.end,
+                                        children: [
+                                          // Radio button
+                                          SizedBox(
+                                            height: 44,
+                                            width: 44,
+                                            child: FilledButton.tonal(
+                                              onPressed: () => _showPlayRadioMenu(context, index),
+                                              style: FilledButton.styleFrom(
+                                                padding: EdgeInsets.zero,
+                                                shape: RoundedRectangleBorder(
+                                                  borderRadius: BorderRadius.circular(12),
+                                                ),
+                                              ),
+                                              child: const Icon(Icons.radio, size: 20),
+                                            ),
+                                          ),
+                                          const SizedBox(width: 10),
+                                          // Add to queue button
+                                          SizedBox(
+                                            height: 44,
+                                            width: 44,
+                                            child: FilledButton.tonal(
+                                              onPressed: () => _addTrackToQueue(context, index),
+                                              style: FilledButton.styleFrom(
+                                                padding: EdgeInsets.zero,
+                                                shape: RoundedRectangleBorder(
+                                                  borderRadius: BorderRadius.circular(12),
+                                                ),
+                                              ),
+                                              child: const Icon(Icons.playlist_add, size: 20),
+                                            ),
+                                          ),
+                                          const SizedBox(width: 10),
+                                          // Favorite button
+                                          SizedBox(
+                                            height: 44,
+                                            width: 44,
+                                            child: FilledButton.tonal(
+                                              onPressed: () => _toggleTrackFavorite(index),
+                                              style: FilledButton.styleFrom(
+                                                padding: EdgeInsets.zero,
+                                                shape: RoundedRectangleBorder(
+                                                  borderRadius: BorderRadius.circular(Radii.xxl),
+                                                ),
+                                              ),
+                                              child: Icon(
+                                                track.favorite == true ? Icons.favorite : Icons.favorite_border,
+                                                size: 20,
+                                                color: track.favorite == true
+                                                    ? colorScheme.error
+                                                    : colorScheme.onSurfaceVariant,
+                                              ),
+                                            ),
+                                          ),
+                                        ],
+                                      ),
+                                    )
+                                  : const SizedBox.shrink(),
+                            ),
+                          ],
                        );
                      },
                      childCount: _tracks.length,
@@ -1150,28 +1057,6 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
                  ),
                SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)), // Space for bottom nav + mini player
              ],
-            ),
-                Positioned(
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
-                  height: BottomSpacing.withMiniPlayer,
-                  child: IgnorePointer(
-                    child: DecoratedBox(
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.topCenter,
-                          end: Alignment.bottomCenter,
-                          colors: [
-                            colorScheme.surface.withOpacity(0.0),
-                            colorScheme.surface,
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ],
            );
          },
        ),
@@ -1,23 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import 'package:material_symbols_icons/symbols.dart';
 import '../models/media_item.dart';
 import '../providers/music_assistant_provider.dart';
 import '../widgets/global_player_overlay.dart';
 import '../widgets/provider_icon.dart';
-import '../widgets/media_context_menu.dart';
 import '../theme/palette_helper.dart';
 import '../theme/theme_provider.dart';
-import '../theme/design_tokens.dart';
 import '../services/debug_logger.dart';
-import '../services/settings_service.dart';
 import '../constants/hero_tags.dart';
 import '../l10n/app_localizations.dart';
-import '../utils/page_transitions.dart';
-import 'podcast_episode_detail_screen.dart';

 class PodcastDetailScreen extends StatefulWidget {
  final MediaItem podcast;
@@ -43,8 +36,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
  bool _isLoadingEpisodes = false;
  bool _isDescriptionExpanded = false;
  bool _isInLibrary = false;
-  bool _isFavorite = false;
-  String _sortOrder = 'newest'; // 'newest', 'oldest', 'alpha', 'duration'
+  String? _expandedEpisodeId; // Track which episode is expanded for actions

  String get _heroTagSuffix => widget.heroTagSuffix != null ? '_${widget.heroTagSuffix}' : '';

@@ -52,109 +44,16 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
  void initState() {
    super.initState();
    _isInLibrary = _checkIfInLibrary(widget.podcast);
-    _isFavorite = widget.podcast.favorite ?? false;
-    _loadSortPreference();
-
-    // Mark that we're on a detail screen and extract colors immediately
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (mounted) {
-        markDetailScreenEntered(context);
-        _extractColors(); // Extract colors immediately - async so won't block
-      }
+      Future.delayed(const Duration(milliseconds: 350), () {
+        if (mounted) {
+          _extractColors();
+        }
+      });
      _loadEpisodes();
    });
  }

-  Future<void> _loadSortPreference() async {
-    final sortOrder = await SettingsService.getPodcastEpisodesSortOrder();
-    if (mounted) {
-      setState(() {
-        _sortOrder = sortOrder;
-      });
-    }
-  }
-
-  void _toggleSortOrder() {
-    // Cycle through sort orders: newest -> oldest -> alpha -> duration -> newest
-    String newOrder;
-    switch (_sortOrder) {
-      case 'newest':
-        newOrder = 'oldest';
-        break;
-      case 'oldest':
-        newOrder = 'alpha';
-        break;
-      case 'alpha':
-        newOrder = 'duration';
-        break;
-      default:
-        newOrder = 'newest';
-    }
-    setState(() {
-      _sortOrder = newOrder;
-      _sortEpisodes();
-    });
-    SettingsService.setPodcastEpisodesSortOrder(newOrder);
-  }
-
-  void _sortEpisodes() {
-    switch (_sortOrder) {
-      case 'newest':
-        _episodes.sort((a, b) {
-          final aDate = _getPublishDate(a.metadata);
-          final bDate = _getPublishDate(b.metadata);
-          if (aDate == null && bDate == null) return 0;
-          if (aDate == null) return 1;
-          if (bDate == null) return -1;
-          return bDate.compareTo(aDate); // Newest first
-        });
-        break;
-      case 'oldest':
-        _episodes.sort((a, b) {
-          final aDate = _getPublishDate(a.metadata);
-          final bDate = _getPublishDate(b.metadata);
-          if (aDate == null && bDate == null) return 0;
-          if (aDate == null) return 1;
-          if (bDate == null) return -1;
-          return aDate.compareTo(bDate); // Oldest first
-        });
-        break;
-      case 'alpha':
-        _episodes.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
-        break;
-      case 'duration':
-        _episodes.sort((a, b) {
-          final aDur = a.duration ?? Duration.zero;
-          final bDur = b.duration ?? Duration.zero;
-          return aDur.compareTo(bDur); // Shortest first
-        });
-        break;
-    }
-  }
-
-  DateTime? _getPublishDate(Map<String, dynamic>? metadata) {
-    if (metadata == null) return null;
-
-    dynamic dateValue = metadata['published'] ??
-        metadata['pub_date'] ??
-        metadata['release_date'] ??
-        metadata['aired'] ??
-        metadata['timestamp'];
-
-    if (dateValue == null) return null;
-
-    try {
-      if (dateValue is String) {
-        return DateTime.tryParse(dateValue);
-      } else if (dateValue is int) {
-        return DateTime.fromMillisecondsSinceEpoch(dateValue * 1000);
-      }
-    } catch (e) {
-      // Silent failure
-    }
-    return null;
-  }
-
  /// Check if podcast is in library
  bool _checkIfInLibrary(MediaItem podcast) {
    if (podcast.provider == 'library') return true;
@@ -287,71 +186,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
    }
  }

-  /// Toggle favorite status
-  Future<void> _toggleFavorite() async {
-    final maProvider = context.read<MusicAssistantProvider>();
-    final newState = !_isFavorite;
-
-    try {
-      bool success;
-      if (newState) {
-        String actualProvider = widget.podcast.provider;
-        String actualItemId = widget.podcast.itemId;
-
-        if (widget.podcast.providerMappings != null && widget.podcast.providerMappings!.isNotEmpty) {
-          final mapping = widget.podcast.providerMappings!.firstWhere(
-            (m) => m.available && m.providerInstance != 'library',
-            orElse: () => widget.podcast.providerMappings!.firstWhere(
-              (m) => m.available,
-              orElse: () => widget.podcast.providerMappings!.first,
-            ),
-          );
-          actualProvider = mapping.providerDomain;
-          actualItemId = mapping.itemId;
-        }
-
-        success = await maProvider.addToFavorites(
-          mediaType: 'podcast',
-          itemId: actualItemId,
-          provider: actualProvider,
-        );
-      } else {
-        int? libraryItemId;
-        if (widget.podcast.provider == 'library') {
-          libraryItemId = int.tryParse(widget.podcast.itemId);
-        } else if (widget.podcast.providerMappings != null) {
-          final libraryMapping = widget.podcast.providerMappings!.firstWhere(
-            (m) => m.providerInstance == 'library',
-            orElse: () => widget.podcast.providerMappings!.first,
-          );
-          if (libraryMapping.providerInstance == 'library') {
-            libraryItemId = int.tryParse(libraryMapping.itemId);
-          }
-        }
-
-        if (libraryItemId == null) return;
-
-        success = await maProvider.removeFromFavorites(
-          mediaType: 'podcast',
-          libraryItemId: libraryItemId,
-        );
-      }
-
-      if (success && mounted) {
-        setState(() => _isFavorite = newState);
-        maProvider.invalidateHomeCache();
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(_isFavorite ? S.of(context)!.addedToFavorites : S.of(context)!.removedFromFavorites),
-            duration: const Duration(seconds: 1),
-          ),
-        );
-      }
-    } catch (e) {
-      _logger.log('Error toggling podcast favorite: $e');
-    }
-  }
-
  Future<void> _extractColors() async {
    final maProvider = context.read<MusicAssistantProvider>();
    // Use initialImageUrl first for consistency with hero animation
@@ -359,17 +193,14 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {

    if (imageUrl != null) {
      try {
-        // Use isolate-based extraction to avoid blocking the main thread
-        final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
+        final colorSchemes = await PaletteHelper.extractColorSchemes(
+          CachedNetworkImageProvider(imageUrl),
+        );
        if (mounted && colorSchemes != null) {
          setState(() {
            _lightColorScheme = colorSchemes.$1;
            _darkColorScheme = colorSchemes.$2;
          });
-
-          // Update ThemeProvider so nav bar uses adaptive colors
-          final themeProvider = context.read<ThemeProvider>();
-          themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
        }
      } catch (e) {
        _logger.log('🎙️ Error extracting colors: $e');
@@ -430,7 +261,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
          }
          setState(() {
            _episodes = episodes;
-            _sortEpisodes();
          });
        }
      }
@@ -576,35 +406,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
    }
  }

-  /// Show context menu for an episode
-  void _showEpisodeContextMenu(BuildContext context, Offset position, MediaItem episode, String? episodeImageUrl) {
-    MediaContextMenu.show(
-      context: context,
-      position: position,
-      mediaType: ContextMenuMediaType.podcastEpisode,
-      item: episode,
-      isFavorite: false,
-      isInLibrary: false,
-      onPlay: () => _playEpisode(episode),
-      onPlayOn: () => _showPlayOnMenu(context, episode),
-      onAddToQueue: () => _addToQueue(episode),
-      onViewDetails: () {
-        final maProvider = this.context.read<MusicAssistantProvider>();
-        final initialImageUrl = episodeImageUrl ?? maProvider.getPodcastImageUrl(widget.podcast);
-        Navigator.push(
-          this.context,
-          FadeSlidePageRoute(
-            child: PodcastEpisodeDetailScreen(
-              episode: episode,
-              podcast: widget.podcast,
-              initialImageUrl: initialImageUrl,
-            ),
-          ),
-        );
-      },
-    );
-  }
-
  @override
  Widget build(BuildContext context) {
    // CRITICAL FIX: Use select() instead of watch() to prevent rebuilds during Hero animation
@@ -654,9 +455,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
            final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
            final expandedHeight = coverSize + 70;

-            return Stack(
-              children: [
-                CustomScrollView(
+            return CustomScrollView(
              slivers: [
                SliverAppBar(
                  expandedHeight: expandedHeight,
@@ -738,7 +537,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                ),
                SliverToBoxAdapter(
                  child: Padding(
-                    padding: const EdgeInsets.fromLTRB(16.0, 8.0, 16.0, 16.0),
+                    padding: const EdgeInsets.all(16),
                    child: Column(
                      crossAxisAlignment: CrossAxisAlignment.center,
                      children: [
@@ -770,6 +569,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                            children: [
                              // Main Play Latest Episode Button
                              Expanded(
+                                flex: 2,
                                child: SizedBox(
                                  height: 50,
                                  child: ElevatedButton.icon(
@@ -791,6 +591,24 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                                ),
                              ),
                              const SizedBox(width: 12),
+                              // "Play on..." Button
+                              SizedBox(
+                                height: 50,
+                                width: 50,
+                                child: FilledButton.tonal(
+                                  onPressed: _isLoadingEpisodes || _episodes.isEmpty
+                                      ? null
+                                      : () => _showPlayOnMenu(context, _episodes.first),
+                                  style: FilledButton.styleFrom(
+                                    padding: EdgeInsets.zero,
+                                    shape: RoundedRectangleBorder(
+                                      borderRadius: BorderRadius.circular(12),
+                                    ),
+                                  ),
+                                  child: const Icon(Icons.speaker_group_outlined),
+                                ),
+                              ),
+                              const SizedBox(width: 12),
                              // Library button
                              SizedBox(
                                height: 50,
@@ -804,76 +622,10 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                                    ),
                                  ),
                                  child: Icon(
-                                    Symbols.book_2,
-                                    size: 25,
-                                    fill: _isInLibrary ? 1 : 0,
+                                    _isInLibrary ? Icons.library_add_check : Icons.library_add,
                                    color: _isInLibrary
                                        ? colorScheme.primary
-                                        : Colors.white70,
-                                  ),
-                                ),
-                              ),
-                              const SizedBox(width: 12),
-                              // Favorite button
-                              SizedBox(
-                                height: 50,
-                                width: 50,
-                                child: FilledButton.tonal(
-                                  onPressed: _toggleFavorite,
-                                  style: FilledButton.styleFrom(
-                                    padding: EdgeInsets.zero,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(Radii.xxl),
-                                    ),
-                                  ),
-                                  child: Icon(
-                                    Icons.favorite,
-                                    size: 25,
-                                    color: _isFavorite
-                                        ? colorScheme.error
-                                        : Colors.white70,
-                                  ),
-                                ),
-                              ),
-                              const SizedBox(width: 12),
-                              // Three-dot Menu Button
-                              SizedBox(
-                                height: 50,
-                                width: 50,
-                                child: Builder(
-                                  builder: (buttonContext) => FilledButton.tonal(
-                                    onPressed: () {
-                                      if (_isLoadingEpisodes || _episodes.isEmpty) return;
-                                      final RenderBox box = buttonContext.findRenderObject() as RenderBox;
-                                      final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
-                                      MediaContextMenu.show(
-                                        context: context,
-                                        position: position,
-                                        mediaType: ContextMenuMediaType.podcast,
-                                        item: widget.podcast,
-                                        isFavorite: _isFavorite,
-                                        isInLibrary: _isInLibrary,
-                                        onToggleFavorite: _toggleFavorite,
-                                        onToggleLibrary: _toggleLibrary,
-                                        adaptiveColorScheme: adaptiveScheme,
-                                        showTopRow: false,
-                                        sortOrder: _sortOrder,
-                                        onToggleSort: _toggleSortOrder,
-                                      );
-                                    },
-                                    style: FilledButton.styleFrom(
-                                      padding: EdgeInsets.zero,
-                                      shape: RoundedRectangleBorder(
-                                        borderRadius: BorderRadius.circular(12),
-                                      ),
-                                    ),
-                                    child: Icon(
-                                      Icons.more_vert,
-                                      size: 25,
-                                      color: _isLoadingEpisodes || _episodes.isEmpty
-                                          ? Colors.white70.withOpacity(0.38)
-                                          : Colors.white70,
-                                    ),
+                                        : colorScheme.onSurfaceVariant,
                                  ),
                                ),
                              ),
@@ -980,126 +732,190 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                        final episode = _episodes[index];
                        final episodeDescription = episode.metadata?['description'] as String?;
                        final duration = episode.duration;
+                        final episodeId = episode.uri ?? episode.itemId;
+                        final isExpanded = _expandedEpisodeId == episodeId;
                        final episodeImageUrl = context.read<MusicAssistantProvider>().getImageUrl(episode, size: 256);

                        // Try to get release date from metadata
                        final releaseDate = _formatReleaseDate(episode.metadata);

-                        return GestureDetector(
-                          onTap: () => _playEpisode(episode),
-                          onLongPressStart: (details) => _showEpisodeContextMenu(
-                            context,
-                            details.globalPosition,
-                            episode,
-                            episodeImageUrl,
-                          ),
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-                            child: Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                // Episode cover
-                                Hero(
-                                  tag: HeroTags.podcastEpisodeCover + (episode.uri ?? episode.itemId),
-                                  child: ClipRRect(
-                                    borderRadius: BorderRadius.circular(8),
-                                    child: Container(
-                                      width: 72,
-                                      height: 72,
-                                      color: colorScheme.surfaceContainerHighest,
-                                      child: episodeImageUrl != null
-                                          ? CachedNetworkImage(
-                                              imageUrl: episodeImageUrl,
-                                              fit: BoxFit.cover,
-                                              fadeInDuration: Duration.zero,
-                                              fadeOutDuration: Duration.zero,
-                                              placeholder: (_, __) => Icon(
+                        return Column(
+                          children: [
+                            InkWell(
+                              onTap: () => _playEpisode(episode),
+                              onLongPress: () {
+                                setState(() {
+                                  _expandedEpisodeId = isExpanded ? null : episodeId;
+                                });
+                              },
+                              child: Padding(
+                                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+                                child: Row(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    // Episode cover (bigger than before)
+                                    ClipRRect(
+                                      borderRadius: BorderRadius.circular(8),
+                                      child: Container(
+                                        width: 72,
+                                        height: 72,
+                                        color: colorScheme.surfaceContainerHighest,
+                                        child: episodeImageUrl != null
+                                            ? CachedNetworkImage(
+                                                imageUrl: episodeImageUrl,
+                                                fit: BoxFit.cover,
+                                                fadeInDuration: Duration.zero,
+                                                fadeOutDuration: Duration.zero,
+                                                placeholder: (_, __) => Icon(
+                                                  MdiIcons.podcast,
+                                                  size: 32,
+                                                  color: colorScheme.onSurfaceVariant,
+                                                ),
+                                                errorWidget: (_, __, ___) => Icon(
+                                                  MdiIcons.podcast,
+                                                  size: 32,
+                                                  color: colorScheme.onSurfaceVariant,
+                                                ),
+                                              )
+                                            : Icon(
                                                MdiIcons.podcast,
                                                size: 32,
                                                color: colorScheme.onSurfaceVariant,
                                              ),
-                                              errorWidget: (_, __, ___) => Icon(
-                                                MdiIcons.podcast,
-                                                size: 32,
-                                                color: colorScheme.onSurfaceVariant,
-                                              ),
-                                            )
-                                          : Icon(
-                                              MdiIcons.podcast,
-                                              size: 32,
-                                              color: colorScheme.onSurfaceVariant,
-                                            ),
-                                    ),
-                                  ),
-                                ),
-                                const SizedBox(width: 12),
-                                // Episode info
-                                Expanded(
-                                  child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
-                                    children: [
-                                      Text(
-                                        episode.name,
-                                        style: textTheme.titleSmall?.copyWith(
-                                          fontWeight: FontWeight.w500,
-                                        ),
-                                        maxLines: 2,
-                                        overflow: TextOverflow.ellipsis,
                                      ),
-                                      if (episodeDescription != null && episodeDescription.isNotEmpty) ...[
-                                        const SizedBox(height: 4),
-                                        Text(
-                                          episodeDescription,
-                                          maxLines: 2,
-                                          overflow: TextOverflow.ellipsis,
-                                          style: textTheme.bodySmall?.copyWith(
-                                            color: colorScheme.onSurface.withOpacity(0.6),
-                                          ),
-                                        ),
-                                      ],
-                                      const SizedBox(height: 6),
-                                      // Duration and release date row
-                                      Row(
+                                    ),
+                                    const SizedBox(width: 12),
+                                    // Episode info
+                                    Expanded(
+                                      child: Column(
+                                        crossAxisAlignment: CrossAxisAlignment.start,
                                        children: [
-                                          if (duration != null && duration > Duration.zero) ...[
-                                            Icon(
-                                              Icons.access_time,
-                                              size: 14,
-                                              color: colorScheme.onSurface.withOpacity(0.5),
+                                          Text(
+                                            episode.name,
+                                            style: textTheme.titleSmall?.copyWith(
+                                              fontWeight: FontWeight.w500,
                                            ),
-                                            const SizedBox(width: 4),
+                                            maxLines: 2,
+                                            overflow: TextOverflow.ellipsis,
+                                          ),
+                                          if (episodeDescription != null && episodeDescription.isNotEmpty) ...[
+                                            const SizedBox(height: 4),
                                            Text(
-                                              _formatDuration(duration),
+                                              episodeDescription,
+                                              maxLines: isExpanded ? 100 : 2,
+                                              overflow: TextOverflow.ellipsis,
                                              style: textTheme.bodySmall?.copyWith(
-                                                color: colorScheme.onSurface.withOpacity(0.5),
+                                                color: colorScheme.onSurface.withOpacity(0.6),
                                              ),
                                            ),
                                          ],
-                                          if (duration != null && duration > Duration.zero && releaseDate != null)
-                                            Padding(
-                                              padding: const EdgeInsets.symmetric(horizontal: 8),
-                                              child: Text(
-                                                '•',
-                                                style: textTheme.bodySmall?.copyWith(
+                                          const SizedBox(height: 6),
+                                          // Duration and release date row
+                                          Row(
+                                            children: [
+                                              if (duration != null && duration > Duration.zero) ...[
+                                                Icon(
+                                                  Icons.access_time,
+                                                  size: 14,
                                                  color: colorScheme.onSurface.withOpacity(0.5),
                                                ),
-                                              ),
-                                            ),
-                                          if (releaseDate != null)
-                                            Text(
-                                              releaseDate,
-                                              style: textTheme.bodySmall?.copyWith(
-                                                color: colorScheme.onSurface.withOpacity(0.5),
-                                              ),
-                                            ),
+                                                const SizedBox(width: 4),
+                                                Text(
+                                                  _formatDuration(duration),
+                                                  style: textTheme.bodySmall?.copyWith(
+                                                    color: colorScheme.onSurface.withOpacity(0.5),
+                                                  ),
+                                                ),
+                                              ],
+                                              if (duration != null && duration > Duration.zero && releaseDate != null)
+                                                Padding(
+                                                  padding: const EdgeInsets.symmetric(horizontal: 8),
+                                                  child: Text(
+                                                    '•',
+                                                    style: textTheme.bodySmall?.copyWith(
+                                                      color: colorScheme.onSurface.withOpacity(0.5),
+                                                    ),
+                                                  ),
+                                                ),
+                                              if (releaseDate != null)
+                                                Text(
+                                                  releaseDate,
+                                                  style: textTheme.bodySmall?.copyWith(
+                                                    color: colorScheme.onSurface.withOpacity(0.5),
+                                                  ),
+                                                ),
+                                            ],
+                                          ),
                                        ],
                                      ),
-                                    ],
-                                  ),
+                                    ),
+                                  ],
                                ),
-                              ],
+                              ),
                            ),
-                          ),
+                            // Expanded action buttons (matching album track style)
+                            AnimatedCrossFade(
+                              firstChild: const SizedBox.shrink(),
+                              secondChild: Padding(
+                                padding: const EdgeInsets.only(left: 100, right: 16, bottom: 12),
+                                child: Row(
+                                  children: [
+                                    // Play button
+                                    SizedBox(
+                                      height: 44,
+                                      width: 44,
+                                      child: FilledButton.tonal(
+                                        onPressed: () => _playEpisode(episode),
+                                        style: FilledButton.styleFrom(
+                                          padding: EdgeInsets.zero,
+                                          shape: RoundedRectangleBorder(
+                                            borderRadius: BorderRadius.circular(12),
+                                          ),
+                                        ),
+                                        child: const Icon(Icons.play_arrow, size: 20),
+                                      ),
+                                    ),
+                                    const SizedBox(width: 10),
+                                    // Play on... button
+                                    SizedBox(
+                                      height: 44,
+                                      width: 44,
+                                      child: FilledButton.tonal(
+                                        onPressed: () => _showPlayOnMenu(context, episode),
+                                        style: FilledButton.styleFrom(
+                                          padding: EdgeInsets.zero,
+                                          shape: RoundedRectangleBorder(
+                                            borderRadius: BorderRadius.circular(12),
+                                          ),
+                                        ),
+                                        child: const Icon(Icons.speaker_group_outlined, size: 20),
+                                      ),
+                                    ),
+                                    const SizedBox(width: 10),
+                                    // Add to queue button
+                                    SizedBox(
+                                      height: 44,
+                                      width: 44,
+                                      child: FilledButton.tonal(
+                                        onPressed: () => _addToQueue(episode),
+                                        style: FilledButton.styleFrom(
+                                          padding: EdgeInsets.zero,
+                                          shape: RoundedRectangleBorder(
+                                            borderRadius: BorderRadius.circular(12),
+                                          ),
+                                        ),
+                                        child: const Icon(Icons.playlist_add, size: 20),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              crossFadeState: isExpanded
+                                  ? CrossFadeState.showSecond
+                                  : CrossFadeState.showFirst,
+                              duration: const Duration(milliseconds: 200),
+                            ),
+                          ],
                        );
                      },
                      childCount: _episodes.length,
@@ -1111,28 +927,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                  child: SizedBox(height: BottomSpacing.withMiniPlayer),
                ),
              ],
-            ),
-                Positioned(
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
-                  height: BottomSpacing.withMiniPlayer,
-                  child: IgnorePointer(
-                    child: DecoratedBox(
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.topCenter,
-                          end: Alignment.bottomCenter,
-                          colors: [
-                            colorScheme.surface.withOpacity(0.0),
-                            colorScheme.surface,
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ],
            );
          },
        ),
@@ -1,528 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-import '../models/media_item.dart';
-import '../providers/music_assistant_provider.dart';
-import '../widgets/global_player_overlay.dart';
-import '../widgets/provider_icon.dart';
-import '../theme/palette_helper.dart';
-import '../theme/theme_provider.dart';
-import '../theme/design_tokens.dart';
-import '../services/debug_logger.dart';
-import '../constants/hero_tags.dart';
-import '../l10n/app_localizations.dart';
-
-class PodcastEpisodeDetailScreen extends StatefulWidget {
-  final MediaItem episode;
-  final MediaItem podcast;
-  final String? heroTagSuffix;
-  final String? initialImageUrl;
-
-  const PodcastEpisodeDetailScreen({
-    super.key,
-    required this.episode,
-    required this.podcast,
-    this.heroTagSuffix,
-    this.initialImageUrl,
-  });
-
-  @override
-  State<PodcastEpisodeDetailScreen> createState() => _PodcastEpisodeDetailScreenState();
-}
-
-class _PodcastEpisodeDetailScreenState extends State<PodcastEpisodeDetailScreen> {
-  final _logger = DebugLogger();
-  ColorScheme? _lightColorScheme;
-  ColorScheme? _darkColorScheme;
-
-  String get _heroTagSuffix => widget.heroTagSuffix != null ? '_${widget.heroTagSuffix}' : '';
-
-  @override
-  void initState() {
-    super.initState();
-
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (mounted) {
-        markDetailScreenEntered(context);
-        _extractColors();
-      }
-    });
-  }
-
-  Future<void> _extractColors() async {
-    final maProvider = context.read<MusicAssistantProvider>();
-    // Try episode image first, fallback to podcast image
-    final imageUrl = widget.initialImageUrl ??
-        maProvider.getImageUrl(widget.episode, size: 512) ??
-        maProvider.getPodcastImageUrl(widget.podcast);
-
-    if (imageUrl != null) {
-      try {
-        final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
-        if (mounted && colorSchemes != null) {
-          setState(() {
-            _lightColorScheme = colorSchemes.$1;
-            _darkColorScheme = colorSchemes.$2;
-          });
-
-          final themeProvider = context.read<ThemeProvider>();
-          themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
-        }
-      } catch (e) {
-        _logger.log('Error extracting colors for episode: $e');
-      }
-    }
-  }
-
-  void _playEpisode() async {
-    final maProvider = context.read<MusicAssistantProvider>();
-    final selectedPlayer = maProvider.selectedPlayer;
-
-    if (selectedPlayer != null) {
-      try {
-        maProvider.setCurrentPodcastName(widget.podcast.name);
-        await maProvider.api?.playPodcastEpisode(selectedPlayer.playerId, widget.episode);
-        if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text('Playing: ${widget.episode.name}'),
-              duration: const Duration(seconds: 1),
-            ),
-          );
-        }
-      } catch (e) {
-        _logger.log('Error playing episode: $e');
-        if (mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text('Failed to play episode: $e')),
-          );
-        }
-      }
-    } else {
-      _showPlayOnMenu();
-    }
-  }
-
-  void _showPlayOnMenu() {
-    final maProvider = context.read<MusicAssistantProvider>();
-
-    GlobalPlayerOverlay.showPlayerSelectorForAction(
-      contextHint: S.of(context)!.selectPlayerForEpisode,
-      onPlayerSelected: (player) async {
-        maProvider.selectPlayer(player);
-        maProvider.setCurrentPodcastName(widget.podcast.name);
-        await maProvider.api?.playPodcastEpisode(player.playerId, widget.episode);
-      },
-    );
-  }
-
-  Future<void> _addToQueue() async {
-    final maProvider = context.read<MusicAssistantProvider>();
-    final selectedPlayer = maProvider.selectedPlayer;
-
-    if (selectedPlayer == null) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(S.of(context)!.noPlayerSelected)),
-      );
-      return;
-    }
-
-    try {
-      final track = Track(
-        itemId: widget.episode.itemId,
-        provider: widget.episode.provider,
-        name: widget.episode.name,
-        uri: widget.episode.uri,
-        duration: widget.episode.duration,
-        metadata: widget.episode.metadata,
-      );
-      await maProvider.addTrackToQueue(selectedPlayer.playerId, track);
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(S.of(context)!.addedToQueue),
-            duration: const Duration(seconds: 1),
-          ),
-        );
-      }
-    } catch (e) {
-      _logger.log('Error adding episode to queue: $e');
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(S.of(context)!.failedToAddToQueue(e.toString()))),
-        );
-      }
-    }
-  }
-
-  String _formatDuration(Duration? duration) {
-    if (duration == null || duration == Duration.zero) return '';
-    final hours = duration.inHours;
-    final minutes = duration.inMinutes.remainder(60);
-
-    if (hours > 0) {
-      return '${hours}h ${minutes}m';
-    }
-    return '$minutes min';
-  }
-
-  String? _formatPublishDate(Map<String, dynamic>? metadata) {
-    if (metadata == null) return null;
-
-    dynamic dateValue = metadata['published'] ??
-        metadata['pub_date'] ??
-        metadata['release_date'] ??
-        metadata['aired'] ??
-        metadata['timestamp'];
-
-    if (dateValue == null) return null;
-
-    try {
-      DateTime? date;
-      if (dateValue is String) {
-        date = DateTime.tryParse(dateValue);
-      } else if (dateValue is int) {
-        date = DateTime.fromMillisecondsSinceEpoch(dateValue * 1000);
-      }
-
-      if (date != null) {
-        final months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-        return '${months[date.month - 1]} ${date.day}, ${date.year}';
-      }
-    } catch (e) {
-      _logger.log('Error parsing release date: $e');
-    }
-
-    return null;
-  }
-
-  String _stripHtml(String htmlText) {
-    final withoutTags = htmlText.replaceAll(RegExp(r'<[^>]*>'), '');
-    final decoded = withoutTags
-        .replaceAll('&nbsp;', ' ')
-        .replaceAll('&amp;', '&')
-        .replaceAll('&lt;', '<')
-        .replaceAll('&gt;', '>')
-        .replaceAll('&quot;', '"')
-        .replaceAll('&#39;', "'");
-    return decoded.replaceAll(RegExp(r'\s+'), ' ').trim();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final maProvider = context.read<MusicAssistantProvider>();
-    final episodeImageUrl = maProvider.getImageUrl(widget.episode, size: 512);
-    final podcastImageUrl = maProvider.getPodcastImageUrl(widget.podcast);
-    final imageUrl = widget.initialImageUrl ?? episodeImageUrl ?? podcastImageUrl;
-
-    final adaptiveTheme = context.select<ThemeProvider, bool>(
-      (provider) => provider.adaptiveTheme,
-    );
-    final adaptiveLightScheme = context.select<ThemeProvider, ColorScheme?>(
-      (provider) => provider.adaptiveLightScheme,
-    );
-    final adaptiveDarkScheme = context.select<ThemeProvider, ColorScheme?>(
-      (provider) => provider.adaptiveDarkScheme,
-    );
-
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-
-    ColorScheme? adaptiveScheme;
-    if (adaptiveTheme) {
-      adaptiveScheme = isDark
-          ? (_darkColorScheme ?? adaptiveDarkScheme)
-          : (_lightColorScheme ?? adaptiveLightScheme);
-    }
-    final colorScheme = adaptiveScheme ?? Theme.of(context).colorScheme;
-    final textTheme = Theme.of(context).textTheme;
-
-    final description = widget.episode.metadata?['description'] as String?;
-    final duration = widget.episode.duration;
-    final publishDate = _formatPublishDate(widget.episode.metadata);
-
-    return PopScope(
-      canPop: true,
-      onPopInvokedWithResult: (didPop, result) {
-        if (didPop) {
-          clearAdaptiveColorsOnBack(context);
-        }
-      },
-      child: Scaffold(
-        backgroundColor: colorScheme.surface,
-        body: LayoutBuilder(
-          builder: (context, constraints) {
-            final coverSize = (constraints.maxWidth * 0.6).clamp(180.0, 280.0);
-            final expandedHeight = coverSize + 70;
-
-            return Stack(
-              children: [
-                CustomScrollView(
-              slivers: [
-                SliverAppBar(
-                  expandedHeight: expandedHeight,
-                  pinned: true,
-                  backgroundColor: colorScheme.surface,
-                  leading: IconButton(
-                    icon: const Icon(Icons.arrow_back_rounded),
-                    onPressed: () {
-                      clearAdaptiveColorsOnBack(context);
-                      Navigator.pop(context);
-                    },
-                    color: colorScheme.onSurface,
-                  ),
-                  flexibleSpace: FlexibleSpaceBar(
-                    background: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        const SizedBox(height: 60),
-                        Hero(
-                          tag: HeroTags.podcastEpisodeCover +
-                              (widget.episode.uri ?? widget.episode.itemId) + _heroTagSuffix,
-                          child: ClipRRect(
-                            borderRadius: BorderRadius.circular(12),
-                            child: SizedBox(
-                              width: coverSize,
-                              height: coverSize,
-                              child: Stack(
-                                fit: StackFit.expand,
-                                children: [
-                                  Container(
-                                    color: colorScheme.surfaceContainerHighest,
-                                    child: imageUrl != null
-                                        ? CachedNetworkImage(
-                                            imageUrl: imageUrl,
-                                            fit: BoxFit.cover,
-                                            memCacheWidth: 256,
-                                            memCacheHeight: 256,
-                                            fadeInDuration: Duration.zero,
-                                            fadeOutDuration: Duration.zero,
-                                            errorWidget: (_, __, ___) => Center(
-                                              child: Icon(
-                                                MdiIcons.podcast,
-                                                size: coverSize * 0.43,
-                                                color: colorScheme.onSurfaceVariant,
-                                              ),
-                                            ),
-                                          )
-                                        : Center(
-                                            child: Icon(
-                                              MdiIcons.podcast,
-                                              size: coverSize * 0.43,
-                                              color: colorScheme.onSurfaceVariant,
-                                            ),
-                                          ),
-                                  ),
-                                  if (widget.episode.providerMappings?.isNotEmpty == true)
-                                    ProviderIconOverlay(
-                                      domain: widget.episode.providerMappings!.first.providerDomain,
-                                      size: 24,
-                                      margin: 8,
-                                    ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-
-                // Header content with title, podcast name, metadata, and actions
-                SliverToBoxAdapter(
-                  child: Padding(
-                    padding: const EdgeInsets.fromLTRB(24.0, 8.0, 24.0, 24.0),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        // Episode title
-                        Text(
-                          widget.episode.name,
-                          style: textTheme.headlineMedium?.copyWith(
-                            color: colorScheme.onSurface,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                        Spacing.vGap8,
-
-                        // Podcast name (tappable to go back)
-                        InkWell(
-                          onTap: () => Navigator.pop(context),
-                          borderRadius: BorderRadius.circular(8),
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(vertical: 4.0),
-                            child: Text(
-                              widget.podcast.name,
-                              style: textTheme.titleMedium?.copyWith(
-                                color: colorScheme.primary,
-                              ),
-                            ),
-                          ),
-                        ),
-                        Spacing.vGap16,
-
-                        // Duration and publish date
-                        Row(
-                          children: [
-                            if (duration != null && duration > Duration.zero) ...[
-                              Icon(
-                                Icons.access_time,
-                                size: 16,
-                                color: colorScheme.onSurface.withOpacity(0.6),
-                              ),
-                              const SizedBox(width: 4),
-                              Text(
-                                _formatDuration(duration),
-                                style: textTheme.bodyMedium?.copyWith(
-                                  color: colorScheme.onSurface.withOpacity(0.6),
-                                ),
-                              ),
-                            ],
-                            if (duration != null && duration > Duration.zero && publishDate != null)
-                              Padding(
-                                padding: const EdgeInsets.symmetric(horizontal: 8),
-                                child: Text(
-                                  '•',
-                                  style: textTheme.bodyMedium?.copyWith(
-                                    color: colorScheme.onSurface.withOpacity(0.5),
-                                  ),
-                                ),
-                              ),
-                            if (publishDate != null)
-                              Text(
-                                publishDate,
-                                style: textTheme.bodyMedium?.copyWith(
-                                  color: colorScheme.onSurface.withOpacity(0.6),
-                                ),
-                              ),
-                          ],
-                        ),
-
-                        const SizedBox(height: 24),
-
-                        // Action buttons row
-                        Row(
-                          children: [
-                            // Main Play Button
-                            Expanded(
-                              child: SizedBox(
-                                height: 50,
-                                child: ElevatedButton.icon(
-                                  onPressed: _playEpisode,
-                                  icon: const Icon(Icons.play_arrow_rounded),
-                                  label: Text(S.of(context)!.play),
-                                  style: ElevatedButton.styleFrom(
-                                    backgroundColor: colorScheme.primary,
-                                    foregroundColor: colorScheme.onPrimary,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(12),
-                                    ),
-                                  ),
-                                ),
-                              ),
-                            ),
-                            const SizedBox(width: 12),
-
-                            // Play On... Button
-                            SizedBox(
-                              height: 50,
-                              width: 50,
-                              child: FilledButton.tonal(
-                                onPressed: _showPlayOnMenu,
-                                style: FilledButton.styleFrom(
-                                  padding: EdgeInsets.zero,
-                                  shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(12),
-                                  ),
-                                ),
-                                child: const Icon(Icons.speaker_group_outlined, size: 25),
-                              ),
-                            ),
-                            const SizedBox(width: 12),
-
-                            // Add to Queue Button
-                            SizedBox(
-                              height: 50,
-                              width: 50,
-                              child: FilledButton.tonal(
-                                onPressed: _addToQueue,
-                                style: FilledButton.styleFrom(
-                                  padding: EdgeInsets.zero,
-                                  shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(12),
-                                  ),
-                                ),
-                                child: const Icon(Icons.playlist_add, size: 25),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-
-                // Full scrollable description (key feature)
-                if (description != null && description.isNotEmpty)
-                  SliverToBoxAdapter(
-                    child: Padding(
-                      padding: const EdgeInsets.fromLTRB(24.0, 0, 24.0, 24.0),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            S.of(context)!.about,
-                            style: textTheme.titleLarge?.copyWith(
-                              color: colorScheme.onSurface,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          Spacing.vGap12,
-                          // Full description - no maxLines, fully scrollable with selectable text
-                          SelectableText(
-                            _stripHtml(description),
-                            style: textTheme.bodyLarge?.copyWith(
-                              color: colorScheme.onSurface.withOpacity(0.8),
-                              height: 1.5,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-
-                // Bottom spacing for mini player
-                SliverToBoxAdapter(
-                  child: SizedBox(height: BottomSpacing.withMiniPlayer),
-                ),
-              ],
-            ),
-                Positioned(
-                  left: 0,
-                  right: 0,
-                  bottom: 0,
-                  height: BottomSpacing.withMiniPlayer,
-                  child: IgnorePointer(
-                    child: DecoratedBox(
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.topCenter,
-                          end: Alignment.bottomCenter,
-                          colors: [
-                            colorScheme.surface.withOpacity(0.0),
-                            colorScheme.surface,
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
@@ -0,0 +1,257 @@
+import 'package:flutter/material.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
+import '../l10n/app_localizations.dart';
+
+/// A screen for scanning QR codes to get the Remote Access ID.
+class QrScannerScreen extends StatefulWidget {
+  const QrScannerScreen({super.key});
+
+  @override
+  State<QrScannerScreen> createState() => _QrScannerScreenState();
+}
+
+class _QrScannerScreenState extends State<QrScannerScreen> {
+  late final MobileScannerController _controller;
+  bool _hasScanned = false;
+  String _statusMessage = '';
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = MobileScannerController(
+      detectionSpeed: DetectionSpeed.normal,
+      facing: CameraFacing.back,
+      formats: [BarcodeFormat.qrCode], // Only scan QR codes
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  void _onDetect(BarcodeCapture capture) {
+    if (_hasScanned) return;
+
+    final List<Barcode> barcodes = capture.barcodes;
+    for (final barcode in barcodes) {
+      final String? code = barcode.rawValue;
+      if (code != null && code.isNotEmpty) {
+        final remoteId = _extractRemoteId(code);
+
+        if (remoteId != null && remoteId.isNotEmpty) {
+          _hasScanned = true;
+          Navigator.of(context).pop(remoteId);
+          return;
+        } else {
+          // Show what was scanned for debugging
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('Scanned: $code'),
+              duration: const Duration(seconds: 5),
+            ),
+          );
+        }
+      }
+    }
+  }
+
+  /// Extract the remote ID from various QR code formats
+  String? _extractRemoteId(String code) {
+    // Format 1: Raw remote ID (alphanumeric)
+    if (RegExp(r'^[a-zA-Z0-9_-]+$').hasMatch(code) && code.length >= 8) {
+      return code;
+    }
+
+    // Format 2: ma://remote/<id>
+    if (code.startsWith('ma://remote/')) {
+      return code.replaceFirst('ma://remote/', '');
+    }
+
+    // Format 3: URL from app.music-assistant.io
+    // Examples:
+    // - https://app.music-assistant.io/?cloudInstanceId=<id>
+    // - https://app.music-assistant.io/#/home?cloudInstanceId=<id>
+    if (code.contains('music-assistant.io')) {
+      final uri = Uri.tryParse(code);
+      if (uri != null) {
+        // Check query parameters in main URL
+        final queryParams = ['cloudInstanceId', 'cloud_instance_id', 'remoteid', 'remote_id', 'id'];
+        for (final param in queryParams) {
+          final value = uri.queryParameters[param];
+          if (value != null && value.isNotEmpty) {
+            return value;
+          }
+        }
+
+        // Check fragment (hash) for query params: #/home?cloudInstanceId=xxx
+        final fragment = uri.fragment;
+        if (fragment.contains('?')) {
+          final fragmentQuery = fragment.split('?').last;
+          final fragmentParams = Uri.splitQueryString(fragmentQuery);
+          for (final param in queryParams) {
+            final value = fragmentParams[param];
+            if (value != null && value.isNotEmpty) {
+              return value;
+            }
+          }
+        }
+
+        // Check if ID is in path segments
+        for (final segment in uri.pathSegments) {
+          if (segment.length >= 8 && RegExp(r'^[a-zA-Z0-9_-]+$').hasMatch(segment)) {
+            return segment;
+          }
+        }
+      }
+    }
+
+    // Format 4: Other URL formats - try to extract from query params or path
+    if (code.contains('://')) {
+      final uri = Uri.tryParse(code);
+      if (uri != null) {
+        // Check common query param names
+        for (final param in ['id', 'remoteid', 'remote_id', 'cloudInstanceId']) {
+          final value = uri.queryParameters[param];
+          if (value != null && value.isNotEmpty) {
+            return value;
+          }
+        }
+        // Last path segment if it looks like an ID
+        if (uri.pathSegments.isNotEmpty) {
+          final last = uri.pathSegments.last;
+          if (last.length >= 8 && RegExp(r'^[a-zA-Z0-9_-]+$').hasMatch(last)) {
+            return last;
+          }
+        }
+      }
+    }
+
+    return null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        backgroundColor: Colors.black,
+        foregroundColor: Colors.white,
+        title: Text(S.of(context)!.scanQrCode),
+        leading: IconButton(
+          icon: const Icon(Icons.close),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
+        actions: [
+          // Toggle torch
+          IconButton(
+            icon: ValueListenableBuilder(
+              valueListenable: _controller,
+              builder: (context, state, child) {
+                return Icon(
+                  state.torchState == TorchState.on
+                      ? Icons.flash_on
+                      : Icons.flash_off,
+                );
+              },
+            ),
+            onPressed: () => _controller.toggleTorch(),
+          ),
+        ],
+      ),
+      body: Stack(
+        children: [
+          // Camera preview
+          MobileScanner(
+            controller: _controller,
+            onDetect: _onDetect,
+            errorBuilder: (context, error, child) {
+              return Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(
+                      Icons.camera_alt_outlined,
+                      size: 64,
+                      color: colorScheme.error,
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      'Camera error: ${error.errorCode.name}',
+                      style: TextStyle(color: colorScheme.error),
+                      textAlign: TextAlign.center,
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      error.errorDetails?.message ?? S.of(context)!.cameraPermissionDenied,
+                      style: TextStyle(color: colorScheme.error.withOpacity(0.7)),
+                      textAlign: TextAlign.center,
+                    ),
+                  ],
+                ),
+              );
+            },
+          ),
+
+          // Scan overlay with instruction
+          Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                // Scan frame
+                Container(
+                  width: 280,
+                  height: 280,
+                  decoration: BoxDecoration(
+                    border: Border.all(
+                      color: Colors.white.withOpacity(0.8),
+                      width: 2,
+                    ),
+                    borderRadius: BorderRadius.circular(16),
+                  ),
+                ),
+                const SizedBox(height: 32),
+                // Instruction text
+                Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 16),
+                  margin: const EdgeInsets.symmetric(horizontal: 24),
+                  decoration: BoxDecoration(
+                    color: Colors.black.withOpacity(0.7),
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        S.of(context)!.pointCameraAtQr,
+                        textAlign: TextAlign.center,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 14,
+                        ),
+                      ),
+                      if (_statusMessage.isNotEmpty) ...[
+                        const SizedBox(height: 8),
+                        Text(
+                          _statusMessage,
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                            color: Colors.white.withOpacity(0.7),
+                            fontSize: 12,
+                          ),
+                        ),
+                      ],
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
@@ -132,8 +132,8 @@ class _QueueScreenState extends State<QueueScreen> {

  @override
  Widget build(BuildContext context) {
-    // Use select to only rebuild when selectedPlayer changes
-    final player = context.select<MusicAssistantProvider, dynamic>((p) => p.selectedPlayer);
+    final maProvider = context.watch<MusicAssistantProvider>();
+    final player = maProvider.selectedPlayer;

    return Scaffold(
      backgroundColor: const Color(0xFF1a1a1a),
@@ -153,7 +153,7 @@ class _QueueScreenState extends State<QueueScreen> {
          IconButton(
            icon: const Icon(Icons.swap_horiz_rounded),
            tooltip: S.of(context)!.transferQueue,
-            onPressed: () => _handleTransferQueue(context.read<MusicAssistantProvider>()),
+            onPressed: () => _handleTransferQueue(maProvider),
          ),
          IconButton(
            icon: const Icon(Icons.refresh),
@@ -161,12 +161,11 @@ class _QueueScreenState extends State<QueueScreen> {
          ),
        ],
      ),
-      body: _buildBody(context),
+      body: _buildBody(maProvider),
    );
  }

-  Widget _buildBody(BuildContext context) {
-    final maProvider = context.read<MusicAssistantProvider>();
+  Widget _buildBody(MusicAssistantProvider maProvider) {
    if (_isLoading) {
      return const Center(child: CircularProgressIndicator());
    }
@@ -1,18 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import '../l10n/app_localizations.dart';
-import '../models/recommendation_folder.dart';
 import '../providers/locale_provider.dart';
 import '../providers/music_assistant_provider.dart';
 import '../services/music_assistant_api.dart';
 import '../services/settings_service.dart';
 import '../theme/theme_provider.dart';
 import '../theme/app_theme.dart';
-import '../utils/page_transitions.dart';
-import '../providers/navigation_provider.dart';
 import '../widgets/global_player_overlay.dart';
 import 'debug_log_screen.dart';
 import 'login_screen.dart';
@@ -25,10 +19,8 @@ class SettingsScreen extends StatefulWidget {
 }

 class _SettingsScreenState extends State<SettingsScreen> {
-  final _scrollController = ScrollController();
  final _lastFmApiKeyController = TextEditingController();
  final _audioDbApiKeyController = TextEditingController();
-  String _appVersion = '';
  // Main rows (default on)
  bool _showRecentAlbums = true;
  bool _showDiscoverArtists = true;
@@ -47,77 +39,19 @@ class _SettingsScreenState extends State<SettingsScreen> {
  // Home row order
  List<String> _homeRowOrder = List.from(SettingsService.defaultHomeRowOrder);
  // Player settings
+  bool _preferLocalPlayer = false;
  bool _smartSortPlayers = false;
+  bool _disableAutoSwitch = false;
  bool _volumePrecisionMode = true;
  // Hint settings
  bool _showHints = true;
  // Display settings
  bool _showProviderIcons = true;
-  // Discovery folders state
-  List<RecommendationFolder> _discoveryFolders = [];
-  Map<String, bool> _discoveryRowEnabled = {};
-  bool _isLoadingDiscoveryFolders = false;
-
-  /// All available static home screen rows (that can be toggled on/off)
-  static const List<String> _allAvailableRows = [
-    'recent-albums',
-    'discover-artists',
-    'discover-albums',
-    'discovery-mixes',
-    'continue-listening',
-    'discover-audiobooks',
-    'discover-series',
-    'favorite-albums',
-    'favorite-artists',
-    'favorite-tracks',
-    'favorite-playlists',
-    'favorite-radio-stations',
-    'favorite-podcasts',
-  ];
-
-  /// Filtered row order for the draggable list
-  /// Shows all available rows (in home order + discovery rows), regardless of enabled state
-  List<String> get _filteredRowOrder {
-    final rows = <String>[];
-
-    // First, add all static rows in their current home order
-    for (final rowId in _homeRowOrder) {
-      if (rowId == 'discovery-mixes') continue;
-      rows.add(rowId);
-    }
-
-    // Then, add any static rows that aren't in home order yet (so users can enable them)
-    for (final rowId in _allAvailableRows) {
-      if (!_homeRowOrder.contains(rowId) && rowId != 'discovery-mixes') {
-        rows.add(rowId);
-      }
-    }
-
-    // Finally, add any discovery rows from provider that aren't in home order yet
-    for (final folder in _discoveryFolders) {
-      final discoveryRowId = 'discovery:${folder.itemId}';
-      if (!_homeRowOrder.contains(discoveryRowId)) {
-        rows.add(discoveryRowId);
-      }
-    }
-
-    return rows;
-  }

  @override
  void initState() {
    super.initState();
    _loadSettings();
-    _loadAppVersion();
-  }
-
-  Future<void> _loadAppVersion() async {
-    final info = await PackageInfo.fromPlatform();
-    if (mounted) {
-      setState(() {
-        _appVersion = '${info.version}+${info.buildNumber}';
-      });
-    }
  }

  Future<void> _loadSettings() async {
@@ -151,7 +85,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
    final rowOrder = await SettingsService.getHomeRowOrder();

    // Load player settings
+    final preferLocal = await SettingsService.getPreferLocalPlayer();
    final smartSort = await SettingsService.getSmartSortPlayers();
+    final disableAutoSwitch = await SettingsService.getDisableAutoSwitch();
    final volumePrecision = await SettingsService.getVolumePrecisionMode();

    // Load hint settings
@@ -160,9 +96,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
    // Load display settings
    final showProviderIcons = await SettingsService.getShowProviderIcons();

-    // Load discovery row preferences
-    final discoveryRowPrefs = await SettingsService.getDiscoveryRowPreferences();
-
    if (mounted) {
      setState(() {
        _showRecentAlbums = showRecent;
@@ -178,104 +111,26 @@ class _SettingsScreenState extends State<SettingsScreen> {
        _showDiscoverAudiobooks = showDiscAudiobooks;
        _showDiscoverSeries = showDiscSeries;
        _homeRowOrder = rowOrder;
+        _preferLocalPlayer = preferLocal;
        _smartSortPlayers = smartSort;
+        _disableAutoSwitch = disableAutoSwitch;
        _volumePrecisionMode = volumePrecision;
        _showHints = showHints;
        _showProviderIcons = showProviderIcons;
-        _discoveryRowEnabled = discoveryRowPrefs;
      });
    }
-
-    // Load discovery folders after initial state is set
-    _loadDiscoveryFolders();
  }

  @override
  void dispose() {
-    _scrollController.dispose();
    _lastFmApiKeyController.dispose();
    _audioDbApiKeyController.dispose();
    super.dispose();
  }

-  /// Load discovery folders from Music Assistant
-  Future<void> _loadDiscoveryFolders() async {
-    if (_discoveryFolders.isEmpty && mounted) {
-      setState(() {
-        _isLoadingDiscoveryFolders = true;
-      });
-    }
-
-    final provider = context.read<MusicAssistantProvider>();
-    try {
-      final folders = await provider.getDiscoveryFoldersWithCache();
-      // Also reload discovery row preferences to ensure they're up to date
-      final discoveryRowPrefs = await SettingsService.getDiscoveryRowPreferences();
-      if (mounted) {
-        setState(() {
-          _discoveryFolders = folders;
-          _discoveryRowEnabled = discoveryRowPrefs;
-          _isLoadingDiscoveryFolders = false;
-        });
-      }
-    } catch (e) {
-      if (mounted) {
-        setState(() {
-          _isLoadingDiscoveryFolders = false;
-        });
-      }
-    }
-  }
-
-  /// Refresh discovery folders from Music Assistant
-  Future<void> _refreshDiscoveryFolders() async {
-    final provider = context.read<MusicAssistantProvider>();
-    try {
-      setState(() {
-        _isLoadingDiscoveryFolders = true;
-      });
-      await provider.refreshDiscoveryFolders();
-      final folders = provider.getCachedDiscoveryFolders() ?? [];
-      if (mounted) {
-        setState(() {
-          _discoveryFolders = folders;
-          _isLoadingDiscoveryFolders = false;
-        });
-      }
-    } catch (e) {
-      if (mounted) {
-        setState(() {
-          _isLoadingDiscoveryFolders = false;
-        });
-      }
-    }
-  }
-
-  /// Toggle a specific discovery row on/off
-  Future<void> _toggleDiscoveryRow(String itemId, bool enabled) async {
-    setState(() {
-      _discoveryRowEnabled[itemId] = enabled;
-    });
-    await SettingsService.setDiscoveryRowPreference(itemId, enabled);
-  }
-
  // Helper to get row display info
  Map<String, String> _getRowInfo(String rowId) {
    final s = S.of(context)!;
-    // Handle dynamic discovery folders
-    if (rowId.startsWith('discovery:')) {
-      final itemId = rowId.substring('discovery:'.length);
-      final folder = _discoveryFolders.firstWhere(
-        (f) => f.itemId == itemId,
-        orElse: () => RecommendationFolder(
-          itemId: itemId,
-          provider: 'unknown',
-          name: rowId,
-          items: [],
-        ),
-      );
-      return {'title': folder.name, 'subtitle': 'Discovery row from Music Assistant'};
-    }
    switch (rowId) {
      case 'recent-albums':
        return {'title': s.recentlyPlayed, 'subtitle': s.showRecentlyPlayedAlbums};
@@ -283,8 +138,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
        return {'title': s.discoverArtists, 'subtitle': s.showRandomArtists};
      case 'discover-albums':
        return {'title': s.discoverAlbums, 'subtitle': s.showRandomAlbums};
-      case 'discovery-mixes':
-        return {'title': s.discoveryMixes, 'subtitle': s.discoveryMixesDescription};
      case 'continue-listening':
        return {'title': s.continueListening, 'subtitle': s.showAudiobooksInProgress};
      case 'discover-audiobooks':
@@ -310,11 +163,6 @@ class _SettingsScreenState extends State<SettingsScreen> {

  // Helper to get row enabled state
  bool _getRowEnabled(String rowId) {
-    // Handle dynamic discovery folders
-    if (rowId.startsWith('discovery:')) {
-      final itemId = rowId.substring('discovery:'.length);
-      return _discoveryRowEnabled[itemId] ?? false;
-    }
    switch (rowId) {
      case 'recent-albums':
        return _showRecentAlbums;
@@ -348,20 +196,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
  // Helper to set row enabled state
  void _setRowEnabled(String rowId, bool value) {
    setState(() {
-      // Handle dynamic discovery folders
-      if (rowId.startsWith('discovery:')) {
-        final itemId = rowId.substring('discovery:'.length);
-        _discoveryRowEnabled[itemId] = value;
-        SettingsService.setDiscoveryRowPreference(itemId, value);
-        // Always add to home row order for position tracking
-        if (!_homeRowOrder.contains(rowId)) {
-          _homeRowOrder.add(rowId);
-          SettingsService.setHomeRowOrder(_homeRowOrder);
-        }
-        return;
-      }
-
-      // Save the setting
      switch (rowId) {
        case 'recent-albums':
          _showRecentAlbums = value;
@@ -411,14 +245,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
          _showFavoritePodcasts = value;
          SettingsService.setShowFavoritePodcasts(value);
          break;
-        default:
-          break;
-      }
-
-      // When enabling a row, add it to home row order if not already present
-      if (value && !_homeRowOrder.contains(rowId)) {
-        _homeRowOrder.add(rowId);
-        SettingsService.setHomeRowOrder(_homeRowOrder);
      }
    });
  }
@@ -441,8 +267,7 @@ class _SettingsScreenState extends State<SettingsScreen> {

  @override
  Widget build(BuildContext context) {
-    // Use select to only rebuild when connectionState changes
-    final connectionState = context.select<MusicAssistantProvider, MAConnectionState>((p) => p.connectionState);
+    final provider = context.watch<MusicAssistantProvider>();
    final colorScheme = Theme.of(context).colorScheme;
    final textTheme = Theme.of(context).textTheme;

@@ -453,13 +278,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
        elevation: 0,
        leading: IconButton(
          icon: const Icon(Icons.arrow_back_rounded),
-          onPressed: () {
-            // Settings is rendered conditionally in HomeScreen (not pushed as a route),
-            // so Navigator.pop would pop the entire HomeScreen causing a black screen.
-            // Instead, switch tab back to Home and restore the mini player.
-            GlobalPlayerOverlay.showPlayer();
-            navigationProvider.setSelectedIndex(0);
-          },
+          onPressed: () => Navigator.pop(context),
          color: colorScheme.onBackground,
        ),
        title: Text(
@@ -476,7 +295,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
            onPressed: () {
              Navigator.push(
                context,
-                FadeSlidePageRoute(child: const DebugLogScreen()),
+                MaterialPageRoute(
+                  builder: (context) => const DebugLogScreen(),
+                ),
              );
            },
            color: colorScheme.onBackground,
@@ -485,7 +306,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
        ],
      ),
      body: SingleChildScrollView(
-        controller: _scrollController,
        padding: const EdgeInsets.all(24.0),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.center,
@@ -525,15 +345,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
                mainAxisAlignment: MainAxisAlignment.center,
                children: [
                  Icon(
-                    _getStatusIcon(connectionState),
-                    color: _getStatusColor(connectionState, colorScheme),
+                    _getStatusIcon(provider.connectionState),
+                    color: _getStatusColor(provider.connectionState, colorScheme),
                    size: 20,
                  ),
                  const SizedBox(width: 8),
                  Text(
-                    _getStatusText(connectionState),
+                    _getStatusText(provider.connectionState),
                    style: textTheme.titleMedium?.copyWith(
-                      color: _getStatusColor(connectionState, colorScheme),
+                      color: _getStatusColor(provider.connectionState, colorScheme),
                      fontWeight: FontWeight.bold,
                    ),
                  ),
@@ -883,6 +703,33 @@ class _SettingsScreenState extends State<SettingsScreen> {
            ),
            const SizedBox(height: 16),

+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+              decoration: BoxDecoration(
+                color: colorScheme.surfaceVariant.withOpacity(0.3),
+                borderRadius: BorderRadius.circular(12),
+              ),
+              child: SwitchListTile(
+                title: Text(
+                  S.of(context)!.preferLocalPlayer,
+                  style: TextStyle(color: colorScheme.onSurface),
+                ),
+                subtitle: Text(
+                  S.of(context)!.preferLocalPlayerDescription,
+                  style: TextStyle(color: colorScheme.onSurface.withOpacity(0.6), fontSize: 12),
+                ),
+                value: _preferLocalPlayer,
+                onChanged: (value) {
+                  setState(() => _preferLocalPlayer = value);
+                  SettingsService.setPreferLocalPlayer(value);
+                },
+                activeColor: colorScheme.primary,
+                contentPadding: EdgeInsets.zero,
+              ),
+            ),
+
+            const SizedBox(height: 16),
+
            Container(
              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
              decoration: BoxDecoration(
@@ -907,7 +754,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                contentPadding: EdgeInsets.zero,
              ),
            ),
-            const SizedBox(height: 16),
+            const SizedBox(height: 8),
            Container(
              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
              decoration: BoxDecoration(
@@ -916,11 +763,36 @@ class _SettingsScreenState extends State<SettingsScreen> {
              ),
              child: SwitchListTile(
                title: Text(
-                  S.of(context)!.volumePrecisionMode,
+                  S.of(context)!.disableAutoSwitch,
                  style: TextStyle(color: colorScheme.onSurface),
                ),
                subtitle: Text(
-                  S.of(context)!.volumePrecisionModeDescription,
+                  S.of(context)!.disableAutoSwitchDescription,
+                  style: TextStyle(color: colorScheme.onSurface.withOpacity(0.6), fontSize: 12),
+                ),
+                value: _disableAutoSwitch,
+                onChanged: (value) {
+                  setState(() => _disableAutoSwitch = value);
+                  SettingsService.setDisableAutoSwitch(value);
+                },
+                activeColor: colorScheme.primary,
+                contentPadding: EdgeInsets.zero,
+              ),
+            ),
+            const SizedBox(height: 8),
+            Container(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+              decoration: BoxDecoration(
+                color: colorScheme.surfaceVariant.withOpacity(0.3),
+                borderRadius: BorderRadius.circular(12),
+              ),
+              child: SwitchListTile(
+                title: Text(
+                  'Volume precision mode',
+                  style: TextStyle(color: colorScheme.onSurface),
+                ),
+                subtitle: Text(
+                  'Hold still while adjusting volume for fine control',
                  style: TextStyle(color: colorScheme.onSurface.withOpacity(0.6), fontSize: 12),
                ),
                value: _volumePrecisionMode,
@@ -1031,7 +903,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
            ),
            const SizedBox(height: 16),

-            // Reorderable home rows list (exclude discovery-mixes from list)
+            // Reorderable home rows list
            Container(
              decoration: BoxDecoration(
                color: colorScheme.surfaceVariant.withOpacity(0.3),
@@ -1042,29 +914,24 @@ class _SettingsScreenState extends State<SettingsScreen> {
                shrinkWrap: true,
                physics: const NeverScrollableScrollPhysics(),
                buildDefaultDragHandles: false,
-                itemCount: _filteredRowOrder.length,
+                itemCount: _homeRowOrder.length,
                onReorder: (oldIndex, newIndex) {
-                  // Create a mutable copy of the filtered list for reordering
-                  final displayRows = List<String>.from(_filteredRowOrder);
-                  if (newIndex > oldIndex) newIndex--;
-                  final item = displayRows.removeAt(oldIndex);
-                  displayRows.insert(newIndex, item);
-
                  setState(() {
-                    // Update _homeRowOrder with the new order (all rows, including discovery)
-                    _homeRowOrder = displayRows;
+                    if (newIndex > oldIndex) newIndex--;
+                    final item = _homeRowOrder.removeAt(oldIndex);
+                    _homeRowOrder.insert(newIndex, item);
                  });
                  SettingsService.setHomeRowOrder(_homeRowOrder);
                },
                itemBuilder: (context, index) {
-                  final rowId = _filteredRowOrder[index];
+                  final rowId = _homeRowOrder[index];
                  final rowInfo = _getRowInfo(rowId);
                  final isEnabled = _getRowEnabled(rowId);

                  return Container(
                    key: ValueKey(rowId),
                    decoration: BoxDecoration(
-                      border: index < _filteredRowOrder.length - 1
+                      border: index < _homeRowOrder.length - 1
                          ? Border(bottom: BorderSide(color: colorScheme.outline.withOpacity(0.2)))
                          : null,
                    ),
@@ -1195,149 +1062,6 @@ class _SettingsScreenState extends State<SettingsScreen> {

            const SizedBox(height: 32),

-            // About & Support section
-            Text(
-              S.of(context)!.aboutAndSupport,
-              style: textTheme.titleMedium?.copyWith(
-                color: colorScheme.onBackground,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-            const SizedBox(height: 16),
-
-            // Support Development banner
-            Container(
-              width: double.infinity,
-              padding: const EdgeInsets.all(20),
-              decoration: BoxDecoration(
-                gradient: LinearGradient(
-                  colors: [
-                    Color(0xFFEA4AAA).withOpacity(0.15),
-                    Color(0xFF1F6FEB).withOpacity(0.15),
-                  ],
-                  begin: Alignment.topLeft,
-                  end: Alignment.bottomRight,
-                ),
-                borderRadius: BorderRadius.circular(16),
-                border: Border.all(
-                  color: colorScheme.outline.withOpacity(0.2),
-                ),
-              ),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Icon(
-                        Icons.favorite_rounded,
-                        color: Color(0xFFEA4AAA),
-                        size: 24,
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Text(
-                          S.of(context)!.supportDevelopment,
-                          style: textTheme.titleMedium?.copyWith(
-                            color: colorScheme.onBackground,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    S.of(context)!.ensembleIsUnofficial,
-                    style: textTheme.bodySmall?.copyWith(
-                      color: colorScheme.onBackground.withOpacity(0.7),
-                    ),
-                  ),
-                  const SizedBox(height: 16),
-                  Row(
-                    children: [
-                      // GitHub Sponsors button
-                      Expanded(
-                        child: _DonationButton(
-                          label: S.of(context)!.sponsorOnGitHub,
-                          color: Color(0xFF1F6FEB),
-                          iconWidget: Icon(MdiIcons.github, size: 20),
-                          onTap: () => _launchUrl('https://github.com/sponsors/CollotsSpot'),
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      // Ko-fi button
-                      Expanded(
-                        child: _DonationButton(
-                          icon: null,
-                          label: S.of(context)!.buyMeAKoFi,
-                          color: Color(0xFFFF5E5B),
-                          iconWidget: Icon(Icons.coffee_rounded, color: Colors.white),
-                          onTap: () => _launchUrl('https://ko-fi.com/collotsspot'),
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-
-            const SizedBox(height: 16),
-
-            // About Ensemble card
-            Container(
-              width: double.infinity,
-              padding: const EdgeInsets.all(16),
-              decoration: BoxDecoration(
-                color: colorScheme.surfaceVariant.withOpacity(0.3),
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    S.of(context)!.aboutEnsemble,
-                    style: textTheme.titleSmall?.copyWith(
-                      color: colorScheme.onBackground,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  Row(
-                    children: [
-                      Text(
-                        S.of(context)!.version,
-                        style: textTheme.bodySmall?.copyWith(
-                          color: colorScheme.onBackground.withOpacity(0.7),
-                        ),
-                      ),
-                      const SizedBox(width: 4),
-                      Text(
-                        _appVersion,
-                        style: textTheme.bodySmall?.copyWith(
-                          color: colorScheme.primary,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 12),
-                  _LinkButton(
-                    icon: Icons.code_rounded,
-                    label: S.of(context)!.visitGitHubRepo,
-                    onTap: () => _launchUrl('https://github.com/CollotsSpot/Ensemble'),
-                  ),
-                  const SizedBox(height: 8),
-                  _LinkButton(
-                    icon: Icons.bug_report_outlined,
-                    label: S.of(context)!.reportABug,
-                    onTap: () => _launchUrl('https://github.com/CollotsSpot/Ensemble/issues'),
-                  ),
-                ],
-              ),
-            ),
-
-            const SizedBox(height: 32),
-
            SizedBox(
              width: double.infinity,
              height: 50,
@@ -1415,227 +1139,4 @@ class _SettingsScreenState extends State<SettingsScreen> {
    }
  }

-  Future<void> _launchUrl(String url) async {
-    final uri = Uri.parse(url);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri, mode: LaunchMode.externalApplication);
-    }
-  }
-
-  /// Build the discovery section with individual row toggles
-  Widget _buildDiscoverySection(ColorScheme colorScheme, TextTheme textTheme) {
-    final s = S.of(context)!;
-
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: colorScheme.surfaceVariant.withOpacity(0.3),
-        borderRadius: BorderRadius.circular(12),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          // Header with title and refresh button
-          Row(
-            children: [
-              Icon(
-                Icons.explore_outlined,
-                color: colorScheme.onSurfaceVariant,
-                size: 20,
-              ),
-              const SizedBox(width: 8),
-              Expanded(
-                child: Text(
-                  s.discoveryRows,
-                  style: textTheme.titleSmall?.copyWith(
-                    color: colorScheme.onBackground,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-              if (_isLoadingDiscoveryFolders)
-                SizedBox(
-                  width: 20,
-                  height: 20,
-                  child: CircularProgressIndicator(
-                    strokeWidth: 2,
-                    valueColor: AlwaysStoppedAnimation<Color>(
-                      colorScheme.primary.withOpacity(0.7),
-                    ),
-                  ),
-                )
-              else
-                IconButton(
-                  icon: const Icon(Icons.refresh, size: 20),
-                  onPressed: _refreshDiscoveryFolders,
-                  tooltip: s.refreshDiscoveryRows,
-                  color: colorScheme.onSurfaceVariant,
-                  padding: EdgeInsets.zero,
-                  constraints: const BoxConstraints(
-                    minWidth: 32,
-                    minHeight: 32,
-                  ),
-                ),
-            ],
-          ),
-          const SizedBox(height: 12),
-
-          // Discovery rows list
-          if (_discoveryFolders.isEmpty && !_isLoadingDiscoveryFolders)
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8.0),
-              child: Text(
-                s.noDiscoveryRows,
-                style: textTheme.bodySmall?.copyWith(
-                  color: colorScheme.onSurface.withOpacity(0.6),
-                ),
-              ),
-            )
-          else
-            ..._discoveryFolders.map((folder) {
-              final itemId = folder.itemId;
-              final isEnabled = _discoveryRowEnabled[itemId] ?? false;
-              return Padding(
-                padding: const EdgeInsets.only(bottom: 4.0),
-                child: SwitchListTile(
-                  title: Text(
-                    folder.name,
-                    style: TextStyle(
-                      color: colorScheme.onSurface,
-                      fontSize: 14,
-                    ),
-                  ),
-                  subtitle: folder.provider.isNotEmpty
-                      ? Text(
-                          folder.provider,
-                          style: TextStyle(
-                            color: colorScheme.onSurface.withOpacity(0.6),
-                            fontSize: 11,
-                          ),
-                        )
-                      : null,
-                  value: isEnabled,
-                  onChanged: (value) => _toggleDiscoveryRow(itemId, value),
-                  activeColor: colorScheme.primary,
-                  contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 0),
-                  dense: true,
-                ),
-              );
-            }).toList(),
-        ],
-      ),
-    );
-  }
-}
-
-// Custom donation button widget
-class _DonationButton extends StatelessWidget {
-  final String? icon;
-  final String label;
-  final Color color;
-  final VoidCallback onTap;
-  final Widget? iconWidget;
-
-  const _DonationButton({
-    this.icon,
-    required this.label,
-    required this.color,
-    required this.onTap,
-    this.iconWidget,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: Colors.transparent,
-      child: InkWell(
-        onTap: onTap,
-        borderRadius: BorderRadius.circular(12),
-        child: Container(
-          height: 48,
-          decoration: BoxDecoration(
-            color: color.withOpacity(0.15),
-            borderRadius: BorderRadius.circular(12),
-            border: Border.all(
-              color: color.withOpacity(0.3),
-            ),
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              if (iconWidget != null)
-                iconWidget!
-              else if (icon != null)
-                Image.asset(
-                  icon!,
-                  width: 20,
-                  height: 20,
-                ),
-              const SizedBox(width: 8),
-              Text(
-                label,
-                style: TextStyle(
-                  color: color,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 13,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-// Custom link button widget
-class _LinkButton extends StatelessWidget {
-  final IconData icon;
-  final String label;
-  final VoidCallback onTap;
-
-  const _LinkButton({
-    required this.icon,
-    required this.label,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    final textTheme = Theme.of(context).textTheme;
-
-    return Material(
-      color: Colors.transparent,
-      child: InkWell(
-        onTap: onTap,
-        borderRadius: BorderRadius.circular(8),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-          child: Row(
-            children: [
-              Icon(
-                icon,
-                size: 18,
-                color: colorScheme.primary,
-              ),
-              const SizedBox(width: 8),
-              Text(
-                label,
-                style: textTheme.bodyMedium?.copyWith(
-                  color: colorScheme.primary,
-                ),
-              ),
-              const SizedBox(width: 4),
-              Icon(
-                Icons.open_in_new,
-                size: 14,
-                color: colorScheme.primary.withOpacity(0.7),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
 }
@@ -1,186 +1,542 @@
 import 'dart:convert';
+import 'dart:io';
 import 'package:http/http.dart' as http;
+import 'auth_strategy.dart';
+import 'no_auth_strategy.dart';
+import 'basic_auth_strategy.dart';
+import 'authelia_strategy.dart';
+import 'ma_auth_strategy.dart';
 import '../debug_logger.dart';
+import '../../constants/network.dart';

-/// Simple authentication manager for Music Assistant
-/// MA now uses its own built-in authentication system
+/// Central authentication manager
+/// Manages auth strategy selection, auto-detection, and credential lifecycle
 class AuthManager {
  final _logger = DebugLogger();

-  String? _accessToken;
-  String? _longLivedToken;
+  // Available auth strategies
+  final List<AuthStrategy> _strategies = [
+    NoAuthStrategy(),
+    BasicAuthStrategy(),
+    AutheliaStrategy(),
+    MusicAssistantAuthStrategy(),
+  ];

-  /// Get the best available token (prefer long-lived)
-  String? get token => _longLivedToken ?? _accessToken;
+  AuthStrategy? _currentStrategy;
+  AuthCredentials? _currentCredentials;

-  /// Check if we have valid credentials
-  bool get hasCredentials => token != null;
+  /// Get current auth strategy (null if none selected)
+  AuthStrategy? get currentStrategy => _currentStrategy;

-  /// Login to Music Assistant and get an access token
-  Future<String?> login(String serverUrl, String username, String password) async {
-    try {
-      final apiUrl = _buildApiUrl(serverUrl);
-      _logger.log('🔐 Logging in to Music Assistant at $apiUrl');
+  /// Get current credentials (null if none stored)
+  AuthCredentials? get currentCredentials => _currentCredentials;

-      final response = await http.post(
-        apiUrl,
-        headers: {'Content-Type': 'application/json'},
-        body: jsonEncode({
-          'command': 'auth/login',
-          'args': {
-            'username': username,
-            'password': password,
-          },
-        }),
-      ).timeout(const Duration(seconds: 10));
+  /// Auto-detect authentication requirements for a server
+  /// Returns null if server is unreachable or auth method unknown
+  /// Also returns the final URL used (in case of HTTP fallback) via the callback
+  String? _lastSuccessfulUrl;
+  String? get lastSuccessfulUrl => _lastSuccessfulUrl;

-      _logger.log('Auth response status: ${response.statusCode}');
+  Future<AuthStrategy?> detectAuthStrategy(String serverUrl) async {
+    _logger.log('🔍 Auto-detecting auth strategy for $serverUrl');
+    _lastSuccessfulUrl = null;

-      if (response.statusCode == 200) {
-        final data = jsonDecode(response.body) as Map<String, dynamic>;
+    // Normalize URL
+    var baseUrl = _normalizeUrl(serverUrl);
+    _logger.log('Normalized URL: $baseUrl');

-        if (data.containsKey('error_code')) {
-          _logger.log('✗ Login failed: ${data['error_code']} - ${data['details']}');
-          return null;
-        }
+    // Try detection with the initial URL
+    var result = await _tryDetectAuth(baseUrl);

-        final result = data['result'] as Map<String, dynamic>?;
-        _accessToken = result?['access_token'] as String?;
-
-        if (_accessToken != null) {
-          _logger.log('✓ Got access token from MA');
-
-          // Try to create a long-lived token
-          _longLivedToken = await _createLongLivedToken(apiUrl, _accessToken!);
-
-          return _longLivedToken ?? _accessToken;
-        }
-
-        _logger.log('✗ No access token in response');
-        return null;
+    // If HTTPS failed and we haven't tried HTTP yet, try HTTP fallback
+    if (result == null && baseUrl.startsWith('https://')) {
+      final httpUrl = baseUrl.replaceFirst('https://', 'http://');
+      _logger.log('🔄 HTTPS failed, trying HTTP fallback: $httpUrl');
+      result = await _tryDetectAuth(httpUrl);
+      if (result != null) {
+        baseUrl = httpUrl;
      }
+    }

-      _logger.log('✗ Authentication failed: ${response.statusCode}');
-      return null;
-    } catch (e) {
-      _logger.log('✗ Login error: $e');
-      return null;
+    if (result != null) {
+      _lastSuccessfulUrl = baseUrl;
+      _logger.log('✅ Auth detection successful with URL: $baseUrl');
+    }
+
+    return result;
+  }
+
+  /// Normalize a server URL with appropriate protocol and port
+  /// For local IP addresses without an explicit port, defaults to MA port 8095
+  String _normalizeUrl(String url) {
+    var baseUrl = url.trim();
+
+    // Check if URL already has a port specified (before adding protocol)
+    // Port can be specified as host:port or after protocol as http://host:port
+    bool hasExplicitPort = _hasExplicitPort(baseUrl);
+
+    if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
+      // Use http for local IPs, https for domains
+      if (_isLocalAddress(baseUrl)) {
+        baseUrl = 'http://$baseUrl';
+      } else if (baseUrl.endsWith('.ts.net') || baseUrl.contains('.ts.net:')) {
+        // Tailscale URLs - default to http:// since VPN tunnel is already encrypted
+        baseUrl = 'http://$baseUrl';
+        _logger.log('🔗 Detected Tailscale URL, using HTTP');
+      } else {
+        baseUrl = 'https://$baseUrl';
+      }
+    }
+
+    // For local addresses without explicit port, add default MA port
+    // This handles the common case of MA as HAOS add-on where port 8095 is needed
+    if (!hasExplicitPort) {
+      final uri = Uri.parse(baseUrl);
+      if (_isLocalAddress(uri.host)) {
+        baseUrl = Uri(
+          scheme: uri.scheme,
+          host: uri.host,
+          port: NetworkConstants.defaultWsPort,
+          path: uri.path.isEmpty ? null : uri.path,
+        ).toString();
+        _logger.log('🔗 Local address without port - defaulting to MA port ${NetworkConstants.defaultWsPort}');
+      }
+    }
+
+    return baseUrl;
+  }
+
+  /// Check if a URL string has an explicit port specified
+  bool _hasExplicitPort(String url) {
+    // Remove protocol if present
+    var hostPart = url;
+    if (hostPart.startsWith('http://')) {
+      hostPart = hostPart.substring(7);
+    } else if (hostPart.startsWith('https://')) {
+      hostPart = hostPart.substring(8);
+    }
+
+    // Remove path if present
+    final pathIndex = hostPart.indexOf('/');
+    if (pathIndex != -1) {
+      hostPart = hostPart.substring(0, pathIndex);
+    }
+
+    // Check for port (host:port pattern)
+    // Need to handle IPv6 addresses like [::1]:8095
+    if (hostPart.startsWith('[')) {
+      // IPv6 address
+      final closeBracket = hostPart.indexOf(']');
+      if (closeBracket != -1 && closeBracket < hostPart.length - 1) {
+        return hostPart[closeBracket + 1] == ':';
+      }
+      return false;
+    } else {
+      // IPv4 or hostname - check for colon followed by digits
+      final colonIndex = hostPart.lastIndexOf(':');
+      if (colonIndex != -1) {
+        final portPart = hostPart.substring(colonIndex + 1);
+        return int.tryParse(portPart) != null;
+      }
+      return false;
    }
  }

-  /// Create a long-lived token for persistent authentication
-  Future<String?> _createLongLivedToken(Uri apiUrl, String accessToken) async {
-    try {
-      _logger.log('Creating long-lived token...');
+  /// Check if an address is a local/private address (without protocol)
+  bool _isLocalAddress(String address) {
+    // Remove port if present for checking
+    var host = address;
+    final colonIndex = host.lastIndexOf(':');
+    if (colonIndex != -1 && int.tryParse(host.substring(colonIndex + 1)) != null) {
+      host = host.substring(0, colonIndex);
+    }

-      final response = await http.post(
-        apiUrl,
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'Bearer $accessToken',
-        },
-        body: jsonEncode({
-          'command': 'auth/create_token',
-          'args': {
-            'name': 'Ensemble Mobile App',
-          },
-        }),
+    return host.startsWith('192.168.') ||
+        host.startsWith('192.') ||
+        host.startsWith('10.') ||
+        host.startsWith('172.') ||
+        host == 'localhost' ||
+        host.startsWith('127.') ||
+        host.endsWith('.local') ||
+        host.endsWith('.ts.net');
+  }
+
+  /// Check if a hostname is a local/private IP address
+  bool _isLocalIpAddress(String host) {
+    return host.startsWith('192.168.') ||
+        host.startsWith('10.') ||
+        host.startsWith('172.16.') ||
+        host.startsWith('172.17.') ||
+        host.startsWith('172.18.') ||
+        host.startsWith('172.19.') ||
+        host.startsWith('172.2') ||
+        host.startsWith('172.30.') ||
+        host.startsWith('172.31.') ||
+        host == 'localhost' ||
+        host.startsWith('127.') ||
+        host.endsWith('.local') ||
+        host.endsWith('.ts.net');
+  }
+
+  /// Try to detect auth strategy for a given URL
+  /// Returns the strategy if successful, null if connection failed
+  Future<AuthStrategy?> _tryDetectAuth(String baseUrl) async {
+    // First, check if this is a Music Assistant server with native auth
+    _logger.log('Checking for Music Assistant native auth at $baseUrl...');
+    final maAuthResult = await _checkMusicAssistantAuth(baseUrl);
+    if (maAuthResult != null) {
+      if (maAuthResult == 'required') {
+        _logger.log('✓ Detected Music Assistant native authentication');
+        return _strategies.firstWhere((s) => s.name == 'music_assistant');
+      } else if (maAuthResult == 'none') {
+        _logger.log('✓ Music Assistant server - no auth required');
+        return _strategies.firstWhere((s) => s.name == 'none');
+      }
+    }
+
+    // Try no-auth (direct connection without any auth)
+    _logger.log('Testing no-auth strategy...');
+    final canConnect = await _canConnectWithoutAuth(baseUrl);
+    _logger.log('No-auth result: $canConnect');
+
+    if (canConnect) {
+      _logger.log('✓ Server does not require authentication');
+      return _strategies.firstWhere((s) => s.name == 'none');
+    }
+
+    // Probe server for auth requirements (reverse proxy scenarios)
+    try {
+      _logger.log('Probing server for auth headers...');
+      // Test root endpoint
+      final probeUrl = baseUrl;
+      _logger.log('Probe URL: $probeUrl');
+
+      final response = await http.get(
+        Uri.parse(probeUrl),
      ).timeout(const Duration(seconds: 10));

-      if (response.statusCode == 200) {
-        final data = jsonDecode(response.body) as Map<String, dynamic>;
+      _logger.log('Probe status: ${response.statusCode}');

-        if (!data.containsKey('error_code')) {
-          final result = data['result'] as Map<String, dynamic>?;
-          final token = result?['token'] as String?;
+      // Check for redirect (common with reverse proxy auth)
+      if (response.statusCode == 302 || response.statusCode == 307) {
+        final location = response.headers['location'];
+        _logger.log('Redirect to: $location');

-          if (token != null) {
-            _logger.log('✓ Created long-lived token');
-            return token;
+        // If redirects to Authelia login, it's Authelia
+        if (location != null && location.contains('authelia')) {
+          _logger.log('✓ Detected Authelia (redirect)');
+          return _strategies.firstWhere((s) => s.name == 'authelia');
+        }
+      }
+
+      // Server returned 401 Unauthorized - check WWW-Authenticate header
+      if (response.statusCode == 401) {
+        final wwwAuth = response.headers['www-authenticate']?.toLowerCase();
+        _logger.log('401 with WWW-Authenticate: $wwwAuth');
+
+        // Check for Basic Auth
+        if (wwwAuth != null && wwwAuth.contains('basic')) {
+          _logger.log('✓ Detected Basic Authentication');
+          return _strategies.firstWhere((s) => s.name == 'basic');
+        }
+
+        // Check for Bearer token - could be MA native auth
+        if (wwwAuth != null && wwwAuth.contains('bearer')) {
+          _logger.log('✓ Detected Bearer auth - likely Music Assistant native');
+          return _strategies.firstWhere((s) => s.name == 'music_assistant');
+        }
+      }
+
+      // If we got here and there's any auth challenge, assume Authelia
+      // (since we're behind a reverse proxy that requires auth)
+      if (response.statusCode >= 300) {
+        _logger.log('Server requires authentication (status ${response.statusCode})');
+        _logger.log('Assuming Authelia (default for authenticated reverse proxy)');
+        return _strategies.firstWhere((s) => s.name == 'authelia');
+      }
+    } catch (e) {
+      _logger.log('✗ Auth detection error: $e');
+      return null; // Return null to trigger fallback
+    }
+
+    _logger.log('⚠️ Could not determine auth method');
+    return null;
+  }
+
+  /// Check if server is a Music Assistant server with native auth
+  /// Returns 'required' if auth needed, 'none' if no auth, null if not MA or error
+  Future<String?> _checkMusicAssistantAuth(String baseUrl) async {
+    try {
+      final uri = Uri.parse(baseUrl);
+      // Use the port from URL if specified, otherwise use default ports (80/443)
+      // Don't default to 8095 here - that's only for direct connections without reverse proxy
+      final apiUrl = Uri(
+        scheme: uri.scheme,
+        host: uri.host,
+        port: uri.hasPort ? uri.port : null,
+        path: '/api',
+      );
+
+      _logger.log('Checking MA API at: $apiUrl');
+
+      // Use IOClient to control redirect behavior for local IPs
+      final isLocalIp = _isLocalIpAddress(uri.host);
+      http.Response response;
+
+      if (isLocalIp) {
+        // For local IPs, don't follow redirects - handle them explicitly
+        final client = HttpClient();
+        try {
+          final request = await client.postUrl(apiUrl);
+          request.followRedirects = false;
+          request.headers.set('Content-Type', 'application/json');
+          request.write(jsonEncode({'command': 'info'}));
+          final ioResponse = await request.close().timeout(const Duration(seconds: 5));
+
+          // Check for redirect to HTTPS
+          if (ioResponse.statusCode == 308 || ioResponse.statusCode == 301 || ioResponse.statusCode == 302) {
+            final location = ioResponse.headers.value('location');
+            _logger.log('Local IP redirects to: $location');
+            if (location != null && location.startsWith('https://')) {
+              _logger.log('⚠️ Server redirects HTTP to HTTPS - this may cause certificate issues for local IP');
+              // Don't follow the redirect - it will likely fail with cert error
+              // Instead, return null to trigger fallback logic
+              client.close();
+              return null;
+            }
          }
+
+          final body = await ioResponse.transform(utf8.decoder).join();
+          response = http.Response(body, ioResponse.statusCode);
+          client.close();
+        } catch (e) {
+          client.close();
+          rethrow;
        }
+      } else {
+        // For non-local URLs, use standard http.post which follows redirects
+        response = await http.post(
+          apiUrl,
+          headers: {'Content-Type': 'application/json'},
+          body: jsonEncode({
+            'command': 'info',
+          }),
+        ).timeout(const Duration(seconds: 5));
      }

-      _logger.log('⚠️ Could not create long-lived token (non-fatal)');
-      return null;
-    } catch (e) {
-      _logger.log('⚠️ Long-lived token creation failed: $e (non-fatal)');
-      return null;
-    }
-  }
+      _logger.log('MA API response: ${response.statusCode}');
+      _logger.log('MA API body: ${response.body}');

-  /// Validate a stored token
-  Future<bool> validateToken(String serverUrl, String storedToken) async {
-    try {
-      final apiUrl = _buildApiUrl(serverUrl);
+      // 401/403 means auth required - check this first
+      if (response.statusCode == 401 || response.statusCode == 403) {
+        _logger.log('MA API returned ${response.statusCode} - auth required');
+        return 'required';
+      }

-      final response = await http.post(
-        apiUrl,
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'Bearer $storedToken',
-        },
-        body: jsonEncode({
-          'command': 'server/info',
-        }),
-      ).timeout(const Duration(seconds: 5));
+      // Also check for "Authentication required" text response
+      if (response.body.toLowerCase().contains('authentication required')) {
+        _logger.log('MA API returned auth required message');
+        return 'required';
+      }

      if (response.statusCode == 200) {
-        final data = jsonDecode(response.body) as Map<String, dynamic>;
-        if (!data.containsKey('error_code')) {
-          _longLivedToken = storedToken;
-          return true;
+        // Try to parse as JSON
+        try {
+          final data = jsonDecode(response.body) as Map<String, dynamic>;
+
+          // Check if we got server info successfully (no auth required)
+          if (data.containsKey('result')) {
+            final result = data['result'] as Map<String, dynamic>?;
+            final serverVersion = result?['server_version'] as String?;
+            final schemaVersion = result?['schema_version'] as int?;
+
+            if (serverVersion != null) {
+              _logger.log('MA server version: $serverVersion, schema: $schemaVersion');
+
+              // Schema 28+ requires auth, but if we got here without auth, it's not enabled
+              return 'none';
+            }
+          }
+
+          // Check for auth error in JSON
+          if (data.containsKey('error_code')) {
+            final errorCode = data['error_code'] as int?;
+            // Error 50 = AuthenticationRequired
+            if (errorCode == 50) {
+              _logger.log('MA server requires authentication (error 50)');
+              return 'required';
+            }
+          }
+        } catch (jsonError) {
+          _logger.log('MA API response not JSON: $jsonError');
        }
      }

+      return null;
+    } catch (e) {
+      _logger.log('MA auth check error: $e');
+      return null;
+    }
+  }
+
+  /// Test if server is accessible without authentication
+  Future<bool> _canConnectWithoutAuth(String serverUrl) async {
+    try {
+      final uri = Uri.parse(serverUrl);
+      _logger.log('No-auth test URL: $serverUrl');
+
+      final isLocalIp = _isLocalIpAddress(uri.host);
+      int statusCode;
+
+      if (isLocalIp) {
+        // For local IPs, don't follow redirects to avoid HTTPS cert issues
+        final client = HttpClient();
+        try {
+          final request = await client.getUrl(uri);
+          request.followRedirects = false;
+          final response = await request.close().timeout(const Duration(seconds: 10));
+          statusCode = response.statusCode;
+
+          // Check for redirect to HTTPS
+          if (statusCode == 308 || statusCode == 301 || statusCode == 302) {
+            final location = response.headers.value('location');
+            if (location != null && location.startsWith('https://')) {
+              _logger.log('⚠️ Local IP redirects to HTTPS: $location');
+              client.close();
+              return false; // Can't connect - would need HTTPS which has cert issues
+            }
+          }
+          client.close();
+        } catch (e) {
+          client.close();
+          rethrow;
+        }
+      } else {
+        // For non-local URLs, use standard http.get
+        final response = await http.get(uri).timeout(const Duration(seconds: 10));
+        statusCode = response.statusCode;
+      }
+
+      _logger.log('No-auth status: $statusCode');
+
+      // 200 = no auth required
+      // 302/307/308 = redirect (probably to auth or HTTPS)
+      // 401 = auth required
+      if (statusCode == 200) {
+        return true;
+      }
+
      return false;
    } catch (e) {
-      _logger.log('Token validation failed: $e');
+      _logger.log('No-auth error: $e');
      return false;
    }
  }

-  /// Build headers for WebSocket connection
+  /// Attempt login with specified strategy
+  /// Returns true if login successful and credentials stored
+  /// authServerUrl is optional - only used for Authelia when auth is on a different domain
+  Future<bool> login(
+    String serverUrl,
+    String username,
+    String password,
+    AuthStrategy strategy, {
+    String? authServerUrl,
+  }) async {
+    _logger.log('Attempting login with ${strategy.name} strategy');
+
+    // Use auth server URL if provided, otherwise use main server URL
+    final loginUrl = authServerUrl?.isNotEmpty == true ? authServerUrl! : serverUrl;
+    _logger.log('Login URL: $loginUrl');
+
+    final credentials = await strategy.login(loginUrl, username, password);
+
+    if (credentials != null) {
+      _currentStrategy = strategy;
+      _currentCredentials = credentials;
+      _logger.log('✓ Login successful with ${strategy.name}');
+      return true;
+    }
+
+    _logger.log('✗ Login failed with ${strategy.name}');
+    return false;
+  }
+
+  /// Validate current credentials are still valid
+  Future<bool> validateCurrentCredentials(String serverUrl) async {
+    if (_currentStrategy == null || _currentCredentials == null) {
+      return false;
+    }
+
+    return await _currentStrategy!.validateCredentials(
+      serverUrl,
+      _currentCredentials!,
+    );
+  }
+
+  /// Get WebSocket connection headers for current credentials
  Map<String, dynamic> getWebSocketHeaders() {
-    if (token != null) {
-      return {'Authorization': 'Bearer $token'};
+    if (_currentStrategy == null || _currentCredentials == null) {
+      return {};
    }
-    return {};
+
+    return _currentStrategy!.buildWebSocketHeaders(_currentCredentials!);
  }

-  /// Build headers for HTTP streaming requests
+  /// Get HTTP streaming headers for current credentials
  Map<String, String> getStreamingHeaders() {
-    if (token != null) {
-      return {'Authorization': 'Bearer $token'};
+    if (_currentStrategy == null || _currentCredentials == null) {
+      return {};
    }
-    return {};
+
+    return _currentStrategy!.buildStreamingHeaders(_currentCredentials!);
  }

-  /// Set token from external source (e.g., restored from settings)
-  void setToken(String? storedToken) {
-    _longLivedToken = storedToken;
+  /// Serialize current credentials for persistent storage
+  Map<String, dynamic>? serializeCredentials() {
+    if (_currentStrategy == null || _currentCredentials == null) {
+      return null;
+    }
+
+    return {
+      'strategy': _currentStrategy!.name,
+      'data': _currentStrategy!.serializeCredentials(_currentCredentials!),
+    };
  }

-  /// Clear authentication state
+  /// Deserialize and restore credentials from persistent storage
+  void deserializeCredentials(Map<String, dynamic> stored) {
+    final strategyName = stored['strategy'] as String?;
+    final data = stored['data'] as Map<String, dynamic>?;
+
+    if (strategyName == null || data == null) {
+      return;
+    }
+
+    // Find matching strategy
+    try {
+      final strategy = _strategies.firstWhere((s) => s.name == strategyName);
+      _currentStrategy = strategy;
+      _currentCredentials = strategy.deserializeCredentials(data);
+      _logger.log('✓ Restored ${strategy.name} credentials from storage');
+    } catch (e) {
+      _logger.log('✗ Could not restore credentials: $e');
+    }
+  }
+
+  /// Clear current authentication state
  void logout() {
-    _accessToken = null;
-    _longLivedToken = null;
+    _currentStrategy = null;
+    _currentCredentials = null;
    _logger.log('Logged out - cleared auth state');
  }

-  /// Build API URL from server URL
-  Uri _buildApiUrl(String serverUrl) {
-    var baseUrl = serverUrl;
-    if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
-      baseUrl = 'http://$baseUrl';
+  /// Get strategy by name (for manual selection)
+  AuthStrategy? getStrategyByName(String name) {
+    try {
+      return _strategies.firstWhere((s) => s.name == name);
+    } catch (e) {
+      return null;
    }
-
-    final uri = Uri.parse(baseUrl);
-    return Uri(
-      scheme: uri.scheme,
-      host: uri.host,
-      port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095),
-      path: '/api',
-    );
  }
 }
@@ -0,0 +1,42 @@
+/// Authentication credentials container
+class AuthCredentials {
+  final String strategyName;
+  final Map<String, dynamic> data;
+
+  AuthCredentials(this.strategyName, this.data);
+}
+
+/// Abstract authentication strategy interface
+/// Implementations handle different auth methods (none, basic, Authelia, HA, etc.)
+abstract class AuthStrategy {
+  /// Strategy name identifier (e.g., 'none', 'basic', 'authelia')
+  String get name;
+
+  /// Attempt login and return auth credentials/token
+  /// Returns null if login fails
+  Future<AuthCredentials?> login(
+    String serverUrl,
+    String username,
+    String password,
+  );
+
+  /// Test if current credentials are still valid
+  Future<bool> validateCredentials(
+    String serverUrl,
+    AuthCredentials credentials,
+  );
+
+  /// Build headers for WebSocket connection
+  /// Example: {'Authorization': 'Basic xyz'} or {'Cookie': 'session=abc'}
+  Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials);
+
+  /// Build headers for HTTP streaming requests
+  /// Example: {'Authorization': 'Basic xyz'}
+  Map<String, String> buildStreamingHeaders(AuthCredentials credentials);
+
+  /// Serialize credentials for persistent storage
+  Map<String, dynamic> serializeCredentials(AuthCredentials credentials);
+
+  /// Deserialize credentials from persistent storage
+  AuthCredentials deserializeCredentials(Map<String, dynamic> data);
+}
@@ -0,0 +1,172 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import 'auth_strategy.dart';
+import '../debug_logger.dart';
+
+/// Authelia authentication strategy
+/// Used when Music Assistant is behind Authelia reverse proxy authentication
+/// Authelia-specific endpoints: /api/firstfactor, /api/verify
+class AutheliaStrategy implements AuthStrategy {
+  final _logger = DebugLogger();
+
+  @override
+  String get name => 'authelia';
+
+  @override
+  Future<AuthCredentials?> login(
+    String serverUrl,
+    String username,
+    String password,
+  ) async {
+    try {
+      // Normalize server URL
+      var baseUrl = serverUrl;
+      if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
+        baseUrl = 'https://$baseUrl';
+      }
+
+      _logger.log('🔐 Attempting Authelia login to $baseUrl');
+
+      // Parse URL and construct Authelia firstfactor endpoint
+      final uri = Uri.parse(baseUrl);
+      final authUrl = Uri(
+        scheme: uri.scheme,
+        host: uri.host,
+        port: uri.hasPort ? uri.port : null,
+        path: '/api/firstfactor',
+      );
+
+      _logger.log('Auth URL: $authUrl');
+
+      // POST to Authelia's firstfactor endpoint
+      final response = await http.post(
+        authUrl,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: jsonEncode({
+          'username': username,
+          'password': password,
+          'keepMeLoggedIn': true,
+        }),
+      ).timeout(const Duration(seconds: 10));
+
+      _logger.log('Auth response status: ${response.statusCode}');
+
+      // Check for successful authentication
+      if (response.statusCode == 200) {
+        _logger.log('✓ Authentication successful');
+
+        // Extract session cookie from Set-Cookie header
+        final cookies = response.headers['set-cookie'];
+        if (cookies != null && cookies.isNotEmpty) {
+          _logger.log('✓ Received session cookie');
+
+          final sessionCookie = _extractSessionCookie(cookies);
+          if (sessionCookie != null) {
+            _logger.log('✓ Extracted session cookie');
+            return AuthCredentials('authelia', {
+              'session_cookie': sessionCookie,
+              'username': username,
+            });
+          }
+        }
+
+        // If 200 but no cookie, something is wrong
+        _logger.log('✗ No session cookie in response');
+        return null;
+      }
+
+      _logger.log('✗ Authentication failed: ${response.statusCode}');
+      _logger.log('Response body: ${response.body}');
+      return null;
+    } catch (e) {
+      _logger.log('✗ Login error: $e');
+      return null;
+    }
+  }
+
+  @override
+  Future<bool> validateCredentials(
+    String serverUrl,
+    AuthCredentials credentials,
+  ) async {
+    final sessionCookie = credentials.data['session_cookie'] as String?;
+    if (sessionCookie == null) return false;
+
+    try {
+      // Normalize server URL
+      var baseUrl = serverUrl;
+      if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
+        baseUrl = 'https://$baseUrl';
+      }
+
+      // Parse URL and construct Authelia verify endpoint
+      final uri = Uri.parse(baseUrl);
+      final verifyUrl = Uri(
+        scheme: uri.scheme,
+        host: uri.host,
+        port: uri.hasPort ? uri.port : null,
+        path: '/api/verify',
+      );
+
+      final response = await http.get(
+        verifyUrl,
+        headers: {
+          'Cookie': 'authelia_session=$sessionCookie',
+        },
+      ).timeout(const Duration(seconds: 5));
+
+      return response.statusCode == 200;
+    } catch (e) {
+      _logger.log('Auth validation failed: $e');
+      return false;
+    }
+  }
+
+  @override
+  Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
+    final sessionCookie = credentials.data['session_cookie'] as String;
+    return {
+      'Cookie': 'authelia_session=$sessionCookie',
+    };
+  }
+
+  @override
+  Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
+    final sessionCookie = credentials.data['session_cookie'] as String;
+    return {
+      'Cookie': 'authelia_session=$sessionCookie',
+    };
+  }
+
+  @override
+  Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
+    return credentials.data;
+  }
+
+  @override
+  AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
+    return AuthCredentials('authelia', data);
+  }
+
+  /// Extract authelia_session cookie value from Set-Cookie header
+  /// Migrated from auth_service.dart:81-98
+  String? _extractSessionCookie(String setCookieHeader) {
+    final cookies = setCookieHeader.split(',');
+
+    for (final cookie in cookies) {
+      if (cookie.trim().startsWith('authelia_session=')) {
+        final parts = cookie.split(';');
+        if (parts.isNotEmpty) {
+          final value = parts[0].trim();
+          if (value.startsWith('authelia_session=')) {
+            return value.substring('authelia_session='.length);
+          }
+        }
+      }
+    }
+
+    return null;
+  }
+}
@@ -0,0 +1,82 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import 'auth_strategy.dart';
+
+/// Basic HTTP Authentication strategy
+/// Used by reverse proxies (nginx, Apache, Caddy, etc.) configured with basic auth
+/// Example: Authorization: Basic base64(username:password)
+class BasicAuthStrategy implements AuthStrategy {
+  @override
+  String get name => 'basic';
+
+  @override
+  Future<AuthCredentials?> login(
+    String serverUrl,
+    String username,
+    String password,
+  ) async {
+    // Encode credentials to base64
+    final credentials = base64Encode(utf8.encode('$username:$password'));
+
+    // Test credentials against server root endpoint
+    // (Music Assistant doesn't have /api/info)
+    try {
+      final response = await http.get(
+        Uri.parse(serverUrl),
+        headers: {'Authorization': 'Basic $credentials'},
+      ).timeout(const Duration(seconds: 5));
+
+      if (response.statusCode == 200) {
+        return AuthCredentials('basic', {
+          'credentials': credentials,
+          'username': username, // Store for re-login if needed
+        });
+      }
+    } catch (e) {
+      return null;
+    }
+    return null;
+  }
+
+  @override
+  Future<bool> validateCredentials(
+    String serverUrl,
+    AuthCredentials credentials,
+  ) async {
+    final base64Creds = credentials.data['credentials'] as String?;
+    if (base64Creds == null) return false;
+
+    try {
+      final response = await http.get(
+        Uri.parse(serverUrl),
+        headers: {'Authorization': 'Basic $base64Creds'},
+      ).timeout(const Duration(seconds: 5));
+
+      return response.statusCode == 200;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  @override
+  Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
+    final base64Creds = credentials.data['credentials'] as String;
+    return {'Authorization': 'Basic $base64Creds'};
+  }
+
+  @override
+  Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
+    final base64Creds = credentials.data['credentials'] as String;
+    return {'Authorization': 'Basic $base64Creds'};
+  }
+
+  @override
+  Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
+    return credentials.data;
+  }
+
+  @override
+  AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
+    return AuthCredentials('basic', data);
+  }
+}
@@ -0,0 +1,254 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import 'auth_strategy.dart';
+import '../debug_logger.dart';
+
+/// Music Assistant native authentication strategy
+/// Used when MA server has built-in authentication enabled (schema 28+)
+///
+/// Flow:
+/// 1. Connect WebSocket (receives server_info with auth requirements)
+/// 2. If auth required, login with username/password to get access token
+/// 3. Send 'auth' command with token to authenticate the session
+/// 4. Optionally create long-lived token for persistent storage
+class MusicAssistantAuthStrategy implements AuthStrategy {
+  final _logger = DebugLogger();
+
+  @override
+  String get name => 'music_assistant';
+
+  /// Login to Music Assistant and get an access token
+  /// This is called AFTER WebSocket connection is established
+  /// Returns credentials containing the access token
+  @override
+  Future<AuthCredentials?> login(
+    String serverUrl,
+    String username,
+    String password,
+  ) async {
+    try {
+      // Normalize server URL
+      var baseUrl = serverUrl;
+      if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
+        // Determine protocol based on URL pattern
+        if (baseUrl.startsWith('192.') ||
+            baseUrl.startsWith('10.') ||
+            baseUrl.startsWith('172.') ||
+            baseUrl == 'localhost' ||
+            baseUrl.startsWith('127.')) {
+          baseUrl = 'http://$baseUrl';
+        } else {
+          baseUrl = 'https://$baseUrl';
+        }
+      }
+
+      _logger.log('🔐 Attempting Music Assistant login to $baseUrl');
+
+      // MA auth endpoint - POST /api with JSON-RPC style command
+      final uri = Uri.parse(baseUrl);
+      final apiUrl = Uri(
+        scheme: uri.scheme,
+        host: uri.host,
+        port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095),
+        path: '/api',
+      );
+
+      _logger.log('Auth API URL: $apiUrl');
+
+      // Login request to get access token
+      final response = await http.post(
+        apiUrl,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: jsonEncode({
+          'command': 'auth/login',
+          'args': {
+            'username': username,
+            'password': password,
+          },
+        }),
+      ).timeout(const Duration(seconds: 10));
+
+      _logger.log('Auth response status: ${response.statusCode}');
+
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body) as Map<String, dynamic>;
+
+        // Check for error in response
+        if (data.containsKey('error_code')) {
+          _logger.log('✗ Login failed: ${data['error_code']} - ${data['details']}');
+          return null;
+        }
+
+        // Extract access token from result
+        final result = data['result'] as Map<String, dynamic>?;
+        final accessToken = result?['access_token'] as String?;
+
+        if (accessToken != null) {
+          _logger.log('✓ Got access token from MA');
+
+          // Now try to create a long-lived token for persistent auth
+          final longLivedToken = await _createLongLivedToken(apiUrl, accessToken);
+
+          return AuthCredentials('music_assistant', {
+            'access_token': accessToken,
+            'long_lived_token': longLivedToken,
+            'username': username,
+            'server_url': baseUrl,
+          });
+        }
+
+        _logger.log('✗ No access token in response');
+        return null;
+      }
+
+      _logger.log('✗ Authentication failed: ${response.statusCode}');
+      _logger.log('Response body: ${response.body}');
+      return null;
+    } catch (e) {
+      _logger.log('✗ Login error: $e');
+      return null;
+    }
+  }
+
+  /// Create a long-lived token for persistent authentication
+  Future<String?> _createLongLivedToken(Uri apiUrl, String accessToken) async {
+    try {
+      _logger.log('Creating long-lived token...');
+
+      final response = await http.post(
+        apiUrl,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer $accessToken',
+        },
+        body: jsonEncode({
+          'command': 'auth/create_token',
+          'args': {
+            'name': 'Ensemble Mobile App',
+          },
+        }),
+      ).timeout(const Duration(seconds: 10));
+
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body) as Map<String, dynamic>;
+
+        if (!data.containsKey('error_code')) {
+          final result = data['result'] as Map<String, dynamic>?;
+          final token = result?['token'] as String?;
+
+          if (token != null) {
+            _logger.log('✓ Created long-lived token');
+            return token;
+          }
+        }
+      }
+
+      _logger.log('⚠️ Could not create long-lived token (non-fatal)');
+      return null;
+    } catch (e) {
+      _logger.log('⚠️ Long-lived token creation failed: $e (non-fatal)');
+      return null;
+    }
+  }
+
+  @override
+  Future<bool> validateCredentials(
+    String serverUrl,
+    AuthCredentials credentials,
+  ) async {
+    // Try long-lived token first, then access token
+    final longLivedToken = credentials.data['long_lived_token'] as String?;
+    final accessToken = credentials.data['access_token'] as String?;
+
+    final token = longLivedToken ?? accessToken;
+    if (token == null) return false;
+
+    try {
+      var baseUrl = serverUrl;
+      if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
+        baseUrl = 'https://$baseUrl';
+      }
+
+      final uri = Uri.parse(baseUrl);
+      final apiUrl = Uri(
+        scheme: uri.scheme,
+        host: uri.host,
+        port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095),
+        path: '/api',
+      );
+
+      // Test token by getting server info
+      final response = await http.post(
+        apiUrl,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer $token',
+        },
+        body: jsonEncode({
+          'command': 'server/info',
+        }),
+      ).timeout(const Duration(seconds: 5));
+
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body) as Map<String, dynamic>;
+        return !data.containsKey('error_code');
+      }
+
+      return false;
+    } catch (e) {
+      _logger.log('Token validation failed: $e');
+      return false;
+    }
+  }
+
+  @override
+  Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
+    // MA auth happens AFTER WebSocket connection, not via headers
+    // But we can still include token if available for initial handshake
+    final longLivedToken = credentials.data['long_lived_token'] as String?;
+    final accessToken = credentials.data['access_token'] as String?;
+
+    final token = longLivedToken ?? accessToken;
+    if (token != null) {
+      return {
+        'Authorization': 'Bearer $token',
+      };
+    }
+
+    return {};
+  }
+
+  @override
+  Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
+    final longLivedToken = credentials.data['long_lived_token'] as String?;
+    final accessToken = credentials.data['access_token'] as String?;
+
+    final token = longLivedToken ?? accessToken;
+    if (token != null) {
+      return {
+        'Authorization': 'Bearer $token',
+      };
+    }
+
+    return {};
+  }
+
+  @override
+  Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
+    return credentials.data;
+  }
+
+  @override
+  AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
+    return AuthCredentials('music_assistant', data);
+  }
+
+  /// Get the best available token (prefer long-lived)
+  String? getToken(AuthCredentials credentials) {
+    final longLivedToken = credentials.data['long_lived_token'] as String?;
+    final accessToken = credentials.data['access_token'] as String?;
+    return longLivedToken ?? accessToken;
+  }
+}
@@ -0,0 +1,64 @@
+import 'package:http/http.dart' as http;
+import 'auth_strategy.dart';
+
+/// No authentication strategy for open Music Assistant servers
+/// Typical scenarios:
+/// - Local network deployment (http://192.168.1.100:8095)
+/// - Home network without reverse proxy
+/// - Development servers
+class NoAuthStrategy implements AuthStrategy {
+  @override
+  String get name => 'none';
+
+  @override
+  Future<AuthCredentials?> login(
+    String serverUrl,
+    String username,
+    String password,
+  ) async {
+    // No authentication required - just test server connectivity
+    try {
+      final response = await http.get(
+        Uri.parse('$serverUrl/api/info'),
+      ).timeout(const Duration(seconds: 5));
+
+      if (response.statusCode == 200) {
+        return AuthCredentials('none', {});
+      }
+    } catch (e) {
+      return null;
+    }
+    return null;
+  }
+
+  @override
+  Future<bool> validateCredentials(
+    String serverUrl,
+    AuthCredentials credentials,
+  ) async {
+    // Always valid for no-auth
+    return true;
+  }
+
+  @override
+  Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
+    // No auth headers needed
+    return {};
+  }
+
+  @override
+  Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
+    // No auth headers needed
+    return {};
+  }
+
+  @override
+  Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
+    return {};
+  }
+
+  @override
+  AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
+    return AuthCredentials('none', {});
+  }
+}
@@ -1,7 +1,6 @@
 import 'dart:convert';
 import '../models/media_item.dart';
 import '../models/player.dart';
-import '../models/recommendation_folder.dart';
 import '../services/debug_logger.dart';
 import '../services/database_service.dart';
 import '../constants/timings.dart';
@@ -11,7 +10,6 @@ import '../constants/timings.dart';
 class CacheService {
  final DebugLogger _logger = DebugLogger();
  bool _homeRowsLoaded = false;
-  Future<void>? _homeRowsLoadFuture;

  // Cache size limits to prevent unbounded memory growth
  static const int _maxDetailCacheSize = 50; // Max albums/playlists/artists cached
@@ -22,14 +20,12 @@ class CacheService {
  List<Album>? _cachedRecentAlbums;
  List<Artist>? _cachedDiscoverArtists;
  List<Album>? _cachedDiscoverAlbums;
-  List<RecommendationFolder>? _cachedDiscoveryFolders;
  List<Audiobook>? _cachedInProgressAudiobooks;
  List<Audiobook>? _cachedDiscoverAudiobooks;
  List<AudiobookSeries>? _cachedDiscoverSeries;
  DateTime? _recentAlbumsLastFetched;
  DateTime? _discoverArtistsLastFetched;
  DateTime? _discoverAlbumsLastFetched;
-  DateTime? _discoveryFoldersLastFetched;
  DateTime? _inProgressAudiobooksLastFetched;
  DateTime? _discoverAudiobooksLastFetched;
  DateTime? _discoverSeriesLastFetched;
@@ -59,14 +55,6 @@ class CacheService {
  // HOME SCREEN ROW CACHING
  // ============================================================================

-  /// Ensure home rows are loaded from database before accessing cache
-  /// This ensures the cache is populated on first access if not already loaded
-  Future<void> ensureHomeRowsLoaded() async {
-    if (!_homeRowsLoaded) {
-      await loadHomeRowsFromDatabase();
-    }
-  }
-
  /// Check if recent albums cache is valid
  bool isRecentAlbumsCacheValid({bool forceRefresh = false}) {
    if (forceRefresh) return false;
@@ -81,11 +69,6 @@ class CacheService {

  /// Set cached recent albums
  void setCachedRecentAlbums(List<Album> albums) {
-    // Don't cache empty results (prevents persisting "not authenticated" errors)
-    if (albums.isEmpty) {
-      _logger.log('⚠️ Not caching empty recent albums result');
-      return;
-    }
    _cachedRecentAlbums = albums;
    _recentAlbumsLastFetched = DateTime.now();
    _logger.log('✅ Cached ${albums.length} recent albums');
@@ -107,11 +90,6 @@ class CacheService {

  /// Set cached discover artists
  void setCachedDiscoverArtists(List<Artist> artists) {
-    // Don't cache empty results (prevents persisting "not authenticated" errors)
-    if (artists.isEmpty) {
-      _logger.log('⚠️ Not caching empty discover artists result');
-      return;
-    }
    _cachedDiscoverArtists = artists;
    _discoverArtistsLastFetched = DateTime.now();
    _logger.log('✅ Cached ${artists.length} discover artists');
@@ -133,11 +111,6 @@ class CacheService {

  /// Set cached discover albums
  void setCachedDiscoverAlbums(List<Album> albums) {
-    // Don't cache empty results (prevents persisting "not authenticated" errors)
-    if (albums.isEmpty) {
-      _logger.log('⚠️ Not caching empty discover albums result');
-      return;
-    }
    _cachedDiscoverAlbums = albums;
    _discoverAlbumsLastFetched = DateTime.now();
    _logger.log('✅ Cached ${albums.length} discover albums');
@@ -145,32 +118,6 @@ class CacheService {
    _persistHomeRowToDatabase('discover_albums', albums.map((a) => a.toJson()).toList());
  }

-  /// Check if discovery folders cache is valid
-  bool isDiscoveryFoldersCacheValid({bool forceRefresh = false}) {
-    if (forceRefresh) return false;
-    final now = DateTime.now();
-    return _cachedDiscoveryFolders != null &&
-        _discoveryFoldersLastFetched != null &&
-        now.difference(_discoveryFoldersLastFetched!) < Timings.homeRowCacheDuration;
-  }
-
-  /// Get cached discovery folders
-  List<RecommendationFolder>? getCachedDiscoveryFolders() => _cachedDiscoveryFolders;
-
-  /// Set cached discovery folders
-  void setCachedDiscoveryFolders(List<RecommendationFolder> folders) {
-    // Don't cache empty results (prevents persisting "not authenticated" errors)
-    if (folders.isEmpty) {
-      _logger.log('⚠️ Not caching empty discovery folders result');
-      return;
-    }
-    _cachedDiscoveryFolders = folders;
-    _discoveryFoldersLastFetched = DateTime.now();
-    _logger.log('✅ Cached ${folders.length} discovery folders');
-    // Persist to database for instant load on next launch
-    _persistHomeRowToDatabase('discovery_folders', folders.map((f) => f.toJson()).toList());
-  }
-
  /// Check if in-progress audiobooks cache is valid
  bool isInProgressAudiobooksCacheValid({bool forceRefresh = false}) {
    if (forceRefresh) return false;
@@ -185,11 +132,6 @@ class CacheService {

  /// Set cached in-progress audiobooks
  void setCachedInProgressAudiobooks(List<Audiobook> audiobooks) {
-    // Don't cache empty results
-    if (audiobooks.isEmpty) {
-      _logger.log('⚠️ Not caching empty in-progress audiobooks result');
-      return;
-    }
    _cachedInProgressAudiobooks = audiobooks;
    _inProgressAudiobooksLastFetched = DateTime.now();
    _logger.log('✅ Cached ${audiobooks.length} in-progress audiobooks');
@@ -209,11 +151,6 @@ class CacheService {

  /// Set cached discover audiobooks
  void setCachedDiscoverAudiobooks(List<Audiobook> audiobooks) {
-    // Don't cache empty results
-    if (audiobooks.isEmpty) {
-      _logger.log('⚠️ Not caching empty discover audiobooks result');
-      return;
-    }
    _cachedDiscoverAudiobooks = audiobooks;
    _discoverAudiobooksLastFetched = DateTime.now();
    _logger.log('✅ Cached ${audiobooks.length} discover audiobooks');
@@ -233,11 +170,6 @@ class CacheService {

  /// Set cached discover series
  void setCachedDiscoverSeries(List<AudiobookSeries> series) {
-    // Don't cache empty results
-    if (series.isEmpty) {
-      _logger.log('⚠️ Not caching empty discover series result');
-      return;
-    }
    _cachedDiscoverSeries = series;
    _discoverSeriesLastFetched = DateTime.now();
    _logger.log('✅ Cached ${series.length} discover series');
@@ -259,7 +191,6 @@ class CacheService {
    _recentAlbumsLastFetched = null;
    _discoverArtistsLastFetched = null;
    _discoverAlbumsLastFetched = null;
-    _discoveryFoldersLastFetched = null;
    _inProgressAudiobooksLastFetched = null;
    _discoverAudiobooksLastFetched = null;
    _discoverSeriesLastFetched = null;
@@ -517,22 +448,10 @@ class CacheService {
  // ============================================================================

  /// Load home row data from database for instant display on startup
-  /// Returns the existing future if already loading, to prevent duplicate loads
  Future<void> loadHomeRowsFromDatabase() async {
-    if (_homeRowsLoadFuture != null) {
-      // Already loading, return the existing future
-      return _homeRowsLoadFuture!;
-    }
    if (_homeRowsLoaded) return;
+    _homeRowsLoaded = true;

-    // Create the load future
-    _homeRowsLoadFuture = _doLoadHomeRowsFromDatabase();
-    await _homeRowsLoadFuture;
-    _homeRowsLoadFuture = null; // Clear after completion
-  }
-
-  /// Internal implementation of home row loading
-  Future<void> _doLoadHomeRowsFromDatabase() async {
    try {
      if (!DatabaseService.instance.isInitialized) return;

@@ -580,25 +499,8 @@ class CacheService {
          _logger.log('⚠️ Failed to parse discover albums: $e');
        }
      }
-
-      // Load discovery folders
-      final foldersData = await DatabaseService.instance.getHomeRowCache('discovery_folders');
-      if (foldersData != null) {
-        try {
-          final items = (jsonDecode(foldersData.itemsJson) as List)
-              .map((json) => RecommendationFolder.fromJson(json as Map<String, dynamic>))
-              .toList();
-          _cachedDiscoveryFolders = items;
-          _discoveryFoldersLastFetched = foldersData.lastUpdated;
-          _logger.log('📦 Loaded ${items.length} discovery folders from database');
-        } catch (e) {
-          _logger.log('⚠️ Failed to parse discovery folders: $e');
-        }
-      }
    } catch (e) {
      _logger.log('⚠️ Error loading home rows from database: $e');
-    } finally {
-      _homeRowsLoaded = true;
    }
  }

@@ -193,33 +193,6 @@ class DatabaseService {
    return db.markItemsDeleted(itemType, [itemId]);
  }

-  /// Mark a cached item as deleted by searching for library ID in the data
-  /// This handles cases where itemId is different from library ID
-  Future<void> markCachedItemDeletedByLibraryId(String itemType, String libraryId) async {
-    // First try direct match (for provider=library items)
-    await db.markItemsDeleted(itemType, [libraryId]);
-
-    // Also search through cached items to find any with matching library mapping
-    final items = await db.getCachedItems(itemType);
-    for (final item in items) {
-      try {
-        // Check if this item's data contains a library mapping with this ID
-        if (item.data.contains('"provider_instance":"library"') &&
-            item.data.contains('"item_id":"$libraryId"')) {
-          // Found a match - extract the actual cache key's itemId
-          final cacheKey = item.cacheKey;
-          final parts = cacheKey.split('_');
-          if (parts.length >= 2) {
-            final actualItemId = parts.sublist(1).join('_');
-            await db.markItemsDeleted(itemType, [actualItemId]);
-          }
-        }
-      } catch (_) {
-        // Ignore parse errors, continue checking other items
-      }
-    }
-  }
-
  /// Batch cache multiple items efficiently
  /// Uses drift's batch API for much better performance on large datasets.
  /// Items are automatically chunked into batches of 500.
@@ -7,6 +7,9 @@ enum ErrorType {
  network,
  playback,
  library,
+  remote,       // Remote connection (WebRTC) errors
+  dataChannel,  // WebRTC data channel errors
+  signaling,    // WebRTC signaling server errors
  unknown,
 }

@@ -107,6 +110,41 @@ class ErrorHandler {
      );
    }

+    // WebRTC/Remote connection errors
+    if (errorStr.contains('webrtc') ||
+        errorStr.contains('remote peer') ||
+        errorStr.contains('remote server disconnected')) {
+      return ErrorInfo(
+        type: ErrorType.remote,
+        userMessage: 'Remote connection lost. Attempting to reconnect...',
+        technicalMessage: error.toString(),
+        canRetry: true,
+      );
+    }
+
+    // Data channel errors
+    if (errorStr.contains('data channel') ||
+        errorStr.contains('datachannel')) {
+      return ErrorInfo(
+        type: ErrorType.dataChannel,
+        userMessage: 'Remote data connection failed. Please try reconnecting.',
+        technicalMessage: error.toString(),
+        canRetry: true,
+      );
+    }
+
+    // Signaling errors
+    if (errorStr.contains('signaling') ||
+        errorStr.contains('ice') ||
+        errorStr.contains('peer connection failed')) {
+      return ErrorInfo(
+        type: ErrorType.signaling,
+        userMessage: 'Failed to establish remote connection. Please try again.',
+        technicalMessage: error.toString(),
+        canRetry: true,
+      );
+    }
+
    // Unknown errors
    return ErrorInfo(
      type: ErrorType.unknown,
@@ -1,175 +0,0 @@
-import '../models/player.dart';
-import 'debug_logger.dart';
-
-/// Manages volume state for group players where the MA API returns null volume.
-///
-/// Both pre-configured speaker groups (provider == 'player_group') and dynamic
-/// sync groups (ID typically starts with 'syncgroup_') don't have their own
-/// volume_level in the MA API. This manager computes an effective volume from
-/// group members and caches recently-set volumes to prevent slider snap-back.
-class GroupVolumeManager {
-  final _logger = DebugLogger();
-
-  // Cache of last-set volume per group player ID.
-  // Prevents slider snap-back between setVolume() and next player_updated event.
-  final Map<String, int> _pendingVolumes = {};
-
-  // Timestamps for pending volumes - used to expire stale entries
-  final Map<String, DateTime> _pendingTimestamps = {};
-
-  // How long to trust a pending volume before falling back to computed average.
-  // For group players the API never returns a volume, so we keep the pending
-  // value until the computed member average converges (within tolerance) or
-  // until a generous timeout to avoid leaking state forever.
-  static const Duration _pendingTimeout = Duration(seconds: 30);
-
-  // If the computed member average is within this many points of the pending
-  // value, we consider the server to have confirmed it and clear the pending.
-  static const int _confirmationTolerance = 3;
-
-  /// Check if a player is a group player that needs computed volume.
-  ///
-  /// Detects both:
-  /// - Pre-configured MA speaker groups (provider == 'player_group')
-  /// - Dynamic sync groups (have group members but API returns null volume)
-  bool isGroupPlayer(Player player) {
-    // Pre-configured MA speaker groups
-    if (player.provider == 'player_group') return true;
-    // Dynamic sync groups: have multiple group members but MA returns null volume
-    if (player.groupMembers != null &&
-        player.groupMembers!.length > 1 &&
-        player.volumeLevel == null) {
-      return true;
-    }
-    return false;
-  }
-
-  /// Get the effective volume for a player.
-  ///
-  /// For non-group players: returns player.volumeLevel (unchanged behavior).
-  /// For group players: returns cached pending volume if recent, otherwise
-  /// computes average from group members.
-  ///
-  /// [player] - The player to get volume for.
-  /// [allPlayers] - All available players (needed to look up group members).
-  ///
-  /// Returns volume as int 0-100, or null if no volume can be determined.
-  int? getEffectiveVolumeLevel(Player player, List<Player> allPlayers) {
-    if (!isGroupPlayer(player)) {
-      return player.volumeLevel;
-    }
-
-    // Check for a pending (just-set) volume
-    final pending = _pendingVolumes[player.playerId];
-    if (pending != null) {
-      final timestamp = _pendingTimestamps[player.playerId];
-      if (timestamp != null &&
-          DateTime.now().difference(timestamp) < _pendingTimeout) {
-        // Compute member average to see if server has converged
-        final memberAvg = _computeGroupVolume(player, allPlayers);
-        if (memberAvg != null && (memberAvg - pending).abs() <= _confirmationTolerance) {
-          // Server confirmed — member average matches what we set
-          _pendingVolumes.remove(player.playerId);
-          _pendingTimestamps.remove(player.playerId);
-          _logger.debug(
-              'GroupVolume: Convergence confirmed for ${player.name}: '
-              'pending=$pending, memberAvg=$memberAvg',
-              context: 'GroupVolumeManager');
-          return memberAvg;
-        }
-        // Not yet confirmed — keep showing the pending value
-        _logger.debug(
-            'GroupVolume: Pending protection active for ${player.name}: '
-            'pending=$pending, memberAvg=$memberAvg, '
-            'elapsed=${DateTime.now().difference(timestamp).inSeconds}s',
-            context: 'GroupVolumeManager');
-        return pending;
-      }
-      // Expired after generous timeout — remove it
-      _logger.debug(
-          'GroupVolume: Pending expired for ${player.name} after ${_pendingTimeout.inSeconds}s, '
-          'falling back to computed average',
-          context: 'GroupVolumeManager');
-      _pendingVolumes.remove(player.playerId);
-      _pendingTimestamps.remove(player.playerId);
-    }
-
-    // Compute average from group members
-    return _computeGroupVolume(player, allPlayers);
-  }
-
-  /// Compute the average volume across all group members.
-  /// Recursively resolves nested group members (MA sometimes makes the first
-  /// member of a group also a group player, which returns null for volumeLevel).
-  /// Returns null if no members have a valid volume.
-  int? _computeGroupVolume(Player groupPlayer, List<Player> allPlayers,
-      {int depth = 0}) {
-    // Prevent infinite recursion from circular group references
-    if (depth > 3) return null;
-
-    final memberIds = groupPlayer.groupMembers;
-    if (memberIds == null || memberIds.isEmpty) {
-      _logger.debug('GroupVolume: No group members for ${groupPlayer.name}',
-          context: 'GroupVolumeManager');
-      return null;
-    }
-
-    int totalVolume = 0;
-    int count = 0;
-
-    for (final memberId in memberIds) {
-      // Skip self-references (groupMembers can include the group's own ID)
-      if (memberId == groupPlayer.playerId) continue;
-
-      final member =
-          allPlayers.where((p) => p.playerId == memberId).firstOrNull;
-      if (member == null) continue;
-
-      if (member.volumeLevel != null) {
-        totalVolume += member.volumeLevel!;
-        count++;
-      } else if (isGroupPlayer(member)) {
-        // Nested group player — MA returns null volumeLevel for these.
-        // Recursively compute from the nested group's own members.
-        final subVolume =
-            _computeGroupVolume(member, allPlayers, depth: depth + 1);
-        if (subVolume != null) {
-          totalVolume += subVolume;
-          count++;
-          _logger.debug(
-              'GroupVolume: Resolved nested group ${member.name} → volume $subVolume',
-              context: 'GroupVolumeManager');
-        }
-      }
-    }
-
-    if (count == 0) {
-      _logger.debug(
-          'GroupVolume: No members with volume for ${groupPlayer.name} '
-          '(${memberIds.length} members checked, depth=$depth)',
-          context: 'GroupVolumeManager');
-      return null;
-    }
-
-    final avg = (totalVolume / count).round();
-    _logger.debug(
-        'GroupVolume: ${groupPlayer.name} average=$avg from $count members '
-        '(total=$totalVolume, depth=$depth)',
-        context: 'GroupVolumeManager');
-    return avg;
-  }
-
-  /// Record that a volume was just set on a group player.
-  /// This prevents the slider from snapping back to 0 before the
-  /// MA server processes the volume change on all members.
-  void onVolumeSet(String playerId, int volumeLevel) {
-    _pendingVolumes[playerId] = volumeLevel;
-    _pendingTimestamps[playerId] = DateTime.now();
-  }
-
-  /// Clear all cached state (e.g., on disconnect)
-  void clear() {
-    _pendingVolumes.clear();
-    _pendingTimestamps.clear();
-  }
-}
@@ -7,40 +7,26 @@ import 'debug_logger.dart';
 ///
 /// For MA players: intercept buttons and send volume commands via API
 /// For builtin player: let native volume work (don't intercept)
-///
-/// Also provides a volume observer for lockscreen volume changes.
-/// When the app is in the background/lockscreen, dispatchKeyEvent doesn't fire,
-/// so the observer watches system STREAM_MUSIC volume changes and sends
-/// absolute volume values to Flutter for routing to the MA player.
 class HardwareVolumeService {
  static final HardwareVolumeService _instance = HardwareVolumeService._internal();
  factory HardwareVolumeService() => _instance;
  HardwareVolumeService._internal();

-  static const _channel = MethodChannel('com.collotsspot.ensemble/volume_buttons');
+  static const _channel = MethodChannel('com.musicassistant.music_assistant/volume_buttons');
  final _logger = DebugLogger();

  final _volumeUpController = StreamController<void>.broadcast();
  final _volumeDownController = StreamController<void>.broadcast();
-  final _absoluteVolumeController = StreamController<int>.broadcast();

  Stream<void> get onVolumeUp => _volumeUpController.stream;
  Stream<void> get onVolumeDown => _volumeDownController.stream;

-  /// Stream of absolute volume values (0-100) from lockscreen hardware buttons.
-  /// Fires when the system STREAM_MUSIC volume changes while the volume
-  /// observer is active (remote/group player selected, app in background).
-  Stream<int> get onAbsoluteVolumeChange => _absoluteVolumeController.stream;
-
  bool _isListening = false;
  bool get isListening => _isListening;

  bool _isIntercepting = false;
  bool get isIntercepting => _isIntercepting;

-  bool _isObservingVolume = false;
-  bool get isObservingVolume => _isObservingVolume;
-
  /// Initialize the service and start listening for volume button events
  Future<void> init() async {
    if (_isListening) return;
@@ -53,11 +39,6 @@ class HardwareVolumeService {
        case 'volumeDown':
          _volumeDownController.add(null);
          break;
-        case 'absoluteVolumeChange':
-          // Volume changed from lockscreen/background via ContentObserver
-          final volume = call.arguments as int? ?? 0;
-          _absoluteVolumeController.add(volume);
-          break;
      }
    });

@@ -89,53 +70,8 @@ class HardwareVolumeService {
    }
  }

-  /// Start the volume observer for lockscreen/background volume changes.
-  /// When active, system STREAM_MUSIC volume changes are detected and sent
-  /// to Flutter via [onAbsoluteVolumeChange]. Optionally sets the system
-  /// volume to [initialVolume] (0-100) to match the MA player's current volume.
-  Future<void> startVolumeObserver({int? initialVolume}) async {
-    if (_isObservingVolume) return;
-
-    try {
-      await _channel.invokeMethod('startVolumeObserver', {
-        if (initialVolume != null) 'initialVolume': initialVolume,
-      });
-      _isObservingVolume = true;
-      _logger.info('Volume observer started', context: 'VolumeService');
-    } catch (e) {
-      _logger.error('Failed to start volume observer', context: 'VolumeService', error: e);
-    }
-  }
-
-  /// Stop the volume observer.
-  Future<void> stopVolumeObserver() async {
-    if (!_isObservingVolume) return;
-
-    try {
-      await _channel.invokeMethod('stopVolumeObserver');
-      _isObservingVolume = false;
-      _logger.info('Volume observer stopped', context: 'VolumeService');
-    } catch (e) {
-      _logger.error('Failed to stop volume observer', context: 'VolumeService', error: e);
-    }
-  }
-
-  /// Sync the system volume to match the MA player volume (0-100).
-  /// Used to keep the system volume HUD in sync with the MA player.
-  Future<void> syncSystemVolume(int maVolume) async {
-    try {
-      await _channel.invokeMethod('syncSystemVolume', {'volume': maVolume});
-    } catch (e) {
-      _logger.error('Failed to sync system volume', context: 'VolumeService', error: e);
-    }
-  }
-
  /// Stop listening for volume button events
  Future<void> dispose() async {
-    if (_isObservingVolume) {
-      await stopVolumeObserver();
-    }
-
    if (!_isListening) return;

    try {
@@ -150,6 +86,5 @@ class HardwareVolumeService {
    // Close StreamControllers to prevent memory leaks
    await _volumeUpController.close();
    await _volumeDownController.close();
-    await _absoluteVolumeController.close();
  }
 }
@@ -1,177 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-
-/// Centralized service for tracking library and favorite status of media items.
-///
-/// This service implements the "single source of truth" pattern:
-/// - All widgets query this service instead of maintaining local state
-/// - Status changes notify all listeners immediately (optimistic updates)
-/// - API failures trigger rollback notifications
-///
-/// Usage:
-/// ```dart
-/// // Check status
-/// final isInLibrary = LibraryStatusService.instance.isInLibrary(itemKey);
-///
-/// // Listen to changes
-/// LibraryStatusService.instance.addListener(() {
-///   // Rebuild UI
-/// });
-///
-/// // Update status (optimistically)
-/// LibraryStatusService.instance.setLibraryStatus(itemKey, true);
-/// ```
-class LibraryStatusService extends ChangeNotifier {
-  LibraryStatusService._();
-  static final LibraryStatusService instance = LibraryStatusService._();
-
-  // Status maps: itemKey -> status
-  // itemKey format: "mediaType:provider:itemId" for uniqueness
-  final Map<String, bool> _libraryStatus = {};
-  final Map<String, bool> _favoriteStatus = {};
-
-  // Pending operations for rollback on failure
-  final Map<String, bool> _pendingLibraryOps = {};
-  final Map<String, bool> _pendingFavoriteOps = {};
-
-  /// Generate a unique key for an item
-  static String makeKey(String mediaType, String provider, String itemId) {
-    return '$mediaType:$provider:$itemId';
-  }
-
-  /// Check if item is in library
-  bool isInLibrary(String key) => _libraryStatus[key] ?? false;
-
-  /// Check if item is favorite
-  bool isFavorite(String key) => _favoriteStatus[key] ?? false;
-
-  /// Set library status (optimistic update)
-  /// Call this immediately when user taps the button
-  void setLibraryStatus(String key, bool inLibrary) {
-    if (_libraryStatus[key] == inLibrary) return;
-
-    _libraryStatus[key] = inLibrary;
-    notifyListeners();
-  }
-
-  /// Set favorite status (optimistic update)
-  void setFavoriteStatus(String key, bool favorite) {
-    if (_favoriteStatus[key] == favorite) return;
-
-    _favoriteStatus[key] = favorite;
-    notifyListeners();
-  }
-
-  /// Mark operation as pending (for rollback tracking)
-  void markLibraryPending(String key, bool previousValue) {
-    _pendingLibraryOps[key] = previousValue;
-  }
-
-  void markFavoritePending(String key, bool previousValue) {
-    _pendingFavoriteOps[key] = previousValue;
-  }
-
-  /// Complete operation successfully (clear pending)
-  void completeLibraryOperation(String key) {
-    _pendingLibraryOps.remove(key);
-  }
-
-  void completeFavoriteOperation(String key) {
-    _pendingFavoriteOps.remove(key);
-  }
-
-  /// Rollback operation on failure
-  void rollbackLibraryOperation(String key) {
-    final previousValue = _pendingLibraryOps.remove(key);
-    if (previousValue != null) {
-      _libraryStatus[key] = previousValue;
-      notifyListeners();
-    }
-  }
-
-  void rollbackFavoriteOperation(String key) {
-    final previousValue = _pendingFavoriteOps.remove(key);
-    if (previousValue != null) {
-      _favoriteStatus[key] = previousValue;
-      notifyListeners();
-    }
-  }
-
-  /// Bulk update from provider's library data
-  /// Called when library is loaded/refreshed
-  void syncFromLibrary({
-    required String mediaType,
-    required List<dynamic> items,
-    required bool Function(dynamic item) getInLibrary,
-    required bool Function(dynamic item) getFavorite,
-    required String Function(dynamic item) getProvider,
-    required String Function(dynamic item) getItemId,
-  }) {
-    bool changed = false;
-
-    for (final item in items) {
-      final key = makeKey(mediaType, getProvider(item), getItemId(item));
-      final inLibrary = getInLibrary(item);
-      final favorite = getFavorite(item);
-
-      // Only update if not pending (don't overwrite optimistic updates)
-      if (!_pendingLibraryOps.containsKey(key)) {
-        if (_libraryStatus[key] != inLibrary) {
-          _libraryStatus[key] = inLibrary;
-          changed = true;
-        }
-      }
-
-      if (!_pendingFavoriteOps.containsKey(key)) {
-        if (_favoriteStatus[key] != favorite) {
-          _favoriteStatus[key] = favorite;
-          changed = true;
-        }
-      }
-    }
-
-    if (changed) {
-      notifyListeners();
-    }
-  }
-
-  /// Update a single item's status from fresh data
-  void syncSingleItem({
-    required String key,
-    required bool inLibrary,
-    required bool favorite,
-  }) {
-    bool changed = false;
-
-    if (!_pendingLibraryOps.containsKey(key) && _libraryStatus[key] != inLibrary) {
-      _libraryStatus[key] = inLibrary;
-      changed = true;
-    }
-
-    if (!_pendingFavoriteOps.containsKey(key) && _favoriteStatus[key] != favorite) {
-      _favoriteStatus[key] = favorite;
-      changed = true;
-    }
-
-    if (changed) {
-      notifyListeners();
-    }
-  }
-
-  /// Clear all status (on logout/disconnect)
-  void clear() {
-    _libraryStatus.clear();
-    _favoriteStatus.clear();
-    _pendingLibraryOps.clear();
-    _pendingFavoriteOps.clear();
-    notifyListeners();
-  }
-
-  /// Get debug info
-  Map<String, dynamic> get debugInfo => {
-    'libraryCount': _libraryStatus.length,
-    'favoriteCount': _favoriteStatus.length,
-    'pendingLibrary': _pendingLibraryOps.length,
-    'pendingFavorite': _pendingFavoriteOps.length,
-  };
-}
@@ -10,7 +10,6 @@ import '../models/media_item.dart';
 import '../models/player.dart';
 import '../models/provider_instance.dart';
 import '../models/provider_manifest.dart';
-import '../models/recommendation_folder.dart';
 import 'debug_logger.dart';
 import 'settings_service.dart';
 import 'device_id_service.dart';
@@ -26,6 +25,20 @@ enum MAConnectionState {
  error,
 }

+/// Wrapper for pending requests with timestamp for age-based cleanup
+class _PendingRequest {
+  final Completer<Map<String, dynamic>> completer;
+  final DateTime createdAt;
+
+  _PendingRequest({required this.completer, DateTime? createdAt})
+      : createdAt = createdAt ?? DateTime.now();
+
+  bool get isStale {
+    const staleThreshold = Duration(minutes: 2);
+    return DateTime.now().difference(createdAt) > staleThreshold;
+  }
+}
+
 class MusicAssistantAPI {
  final String serverUrl;
  final AuthManager authManager;
@@ -39,7 +52,7 @@ class MusicAssistantAPI {
  MAConnectionState _currentState = MAConnectionState.disconnected;
  MAConnectionState get currentConnectionState => _currentState;

-  final Map<String, Completer<Map<String, dynamic>>> _pendingRequests = {};
+  final Map<String, _PendingRequest> _pendingRequests = {};
  final Map<String, StreamController<Map<String, dynamic>>> _eventStreams = {};

  Completer<void>? _connectionCompleter;
@@ -66,6 +79,12 @@ class MusicAssistantAPI {
  final Map<String, ProviderManifest> _providerManifests = {};
  Map<String, ProviderManifest> get providerManifests => _providerManifests;

+  // Remote mode flag - when true, images go through WebRTC bridge which doesn't support HTTP
+  // In this mode, we use external CDN URLs directly instead of imageproxy
+  bool _isRemoteMode = false;
+  bool get isRemoteMode => _isRemoteMode;
+  set isRemoteMode(bool value) => _isRemoteMode = value;
+
  MusicAssistantAPI(this.serverUrl, this.authManager);

  // Guard to prevent multiple simultaneous connection attempts
@@ -215,7 +234,6 @@ class MusicAssistantAPI {
        },
        onDone: () {
          _logger.log('WebSocket connection closed');
-          _isAuthenticated = false; // Reset auth state on disconnect
          _updateConnectionState(MAConnectionState.disconnected);
          if (_connectionCompleter != null && !_connectionCompleter!.isCompleted) {
            _connectionCompleter!.completeError(Exception('Connection closed'));
@@ -287,15 +305,15 @@ class MusicAssistantAPI {

      // Handle response to a request
      if (messageId != null && _pendingRequests.containsKey(messageId)) {
-        final completer = _pendingRequests.remove(messageId);
+        final pending = _pendingRequests.remove(messageId);

        if (data.containsKey('error_code')) {
          _logger.log('Command error: ${data['error_code']} - ${data['details']}');
-          completer!.completeError(
+          pending!.completer.completeError(
            Exception('${data['error_code']}: ${data['details']}'),
          );
        } else {
-          completer!.complete(data);
+          pending!.completer.complete(data);
        }
        return;
      }
@@ -354,6 +372,9 @@ class MusicAssistantAPI {
      }
    }

+    // Clean up stale requests before checking limits
+    _cleanupStaleRequests();
+
    // Prevent memory leaks by limiting pending requests
    if (_pendingRequests.length >= NetworkConstants.maxPendingRequests) {
      throw Exception(
@@ -364,7 +385,7 @@ class MusicAssistantAPI {

    final messageId = _uuid.v4();
    final completer = Completer<Map<String, dynamic>>();
-    _pendingRequests[messageId] = completer;
+    _pendingRequests[messageId] = _PendingRequest(completer: completer);

    final message = {
      'message_id': messageId,
@@ -387,6 +408,27 @@ class MusicAssistantAPI {
    }
  }

+  /// Clean up stale pending requests that have been waiting too long
+  void _cleanupStaleRequests() {
+    final staleIds = <String>[];
+    for (final entry in _pendingRequests.entries) {
+      if (entry.value.isStale && !entry.value.completer.isCompleted) {
+        staleIds.add(entry.key);
+      }
+    }
+    if (staleIds.isNotEmpty) {
+      _logger.log('Cleanup: Removing ${staleIds.length} stale pending requests');
+      for (final id in staleIds) {
+        final pending = _pendingRequests.remove(id);
+        if (pending != null && !pending.completer.isCompleted) {
+          pending.completer.completeError(
+            TimeoutException('Request expired after 2 minutes'),
+          );
+        }
+      }
+    }
+  }
+
  // Library browsing methods
  Future<List<Artist>> getArtists({
    int? limit,
@@ -1196,28 +1238,6 @@ class MusicAssistantAPI {
    }
  }

-  // ============ RECOMMENDATIONS ============
-
-  /// Get recommendation folders (mixes, recommendations, etc.)
-  Future<List<RecommendationFolder>> getRecommendations() async {
-    try {
-      final response = await _sendCommand(
-        'music/recommendations',
-      );
-
-      final items = response['result'] as List<dynamic>?;
-      if (items == null) return [];
-
-      return items
-          .whereType<Map<String, dynamic>>()
-          .map(RecommendationFolder.fromJson)
-          .toList();
-    } catch (e) {
-      _logger.log('Error getting recommendations: $e');
-      return [];
-    }
-  }
-
  /// Get the audiobookshelf provider instance ID
  Future<String?> getAudiobookshelfProviderId() async {
    try {
@@ -1466,10 +1486,9 @@ class MusicAssistantAPI {
        final futures = batch.map((uri) => _sendCommand(
          'music/item_by_uri',
          args: {'uri': uri},
-        ).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null})
-         .catchError((_) => <String, dynamic>{'result': null}));
+        ).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null}));

-        final results = await Future.wait(futures);
+        final results = await Future.wait(futures, eagerError: false);

        for (final trackResponse in results) {
          if (albumUris.length >= limit) break;
@@ -1506,10 +1525,9 @@ class MusicAssistantAPI {
        final futures = batch.map((uri) => _sendCommand(
          'music/item_by_uri',
          args: {'uri': uri},
-        ).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null})
-         .catchError((_) => <String, dynamic>{'result': null}));
+        ).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null}));

-        final results = await Future.wait(futures);
+        final results = await Future.wait(futures, eagerError: false);

        for (final albumResponse in results) {
          try {
@@ -2102,37 +2120,6 @@ class MusicAssistantAPI {
    }
  }

-  /// Add multiple tracks to queue without interrupting playback
-  Future<void> addTracksToQueue(String playerId, List<Track> tracks, {int startIndex = 0}) async {
-    try {
-      final tracksToAdd = startIndex > 0 ? tracks.sublist(startIndex) : tracks;
-
-      // Filter to only tracks with available provider mappings
-      final playableTracks = tracksToAdd.where((track) {
-        if (track.providerMappings == null || track.providerMappings!.isEmpty) {
-          return false;
-        }
-        return track.providerMappings!.any((m) => m.available);
-      }).toList();
-
-      if (playableTracks.isEmpty) return;
-
-      final uris = playableTracks.map((track) => _buildTrackUri(track)).toList();
-
-      await _sendCommand(
-        'player_queues/play_media',
-        args: {
-          'queue_id': playerId,
-          'media': uris,
-          'option': 'add',  // Add to queue without starting playback
-        },
-      );
-    } catch (e) {
-      _logger.log('Error adding tracks to queue: $e');
-      rethrow;
-    }
-  }
-
  /// Play album on player
  Future<void> playAlbum(String playerId, Album album) async {
    try {
@@ -3273,6 +3260,12 @@ class MusicAssistantAPI {
      return null;
    }

+    // In remote mode (WebRTC bridge), HTTP requests don't work through the tunnel
+    // So we need to use external CDN URLs directly when available
+    if (_isRemoteMode) {
+      return _getImageUrlForRemoteMode(images, size);
+    }
+
    // Try to find a non-remotely accessible image first (prefer local/opensubsonic)
    Map<String, dynamic>? selectedImage;
    for (var img in images) {
@@ -3335,6 +3328,107 @@ class MusicAssistantAPI {
    return '$baseUrl/imageproxy?provider=${Uri.encodeComponent(provider ?? "")}&size=$size&fmt=jpeg&path=${Uri.encodeComponent(imagePath)}';
  }

+  /// Get image URL for remote mode - uses external CDN URLs directly
+  /// since HTTP requests don't work through the WebRTC bridge
+  String? _getImageUrlForRemoteMode(List<dynamic> images, int size) {
+    // Known external CDN domains that are publicly accessible
+    const externalDomains = [
+      'i.scdn.co',           // Spotify
+      'mosaic.scdn.co',      // Spotify playlists
+      'image-cdn-ak.spotifycdn.com',  // Spotify
+      'cdns-images.dzcdn.net',  // Deezer
+      'resources.tidal.com',    // Tidal
+      'e-cdns-images.dzcdn.net',  // Deezer
+      'is1-ssl.mzstatic.com',   // Apple Music
+      'is2-ssl.mzstatic.com',   // Apple Music
+      'is3-ssl.mzstatic.com',   // Apple Music
+      'is4-ssl.mzstatic.com',   // Apple Music
+      'is5-ssl.mzstatic.com',   // Apple Music
+      'lastfm.freetls.fastly.net',  // Last.fm
+      'coverartarchive.org',    // MusicBrainz
+      'archive.org',            // Internet Archive
+      'fanart.tv',              // Fanart.tv
+    ];
+
+    // First pass: look for images with paths that are external URLs
+    for (var img in images) {
+      final imgMap = img as Map<String, dynamic>;
+      final path = imgMap['path'] as String?;
+      if (path == null) continue;
+
+      // Check if path is already an external URL
+      if (path.startsWith('https://')) {
+        try {
+          final uri = Uri.parse(path);
+
+          // If URL contains imageproxy with a size parameter, replace with requested size
+          if (uri.path.contains('imageproxy') && uri.queryParameters.containsKey('size')) {
+            final newParams = Map<String, String>.from(uri.queryParameters);
+            newParams['size'] = size.toString();
+            final newUri = uri.replace(queryParameters: newParams);
+            _logger.log('🖼️ Remote mode: adjusted imageproxy size to $size from ${uri.host}');
+            return newUri.toString();
+          }
+
+          // Check if it's from a known CDN
+          for (final domain in externalDomains) {
+            if (uri.host.contains(domain)) {
+              _logger.log('🖼️ Remote mode: using external CDN URL from ${uri.host}');
+              // For Spotify, we can request different sizes
+              if (uri.host.contains('scdn.co') || uri.host.contains('spotifycdn.com')) {
+                // Spotify image URLs can have size in path, but we'll use as-is
+                return path;
+              }
+              return path;
+            }
+          }
+
+          // Check if it's an Audiobookshelf URL (cover API endpoint)
+          // Audiobookshelf supports ?width=X parameter for resizing
+          if (uri.path.contains('/api/') && uri.path.contains('/cover')) {
+            final newParams = Map<String, String>.from(uri.queryParameters);
+            newParams['width'] = size.toString();
+            final newUri = uri.replace(queryParameters: newParams);
+            _logger.log('🖼️ Remote mode: adjusted Audiobookshelf cover size to $size from ${uri.host}');
+            return newUri.toString();
+          }
+
+          // Even if not a known CDN, if it's HTTPS it might work
+          _logger.log('🖼️ Remote mode: trying external URL from ${uri.host}');
+          return path;
+        } catch (e) {
+          // Not a valid URL, continue
+        }
+      }
+    }
+
+    // Second pass: try any image with a provider that typically has external URLs
+    for (var img in images) {
+      final imgMap = img as Map<String, dynamic>;
+      final provider = imgMap['provider'] as String?;
+      final path = imgMap['path'] as String?;
+      if (path == null) continue;
+
+      // Providers that typically have external URLs in their paths
+      if (provider != null) {
+        if (provider.contains('spotify') ||
+            provider.contains('tidal') ||
+            provider.contains('deezer') ||
+            provider.contains('apple_music') ||
+            provider.contains('musicbrainz')) {
+          if (path.startsWith('https://')) {
+            _logger.log('🖼️ Remote mode: using $provider image URL');
+            return path;
+          }
+        }
+      }
+    }
+
+    // No external URLs found - images won't load in remote mode for local files
+    _logger.log('🖼️ Remote mode: no external image URL available');
+    return null;
+  }
+
  // ==================== iTunes Artwork Lookup ====================

  /// Search iTunes for a podcast and return high-res artwork URL
@@ -3734,8 +3828,8 @@ class MusicAssistantAPI {
  /// Cancel all pending requests with an error message
  void _cancelPendingRequests(String reason) {
    for (final entry in _pendingRequests.entries) {
-      if (!entry.value.isCompleted) {
-        entry.value.completeError(Exception(reason));
+      if (!entry.value.completer.isCompleted) {
+        entry.value.completer.completeError(Exception(reason));
      }
    }
    _pendingRequests.clear();
@@ -0,0 +1,675 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+import 'package:ensemble/services/remote/webview_webrtc_connection.dart';
+import 'package:ensemble/services/debug_logger.dart';
+
+/// Error types for RemoteBridge
+enum RemoteBridgeErrorType {
+  webrtcConnection,
+  signaling,
+  authentication,
+  dataChannel,
+  timeout,
+  unknown,
+}
+
+/// Error information from RemoteBridge
+class RemoteBridgeError {
+  final RemoteBridgeErrorType type;
+  final String message;
+  final DateTime timestamp;
+
+  RemoteBridgeError({
+    required this.type,
+    required this.message,
+    DateTime? timestamp,
+  }) : timestamp = timestamp ?? DateTime.now();
+}
+
+/// Connection state for RemoteBridge
+enum RemoteBridgeState {
+  disconnected,
+  connecting,
+  authenticating,
+  connected,
+  reconnecting,
+  failed,
+}
+
+/// Connection quality metrics
+class ConnectionMetrics {
+  final int requestsSent;
+  final int responsesReceived;
+  final int reconnectionCount;
+  final Duration? lastLatency;
+  final DateTime? lastActivity;
+
+  ConnectionMetrics({
+    required this.requestsSent,
+    required this.responsesReceived,
+    required this.reconnectionCount,
+    this.lastLatency,
+    this.lastActivity,
+  });
+
+  double get successRate {
+    if (requestsSent == 0) return 1.0;
+    return responsesReceived / requestsSent;
+  }
+}
+
+/// A WebRTC-to-WebSocket bridge that allows MusicAssistantAPI to work unchanged
+/// for remote connections. All traffic is tunneled through a local WebSocket server.
+///
+/// Architecture:
+/// ```
+/// MusicAssistantAPI → localhost:port → RemoteBridge → WebRTC → MA Server
+/// Sendspin → localhost:port/sendspin → RemoteBridge → WebRTC (sendspin channel) → MA Server
+/// ```
+class RemoteBridge {
+  HttpServer? _server;
+  WebViewWebRTCConnection? _webrtcConnection;
+  int? _port;
+
+  // API client (MusicAssistantAPI)
+  WebSocket? _apiClientSocket;
+  StreamSubscription? _apiClientSubscription;
+  StreamSubscription? _apiWebrtcSubscription;
+
+  // Sendspin client (local player audio)
+  WebSocket? _sendspinClientSocket;
+  StreamSubscription? _sendspinClientSubscription;
+  StreamSubscription? _sendspinTextSubscription;
+  StreamSubscription? _sendspinBinarySubscription;
+
+  Timer? _healthCheckTimer;
+  Timer? _reconnectTimer;
+
+  // Connection parameters for reconnection
+  String? _remoteId;
+  String? _username;
+  String? _password;
+  bool _isReconnecting = false;
+  int _reconnectAttempts = 0;
+  static const int _maxReconnectAttempts = 5;
+  static const Duration _reconnectDelay = Duration(seconds: 3);
+  static const Duration _rateLimitDelay = Duration(seconds: 65);
+  bool _isRateLimited = false;
+
+  // Cached server hello to replay when WS client connects
+  String? _cachedServerHello;
+
+  // Debug counters
+  int _apiMessagesSent = 0;
+  int _apiMessagesReceived = 0;
+  int _sendspinMessagesSent = 0;
+  int _sendspinMessagesReceived = 0;
+  DateTime? _lastMessageReceived;
+  int _totalReconnections = 0;
+
+  // State tracking
+  RemoteBridgeState _state = RemoteBridgeState.disconnected;
+  final _stateController = StreamController<RemoteBridgeState>.broadcast();
+  final _errorController = StreamController<RemoteBridgeError>.broadcast();
+
+  final DebugLogger _logger = DebugLogger();
+
+  int? get port => _port;
+  bool get isRunning => _server != null;
+  bool get isSendspinReady => _webrtcConnection?.isSendspinConnected ?? false;
+  bool get isWebRTCConnected => _webrtcConnection?.isConnected ?? false;
+  RemoteBridgeState get state => _state;
+  Stream<RemoteBridgeState> get stateStream => _stateController.stream;
+  Stream<RemoteBridgeError> get errorStream => _errorController.stream;
+
+  /// Build the hidden WebView widget that must be added to the widget tree.
+  /// This must be called and the returned widget added to the tree BEFORE calling start().
+  /// The WebView is 1x1 pixel and invisible.
+  Widget buildWebView() {
+    // Create the connection if not already created
+    _webrtcConnection ??= WebViewWebRTCConnection();
+    return _webrtcConnection!.buildWebView();
+  }
+
+  /// Get current connection metrics
+  ConnectionMetrics get metrics => ConnectionMetrics(
+    requestsSent: _apiMessagesSent,
+    responsesReceived: _apiMessagesReceived,
+    reconnectionCount: _totalReconnections,
+    lastActivity: _lastMessageReceived,
+  );
+
+  /// Update state and notify listeners
+  void _setState(RemoteBridgeState newState) {
+    if (_state != newState) {
+      _logger.log('RemoteBridge: State changed: $_state -> $newState');
+      _state = newState;
+      _stateController.add(newState);
+    }
+  }
+
+  /// Emit an error to listeners
+  void _emitError(RemoteBridgeErrorType type, String message) {
+    final error = RemoteBridgeError(type: type, message: message);
+    _logger.log('RemoteBridge: Error [$type]: $message');
+    _errorController.add(error);
+  }
+
+  /// Start the bridge and connect to the remote MA server.
+  /// Returns the local port number to connect to, or null if failed.
+  Future<int?> start(String remoteId, String username, String password) async {
+    _logger.log('RemoteBridge: Starting bridge for remote ID: $remoteId');
+    _setState(RemoteBridgeState.connecting);
+
+    // Store connection parameters for reconnection
+    _remoteId = remoteId;
+    _username = username;
+    _password = password;
+    _reconnectAttempts = 0;
+
+    try {
+      // Step 1: Connect to MA via WebRTC (using WebView-based implementation)
+      // The WebView must be in the widget tree first - call buildWebView() before start()
+      _webrtcConnection ??= WebViewWebRTCConnection();
+
+      _webrtcConnection!.onStateChanged = (state) {
+        _logger.log('RemoteBridge: WebRTC state: $state');
+        if (state == WebViewWebRTCConnectionState.disconnected ||
+            state == WebViewWebRTCConnectionState.failed) {
+          _handleWebRTCDisconnection();
+        }
+      };
+
+      _webrtcConnection!.onError = (error) {
+        _logger.log('RemoteBridge: WebRTC error: $error');
+        _emitError(RemoteBridgeErrorType.webrtcConnection, error);
+      };
+
+      final connected = await _webrtcConnection!.connect(remoteId);
+      if (!connected) {
+        _logger.log('RemoteBridge: WebRTC connection failed');
+        _setState(RemoteBridgeState.failed);
+        _emitError(RemoteBridgeErrorType.webrtcConnection, 'Failed to connect to remote server');
+        await stop();
+        return null;
+      }
+
+      _logger.log('RemoteBridge: WebRTC connected, authenticating...');
+      _setState(RemoteBridgeState.authenticating);
+
+      // Step 2: Authenticate with MA
+      final authenticated = await _authenticate(username, password);
+      if (!authenticated) {
+        _logger.log('RemoteBridge: Authentication failed');
+        _setState(RemoteBridgeState.failed);
+        _emitError(RemoteBridgeErrorType.authentication, 'Authentication failed');
+        await stop();
+        return null;
+      }
+
+      _logger.log('RemoteBridge: Authentication successful');
+      _setState(RemoteBridgeState.connected);
+
+      // Step 3: Cache the server hello (it was already received by WebRTCConnection)
+      if (_webrtcConnection!.serverInfo != null) {
+        _cachedServerHello = jsonEncode(_webrtcConnection!.serverInfo);
+        _logger.log('RemoteBridge: Cached server hello');
+      }
+
+      // Step 4: Start local WebSocket server
+      _server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+      _port = _server!.port;
+      _logger.log('RemoteBridge: Local WS server started on port $_port');
+
+      // Handle incoming connections
+      _server!.listen(_handleHttpRequest);
+
+      // Step 5: Subscribe to WebRTC API messages to forward to API client
+      _apiWebrtcSubscription = _webrtcConnection!.rawMessages.listen((message) {
+        _apiMessagesReceived++;
+        _lastMessageReceived = DateTime.now();
+        if (_apiClientSocket != null) {
+          _apiClientSocket!.add(message);
+        }
+      });
+
+      // Step 6: Subscribe to Sendspin WebRTC messages (text) to forward to Sendspin client
+      _sendspinTextSubscription = _webrtcConnection!.sendspinTextMessages.listen((message) {
+        _sendspinMessagesReceived++;
+        _lastMessageReceived = DateTime.now();
+        if (_sendspinClientSocket != null) {
+          _sendspinClientSocket!.add(message);
+        }
+      });
+
+      // Step 7: Subscribe to Sendspin WebRTC messages (binary audio) to forward to Sendspin client
+      _sendspinBinarySubscription = _webrtcConnection!.sendspinBinaryMessages.listen((data) {
+        _sendspinMessagesReceived++;
+        if (_sendspinClientSocket != null) {
+          // Forward binary audio data to Sendspin client
+          _sendspinClientSocket!.add(data);
+        }
+      });
+
+      // Step 8: Start health check timer
+      _startHealthCheck();
+
+      return _port;
+    } catch (e) {
+      _logger.log('RemoteBridge: Start failed: $e');
+      _setState(RemoteBridgeState.failed);
+      _emitError(RemoteBridgeErrorType.unknown, e.toString());
+      await stop();
+      return null;
+    }
+  }
+
+  /// Authenticate with the MA server over WebRTC.
+  Future<bool> _authenticate(String username, String password) async {
+    try {
+      // Step 1: Login to get access token
+      _logger.log('RemoteBridge: Sending auth/login...');
+      final loginResult = await _webrtcConnection!.sendRequest('auth/login', {
+        'username': username,
+        'password': password,
+        'device_name': 'Ensemble Mobile App',
+      });
+
+      _logger.log('RemoteBridge: Login result: $loginResult');
+
+      // Check for error response
+      if (loginResult.containsKey('error_code')) {
+        _logger.log('RemoteBridge: Login error: ${loginResult['details']}');
+        return false;
+      }
+
+      String? accessToken;
+      if (loginResult['result'] != null) {
+        final result = loginResult['result'];
+        if (result is Map<String, dynamic>) {
+          if (result['success'] == true) {
+            accessToken = result['access_token'] as String?;
+            final user = result['user'] as Map<String, dynamic>?;
+            _logger.log('RemoteBridge: Login successful! User: ${user?['username']}');
+          }
+        }
+      }
+
+      if (accessToken == null) {
+        _logger.log('RemoteBridge: No access token received');
+        return false;
+      }
+
+      // Step 2: Authenticate the session with the token
+      _logger.log('RemoteBridge: Authenticating session with token...');
+      final authResult = await _webrtcConnection!.sendRequest('auth', {
+        'token': accessToken,
+      });
+
+      _logger.log('RemoteBridge: Auth result: $authResult');
+
+      if (authResult.containsKey('error_code')) {
+        _logger.log('RemoteBridge: Session auth failed: ${authResult['details']}');
+        return false;
+      }
+
+      _logger.log('RemoteBridge: Session authenticated successfully!');
+      return true;
+    } catch (e) {
+      _logger.log('RemoteBridge: Auth error: $e');
+      return false;
+    }
+  }
+
+  /// Handle incoming HTTP requests and upgrade to WebSocket.
+  void _handleHttpRequest(HttpRequest request) async {
+    final path = request.uri.path;
+    _logger.log('RemoteBridge: Incoming HTTP request: $path');
+
+    if (WebSocketTransformer.isUpgradeRequest(request)) {
+      try {
+        final socket = await WebSocketTransformer.upgrade(request);
+
+        // Route based on path: /sendspin for audio, anything else for API
+        if (path == '/sendspin') {
+          _handleSendspinConnection(socket);
+        } else {
+          _handleApiConnection(socket);
+        }
+      } catch (e) {
+        _logger.log('RemoteBridge: WebSocket upgrade failed: $e');
+        request.response.statusCode = HttpStatus.internalServerError;
+        await request.response.close();
+      }
+    } else {
+      // Not a WebSocket request
+      request.response.statusCode = HttpStatus.badRequest;
+      await request.response.close();
+    }
+  }
+
+  /// Handle a new API WebSocket client connection.
+  void _handleApiConnection(WebSocket socket) {
+    _logger.log('RemoteBridge: API client connected');
+
+    // Only allow one API client at a time
+    if (_apiClientSocket != null) {
+      _logger.log('RemoteBridge: Closing existing API client connection');
+      _apiClientSubscription?.cancel();
+      _apiClientSocket?.close();
+    }
+
+    _apiClientSocket = socket;
+
+    // Step 1: Send cached server hello immediately
+    if (_cachedServerHello != null) {
+      _logger.log('RemoteBridge: Sending cached server hello to API client');
+      _apiClientSocket!.add(_cachedServerHello!);
+    }
+
+    // Step 2: Forward all messages from API client to WebRTC (ma-api channel)
+    _apiClientSubscription = _apiClientSocket!.listen(
+      (message) {
+        if (message is String && _webrtcConnection != null) {
+          _apiMessagesSent++;
+          _webrtcConnection!.sendRaw(message);
+        }
+      },
+      onDone: () {
+        _logger.log('RemoteBridge: API client disconnected');
+        _apiClientSocket = null;
+        _apiClientSubscription = null;
+      },
+      onError: (error) {
+        _logger.log('RemoteBridge: API client error: $error');
+        _apiClientSocket = null;
+        _apiClientSubscription = null;
+      },
+    );
+  }
+
+  /// Handle a new Sendspin WebSocket client connection (for audio streaming).
+  void _handleSendspinConnection(WebSocket socket) {
+    _logger.log('RemoteBridge: Sendspin client connected');
+
+    // Only allow one Sendspin client at a time
+    if (_sendspinClientSocket != null) {
+      _logger.log('RemoteBridge: Closing existing Sendspin client connection');
+      _sendspinClientSubscription?.cancel();
+      _sendspinClientSocket?.close();
+    }
+
+    _sendspinClientSocket = socket;
+
+    // Forward all messages from Sendspin client to WebRTC (sendspin channel)
+    _sendspinClientSubscription = _sendspinClientSocket!.listen(
+      (message) {
+        if (_webrtcConnection != null) {
+          _sendspinMessagesSent++;
+          if (message is String) {
+            // Text message (JSON control)
+            _webrtcConnection!.sendSendspinText(message);
+          } else if (message is List<int>) {
+            // Binary message (would be audio data from client, unlikely but handle it)
+            _webrtcConnection!.sendSendspinBinary(Uint8List.fromList(message));
+          }
+        }
+      },
+      onDone: () {
+        _logger.log('RemoteBridge: Sendspin client disconnected');
+        _sendspinClientSocket = null;
+        _sendspinClientSubscription = null;
+      },
+      onError: (error) {
+        _logger.log('RemoteBridge: Sendspin client error: $error');
+        _sendspinClientSocket = null;
+        _sendspinClientSubscription = null;
+      },
+    );
+  }
+
+  /// Handle WebRTC disconnection - attempt reconnection.
+  void _handleWebRTCDisconnection() {
+    _logger.log('RemoteBridge: WebRTC disconnected');
+
+    // Don't close WS clients immediately - they will reconnect when WebRTC is back
+    // Instead, attempt to reconnect WebRTC
+    _scheduleReconnect();
+  }
+
+  /// Schedule a WebRTC reconnection attempt.
+  void _scheduleReconnect() {
+    if (_isReconnecting) {
+      _logger.log('RemoteBridge: Already reconnecting, skipping');
+      return;
+    }
+
+    if (_remoteId == null || _username == null || _password == null) {
+      _logger.log('RemoteBridge: No connection parameters, cannot reconnect');
+      _setState(RemoteBridgeState.failed);
+      _emitError(RemoteBridgeErrorType.webrtcConnection, 'Cannot reconnect - no connection parameters');
+      _closeAllClients();
+      return;
+    }
+
+    if (_reconnectAttempts >= _maxReconnectAttempts) {
+      _logger.log('RemoteBridge: Max reconnect attempts reached, giving up');
+      _setState(RemoteBridgeState.failed);
+      _emitError(RemoteBridgeErrorType.webrtcConnection, 'Max reconnection attempts reached');
+      _closeAllClients();
+      return;
+    }
+
+    _setState(RemoteBridgeState.reconnecting);
+    _reconnectAttempts++;
+    _totalReconnections++;
+
+    // Use longer delay if rate limited, otherwise exponential backoff
+    final Duration delay;
+    if (_isRateLimited) {
+      delay = _rateLimitDelay;
+      _logger.log('RemoteBridge: Rate limited - waiting ${delay.inSeconds}s before reconnect attempt $_reconnectAttempts/$_maxReconnectAttempts');
+    } else {
+      delay = _reconnectDelay * _reconnectAttempts;
+      _logger.log('RemoteBridge: Scheduling reconnect attempt $_reconnectAttempts/$_maxReconnectAttempts in ${delay.inSeconds}s');
+    }
+
+    _reconnectTimer?.cancel();
+    _reconnectTimer = Timer(delay, _reconnectWebRTC);
+  }
+
+  /// Attempt to reconnect WebRTC.
+  Future<void> _reconnectWebRTC() async {
+    if (_isReconnecting) return;
+    _isReconnecting = true;
+
+    _logger.log('RemoteBridge: Attempting WebRTC reconnection...');
+
+    try {
+      // Clean up subscriptions but keep the WebView connection (it's still in the widget tree)
+      _apiWebrtcSubscription?.cancel();
+      _sendspinTextSubscription?.cancel();
+      _sendspinBinarySubscription?.cancel();
+      await _webrtcConnection?.disconnect();
+
+      // Reuse existing WebView connection (WebView is already in widget tree)
+      // If somehow null, create a new one (shouldn't happen in normal flow)
+      _webrtcConnection ??= WebViewWebRTCConnection();
+
+      _webrtcConnection!.onStateChanged = (state) {
+        _logger.log('RemoteBridge: WebRTC state (reconnect): $state');
+        if (state == WebViewWebRTCConnectionState.disconnected ||
+            state == WebViewWebRTCConnectionState.failed) {
+          _isReconnecting = false;
+          _handleWebRTCDisconnection();
+        } else if (state == WebViewWebRTCConnectionState.connected) {
+          _reconnectAttempts = 0; // Reset on successful connection
+        }
+      };
+
+      _webrtcConnection!.onError = (error) {
+        _logger.log('RemoteBridge: WebRTC error (reconnect): $error');
+        // Detect rate limiting from signaling server
+        if (error.toLowerCase().contains('rate limit')) {
+          _logger.log('RemoteBridge: Rate limited - will wait ${_rateLimitDelay.inSeconds}s before retry');
+          _isRateLimited = true;
+        }
+      };
+
+      final connected = await _webrtcConnection!.connect(_remoteId!);
+      if (!connected) {
+        _logger.log('RemoteBridge: WebRTC reconnection failed');
+        _isReconnecting = false;
+        _scheduleReconnect();
+        return;
+      }
+
+      _logger.log('RemoteBridge: WebRTC reconnected, re-authenticating...');
+
+      // Re-authenticate
+      final authenticated = await _authenticate(_username!, _password!);
+      if (!authenticated) {
+        _logger.log('RemoteBridge: Re-authentication failed');
+        _isReconnecting = false;
+        _scheduleReconnect();
+        return;
+      }
+
+      _logger.log('RemoteBridge: Re-authentication successful');
+
+      // Re-cache server hello
+      if (_webrtcConnection!.serverInfo != null) {
+        _cachedServerHello = jsonEncode(_webrtcConnection!.serverInfo);
+        _logger.log('RemoteBridge: Re-cached server hello');
+      }
+
+      // Re-subscribe to WebRTC streams
+      _apiWebrtcSubscription = _webrtcConnection!.rawMessages.listen((message) {
+        _apiMessagesReceived++;
+        _lastMessageReceived = DateTime.now();
+        if (_apiClientSocket != null) {
+          _apiClientSocket!.add(message);
+        }
+      });
+
+      _sendspinTextSubscription = _webrtcConnection!.sendspinTextMessages.listen((message) {
+        _sendspinMessagesReceived++;
+        _lastMessageReceived = DateTime.now();
+        if (_sendspinClientSocket != null) {
+          _sendspinClientSocket!.add(message);
+        }
+      });
+
+      _sendspinBinarySubscription = _webrtcConnection!.sendspinBinaryMessages.listen((data) {
+        _sendspinMessagesReceived++;
+        if (_sendspinClientSocket != null) {
+          _sendspinClientSocket!.add(data);
+        }
+      });
+
+      _logger.log('RemoteBridge: ✅ WebRTC reconnection complete');
+      _setState(RemoteBridgeState.connected);
+      _isReconnecting = false;
+      _reconnectAttempts = 0;
+      _isRateLimited = false;
+    } catch (e) {
+      _logger.log('RemoteBridge: Reconnection error: $e');
+      _emitError(RemoteBridgeErrorType.webrtcConnection, e.toString());
+      _isReconnecting = false;
+      _scheduleReconnect();
+    }
+  }
+
+  /// Close all WS clients (called when giving up on reconnection).
+  void _closeAllClients() {
+    _logger.log('RemoteBridge: Closing all WS clients');
+
+    _apiClientSocket?.close();
+    _apiClientSocket = null;
+    _apiClientSubscription?.cancel();
+    _apiClientSubscription = null;
+
+    _sendspinClientSocket?.close();
+    _sendspinClientSocket = null;
+    _sendspinClientSubscription?.cancel();
+    _sendspinClientSubscription = null;
+  }
+
+  /// Start periodic health check to monitor connection state
+  void _startHealthCheck() {
+    _healthCheckTimer?.cancel();
+    _healthCheckTimer = Timer.periodic(const Duration(seconds: 10), (_) {
+      final dcState = _webrtcConnection?.dataChannelStateDebug ?? 'no connection';
+      final sendspinState = _webrtcConnection?.isSendspinConnected ?? false;
+      final wcState = _webrtcConnection?.state.toString() ?? 'no connection';
+      final timeSinceLastMsg = _lastMessageReceived != null
+          ? DateTime.now().difference(_lastMessageReceived!).inSeconds
+          : -1;
+      _logger.log('RemoteBridge: Health check - API DC:$dcState, Sendspin:$sendspinState, WC:$wcState, '
+          'API sent:$_apiMessagesSent recv:$_apiMessagesReceived, '
+          'Sendspin sent:$_sendspinMessagesSent recv:$_sendspinMessagesReceived, '
+          'lastRecv:${timeSinceLastMsg}s ago');
+    });
+  }
+
+  /// Stop the bridge and disconnect from the remote server.
+  Future<void> stop() async {
+    _logger.log('RemoteBridge: Stopping bridge');
+    _setState(RemoteBridgeState.disconnected);
+
+    // Cancel reconnection
+    _reconnectTimer?.cancel();
+    _reconnectTimer = null;
+    _isReconnecting = false;
+    _reconnectAttempts = 0;
+
+    _healthCheckTimer?.cancel();
+    _healthCheckTimer = null;
+
+    // Cancel API subscriptions
+    _apiClientSubscription?.cancel();
+    _apiClientSubscription = null;
+    _apiWebrtcSubscription?.cancel();
+    _apiWebrtcSubscription = null;
+
+    // Cancel Sendspin subscriptions
+    _sendspinClientSubscription?.cancel();
+    _sendspinClientSubscription = null;
+    _sendspinTextSubscription?.cancel();
+    _sendspinTextSubscription = null;
+    _sendspinBinarySubscription?.cancel();
+    _sendspinBinarySubscription = null;
+
+    // Close client sockets
+    await _apiClientSocket?.close();
+    _apiClientSocket = null;
+    await _sendspinClientSocket?.close();
+    _sendspinClientSocket = null;
+
+    await _server?.close(force: true);
+    _server = null;
+    _port = null;
+
+    await _webrtcConnection?.disconnect();
+    _webrtcConnection = null;
+
+    _cachedServerHello = null;
+
+    // Clear connection parameters
+    _remoteId = null;
+    _username = null;
+    _password = null;
+
+    _logger.log('RemoteBridge: Bridge stopped');
+  }
+
+  /// Dispose the bridge and close all stream controllers.
+  void dispose() {
+    stop();
+    _stateController.close();
+    _errorController.close();
+  }
+}
@@ -0,0 +1,174 @@
+import 'dart:async';
+import 'package:ensemble/services/remote/webrtc_connection.dart';
+import 'package:ensemble/services/debug_logger.dart';
+
+/// Manages remote connections to MA servers via WebRTC
+class RemoteConnectionManager {
+  final WebRTCConnection _connection = WebRTCConnection();
+
+  StreamSubscription? _messageSubscription;
+  final _eventController = StreamController<Map<String, dynamic>>.broadcast();
+
+  bool _isAuthenticated = false;
+  String? _serverVersion;
+
+  // Callbacks
+  Function(bool connected)? onConnectionChanged;
+  Function(String error)? onError;
+
+  bool get isConnected => _connection.isConnected && _isAuthenticated;
+  Stream<Map<String, dynamic>> get events => _eventController.stream;
+  String? get serverVersion => _serverVersion;
+
+  RemoteConnectionManager() {
+    _connection.onStateChanged = _onConnectionStateChanged;
+    _connection.onError = (error) => onError?.call(error);
+
+    // Forward events from the data channel
+    _messageSubscription = _connection.messages.listen((message) {
+      // Check if this is an event (has 'event' key)
+      if (message.containsKey('event')) {
+        _eventController.add(message);
+      }
+    });
+  }
+
+  /// Connect to a remote MA server using Remote Access ID
+  Future<bool> connect(String remoteId, String username, String password) async {
+    DebugLogger().log('RemoteConnection: Connecting to remote ID: $remoteId');
+
+    // Connect WebRTC
+    final connected = await _connection.connect(remoteId);
+    if (!connected) {
+      DebugLogger().log('RemoteConnection: WebRTC connection failed');
+      return false;
+    }
+
+    DebugLogger().log('RemoteConnection: WebRTC connected, authenticating...');
+
+    // Authenticate with MA
+    try {
+      final authenticated = await _authenticate(username, password);
+      if (!authenticated) {
+        DebugLogger().log('RemoteConnection: Authentication failed');
+        await _connection.disconnect();
+        return false;
+      }
+
+      _isAuthenticated = true;
+      DebugLogger().log('RemoteConnection: Fully connected and authenticated');
+      onConnectionChanged?.call(true);
+      return true;
+    } catch (e) {
+      DebugLogger().log('RemoteConnection: Auth error: $e');
+      await _connection.disconnect();
+      return false;
+    }
+  }
+
+  /// Authenticate with the MA server
+  Future<bool> _authenticate(String username, String password) async {
+    try {
+      // Step 1: Login to get access token
+      DebugLogger().log('RemoteConnection: Sending auth/login...');
+      final loginResult = await _connection.sendRequest('auth/login', {
+        'username': username,
+        'password': password,
+        'device_name': 'Ensemble Mobile App',
+      });
+
+      DebugLogger().log('RemoteConnection: Login result: $loginResult');
+
+      // Check for error response
+      if (loginResult.containsKey('error_code')) {
+        DebugLogger().log('RemoteConnection: Login error: ${loginResult['details']}');
+        return false;
+      }
+
+      String? accessToken;
+      if (loginResult['result'] != null) {
+        final result = loginResult['result'];
+
+        if (result is Map<String, dynamic>) {
+          if (result['success'] == true) {
+            accessToken = result['access_token'] as String?;
+            final user = result['user'] as Map<String, dynamic>?;
+
+            DebugLogger().log('RemoteConnection: Login successful!');
+            DebugLogger().log('RemoteConnection: User: ${user?['username']} (${user?['role']})');
+          }
+        }
+      }
+
+      if (accessToken == null) {
+        DebugLogger().log('RemoteConnection: No access token received');
+        return false;
+      }
+
+      // Step 2: Authenticate the session with the token
+      DebugLogger().log('RemoteConnection: Authenticating session with token...');
+      final authResult = await _connection.sendRequest('auth', {
+        'token': accessToken,
+      });
+
+      DebugLogger().log('RemoteConnection: Auth result: $authResult');
+
+      if (authResult.containsKey('error_code')) {
+        DebugLogger().log('RemoteConnection: Session auth failed: ${authResult['details']}');
+        return false;
+      }
+
+      // Store the token for later use
+      _accessToken = accessToken;
+      DebugLogger().log('RemoteConnection: Session authenticated successfully!');
+      return true;
+    } catch (e) {
+      DebugLogger().log('RemoteConnection: Login error: $e');
+      return false;
+    }
+  }
+
+  String? _accessToken;
+
+  /// Send a command to the MA server
+  Future<Map<String, dynamic>> sendCommand(
+    String command, [
+    Map<String, dynamic>? params,
+  ]) async {
+    if (!_connection.isConnected) {
+      throw Exception('Not connected');
+    }
+
+    return await _connection.sendRequest(command, params);
+  }
+
+  /// Subscribe to events from the server
+  Future<void> subscribe(List<String> eventTypes) async {
+    await sendCommand('subscribe_events', {
+      'event_types': eventTypes,
+    });
+  }
+
+  /// Disconnect from the remote server
+  Future<void> disconnect() async {
+    _isAuthenticated = false;
+    await _connection.disconnect();
+    onConnectionChanged?.call(false);
+  }
+
+  void _onConnectionStateChanged(WebRTCConnectionState state) {
+    DebugLogger().log('RemoteConnection: State changed to $state');
+
+    if (state == WebRTCConnectionState.disconnected ||
+        state == WebRTCConnectionState.failed) {
+      _isAuthenticated = false;
+      onConnectionChanged?.call(false);
+    }
+  }
+
+  void dispose() {
+    _messageSubscription?.cancel();
+    _eventController.close();
+    _connection.dispose();
+  }
+}
@@ -0,0 +1,272 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:web_socket_channel/web_socket_channel.dart';
+import 'package:ensemble/services/debug_logger.dart';
+
+/// Message types for the MA signaling protocol
+class SignalingMessageType {
+  static const String ping = 'ping';
+  static const String pong = 'pong';
+  static const String connectRequest = 'connect-request';
+  static const String connected = 'connected';
+  static const String offer = 'offer';
+  static const String answer = 'answer';
+  static const String iceCandidate = 'ice-candidate';
+  static const String peerDisconnected = 'peer-disconnected';
+  static const String error = 'error';
+}
+
+/// ICE server configuration from signaling
+class IceServer {
+  final List<String> urls;
+  final String? username;
+  final String? credential;
+
+  IceServer({
+    required this.urls,
+    this.username,
+    this.credential,
+  });
+
+  factory IceServer.fromJson(Map<String, dynamic> json) {
+    // Handle urls as either String or List<String>
+    final urlsRaw = json['urls'];
+    final List<String> urls;
+    if (urlsRaw is String) {
+      urls = [urlsRaw];
+    } else if (urlsRaw is List) {
+      urls = urlsRaw.cast<String>();
+    } else {
+      urls = [];
+    }
+
+    return IceServer(
+      urls: urls,
+      username: json['username'] as String?,
+      credential: json['credential'] as String?,
+    );
+  }
+
+  Map<String, dynamic> toWebRtcConfig() {
+    final config = <String, dynamic>{'urls': urls};
+    if (username != null) config['username'] = username;
+    if (credential != null) config['credential'] = credential;
+    return config;
+  }
+}
+
+/// Client for connecting to the MA signaling server
+class SignalingClient {
+  static const String _signalingUrl = 'wss://signaling.music-assistant.io/ws';
+
+  WebSocketChannel? _channel;
+  StreamSubscription? _subscription;
+  Timer? _pingTimer;
+
+  String? _sessionId;
+  String? _remoteId;
+  List<IceServer> _iceServers = [];
+  bool _isConnected = false;
+
+  // Callbacks
+  Function(String sessionId, List<IceServer> iceServers)? onConnected;
+  Function(Map<String, dynamic> answer)? onAnswer;
+  Function(Map<String, dynamic> candidate)? onIceCandidate;
+  Function(String error)? onError;
+  Function()? onPeerDisconnected;
+  Function()? onDisconnected;
+
+  String? get sessionId => _sessionId;
+  List<IceServer> get iceServers => _iceServers;
+  bool get isConnected => _isConnected;
+
+  /// Connect to the signaling server and request connection to a remote MA server
+  Future<bool> connect(String remoteId) async {
+    DebugLogger().log('Signaling: Connecting to $_signalingUrl');
+
+    try {
+      // Normalize remote ID (remove dashes, uppercase)
+      final normalizedId = remoteId.replaceAll('-', '').toUpperCase();
+      _remoteId = normalizedId;
+      DebugLogger().log('Signaling: Remote ID: $normalizedId');
+
+      _channel = WebSocketChannel.connect(Uri.parse(_signalingUrl));
+      await _channel!.ready;
+
+      _subscription = _channel!.stream.listen(
+        _handleMessage,
+        onError: (error) {
+          DebugLogger().log('Signaling: WebSocket error: $error');
+          onError?.call(error.toString());
+          _cleanup();
+        },
+        onDone: () {
+          DebugLogger().log('Signaling: WebSocket closed');
+          onDisconnected?.call();
+          _cleanup();
+        },
+      );
+
+      // Start ping timer to keep connection alive
+      _startPingTimer();
+
+      // Send connect request
+      _send({
+        'type': SignalingMessageType.connectRequest,
+        'remoteId': normalizedId,
+      });
+
+      return true;
+    } catch (e) {
+      DebugLogger().log('Signaling: Failed to connect: $e');
+      onError?.call(e.toString());
+      return false;
+    }
+  }
+
+  /// Send WebRTC offer to the remote server
+  void sendOffer(Map<String, dynamic> offer) {
+    if (_sessionId == null || _remoteId == null) {
+      DebugLogger().log('Signaling: Cannot send offer - no session');
+      return;
+    }
+
+    _send({
+      'type': SignalingMessageType.offer,
+      'remoteId': _remoteId,
+      'sessionId': _sessionId,
+      'data': offer,
+    });
+  }
+
+  /// Send ICE candidate to the remote server
+  void sendIceCandidate(Map<String, dynamic> candidate) {
+    if (_sessionId == null || _remoteId == null) {
+      DebugLogger().log('Signaling: Cannot send ICE candidate - no session');
+      return;
+    }
+
+    _send({
+      'type': SignalingMessageType.iceCandidate,
+      'remoteId': _remoteId,
+      'sessionId': _sessionId,
+      'data': candidate,
+    });
+  }
+
+  /// Disconnect from the signaling server
+  void disconnect() {
+    DebugLogger().log('Signaling: Disconnecting');
+    _cleanup();
+  }
+
+  void _handleMessage(dynamic data) {
+    try {
+      final message = jsonDecode(data as String) as Map<String, dynamic>;
+      final type = message['type'] as String?;
+
+      DebugLogger().log('Signaling: Received message type: $type');
+
+      switch (type) {
+        case SignalingMessageType.ping:
+          // Server is pinging us - respond with pong to keep connection alive
+          _send({'type': SignalingMessageType.pong});
+          break;
+
+        case SignalingMessageType.pong:
+          // Ignore pong responses to our pings
+          break;
+
+        case SignalingMessageType.connected:
+          _handleConnected(message);
+          break;
+
+        case SignalingMessageType.answer:
+          _handleAnswer(message);
+          break;
+
+        case SignalingMessageType.iceCandidate:
+          _handleIceCandidate(message);
+          break;
+
+        case SignalingMessageType.peerDisconnected:
+          DebugLogger().log('Signaling: Peer disconnected');
+          onPeerDisconnected?.call();
+          break;
+
+        case SignalingMessageType.error:
+          final error = message['error'] as String? ?? 'Unknown error';
+          DebugLogger().log('Signaling: Error from server: $error');
+          onError?.call(error);
+          break;
+
+        default:
+          DebugLogger().log('Signaling: Unknown message type: $type');
+      }
+    } catch (e) {
+      DebugLogger().log('Signaling: Failed to handle message: $e');
+    }
+  }
+
+  void _handleConnected(Map<String, dynamic> message) {
+    _sessionId = message['sessionId'] as String?;
+    _isConnected = true;
+
+    // Parse ICE servers
+    final iceServersJson = message['iceServers'] as List<dynamic>?;
+    if (iceServersJson != null) {
+      _iceServers = iceServersJson
+          .map((s) => IceServer.fromJson(s as Map<String, dynamic>))
+          .toList();
+    }
+
+    DebugLogger().log('Signaling: Connected with session $_sessionId');
+    DebugLogger().log('Signaling: Received ${_iceServers.length} ICE servers');
+
+    onConnected?.call(_sessionId!, _iceServers);
+  }
+
+  void _handleAnswer(Map<String, dynamic> message) {
+    final answer = message['data'] as Map<String, dynamic>?;
+    if (answer != null) {
+      DebugLogger().log('Signaling: Received answer');
+      onAnswer?.call(answer);
+    }
+  }
+
+  void _handleIceCandidate(Map<String, dynamic> message) {
+    final candidate = message['data'] as Map<String, dynamic>?;
+    if (candidate != null) {
+      DebugLogger().log('Signaling: Received ICE candidate');
+      onIceCandidate?.call(candidate);
+    }
+  }
+
+  void _send(Map<String, dynamic> message) {
+    if (_channel == null) return;
+
+    final json = jsonEncode(message);
+    DebugLogger().log('Signaling: Sending ${message['type']}');
+    _channel!.sink.add(json);
+  }
+
+  void _startPingTimer() {
+    _pingTimer?.cancel();
+    // Send ping every 15 seconds to keep connection alive
+    _pingTimer = Timer.periodic(const Duration(seconds: 15), (_) {
+      _send({'type': SignalingMessageType.ping});
+    });
+  }
+
+  void _cleanup() {
+    _pingTimer?.cancel();
+    _pingTimer = null;
+    _subscription?.cancel();
+    _subscription = null;
+    _channel?.sink.close();
+    _channel = null;
+    _sessionId = null;
+    _remoteId = null;
+    _isConnected = false;
+  }
+}
@@ -0,0 +1,506 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:typed_data';
+import 'package:flutter_webrtc/flutter_webrtc.dart';
+import 'package:uuid/uuid.dart';
+import 'package:ensemble/services/remote/signaling_client.dart';
+import 'package:ensemble/services/debug_logger.dart';
+
+/// WebRTC connection state
+enum WebRTCConnectionState {
+  disconnected,
+  connecting,
+  connected,
+  failed,
+}
+
+/// Manages a WebRTC peer connection for remote MA access
+class WebRTCConnection {
+  RTCPeerConnection? _peerConnection;
+  RTCDataChannel? _dataChannel;
+  RTCDataChannel? _sendspinDataChannel;
+  final SignalingClient _signalingClient = SignalingClient();
+  final _uuid = const Uuid();
+
+  WebRTCConnectionState _state = WebRTCConnectionState.disconnected;
+  Completer<bool>? _connectionCompleter;
+  bool _serverHelloReceived = false;
+  Completer<void>? _serverHelloCompleter;
+
+  // Message handling for MA API
+  final _messageController = StreamController<Map<String, dynamic>>.broadcast();
+  final _rawMessageController = StreamController<String>.broadcast();
+  final Map<String, Completer<Map<String, dynamic>>> _pendingRequests = {};
+
+  // Sendspin message handling (text and binary)
+  final _sendspinTextController = StreamController<String>.broadcast();
+  final _sendspinBinaryController = StreamController<Uint8List>.broadcast();
+
+  // Server info
+  Map<String, dynamic>? serverInfo;
+
+  // Callbacks
+  Function(WebRTCConnectionState state)? onStateChanged;
+  Function(String error)? onError;
+
+  WebRTCConnectionState get state => _state;
+  Stream<Map<String, dynamic>> get messages => _messageController.stream;
+  Stream<String> get rawMessages => _rawMessageController.stream;
+  bool get isConnected => _state == WebRTCConnectionState.connected;
+
+  // Sendspin channel streams
+  Stream<String> get sendspinTextMessages => _sendspinTextController.stream;
+  Stream<Uint8List> get sendspinBinaryMessages => _sendspinBinaryController.stream;
+  bool get isSendspinConnected =>
+      _sendspinDataChannel?.state == RTCDataChannelState.RTCDataChannelOpen;
+
+  /// Connect to a remote MA server using the Remote Access ID
+  Future<bool> connect(String remoteId) async {
+    if (_state == WebRTCConnectionState.connecting) {
+      DebugLogger().log('WebRTC: Already connecting');
+      return false;
+    }
+
+    _setState(WebRTCConnectionState.connecting);
+    _connectionCompleter = Completer<bool>();
+
+    try {
+      // Set up signaling callbacks
+      _signalingClient.onConnected = _onSignalingConnected;
+      _signalingClient.onAnswer = _onAnswer;
+      _signalingClient.onIceCandidate = _onRemoteIceCandidate;
+      _signalingClient.onError = _onSignalingError;
+      _signalingClient.onPeerDisconnected = _onPeerDisconnected;
+      _signalingClient.onDisconnected = _onSignalingDisconnected;
+
+      // Connect to signaling server
+      final connected = await _signalingClient.connect(remoteId);
+      if (!connected) {
+        _setState(WebRTCConnectionState.failed);
+        return false;
+      }
+
+      // Wait for connection to complete (with timeout)
+      final result = await _connectionCompleter!.future.timeout(
+        const Duration(seconds: 30),
+        onTimeout: () {
+          DebugLogger().log('WebRTC: Connection timeout');
+          _onSignalingError('Connection timeout');
+          return false;
+        },
+      );
+
+      return result;
+    } catch (e) {
+      DebugLogger().log('WebRTC: Connection error: $e');
+      _setState(WebRTCConnectionState.failed);
+      onError?.call(e.toString());
+      return false;
+    }
+  }
+
+  /// Send a JSON-RPC request and wait for response
+  Future<Map<String, dynamic>> sendRequest(
+    String command, [
+    Map<String, dynamic>? params,
+  ]) async {
+    if (_dataChannel == null || _dataChannel!.state != RTCDataChannelState.RTCDataChannelOpen) {
+      throw Exception('Data channel not open');
+    }
+
+    final messageId = _uuid.v4();
+    final request = {
+      'message_id': messageId,
+      'command': command,
+      if (params != null) 'args': params,
+    };
+
+    final completer = Completer<Map<String, dynamic>>();
+    _pendingRequests[messageId] = completer;
+
+    final jsonStr = jsonEncode(request);
+    DebugLogger().log('WebRTC: Sending request: $jsonStr');
+    _dataChannel!.send(RTCDataChannelMessage(jsonStr));
+
+    // Timeout after 30 seconds
+    return completer.future.timeout(
+      const Duration(seconds: 30),
+      onTimeout: () {
+        _pendingRequests.remove(messageId);
+        throw TimeoutException('Request timed out: $command');
+      },
+    );
+  }
+
+  /// Send a raw message without waiting for response (for bridge passthrough)
+  void sendRaw(String message) {
+    if (_dataChannel == null) {
+      DebugLogger().log('WebRTC: Cannot send raw - data channel is null');
+      return;
+    }
+
+    final state = _dataChannel!.state;
+    if (state != RTCDataChannelState.RTCDataChannelOpen) {
+      DebugLogger().log('WebRTC: Cannot send raw - data channel state: $state');
+      return;
+    }
+
+    DebugLogger().log('WebRTC: Sending raw: ${message.substring(0, message.length > 100 ? 100 : message.length)}...');
+    _dataChannel!.send(RTCDataChannelMessage(message));
+  }
+
+  /// Check if the data channel is healthy
+  bool get isDataChannelHealthy {
+    if (_dataChannel == null) return false;
+    return _dataChannel!.state == RTCDataChannelState.RTCDataChannelOpen;
+  }
+
+  /// Get data channel state for debugging
+  String get dataChannelStateDebug {
+    if (_dataChannel == null) return 'null';
+    return _dataChannel!.state.toString();
+  }
+
+  /// Disconnect from the remote server
+  Future<void> disconnect() async {
+    DebugLogger().log('WebRTC: Disconnecting');
+
+    _signalingClient.disconnect();
+    await _dataChannel?.close();
+    await _sendspinDataChannel?.close();
+    await _peerConnection?.close();
+
+    _dataChannel = null;
+    _sendspinDataChannel = null;
+    _peerConnection = null;
+
+    // Complete all pending requests with an error before clearing
+    _completePendingRequestsWithError('WebRTC connection disconnected');
+
+    _serverHelloReceived = false;
+    _serverHelloCompleter = null;
+    serverInfo = null;
+
+    _setState(WebRTCConnectionState.disconnected);
+  }
+
+  /// Complete all pending requests with an error message
+  void _completePendingRequestsWithError(String reason) {
+    for (final entry in _pendingRequests.entries) {
+      if (!entry.value.isCompleted) {
+        entry.value.completeError(Exception(reason));
+      }
+    }
+    _pendingRequests.clear();
+  }
+
+  void _setState(WebRTCConnectionState newState) {
+    if (_state != newState) {
+      DebugLogger().log('WebRTC: State changed: $_state -> $newState');
+      _state = newState;
+      onStateChanged?.call(newState);
+    }
+  }
+
+  Future<void> _onSignalingConnected(String sessionId, List<IceServer> iceServers) async {
+    DebugLogger().log('WebRTC: Signaling connected, creating peer connection');
+
+    try {
+      // Configure Android audio to NOT manage focus since we only use data channels
+      // This prevents flutter_webrtc from interfering with system audio/speakers
+      await AndroidNativeAudioManagement.setAndroidAudioConfiguration(
+        AndroidAudioConfiguration(
+          manageAudioFocus: false,
+        ),
+      );
+      DebugLogger().log('WebRTC: Android audio configured - manageAudioFocus: false');
+
+      // Create peer connection with ICE servers
+      final config = <String, dynamic>{
+        'iceServers': iceServers.map((s) => s.toWebRtcConfig()).toList(),
+        'sdpSemantics': 'unified-plan',
+      };
+
+      DebugLogger().log('WebRTC: ICE servers: ${config['iceServers']}');
+
+      _peerConnection = await createPeerConnection(config);
+
+      // Set up peer connection callbacks
+      _peerConnection!.onIceCandidate = _onLocalIceCandidate;
+      _peerConnection!.onIceConnectionState = _onIceConnectionState;
+      _peerConnection!.onConnectionState = _onConnectionState;
+      _peerConnection!.onDataChannel = _onDataChannel;
+
+      // Create data channel for MA API
+      final dataChannelInit = RTCDataChannelInit()
+        ..ordered = true
+        ..protocol = 'ma-api';
+
+      _dataChannel = await _peerConnection!.createDataChannel('ma-api', dataChannelInit);
+      _setupDataChannel(_dataChannel!);
+
+      // TEST: Sendspin channel DISABLED to test if multi-channel bug causes disconnects
+      // If stability improves, the flutter_webrtc multi-channel bug is confirmed
+      DebugLogger().log('WebRTC: ⚠️ TEST BUILD - Sendspin channel DISABLED (single channel mode)');
+      // final sendspinChannelInit = RTCDataChannelInit()
+      //   ..ordered = true
+      //   ..protocol = 'sendspin';
+      // _sendspinDataChannel = await _peerConnection!.createDataChannel('sendspin', sendspinChannelInit);
+      // _setupSendspinDataChannel(_sendspinDataChannel!);
+
+      // Create and send offer
+      final offer = await _peerConnection!.createOffer();
+      await _peerConnection!.setLocalDescription(offer);
+
+      DebugLogger().log('WebRTC: Sending offer');
+      _signalingClient.sendOffer({
+        'type': offer.type,
+        'sdp': offer.sdp,
+      });
+    } catch (e) {
+      DebugLogger().log('WebRTC: Failed to create peer connection: $e');
+      _onSignalingError(e.toString());
+    }
+  }
+
+  Future<void> _onAnswer(Map<String, dynamic> answer) async {
+    DebugLogger().log('WebRTC: Received answer');
+
+    try {
+      final description = RTCSessionDescription(
+        answer['sdp'] as String?,
+        answer['type'] as String?,
+      );
+      await _peerConnection?.setRemoteDescription(description);
+    } catch (e) {
+      DebugLogger().log('WebRTC: Failed to set remote description: $e');
+      _onSignalingError(e.toString());
+    }
+  }
+
+  void _onLocalIceCandidate(RTCIceCandidate candidate) {
+    DebugLogger().log('WebRTC: Local ICE candidate: ${candidate.candidate?.substring(0, 50)}...');
+
+    _signalingClient.sendIceCandidate({
+      'candidate': candidate.candidate,
+      'sdpMid': candidate.sdpMid,
+      'sdpMLineIndex': candidate.sdpMLineIndex,
+    });
+  }
+
+  Future<void> _onRemoteIceCandidate(Map<String, dynamic> candidateData) async {
+    DebugLogger().log('WebRTC: Remote ICE candidate received');
+
+    try {
+      final candidate = RTCIceCandidate(
+        candidateData['candidate'] as String?,
+        candidateData['sdpMid'] as String?,
+        candidateData['sdpMLineIndex'] as int?,
+      );
+      await _peerConnection?.addCandidate(candidate);
+    } catch (e) {
+      DebugLogger().log('WebRTC: Failed to add ICE candidate: $e');
+    }
+  }
+
+  void _onIceConnectionState(RTCIceConnectionState state) {
+    DebugLogger().log('WebRTC: ICE connection state: $state');
+
+    switch (state) {
+      case RTCIceConnectionState.RTCIceConnectionStateFailed:
+        _onSignalingError('ICE connection failed');
+        break;
+      case RTCIceConnectionState.RTCIceConnectionStateDisconnected:
+        DebugLogger().log('WebRTC: ICE disconnected, may recover');
+        break;
+      default:
+        break;
+    }
+  }
+
+  void _onConnectionState(RTCPeerConnectionState state) {
+    DebugLogger().log('WebRTC: Peer connection state: $state');
+
+    switch (state) {
+      case RTCPeerConnectionState.RTCPeerConnectionStateConnected:
+        // Connection established, but wait for data channel
+        break;
+      case RTCPeerConnectionState.RTCPeerConnectionStateFailed:
+        _onSignalingError('Peer connection failed');
+        break;
+      case RTCPeerConnectionState.RTCPeerConnectionStateClosed:
+        _setState(WebRTCConnectionState.disconnected);
+        break;
+      default:
+        break;
+    }
+  }
+
+  void _onDataChannel(RTCDataChannel channel) {
+    DebugLogger().log('WebRTC: Remote data channel received: ${channel.label}');
+    if (channel.label == 'ma-api') {
+      _dataChannel = channel;
+      _setupDataChannel(channel);
+    } else if (channel.label == 'sendspin') {
+      _sendspinDataChannel = channel;
+      _setupSendspinDataChannel(channel);
+    }
+  }
+
+  void _setupDataChannel(RTCDataChannel channel) {
+    channel.onDataChannelState = (state) {
+      DebugLogger().log('WebRTC: Data channel state: $state');
+
+      if (state == RTCDataChannelState.RTCDataChannelOpen) {
+        DebugLogger().log('WebRTC: Data channel open - waiting for server hello...');
+        // Don't complete yet - wait for server hello
+        _serverHelloCompleter = Completer<void>();
+        _serverHelloCompleter!.future.then((_) {
+          DebugLogger().log('WebRTC: Server hello received - connection complete!');
+          _setState(WebRTCConnectionState.connected);
+          _safeCompleteConnection(true);
+        });
+      } else if (state == RTCDataChannelState.RTCDataChannelClosed) {
+        DebugLogger().log('WebRTC: Data channel closed, completing pending requests with error');
+        _completePendingRequestsWithError('Data channel closed');
+        _setState(WebRTCConnectionState.disconnected);
+      }
+    };
+
+    channel.onMessage = _onDataChannelMessage;
+  }
+
+  void _onDataChannelMessage(RTCDataChannelMessage message) {
+    try {
+      DebugLogger().log('WebRTC: Raw message: ${message.text.substring(0, message.text.length > 200 ? 200 : message.text.length)}...');
+      final data = jsonDecode(message.text) as Map<String, dynamic>;
+      final messageId = data['message_id']?.toString();
+
+      DebugLogger().log('WebRTC: Parsed message keys: ${data.keys.toList()}, message_id: $messageId');
+
+      // Check for server hello message (has server_id but no message_id)
+      if (data.containsKey('server_id') && messageId == null && !_serverHelloReceived) {
+        DebugLogger().log('WebRTC: Server hello received - server_version: ${data['server_version']}');
+        serverInfo = data;
+        _serverHelloReceived = true;
+        _serverHelloCompleter?.complete();
+        // Don't forward server hello to rawMessages - bridge caches it separately
+        return;
+      }
+
+      // Check if this is a response to a pending request (for internal use like auth)
+      if (messageId != null && _pendingRequests.containsKey(messageId)) {
+        DebugLogger().log('WebRTC: Matched pending request $messageId');
+        _pendingRequests.remove(messageId)?.complete(data);
+        // Don't forward to rawMessages - this was an internal request
+        return;
+      }
+
+      // Forward all other messages to rawMessages stream (for bridge passthrough)
+      _rawMessageController.add(message.text);
+
+      // Also broadcast parsed event/notification for internal listeners
+      DebugLogger().log('WebRTC: No match for message_id=$messageId, pending: ${_pendingRequests.keys.toList()}');
+      _messageController.add(data);
+    } catch (e) {
+      DebugLogger().log('WebRTC: Failed to parse message: $e');
+    }
+  }
+
+  /// Setup Sendspin data channel for audio streaming
+  void _setupSendspinDataChannel(RTCDataChannel channel) {
+    channel.onDataChannelState = (state) {
+      DebugLogger().log('WebRTC: Sendspin data channel state: $state');
+    };
+
+    channel.onMessage = _onSendspinMessage;
+  }
+
+  /// Handle incoming Sendspin messages (both text and binary)
+  void _onSendspinMessage(RTCDataChannelMessage message) {
+    if (message.isBinary) {
+      // Binary audio data
+      final bytes = message.binary;
+      if (bytes != null && !_sendspinBinaryController.isClosed) {
+        _sendspinBinaryController.add(bytes);
+      }
+    } else {
+      // Text control message (JSON)
+      final text = message.text;
+      DebugLogger().log('WebRTC: Sendspin text message: ${text.substring(0, text.length > 100 ? 100 : text.length)}...');
+      if (!_sendspinTextController.isClosed) {
+        _sendspinTextController.add(text);
+      }
+    }
+  }
+
+  /// Send a text message to Sendspin channel (JSON control messages)
+  void sendSendspinText(String message) {
+    if (_sendspinDataChannel == null) {
+      DebugLogger().log('WebRTC: Cannot send sendspin text - channel is null');
+      return;
+    }
+
+    final state = _sendspinDataChannel!.state;
+    if (state != RTCDataChannelState.RTCDataChannelOpen) {
+      DebugLogger().log('WebRTC: Cannot send sendspin text - channel state: $state');
+      return;
+    }
+
+    _sendspinDataChannel!.send(RTCDataChannelMessage(message));
+  }
+
+  /// Send binary data to Sendspin channel (audio data from local player)
+  void sendSendspinBinary(Uint8List data) {
+    if (_sendspinDataChannel == null) {
+      DebugLogger().log('WebRTC: Cannot send sendspin binary - channel is null');
+      return;
+    }
+
+    final state = _sendspinDataChannel!.state;
+    if (state != RTCDataChannelState.RTCDataChannelOpen) {
+      DebugLogger().log('WebRTC: Cannot send sendspin binary - channel state: $state');
+      return;
+    }
+
+    _sendspinDataChannel!.send(RTCDataChannelMessage.fromBinary(data));
+  }
+
+  void _onSignalingError(String error) {
+    DebugLogger().log('WebRTC: Signaling error: $error');
+    _setState(WebRTCConnectionState.failed);
+    onError?.call(error);
+    _safeCompleteConnection(false);
+  }
+
+  void _onPeerDisconnected() {
+    DebugLogger().log('WebRTC: Peer disconnected, completing pending requests with error');
+    _completePendingRequestsWithError('Remote peer disconnected');
+    _setState(WebRTCConnectionState.disconnected);
+    onError?.call('Remote server disconnected');
+  }
+
+  void _onSignalingDisconnected() {
+    DebugLogger().log('WebRTC: Signaling disconnected');
+    // Only set failed if we were still connecting
+    if (_state == WebRTCConnectionState.connecting) {
+      _setState(WebRTCConnectionState.failed);
+      _safeCompleteConnection(false);
+    }
+  }
+
+  /// Safely complete the connection completer (only once)
+  void _safeCompleteConnection(bool success) {
+    if (_connectionCompleter != null && !_connectionCompleter!.isCompleted) {
+      _connectionCompleter!.complete(success);
+    }
+  }
+
+  void dispose() {
+    _messageController.close();
+    _rawMessageController.close();
+    _sendspinTextController.close();
+    _sendspinBinaryController.close();
+    disconnect();
+  }
+}
@@ -40,6 +40,10 @@ class SendspinService {
  WebSocketChannel? _channel;
  Timer? _heartbeatTimer;
  Timer? _reconnectTimer;
+  int _reconnectAttempts = 0;
+  static const int _maxReconnectAttempts = 10;
+  static const Duration _baseReconnectDelay = Duration(seconds: 3);
+  static const Duration _maxReconnectDelay = Duration(seconds: 60);

  // Connection state
  SendspinConnectionState _state = SendspinConnectionState.disconnected;
@@ -279,6 +283,7 @@ class SendspinService {

      _logger.log('Sendspin: Connected and registered successfully');
      _updateState(SendspinConnectionState.connected);
+      _resetReconnectAttempts();
      _startHeartbeat();

      return true;
@@ -559,6 +564,7 @@ class SendspinService {
          'state': playerState,
          'volume': _volume,
          'muted': _isMuted,
+          'position': _position,
        },
      },
    });
@@ -627,6 +633,7 @@ class SendspinService {
          'state': 'synchronized',
          'volume': _volume,
          'muted': _isMuted,
+          'position': _position,
        },
      },
    }, allowDuringHandshake: true);
@@ -638,12 +645,27 @@ class SendspinService {
    _heartbeatTimer = null;
  }

-  /// Schedule reconnection attempt
+  /// Schedule reconnection attempt with exponential backoff
  void _scheduleReconnect() {
    if (_isDisposed) return;

+    if (_reconnectAttempts >= _maxReconnectAttempts) {
+      _logger.log('Sendspin: Max reconnection attempts reached ($_maxReconnectAttempts), giving up');
+      _updateState(SendspinConnectionState.disconnected);
+      return;
+    }
+
+    _reconnectAttempts++;
+
+    // Calculate exponential backoff delay: 3s, 6s, 12s, 24s, 48s, then cap at 60s
+    final delaySeconds = (_baseReconnectDelay.inSeconds * (1 << (_reconnectAttempts - 1)))
+        .clamp(0, _maxReconnectDelay.inSeconds);
+    final delay = Duration(seconds: delaySeconds);
+
+    _logger.log('Sendspin: Scheduling reconnect attempt $_reconnectAttempts/$_maxReconnectAttempts in ${delay.inSeconds}s');
+
    _reconnectTimer?.cancel();
-    _reconnectTimer = Timer(const Duration(seconds: 5), () {
+    _reconnectTimer = Timer(delay, () {
      if (!_isDisposed && _state != SendspinConnectionState.connected) {
        _logger.log('Sendspin: Attempting reconnection...');
        if (_connectedUrl != null) {
@@ -653,12 +675,17 @@ class SendspinService {
    });
  }

+  /// Reset reconnection attempts counter (call on successful connection)
+  void _resetReconnectAttempts() {
+    _reconnectAttempts = 0;
+  }
+
  /// Update connection state
  void _updateState(SendspinConnectionState newState) {
    if (_state != newState) {
      _state = newState;
-      // Don't try to emit if disposed or controller is closed
-      if (!_isDisposed && !_stateController.isClosed) {
+      // Don't add events if controller is closed (disposed)
+      if (!_isDisposed) {
        _stateController.add(newState);
      }
    }
@@ -73,6 +73,7 @@ class SettingsService {
  static const String _keyServerUrl = 'server_url';
  static const String _keyAuthServerUrl = 'auth_server_url';
  static const String _keyWebSocketPort = 'websocket_port';
+  static const String _keyRemoteAccessId = 'remote_access_id'; // MA Remote Access ID for WebRTC
  static const String _keyAuthToken = 'auth_token';
  static const String _keyMaAuthToken = 'ma_auth_token'; // Music Assistant native auth token
  static const String _keyAuthCredentials = 'auth_credentials'; // NEW: Serialized auth strategy credentials
@@ -90,11 +91,12 @@ class SettingsService {
  static const String _keyLocalPlayerName = 'local_player_name';
  static const String _keyOwnerName = 'owner_name';
  static const String _keyLastSelectedPlayerId = 'last_selected_player_id';
+  static const String _keyPreferLocalPlayer = 'prefer_local_player';
  static const String _keySmartSortPlayers = 'smart_sort_players';
+  static const String _keyDisableAutoSwitch = 'disable_auto_switch';
  static const String _keyShowRecentAlbums = 'show_recent_albums';
  static const String _keyShowDiscoverArtists = 'show_discover_artists';
  static const String _keyShowDiscoverAlbums = 'show_discover_albums';
-  static const String _keyShowDiscoveryFolders = 'show_discovery_folders';
  static const String _keyShowContinueListeningAudiobooks = 'show_continue_listening_audiobooks';
  static const String _keyShowDiscoverAudiobooks = 'show_discover_audiobooks';
  static const String _keyShowDiscoverSeries = 'show_discover_series';
@@ -107,11 +109,20 @@ class SettingsService {
  static const String _keyShowOnlyArtistsWithAlbums = 'show_only_artists_with_albums'; // Library artists filter
  static const String _keyHomeRowOrder = 'home_row_order'; // JSON list of row IDs

-  // Default row order (only these 3 rows enabled by default on first launch)
+  // Default row order
  static const List<String> defaultHomeRowOrder = [
    'recent-albums',
    'discover-artists',
    'discover-albums',
+    'continue-listening',
+    'discover-audiobooks',
+    'discover-series',
+    'favorite-albums',
+    'favorite-artists',
+    'favorite-tracks',
+    'favorite-playlists',
+    'favorite-radio-stations',
+    'favorite-podcasts',
  ];

  // View Mode Settings
@@ -142,7 +153,6 @@ class SettingsService {
  static const String _keyLibrarySeriesSortOrder = 'library_series_sort_order'; // 'alpha', 'alpha_desc', 'books'
  static const String _keyLibraryRadioSortOrder = 'library_radio_sort_order'; // 'alpha', 'alpha_desc'
  static const String _keyLibraryPodcastsSortOrder = 'library_podcasts_sort_order'; // 'alpha', 'alpha_desc'
-  static const String _keyPodcastEpisodesSortOrder = 'podcast_episodes_sort_order'; // 'newest', 'oldest', 'alpha', 'duration'

  // Audiobookshelf Direct Integration Settings
  static const String _keyAbsServerUrl = 'abs_server_url';
@@ -169,9 +179,6 @@ class SettingsService {
  // Podcast Cover Cache (iTunes URLs for high-res artwork)
  static const String _keyPodcastCoverCache = 'podcast_cover_cache';

-  // Discovery Row Preferences (per-row settings for Music Assistant recommendations)
-  static const String _keyDiscoveryRowPreferences = 'discovery_row_preferences';
-
  static Future<String?> getServerUrl() async {
    final prefs = await _getPrefs();
    return prefs.getString(_keyServerUrl);
@@ -187,6 +194,26 @@ class SettingsService {
    await prefs.remove(_keyServerUrl);
  }

+  // Remote Access ID for WebRTC-based remote connections
+  static Future<String?> getRemoteAccessId() async {
+    final prefs = await _getPrefs();
+    return prefs.getString(_keyRemoteAccessId);
+  }
+
+  static Future<void> setRemoteAccessId(String? id) async {
+    final prefs = await _getPrefs();
+    if (id == null || id.isEmpty) {
+      await prefs.remove(_keyRemoteAccessId);
+    } else {
+      await prefs.setString(_keyRemoteAccessId, id);
+    }
+  }
+
+  static Future<void> clearRemoteAccessId() async {
+    final prefs = await _getPrefs();
+    await prefs.remove(_keyRemoteAccessId);
+  }
+
  // Get authentication server URL (returns null if not set, meaning use server URL)
  static Future<String?> getAuthServerUrl() async {
    final prefs = await _getPrefs();
@@ -348,10 +375,18 @@ class SettingsService {
  static Future<void> setLastSelectedPlayerId(String? playerId) =>
      _setString(_keyLastSelectedPlayerId, playerId, removeIfEmpty: true);

+  // Prefer Local Player - always select local player first when available
+  static Future<bool> getPreferLocalPlayer() => _getBool(_keyPreferLocalPlayer, defaultValue: false);
+  static Future<void> setPreferLocalPlayer(bool prefer) => _setBool(_keyPreferLocalPlayer, prefer);
+
  // Smart Sort Players - sort by status (playing > on > off) instead of alphabetically
  static Future<bool> getSmartSortPlayers() => _getBool(_keySmartSortPlayers, defaultValue: false);
  static Future<void> setSmartSortPlayers(bool smartSort) => _setBool(_keySmartSortPlayers, smartSort);

+  // Disable Auto-Switch - prevents automatic switching to playing players
+  static Future<bool> getDisableAutoSwitch() => _getBool(_keyDisableAutoSwitch, defaultValue: false);
+  static Future<void> setDisableAutoSwitch(bool disable) => _setBool(_keyDisableAutoSwitch, disable);
+
  // Helper to create player name with possessive apostrophe
  // Automatically detects Phone vs Tablet based on screen size
  static String _makePlayerName(String ownerName) {
@@ -386,10 +421,6 @@ class SettingsService {
  static Future<bool> getShowDiscoverAlbums() => _getBool(_keyShowDiscoverAlbums, defaultValue: true);
  static Future<void> setShowDiscoverAlbums(bool show) => _setBool(_keyShowDiscoverAlbums, show);

-  // Home Screen Discovery Folders (default off - provider mixes like Tidal)
-  static Future<bool> getShowDiscoveryFolders() => _getBool(_keyShowDiscoveryFolders, defaultValue: false);
-  static Future<void> setShowDiscoveryFolders(bool show) => _setBool(_keyShowDiscoveryFolders, show);
-
  // Home Screen Audiobook Rows (default off - optional)
  static Future<bool> getShowContinueListeningAudiobooks() => _getBool(_keyShowContinueListeningAudiobooks, defaultValue: false);
  static Future<void> setShowContinueListeningAudiobooks(bool show) => _setBool(_keyShowContinueListeningAudiobooks, show);
@@ -682,17 +713,6 @@ class SettingsService {
    await prefs.setString(_keyLibraryPodcastsSortOrder, order);
  }

-  // Podcast Episode Sort Order (within podcast detail screen)
-  static Future<String> getPodcastEpisodesSortOrder() async {
-    final prefs = await _getPrefs();
-    return prefs.getString(_keyPodcastEpisodesSortOrder) ?? 'newest';
-  }
-
-  static Future<void> setPodcastEpisodesSortOrder(String order) async {
-    final prefs = await _getPrefs();
-    await prefs.setString(_keyPodcastEpisodesSortOrder, order);
-  }
-
  // Audiobookshelf Settings
  static Future<String?> getAbsServerUrl() async {
    final prefs = await _getPrefs();
@@ -938,7 +958,7 @@ class SettingsService {
  /// for fine-grained control (10x more precise)
  static Future<bool> getVolumePrecisionMode() async {
    final prefs = await _getPrefs();
-    return prefs.getBool(_keyVolumePrecisionMode) ?? false;
+    return prefs.getBool(_keyVolumePrecisionMode) ?? true;
  }

  /// Set whether volume precision mode is enabled
@@ -975,46 +995,4 @@ class SettingsService {
    cache[podcastId] = url;
    await setPodcastCoverCache(cache);
  }
-
-  // Discovery Row Preferences (per-row settings for Music Assistant recommendations)
-
-  /// Get all discovery row preferences as a map (itemId -> enabled)
-  /// Defaults to all enabled (true) if not set
-  static Future<Map<String, bool>> getDiscoveryRowPreferences() async {
-    final prefs = await _getPrefs();
-    final json = prefs.getString(_keyDiscoveryRowPreferences);
-    if (json == null) return {}; // Empty map = all enabled by default
-    try {
-      final decoded = jsonDecode(json) as Map<String, dynamic>;
-      return decoded.map((key, value) => MapEntry(key, value as bool));
-    } catch (_) {
-      return {};
-    }
-  }
-
-  /// Set all discovery row preferences at once
-  static Future<void> setDiscoveryRowPreferences(Map<String, bool> prefs) async {
-    final sharedPrefs = await _getPrefs();
-    await sharedPrefs.setString(_keyDiscoveryRowPreferences, jsonEncode(prefs));
-  }
-
-  /// Get whether a specific discovery row is enabled
-  /// Returns false if not explicitly set (default off)
-  static Future<bool> getDiscoveryRowPreference(String itemId) async {
-    final allPrefs = await getDiscoveryRowPreferences();
-    return allPrefs[itemId] ?? false; // Default to disabled
-  }
-
-  /// Set whether a specific discovery row is enabled
-  static Future<void> setDiscoveryRowPreference(String itemId, bool enabled) async {
-    final allPrefs = await getDiscoveryRowPreferences();
-    allPrefs[itemId] = enabled;
-    await setDiscoveryRowPreferences(allPrefs);
-  }
-
-  /// Clear all discovery row preferences (reverts to all enabled)
-  static Future<void> clearDiscoveryRowPreferences() async {
-    final prefs = await _getPrefs();
-    await prefs.remove(_keyDiscoveryRowPreferences);
-  }
 }
@@ -173,9 +173,7 @@ class SyncService with ChangeNotifier {
    }

    // Check if sync is needed (default: every 5 minutes)
-    // Always sync if cache is empty (no albums AND no artists loaded)
-    final cacheEmpty = _cachedAlbums.isEmpty && _cachedArtists.isEmpty;
-    if (!force && !cacheEmpty) {
+    if (!force) {
      final albumsNeedSync = await _db.needsSync('albums', maxAge: const Duration(minutes: 5));
      final artistsNeedSync = await _db.needsSync('artists', maxAge: const Duration(minutes: 5));
      final audiobooksNeedSync = await _db.needsSync('audiobooks', maxAge: const Duration(minutes: 5));
@@ -244,24 +242,44 @@ class SyncService with ChangeNotifier {
      final playlistMap = <String, Playlist>{};

      // If specific providers are requested, sync each separately for accurate source tracking
+      // Use smaller batches in remote mode to avoid WebRTC message size issues
+      final limit = api.isRemoteMode ? 100 : 1000;
+
      if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
-        _logger.log('🔒 Per-provider sync for ${providerInstanceIds.length} providers');
+        _logger.log('🔒 Per-provider sync for ${providerInstanceIds.length} providers (limit: $limit, remote: ${api.isRemoteMode})');

        for (final providerId in providerInstanceIds) {
          _logger.log('  📡 Syncing provider: $providerId');

-          // Fetch from this specific provider
-          final results = await Future.wait([
-            api.getAlbums(limit: 1000, providerInstanceIds: [providerId]),
-            api.getArtists(limit: 1000, albumArtistsOnly: showOnlyArtistsWithAlbums, providerInstanceIds: [providerId]),
-            api.getAudiobooks(limit: 1000, providerInstanceIds: [providerId]),
-            api.getPlaylists(limit: 1000, providerInstanceIds: [providerId]),
-          ]);
+          List<Album> albums;
+          List<Artist> artists;
+          List<Audiobook> audiobooks;
+          List<Playlist> playlists;

-          final albums = results[0] as List<Album>;
-          final artists = results[1] as List<Artist>;
-          final audiobooks = results[2] as List<Audiobook>;
-          final playlists = results[3] as List<Playlist>;
+          // In remote mode, do sequential requests to avoid overwhelming WebRTC
+          if (api.isRemoteMode) {
+            albums = await api.getAlbums(limit: limit, providerInstanceIds: [providerId]);
+            await Future.delayed(const Duration(milliseconds: 300));
+            artists = await api.getArtists(limit: limit, albumArtistsOnly: showOnlyArtistsWithAlbums, providerInstanceIds: [providerId]);
+            await Future.delayed(const Duration(milliseconds: 300));
+            audiobooks = await api.getAudiobooks(limit: limit, providerInstanceIds: [providerId]);
+            await Future.delayed(const Duration(milliseconds: 300));
+            playlists = await api.getPlaylists(limit: limit, providerInstanceIds: [providerId]);
+            await Future.delayed(const Duration(milliseconds: 300));
+          } else {
+            // Local mode: parallel requests for speed
+            final results = await Future.wait([
+              api.getAlbums(limit: limit, providerInstanceIds: [providerId]),
+              api.getArtists(limit: limit, albumArtistsOnly: showOnlyArtistsWithAlbums, providerInstanceIds: [providerId]),
+              api.getAudiobooks(limit: limit, providerInstanceIds: [providerId]),
+              api.getPlaylists(limit: limit, providerInstanceIds: [providerId]),
+            ]);
+
+            albums = results[0] as List<Album>;
+            artists = results[1] as List<Artist>;
+            audiobooks = results[2] as List<Audiobook>;
+            playlists = results[3] as List<Playlist>;
+          }

          _logger.log('  📥 Got ${albums.length} albums, ${artists.length} artists, ${audiobooks.length} audiobooks from $providerId');

@@ -297,26 +315,59 @@ class SyncService with ChangeNotifier {
        }
      } else {
        // No provider filter - fetch all at once (faster, but no source tracking)
-        _logger.log('📡 Fetching from all providers (no source tracking)');
+        _logger.log('📡 Fetching from all providers (no source tracking, limit: $limit)');

-        final results = await Future.wait([
-          api.getAlbums(limit: 1000),
-          api.getArtists(limit: 1000, albumArtistsOnly: showOnlyArtistsWithAlbums),
-          api.getAudiobooks(limit: 1000),
-          api.getPlaylists(limit: 1000),
-        ]);
+        // In remote mode, do sequential requests to avoid overwhelming WebRTC
+        if (api.isRemoteMode) {
+          _logger.log('🌐 Remote mode: using sequential requests with delays');

-        for (final album in results[0] as List<Album>) {
-          albumMap[album.itemId] = album;
-        }
-        for (final artist in results[1] as List<Artist>) {
-          artistMap[artist.itemId] = artist;
-        }
-        for (final audiobook in results[2] as List<Audiobook>) {
-          audiobookMap[audiobook.itemId] = audiobook;
-        }
-        for (final playlist in results[3] as List<Playlist>) {
-          playlistMap[playlist.itemId] = playlist;
+          final albums = await api.getAlbums(limit: limit);
+          for (final album in albums) {
+            albumMap[album.itemId] = album;
+          }
+          _logger.log('  📥 Got ${albums.length} albums');
+          await Future.delayed(const Duration(milliseconds: 500));
+
+          final artists = await api.getArtists(limit: limit, albumArtistsOnly: showOnlyArtistsWithAlbums);
+          for (final artist in artists) {
+            artistMap[artist.itemId] = artist;
+          }
+          _logger.log('  📥 Got ${artists.length} artists');
+          await Future.delayed(const Duration(milliseconds: 500));
+
+          final audiobooks = await api.getAudiobooks(limit: limit);
+          for (final audiobook in audiobooks) {
+            audiobookMap[audiobook.itemId] = audiobook;
+          }
+          _logger.log('  📥 Got ${audiobooks.length} audiobooks');
+          await Future.delayed(const Duration(milliseconds: 500));
+
+          final playlists = await api.getPlaylists(limit: limit);
+          for (final playlist in playlists) {
+            playlistMap[playlist.itemId] = playlist;
+          }
+          _logger.log('  📥 Got ${playlists.length} playlists');
+        } else {
+          // Local mode: parallel requests for speed
+          final results = await Future.wait([
+            api.getAlbums(limit: limit),
+            api.getArtists(limit: limit, albumArtistsOnly: showOnlyArtistsWithAlbums),
+            api.getAudiobooks(limit: limit),
+            api.getPlaylists(limit: limit),
+          ]);
+
+          for (final album in results[0] as List<Album>) {
+            albumMap[album.itemId] = album;
+          }
+          for (final artist in results[1] as List<Artist>) {
+            artistMap[artist.itemId] = artist;
+          }
+          for (final audiobook in results[2] as List<Audiobook>) {
+            audiobookMap[audiobook.itemId] = audiobook;
+          }
+          for (final playlist in results[3] as List<Playlist>) {
+            playlistMap[playlist.itemId] = playlist;
+          }
        }
      }

@@ -598,78 +649,4 @@ class SyncService with ChangeNotifier {
    _cachedPlaylists = playlists;
    notifyListeners();
  }
-
-  /// Remove an item from in-memory cache by library ID
-  /// Called when an item is removed from library to keep SyncService in sync
-  void removeFromCacheByLibraryId(String mediaType, int libraryItemId) {
-    final libraryIdStr = libraryItemId.toString();
-    bool updated = false;
-
-    // Helper to check if item matches the library ID being removed
-    bool matchesLibraryId(String? provider, String? itemId, List<ProviderMapping>? mappings) {
-      if (provider == 'library' && itemId == libraryIdStr) return true;
-      if (mappings != null) {
-        for (final m in mappings) {
-          if ((m.providerInstance == 'library' || m.providerDomain == 'library') &&
-              m.itemId == libraryIdStr) {
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    switch (mediaType) {
-      case 'album':
-        final before = _cachedAlbums.length;
-        _cachedAlbums = _cachedAlbums.where((a) =>
-          !matchesLibraryId(a.provider, a.itemId, a.providerMappings)
-        ).toList();
-        updated = _cachedAlbums.length != before;
-        // Also remove from source provider tracking
-        if (updated) {
-          _albumSourceProviders.removeWhere((key, _) =>
-            _cachedAlbums.every((a) => a.itemId != key));
-        }
-        break;
-      case 'artist':
-        final before = _cachedArtists.length;
-        _cachedArtists = _cachedArtists.where((a) =>
-          !matchesLibraryId(a.provider, a.itemId, a.providerMappings)
-        ).toList();
-        updated = _cachedArtists.length != before;
-        if (updated) {
-          _artistSourceProviders.removeWhere((key, _) =>
-            _cachedArtists.every((a) => a.itemId != key));
-        }
-        break;
-      case 'audiobook':
-        final before = _cachedAudiobooks.length;
-        _cachedAudiobooks = _cachedAudiobooks.where((a) =>
-          !matchesLibraryId(a.provider, a.itemId, a.providerMappings)
-        ).toList();
-        updated = _cachedAudiobooks.length != before;
-        if (updated) {
-          _audiobookSourceProviders.removeWhere((key, _) =>
-            _cachedAudiobooks.every((a) => a.itemId != key));
-        }
-        break;
-      case 'playlist':
-        final before = _cachedPlaylists.length;
-        _cachedPlaylists = _cachedPlaylists.where((p) =>
-          !matchesLibraryId(p.provider, p.itemId, p.providerMappings)
-        ).toList();
-        updated = _cachedPlaylists.length != before;
-        if (updated) {
-          _playlistSourceProviders.removeWhere((key, _) =>
-            _cachedPlaylists.every((p) => p.itemId != key));
-        }
-        break;
-    }
-
-    if (updated) {
-      _logger.log('🗑️ Removed $mediaType with libraryId=$libraryItemId from SyncService cache');
-      notifyListeners();
-    }
-  }
 }
@@ -1,25 +1,9 @@
-import 'dart:math' as math;
-import 'dart:typed_data';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:material_color_utilities/material_color_utilities.dart';
 import 'package:palette_generator/palette_generator.dart';
-import 'package:image/image.dart' as img;
-import 'package:http/http.dart' as http;
 import '../services/debug_logger.dart';

 final _logger = DebugLogger();

-/// Minimum contrast ratio for UI components (WCAG 2.1 Level AA)
-const double _minContrastRatio = 3.0;
-
-/// Minimum chroma for primary colors to ensure they're visually distinct
-/// Material Design 3 uses 48 for vibrant, but we use 36 as a balance
-const double _minPrimaryChroma = 36.0;
-
-/// Minimum chroma for surface/container colors (lower is fine for backgrounds)
-const double _minSurfaceChroma = 6.0;
-
 /// Extracted adaptive colors from album art
 class AdaptiveColors {
  final Color primary;       // Main accent color (vibrant)
@@ -42,398 +26,15 @@ class AdaptiveColors {
  );
 }

-/// Data class to pass color extraction results from isolate
-/// (Color objects can't be passed directly between isolates)
-class _ExtractedColors {
-  final int vibrantColor;
-  final int lightVibrantColor;
-  final int dominantColor;
-  final int darkMutedColor;
-  final int mutedColor;
-  final int lightMutedColor;
-
-  const _ExtractedColors({
-    required this.vibrantColor,
-    required this.lightVibrantColor,
-    required this.dominantColor,
-    required this.darkMutedColor,
-    required this.mutedColor,
-    required this.lightMutedColor,
-  });
-}
-
-/// Calculate WCAG 2.1 contrast ratio between two colors
-double _contrastRatio(Color c1, Color c2) {
-  final l1 = c1.computeLuminance();
-  final l2 = c2.computeLuminance();
-  final lighter = math.max(l1, l2);
-  final darker = math.min(l1, l2);
-  return (lighter + 0.05) / (darker + 0.05);
-}
-
-/// Helper to get contrasting text color based on WCAG contrast ratio
+/// Helper to get contrasting text color based on background luminance
 Color getContrastingTextColor(Color backgroundColor) {
-  // Calculate contrast with both black and white, pick the one with better contrast
-  final contrastWithWhite = _contrastRatio(backgroundColor, Colors.white);
-  final contrastWithBlack = _contrastRatio(backgroundColor, Colors.black);
-  return contrastWithWhite >= contrastWithBlack ? Colors.white : Colors.black;
-}
-
-/// Adjust a color's tone using HCT to ensure minimum contrast against a background
-/// Uses binary search to find the MINIMUM tone adjustment needed (preserves color identity)
-Color _ensureContrastHct(Color foreground, Color background, {double minRatio = _minContrastRatio}) {
-  final fgHct = Hct.fromInt(foreground.value);
-  final bgHct = Hct.fromInt(background.value);
-
-  // Ensure foreground has enough chroma to be visually distinct
-  final chroma = math.max(fgHct.chroma, _minPrimaryChroma);
-
-  final currentRatio = _contrastRatio(foreground, background);
-  if (currentRatio >= minRatio) {
-    // Already has sufficient contrast, just ensure chroma
-    if (fgHct.chroma < _minPrimaryChroma) {
-      return Color(Hct.from(fgHct.hue, chroma, fgHct.tone).toInt());
-    }
-    return foreground;
-  }
-
-  // For dark backgrounds (tone < 50), we need lighter foreground
-  // For light backgrounds (tone >= 50), we need darker foreground
-  final bgIsDark = bgHct.tone < 50;
-
-  // Binary search for the minimum tone that achieves target contrast
-  double lo, hi;
-  if (bgIsDark) {
-    // Search upward from current tone toward white
-    lo = fgHct.tone;
-    hi = 100.0;
-  } else {
-    // Search downward from current tone toward black
-    lo = 0.0;
-    hi = fgHct.tone;
-  }
-
-  double bestTone = bgIsDark ? hi : lo; // Fallback to extreme if needed
-
-  for (int i = 0; i < 20; i++) {
-    final mid = (lo + hi) / 2;
-    final testColor = Hct.from(fgHct.hue, chroma, mid);
-    final testRatio = _contrastRatio(Color(testColor.toInt()), background);
-
-    if (bgIsDark) {
-      // We want lighter - if mid works, try lower (closer to original)
-      if (testRatio >= minRatio) {
-        bestTone = mid;
-        hi = mid; // Try to find a lower tone that still works
-      } else {
-        lo = mid; // Need to go lighter
-      }
-    } else {
-      // We want darker - if mid works, try higher (closer to original)
-      if (testRatio >= minRatio) {
-        bestTone = mid;
-        lo = mid; // Try to find a higher tone that still works
-      } else {
-        hi = mid; // Need to go darker
-      }
-    }
-
-    if (hi - lo < 0.5) break; // Precision reached
-  }
-
-  return Color(Hct.from(fgHct.hue, chroma, bestTone).toInt());
-}
-
-/// Ensure a color has minimum chroma (colorfulness) for primary use
-Color _ensureMinChroma(Color color) {
-  final hct = Hct.fromInt(color.value);
-  if (hct.chroma >= _minPrimaryChroma) {
-    return color;
-  }
-  final adjusted = Hct.from(hct.hue, _minPrimaryChroma, hct.tone);
-  return Color(adjusted.toInt());
-}
-
-/// Top-level function for isolate-based color extraction
-/// Must be top-level or static to work with compute()
-_ExtractedColors? _extractColorsInIsolate(Uint8List imageBytes) {
-  try {
-    // Decode image using pure Dart image package
-    final image = img.decodeImage(imageBytes);
-    if (image == null) return null;
-
-    // Resize for faster processing (max 100x100)
-    final resized = img.copyResize(
-      image,
-      width: image.width > 100 ? 100 : image.width,
-      height: image.height > 100 ? 100 : image.height,
-      interpolation: img.Interpolation.average,
-    );
-
-    // Extract color histogram
-    final colorCounts = <int, int>{};
-    for (int y = 0; y < resized.height; y++) {
-      for (int x = 0; x < resized.width; x++) {
-        final pixel = resized.getPixel(x, y);
-        // Quantize to reduce color space (shift off lower 4 bits)
-        final r = (pixel.r.toInt() >> 4) << 4;
-        final g = (pixel.g.toInt() >> 4) << 4;
-        final b = (pixel.b.toInt() >> 4) << 4;
-        final quantized = (0xFF << 24) | (r << 16) | (g << 8) | b;
-        colorCounts[quantized] = (colorCounts[quantized] ?? 0) + 1;
-      }
-    }
-
-    // Sort colors by frequency
-    final sortedColors = colorCounts.entries.toList()
-      ..sort((a, b) => b.value.compareTo(a.value));
-
-    if (sortedColors.isEmpty) return null;
-
-    // Categorize colors by HSL properties
-    int? vibrant, lightVibrant, dominant, darkMuted, muted, lightMuted;
-
-    for (final entry in sortedColors.take(32)) {
-      final color = entry.key;
-      final r = (color >> 16) & 0xFF;
-      final g = (color >> 8) & 0xFF;
-      final b = color & 0xFF;
-
-      // Calculate HSL manually
-      final rf = r / 255.0;
-      final gf = g / 255.0;
-      final bf = b / 255.0;
-      final maxC = [rf, gf, bf].reduce((a, b) => a > b ? a : b);
-      final minC = [rf, gf, bf].reduce((a, b) => a < b ? a : b);
-      final lightness = (maxC + minC) / 2;
-      final saturation = maxC == minC ? 0.0 :
-          (lightness > 0.5
-              ? (maxC - minC) / (2 - maxC - minC)
-              : (maxC - minC) / (maxC + minC));
-
-      // Categorize based on saturation and lightness
-      if (saturation > 0.5 && lightness > 0.3 && lightness < 0.7) {
-        vibrant ??= color;
-      }
-      if (saturation > 0.4 && lightness > 0.6) {
-        lightVibrant ??= color;
-      }
-      if (saturation < 0.4 && lightness < 0.3) {
-        darkMuted ??= color;
-      }
-      if (saturation < 0.4 && lightness > 0.3 && lightness < 0.7) {
-        muted ??= color;
-      }
-      if (saturation < 0.4 && lightness > 0.7) {
-        lightMuted ??= color;
-      }
-
-      // First color is dominant
-      dominant ??= color;
-    }
-
-    // Fallback to dominant for any missing colors
-    final defaultColor = dominant ?? sortedColors.first.key;
-
-    return _ExtractedColors(
-      vibrantColor: vibrant ?? defaultColor,
-      lightVibrantColor: lightVibrant ?? vibrant ?? defaultColor,
-      dominantColor: dominant ?? defaultColor,
-      darkMutedColor: darkMuted ?? defaultColor,
-      mutedColor: muted ?? defaultColor,
-      lightMutedColor: lightMuted ?? muted ?? defaultColor,
-    );
-  } catch (e) {
-    return null;
-  }
+  // Use relative luminance to determine if we need light or dark text
+  // Standard threshold is 0.179 based on WCAG guidelines
+  return backgroundColor.computeLuminance() > 0.4 ? Colors.black : Colors.white;
 }

 class PaletteHelper {
-  /// Cache for downloaded image bytes to avoid re-downloading
-  static final Map<String, Uint8List> _imageCache = {};
-  static const int _maxCacheSize = 20;
-
-  /// Cache for extracted color schemes to avoid re-processing
-  static final Map<String, (ColorScheme, ColorScheme)> _colorSchemeCache = {};
-  static const int _maxColorSchemeCacheSize = 30;
-
-  /// Extract color schemes from a URL using isolate-based processing
-  /// This is the preferred method as it doesn't block the main thread
-  /// Results are cached for instant retrieval on subsequent calls
-  static Future<(ColorScheme, ColorScheme)?> extractColorSchemesFromUrl(String imageUrl) async {
-    try {
-      // Check color scheme cache first for instant return
-      final cachedSchemes = _colorSchemeCache[imageUrl];
-      if (cachedSchemes != null) {
-        return cachedSchemes;
-      }
-
-      // Check image bytes cache
-      Uint8List? imageBytes = _imageCache[imageUrl];
-
-      if (imageBytes == null) {
-        // Download image bytes
-        final response = await http.get(Uri.parse(imageUrl));
-        if (response.statusCode != 200) {
-          _logger.warning('Failed to download image: ${response.statusCode}', context: 'Palette');
-          return null;
-        }
-        imageBytes = response.bodyBytes;
-
-        // Cache the bytes
-        if (_imageCache.length >= _maxCacheSize) {
-          _imageCache.remove(_imageCache.keys.first);
-        }
-        _imageCache[imageUrl] = imageBytes;
-      }
-
-      // Extract colors in isolate
-      final extractedColors = await compute(_extractColorsInIsolate, imageBytes);
-      if (extractedColors == null) return null;
-
-      // Convert to ColorSchemes on main thread
-      final colorSchemes = _buildColorSchemes(extractedColors);
-
-      // Cache the color schemes for instant access next time
-      if (_colorSchemeCache.length >= _maxColorSchemeCacheSize) {
-        _colorSchemeCache.remove(_colorSchemeCache.keys.first);
-      }
-      _colorSchemeCache[imageUrl] = colorSchemes;
-
-      return colorSchemes;
-    } catch (e) {
-      _logger.warning('Failed to extract colors from URL: $e', context: 'Palette');
-      return null;
-    }
-  }
-
-  /// Build ColorSchemes from extracted color data using HCT color space
-  static (ColorScheme, ColorScheme) _buildColorSchemes(_ExtractedColors colors) {
-    // Convert int colors to Color objects
-    final vibrant = Color(colors.vibrantColor);
-    final lightVibrant = Color(colors.lightVibrantColor);
-    final dominant = Color(colors.dominantColor);
-    final darkMuted = Color(colors.darkMutedColor);
-    final muted = Color(colors.mutedColor);
-    final lightMuted = Color(colors.lightMutedColor);
-
-    // Get primary color - prefer vibrant, then lightVibrant, then dominant
-    Color primary = vibrant;
-    final vibrantHct = Hct.fromInt(vibrant.value);
-    if (vibrantHct.tone < 20 || vibrantHct.chroma < 8) {
-      primary = lightVibrant;
-    }
-    final primaryHct = Hct.fromInt(primary.value);
-    if (primaryHct.tone < 20 || primaryHct.chroma < 8) {
-      primary = dominant;
-    }
-
-    // Use HCT for perceptually accurate color adjustment
-    // Ensure minimum chroma (colorfulness) so colors aren't muddy
-    Color adjustedPrimary = _ensureMinChroma(primary);
-
-    // Build dark mode colors using HCT
-    final darkMutedHct = Hct.fromInt(darkMuted.value);
-    final darkSurface = Color(Hct.from(
-      darkMutedHct.hue,
-      math.min(darkMutedHct.chroma, _minSurfaceChroma), // Low chroma for surface
-      math.max(darkMutedHct.tone * 0.3, 5.0).clamp(5.0, 15.0), // Very dark
-    ).toInt());
-    final darkMiniPlayer = Color(Hct.from(
-      darkMutedHct.hue,
-      (darkMutedHct.chroma * 1.2).clamp(4, 16),
-      30, // Fixed tone for consistency
-    ).toInt());
-
-    // Build light mode colors using HCT
-    final lightMutedHct = Hct.fromInt(lightMuted.value);
-    final lightSurface = Color(Hct.from(
-      lightMutedHct.hue,
-      math.min(lightMutedHct.chroma, _minSurfaceChroma),
-      95, // Very light
-    ).toInt());
-    final lightMiniPlayer = Color(Hct.from(
-      lightMutedHct.hue,
-      (lightMutedHct.chroma * 1.2).clamp(4, 16),
-      75,
-    ).toInt());
-
-    // Generate secondary container colors using HCT
-    // Dark secondary container at tone 25 for tonal buttons
-    final primaryHctFinal = Hct.fromInt(adjustedPrimary.value);
-    final darkSecondaryContainer = Color(Hct.from(
-      primaryHctFinal.hue,
-      (primaryHctFinal.chroma * 0.4).clamp(4, 16),
-      25, // Fixed tone for dark mode tonal buttons
-    ).toInt());
-    final lightSecondaryContainer = Color(Hct.from(
-      primaryHctFinal.hue,
-      (primaryHctFinal.chroma * 0.3).clamp(4, 12),
-      90, // Fixed tone for light mode tonal buttons
-    ).toInt());
-
-    // CRITICAL: Ensure primary has sufficient contrast against secondaryContainer
-    // This guarantees highlighted icons are visible on tonal buttons
-    final darkAdjustedPrimary = _ensureContrastHct(
-      adjustedPrimary,
-      darkSecondaryContainer,
-      minRatio: _minContrastRatio,
-    );
-    final lightAdjustedPrimary = _ensureContrastHct(
-      adjustedPrimary,
-      lightSecondaryContainer,
-      minRatio: _minContrastRatio,
-    );
-
-    // Determine contrasting text colors
-    final lightOnPrimary = getContrastingTextColor(lightAdjustedPrimary);
-    final darkOnPrimary = getContrastingTextColor(darkAdjustedPrimary);
-    final lightOnMiniPlayer = getContrastingTextColor(lightMiniPlayer);
-    final darkOnMiniPlayer = getContrastingTextColor(darkMiniPlayer);
-
-    final lightScheme = ColorScheme(
-      brightness: Brightness.light,
-      primary: lightAdjustedPrimary,
-      onPrimary: lightOnPrimary,
-      secondary: lightAdjustedPrimary.withOpacity(0.8),
-      onSecondary: lightOnPrimary,
-      secondaryContainer: lightSecondaryContainer,
-      onSecondaryContainer: Colors.black87,
-      error: Colors.red,
-      onError: Colors.white,
-      surface: lightSurface,
-      onSurface: Colors.black87,
-      primaryContainer: lightMiniPlayer,
-      onPrimaryContainer: lightOnMiniPlayer,
-    );
-
-    final darkScheme = ColorScheme(
-      brightness: Brightness.dark,
-      primary: darkAdjustedPrimary,
-      onPrimary: darkOnPrimary,
-      secondary: darkAdjustedPrimary.withOpacity(0.8),
-      onSecondary: darkOnPrimary,
-      secondaryContainer: darkSecondaryContainer,
-      onSecondaryContainer: Colors.white,
-      error: Colors.redAccent,
-      onError: Colors.black,
-      surface: darkSurface,
-      onSurface: Colors.white,
-      primaryContainer: darkMiniPlayer,
-      onPrimaryContainer: darkOnMiniPlayer,
-    );
-
-    return (lightScheme, darkScheme);
-  }
-
-  /// Clear all caches (image bytes and color schemes)
-  static void clearCache() {
-    _imageCache.clear();
-    _colorSchemeCache.clear();
-  }
-
  /// Extract a color palette from an image with higher color count for better variety
-  /// NOTE: This runs on the main thread. Prefer extractColorSchemesFromUrl for better performance.
  static Future<PaletteGenerator?> extractPalette(ImageProvider imageProvider) async {
    try {
      final palette = await PaletteGenerator.fromImageProvider(
@@ -447,7 +48,7 @@ class PaletteHelper {
    }
  }

-  /// Extract actual colors from the palette using HCT color space
+  /// Extract actual colors from the palette (not seed-based)
  static AdaptiveColors? extractAdaptiveColors(PaletteGenerator? palette, {required bool isDark}) {
    if (palette == null) return null;

@@ -457,9 +58,22 @@ class PaletteHelper {
                         palette.dominantColor?.color ??
                         const Color(0xFF604CEC);

-    // Use HCT for perceptually accurate color adjustment
-    // Ensure minimum chroma (colorfulness) so colors aren't muddy
-    Color adjustedPrimary = _ensureMinChroma(primary);
+    // Ensure primary has enough saturation to be visually distinct
+    // AND enough lightness for white text to be readable on it
+    final HSLColor hslPrimary = HSLColor.fromColor(primary);
+    Color adjustedPrimary = primary;
+
+    // Adjust saturation if too low
+    if (hslPrimary.saturation < 0.3) {
+      adjustedPrimary = hslPrimary.withSaturation(0.5).toColor();
+    }
+
+    // Ensure minimum lightness for contrast with white text
+    // If primary is too dark (luminance < 0.15), lighten it
+    if (adjustedPrimary.computeLuminance() < 0.15) {
+      final hsl = HSLColor.fromColor(adjustedPrimary);
+      adjustedPrimary = hsl.withLightness((hsl.lightness + 0.25).clamp(0.3, 0.6)).toColor();
+    }

    if (isDark) {
      // Dark mode: use dark muted colors for background
@@ -467,19 +81,18 @@ class PaletteHelper {
                                palette.mutedColor?.color ??
                                const Color(0xFF121212);

-      // Build surface colors using HCT
-      final surfaceHct = Hct.fromInt(surfaceBase.value);
-      final Color surface = Color(Hct.from(
-        surfaceHct.hue,
-        math.min(surfaceHct.chroma, _minSurfaceChroma),
-        math.max(surfaceHct.tone * 0.3, 5.0).clamp(5.0, 15.0),
-      ).toInt());
+      // Darken the surface color significantly for the expanded background
+      final HSLColor hslSurface = HSLColor.fromColor(surfaceBase);
+      final Color surface = hslSurface
+          .withLightness((hslSurface.lightness * 0.3).clamp(0.05, 0.15))
+          .toColor();

-      final Color miniPlayer = Color(Hct.from(
-        surfaceHct.hue,
-        (surfaceHct.chroma * 1.2).clamp(4, 16),
-        30,
-      ).toInt());
+      // Mini player should be medium brightness - noticeably tinted but readable
+      // Use the muted color but at medium lightness (0.25-0.35 range)
+      final Color miniPlayer = hslSurface
+          .withLightness(0.3.clamp(0.25, 0.38))
+          .withSaturation((hslSurface.saturation * 1.2).clamp(0.15, 0.5))
+          .toColor();

      return AdaptiveColors(
        primary: adjustedPrimary,
@@ -493,18 +106,16 @@ class PaletteHelper {
                                palette.mutedColor?.color ??
                                Colors.white;

-      final surfaceHct = Hct.fromInt(surfaceBase.value);
-      final Color surface = Color(Hct.from(
-        surfaceHct.hue,
-        math.min(surfaceHct.chroma, _minSurfaceChroma),
-        95,
-      ).toInt());
+      final HSLColor hslSurface = HSLColor.fromColor(surfaceBase);
+      final Color surface = hslSurface
+          .withLightness((hslSurface.lightness).clamp(0.92, 0.98))
+          .toColor();

-      final Color miniPlayer = Color(Hct.from(
-        surfaceHct.hue,
-        (surfaceHct.chroma * 1.2).clamp(4, 16),
-        75,
-      ).toInt());
+      // Mini player in light mode - medium tinted
+      final Color miniPlayer = hslSurface
+          .withLightness(0.75.clamp(0.65, 0.8))
+          .withSaturation((hslSurface.saturation * 1.2).clamp(0.15, 0.5))
+          .toColor();

      return AdaptiveColors(
        primary: adjustedPrimary,
@@ -515,7 +126,7 @@ class PaletteHelper {
    }
  }

-  /// Generate color schemes from a palette using HCT color space
+  /// Generate color schemes from a palette (kept for backward compatibility)
  static (ColorScheme, ColorScheme)? generateColorSchemes(PaletteGenerator? palette) {
    if (palette == null) return null;

@@ -524,47 +135,18 @@ class PaletteHelper {

    if (lightColors == null || darkColors == null) return null;

-    // Generate secondary container colors using HCT
-    final lightPrimaryHct = Hct.fromInt(lightColors.primary.value);
-    final lightSecondaryContainer = Color(Hct.from(
-      lightPrimaryHct.hue,
-      (lightPrimaryHct.chroma * 0.3).clamp(4, 12),
-      90, // Fixed tone for light mode tonal buttons
-    ).toInt());
-
-    final darkPrimaryHct = Hct.fromInt(darkColors.primary.value);
-    final darkSecondaryContainer = Color(Hct.from(
-      darkPrimaryHct.hue,
-      (darkPrimaryHct.chroma * 0.4).clamp(4, 16),
-      25, // Fixed tone for dark mode tonal buttons
-    ).toInt());
-
-    // CRITICAL: Ensure primary has sufficient contrast against secondaryContainer
-    final lightAdjustedPrimary = _ensureContrastHct(
-      lightColors.primary,
-      lightSecondaryContainer,
-      minRatio: _minContrastRatio,
-    );
-    final darkAdjustedPrimary = _ensureContrastHct(
-      darkColors.primary,
-      darkSecondaryContainer,
-      minRatio: _minContrastRatio,
-    );
-
-    // Determine contrasting text colors
-    final lightOnPrimary = getContrastingTextColor(lightAdjustedPrimary);
-    final darkOnPrimary = getContrastingTextColor(darkAdjustedPrimary);
+    // Determine contrasting text colors based on primary color luminance
+    final lightOnPrimary = getContrastingTextColor(lightColors.primary);
+    final darkOnPrimary = getContrastingTextColor(darkColors.primary);
    final lightOnMiniPlayer = getContrastingTextColor(lightColors.miniPlayer);
    final darkOnMiniPlayer = getContrastingTextColor(darkColors.miniPlayer);

    final lightScheme = ColorScheme(
      brightness: Brightness.light,
-      primary: lightAdjustedPrimary,
+      primary: lightColors.primary,
      onPrimary: lightOnPrimary,
-      secondary: lightAdjustedPrimary.withOpacity(0.8),
+      secondary: lightColors.primary.withOpacity(0.8),
      onSecondary: lightOnPrimary,
-      secondaryContainer: lightSecondaryContainer,
-      onSecondaryContainer: Colors.black87,
      error: Colors.red,
      onError: Colors.white,
      surface: lightColors.surface,
@@ -575,12 +157,10 @@ class PaletteHelper {

    final darkScheme = ColorScheme(
      brightness: Brightness.dark,
-      primary: darkAdjustedPrimary,
+      primary: darkColors.primary,
      onPrimary: darkOnPrimary,
-      secondary: darkAdjustedPrimary.withOpacity(0.8),
+      secondary: darkColors.primary.withOpacity(0.8),
      onSecondary: darkOnPrimary,
-      secondaryContainer: darkSecondaryContainer,
-      onSecondaryContainer: Colors.white,
      error: Colors.redAccent,
      onError: Colors.black,
      surface: darkColors.surface,
@@ -593,7 +173,6 @@ class PaletteHelper {
  }

  /// Extract color schemes from an image provider in one call
-  /// NOTE: This runs on the main thread. Prefer extractColorSchemesFromUrl for better performance.
  static Future<(ColorScheme, ColorScheme)?> extractColorSchemes(ImageProvider imageProvider) async {
    final palette = await extractPalette(imageProvider);
    return generateColorSchemes(palette);
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import '../services/settings_service.dart';
 import '../services/debug_logger.dart';
 import 'palette_helper.dart';
@@ -9,13 +10,11 @@ final _themeLogger = DebugLogger();
 /// Global function to update adaptive colors from an image URL
 /// This can be called from anywhere in the app (e.g., when tapping an album/artist)
 /// Sets isOnDetailScreen=true so nav bar will also use adaptive colors
-/// Uses isolate-based extraction to avoid blocking the main thread
 Future<void> updateAdaptiveColorsFromImage(BuildContext context, String? imageUrl) async {
  if (imageUrl == null || imageUrl.isEmpty) return;

  try {
-    // Use isolate-based extraction for better performance
-    final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
+    final colorSchemes = await PaletteHelper.extractColorSchemes(CachedNetworkImageProvider(imageUrl));
    if (colorSchemes != null && context.mounted) {
      final themeProvider = context.read<ThemeProvider>();
      themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
@@ -33,13 +32,6 @@ void clearAdaptiveColorsOnBack(BuildContext context) {
  themeProvider.clearAdaptiveColors();
 }

-/// Mark that we're entering a detail screen (call this synchronously on init)
-/// This ensures the nav bar starts using adaptive colors immediately
-void markDetailScreenEntered(BuildContext context) {
-  final themeProvider = context.read<ThemeProvider>();
-  themeProvider.setOnDetailScreen(true);
-}
-
 class ThemeProvider extends ChangeNotifier {
  ThemeMode _themeMode = ThemeMode.system;
  bool _useMaterialTheme = false;
@@ -211,12 +203,4 @@ class ThemeProvider extends ChangeNotifier {
    _isOnDetailScreen = false;
    notifyListeners();
  }
-
-  /// Set the detail screen flag (used for immediate synchronous updates)
-  void setOnDetailScreen(bool value) {
-    if (_isOnDetailScreen != value) {
-      _isOnDetailScreen = value;
-      notifyListeners();
-    }
-  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chris	44f35d1a26	WIP on feature/remote-bridge: `8cf35cf` Add robust reconnection for remote mode	2026-01-23 22:16:58 +00:00
Chris	6918569a82	index on feature/remote-bridge: `8cf35cf` Add robust reconnection for remote mode	2026-01-23 22:16:58 +00:00
ChrisandClaude Opus 4.5	8cf35cfe78	Add robust reconnection for remote mode Bridge improvements: - Increase max reconnect attempts to 10 with exponential backoff (2s-60s) - Auto-recover from failed state when app tries to connect - Health check triggers retry every 60s when in failed state - Track last reconnect attempt time for smarter retries App improvements: - Retry 5 times with exponential backoff on resume (remote mode) - Add 30s periodic reconnect timer when disconnected in remote mode - Timer auto-stops on successful connection - Multiple retry layers ensure eventual recovery This fixes the issue where network drops would leave the app permanently disconnected even after network recovery. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 12:40:53 +00:00
ChrisandClaude Opus 4.5	42bc1ed16c	Fix remote connection stability issues - Add 30s server hello timeout to prevent indefinite hangs - Queue ICE candidates until remote description is set - Fix stuck "connecting" state blocking future connections - Properly notify clients when WebRTC fails with error codes - Close WS clients immediately on WebRTC failure (not cache stale hello) - Reject new connections during reconnection or failed state - Add _resetConnection() for clean retry scenarios WebSocket close codes: - 4000: WebRTC not healthy - 4001: Connection lost, reconnecting - 4002: Reconnection in progress - 4003: Connection failed - 4004: Bridge terminated Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 11:54:38 +00:00
ChrisandClaude Opus 4.5	d908cf93a2	Remove HA add-on note - too busy Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 11:03:43 +00:00
ChrisandClaude Opus 4.5	e21e1eb4fd	Update remote ID hint format and add HA add-on note - Change placeholder to realistic format: ABCD1234-EFGH5-6IJKL-MNOP7890 - Add note: "For Home Assistant add-on users only" Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 10:43:07 +00:00
ChrisandClaude Opus 4.5	9aa81ef09f	Make QR button same height as remote ID field Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 10:33:55 +00:00
ChrisandClaude Opus 4.5	8d2adb6fc5	Style QR button to match remote ID field Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 10:28:13 +00:00
ChrisandClaude Opus 4.5	99ee131712	Move QR scanner to separate button beside remote ID field Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 10:15:27 +00:00
ChrisandClaude Opus 4.5	f51ea9cb22	Add QR code scanner for Remote Access ID - Add QR scanner screen with camera preview and scan overlay - Wire up QR button to remote ID field on login screen - Add mobile_scanner dependency - Add localization strings for scanner UI - Handle various QR code formats: - Raw remote ID - ma://remote/<id> URL scheme - music-assistant.io URLs with cloudInstanceId param Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 10:04:42 +00:00
ChrisandClaude Opus 4.5	9773f28cf7	Fix ICE server URL parsing for Nabu Casa users The signaling server returns URLs as an array for HA Cloud subscribers but as a string for others. Handle both formats in IceServer.fromJson. Fixes #31 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 09:51:32 +00:00
ChrisandClaude Opus 4.5	2856ca1e8b	Implement remote connection audit fixes - WebRTCConnection: Complete pending requests with error on disconnect/peer disconnect - ErrorHandler: Add WebRTC-specific error types (remote, dataChannel, signaling) - RemoteBridge: Add RemoteBridgeErrorType, RemoteBridgeState, ConnectionMetrics - State and error streams for UI integration - Track total reconnection count - MusicAssistantAPI: Age-based cleanup for pending requests - New _PendingRequest class with timestamp - Auto-cleanup stale requests older than 2 minutes - SendspinService: Exponential backoff for reconnection (3s, 6s, 12s... up to 60s) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 09:42:43 +00:00
ChrisandClaude Opus 4.5	c832502c49	Add default MA port 8095 for local IP addresses When users enter a local IP address without specifying a port, auth detection now defaults to port 8095 (MA's default port). This fixes connection issues for HAOS add-on users who previously had to manually specify :8095. Behavior: - 192.168.4.178 → http://192.168.4.178:8095 - 192.168.4.178:8095 → http://192.168.4.178:8095 (unchanged) - 192.168.4.178:80 → http://192.168.4.178:80 (explicit port preserved) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-23 09:29:48 +00:00
ChrisandClaude Opus 4.5	675779c108	Add remote auto-reconnect on app restart - Save remote access ID when connecting via remote mode - Clear remote access ID when connecting via local/direct mode - On startup, detect if saved URL is a localhost bridge URL - Re-establish bridge automatically using saved credentials - Fixes app unable to connect after restart in remote mode Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 18:33:00 +00:00
ChrisandClaude Opus 4.5	54a9e6e2b4	Add WebRTC auto-reconnection and increase ping frequency - Increase signaling ping frequency from 30s to 15s - Add automatic WebRTC reconnection when connection drops - Exponential backoff for reconnect attempts (up to 5 tries) - Preserve WS clients during reconnection for seamless recovery Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 18:24:53 +00:00
ChrisandClaude Opus 4.5	870acabad1	Add Sendspin audio tunneling through WebRTC bridge for remote local player - Add second WebRTC data channel for Sendspin audio streaming - Extend RemoteBridge to handle /sendspin path separately from API - Route Sendspin text and binary messages through dedicated channel - Update provider to connect Sendspin via bridge in remote mode - Fix authentication flow (save credentials before connecting) - Add sequential sync requests for remote mode stability Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 18:08:17 +00:00
ChrisandClaude Opus 4.5	d3a5542c68	Remove init.gradle from CI - conflicts with Gradle settings mode GitHub Actions doesn't need Maven mirrors workaround. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 15:09:10 +00:00
ChrisandClaude Opus 4.5	b93918219f	Update CI to Flutter 3.38.0 for intl compatibility Flutter 3.24 pins intl to 0.19.0 via flutter_localizations, but project requires intl ^0.20.0. Flutter 3.38 resolves this. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 15:04:07 +00:00
ChrisandClaude Opus 4.5	a23f9ff05f	Add remote access login UI and fix album art for remote mode - Add Server URL / Remote Access ID toggle to login screen - Add RemoteBridge connection flow for HA add-on users - Add isRemoteMode flag to API to detect WebRTC tunnel connections - Fix album art in remote mode by using external CDN URLs directly (Spotify, Tidal, Deezer, Apple Music, Last.fm, MusicBrainz) - Add debug copy logs button to home screen - Add localization strings for remote access UI Note: Local/OpenSubsonic content won't have album art in remote mode since HTTP image requests can't go through the WebRTC tunnel. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 14:58:13 +00:00
ChrisandClaude Opus 4.5	1921a20884	Add remote bridge infrastructure and fix Flutter 3.38 compatibility issues Remote Bridge: - Add WebRTC-based remote connection infrastructure - Add signaling client for MA remote access protocol - Add RemoteBridge local WebSocket server for transparent tunneling - Add RemoteConnectionManager for high-level remote API Flutter 3.38 Fixes: - Replace Material 3 Slider with custom implementation (fixes Overlay error) - Custom progress bar and volume slider using Stack/Container - Add seek debouncing to prevent command timeout on rapid seeks - Fix position reporting in Sendspin client/state payload Other Fixes: - Fix tab swiping scrolling multiple tabs (use default PageScrollPhysics) - Fix copy logs to use filtered entries instead of all logs - Revert share logs to simple implementation Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 13:40:51 +00:00
ChrisandClaude Opus 4.5	516faf6f6a	chore: Update Gradle, Kotlin, and AGP for Flutter 3.38 compatibility - Gradle: 8.0 → 8.9 - Android Gradle Plugin: 8.1.0 → 8.7.0 - Kotlin: 1.9.10 → 2.1.0 - intl: 0.19.0 → 0.20.0 - Fix CardTheme → CardThemeData (Flutter API change) Required for Flutter 3.38.7 compatibility. The older versions cause build failures with the current Flutter SDK. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-22 10:21:32 +00:00
				`@@ -1 +0,0 @@`
				`Disable dependency metadata in APK for F-Droid compliance.`
				`@@ -1 +0,0 @@`
				`Unofficial mobile client for Music Assistant`