refactor(nowPlaying): co-locate now playing feature into features/nowPlaying

src/app/AppRoutes.tsx

@@ -26,7 +26,7 @@ const RandomAlbums = lazy(() => import('../pages/RandomAlbums'));
 const LuckyMixPage = lazy(() => import('../pages/LuckyMix'));
 const Playlists = lazy(() => import('../pages/Playlists'));
 const PlaylistDetail = lazy(() => import('../pages/PlaylistDetail'));
-const NowPlayingPage = lazy(() => import('../pages/NowPlaying'));
+const NowPlayingPage = lazy(() => import('@/features/nowPlaying/pages/NowPlaying'));
 const Settings = lazy(() => import('../pages/Settings'));
 const Statistics = lazy(() => import('@/features/stats/pages/Statistics'));
 const Help = lazy(() => import('../pages/Help'));

src/app/AppShell.tsx

@@ -11,7 +11,7 @@ import BottomNav from '../components/BottomNav';
 import { useIsMobile } from '../hooks/useIsMobile';
 import LiveSearch from '../components/LiveSearch';
 import DevNetworkModeToggle from '../components/DevNetworkModeToggle';
-import NowPlayingDropdown from '../components/NowPlayingDropdown';
+import { NowPlayingDropdown } from '@/features/nowPlaying';
 import QueuePanel from '../components/QueuePanel';
 import AppRoutes from './AppRoutes';
 import FullscreenPlayer from '@/features/fullscreenPlayer';
@@ -52,7 +52,7 @@ import { useAppActivityTracking } from '../hooks/useAppActivityTracking';
 import { useMainScrollingIndicator } from '../hooks/useMainScrollingIndicator';
 import { useCoverNavigationPriority } from '../hooks/useCoverNavigationPriority';
 import { useLiveSearchRouteScope } from '../hooks/useLiveSearchRouteScope';
-import { useNowPlayingPrewarm } from '../hooks/useNowPlayingPrewarm';
+import { useNowPlayingPrewarm } from '@/features/nowPlaying';
 import { useOfflineAutoNav } from '../hooks/useOfflineAutoNav';
 import { useOfflineLibraryFilterSuspend } from '../hooks/useOfflineLibraryFilterSuspend';
 import { AppShellQueueResizerSeam } from '../components/AppShellQueueResizerSeam';

src/components/QueuePanel.tsx

@@ -20,7 +20,7 @@ import { showToast } from '../utils/ui/toast';
 import { useThemeStore } from '../store/themeStore';
 import { useLyricsStore } from '../store/lyricsStore';
 import LyricsPane from './LyricsPane';
-import NowPlayingInfo from './NowPlayingInfo';
+import { NowPlayingInfo } from '@/features/nowPlaying';
 import { useLuckyMixStore } from '../store/luckyMixStore';
 import { useQueueToolbarStore } from '../store/queueToolbarStore';
 import { SavePlaylistModal } from './queuePanel/SavePlaylistModal';

src/features/nowPlaying/api/nowPlayingPresence.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { nowPlayingPresence, NOW_PLAYING_IDLE_MINUTES } from './nowPlayingPresence';
-import type { SubsonicNowPlaying, PlaybackReportState } from './subsonicTypes';
+import { nowPlayingPresence, NOW_PLAYING_IDLE_MINUTES } from '@/features/nowPlaying/api/nowPlayingPresence';
+import type { SubsonicNowPlaying, PlaybackReportState } from '@/api/subsonicTypes';
 
 // The function only reads `state` and `minutesAgo`; cast a minimal fixture.
 function entry(partial: { state?: PlaybackReportState; minutesAgo?: number }): SubsonicNowPlaying {

src/features/nowPlaying/api/nowPlayingPresence.ts

@@ -1,4 +1,4 @@
-import type { SubsonicNowPlaying } from './subsonicTypes';
+import type { SubsonicNowPlaying } from '@/api/subsonicTypes';
 
 /**
  * Derived liveness of a now-playing entry, surfaced as the indicator dot in the

src/features/nowPlaying/components/AlbumCard.tsx

@@ -1,9 +1,9 @@
 import React, { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Disc3, ExternalLink, Star } from 'lucide-react';
-import type { SubsonicAlbum, SubsonicSong } from '../../api/subsonicTypes';
-import { formatTotalDuration } from '../../utils/componentHelpers/nowPlayingHelpers';
-import { formatTrackTime } from '../../utils/format/formatDuration';
+import type { SubsonicAlbum, SubsonicSong } from '@/api/subsonicTypes';
+import { formatTotalDuration } from '@/utils/componentHelpers/nowPlayingHelpers';
+import { formatTrackTime } from '@/utils/format/formatDuration';
 
 interface AlbumCardProps {
   album: SubsonicAlbum | null;

src/features/nowPlaying/components/ArtistCard.test.tsx

@@ -7,8 +7,8 @@
 import { describe, it, expect, vi } from 'vitest';
 import { fireEvent } from '@testing-library/react';
 import { renderWithProviders } from '@/test/helpers/renderWithProviders';
-import ArtistCard from './ArtistCard';
-import type { SubsonicArtistInfo } from '../../api/subsonicTypes';
+import ArtistCard from '@/features/nowPlaying/components/ArtistCard';
+import type { SubsonicArtistInfo } from '@/api/subsonicTypes';
 
 const infoWithImage: SubsonicArtistInfo = {
   biography: 'Some bio text here.',

src/features/nowPlaying/components/ArtistCard.tsx

@@ -1,8 +1,8 @@
 import React, { memo, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ExternalLink } from 'lucide-react';
-import type { SubsonicArtistInfo } from '../../api/subsonicTypes';
-import { isRealArtistImage, sanitizeHtml } from '../../utils/componentHelpers/nowPlayingHelpers';
+import type { SubsonicArtistInfo } from '@/api/subsonicTypes';
+import { isRealArtistImage, sanitizeHtml } from '@/utils/componentHelpers/nowPlayingHelpers';
 import CachedImage from '@/ui/CachedImage';
 
 export interface ArtistCardTab {

src/features/nowPlaying/components/CreditsCard.tsx

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
-import type { ContributorRow } from '../../utils/componentHelpers/nowPlayingHelpers';
+import type { ContributorRow } from '@/utils/componentHelpers/nowPlayingHelpers';
 
 interface CreditsCardProps { rows: ContributorRow[]; }
 

src/features/nowPlaying/components/DiscographyCard.tsx

@@ -1,9 +1,9 @@
 import React, { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Disc3, ExternalLink, Music } from 'lucide-react';
-import type { SubsonicAlbum } from '../../api/subsonicTypes';
-import { AlbumCoverArtImage } from '../../cover/AlbumCoverArtImage';
-import { COVER_DENSE_RAIL_CELL_CSS_PX } from '../../cover/layoutSizes';
+import type { SubsonicAlbum } from '@/api/subsonicTypes';
+import { AlbumCoverArtImage } from '@/cover/AlbumCoverArtImage';
+import { COVER_DENSE_RAIL_CELL_CSS_PX } from '@/cover/layoutSizes';
 
 interface DiscographyCardProps {
   artistId?: string;

src/features/nowPlaying/components/Hero.tsx

@@ -1,15 +1,15 @@
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Headphones, Heart, MicVocal, Music, Star } from 'lucide-react';
-import { CoverArtImage } from '../../cover/CoverArtImage';
-import type { CoverArtRef } from '../../cover/types';
-import type { ArtistStats, TrackStats } from '../../music-network';
-import type { SubsonicOpenArtistRef } from '../../api/subsonicTypes';
-import { OpenArtistRefInline } from '../OpenArtistRefInline';
-import { formatTrackTime } from '../../utils/format/formatDuration';
-import { useEnrichmentPrimaryLabel } from '../../hooks/useEnrichmentPrimaryLabel';
-import { useEnrichmentPrimaryIcon } from '../../hooks/useEnrichmentPrimaryIcon';
-import { renderPresetIcon } from '../settings/musicNetwork/presetIcon';
+import { CoverArtImage } from '@/cover/CoverArtImage';
+import type { CoverArtRef } from '@/cover/types';
+import type { ArtistStats, TrackStats } from '@/music-network';
+import type { SubsonicOpenArtistRef } from '@/api/subsonicTypes';
+import { OpenArtistRefInline } from '@/components/OpenArtistRefInline';
+import { formatTrackTime } from '@/utils/format/formatDuration';
+import { useEnrichmentPrimaryLabel } from '@/hooks/useEnrichmentPrimaryLabel';
+import { useEnrichmentPrimaryIcon } from '@/hooks/useEnrichmentPrimaryIcon';
+import { renderPresetIcon } from '@/components/settings/musicNetwork/presetIcon';
 
 interface HeroProps {
   track: { title: string; artist: string; album: string; year?: number;

src/features/nowPlaying/components/NowPlayingDropdown.tsx

@@ -1,12 +1,12 @@
-import { TrackCoverArtImage } from '../cover/TrackCoverArtImage';
-import { getNowPlaying } from '../api/subsonicScrobble';
-import type { SubsonicNowPlaying } from '../api/subsonicTypes';
+import { TrackCoverArtImage } from '@/cover/TrackCoverArtImage';
+import { getNowPlaying } from '@/api/subsonicScrobble';
+import type { SubsonicNowPlaying } from '@/api/subsonicTypes';
 import React, { useState, useEffect, useRef, useCallback, useLayoutEffect } from 'react';
 import { createPortal } from 'react-dom';
 import { PlayCircle, Pause, User, Radio, RefreshCw } from 'lucide-react';
-import { nowPlayingPresence } from '../api/nowPlayingPresence';
-import { useAuthStore } from '../store/authStore';
-import { usePlayerStore } from '../store/playerStore';
+import { nowPlayingPresence } from '@/features/nowPlaying/api/nowPlayingPresence';
+import { useAuthStore } from '@/store/authStore';
+import { usePlayerStore } from '@/store/playerStore';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 

src/features/nowPlaying/components/NowPlayingInfo.tsx

@@ -1,17 +1,17 @@
-import { getSongForServer } from '../api/subsonicLibrary';
-import { getArtistInfoForServer } from '../api/subsonicArtists';
-import type { SubsonicArtistInfo, SubsonicSong } from '../api/subsonicTypes';
+import { getSongForServer } from '@/api/subsonicLibrary';
+import { getArtistInfoForServer } from '@/api/subsonicArtists';
+import type { SubsonicArtistInfo, SubsonicSong } from '@/api/subsonicTypes';
 import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Info } from 'lucide-react';
 import { open as shellOpen } from '@tauri-apps/plugin-shell';
-import { usePlayerStore } from '../store/playerStore';
-import { useAuthStore } from '../store/authStore';
-import { usePlaybackServerId } from '../hooks/usePlaybackServerId';
-import { fetchBandsintownEvents, type BandsintownEvent } from '../api/bandsintown';
+import { usePlayerStore } from '@/store/playerStore';
+import { useAuthStore } from '@/store/authStore';
+import { usePlaybackServerId } from '@/hooks/usePlaybackServerId';
+import { fetchBandsintownEvents, type BandsintownEvent } from '@/api/bandsintown';
 import CachedImage from '@/ui/CachedImage';
 import OverlayScrollArea from '@/ui/OverlayScrollArea';
-import { primaryTrackArtistRef } from '../utils/playback/trackArtistRefs';
+import { primaryTrackArtistRef } from '@/utils/playback/trackArtistRefs';
 
 const TOUR_LIMIT = 5;
 const BIO_CLAMP_LINES = 4;

src/features/nowPlaying/components/NpCardWrap.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { useDragSource } from '../../contexts/DragDropContext';
-import type { NpCardId } from '../../store/nowPlayingLayoutStore';
+import { useDragSource } from '@/contexts/DragDropContext';
+import type { NpCardId } from '@/features/nowPlaying/store/nowPlayingLayoutStore';
 
 interface NpCardWrapProps {
   id: NpCardId;

src/features/nowPlaying/components/NpColumnEl.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import type { NpCardId, NpColumn } from '../../store/nowPlayingLayoutStore';
+import type { NpCardId, NpColumn } from '@/features/nowPlaying/store/nowPlayingLayoutStore';
 
 interface NpColumnProps {
   col: NpColumn;

src/features/nowPlaying/components/RadioView.tsx

@@ -2,8 +2,8 @@ import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Cast, Clock, Radio, SkipForward, Users } from 'lucide-react';
 import type { useRadioMetadata } from '@/features/radio';
-import { usePlayerStore } from '../../store/playerStore';
-import { formatTrackTime } from '../../utils/format/formatDuration';
+import { usePlayerStore } from '@/store/playerStore';
+import { formatTrackTime } from '@/utils/format/formatDuration';
 
 type NonNullStoreField<K extends keyof ReturnType<typeof usePlayerStore.getState>> =
   NonNullable<ReturnType<typeof usePlayerStore.getState>[K]>;

src/features/nowPlaying/components/TopSongsCard.tsx

@@ -1,8 +1,8 @@
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ExternalLink, Play, TrendingUp } from 'lucide-react';
-import type { SubsonicSong } from '../../api/subsonicTypes';
-import { formatTrackTime } from '../../utils/format/formatDuration';
+import type { SubsonicSong } from '@/api/subsonicTypes';
+import { formatTrackTime } from '@/utils/format/formatDuration';
 
 interface TopSongsCardProps {
   artistName: string;

src/features/nowPlaying/components/TourCard.tsx

@@ -2,8 +2,8 @@ import React, { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Calendar, Info } from 'lucide-react';
 import { open as shellOpen } from '@tauri-apps/plugin-shell';
-import type { BandsintownEvent } from '../../api/bandsintown';
-import { isoToParts } from '../../utils/componentHelpers/nowPlayingHelpers';
+import type { BandsintownEvent } from '@/api/bandsintown';
+import { isoToParts } from '@/utils/componentHelpers/nowPlayingHelpers';
 
 interface TourCardProps {
   artistName: string;

src/features/nowPlaying/hooks/useNowPlayingFetchers.test.ts

@@ -11,20 +11,20 @@
  */
 import { renderHook, act, waitFor } from '@testing-library/react';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type { SubsonicArtistInfo, SubsonicSong, SubsonicAlbum, SubsonicArtist } from '../api/subsonicTypes';
+import type { SubsonicArtistInfo, SubsonicSong, SubsonicAlbum, SubsonicArtist } from '@/api/subsonicTypes';
 
-vi.mock('../api/subsonicArtists');
-vi.mock('../api/subsonicLibrary');
-vi.mock('../api/bandsintown');
-vi.mock('../utils/network/subsonicNetworkGuard', () => ({
+vi.mock('@/api/subsonicArtists');
+vi.mock('@/api/subsonicLibrary');
+vi.mock('@/api/bandsintown');
+vi.mock('@/utils/network/subsonicNetworkGuard', () => ({
   shouldAttemptSubsonicForServer: vi.fn(() => true),
 }));
 
-import { shouldAttemptSubsonicForServer } from '../utils/network/subsonicNetworkGuard';
-import { getArtistForServer, getArtistInfoForServer, getTopSongsForServer } from '../api/subsonicArtists';
-import { getAlbumForServer, getSongForServer } from '../api/subsonicLibrary';
-import { fetchBandsintownEvents } from '../api/bandsintown';
-import { useNowPlayingFetchers, type NowPlayingFetchersDeps } from './useNowPlayingFetchers';
+import { shouldAttemptSubsonicForServer } from '@/utils/network/subsonicNetworkGuard';
+import { getArtistForServer, getArtistInfoForServer, getTopSongsForServer } from '@/api/subsonicArtists';
+import { getAlbumForServer, getSongForServer } from '@/api/subsonicLibrary';
+import { fetchBandsintownEvents } from '@/api/bandsintown';
+import { useNowPlayingFetchers, type NowPlayingFetchersDeps } from '@/features/nowPlaying/hooks/useNowPlayingFetchers';
 
 // Resolved return shapes of the mocked API calls — used to cast deliberately
 // partial test fixtures without `any`.

src/features/nowPlaying/hooks/useNowPlayingFetchers.ts

@@ -1,13 +1,13 @@
 import { useEffect, useState } from 'react';
-import { getArtistInfoForServer } from '../api/subsonicArtists';
-import type { SubsonicAlbum, SubsonicArtistInfo, SubsonicSong } from '../api/subsonicTypes';
-import { resolveNpAlbum, resolveNpDiscography, resolveNpSongMeta, resolveNpTopSongs } from '../utils/library/nowPlayingMetadataResolve';
-import { fetchBandsintownEvents, type BandsintownEvent } from '../api/bandsintown';
-import type { ArtistStats, TrackStats } from '../music-network';
-import { getMusicNetworkRuntimeOrNull } from '../music-network';
-import { makeCache } from '../utils/cache/nowPlayingCache';
-import { shouldAttemptSubsonicForServer } from '../utils/network/subsonicNetworkGuard';
-import { useConnectionStatus } from './useConnectionStatus';
+import { getArtistInfoForServer } from '@/api/subsonicArtists';
+import type { SubsonicAlbum, SubsonicArtistInfo, SubsonicSong } from '@/api/subsonicTypes';
+import { resolveNpAlbum, resolveNpDiscography, resolveNpSongMeta, resolveNpTopSongs } from '@/features/nowPlaying/utils/nowPlayingMetadataResolve';
+import { fetchBandsintownEvents, type BandsintownEvent } from '@/api/bandsintown';
+import type { ArtistStats, TrackStats } from '@/music-network';
+import { getMusicNetworkRuntimeOrNull } from '@/music-network';
+import { makeCache } from '@/utils/cache/nowPlayingCache';
+import { shouldAttemptSubsonicForServer } from '@/utils/network/subsonicNetworkGuard';
+import { useConnectionStatus } from '@/hooks/useConnectionStatus';
 
 // Module-level TTL caches (shared across mounts)
 const songMetaCache    = makeCache<SubsonicSong | null>();

src/features/nowPlaying/hooks/useNowPlayingPrewarm.test.ts

@@ -1,17 +1,17 @@
 import { renderHook, waitFor } from '@testing-library/react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { coverCacheEnsure, coverCachePeekBatch } from '../api/coverCache';
-import { coverIndexKeyFromRef } from '../cover/storageKeys';
-import { useNowPlayingPrewarm } from './useNowPlayingPrewarm';
-import { prewarmNowPlayingFetchers } from './useNowPlayingFetchers';
-import { useAuthStore } from '../store/authStore';
-import { usePlayerStore } from '../store/playerStore';
-import { makeTrack } from '../test/helpers/factories';
-import { resetAllStores } from '../test/helpers/storeReset';
-import { toQueueItemRefs } from '../utils/library/queueItemRef';
+import { coverCacheEnsure, coverCachePeekBatch } from '@/api/coverCache';
+import { coverIndexKeyFromRef } from '@/cover/storageKeys';
+import { useNowPlayingPrewarm } from '@/features/nowPlaying/hooks/useNowPlayingPrewarm';
+import { prewarmNowPlayingFetchers } from '@/features/nowPlaying/hooks/useNowPlayingFetchers';
+import { useAuthStore } from '@/store/authStore';
+import { usePlayerStore } from '@/store/playerStore';
+import { makeTrack } from '@/test/helpers/factories';
+import { resetAllStores } from '@/test/helpers/storeReset';
+import { toQueueItemRefs } from '@/utils/library/queueItemRef';
 
-vi.mock('../api/coverCache', async importOriginal => {
-  const actual = await importOriginal<typeof import('../api/coverCache')>();
+vi.mock('@/api/coverCache', async importOriginal => {
+  const actual = await importOriginal<typeof import('@/api/coverCache')>();
   return {
     ...actual,
     coverCachePeekBatch: vi.fn(async () => ({})),
@@ -19,7 +19,7 @@ vi.mock('../api/coverCache', async importOriginal => {
   };
 });
 
-vi.mock('./useNowPlayingFetchers', () => ({
+vi.mock('@/features/nowPlaying/hooks/useNowPlayingFetchers', () => ({
   prewarmNowPlayingFetchers: vi.fn(async () => undefined),
 }));
 

src/features/nowPlaying/hooks/useNowPlayingPrewarm.ts

@@ -1,18 +1,18 @@
 import { useEffect } from 'react';
-import { coverCacheEnsure, coverCachePeekBatch } from '../api/coverCache';
-import { albumCoverRef } from '../cover/ref';
-import { resolvePlaybackCoverScope } from '../cover/ref';
-import { resolveTrackCoverRefFromLibrary } from '../cover/resolveEntryLibrary';
-import { getDiskSrc, rememberDiskSrc } from '../cover/diskSrcCache';
-import { coverStorageKeyFromRef } from '../cover/storageKeys';
-import { resolveCoverDisplayTier } from '../cover/tiers';
-import { coverArtIdFromRadio } from '../cover/ids';
-import type { CoverArtRef } from '../cover/types';
-import { prewarmNowPlayingFetchers } from './useNowPlayingFetchers';
-import { useAuthStore } from '../store/authStore';
-import { usePlayerStore } from '../store/playerStore';
-import { usePlaybackServerId } from './usePlaybackServerId';
-import { primaryTrackArtistRef } from '../utils/playback/trackArtistRefs';
+import { coverCacheEnsure, coverCachePeekBatch } from '@/api/coverCache';
+import { albumCoverRef } from '@/cover/ref';
+import { resolvePlaybackCoverScope } from '@/cover/ref';
+import { resolveTrackCoverRefFromLibrary } from '@/cover/resolveEntryLibrary';
+import { getDiskSrc, rememberDiskSrc } from '@/cover/diskSrcCache';
+import { coverStorageKeyFromRef } from '@/cover/storageKeys';
+import { resolveCoverDisplayTier } from '@/cover/tiers';
+import { coverArtIdFromRadio } from '@/cover/ids';
+import type { CoverArtRef } from '@/cover/types';
+import { prewarmNowPlayingFetchers } from '@/features/nowPlaying/hooks/useNowPlayingFetchers';
+import { useAuthStore } from '@/store/authStore';
+import { usePlayerStore } from '@/store/playerStore';
+import { usePlaybackServerId } from '@/hooks/usePlaybackServerId';
+import { primaryTrackArtistRef } from '@/utils/playback/trackArtistRefs';
 
 const NOW_PLAYING_COVER_CSS_PX = 800;
 

src/features/nowPlaying/hooks/useNowPlayingStarLove.ts

@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useState } from 'react';
-import { queueSongStar } from '../store/pendingStarSync';
-import type { SubsonicSong } from '../api/subsonicTypes';
-import type { Track } from '../store/playerStoreTypes';
-import type { TrackStats } from '../music-network';
-import { getMusicNetworkRuntime } from '../music-network';
+import { queueSongStar } from '@/store/pendingStarSync';
+import type { SubsonicSong } from '@/api/subsonicTypes';
+import type { Track } from '@/store/playerStoreTypes';
+import type { TrackStats } from '@/music-network';
+import { getMusicNetworkRuntime } from '@/music-network';
 
 export interface NowPlayingStarLoveDeps {
   currentTrack: Pick<Track, 'id' | 'title' | 'artist' | 'serverId'> | null;

src/features/nowPlaying/index.ts

@@ -0,0 +1,12 @@
+/**
+ * Now Playing feature — the Now Playing page (album/artist/credits/discography/
+ * tour cards, hero), its layout store and index-first metadata resolvers, the
+ * topbar "Who is listening?" dropdown, and the queue-side track info panel.
+ *
+ * The page itself is lazy-loaded via the deep path `pages/NowPlaying`.
+ * `ArtistCard` is also reused by the Artist Detail page.
+ */
+export { default as NowPlayingDropdown } from './components/NowPlayingDropdown';
+export { default as NowPlayingInfo } from './components/NowPlayingInfo';
+export { default as ArtistCard } from './components/ArtistCard';
+export { useNowPlayingPrewarm } from './hooks/useNowPlayingPrewarm';

src/features/nowPlaying/pages/NowPlaying.tsx

@@ -1,45 +1,45 @@
-import { useCoverArt } from '../cover/useCoverArt';
-import { albumCoverRef } from '../cover/ref';
-import { usePlaybackTrackCoverRef } from '../cover/useLibraryCoverRef';
-import { coverArtIdFromRadio } from '../cover/ids';
-import type { SubsonicArtistInfo, SubsonicSong } from '../api/subsonicTypes';
+import { useCoverArt } from '@/cover/useCoverArt';
+import { albumCoverRef } from '@/cover/ref';
+import { usePlaybackTrackCoverRef } from '@/cover/useLibraryCoverRef';
+import { coverArtIdFromRadio } from '@/cover/ids';
+import type { SubsonicArtistInfo, SubsonicSong } from '@/api/subsonicTypes';
 import React, { useState, useRef, useEffect, useCallback, useMemo } from 'react';
-import { usePlaybackLibraryNavigate } from '../hooks/usePlaybackLibraryNavigate';
-import { usePlaybackServerId } from '../hooks/usePlaybackServerId';
+import { usePlaybackLibraryNavigate } from '@/hooks/usePlaybackLibraryNavigate';
+import { usePlaybackServerId } from '@/hooks/usePlaybackServerId';
 import { useTranslation } from 'react-i18next';
 import { Music, EyeOff, LayoutGrid, RotateCcw, Eye } from 'lucide-react';
-import { usePlayerStore } from '../store/playerStore';
-import { useAuthStore } from '../store/authStore';
-import { useLyricsStore } from '../store/lyricsStore';
-import { songToTrack } from '../utils/playback/songToTrack';
+import { usePlayerStore } from '@/store/playerStore';
+import { useAuthStore } from '@/store/authStore';
+import { useLyricsStore } from '@/store/lyricsStore';
+import { songToTrack } from '@/utils/playback/songToTrack';
 import { useRadioMetadata } from '@/features/radio';
-import { useDragDrop } from '../contexts/DragDropContext';
+import { useDragDrop } from '@/contexts/DragDropContext';
 import OverlayScrollArea from '@/ui/OverlayScrollArea';
 import {
   useNpLayoutStore, NP_CARD_IDS,
   type NpCardId, type NpColumn,
-} from '../store/nowPlayingLayoutStore';
+} from '@/features/nowPlaying/store/nowPlayingLayoutStore';
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
 import {
   buildContributorRows,
-} from '../utils/componentHelpers/nowPlayingHelpers';
-import NpCardWrap from '../components/nowPlaying/NpCardWrap';
-import NpColumnEl from '../components/nowPlaying/NpColumnEl';
-import RadioView from '../components/nowPlaying/RadioView';
-import Hero from '../components/nowPlaying/Hero';
-import ArtistCard from '../components/nowPlaying/ArtistCard';
-import AlbumCard from '../components/nowPlaying/AlbumCard';
-import TopSongsCard from '../components/nowPlaying/TopSongsCard';
-import CreditsCard from '../components/nowPlaying/CreditsCard';
-import TourCard from '../components/nowPlaying/TourCard';
-import DiscographyCard from '../components/nowPlaying/DiscographyCard';
-import { useNowPlayingFetchers } from '../hooks/useNowPlayingFetchers';
-import { useNowPlayingStarLove } from '../hooks/useNowPlayingStarLove';
-import { useArtistInfoBatch } from '../hooks/useArtistInfoBatch';
-import { primaryTrackArtistRef, resolveTrackArtistRefs } from '../utils/playback/trackArtistRefs';
-import type { ArtistCardTab } from '../components/nowPlaying/ArtistCard';
+} from '@/utils/componentHelpers/nowPlayingHelpers';
+import NpCardWrap from '@/features/nowPlaying/components/NpCardWrap';
+import NpColumnEl from '@/features/nowPlaying/components/NpColumnEl';
+import RadioView from '@/features/nowPlaying/components/RadioView';
+import Hero from '@/features/nowPlaying/components/Hero';
+import ArtistCard from '@/features/nowPlaying/components/ArtistCard';
+import AlbumCard from '@/features/nowPlaying/components/AlbumCard';
+import TopSongsCard from '@/features/nowPlaying/components/TopSongsCard';
+import CreditsCard from '@/features/nowPlaying/components/CreditsCard';
+import TourCard from '@/features/nowPlaying/components/TourCard';
+import DiscographyCard from '@/features/nowPlaying/components/DiscographyCard';
+import { useNowPlayingFetchers } from '@/features/nowPlaying/hooks/useNowPlayingFetchers';
+import { useNowPlayingStarLove } from '@/features/nowPlaying/hooks/useNowPlayingStarLove';
+import { useArtistInfoBatch } from '@/hooks/useArtistInfoBatch';
+import { primaryTrackArtistRef, resolveTrackArtistRefs } from '@/utils/playback/trackArtistRefs';
+import type { ArtistCardTab } from '@/features/nowPlaying/components/ArtistCard';
 
 // ─── Main Page ────────────────────────────────────────────────────────────────
 

src/features/nowPlaying/utils/nowPlayingMetadataResolve.test.ts

@@ -22,7 +22,7 @@ import {
   resolveNpDiscography,
   resolveNpTopSongs,
   resolveNpSongMeta,
-} from './nowPlayingMetadataResolve';
+} from '@/features/nowPlaying/utils/nowPlayingMetadataResolve';
 
 const guard = vi.mocked(shouldAttemptSubsonicForServer);
 

src/features/nowPlaying/utils/nowPlayingMetadataResolve.ts

@@ -16,14 +16,14 @@
  * `artistInfo` (bio / similar) has no index source and stays network-only — it
  * is intentionally absent here.
  */
-import { libraryGetTrack, libraryGetTracksByAlbum } from '../../api/library';
-import { getArtistForServer, getTopSongsForServer } from '../../api/subsonicArtists';
-import { getAlbumForServer, getSongForServer } from '../../api/subsonicLibrary';
-import type { SubsonicAlbum, SubsonicSong } from '../../api/subsonicTypes';
-import { shouldAttemptSubsonicForServer } from '../network/subsonicNetworkGuard';
-import { loadAlbumFromLibraryIndex, loadArtistFromLibraryIndex } from '../offline/offlineLibraryIndexLoad';
-import { trackToSong } from './advancedSearchLocal';
-import { libraryIsReady } from './libraryReady';
+import { libraryGetTrack, libraryGetTracksByAlbum } from '@/api/library';
+import { getArtistForServer, getTopSongsForServer } from '@/api/subsonicArtists';
+import { getAlbumForServer, getSongForServer } from '@/api/subsonicLibrary';
+import type { SubsonicAlbum, SubsonicSong } from '@/api/subsonicTypes';
+import { shouldAttemptSubsonicForServer } from '@/utils/network/subsonicNetworkGuard';
+import { loadAlbumFromLibraryIndex, loadArtistFromLibraryIndex } from '@/utils/offline/offlineLibraryIndexLoad';
+import { trackToSong } from '@/utils/library/advancedSearchLocal';
+import { libraryIsReady } from '@/utils/library/libraryReady';
 
 const TOP_SONGS_LIMIT = 5;
 

src/pages/ArtistDetail.tsx

@@ -28,7 +28,7 @@ import {
 import ArtistDetailHero from '../components/artistDetail/ArtistDetailHero';
 import ArtistDetailTopTracks from '../components/artistDetail/ArtistDetailTopTracks';
 import ArtistDetailSimilarArtists from '../components/artistDetail/ArtistDetailSimilarArtists';
-import ArtistCard from '../components/nowPlaying/ArtistCard';
+import { ArtistCard } from '@/features/nowPlaying';
 import LosslessModeBanner from '../components/LosslessModeBanner';
 import { usePerfProbeFlags } from '../utils/perf/perfFlags';
 import { albumGridWarmCovers, COVER_DENSE_GRID_MIN_CELL_CSS_PX, GRID_COVER_WARM_LIMIT } from '../cover/layoutSizes';