Change package ID to com.collotsspot.ensemble

BREAKING CHANGE: Users must uninstall and reinstall the app. The previous package ID (com.musicassistant.music_assistant) could be confused with an official Music Assistant app. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Bump version to 2.9.3-beta
2026-01-27 19:55:23 +00:00 · 2026-01-27 19:20:19 +00:00 · 2026-01-27 19:14:36 +00:00 · 2026-01-27 19:14:36 +00:00 · 2026-01-27 19:14:36 +00:00 · 2026-01-27 19:14:36 +00:00
153 changed files with 42674 additions and 10129 deletions
@@ -31,10 +31,20 @@ jobs:
      - name: Setup Flutter
        uses: subosito/flutter-action@v2
        with:
-          flutter-version: '3.24.0'
-          channel: 'stable'
+          flutter-version: '3.38.0'
+          channel: 'master'
          cache: true

+      - name: Cache Gradle dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            gradle-${{ runner.os }}-
+
      - name: Get dependencies
        run: flutter pub get

@@ -53,10 +63,7 @@ jobs:

      - name: Setup signing keystore
        run: |
-          # Decode keystore from secret (persistent key for consistent signatures)
          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > android/app/upload-keystore.jks
-
-          # Create key.properties file
          cat > android/key.properties << EOF
          storePassword=${{ secrets.KEYSTORE_PASSWORD }}
          keyPassword=${{ secrets.KEY_PASSWORD }}
@@ -76,10 +83,5 @@ jobs:

      - name: Upload APK summary
        run: |
-          echo "## APK Build Successful! 🎉" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "📱 **APK Location:** \`build/app/outputs/flutter-apk/app-release.apk\`" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "📦 **Download:** Check the artifacts section below" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "## APK Build Successful!" >> $GITHUB_STEP_SUMMARY
          ls -lh build/app/outputs/flutter-apk/app-release.apk >> $GITHUB_STEP_SUMMARY
@@ -0,0 +1,182 @@
+# Player System Animation & Polish Audit
+
+## Context
+
+This is a Music Assistant client app (Ensemble) built with Flutter. The player system has undergone extensive development and now needs a comprehensive polish audit. The goal is buttery smooth 60fps animations and a premium user experience.
+
+## Architecture Overview
+
+The player system consists of three interconnected components:
+
+1. **Mini Player** (collapsed state) - Floating card at bottom, shows current track
+2. **Expanded Player** - Full-screen player with album art, controls, progress
+3. **Queue Panel** - Slides in from right of expanded player, shows playback queue
+
+Additionally:
+- **Player Selector** - Horizontal swipe between multiple players (collapsed mode)
+- **Device Reveal** - Swipe down from mini player to show available players
+
+## Key Files
+
+```
+lib/widgets/
+├── expandable_player.dart      # Main player widget (1800+ lines)
+├── global_player_overlay.dart  # Overlay wrapper, static accessors
+├── player/
+│   ├── queue_panel.dart        # Queue list with great_list_view
+│   ├── chapters_panel.dart     # Audiobook chapters
+│   └── mini_player_content.dart
+```
+
+## CRITICAL CONSTRAINTS
+
+1. **DO NOT MODIFY the queue list implementation** - It uses `great_list_view` package with `AutomaticAnimatedListView`. This was chosen specifically to avoid Flutter's grey screen overlay bug (#103804). The current implementation works correctly.
+
+2. **Preserve all existing functionality** - Focus on polish, not rewrites
+
+3. **Test changes incrementally** - This system is complex with many interdependencies
+
+## Audit Areas
+
+### 1. Animation Performance Audit
+
+Use sub-agents to analyze each animation system:
+
+**Agent 1: Expand/Collapse Animation**
+- Analyze `_controller` and `_expandAnimation`
+- Check for jank during morphing transition
+- Verify lerp functions are efficient
+- Look for unnecessary rebuilds during animation
+- Check `RepaintBoundary` placement
+
+**Agent 2: Queue Panel Animation**
+- Analyze `_queuePanelController` and `_queuePanelAnimation`
+- Verify slide-in/out is smooth
+- Check interaction with expanded player state
+- Verify the Listener-based swipe detection doesn't cause issues
+
+**Agent 3: Player Selector Animation**
+- Analyze horizontal swipe between players
+- Check `_slideOffset` and peek player animations
+- Verify finger-following feels natural
+- Look for edge cases with rapid swipes
+
+**Agent 4: Micro-interactions**
+- Play/pause button animations
+- Progress bar interactions
+- Volume swipe overlay
+- Favorite button feedback
+- Skip button responsiveness
+
+### 2. State Management Audit
+
+**Check for:**
+- Unnecessary `setState` calls during animations
+- ValueNotifier usage efficiency
+- Animation listener cleanup
+- Memory leaks from subscriptions
+- State synchronization between components
+
+### 3. Visual Polish Audit
+
+**Check for:**
+- Color transitions during expand/collapse
+- Text fade/scale animations
+- Image loading placeholders
+- Shadow/elevation consistency
+- Border radius morphing smoothness
+- Safe area handling
+
+### 4. Gesture Conflict Resolution
+
+**Verify:**
+- Vertical drag (expand/collapse) vs horizontal drag (player switch)
+- Queue panel swipe-right-to-close vs Dismissible swipe-left-to-delete
+- Edge dead zones for Android back gesture
+- Tap vs drag disambiguation
+
+### 5. Edge Cases
+
+**Test scenarios:**
+- Rapid expand/collapse
+- Swipe during animation
+- Back button during animations
+- Track change during queue scroll
+- Network image loading failures
+- Very long track/artist names
+
+## Execution Strategy
+
+```
+ultrathink: true
+```
+
+### Phase 1: Discovery (Read-Only)
+Launch parallel sub-agents to analyze each file:
+- Read and understand the animation architecture
+- Map all animation controllers and their relationships
+- Identify potential performance bottlenecks
+- Document current RepaintBoundary usage
+
+### Phase 2: Analysis Report
+Compile findings into categories:
+- **Critical**: Causes visible jank or bugs
+- **Important**: Noticeable but not breaking
+- **Nice-to-have**: Minor polish improvements
+
+### Phase 3: Implementation Plan
+For each finding:
+- Specific file and line numbers
+- Proposed change
+- Risk assessment
+- Testing approach
+
+### Phase 4: Incremental Fixes
+- One fix at a time
+- Build and test after each change
+- Verify no regressions
+
+## Output Format
+
+Provide a structured audit report:
+
+```markdown
+## Animation Audit Report
+
+### Executive Summary
+[2-3 sentences on overall state]
+
+### Critical Issues
+1. [Issue]: [File:Line] - [Description] - [Proposed Fix]
+
+### Important Issues
+1. [Issue]: [File:Line] - [Description] - [Proposed Fix]
+
+### Polish Opportunities
+1. [Issue]: [File:Line] - [Description] - [Proposed Fix]
+
+### Architecture Observations
+[Notes on overall structure, patterns noticed]
+
+### Recommended Priority Order
+1. [First fix]
+2. [Second fix]
+...
+```
+
+## Success Criteria
+
+After this audit and fixes:
+- All animations run at consistent 60fps
+- No jank during any transition
+- Gestures feel responsive and natural
+- State transitions are seamless
+- No visual glitches or flickers
+- Memory usage is stable during interactions
+
+## Notes
+
+- The app uses adaptive theming (colors extracted from album art)
+- There's an `AnimationDebugger` utility for profiling
+- Position tracking uses a shared `PositionTracker` singleton
+- The player supports both music and audiobooks (different UI modes)
@@ -1,136 +1,257 @@
-# Ensemble Flutter App - Code Audit Report
+# Ensemble Codebase Audit Report

-**Date:** January 4, 2026
-**Branch:** `audit/code-quality-review`
-**Files Audited:** 93 Dart files
+**Date**: 2026-01-14
+**Scope**: Full codebase audit (104 Dart files, 18 screens)
+**Focus Areas**: UI Continuity, Performance, Logic/Best Practices

 ---

 ## Executive Summary

-The codebase is generally well-maintained with good existing performance optimizations (RepaintBoundary, ListView.builder, cacheExtent settings). Key improvement areas identified:
+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:

-| Category | Issues Found | Priority |
-|----------|-------------|----------|
-| Deprecated APIs | 20 instances | HIGH |
-| Missing const constructors | 100+ instances | MEDIUM |
-| Image cache parameters | 7 locations | MEDIUM |
-| Code duplication | 8 view mode functions | LOW |
-| Color constants | 3 files with duplicates | LOW |
+| 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

 ---

-## 1. CRITICAL: Deprecated API Usage
+## Critical Issues

-### `colorScheme.background` (20 instances)
-Flutter Material 3 deprecates `ColorScheme.background`. Replace with `colorScheme.surface`.
+### 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

-**Files affected:**
- lib/main.dart:335, 336
- lib/screens/library_artists_screen.dart:21
- lib/screens/new_home_screen.dart:121
- lib/screens/artist_details_screen.dart:708, 720
- lib/screens/library_playlists_screen.dart:53
- lib/screens/library_tracks_screen.dart:19
- lib/screens/login_screen.dart:489
- lib/screens/new_library_screen.dart:933, 957, 1020, 1021
- lib/screens/album_details_screen.dart:807, 819
- lib/screens/library_albums_screen.dart:19
- lib/screens/search_screen.dart:427, 738, 739
- lib/screens/settings_screen.dart:245
+### 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

 ---

-## 2. HIGH: Missing const Constructors
+## High Severity Issues

-### EdgeInsets.zero (64 instances)
-High-impact optimization - used extensively in button padding.
+### 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 |

-**Key files:**
- lib/screens/album_details_screen.dart (12 instances)
- lib/screens/artist_details_screen.dart (8 instances)
- lib/screens/audiobook_detail_screen.dart (3 instances)
- lib/screens/audiobook_series_screen.dart (2 instances)
- lib/screens/audiobook_author_screen.dart (2 instances)
+### 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 |

-### BorderRadius.circular (40+ instances)
-Cannot use `const BorderRadius.circular()` directly. Alternative: `const BorderRadius.all(Radius.circular(X))`.
+### 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 |

 ---

-## 3. MEDIUM: Scroll Performance - Missing Image Cache Parameters
+## Medium Severity Issues

-### CachedNetworkImage without memCacheWidth/Height
+### 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

-**lib/screens/new_library_screen.dart:**
- Line 1395-1402: Author image (48x48) - missing cache params
- Line 1480-1486: Author card image - missing cache params
- Line 1572-1580: Audiobook cover (56x56) - missing cache params
- Line 1740-1745: Audiobook grid cover - missing cache params
- Line 1959-1969: Playlist cover (56x56) - missing cache params
- Line 2143-2152: Playlist grid covers - missing cache params
- Line 2973-2981: Album cover (56x56) - missing cache params
+### 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

-**Note:** DecorationImage with CachedNetworkImageProvider cannot have cache size specified (structural Flutter limitation).
+### 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

 ---

-## 4. LOW: Code Duplication
+## Quick Wins (High Impact, Low Effort)

-### View Mode Cycling Functions (8 nearly identical functions)
-**File:** lib/screens/new_library_screen.dart
-
-Functions that follow identical switch/case pattern:
- `_cycleArtistsViewMode()` (line 184)
- `_cycleAlbumsViewMode()` (line 200)
- `_cyclePlaylistsViewMode()` (line 216)
- `_cycleAuthorsViewMode()` (line 232)
- `_cycleAudiobooksViewMode()` (line 248)
- `_cycleSeriesViewMode()` (line 286)
- `_cycleRadioViewMode()` (line 303)
- `_cyclePodcastsViewMode()` (line 319)
-
-**Recommendation:** Create generic utility function.
-
-### Duplicated Color Constants (3 files)
-Series fallback colors defined identically in:
- lib/widgets/series_row.dart:246-253
- lib/screens/audiobook_series_screen.dart:466-473
- lib/screens/new_library_screen.dart:2112-2119
-
-**Recommendation:** Extract to lib/constants/colors.dart
+| # | 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 |

 ---

-## 5. POSITIVE FINDINGS (Already Optimized)
+## Refactoring Roadmap

- **RepaintBoundary**: Properly implemented in all list item widgets
- **ListView.builder**: Used consistently with cacheExtent: 1000
- **ScrollController disposal**: All 8+ controllers properly disposed
- **Animation patterns**: Proper listener cleanup in expandable_player.dart
- **Debounced operations**: Color extraction debounced to 300ms
+### 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.

 ---

-## Recommended Action Plan
+## Positive Findings

-### Phase 1: Quick Wins (Low Risk)
-1. Replace `colorScheme.background` with `colorScheme.surface` (20 locations)
-2. Add `const` to EdgeInsets.zero instances
+The codebase already demonstrates many good practices:

-### Phase 2: Image Optimization
-1. Add memCacheWidth/memCacheHeight to CachedNetworkImage instances in new_library_screen.dart
-
-### Phase 3: Code Cleanup (Optional)
-1. Extract view mode cycling to utility function
-2. Centralize color constants
+- **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 Complexity
+## Files by Priority

-| File | Lines | Status |
-|------|-------|--------|
-| lib/screens/search_screen.dart | 3,489 | Good structure, minor fixes needed |
-| lib/screens/new_library_screen.dart | 3,351 | Good performance, some duplication |
-| lib/widgets/expandable_player.dart | 2,577 | Well-optimized animations |
+| 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.
@@ -20,44 +20,66 @@ This application was built with AI-assisted development using **Claude Code** an
 ## Features

 ### Local Playback
- **Stream to Your Phone** - Play music from your Music Assistant library directly on your mobile device
+- **Stream to Your Phone** - Play music from your Music Assistant library directly on your mobile device via Sendspin protocol
 - **Background Playback** - Music continues playing when the app is minimized
 - **Media Notifications** - Control playback from your notification shade with album art display
+- **Instant Response** - Pause/resume in ~300ms

 ### Remote Control
 - **Multi-Player Support** - Control any speaker or device connected to Music Assistant
- **Device Selector** - Quickly switch between your phone and other players
+- **Device Selector** - Swipe down on mini player to reveal all your devices
+- **Multi-Room Grouping** - Long-press any player to sync it with the current player
 - **Full Playback Controls** - Play, pause, skip, seek, and adjust volume
- **Queue Management** - View and manage the playback queue
+- **Volume Precision Mode** - Hold the volume slider for fine-grained control with haptic feedback
+- **Power Control** - Turn players on/off directly from the mini player
+
+### Queue Management
+- **View & Manage Queue** - See upcoming tracks in the playback queue
+- **Drag to Reorder** - Instant drag handles for reordering tracks
+- **Swipe left to Delete** - Remove tracks with a simple swipe gesture
+- **Swipe right to play next** - Move tracks with a simple swipe gesture

 ### Home Screen
- **Customizable Rows** - Toggle Recently Played, Discover Artists, and Discover Albums
- **Favorites Rows** - Optional rows for Favorite Albums, Artists, and Tracks
+- **Customizable Rows** - Toggle and reorder: Recently Played, Discover Artists, Discover Albums
+- **Favorites Rows** - Optional rows for Favorite Albums, Artists, Tracks, Playlists, and Radio Stations
 - **Adaptive Layout** - Rows scale properly for different screen sizes and aspect ratios
 - **Pull to Refresh** - Refresh content with a simple pull gesture

-### Library Browsing
- **Browse Your Collection** - Artists, albums, playlists, and tracks from all your music sources
+### Library
+- **Music** - Browse artists, albums, playlists, and tracks from all your music sources
+- **Radio Stations** - Browse and play radio stations with list or grid view
+- **Podcasts** - Browse podcasts, view episodes with descriptions and publish dates
+- **Audiobooks** - Browse by title, series, or author with progress tracking
 - **Favorites Filter** - Toggle to show only your favorite items
- **Album Details** - View track listings with artwork
- **Artist Details** - View artist albums and top tracks
- **Playlist Support** - Browse and play your playlists
- **Search** - Find music across your entire library
+- **Providers Filter** - Toggle to show only specific provider items
+- **Letter Scrollbar** - Fast navigation through long lists
+- **Provider Icons** - Provider icons on library covers
+
+### Search
+- **Universal Search** - Find music, podcasts, radio stations, playlists, and audiobooks
+- **Fuzzy Matching** - Typo-tolerant search (e.g., "beetles" finds "Beatles")
+- **Smart Scoring** - Results ranked by relevance with colored type indicators
+- **Search History** - Quickly access your recent searches
+- **Quick Actions** - Long-press any result to add to queue or play next

 ### Audiobooks
- **Audiobooks Tab** - Browse your audiobook library with grid/list view options
- **Series Support** - View audiobooks organized by series with collage cover art
- **Author Browsing** - Browse audiobooks by author
 - **Chapter Navigation** - Jump between chapters with timestamp display
 - **Progress Tracking** - Track your listening progress across sessions
 - **Continue Listening** - Pick up where you left off
 - **Mark as Finished/Unplayed** - Manage your reading progress
+- **Series Support** - View audiobooks organized by series with collage cover art
+
+### Podcasts
+- **Episode Browser** - View full episode list with artwork and descriptions
+- **Skip Controls** - Skip forward/backward during playback
+- **High-Resolution Artwork** - Fetched via iTunes for best quality

 ### Smart Features
 - **Instant App Restore** - App loads instantly with cached library data while syncing in background
 - **Auto-Reconnect** - Automatically reconnects when connection is lost
 - **Offline Browsing** - Browse your cached library even when disconnected
 - **Hero Animations** - Smooth transitions between screens
+- **Welcome Screen** - Guided onboarding for first-time users

 ### Theming
 - **Material You** - Dynamic theming based on your device's wallpaper
@@ -67,14 +89,18 @@ This application was built with AI-assisted development using **Claude Code** an
 ## Screenshots

 <div align="center">
-  <img src="assets/screenshots/1.png?v=2" alt="Connection Screen" width="150">
-  <img src="assets/screenshots/2.png?v=2" alt="Home Screen" width="150">
-  <img src="assets/screenshots/3.png?v=2" alt="Album Details" width="150">
-  <img src="assets/screenshots/4.png?v=2" alt="Now Playing" width="150">
-  <img src="assets/screenshots/5.png?v=2" alt="Queue" width="150">
-  <img src="assets/screenshots/6.png?v=2" alt="Settings" width="150">
-  <img src="assets/screenshots/7.png?v=2" alt="Audiobooks" width="150">
-  <img src="assets/screenshots/8.png?v=2" alt="Audiobook Player" width="150">
+  <img src="assets/screenshots/1.png?v=4" alt="Screenshot 1" width="150">
+  <img src="assets/screenshots/2.png?v=4" alt="Screenshot 2" width="150">
+  <img src="assets/screenshots/3.png?v=4" alt="Screenshot 3" width="150">
+  <img src="assets/screenshots/4.png?v=4" alt="Screenshot 4" width="150">
+  <img src="assets/screenshots/5.png?v=4" alt="Screenshot 5" width="150">
+  <img src="assets/screenshots/6.png?v=4" alt="Screenshot 6" width="150">
+  <img src="assets/screenshots/7.png?v=4" alt="Screenshot 7" width="150">
+  <img src="assets/screenshots/8.png?v=4" alt="Screenshot 8" width="150">
+  <img src="assets/screenshots/9.png?v=4" alt="Screenshot 9" width="150">
+  <img src="assets/screenshots/10.png?v=4" alt="Screenshot 10" width="150">
+  <img src="assets/screenshots/11.png?v=4" alt="Screenshot 11" width="150">
+  <img src="assets/screenshots/12.png?v=4" alt="Screenshot 12" width="150">
 </div>

 ## Download
@@ -84,26 +110,32 @@ Download the latest release from the [Releases page](https://github.com/CollotsS
 ## Setup

 1. Launch the app
-2. Enter your Music Assistant server URL (e.g., `music.example.com` or `192.168.1.100`)
+2. Enter your Music Assistant server URL
 3. Connect to your server
-4. Start playing! Music plays on your phone by default, or tap the device icon to choose a different player.
+4. Start playing! Music plays on your phone by default, or swipe down on the mini player to choose a different player.

-## Authentication
+### Finding Your Server URL

-Ensemble supports multiple authentication methods:
+**Important:** You need the **Music Assistant** URL, not your Home Assistant URL.

-| Method | Status |
-|--------|--------|
-| Music Assistant native auth | Tested |
-| No authentication | Tested |
-| Authelia | Implemented, not recently tested |
-| HTTP Basic Auth | Implemented, not recently tested |
+To find the correct URL:
+1. Open Music Assistant web UI
+2. Go to **Settings** > **About**
+3. Look for **Base URL** (e.g., `http://192.168.1.100:8095`)

-**Note:** Development and testing is done against Music Assistant beta with native authentication enabled.
+### Home Assistant Add-on Users
+
+If you run Music Assistant as a Home Assistant add-on:
+- Use the IP address of your Home Assistant server
+- Do **not** use your Home Assistant URL or ingress URL
+
+### Remote Access
+
+For access outside your home network, you'll need to expose Music Assistant through a reverse proxy (e.g., Traefik, Nginx Proxy Manager, Cloudflare Tunnel).

 ## Requirements

- Music Assistant server (v2.7.0 beta 20 or later)
+- Music Assistant server (v2.7.0 beta 20 or later recommended)
 - Network connectivity to your Music Assistant server
 - Android device (Android 5.0+)
 - Audiobookshelf provider configured in Music Assistant (for audiobook features)
@@ -0,0 +1,78 @@
+# Release Notes Draft
+
+## v2.9.2-beta (TBD)
+
+### New Features
+
+#### Context Menus
+- **Long-press context menus on all media items**: Albums, artists, tracks, playlists, podcasts, and radio stations now all support long-press to show a context menu with Play, Add to Library, and Favorite options.
+
+#### Podcasts
+- **Podcast episode detail screen**: Tap "View Details" from episode context menu to see full scrollable description, publish date, duration, with Play, Play On, and Add to Queue actions.
+- **Episode sorting**: Sort podcast episodes by newest first, oldest first, alphabetical, or duration.
+
+#### Audio Quality
+- **Hi-res audio badge**: Track listings now show a hi-res badge when high quality audio is available.
+
+### Improvements
+
+#### UI/UX
+- **New library icon**: Replaced confusing library icon with clearer book icon (book_2) across bottom nav, search filter, detail screens, and context menus. Filled when in library, outlined when not.
+- **Player selector**: Replaced popup dialog with player select overlay for queue actions.
+- **Search library filter**: Filled icon indicates active filter state without background highlight.
+- **Context menu polish**: Slightly larger buttons (46px), wider menu (185px), consistent text colors that don't pick up adaptive theming.
+- **Navigation transitions**: Smoother fade/slide animations between screens.
+- **Hero animations**: Podcast episode images animate smoothly to detail screen.
+
+#### Performance
+- **Library list optimization**: Standardized list item heights with itemExtent, reduced image cache sizes for smoother scrolling.
+- **Palette extraction**: Moved to isolate for better UI responsiveness during color extraction.
+- **Provider selects**: Optimized provider state watching to reduce unnecessary rebuilds.
+
+### Bug Fixes
+
+#### Audiobooks
+- **Fixed audiobooks not loading after provider re-add**: When removing and re-adding an AudiobookShelf provider, the app would show 0 audiobooks because saved library paths referenced the old provider instance ID. Now automatically clears stale settings and falls back to the library_items API.
+
+- **Fixed duplicate provider filter options**: After re-adding a provider, two entries for the same provider could appear in the library filter menu. Now deduplicates providers by name, keeping the one with more items.
+
+- **Fixed multiple accounts of same service not showing**: When you have multiple accounts of the same service (e.g., two Spotify accounts for different family members), only one would appear in the library menu provider toggles. Now all accounts with distinct names are shown.
+
+- **Fixed audiobook year sorting**: Sort by year now works correctly for audiobooks. Fixed two issues:
+  - Year data is now properly extracted from ABS's `metadata.release_date` field (handles both "2024" and "2024-01-15" formats)
+  - Sort handler now properly supports ascending and descending year sorts
+
+#### Library Sorting
+- **Fixed letter scrollbar showing irrelevant letters**: When sorting by date or play count, the scrollbar popup now hides instead of showing meaningless letters. Shows contextual info based on sort type (letters for alphabetical, years for year sort, hidden for date/count sorts).
+
+- **Fixed sorting not working for date added, last played, play count**: These sort options now correctly preserve server-side sorting instead of re-sorting alphabetically on the client. Affected albums, artists, and tracks tabs.
+
+- **Fixed playlists sorting**: Modified, last played, and play count sorting now works for playlists by properly requesting sorted data from the server.
+
+- **Fixed ascending/descending not working**: Sort direction now properly applies for all sort types across albums, artists, playlists, and audiobooks.
+
+- **Fixed list not updating when sort order changes**: Added sort order to ListView/GridView keys to force UI rebuilds when changing sort direction.
+
+#### Provider Management
+- **Fixed stale provider IDs persisting in settings**: When toggling providers, stale provider instance IDs (from removed providers) are now automatically cleaned up from saved settings.
+
+#### Playback
+- **Fixed Spotify external source detection** (issue #27): Properly detects when Spotify is the music provider.
+- **Fixed foreground service not stopping** (issue #51): Auto-stops after 30 minutes idle.
+- **Fixed Sendspin proxy auth**: Now works correctly for local network connections.
+
+#### UI Fixes
+- **Fixed nav bar hidden when no player selected**: Navigation bar now always visible.
+- **Fixed Flutter 3.38 slider grey rectangles**: Volume and seek sliders render correctly.
+- **Fixed library tab scroll position**: Maintains position when switching tabs.
+
+### Technical Changes
+- Flutter 3.38 compatibility
+- Simplified authentication using MA built-in auth
+- Added `material_symbols_icons` package for book_2 icon
+- Added `ScrollbarDisplayMode` enum (`letter`, `year`, `count`, `none`) for contextual scrollbar popups
+- Added `updateCachedAlbums()`, `updateCachedArtists()`, `updateCachedPlaylists()` methods to SyncService for proper cache synchronization with sorted data
+- Provider filter now validates against available providers when toggling, not just on initial load
+- Removed Selector caching from albums and artists tabs to ensure proper rebuilds when source tracking updates
+- Options menu provider toggles now use Consumer to watch Provider state directly
+- Centralized player selector logic in GlobalPlayerOverlay.showPlayerSelectorForAction()
@@ -29,7 +29,7 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    namespace "com.musicassistant.music_assistant"
+    namespace "com.collotsspot.ensemble"
    compileSdk 35
    ndkVersion flutter.ndkVersion

@@ -58,8 +58,8 @@ android {
    }

    defaultConfig {
-        applicationId "com.musicassistant.music_assistant"
-        minSdk 21
+        applicationId "com.collotsspot.ensemble"
+        minSdkVersion flutter.minSdkVersion
        targetSdk 35
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
@@ -11,6 +11,7 @@
        android:label="Ensemble"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
+        android:appCategory="audio"
        android:usesCleartextTraffic="true"
        android:networkSecurityConfig="@xml/network_security_config">
        <activity
@@ -1,4 +1,4 @@
-package com.musicassistant.music_assistant
+package com.collotsspot.ensemble

 import android.util.Log
 import android.view.KeyEvent
@@ -10,7 +10,7 @@ import io.flutter.plugin.common.MethodChannel
 // while also intercepting volume button events
 class MainActivity: AudioServiceActivity() {
    private val TAG = "EnsembleVolume"
-    private val CHANNEL = "com.musicassistant.music_assistant/volume_buttons"
+    private val CHANNEL = "com.collotsspot.ensemble/volume_buttons"
    private var methodChannel: MethodChannel? = null
    private var isListening = false

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <color name="launch_background_color">#1a1a1a</color>
-</resources>
+	<color name="ic_launcher_background">#1a1a1a</color>
+</resources>
@@ -1,12 +1,15 @@
 buildscript {
-    ext.kotlin_version = '1.9.10'
+    ext.kotlin_version = '2.1.0'
    repositories {
        google()
+        // Use Maven Central mirrors as fallback for 403 errors
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
        mavenCentral()
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.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()
    }
 }
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
@@ -0,0 +1,37 @@
+// Force all repositories to use mirrors first
+allprojects {
+    repositories {
+        all { ArtifactRepository repo ->
+            if (repo instanceof MavenArtifactRepository) {
+                def url = repo.url.toString()
+                if (url.contains('repo.maven.apache.org') || url.contains('repo1.maven.org')) {
+                    remove repo
+                }
+            }
+        }
+        // Add mirrors before Maven Central
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
+    }
+}
+
+settingsEvaluated { settings ->
+    settings.pluginManagement {
+        repositories {
+            all { ArtifactRepository repo ->
+                if (repo instanceof MavenArtifactRepository) {
+                    def url = repo.url.toString()
+                    if (url.contains('repo.maven.apache.org') || url.contains('repo1.maven.org')) {
+                        remove repo
+                    }
+                }
+            }
+            maven { url 'https://maven.aliyun.com/repository/central' }
+            maven { url 'https://maven.aliyun.com/repository/google' }
+            maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+            maven { url 'https://maven.aliyun.com/repository/public' }
+        }
+    }
+}
@@ -22,8 +22,8 @@ pluginManagement {

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

 include ":app"
@@ -0,0 +1,336 @@
+# Per-Provider Sync Implementation
+
+## Date: January 17, 2026
+
+## Overview
+
+This document details the implementation of per-provider sync with source tracking, enabling instant client-side filtering that properly differentiates between multiple accounts of the same provider type (e.g., two different Spotify accounts).
+
+## Problem Statement
+
+### The Core Issue
+
+When a user has multiple accounts of the same provider type (e.g., two Spotify accounts: "Chris Laycock" and "Bababagoly"), the existing provider filter couldn't differentiate between them.
+
+**Why?** Music Assistant's `provider_mappings` field on media items shows which providers **CAN PLAY** an item, not which provider **ADDED** it. When both Spotify accounts can play the same artist, both appear in `provider_mappings`, making client-side filtering impossible.
+
+### Previous Approach (Failed)
+
+The initial implementation tried to filter client-side using `provider_mappings`:
+
+```dart
+bool isItemAllowedByProviderFilter(MediaItem item) {
+  final mappings = item.providerMappings;
+  for (final mapping in mappings) {
+    if (_providerFilter.contains(mapping.providerInstance)) {
+      return true;
+    }
+  }
+  return false;
+}
+```
+
+**Result:** Both Spotify accounts showed the same items because `provider_mappings` contained both account IDs for shared content.
+
+### Race Condition Issue
+
+Additionally, when rapidly toggling providers, a race condition occurred:
+1. User toggles Provider A off
+2. Sync starts for remaining providers
+3. User toggles Provider B off before sync completes
+4. First sync completes with wrong filter state
+5. UI shows incorrect results
+
+## Solution: Per-Provider Sync with Source Tracking
+
+### Concept
+
+Instead of relying on `provider_mappings`, we:
+1. **Sync each provider separately** using the MA API's `provider` parameter
+2. **Tag each item** with which provider instance(s) returned it
+3. **Store source tracking** in the local database
+4. **Filter client-side** using the source tracking data (instant)
+5. **Background sync** keeps data fresh without blocking UI
+
+### Why This Works
+
+When we call the MA API with `provider: ["spotify--RKnr3jKx"]`, the server returns **only items from that specific account's library**. By syncing each provider separately and remembering which provider returned each item, we can accurately filter.
+
+## Implementation Details
+
+### 1. Database Schema Update
+
+**File:** `lib/database/database.dart`
+
+Added `sourceProviders` column to `LibraryCache` table:
+
+```dart
+class LibraryCache extends Table {
+  // ... existing columns ...
+
+  /// Provider instance IDs that provided this item (JSON array)
+  /// Used for client-side filtering by source provider
+  TextColumn get sourceProviders => text().withDefault(const Constant('[]'))();
+}
+```
+
+**Schema version:** 5 → 6
+
+**Migration:**
+```dart
+if (from < 6) {
+  await customStatement(
+    "ALTER TABLE library_cache ADD COLUMN source_providers TEXT NOT NULL DEFAULT '[]'"
+  );
+}
+```
+
+### 2. Database Service Updates
+
+**File:** `lib/services/database_service.dart`
+
+Added `sourceProvider` parameter to `cacheItem()`:
+
+```dart
+Future<void> cacheItem<T>({
+  required String itemType,
+  required String itemId,
+  required Map<String, dynamic> data,
+  String? sourceProvider,  // NEW: tracks which provider this item came from
+})
+```
+
+Added new method to retrieve items with source tracking:
+
+```dart
+Future<List<(Map<String, dynamic>, List<String>)>> getCachedItemsWithProviders(String itemType)
+```
+
+Returns tuples of `(itemData, sourceProviderIds)`.
+
+### 3. SyncService Rewrite
+
+**File:** `lib/services/sync_service.dart`
+
+#### New Fields
+
+```dart
+// Source provider tracking for client-side filtering
+Map<String, List<String>> _albumSourceProviders = {};
+Map<String, List<String>> _artistSourceProviders = {};
+Map<String, List<String>> _audiobookSourceProviders = {};
+Map<String, List<String>> _playlistSourceProviders = {};
+```
+
+#### Per-Provider Sync Logic
+
+```dart
+Future<void> syncFromApi(MusicAssistantAPI api, {
+  bool force = false,
+  List<String>? providerInstanceIds,
+}) async {
+  // If specific providers are requested, sync each separately
+  if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
+    for (final providerId in providerInstanceIds) {
+      // Fetch from this specific provider
+      final results = await Future.wait([
+        api.getAlbums(limit: 1000, providerInstanceIds: [providerId]),
+        api.getArtists(limit: 1000, providerInstanceIds: [providerId]),
+        // ... etc
+      ]);
+
+      // Track source provider for each item
+      for (final album in albums) {
+        albumMap[album.itemId] = album;
+        _albumSourceProviders.putIfAbsent(album.itemId, () => []);
+        if (!_albumSourceProviders[album.itemId]!.contains(providerId)) {
+          _albumSourceProviders[album.itemId]!.add(providerId);
+        }
+      }
+    }
+  }
+}
+```
+
+#### Client-Side Filtering Methods
+
+```dart
+/// Filter albums by source provider (instant, no network)
+List<Album> getAlbumsFilteredByProviders(Set<String> enabledProviderIds) {
+  if (enabledProviderIds.isEmpty || _albumSourceProviders.isEmpty) {
+    return _cachedAlbums;
+  }
+  return _cachedAlbums.where((album) {
+    final sources = _albumSourceProviders[album.itemId];
+    if (sources == null || sources.isEmpty) return true; // No tracking = show
+    return sources.any((s) => enabledProviderIds.contains(s));
+  }).toList();
+}
+
+// Similar methods for artists, audiobooks, playlists
+```
+
+### 4. Library Screen Updates
+
+**File:** `lib/screens/new_library_screen.dart`
+
+#### Hybrid Provider Toggle Handler
+
+```dart
+void _handleProviderToggle(String providerId, bool enabled) {
+  final maProvider = context.read<MusicAssistantProvider>();
+
+  // Instant UI update via global provider toggle
+  maProvider.toggleProviderEnabled(providerId, enabled);
+  setState(() {}); // Rebuild with client-side filtering
+
+  // Background sync after 1.5s debounce
+  _providerFilterDebounce?.cancel();
+  _providerFilterDebounce = Timer(const Duration(milliseconds: 1500), () async {
+    if (mounted) {
+      await maProvider.forceLibrarySync();
+      if (mounted) setState(() {});
+    }
+  });
+}
+```
+
+#### Updated Tab Builders
+
+Artists tab now uses source tracking:
+
+```dart
+Widget _buildArtistsTab(BuildContext context, S l10n) {
+  return Selector<MusicAssistantProvider, (List<Artist>, bool, Set<String>)>(
+    selector: (_, provider) => (
+      provider.artists,
+      provider.isLoading,
+      provider.enabledProviderIds.toSet()
+    ),
+    builder: (context, data, _) {
+      final (allArtists, isLoading, enabledProviders) = data;
+
+      // Client-side filtering using SyncService source tracking
+      final syncService = SyncService.instance;
+      final filteredArtists = syncService.hasSourceTracking && enabledProviders.isNotEmpty
+          ? syncService.getArtistsFilteredByProviders(enabledProviders)
+          : allArtists;
+
+      // ... rest of build
+    },
+  );
+}
+```
+
+Similar updates for albums, playlists, and audiobooks tabs.
+
+### 5. Provider Instance Model
+
+**File:** `lib/models/provider_instance.dart` (new file)
+
+```dart
+class ProviderInstance {
+  final String instanceId;  // e.g., "spotify--abc123"
+  final String domain;      // e.g., "spotify"
+  final String name;        // e.g., "Spotify (John's Account)"
+  final bool available;
+
+  /// Known music provider domains
+  static const Set<String> musicProviderDomains = {
+    'spotify', 'tidal', 'qobuz', 'deezer', 'ytmusic', 'soundcloud',
+    'apple_music', 'amazon_music', 'plex', 'subsonic', 'opensubsonic',
+    'jellyfin', 'emby', 'navidrome', 'audiobookshelf', 'filesystem',
+    'tunein', 'radiobrowser', 'snapcast', 'fully_kiosk',
+  };
+
+  bool get isMusicProvider => musicProviderDomains.contains(domain);
+}
+```
+
+## Data Flow
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│                     User Toggles Provider                        │
+└─────────────────────────────────────────────────────────────────┘
+                                │
+                                ▼
+┌─────────────────────────────────────────────────────────────────┐
+│  1. MusicAssistantProvider.toggleProviderEnabled()              │
+│     - Updates enabledProviderIds                                │
+│     - Triggers setState() for instant UI update                 │
+└─────────────────────────────────────────────────────────────────┘
+                                │
+                                ▼
+┌─────────────────────────────────────────────────────────────────┐
+│  2. UI Rebuilds Immediately                                     │
+│     - Selector detects enabledProviderIds change                │
+│     - Calls SyncService.getArtistsFilteredByProviders()         │
+│     - Filters using source tracking (instant, no network)       │
+└─────────────────────────────────────────────────────────────────┘
+                                │
+                                ▼
+┌─────────────────────────────────────────────────────────────────┐
+│  3. Background Sync (after 1.5s debounce)                       │
+│     - forceLibrarySync() called                                 │
+│     - Syncs each enabled provider separately                    │
+│     - Updates source tracking in database                       │
+│     - UI refreshes with fresh data                              │
+└─────────────────────────────────────────────────────────────────┘
+```
+
+## Files Changed
+
+| File | Changes |
+|------|---------|
+| `lib/database/database.dart` | Added `sourceProviders` column, schema v6, migration |
+| `lib/database/database.g.dart` | Auto-generated from schema changes |
+| `lib/services/database_service.dart` | Added `sourceProvider` param, `getCachedItemsWithProviders()` |
+| `lib/services/sync_service.dart` | Per-provider sync, source tracking maps, filtering methods |
+| `lib/screens/new_library_screen.dart` | Hybrid toggle handler, updated tab builders |
+| `lib/models/provider_instance.dart` | New model for provider instances |
+
+## Testing Checklist
+
+- [ ] Fresh install: First sync should populate source tracking
+- [ ] Toggle single provider: UI updates instantly
+- [ ] Toggle multiple providers rapidly: Debounce prevents race conditions
+- [ ] Two Spotify accounts: Toggling one only shows that account's items
+- [ ] Mixed providers: Toggling Spotify doesn't affect Audiobookshelf items
+- [ ] Legacy cache: Items without source tracking show regardless of filter
+- [ ] Pull to refresh: Refreshes source tracking data
+
+## Known Limitations
+
+1. **First sync required:** Source tracking only works after at least one sync with providers enabled
+2. **Network cost:** Per-provider sync makes N API calls (one per provider) vs. 1 call for all providers
+3. **Items in multiple accounts:** If the same item exists in both Spotify accounts, it will show when either is enabled
+
+## Future Improvements
+
+1. **Incremental sync:** Only sync changed items instead of full library
+2. **Provider-specific cache age:** Different sync intervals per provider
+3. **Offline source tracking:** Persist source tracking independently of full cache
+
+## Branch
+
+All changes are on the `feature/per-provider-sync` branch.
+
+```bash
+git checkout feature/per-provider-sync
+```
+
+## Commit
+
+```
+feat: Add per-provider sync with source tracking for instant filtering
+
+- Add sourceProviders column to database schema (v6) for tracking which
+  provider instance each item came from
+- Update SyncService to sync each enabled provider separately and tag
+  items with their source provider
+- Add client-side filtering methods that use source tracking to properly
+  differentiate between multiple accounts of the same provider type
+- Update library UI to use instant client-side filtering with background
+  sync for data freshness
+```
@@ -0,0 +1,217 @@
+# Provider Filter Implementation Notes
+
+## Overview
+
+This document captures the context and learnings from an attempted implementation of provider filtering in the Ensemble app. The goal was to allow users to filter their library to show only items from a specific music provider (e.g., only one Spotify account when multiple are configured).
+
+## The Problem
+
+Users with multiple music provider accounts (e.g., two Spotify accounts: one personal, one family) want to filter their library view to show only items from one specific account. The Music Assistant (MA) web UI successfully implements this feature.
+
+## What Works vs What Failed
+
+### Works: Different Provider Types
+Filtering between different provider types (e.g., Spotify vs Tidal vs Plex) works correctly. Each provider type has distinct `provider_mappings` entries.
+
+### Failed: Multiple Accounts of Same Provider
+Filtering between multiple Spotify accounts (e.g., `spotify--abc123` vs `spotify--xyz789`) does NOT work correctly. The same library items appear regardless of which Spotify account is selected.
+
+## Root Cause Analysis
+
+### The provider_mappings Problem
+
+MA's `provider_mappings` field on media items does NOT indicate "which account ADDED this item to the library." Instead, it indicates "which providers CAN PLAY this item."
+
+Example: An artist "Ari Mason" that exists ONLY in User A's Spotify library will show provider_mappings containing BOTH Spotify accounts:
+```json
+{
+  "provider_mappings": [
+    {"provider_instance": "spotify--userA_id", "item_id": "..."},
+    {"provider_instance": "spotify--userB_id", "item_id": "..."}
+  ]
+}
+```
+
+This happens because:
+1. MA's internal database stores that the artist exists
+2. MA knows both Spotify accounts CAN play this artist (Spotify has the content)
+3. MA doesn't track WHICH account originally added the item to the library
+
+### MA Web UI Behavior
+
+The MA web UI's provider filter works differently - it appears to use server-side filtering via the `provider` parameter on library_items API calls. When you select a single provider in MA settings, the API returns only items from that provider's library.
+
+## API Investigation
+
+### Server-Side Filtering Parameter
+
+The MA server's `library_items` method accepts a `provider` parameter:
+- Parameter name: `provider` (string or list of strings)
+- Endpoint: `music/{type}/library_items` (e.g., `music/artists/library_items`)
+- Expected behavior: Filter to only return items from the specified provider's library
+
+### What We Tried
+
+1. **Client-side filtering based on provider_mappings**
+   - Result: Failed - all Spotify accounts appear in mappings regardless of which added the item
+
+2. **Server-side filtering with `provider` parameter**
+   - Result: Partially implemented but behavior was inconsistent
+   - The API accepts the parameter but may not filter correctly for same-provider-type accounts
+
+3. **Using `provider_instance_id_or_domain` parameter**
+   - Result: This parameter is for getting specific items by ID, not for filtering library_items
+
+## Code Locations
+
+### Files Modified (in stash)
+
+The implementation attempt is preserved in git stash:
+```bash
+git stash list  # Look for "provider-filter-and-dropdown-work"
+git stash show -p stash@{0}  # View the changes
+```
+
+Key files that were modified:
+
+1. **lib/providers/music_assistant_provider.dart**
+   - `_disabledProviders`: List of disabled provider instance IDs (local app setting)
+   - `selectedProviderForFilter`: Returns single enabled provider for server-side filtering
+   - `toggleProviderEnabled()`: Toggle provider on/off and trigger re-sync
+   - `loadDisabledProviders()`: Load from local settings
+   - `filterByProvider()`: Client-side filtering (enhanced version)
+   - `isItemAllowedByProviderFilter()`: Check if item should be visible
+
+2. **lib/services/music_assistant_api.dart**
+   - Added `provider` parameter to: `getArtists`, `getAlbums`, `getTracks`, `getRandomArtists`, `getRandomAlbums`
+   - Added `MusicProvider` model parsing from `/providers` endpoint
+   - `musicProviders` getter: List of available music providers
+
+3. **lib/services/sync_service.dart**
+   - Added `provider` parameter to `syncFromApi()` and `forceSync()`
+   - Pass provider filter to API calls during sync
+
+4. **lib/services/settings_service.dart**
+   - `getDisabledMusicProviders()`: Get list of disabled provider IDs
+   - `setDisabledMusicProviders()`: Save disabled providers
+   - `toggleProviderEnabled()`: Toggle and persist
+
+5. **lib/screens/settings_screen.dart**
+   - UI for toggling individual providers on/off
+   - Display provider name and instance ID
+
+6. **lib/screens/new_library_screen.dart**
+   - Integration with provider filtering
+
+7. **lib/models/music_provider.dart** (new file)
+   - Model for MA provider instances
+   - Fields: `instanceId`, `domain`, `name`, `available`
+
+## Race Condition Issue
+
+A race condition was identified where:
+1. Initial app sync starts WITHOUT provider filter
+2. User toggles provider filter
+3. `clearCache()` is called
+4. New sync with provider filter tries to start
+5. "Sync already in progress" - new sync is skipped
+6. Result: Old unfiltered data remains
+
+Fix attempted: Reset `_isSyncing = false` in `clearCache()` to allow fresh sync.
+
+## Potential Solutions to Explore
+
+### 1. Investigate MA Server-Side Filtering
+
+The MA server should support filtering by provider. Need to verify:
+- Does the `provider` parameter work for filtering between same-type providers?
+- Is there a different parameter or API endpoint?
+- Check MA source code: https://github.com/music-assistant/server
+
+### 2. Library Sync Per Provider
+
+Instead of syncing all items and filtering, sync each provider's library separately:
+```dart
+for (final provider in enabledProviders) {
+  final items = await api.getAlbums(provider: provider.instanceId);
+  // Store with provider association
+}
+```
+
+### 3. Track Item Origin
+
+Store which provider originally added each item:
+- Modify database schema to track `source_provider`
+- When syncing, record which provider the item came from
+- Filter based on source, not playability
+
+### 4. Use MA's Internal Library State
+
+MA might have internal state about which items are in which provider's library. Investigate:
+- `/music/library/items` endpoint
+- Provider-specific library endpoints
+- MA's database schema for library associations
+
+### 5. Check MA User Settings
+
+The MA web UI's provider filter might be stored in user settings:
+```dart
+final userInfo = await api.getCurrentUserInfo();
+// Check for provider_filter or similar field
+```
+
+## Testing Notes
+
+### Log Messages to Watch
+
+```
+🔌 Selected provider for filter: spotify--xxxxx
+🔍 API getArtists args: {limit: 1000, provider: spotify--xxxxx}
+🔍 API getArtists returned XXX items
+🔌 filterByProvider: XXX → YYY (disabled=[...])
+```
+
+### Test Scenario
+
+1. Configure two Spotify accounts in MA
+2. Add different artists to each account's library
+3. In Ensemble, select only one Spotify account
+4. Verify library shows ONLY that account's items
+5. Switch to other account, verify different items
+
+### Expected vs Actual
+
+- **Expected**: Artist "Ari Mason" (only in Account A) should NOT appear when Account B is selected
+- **Actual**: Artist appears regardless of which account is selected
+
+## MA API Reference
+
+### Get Providers
+```
+Command: providers
+Returns: List of provider instances with type, domain, instanceId, name, available
+```
+
+### Library Items with Filter
+```
+Command: music/artists/library_items
+Args: {
+  limit: int,
+  offset: int,
+  provider: string | list<string>,  // Filter to specific provider(s)
+  album_artists_only: bool,
+  order_by: string
+}
+```
+
+### Relevant MA Source Files
+
+- `music_assistant/server/controllers/music.py` - Library item retrieval
+- `music_assistant/server/models/provider.py` - Provider model
+- `music_assistant/server/providers/` - Individual provider implementations
+
+## Conclusion
+
+The core challenge is that MA's `provider_mappings` indicates playability, not ownership. Server-side filtering via the `provider` parameter should work but needs further investigation to understand why it doesn't differentiate between multiple accounts of the same provider type.
+
+The implementation is preserved in the git stash for future reference. The sorting/dropdown improvements were extracted and committed separately.
@@ -0,0 +1,271 @@
+# Audiobook Provider Filtering Fix
+
+## Date: January 17, 2026 (Continuation)
+
+## Overview
+
+This session focused on fixing provider filtering issues discovered after the initial provider filtering improvements:
+1. Audiobooks were not responding to provider filter changes (browse API ignoring `providerInstanceIds`)
+2. UI not updating instantly when toggling providers (missing `notifyListeners()` call)
+3. Audiobook tabs not rebuilding on provider changes (using `context.read` instead of `Selector`)
+
+---
+
+## Problem Statement
+
+After implementing capability-based provider filtering for the music library, two issues remained:
+
+### Issue 1: Audiobooks Not Filtering During Sync
+
+The bug report showed:
+```
+📊 Source tracking: 252 albums, 87 artists have provider info
+📚 Total audiobooks from browse: 186
+```
+
+- Albums and artists had provider source tracking
+- Audiobooks had NO provider source tracking (not listed)
+- All 186 audiobooks were returned regardless of provider selection
+
+### Issue 2: UI Not Updating Instantly
+
+When toggling providers in the library menu:
+- Music tabs weren't updating immediately
+- Audiobooks required manual pull-to-refresh
+- Changes only appeared after ~600ms (debounce timer)
+
+---
+
+## Root Cause Analysis
+
+### Cause 1: Browse API Ignoring Provider Filter
+
+In `lib/services/music_assistant_api.dart`, when ABS library filtering is enabled, the `getAudiobooks()` function uses the browse API but was **ignoring** the `providerInstanceIds` parameter:
+
+```dart
+// BEFORE: providerInstanceIds was ignored when using browse API
+if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
+  return await _getAudiobooksFromBrowse(enabledLibraries, favoriteOnly: favoriteOnly);
+}
+```
+
+### Cause 2: `notifyListeners()` Called Too Late
+
+In `lib/providers/music_assistant_provider.dart`, the `toggleProviderEnabled()` function only called `notifyListeners()` **inside** the 600ms debounce timer:
+
+```dart
+// BEFORE: notifyListeners only called after 600ms debounce
+_providerFilterDebounceTimer = Timer(const Duration(milliseconds: 600), () {
+  forceLibrarySync();
+  notifyListeners();  // Too late! UI should update immediately
+});
+```
+
+### Cause 3: Audiobook Tabs Not Listening for Changes
+
+The audiobook tabs used `context.read<MusicAssistantProvider>()` which doesn't trigger rebuilds when the provider changes:
+
+```dart
+// BEFORE: context.read doesn't listen for changes
+Widget _buildBooksAuthorsTab(BuildContext context, S l10n) {
+  final maProvider = context.read<MusicAssistantProvider>();
+  final enabledProviders = maProvider.enabledProviderIds.toSet();
+  // ... widget doesn't rebuild when enabledProviders changes
+}
+```
+
+---
+
+## Solutions
+
+### Fix 1: Browse API Provider Filtering
+
+**File:** `lib/services/music_assistant_api.dart` (lines 760-785)
+
+Added logic to filter library paths by provider ID before browsing:
+
+```dart
+if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
+  _logger.log('📚 getAudiobooks: enabledLibraries=$enabledLibraries, providerInstanceIds=$providerInstanceIds');
+
+  // If specific providers are requested, filter libraries to only matching providers
+  // Library paths start with provider ID (e.g., "audiobookshelf--abc123://lb...")
+  var librariesToBrowse = enabledLibraries;
+  if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
+    librariesToBrowse = enabledLibraries.where((libPath) {
+      // Extract provider ID from library path (everything before "://")
+      final providerEnd = libPath.indexOf('://');
+      if (providerEnd == -1) return false;
+      final providerId = libPath.substring(0, providerEnd);
+      return providerInstanceIds.contains(providerId);
+    }).toList();
+
+    // If no libraries match the requested providers, return empty
+    if (librariesToBrowse.isEmpty) {
+      return [];
+    }
+  }
+  return await _getAudiobooksFromBrowse(librariesToBrowse, favoriteOnly: favoriteOnly);
+}
+```
+
+### Fix 2: Immediate `notifyListeners()` Call
+
+**File:** `lib/providers/music_assistant_provider.dart` (line 1149)
+
+Moved `notifyListeners()` to fire immediately after `_enabledProviderIds` changes:
+
+```dart
+// Reload the enabled providers
+final savedEnabled = await SettingsService.getEnabledMusicProviders();
+_enabledProviderIds = savedEnabled ?? [];
+
+// Notify listeners IMMEDIATELY so UI rebuilds with client-side filtering
+// This enables instant UI updates using cached data with source tracking
+notifyListeners();
+
+// Cancel any pending debounce timer
+_providerFilterDebounceTimer?.cancel();
+
+// Start debounced sync - waits 600ms for user to finish toggling
+// This refreshes the cache with new data from enabled providers
+_providerFilterDebounceTimer = Timer(const Duration(milliseconds: 600), () {
+  _logger.log('🔄 Debounce complete, starting library sync...');
+  forceLibrarySync();
+});
+```
+
+### Fix 3: Audiobook Tabs Use Selector
+
+**File:** `lib/screens/new_library_screen.dart`
+
+Wrapped `_buildBooksAuthorsTab` and `_buildAllBooksTab` in `Selector` to rebuild when `enabledProviderIds` changes:
+
+```dart
+Widget _buildBooksAuthorsTab(BuildContext context, S l10n) {
+  // Use Selector to rebuild when enabledProviderIds changes
+  return Selector<MusicAssistantProvider, Set<String>>(
+    selector: (_, provider) => provider.enabledProviderIds.toSet(),
+    builder: (context, enabledProviders, _) {
+      final syncService = SyncService.instance;
+
+      // Client-side filtering using SyncService source tracking for instant updates
+      var audiobooks = syncService.hasSourceTracking && enabledProviders.isNotEmpty
+          ? syncService.getAudiobooksFilteredByProviders(enabledProviders)
+          : List<Audiobook>.from(_audiobooks);
+
+      // ... rest of widget
+    },
+  );
+}
+```
+
+### Fix 4: Enhanced Sync Logging
+
+**File:** `lib/services/sync_service.dart`
+
+Added audiobook counts to logging:
+
+```dart
+// Per-provider log (line 237)
+_logger.log('  📥 Got ${albums.length} albums, ${artists.length} artists, ${audiobooks.length} audiobooks from $providerId');
+
+// Source tracking summary (line 323)
+_logger.log('📊 Source tracking: ${_albumSourceProviders.length} albums, ${_artistSourceProviders.length} artists, ${_audiobookSourceProviders.length} audiobooks have provider info');
+```
+
+---
+
+## Data Flow After Fixes
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│                    User Toggles Provider                         │
+│                                                                  │
+│   1. toggleProviderEnabled() called                             │
+│   2. _enabledProviderIds updated                                │
+│   3. notifyListeners() called IMMEDIATELY                       │
+└─────────────────────────────────────────────────────────────────┘
+                              │
+                              ▼
+┌─────────────────────────────────────────────────────────────────┐
+│                    Selectors Detect Change                       │
+│                                                                  │
+│   Music tabs: Selector<..., (List, bool, Set<String>)>         │
+│   Audiobook tabs: Selector<..., Set<String>>                    │
+│                                                                  │
+│   → All tabs rebuild immediately                                 │
+└─────────────────────────────────────────────────────────────────┘
+                              │
+                              ▼
+┌─────────────────────────────────────────────────────────────────┐
+│                Client-Side Filtering (Instant)                   │
+│                                                                  │
+│   syncService.getAlbumsFilteredByProviders(enabledProviders)    │
+│   syncService.getArtistsFilteredByProviders(enabledProviders)   │
+│   syncService.getAudiobooksFilteredByProviders(enabledProviders)│
+│                                                                  │
+│   → Uses EXISTING cache with source tracking                    │
+│   → Instant UI update, no network required                      │
+└─────────────────────────────────────────────────────────────────┘
+                              │
+                              ▼
+┌─────────────────────────────────────────────────────────────────┐
+│              Background Sync (After 600ms Debounce)              │
+│                                                                  │
+│   - Refreshes cache with new data from enabled providers        │
+│   - Updates source tracking                                      │
+│   - Only needed when ENABLING providers (to fetch new data)     │
+└─────────────────────────────────────────────────────────────────┘
+```
+
+---
+
+## Files Changed
+
+| File | Changes |
+|------|---------|
+| `lib/services/music_assistant_api.dart` | Added provider filtering to browse API path in `getAudiobooks()`, added debug logging |
+| `lib/services/sync_service.dart` | Added audiobook counts to per-provider and summary logs |
+| `lib/providers/music_assistant_provider.dart` | Moved `notifyListeners()` to fire immediately on provider toggle |
+| `lib/screens/new_library_screen.dart` | Wrapped audiobook tabs in `Selector` to rebuild on provider changes |
+
+---
+
+## Expected Behavior After Fixes
+
+1. **Instant UI Updates:** When you toggle a provider, the library immediately updates using client-side filtering
+2. **Audiobook Source Tracking:** Audiobooks now have provider source tracking (visible in logs)
+3. **Audiobook Tab Rebuilds:** Both audiobook tabs (Authors and All Books) rebuild instantly on provider toggle
+4. **Music Tab Consistency:** Music tabs continue to work as before, now with immediate rebuilds
+
+---
+
+## Testing Checklist
+
+- [ ] Toggle a music provider, verify instant UI update (no 600ms delay)
+- [ ] Toggle between different Spotify accounts, verify correct filtering
+- [ ] Sync with ABS library filtering enabled
+- [ ] Verify audiobooks appear in source tracking log
+- [ ] Toggle ABS provider off in library menu
+- [ ] Verify audiobooks list becomes empty immediately (no pull-to-refresh needed)
+- [ ] Toggle ABS provider back on
+- [ ] Verify audiobooks reappear after sync completes
+- [ ] Test with multiple providers (Spotify audiobooks + ABS)
+
+---
+
+## Related Documentation
+
+- `docs/SESSION_2026_01_17_PROVIDER_FILTERING.md` - Initial provider filtering implementation
+- `docs/PER_PROVIDER_SYNC_IMPLEMENTATION.md` - Per-provider sync architecture
+
+---
+
+## Known Limitations
+
+1. **Series Tab:** The Series tab still doesn't filter by provider. Series are fetched as `AudiobookSeries` objects without per-provider tracking.
+
+2. **Mixed Provider Scenario:** If user has both Spotify audiobooks and ABS audiobooks, and ABS library filtering is enabled, Spotify audiobooks may not be fetched because the browse API path is taken. This is a pre-existing architectural limitation.
+
+3. **Enabling Providers:** When ENABLING a previously disabled provider, the UI updates immediately but shows empty until the background sync completes (because the cache doesn't have that provider's data yet). This is expected behavior.
@@ -0,0 +1,217 @@
+# Session 2026-01-17: Optimistic Updates & Podcast Provider Filtering
+
+## Overview
+
+This session focused on fixing provider filtering for podcasts, resolving iTunes podcast provider issues, and implementing optimistic updates for library buttons across detail screens.
+
+## Issues Addressed
+
+### 1. Podcast Provider Counts Showing Incorrectly
+
+**Problem**: All Spotify accounts showed the same podcast count instead of only counting podcasts owned by each account.
+
+**Root Cause**: The podcast counting logic wasn't checking the `inLibrary` field on provider mappings.
+
+**Solution**:
+- Added `inLibrary` field to `ProviderMapping` model
+- Updated `getProvidersWithPodcasts()` to only count mappings where `inLibrary == true`
+- Updated podcast filtering in library screen to check `inLibrary` field
+
+**Files Modified**:
+- `lib/models/media_item.dart` - Added `inLibrary` field
+- `lib/providers/music_assistant_provider.dart` - Updated counting logic
+- `lib/screens/new_library_screen.dart` - Updated filtering logic
+
+### 2. iTunes Podcasts Not Appearing in Library
+
+**Problem**: Podcasts added from iTunes search weren't showing in library and iTunes provider filter showed 0 count.
+
+**Investigation**:
+- Added `itunes_podcasts` to provider capabilities and music provider domains
+- Added synthetic provider instance creation for search-only providers
+- Added debug logging to understand podcast loading
+
+**Resolution**: The issue was with Music Assistant's iTunes podcast provider itself - podcasts added via iTunes weren't being properly stored in the MA library. The user removed the iTunes provider from MA and re-added podcasts via Spotify search as a workaround.
+
+**Files Modified**:
+- `lib/models/provider_instance.dart` - Added `itunes_podcasts` to capabilities
+
+### 3. Episode Loading Failing for Non-Library Podcasts
+
+**Problem**: When a podcast was removed from library, the old library ID became invalid and episodes wouldn't load.
+
+**Solution**: Added fallback logic to try loading episodes via provider mappings when the primary ID fails.
+
+**Files Modified**:
+- `lib/screens/podcast_detail_screen.dart` - Added fallback episode loading
+
+### 4. Search Filtering Rework
+
+**Problem**: Server-side provider filtering was being applied to search results when it should only apply when the "in library" toggle is enabled.
+
+**Solution**:
+- Removed `filterSearchResults()` calls from search methods
+- Added client-side `_filterByEnabledProviders()` helper
+- Applied filtering only when `_libraryOnly` toggle is ON
+
+**Files Modified**:
+- `lib/providers/music_assistant_provider.dart` - Removed filterSearchResults calls
+- `lib/screens/search_screen.dart` - Added client-side filtering
+
+### 5. Library Buttons Not Updating Immediately
+
+**Problem**: Add/remove library buttons on detail screens waited for API response before updating, causing perceived lag.
+
+**Solution**: Implemented optimistic updates - update UI immediately, revert on failure.
+
+**Files Modified**:
+- `lib/screens/podcast_detail_screen.dart`
+- `lib/screens/album_details_screen.dart`
+- `lib/screens/artist_details_screen.dart`
+
+## Code Changes
+
+### ProviderMapping.inLibrary Field
+
+```dart
+// lib/models/media_item.dart
+class ProviderMapping {
+  final String itemId;
+  final String providerDomain;
+  final String providerInstance;
+  final bool available;
+  final Map<String, dynamic>? audioFormat;
+  final bool inLibrary;  // NEW: indicates ownership
+
+  factory ProviderMapping.fromJson(Map<String, dynamic> json) {
+    return ProviderMapping(
+      // ... other fields ...
+      inLibrary: json['in_library'] == true || json['in_library'] == 1,
+    );
+  }
+}
+```
+
+### Podcast Provider Counting
+
+```dart
+// lib/providers/music_assistant_provider.dart
+Map<String, int> getProvidersWithPodcasts() {
+  final counts = <String, int>{};
+  for (final item in _podcasts) {
+    final mappings = item.providerMappings;
+    if (mappings != null) {
+      for (final mapping in mappings) {
+        // Only count if this provider "owns" the item
+        if (mapping.inLibrary) {
+          final instanceId = mapping.providerInstance;
+          if (instanceId.isNotEmpty) {
+            counts[instanceId] = (counts[instanceId] ?? 0) + 1;
+          }
+        }
+      }
+    }
+  }
+  return counts;
+}
+```
+
+### Optimistic Update Pattern
+
+```dart
+// Example from podcast_detail_screen.dart
+Future<void> _toggleLibrary() async {
+  final newState = !_isInLibrary;
+
+  // OPTIMISTIC UPDATE: Update UI immediately
+  setState(() {
+    _isInLibrary = newState;
+  });
+
+  if (mounted) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(S.of(context)!.addedToLibrary)),
+    );
+  }
+
+  // Fire and forget - API call happens in background
+  maProvider.addToLibrary(...).catchError((e) {
+    // Revert on failure
+    if (mounted) {
+      setState(() {
+        _isInLibrary = !newState;
+      });
+    }
+  });
+}
+```
+
+### Client-Side Search Filtering
+
+```dart
+// lib/screens/search_screen.dart
+Map<String, List<MediaItem>> _filterByEnabledProviders(
+  Map<String, List<MediaItem>> results,
+  Set<String> enabledProviders,
+) {
+  if (enabledProviders.isEmpty) return results;
+
+  bool isItemAllowed(MediaItem item) {
+    final mappings = item.providerMappings;
+    if (mappings == null || mappings.isEmpty) return true;
+    return mappings.any((m) => m.inLibrary && enabledProviders.contains(m.providerInstance));
+  }
+
+  return {
+    for (final entry in results.entries)
+      entry.key: entry.value.where(isItemAllowed).toList(),
+  };
+}
+
+// Applied when setting results:
+if (_libraryOnly) {
+  final enabledProviders = provider.enabledProviderIds.toSet();
+  combinedResults = _filterByEnabledProviders(combinedResults, enabledProviders);
+}
+```
+
+## Provider Capabilities Update
+
+```dart
+// lib/models/provider_instance.dart
+static const Map<String, Set<String>> providerCapabilities = {
+  'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+  'ytmusic': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
+  'apple_music': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
+  'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+  'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+  'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+  'audiobookshelf': {'audiobooks', 'podcasts'},
+  'itunes_podcasts': {'podcasts'},  // NEW
+  'tunein': {'radio', 'podcasts'},
+  // ... other providers
+};
+```
+
+## Summary of All Modified Files
+
+| File | Changes |
+|------|---------|
+| `lib/models/media_item.dart` | Added `inLibrary` field to ProviderMapping |
+| `lib/models/provider_instance.dart` | Added `itunes_podcasts`, podcasts to capabilities |
+| `lib/providers/music_assistant_provider.dart` | Updated podcast counting, removed filterSearchResults |
+| `lib/screens/new_library_screen.dart` | Updated podcast filtering with inLibrary check |
+| `lib/screens/search_screen.dart` | Added client-side filtering for in-library mode |
+| `lib/screens/podcast_detail_screen.dart` | Optimistic updates, fallback episode loading |
+| `lib/screens/album_details_screen.dart` | Optimistic updates for library button |
+| `lib/screens/artist_details_screen.dart` | Optimistic updates for library button |
+
+## Key Learnings
+
+1. **inLibrary field**: Music Assistant's provider mappings include an `in_library` field that indicates whether the user added the item from that specific provider account. This is essential for accurate per-provider filtering.
+
+2. **iTunes podcast provider**: The MA iTunes podcast provider is for search only - it doesn't properly store items in the library. Users should add podcasts from streaming providers like Spotify instead.
+
+3. **Optimistic updates**: For better UX, library toggle buttons should update immediately and only revert if the API call fails, rather than waiting for API response.
+
+4. **Search vs Library filtering**: Server-side provider filtering should only apply to library views, not search results (unless the "in library" toggle is enabled).
@@ -0,0 +1,263 @@
+# Provider Filtering Improvements
+
+## Date: January 17, 2026
+
+## Overview
+
+This session focused on improving the provider filtering system across the app, building on the per-provider sync implementation. Key improvements include a cleaner capability-based architecture, fixing filter visibility bugs, and extending filtering to the audiobooks library.
+
+---
+
+## Changes Made
+
+### 1. Provider Capability Mapping
+
+**File:** `lib/models/provider_instance.dart`
+
+Replaced the clunky item-count-based filtering with a static capability map that defines what content types each provider domain supports.
+
+```dart
+static const Map<String, Set<String>> providerCapabilities = {
+  // Music streaming services
+  'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
+  'tidal': {'artists', 'albums', 'tracks', 'playlists'},
+  'qobuz': {'artists', 'albums', 'tracks', 'playlists'},
+  'deezer': {'artists', 'albums', 'tracks', 'playlists'},
+  'ytmusic': {'artists', 'albums', 'tracks', 'playlists'},
+  'soundcloud': {'artists', 'albums', 'tracks', 'playlists'},
+  'apple_music': {'artists', 'albums', 'tracks', 'playlists'},
+  'amazon_music': {'artists', 'albums', 'tracks', 'playlists'},
+
+  // Self-hosted media servers (can have music and audiobooks)
+  'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
+  'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
+  'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
+
+  // Music-only servers
+  'subsonic': {'artists', 'albums', 'tracks', 'playlists'},
+  'opensubsonic': {'artists', 'albums', 'tracks', 'playlists'},
+  'navidrome': {'artists', 'albums', 'tracks', 'playlists'},
+  'filesystem': {'artists', 'albums', 'tracks', 'playlists'},
+
+  // Audiobook-only providers
+  'audiobookshelf': {'audiobooks'},
+
+  // Radio providers
+  'tunein': {'radio'},
+  'radiobrowser': {'radio'},
+
+  // Player/system providers (no library content)
+  'snapcast': <String>{},
+  'fully_kiosk': <String>{},
+};
+```
+
+**Added helper methods:**
+```dart
+Set<String> get supportedContentTypes => providerCapabilities[domain] ?? <String>{};
+bool supportsContentType(String category) => supportedContentTypes.contains(category);
+```
+
+**Benefits:**
+- Radio providers never show in Artists tab (by design, not by count)
+- Works immediately, even with empty libraries
+- Disabled providers still show in menu (if they support the content type)
+- Clean separation of concerns
+
+---
+
+### 2. Updated Provider Filtering in MusicAssistantProvider
+
+**File:** `lib/providers/music_assistant_provider.dart`
+
+Updated `getRelevantProvidersForCategory()` to filter by capability:
+
+```dart
+List<(ProviderInstance, int)> getRelevantProvidersForCategory(String category) {
+  // ... get counts ...
+
+  final result = <(ProviderInstance, int)>[];
+  for (final provider in _availableMusicProviders) {
+    // Only include providers that support this content type
+    if (provider.supportsContentType(category)) {
+      final count = counts[provider.instanceId] ?? 0;
+      result.add((provider, count));
+    }
+  }
+  // ...
+}
+```
+
+---
+
+### 3. Simplified Library Menu Provider Filter
+
+**File:** `lib/screens/new_library_screen.dart`
+
+Simplified the options menu overlay to show all providers that support the current category:
+
+**Before (clunky):**
+```dart
+if (widget.relevantProviders.where((p) {
+  final hasItems = p.$2 > 0;
+  final isDisabledByUser = widget.enabledProviderIds.isNotEmpty &&
+      !widget.enabledProviderIds.contains(p.$1.instanceId);
+  return hasItems || isDisabledByUser;
+}).length > 1) ...[
+```
+
+**After (clean):**
+```dart
+// relevantProviders is pre-filtered by capability
+if (widget.relevantProviders.length > 1) ...[
+  // Show all providers that support this category
+  ...widget.relevantProviders.map((providerData) {
+```
+
+---
+
+### 4. Removed Provider Toggles from Settings Screen
+
+**File:** `lib/screens/settings_screen.dart`
+
+Removed the "Music Providers" section entirely since provider filtering is now handled in the library menu:
+
+- Removed `_providerEnabled` state variable
+- Removed provider loading code from `_loadSettings()`
+- Removed the entire Music Providers UI section (~100 lines)
+
+**Rationale:** Single source of truth - provider toggles now only appear in the library menu where they're contextually relevant.
+
+---
+
+### 5. Fixed Audiobooks Library Provider Filtering
+
+**File:** `lib/screens/new_library_screen.dart`
+
+The audiobooks tabs were not filtering by provider - they loaded data once and displayed it without responding to provider changes.
+
+**Fixed `_buildBooksAuthorsTab()`:**
+```dart
+final syncService = SyncService.instance;
+final enabledProviders = maProvider.enabledProviderIds.toSet();
+
+// Client-side filtering using SyncService source tracking
+var audiobooks = syncService.hasSourceTracking && enabledProviders.isNotEmpty
+    ? syncService.getAudiobooksFilteredByProviders(enabledProviders)
+    : List<Audiobook>.from(_audiobooks);
+
+// Filter by favorites if enabled
+if (_showFavoritesOnly) {
+  audiobooks = audiobooks.where((a) => a.favorite == true).toList();
+}
+
+// Group filtered audiobooks by author (dynamic, not cached)
+final groupedByAuthor = <String, List<Audiobook>>{};
+for (final book in audiobooks) {
+  final authorName = book.authorsString;
+  groupedByAuthor.putIfAbsent(authorName, () => []).add(book);
+}
+```
+
+**Fixed `_buildAllBooksTab()`:**
+- Same provider filtering pattern
+- Dynamic sorting after filtering
+- Updated PageStorageKey to include provider count for proper rebuild
+
+---
+
+## Bug Fixes
+
+### Provider Filter Menu Disappearing
+
+**Problem:** When providers were deselected, the background sync would clear the cache and only fetch data for enabled providers. Disabled providers then had 0 items, and the menu required `> 1 providers WITH items` to show. The entire Providers section would disappear.
+
+**Solution:** Changed to capability-based filtering. The menu now shows all providers that support the category, regardless of item count.
+
+### Audiobooks Not Filtering by Provider
+
+**Problem:** Audiobooks tabs loaded data once into `_audiobooks` and displayed it without provider filtering. Toggling providers in the menu had no effect.
+
+**Solution:** Added inline provider filtering during build (same pattern as music tabs).
+
+---
+
+## Files Changed
+
+| File | Changes |
+|------|---------|
+| `lib/models/provider_instance.dart` | Added `providerCapabilities` map and helper methods |
+| `lib/providers/music_assistant_provider.dart` | Updated `getRelevantProvidersForCategory()` to filter by capability |
+| `lib/screens/new_library_screen.dart` | Simplified menu filter logic, added audiobook provider filtering |
+| `lib/screens/settings_screen.dart` | Removed Music Providers section |
+
+---
+
+## Architecture
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│                    Provider Capability Map                       │
+│         (ProviderInstance.providerCapabilities)                  │
+│                                                                  │
+│   spotify → {artists, albums, tracks, playlists, audiobooks}    │
+│   audiobookshelf → {audiobooks}                                 │
+│   tunein → {radio}                                              │
+└─────────────────────────────────────────────────────────────────┘
+                              │
+                              ▼
+┌─────────────────────────────────────────────────────────────────┐
+│            getRelevantProvidersForCategory(category)             │
+│                                                                  │
+│   - Filters _availableMusicProviders by capability              │
+│   - Returns only providers that support the category            │
+│   - Includes item counts for display                            │
+└─────────────────────────────────────────────────────────────────┘
+                              │
+                              ▼
+┌─────────────────────────────────────────────────────────────────┐
+│                    Library Menu (Options)                        │
+│                                                                  │
+│   - Shows providers section if > 1 providers support category   │
+│   - All relevant providers shown (can toggle on/off)            │
+│   - Instant UI update via setState()                            │
+│   - Background sync after 1.5s debounce                         │
+└─────────────────────────────────────────────────────────────────┘
+                              │
+                              ▼
+┌─────────────────────────────────────────────────────────────────┐
+│                   Tab Build Methods                              │
+│                                                                  │
+│   - Get enabledProviderIds from MusicAssistantProvider          │
+│   - Filter data using SyncService source tracking               │
+│   - Display filtered results                                    │
+└─────────────────────────────────────────────────────────────────┘
+```
+
+---
+
+## Known Limitations
+
+1. **Series Tab:** The Series tab in audiobooks doesn't filter by provider yet. Series are fetched separately as `AudiobookSeries` objects and don't have the same source tracking as individual audiobooks.
+
+2. **First Sync Required:** Source tracking only works after at least one sync with providers enabled.
+
+---
+
+## Testing Checklist
+
+- [x] Music tabs filter by provider correctly
+- [x] Provider menu shows only relevant providers per category
+- [x] Radio providers don't appear in Artists/Albums tabs
+- [x] Spotify appears in Audiobooks tab (has audiobooks)
+- [x] Audiobooks Authors tab filters by provider
+- [x] Audiobooks All Books tab filters by provider
+- [ ] Audiobooks Series tab filters by provider (not implemented)
+- [x] Disabled providers can be re-enabled from menu
+- [x] Settings screen no longer has provider toggles
+
+---
+
+## Related Documentation
+
+- `docs/PER_PROVIDER_SYNC_IMPLEMENTATION.md` - Original per-provider sync implementation
@@ -0,0 +1,221 @@
+# Feature: Replace "Play On" Popups with Player Selector
+
+## Overview
+
+Replace the `PlayerPickerSheet` popup modal with the existing Player Selector (reveal overlay) when users tap "Play on" buttons throughout the app. This provides a consistent, richer player selection experience.
+
+## Current State
+
+### PlayerPickerSheet Popup
+Used in 7+ places:
+- `album_details_screen.dart` - Play Album, Play From Here, Play Radio
+- `playlist_details_screen.dart` - Play Playlist, Play Radio
+- `search_screen.dart` - Play album/playlist/audiobook/radio from search
+- `podcast_detail_screen.dart` - Play Episode
+- `audiobook_detail_screen.dart` - Play Audiobook
+- `queue_screen.dart` - Transfer Queue (special case - keep popup)
+
+### Player Selector (Reveal Overlay)
+- Location: `lib/widgets/player/player_reveal_overlay.dart`
+- Shows vertical list of all players with artwork, current track, sync status
+- Has hints above player list: "Long-press to sync" & "Swipe to adjust volume"
+- Triggered by pull-down gesture or device button tap
+
+## Proposed Changes
+
+### 1. Modify PlayerRevealOverlay
+
+**File:** `lib/widgets/player/player_reveal_overlay.dart`
+
+Add new optional parameters:
+
+```dart
+class PlayerRevealOverlay extends StatefulWidget {
+  final VoidCallback onDismiss;
+  final double miniPlayerBottom;
+  final double miniPlayerHeight;
+  final bool showOnboardingHints;
+
+  // NEW: Callback when player is selected for a pending action
+  final void Function(Player player)? onPlayerSelected;
+
+  // NEW: Context hint to display instead of default hints
+  // e.g., "Select player to play album"
+  final String? contextHint;
+
+  // NEW: Icon for context hint (default: speaker icon)
+  final IconData? contextHintIcon;
+```
+
+### 2. Modify Hint Display
+
+**File:** `lib/widgets/player/player_reveal_overlay.dart` (around line 386-394)
+
+```dart
+// Current:
+: Column(
+    mainAxisSize: MainAxisSize.min,
+    children: [
+      buildHintRow(Icons.lightbulb_outline, S.of(context)!.holdToSync),
+      const SizedBox(height: 4),
+      buildHintRow(Icons.lightbulb_outline, S.of(context)!.swipeToAdjustVolume),
+    ],
+  ),
+
+// New:
+: widget.contextHint != null
+    ? buildHintRow(
+        widget.contextHintIcon ?? Icons.play_circle_outline,
+        widget.contextHint!,
+      )
+    : Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          buildHintRow(Icons.lightbulb_outline, S.of(context)!.holdToSync),
+          const SizedBox(height: 4),
+          buildHintRow(Icons.lightbulb_outline, S.of(context)!.swipeToAdjustVolume),
+        ],
+      ),
+```
+
+### 3. Modify Player Card onTap
+
+**File:** `lib/widgets/player/player_reveal_overlay.dart` (around line 437-441 and 490-494)
+
+```dart
+// Current:
+onTap: () {
+  HapticFeedback.mediumImpact();
+  maProvider.selectPlayer(data.player);
+  dismiss();
+},
+
+// New:
+onTap: () {
+  HapticFeedback.mediumImpact();
+  if (widget.onPlayerSelected != null) {
+    // Execute the pending action with selected player
+    widget.onPlayerSelected!(data.player);
+  } else {
+    // Default behavior: just select the player
+    maProvider.selectPlayer(data.player);
+  }
+  dismiss();
+},
+```
+
+### 4. Add Helper Method to GlobalPlayerOverlay
+
+**File:** `lib/widgets/global_player_overlay.dart`
+
+Add a static method to show player selector with pending action:
+
+```dart
+/// Show player selector for a "Play on" action
+///
+/// [contextHint] - Message shown instead of default hints
+/// [onPlayerSelected] - Called when user taps a player
+///
+/// Example:
+/// ```dart
+/// GlobalPlayerOverlay.showPlayerSelectorForAction(
+///   contextHint: "Select player to play album",
+///   onPlayerSelected: (player) {
+///     provider.playAlbum(albumId, playerId: player.playerId);
+///   },
+/// );
+/// ```
+static void showPlayerSelectorForAction({
+  required String contextHint,
+  required void Function(Player player) onPlayerSelected,
+  IconData? hintIcon,
+}) {
+  // Implementation: trigger the player reveal overlay with these parameters
+  // May need to store pending action in state and pass to overlay
+}
+```
+
+### 5. Update Calling Sites
+
+Replace `showPlayerPickerSheet()` calls with new method:
+
+**Example - album_details_screen.dart:**
+
+```dart
+// Current (around line 1305-1316):
+showPlayerPickerSheet(
+  context: context,
+  title: 'Play Album',
+  onPlayerSelected: (player) async {
+    GlobalPlayerOverlay.hidePlayer();
+    await maProvider.playAlbum(albumId, playerId: player.playerId);
+    GlobalPlayerOverlay.showPlayer();
+  },
+);
+
+// New:
+GlobalPlayerOverlay.showPlayerSelectorForAction(
+  contextHint: S.of(context)!.selectPlayerToPlayAlbum, // Add localization
+  onPlayerSelected: (player) async {
+    await maProvider.playAlbum(albumId, playerId: player.playerId);
+  },
+);
+```
+
+### 6. Add Localizations
+
+**File:** `lib/l10n/app_en.arb` (and other language files)
+
+```json
+"selectPlayerToPlay": "Select player to play",
+"selectPlayerToPlayAlbum": "Select player to play album",
+"selectPlayerToPlayPlaylist": "Select player to play playlist",
+"selectPlayerToPlayRadio": "Select player to start radio",
+"selectPlayerToPlayEpisode": "Select player to play episode",
+"selectPlayerToPlayAudiobook": "Select player to play audiobook"
+```
+
+## Files to Modify
+
+1. `lib/widgets/player/player_reveal_overlay.dart` - Add parameters, modify hints & onTap
+2. `lib/widgets/global_player_overlay.dart` - Add helper method
+3. `lib/screens/album_details_screen.dart` - Replace 3 popup calls
+4. `lib/screens/playlist_details_screen.dart` - Replace 2 popup calls
+5. `lib/screens/search_screen.dart` - Replace ~5 popup calls
+6. `lib/screens/podcast_detail_screen.dart` - Replace 1 popup call
+7. `lib/screens/audiobook_detail_screen.dart` - Replace 1 popup call
+8. `lib/l10n/app_en.arb` - Add new strings
+9. `lib/l10n/app_de.arb`, `app_fr.arb`, `app_es.arb` - Translations
+
+## Exception: Queue Transfer
+
+**Keep the popup for `queue_screen.dart`** because:
+- Needs to filter out current player (can't transfer to self)
+- Needs to filter out certain player types
+- Different UX intent (transfer vs play)
+
+## Implementation Order
+
+1. Modify `PlayerRevealOverlay` to accept new parameters
+2. Add helper method to `GlobalPlayerOverlay`
+3. Test with one screen (album_details_screen.dart)
+4. Add localizations
+5. Migrate remaining screens
+6. Clean up unused code from PlayerPickerSheet if no longer needed elsewhere
+
+## Testing Checklist
+
+- [ ] Album details: Play Album button
+- [ ] Album details: Play From Here (track context menu)
+- [ ] Album details: Play Radio (track context menu)
+- [ ] Playlist details: Play Playlist button
+- [ ] Playlist details: Play Radio (track context menu)
+- [ ] Search: Play album from results
+- [ ] Search: Play playlist from results
+- [ ] Search: Play radio from results
+- [ ] Podcast detail: Play episode
+- [ ] Audiobook detail: Play audiobook
+- [ ] Queue transfer still works with popup
+- [ ] Long-press to sync still works in player selector
+- [ ] Dismiss by tapping backdrop works
+- [ ] Dismiss by swiping down works
@@ -0,0 +1,328 @@
+# Remote Connection - Future Implementation Guide
+
+## Overview
+
+This document provides guidance for implementing remote connection to Music Assistant servers via WebRTC. Remote connection allows the Ensemble app to connect to MA servers outside the local network using Nabu Casa's WebRTC signaling infrastructure.
+
+## Current Status: On Hold
+
+Remote connection was partially implemented but put on hold due to a critical bug where the `ma-api` data channel becomes one-way after 1-3 minutes. See `MA_WEBRTC_BUG_REPORT.md` for details.
+
+---
+
+## Architecture
+
+### How It Works
+
+```
+┌─────────────────┐     WebSocket      ┌──────────────────────────┐
+│  Ensemble App   │◄──────────────────►│  MA Server (local WS)    │
+└─────────────────┘                    └──────────────────────────┘
+        │                                         │
+        │ (when local unavailable)                │
+        ▼                                         ▼
+┌─────────────────┐                    ┌──────────────────────────┐
+│  SignalingClient│◄──── WebSocket ───►│ signaling.music-assistant│
+└─────────────────┘                    │        .io/ws            │
+        │                              └──────────────────────────┘
+        │ ICE candidates, SDP                     │
+        ▼                                         ▼
+┌─────────────────┐                    ┌──────────────────────────┐
+│  WebRTC Peer    │◄═══ Data Channel ══►│  MA Server WebRTC       │
+│  Connection     │    (ma-api)         │  Endpoint               │
+└─────────────────┘                    └──────────────────────────┘
+```
+
+### Components
+
+1. **SignalingClient** - WebSocket connection to `wss://signaling.music-assistant.io/ws`
+2. **WebRTCConnection** - Manages RTCPeerConnection and data channels
+3. **RemoteBridge** - Bridges local WebSocket API to remote WebRTC connection
+
+### Data Channels
+
+| Channel | Purpose | Traffic Pattern |
+|---------|---------|-----------------|
+| `ma-api` | JSON API requests/responses | High volume, large payloads |
+| `sendspin` | Audio streaming + control | Low JSON, binary audio data |
+
+---
+
+## Key Files to Create/Modify
+
+### New Files
+
+| File | Purpose |
+|------|---------|
+| `lib/services/remote/signaling_client.dart` | WebSocket client for signaling server |
+| `lib/services/remote/webrtc_connection.dart` | WebRTC peer connection management |
+| `lib/services/remote/remote_bridge.dart` | Bridges API calls to WebRTC |
+
+### Files to Modify
+
+| File | Changes |
+|------|---------|
+| `lib/services/music_assistant_api.dart` | Add remote connection fallback |
+| `lib/providers/music_assistant_provider.dart` | Expose remote connection state |
+| `pubspec.yaml` | Add `flutter_webrtc` dependency |
+
+---
+
+## Implementation Steps
+
+### Step 1: Add Dependencies
+
+```yaml
+# pubspec.yaml
+dependencies:
+  flutter_webrtc: ^0.12.0  # or latest
+```
+
+### Step 2: Implement SignalingClient
+
+The signaling client connects to Music Assistant's signaling server and exchanges WebRTC offers/answers.
+
+```dart
+class SignalingClient {
+  WebSocket? _socket;
+
+  Future<void> connect(String serverId) async {
+    _socket = await WebSocket.connect('wss://signaling.music-assistant.io/ws');
+
+    // Send connect request
+    _send({
+      'type': 'connect-request',
+      'server_id': serverId,
+    });
+
+    // Listen for messages
+    _socket!.listen(_handleMessage);
+  }
+
+  void _handleMessage(dynamic data) {
+    final message = jsonDecode(data);
+    switch (message['type']) {
+      case 'answer':
+        onAnswer?.call(message['sdp']);
+        break;
+      case 'ice-candidate':
+        onIceCandidate?.call(message['candidate']);
+        break;
+    }
+  }
+}
+```
+
+### Step 3: Implement WebRTCConnection
+
+```dart
+class WebRTCConnection {
+  RTCPeerConnection? _peerConnection;
+  RTCDataChannel? _apiChannel;
+  RTCDataChannel? _sendspinChannel;
+
+  Future<void> connect(SignalingClient signaling) async {
+    // Create peer connection with STUN/TURN servers
+    _peerConnection = await createPeerConnection({
+      'iceServers': [
+        {'urls': 'stun:stun.l.google.com:19302'},
+        // TURN servers provided by signaling
+      ],
+    });
+
+    // Create data channels BEFORE creating offer
+    _apiChannel = await _peerConnection!.createDataChannel(
+      'ma-api',
+      RTCDataChannelInit()..ordered = true,
+    );
+
+    _sendspinChannel = await _peerConnection!.createDataChannel(
+      'sendspin',
+      RTCDataChannelInit()..ordered = true,
+    );
+
+    // Create and send offer
+    final offer = await _peerConnection!.createOffer();
+    await _peerConnection!.setLocalDescription(offer);
+    signaling.sendOffer(offer.sdp!);
+
+    // Handle answer from server
+    signaling.onAnswer = (sdp) async {
+      await _peerConnection!.setRemoteDescription(
+        RTCSessionDescription(sdp, 'answer'),
+      );
+    };
+  }
+}
+```
+
+### Step 4: Implement RemoteBridge
+
+The bridge translates between the local WebSocket API format and WebRTC data channel messages.
+
+```dart
+class RemoteBridge {
+  final WebRTCConnection _webrtc;
+  final StreamController<String> _messageController;
+
+  void sendCommand(String json) {
+    _webrtc.sendToApiChannel(json);
+  }
+
+  Stream<String> get messages => _messageController.stream;
+}
+```
+
+### Step 5: Integrate with MusicAssistantAPI
+
+```dart
+class MusicAssistantAPI {
+  WebSocket? _localSocket;
+  RemoteBridge? _remoteBridge;
+
+  Future<void> connect(String host, {String? serverId}) async {
+    try {
+      // Try local connection first
+      _localSocket = await WebSocket.connect('ws://$host/ws');
+    } catch (e) {
+      // Fall back to remote if serverId provided
+      if (serverId != null) {
+        _remoteBridge = RemoteBridge();
+        await _remoteBridge!.connect(serverId);
+      }
+    }
+  }
+}
+```
+
+---
+
+## Critical Implementation Details
+
+### 1. Channel Creation Order
+
+The client MUST create data channels BEFORE sending the WebRTC offer. The server expects the client to create:
+- `ma-api` - for API traffic
+- `sendspin` - for audio streaming (optional)
+
+### 2. Health Monitoring
+
+Implement aggressive health checks because data channels can silently die:
+
+```dart
+// Track message counts
+int _sentCount = 0;
+int _recvCount = 0;
+DateTime _lastRecvTime = DateTime.now();
+
+// Health check every 10 seconds
+void _healthCheck() {
+  final timeSinceRecv = DateTime.now().difference(_lastRecvTime);
+  if (timeSinceRecv.inSeconds > 30) {
+    // Channel is dead, trigger reconnection
+    _reconnect();
+  }
+}
+```
+
+### 3. Keepalive Messages
+
+Send periodic keepalive on the data channel itself (not just signaling):
+
+```dart
+void _sendKeepalive() {
+  _apiChannel?.send(RTCDataChannelMessage(
+    jsonEncode({'type': 'ping', 'timestamp': DateTime.now().toIso8601String()}),
+  ));
+}
+```
+
+### 4. Flow Control
+
+Monitor buffer to prevent overflow:
+
+```dart
+void sendMessage(String json) {
+  if (_apiChannel!.bufferedAmount > 1048576) {  // 1MB
+    // Queue message, don't send
+    _sendQueue.add(json);
+    return;
+  }
+  _apiChannel!.send(RTCDataChannelMessage(json));
+}
+```
+
+---
+
+## Known Issues & Pitfalls
+
+### 1. One-Way Channel Death (CRITICAL - UNSOLVED)
+
+The `ma-api` channel stops receiving after 1-3 minutes while `sendspin` continues working. This occurs in both flutter_webrtc and WebView implementations.
+
+**Workaround options:**
+- Detect via health check and force reconnection
+- Try single-channel multiplexing (see `PLAN_B_SINGLE_CHANNEL.md`)
+- Report to MA team and wait for server-side fix
+
+### 2. flutter_webrtc Quirks
+
+- `RTCDataChannel.state` may show "open" when actually dead
+- `bufferedAmount` accuracy varies by platform
+- `onBufferedAmountLow` callback support inconsistent
+
+### 3. Android Background Throttling
+
+Android aggressively throttles background WebRTC. Consider:
+- Foreground service for sustained connections
+- Reconnection on app resume
+
+### 4. ICE/TURN Issues
+
+- aiortc (server-side) has known TURN + DataChannel bugs
+- May need ICE restart on network changes
+
+---
+
+## Testing Checklist
+
+- [ ] Connect via remote when local unavailable
+- [ ] Verify API commands work (players/all, library queries)
+- [ ] Test sustained connection (30+ minutes)
+- [ ] Test app backgrounding and resume
+- [ ] Test network transitions (WiFi ↔ cellular)
+- [ ] Verify reconnection after channel death
+- [ ] Test sendspin audio streaming (if implemented)
+
+---
+
+## Useful Resources
+
+- [Music Assistant Remote Access Docs](https://music-assistant.io/docs/remote-access/)
+- [flutter_webrtc Package](https://pub.dev/packages/flutter_webrtc)
+- [WebRTC Data Channel MDN](https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel)
+- Signaling server: `wss://signaling.music-assistant.io/ws`
+
+---
+
+## Files in This Directory
+
+| File | Description |
+|------|-------------|
+| `FUTURE_IMPLEMENTATION_GUIDE.md` | This file - implementation guide |
+| `MA_WEBRTC_BUG_REPORT.md` | Bug report for MA team |
+| `WEBRTC_DISCONNECT_FIXES.md` | All fixes attempted |
+| `WEBRTC_PROGRESS.md` | Progress log |
+| `PLAN_B_SINGLE_CHANNEL.md` | Alternative single-channel approach |
+| `webrtc-failure-logs.txt` | Raw failure logs |
+| `console-export-*.log` | Browser console exports |
+
+---
+
+## Quick Start for Future Implementation
+
+1. Read this guide fully
+2. Review `WEBRTC_DISCONNECT_FIXES.md` for all attempted fixes
+3. Check if MA team has fixed server-side issues
+4. Start with basic implementation, add health monitoring early
+5. Test extensively before shipping - the failure mode is subtle
@@ -0,0 +1,127 @@
+# WebRTC Data Channel Failure on Android - Bug Report
+
+## Summary
+
+When connecting to Music Assistant via WebRTC remote access (Nabu Casa), the `ma-api` data channel becomes **one-way** (can send, cannot receive) after 1-3 minutes of use, while the `sendspin` channel continues working normally.
+
+## Environment
+
+- **MA Server**: 2.8.0b7 (Home Assistant add-on)
+- **Client**: Android app (Flutter) connecting via Nabu Casa remote access
+- **Remote Access**: WebRTC via `wss://signaling.music-assistant.io/ws`
+
+## Reproduction Steps
+
+1. Connect to MA server via WebRTC remote access (not local network)
+2. Use the app normally - browse library, view players
+3. After 1-3 minutes, the connection degrades
+4. Commands time out, but signaling ping/pong continues working
+
+## Observed Behavior
+
+### Timeline from logs:
+
+```
+07:14:20 - Working normally
+           Health: API sent:51 recv:54 (balanced)
+
+07:15:57 - Receive stops
+           Health: API sent:97 recv:97, lastRecv:12s ago
+
+07:16:02 - Timeouts begin
+           "TimeoutException: Command timeout: players/all"
+
+07:16:17 - Sendspin still works!
+           "Sendspin: Received server/time response"
+           Health: API sent:114 recv:97, lastRecv:27s ago
+
+07:17:30 - Forced reconnect
+           Health: API sent:137 recv:97, lastRecv:42s ago
+           "Health check detected stale connection"
+```
+
+### Key Observation
+
+| Channel | Traffic Pattern | Status |
+|---------|-----------------|--------|
+| `ma-api` | High (10+ msg/s, large payloads) | **FAILS** - stops receiving |
+| `sendspin` | Low (~1 msg/5s, small payloads) | **SURVIVES** - continues working |
+| Signaling | Ping/pong every 15s | **SURVIVES** - continues working |
+
+The WebRTC peer connection remains in "connected" state. ICE connection shows "completed". Only the ma-api data channel stops receiving.
+
+## Testing Performed
+
+### Test 1: flutter_webrtc (Native WebRTC)
+- **Result**: ma-api channel dies after 1-3 minutes
+- **Sendspin**: Continues working
+
+### Test 2: WebView-based WebRTC (Browser engine)
+- **Hypothesis**: Use Android WebView's browser-native WebRTC, since MA Web UI works
+- **Implementation**: Hidden InAppWebView running JavaScript WebRTC engine
+- **Result**: **Same failure mode** - ma-api dies, sendspin survives
+- **Conclusion**: Not a flutter_webrtc bug
+
+### Test 3: Various Data Channel Settings
+- Tried `ordered: false` with `maxRetransmits: 3`
+- Tried letting server create channels (failed - server expects client to create)
+- No improvement
+
+## Analysis
+
+The identical failure in both native and WebView WebRTC implementations suggests the issue is:
+
+1. **Server-side** - Different handling of ma-api vs sendspin channels
+2. **TURN relay** - High-traffic channel may hit limits
+3. **Not client-specific** - Both implementations fail identically
+
+### Questions for MA Team
+
+1. Are the two data channels (`ma-api`, `sendspin`) created with different settings?
+2. Is there any server-side buffering or rate limiting that could affect high-traffic channels?
+3. Does the MA Web UI use different data channel configurations?
+4. Are there known issues with the TURN relay for sustained high-traffic channels?
+
+## Comparison: MA Web UI vs Android App
+
+| Aspect | MA Web UI | Android App |
+|--------|-----------|-------------|
+| Platform | Browser tab (visible, active) | Background-capable app |
+| WebRTC | Browser native | flutter_webrtc / WebView |
+| Result | Works | Fails after 1-3 min |
+
+The MA Web UI runs in a **visible, active browser tab**. Android may throttle background apps differently, but this doesn't explain why sendspin survives while ma-api dies on the same connection.
+
+## Logs
+
+### Health Check Pattern (shows channel death)
+```
+07:14:25 API sent:51 recv:54, lastRecv:2s ago   <- Working
+07:15:35 API sent:87 recv:91, lastRecv:2s ago   <- Working
+07:16:05 API sent:108 recv:97, lastRecv:17s ago <- DYING (gap growing)
+07:16:15 API sent:114 recv:97, lastRecv:27s ago <- DEAD
+07:16:45 API sent:130 recv:97, lastRecv:27s ago <- Still sending, no receive
+07:17:30 API sent:137 recv:97, lastRecv:42s ago <- Forced reconnect
+```
+
+### Sendspin Still Working During Failure
+```
+07:16:17 Sendspin: Received server/time response  <- Still alive!
+07:16:47 Sendspin: Received server/time response  <- Still alive!
+```
+
+## Requested Information
+
+1. Data channel creation code/settings for both channels
+2. Any server-side differences in channel handling
+3. TURN server configuration details
+4. Whether this has been reported by other Android/mobile clients
+
+## Workaround
+
+Currently using local WebSocket connection when on same network. Remote access via WebRTC is unusable for sustained use.
+
+---
+
+**Reporter**: Ensemble Android App Developer
+**Date**: 2026-01-24
@@ -0,0 +1,149 @@
+# Plan B: Single Data Channel Multiplexing
+
+## Why This Might Be Needed
+
+If upgrading flutter_webrtc doesn't fix the one-way channel failure, the root cause is likely a bug in how flutter_webrtc (or underlying libwebrtc) handles **multiple data channels**.
+
+Evidence:
+- MA Web UI works fine with local playback (same server, browser WebRTC)
+- Our app uses flutter_webrtc which has known issues:
+  - [Issue #1428](https://github.com/flutter-webrtc/flutter-webrtc/issues/1428): Threading issues causing data loss
+  - [Issue #974](https://github.com/flutter-webrtc/flutter-webrtc/issues/974): EventChannel intermittently fails
+- Pattern matches: second channel survives while first dies
+
+## Current Architecture
+
+```
+┌─────────────────────────────────────────────────┐
+│              WebRTC Peer Connection             │
+├────────────────────┬────────────────────────────┤
+│   ma-api channel   │     sendspin channel       │
+│   (JSON API)       │   (JSON + binary audio)    │
+│   SCTP stream 0    │     SCTP stream 1          │
+└────────────────────┴────────────────────────────┘
+```
+
+## Proposed Architecture
+
+```
+┌─────────────────────────────────────────────────┐
+│              WebRTC Peer Connection             │
+├─────────────────────────────────────────────────┤
+│              unified channel                     │
+│    (multiplexed: API + Sendspin text + binary)  │
+│              SCTP stream 0                       │
+└─────────────────────────────────────────────────┘
+```
+
+## Multiplexing Protocol
+
+### Message Framing
+
+Each message has a 1-byte type prefix:
+
+| Prefix | Type | Content |
+|--------|------|---------|
+| 0x00 | API | JSON text (MA API request/response) |
+| 0x01 | Sendspin Text | JSON text (Sendspin control messages) |
+| 0x02 | Sendspin Binary | Raw bytes (PCM audio data) |
+
+### Implementation
+
+#### Sending (Client → Server)
+
+```dart
+void sendApiMessage(String json) {
+  final prefix = Uint8List.fromList([0x00]);
+  final payload = utf8.encode(json);
+  final message = Uint8List(1 + payload.length);
+  message[0] = 0x00;
+  message.setRange(1, message.length, payload);
+  _dataChannel.send(RTCDataChannelMessage.fromBinary(message));
+}
+
+void sendSendspinText(String json) {
+  final prefix = Uint8List.fromList([0x01]);
+  final payload = utf8.encode(json);
+  final message = Uint8List(1 + payload.length);
+  message[0] = 0x01;
+  message.setRange(1, message.length, payload);
+  _dataChannel.send(RTCDataChannelMessage.fromBinary(message));
+}
+
+void sendSendspinBinary(Uint8List audio) {
+  final message = Uint8List(1 + audio.length);
+  message[0] = 0x02;
+  message.setRange(1, message.length, audio);
+  _dataChannel.send(RTCDataChannelMessage.fromBinary(message));
+}
+```
+
+#### Receiving (Server → Client)
+
+```dart
+void _onMessage(RTCDataChannelMessage message) {
+  final data = message.binary;
+  if (data == null || data.isEmpty) return;
+
+  final type = data[0];
+  final payload = data.sublist(1);
+
+  switch (type) {
+    case 0x00: // API
+      final json = utf8.decode(payload);
+      _handleApiMessage(json);
+      break;
+    case 0x01: // Sendspin text
+      final json = utf8.decode(payload);
+      _handleSendspinText(json);
+      break;
+    case 0x02: // Sendspin binary
+      _handleSendspinBinary(payload);
+      break;
+  }
+}
+```
+
+## Server-Side Changes Required
+
+The Music Assistant server would need to:
+1. Accept a single "unified" data channel instead of separate ma-api and sendspin channels
+2. Multiplex responses using the same framing protocol
+3. This requires changes to the MA remote connection code
+
+**Alternative**: Keep server unchanged, do multiplexing in a proxy layer on the client.
+
+## Client-Only Approach (No Server Changes)
+
+If we can't change the server, we could:
+
+1. Still create two channels to the server (ma-api + sendspin)
+2. But internally route them through a single "virtual" channel for flutter_webrtc
+3. This is more complex and may not avoid the underlying bug
+
+## Files to Modify
+
+| File | Changes |
+|------|---------|
+| `webrtc_connection.dart` | Single channel creation, multiplexing logic |
+| `remote_bridge.dart` | Route messages based on type prefix |
+
+## Risks
+
+1. **Server compatibility**: Requires MA server changes or complex client proxy
+2. **Performance**: Extra byte per message, decode overhead
+3. **Binary handling**: Must handle all messages as binary (not text)
+
+## Testing Plan
+
+1. Implement client-side changes
+2. Test with modified server (if available) or mock
+3. Verify both API and Sendspin traffic flows correctly
+4. Long-duration stability test
+
+## Decision Point
+
+Try this approach if:
+- flutter_webrtc 0.14.x doesn't fix the issue
+- The one-way failure pattern continues
+- We've confirmed the issue is multi-channel specific
@@ -0,0 +1,406 @@
+# WebRTC Data Channel Disconnect Fixes
+
+## Document Purpose
+Track all fixes attempted for the WebRTC data channel disconnection issues in Ensemble's remote connection feature. This document should be referenced when debugging future disconnection problems.
+
+---
+
+## Problem Summary
+
+The WebRTC data channel between the Ensemble mobile app and Music Assistant server can fail in several ways:
+
+1. **One-way failure**: Data channel appears "open" but only sends work, receives stop
+2. **Silent disconnect**: No error events fire, channel just stops working
+3. **ICE failure**: ICE connection fails, properly detected but causes disconnect
+4. **Signaling disconnect**: Signaling WebSocket closes, causing ICE/WebRTC to fail
+
+---
+
+## Key Files
+
+| File | Purpose |
+|------|---------|
+| `lib/services/remote/webrtc_connection.dart` | WebRTC peer connection, data channel management |
+| `lib/services/remote/remote_bridge.dart` | WebSocket bridge, health monitoring, reconnection logic |
+| `lib/services/remote/signaling_client.dart` | Signaling server WebSocket connection |
+
+---
+
+## Implemented Fixes (Chronological)
+
+### Fix 1: Data Channel Keepalive (Original)
+**Problem**: Data channel could silently die without any error events firing.
+
+**Solution**: Added periodic keepalive ping/pong on the data channel itself.
+
+**Code** (`webrtc_connection.dart`):
+- `_keepaliveTimer`: Runs every 10 seconds
+- `_checkKeepalive()`: Checks time since last data received
+- `_sendKeepalivePing()`: Sends JSON ping message
+- `_recordDataReceived()`: Called on every message receipt
+
+**Constants**:
+```dart
+static const _keepaliveInterval = Duration(seconds: 10);
+static const _keepaliveTimeout = Duration(seconds: 20);  // Reduced from 30
+static const _maxKeepaliveMisses = 2;  // Reduced from 3
+```
+
+### Fix 2: ICE Recovery
+**Problem**: ICE connection could temporarily disconnect and might auto-recover.
+
+**Solution**: Added ICE recovery timer before declaring failure.
+
+**Code** (`webrtc_connection.dart`):
+- `_startIceRecovery()`: Starts 5-second timer when ICE disconnects
+- `_cancelIceRecovery()`: Cancels if ICE recovers on its own
+- `_attemptIceRestart()`: Calls `restartIce()` if recovery timer expires
+
+### Fix 3: Flow Control (Buffer Overflow Prevention)
+**Problem**: Fire-and-forget sends could overflow the 16MB SCTP buffer, causing silent channel death.
+
+**Solution**: Added send-side flow control with buffering.
+
+**Code** (`webrtc_connection.dart`):
+```dart
+static const _maxBufferedAmount = 1048576;  // 1MB threshold
+static const _bufferLowThreshold = 65536;   // 64KB resume threshold
+bool _sendPaused = false;
+final _sendQueue = <String>[];
+```
+
+**Modified `sendRaw()`**:
+- Checks `bufferedAmount` before sending
+- Queues messages if buffer > 1MB
+- `onBufferedAmountLow` callback drains queue
+
+### Fix 4: Health Check Stale Detection
+**Problem**: Health check could see "30s since last data" but not trigger reconnection.
+
+**Solution**: Reduced stale detection threshold from 45s to 30s.
+
+**Code** (`remote_bridge.dart`):
+```dart
+if (_state == RemoteBridgeState.connected && timeSinceLastData > 30 && !_isReconnecting) {
+  // Force reconnection
+}
+```
+
+### Fix 5: Reduced Keepalive Timeouts
+**Problem**: 30s timeout × 3 misses = 90s minimum before detection.
+
+**Solution**: Reduced to 20s timeout × 2 misses = ~40s detection.
+
+### Fix 6: Recv Stagnation Detection
+**Problem**: One-way failure where recv stops but sent continues not detected quickly enough.
+
+**Solution**: Track recv count across health checks. If recv stuck while sent increases for 2 consecutive checks (20s), force reconnection.
+
+**Code** (`remote_bridge.dart`):
+```dart
+// Track across health checks
+int _lastHealthCheckRecvCount = 0;
+int _lastHealthCheckSentCount = 0;
+int _recvStagnationCount = 0;
+
+// In health check:
+if (recvStuck && sentIncreased) {
+  _recvStagnationCount++;
+  if (_recvStagnationCount >= 2) {
+    // Force reconnection - channel is one-way
+  }
+}
+```
+
+**Detection time**: ~20 seconds (2 × 10s health check interval)
+
+---
+
+## Log Patterns to Watch For
+
+### Healthy Connection
+```
+Health check - API sent:93 recv:88 ... lastRecv:0s ago
+```
+- `sent` and `recv` both increasing
+- `lastRecv` low (< 5s typically)
+
+### One-Way Failure (CRITICAL)
+```
+Health check - API sent:206 recv:163 ... lastRecv:30s ago
+Health check - API sent:218 recv:163 ... lastRecv:40s ago
+```
+- `sent` increases, `recv` STUCK
+- `lastRecv` keeps increasing
+- Data channel still shows "open"
+
+### Signaling Disconnect
+```
+WebRTC: Signaling disconnected
+... (6-16 seconds later) ...
+WebRTC: ICE connection state: RTCIceConnectionStateDisconnected
+WebRTC: ICE connection state: RTCIceConnectionStateFailed
+```
+
+### Network Failure (DNS)
+```
+Signaling: WebSocket closed
+... (reconnection attempt) ...
+Signaling: Failed to connect: SocketException: Failed host lookup: 'signaling.music-assistant.io'
+```
+This indicates the phone lost network connectivity entirely.
+
+### Reconnection Storm (Signaling Instability)
+```
+Signaling: Connecting to wss://signaling.music-assistant.io/ws
+Signaling: Sending connect-request
+Signaling: WebSocket closed  ← Closes within 100-500ms
+WebRTC: Signaling disconnected
+RemoteBridge: Scheduling reconnect attempt X/10 in Ys
+```
+Rapid reconnection loop - signaling never stays connected long enough.
+
+### Flow Control Engaged
+```
+WebRTC: ⚠️ Buffer full (1234567 bytes) or paused - queueing message
+WebRTC: Buffer drained to 12345 bytes - draining 5 queued messages
+WebRTC: ✅ Send queue drained (5 messages) - resuming normal sends
+```
+
+### Keepalive Detection
+```
+WebRTC: ⚠️ Keepalive timeout! No data for 22s (missed: 1/2)
+WebRTC: ❌ Data channel appears dead - triggering reconnection
+```
+
+---
+
+## Known Issues / Limitations
+
+### 1. flutter_webrtc Limitations
+- `RTCDataChannel.state` may show "open" when actually dead (Issue #843)
+- `bufferedAmount` may not be accurate on all platforms
+- `onBufferedAmountLow` callback support varies
+
+### 2. SCTP Receive Window
+- If server sends faster than client processes, receive window fills
+- This causes server-side to stop sending, client sees no data
+- No way to monitor receive-side buffer from client
+
+### 3. TURN Server Issues
+- aiortc (server-side) has known issues with TURN + DataChannel (#1156)
+- Data channel may fail silently when using TURN relay
+
+### 4. Network Transitions
+- WiFi → Cellular or vice versa can cause ICE to fail
+- App backgrounding on mobile can close WebSocket/WebRTC
+
+---
+
+## Root Cause Categories
+
+### Category A: Network Issues (Not Code Bugs)
+These are environmental issues, not bugs in our code:
+- **DNS failure**: `Failed host lookup` - Phone lost internet
+- **WiFi/Cellular switch**: Network changed, connections dropped
+- **Server unreachable**: Signaling server down or blocked
+- **Firewall/NAT issues**: TURN relay needed but unavailable
+
+**Evidence**: Signaling WebSocket closes, DNS lookups fail, reconnection attempts fail repeatedly.
+
+### Category B: WebRTC/SCTP Issues (Partial Code Control)
+These can be mitigated but not fully prevented:
+- **One-way channel death**: Channel appears open but data stops flowing
+- **Buffer overflow**: Too much data sent, SCTP buffer exceeded
+- **ICE failure**: Network path lost, no recovery possible
+
+**Evidence**: Data channel shows "open" but `recv` stuck, `lastRecv` increasing.
+
+### Category C: Code Bugs (Fixable)
+Issues in our implementation:
+- **Detection too slow**: Timeouts too long, misses too many
+- **Recovery not triggered**: State checks wrong, reconnection not started
+- **Resource leaks**: Timers not cancelled, connections not cleaned up
+
+**Evidence**: Logs show problem but no action taken, or wrong action taken.
+
+---
+
+## Debugging Checklist
+
+When investigating a disconnect:
+
+1. **Find the last successful response**:
+   ```
+   grep "WebRTC API → WS" logs.txt | head -5
+   ```
+
+2. **Check health check progression**:
+   ```
+   grep "Health check" logs.txt
+   ```
+   Look for `recv` getting stuck while `sent` increases.
+
+3. **Check for signaling issues**:
+   ```
+   grep -i "signaling" logs.txt
+   ```
+
+4. **Check ICE state changes**:
+   ```
+   grep "ICE connection state" logs.txt
+   ```
+
+5. **Check for keepalive detection**:
+   ```
+   grep -i "keepalive" logs.txt
+   ```
+
+6. **Check buffer status**:
+   ```
+   grep -E "(buffer|queue|paused)" logs.txt
+   ```
+
+---
+
+## Potential Future Improvements
+
+### 1. Server-Side Backpressure
+MA protocol doesn't have explicit backpressure. Could add:
+- Client-side request throttling
+- Application-level ACKs for critical messages
+
+### 2. More Aggressive Detection
+- Track recv count across health checks, detect stagnation
+- Shorter keepalive interval (5s instead of 10s)
+
+### 3. Proactive Health Signals
+- Monitor `bufferedAmount` trend (increasing = problem)
+- Track round-trip latency of keepalive pings
+
+### 4. Connection Quality Metrics
+- Expose packet loss, jitter from WebRTC stats
+- Use to predict imminent failure
+
+---
+
+## Test Scenarios
+
+| Scenario | How to Test | Expected Behavior |
+|----------|-------------|-------------------|
+| Normal usage | Browse library, play music | No warnings |
+| Heavy sync | Pull-to-refresh library | Buffer may queue, should drain |
+| Long session | Leave connected 2+ hours | Should stay connected |
+| Rapid navigation | Quick tab switching | Brief queue usage, recovers |
+| Network change | WiFi → Cellular | Should detect and reconnect |
+| App background | Background for 5+ min | May disconnect, should reconnect |
+
+---
+
+## Observed Failure Patterns
+
+### Pattern 1: One-Way Death After Library Sync
+**Observed**: 2026-01-23 (multiple times)
+
+```
+17:13:06.175 - Last response (playlists sync)
+17:13:06.264 - Local batch save
+-- 5 seconds silence --
+17:13:11.005 - Send players/all → NO RESPONSE
+17:13:13.914 - ICE state: completed (looks healthy!)
+17:13:28 - Keepalive detects timeout
+17:13:38 - Reconnection triggered
+```
+
+**Characteristics**:
+- Often happens after library sync (large batch responses)
+- ICE shows "completed" even though data channel is dead
+- Signaling ping/pong continues working
+- Only data channel receive is affected
+
+**Hypothesis**:
+- Server-side SCTP buffer exhausted from sending large responses?
+- Client receive window full, server blocks?
+- flutter_webrtc onMessage callback stops firing?
+
+### Pattern 2: Reconnection Storm / Signaling Instability
+**Observed**: 2026-01-23 17:30-17:31
+
+```
+17:31:05.093 - Signaling: Connecting
+17:31:05.216 - Signaling: Sending connect-request
+17:31:05.218 - Signaling: WebSocket closed (123ms later!)
+17:31:05.218 - WebRTC: Signaling disconnected
+```
+
+**Characteristics**:
+- Signaling WebSocket closes almost immediately after connect
+- Multiple rapid reconnection attempts (storm)
+- Connection never stable long enough for data flow
+- Often happens after network instability
+- Artist detail, albums etc don't load because connection keeps failing
+
+**Possible Causes**:
+- Network instability (WiFi/cellular issues)
+- Signaling server rate limiting
+- DNS resolution failures
+- Server rejecting rapid reconnection attempts
+
+**Side Effects**:
+- UI shows errors like "Not connected to Music Assistant server"
+- Artist/album detail screens fail to load
+- Players list empty or stale
+
+### Pattern 3: API Channel Dies While Sendspin Lives
+**Observed**: 2026-01-23 17:53
+
+```
+17:53:35.755 - Send album_tracks request → NO RESPONSE
+17:53:40.596 - Health check: recv stuck at 197, sent increased
+17:53:55.204 - Sendspin channel RECEIVES server/time response!
+17:54:02.790 - Keepalive detects dead API channel
+```
+
+**Characteristics**:
+- API data channel (ma-api) stops receiving
+- Sendspin data channel continues working normally
+- Same WebRTC peer connection, different data channels
+- This proves it's NOT a network issue - Sendspin traffic flows fine
+
+**Hypothesis**:
+- flutter_webrtc bug where `onMessage` callback stops firing for one channel
+- Possible memory/GC issue with the callback
+- Server-side might be sending to wrong channel?
+
+**Key Evidence**:
+- Recv count stays at 197 for API
+- Sendspin recv count increases (7→8)
+- Both channels use same peer connection
+
+---
+
+## Version History
+
+| Date | Build | Changes |
+|------|-------|---------|
+| 2026-01-23 | ~v49 | Initial flow control implementation |
+| 2026-01-23 | ~v49 | Reduced keepalive timeout 30→20s, misses 3→2 |
+| 2026-01-23 | ~v49 | Reduced health check stale threshold 45→30s |
+| 2026-01-23 | ~v49 | Fixed excessive "queue drained" logging |
+| 2026-01-23 | ~v49 | Created WEBRTC_DISCONNECT_FIXES.md documentation |
+| 2026-01-23 | ~v49 | Added recv stagnation detection (20s detection) |
+| 2026-01-23 | ~v49 | Documented Pattern 2: Reconnection storm / signaling instability |
+| 2026-01-23 | ~v49 | Fixed race condition in _scheduleReconnect (multiple simultaneous calls) |
+| 2026-01-23 | ~v49 | Added WebSocket close code/reason logging to signaling |
+| 2026-01-23 | ~v49 | **CRITICAL FIX**: _reconnectWebRTC() was returning immediately due to _isReconnecting already being true |
+| 2026-01-23 | ~v49 | Fixed old WebRTC callbacks firing during reconnection cleanup (clear callbacks before disconnect) |
+| 2026-01-23 | ~v49 | Fixed onStateChanged handler calling _handleWebRTCDisconnection during active reconnection |
+
+---
+
+## References
+
+- flutter_webrtc Issue #843: Data channel state unreliable
+- aiortc Issue #1156: TURN + DataChannel bugs
+- WebRTC SCTP: Max buffer is 16MB, recommended threshold 1MB
+- Music Assistant remote protocol: No explicit flow control
@@ -0,0 +1,118 @@
+# WebRTC Remote Connection Progress
+
+## Problem Statement
+The flutter_webrtc library has reliability issues causing data channel failures during remote connections via Nabu Casa. The ma-api data channel becomes one-way (can send, but receives stop) after some time, while the sendspin channel continues working.
+
+## Approaches Tried
+
+### 1. Original Implementation (flutter_webrtc)
+- **Status**: Fails
+- **Issue**: ma-api data channel goes one-way after some time
+- **Files**: `lib/services/remote/webrtc_connection.dart`
+
+### 2. WebView-based WebRTC Implementation
+- **Status**: Same failure mode
+- **Hypothesis**: Use browser-native WebRTC via InAppWebView, since MA Web UI works
+- **Result**: Same one-way channel death occurs
+- **Key Finding**: This proves the issue is NOT specific to flutter_webrtc
+
+## Key Observations
+
+From the logs:
+```
+lastRecv:26s ago          <- No messages received in 26 seconds
+API sent:674 recv:618     <- Gap growing, responses stopped
+```
+
+- Signaling ping/pong continues working
+- Sendspin channel continues receiving (`server/time` responses)
+- Only ma-api channel becomes one-way
+- WebRTC peer connection itself remains "connected"
+
+## Differences from Working MA Web UI
+
+The MA Web UI runs in a **visible, active browser tab**. Our implementations:
+1. flutter_webrtc: Native WebRTC in background app
+2. WebView: Browser WebRTC in **hidden 1x1 pixel WebView**
+
+Android aggressively throttles hidden WebViews to save battery.
+
+## Current Implementation (WebView)
+
+### Files Created
+| File | Purpose |
+|------|---------|
+| `lib/services/remote/webview_webrtc_connection.dart` | Dart WebView wrapper |
+| `assets/webrtc_engine.js` | JavaScript WebRTC engine |
+
+### Files Modified
+| File | Changes |
+|------|---------|
+| `pubspec.yaml` | Added `flutter_inappwebview: ^6.0.0` |
+| `lib/services/remote/remote_bridge.dart` | Uses `WebViewWebRTCConnection` |
+| `lib/providers/music_assistant_provider.dart` | Exposes WebView widget |
+| `lib/main.dart` | Adds WebView to widget tree |
+
+### Architecture
+```
+MusicAssistantAPI -> localhost WebSocket -> RemoteBridge
+                                              |
+                                   WebViewWebRTCConnection
+                                              |
+                                   Hidden InAppWebView
+                                              |
+                                   JavaScript WebRTC Engine
+                                              |
+                                   MA Server via TURN
+```
+
+## Current Fixes Being Tested
+
+### 1. Prevent WebView Throttling
+- Changed WebView position from off-screen (-10,-10) to on-screen (0,0) with Opacity(0)
+- Added various InAppWebViewSettings to prevent background throttling
+
+### 2. Data Channel Settings
+- Changed from `ordered: true` to `ordered: false` with `maxRetransmits: 3`
+- Hypothesis: Ordered delivery may cause buffer bloat issues
+
+### 3. Buffer Monitoring
+- Added `bufferedAmount` checking in JavaScript
+- Logs warning when buffer exceeds 1MB
+- Added `getChannelHealth()` function for diagnostics
+
+### 4. Reduced Logging
+- Removed per-message logging (was filling logs too fast)
+- Keep only state changes, errors, and warnings
+
+## Experiments Completed
+
+### 5. Server-Created Channels (Failed)
+- **Hypothesis**: Let server create data channels to avoid ID collisions
+- **Result**: Connection timeout - server expects CLIENT to create channels
+- **Learning**: Client must create channels before sending offer
+
+## Next Steps to Try
+
+1. **Make WebView actually visible** - Android may still throttle Opacity(0) WebView
+2. **Single data channel** - Use only ma-api, disable sendspin
+3. **Periodic channel recreation** - Detect stale channel and recreate
+4. **Report to MA team** - Browser WebRTC also fails, suggesting server-side issue
+
+## Test APK Location
+`/home/chris/Ensemble/ensemble-webview-webrtc.apk`
+
+## Useful Debug Commands
+
+Check channel health (in JS console or via Dart):
+```javascript
+getChannelHealth()
+// Returns: { peerConnection, iceConnection, apiChannel, apiBuffered, sendspinChannel, sendspinBuffered, signalingConnected }
+```
+
+## Open Questions
+
+1. Why does sendspin channel survive when ma-api dies?
+2. Is there a difference in how MA server handles the two channels?
+3. Does MA Web UI use different data channel settings?
+4. Is there a TURN relay issue specific to high-traffic channels?
@@ -28,4 +28,25 @@ class HeroTags {

  /// Podcast cover hero tag prefix
  static const String podcastCover = 'podcast_cover_';
+
+  /// Podcast title hero tag prefix
+  static const String podcastTitle = 'podcast_title_';
+
+  /// Podcast episode cover hero tag prefix
+  static const String podcastEpisodeCover = 'podcast_episode_cover_';
+
+  /// Podcast episode title hero tag prefix
+  static const String podcastEpisodeTitle = 'podcast_episode_title_';
+
+  /// Playlist cover hero tag prefix
+  static const String playlistCover = 'playlist_cover_';
+
+  /// Playlist title hero tag prefix
+  static const String playlistTitle = 'playlist_title_';
+
+  /// Radio station cover hero tag prefix
+  static const String radioCover = 'radio_cover_';
+
+  /// Radio station title hero tag prefix
+  static const String radioTitle = 'radio_title_';
 }
@@ -10,4 +10,7 @@ class NetworkConstants {

  /// Default HTTP port
  static const int defaultHttpPort = 80;
+
+  /// Maximum number of pending WebSocket requests to prevent memory leaks
+  static const int maxPendingRequests = 100;
 }
@@ -31,6 +31,9 @@ class Timings {
  /// Search debounce delay
  static const Duration searchDebounce = Duration(milliseconds: 500);

+  /// Navigation debounce to prevent double-tap navigation
+  static const Duration navigationDebounce = Duration(milliseconds: 500);
+
  /// Delay after track change before updating state
  static const Duration trackChangeDelay = Duration(milliseconds: 500);
 }
@@ -78,6 +78,10 @@ class LibraryCache extends Table {
  /// Whether this item was deleted on the server
  BoolColumn get isDeleted => boolean().withDefault(const Constant(false))();

+  /// Provider instance IDs that provided this item (JSON array)
+  /// Used for client-side filtering by source provider
+  TextColumn get sourceProviders => text().withDefault(const Constant('[]'))();
+
  @override
  Set<Column> get primaryKey => {cacheKey};
 }
@@ -191,7 +195,7 @@ class AppDatabase extends _$AppDatabase {
  AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());

  @override
-  int get schemaVersion => 5;
+  int get schemaVersion => 6;

  @override
  MigrationStrategy get migration {
@@ -226,6 +230,10 @@ class AppDatabase extends _$AppDatabase {
          await customStatement('CREATE INDEX IF NOT EXISTS idx_cached_queue_player ON cached_queue (player_id)');
          await customStatement('CREATE INDEX IF NOT EXISTS idx_cached_queue_player_position ON cached_queue (player_id, position)');
        }
+        // Migration from v5 to v6: Add source_providers column for client-side filtering
+        if (from < 6) {
+          await customStatement("ALTER TABLE library_cache ADD COLUMN source_providers TEXT NOT NULL DEFAULT '[]'");
+        }
      },
    );
  }
@@ -368,20 +376,57 @@ class AppDatabase extends _$AppDatabase {
  // ============================================

  /// Cache a library item
+  /// [sourceProvider] - the provider instance ID that provided this item (for filtering)
  Future<void> cacheItem({
    required String itemType,
    required String itemId,
    required String data,
+    String? sourceProvider,
  }) async {
    final cacheKey = '${itemType}_$itemId';

-    await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
-      cacheKey: cacheKey,
-      itemType: itemType,
-      itemId: itemId,
-      data: data,
-      lastSynced: DateTime.now(),
-    ));
+    // If sourceProvider is specified, we need to merge with existing providers
+    if (sourceProvider != null) {
+      final existing = await getCachedItem(itemType, itemId);
+      List<String> providers = [];
+      if (existing != null) {
+        try {
+          final existingProviders = existing.sourceProviders;
+          if (existingProviders.isNotEmpty && existingProviders != '[]') {
+            providers = List<String>.from(
+              (await Future.value(existingProviders))
+                  .replaceAll('[', '')
+                  .replaceAll(']', '')
+                  .replaceAll('"', '')
+                  .split(',')
+                  .where((s) => s.trim().isNotEmpty)
+                  .map((s) => s.trim()),
+            );
+          }
+        } catch (_) {}
+      }
+      if (!providers.contains(sourceProvider)) {
+        providers.add(sourceProvider);
+      }
+      final sourceProvidersJson = '[${providers.map((p) => '"$p"').join(',')}]';
+
+      await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
+        cacheKey: cacheKey,
+        itemType: itemType,
+        itemId: itemId,
+        data: data,
+        lastSynced: DateTime.now(),
+        sourceProviders: Value(sourceProvidersJson),
+      ));
+    } else {
+      await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
+        cacheKey: cacheKey,
+        itemType: itemType,
+        itemId: itemId,
+        data: data,
+        lastSynced: DateTime.now(),
+      ));
+    }
  }

  /// Get cached items by type
@@ -650,4 +695,66 @@ class AppDatabase extends _$AppDatabase {
  Future<void> clearSearchHistory() async {
    await delete(searchHistory).go();
  }
+
+  // ============================================
+  // Batch Cache Operations
+  // ============================================
+
+  /// Batch size for chunked inserts to prevent SQLite limits
+  static const int _batchChunkSize = 500;
+
+  /// Batch cache multiple items efficiently using drift batch API
+  /// This is much faster than individual inserts for large datasets.
+  /// Items are chunked into batches of 500 to prevent SQLite variable limits.
+  ///
+  /// [items] - List of items to cache, each containing:
+  ///   - itemType: 'album', 'artist', 'track', 'playlist', 'audiobook', etc.
+  ///   - itemId: the item's ID
+  ///   - data: JSON string of the item
+  ///   - sourceProviders: list of provider instance IDs
+  Future<void> batchCacheItems(List<BatchCacheItem> items) async {
+    if (items.isEmpty) return;
+
+    // Process in chunks to avoid SQLite variable limits
+    for (var i = 0; i < items.length; i += _batchChunkSize) {
+      final chunk = items.skip(i).take(_batchChunkSize).toList();
+
+      await batch((b) {
+        for (final item in chunk) {
+          final cacheKey = '${item.itemType}_${item.itemId}';
+          final sourceProvidersJson = item.sourceProviders.isEmpty
+              ? '[]'
+              : '[${item.sourceProviders.map((p) => '"$p"').join(',')}]';
+
+          b.insert(
+            libraryCache,
+            LibraryCacheCompanion.insert(
+              cacheKey: cacheKey,
+              itemType: item.itemType,
+              itemId: item.itemId,
+              data: item.data,
+              lastSynced: DateTime.now(),
+              sourceProviders: Value(sourceProvidersJson),
+            ),
+            mode: InsertMode.insertOrReplace,
+          );
+        }
+      });
+    }
+  }
+}
+
+/// Data class for batch cache operations
+class BatchCacheItem {
+  final String itemType;
+  final String itemId;
+  final String data;
+  final List<String> sourceProviders;
+
+  const BatchCacheItem({
+    required this.itemType,
+    required this.itemId,
+    required this.data,
+    this.sourceProviders = const [],
+  });
 }
@@ -203,6 +203,7 @@
  "english": "Englisch",
  "german": "Deutsch",
  "spanish": "Spanisch",
+  "french": "Französisch",

  "noTracksInPlaylist": "Keine Songs in Wiedergabeliste",
  "sortAlphabetically": "Alphabetisch sortieren",
@@ -51,7 +51,7 @@
    "description": "Hint for port field"
  },

-  "portDescription": "Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.",
+  "portDescription": "Leave blank unless using a custom port",
  "@portDescription": {
    "description": "Description for port field"
  },
@@ -251,6 +251,21 @@
    "description": "Home screen section title"
  },

+  "favoritePlaylists": "Favorite Playlists",
+  "@favoritePlaylists": {
+    "description": "Home screen section title"
+  },
+
+  "favoriteRadioStations": "Favorite Radio Stations",
+  "@favoriteRadioStations": {
+    "description": "Home screen section title"
+  },
+
+  "favoritePodcasts": "Favorite Podcasts",
+  "@favoritePodcasts": {
+    "description": "Home screen section title"
+  },
+
  "searchMusic": "Search music...",
  "@searchMusic": {
    "description": "Search placeholder text"
@@ -589,6 +604,11 @@

  "tracksAddedToQueue": "Tracks added to queue",
  "@tracksAddedToQueue": {
+    "description": "Snackbar message for tracks added to queue"
+  },
+
+  "trackAddedToQueue": "Track added to queue",
+  "@trackAddedToQueue": {
    "description": "Confirmation when tracks added"
  },

@@ -1045,10 +1065,19 @@
    "description": "Spanish language"
  },

+  "french": "French",
+  "@french": {
+    "description": "French language"
+  },
+
  "noTracksInPlaylist": "No tracks in playlist",
  "sortAlphabetically": "Sort alphabetically",
  "sortByYear": "Sort by year",
  "sortBySeriesOrder": "Sort by series order",
+  "sortByDuration": "Sort by duration",
+  "newestFirst": "Newest first",
+  "oldestFirst": "Oldest first",
+  "viewDetails": "View details",
  "listView": "List view",
  "gridView": "Grid view",
  "noBooksInSeries": "No books found in this series",
@@ -1062,13 +1091,17 @@
  "showFavoriteAlbums": "Show a row of your favorite albums",
  "showFavoriteArtists": "Show a row of your favorite artists",
  "showFavoriteTracks": "Show a row of your favorite tracks",
+  "showFavoritePlaylists": "Show a row of your favorite playlists",
+  "showFavoriteRadioStations": "Show a row of your favorite radio stations",
+  "showFavoritePodcasts": "Show a row of your favorite podcasts",
  "extractColorsFromArtwork": "Extract colors from album and artist artwork",
  "chooseHomeScreenRows": "Choose which rows to display on the home screen",
+  "favorite": "Favorite",
  "addedToFavorites": "Added to favorites",
  "removedFromFavorites": "Removed from favorites",
  "addedToLibrary": "Added to library",
  "removedFromLibrary": "Removed from library",
-  "addToLibrary": "Add to library",
+  "addToLibrary": "Add",
  "unknown": "Unknown",
  "noUpcomingTracks": "No upcoming tracks",
  "showAll": "Show all",
@@ -1117,6 +1150,10 @@
  "audiobookLibraries": "Audiobook Libraries",
  "chooseAudiobookLibraries": "Choose which Audiobookshelf libraries to include",
  "unknownLibrary": "Unknown Library",
+  "musicProviders": "Music Providers",
+  "musicProvidersDescription": "Choose which accounts to show in your library",
+  "libraryRefreshing": "Refreshing library...",
+  "cannotDisableLastProvider": "Cannot disable the last provider",
  "noSeriesFound": "No Series Found",
  "ensembleBugReport": "Ensemble Bug Report",
  "byOwner": "By {owner}",
@@ -1180,11 +1217,21 @@
    "description": "Bottom sheet title for adding album to queue"
  },

+  "addToQueue": "Add to queue",
+  "@addToQueue": {
+    "description": "Add item to queue on selected player"
+  },
+
  "addToQueueOn": "Add to queue on...",
  "@addToQueueOn": {
    "description": "Bottom sheet title for adding to queue"
  },

+  "startRadio": "Start radio",
+  "@startRadio": {
+    "description": "Start radio on selected player"
+  },
+
  "startRadioOn": "Start {name} radio on...",
  "@startRadioOn": {
    "description": "Bottom sheet title for starting radio",
@@ -1265,6 +1312,16 @@
    "description": "Description for smart sort players setting"
  },

+  "disableAutoSwitch": "Disable Auto-Switch",
+  "@disableAutoSwitch": {
+    "description": "Setting to disable automatic player switching"
+  },
+
+  "disableAutoSwitchDescription": "Never automatically switch to a different player",
+  "@disableAutoSwitchDescription": {
+    "description": "Description for disable auto-switch setting"
+  },
+
  "playerStateUnavailable": "Unavailable",
  "@playerStateUnavailable": {
    "description": "Player state when unavailable"
@@ -1320,6 +1377,31 @@
    "description": "Description for show hints toggle"
  },

+  "volumePrecisionMode": "Volume Precision Mode",
+  "@volumePrecisionMode": {
+    "description": "Setting for fine volume control"
+  },
+
+  "volumePrecisionModeDescription": "Hold still while adjusting volume for fine control",
+  "@volumePrecisionModeDescription": {
+    "description": "Description for volume precision mode setting"
+  },
+
+  "display": "Display",
+  "@display": {
+    "description": "Settings section title for display options"
+  },
+
+  "showProviderIcons": "Show Provider Icons",
+  "@showProviderIcons": {
+    "description": "Toggle label for showing provider icons on album art"
+  },
+
+  "showProviderIconsDescription": "Display provider logos on album art",
+  "@showProviderIconsDescription": {
+    "description": "Description for show provider icons toggle"
+  },
+
  "pullToSelectPlayers": "Pull to select players",
  "@pullToSelectPlayers": {
    "description": "Hint shown when mini player bounces"
@@ -1378,5 +1460,228 @@
        "type": "String"
      }
    }
+  },
+
+  "noTracks": "No tracks",
+  "@noTracks": {
+    "description": "Empty state title when no tracks exist in library"
+  },
+
+  "addTracksHint": "Add some music to your library to see tracks here",
+  "@addTracksHint": {
+    "description": "Hint for adding tracks to library"
+  },
+
+  "noFavoriteRadioStations": "No favorite radio stations",
+  "@noFavoriteRadioStations": {
+    "description": "Empty state when no favorite radio stations"
+  },
+
+  "longPressRadioHint": "Long-press a station and tap the heart to add it to favorites",
+  "@longPressRadioHint": {
+    "description": "Hint for favoriting radio stations"
+  },
+
+  "noFavoritePodcasts": "No favorite podcasts",
+  "@noFavoritePodcasts": {
+    "description": "Empty state when no favorite podcasts"
+  },
+
+  "longPressPodcastHint": "Long-press a podcast and tap the heart to add it to favorites",
+  "@longPressPodcastHint": {
+    "description": "Hint for favoriting podcasts"
+  },
+
+  "failedToPlayRadioStation": "Failed to play radio station: {error}",
+  "@failedToPlayRadioStation": {
+    "description": "Error when playing radio station fails",
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+
+  "itemAlreadyInLibrary": "Item is already in library",
+  "@itemAlreadyInLibrary": {
+    "description": "Message when trying to add item already in library"
+  },
+
+  "failedToAddToLibrary": "Failed to add to library",
+  "@failedToAddToLibrary": {
+    "description": "Error when adding to library fails"
+  },
+
+  "cannotFindLibraryId": "Cannot find library ID for removal",
+  "@cannotFindLibraryId": {
+    "description": "Error when library ID not found for removal"
+  },
+
+  "failedToRemoveFromLibrary": "Failed to remove from library",
+  "@failedToRemoveFromLibrary": {
+    "description": "Error when removing from library fails"
+  },
+
+  "failedToPlayAlbum": "Failed to play album: {error}",
+  "@failedToPlayAlbum": {
+    "description": "Error when playing album fails",
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+
+  "playingOnPlayer": "Playing {name} on {playerName}",
+  "@playingOnPlayer": {
+    "description": "Status when playing item on specific player",
+    "placeholders": {
+      "name": {
+        "type": "String"
+      },
+      "playerName": {
+        "type": "String"
+      }
+    }
+  },
+
+  "failedToPlayPlaylist": "Failed to play playlist: {error}",
+  "@failedToPlayPlaylist": {
+    "description": "Error when playing playlist fails",
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+
+  "failedToPlayAudiobook": "Failed to play audiobook: {error}",
+  "@failedToPlayAudiobook": {
+    "description": "Error when playing audiobook fails",
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+
+  "noOtherPlayersAvailable": "No other players available",
+  "@noOtherPlayersAvailable": {
+    "description": "Message when no other players available for transfer"
+  },
+
+  "transferQueue": "Transfer queue",
+  "@transferQueue": {
+    "description": "Tooltip for transfer queue button"
+  },
+
+  "clearQueue": "Clear queue",
+  "@clearQueue": {
+    "description": "Tooltip for clear queue button"
+  },
+
+  "syncingPlayer": "Syncing {playerName}...",
+  "@syncingPlayer": {
+    "description": "Status when syncing player",
+    "placeholders": {
+      "playerName": {
+        "type": "String"
+      }
+    }
+  },
+
+  "switchPlayer": "Switch Player",
+  "@switchPlayer": {
+    "description": "Label for switch player action"
+  },
+
+  "logsCopiedToClipboard": "Logs copied to clipboard",
+  "@logsCopiedToClipboard": {
+    "description": "Confirmation when logs copied"
+  },
+
+  "auto": "Auto",
+  "@auto": {
+    "description": "Auto option for language selection"
+  },
+
+  "transferQueueTo": "Transfer Queue To",
+  "@transferQueueTo": {
+    "description": "Title for transfer queue dialog"
+  },
+
+  "queueTransferredTo": "Queue transferred to {playerName}",
+  "@queueTransferredTo": {
+    "description": "Success message when queue transferred",
+    "placeholders": {
+      "playerName": {
+        "type": "String"
+      }
+    }
+  },
+
+  "failedToTransferQueue": "Failed to transfer queue: {error}",
+  "@failedToTransferQueue": {
+    "description": "Error when queue transfer fails",
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+
+  "failedToLoadQueue": "Failed to load queue: {error}",
+  "@failedToLoadQueue": {
+    "description": "Error when queue loading fails",
+    "placeholders": {
+      "error": {
+        "type": "String"
+      }
+    }
+  },
+
+  "transferTo": "Transfer to...",
+  "@transferTo": {
+    "description": "Label for transfer destination selection"
+  },
+
+  "transferQueueToPlayer": "Transfer queue to another player",
+  "@transferQueueToPlayer": {
+    "description": "Tooltip for transfer queue button"
+  },
+
+  "selectPlayerToPlay": "Select a player",
+  "@selectPlayerToPlay": {
+    "description": "Generic hint for selecting a player in player selector"
+  },
+
+  "selectPlayerToPlayAlbum": "Select player to play album",
+  "@selectPlayerToPlayAlbum": {
+    "description": "Hint for selecting player to play album"
+  },
+
+  "selectPlayerToPlayPlaylist": "Select player to play playlist",
+  "@selectPlayerToPlayPlaylist": {
+    "description": "Hint for selecting player to play playlist"
+  },
+
+  "selectPlayerForRadio": "Select player for radio",
+  "@selectPlayerForRadio": {
+    "description": "Hint for selecting player to start radio"
+  },
+
+  "selectPlayerForEpisode": "Select player for episode",
+  "@selectPlayerForEpisode": {
+    "description": "Hint for selecting player to play episode"
+  },
+
+  "selectPlayerForAudiobook": "Select player for audiobook",
+  "@selectPlayerForAudiobook": {
+    "description": "Hint for selecting player to play audiobook"
+  },
+
+  "selectPlayerToAddToQueue": "Select player to add to queue",
+  "@selectPlayerToAddToQueue": {
+    "description": "Hint for selecting player to add to queue"
  }
 }
@@ -360,6 +360,7 @@
  "english": "Inglés",
  "german": "Alemán",
  "spanish": "Español",
+  "french": "Francés",
  "noTracksInPlaylist": "No hay canciones en la lista",
  "sortAlphabetically": "Ordenar alfabéticamente",
  "sortByYear": "Ordenar por año",
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
@@ -33,6 +34,10 @@ final _logger = DebugLogger();
 Future<void> main() async {
  WidgetsFlutterBinding.ensureInitialized();

+  // Initialize SharedPreferences cache early for performance
+  await SettingsService.initialize();
+  _logger.log('⚡ SharedPreferences cached');
+
  // Initialize local database
  await DatabaseService.instance.initialize();
  _logger.log('💾 Database initialized');
@@ -71,17 +76,42 @@ Future<void> main() async {
    DeviceOrientation.portraitDown,
  ]);

-  // Set system UI overlay style
+  // Set initial system UI overlay style based on platform brightness
+  // SystemUIWrapper will update this dynamically when theme changes
+  final platformBrightness = WidgetsBinding.instance.platformDispatcher.platformBrightness;
+  final isDark = platformBrightness == Brightness.dark;
  SystemChrome.setSystemUIOverlayStyle(
-    const SystemUiOverlayStyle(
+    SystemUiOverlayStyle(
      statusBarColor: Colors.transparent,
-      statusBarIconBrightness: Brightness.light,
-      systemNavigationBarColor: Color(0xFF1a1a1a),
-      systemNavigationBarIconBrightness: Brightness.light,
+      statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
+      systemNavigationBarColor: isDark ? const Color(0xFF1a1a1a) : const Color(0xFFF5F5F5),
+      systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
    ),
  );

-  runApp(const MusicAssistantApp());
+  // Set up Flutter error boundary to catch and log widget build errors
+  FlutterError.onError = (FlutterErrorDetails details) {
+    _logger.error('Flutter error: ${details.exceptionAsString()}', context: 'FlutterError');
+    _logger.error('Stack trace:\n${details.stack}', context: 'FlutterError');
+    // Still report to Flutter's default handler in debug mode
+    FlutterError.presentError(details);
+  };
+
+  // Catch errors from the platform dispatcher (platform channel errors)
+  PlatformDispatcher.instance.onError = (error, stack) {
+    _logger.error('Platform error: $error', context: 'PlatformDispatcher');
+    _logger.error('Stack trace:\n$stack', context: 'PlatformDispatcher');
+    return true; // Handled
+  };
+
+  // Wrap app in zone to catch async errors
+  runZonedGuarded(
+    () => runApp(const MusicAssistantApp()),
+    (error, stackTrace) {
+      _logger.error('Uncaught async error: $error', context: 'ZoneError');
+      _logger.error('Stack trace:\n$stackTrace', context: 'ZoneError');
+    },
+  );
 }

 class MusicAssistantApp extends StatefulWidget {
@@ -176,7 +206,7 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
  @override
  Future<bool> didPopRoute() async {
    // Intercept back button at app level - runs BEFORE Navigator processes it
-    // Priority order: device list > expanded player > normal navigation
+    // Priority order: device list > queue panel > expanded player > normal navigation

    // Device list has highest priority - dismiss it first
    if (GlobalPlayerOverlay.isPlayerRevealVisible) {
@@ -184,9 +214,18 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
      return true; // We handled it, don't let Navigator process it
    }

+    // Queue panel second - close it before collapsing player
+    // Use target state (not animation value) to handle rapid open-close timing
+    // Use withHaptic: false because Android back gesture provides system haptic
+    if (GlobalPlayerOverlay.isQueuePanelTargetOpen) {
+      GlobalPlayerOverlay.closeQueuePanel(withHaptic: false);
+      return true; // We handled it, don't let Navigator process it
+    }
+
    // Then check expanded player
+    // No haptic - Android back gesture provides its own
    if (GlobalPlayerOverlay.isPlayerExpanded) {
-      GlobalPlayerOverlay.collapsePlayer();
+      GlobalPlayerOverlay.collapsePlayer(withHaptic: false);
      return true; // We handled it, don't let Navigator process it
    }

@@ -229,10 +268,17 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
              ColorScheme? darkColorScheme;

              if (themeProvider.useMaterialTheme && snapshot.hasData && snapshot.data != null) {
-                // Use system color schemes
+                // Use system color schemes, but override background to match app design
+                // Material You doesn't set background consistently, causing black screen issues
                final (light, dark) = snapshot.data!;
-                lightColorScheme = light;
-                darkColorScheme = dark;
+                lightColorScheme = light.copyWith(
+                  surface: light.surface,
+                  background: const Color(0xFFFAFAFA), // App's preferred light background
+                );
+                darkColorScheme = dark.copyWith(
+                  surface: const Color(0xFF2a2a2a), // App's preferred dark surface
+                  background: const Color(0xFF1a1a1a), // App's preferred dark background
+                );
              } else {
                // Use custom color from theme provider
                lightColorScheme = generateLightColorScheme(themeProvider.customColor);
@@ -256,6 +302,29 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
                  ],
                  supportedLocales: S.supportedLocales,
                  locale: localeProvider.locale,
+                  // Fallback to English when locale is not supported
+                  localeListResolutionCallback: (locales, supportedLocales) {
+                    // If user has set a specific locale, try to use it
+                    if (localeProvider.locale != null) {
+                      for (final supported in supportedLocales) {
+                        if (supported.languageCode == localeProvider.locale!.languageCode) {
+                          return supported;
+                        }
+                      }
+                    }
+                    // Try to match system locales
+                    if (locales != null) {
+                      for (final locale in locales) {
+                        for (final supported in supportedLocales) {
+                          if (supported.languageCode == locale.languageCode) {
+                            return supported;
+                          }
+                        }
+                      }
+                    }
+                    // Fallback to English (not German)
+                    return const Locale('en');
+                  },
                  themeMode: themeProvider.themeMode,
                  theme: AppTheme.lightTheme(colorScheme: lightColorScheme),
                  darkTheme: AppTheme.darkTheme(colorScheme: darkColorScheme),
@@ -332,8 +401,8 @@ class _SystemUIWrapperState extends State<SystemUIWrapper> {
          statusBarColor: Colors.transparent,
          statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
          systemNavigationBarColor: isDark
-              ? widget.darkColorScheme.background
-              : widget.lightColorScheme.background,
+              ? widget.darkColorScheme.surface
+              : widget.lightColorScheme.surface,
          systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
        ),
      );
@@ -16,6 +16,10 @@ class ProviderMapping {
  final String providerInstance;
  final bool available;
  final Map<String, dynamic>? audioFormat;
+  /// Whether this item is in the library for this specific provider instance.
+  /// True = this provider "owns" the item (user added it from this account)
+  /// False = item exists but wasn't added from this provider
+  final bool inLibrary;

  ProviderMapping({
    required this.itemId,
@@ -23,6 +27,7 @@ class ProviderMapping {
    required this.providerInstance,
    required this.available,
    this.audioFormat,
+    this.inLibrary = true,
  });

  factory ProviderMapping.fromJson(Map<String, dynamic> json) {
@@ -32,6 +37,8 @@ class ProviderMapping {
      providerInstance: json['provider_instance'] as String? ?? '',
      available: json['available'] as bool? ?? true,
      audioFormat: json['audio_format'] as Map<String, dynamic>?,
+      // Parse in_library field - MA uses 1/0 or true/false
+      inLibrary: json['in_library'] == true || json['in_library'] == 1,
    );
  }

@@ -42,6 +49,7 @@ class ProviderMapping {
      'provider_instance': providerInstance,
      'available': available,
      if (audioFormat != null) 'audio_format': audioFormat,
+      'in_library': inLibrary,
    };
  }
 }
@@ -118,6 +126,23 @@ class MediaItem {
      if (duration != null) 'duration': duration!.inSeconds,
    };
  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is MediaItem &&
+          runtimeType == other.runtimeType &&
+          itemId == other.itemId &&
+          provider == other.provider;
+
+  @override
+  int get hashCode => Object.hash(itemId, provider);
+
+  /// Check if this item is in the user's library
+  bool get inLibrary {
+    if (provider == 'library') return true;
+    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
+  }
 }

 class Artist extends MediaItem {
@@ -146,6 +171,12 @@ class Artist extends MediaItem {
    );
  }

+  /// Check if this artist is in the user's library
+  bool get inLibrary {
+    if (provider == 'library') return true;
+    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
+  }
+
  @override
  Map<String, dynamic> toJson() => super.toJson();
 }
@@ -267,6 +298,12 @@ class Track extends MediaItem {
  String get artistsString =>
      artists?.map((a) => a.name).join(', ') ?? 'Unknown Artist';

+  /// Check if this track is in the user's library
+  bool get inLibrary {
+    if (provider == 'library') return true;
+    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
+  }
+
  @override
  Map<String, dynamic> toJson() {
    final json = super.toJson();
@@ -313,6 +350,12 @@ class Playlist extends MediaItem {
      favorite: item.favorite,
    );
  }
+
+  /// Check if this playlist is in the user's library
+  bool get inLibrary {
+    if (provider == 'library') return true;
+    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
+  }
 }

 class Chapter {
@@ -421,9 +464,20 @@ class Audiobook extends MediaItem {
  factory Audiobook.fromJson(Map<String, dynamic> json) {
    final item = MediaItem.fromJson(json);

-    // Parse year
+    // Parse year - check top level first, then metadata.release_date (ABS format)
    int? year;
-    final yearValue = json['year'];
+    final metadata = json['metadata'] as Map<String, dynamic>?;
+    dynamic yearValue = json['year'];
+    if (yearValue == null && metadata != null) {
+      // ABS stores year in metadata.release_date (can be "2024" or "2024-01-15")
+      final releaseDate = metadata['release_date'];
+      if (releaseDate is String && releaseDate.isNotEmpty) {
+        // Extract year from date string (handles both "2024" and "2024-01-15" formats)
+        yearValue = releaseDate.split('-').first;
+      } else if (releaseDate is int) {
+        yearValue = releaseDate;
+      }
+    }
    if (yearValue is int) {
      year = yearValue;
    } else if (yearValue is String) {
@@ -453,8 +507,6 @@ class Audiobook extends MediaItem {

    // Parse chapters - check top level first, then metadata
    List<Chapter>? chapters;
-    final metadata = json['metadata'] as Map<String, dynamic>?;
-
    dynamic chaptersData = json['chapters'];
    if (chaptersData == null && metadata != null) {
      chaptersData = metadata['chapters'];
@@ -500,6 +552,12 @@ class Audiobook extends MediaItem {
  String get narratorsString =>
      narrators?.map((n) => n.name).join(', ') ?? 'Unknown Narrator';

+  /// Check if this audiobook is in the user's library
+  bool get inLibrary {
+    if (provider == 'library') return true;
+    return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
+  }
+
  /// Get progress as a percentage (0.0 to 1.0)
  double get progress {
    if (fullyPlayed == true) return 1.0;
@@ -17,6 +17,7 @@ class Player {
  final String? activeSource; // The currently active source for this player
  final bool isExternalSource; // True when an external source (optical, Spotify, etc.) is active
  final String? appId; // The app_id from MA - 'music_assistant' when MA is playing, else external source
+  final String? activeQueue; // The active_queue from MA - has value when MA is controlling playback

  Player({
    required this.playerId,
@@ -35,6 +36,7 @@ class Player {
    this.activeSource,
    this.isExternalSource = false,
    this.appId,
+    this.activeQueue,
  });

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

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

-    // Detect external source (optical, Spotify, AirPlay, etc.)
-    // Primary indicator: app_id - if not 'music_assistant', it's an external source
-    // Secondary indicators: URI patterns and media_type
+    // 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.)
    bool isExternalSource = false;

-    // 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
+    // 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) {
      isExternalSource = true;
    }
-
-    // Also check current_media for additional external source indicators
-    if (!isExternalSource && json.containsKey('current_media')) {
+    // 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')) {
      final currentMedia = json['current_media'] as Map<String, dynamic>?;
      if (currentMedia != null) {
        final uri = currentMedia['uri'] as String?;
        final mediaType = currentMedia['media_type'] as String?;

-        // External source indicators:
-        // 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)
+        // 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
        if (uri != null) {
          final uriLower = uri.toLowerCase();
          // Simple external source identifiers (no :// or /)
+          // These are physical inputs that are always external
          final isSimpleExternalId = !uri.contains('://') && !uri.contains('/') &&
              (uriLower == 'optical' || uriLower == 'line_in' || uriLower == 'bluetooth' ||
               uriLower == 'hdmi' || uriLower == 'tv' || uriLower == 'aux' ||
               uriLower == 'coaxial' || uriLower == 'toslink');
-          // External streaming protocols
-          final isExternalProtocol = uriLower.startsWith('spotify://') ||
-              uriLower.startsWith('airplay://') ||
-              uriLower.startsWith('cast://') ||
-              uriLower.startsWith('bluetooth://');

-          isExternalSource = isSimpleExternalId || isExternalProtocol;
+          isExternalSource = isSimpleExternalId;
        }

-        // Also check media_type - 'unknown' often indicates external source
+        // Also check media_type - 'unknown' with non-MA URI indicates external source
        if (!isExternalSource && mediaType == 'unknown') {
-          // If media_type is unknown and URI doesn't look like MA content, it's external
          final uri = currentMedia['uri'] as String?;
          if (uri != null && !uri.startsWith('library://') && !uri.contains('://track/')) {
            isExternalSource = true;
@@ -287,6 +302,7 @@ class Player {
      activeSource: activeSource,
      isExternalSource: isExternalSource,
      appId: appId,
+      activeQueue: activeQueue,
    );
  }

@@ -308,6 +324,7 @@ class Player {
      if (activeSource != null) 'active_source': activeSource,
      'is_external_source': isExternalSource,
      if (appId != null) 'app_id': appId,
+      if (activeQueue != null) 'active_queue': activeQueue,
    };
  }
 }
@@ -0,0 +1,128 @@
+/// Represents a music provider instance from Music Assistant.
+///
+/// Each provider (like Spotify, Tidal) can have multiple instances
+/// (e.g., two different Spotify accounts). This class represents
+/// a single provider instance with its unique ID.
+class ProviderInstance {
+  /// Unique identifier for this provider instance (e.g., "spotify--abc123")
+  final String instanceId;
+
+  /// The provider domain/type (e.g., "spotify", "tidal", "qobuz")
+  final String domain;
+
+  /// Display name for this instance (e.g., "Spotify (John's Account)")
+  final String name;
+
+  /// Whether this provider is currently available/connected
+  final bool available;
+
+  ProviderInstance({
+    required this.instanceId,
+    required this.domain,
+    required this.name,
+    required this.available,
+  });
+
+  /// Provider capabilities - maps domain to supported content types
+  /// This determines which tabs/categories show which providers
+  static const Map<String, Set<String>> providerCapabilities = {
+    // Music streaming services (support artists, albums, tracks, playlists)
+    // Spotify also has audiobooks and podcasts
+    'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+    'tidal': {'artists', 'albums', 'tracks', 'playlists'},
+    'qobuz': {'artists', 'albums', 'tracks', 'playlists'},
+    'deezer': {'artists', 'albums', 'tracks', 'playlists'},
+    'ytmusic': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
+    'soundcloud': {'artists', 'albums', 'tracks', 'playlists'},
+    'apple_music': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
+    'amazon_music': {'artists', 'albums', 'tracks', 'playlists'},
+    // Self-hosted media servers (can have music, audiobooks, and podcasts)
+    'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+    'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+    'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
+    // Music-only servers
+    'subsonic': {'artists', 'albums', 'tracks', 'playlists'},
+    'opensubsonic': {'artists', 'albums', 'tracks', 'playlists'},
+    'navidrome': {'artists', 'albums', 'tracks', 'playlists'},
+    'filesystem': {'artists', 'albums', 'tracks', 'playlists'},
+    // Audiobook and podcast providers
+    'audiobookshelf': {'audiobooks', 'podcasts'},
+    'itunes_podcasts': {'podcasts'},
+    // Radio providers (tunein also has podcasts)
+    'tunein': {'radio', 'podcasts'},
+    'radiobrowser': {'radio'},
+    // Player/system providers (no library content)
+    'snapcast': <String>{},
+    'fully_kiosk': <String>{},
+  };
+
+  /// Known music provider domains that provide library content
+  static const Set<String> musicProviderDomains = {
+    // Streaming services
+    'spotify',
+    'tidal',
+    'qobuz',
+    'deezer',
+    'ytmusic',
+    'soundcloud',
+    'apple_music',
+    'amazon_music',
+    // Self-hosted / local
+    'plex',
+    'subsonic',
+    'opensubsonic',
+    'jellyfin',
+    'emby',
+    'navidrome',
+    'audiobookshelf',
+    'filesystem',
+    'itunes_podcasts',
+    // Other
+    'tunein',
+    'radiobrowser',
+    'snapcast',
+    'fully_kiosk',
+  };
+
+  /// Whether this is a music provider (vs. player provider, metadata provider, etc.)
+  bool get isMusicProvider => musicProviderDomains.contains(domain);
+
+  /// Get supported content types for this provider
+  Set<String> get supportedContentTypes =>
+      providerCapabilities[domain] ?? <String>{};
+
+  /// Check if this provider supports a specific content type/category
+  bool supportsContentType(String category) =>
+      supportedContentTypes.contains(category);
+
+  factory ProviderInstance.fromJson(Map<String, dynamic> json) {
+    return ProviderInstance(
+      instanceId: json['instance_id'] as String? ?? '',
+      domain: json['domain'] as String? ?? json['type'] as String? ?? '',
+      name: json['name'] as String? ?? json['instance_id'] as String? ?? 'Unknown',
+      available: json['available'] as bool? ?? true,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'instance_id': instanceId,
+      'domain': domain,
+      'name': name,
+      'available': available,
+    };
+  }
+
+  @override
+  String toString() => 'ProviderInstance($instanceId: $name)';
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is ProviderInstance &&
+          runtimeType == other.runtimeType &&
+          instanceId == other.instanceId;
+
+  @override
+  int get hashCode => instanceId.hashCode;
+}
@@ -0,0 +1,65 @@
+/// Represents a provider manifest from Music Assistant.
+///
+/// Contains metadata about a provider type including its icons.
+/// This is separate from ProviderInstance which represents a configured
+/// instance of a provider.
+class ProviderManifest {
+  /// The provider domain/type (e.g., "spotify", "tidal", "qobuz")
+  final String domain;
+
+  /// Display name for this provider type
+  final String name;
+
+  /// Description of the provider
+  final String? description;
+
+  /// SVG icon as XML string
+  final String? iconSvg;
+
+  /// SVG icon for dark theme as XML string
+  final String? iconSvgDark;
+
+  /// Monochrome SVG icon as XML string
+  final String? iconSvgMonochrome;
+
+  /// Material Design icon name (fallback)
+  final String? icon;
+
+  ProviderManifest({
+    required this.domain,
+    required this.name,
+    this.description,
+    this.iconSvg,
+    this.iconSvgDark,
+    this.iconSvgMonochrome,
+    this.icon,
+  });
+
+  /// Whether this manifest has any SVG icon available
+  bool get hasSvgIcon =>
+      iconSvg != null || iconSvgDark != null || iconSvgMonochrome != null;
+
+  /// Get the best available SVG icon for the given brightness
+  /// Prefers dark icon for dark themes, falls back to regular or monochrome
+  String? getSvgIcon({bool isDark = false}) {
+    if (isDark && iconSvgDark != null) {
+      return iconSvgDark;
+    }
+    return iconSvg ?? iconSvgMonochrome;
+  }
+
+  factory ProviderManifest.fromJson(Map<String, dynamic> json) {
+    return ProviderManifest(
+      domain: json['domain'] as String? ?? '',
+      name: json['name'] as String? ?? '',
+      description: json['description'] as String?,
+      iconSvg: json['icon_svg'] as String?,
+      iconSvgDark: json['icon_svg_dark'] as String?,
+      iconSvgMonochrome: json['icon_svg_monochrome'] as String?,
+      icon: json['icon'] as String?,
+    );
+  }
+
+  @override
+  String toString() => 'ProviderManifest($domain: $name)';
+}
@@ -2,168 +2,80 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import '../services/music_assistant_api.dart';
 import '../services/settings_service.dart';
-import '../services/database_service.dart';
-import '../services/profile_service.dart';
 import '../services/debug_logger.dart';
 import '../services/error_handler.dart';
 import '../services/auth/auth_manager.dart';
-import '../services/cache_service.dart';

-/// Provider for managing connection state to Music Assistant server
-/// Handles WebSocket connection, authentication, and reconnection
+/// Callback types for connection events
+typedef OnConnected = Future<void> Function();
+typedef OnAuthenticated = Future<void> Function();
+typedef OnDisconnected = void Function();
+
+/// Provider for connection state management.
+///
+/// Extracted from MusicAssistantProvider to handle:
+/// - WebSocket connection lifecycle
+/// - Authentication flow (MA token, credentials)
+/// - Reconnection logic
+/// - Connection state broadcasting
+///
+/// Note: This is a partial extraction. Full integration requires updating
+/// all consumers to use this provider directly.
 class ConnectionProvider with ChangeNotifier {
-  MusicAssistantAPI? _api;
-  final AuthManager _authManager = AuthManager();
  final DebugLogger _logger = DebugLogger();
-  final CacheService _cacheService = CacheService();
+  final AuthManager _authManager = AuthManager();

-  MAConnectionState _connectionState = MAConnectionState.disconnected;
+  MusicAssistantAPI? _api;
  String? _serverUrl;
  String? _error;
+  MAConnectionState _connectionState = MAConnectionState.disconnected;

-  // Callbacks for post-connection initialization
-  VoidCallback? onConnected;
-  VoidCallback? onAuthenticated;
-  VoidCallback? onDisconnected;
+  StreamSubscription? _connectionStateSubscription;

-  MAConnectionState get connectionState => _connectionState;
-  String? get serverUrl => _serverUrl;
-  String? get error => _error;
-  bool get isConnected => _connectionState == MAConnectionState.connected ||
-                          _connectionState == MAConnectionState.authenticated;
+  // Callbacks for connection events - set by the facade provider
+  OnConnected? onConnected;
+  OnAuthenticated? onAuthenticated;
+  OnDisconnected? onDisconnected;
+
+  // User settings captured during authentication
+  List<String> _providerFilter = [];
+  List<String> _playerFilter = [];
+
+  // ============================================================================
+  // GETTERS
+  // ============================================================================

  MusicAssistantAPI? get api => _api;
  AuthManager get authManager => _authManager;
-  CacheService get cacheService => _cacheService;
+  String? get serverUrl => _serverUrl;
+  String? get error => _error;
+  MAConnectionState get connectionState => _connectionState;

-  ConnectionProvider() {
-    _initialize();
-  }
+  bool get isConnected =>
+      _connectionState == MAConnectionState.connected ||
+      _connectionState == MAConnectionState.authenticated;

-  Future<void> _initialize() async {
-    _serverUrl = await SettingsService.getServerUrl();
-    if (_serverUrl != null && _serverUrl!.isNotEmpty) {
-      await _restoreAuthCredentials();
-      await connectToServer(_serverUrl!);
-    }
-  }
+  List<String> get providerFilter => _providerFilter;
+  List<String> get playerFilter => _playerFilter;

-  /// Restore auth credentials from persistent storage
-  Future<void> _restoreAuthCredentials() async {
-    final savedCredentials = await SettingsService.getAuthCredentials();
-    if (savedCredentials != null) {
-      _logger.log('🔐 Restoring saved auth credentials...');
-      _authManager.deserializeCredentials(savedCredentials);
-      _logger.log('🔐 Auth credentials restored: ${_authManager.currentStrategy?.name ?? "none"}');
-    } else {
-      _logger.log('🔐 No saved auth credentials found');
-    }
-  }
+  // ============================================================================
+  // CONNECTION
+  // ============================================================================

-  /// Handle Music Assistant native authentication after WebSocket connection
-  Future<bool> handleMaAuthentication() async {
-    if (_api == null) return false;
-
-    try {
-      // First, try stored MA token
-      final storedToken = await SettingsService.getMaAuthToken();
-      if (storedToken != null) {
-        _logger.log('🔐 Trying stored MA token...');
-        final success = await _api!.authenticateWithToken(storedToken);
-        if (success) {
-          _logger.log('✅ MA authentication with stored token successful');
-          await _fetchAndSetUserProfileName();
-          return true;
-        }
-        _logger.log('⚠️ Stored MA token invalid, clearing...');
-        await SettingsService.clearMaAuthToken();
-      }
-
-      // No valid token - try stored credentials
-      final username = await SettingsService.getUsername();
-      final password = await SettingsService.getPassword();
-
-      if (username != null && password != null && username.isNotEmpty && password.isNotEmpty) {
-        _logger.log('🔐 Trying stored credentials...');
-        final accessToken = await _api!.loginWithCredentials(username, password);
-
-        if (accessToken != null) {
-          _logger.log('✅ MA login with stored credentials successful');
-
-          final longLivedToken = await _api!.createLongLivedToken();
-          if (longLivedToken != null) {
-            await SettingsService.setMaAuthToken(longLivedToken);
-            _logger.log('✅ Saved new long-lived MA token');
-          } else {
-            await SettingsService.setMaAuthToken(accessToken);
-          }
-
-          await _fetchAndSetUserProfileName();
-          return true;
-        }
-      }
-
-      _logger.log('❌ MA authentication failed - no valid token or credentials');
-      return false;
-    } catch (e) {
-      _logger.log('❌ MA authentication error: $e');
-      return false;
-    }
-  }
-
-  /// Fetch user profile from MA and set owner name + create/activate local profile
-  Future<void> _fetchAndSetUserProfileName() async {
-    if (_api == null) return;
-
-    try {
-      final userInfo = await _api!.getCurrentUserInfo();
-      if (userInfo == null) {
-        _logger.log('⚠️ Could not fetch user profile');
-        return;
-      }
-
-      final displayName = userInfo['display_name'] as String?;
-      final username = userInfo['username'] as String?;
-
-      _logger.log('🔍 Profile data: display_name="$displayName", username="$username"');
-
-      final profileName = (displayName != null && displayName.isNotEmpty)
-          ? displayName
-          : username;
-
-      if (profileName != null && profileName.isNotEmpty) {
-        await SettingsService.setOwnerName(profileName);
-        _logger.log('✅ Set owner name from MA profile: $profileName');
-
-        // Create/activate profile in local database
-        if (DatabaseService.instance.isInitialized && username != null) {
-          await ProfileService.instance.onMaAuthenticated(
-            username: username,
-            displayName: displayName,
-          );
-          _logger.log('✅ Local profile activated: $username');
-        }
-      } else {
-        _logger.log('⚠️ No valid name in profile');
-      }
-    } catch (e) {
-      _logger.log('⚠️ Could not fetch user profile (non-fatal): $e');
-    }
-  }
-
-  Future<void> connectToServer(String serverUrl) async {
+  /// Connect to the Music Assistant server
+  Future<void> connect(String serverUrl) async {
    try {
      _error = null;
      _serverUrl = serverUrl;
      await SettingsService.setServerUrl(serverUrl);

-      // Disconnect existing connection
-      await _api?.disconnect();
+      // Dispose the old API to stop any pending reconnects
+      _api?.dispose();

      _api = MusicAssistantAPI(serverUrl, _authManager);

-      // Listen to connection state changes
-      _api!.connectionState.listen(
+      _connectionStateSubscription?.cancel();
+      _connectionStateSubscription = _api!.connectionState.listen(
        (state) async {
          _connectionState = state;
          notifyListeners();
@@ -173,9 +85,8 @@ class ConnectionProvider with ChangeNotifier {

            if (_api!.authRequired && !_api!.isAuthenticated) {
              _logger.log('🔐 MA auth required, attempting authentication...');
-              final authenticated = await handleMaAuthentication();
+              final authenticated = await _handleAuthentication();
              if (!authenticated) {
-                _logger.log('❌ MA authentication failed - stopping connection flow');
                _error = 'Authentication required. Please log in again.';
                notifyListeners();
                return;
@@ -183,15 +94,13 @@ class ConnectionProvider with ChangeNotifier {
              return;
            }

-            // No auth required - notify connected
-            onConnected?.call();
+            // No auth required, trigger callback
+            await onConnected?.call();
          } else if (state == MAConnectionState.authenticated) {
            _logger.log('✅ MA authentication successful');
-            onAuthenticated?.call();
+            await onAuthenticated?.call();
          } else if (state == MAConnectionState.disconnected) {
-            // DON'T clear caches on disconnect - keep showing cached data
-            // This allows instant UI display when app resumes or reconnects
-            // Caches will be refreshed when connection is restored
+            _logger.log('📡 Disconnected - keeping cached data for instant resume');
            onDisconnected?.call();
          }
        },
@@ -214,44 +123,122 @@ class ConnectionProvider with ChangeNotifier {
    }
  }

+  Future<bool> _handleAuthentication() async {
+    if (_api == null) return false;
+
+    try {
+      final storedToken = await SettingsService.getMaAuthToken();
+      if (storedToken != null) {
+        _logger.log('🔐 Trying stored MA token...');
+        final success = await _api!.authenticateWithToken(storedToken);
+        if (success) {
+          _logger.log('✅ MA authentication with stored token successful');
+          await _fetchUserSettings();
+          return true;
+        }
+        _logger.log('⚠️ Stored MA token invalid, clearing...');
+        await SettingsService.clearMaAuthToken();
+      }
+
+      final username = await SettingsService.getUsername();
+      final password = await SettingsService.getPassword();
+
+      if (username != null &&
+          password != null &&
+          username.isNotEmpty &&
+          password.isNotEmpty) {
+        _logger.log('🔐 Trying stored credentials...');
+        final accessToken = await _api!.loginWithCredentials(username, password);
+
+        if (accessToken != null) {
+          _logger.log('✅ MA login with stored credentials successful');
+
+          final longLivedToken = await _api!.createLongLivedToken();
+          if (longLivedToken != null) {
+            await SettingsService.setMaAuthToken(longLivedToken);
+            _logger.log('✅ Saved new long-lived MA token');
+          } else {
+            await SettingsService.setMaAuthToken(accessToken);
+          }
+
+          await _fetchUserSettings();
+          return true;
+        }
+      }
+
+      _logger.log('❌ MA authentication failed - no valid token or credentials');
+      return false;
+    } catch (e) {
+      _logger.log('❌ MA authentication error: $e');
+      return false;
+    }
+  }
+
+  Future<void> _fetchUserSettings() async {
+    if (_api == null) return;
+
+    try {
+      final userInfo = await _api!.getCurrentUserInfo();
+      if (userInfo == null) return;
+
+      // Set profile name
+      final displayName = userInfo['display_name'] as String?;
+      final username = userInfo['username'] as String?;
+      final profileName =
+          (displayName != null && displayName.isNotEmpty) ? displayName : username;
+
+      if (profileName != null && profileName.isNotEmpty) {
+        await SettingsService.setOwnerName(profileName);
+        _logger.log('✅ Set owner name from MA profile: $profileName');
+      }
+
+      // Capture provider filter
+      final providerFilterRaw = userInfo['provider_filter'];
+      if (providerFilterRaw is List) {
+        _providerFilter = providerFilterRaw.cast<String>().toList();
+        if (_providerFilter.isNotEmpty) {
+          _logger.log(
+              '🔒 Provider filter active: ${_providerFilter.length} providers allowed');
+        }
+      } else {
+        _providerFilter = [];
+      }
+
+      // Capture player filter
+      final playerFilterRaw = userInfo['player_filter'];
+      if (playerFilterRaw is List) {
+        _playerFilter = playerFilterRaw.cast<String>().toList();
+        if (_playerFilter.isNotEmpty) {
+          _logger.log(
+              '🔒 Player filter active: ${_playerFilter.length} players allowed');
+        }
+      } else {
+        _playerFilter = [];
+      }
+    } catch (e) {
+      _logger.log('⚠️ Could not fetch user settings (non-fatal): $e');
+    }
+  }
+
+  /// Disconnect from the server
  Future<void> disconnect() async {
+    _connectionStateSubscription?.cancel();
    await _api?.disconnect();
    _connectionState = MAConnectionState.disconnected;
-    // DON'T clear caches on disconnect - keep showing cached data for instant reconnect
    notifyListeners();
  }

-  /// Clear all caches and state (for logout or server change)
-  void clearCachesOnLogout() {
-    _cacheService.clearAll();
-    notifyListeners();
-  }
-
-  /// Check connection and reconnect if needed (called when app resumes)
+  /// Check connection and reconnect if needed
  Future<void> checkAndReconnect() async {
-    _logger.log('🔄 checkAndReconnect called - state: $_connectionState');
-
-    if (_serverUrl == null) {
-      _logger.log('🔄 No server URL saved, skipping reconnect');
-      return;
-    }
-
-    if (_connectionState != MAConnectionState.connected &&
-        _connectionState != MAConnectionState.authenticated) {
-      _logger.log('🔄 Not connected, attempting reconnect to $_serverUrl');
-      try {
-        await connectToServer(_serverUrl!);
-        _logger.log('🔄 Reconnection successful');
-      } catch (e) {
-        _logger.log('🔄 Reconnection failed: $e');
-      }
-    } else {
-      _logger.log('🔄 Already connected, connection verified');
+    if (_serverUrl != null && !isConnected) {
+      _logger.log('🔄 Attempting reconnection...');
+      await connect(_serverUrl!);
    }
  }

  @override
  void dispose() {
+    _connectionStateSubscription?.cancel();
    _api?.dispose();
    super.dispose();
  }
@@ -1,392 +0,0 @@
-import 'package:flutter/foundation.dart';
-import '../models/media_item.dart';
-import '../services/music_assistant_api.dart';
-import '../services/debug_logger.dart';
-import '../services/error_handler.dart';
-import '../services/cache_service.dart';
-import '../services/settings_service.dart';
-import '../constants/timings.dart';
-
-/// Provider for managing library data (artists, albums, tracks, playlists)
-class LibraryProvider with ChangeNotifier {
-  final DebugLogger _logger = DebugLogger();
-  final CacheService _cacheService;
-
-  MusicAssistantAPI? _api;
-
-  List<Artist> _artists = [];
-  List<Album> _albums = [];
-  List<Track> _tracks = [];
-  bool _isLoading = false;
-  String? _error;
-
-  // Search state persistence
-  String _lastSearchQuery = '';
-  Map<String, List<MediaItem>> _lastSearchResults = {
-    'artists': [],
-    'albums': [],
-    'tracks': [],
-  };
-
-  // Getters
-  List<Artist> get artists => _artists;
-  List<Album> get albums => _albums;
-  List<Track> get tracks => _tracks;
-  bool get isLoading => _isLoading;
-  String? get error => _error;
-  String get lastSearchQuery => _lastSearchQuery;
-  Map<String, List<MediaItem>> get lastSearchResults => _lastSearchResults;
-
-  LibraryProvider(this._cacheService);
-
-  /// Initialize with API reference after connection
-  void initialize(MusicAssistantAPI api) {
-    _api = api;
-  }
-
-  void saveSearchState(String query, Map<String, List<MediaItem>> results) {
-    _lastSearchQuery = query;
-    _lastSearchResults = results;
-  }
-
-  void clearSearchState() {
-    _lastSearchQuery = '';
-    _lastSearchResults = {
-      'artists': [],
-      'albums': [],
-      'tracks': [],
-    };
-  }
-
-  // ============================================================================
-  // HOME SCREEN DATA
-  // ============================================================================
-
-  /// Get recently played albums with caching
-  Future<List<Album>> getRecentAlbumsWithCache({bool forceRefresh = false}) async {
-    if (_cacheService.isRecentAlbumsCacheValid(forceRefresh: forceRefresh)) {
-      _logger.log('📦 Using cached recent albums');
-      return _cacheService.getCachedRecentAlbums()!;
-    }
-
-    if (_api == null) return _cacheService.getCachedRecentAlbums() ?? [];
-
-    try {
-      _logger.log('🔄 Fetching fresh recent albums...');
-      final albums = await _api!.getRecentAlbums(limit: LibraryConstants.defaultRecentLimit);
-      _cacheService.setCachedRecentAlbums(albums);
-      return albums;
-    } catch (e) {
-      _logger.log('❌ Failed to fetch recent albums: $e');
-      return _cacheService.getCachedRecentAlbums() ?? [];
-    }
-  }
-
-  /// Get discover artists (random) with caching
-  Future<List<Artist>> getDiscoverArtistsWithCache({bool forceRefresh = false}) async {
-    if (_cacheService.isDiscoverArtistsCacheValid(forceRefresh: forceRefresh)) {
-      _logger.log('📦 Using cached discover artists');
-      return _cacheService.getCachedDiscoverArtists()!;
-    }
-
-    if (_api == null) return _cacheService.getCachedDiscoverArtists() ?? [];
-
-    try {
-      _logger.log('🔄 Fetching fresh discover artists...');
-      final artists = await _api!.getRandomArtists(limit: LibraryConstants.defaultRecentLimit);
-      _cacheService.setCachedDiscoverArtists(artists);
-      return artists;
-    } catch (e) {
-      _logger.log('❌ Failed to fetch discover artists: $e');
-      return _cacheService.getCachedDiscoverArtists() ?? [];
-    }
-  }
-
-  /// Get discover albums (random) with caching
-  Future<List<Album>> getDiscoverAlbumsWithCache({bool forceRefresh = false}) async {
-    if (_cacheService.isDiscoverAlbumsCacheValid(forceRefresh: forceRefresh)) {
-      _logger.log('📦 Using cached discover albums');
-      return _cacheService.getCachedDiscoverAlbums()!;
-    }
-
-    if (_api == null) return _cacheService.getCachedDiscoverAlbums() ?? [];
-
-    try {
-      _logger.log('🔄 Fetching fresh discover albums...');
-      final albums = await _api!.getRandomAlbums(limit: LibraryConstants.defaultRecentLimit);
-      _cacheService.setCachedDiscoverAlbums(albums);
-      return albums;
-    } catch (e) {
-      _logger.log('❌ Failed to fetch discover albums: $e');
-      return _cacheService.getCachedDiscoverAlbums() ?? [];
-    }
-  }
-
-  /// Invalidate home screen cache (call on pull-to-refresh)
-  void invalidateHomeCache() {
-    _cacheService.invalidateHomeCache();
-  }
-
-  // ============================================================================
-  // LIBRARY DATA
-  // ============================================================================
-
-  Future<void> loadLibrary() async {
-    if (_api == null) return;
-
-    try {
-      _isLoading = true;
-      _error = null;
-      notifyListeners();
-
-      // Read artist filter setting - when ON, only fetch artists that have albums
-      final showOnlyArtistsWithAlbums = await SettingsService.getShowOnlyArtistsWithAlbums();
-      _logger.log('🎨 loadLibrary using albumArtistsOnly: $showOnlyArtistsWithAlbums');
-
-      final results = await Future.wait([
-        _api!.getArtists(limit: LibraryConstants.maxLibraryItems, albumArtistsOnly: showOnlyArtistsWithAlbums),
-        _api!.getAlbums(limit: LibraryConstants.maxLibraryItems),
-        _api!.getTracks(limit: LibraryConstants.maxLibraryItems),
-      ]);
-
-      _artists = results[0] as List<Artist>;
-      _albums = results[1] as List<Album>;
-      _tracks = results[2] as List<Track>;
-
-      _isLoading = false;
-      notifyListeners();
-    } catch (e) {
-      final errorInfo = ErrorHandler.handleError(e, context: 'Load library');
-      _error = errorInfo.userMessage;
-      _isLoading = false;
-      notifyListeners();
-    }
-  }
-
-  Future<void> loadArtists({int? limit, int? offset, String? search}) async {
-    if (_api == null) return;
-
-    try {
-      _isLoading = true;
-      _error = null;
-      notifyListeners();
-
-      // Read artist filter setting - when ON, only fetch artists that have albums
-      final showOnlyArtistsWithAlbums = await SettingsService.getShowOnlyArtistsWithAlbums();
-
-      _artists = await _api!.getArtists(
-        limit: limit ?? LibraryConstants.maxLibraryItems,
-        offset: offset,
-        search: search,
-        albumArtistsOnly: showOnlyArtistsWithAlbums,
-      );
-
-      _isLoading = false;
-      notifyListeners();
-    } catch (e) {
-      final errorInfo = ErrorHandler.handleError(e, context: 'Load artists');
-      _error = errorInfo.userMessage;
-      _isLoading = false;
-      notifyListeners();
-    }
-  }
-
-  Future<void> loadAlbums({int? limit, int? offset, String? search, String? artistId}) async {
-    if (_api == null) return;
-
-    try {
-      _isLoading = true;
-      _error = null;
-      notifyListeners();
-
-      _albums = await _api!.getAlbums(
-        limit: limit ?? LibraryConstants.maxLibraryItems,
-        offset: offset,
-        search: search,
-        artistId: artistId,
-      );
-
-      _isLoading = false;
-      notifyListeners();
-    } catch (e) {
-      final errorInfo = ErrorHandler.handleError(e, context: 'Load albums');
-      _error = errorInfo.userMessage;
-      _isLoading = false;
-      notifyListeners();
-    }
-  }
-
-  // ============================================================================
-  // DETAIL SCREEN DATA
-  // ============================================================================
-
-  /// Get album tracks with caching
-  Future<List<Track>> getAlbumTracksWithCache(String provider, String itemId, {bool forceRefresh = false}) async {
-    final cacheKey = '${provider}_$itemId';
-
-    if (_cacheService.isAlbumTracksCacheValid(cacheKey, forceRefresh: forceRefresh)) {
-      _logger.log('📦 Using cached album tracks for $cacheKey');
-      return _cacheService.getCachedAlbumTracks(cacheKey)!;
-    }
-
-    if (_api == null) return _cacheService.getCachedAlbumTracks(cacheKey) ?? [];
-
-    try {
-      _logger.log('🔄 Fetching fresh album tracks for $cacheKey...');
-      final tracks = await _api!.getAlbumTracks(provider, itemId);
-      _cacheService.setCachedAlbumTracks(cacheKey, tracks);
-      return tracks;
-    } catch (e) {
-      _logger.log('❌ Failed to fetch album tracks: $e');
-      return _cacheService.getCachedAlbumTracks(cacheKey) ?? [];
-    }
-  }
-
-  /// Get playlist tracks with caching
-  Future<List<Track>> getPlaylistTracksWithCache(String provider, String itemId, {bool forceRefresh = false}) async {
-    final cacheKey = '${provider}_$itemId';
-
-    if (_cacheService.isPlaylistTracksCacheValid(cacheKey, forceRefresh: forceRefresh)) {
-      _logger.log('📦 Using cached playlist tracks for $cacheKey');
-      return _cacheService.getCachedPlaylistTracks(cacheKey)!;
-    }
-
-    if (_api == null) return _cacheService.getCachedPlaylistTracks(cacheKey) ?? [];
-
-    try {
-      _logger.log('🔄 Fetching fresh playlist tracks for $cacheKey...');
-      final tracks = await _api!.getPlaylistTracks(provider, itemId);
-      _cacheService.setCachedPlaylistTracks(cacheKey, tracks);
-      return tracks;
-    } catch (e) {
-      _logger.log('❌ Failed to fetch playlist tracks: $e');
-      return _cacheService.getCachedPlaylistTracks(cacheKey) ?? [];
-    }
-  }
-
-  /// Get artist albums with caching
-  Future<List<Album>> getArtistAlbumsWithCache(String artistName, {bool forceRefresh = false}) async {
-    final cacheKey = artistName.toLowerCase();
-
-    if (_cacheService.isArtistAlbumsCacheValid(cacheKey, forceRefresh: forceRefresh)) {
-      _logger.log('📦 Using cached artist albums for "$artistName"');
-      return _cacheService.getCachedArtistAlbums(cacheKey)!;
-    }
-
-    if (_api == null) return _cacheService.getCachedArtistAlbums(cacheKey) ?? [];
-
-    try {
-      _logger.log('🔄 Fetching albums for artist "$artistName"...');
-
-      final libraryAlbums = await _api!.getAlbums();
-      final artistAlbums = libraryAlbums.where((album) {
-        final albumArtists = album.artists;
-        if (albumArtists == null || albumArtists.isEmpty) return false;
-        return albumArtists.any((a) => a.name.toLowerCase() == artistName.toLowerCase());
-      }).toList();
-
-      final searchResults = await _api!.search(artistName);
-      final searchAlbums = searchResults['albums'] as List<MediaItem>? ?? [];
-      final providerAlbums = searchAlbums.whereType<Album>().where((album) {
-        final albumArtists = album.artists;
-        if (albumArtists == null || albumArtists.isEmpty) return false;
-        return albumArtists.any((a) => a.name.toLowerCase() == artistName.toLowerCase());
-      }).toList();
-
-      final allAlbums = <Album>[];
-      final seenNames = <String>{};
-
-      for (final album in [...artistAlbums, ...providerAlbums]) {
-        final key = album.name.toLowerCase();
-        if (!seenNames.contains(key)) {
-          seenNames.add(key);
-          allAlbums.add(album);
-        }
-      }
-
-      _cacheService.setCachedArtistAlbums(cacheKey, allAlbums);
-      return allAlbums;
-    } catch (e) {
-      _logger.log('❌ Failed to fetch artist albums: $e');
-      return _cacheService.getCachedArtistAlbums(cacheKey) ?? [];
-    }
-  }
-
-  /// Invalidate album tracks cache
-  void invalidateAlbumTracksCache(String albumId) {
-    _cacheService.invalidateAlbumTracksCache(albumId);
-  }
-
-  /// Invalidate playlist tracks cache
-  void invalidatePlaylistTracksCache(String playlistId) {
-    _cacheService.invalidatePlaylistTracksCache(playlistId);
-  }
-
-  // ============================================================================
-  // SEARCH
-  // ============================================================================
-
-  /// Search with caching
-  Future<Map<String, List<MediaItem>>> searchWithCache(String query, {bool forceRefresh = false}) async {
-    final cacheKey = query.toLowerCase().trim();
-    if (cacheKey.isEmpty) return {'artists': [], 'albums': [], 'tracks': []};
-
-    if (_cacheService.isSearchCacheValid(cacheKey, forceRefresh: forceRefresh)) {
-      _logger.log('📦 Using cached search results for "$query"');
-      return _cacheService.getCachedSearchResults(cacheKey)!;
-    }
-
-    if (_api == null) {
-      return _cacheService.getCachedSearchResults(cacheKey) ?? {'artists': [], 'albums': [], 'tracks': []};
-    }
-
-    try {
-      _logger.log('🔄 Searching for "$query"...');
-      final results = await _api!.search(query);
-
-      final cachedResults = <String, List<MediaItem>>{
-        'artists': results['artists'] ?? [],
-        'albums': results['albums'] ?? [],
-        'tracks': results['tracks'] ?? [],
-      };
-
-      _cacheService.setCachedSearchResults(cacheKey, cachedResults);
-      return cachedResults;
-    } catch (e) {
-      _logger.log('❌ Search failed: $e');
-      return _cacheService.getCachedSearchResults(cacheKey) ?? {'artists': [], 'albums': [], 'tracks': []};
-    }
-  }
-
-  Future<Map<String, List<MediaItem>>> search(String query, {bool libraryOnly = false}) async {
-    if (_api == null) return {'artists': [], 'albums': [], 'tracks': []};
-
-    try {
-      return await _api!.search(query, libraryOnly: libraryOnly);
-    } catch (e) {
-      ErrorHandler.logError('Search', e);
-      return {'artists': [], 'albums': [], 'tracks': []};
-    }
-  }
-
-  Future<List<Track>> getAlbumTracks(String provider, String itemId) async {
-    if (_api == null) return [];
-
-    try {
-      return await _api!.getAlbumTracks(provider, itemId);
-    } catch (e) {
-      ErrorHandler.logError('Get album tracks', e);
-      return [];
-    }
-  }
-
-  void clearState() {
-    _artists = [];
-    _albums = [];
-    _tracks = [];
-    _isLoading = false;
-    _error = null;
-    clearSearchState();
-    notifyListeners();
-  }
-}
@@ -31,6 +31,10 @@ class LocaleProvider extends ChangeNotifier {
        return 'English';
      case 'de':
        return 'Deutsch';
+      case 'es':
+        return 'Español';
+      case 'fr':
+        return 'Français';
      case null:
        return 'System';
      default:
@@ -1,964 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/painting.dart';
-import '../models/media_item.dart';
-import '../models/player.dart';
-import '../services/music_assistant_api.dart';
-import '../services/settings_service.dart';
-import '../services/debug_logger.dart';
-import '../services/error_handler.dart';
-import '../services/local_player_service.dart';
-import '../services/auth/auth_manager.dart';
-import '../services/device_id_service.dart';
-import '../services/cache_service.dart';
-import '../constants/timings.dart';
-import '../main.dart' show audioHandler;
-
-/// Provider for managing player state, selection, and controls
-class PlayerProvider with ChangeNotifier {
-  final DebugLogger _logger = DebugLogger();
-  late final LocalPlayerService _localPlayer;
-  final CacheService _cacheService;
-
-  // Dependencies injected from parent provider
-  MusicAssistantAPI? _api;
-  AuthManager? _authManager;
-  String? _serverUrl;
-
-  // Player selection
-  Player? _selectedPlayer;
-  List<Player> _availablePlayers = [];
-  Track? _currentTrack;
-  Timer? _playerStateTimer;
-  Timer? _adjacentPlayerCacheTimer;
-
-  // Local Playback
-  bool _isLocalPlayerPowered = true;
-  StreamSubscription? _localPlayerEventSubscription;
-  StreamSubscription? _playerUpdatedEventSubscription;
-  Timer? _localPlayerStateReportTimer;
-
-  // Pending metadata from player_updated events
-  TrackMetadata? _pendingTrackMetadata;
-  TrackMetadata? _currentNotificationMetadata;
-
-  // Registration guard
-  Completer<void>? _registrationInProgress;
-
-  // Getters
-  Player? get selectedPlayer => _selectedPlayer;
-  List<Player> get availablePlayers => _availablePlayers;
-  Track? get currentTrack => _currentTrack;
-  bool get isLocalPlayerPowered => _isLocalPlayerPowered;
-
-  /// Get cached track for a player (used for smooth swipe transitions)
-  Track? getCachedTrackForPlayer(String playerId) => _cacheService.getCachedTrackForPlayer(playerId);
-
-  PlayerProvider(this._cacheService, AuthManager authManager) {
-    _authManager = authManager;
-    _localPlayer = LocalPlayerService(authManager);
-  }
-
-  /// Initialize with API reference after connection
-  void initialize(MusicAssistantAPI api, String serverUrl) {
-    _api = api;
-    _serverUrl = serverUrl;
-  }
-
-  /// Set up event listeners after connection
-  Future<void> setupEventListeners() async {
-    if (_api == null) return;
-
-    // Listen to built-in player events
-    _localPlayerEventSubscription?.cancel();
-    _localPlayerEventSubscription = _api!.builtinPlayerEvents.listen(
-      _handleLocalPlayerEvent,
-      onError: (error) {
-        _logger.log('Builtin player event stream error: $error');
-      },
-    );
-
-    // Listen to player_updated events
-    _playerUpdatedEventSubscription?.cancel();
-    _playerUpdatedEventSubscription = _api!.playerUpdatedEvents.listen(
-      _handlePlayerUpdatedEvent,
-      onError: (error) {
-        _logger.log('Player updated event stream error: $error');
-      },
-    );
-  }
-
-  /// Initialize local playback
-  Future<void> initializeLocalPlayback() async {
-    await _localPlayer.initialize();
-    _isLocalPlayerPowered = true;
-
-    // Wire up skip button callbacks
-    audioHandler.onSkipToNext = () {
-      _logger.log('🎵 Notification: Skip to next pressed');
-      nextTrackSelectedPlayer();
-    };
-    audioHandler.onSkipToPrevious = () {
-      _logger.log('🎵 Notification: Skip to previous pressed');
-      previousTrackSelectedPlayer();
-    };
-
-    if (_api != null) {
-      await registerLocalPlayer();
-    }
-  }
-
-  /// Try to adopt an existing ghost player
-  Future<bool> tryAdoptGhostPlayer() async {
-    if (_api == null) return false;
-
-    try {
-      final isFresh = await DeviceIdService.isFreshInstallation();
-      if (!isFresh) {
-        _logger.log('👻 Not a fresh install, skipping ghost adoption');
-        return false;
-      }
-
-      final ownerName = await SettingsService.getOwnerName();
-      if (ownerName == null || ownerName.isEmpty) {
-        _logger.log('👻 No owner name set, cannot adopt ghost player');
-        return false;
-      }
-
-      _logger.log('👻 Fresh install detected, searching for adoptable ghost for "$ownerName"...');
-      final adoptableId = await _api!.findAdoptableGhostPlayer(ownerName);
-      if (adoptableId == null) {
-        _logger.log('👻 No matching ghost player found - will generate new ID');
-        return false;
-      }
-
-      _logger.log('👻 Found adoptable ghost: $adoptableId');
-      await DeviceIdService.adoptPlayerId(adoptableId);
-
-      _logger.log('✅ Successfully adopted ghost player');
-      return true;
-    } catch (e) {
-      _logger.log('⚠️ Ghost adoption failed (non-fatal): $e');
-      return false;
-    }
-  }
-
-  /// Register local player with MA server
-  Future<void> registerLocalPlayer() async {
-    if (_api == null) return;
-
-    if (_registrationInProgress != null) {
-      _logger.log('⏳ Registration already in progress, waiting...');
-      return _registrationInProgress!.future;
-    }
-
-    _registrationInProgress = Completer<void>();
-
-    try {
-      final playerId = await DeviceIdService.getOrCreateDevicePlayerId();
-      _logger.log('🆔 Using player ID: $playerId');
-
-      await SettingsService.setBuiltinPlayerId(playerId);
-      final name = await SettingsService.getLocalPlayerName();
-
-      final existingPlayers = await _api!.getPlayers();
-      final existingPlayer = existingPlayers.where((p) => p.playerId == playerId).firstOrNull;
-
-      if (existingPlayer != null && existingPlayer.available) {
-        _logger.log('✅ Player already registered and available: $playerId');
-        _startReportingLocalPlayerState();
-        if (_registrationInProgress != null && !_registrationInProgress!.isCompleted) {
-          _registrationInProgress!.complete();
-        }
-        _registrationInProgress = null;
-        return;
-      } else if (existingPlayer != null && !existingPlayer.available) {
-        _logger.log('⚠️ Player exists but unavailable (stale), re-registering: $playerId');
-      } else {
-        _logger.log('🆔 Player not found in MA, registering as new');
-      }
-
-      _logger.log('🎵 Registering player with MA: id=$playerId, name=$name');
-      await _api!.registerBuiltinPlayer(playerId, name);
-
-      _logger.log('✅ Player registration complete');
-      _startReportingLocalPlayerState();
-
-      if (_registrationInProgress != null && !_registrationInProgress!.isCompleted) {
-        _registrationInProgress!.complete();
-      }
-      _registrationInProgress = null;
-    } catch (e) {
-      _logger.log('❌ CRITICAL: Player registration failed: $e');
-      if (_registrationInProgress != null && !_registrationInProgress!.isCompleted) {
-        _registrationInProgress!.completeError(e);
-      }
-      _registrationInProgress = null;
-      rethrow;
-    }
-  }
-
-  void _startReportingLocalPlayerState() {
-    _localPlayerStateReportTimer?.cancel();
-    _localPlayerStateReportTimer = Timer.periodic(Timings.localPlayerReportInterval, (_) async {
-      try {
-        await _reportLocalPlayerState();
-      } catch (e) {
-        _logger.log('Error reporting local player state (will retry): $e');
-      }
-    });
-  }
-
-  Future<void> _reportLocalPlayerState() async {
-    if (_api == null) return;
-
-    // Don't try to report state if not authenticated - avoids spamming errors
-    if (_api!.currentConnectionState != MAConnectionState.authenticated) return;
-
-    final playerId = await SettingsService.getBuiltinPlayerId();
-    if (playerId == null) return;
-
-    final isPlaying = _localPlayer.isPlaying;
-    final position = _localPlayer.position.inSeconds;
-    final volume = (_localPlayer.volume * 100).round();
-    final isPaused = !isPlaying && position > 0;
-
-    await _api!.updateBuiltinPlayerState(
-      playerId,
-      powered: _isLocalPlayerPowered,
-      playing: isPlaying,
-      paused: isPaused,
-      position: position,
-      volume: volume,
-      muted: _localPlayer.volume == 0.0,
-    );
-  }
-
-  Future<void> _handleLocalPlayerEvent(Map<String, dynamic> event) async {
-    _logger.log('📥 Local player event received: ${event['type'] ?? event['command']}');
-
-    try {
-      final eventPlayerId = event['player_id'] as String?;
-      final myPlayerId = await SettingsService.getBuiltinPlayerId();
-
-      if (eventPlayerId != null && myPlayerId != null && eventPlayerId != myPlayerId) {
-        _logger.log('🚫 Ignoring event for different player: $eventPlayerId');
-        return;
-      }
-
-      final command = (event['type'] as String?) ?? (event['command'] as String?);
-
-      switch (command) {
-        case 'play_media':
-          final urlPath = event['media_url'] as String? ?? event['url'] as String?;
-
-          if (urlPath != null && _serverUrl != null) {
-            String fullUrl;
-            if (urlPath.startsWith('http')) {
-              fullUrl = urlPath;
-            } else {
-              var baseUrl = _serverUrl!;
-              if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
-                baseUrl = 'https://$baseUrl';
-              }
-              baseUrl = baseUrl.endsWith('/') ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl;
-              final path = urlPath.startsWith('/') ? urlPath : '/$urlPath';
-              fullUrl = '$baseUrl$path';
-            }
-
-            TrackMetadata metadata;
-            if (_pendingTrackMetadata != null) {
-              metadata = _pendingTrackMetadata!;
-            } else {
-              final trackName = event['track_name'] as String? ?? event['name'] as String? ?? 'Unknown Track';
-              final artistName = event['artist_name'] as String? ?? event['artist'] as String? ?? 'Unknown Artist';
-              final albumName = event['album_name'] as String? ?? event['album'] as String?;
-              var artworkUrl = event['image_url'] as String? ?? event['artwork_url'] as String?;
-              final durationSecs = event['duration'] as int?;
-
-              if (artworkUrl != null && artworkUrl.startsWith('http://')) {
-                artworkUrl = artworkUrl.replaceFirst('http://', 'https://');
-              }
-
-              metadata = TrackMetadata(
-                title: trackName,
-                artist: artistName,
-                album: albumName,
-                artworkUrl: artworkUrl,
-                duration: durationSecs != null ? Duration(seconds: durationSecs) : null,
-              );
-            }
-
-            _localPlayer.setCurrentTrackMetadata(metadata);
-            _currentNotificationMetadata = metadata;
-            await _localPlayer.playUrl(fullUrl);
-          }
-          break;
-
-        case 'stop':
-          await _localPlayer.stop();
-          break;
-
-        case 'pause':
-          await _localPlayer.pause();
-          break;
-
-        case 'play':
-          await _localPlayer.play();
-          break;
-
-        case 'seek':
-          final position = event['position'] as int?;
-          if (position != null) {
-            await _localPlayer.seek(Duration(seconds: position));
-          }
-          break;
-
-        case 'volume_set':
-          final volume = event['volume_level'] as int?;
-          if (volume != null) {
-            await _localPlayer.setVolume(volume / 100.0);
-          }
-          break;
-
-        case 'power_on':
-        case 'power_off':
-        case 'power':
-          bool? newPowerState;
-          if (command == 'power_on') {
-            newPowerState = true;
-          } else if (command == 'power_off') {
-            newPowerState = false;
-          } else {
-            newPowerState = event['powered'] as bool?;
-          }
-
-          if (newPowerState != null) {
-            _isLocalPlayerPowered = newPowerState;
-            if (!_isLocalPlayerPowered) {
-              await _localPlayer.stop();
-            }
-          }
-          break;
-      }
-
-      await _reportLocalPlayerState();
-    } catch (e) {
-      _logger.log('Error handling local player event: $e');
-    }
-  }
-
-  Future<void> _handlePlayerUpdatedEvent(Map<String, dynamic> event) async {
-    try {
-      final playerId = event['player_id'] as String?;
-      if (playerId == null) return;
-
-      if (_selectedPlayer != null && playerId == _selectedPlayer!.playerId) {
-        _updatePlayerState();
-      }
-
-      final currentMedia = event['current_media'] as Map<String, dynamic>?;
-      final playerName = event['name'] as String? ?? playerId;
-
-      if (currentMedia != null) {
-        final mediaType = currentMedia['media_type'] as String?;
-        if (mediaType != 'flow_stream') {
-          final durationSecs = (currentMedia['duration'] as num?)?.toInt();
-          final albumName = currentMedia['album'] as String?;
-          final imageUrl = currentMedia['image_url'] as String?;
-
-          Map<String, dynamic>? metadata;
-          if (imageUrl != null && _serverUrl != null) {
-            var finalImageUrl = imageUrl;
-            try {
-              final imgUri = Uri.parse(imageUrl);
-              final queryString = imgUri.query;
-              var baseUrl = _serverUrl!;
-              if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
-                baseUrl = 'https://$baseUrl';
-              }
-              if (baseUrl.endsWith('/')) {
-                baseUrl = baseUrl.substring(0, baseUrl.length - 1);
-              }
-              finalImageUrl = '$baseUrl/imageproxy?$queryString';
-            } catch (e) {
-              // Use original URL
-            }
-            metadata = {
-              'images': [{'path': finalImageUrl, 'provider': 'direct'}]
-            };
-          }
-
-          final trackFromEvent = Track(
-            itemId: currentMedia['queue_item_id'] as String? ?? '',
-            provider: 'library',
-            name: currentMedia['title'] as String? ?? 'Unknown Track',
-            uri: currentMedia['uri'] as String?,
-            duration: durationSecs != null ? Duration(seconds: durationSecs) : null,
-            artists: [Artist(itemId: '', provider: 'library', name: currentMedia['artist'] as String? ?? 'Unknown Artist')],
-            album: albumName != null ? Album(itemId: '', provider: 'library', name: albumName) : null,
-            metadata: metadata,
-          );
-
-          _cacheService.setCachedTrackForPlayer(playerId, trackFromEvent);
-
-          if (_selectedPlayer != null && playerId == _selectedPlayer!.playerId) {
-            _currentTrack = trackFromEvent;
-          }
-
-          _logger.log('📋 Cached track for $playerName: ${trackFromEvent.name}');
-
-          if (imageUrl != null) {
-            final images = metadata?['images'] as List?;
-            if (images != null && images.isNotEmpty) {
-              final imagePath = images[0]['path'] as String?;
-              if (imagePath != null) {
-                _precacheImage(imagePath);
-              }
-            }
-          }
-
-          notifyListeners();
-        }
-      }
-
-      // Handle notification metadata for local player
-      final builtinPlayerId = await SettingsService.getBuiltinPlayerId();
-      if (builtinPlayerId == null || playerId != builtinPlayerId) return;
-
-      if (currentMedia == null) return;
-
-      final title = currentMedia['title'] as String? ?? 'Unknown Track';
-      final artist = currentMedia['artist'] as String? ?? 'Unknown Artist';
-      final album = currentMedia['album'] as String?;
-      var imageUrl = currentMedia['image_url'] as String?;
-      final durationSecs = (currentMedia['duration'] as num?)?.toInt();
-
-      if (imageUrl != null && _serverUrl != null) {
-        try {
-          final imgUri = Uri.parse(imageUrl);
-          final queryString = imgUri.query;
-          var baseUrl = _serverUrl!;
-          if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
-            baseUrl = 'https://$baseUrl';
-          }
-          if (baseUrl.endsWith('/')) {
-            baseUrl = baseUrl.substring(0, baseUrl.length - 1);
-          }
-          imageUrl = '$baseUrl/imageproxy?$queryString';
-        } catch (e) {
-          if (imageUrl != null && imageUrl.startsWith('http://')) {
-            imageUrl = imageUrl.replaceFirst('http://', 'https://');
-          }
-        }
-      }
-
-      final newMetadata = TrackMetadata(
-        title: title,
-        artist: artist,
-        album: album,
-        artworkUrl: imageUrl,
-        duration: durationSecs != null ? Duration(seconds: durationSecs) : null,
-      );
-
-      final mediaType = currentMedia['media_type'] as String?;
-      if (mediaType == 'flow_stream') return;
-
-      _pendingTrackMetadata = newMetadata;
-
-      final notificationNeedsUpdate = _currentNotificationMetadata != null &&
-          (_currentNotificationMetadata!.title != title ||
-           _currentNotificationMetadata!.artist != artist);
-
-      if (_localPlayer.isPlaying && notificationNeedsUpdate) {
-        await _localPlayer.updateNotificationWhilePlaying(newMetadata);
-        _currentNotificationMetadata = newMetadata;
-      }
-    } catch (e) {
-      _logger.log('Error handling player_updated event: $e');
-    }
-  }
-
-  // ============================================================================
-  // PLAYER SELECTION
-  // ============================================================================
-
-  Future<void> loadAndSelectPlayers({bool forceRefresh = false}) async {
-    if (_api == null) return;
-
-    try {
-      if (!forceRefresh && _cacheService.isPlayersCacheValid() && _availablePlayers.isNotEmpty) {
-        return;
-      }
-
-      final allPlayers = await _api!.getPlayers();
-      final builtinPlayerId = await SettingsService.getBuiltinPlayerId();
-
-      _logger.log('🎛️ getPlayers returned ${allPlayers.length} players');
-
-      int filteredCount = 0;
-
-      _availablePlayers = allPlayers.where((player) {
-        final nameLower = player.name.toLowerCase();
-
-        if (nameLower.contains('music assistant mobile')) {
-          filteredCount++;
-          return false;
-        }
-
-        // Filter out MA Web UI's built-in player (provider is 'builtin_player' and starts with 'ma_')
-        // Note: We check BOTH conditions to avoid filtering snapcast/other players that may have 'ma_' prefix
-        if (player.provider == 'builtin_player' && player.playerId.startsWith('ma_')) {
-          filteredCount++;
-          return false;
-        }
-
-        // Also filter "This Device" named players without proper provider
-        if (nameLower == 'this device') {
-          filteredCount++;
-          return false;
-        }
-
-        if (player.playerId.startsWith('ensemble_')) {
-          if (builtinPlayerId == null || player.playerId != builtinPlayerId) {
-            filteredCount++;
-            return false;
-          }
-        }
-
-        if (!player.available) {
-          if (builtinPlayerId != null && player.playerId == builtinPlayerId) {
-            return true;
-          }
-          filteredCount++;
-          return false;
-        }
-
-        return true;
-      }).toList();
-
-      _availablePlayers.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
-      _cacheService.updatePlayersLastFetched();
-
-      _logger.log('🎛️ After filtering: ${_availablePlayers.length} players available');
-
-      if (_availablePlayers.isNotEmpty) {
-        Player? playerToSelect;
-
-        if (_selectedPlayer != null) {
-          final stillAvailable = _availablePlayers.any(
-            (p) => p.playerId == _selectedPlayer!.playerId && p.available,
-          );
-          if (stillAvailable) {
-            playerToSelect = _availablePlayers.firstWhere(
-              (p) => p.playerId == _selectedPlayer!.playerId,
-            );
-          }
-        }
-
-        if (playerToSelect == null) {
-          final lastSelectedPlayerId = await SettingsService.getLastSelectedPlayerId();
-
-          // Priority 1: Last selected player
-          if (lastSelectedPlayerId != null) {
-            playerToSelect = _availablePlayers.cast<Player?>().firstWhere(
-              (p) => p!.playerId == lastSelectedPlayerId && p.available,
-              orElse: () => null,
-            );
-          }
-
-          // Priority 2: Built-in (local) player
-          if (playerToSelect == null && builtinPlayerId != null) {
-            playerToSelect = _availablePlayers.cast<Player?>().firstWhere(
-              (p) => p!.playerId == builtinPlayerId && p.available,
-              orElse: () => null,
-            );
-          }
-
-          // Priority 3: Currently playing player (exclude external sources - not playing MA content)
-          if (playerToSelect == null) {
-            playerToSelect = _availablePlayers.cast<Player?>().firstWhere(
-              (p) => p!.state == 'playing' && p.available && !p.isExternalSource,
-              orElse: () => null,
-            );
-          }
-
-          if (playerToSelect == null) {
-            playerToSelect = _availablePlayers.firstWhere(
-              (p) => p.available,
-              orElse: () => _availablePlayers.first,
-            );
-          }
-        }
-
-        selectPlayer(playerToSelect);
-      }
-
-      _preloadAdjacentPlayers(preloadAll: true);
-    } catch (e) {
-      ErrorHandler.logError('Load and select players', e);
-    }
-  }
-
-  void selectPlayer(Player player, {bool skipNotify = false}) {
-    _selectedPlayer = player;
-    SettingsService.setLastSelectedPlayerId(player.playerId);
-    _startPlayerStatePolling();
-    _preloadAdjacentPlayers();
-
-    if (!skipNotify) {
-      notifyListeners();
-    }
-  }
-
-  Future<void> _preloadAdjacentPlayers({bool preloadAll = false}) async {
-    if (_api == null) return;
-
-    final players = _availablePlayers.where((p) => p.available).toList();
-    if (players.isEmpty) return;
-
-    if (preloadAll) {
-      _logger.log('🖼️ Preloading track info for all ${players.length} players...');
-      await Future.wait(players.map((player) => _preloadPlayerTrack(player)));
-      _logger.log('🖼️ Preloading complete');
-      return;
-    }
-
-    if (_selectedPlayer == null || players.length <= 1) return;
-
-    final currentIndex = players.indexWhere((p) => p.playerId == _selectedPlayer!.playerId);
-    if (currentIndex == -1) return;
-
-    final prevIndex = currentIndex <= 0 ? players.length - 1 : currentIndex - 1;
-    final nextIndex = currentIndex >= players.length - 1 ? 0 : currentIndex + 1;
-
-    final playersToPreload = <Player>{};
-    if (prevIndex != currentIndex) playersToPreload.add(players[prevIndex]);
-    if (nextIndex != currentIndex) playersToPreload.add(players[nextIndex]);
-
-    for (final player in playersToPreload) {
-      _preloadPlayerTrack(player);
-    }
-  }
-
-  Future<void> _preloadPlayerTrack(Player player) async {
-    if (_api == null) return;
-
-    try {
-      if (!player.available || !player.powered) {
-        _cacheService.setCachedTrackForPlayer(player.playerId, null);
-        return;
-      }
-
-      final queue = await _api!.getQueue(player.playerId);
-
-      if (queue != null && queue.currentItem != null) {
-        final track = queue.currentItem!.track;
-        final existingTrack = _cacheService.getCachedTrackForPlayer(player.playerId);
-        final existingHasImage = existingTrack?.metadata?['images'] != null;
-        final newHasImage = track.metadata?['images'] != null;
-
-        if (!existingHasImage || newHasImage) {
-          _cacheService.setCachedTrackForPlayer(player.playerId, track);
-        }
-
-        final artworkUrl512 = _api!.getImageUrl(existingHasImage ? existingTrack! : track, size: 512);
-        if (artworkUrl512 != null) {
-          await _precacheImage(artworkUrl512);
-        }
-      } else {
-        final existingTrack = _cacheService.getCachedTrackForPlayer(player.playerId);
-        if (existingTrack?.metadata?['images'] == null) {
-          _cacheService.setCachedTrackForPlayer(player.playerId, null);
-        }
-      }
-    } catch (e) {
-      _logger.log('Error preloading player track for ${player.name}: $e');
-    }
-  }
-
-  Future<void> _precacheImage(String url) async {
-    try {
-      final imageProvider = NetworkImage(url);
-      final imageStream = imageProvider.resolve(const ImageConfiguration());
-      final completer = Completer<void>();
-      late ImageStreamListener listener;
-
-      listener = ImageStreamListener(
-        (ImageInfo info, bool synchronousCall) {
-          if (!completer.isCompleted) completer.complete();
-          imageStream.removeListener(listener);
-        },
-        onError: (exception, stackTrace) {
-          if (!completer.isCompleted) completer.completeError(exception);
-          imageStream.removeListener(listener);
-        },
-      );
-
-      imageStream.addListener(listener);
-      await completer.future.timeout(const Duration(seconds: 10), onTimeout: () {
-        imageStream.removeListener(listener);
-      });
-    } catch (e) {
-      _logger.log('Image precache failed for $url: $e');
-    }
-  }
-
-  Future<void> preloadAllPlayerTracks() async {
-    if (_api == null) return;
-    final players = _availablePlayers.where((p) => p.available).toList();
-    await Future.wait(players.map((player) => _preloadPlayerTrack(player)));
-  }
-
-  void _startPlayerStatePolling() {
-    _playerStateTimer?.cancel();
-    if (_selectedPlayer == null) return;
-
-    _playerStateTimer = Timer.periodic(Timings.playerPollingInterval, (_) async {
-      try {
-        await _updatePlayerState();
-      } catch (e) {
-        _logger.log('Error updating player state (will retry): $e');
-      }
-    });
-
-    _updatePlayerState();
-  }
-
-  Future<void> _updatePlayerState() async {
-    if (_selectedPlayer == null || _api == null) return;
-
-    try {
-      bool stateChanged = false;
-
-      final allPlayers = await _api!.getPlayers();
-      final updatedPlayer = allPlayers.firstWhere(
-        (p) => p.playerId == _selectedPlayer!.playerId,
-        orElse: () => _selectedPlayer!,
-      );
-
-      _selectedPlayer = updatedPlayer;
-      stateChanged = true;
-
-      final isPlayingOrPaused = _selectedPlayer!.state == 'playing' || _selectedPlayer!.state == 'paused';
-      final isIdleWithContent = _selectedPlayer!.state == 'idle' && _selectedPlayer!.powered;
-      final shouldShowTrack = _selectedPlayer!.available && (isPlayingOrPaused || isIdleWithContent);
-
-      if (!shouldShowTrack) {
-        if (_currentTrack != null) {
-          _currentTrack = null;
-          stateChanged = true;
-        }
-        if (stateChanged) notifyListeners();
-        return;
-      }
-
-      final queue = await _api!.getQueue(_selectedPlayer!.playerId);
-
-      if (queue != null && queue.currentItem != null) {
-        if (_currentTrack == null ||
-            _currentTrack!.uri != queue.currentItem!.track.uri ||
-            _currentTrack!.name != queue.currentItem!.track.name) {
-          _currentTrack = queue.currentItem!.track;
-          stateChanged = true;
-
-          final builtinPlayerId = await SettingsService.getBuiltinPlayerId();
-          if (builtinPlayerId != null && _selectedPlayer!.playerId == builtinPlayerId) {
-            final track = _currentTrack!;
-            final artworkUrl = _api?.getImageUrl(track, size: 512);
-            _localPlayer.updateNotification(
-              id: track.uri ?? track.itemId,
-              title: track.name,
-              artist: track.artistsString,
-              album: track.album?.name,
-              artworkUrl: artworkUrl,
-              duration: track.duration,
-            );
-          }
-        }
-      } else {
-        if (_currentTrack != null) {
-          _currentTrack = null;
-          stateChanged = true;
-        }
-      }
-
-      if (stateChanged) notifyListeners();
-    } catch (e) {
-      _logger.log('❌ Error updating player state: $e');
-    }
-  }
-
-  // ============================================================================
-  // PLAYER CONTROLS
-  // ============================================================================
-
-  Future<void> playPauseSelectedPlayer() async {
-    if (_selectedPlayer == null || _api == null) return;
-
-    if (_selectedPlayer!.isPlaying) {
-      await _api!.pausePlayer(_selectedPlayer!.playerId);
-    } else {
-      await _api!.resumePlayer(_selectedPlayer!.playerId);
-    }
-
-    await refreshPlayers();
-  }
-
-  Future<void> nextTrackSelectedPlayer() async {
-    if (_selectedPlayer == null || _api == null) return;
-    await _api!.nextTrack(_selectedPlayer!.playerId);
-    await Future.delayed(Timings.trackChangeDelay);
-    await _updatePlayerState();
-  }
-
-  Future<void> previousTrackSelectedPlayer() async {
-    if (_selectedPlayer == null || _api == null) return;
-    await _api!.previousTrack(_selectedPlayer!.playerId);
-    await Future.delayed(Timings.trackChangeDelay);
-    await _updatePlayerState();
-  }
-
-  Future<void> refreshPlayers() async {
-    final previousState = _selectedPlayer?.state;
-    final previousVolume = _selectedPlayer?.volumeLevel;
-
-    await loadAndSelectPlayers(forceRefresh: true);
-
-    bool stateChanged = false;
-    if (_selectedPlayer != null && _availablePlayers.isNotEmpty) {
-      try {
-        final updatedPlayer = _availablePlayers.firstWhere(
-          (p) => p.playerId == _selectedPlayer!.playerId,
-        );
-
-        if (updatedPlayer.state != previousState || updatedPlayer.volumeLevel != previousVolume) {
-          stateChanged = true;
-        }
-
-        _selectedPlayer = updatedPlayer;
-      } catch (e) {
-        stateChanged = true;
-      }
-    }
-
-    if (stateChanged) notifyListeners();
-  }
-
-  Future<void> togglePower(String playerId) async {
-    if (_api == null) return;
-
-    try {
-      final localPlayerId = await SettingsService.getBuiltinPlayerId();
-      final isLocalPlayer = localPlayerId != null && playerId == localPlayerId;
-
-      if (isLocalPlayer) {
-        _isLocalPlayerPowered = !_isLocalPlayerPowered;
-        if (!_isLocalPlayerPowered) {
-          await _localPlayer.stop();
-        }
-        await _reportLocalPlayerState();
-        await refreshPlayers();
-      } else {
-        final player = _availablePlayers.firstWhere(
-          (p) => p.playerId == playerId,
-          orElse: () => _selectedPlayer != null && _selectedPlayer!.playerId == playerId
-              ? _selectedPlayer!
-              : throw Exception("Player not found"),
-        );
-
-        await _api!.setPower(playerId, !player.powered);
-        await refreshPlayers();
-      }
-    } catch (e) {
-      ErrorHandler.logError('Toggle power', e);
-    }
-  }
-
-  Future<void> setVolume(String playerId, int volumeLevel) async {
-    if (_api == null) return;
-    try {
-      await _api!.setVolume(playerId, volumeLevel);
-    } catch (e) {
-      ErrorHandler.logError('Set volume', e);
-      rethrow;
-    }
-  }
-
-  Future<void> setMute(String playerId, bool muted) async {
-    if (_api == null) return;
-    try {
-      await _api!.setMute(playerId, muted);
-      await refreshPlayers();
-    } catch (e) {
-      ErrorHandler.logError('Set mute', e);
-      rethrow;
-    }
-  }
-
-  Future<void> seek(String playerId, int position) async {
-    if (_api == null) return;
-    try {
-      await _api!.seek(playerId, position);
-    } catch (e) {
-      ErrorHandler.logError('Seek', e);
-      rethrow;
-    }
-  }
-
-  Future<void> toggleShuffle(String queueId, bool shuffleEnabled) async {
-    if (_api == null) return;
-    try {
-      await _api!.toggleShuffle(queueId, shuffleEnabled);
-    } catch (e) {
-      ErrorHandler.logError('Toggle shuffle', e);
-      rethrow;
-    }
-  }
-
-  Future<void> setRepeatMode(String queueId, String mode) async {
-    if (_api == null) return;
-    try {
-      await _api!.setRepeatMode(queueId, mode);
-    } catch (e) {
-      ErrorHandler.logError('Set repeat mode', e);
-      rethrow;
-    }
-  }
-
-  Future<void> cycleRepeatMode(String queueId, String? currentMode) async {
-    String nextMode;
-    switch (currentMode) {
-      case 'off':
-      case null:
-        nextMode = 'all';
-        break;
-      case 'all':
-        nextMode = 'one';
-        break;
-      case 'one':
-        nextMode = 'off';
-        break;
-      default:
-        nextMode = 'off';
-    }
-    await setRepeatMode(queueId, nextMode);
-  }
-
-  void clearState() {
-    _playerStateTimer?.cancel();
-    _playerStateTimer = null;
-    _localPlayerStateReportTimer?.cancel();
-    _localPlayerEventSubscription?.cancel();
-    _playerUpdatedEventSubscription?.cancel();
-    _availablePlayers = [];
-    _selectedPlayer = null;
-    _currentTrack = null;
-  }
-
-  @override
-  void dispose() {
-    clearState();
-    super.dispose();
-  }
-}
@@ -0,0 +1,129 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+import '../services/debug_logger.dart';
+
+/// Callback type for when sleep timer expires and should pause playback
+typedef OnSleepTimerExpired = void Function();
+
+/// Provider for sleep timer functionality.
+///
+/// Extracted from MusicAssistantProvider to reduce complexity and improve testability.
+/// This provider manages:
+/// - Timed sleep (pause after X minutes)
+/// - End of track sleep (pause when current track ends)
+class SleepTimerProvider with ChangeNotifier {
+  final DebugLogger _logger = DebugLogger();
+
+  Timer? _sleepTimer;
+  DateTime? _sleepTimerEndTime;
+  int? _sleepTimerMinutes; // null = off, -1 = end of track, positive = minutes
+  Timer? _sleepTimerDisplayTimer;
+
+  /// Callback to pause playback when timer expires
+  OnSleepTimerExpired? onExpired;
+
+  // ============================================================================
+  // GETTERS
+  // ============================================================================
+
+  /// Whether a sleep timer is currently active
+  bool get isActive => _sleepTimerMinutes != null;
+
+  /// Current timer setting: null = off, -1 = end of track, positive = minutes
+  int? get minutes => _sleepTimerMinutes;
+
+  /// Time remaining until sleep timer expires (null if end-of-track mode or inactive)
+  Duration? get remaining {
+    if (_sleepTimerEndTime == null) return null;
+    final remaining = _sleepTimerEndTime!.difference(DateTime.now());
+    return remaining.isNegative ? Duration.zero : remaining;
+  }
+
+  // ============================================================================
+  // TIMER CONTROL
+  // ============================================================================
+
+  /// Set sleep timer. Pass null to turn off, -1 for end of track, or minutes.
+  void setTimer(int? minutes) {
+    // Cancel any existing timer
+    _cancelInternal();
+
+    _sleepTimerMinutes = minutes;
+
+    if (minutes == null) {
+      // Timer off
+      _logger.log('😴 Sleep timer: OFF');
+      notifyListeners();
+      return;
+    }
+
+    if (minutes == -1) {
+      // End of track - handled in player state updates
+      _sleepTimerEndTime = null; // No fixed end time
+      _logger.log('😴 Sleep timer: End of track');
+      notifyListeners();
+      return;
+    }
+
+    // Set timer for specified minutes
+    _sleepTimerEndTime = DateTime.now().add(Duration(minutes: minutes));
+    _logger.log('😴 Sleep timer: $minutes minutes (until $_sleepTimerEndTime)');
+
+    // Create the actual timer
+    _sleepTimer = Timer(Duration(minutes: minutes), _onTimerExpired);
+
+    // Start display update timer (every second for countdown)
+    _sleepTimerDisplayTimer = Timer.periodic(const Duration(seconds: 1), (_) {
+      notifyListeners(); // Update UI with remaining time
+    });
+
+    notifyListeners();
+  }
+
+  /// Cancel sleep timer
+  void cancel() {
+    _cancelInternal();
+    _sleepTimerMinutes = null;
+    _sleepTimerEndTime = null;
+    _logger.log('😴 Sleep timer: Cancelled');
+    notifyListeners();
+  }
+
+  void _cancelInternal() {
+    _sleepTimer?.cancel();
+    _sleepTimer = null;
+    _sleepTimerDisplayTimer?.cancel();
+    _sleepTimerDisplayTimer = null;
+  }
+
+  void _onTimerExpired() {
+    _logger.log('😴 Sleep timer expired - pausing playback');
+    _cancelInternal();
+    _sleepTimerMinutes = null;
+    _sleepTimerEndTime = null;
+
+    // Trigger the callback to pause playback
+    onExpired?.call();
+
+    notifyListeners();
+  }
+
+  /// Called when track ends - checks if "end of track" sleep timer is active
+  void checkEndOfTrack() {
+    if (_sleepTimerMinutes == -1) {
+      _logger.log('😴 End of track sleep timer triggered');
+      _sleepTimerMinutes = null;
+
+      // Trigger the callback to pause playback
+      onExpired?.call();
+
+      notifyListeners();
+    }
+  }
+
+  @override
+  void dispose() {
+    _cancelInternal();
+    super.dispose();
+  }
+}
@@ -1,11 +1,12 @@
 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 '../theme/palette_helper.dart';
+import '../widgets/media_context_menu.dart';
 import '../theme/theme_provider.dart';
 import '../services/settings_service.dart';
 import '../services/metadata_service.dart';
@@ -14,6 +15,7 @@ import '../utils/page_transitions.dart';
 import '../constants/hero_tags.dart';
 import '../l10n/app_localizations.dart';
 import 'audiobook_detail_screen.dart';
+import '../widgets/provider_icon.dart';

 class AudiobookAuthorScreen extends StatefulWidget {
  final String authorName;
@@ -118,6 +120,149 @@ 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>(
@@ -150,10 +295,16 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
      },
      child: Scaffold(
        backgroundColor: colorScheme.surface,
-        body: CustomScrollView(
+        body: LayoutBuilder(
+          builder: (context, constraints) {
+            // 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 CustomScrollView(
          slivers: [
            SliverAppBar(
-              expandedHeight: 200,
+              expandedHeight: expandedHeight,
              pinned: true,
              backgroundColor: colorScheme.surface,
              leading: IconButton(
@@ -164,6 +315,49 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
                },
                color: colorScheme.onSurface,
              ),
+              actions: [
+                // Three-dot menu with sort/view options
+                Padding(
+                  padding: const EdgeInsets.only(right: 8),
+                  child: SizedBox(
+                    height: 40,
+                    width: 40,
+                    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: 20,
+                          color: Colors.white70,
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ],
              flexibleSpace: FlexibleSpaceBar(
                background: Column(
                  mainAxisAlignment: MainAxisAlignment.center,
@@ -172,37 +366,41 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
                    Hero(
                      tag: HeroTags.authorImage + widget.authorName + _heroTagSuffix,
                      child: Container(
-                        width: 200,
-                        height: 200,
+                        width: coverSize,
+                        height: coverSize,
                        decoration: BoxDecoration(
                          color: colorScheme.primaryContainer,
                          shape: BoxShape.circle,
                        ),
-                        child: ClipOval(
-                          child: _authorImageUrl != null
-                              ? CachedNetworkImage(
-                                  imageUrl: _authorImageUrl!,
-                                  fit: BoxFit.cover,
-                                  width: 200,
-                                  height: 200,
-                                  fadeInDuration: Duration.zero,
-                                  fadeOutDuration: Duration.zero,
-                                  placeholder: (_, __) => Icon(
-                                    MdiIcons.accountOutline,
-                                    size: 100,
-                                    color: colorScheme.onPrimaryContainer,
+                        child: Stack(
+                          alignment: Alignment.center,
+                          children: [
+                            // Icon always present underneath
+                            Icon(
+                              MdiIcons.accountOutline,
+                              size: coverSize * 0.5,
+                              color: colorScheme.onPrimaryContainer,
+                            ),
+                            // Image covers icon when loaded
+                            if (_authorImageUrl != null)
+                              SizedBox(
+                                width: coverSize,
+                                height: coverSize,
+                                child: ClipOval(
+                                  child: CachedNetworkImage(
+                                    imageUrl: _authorImageUrl!,
+                                    fit: BoxFit.cover,
+                                    width: coverSize,
+                                    height: coverSize,
+                                    memCacheWidth: 256,
+                                    fadeInDuration: Duration.zero,
+                                    fadeOutDuration: Duration.zero,
+                                    placeholder: (_, __) => const SizedBox.shrink(),
+                                    errorWidget: (_, __, ___) => const SizedBox.shrink(),
                                  ),
-                                  errorWidget: (_, __, ___) => Icon(
-                                    MdiIcons.accountOutline,
-                                    size: 100,
-                                    color: colorScheme.onPrimaryContainer,
-                                  ),
-                                )
-                              : Icon(
-                                  MdiIcons.accountOutline,
-                                  size: 100,
-                                  color: colorScheme.onPrimaryContainer,
                                ),
+                              ),
+                          ],
                        ),
                      ),
                    ),
@@ -234,61 +432,24 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
                ),
              ),
            ),
-            // Audiobooks Section Header with controls
+            // Audiobooks Section Header
            SliverToBoxAdapter(
              child: Padding(
-                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),
-                    ),
-                  ],
+                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,
+                  ),
                ),
              ),
            ),
            _buildAudiobookSliver(),
-            const SliverToBoxAdapter(child: SizedBox(height: 140)),
+            SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)),
          ],
+            );
+          },
        ),
      ),
    );
@@ -334,10 +495,31 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
    final textTheme = Theme.of(context).textTheme;
    final heroSuffix = 'author${_heroTagSuffix}';

-    return InkWell(
-      onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
+    // 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,
        children: [
          AspectRatio(
            aspectRatio: 1.0,
@@ -395,6 +577,11 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
                      minHeight: 3,
                    ),
                  ),
+                // Provider icon overlay
+                if (book.providerMappings?.isNotEmpty == true)
+                  ProviderIconOverlay(
+                    domain: book.providerMappings!.first.providerDomain,
+                  ),
              ],
            ),
          ),
@@ -423,7 +610,8 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
              maxLines: 1,
              overflow: TextOverflow.ellipsis,
            ),
-        ],
+          ],
+        ),
      ),
    );
  }
@@ -435,9 +623,30 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
    final textTheme = Theme.of(context).textTheme;
    final heroSuffix = 'author${_heroTagSuffix}';

-    return ListTile(
-      contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-      leading: Hero(
+    // 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(
        tag: HeroTags.audiobookCover + (book.uri ?? book.itemId) + '_$heroSuffix',
        child: ClipRRect(
          borderRadius: BorderRadius.circular(4),
@@ -518,7 +727,8 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
              ),
            )
          : null,
-      onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
+        onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
+      ),
    );
  }

@@ -1,17 +1,21 @@
 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/player_picker_sheet.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';
 import '../services/recently_played_service.dart';
 import '../constants/hero_tags.dart';
 import '../l10n/app_localizations.dart';
+import '../theme/design_tokens.dart';

 class AudiobookDetailScreen extends StatefulWidget {
  final Audiobook audiobook;
@@ -34,6 +38,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
  final _logger = DebugLogger();
  bool _isDescriptionExpanded = false;
  bool _isFavorite = false;
+  bool _isInLibrary = false;
  ColorScheme? _lightColorScheme;
  ColorScheme? _darkColorScheme;
  int? _expandedChapterIndex;
@@ -45,17 +50,24 @@ 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((_) {
-      Future.delayed(const Duration(milliseconds: 350), () {
-        if (mounted) {
-          _extractColors();
-        }
-      });
+      if (mounted) {
+        markDetailScreenEntered(context);
+        _extractColors(); // Extract colors immediately - async so won't block
+      }
      // Load full audiobook details with chapters
      _loadAudiobookDetails();
    });
@@ -106,15 +118,18 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
    if (imageUrl == null) return;

    try {
-      final colorSchemes = await PaletteHelper.extractColorSchemes(
-        CachedNetworkImageProvider(imageUrl),
-      );
+      // Use isolate-based extraction to avoid blocking the main thread
+      final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(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');
@@ -208,16 +223,93 @@ 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>();

-    GlobalPlayerOverlay.hidePlayer();
-
-    showPlayerPickerSheet(
-      context: context,
-      title: S.of(context)!.playOn,
-      players: maProvider.availablePlayers,
-      selectedPlayer: maProvider.selectedPlayer,
+    GlobalPlayerOverlay.showPlayerSelectorForAction(
+      contextHint: S.of(context)!.selectPlayerForAudiobook,
      onPlayerSelected: (player) async {
        maProvider.selectPlayer(player);
        maProvider.setCurrentAudiobook(_audiobook);
@@ -226,9 +318,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
          widget.audiobook,
        );
      },
-    ).whenComplete(() {
-      GlobalPlayerOverlay.showPlayer();
-    });
+    );
  }

  Future<void> _markAsFinished() async {
@@ -504,41 +594,55 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                      tag: HeroTags.audiobookCover + (widget.audiobook.uri ?? widget.audiobook.itemId) + _heroTagSuffix,
                      child: ClipRRect(
                        borderRadius: BorderRadius.circular(8),
-                        child: Container(
+                        child: SizedBox(
                          width: coverSize,
                          height: coverSize,
-                          color: colorScheme.surfaceContainerHighest,
-                          child: imageUrl != null
-                              ? CachedNetworkImage(
-                                  imageUrl: imageUrl,
-                                  fit: BoxFit.cover,
-                                  // Match source memCacheWidth for smooth Hero animation
-                                  memCacheWidth: 256,
-                                  memCacheHeight: 256,
-                                  fadeInDuration: Duration.zero,
-                                  fadeOutDuration: Duration.zero,
-                                  placeholder: (_, __) => Center(
-                                    child: Icon(
-                                      MdiIcons.bookOutline,
-                                      size: coverSize * 0.43,
-                                      color: colorScheme.onSurfaceVariant,
-                                    ),
-                                  ),
-                                  errorWidget: (_, __, ___) => Center(
-                                    child: Icon(
-                                      MdiIcons.bookOutline,
-                                      size: coverSize * 0.43,
-                                      color: colorScheme.onSurfaceVariant,
-                                    ),
-                                  ),
-                                )
-                              : Center(
-                                  child: Icon(
-                                    MdiIcons.bookOutline,
-                                    size: coverSize * 0.43,
-                                    color: colorScheme.onSurfaceVariant,
-                                  ),
+                          child: Stack(
+                            fit: StackFit.expand,
+                            children: [
+                              Container(
+                                color: colorScheme.surfaceContainerHighest,
+                                child: imageUrl != null
+                                    ? CachedNetworkImage(
+                                        imageUrl: imageUrl,
+                                        fit: BoxFit.cover,
+                                        // Match source memCacheWidth for smooth Hero animation
+                                        memCacheWidth: 256,
+                                        memCacheHeight: 256,
+                                        fadeInDuration: Duration.zero,
+                                        fadeOutDuration: Duration.zero,
+                                        placeholder: (_, __) => Center(
+                                          child: Icon(
+                                            MdiIcons.bookOutline,
+                                            size: coverSize * 0.43,
+                                            color: colorScheme.onSurfaceVariant,
+                                          ),
+                                        ),
+                                        errorWidget: (_, __, ___) => Center(
+                                          child: Icon(
+                                            MdiIcons.bookOutline,
+                                            size: coverSize * 0.43,
+                                            color: colorScheme.onSurfaceVariant,
+                                          ),
+                                        ),
+                                      )
+                                    : Center(
+                                        child: Icon(
+                                          MdiIcons.bookOutline,
+                                          size: coverSize * 0.43,
+                                          color: colorScheme.onSurfaceVariant,
+                                        ),
+                                      ),
+                              ),
+                              // Provider icon overlay
+                              if (widget.audiobook.providerMappings?.isNotEmpty == true)
+                                ProviderIconOverlay(
+                                  domain: widget.audiobook.providerMappings!.first.providerDomain,
+                                  size: 24,
+                                  margin: 8,
                                ),
+                            ],
+                          ),
                        ),
                      ),
                    ),
@@ -566,7 +670,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                        ),
                      ),
                    ),
-                    const SizedBox(height: 8),
+                    Spacing.vGap8,

                    // Author
                    Text(
@@ -588,7 +692,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                    ],

                    // Duration & Progress
-                    const SizedBox(height: 16),
+                    Spacing.vGap16,
                    Row(
                      children: [
                        if (book.duration != null) ...[
@@ -644,7 +748,6 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                      children: [
                        // Play/Resume Button
                        Expanded(
-                          flex: 2,
                          child: SizedBox(
                            height: 50,
                            child: ElevatedButton.icon(
@@ -678,26 +781,33 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                                  borderRadius: BorderRadius.circular(12),
                                ),
                              ),
-                              child: const Icon(Icons.replay),
+                              child: const Icon(Icons.replay, size: 25),
                            ),
                          ),
                        ],

                        const SizedBox(width: 12),

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

@@ -712,14 +822,54 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                            style: FilledButton.styleFrom(
                              padding: EdgeInsets.zero,
                              shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(25),
+                                borderRadius: BorderRadius.circular(Radii.xxl),
                              ),
                            ),
                            child: Icon(
-                              _isFavorite ? Icons.favorite : Icons.favorite_border,
+                              Icons.favorite,
+                              size: 25,
                              color: _isFavorite
                                  ? colorScheme.error
-                                  : colorScheme.onSurfaceVariant,
+                                  : 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,
+                              ),
                            ),
                          ),
                        ),
@@ -736,7 +886,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                          fontWeight: FontWeight.bold,
                        ),
                      ),
-                      const SizedBox(height: 8),
+                      Spacing.vGap8,
                      InkWell(
                        onTap: () {
                          setState(() {
@@ -767,7 +917,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
                        fontWeight: FontWeight.bold,
                      ),
                    ),
-                    const SizedBox(height: 8),
+                    Spacing.vGap8,
                  ],
                ),
              ),
@@ -777,7 +927,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
            // Use MA chapters if available, otherwise use ABS chapters
            ..._buildChapterSection(book, colorScheme, textTheme),

-            const SliverToBoxAdapter(child: SizedBox(height: 140)),
+            SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)),
          ],
        );
          },
@@ -6,6 +6,7 @@ import 'package:palette_generator/palette_generator.dart';
 import '../models/media_item.dart';
 import '../providers/music_assistant_provider.dart';
 import '../widgets/global_player_overlay.dart' show BottomSpacing;
+import '../widgets/provider_icon.dart';
 import '../services/settings_service.dart';
 import '../services/debug_logger.dart';
 import '../utils/page_transitions.dart';
@@ -270,7 +271,8 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
  Widget build(BuildContext context) {
    final colorScheme = Theme.of(context).colorScheme;
    final textTheme = Theme.of(context).textTheme;
-    final maProvider = context.watch<MusicAssistantProvider>();
+    // Use read since we only need the provider for non-reactive operations (getImageUrl)
+    final maProvider = context.read<MusicAssistantProvider>();
    final l10n = S.of(context)!;

    return Scaffold(
@@ -690,6 +692,11 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
                    ),
                  ),
                ),
+                // Provider icon overlay
+                if (book.providerMappings?.isNotEmpty == true)
+                  ProviderIconOverlay(
+                    domain: book.providerMappings!.first.providerDomain,
+                  ),
                // Progress indicator
                if (book.progress > 0)
                  Positioned(
@@ -748,45 +755,55 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
        tag: HeroTags.audiobookCover + (book.uri ?? book.itemId) + '_$heroSuffix',
        child: ClipRRect(
          borderRadius: BorderRadius.circular(4),
-          child: Stack(
-            children: [
-              Container(
-                width: 56,
-                height: 56,
-                color: colorScheme.surfaceContainerHighest,
-                child: imageUrl != null
-                    ? CachedNetworkImage(
-                        imageUrl: imageUrl,
-                        fit: BoxFit.cover,
-                        fadeInDuration: Duration.zero,
-                        fadeOutDuration: Duration.zero,
-                        placeholder: (_, __) => Icon(
+          child: SizedBox(
+            width: 56,
+            height: 56,
+            child: Stack(
+              children: [
+                Container(
+                  width: 56,
+                  height: 56,
+                  color: colorScheme.surfaceContainerHighest,
+                  child: imageUrl != null
+                      ? CachedNetworkImage(
+                          imageUrl: imageUrl,
+                          fit: BoxFit.cover,
+                          fadeInDuration: Duration.zero,
+                          fadeOutDuration: Duration.zero,
+                          placeholder: (_, __) => Icon(
+                            MdiIcons.bookOutline,
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                          errorWidget: (_, __, ___) => Icon(
+                            MdiIcons.bookOutline,
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                        )
+                      : Icon(
                          MdiIcons.bookOutline,
                          color: colorScheme.onSurfaceVariant,
                        ),
-                        errorWidget: (_, __, ___) => Icon(
-                          MdiIcons.bookOutline,
-                          color: colorScheme.onSurfaceVariant,
-                        ),
-                      )
-                    : Icon(
-                        MdiIcons.bookOutline,
-                        color: colorScheme.onSurfaceVariant,
-                      ),
-              ),
-              if (book.progress > 0)
-                Positioned(
-                  bottom: 0,
-                  left: 0,
-                  right: 0,
-                  child: LinearProgressIndicator(
-                    value: book.progress,
-                    backgroundColor: Colors.black54,
-                    valueColor: AlwaysStoppedAnimation<Color>(colorScheme.primary),
-                    minHeight: 2,
-                  ),
                ),
-            ],
+                // Provider icon overlay
+                if (book.providerMappings?.isNotEmpty == true)
+                  ProviderIconOverlay(
+                    domain: book.providerMappings!.first.providerDomain,
+                    size: 16,
+                  ),
+                if (book.progress > 0)
+                  Positioned(
+                    bottom: 0,
+                    left: 0,
+                    right: 0,
+                    child: LinearProgressIndicator(
+                      value: book.progress,
+                      backgroundColor: Colors.black54,
+                      valueColor: AlwaysStoppedAnimation<Color>(colorScheme.primary),
+                      minHeight: 2,
+                    ),
+                  ),
+              ],
+            ),
          ),
        ),
      ),
@@ -68,6 +68,12 @@ class _HomeScreenState extends State<HomeScreen> {
              return;
            }

+            // If queue panel is open, close it first (before collapsing player)
+            if (GlobalPlayerOverlay.isQueuePanelOpen) {
+              GlobalPlayerOverlay.closeQueuePanel();
+              return;
+            }
+
            // If global player is expanded, collapse it first
            if (GlobalPlayerOverlay.isPlayerExpanded) {
              GlobalPlayerOverlay.collapsePlayer();
@@ -4,8 +4,12 @@ import 'package:cached_network_image/cached_network_image.dart';
 import '../providers/music_assistant_provider.dart';
 import '../models/media_item.dart';
 import '../widgets/common/empty_state.dart';
+import '../constants/hero_tags.dart';
+import '../theme/theme_provider.dart';
+import '../utils/page_transitions.dart';
 import 'playlist_details_screen.dart';
 import '../l10n/app_localizations.dart';
+import '../theme/design_tokens.dart';

 class LibraryPlaylistsScreen extends StatefulWidget {
  const LibraryPlaylistsScreen({super.key});
@@ -39,7 +43,6 @@ 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;

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

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

    // Show cached data immediately if available, even while loading
@@ -104,34 +109,55 @@ class _LibraryPlaylistsScreenState extends State<LibraryPlaylistsScreen> {
    final colorScheme = Theme.of(context).colorScheme;
    final textTheme = Theme.of(context).textTheme;

+    // Unique suffix for this context to avoid hero tag conflicts
+    const heroSuffix = '_playlists';
+
    return RepaintBoundary(
      child: ListTile(
        key: ValueKey(playlist.itemId),
-        leading: Container(
-          width: 48,
-          height: 48,
-          decoration: BoxDecoration(
-            color: colorScheme.surfaceVariant,
+        leading: Hero(
+          tag: HeroTags.playlistCover + (playlist.uri ?? playlist.itemId) + heroSuffix,
+          child: ClipRRect(
            borderRadius: BorderRadius.circular(8),
-            image: imageUrl != null
-                ? DecorationImage(
-                    image: CachedNetworkImageProvider(imageUrl),
-                    fit: BoxFit.cover,
-                  )
-                : null,
+            child: Container(
+              width: 48,
+              height: 48,
+              color: colorScheme.surfaceContainerHighest,
+              child: imageUrl != null
+                  ? CachedNetworkImage(
+                      imageUrl: imageUrl,
+                      fit: BoxFit.cover,
+                      memCacheWidth: 96,
+                      memCacheHeight: 96,
+                      fadeInDuration: Duration.zero,
+                      fadeOutDuration: Duration.zero,
+                      placeholder: (_, __) => const SizedBox(),
+                      errorWidget: (_, __, ___) => Icon(
+                        Icons.playlist_play_rounded,
+                        color: colorScheme.onSurfaceVariant,
+                      ),
+                    )
+                  : Icon(
+                      Icons.playlist_play_rounded,
+                      color: colorScheme.onSurfaceVariant,
+                    ),
+            ),
          ),
-          child: imageUrl == null
-              ? Icon(Icons.playlist_play_rounded, color: colorScheme.onSurfaceVariant)
-              : null,
        ),
-        title: Text(
-          playlist.name,
-          style: textTheme.titleMedium?.copyWith(
-            color: colorScheme.onSurface,
-            fontWeight: FontWeight.w500,
+        title: Hero(
+          tag: HeroTags.playlistTitle + (playlist.uri ?? playlist.itemId) + heroSuffix,
+          child: Material(
+            color: Colors.transparent,
+            child: Text(
+              playlist.name,
+              style: textTheme.titleMedium?.copyWith(
+                color: colorScheme.onSurface,
+                fontWeight: FontWeight.w500,
+              ),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),
          ),
-          maxLines: 1,
-          overflow: TextOverflow.ellipsis,
        ),
        subtitle: Text(
          playlist.trackCount != null
@@ -144,16 +170,17 @@ class _LibraryPlaylistsScreenState extends State<LibraryPlaylistsScreen> {
          overflow: TextOverflow.ellipsis,
        ),
        trailing: playlist.favorite == true
-            ? const Icon(Icons.favorite, color: Colors.red, size: 20)
+            ? const Icon(Icons.favorite, color: StatusColors.favorite, size: 20)
            : null,
        onTap: () {
+          updateAdaptiveColorsFromImage(context, imageUrl);
          Navigator.push(
            context,
-            MaterialPageRoute(
-              builder: (context) => PlaylistDetailsScreen(
+            FadeSlidePageRoute(
+              child: PlaylistDetailsScreen(
                playlist: playlist,
-                provider: playlist.provider,
-                itemId: playlist.itemId,
+                heroTagSuffix: 'playlists',
+                initialImageUrl: imageUrl,
              ),
            ),
          );
@@ -11,7 +11,6 @@ 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;

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

-  Widget _buildTracksList(
-      BuildContext context, MusicAssistantProvider 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),
+    );
    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 (provider.tracks.isEmpty && provider.isLoading) {
+    if (tracks.isEmpty && isLoading) {
      return Center(
        child: CircularProgressIndicator(color: colorScheme.primary),
      );
    }

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

    return ListView.builder(
-      itemCount: provider.tracks.length,
+      itemCount: 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 = provider.tracks[index];
-        return _buildTrackTile(context, track, provider, index);
+        final track = tracks[index] as Track;
+        return _buildTrackTile(context, track, index);
      },
    );
  }
@@ -70,9 +75,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;
@@ -4,7 +4,6 @@ import '../providers/music_assistant_provider.dart';
 import '../services/settings_service.dart';
 import '../services/database_service.dart';
 import '../services/profile_service.dart';
-import '../services/auth/auth_strategy.dart';
 import '../services/debug_logger.dart';
 import '../widgets/debug/debug_console.dart';
 import '../l10n/app_localizations.dart';
@@ -19,260 +18,91 @@ class LoginScreen extends StatefulWidget {

 class _LoginScreenState extends State<LoginScreen> {
  final TextEditingController _serverUrlController = TextEditingController();
-  final TextEditingController _ownerNameController = TextEditingController();
-  final TextEditingController _portController = TextEditingController();
-  final TextEditingController _authServerUrlController = TextEditingController(); // For separate auth server (Authelia)
  final TextEditingController _usernameController = TextEditingController();
  final TextEditingController _passwordController = TextEditingController();
  final FocusNode _usernameFocusNode = FocusNode();
+  final _logger = DebugLogger();

  bool _isConnecting = false;
-  bool _isDetectingAuth = false;
-  AuthStrategy? _detectedAuthStrategy;
-  String? _detectedAuthType;
  String? _error;
  bool _showDebug = false;
-  List<String> _debugLogs = [];
-  String? _resolvedServerUrl; // The actual URL after fallback (e.g., HTTP if HTTPS failed)
-  bool _usedHttpFallback = false; // True if HTTPS failed and we fell back to HTTP

  @override
  void initState() {
    super.initState();
-    _loadSavedSettings();
-  }
-
-  Future<void> _loadSavedSettings() async {
-    final savedPort = await SettingsService.getWebSocketPort();
-    final savedAuthServerUrl = await SettingsService.getAuthServerUrl();
-    final savedOwnerName = await SettingsService.getOwnerName();
-
-    if (savedPort != null) {
-      setState(() {
-        _portController.text = savedPort.toString();
-      });
-    }
-
-    if (savedAuthServerUrl != null) {
-      setState(() {
-        _authServerUrlController.text = savedAuthServerUrl;
-      });
-    }
-
-    if (savedOwnerName != null) {
-      setState(() {
-        _ownerNameController.text = savedOwnerName;
-      });
-    }
  }

  @override
  void dispose() {
    _serverUrlController.dispose();
-    _ownerNameController.dispose();
-    _portController.dispose();
-    _authServerUrlController.dispose();
    _usernameController.dispose();
    _passwordController.dispose();
    _usernameFocusNode.dispose();
    super.dispose();
  }

-  String _normalizeServerUrl(String url) {
-    // Remove any trailing slashes
-    url = url.trim();
+  /// Normalize server URL and add default port for local IPs
+  String _buildServerUrl(String input) {
+    var url = input.trim();
+
+    // Remove trailing slashes
    while (url.endsWith('/')) {
      url = url.substring(0, url.length - 1);
    }

-    // If URL already has a protocol, return it
-    if (url.startsWith('http://') || url.startsWith('https://')) {
-      return url;
-    }
-
-    // If it's an IP address or localhost, default to http://
-    if (url.startsWith('192.') ||
-        url.startsWith('10.') ||
-        url.startsWith('172.') ||
-        url == 'localhost' ||
-        url.startsWith('127.')) {
-      return 'http://$url';
-    }
-
-    // Tailscale URLs (*.ts.net) - default to http:// since VPN tunnel is already encrypted
-    if (url.endsWith('.ts.net') || url.contains('.ts.net:')) {
-      return 'http://$url';
-    }
-
-    // For domain names, default to https://
-    return 'https://$url';
-  }
-
-  /// Check if the URL is using HTTP (for security warning display)
-  bool _isHttpConnection(String url) {
-    final normalized = _normalizeServerUrl(url);
-    return normalized.startsWith('http://') && !normalized.startsWith('https://');
-  }
-
-  /// Check if the URL is a Tailscale URL (safe for HTTP)
-  bool _isTailscaleUrl(String url) {
-    final normalized = url.trim().toLowerCase();
-    return normalized.contains('.ts.net');
-  }
-
-  String _buildServerUrl() {
-    // Normalize the base URL
-    var url = _normalizeServerUrl(_serverUrlController.text.trim());
-
-    // Parse to check if port is already included
-    final uri = Uri.parse(url);
-
-    // Get port from field
-    final portText = _portController.text.trim();
-    if (portText.isEmpty) {
-      return url; // No port specified, use URL as-is
-    }
-
-    final port = int.tryParse(portText);
-    if (port == null) {
-      return url; // Invalid port, use URL as-is
-    }
-
-    // Skip adding port if it's the default for the scheme
-    final isDefaultPort = (uri.scheme == 'https' && port == 443) ||
-                          (uri.scheme == 'http' && port == 80);
-
-    if (isDefaultPort) {
-      return url; // Don't add default ports
-    }
-
-    // Build URL with custom port
-    return '${uri.scheme}://${uri.host}:$port';
-  }
-
-  void _addDebugLog(String message) {
-    setState(() {
-      _debugLogs.add('[${DateTime.now().toString().substring(11, 19)}] $message');
-    });
-  }
-
-  Future<void> _detectAuthRequirements() async {
-    if (_serverUrlController.text.trim().isEmpty) {
-      setState(() {
-        _error = S.of(context)!.pleaseEnterServerAddress;
-      });
-      return;
-    }
-
-    setState(() {
-      _isDetectingAuth = true;
-      _error = null;
-      _detectedAuthStrategy = null;
-      _detectedAuthType = null;
-      _resolvedServerUrl = null;
-      _usedHttpFallback = false;
-      _debugLogs.clear();
-    });
-
-    try {
-      final serverUrl = _buildServerUrl();
-      _addDebugLog('Built server URL: $serverUrl');
-
-      final provider = context.read<MusicAssistantProvider>();
-
-      _addDebugLog('Starting auth detection...');
-      // Auto-detect authentication requirements
-      final strategy = await provider.authManager.detectAuthStrategy(serverUrl);
-
-      // Check if auth manager used a different URL (e.g., HTTP fallback)
-      final resolvedUrl = provider.authManager.lastSuccessfulUrl;
-      if (resolvedUrl != null && resolvedUrl != serverUrl) {
-        _addDebugLog('URL resolved via fallback: $resolvedUrl');
-        _usedHttpFallback = serverUrl.startsWith('https://') && resolvedUrl.startsWith('http://');
-      }
-
-      _addDebugLog('Detection complete. Strategy: ${strategy?.name ?? 'null'}');
-
-      if (strategy == null) {
-        setState(() {
-          _error = S.of(context)!.cannotDetermineAuth;
-          _isDetectingAuth = false;
-        });
-        return;
-      }
-
-      setState(() {
-        _detectedAuthStrategy = strategy;
-        _detectedAuthType = _getAuthTypeName(strategy.name);
-        _resolvedServerUrl = resolvedUrl;
-        _isDetectingAuth = false;
-      });
-
-      // If no auth required, connect immediately
-      if (strategy.name == 'none') {
-        await _connect();
+    // Add protocol if missing
+    if (!url.startsWith('http://') && !url.startsWith('https://')) {
+      if (_isLocalAddress(url)) {
+        url = 'http://$url';
+      } else if (url.endsWith('.ts.net') || url.contains('.ts.net:')) {
+        // Tailscale - use http since VPN is encrypted
+        url = 'http://$url';
      } else {
-        // Auth required - focus username field after a brief delay
-        // to allow the new fields to build
-        Future.delayed(const Duration(milliseconds: 100), () {
-          if (mounted) {
-            _usernameFocusNode.requestFocus();
-          }
-        });
+        url = 'https://$url';
      }
-    } catch (e) {
-      setState(() {
-        _error = 'Auth detection failed: ${e.toString()}';
-        _isDetectingAuth = false;
-      });
    }
+
+    // Add default port 8095 for local IPs without a port
+    final uri = Uri.parse(url);
+    if (!uri.hasPort && _isLocalAddress(uri.host)) {
+      return '${uri.scheme}://${uri.host}:8095';
+    }
+
+    return url;
  }

-  String _getAuthTypeName(String strategyName) {
-    switch (strategyName) {
-      case 'none':
-        return S.of(context)!.noAuthentication;
-      case 'basic':
-        return S.of(context)!.httpBasicAuth;
-      case 'authelia':
-        return S.of(context)!.authelia;
-      case 'music_assistant':
-        return S.of(context)!.musicAssistantLogin;
-      default:
-        return 'Unknown';
-    }
-  }
-
-  IconData _getAuthIcon(String strategyName) {
-    switch (strategyName) {
-      case 'none':
-        return Icons.lock_open_rounded;
-      case 'basic':
-        return Icons.vpn_key_rounded;
-      case 'authelia':
-        return Icons.shield_rounded;
-      case 'music_assistant':
-        return Icons.music_note_rounded;
-      default:
-        return Icons.security_rounded;
-    }
+  /// Check if address is local/private
+  bool _isLocalAddress(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.');
  }

  Future<void> _connect() async {
-    if (_serverUrlController.text.trim().isEmpty) {
-      setState(() {
-        _error = S.of(context)!.pleaseEnterServerAddress;
-      });
+    final serverInput = _serverUrlController.text.trim();
+    final username = _usernameController.text.trim();
+    final password = _passwordController.text.trim();
+
+    // Validate inputs
+    if (serverInput.isEmpty) {
+      setState(() => _error = S.of(context)!.pleaseEnterServerAddress);
      return;
    }
-
-    // Validate owner name - only required if NOT using MA auth
-    // (MA auth will get display_name from user profile after login)
-    final isMaAuth = _detectedAuthStrategy?.name == 'music_assistant';
-    if (!isMaAuth && _ownerNameController.text.trim().isEmpty) {
-      setState(() {
-        _error = S.of(context)!.pleaseEnterName;
-      });
+    if (username.isEmpty) {
+      setState(() => _error = S.of(context)!.pleaseEnterCredentials);
+      _usernameFocusNode.requestFocus();
+      return;
+    }
+    if (password.isEmpty) {
+      setState(() => _error = S.of(context)!.pleaseEnterCredentials);
      return;
    }

@@ -282,173 +112,73 @@ class _LoginScreenState extends State<LoginScreen> {
    });

    try {
-      // Use the resolved URL if available (e.g., from HTTP fallback), otherwise build it
-      final serverUrl = _resolvedServerUrl ?? _buildServerUrl();
-      _addDebugLog('Using server URL for connection: $serverUrl');
-      final port = _portController.text.trim();
-
-      // Validate port (if provided)
-      int? portNum;
-      if (port.isNotEmpty) {
-        portNum = int.tryParse(port);
-        if (portNum == null || portNum < 1 || portNum > 65535) {
-          setState(() {
-            _error = S.of(context)!.pleaseEnterValidPort;
-            _isConnecting = false;
-          });
-          return;
-        }
-      }
-
-      // Save owner name (if provided) and port to settings
-      // For MA auth, the owner name will be set from user profile after login
-      if (!isMaAuth && _ownerNameController.text.trim().isNotEmpty) {
-        final ownerName = _ownerNameController.text.trim();
-        await SettingsService.setOwnerName(ownerName);
-
-        // Create/activate profile in local database for manual name entry
-        if (DatabaseService.instance.isInitialized) {
-          await ProfileService.instance.onManualNameEntered(ownerName);
-        }
-      }
-      await SettingsService.setWebSocketPort(portNum);
+      final serverUrl = _buildServerUrl(serverInput);
+      _logger.log('Connecting to: $serverUrl');

      final provider = context.read<MusicAssistantProvider>();

-      // Handle authentication based on detected strategy
-      // Note: isMaAuth is already defined earlier in this method
-
-      if (_detectedAuthStrategy != null && _detectedAuthStrategy!.name != 'none' && !isMaAuth) {
-        // Pre-connect auth (Authelia, Basic Auth)
-        final username = _usernameController.text.trim();
-        final password = _passwordController.text.trim();
-
-        if (username.isEmpty || password.isEmpty) {
-          setState(() {
-            _error = S.of(context)!.pleaseEnterCredentials;
-            _isConnecting = false;
-          });
-          return;
-        }
-
-        // Get auth server URL (if provided for Authelia)
-        String? authServerUrl;
-        if (_detectedAuthStrategy!.name == 'authelia') {
-          final authUrl = _authServerUrlController.text.trim();
-          if (authUrl.isNotEmpty) {
-            authServerUrl = _normalizeServerUrl(authUrl);
-          }
-        }
-
-        // Attempt login with detected strategy
-        final success = await provider.authManager.login(
-          serverUrl,
-          username,
-          password,
-          _detectedAuthStrategy!,
-          authServerUrl: authServerUrl,
-        );
-
-        if (!success) {
-          setState(() {
-            _error = S.of(context)!.authFailed;
-            _isConnecting = false;
-          });
-          return;
-        }
-
-        // Save credentials for future auto-login
-        await SettingsService.setUsername(username);
-        await SettingsService.setPassword(password);
-
-        // Save auth server URL if provided
-        if (authServerUrl != null && authServerUrl.isNotEmpty) {
-          await SettingsService.setAuthServerUrl(authServerUrl);
-        } else {
-          await SettingsService.setAuthServerUrl(null);
-        }
-
-        // Save auth credentials to settings
-        final serialized = provider.authManager.serializeCredentials();
-        if (serialized != null) {
-          await SettingsService.setAuthCredentials(serialized);
-        }
-      }
-
      // Connect to server
      await provider.connectToServer(serverUrl);

-      // Post-connect auth (Music Assistant native auth)
-      if (isMaAuth) {
-        final username = _usernameController.text.trim();
-        final password = _passwordController.text.trim();
+      // Authenticate with MA
+      _logger.log('Authenticating with Music Assistant...');

-        if (username.isEmpty || password.isEmpty) {
+      // Check if we have a stored MA token first
+      final storedToken = await SettingsService.getMaAuthToken();
+      bool authSuccess = false;
+
+      if (storedToken != null && provider.api != null) {
+        _logger.log('Trying stored MA token...');
+        authSuccess = await provider.api!.authenticateWithToken(storedToken);
+      }
+
+      if (!authSuccess) {
+        _logger.log('Logging in with credentials...');
+        final accessToken = await provider.api?.loginWithCredentials(username, password);
+
+        if (accessToken == null) {
          setState(() {
-            _error = S.of(context)!.pleaseEnterCredentials;
+            _error = S.of(context)!.maLoginFailed;
            _isConnecting = false;
          });
          return;
        }

-        _addDebugLog('Authenticating with Music Assistant...');
+        // Try to create a long-lived token for future use
+        final longLivedToken = await provider.api?.createLongLivedToken();
+        final tokenToStore = longLivedToken ?? accessToken;

-        // Check if we have a stored MA token first
-        final storedToken = await SettingsService.getMaAuthToken();
-        bool authSuccess = false;
-
-        if (storedToken != null && provider.api != null) {
-          _addDebugLog('Trying stored MA token...');
-          authSuccess = await provider.api!.authenticateWithToken(storedToken);
-        }
-
-        if (!authSuccess) {
-          _addDebugLog('Logging in with credentials...');
-          // Login with credentials over WebSocket
-          final accessToken = await provider.api?.loginWithCredentials(username, password);
-
-          if (accessToken == null) {
-            setState(() {
-              _error = S.of(context)!.maLoginFailed;
-              _isConnecting = false;
-            });
-            return;
-          }
-
-          // Try to create a long-lived token for future use
-          final longLivedToken = await provider.api?.createLongLivedToken();
-          final tokenToStore = longLivedToken ?? accessToken;
-
-          // Save the token for future auto-login
-          await SettingsService.setMaAuthToken(tokenToStore);
-          _addDebugLog('MA token saved for future logins');
-        }
-
-        // Save credentials for future auto-login
-        await SettingsService.setUsername(username);
-        await SettingsService.setPassword(password);
-
-        // Save auth strategy info
-        await SettingsService.setAuthCredentials({
-          'strategy': 'music_assistant',
-          'data': {'username': username},
-        });
+        // Save the token for future auto-login
+        await SettingsService.setMaAuthToken(tokenToStore);
+        _logger.log('MA token saved for future logins');
      }

-      // Wait for connection and authentication to complete
-      // MA auth happens asynchronously after connect, so we need to wait longer
+      // Save credentials
+      await SettingsService.setUsername(username);
+      await SettingsService.setPassword(password);
+      await SettingsService.setServerUrl(serverUrl);
+
+      // Save auth credentials to settings
+      await SettingsService.setAuthCredentials({
+        'strategy': 'music_assistant',
+        'data': {'username': username},
+      });
+
+      // Set owner name from username for profile
+      if (DatabaseService.instance.isInitialized) {
+        await ProfileService.instance.onManualNameEntered(username);
+      }
+
+      // Wait for connection to complete
      for (int i = 0; i < 10; i++) {
        await Future.delayed(const Duration(milliseconds: 500));
        if (provider.isConnected) break;
      }

      if (provider.isConnected) {
-        // For first-time users, wait for player selection so the welcome
-        // overlay can appear immediately without home screen flash.
-        // This matches the logic in AppStartup._checkAndConnect().
+        // First-time user: wait for player selection
        final hasCompletedOnboarding = await SettingsService.getHasCompletedOnboarding();
        if (!hasCompletedOnboarding) {
-          // First-time user: wait for connection + player selection
          for (int i = 0; i < 20; i++) {
            await Future.delayed(const Duration(milliseconds: 250));
            if (provider.selectedPlayer != null) break;
@@ -457,7 +187,6 @@ class _LoginScreenState extends State<LoginScreen> {

        // Navigate to home screen
        if (mounted) {
-          // Ensure keyboard is closed before navigating
          FocusScope.of(context).unfocus();
          Navigator.of(context).pushReplacement(
            MaterialPageRoute(builder: (context) => const HomeScreen()),
@@ -470,6 +199,7 @@ class _LoginScreenState extends State<LoginScreen> {
        });
      }
    } catch (e) {
+      _logger.log('Connection error: $e');
      setState(() {
        _error = 'Connection failed: ${e.toString()}';
        _isConnecting = false;
@@ -482,9 +212,6 @@ class _LoginScreenState extends State<LoginScreen> {
    final colorScheme = Theme.of(context).colorScheme;
    final textTheme = Theme.of(context).textTheme;

-    // Determine if we need auth fields
-    final needsAuth = _detectedAuthStrategy != null && _detectedAuthStrategy!.name != 'none';
-
    return Scaffold(
      backgroundColor: colorScheme.background,
      body: SafeArea(
@@ -538,76 +265,29 @@ class _LoginScreenState extends State<LoginScreen> {
                    color: colorScheme.onSurface.withOpacity(0.54),
                  ),
                ),
-                enabled: !_isConnecting && !_isDetectingAuth,
+                enabled: !_isConnecting,
                keyboardType: TextInputType.url,
                textInputAction: TextInputAction.next,
              ),

              const SizedBox(height: 24),

-              // Your Name - only show AFTER auth detection AND only for non-MA auth
-              // (MA auth gets display_name from user profile automatically)
-              // Show for: 'none' (no auth), 'authelia', 'basic_auth', etc.
-              // Hide for: 'music_assistant' (gets name from profile)
-              if (_detectedAuthStrategy != null &&
-                  _detectedAuthStrategy!.name != 'music_assistant') ...[
-                Text(
-                  S.of(context)!.yourName,
-                  style: textTheme.titleMedium?.copyWith(
-                    color: colorScheme.onBackground,
-                    fontWeight: FontWeight.w500,
-                  ),
-                ),
-                const SizedBox(height: 12),
-
-                TextField(
-                  controller: _ownerNameController,
-                  style: TextStyle(color: colorScheme.onSurface),
-                  decoration: InputDecoration(
-                    hintText: S.of(context)!.yourFirstName,
-                    hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
-                    filled: true,
-                    fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(12),
-                      borderSide: BorderSide.none,
-                    ),
-                    prefixIcon: Icon(
-                      Icons.person_rounded,
-                      color: colorScheme.onSurface.withOpacity(0.54),
-                    ),
-                  ),
-                  enabled: !_isConnecting && !_isDetectingAuth,
-                  keyboardType: TextInputType.name,
-                  textInputAction: TextInputAction.next,
-                ),
-
-                const SizedBox(height: 24),
-              ],
-
-              // Port
+              // Username
              Text(
-                S.of(context)!.portOptional,
+                S.of(context)!.username,
                style: textTheme.titleMedium?.copyWith(
                  color: colorScheme.onBackground,
                  fontWeight: FontWeight.w500,
                ),
              ),
-              const SizedBox(height: 8),
-              Text(
-                S.of(context)!.portDescription,
-                style: TextStyle(
-                  color: colorScheme.onBackground.withOpacity(0.6),
-                  fontSize: 12,
-                ),
-              ),
              const SizedBox(height: 12),

              TextField(
-                controller: _portController,
+                controller: _usernameController,
+                focusNode: _usernameFocusNode,
                style: TextStyle(color: colorScheme.onSurface),
                decoration: InputDecoration(
-                  hintText: S.of(context)!.portHint,
+                  hintText: S.of(context)!.username,
                  hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
                  filled: true,
                  fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
@@ -616,248 +296,50 @@ class _LoginScreenState extends State<LoginScreen> {
                    borderSide: BorderSide.none,
                  ),
                  prefixIcon: Icon(
-                    Icons.settings_ethernet_rounded,
+                    Icons.person_rounded,
                    color: colorScheme.onSurface.withOpacity(0.54),
                  ),
                ),
-                enabled: !_isConnecting && !_isDetectingAuth,
-                keyboardType: TextInputType.number,
-                textInputAction: needsAuth ? TextInputAction.next : TextInputAction.done,
-                onSubmitted: (_) => needsAuth ? null : _detectedAuthStrategy == null ? _detectAuthRequirements() : _connect(),
+                enabled: !_isConnecting,
+                textInputAction: TextInputAction.next,
              ),

              const SizedBox(height: 24),

-              // Detected auth method indicator
-              if (_detectedAuthType != null)
-                Container(
-                  padding: const EdgeInsets.all(16),
-                  margin: const EdgeInsets.only(bottom: 24),
-                  decoration: BoxDecoration(
-                    color: needsAuth
-                        ? colorScheme.primaryContainer.withOpacity(0.3)
-                        : colorScheme.tertiaryContainer.withOpacity(0.3),
+              // Password
+              Text(
+                S.of(context)!.password,
+                style: textTheme.titleMedium?.copyWith(
+                  color: colorScheme.onBackground,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+              const SizedBox(height: 12),
+
+              TextField(
+                controller: _passwordController,
+                style: TextStyle(color: colorScheme.onSurface),
+                decoration: InputDecoration(
+                  hintText: S.of(context)!.password,
+                  hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
+                  filled: true,
+                  fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
+                  border: OutlineInputBorder(
                    borderRadius: BorderRadius.circular(12),
+                    borderSide: BorderSide.none,
                  ),
-                  child: Row(
-                    children: [
-                      Icon(
-                        _getAuthIcon(_detectedAuthStrategy!.name),
-                        color: needsAuth ? colorScheme.primary : colorScheme.tertiary,
-                        size: 24,
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text(
-                              S.of(context)!.detectedAuthType(_detectedAuthType!),
-                              style: TextStyle(
-                                color: needsAuth
-                                    ? colorScheme.onPrimaryContainer
-                                    : colorScheme.onTertiaryContainer,
-                                fontSize: 14,
-                                fontWeight: FontWeight.w600,
-                              ),
-                            ),
-                            if (needsAuth)
-                              Padding(
-                                padding: const EdgeInsets.only(top: 4),
-                                child: Text(
-                                  S.of(context)!.serverRequiresAuth,
-                                  style: TextStyle(
-                                    color: colorScheme.onPrimaryContainer.withOpacity(0.7),
-                                    fontSize: 12,
-                                  ),
-                                ),
-                              ),
-                          ],
-                        ),
-                      ),
-                    ],
+                  prefixIcon: Icon(
+                    Icons.lock_rounded,
+                    color: colorScheme.onSurface.withOpacity(0.54),
                  ),
                ),
+                obscureText: true,
+                enabled: !_isConnecting,
+                textInputAction: TextInputAction.done,
+                onSubmitted: (_) => _connect(),
+              ),

-              // HTTP connection info banner
-              if (_resolvedServerUrl != null && _isHttpConnection(_resolvedServerUrl!))
-                Container(
-                  padding: const EdgeInsets.all(16),
-                  margin: const EdgeInsets.only(bottom: 24),
-                  decoration: BoxDecoration(
-                    color: _isTailscaleUrl(_serverUrlController.text)
-                        ? colorScheme.secondaryContainer.withOpacity(0.3)
-                        : colorScheme.errorContainer.withOpacity(0.3),
-                    borderRadius: BorderRadius.circular(12),
-                    border: _isTailscaleUrl(_serverUrlController.text)
-                        ? null
-                        : Border.all(color: colorScheme.error.withOpacity(0.3)),
-                  ),
-                  child: Row(
-                    children: [
-                      Icon(
-                        _isTailscaleUrl(_serverUrlController.text)
-                            ? Icons.vpn_lock_rounded
-                            : Icons.warning_amber_rounded,
-                        color: _isTailscaleUrl(_serverUrlController.text)
-                            ? colorScheme.secondary
-                            : colorScheme.error,
-                        size: 24,
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text(
-                              _isTailscaleUrl(_serverUrlController.text)
-                                  ? S.of(context)!.tailscaleVpnConnection
-                                  : S.of(context)!.unencryptedConnection,
-                              style: TextStyle(
-                                color: _isTailscaleUrl(_serverUrlController.text)
-                                    ? colorScheme.onSecondaryContainer
-                                    : colorScheme.onErrorContainer,
-                                fontSize: 14,
-                                fontWeight: FontWeight.w600,
-                              ),
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.only(top: 4),
-                              child: Text(
-                                _isTailscaleUrl(_serverUrlController.text)
-                                    ? S.of(context)!.usingHttpOverTailscale
-                                    : _usedHttpFallback
-                                        ? S.of(context)!.httpsFailedUsingHttp
-                                        : S.of(context)!.httpNotEncrypted,
-                                style: TextStyle(
-                                  color: (_isTailscaleUrl(_serverUrlController.text)
-                                      ? colorScheme.onSecondaryContainer
-                                      : colorScheme.onErrorContainer).withOpacity(0.7),
-                                  fontSize: 12,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-
-              // Authentication fields (shown only if auth required)
-              if (needsAuth) ...[
-                // Auth Server URL (only for Authelia)
-                if (_detectedAuthStrategy?.name == 'authelia') ...[
-                  Text(
-                    S.of(context)!.authServerUrlOptional,
-                    style: textTheme.titleMedium?.copyWith(
-                      color: colorScheme.onBackground,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    S.of(context)!.authServerUrlDescription,
-                    style: TextStyle(
-                      color: colorScheme.onBackground.withOpacity(0.6),
-                      fontSize: 12,
-                    ),
-                  ),
-                  const SizedBox(height: 12),
-
-                  TextField(
-                    controller: _authServerUrlController,
-                    style: TextStyle(color: colorScheme.onSurface),
-                    decoration: InputDecoration(
-                      hintText: S.of(context)!.authServerUrlHint,
-                      hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
-                      filled: true,
-                      fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
-                      border: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(12),
-                        borderSide: BorderSide.none,
-                      ),
-                      prefixIcon: Icon(
-                        Icons.shield_rounded,
-                        color: colorScheme.onSurface.withOpacity(0.54),
-                      ),
-                    ),
-                    enabled: !_isConnecting,
-                    textInputAction: TextInputAction.next,
-                  ),
-
-                  const SizedBox(height: 24),
-                ],
-
-                Text(
-                  S.of(context)!.username,
-                  style: textTheme.titleMedium?.copyWith(
-                    color: colorScheme.onBackground,
-                    fontWeight: FontWeight.w500,
-                  ),
-                ),
-                const SizedBox(height: 12),
-
-                TextField(
-                  controller: _usernameController,
-                  focusNode: _usernameFocusNode,
-                  style: TextStyle(color: colorScheme.onSurface),
-                  decoration: InputDecoration(
-                    hintText: S.of(context)!.username,
-                    hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
-                    filled: true,
-                    fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(12),
-                      borderSide: BorderSide.none,
-                    ),
-                    prefixIcon: Icon(
-                      Icons.person_rounded,
-                      color: colorScheme.onSurface.withOpacity(0.54),
-                    ),
-                  ),
-                  enabled: !_isConnecting,
-                  textInputAction: TextInputAction.next,
-                ),
-
-                const SizedBox(height: 16),
-
-                Text(
-                  S.of(context)!.password,
-                  style: textTheme.titleMedium?.copyWith(
-                    color: colorScheme.onBackground,
-                    fontWeight: FontWeight.w500,
-                  ),
-                ),
-                const SizedBox(height: 12),
-
-                TextField(
-                  controller: _passwordController,
-                  style: TextStyle(color: colorScheme.onSurface),
-                  decoration: InputDecoration(
-                    hintText: S.of(context)!.password,
-                    hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
-                    filled: true,
-                    fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(12),
-                      borderSide: BorderSide.none,
-                    ),
-                    prefixIcon: Icon(
-                      Icons.lock_rounded,
-                      color: colorScheme.onSurface.withOpacity(0.54),
-                    ),
-                  ),
-                  obscureText: true,
-                  enabled: !_isConnecting,
-                  textInputAction: TextInputAction.done,
-                  onSubmitted: (_) => _connect(),
-                ),
-
-                const SizedBox(height: 16),
-              ],
-
-              const SizedBox(height: 16),
+              const SizedBox(height: 32),

              // Error message
              if (_error != null)
@@ -893,16 +375,14 @@ class _LoginScreenState extends State<LoginScreen> {
              if (_showDebug) ...[
                const SizedBox(height: 16),
                DebugConsole(
-                  onClear: () => setState(() => _debugLogs.clear()),
+                  onClear: () {},
                ),
                const SizedBox(height: 16),
              ],

-              // Connect button (changes based on state)
+              // Connect button
              ElevatedButton(
-                onPressed: (_isConnecting || _isDetectingAuth)
-                    ? null
-                    : (_detectedAuthStrategy == null ? _detectAuthRequirements : _connect),
+                onPressed: _isConnecting ? null : _connect,
                style: ElevatedButton.styleFrom(
                  backgroundColor: colorScheme.primary,
                  foregroundColor: colorScheme.onPrimary,
@@ -912,44 +392,22 @@ class _LoginScreenState extends State<LoginScreen> {
                  ),
                  elevation: 0,
                ),
-                child: _isDetectingAuth
-                    ? Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          SizedBox(
-                            height: 20,
-                            width: 20,
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2,
-                              valueColor: AlwaysStoppedAnimation<Color>(colorScheme.onPrimary),
-                            ),
-                          ),
-                          const SizedBox(width: 12),
-                          Text(
-                            S.of(context)!.detectingAuth,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ],
+                child: _isConnecting
+                    ? SizedBox(
+                        height: 20,
+                        width: 20,
+                        child: CircularProgressIndicator(
+                          strokeWidth: 2,
+                          valueColor: AlwaysStoppedAnimation<Color>(colorScheme.onPrimary),
+                        ),
                      )
-                    : _isConnecting
-                        ? SizedBox(
-                            height: 20,
-                            width: 20,
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2,
-                              valueColor: AlwaysStoppedAnimation<Color>(colorScheme.onPrimary),
-                            ),
-                          )
-                        : Text(
-                            _detectedAuthStrategy == null ? S.of(context)!.detectAndConnect : S.of(context)!.connect,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
+                    : Text(
+                        S.of(context)!.connect,
+                        style: const TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
              ),
            ],
          ),
@@ -13,6 +13,9 @@ import '../widgets/artist_row.dart';
 import '../widgets/track_row.dart';
 import '../widgets/audiobook_row.dart';
 import '../widgets/series_row.dart';
+import '../widgets/playlist_row.dart';
+import '../widgets/radio_station_row.dart';
+import '../widgets/podcast_row.dart';
 import '../widgets/common/disconnected_state.dart';
 import 'settings_screen.dart';
 import 'search_screen.dart';
@@ -35,6 +38,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
  bool _showFavoriteAlbums = false;
  bool _showFavoriteArtists = false;
  bool _showFavoriteTracks = false;
+  bool _showFavoritePlaylists = false;
+  bool _showFavoriteRadioStations = false;
+  bool _showFavoritePodcasts = false;
  // Audiobook rows (default off)
  bool _showContinueListeningAudiobooks = false;
  bool _showDiscoverAudiobooks = false;
@@ -45,19 +51,89 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
  @override
  bool get wantKeepAlive => true;

+  // Track if we had empty favorites on first load (to know when to refresh)
+  bool _hadEmptyFavoritesOnLoad = false;
+  SyncStatus? _lastSyncStatus;
+  int _lastArtistCount = 0;
+  MusicAssistantProvider? _providerListeningTo;
+
  @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();
  }

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

+  /// Check if favorites are empty on initial load (so we know to refresh after sync)
+  void _checkInitialFavoriteState() {
+    // Schedule after first frame to ensure provider is accessible
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final provider = context.read<MusicAssistantProvider>();
+      _lastArtistCount = provider.artists.length;
+      // Check if artists list is empty - favorites will also be empty
+      if (_lastArtistCount == 0) {
+        _hadEmptyFavoritesOnLoad = true;
+        _logger.log('📋 Home: favorites empty on load, will refresh after sync');
+        // Also listen to provider for when cache loads (before sync completes)
+        _providerListeningTo = provider;
+        provider.addListener(_onProviderChanged);
+      }
+    });
+  }
+
+  /// Called when MusicAssistantProvider changes (for cache load detection)
+  void _onProviderChanged() {
+    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
+  void _onSyncChanged() {
+    final newStatus = SyncService.instance.status;
+    // When sync completes and we had empty favorites, refresh to show new data
+    if (_lastSyncStatus == SyncStatus.syncing &&
+        newStatus == SyncStatus.completed &&
+        _hadEmptyFavoritesOnLoad) {
+      _logger.log('🔄 Home: sync completed, refreshing favorite rows');
+      _hadEmptyFavoritesOnLoad = false;
+      // Clean up provider listener if still attached
+      _providerListeningTo?.removeListener(_onProviderChanged);
+      _providerListeningTo = null;
+      if (mounted) {
+        setState(() {
+          _refreshKey = UniqueKey();
+        });
+      }
+    }
+    _lastSyncStatus = newStatus;
+  }
+
  @override
  void didChangeAppLifecycleState(AppLifecycleState state) {
    // Reload settings when app resumes (coming back from settings)
@@ -73,6 +149,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
    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();
@@ -85,6 +164,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
        _showFavoriteAlbums = showFavAlbums;
        _showFavoriteArtists = showFavArtists;
        _showFavoriteTracks = showFavTracks;
+        _showFavoritePlaylists = showFavPlaylists;
+        _showFavoriteRadioStations = showFavRadio;
+        _showFavoritePodcasts = showFavPodcasts;
        _showContinueListeningAudiobooks = showContAudiobooks;
        _showDiscoverAudiobooks = showDiscAudiobooks;
        _showDiscoverSeries = showDiscSeries;
@@ -238,15 +320,50 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
  }


+  /// Count how many rows are currently enabled
+  int _countEnabledRows() {
+    int count = 0;
+    for (final rowId in _homeRowOrder) {
+      if (_isRowEnabled(rowId)) count++;
+    }
+    return count;
+  }
+
+  /// Check if a specific row is enabled
+  bool _isRowEnabled(String rowId) {
+    switch (rowId) {
+      case 'recent-albums': return _showRecentAlbums;
+      case 'discover-artists': return _showDiscoverArtists;
+      case 'discover-albums': return _showDiscoverAlbums;
+      case 'continue-listening': return _showContinueListeningAudiobooks;
+      case 'discover-audiobooks': return _showDiscoverAudiobooks;
+      case 'discover-series': return _showDiscoverSeries;
+      case 'favorite-albums': return _showFavoriteAlbums;
+      case 'favorite-artists': return _showFavoriteArtists;
+      case 'favorite-tracks': return _showFavoriteTracks;
+      case 'favorite-playlists': return _showFavoritePlaylists;
+      case 'favorite-radio-stations': return _showFavoriteRadioStations;
+      case 'favorite-podcasts': return _showFavoritePodcasts;
+      default: return false;
+    }
+  }
+
  Widget _buildConnectedView(
      BuildContext context, MusicAssistantProvider provider) {
    // Use LayoutBuilder to get available screen height
    return LayoutBuilder(
      builder: (context, constraints) {
-        // Simple calculation: available height divided by 3 rows
-        // Each row includes its title, artwork, and info
+        // Each row is always 1/3 of screen height
+        // 1 row = 1/3, 2 rows = 2/3, 3 rows = full screen, 4+ rows scroll
        final availableHeight = constraints.maxHeight - BottomSpacing.withMiniPlayer;
-        final rowHeight = (availableHeight + 8) / 3;
+
+        // 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();
+        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>(
@@ -288,6 +405,10 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
    for (final rowId in _homeRowOrder) {
      final widget = _buildRowWidget(rowId, provider, rowHeight);
      if (widget != null) {
+        // Add spacing between rows (not before first row)
+        if (rows.isNotEmpty) {
+          rows.add(const SizedBox(height: 2.0));
+        }
        rows.add(widget);
      }
    }
@@ -330,7 +451,8 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
        return AudiobookRow(
          key: const ValueKey('continue-listening'),
          title: S.of(context)!.continueListening,
-          loadAudiobooks: () => provider.getInProgressAudiobooks(),
+          loadAudiobooks: () => provider.getInProgressAudiobooksWithCache(),
+          getCachedAudiobooks: () => provider.getCachedInProgressAudiobooks(),
          rowHeight: rowHeight,
        );
      case 'discover-audiobooks':
@@ -338,7 +460,8 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
        return AudiobookRow(
          key: const ValueKey('discover-audiobooks'),
          title: S.of(context)!.discoverAudiobooks,
-          loadAudiobooks: () => provider.getDiscoverAudiobooks(),
+          loadAudiobooks: () => provider.getDiscoverAudiobooksWithCache(),
+          getCachedAudiobooks: () => provider.getCachedDiscoverAudiobooks(),
          rowHeight: rowHeight,
        );
      case 'discover-series':
@@ -346,7 +469,8 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
        return SeriesRow(
          key: const ValueKey('discover-series'),
          title: S.of(context)!.discoverSeries,
-          loadSeries: () => provider.getDiscoverSeries(),
+          loadSeries: () => provider.getDiscoverSeriesWithCache(),
+          getCachedSeries: () => provider.getCachedDiscoverSeries(),
          rowHeight: rowHeight,
        );
      case 'favorite-albums':
@@ -373,6 +497,33 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
          loadTracks: () => provider.getFavoriteTracks(),
          rowHeight: rowHeight,
        );
+      case 'favorite-playlists':
+        if (!_showFavoritePlaylists) return null;
+        return PlaylistRow(
+          key: const ValueKey('favorite-playlists'),
+          title: S.of(context)!.favoritePlaylists,
+          loadPlaylists: () => provider.getFavoritePlaylists(),
+          heroTagSuffix: 'home',
+          rowHeight: rowHeight,
+        );
+      case 'favorite-radio-stations':
+        if (!_showFavoriteRadioStations) return null;
+        return RadioStationRow(
+          key: const ValueKey('favorite-radio-stations'),
+          title: S.of(context)!.favoriteRadioStations,
+          loadRadioStations: () => provider.getFavoriteRadioStations(),
+          heroTagSuffix: 'home',
+          rowHeight: rowHeight,
+        );
+      case 'favorite-podcasts':
+        if (!_showFavoritePodcasts) return null;
+        return PodcastRow(
+          key: const ValueKey('favorite-podcasts'),
+          title: S.of(context)!.favoritePodcasts,
+          loadPodcasts: () => provider.getFavoritePodcasts(),
+          heroTagSuffix: 'home',
+          rowHeight: rowHeight,
+        );
      default:
        return null;
    }
@@ -1,16 +1,23 @@
 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/player_picker_sheet.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;
@@ -36,7 +43,8 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
  bool _isLoadingEpisodes = false;
  bool _isDescriptionExpanded = false;
  bool _isInLibrary = false;
-  String? _expandedEpisodeId; // Track which episode is expanded for actions
+  bool _isFavorite = false;
+  String _sortOrder = 'newest'; // 'newest', 'oldest', 'alpha', 'duration'

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

@@ -44,16 +52,109 @@ 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((_) {
-      Future.delayed(const Duration(milliseconds: 350), () {
-        if (mounted) {
-          _extractColors();
-        }
-      });
+      if (mounted) {
+        markDetailScreenEntered(context);
+        _extractColors(); // Extract colors immediately - async so won't block
+      }
      _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;
@@ -66,7 +167,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {

    try {
      final newState = !_isInLibrary;
-      bool success;

      if (newState) {
        // Add to library - MUST use non-library provider
@@ -97,12 +197,35 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
          }
        }

+        // OPTIMISTIC UPDATE: Update UI immediately
+        setState(() {
+          _isInLibrary = newState;
+        });
+
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(S.of(context)!.addedToLibrary),
+              duration: const Duration(seconds: 1),
+            ),
+          );
+        }
+
        _logger.log('Adding podcast to library: provider=$actualProvider, itemId=$actualItemId');
-        success = await maProvider.addToLibrary(
+        // Fire and forget - API call happens in background
+        maProvider.addToLibrary(
          mediaType: 'podcast',
          provider: actualProvider,
          itemId: actualItemId,
-        );
+        ).catchError((e) {
+          _logger.log('❌ Failed to add podcast to library: $e');
+          // Revert on failure
+          if (mounted) {
+            setState(() {
+              _isInLibrary = !newState;
+            });
+          }
+        });
      } else {
        // Remove from library
        int? libraryItemId;
@@ -123,13 +246,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
          return;
        }

-        success = await maProvider.removeFromLibrary(
-          mediaType: 'podcast',
-          libraryItemId: libraryItemId,
-        );
-      }
-
-      if (success) {
+        // OPTIMISTIC UPDATE: Update UI immediately
        setState(() {
          _isInLibrary = newState;
        });
@@ -137,13 +254,25 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
        if (mounted) {
          ScaffoldMessenger.of(context).showSnackBar(
            SnackBar(
-              content: Text(
-                _isInLibrary ? S.of(context)!.addedToLibrary : S.of(context)!.removedFromLibrary,
-              ),
+              content: Text(S.of(context)!.removedFromLibrary),
              duration: const Duration(seconds: 1),
            ),
          );
        }
+
+        // Fire and forget - API call happens in background
+        maProvider.removeFromLibrary(
+          mediaType: 'podcast',
+          libraryItemId: libraryItemId,
+        ).catchError((e) {
+          _logger.log('❌ Failed to remove podcast from library: $e');
+          // Revert on failure
+          if (mounted) {
+            setState(() {
+              _isInLibrary = !newState;
+            });
+          }
+        });
      }
    } catch (e) {
      _logger.log('Error toggling podcast library: $e');
@@ -158,6 +287,71 @@ 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
@@ -165,14 +359,17 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {

    if (imageUrl != null) {
      try {
-        final colorSchemes = await PaletteHelper.extractColorSchemes(
-          CachedNetworkImageProvider(imageUrl),
-        );
+        // Use isolate-based extraction to avoid blocking the main thread
+        final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(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');
@@ -190,10 +387,38 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
    try {
      final maProvider = context.read<MusicAssistantProvider>();
      if (maProvider.api != null) {
-        final episodes = await maProvider.api!.getPodcastEpisodes(
-          widget.podcast.itemId,
-          provider: widget.podcast.provider,
-        );
+        List<MediaItem> episodes = [];
+
+        // Try loading with the podcast's own ID and provider first
+        try {
+          episodes = await maProvider.api!.getPodcastEpisodes(
+            widget.podcast.itemId,
+            provider: widget.podcast.provider,
+          );
+        } catch (e) {
+          _logger.log('🎙️ Primary episode load failed: $e');
+        }
+
+        // If that failed and we have provider mappings, try those
+        if (episodes.isEmpty && widget.podcast.providerMappings != null) {
+          for (final mapping in widget.podcast.providerMappings!) {
+            if (mapping.itemId.isNotEmpty && mapping.providerInstance.isNotEmpty) {
+              try {
+                _logger.log('🎙️ Trying provider mapping: ${mapping.providerInstance}');
+                episodes = await maProvider.api!.getPodcastEpisodes(
+                  mapping.itemId,
+                  provider: mapping.providerInstance,
+                );
+                if (episodes.isNotEmpty) {
+                  _logger.log('🎙️ Loaded episodes via provider mapping');
+                  break;
+                }
+              } catch (e) {
+                _logger.log('🎙️ Provider mapping failed: $e');
+              }
+            }
+          }
+        }

        if (mounted) {
          _logger.log('🎙️ Loaded ${episodes.length} episodes for ${widget.podcast.name}');
@@ -205,6 +430,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
          }
          setState(() {
            _episodes = episodes;
+            _sortEpisodes();
          });
        }
      }
@@ -225,6 +451,8 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {

    if (selectedPlayer != null) {
      try {
+        // Set podcast context before playing so player UI shows correct podcast name
+        maProvider.setCurrentPodcastName(widget.podcast.name);
        await maProvider.api?.playPodcastEpisode(selectedPlayer.playerId, episode);
        if (mounted) {
          ScaffoldMessenger.of(context).showSnackBar(
@@ -250,20 +478,15 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
  void _showPlayOnMenu(BuildContext context, MediaItem episode) {
    final maProvider = context.read<MusicAssistantProvider>();

-    GlobalPlayerOverlay.hidePlayer();
-
-    showPlayerPickerSheet(
-      context: context,
-      title: S.of(context)!.playOn,
-      players: maProvider.availablePlayers,
-      selectedPlayer: maProvider.selectedPlayer,
+    GlobalPlayerOverlay.showPlayerSelectorForAction(
+      contextHint: S.of(context)!.selectPlayerForEpisode,
      onPlayerSelected: (player) async {
        maProvider.selectPlayer(player);
+        // Set podcast context before playing so player UI shows correct podcast name
+        maProvider.setCurrentPodcastName(widget.podcast.name);
        await maProvider.api?.playPodcastEpisode(player.playerId, episode);
      },
-    ).whenComplete(() {
-      GlobalPlayerOverlay.showPlayer();
-    });
+    );
  }

  String _formatDuration(Duration? duration) {
@@ -353,6 +576,35 @@ 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
@@ -426,41 +678,55 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                          // Match audiobook pattern: ClipRRect + CachedNetworkImage for smooth hero
                          child: ClipRRect(
                            borderRadius: BorderRadius.circular(16),
-                            child: Container(
+                            child: SizedBox(
                              width: coverSize,
                              height: coverSize,
-                              color: colorScheme.surfaceContainerHighest,
-                              child: imageUrl != null
-                                  ? CachedNetworkImage(
-                                      imageUrl: imageUrl,
-                                      fit: BoxFit.cover,
-                                      // Match source memCacheWidth for smooth Hero animation
-                                      memCacheWidth: 256,
-                                      memCacheHeight: 256,
-                                      fadeInDuration: Duration.zero,
-                                      fadeOutDuration: Duration.zero,
-                                      placeholder: (_, __) => Center(
-                                        child: Icon(
-                                          MdiIcons.podcast,
-                                          size: coverSize * 0.43,
-                                          color: colorScheme.onSurfaceVariant,
-                                        ),
-                                      ),
-                                      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,
-                                      ),
+                              child: Stack(
+                                fit: StackFit.expand,
+                                children: [
+                                  Container(
+                                    color: colorScheme.surfaceContainerHighest,
+                                    child: imageUrl != null
+                                        ? CachedNetworkImage(
+                                            imageUrl: imageUrl,
+                                            fit: BoxFit.cover,
+                                            // Match source memCacheWidth for smooth Hero animation
+                                            memCacheWidth: 256,
+                                            memCacheHeight: 256,
+                                            fadeInDuration: Duration.zero,
+                                            fadeOutDuration: Duration.zero,
+                                            placeholder: (_, __) => Center(
+                                              child: Icon(
+                                                MdiIcons.podcast,
+                                                size: coverSize * 0.43,
+                                                color: colorScheme.onSurfaceVariant,
+                                              ),
+                                            ),
+                                            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,
+                                            ),
+                                          ),
+                                  ),
+                                  // Provider icon overlay
+                                  if (widget.podcast.providerMappings?.isNotEmpty == true)
+                                    ProviderIconOverlay(
+                                      domain: widget.podcast.providerMappings!.first.providerDomain,
+                                      size: 24,
+                                      margin: 8,
                                    ),
+                                ],
+                              ),
                            ),
                          ),
                        ),
@@ -502,7 +768,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                            children: [
                              // Main Play Latest Episode Button
                              Expanded(
-                                flex: 2,
                                child: SizedBox(
                                  height: 50,
                                  child: ElevatedButton.icon(
@@ -524,24 +789,6 @@ 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,
@@ -555,10 +802,76 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                                    ),
                                  ),
                                  child: Icon(
-                                    _isInLibrary ? Icons.library_add_check : Icons.library_add,
+                                    Symbols.book_2,
+                                    size: 25,
+                                    fill: _isInLibrary ? 1 : 0,
                                    color: _isInLibrary
                                        ? colorScheme.primary
-                                        : colorScheme.onSurfaceVariant,
+                                        : 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,
+                                    ),
                                  ),
                                ),
                              ),
@@ -665,190 +978,126 @@ 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 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(
+                        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(
                                                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,
+                                              errorWidget: (_, __, ___) => Icon(
+                                                MdiIcons.podcast,
+                                                size: 32,
+                                                color: colorScheme.onSurfaceVariant,
+                                              ),
+                                            )
+                                          : Icon(
+                                              MdiIcons.podcast,
+                                              size: 32,
+                                              color: colorScheme.onSurfaceVariant,
                                            ),
-                                            maxLines: 2,
-                                            overflow: TextOverflow.ellipsis,
+                                    ),
+                                  ),
+                                ),
+                                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),
                                          ),
-                                          if (episodeDescription != null && episodeDescription.isNotEmpty) ...[
-                                            const SizedBox(height: 4),
+                                        ),
+                                      ],
+                                      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),
+                                            ),
+                                            const SizedBox(width: 4),
                                            Text(
-                                              episodeDescription,
-                                              maxLines: isExpanded ? 100 : 2,
-                                              overflow: TextOverflow.ellipsis,
+                                              _formatDuration(duration),
                                              style: textTheme.bodySmall?.copyWith(
-                                                color: colorScheme.onSurface.withOpacity(0.6),
+                                                color: colorScheme.onSurface.withOpacity(0.5),
                                              ),
                                            ),
                                          ],
-                                          const SizedBox(height: 6),
-                                          // Duration and release date row
-                                          Row(
-                                            children: [
-                                              if (duration != null && duration > Duration.zero) ...[
-                                                Icon(
-                                                  Icons.access_time,
-                                                  size: 14,
+                                          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),
                                                ),
-                                                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),
-                                                  ),
-                                                ),
-                                            ],
-                                          ),
+                                              ),
+                                            ),
+                                          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,
@@ -856,8 +1105,8 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
                  ),

                // Bottom padding for mini player
-                const SliverToBoxAdapter(
-                  child: SizedBox(height: 100),
+                SliverToBoxAdapter(
+                  child: SizedBox(height: BottomSpacing.withMiniPlayer),
                ),
              ],
            );
@@ -0,0 +1,504 @@
+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 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.all(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),
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
@@ -4,6 +4,7 @@ import '../providers/music_assistant_provider.dart';
 import '../models/player.dart';
 import '../services/debug_logger.dart';
 import '../widgets/common/empty_state.dart';
+import '../widgets/player_picker_sheet.dart';
 import '../l10n/app_localizations.dart';

 class QueueScreen extends StatefulWidget {
@@ -67,10 +68,72 @@ class _QueueScreenState extends State<QueueScreen> {
    }
  }

+  Future<void> _handleTransferQueue(MusicAssistantProvider maProvider) async {
+    final player = maProvider.selectedPlayer;
+    if (player == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(S.of(context)!.noPlayerSelected)),
+      );
+      return;
+    }
+
+    // Get available players, excluding the current source player
+    final allPlayers = maProvider.availablePlayers;
+    final targetPlayers = allPlayers
+        .where((p) => p.playerId != player.playerId && p.available)
+        .toList();
+
+    if (targetPlayers.isEmpty) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(S.of(context)!.noOtherPlayersAvailable),
+          duration: const Duration(seconds: 2),
+        ),
+      );
+      return;
+    }
+
+    // Show player picker sheet
+    await showPlayerPickerSheet(
+      context: context,
+      title: S.of(context)!.transferQueueTo,
+      players: targetPlayers,
+      onPlayerSelected: (targetPlayer) async {
+        try {
+          await maProvider.api?.transferQueue(
+            sourceQueueId: player.playerId,
+            targetQueueId: targetPlayer.playerId,
+            autoPlay: true,
+          );
+
+          if (mounted) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(S.of(context)!.queueTransferredTo(targetPlayer.name)),
+                duration: const Duration(seconds: 2),
+              ),
+            );
+          }
+        } catch (e) {
+          _logger.log('Error transferring queue: $e');
+          if (mounted) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(S.of(context)!.failedToTransferQueue(e.toString())),
+                backgroundColor: Colors.red.shade700,
+                duration: const Duration(seconds: 3),
+              ),
+            );
+          }
+        }
+      },
+    );
+  }
+
  @override
  Widget build(BuildContext context) {
-    final maProvider = context.watch<MusicAssistantProvider>();
-    final player = maProvider.selectedPlayer;
+    // Use select to only rebuild when selectedPlayer changes
+    final player = context.select<MusicAssistantProvider, dynamic>((p) => p.selectedPlayer);

    return Scaffold(
      backgroundColor: const Color(0xFF1a1a1a),
@@ -87,17 +150,23 @@ class _QueueScreenState extends State<QueueScreen> {
        ),
        centerTitle: true,
        actions: [
+          IconButton(
+            icon: const Icon(Icons.swap_horiz_rounded),
+            tooltip: S.of(context)!.transferQueue,
+            onPressed: () => _handleTransferQueue(context.read<MusicAssistantProvider>()),
+          ),
          IconButton(
            icon: const Icon(Icons.refresh),
            onPressed: _loadQueue,
          ),
        ],
      ),
-      body: _buildBody(maProvider),
+      body: _buildBody(context),
    );
  }

-  Widget _buildBody(MusicAssistantProvider maProvider) {
+  Widget _buildBody(BuildContext context) {
+    final maProvider = context.read<MusicAssistantProvider>();
    if (_isLoading) {
      return const Center(child: CircularProgressIndicator());
    }
@@ -7,6 +7,7 @@ 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 '../widgets/global_player_overlay.dart';
 import 'debug_log_screen.dart';
 import 'login_screen.dart';
@@ -29,22 +30,22 @@ class _SettingsScreenState extends State<SettingsScreen> {
  bool _showFavoriteAlbums = false;
  bool _showFavoriteArtists = false;
  bool _showFavoriteTracks = false;
+  bool _showFavoritePlaylists = false;
+  bool _showFavoriteRadioStations = false;
+  bool _showFavoritePodcasts = false;
  // Audiobook home rows (default off)
  bool _showContinueListeningAudiobooks = false;
  bool _showDiscoverAudiobooks = false;
  bool _showDiscoverSeries = false;
  // Home row order
  List<String> _homeRowOrder = List.from(SettingsService.defaultHomeRowOrder);
-  // Audiobook libraries
-  List<Map<String, String>> _discoveredLibraries = [];
-  Map<String, bool> _libraryEnabled = {};
  // Player settings
-  bool _preferLocalPlayer = false;
  bool _smartSortPlayers = false;
+  bool _volumePrecisionMode = true;
  // Hint settings
  bool _showHints = true;
-  // Library settings
-  bool _showOnlyArtistsWithAlbums = false;
+  // Display settings
+  bool _showProviderIcons = true;

  @override
  void initState() {
@@ -70,6 +71,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
    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();

    // Load audiobook home row settings
    final showContinueAudiobooks = await SettingsService.getShowContinueListeningAudiobooks();
@@ -79,25 +83,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
    // Load home row order
    final rowOrder = await SettingsService.getHomeRowOrder();

-    // Load audiobook library settings
-    final discovered = await SettingsService.getDiscoveredAbsLibraries() ?? [];
-    final enabled = await SettingsService.getEnabledAbsLibraries();
-    final libraryEnabled = <String, bool>{};
-    for (final lib in discovered) {
-      final path = lib['path'] ?? '';
-      // null means all enabled
-      libraryEnabled[path] = enabled == null || enabled.contains(path);
-    }
-
    // Load player settings
-    final preferLocal = await SettingsService.getPreferLocalPlayer();
    final smartSort = await SettingsService.getSmartSortPlayers();
+    final volumePrecision = await SettingsService.getVolumePrecisionMode();

    // Load hint settings
    final showHints = await SettingsService.getShowHints();

-    // Load library settings
-    final showOnlyArtistsWithAlbums = await SettingsService.getShowOnlyArtistsWithAlbums();
+    // Load display settings
+    final showProviderIcons = await SettingsService.getShowProviderIcons();

    if (mounted) {
      setState(() {
@@ -107,16 +101,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
        _showFavoriteAlbums = showFavAlbums;
        _showFavoriteArtists = showFavArtists;
        _showFavoriteTracks = showFavTracks;
+        _showFavoritePlaylists = showFavPlaylists;
+        _showFavoriteRadioStations = showFavRadio;
+        _showFavoritePodcasts = showFavPodcasts;
        _showContinueListeningAudiobooks = showContinueAudiobooks;
        _showDiscoverAudiobooks = showDiscAudiobooks;
        _showDiscoverSeries = showDiscSeries;
        _homeRowOrder = rowOrder;
-        _discoveredLibraries = discovered;
-        _libraryEnabled = libraryEnabled;
-        _preferLocalPlayer = preferLocal;
        _smartSortPlayers = smartSort;
+        _volumePrecisionMode = volumePrecision;
        _showHints = showHints;
-        _showOnlyArtistsWithAlbums = showOnlyArtistsWithAlbums;
+        _showProviderIcons = showProviderIcons;
      });
    }
  }
@@ -150,6 +145,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
        return {'title': s.favoriteArtists, 'subtitle': s.showFavoriteArtists};
      case 'favorite-tracks':
        return {'title': s.favoriteTracks, 'subtitle': s.showFavoriteTracks};
+      case 'favorite-playlists':
+        return {'title': s.favoritePlaylists, 'subtitle': s.showFavoritePlaylists};
+      case 'favorite-radio-stations':
+        return {'title': s.favoriteRadioStations, 'subtitle': s.showFavoriteRadioStations};
+      case 'favorite-podcasts':
+        return {'title': s.favoritePodcasts, 'subtitle': s.showFavoritePodcasts};
      default:
        return {'title': rowId, 'subtitle': ''};
    }
@@ -176,6 +177,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
        return _showFavoriteArtists;
      case 'favorite-tracks':
        return _showFavoriteTracks;
+      case 'favorite-playlists':
+        return _showFavoritePlaylists;
+      case 'favorite-radio-stations':
+        return _showFavoriteRadioStations;
+      case 'favorite-podcasts':
+        return _showFavoritePodcasts;
      default:
        return false;
    }
@@ -221,6 +228,18 @@ class _SettingsScreenState extends State<SettingsScreen> {
          _showFavoriteTracks = value;
          SettingsService.setShowFavoriteTracks(value);
          break;
+        case 'favorite-playlists':
+          _showFavoritePlaylists = value;
+          SettingsService.setShowFavoritePlaylists(value);
+          break;
+        case 'favorite-radio-stations':
+          _showFavoriteRadioStations = value;
+          SettingsService.setShowFavoriteRadioStations(value);
+          break;
+        case 'favorite-podcasts':
+          _showFavoritePodcasts = value;
+          SettingsService.setShowFavoritePodcasts(value);
+          break;
      }
    });
  }
@@ -243,7 +262,8 @@ class _SettingsScreenState extends State<SettingsScreen> {

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

@@ -271,9 +291,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
            onPressed: () {
              Navigator.push(
                context,
-                MaterialPageRoute(
-                  builder: (context) => const DebugLogScreen(),
-                ),
+                FadeSlidePageRoute(child: const DebugLogScreen()),
              );
            },
            color: colorScheme.onBackground,
@@ -287,13 +305,26 @@ class _SettingsScreenState extends State<SettingsScreen> {
          crossAxisAlignment: CrossAxisAlignment.center,
          children: [
            // Logo - same size as login screen (50% of screen width)
+            // Use color filter to make logo dark in light theme
            Padding(
              padding: const EdgeInsets.only(top: 8.0, bottom: 48.0),
-              child: Image.asset(
-                'assets/images/ensemble_icon_transparent.png',
-                width: MediaQuery.of(context).size.width * 0.5,
-                fit: BoxFit.contain,
-              ),
+              child: Theme.of(context).brightness == Brightness.light
+                  ? ColorFiltered(
+                      colorFilter: const ColorFilter.mode(
+                        Color(0xFF1a1a1a), // Dark color for light theme
+                        BlendMode.srcIn,
+                      ),
+                      child: Image.asset(
+                        'assets/images/ensemble_icon_transparent.png',
+                        width: MediaQuery.of(context).size.width * 0.5,
+                        fit: BoxFit.contain,
+                      ),
+                    )
+                  : Image.asset(
+                      'assets/images/ensemble_icon_transparent.png',
+                      width: MediaQuery.of(context).size.width * 0.5,
+                      fit: BoxFit.contain,
+                    ),
            ),

            // Connection status box - centered with border radius like theme boxes
@@ -308,15 +339,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
                mainAxisAlignment: MainAxisAlignment.center,
                children: [
                  Icon(
-                    _getStatusIcon(provider.connectionState),
-                    color: _getStatusColor(provider.connectionState, colorScheme),
+                    _getStatusIcon(connectionState),
+                    color: _getStatusColor(connectionState, colorScheme),
                    size: 20,
                  ),
                  const SizedBox(width: 8),
                  Text(
-                    _getStatusText(provider.connectionState),
+                    _getStatusText(connectionState),
                    style: textTheme.titleMedium?.copyWith(
-                      color: _getStatusColor(provider.connectionState, colorScheme),
+                      color: _getStatusColor(connectionState, colorScheme),
                      fontWeight: FontWeight.bold,
                    ),
                  ),
@@ -600,7 +631,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                            children: [
                              RadioListTile<String?>(
                                title: Text(S.of(context)!.system),
-                                subtitle: const Text('Auto'),
+                                subtitle: Text(S.of(context)!.auto),
                                value: null,
                                groupValue: localeProvider.locale?.languageCode,
                                onChanged: (value) {
@@ -609,7 +640,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                                },
                              ),
                              RadioListTile<String?>(
-                                title: const Text('English'),
+                                title: Text(S.of(context)!.english),
                                value: 'en',
                                groupValue: localeProvider.locale?.languageCode,
                                onChanged: (value) {
@@ -618,7 +649,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                                },
                              ),
                              RadioListTile<String?>(
-                                title: const Text('Deutsch'),
+                                title: Text(S.of(context)!.german),
                                value: 'de',
                                groupValue: localeProvider.locale?.languageCode,
                                onChanged: (value) {
@@ -627,7 +658,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                                },
                              ),
                              RadioListTile<String?>(
-                                title: const Text('Español'),
+                                title: Text(S.of(context)!.spanish),
                                value: 'es',
                                groupValue: localeProvider.locale?.languageCode,
                                onChanged: (value) {
@@ -635,6 +666,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
                                  Navigator.pop(dialogContext);
                                },
                              ),
+                              RadioListTile<String?>(
+                                title: Text(S.of(context)!.french),
+                                value: 'fr',
+                                groupValue: localeProvider.locale?.languageCode,
+                                onChanged: (value) {
+                                  localeProvider.setLocale(const Locale('fr'));
+                                  Navigator.pop(dialogContext);
+                                },
+                              ),
                            ],
                          ),
                        );
@@ -657,33 +697,6 @@ 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(
@@ -708,6 +721,31 @@ class _SettingsScreenState extends State<SettingsScreen> {
                contentPadding: EdgeInsets.zero,
              ),
            ),
+            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)!.volumePrecisionMode,
+                  style: TextStyle(color: colorScheme.onSurface),
+                ),
+                subtitle: Text(
+                  S.of(context)!.volumePrecisionModeDescription,
+                  style: TextStyle(color: colorScheme.onSurface.withOpacity(0.6), fontSize: 12),
+                ),
+                value: _volumePrecisionMode,
+                onChanged: (value) {
+                  setState(() => _volumePrecisionMode = value);
+                  SettingsService.setVolumePrecisionMode(value);
+                },
+                activeColor: colorScheme.primary,
+                contentPadding: EdgeInsets.zero,
+              ),
+            ),

            const SizedBox(height: 32),

@@ -749,17 +787,18 @@ class _SettingsScreenState extends State<SettingsScreen> {
              ),
            ),

-            const SizedBox(height: 32),
+            const SizedBox(height: 24),

-            // Library section
+            // Display section
            Text(
-              S.of(context)!.library,
+              S.of(context)!.display,
              style: textTheme.titleMedium?.copyWith(
                color: colorScheme.onBackground,
                fontWeight: FontWeight.bold,
              ),
            ),
            const SizedBox(height: 16),
+
            Container(
              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
              decoration: BoxDecoration(
@@ -768,24 +807,19 @@ class _SettingsScreenState extends State<SettingsScreen> {
              ),
              child: SwitchListTile(
                title: Text(
-                  'Show only artists with albums',
+                  S.of(context)!.showProviderIcons,
                  style: TextStyle(color: colorScheme.onSurface),
                ),
                subtitle: Text(
-                  'Hide artists that have no albums in your library',
-                  style: TextStyle(
+                  S.of(context)!.showProviderIconsDescription,
+                  style: textTheme.bodySmall?.copyWith(
                    color: colorScheme.onSurface.withOpacity(0.6),
-                    fontSize: 12,
                  ),
                ),
-                value: _showOnlyArtistsWithAlbums,
-                onChanged: (value) async {
-                  setState(() => _showOnlyArtistsWithAlbums = value);
-                  await SettingsService.setShowOnlyArtistsWithAlbums(value);
-                  // Force sync library to apply the new filter at API level
-                  if (mounted) {
-                    context.read<MusicAssistantProvider>().forceLibrarySync();
-                  }
+                value: _showProviderIcons,
+                onChanged: (value) {
+                  setState(() => _showProviderIcons = value);
+                  SettingsService.setShowProviderIcons(value);
                },
                activeColor: colorScheme.primary,
                contentPadding: EdgeInsets.zero,
@@ -970,76 +1004,6 @@ class _SettingsScreenState extends State<SettingsScreen> {

            const SizedBox(height: 32),

-            // Audiobook Libraries section
-            if (_discoveredLibraries.isNotEmpty) ...[
-              Text(
-                S.of(context)!.audiobookLibraries,
-                style: textTheme.titleMedium?.copyWith(
-                  color: colorScheme.onBackground,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 8),
-              Text(
-                S.of(context)!.chooseAudiobookLibraries,
-                style: textTheme.bodySmall?.copyWith(
-                  color: colorScheme.onBackground.withOpacity(0.6),
-                ),
-              ),
-              const SizedBox(height: 16),
-
-              Container(
-                decoration: BoxDecoration(
-                  color: colorScheme.surfaceVariant.withOpacity(0.3),
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Column(
-                  children: _discoveredLibraries.asMap().entries.map((entry) {
-                    final index = entry.key;
-                    final library = entry.value;
-                    final path = library['path'] ?? '';
-                    final name = library['name'] ?? S.of(context)!.unknownLibrary;
-                    final isEnabled = _libraryEnabled[path] ?? true;
-
-                    return Column(
-                      children: [
-                        SwitchListTile(
-                          title: Text(
-                            name,
-                            style: TextStyle(color: colorScheme.onSurface),
-                          ),
-                          value: isEnabled,
-                          onChanged: (value) async {
-                            setState(() {
-                              _libraryEnabled[path] = value;
-                            });
-                            await SettingsService.toggleAbsLibrary(path, value);
-                            if (mounted) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(S.of(context)!.pullToRefresh),
-                                  duration: const Duration(seconds: 2),
-                                ),
-                              );
-                            }
-                          },
-                          activeColor: colorScheme.primary,
-                        ),
-                        if (index < _discoveredLibraries.length - 1)
-                          Divider(
-                            height: 1,
-                            indent: 16,
-                            endIndent: 16,
-                            color: colorScheme.onSurface.withOpacity(0.1),
-                          ),
-                      ],
-                    );
-                  }).toList(),
-                ),
-              ),
-              const SizedBox(height: 32),
-            ],
-
            SizedBox(
              width: double.infinity,
              height: 50,
@@ -157,6 +157,17 @@ class MassivAudioHandler extends BaseAudioHandler with SeekHandler {
    // Note: We don't actually stop playback - this button is repurposed for player switching
  }

+  /// Fully stop the foreground service and release resources
+  /// Called after idle timeout to save battery
+  Future<void> stopService() async {
+    _logger.log('MassivAudioHandler: Stopping foreground service (idle timeout)');
+    _isRemoteMode = false;
+    _currentMediaItem = null;
+    await _player.stop();
+    // Call the base stop() to properly stop the foreground service
+    await super.stop();
+  }
+
  @override
  Future<void> seek(Duration position) => _player.seek(position);

@@ -1,467 +1,186 @@
 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';

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

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

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

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

-  /// Get current credentials (null if none stored)
-  AuthCredentials? get currentCredentials => _currentCredentials;
-
-  /// 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;
-
-  Future<AuthStrategy?> detectAuthStrategy(String serverUrl) async {
-    _logger.log('🔍 Auto-detecting auth strategy for $serverUrl');
-    _lastSuccessfulUrl = null;
-
-    // Normalize URL
-    var baseUrl = _normalizeUrl(serverUrl);
-    _logger.log('Normalized URL: $baseUrl');
-
-    // Try detection with the initial URL
-    var result = await _tryDetectAuth(baseUrl);
-
-    // 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;
-      }
-    }
-
-    if (result != null) {
-      _lastSuccessfulUrl = baseUrl;
-      _logger.log('✅ Auth detection successful with URL: $baseUrl');
-    }
-
-    return result;
-  }
-
-  /// Normalize a server URL with appropriate protocol
-  String _normalizeUrl(String url) {
-    var baseUrl = url;
-    if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
-      // Use http for local IPs, https for domains
-      if (baseUrl.startsWith('192.') ||
-          baseUrl.startsWith('10.') ||
-          baseUrl.startsWith('172.') ||
-          baseUrl == 'localhost' ||
-          baseUrl.startsWith('127.')) {
-        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';
-      }
-    }
-    return baseUrl;
-  }
-
-  /// 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');
-  }
-
-  /// 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)
+  /// Login to Music Assistant and get an access token
+  Future<String?> login(String serverUrl, String username, String password) async {
    try {
-      _logger.log('Probing server for auth headers...');
-      // Test root endpoint
-      final probeUrl = baseUrl;
-      _logger.log('Probe URL: $probeUrl');
+      final apiUrl = _buildApiUrl(serverUrl);
+      _logger.log('🔐 Logging in to Music Assistant at $apiUrl');

-      final response = await http.get(
-        Uri.parse(probeUrl),
+      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('Probe status: ${response.statusCode}');
-
-      // 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 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('MA API response: ${response.statusCode}');
-      _logger.log('MA API body: ${response.body}');
-
-      // 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';
-      }
-
-      // Also check for "Authentication required" text response
-      if (response.body.toLowerCase().contains('authentication required')) {
-        _logger.log('MA API returned auth required message');
-        return 'required';
-      }
+      _logger.log('Auth response status: ${response.statusCode}');

      if (response.statusCode == 200) {
-        // Try to parse as JSON
-        try {
-          final data = jsonDecode(response.body) as Map<String, dynamic>;
+        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');
+        if (data.containsKey('error_code')) {
+          _logger.log('✗ Login failed: ${data['error_code']} - ${data['details']}');
+          return null;
        }
+
+        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;
      }

+      _logger.log('✗ Authentication failed: ${response.statusCode}');
      return null;
    } catch (e) {
-      _logger.log('MA auth check error: $e');
+      _logger.log('✗ Login error: $e');
      return null;
    }
  }

-  /// Test if server is accessible without authentication
-  Future<bool> _canConnectWithoutAuth(String serverUrl) async {
+  /// Create a long-lived token for persistent authentication
+  Future<String?> _createLongLivedToken(Uri apiUrl, String accessToken) async {
    try {
-      final uri = Uri.parse(serverUrl);
-      _logger.log('No-auth test URL: $serverUrl');
+      _logger.log('Creating long-lived token...');

-      final isLocalIp = _isLocalIpAddress(uri.host);
-      int statusCode;
+      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 (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;
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body) as Map<String, dynamic>;

-          // 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
-            }
+        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;
          }
-          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');
+      _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;
+    }
+  }

-      // 200 = no auth required
-      // 302/307/308 = redirect (probably to auth or HTTPS)
-      // 401 = auth required
-      if (statusCode == 200) {
-        return true;
+  /// Validate a stored token
+  Future<bool> validateToken(String serverUrl, String storedToken) async {
+    try {
+      final apiUrl = _buildApiUrl(serverUrl);
+
+      final response = await http.post(
+        apiUrl,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer $storedToken',
+        },
+        body: jsonEncode({
+          'command': 'server/info',
+        }),
+      ).timeout(const Duration(seconds: 5));
+
+      if (response.statusCode == 200) {
+        final data = jsonDecode(response.body) as Map<String, dynamic>;
+        if (!data.containsKey('error_code')) {
+          _longLivedToken = storedToken;
+          return true;
+        }
      }

      return false;
    } catch (e) {
-      _logger.log('No-auth error: $e');
+      _logger.log('Token validation failed: $e');
      return false;
    }
  }

-  /// 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
+  /// Build headers for WebSocket connection
  Map<String, dynamic> getWebSocketHeaders() {
-    if (_currentStrategy == null || _currentCredentials == null) {
-      return {};
+    if (token != null) {
+      return {'Authorization': 'Bearer $token'};
    }
-
-    return _currentStrategy!.buildWebSocketHeaders(_currentCredentials!);
+    return {};
  }

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

-  /// 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!),
-    };
+  /// Set token from external source (e.g., restored from settings)
+  void setToken(String? storedToken) {
+    _longLivedToken = storedToken;
  }

-  /// 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
+  /// Clear authentication state
  void logout() {
-    _currentStrategy = null;
-    _currentCredentials = null;
+    _accessToken = null;
+    _longLivedToken = null;
    _logger.log('Logged out - cleared auth state');
  }

-  /// Get strategy by name (for manual selection)
-  AuthStrategy? getStrategyByName(String name) {
-    try {
-      return _strategies.firstWhere((s) => s.name == name);
-    } catch (e) {
-      return null;
+  /// Build API URL from server URL
+  Uri _buildApiUrl(String serverUrl) {
+    var baseUrl = serverUrl;
+    if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
+      baseUrl = 'http://$baseUrl';
    }
+
+    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',
+    );
  }
 }
@@ -1,42 +0,0 @@
-/// 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);
-}
@@ -1,172 +0,0 @@
-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;
-  }
-}
@@ -1,82 +0,0 @@
-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);
-  }
-}
@@ -1,254 +0,0 @@
-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;
-  }
-}
@@ -1,64 +0,0 @@
-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', {});
-  }
-}
@@ -20,9 +20,15 @@ class CacheService {
  List<Album>? _cachedRecentAlbums;
  List<Artist>? _cachedDiscoverArtists;
  List<Album>? _cachedDiscoverAlbums;
+  List<Audiobook>? _cachedInProgressAudiobooks;
+  List<Audiobook>? _cachedDiscoverAudiobooks;
+  List<AudiobookSeries>? _cachedDiscoverSeries;
  DateTime? _recentAlbumsLastFetched;
  DateTime? _discoverArtistsLastFetched;
  DateTime? _discoverAlbumsLastFetched;
+  DateTime? _inProgressAudiobooksLastFetched;
+  DateTime? _discoverAudiobooksLastFetched;
+  DateTime? _discoverSeriesLastFetched;

  // Detail screen caching
  final Map<String, List<Track>> _albumTracksCache = {};
@@ -112,11 +118,82 @@ class CacheService {
    _persistHomeRowToDatabase('discover_albums', albums.map((a) => a.toJson()).toList());
  }

+  /// Check if in-progress audiobooks cache is valid
+  bool isInProgressAudiobooksCacheValid({bool forceRefresh = false}) {
+    if (forceRefresh) return false;
+    final now = DateTime.now();
+    return _cachedInProgressAudiobooks != null &&
+        _inProgressAudiobooksLastFetched != null &&
+        now.difference(_inProgressAudiobooksLastFetched!) < Timings.homeRowCacheDuration;
+  }
+
+  /// Get cached in-progress audiobooks
+  List<Audiobook>? getCachedInProgressAudiobooks() => _cachedInProgressAudiobooks;
+
+  /// Set cached in-progress audiobooks
+  void setCachedInProgressAudiobooks(List<Audiobook> audiobooks) {
+    _cachedInProgressAudiobooks = audiobooks;
+    _inProgressAudiobooksLastFetched = DateTime.now();
+    _logger.log('✅ Cached ${audiobooks.length} in-progress audiobooks');
+  }
+
+  /// Check if discover audiobooks cache is valid
+  bool isDiscoverAudiobooksCacheValid({bool forceRefresh = false}) {
+    if (forceRefresh) return false;
+    final now = DateTime.now();
+    return _cachedDiscoverAudiobooks != null &&
+        _discoverAudiobooksLastFetched != null &&
+        now.difference(_discoverAudiobooksLastFetched!) < Timings.homeRowCacheDuration;
+  }
+
+  /// Get cached discover audiobooks
+  List<Audiobook>? getCachedDiscoverAudiobooks() => _cachedDiscoverAudiobooks;
+
+  /// Set cached discover audiobooks
+  void setCachedDiscoverAudiobooks(List<Audiobook> audiobooks) {
+    _cachedDiscoverAudiobooks = audiobooks;
+    _discoverAudiobooksLastFetched = DateTime.now();
+    _logger.log('✅ Cached ${audiobooks.length} discover audiobooks');
+  }
+
+  /// Check if discover series cache is valid
+  bool isDiscoverSeriesCacheValid({bool forceRefresh = false}) {
+    if (forceRefresh) return false;
+    final now = DateTime.now();
+    return _cachedDiscoverSeries != null &&
+        _discoverSeriesLastFetched != null &&
+        now.difference(_discoverSeriesLastFetched!) < Timings.homeRowCacheDuration;
+  }
+
+  /// Get cached discover series
+  List<AudiobookSeries>? getCachedDiscoverSeries() => _cachedDiscoverSeries;
+
+  /// Set cached discover series
+  void setCachedDiscoverSeries(List<AudiobookSeries> series) {
+    _cachedDiscoverSeries = series;
+    _discoverSeriesLastFetched = DateTime.now();
+    _logger.log('✅ Cached ${series.length} discover series');
+  }
+
+  /// Invalidate audiobook caches
+  void invalidateAudiobookCaches() {
+    _cachedInProgressAudiobooks = null;
+    _inProgressAudiobooksLastFetched = null;
+    _cachedDiscoverAudiobooks = null;
+    _discoverAudiobooksLastFetched = null;
+    _cachedDiscoverSeries = null;
+    _discoverSeriesLastFetched = null;
+    _logger.log('🗑️ Audiobook caches invalidated');
+  }
+
  /// Invalidate home screen cache (call on pull-to-refresh)
  void invalidateHomeCache() {
    _recentAlbumsLastFetched = null;
    _discoverArtistsLastFetched = null;
    _discoverAlbumsLastFetched = null;
+    _inProgressAudiobooksLastFetched = null;
+    _discoverAudiobooksLastFetched = null;
+    _discoverSeriesLastFetched = null;
    _logger.log('🗑️ Home screen cache invalidated');
  }

@@ -136,6 +213,20 @@ class CacheService {
    _logger.log('🗑️ Home artist caches invalidated');
  }

+  /// Clear discover caches (call when provider filter changes)
+  /// This ensures discover rows are refetched with the new provider filter
+  void clearDiscoverCaches() {
+    _cachedDiscoverArtists = null;
+    _discoverArtistsLastFetched = null;
+    _cachedDiscoverAlbums = null;
+    _discoverAlbumsLastFetched = null;
+    _cachedRecentAlbums = null;
+    _recentAlbumsLastFetched = null;
+    _searchCache.clear();
+    _searchCacheTime.clear();
+    _logger.log('🗑️ Discover caches cleared for provider filter change');
+  }
+
  // ============================================================================
  // DETAIL SCREEN CACHING
  // ============================================================================
--- a/Show More
+++ b/Show More