handleAction(async () => {
- const { showToast } = await import('../../utils/ui/toast');
+ const { showToast } = await import('@/utils/ui/toast');
const { deletePlaylist } = await import('@/lib/api/subsonicPlaylists');
const { removeId } = usePlaylistStore.getState();
try {
@@ -112,7 +112,7 @@ export default function PlaylistContextItems(props: ContextMenuItemsProps) {
)}
{offlinePolicy.canEditPlaylist && (
handleAction(async () => {
- const { showToast } = await import('../../utils/ui/toast');
+ const { showToast } = await import('@/utils/ui/toast');
const { deletePlaylist } = await import('@/lib/api/subsonicPlaylists');
const { removeId } = usePlaylistStore.getState();
const deletedIds: string[] = [];
diff --git a/src/components/contextMenu/PlaylistToPlaylistSubmenus.tsx b/src/features/contextMenu/components/PlaylistToPlaylistSubmenus.tsx
similarity index 98%
rename from src/components/contextMenu/PlaylistToPlaylistSubmenus.tsx
rename to src/features/contextMenu/components/PlaylistToPlaylistSubmenus.tsx
index f090aa3e..573a2f46 100644
--- a/src/components/contextMenu/PlaylistToPlaylistSubmenus.tsx
+++ b/src/features/contextMenu/components/PlaylistToPlaylistSubmenus.tsx
@@ -2,8 +2,8 @@ import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 're
import { useTranslation } from 'react-i18next';
import { ListMusic, Plus } from 'lucide-react';
import { usePlaylistStore } from '@/features/playlist';
-import { showToast } from '../../utils/ui/toast';
-import { isSmartPlaylistName } from '../../utils/componentHelpers/contextMenuHelpers';
+import { showToast } from '@/utils/ui/toast';
+import { isSmartPlaylistName } from '@/utils/componentHelpers/contextMenuHelpers';
interface SingleProps {
playlist: { id: string; name: string };
diff --git a/src/components/contextMenu/QueueItemContextItems.tsx b/src/features/contextMenu/components/QueueItemContextItems.tsx
similarity index 93%
rename from src/components/contextMenu/QueueItemContextItems.tsx
rename to src/features/contextMenu/components/QueueItemContextItems.tsx
index 4786a421..c1de9e4f 100644
--- a/src/components/contextMenu/QueueItemContextItems.tsx
+++ b/src/features/contextMenu/components/QueueItemContextItems.tsx
@@ -1,13 +1,13 @@
import { useTranslation } from 'react-i18next';
import { Play, Radio, Heart, ChevronRight, User, Disc3, ListMusic, Info, Sparkles, Star, Trash2, Share2 } from 'lucide-react';
import { queueSongStar } from '@/features/playback/store/pendingStarSync';
-import { getMusicNetworkRuntime, useEnrichmentPrimary } from '../../music-network';
+import { getMusicNetworkRuntime, useEnrichmentPrimary } from '@/music-network';
import type { Track } from '@/lib/media/trackTypes';
-import { useAuthStore } from '../../store/authStore';
-import { renderPresetIcon } from '../settings/musicNetwork/presetIcon';
+import { useAuthStore } from '@/store/authStore';
+import { renderPresetIcon } from '@/components/settings/musicNetwork/presetIcon';
import StarRating from '@/ui/StarRating';
-import { AddToPlaylistSubmenu } from './AddToPlaylistSubmenu';
-import type { ContextMenuItemsProps } from './contextMenuItemTypes';
+import { AddToPlaylistSubmenu } from '@/features/contextMenu/components/AddToPlaylistSubmenu';
+import type { ContextMenuItemsProps } from '@/features/contextMenu/components/contextMenuItemTypes';
export default function QueueItemContextItems(props: ContextMenuItemsProps) {
const {
diff --git a/src/components/contextMenu/SongContextItems.tsx b/src/features/contextMenu/components/SongContextItems.tsx
similarity index 97%
rename from src/components/contextMenu/SongContextItems.tsx
rename to src/features/contextMenu/components/SongContextItems.tsx
index cdb30463..55aa46b5 100644
--- a/src/components/contextMenu/SongContextItems.tsx
+++ b/src/features/contextMenu/components/SongContextItems.tsx
@@ -4,17 +4,17 @@ import { useNavigateToAlbum } from '@/features/album';
import { useNavigateToArtist } from '@/features/artist';
import { resolveAlbum, resolveMediaServerId, resolvePlaylist } from '@/features/offline';
import { queueSongStar } from '@/features/playback/store/pendingStarSync';
-import { getMusicNetworkRuntime, useEnrichmentPrimary } from '../../music-network';
+import { getMusicNetworkRuntime, useEnrichmentPrimary } from '@/music-network';
import type { Track } from '@/lib/media/trackTypes';
-import { useAuthStore } from '../../store/authStore';
+import { useAuthStore } from '@/store/authStore';
import { usePlaylistStore } from '@/features/playlist';
import { songToTrack } from '@/lib/media/songToTrack';
-import { showToast } from '../../utils/ui/toast';
+import { showToast } from '@/utils/ui/toast';
import { suggestOrbitTrack, hostEnqueueToOrbit, evaluateOrbitSuggestGate, OrbitSuggestBlockedError } from '@/features/orbit';
-import { renderPresetIcon } from '../settings/musicNetwork/presetIcon';
+import { renderPresetIcon } from '@/components/settings/musicNetwork/presetIcon';
import StarRating from '@/ui/StarRating';
-import { AddToPlaylistSubmenu } from './AddToPlaylistSubmenu';
-import type { ContextMenuItemsProps } from './contextMenuItemTypes';
+import { AddToPlaylistSubmenu } from '@/features/contextMenu/components/AddToPlaylistSubmenu';
+import type { ContextMenuItemsProps } from '@/features/contextMenu/components/contextMenuItemTypes';
export default function SongContextItems(props: ContextMenuItemsProps) {
const {
@@ -179,7 +179,7 @@ export default function SongContextItems(props: ContextMenuItemsProps) {
{offlinePolicy.canEditPlaylist && playlistId && playlistSongIndex !== undefined && (
handleAction(async () => {
const { updatePlaylist } = await import('@/lib/api/subsonicPlaylists');
- const { showToast } = await import('../../utils/ui/toast');
+ const { showToast } = await import('@/utils/ui/toast');
const touchPlaylist = usePlaylistStore.getState().touchPlaylist;
try {
const serverId = resolveMediaServerId();
diff --git a/src/components/contextMenu/contextMenuItemTypes.ts b/src/features/contextMenu/components/contextMenuItemTypes.ts
similarity index 97%
rename from src/components/contextMenu/contextMenuItemTypes.ts
rename to src/features/contextMenu/components/contextMenuItemTypes.ts
index 12412c0e..c25e1cf1 100644
--- a/src/components/contextMenu/contextMenuItemTypes.ts
+++ b/src/features/contextMenu/components/contextMenuItemTypes.ts
@@ -1,7 +1,7 @@
import type React from 'react';
import type { SubsonicAlbum, SubsonicArtist } from '@/lib/api/subsonicTypes';
import type { QueueItemRef, Track } from '@/lib/media/trackTypes';
-import type { EntityShareKind } from '../../utils/share/shareLink';
+import type { EntityShareKind } from '@/utils/share/shareLink';
import type { OfflineActionPolicy } from '@/features/offline';
export type RatingKind = 'song' | 'album' | 'artist';
diff --git a/src/features/contextMenu/index.ts b/src/features/contextMenu/index.ts
new file mode 100644
index 00000000..997c0a38
--- /dev/null
+++ b/src/features/contextMenu/index.ts
@@ -0,0 +1,8 @@
+/**
+ * Context-menu feature — the rendered ContextMenu plus the per-entity menu-item
+ * builders (album/artist/playlist/song/queue items + add-to-playlist /
+ * move-to-folder submenus). ContextMenu is deep-imported by its consumers
+ * (app shell + favorites/album/playlist surfaces); the item builders are
+ * internal to the subsystem, so nothing is re-exported here.
+ */
+export {};
diff --git a/src/features/favorites/components/FavoritesSongsSectionHeader.tsx b/src/features/favorites/components/FavoritesSongsSectionHeader.tsx
index 9b0a1a05..e2ed51fd 100644
--- a/src/features/favorites/components/FavoritesSongsSectionHeader.tsx
+++ b/src/features/favorites/components/FavoritesSongsSectionHeader.tsx
@@ -5,7 +5,7 @@ import type { SubsonicSong } from '@/lib/api/subsonicTypes';
import { usePlayerStore } from '@/features/playback/store/playerStore';
import { useSelectionStore } from '@/store/selectionStore';
import { songToTrack } from '@/lib/media/songToTrack';
-import { AddToPlaylistSubmenu } from '@/components/ContextMenu';
+import { AddToPlaylistSubmenu } from '@/features/contextMenu/components/ContextMenu';
import GenreFilterBar from '@/ui/GenreFilterBar';
interface Props {
diff --git a/src/features/playlist/components/PlaylistSongSearchPanel.tsx b/src/features/playlist/components/PlaylistSongSearchPanel.tsx
index 70a2b33d..e4255872 100644
--- a/src/features/playlist/components/PlaylistSongSearchPanel.tsx
+++ b/src/features/playlist/components/PlaylistSongSearchPanel.tsx
@@ -7,7 +7,7 @@ import { songToTrack } from '@/lib/media/songToTrack';
import { formatTrackTime } from '@/lib/format/formatDuration';
import { AlbumCoverArtImage } from '@/cover/AlbumCoverArtImage';
import { COVER_DENSE_SEARCH_CSS_PX } from '@/cover/layoutSizes';
-import { AddToPlaylistSubmenu } from '@/components/ContextMenu';
+import { AddToPlaylistSubmenu } from '@/features/contextMenu/components/ContextMenu';
function PlaylistSearchResultThumb({ albumId, coverArt }: { albumId: string; coverArt: string }) {
return (
diff --git a/src/features/playlist/components/PlaylistTracklist.tsx b/src/features/playlist/components/PlaylistTracklist.tsx
index 05d2262b..e2c9d472 100644
--- a/src/features/playlist/components/PlaylistTracklist.tsx
+++ b/src/features/playlist/components/PlaylistTracklist.tsx
@@ -19,7 +19,7 @@ import { useDragDrop } from '@/lib/dnd/DragDropContext';
import { useOrbitSongRowBehavior } from '@/features/orbit';
import { songToTrack } from '@/lib/media/songToTrack';
import type { PlaylistSortKey, PlaylistSortDir } from '@/features/playlist/utils/playlistDisplayedSongs';
-import { AddToPlaylistSubmenu } from '@/components/ContextMenu';
+import { AddToPlaylistSubmenu } from '@/features/contextMenu/components/ContextMenu';
const PL_CENTERED = new Set(['favorite', 'rating', 'duration', 'playCount', 'bpm']);
diff --git a/src/components/AppUpdater.tsx b/src/features/updater/components/AppUpdater.tsx
similarity index 97%
rename from src/components/AppUpdater.tsx
rename to src/features/updater/components/AppUpdater.tsx
index 0b107a5b..1e6ef549 100644
--- a/src/components/AppUpdater.tsx
+++ b/src/features/updater/components/AppUpdater.tsx
@@ -2,11 +2,11 @@ import { type ReactNode } from 'react';
import { open } from '@tauri-apps/plugin-shell';
import { ArrowUpCircle, CheckCircle2, ChevronDown, Download, FolderOpen, RefreshCw, ShieldCheck } from 'lucide-react';
import { useTranslation } from 'react-i18next';
-import { version as currentVersion } from '../../package.json';
+import { version as currentVersion } from '@/../package.json';
import { formatBytes } from '@/lib/format/formatBytes';
-import { useAppUpdater } from '../hooks/useAppUpdater';
-import Modal from './Modal';
-import Changelog from './appUpdater/Changelog';
+import { useAppUpdater } from '@/hooks/useAppUpdater';
+import Modal from '@/components/Modal';
+import Changelog from '@/features/updater/components/Changelog';
export default function AppUpdater() {
const { t } = useTranslation();
diff --git a/src/components/appUpdater/Changelog.tsx b/src/features/updater/components/Changelog.tsx
similarity index 100%
rename from src/components/appUpdater/Changelog.tsx
rename to src/features/updater/components/Changelog.tsx
diff --git a/src/features/updater/index.ts b/src/features/updater/index.ts
new file mode 100644
index 00000000..d43e1f3c
--- /dev/null
+++ b/src/features/updater/index.ts
@@ -0,0 +1,5 @@
+/**
+ * Updater feature — the in-app update checker/notification (AppUpdater) and its
+ * changelog display. Mounted by the app shell; deep-imported, not re-exported.
+ */
+export {};