refactor(lib): extract clean server + navigation infra to lib/ (decouple-knot files stay in utils/ pending seam)

src/api/analysis.ts

@@ -1,6 +1,6 @@
 import { invoke } from '@tauri-apps/api/core';
 import { useAuthStore } from '../store/authStore';
-import { serverIndexKeyFromUrl } from '../utils/server/serverIndexKey';
+import { serverIndexKeyFromUrl } from '@/lib/server/serverIndexKey';
 
 export interface AnalysisBackfillQueueStatsDto {
   queued: number;

src/api/coverCache.ts

@@ -2,8 +2,8 @@ import { invoke } from '@tauri-apps/api/core';
 import { useAuthStore } from '../store/authStore';
 import { useThemeStore } from '../store/themeStore';
 import { coverIndexKeyFromRef, coverStorageKeyFromRef } from '../cover/storageKeys';
-import { connectBaseUrlForServer } from '../utils/server/serverEndpoint';
-import { serverIndexKeyForProfile } from '../utils/server/serverIndexKey';
+import { connectBaseUrlForServer } from '@/lib/server/serverEndpoint';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import { getPlaybackServerId } from '@/features/playback/utils/playback/playbackServer';
 import { restBaseFromUrl } from '@/lib/api/subsonicClient';
 import type { CoverArtRef, CoverArtTier } from '../cover/types';

src/app/ConnectionIndicator.tsx

@@ -10,7 +10,7 @@ import type { ServerProfile } from '@/store/authStoreTypes';
 import { useAuthStore } from '@/store/authStore';
 import { switchActiveServer } from '@/utils/server/switchActiveServer';
 import { showToast } from '@/lib/dom/toast';
-import { serverListDisplayLabel } from '@/utils/server/serverDisplayName';
+import { serverListDisplayLabel } from '@/lib/server/serverDisplayName';
 
 interface Props {
   status: ConnectionStatus;

src/app/hooks/useMigrationOrchestrator.ts

@@ -4,7 +4,7 @@ import { libraryGenreTagsInspect, libraryGenreTagsRun } from '@/lib/api/library'
 import { migrationInspect, migrationRun, type ServerIndexMapping } from '@/api/migration';
 import { useAuthStore } from '@/store/authStore';
 import { useMigrationStore } from '@/store/migrationStore';
-import { serverIndexKeyFromUrl } from '@/utils/server/serverIndexKey';
+import { serverIndexKeyFromUrl } from '@/lib/server/serverIndexKey';
 import { rewriteFrontendStoreKeys } from '@/utils/server/rewriteFrontendStoreKeys';
 
 const MIGRATION_DONE_FLAG = 'psysonic-server-key-migration-v1';

src/components/PasteClipboardHandler.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useAuthStore } from '../store/authStore';
 import type { EntitySharePayloadV1 } from '../utils/share/shareLink';
 import { decodeSharePayloadFromText } from '../utils/share/shareLink';
-import { decodeServerMagicStringFromText } from '../utils/server/serverMagicString';
+import { decodeServerMagicStringFromText } from '@/lib/server/serverMagicString';
 import { applySharePastePayload, applySharePasteQueue } from '../utils/share/applySharePaste';
 import { shareQueueServerContext } from '../utils/share/shareServerOriginLabel';
 import { showToast } from '@/lib/dom/toast';

src/components/SongInfoModal.tsx

@@ -10,7 +10,7 @@ import { ndGetSongPath } from '@/lib/api/navidromeAdmin';
 import { useAuthStore } from '../store/authStore';
 import { useLibraryIndexStore } from '../store/libraryIndexStore';
 import { useTranslation } from 'react-i18next';
-import { copyTextToClipboard } from '../utils/server/serverMagicString';
+import { copyTextToClipboard } from '@/lib/server/serverMagicString';
 import { showToast } from '@/lib/dom/toast';
 import { formatTrackTime } from '@/lib/format/formatDuration';
 import { formatLastSeen } from '../utils/componentHelpers/userMgmtHelpers';

src/cover/fetchUrl.ts

@@ -4,7 +4,7 @@ import {
 } from '@/lib/api/subsonicStreamUrl';
 import { getPlaybackServerId } from '@/features/playback/utils/playback/playbackServer';
 import { useAuthStore } from '../store/authStore';
-import { connectBaseUrlForServer } from '../utils/server/serverEndpoint';
+import { connectBaseUrlForServer } from '@/lib/server/serverEndpoint';
 import type { CoverArtRef, CoverArtTier } from './types';
 
 /** Builds ephemeral getCoverArt URL — NOT a cache key */

src/cover/integrations/discord.ts

@@ -1,5 +1,5 @@
 import { buildCoverArtUrlForServer } from '@/lib/api/subsonicStreamUrl';
-import { serverShareBaseUrl } from '../../utils/server/serverEndpoint';
+import { serverShareBaseUrl } from '@/lib/server/serverEndpoint';
 import { useAuthStore } from '../../store/authStore';
 import type { CoverArtRef } from '../types';
 

src/cover/serverScope.ts

@@ -1,4 +1,4 @@
-import { findServerByIdOrIndexKey } from '../utils/server/serverLookup';
+import { findServerByIdOrIndexKey } from '@/lib/server/serverLookup';
 import { COVER_SCOPE_ACTIVE, type CoverServerScope } from './types';
 
 /** Explicit server bucket for cover disk/IDB — use when entity carries `serverId` (e.g. cross-server favorites). */

src/cover/storageKeys.ts

@@ -1,11 +1,11 @@
 import { getPlaybackServerId } from '@/features/playback/utils/playback/playbackServer';
 import { useAuthStore } from '../store/authStore';
-import { findServerByIdOrIndexKey } from '../utils/server/serverLookup';
+import { findServerByIdOrIndexKey } from '@/lib/server/serverLookup';
 import {
   resolveIndexKey,
   serverIndexKeyForProfile,
   serverIndexKeyFromUrl,
-} from '../utils/server/serverIndexKey';
+} from '@/lib/server/serverIndexKey';
 import type { CoverArtRef, CoverArtTier, CoverServerScope } from './types';
 
 /**

src/cover/useLibraryCoverBackfill.ts

@@ -11,8 +11,8 @@ import { coverStrategyAllowsLibraryBackfill } from '@/lib/library/coverStrategy'
 import { useAuthStore } from '@/store/authStore';
 import { useCoverStrategyStore } from '@/store/coverStrategyStore';
 import { subscribeLibraryCoverBackfillWake } from '@/lib/library/coverBackfillWake';
-import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
-import { subscribeConnectCache } from '@/utils/server/serverEndpoint';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
+import { subscribeConnectCache } from '@/lib/server/serverEndpoint';
 
 /**
  * Library cover warm-up — configure session in Rust; full pass runs natively.

src/cover/useLibraryCoverRef.ts

@@ -11,7 +11,7 @@ import {
   resolvePlaybackCoverScope,
 } from './ref';
 import { coverServerScopeForServerId } from './serverScope';
-import { resolveServerIdForIndexKey } from '../utils/server/serverLookup';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import { sameQueueTrackId } from '@/features/playback/utils/playback/queueIdentity';
 import {
   resolveAlbumCoverRefFromLibrary,

src/features/album/components/AlbumCard.tsx

@@ -23,7 +23,7 @@ import { useDragDrop } from '@/lib/dnd/DragDropContext';
 import { isAlbumRecentlyAdded } from '@/features/album/utils/albumRecency';
 import { albumArtistDisplayName, deriveAlbumArtistRefs } from '@/features/album/utils/deriveAlbumHeaderArtistRefs';
 import { coverServerScopeForServerId } from '@/cover/serverScope';
-import { appendServerQuery } from '@/utils/navigation/detailServerScope';
+import { appendServerQuery } from '@/lib/navigation/detailServerScope';
 
 interface AlbumCardProps {
   album: SubsonicAlbum;

src/features/album/hooks/useAlbumDetailData.ts

@@ -16,7 +16,7 @@ import {
   loadArtistFromLocalPlayback,
   offlineLocalBrowseEnabled,
 } from '@/features/offline';
-import { readDetailServerId } from '@/utils/navigation/detailServerScope';
+import { readDetailServerId } from '@/lib/navigation/detailServerScope';
 import { libraryIsReady } from '@/lib/library/libraryReady';
 import {
   shouldAttemptSubsonicForActiveServer,

src/features/album/pages/AlbumDetail.tsx

@@ -45,7 +45,7 @@ import { VirtualCardGrid } from '@/ui/VirtualCardGrid';
 import LosslessModeBanner from '@/ui/LosslessModeBanner';
 import { isLosslessSuffix } from '@/lib/library/losslessFormats';
 import { isLosslessMode } from '@/lib/library/losslessMode';
-import { readDetailServerId } from '@/utils/navigation/detailServerScope';
+import { readDetailServerId } from '@/lib/navigation/detailServerScope';
 import { useOfflineBrowseContext } from '@/features/offline';
 import { offlineActionPolicy } from '@/features/offline';
 

src/features/artist/components/ArtistCardLocal.tsx

@@ -7,7 +7,7 @@ import { useArtistCoverRef } from '@/cover/useLibraryCoverRef';
 import { COVER_DENSE_GRID_MIN_CELL_CSS_PX } from '@/cover/layoutSizes';
 import { useNavigateToArtist } from '@/features/artist/hooks/useNavigateToArtist';
 import { coverServerScopeForServerId } from '@/cover/serverScope';
-import { appendServerQuery } from '@/utils/navigation/detailServerScope';
+import { appendServerQuery } from '@/lib/navigation/detailServerScope';
 
 interface Props {
   artist: SubsonicArtist;

src/features/artist/hooks/useArtistDetailData.ts

@@ -10,7 +10,7 @@ import { useConnectionStatus } from '@/hooks/useConnectionStatus';
 import { loadArtistFromLibraryIndex } from '@/features/offline';
 import { useOfflineBrowseContext } from '@/features/offline';
 import { loadArtistFromLocalPlayback, offlineLocalBrowseEnabled } from '@/features/offline';
-import { readDetailServerId } from '@/utils/navigation/detailServerScope';
+import { readDetailServerId } from '@/lib/navigation/detailServerScope';
 import { runLocalArtistLosslessBrowse } from '@/lib/library/browseTextSearch';
 import { isLosslessSuffix } from '@/lib/library/losslessFormats';
 

src/features/artist/pages/ArtistDetail.tsx

@@ -38,7 +38,7 @@ import { useWarmGridCovers } from '@/cover/useWarmGridCovers';
 import { VirtualCardGrid } from '@/ui/VirtualCardGrid';
 import { LOSSLESS_MODE_QUERY } from '@/lib/library/losslessMode';
 import { sortArtistAlbumsByYear } from '@/features/artist/utils/sortArtistAlbums';
-import { readDetailServerId } from '@/utils/navigation/detailServerScope';
+import { readDetailServerId } from '@/lib/navigation/detailServerScope';
 
 
 export default function ArtistDetail() {

src/features/auth/pages/Login.test.tsx

@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import { renderWithProviders } from '@/test/helpers/renderWithProviders';
 import { resetAuthStore } from '@/test/helpers/storeReset';
 import { useAuthStore } from '@/store/authStore';
-import { encodeServerMagicString } from '@/utils/server/serverMagicString';
+import { encodeServerMagicString } from '@/lib/server/serverMagicString';
 
 vi.mock('@/lib/api/subsonic', () => ({
   pingWithCredentialsForProfile: vi.fn(async () => ({
@@ -16,7 +16,7 @@ vi.mock('@/lib/api/subsonic', () => ({
   scheduleInstantMixProbeForServer: vi.fn(),
 }));
 
-vi.mock('@/utils/server/syncServerHttpContext', () => ({
+vi.mock('@/lib/server/syncServerHttpContext', () => ({
   syncServerHttpContextForProfile: vi.fn(async () => undefined),
 }));
 

src/features/auth/pages/Login.tsx

@@ -9,8 +9,8 @@ import {
   DEFAULT_CUSTOM_HEADERS_APPLY_TO,
   serverCustomHeadersFromForm,
   validateCustomHeaders,
-} from '@/utils/server/serverHttpHeaders';
-import { syncServerHttpContextForProfile } from '@/utils/server/syncServerHttpContext';
+} from '@/lib/server/serverHttpHeaders';
+import { syncServerHttpContextForProfile } from '@/lib/server/syncServerHttpContext';
 import { useTranslation } from 'react-i18next';
 import i18n from '@/lib/i18n';
 import CustomSelect from '@/ui/CustomSelect';
@@ -19,8 +19,8 @@ import {
   DECODED_PASSWORD_VISUAL_MASK,
   encodeServerMagicString,
   type ServerMagicPayload,
-} from '@/utils/server/serverMagicString';
-import { shortHostFromServerUrl, serverListDisplayLabel } from '@/utils/server/serverDisplayName';
+} from '@/lib/server/serverMagicString';
+import { shortHostFromServerUrl, serverListDisplayLabel } from '@/lib/server/serverDisplayName';
 
 const PsysonicLogo = () => (
   <img src="/logo-psysonic.png" width="64" height="64" alt="Psysonic" style={{ borderRadius: 18 }} />

src/features/favorites/components/FavoritesSongsTracklist.tsx

@@ -13,7 +13,7 @@ import { useThemeStore } from '@/store/themeStore';
 import { useDragDrop } from '@/lib/dnd/DragDropContext';
 import { useOrbitSongRowBehavior } from '@/features/orbit';
 import { songToTrack } from '@/lib/media/songToTrack';
-import { appendServerQuery } from '@/utils/navigation/detailServerScope';
+import { appendServerQuery } from '@/lib/navigation/detailServerScope';
 import { APP_MAIN_SCROLL_VIEWPORT_ID } from '@/constants/appScroll';
 import { useElementClientHeightById } from '@/lib/hooks/useResizeClientHeight';
 import { SORTABLE_COLUMNS } from '@/features/favorites/hooks/useFavoritesSongFiltering';

src/features/genre/pages/Genres.tsx

@@ -10,7 +10,7 @@ import { useLibraryIndexStore } from '@/store/libraryIndexStore';
 import { fetchGenreCatalog, filterGenresWithContent } from '@/features/playback/utils/playback/genreBrowsePlayback';
 import { libraryScopeForServer } from '@/lib/api/subsonicClient';
 import { peekGenreCatalogCache } from '@/lib/library/genreCatalogCountsCache';
-import { resolveIndexKey } from '@/utils/server/serverIndexKey';
+import { resolveIndexKey } from '@/lib/server/serverIndexKey';
 import { genreColor } from '@/lib/library/genreColor';
 
 const SCROLL_KEY = 'genres-scroll';

src/features/offline/pages/OfflineLibrary.tsx

@@ -35,7 +35,7 @@ import {
 import { showToast } from '@/lib/dom/toast';
 import { shuffleArray } from '@/lib/util/shuffleArray';
 import { getMediaDir } from '@/lib/media/mediaDir';
-import { canonicalQueueServerKey, resolveIndexKey } from '@/utils/server/serverIndexKey';
+import { canonicalQueueServerKey, resolveIndexKey } from '@/lib/server/serverIndexKey';
 import { reconcileAllLibraryTiersFromDisk } from '@/features/offline/utils/libraryTierReconcile';
 import {
   inferPinSourcesFromLibraryIndex,

src/features/offline/store/offlineStore.ts

@@ -17,7 +17,7 @@ import {
   pendingOfflinePinSongs,
 } from '@/features/offline/utils/offlineLibraryHelpers';
 import { librarySqlServerId } from '@/api/coverCache';
-import { resolveIndexKey, serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { resolveIndexKey, serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import { isSmartPlaylistName } from '@/utils/componentHelpers/playlistDetailHelpers';
 import {
   enqueueOfflinePin,

src/features/offline/utils/favoritesOfflineSync.ts

@@ -12,7 +12,7 @@ import { cancelledDownloads, useOfflineJobStore } from '@/features/offline/store
 import { useFavoritesOfflineSyncStore } from '@/features/offline/store/favoritesOfflineSyncStore';
 import { useLocalPlaybackStore } from '@/store/localPlaybackStore';
 import { getMediaDir } from '@/lib/media/mediaDir';
-import { resolveIndexKey, serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { resolveIndexKey, serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import { FAVORITES_OFFLINE_JOB_ID } from '@/features/offline/utils/favoritesOfflineConstants';
 import { isActiveServerReachable } from '@/utils/network/activeServerReachability';
 import { favoritesServerIds } from '@/features/offline/utils/favoritesOfflineBrowse';

src/features/offline/utils/legacyOfflineFileMigration.ts

@@ -6,8 +6,8 @@ import { useLocalPlaybackStore, type LocalPlaybackEntry, type PinSource } from '
 import { localPlaybackEntryKey } from '@/store/localPlaybackKeys';
 import { importLegacyLocalPlayback } from '@/store/localPlaybackMigration';
 import { getMediaDir } from '@/lib/media/mediaDir';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
-import { resolveIndexKey } from '@/utils/server/serverIndexKey';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
+import { resolveIndexKey } from '@/lib/server/serverIndexKey';
 
 interface LegacyOfflineMigrationResult {
   trackId: string;

src/features/offline/utils/libraryTierReconcile.ts

@@ -6,7 +6,7 @@ import { useAuthStore } from '@/store/authStore';
 import type { LocalPlaybackEntry, PinSource } from '@/store/localPlaybackStore';
 import { useLocalPlaybackStore } from '@/store/localPlaybackStore';
 import { getMediaDir } from '@/lib/media/mediaDir';
-import { resolveIndexKey, serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { resolveIndexKey, serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import {
   entryBelongsToServer,
   findLocalPlaybackEntry,

src/features/offline/utils/offlineLibraryHelpers.ts

@@ -8,10 +8,10 @@ import { useLocalPlaybackStore } from '@/store/localPlaybackStore';
 import { findLocalPlaybackEntry, hasLocalLibraryBytes } from '@/store/localPlaybackResolve';
 import { useOfflineStore, type OfflineAlbumMeta } from '@/features/offline/store/offlineStore';
 import { resolveTrackCoverArtId, trackToSong } from '@/lib/library/advancedSearchLocal';
-import { canonicalQueueServerKey, resolveIndexKey } from '@/utils/server/serverIndexKey';
+import { canonicalQueueServerKey, resolveIndexKey } from '@/lib/server/serverIndexKey';
 import type { Track } from '@/lib/media/trackTypes';
-import { findServerByIdOrIndexKey, resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
-import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { findServerByIdOrIndexKey, resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 
 export interface OfflineLibraryCard {
   serverIndexKey: string;

src/features/offline/utils/pinnedOfflineSync.ts

@@ -15,8 +15,8 @@ import {
   isActiveServerReachable,
   onActiveServerBecameReachable,
 } from '@/utils/network/activeServerReachability';
-import { resolveIndexKey, serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { resolveIndexKey, serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import { findLocalPlaybackEntry } from '@/store/localPlaybackResolve';
 import { enqueueOfflinePin } from '@/features/offline/utils/offlinePinQueue';
 

src/features/offline/utils/resumeIncompleteOfflinePins.ts

@@ -7,7 +7,7 @@ import { useOfflineStore } from '@/features/offline/store/offlineStore';
 import { trackToSong } from '@/lib/library/advancedSearchLocal';
 import { isActiveServerReachable, onActiveServerBecameReachable } from '@/utils/network/activeServerReachability';
 import { shouldAttemptSubsonicForServer } from '@/utils/network/subsonicNetworkGuard';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import { isOfflinePinComplete } from '@/features/offline/utils/offlineLibraryHelpers';
 import { resolveAlbumForServer } from '@/features/offline/utils/offlineMediaResolve';
 

src/features/orbit/components/OrbitSharePopover.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 import { useOrbitStore } from '@/features/orbit/store/orbitStore';
 import { useAuthStore } from '@/store/authStore';
 import { buildOrbitShareLink } from '@/features/orbit/utils/orbit';
-import { serverShareBaseUrl } from '@/utils/server/serverEndpoint';
+import { serverShareBaseUrl } from '@/lib/server/serverEndpoint';
 
 interface Props {
   anchorRef: React.RefObject<HTMLElement | null>;

src/features/orbit/components/OrbitStartModal.tsx

@@ -13,7 +13,7 @@ import {
 import { randomOrbitSessionName } from '@/features/orbit/utils/orbitNames';
 import { useAuthStore } from '@/store/authStore';
 import { usePlayerStore } from '@/features/playback/store/playerStore';
-import { isLanUrl, serverShareBaseUrl } from '@/utils/server/serverEndpoint';
+import { isLanUrl, serverShareBaseUrl } from '@/lib/server/serverEndpoint';
 import { ORBIT_DEFAULT_MAX_USERS } from '@/features/orbit/api/orbit';
 
 interface Props { onClose: () => void; }

src/features/playback/store/applyQueueHistorySnapshot.ts

@@ -13,7 +13,7 @@ import type { QueueItemRef } from '@/lib/media/trackTypes';
 import type { PlayerState } from '@/features/playback/store/playerStoreTypes';
 import { resolveQueueTrack } from '@/features/playback/store/queueTrackView';
 import { seedQueueResolver } from '@/features/playback/store/queueTrackResolver';
-import { canonicalQueueServerKey } from '@/utils/server/serverIndexKey';
+import { canonicalQueueServerKey } from '@/lib/server/serverIndexKey';
 import { sameQueueTrackId } from '@/features/playback/utils/playback/queueIdentity';
 import { queueUndoRestoreAudioEngine } from '@/features/playback/store/queueUndoAudioRestore';
 import {

src/features/playback/store/applyServerPlayQueue.idle.test.ts

@@ -7,7 +7,7 @@ vi.mock('@/lib/api/subsonicPlayQueue', () => ({
   getPlayQueueForServer: (...args: unknown[]) => getPlayQueueForServerMock(...args),
 }));
 
-vi.mock('@/utils/server/serverLookup', () => ({
+vi.mock('@/lib/server/serverLookup', () => ({
   resolveServerIdForIndexKey: (id: string) => id,
 }));
 

src/features/playback/store/applyServerPlayQueue.ts

@@ -1,7 +1,7 @@
 import { getPlayQueueForServer, type PlayQueueResult } from '@/lib/api/subsonicPlayQueue';
 import { songToTrack } from '@/lib/media/songToTrack';
 import { bindQueueServerId } from '@/features/playback/utils/playback/playbackServer';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import { toQueueItemRefs } from '@/features/playback/store/queueItemRef';
 import { seedQueueResolver } from '@/features/playback/store/queueTrackResolver';
 import type { Track } from '@/lib/media/trackTypes';

src/features/playback/store/loudnessRefresh.test.ts

@@ -39,7 +39,7 @@ const hoisted = vi.hoisted(() => {
 
 vi.mock('@tauri-apps/api/core', () => ({ invoke: hoisted.invokeMock }));
 vi.mock('@/lib/api/subsonicStreamUrl', () => ({ buildStreamUrl: hoisted.buildStreamUrlMock }));
-vi.mock('@/utils/server/redactSubsonicUrl', () => ({ redactSubsonicUrlForLog: hoisted.redactMock }));
+vi.mock('@/lib/server/redactSubsonicUrl', () => ({ redactSubsonicUrlForLog: hoisted.redactMock }));
 vi.mock('@/store/authStore', () => ({ useAuthStore: { getState: () => hoisted.auth } }));
 vi.mock('@/features/playback/store/playerStore', () => ({
   usePlayerStore: {

src/features/playback/store/loudnessRefresh.ts

@@ -1,7 +1,7 @@
 import { buildStreamUrl } from '@/lib/api/subsonicStreamUrl';
 import { invoke } from '@tauri-apps/api/core';
 import { getPlaybackIndexKey } from '@/features/playback/utils/playback/playbackServer';
-import { redactSubsonicUrlForLog } from '@/utils/server/redactSubsonicUrl';
+import { redactSubsonicUrlForLog } from '@/lib/server/redactSubsonicUrl';
 import { useAuthStore } from '@/store/authStore';
 import { usePlayerStore } from '@/features/playback/store/playerStore';
 import { emitNormalizationDebug } from '@/features/playback/store/normalizationDebug';

src/features/playback/store/playbackUrlRouting.ts

@@ -1,6 +1,6 @@
 import { findLocalPlaybackUrl } from '@/store/localPlaybackResolve';
 import { resolvePlaybackUrl, type PlaybackSourceKind } from '@/features/playback/utils/playback/resolvePlaybackUrl';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import { sameQueueTrackId } from '@/features/playback/utils/playback/queueIdentity';
 
 /**

src/features/playback/store/playerStore.ts

@@ -7,7 +7,7 @@ import { emitPlaybackProgress } from '@/features/playback/store/playbackProgress
 import type { QueueItemRef, Track } from '@/lib/media/trackTypes';
 import type { PlayerState } from '@/features/playback/store/playerStoreTypes';
 import { toQueueItemRefs } from '@/features/playback/store/queueItemRef';
-import { canonicalQueueServerKey } from '@/utils/server/serverIndexKey';
+import { canonicalQueueServerKey } from '@/lib/server/serverIndexKey';
 import { readInitialQueueVisibility } from '@/features/playback/store/queueVisibilityStorage';
 import { createNetworkLoveActions } from '@/features/playback/store/networkLoveActions';
 import { createMiscActions } from '@/features/playback/store/miscActions';

src/features/playback/store/queueItemRef.ts

@@ -1,6 +1,6 @@
 import type { QueueItemRef, Track } from '@/lib/media/trackTypes';
 import { stampTrackServerId } from '@/lib/media/trackServerScope';
-import { canonicalQueueServerKey } from '@/utils/server/serverIndexKey';
+import { canonicalQueueServerKey } from '@/lib/server/serverIndexKey';
 
 /**
  * Derive thin `QueueItemRef`s from a `Track[]` queue (thin-state). Per-item

src/features/playback/store/queueRestore.ts

@@ -1,7 +1,7 @@
 import { useAuthStore } from '@/store/authStore';
 import { usePlayerStore } from '@/features/playback/store/playerStore';
 import type { QueueItemRef } from '@/lib/media/trackTypes';
-import { canonicalQueueServerKey } from '@/utils/server/serverIndexKey';
+import { canonicalQueueServerKey } from '@/lib/server/serverIndexKey';
 import { resolveBatch } from './queueTrackResolver';
 
 /**

src/features/playback/store/queueTrackResolver.ts

@@ -3,8 +3,8 @@ import { getSongForServer } from '@/lib/api/subsonicLibrary';
 import { usePlayerStore } from '@/features/playback/store/playerStore';
 import type { QueueItemRef, Track } from '@/lib/media/trackTypes';
 import { songToTrack } from '@/lib/media/songToTrack';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
-import { canonicalQueueServerKey } from '@/utils/server/serverIndexKey';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
+import { canonicalQueueServerKey } from '@/lib/server/serverIndexKey';
 import { trackToSong } from '@/lib/library/advancedSearchLocal';
 import { libraryIsReady } from '@/lib/library/libraryReady';
 

src/features/playback/utils/playback/playbackServer.ts

@@ -9,13 +9,13 @@ import { usePlayerStore } from '@/features/playback/store/playerStore';
 import { switchActiveServer } from '@/utils/server/switchActiveServer';
 import { sameQueueTrackId } from '@/features/playback/utils/playback/queueIdentity';
 import type { QueueItemRef, Track } from '@/lib/media/trackTypes';
-import { findServerByIdOrIndexKey, resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { findServerByIdOrIndexKey, resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import {
   canonicalQueueServerKey,
   resolveIndexKey,
   serverIndexKeyForProfile,
   serverIndexKeyFromUrl,
-} from '@/utils/server/serverIndexKey';
+} from '@/lib/server/serverIndexKey';
 import {
   activeServerProfileId,
   isMultiServerQueue,

src/features/playback/utils/playback/resolvePlaybackUrl.ts

@@ -1,6 +1,6 @@
 import { buildStreamUrlForServer } from '@/lib/api/subsonicStreamUrl';
 import { findLocalPlaybackUrl } from '@/store/localPlaybackResolve';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import { getPlaybackCacheServerKey, getPlaybackServerId } from '@/features/playback/utils/playback/playbackServer';
 
 /** Same resolution order as {@link resolvePlaybackUrl} — for UI hints only. */

src/features/playback/utils/playback/trackServerScope.ts

@@ -1,6 +1,6 @@
 import type { QueueItemRef } from '@/lib/media/trackTypes';
 import { usePlayerStore } from '@/features/playback/store/playerStore';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 import { activeServerProfileId, profileIdFromQueueRef } from '@/lib/media/trackServerScope';
 
 /**

src/features/queue/components/QueuePanel.tsx

@@ -13,8 +13,8 @@ import { useTranslation } from 'react-i18next';
 import { usePlaybackLibraryNavigate } from '@/features/playback/hooks/usePlaybackLibraryNavigate';
 import { useAuthStore } from '@/store/authStore';
 import { encodeSharePayload } from '@/utils/share/shareLink';
-import { serverShareBaseUrl } from '@/utils/server/serverEndpoint';
-import { copyTextToClipboard } from '@/utils/server/serverMagicString';
+import { serverShareBaseUrl } from '@/lib/server/serverEndpoint';
+import { copyTextToClipboard } from '@/lib/server/serverMagicString';
 import { showToast } from '@/lib/dom/toast';
 import { useThemeStore } from '@/store/themeStore';
 import { useLyricsStore } from '@/store/lyricsStore';

src/features/search/components/LiveSearch.tsx

@@ -54,7 +54,7 @@ import {
   resolveLiveSearchScopeGhost,
 } from '@/features/search/components/liveSearchScope';
 import { useLiveSearchScopeStore } from '@/store/liveSearchScopeStore';
-import { resolveIndexKey } from '@/utils/server/serverIndexKey';
+import { resolveIndexKey } from '@/lib/server/serverIndexKey';
 
 type LiveSearchSource = 'local' | 'network';
 

src/features/search/hooks/useShareSearch.ts

@@ -11,7 +11,7 @@ import type { ServerProfile } from '@/store/authStoreTypes';
 import { findServerIdForShareUrl } from '@/utils/share/shareLink';
 import { shareServerOriginLabel } from '@/utils/share/shareServerOriginLabel';
 import { parseShareSearchText } from '@/utils/share/shareSearch';
-import { serverIndexKeyFromUrl } from '@/utils/server/serverIndexKey';
+import { serverIndexKeyFromUrl } from '@/lib/server/serverIndexKey';
 import { useShareSearchPreview } from '@/features/search/hooks/useShareSearchPreview';
 
 export function useShareSearch(query: string, onSuccess?: () => void) {

src/features/search/pages/SearchBrowsePage.tsx

@@ -35,8 +35,8 @@ import {
   registerAdvancedSearchSessionProvider,
   resolveAdvancedSearchLeaveSnapshot,
   type AdvancedSearchLeaveSnapshot,
-} from '@/utils/navigation/advancedSearchScrollSnapshot';
-import { restoreMainViewportScroll } from '@/utils/navigation/restoreMainViewportScroll';
+} from '@/lib/navigation/advancedSearchScrollSnapshot';
+import { restoreMainViewportScroll } from '@/lib/navigation/restoreMainViewportScroll';
 import {
   loadMoreLocalSongs,
   runNetworkAdvancedTextSearch,

src/features/settings/components/AddServerForm.test.tsx

@@ -3,7 +3,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { renderWithProviders } from '@/test/helpers/renderWithProviders';
 import { AddServerForm } from '@/features/settings/components/AddServerForm';
-import { encodeServerMagicString } from '@/utils/server/serverMagicString';
+import { encodeServerMagicString } from '@/lib/server/serverMagicString';
 
 // resolve_host_addresses Tauri command — hint-only, must not block save.
 vi.mock('@/api/network', () => ({

src/features/settings/components/AddServerForm.tsx

@@ -6,16 +6,16 @@ import {
   DEFAULT_CUSTOM_HEADERS_APPLY_TO,
   serverCustomHeadersFromForm,
   validateCustomHeaders,
-} from '@/utils/server/serverHttpHeaders';
+} from '@/lib/server/serverHttpHeaders';
 import { CustomHttpHeadersEditor } from '@/features/settings/components/CustomHttpHeadersEditor';
 import {
   decodeServerMagicString,
   encodeServerMagicString,
   DECODED_PASSWORD_VISUAL_MASK,
   type ServerMagicPayload,
-} from '@/utils/server/serverMagicString';
-import { shortHostFromServerUrl } from '@/utils/server/serverDisplayName';
-import { isLanUrl } from '@/utils/server/serverEndpoint';
+} from '@/lib/server/serverMagicString';
+import { shortHostFromServerUrl } from '@/lib/server/serverDisplayName';
+import { isLanUrl } from '@/lib/server/serverEndpoint';
 import { resolveHostAddresses } from '@/api/network';
 
 type FormState = {

src/features/settings/components/AnalyticsStrategySection.tsx

@@ -21,8 +21,8 @@ import {
 } from '@/api/analysis';
 import { libraryGetTracksBatch, type LibraryTrackDto, type TrackRefDto } from '@/lib/api/library';
 import { buildStreamUrlForServer } from '@/lib/api/subsonicStreamUrl';
-import { serverListDisplayLabel } from '@/utils/server/serverDisplayName';
-import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { serverListDisplayLabel } from '@/lib/server/serverDisplayName';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import { showToast } from '@/lib/dom/toast';
 import {
   ANALYTICS_STRATEGIES,

src/features/settings/components/CoverCacheStrategySection.tsx

@@ -14,8 +14,8 @@ import {
   libraryCoverProgress,
 } from '@/api/coverCache';
 import { clearDiskSrcCacheForServer } from '@/cover/diskSrcCache';
-import { serverListDisplayLabel } from '@/utils/server/serverDisplayName';
-import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { serverListDisplayLabel } from '@/lib/server/serverDisplayName';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import { showToast } from '@/lib/dom/toast';
 import { formatBytes } from '@/lib/format/formatBytes';
 import { clearImageCache, getImageCacheSize } from '@/utils/imageCache';

src/features/settings/components/ServersTab.tsx

@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import { open as openUrl } from '@tauri-apps/plugin-shell';
 import { AlertTriangle, CheckCircle2, Info, Lock, LogOut, Pencil, Plus, Power, Server, Sparkles, Wifi, WifiOff } from 'lucide-react';
 import { useAuthStore } from '@/store/authStore';
-import { formatServerSoftware, isNavidromeAudiomuseSoftwareEligible, type InstantMixProbeResult, type SubsonicServerIdentity } from '@/utils/server/subsonicServerIdentity';
+import { formatServerSoftware, isNavidromeAudiomuseSoftwareEligible, type InstantMixProbeResult, type SubsonicServerIdentity } from '@/lib/server/subsonicServerIdentity';
 import { buildCapabilityContext } from '@/serverCapabilities/context';
 import { useLibraryIndexStore } from '@/store/libraryIndexStore';
 import { libraryDeleteServerData, librarySyncClearSession } from '@/lib/api/library';
@@ -16,24 +16,24 @@ import { pingWithCredentialsForProfile, scheduleInstantMixProbeForServer } from
 import {
   clearServerHttpContext,
   syncServerHttpContextForProfile,
-} from '@/utils/server/syncServerHttpContext';
-import { type ServerMagicPayload } from '@/utils/server/serverMagicString';
-import { ensureConnectUrlResolved, invalidateReachableEndpointCache } from '@/utils/server/serverEndpoint';
+} from '@/lib/server/syncServerHttpContext';
+import { type ServerMagicPayload } from '@/lib/server/serverMagicString';
+import { ensureConnectUrlResolved, invalidateReachableEndpointCache } from '@/lib/server/serverEndpoint';
 import {
   verifySameServerEndpoints,
   type VerifySameServerResult,
-} from '@/utils/server/serverFingerprint';
+} from '@/lib/server/serverFingerprint';
 import {
   indexKeyRemapForUrlChange,
   runIndexKeyRemigration,
-} from '@/utils/server/serverUrlRemigration';
+} from '@/lib/server/serverUrlRemigration';
 import { useConfirmModalStore } from '@/store/confirmModalStore';
 import { showToast } from '@/lib/dom/toast';
 import { FEATURE_AUDIOMUSE_SIMILAR_TRACKS } from '@/serverCapabilities/catalog';
 import { isFeatureActiveForServer, resolveFeatureForServer } from '@/serverCapabilities/storeView';
 import type { ResolvedCapability } from '@/serverCapabilities/types';
-import { serverIdentityLabel, serverListDisplayLabel, serverSettingsEntryTitle } from '@/utils/server/serverDisplayName';
-import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { serverIdentityLabel, serverListDisplayLabel, serverSettingsEntryTitle } from '@/lib/server/serverDisplayName';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import { switchActiveServer } from '@/utils/server/switchActiveServer';
 import { AddServerForm } from '@/features/settings/components/AddServerForm';
 import { ServerCapabilityHeaderBadge } from '@/features/settings/components/ServerCapabilityHeaderBadge';

src/features/settings/components/UserForm.tsx

@@ -7,8 +7,8 @@ import {
   copyTextToClipboard,
   encodeServerMagicString,
   magicPayloadAddressFields,
-} from '@/utils/server/serverMagicString';
-import { shortHostFromServerUrl } from '@/utils/server/serverDisplayName';
+} from '@/lib/server/serverMagicString';
+import { shortHostFromServerUrl } from '@/lib/server/serverDisplayName';
 import { useAuthStore } from '@/store/authStore';
 
 export interface UserFormState {

src/features/settings/components/userMgmt/MagicStringModal.tsx

@@ -8,8 +8,8 @@ import {
   copyTextToClipboard,
   encodeServerMagicString,
   magicPayloadAddressFields,
-} from '@/utils/server/serverMagicString';
-import { shortHostFromServerUrl } from '@/utils/server/serverDisplayName';
+} from '@/lib/server/serverMagicString';
+import { shortHostFromServerUrl } from '@/lib/server/serverDisplayName';
 import { useAuthStore } from '@/store/authStore';
 
 interface Props {

src/features/settings/hooks/useUserMgmtActions.ts

@@ -12,8 +12,8 @@ import { showToast } from '@/lib/dom/toast';
 import {
   copyTextToClipboard,
   encodeServerMagicString,
-} from '@/utils/server/serverMagicString';
-import { shortHostFromServerUrl } from '@/utils/server/serverDisplayName';
+} from '@/lib/server/serverMagicString';
+import { shortHostFromServerUrl } from '@/lib/server/serverDisplayName';
 import type { UserFormState } from '@/features/settings/components/UserForm';
 
 interface UseUserMgmtActionsArgs {

src/features/settings/pages/Settings.tsx

@@ -21,7 +21,7 @@ import { searchSettings, type SettingsSearchHit } from '@/features/settings/comp
 import { type Tab, resolveTab } from '@/features/settings/components/settingsTabs';
 import { UserManagementSection } from '@/features/settings/components/UserManagementSection';
 import { ndLogin } from '@/lib/api/navidromeAdmin';
-import { type ServerMagicPayload } from '@/utils/server/serverMagicString';
+import { type ServerMagicPayload } from '@/lib/server/serverMagicString';
 
 
 export default function Settings() {

src/features/sidebar/components/perfProbe/SidebarPerfProbeConnectionsTab.tsx

@@ -2,8 +2,8 @@ import { useAuthStore } from '@/store/authStore';
 import { usePlayerStore } from '@/features/playback/store/playerStore';
 import { useConnectionStatus } from '@/hooks/useConnectionStatus';
 import { useNavidromeAdminRole } from '@/hooks/useNavidromeAdminRole';
-import { serverListDisplayLabel } from '@/utils/server/serverDisplayName';
-import { findServerByIdOrIndexKey } from '@/utils/server/serverLookup';
+import { serverListDisplayLabel } from '@/lib/server/serverDisplayName';
+import { findServerByIdOrIndexKey } from '@/lib/server/serverLookup';
 import { PerfProbeMetricSection } from '@/features/sidebar/components/perfProbe/PerfProbeMetricCard';
 import PerfProbeDetailList from '@/features/sidebar/components/perfProbe/PerfProbeDetailList';
 import PerfProbeStatusBadge, { type PerfProbeBadgeTone } from '@/features/sidebar/components/perfProbe/PerfProbeStatusBadge';

src/features/sidebar/components/perfProbe/SidebarPerfProbeServerSection.tsx

@@ -1,6 +1,6 @@
 import { useAuthStore } from '@/store/authStore';
 import type { NavidromeAdminRole } from '@/hooks/useNavidromeAdminRole';
-import { isNavidromeServer, formatServerSoftware } from '@/utils/server/subsonicServerIdentity';
+import { isNavidromeServer, formatServerSoftware } from '@/lib/server/subsonicServerIdentity';
 import { FEATURE_AUDIOMUSE_SIMILAR_TRACKS, OP_SIMILAR_TRACKS } from '@/serverCapabilities/catalog';
 import {
   isFeatureActiveForServer,

src/hooks/useConnectionStatus.test.ts

@@ -5,7 +5,7 @@ import { useAuthStore } from '@/store/authStore';
 import {
   invalidateReachableEndpointCache,
   type PickReachableResult,
-} from '@/utils/server/serverEndpoint';
+} from '@/lib/server/serverEndpoint';
 
 vi.mock('@/lib/api/subsonic', () => ({
   pingWithCredentials: vi.fn(),

src/hooks/useConnectionStatus.ts

@@ -1,13 +1,13 @@
 import { useState, useEffect, useCallback, useRef, useMemo, useSyncExternalStore } from 'react';
 import { useAuthStore } from '../store/authStore';
 import { scheduleInstantMixProbeForServer } from '@/lib/api/subsonic';
-import { serverListDisplayLabel } from '../utils/server/serverDisplayName';
+import { serverListDisplayLabel } from '@/lib/server/serverDisplayName';
 import {
   ensureConnectUrlResolved,
   invalidateReachableEndpointCache,
   isLanUrl,
   type ServerEndpointKind,
-} from '../utils/server/serverEndpoint';
+} from '@/lib/server/serverEndpoint';
 import {
   getConnectionStatus,
   setActiveServerReachable,

src/hooks/useNavidromeAdminRole.ts

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { ndLogin } from '@/lib/api/navidromeAdmin';
 import { useAuthStore } from '../store/authStore';
-import { isNavidromeServer } from '../utils/server/subsonicServerIdentity';
+import { isNavidromeServer } from '@/lib/server/subsonicServerIdentity';
 
 export type NavidromeAdminRole = 'idle' | 'checking' | 'admin' | 'user' | 'na' | 'error';
 

src/hotCachePrefetch/analysisPrune.ts

@@ -4,7 +4,7 @@ import { usePlayerStore } from '@/features/playback/store/playerStore';
 import { collectPlaybackMiddlePriorityTrackIds } from '@/features/playback/store/loudnessBackfillWindow';
 import { getPlaybackServerId } from '@/features/playback/utils/playback/playbackServer';
 import { analysisSetPlaybackPriorityHints } from '../api/analysis';
-import { serverIndexKeyFromUrl } from '../utils/server/serverIndexKey';
+import { serverIndexKeyFromUrl } from '@/lib/server/serverIndexKey';
 import { hotCacheFrontendDebug } from './helpers';
 
 let analysisPruneTimer: ReturnType<typeof setTimeout> | null = null;

src/lib/api/library.ts

@@ -9,8 +9,8 @@
 import { invoke } from '@tauri-apps/api/core';
 import { listen, type UnlistenFn } from '@tauri-apps/api/event';
 import { useAuthStore } from '@/store/authStore';
-import { serverIndexKeyFromUrl } from '@/utils/server/serverIndexKey';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { serverIndexKeyFromUrl } from '@/lib/server/serverIndexKey';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 
 // ── DTO mirrors (camelCase, matching the Rust `#[serde(rename_all = "camelCase")]`) ─
 

src/lib/api/subsonic.scheduleProbe.test.ts

@@ -7,7 +7,7 @@ vi.mock('@/lib/api/subsonicOpenSubsonic', () => ({
 import { fetchOpenSubsonicExtensionsWithCredentials } from '@/lib/api/subsonicOpenSubsonic';
 import { scheduleInstantMixProbeForServer } from '@/lib/api/subsonic';
 import { useAuthStore } from '@/store/authStore';
-import type { SubsonicServerIdentity } from '@/utils/server/subsonicServerIdentity';
+import type { SubsonicServerIdentity } from '@/lib/server/subsonicServerIdentity';
 
 const fetchMock = vi.mocked(fetchOpenSubsonicExtensionsWithCredentials);
 const SID = 'srv-probe';

src/lib/api/subsonic.ts

@@ -2,12 +2,12 @@ import axios from 'axios';
 import md5 from 'md5';
 import { useAuthStore } from '@/store/authStore';
 import type { ServerProfile } from '@/store/authStoreTypes';
-import { headersForServerRequest } from '@/utils/server/serverHttpHeaders';
-import { findServerByIdOrIndexKey } from '@/utils/server/serverLookup';
+import { headersForServerRequest } from '@/lib/server/serverHttpHeaders';
+import { findServerByIdOrIndexKey } from '@/lib/server/serverLookup';
 import {
   type InstantMixProbeResult,
   type SubsonicServerIdentity,
-} from '@/utils/server/subsonicServerIdentity';
+} from '@/lib/server/subsonicServerIdentity';
 import { fetchOpenSubsonicExtensionsWithCredentials } from '@/lib/api/subsonicOpenSubsonic';
 import { buildCapabilityContext } from '@/serverCapabilities/context';
 import {

src/lib/api/subsonicClient.ts

@@ -3,9 +3,9 @@ import md5 from 'md5';
 import { version } from '@/../package.json';
 import { useAuthStore } from '@/store/authStore';
 import type { ServerProfile } from '@/store/authStoreTypes';
-import { connectBaseUrlForServer } from '@/utils/server/serverEndpoint';
-import { headersForServerRequest } from '@/utils/server/serverHttpHeaders';
-import { findServerByIdOrIndexKey, resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { connectBaseUrlForServer } from '@/lib/server/serverEndpoint';
+import { headersForServerRequest } from '@/lib/server/serverHttpHeaders';
+import { findServerByIdOrIndexKey, resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 
 export const SUBSONIC_CLIENT = `psysonic/${version}`;
 

src/lib/api/subsonicStreamUrl.ts

@@ -3,8 +3,8 @@ import { coverStorageKeyFromRef } from '@/cover/storageKeys';
 import { coverEntryToRef, resolveAlbumCoverEntry } from '@/cover/resolveEntry';
 import type { CoverArtTier } from '@/cover/types';
 import { useAuthStore } from '@/store/authStore';
-import { connectBaseUrlForServer } from '@/utils/server/serverEndpoint';
-import { findServerByIdOrIndexKey } from '@/utils/server/serverLookup';
+import { connectBaseUrlForServer } from '@/lib/server/serverEndpoint';
+import { findServerByIdOrIndexKey } from '@/lib/server/serverLookup';
 import { restBaseFromUrl, SUBSONIC_CLIENT, secureRandomSalt } from '@/lib/api/subsonicClient';
 
 function coverArtQueryParams(username: string, password: string, id: string, size: number): URLSearchParams {

src/lib/api/subsonicTypes.ts

@@ -1,4 +1,4 @@
-import type { SubsonicServerIdentity } from '@/utils/server/subsonicServerIdentity';
+import type { SubsonicServerIdentity } from '@/lib/server/subsonicServerIdentity';
 
 /** OpenSubsonic `ItemGenre` on songs/albums (atomic genres from the server). */
 export interface SubsonicItemGenre {

src/lib/library/genreCatalogCountsCache.ts

@@ -1,5 +1,5 @@
 import type { SubsonicGenre } from '@/lib/api/subsonicTypes';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 
 /** Fresh hits skip SQLite entirely. */
 const FRESH_TTL_MS = 60 * 60 * 1000;

src/lib/library/hooks/useLibraryAnalysisBackfill.ts

@@ -7,7 +7,7 @@ import { librarySqlServerId } from '@/api/coverCache';
 import { useAuthStore } from '@/store/authStore';
 import { useAnalysisStrategyStore } from '@/store/analysisStrategyStore';
 import { DEFAULT_ADVANCED_PARALLELISM } from '@/lib/library/analysisStrategy';
-import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 
 const DISABLED_CONFIGURE = {
   enabled: false,

src/lib/library/hooks/useLibraryIndexSync.ts

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { useAuthStore } from '@/store/authStore';
 import { useLibraryIndexStore } from '@/store/libraryIndexStore';
 import { showToast } from '@/lib/dom/toast';
-import { resolveIndexKey, serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
+import { resolveIndexKey, serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
 import {
   libraryGetStatus,
   librarySyncCancel,

src/lib/library/librarySession.ts

@@ -6,9 +6,9 @@ import { enqueueLibrarySync, queueInitialSyncIfNeeded } from './librarySyncQueue
 import type { ServerProfile } from '@/store/authStoreTypes';
 import { useAuthStore } from '@/store/authStore';
 import { useLibraryIndexStore } from '@/store/libraryIndexStore';
-import { ensureConnectUrlResolved } from '@/utils/server/serverEndpoint';
-import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
-import { syncServerHttpContextForProfile } from '@/utils/server/syncServerHttpContext';
+import { ensureConnectUrlResolved } from '@/lib/server/serverEndpoint';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
+import { syncServerHttpContextForProfile } from '@/lib/server/syncServerHttpContext';
 import { libraryDevEnabled, logLibraryStatus, logLibrarySync, timed } from './libraryDevLog';
 
 export type BindServerResult = 'bound' | 'offline' | 'error';

src/lib/media/trackServerScope.ts

@@ -1,7 +1,7 @@
 import type { Track, QueueItemRef } from '@/lib/media/trackTypes';
 import { useAuthStore } from '@/store/authStore';
-import { canonicalQueueServerKey } from '@/utils/server/serverIndexKey';
-import { resolveServerIdForIndexKey } from '@/utils/server/serverLookup';
+import { canonicalQueueServerKey } from '@/lib/server/serverIndexKey';
+import { resolveServerIdForIndexKey } from '@/lib/server/serverLookup';
 
 /**
  * Pure server-scope helpers for the shared media model: stamp the owning server

src/lib/navigation/advancedSearchScrollSnapshot.test.ts

@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
 import { afterEach, describe, expect, it } from 'vitest';
-import { APP_MAIN_SCROLL_VIEWPORT_ID } from '../../constants/appScroll';
+import { APP_MAIN_SCROLL_VIEWPORT_ID } from '@/constants/appScroll';
 import {
   clearAdvancedSearchLeaveSnapshots,
   peekPersistedAdvancedSearchLeaveSnapshot,
@@ -9,8 +9,8 @@ import {
   registerAdvancedSearchSessionProvider,
   resolveAdvancedSearchLeaveSnapshot,
   saveAdvancedSearchLeaveSnapshot,
-} from './advancedSearchScrollSnapshot';
-import { useAdvancedSearchSessionStore } from '../../store/advancedSearchSessionStore';
+} from '@/lib/navigation/advancedSearchScrollSnapshot';
+import { useAdvancedSearchSessionStore } from '@/store/advancedSearchSessionStore';
 
 describe('advancedSearchScrollSnapshot', () => {
   afterEach(() => {

src/lib/navigation/advancedSearchScrollSnapshot.ts

@@ -1,8 +1,8 @@
-import { APP_MAIN_SCROLL_VIEWPORT_ID } from '../../constants/appScroll';
+import { APP_MAIN_SCROLL_VIEWPORT_ID } from '@/constants/appScroll';
 import {
   useAdvancedSearchSessionStore,
   type AdvancedSearchSessionStash,
-} from '../../store/advancedSearchSessionStore';
+} from '@/store/advancedSearchSessionStore';
 
 export type AdvancedSearchLeaveSnapshot = {
   scrollTop: number;

src/lib/navigation/detailServerScope.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest';
-import { useAuthStore } from '../../store/authStore';
-import { appendServerQuery, readDetailServerId } from './detailServerScope';
+import { useAuthStore } from '@/store/authStore';
+import { appendServerQuery, readDetailServerId } from '@/lib/navigation/detailServerScope';
 
 describe('detailServerScope', () => {
   beforeEach(() => {

src/lib/navigation/detailServerScope.ts

@@ -1,4 +1,4 @@
-import { useAuthStore } from '../../store/authStore';
+import { useAuthStore } from '@/store/authStore';
 
 /** Resolve `?server=` on album/artist detail routes; falls back when absent or unknown. */
 export function readDetailServerId(

src/lib/navigation/restoreMainViewportScroll.ts

@@ -1,4 +1,4 @@
-import { APP_MAIN_SCROLL_VIEWPORT_ID } from '../../constants/appScroll';
+import { APP_MAIN_SCROLL_VIEWPORT_ID } from '@/constants/appScroll';
 
 const SAFETY_TIMEOUT_MS = 3000;
 

src/lib/server/serverBaseUrl.ts

@@ -1,4 +1,4 @@
-import type { ServerProfile } from '../../store/authStoreTypes';
+import type { ServerProfile } from '@/store/authStoreTypes';
 
 /** Normalized Subsonic root URL for a server profile (same shape as `getBaseUrl`). */
 export function serverProfileBaseUrl(server: Pick<ServerProfile, 'url'>): string {

src/lib/server/serverDisplayName.test.ts

@@ -1,6 +1,6 @@
-import type { ServerProfile } from '../../store/authStoreTypes';
+import type { ServerProfile } from '@/store/authStoreTypes';
 import { describe, expect, it } from 'vitest';
-import { serverIdentityLabel, serverListDisplayLabel, serverSettingsEntryTitle, shortHostFromServerUrl } from './serverDisplayName';
+import { serverIdentityLabel, serverListDisplayLabel, serverSettingsEntryTitle, shortHostFromServerUrl } from '@/lib/server/serverDisplayName';
 
 function srv(p: Partial<ServerProfile> & Pick<ServerProfile, 'id'>): ServerProfile {
   return {

src/lib/server/serverDisplayName.ts

@@ -1,4 +1,4 @@
-import type { ServerProfile } from '../../store/authStoreTypes';
+import type { ServerProfile } from '@/store/authStoreTypes';
 /** Host (+ port) from a server base URL, e.g. `https://music.one.com/foo` → `music.one.com`. */
 export function shortHostFromServerUrl(urlRaw?: string | null): string {
   const t = typeof urlRaw === 'string' ? urlRaw.trim() : '';

src/lib/server/serverEndpoint.test.ts

@@ -17,8 +17,8 @@ import {
   serverAddressEndpoints,
   serverShareBaseUrl,
   subscribeConnectCache,
-} from './serverEndpoint';
-import type { ServerProfile } from '../../store/authStoreTypes';
+} from '@/lib/server/serverEndpoint';
+import type { ServerProfile } from '@/store/authStoreTypes';
 
 function makeProfile(overrides: Partial<ServerProfile> = {}): ServerProfile {
   return {

src/lib/server/serverEndpoint.ts

@@ -1,7 +1,7 @@
 import { pingWithCredentialsForProfile } from '@/lib/api/subsonic';
 import type { PingWithCredentialsResult } from '@/lib/api/subsonicTypes';
-import type { ServerProfile } from '../../store/authStoreTypes';
-import { serverProfileBaseUrl } from './serverBaseUrl';
+import type { ServerProfile } from '@/store/authStoreTypes';
+import { serverProfileBaseUrl } from '@/lib/server/serverBaseUrl';
 
 export type ServerEndpointKind = 'local' | 'public';
 

src/lib/server/serverFingerprint.test.ts

@@ -16,7 +16,7 @@ import {
   fetchServerFingerprint,
   verifySameServerEndpoints,
   type ServerFingerprint,
-} from './serverFingerprint';
+} from '@/lib/server/serverFingerprint';
 
 function makeFingerprint(overrides: Partial<ServerFingerprint> = {}): ServerFingerprint {
   return {

src/lib/server/serverFingerprint.ts

@@ -22,9 +22,9 @@ import {
   SUBSONIC_CLIENT,
   type ServerHttpHeaderProfile,
 } from '@/lib/api/subsonicClient';
-import type { ServerProfile } from '../../store/authStoreTypes';
-import { allNormalizedAddresses } from './serverEndpoint';
-import { headersForServerRequest } from './serverHttpHeaders';
+import type { ServerProfile } from '@/store/authStoreTypes';
+import { allNormalizedAddresses } from '@/lib/server/serverEndpoint';
+import { headersForServerRequest } from '@/lib/server/serverHttpHeaders';
 
 export type ServerFingerprint = {
   ping: {

src/lib/server/serverHttpHeaders.test.ts

@@ -4,7 +4,7 @@ import {
   requestBaseUrlFromHttpUrl,
   serverCustomHeadersFromForm,
   validateCustomHeaders,
-} from './serverHttpHeaders';
+} from '@/lib/server/serverHttpHeaders';
 
 describe('requestBaseUrlFromHttpUrl', () => {
   it('strips /rest/ path and query from stream URLs', () => {

src/lib/server/serverHttpHeaders.ts

@@ -4,9 +4,9 @@ import type {
   CustomHeadersFieldError,
   CustomHeadersValidationResult,
   ServerProfile,
-} from '../../store/authStoreTypes';
-import { serverIndexKeyForProfile } from './serverIndexKey';
-import { normalizeServerBaseUrl, serverAddressEndpoints, type ServerEndpointKind } from './serverEndpoint';
+} from '@/store/authStoreTypes';
+import { serverIndexKeyForProfile } from '@/lib/server/serverIndexKey';
+import { normalizeServerBaseUrl, serverAddressEndpoints, type ServerEndpointKind } from '@/lib/server/serverEndpoint';
 
 export const DEFAULT_CUSTOM_HEADERS_APPLY_TO: CustomHeadersApplyTo = 'public';
 

src/lib/server/serverIndexKey.ts

@@ -1,6 +1,6 @@
-import type { ServerProfile } from '../../store/authStoreTypes';
-import { useAuthStore } from '../../store/authStore';
-import { serverProfileBaseUrl } from './serverBaseUrl';
+import type { ServerProfile } from '@/store/authStoreTypes';
+import { useAuthStore } from '@/store/authStore';
+import { serverProfileBaseUrl } from '@/lib/server/serverBaseUrl';
 
 /** Stable index key derived from a server URL (host + optional path, no scheme). */
 export function serverIndexKeyFromUrl(urlRaw: string): string {

src/lib/server/serverIndexMigration.ts

@@ -1,5 +1,5 @@
-import { useAuthStore } from '../../store/authStore';
-import { rewriteFrontendStoreKeys } from './rewriteFrontendStoreKeys';
+import { useAuthStore } from '@/store/authStore';
+import { rewriteFrontendStoreKeys } from '@/utils/server/rewriteFrontendStoreKeys';
 
 /**
  * Legacy compatibility shim. The migration lifecycle now runs through

src/lib/server/serverLookup.ts

@@ -1,6 +1,6 @@
-import { useAuthStore } from '../../store/authStore';
-import type { ServerProfile } from '../../store/authStoreTypes';
-import { serverIndexKeyForProfile, serverIndexKeyFromUrl } from './serverIndexKey';
+import { useAuthStore } from '@/store/authStore';
+import type { ServerProfile } from '@/store/authStoreTypes';
+import { serverIndexKeyForProfile, serverIndexKeyFromUrl } from '@/lib/server/serverIndexKey';
 
 export function findServerByIdOrIndexKey(serverIdOrKey: string): ServerProfile | undefined {
   const servers = useAuthStore.getState().servers;

src/lib/server/serverMagicString.test.ts

@@ -6,7 +6,7 @@ import {
   decodeServerMagicString,
   decodeServerMagicStringFromText,
   encodeServerMagicString,
-} from './serverMagicString';
+} from '@/lib/server/serverMagicString';
 
 describe('DECODED_PASSWORD_VISUAL_MASK', () => {
   it('has fixed length independent of real passwords', () => {

src/lib/server/serverMagicString.ts

@@ -1,5 +1,5 @@
-import type { ServerProfile } from '../../store/authStoreTypes';
-import { normalizeServerBaseUrl, serverShareBaseUrl } from './serverEndpoint';
+import type { ServerProfile } from '@/store/authStoreTypes';
+import { normalizeServerBaseUrl, serverShareBaseUrl } from '@/lib/server/serverEndpoint';
 
 /**
  * Prefix for server invite strings (Subsonic credentials). Same family as library

src/lib/server/serverUrlRemigration.test.ts

@@ -11,7 +11,7 @@ import { invoke } from '@tauri-apps/api/core';
 import {
   indexKeyRemapForUrlChange,
   runIndexKeyRemigration,
-} from './serverUrlRemigration';
+} from '@/lib/server/serverUrlRemigration';
 
 function inspectStub(needs = true) {
   return {

src/lib/server/serverUrlRemigration.ts

@@ -28,15 +28,15 @@
  */
 
 import { invoke } from '@tauri-apps/api/core';
-import type { ServerProfile } from '../../store/authStoreTypes';
+import type { ServerProfile } from '@/store/authStoreTypes';
 import {
   migrationInspect,
   migrationRun,
   type MigrationInspectReport,
   type MigrationRunResult,
-} from '../../api/migration';
-import { rewriteFrontendStoreKeysForRemap } from './rewriteFrontendStoreKeys';
-import { serverIndexKeyFromUrl } from './serverIndexKey';
+} from '@/api/migration';
+import { rewriteFrontendStoreKeysForRemap } from '@/utils/server/rewriteFrontendStoreKeys';
+import { serverIndexKeyFromUrl } from '@/lib/server/serverIndexKey';
 
 export type IndexKeyRemap = { oldKey: string; newKey: string };
 

src/lib/server/subsonicServerIdentity.test.ts

@@ -4,7 +4,7 @@ import {
   isNavidromeAudiomuseSoftwareEligible,
   isNavidromeServer,
   parseLeadingSemver,
-} from './subsonicServerIdentity';
+} from '@/lib/server/subsonicServerIdentity';
 
 describe('parseLeadingSemver', () => {
   it('parses Navidrome-style version strings', () => {

src/lib/server/syncServerHttpContext.test.ts

@@ -4,7 +4,7 @@ const invokeMock = vi.hoisted(() => vi.fn(async () => undefined));
 
 vi.mock('@tauri-apps/api/core', () => ({ invoke: invokeMock }));
 
-import { syncServerHttpContextForProfile } from './syncServerHttpContext';
+import { syncServerHttpContextForProfile } from '@/lib/server/syncServerHttpContext';
 
 const server = {
   id: 'app-uuid-1',