diff --git a/src/lib/components/immersive/panels/CoverflowPanel.svelte b/src/lib/components/immersive/panels/CoverflowPanel.svelte
index 3899c7f38..88e5faf94 100644
--- a/src/lib/components/immersive/panels/CoverflowPanel.svelte
+++ b/src/lib/components/immersive/panels/CoverflowPanel.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { t } from 'svelte-i18n';
+  import { formatTrackTitle } from '$lib/utils/trackTitle';
   import QualityBadge from '$lib/components/QualityBadge.svelte';
   import { cachedSrc } from '$lib/actions/cachedImage';
 
@@ -60,7 +61,7 @@
         items.push({
           index: queueIndex,
           artwork: track.artwork,
-          title: track.title,
+          title: formatTrackTitle(track),
           artist: track.artist,
           position: offset
         });
diff --git a/src/lib/components/views/ArtistDetailView.svelte b/src/lib/components/views/ArtistDetailView.svelte
index 1902f44de..014f87269 100644
--- a/src/lib/components/views/ArtistDetailView.svelte
+++ b/src/lib/components/views/ArtistDetailView.svelte
@@ -42,6 +42,8 @@
   interface Track {
     id: number;
     title: string;
+    /** Qobuz subtitle/edition (e.g. "Player's Ball Mix") (#360). */
+    version?: string | null;
     duration: number;
     album?: {
       id: string;
@@ -63,6 +65,8 @@
   interface DisplayTrack {
     id: number;
     title: string;
+    /** Qobuz subtitle/edition (#360). */
+    version?: string | null;
     artist: string;
     album: string;
     albumArt: string;
@@ -462,6 +466,7 @@
       .map(trk => ({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.performer?.name || artist?.name || 'Unknown',
         album: trk.album?.title || '',
         duration_secs: trk.duration,
@@ -556,6 +561,7 @@
     return tracks.map(track => ({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       duration: track.duration ?? 0,
       album: track.album ? {
         id: track.album.id,
@@ -775,6 +781,7 @@
         onTrackPlay({
           id: firstTrack.id,
           title: firstTrack.title,
+          version: firstTrack.version ?? null,
           artist: firstTrack.artist,
           album: firstTrack.album,
           albumArt: firstTrack.artwork_url || '',
@@ -827,6 +834,7 @@
         onTrackPlay({
           id: firstTrack.id,
           title: firstTrack.title,
+          version: firstTrack.version ?? null,
           artist: firstTrack.artist,
           album: firstTrack.album,
           albumArt: firstTrack.artwork_url || '',
@@ -867,6 +875,7 @@
         onTrackPlay({
           id: firstTrack.id,
           title: firstTrack.title,
+          version: firstTrack.version ?? null,
           artist: firstTrack.artist,
           album: firstTrack.album,
           albumArt: firstTrack.artwork_url || '',
@@ -905,6 +914,7 @@
         onTrackPlay({
           id: firstTrack.id,
           title: firstTrack.title,
+          version: firstTrack.version ?? null,
           artist: firstTrack.artist,
           album: firstTrack.album,
           albumArt: firstTrack.artwork_url || '',
@@ -1216,6 +1226,7 @@
     return tracks.map((track) => ({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || artist.name,
       album: track.album?.title || '',
       duration_secs: track.duration,
@@ -1261,6 +1272,7 @@
       onTrackPlay({
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.performer?.name || artist.name,
         album: track.album?.title || '',
         albumArt: track.album?.image?.large || track.album?.image?.thumbnail || '',
diff --git a/src/lib/components/views/DynamicSuggestView.svelte b/src/lib/components/views/DynamicSuggestView.svelte
index f3af5a26a..d61f6f1e9 100644
--- a/src/lib/components/views/DynamicSuggestView.svelte
+++ b/src/lib/components/views/DynamicSuggestView.svelte
@@ -350,6 +350,7 @@
     return {
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || 'Unknown Artist',
       album: track.album?.title,
       albumArt: getQobuzImage(track.album?.image),
@@ -372,6 +373,7 @@
       .map(trk => ({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.performer?.name || 'Unknown Artist',
         album: trk.album?.title || 'DailyQ',
         duration_secs: trk.duration || 0,
diff --git a/src/lib/components/views/FavQView.svelte b/src/lib/components/views/FavQView.svelte
index e2671bd28..c846a0388 100644
--- a/src/lib/components/views/FavQView.svelte
+++ b/src/lib/components/views/FavQView.svelte
@@ -59,6 +59,8 @@
   interface FavTrack {
     id: number;
     title: string;
+    /** Qobuz subtitle/edition (#360). */
+    version?: string | null;
     duration: number;
     track_number: number;
     performer?: { id?: number; name: string };
@@ -287,6 +289,7 @@
     return {
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || 'Unknown Artist',
       album: track.album?.title,
       albumArt: getQobuzImage(track.album?.image),
@@ -310,6 +313,7 @@
       .map(trk => ({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.performer?.name || 'Unknown Artist',
         album: trk.album?.title || 'FavQ',
         duration_secs: trk.duration || 0,
diff --git a/src/lib/components/views/FavoritesView.svelte b/src/lib/components/views/FavoritesView.svelte
index 895c9665d..a524a7f18 100644
--- a/src/lib/components/views/FavoritesView.svelte
+++ b/src/lib/components/views/FavoritesView.svelte
@@ -56,6 +56,8 @@
   interface FavoriteTrack {
     id: number;
     title: string;
+    /** Qobuz subtitle/edition (e.g. "Player's Ball Mix") (#360). */
+    version?: string | null;
     duration: number;
     track_number: number;
     performer?: { id?: number; name: string };
@@ -339,6 +341,7 @@
       .map(track => ({
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.performer?.name || 'Unknown',
         album: track.album?.title,
         albumId: track.album?.id,
@@ -1230,6 +1233,7 @@
     return tracks.map(trk => ({
       id: trk.id,
       title: trk.title,
+      version: trk.version ?? null,
       artist: trk.performer?.name || 'Unknown Artist',
       album: trk.album?.title || 'Favorites',
       duration_secs: trk.duration,
diff --git a/src/lib/components/views/LabelView.svelte b/src/lib/components/views/LabelView.svelte
index 87878a346..597a3aeae 100644
--- a/src/lib/components/views/LabelView.svelte
+++ b/src/lib/components/views/LabelView.svelte
@@ -34,6 +34,8 @@
   interface Track {
     id: number;
     title: string;
+    /** Qobuz subtitle/edition (#360). */
+    version?: string | null;
     duration: number;
     album?: {
       id: string;
@@ -475,6 +477,7 @@
     return tracks.map((track) => ({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || pageData?.name || '',
       album: track.album?.title || '',
       duration_secs: track.duration,
@@ -525,6 +528,7 @@
       onTrackPlay({
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.performer?.name || pageData?.name || '',
         album: track.album?.title || '',
         albumArt: track.album?.image?.large || track.album?.image?.thumbnail || '',
diff --git a/src/lib/components/views/PurchaseAlbumDetailView.svelte b/src/lib/components/views/PurchaseAlbumDetailView.svelte
index ee1ee25b2..b36599b70 100644
--- a/src/lib/components/views/PurchaseAlbumDetailView.svelte
+++ b/src/lib/components/views/PurchaseAlbumDetailView.svelte
@@ -122,6 +122,7 @@
     return {
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       number: track.track_number,
       artist: track.performer?.name || album?.artist.name,
       album: album?.title || track.album?.title,
diff --git a/src/lib/components/views/PurchasesView.svelte b/src/lib/components/views/PurchasesView.svelte
index 66f3b00b3..8cbebb9c7 100644
--- a/src/lib/components/views/PurchasesView.svelte
+++ b/src/lib/components/views/PurchasesView.svelte
@@ -394,6 +394,7 @@
     return {
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name,
       album: track.album?.title,
       albumArt: getQobuzImage(track.album?.image),
diff --git a/src/lib/components/views/SearchView.svelte b/src/lib/components/views/SearchView.svelte
index db2bcb539..e6c8f5586 100644
--- a/src/lib/components/views/SearchView.svelte
+++ b/src/lib/components/views/SearchView.svelte
@@ -335,6 +335,8 @@
   interface Track {
     id: number;
     title: string;
+    /** Qobuz subtitle/edition (#360). */
+    version?: string | null;
     duration: number;
     album?: {
       id?: string;
@@ -703,6 +705,7 @@
     return tracks.map(track => ({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || 'Unknown Artist',
       album: track.album?.title || '',
       duration_secs: track.duration,
diff --git a/src/lib/components/views/TopQView.svelte b/src/lib/components/views/TopQView.svelte
index 23587cf63..cd193e978 100644
--- a/src/lib/components/views/TopQView.svelte
+++ b/src/lib/components/views/TopQView.svelte
@@ -401,6 +401,7 @@
     return {
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || 'Unknown Artist',
       album: track.album?.title,
       albumArt: getQobuzImage(track.album?.image),
@@ -423,6 +424,7 @@
       .map(trk => ({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.performer?.name || 'Unknown Artist',
         album: trk.album?.title || 'TopQ',
         duration_secs: trk.duration || 0,
diff --git a/src/lib/components/views/WeeklySuggestView.svelte b/src/lib/components/views/WeeklySuggestView.svelte
index 7c090d523..ecb861257 100644
--- a/src/lib/components/views/WeeklySuggestView.svelte
+++ b/src/lib/components/views/WeeklySuggestView.svelte
@@ -348,6 +348,7 @@
     return {
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || 'Unknown Artist',
       album: track.album?.title,
       albumArt: getQobuzImage(track.album?.image),
@@ -370,6 +371,7 @@
       .map(trk => ({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.performer?.name || 'Unknown Artist',
         album: trk.album?.title || 'WeeklyQ',
         duration_secs: trk.duration || 0,
diff --git a/src/lib/services/playbackService.ts b/src/lib/services/playbackService.ts
index e1291fe17..712398e7a 100644
--- a/src/lib/services/playbackService.ts
+++ b/src/lib/services/playbackService.ts
@@ -12,6 +12,7 @@
 import { invoke } from '@tauri-apps/api/core';
 import { get } from 'svelte/store';
 import { t } from '$lib/i18n';
+import { formatTrackTitle } from '$lib/utils/trackTitle';
 import { cmdStop, cmdPlayTrack, skipIfRemote } from '$lib/services/commandRouter';
 import { getTarget } from '$lib/stores/playbackTargetStore';
 import { remotePost } from '$lib/services/remoteApi';
@@ -187,6 +188,7 @@ async function autoSkipToNext(): Promise<boolean> {
     playTrack({
       id: next.id,
       title: next.title,
+      version: next.version ?? null,
       artist: next.artist,
       album: next.album,
       duration: next.duration_secs,
@@ -363,9 +365,12 @@ export async function playTrack(
       });
     }
 
-    // Update MPRIS metadata
+    // Update MPRIS metadata. The user-visible title carries the
+    // version/edition subtitle (#360) — MPRIS surfaces (system tray,
+    // media keys, GNOME shell, Plasma media widget) should match what
+    // qbz shows on screen.
     await updateMediaMetadata({
-      title: track.title,
+      title: formatTrackTitle(track),
       artist: track.artist,
       album: track.album,
       durationSecs: track.duration,
@@ -480,6 +485,7 @@ export async function playTrack(
             playTrack({
               id: next.id,
               title: next.title,
+              version: next.version ?? null,
               artist: next.artist,
               album: next.album,
               duration: next.duration_secs,
diff --git a/src/lib/stores/lyricsStore.ts b/src/lib/stores/lyricsStore.ts
index 7bec76b8a..9c8a13ba3 100644
--- a/src/lib/stores/lyricsStore.ts
+++ b/src/lib/stores/lyricsStore.ts
@@ -312,6 +312,7 @@ export async function fetchLyrics(): Promise<void> {
     const result = await invoke<LyricsPayload | null>('v2_lyrics_get', {
       trackId: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.artist,
       album: track.album || null,
       durationSecs: track.duration || null
diff --git a/src/lib/stores/offlineCacheState.ts b/src/lib/stores/offlineCacheState.ts
index d612dee9b..4e124f94e 100644
--- a/src/lib/stores/offlineCacheState.ts
+++ b/src/lib/stores/offlineCacheState.ts
@@ -1,366 +1,366 @@
-import { invoke } from '@tauri-apps/api/core';
-import { listen, type UnlistenFn } from '@tauri-apps/api/event';
-import { skipIfRemote } from '$lib/services/commandRouter';
-
-export type OfflineCacheStatus = 'none' | 'queued' | 'downloading' | 'ready' | 'failed';
-
-export interface OfflineCacheInfo {
-  status: OfflineCacheStatus;
-  progress: number;
-  error?: string;
-}
-
-export interface CachedTrackInfo {
-  trackId: number;
-  title: string;
-  artist: string;
-  album?: string;
-  albumId?: string;
-  durationSecs: number;
-  fileSizeBytes: number;
-  quality: string;
-  bitDepth?: number;
-  sampleRate?: number;
-  status: OfflineCacheStatus;
-  progressPercent: number;
-  errorMessage?: string;
-  createdAt: string;
-  lastAccessedAt: string;
-}
-
-export interface OfflineCacheStats {
-  totalTracks: number;
-  readyTracks: number;
-  downloadingTracks: number;
-  failedTracks: number;
-  totalSizeBytes: number;
-  limitBytes?: number;
-  cachePath: string;
-}
-
-// Track offline cache states by track ID
-const offlineCacheStates = new Map<number, OfflineCacheInfo>();
-
-// Listeners for state changes
-const listeners = new Set<() => void>();
-
-// Event unsubscribe functions
-let unlisteners: UnlistenFn[] = [];
-// Flag to prevent listener leaks on fast stop/start cycles
-let listenersDisposed = false;
-
-export function getOfflineCacheState(trackId: number): OfflineCacheInfo {
-  return offlineCacheStates.get(trackId) || { status: 'none', progress: 0 };
-}
-
-export function setOfflineCacheState(trackId: number, info: OfflineCacheInfo): void {
-  const current = offlineCacheStates.get(trackId);
-  if (current && current.status === info.status && current.progress === info.progress) return;
-  offlineCacheStates.set(trackId, info);
-  notifyListeners();
-}
-
-// Check if all tracks of an album are cached for offline
-export function isAlbumFullyCached(trackIds: number[]): boolean {
-  if (trackIds.length === 0) return false;
-
-  return trackIds.every(trackId => {
-    const state = getOfflineCacheState(trackId);
-    return state.status === 'ready';
-  });
-}
-
-export function subscribe(listener: () => void): () => void {
-  listeners.add(listener);
-  return () => listeners.delete(listener);
-}
-
-let rafScheduled = false;
-
-function notifyListeners(): void {
-  if (rafScheduled) return;
-  rafScheduled = true;
-  requestAnimationFrame(() => {
-    rafScheduled = false;
-    for (const listener of listeners) {
-      listener();
-    }
-  });
-}
-
-// Initialize offline cache states from backend
-export async function initOfflineCacheStates(): Promise<void> {
-  if (skipIfRemote()) return;
-  try {
-    const tracks = await invoke<CachedTrackInfo[]>('v2_get_cached_tracks');
-    for (const track of tracks) {
-      offlineCacheStates.set(track.trackId, {
-        status: track.status,
-        progress: track.progressPercent,
-        error: track.errorMessage,
-      });
-    }
-    notifyListeners();
-  } catch (err) {
-    console.error('Failed to init offline cache states:', err);
-  }
-}
-
-// Start listening for offline cache events
-export async function startOfflineCacheEventListeners(): Promise<void> {
-  if (skipIfRemote()) return;
-  // Idempotency guard: prevent duplicate listeners on HMR/remount
-  if (unlisteners.length > 0) {
-    return;
-  }
-
-  // Reset disposed flag when starting
-  listenersDisposed = false;
-
-  try {
-    const unlistenStarted = await listen<{ trackId: number }>('offline:caching_started', (event) => {
-      console.log('Offline caching started:', event.payload.trackId);
-      setOfflineCacheState(event.payload.trackId, { status: 'downloading', progress: 0 });
-    });
-    // Check if stop was called while we were awaiting
-    if (listenersDisposed) { unlistenStarted(); return; }
-
-    const unlistenProgress = await listen<{
-      trackId: number;
-      progressPercent: number;
-      bytesDownloaded: number;
-      totalBytes?: number;
-      status: string;
-    }>('offline:caching_progress', (event) => {
-      const { trackId, progressPercent } = event.payload;
-      setOfflineCacheState(trackId, { status: 'downloading', progress: progressPercent });
-    });
-    if (listenersDisposed) { unlistenStarted(); unlistenProgress(); return; }
-
-    const unlistenCompleted = await listen<{ trackId: number; size: number }>('offline:caching_completed', (event) => {
-      console.log('Offline caching completed:', event.payload.trackId);
-      setOfflineCacheState(event.payload.trackId, { status: 'ready', progress: 100 });
-    });
-    if (listenersDisposed) { unlistenStarted(); unlistenProgress(); unlistenCompleted(); return; }
-
-    const unlistenFailed = await listen<{ trackId: number; error: string }>('offline:caching_failed', (event) => {
-      console.error('Offline caching failed:', event.payload.trackId, event.payload.error);
-      setOfflineCacheState(event.payload.trackId, {
-        status: 'failed',
-        progress: 0,
-        error: event.payload.error,
-      });
-    });
-    if (listenersDisposed) { unlistenStarted(); unlistenProgress(); unlistenCompleted(); unlistenFailed(); return; }
-
-    unlisteners = [unlistenStarted, unlistenProgress, unlistenCompleted, unlistenFailed];
-  } catch (err) {
-    console.error('Failed to setup offline cache event listeners:', err);
-  }
-}
-
-// Stop listening for events
-export function stopOfflineCacheEventListeners(): void {
-  // Set disposed flag to prevent leaks from pending async registrations
-  listenersDisposed = true;
-  for (const unlisten of unlisteners) {
-    unlisten();
-  }
-  unlisteners = [];
-}
-
-// Cache a track for offline listening
-export async function cacheTrackForOffline(track: {
-  id: number;
-  title: string;
-  artist: string;
-  album?: string;
-  albumId?: string;
-  durationSecs: number;
-  quality: string;
-  bitDepth?: number;
-  sampleRate?: number;
-}): Promise<void> {
-  if (skipIfRemote()) return;
-  try {
-    setOfflineCacheState(track.id, { status: 'queued', progress: 0 });
-    await invoke('v2_cache_track_for_offline', {
-      trackId: track.id,
-      title: track.title,
-      artist: track.artist,
-      album: track.album,
-      albumId: track.albumId,
-      durationSecs: track.durationSecs,
-      quality: track.quality,
-      bitDepth: track.bitDepth,
-      sampleRate: track.sampleRate,
-    });
-  } catch (err) {
-    console.error('Failed to cache track for offline:', err);
-    setOfflineCacheState(track.id, { status: 'failed', progress: 0, error: String(err) });
-    throw err;
-  }
-}
-
-// Cache multiple tracks for offline in a single batch IPC call
-export async function cacheTracksForOfflineBatch(tracks: Array<{
-  id: number;
-  title: string;
-  artist: string;
-  album?: string;
-  albumId?: string;
-  durationSecs: number;
-  quality: string;
-  bitDepth?: number;
-  sampleRate?: number;
-}>): Promise<void> {
-  if (skipIfRemote()) return;
-  if (tracks.length === 0) return;
-
-  // Mark all as queued immediately
-  for (const track of tracks) {
-    setOfflineCacheState(track.id, { status: 'queued', progress: 0 });
-  }
-
-  try {
-    await invoke('v2_cache_tracks_batch_for_offline', {
-      tracks: tracks.map(track => ({
-        id: track.id,
-        title: track.title,
-        artist: track.artist,
-        album: track.album,
-        albumId: track.albumId,
-        durationSecs: track.durationSecs,
-        quality: track.quality,
-        bitDepth: track.bitDepth,
-        sampleRate: track.sampleRate,
-      })),
-    });
-  } catch (err) {
-    console.error('Failed to batch cache tracks for offline:', err);
-    for (const track of tracks) {
-      setOfflineCacheState(track.id, { status: 'failed', progress: 0, error: String(err) });
-    }
-    throw err;
-  }
-}
-
-// Remove a track from offline cache
-export async function removeCachedTrack(trackId: number): Promise<void> {
-  if (skipIfRemote()) return;
-  try {
-    await invoke('v2_remove_cached_track', { trackId });
-    offlineCacheStates.delete(trackId);
-    notifyListeners();
-  } catch (err) {
-    console.error('Failed to remove cached track:', err);
-    throw err;
-  }
-}
-
-// Get offline cache stats
-export async function getOfflineCacheStats(): Promise<OfflineCacheStats> {
-  if (skipIfRemote()) return { totalTracks: 0, readyTracks: 0, downloadingTracks: 0, failedTracks: 0, totalSizeBytes: 0, cachePath: '' };
-  return invoke<OfflineCacheStats>('v2_get_offline_cache_stats');
-}
-
-// Clear all offline cache
-export async function clearOfflineCache(): Promise<void> {
-  if (skipIfRemote()) return;
-  await invoke('v2_clear_offline_cache');
-  offlineCacheStates.clear();
-  notifyListeners();
-}
-
-// Open offline cache folder
-export async function openOfflineCacheFolder(): Promise<void> {
-  if (skipIfRemote()) return;
-  await invoke('v2_open_offline_cache_folder');
-}
-
-// Set offline cache limit
-export async function setOfflineCacheLimit(limitMb: number | null): Promise<void> {
-  if (skipIfRemote()) return;
-  await invoke('v2_set_offline_cache_limit', { limitMb });
-}
-
-// Open containing folder for a specific album
-export async function openAlbumFolder(albumId: string): Promise<void> {
-  if (skipIfRemote()) return;
-  await invoke('v2_open_album_folder', { albumId });
-}
-
-// Open containing folder for a specific track
-export async function openTrackFolder(trackId: number): Promise<void> {
-  if (skipIfRemote()) return;
-  await invoke('v2_open_track_folder', { trackId });
-}
-
-// Refresh a cached track (re-cache, overwriting if exists)
-export async function refreshCachedTrack(track: {
-  id: number;
-  title: string;
-  artist: string;
-  album?: string;
-  albumId?: string;
-  durationSecs: number;
-  quality: string;
-  bitDepth?: number;
-  sampleRate?: number;
-}): Promise<void> {
-  // Just call cacheTrackForOffline - backend handles overwriting
-  await cacheTrackForOffline(track);
-}
-
-// ============================================================================
-// COMPATIBILITY ALIASES - These maintain backward compatibility during refactor
-// Will be removed once all references are updated
-// ============================================================================
-
-/** @deprecated Use OfflineCacheStatus instead */
-export type DownloadStatus = OfflineCacheStatus;
-
-/** @deprecated Use OfflineCacheInfo instead */
-export type DownloadInfo = OfflineCacheInfo;
-
-/** @deprecated Use OfflineCacheStats instead */
-export type DownloadCacheStats = OfflineCacheStats;
-
-/** @deprecated Use getOfflineCacheState instead */
-export const getDownloadState = getOfflineCacheState;
-
-/** @deprecated Use setOfflineCacheState instead */
-export const setDownloadState = setOfflineCacheState;
-
-/** @deprecated Use isAlbumFullyCached instead */
-export const isAlbumFullyDownloaded = isAlbumFullyCached;
-
-/** @deprecated Use initOfflineCacheStates instead */
-export const initDownloadStates = initOfflineCacheStates;
-
-/** @deprecated Use startOfflineCacheEventListeners instead */
-export const startDownloadEventListeners = startOfflineCacheEventListeners;
-
-/** @deprecated Use stopOfflineCacheEventListeners instead */
-export const stopDownloadEventListeners = stopOfflineCacheEventListeners;
-
-/** @deprecated Use cacheTrackForOffline instead */
-export const downloadTrack = cacheTrackForOffline;
-
-/** @deprecated Use removeCachedTrack instead */
-export const removeDownload = removeCachedTrack;
-
-/** @deprecated Use getOfflineCacheStats instead */
-export const getDownloadCacheStats = getOfflineCacheStats;
-
-/** @deprecated Use clearOfflineCache instead */
-export const clearDownloadCache = clearOfflineCache;
-
-/** @deprecated Use openOfflineCacheFolder instead */
-export const openDownloadCacheFolder = openOfflineCacheFolder;
-
-/** @deprecated Use setOfflineCacheLimit instead */
-export const setDownloadCacheLimit = setOfflineCacheLimit;
-
-/** @deprecated Use refreshCachedTrack instead */
-export const reDownloadTrack = refreshCachedTrack;
+import { invoke } from '@tauri-apps/api/core';
+import { listen, type UnlistenFn } from '@tauri-apps/api/event';
+import { skipIfRemote } from '$lib/services/commandRouter';
+
+export type OfflineCacheStatus = 'none' | 'queued' | 'downloading' | 'ready' | 'failed';
+
+export interface OfflineCacheInfo {
+  status: OfflineCacheStatus;
+  progress: number;
+  error?: string;
+}
+
+export interface CachedTrackInfo {
+  trackId: number;
+  title: string;
+  artist: string;
+  album?: string;
+  albumId?: string;
+  durationSecs: number;
+  fileSizeBytes: number;
+  quality: string;
+  bitDepth?: number;
+  sampleRate?: number;
+  status: OfflineCacheStatus;
+  progressPercent: number;
+  errorMessage?: string;
+  createdAt: string;
+  lastAccessedAt: string;
+}
+
+export interface OfflineCacheStats {
+  totalTracks: number;
+  readyTracks: number;
+  downloadingTracks: number;
+  failedTracks: number;
+  totalSizeBytes: number;
+  limitBytes?: number;
+  cachePath: string;
+}
+
+// Track offline cache states by track ID
+const offlineCacheStates = new Map<number, OfflineCacheInfo>();
+
+// Listeners for state changes
+const listeners = new Set<() => void>();
+
+// Event unsubscribe functions
+let unlisteners: UnlistenFn[] = [];
+// Flag to prevent listener leaks on fast stop/start cycles
+let listenersDisposed = false;
+
+export function getOfflineCacheState(trackId: number): OfflineCacheInfo {
+  return offlineCacheStates.get(trackId) || { status: 'none', progress: 0 };
+}
+
+export function setOfflineCacheState(trackId: number, info: OfflineCacheInfo): void {
+  const current = offlineCacheStates.get(trackId);
+  if (current && current.status === info.status && current.progress === info.progress) return;
+  offlineCacheStates.set(trackId, info);
+  notifyListeners();
+}
+
+// Check if all tracks of an album are cached for offline
+export function isAlbumFullyCached(trackIds: number[]): boolean {
+  if (trackIds.length === 0) return false;
+
+  return trackIds.every(trackId => {
+    const state = getOfflineCacheState(trackId);
+    return state.status === 'ready';
+  });
+}
+
+export function subscribe(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => listeners.delete(listener);
+}
+
+let rafScheduled = false;
+
+function notifyListeners(): void {
+  if (rafScheduled) return;
+  rafScheduled = true;
+  requestAnimationFrame(() => {
+    rafScheduled = false;
+    for (const listener of listeners) {
+      listener();
+    }
+  });
+}
+
+// Initialize offline cache states from backend
+export async function initOfflineCacheStates(): Promise<void> {
+  if (skipIfRemote()) return;
+  try {
+    const tracks = await invoke<CachedTrackInfo[]>('v2_get_cached_tracks');
+    for (const track of tracks) {
+      offlineCacheStates.set(track.trackId, {
+        status: track.status,
+        progress: track.progressPercent,
+        error: track.errorMessage,
+      });
+    }
+    notifyListeners();
+  } catch (err) {
+    console.error('Failed to init offline cache states:', err);
+  }
+}
+
+// Start listening for offline cache events
+export async function startOfflineCacheEventListeners(): Promise<void> {
+  if (skipIfRemote()) return;
+  // Idempotency guard: prevent duplicate listeners on HMR/remount
+  if (unlisteners.length > 0) {
+    return;
+  }
+
+  // Reset disposed flag when starting
+  listenersDisposed = false;
+
+  try {
+    const unlistenStarted = await listen<{ trackId: number }>('offline:caching_started', (event) => {
+      console.log('Offline caching started:', event.payload.trackId);
+      setOfflineCacheState(event.payload.trackId, { status: 'downloading', progress: 0 });
+    });
+    // Check if stop was called while we were awaiting
+    if (listenersDisposed) { unlistenStarted(); return; }
+
+    const unlistenProgress = await listen<{
+      trackId: number;
+      progressPercent: number;
+      bytesDownloaded: number;
+      totalBytes?: number;
+      status: string;
+    }>('offline:caching_progress', (event) => {
+      const { trackId, progressPercent } = event.payload;
+      setOfflineCacheState(trackId, { status: 'downloading', progress: progressPercent });
+    });
+    if (listenersDisposed) { unlistenStarted(); unlistenProgress(); return; }
+
+    const unlistenCompleted = await listen<{ trackId: number; size: number }>('offline:caching_completed', (event) => {
+      console.log('Offline caching completed:', event.payload.trackId);
+      setOfflineCacheState(event.payload.trackId, { status: 'ready', progress: 100 });
+    });
+    if (listenersDisposed) { unlistenStarted(); unlistenProgress(); unlistenCompleted(); return; }
+
+    const unlistenFailed = await listen<{ trackId: number; error: string }>('offline:caching_failed', (event) => {
+      console.error('Offline caching failed:', event.payload.trackId, event.payload.error);
+      setOfflineCacheState(event.payload.trackId, {
+        status: 'failed',
+        progress: 0,
+        error: event.payload.error,
+      });
+    });
+    if (listenersDisposed) { unlistenStarted(); unlistenProgress(); unlistenCompleted(); unlistenFailed(); return; }
+
+    unlisteners = [unlistenStarted, unlistenProgress, unlistenCompleted, unlistenFailed];
+  } catch (err) {
+    console.error('Failed to setup offline cache event listeners:', err);
+  }
+}
+
+// Stop listening for events
+export function stopOfflineCacheEventListeners(): void {
+  // Set disposed flag to prevent leaks from pending async registrations
+  listenersDisposed = true;
+  for (const unlisten of unlisteners) {
+    unlisten();
+  }
+  unlisteners = [];
+}
+
+// Cache a track for offline listening
+export async function cacheTrackForOffline(track: {
+  id: number;
+  title: string;
+  artist: string;
+  album?: string;
+  albumId?: string;
+  durationSecs: number;
+  quality: string;
+  bitDepth?: number;
+  sampleRate?: number;
+}): Promise<void> {
+  if (skipIfRemote()) return;
+  try {
+    setOfflineCacheState(track.id, { status: 'queued', progress: 0 });
+    await invoke('v2_cache_track_for_offline', {
+      trackId: track.id,
+      title: track.title,
+      artist: track.artist,
+      album: track.album,
+      albumId: track.albumId,
+      durationSecs: track.durationSecs,
+      quality: track.quality,
+      bitDepth: track.bitDepth,
+      sampleRate: track.sampleRate,
+    });
+  } catch (err) {
+    console.error('Failed to cache track for offline:', err);
+    setOfflineCacheState(track.id, { status: 'failed', progress: 0, error: String(err) });
+    throw err;
+  }
+}
+
+// Cache multiple tracks for offline in a single batch IPC call
+export async function cacheTracksForOfflineBatch(tracks: Array<{
+  id: number;
+  title: string;
+  artist: string;
+  album?: string;
+  albumId?: string;
+  durationSecs: number;
+  quality: string;
+  bitDepth?: number;
+  sampleRate?: number;
+}>): Promise<void> {
+  if (skipIfRemote()) return;
+  if (tracks.length === 0) return;
+
+  // Mark all as queued immediately
+  for (const track of tracks) {
+    setOfflineCacheState(track.id, { status: 'queued', progress: 0 });
+  }
+
+  try {
+    await invoke('v2_cache_tracks_batch_for_offline', {
+      tracks: tracks.map(track => ({
+        id: track.id,
+        title: track.title,
+        artist: track.artist,
+        album: track.album,
+        albumId: track.albumId,
+        durationSecs: track.durationSecs,
+        quality: track.quality,
+        bitDepth: track.bitDepth,
+        sampleRate: track.sampleRate,
+      })),
+    });
+  } catch (err) {
+    console.error('Failed to batch cache tracks for offline:', err);
+    for (const track of tracks) {
+      setOfflineCacheState(track.id, { status: 'failed', progress: 0, error: String(err) });
+    }
+    throw err;
+  }
+}
+
+// Remove a track from offline cache
+export async function removeCachedTrack(trackId: number): Promise<void> {
+  if (skipIfRemote()) return;
+  try {
+    await invoke('v2_remove_cached_track', { trackId });
+    offlineCacheStates.delete(trackId);
+    notifyListeners();
+  } catch (err) {
+    console.error('Failed to remove cached track:', err);
+    throw err;
+  }
+}
+
+// Get offline cache stats
+export async function getOfflineCacheStats(): Promise<OfflineCacheStats> {
+  if (skipIfRemote()) return { totalTracks: 0, readyTracks: 0, downloadingTracks: 0, failedTracks: 0, totalSizeBytes: 0, cachePath: '' };
+  return invoke<OfflineCacheStats>('v2_get_offline_cache_stats');
+}
+
+// Clear all offline cache
+export async function clearOfflineCache(): Promise<void> {
+  if (skipIfRemote()) return;
+  await invoke('v2_clear_offline_cache');
+  offlineCacheStates.clear();
+  notifyListeners();
+}
+
+// Open offline cache folder
+export async function openOfflineCacheFolder(): Promise<void> {
+  if (skipIfRemote()) return;
+  await invoke('v2_open_offline_cache_folder');
+}
+
+// Set offline cache limit
+export async function setOfflineCacheLimit(limitMb: number | null): Promise<void> {
+  if (skipIfRemote()) return;
+  await invoke('v2_set_offline_cache_limit', { limitMb });
+}
+
+// Open containing folder for a specific album
+export async function openAlbumFolder(albumId: string): Promise<void> {
+  if (skipIfRemote()) return;
+  await invoke('v2_open_album_folder', { albumId });
+}
+
+// Open containing folder for a specific track
+export async function openTrackFolder(trackId: number): Promise<void> {
+  if (skipIfRemote()) return;
+  await invoke('v2_open_track_folder', { trackId });
+}
+
+// Refresh a cached track (re-cache, overwriting if exists)
+export async function refreshCachedTrack(track: {
+  id: number;
+  title: string;
+  artist: string;
+  album?: string;
+  albumId?: string;
+  durationSecs: number;
+  quality: string;
+  bitDepth?: number;
+  sampleRate?: number;
+}): Promise<void> {
+  // Just call cacheTrackForOffline - backend handles overwriting
+  await cacheTrackForOffline(track);
+}
+
+// ============================================================================
+// COMPATIBILITY ALIASES - These maintain backward compatibility during refactor
+// Will be removed once all references are updated
+// ============================================================================
+
+/** @deprecated Use OfflineCacheStatus instead */
+export type DownloadStatus = OfflineCacheStatus;
+
+/** @deprecated Use OfflineCacheInfo instead */
+export type DownloadInfo = OfflineCacheInfo;
+
+/** @deprecated Use OfflineCacheStats instead */
+export type DownloadCacheStats = OfflineCacheStats;
+
+/** @deprecated Use getOfflineCacheState instead */
+export const getDownloadState = getOfflineCacheState;
+
+/** @deprecated Use setOfflineCacheState instead */
+export const setDownloadState = setOfflineCacheState;
+
+/** @deprecated Use isAlbumFullyCached instead */
+export const isAlbumFullyDownloaded = isAlbumFullyCached;
+
+/** @deprecated Use initOfflineCacheStates instead */
+export const initDownloadStates = initOfflineCacheStates;
+
+/** @deprecated Use startOfflineCacheEventListeners instead */
+export const startDownloadEventListeners = startOfflineCacheEventListeners;
+
+/** @deprecated Use stopOfflineCacheEventListeners instead */
+export const stopDownloadEventListeners = stopOfflineCacheEventListeners;
+
+/** @deprecated Use cacheTrackForOffline instead */
+export const downloadTrack = cacheTrackForOffline;
+
+/** @deprecated Use removeCachedTrack instead */
+export const removeDownload = removeCachedTrack;
+
+/** @deprecated Use getOfflineCacheStats instead */
+export const getDownloadCacheStats = getOfflineCacheStats;
+
+/** @deprecated Use clearOfflineCache instead */
+export const clearDownloadCache = clearOfflineCache;
+
+/** @deprecated Use openOfflineCacheFolder instead */
+export const openDownloadCacheFolder = openOfflineCacheFolder;
+
+/** @deprecated Use setOfflineCacheLimit instead */
+export const setDownloadCacheLimit = setOfflineCacheLimit;
+
+/** @deprecated Use refreshCachedTrack instead */
+export const reDownloadTrack = refreshCachedTrack;
diff --git a/src/lib/types/dynamicSuggest.ts b/src/lib/types/dynamicSuggest.ts
index e1fdafe95..730bc529b 100644
--- a/src/lib/types/dynamicSuggest.ts
+++ b/src/lib/types/dynamicSuggest.ts
@@ -8,6 +8,8 @@ export interface DynamicTrackToAnalyseInput {
 export interface DynamicSuggestTrack {
   id: number;
   title: string;
+  /** Qobuz subtitle/edition (#360). */
+  version?: string | null;
   duration?: number;
   performer?: { id?: number; name: string };
   album?: {
diff --git a/src/lib/types/purchases.ts b/src/lib/types/purchases.ts
index 47ce44458..051c6679f 100644
--- a/src/lib/types/purchases.ts
+++ b/src/lib/types/purchases.ts
@@ -37,6 +37,8 @@ export interface PurchasedAlbum {
 export interface PurchasedTrack {
   id: number;
   title: string;
+  /** Qobuz subtitle/edition (#360). */
+  version?: string | null;
   track_number: number;
   media_number?: number;
   duration: number;
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 1e6f4dfdf..d8adc1eac 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1183,6 +1183,7 @@
     return {
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.artist,
       album: track.album,
       artwork: track.artwork_url || '',
@@ -1585,6 +1586,7 @@
       const queueTracks = playableTracks.map((trk) => ({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.artist || converted.artist || 'Unknown Artist',
         album: converted.title || '',
         duration_secs: trk.durationSeconds,
@@ -1738,6 +1740,7 @@
         .map((trk) => ({
           id: trk.id,
           title: trk.title,
+          version: trk.version ?? null,
           artist: trk.artist || converted.artist || 'Unknown Artist',
           album: albumTitle,
           duration_secs: trk.durationSeconds,
@@ -2185,6 +2188,7 @@
     const queueTracks: BackendQueueTrack[] = album.tracks.map(trk => ({
       id: trk.id,
       title: trk.title,
+      version: trk.version ?? null,
       artist: trk.artist || album.artist || 'Unknown Artist',
       album: album.title || '',
       duration_secs: trk.durationSeconds,
@@ -2211,6 +2215,7 @@
     await playTrack({
       id: firstTrack.id,
       title: firstTrack.title,
+      version: firstTrack.version ?? null,
       artist: firstTrack.artist || album.artist || 'Unknown Artist',
       album: album.title || '',
       artwork,
@@ -2234,6 +2239,7 @@
       const queued = await queueTrackNext({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.artist || album.artist || 'Unknown Artist',
         album: album.title || '',
         duration_secs: trk.durationSeconds,
@@ -2267,6 +2273,7 @@
     const queueTracks: BackendQueueTrack[] = album.tracks.map(trk => ({
       id: trk.id,
       title: trk.title,
+      version: trk.version ?? null,
       artist: trk.artist || album.artist || 'Unknown Artist',
       album: album.title || '',
       duration_secs: trk.durationSeconds,
@@ -2342,6 +2349,7 @@
       await cacheTracksForOfflineBatch(tracksToDownload.map(track => ({
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.artist || album.artist || 'Unknown',
         album: album.title,
         albumId: album.id,
@@ -2567,6 +2575,7 @@
     await playTrack({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.performer?.name || 'Unknown Artist',
       album: track.album?.title || '',
       artwork,
@@ -2625,6 +2634,7 @@
       const queueTracks: BackendQueueTrack[] = playableTracks.map(trk => ({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.artist || album.artist || 'Unknown Artist',
         album: album.title || '',
         duration_secs: trk.durationSeconds,
@@ -2652,6 +2662,7 @@
     await playTrack({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.artist || selectedAlbum?.artist || 'Unknown Artist',
       album: selectedAlbum?.title || '',
       artwork,
@@ -2955,6 +2966,7 @@
     await playTrack({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.artist,
       album: track.album,
       artwork: resolveQueueTrackArtwork(track.artwork_url),
@@ -3126,6 +3138,7 @@
       await handleTrackPlay({
         id: historyTrack.id,
         title: historyTrack.title,
+        version: historyTrack.version ?? null,
         performer: { name: historyTrack.artist },
         album: { title: historyTrack.album, image: { large: historyTrack.artwork_url || '' } },
         duration: historyTrack.duration_secs,
@@ -3207,6 +3220,7 @@
         playTrack({
           id: firstTrack.id,
           title: firstTrack.title,
+          version: firstTrack.version ?? null,
           artist: firstTrack.artist,
           album: firstTrack.album,
           artwork: firstTrack.artwork_url || '',
@@ -3241,6 +3255,7 @@
         playTrack({
           id: firstTrack.id,
           title: firstTrack.title,
+          version: firstTrack.version ?? null,
           artist: firstTrack.artist,
           album: firstTrack.album,
           artwork: firstTrack.artwork_url || '',
@@ -3276,6 +3291,7 @@
         playTrack({
           id: firstTrack.id,
           title: firstTrack.title,
+          version: firstTrack.version ?? null,
           artist: firstTrack.artist,
           album: firstTrack.album,
           artwork: firstTrack.artwork_url || '',
@@ -3317,6 +3333,7 @@
       const queued = await queueTrackNext({
         id: trk.id,
         title: trk.title,
+        version: trk.version ?? null,
         artist: trk.artist || album.artist || 'Unknown Artist',
         album: album.title || '',
         duration_secs: trk.durationSeconds,
@@ -3360,6 +3377,7 @@
     const queueTracks: BackendQueueTrack[] = playableTracks.map(trk => ({
       id: trk.id,
       title: trk.title,
+      version: trk.version ?? null,
       artist: trk.artist || album.artist || 'Unknown Artist',
       album: album.title || '',
       duration_secs: trk.durationSeconds,
@@ -3518,6 +3536,7 @@
       await cacheTracksForOfflineBatch(tracksToDownload.map(track => ({
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.artist || album.artist || 'Unknown',
         album: album.title,
         albumId: album.id,
@@ -3552,6 +3571,7 @@
       await cacheTracksForOfflineBatch(album.tracks.map(track => ({
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.artist || album.artist || 'Unknown',
         album: album.title,
         albumId: album.id,
@@ -3588,6 +3608,7 @@
         await cacheTracksForOfflineBatch(album.tracks.items.map(track => ({
           id: track.id,
           title: track.title,
+          version: track.version ?? null,
           artist: track.performer?.name || album.artist?.name || 'Unknown',
           album: album.title,
           albumId: album.id,
@@ -3693,6 +3714,7 @@
     playTrack({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.artist || 'Unknown Artist',
       album: track.album || 'Playlist',
       artwork: track.albumArt || '',
@@ -3723,6 +3745,7 @@
       {
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.artist || 'Unknown Artist',
         album: track.album || 'Playlist',
         artwork: track.albumArt || '',
@@ -4066,6 +4089,7 @@
             setCurrentTrack({
               id: track.id,
               title: track.title,
+              version: track.version ?? null,
               artist: track.artist,
               album: track.album,
               artwork: resolveQueueTrackArtwork(track.artwork_url),
@@ -4271,6 +4295,7 @@
       const allTracks: PersistedQueueTrack[] = tracks.map(track => ({
         id: track.id,
         title: track.title,
+        version: track.version ?? null,
         artist: track.artist,
         album: track.album,
         duration_secs: track.duration_secs,
@@ -4467,6 +4492,7 @@
       await playTrack({
         id: next.id,
         title: next.title,
+        version: next.version ?? null,
         artist: next.artist,
         album: next.album,
         duration: next.duration_secs,
diff --git a/src/routes/miniplayer/+page.svelte b/src/routes/miniplayer/+page.svelte
index 6ba3958aa..241deb489 100644
--- a/src/routes/miniplayer/+page.svelte
+++ b/src/routes/miniplayer/+page.svelte
@@ -356,6 +356,7 @@
     await playTrack({
       id: track.id,
       title: track.title,
+      version: track.version ?? null,
       artist: track.artist,
       album: track.album,
       artwork: track.artwork_url || '',