From 40052f638ab3e7b384ca85f2f428252ca50ab2cd Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Wed, 13 May 2026 18:31:58 +0800
Subject: [PATCH 01/33] =?UTF-8?q?feat:=20=E9=A1=B6=E6=A0=8F=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=BC=B9=E7=AA=97=E4=B8=8E=E7=BD=91=E6=98=93=E4=BA=91?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  13 +-
 electron.vite.config.ts                       |   2 +-
 src/apis/search.ts                            | 173 ++++++++++++++
 .../layout}/NavHeader.vue                     |   1 +
 src/components/layout/NavSearch.vue           |  74 ++++++
 .../layout}/SideBar.vue                       |   0
 .../layout}/SideBarLogo.vue                   |   0
 .../layout}/WindowControls.vue                |   0
 src/components/list/CoverList.vue             |   2 +
 src/components/ui/SInput.vue                  |   4 +-
 src/i18n/locales/en-US.json                   |  20 +-
 src/i18n/locales/zh-CN.json                   |  20 +-
 src/pages/Search.vue                          | 225 ++++++++++++++++++
 src/router/index.ts                           |   5 +
 14 files changed, 530 insertions(+), 9 deletions(-)
 create mode 100644 src/apis/search.ts
 rename src/{layouts/components => components/layout}/NavHeader.vue (99%)
 create mode 100644 src/components/layout/NavSearch.vue
 rename src/{layouts/components => components/layout}/SideBar.vue (100%)
 rename src/{layouts/components => components/layout}/SideBarLogo.vue (100%)
 rename src/{layouts/components => components/layout}/WindowControls.vue (100%)
 create mode 100644 src/pages/Search.vue

diff --git a/components.d.ts b/components.d.ts
index 3f11b156..c6f9c67a 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -62,7 +62,9 @@ declare module 'vue' {
     FontConfig: typeof import('./src/components/settings/custom/FontConfig.vue')['default']
     FullPlayer: typeof import('./src/components/player/FullPlayer/index.vue')['default']
     HotkeyConfig: typeof import('./src/components/settings/custom/HotkeyConfig.vue')['default']
+    IconLucideArrowRight: typeof import('~icons/lucide/arrow-right')['default']
     IconLucideArrowUpCircle: typeof import('~icons/lucide/arrow-up-circle')['default']
+    IconLucideBan: typeof import('~icons/lucide/ban')['default']
     IconLucideCheck: typeof import('~icons/lucide/check')['default']
     IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideChevronLeft: typeof import('~icons/lucide/chevron-left')['default']
@@ -119,7 +121,8 @@ declare module 'vue' {
     LyricFormatOrderConfig: typeof import('./src/components/settings/custom/LyricFormatOrderConfig.vue')['default']
     Lyrics: typeof import('./src/components/player/Lyrics/index.vue')['default']
     LyricSourceOrderConfig: typeof import('./src/components/settings/custom/LyricSourceOrderConfig.vue')['default']
-    NavHeader: typeof import('./src/layouts/components/NavHeader.vue')['default']
+    NavHeader: typeof import('./src/components/layout/NavHeader.vue')['default']
+    NavSearch: typeof import('./src/components/layout/NavSearch.vue')['default']
     NumberFieldDecrement: typeof import('reka-ui')['NumberFieldDecrement']
     NumberFieldIncrement: typeof import('reka-ui')['NumberFieldIncrement']
     NumberFieldInput: typeof import('reka-ui')['NumberFieldInput']
@@ -150,6 +153,8 @@ declare module 'vue' {
     SDivider: typeof import('./src/components/ui/SDivider.vue')['default']
     SDrawer: typeof import('./src/components/ui/SDrawer.vue')['default']
     SDropdownMenu: typeof import('./src/components/ui/SDropdownMenu.vue')['default']
+    SearchDialog: typeof import('./src/components/layout/SearchDialog.vue')['default']
+    SearchOverlay: typeof import('./src/components/search/SearchOverlay.vue')['default']
     SelectContent: typeof import('reka-ui')['SelectContent']
     SelectIcon: typeof import('reka-ui')['SelectIcon']
     SelectItem: typeof import('reka-ui')['SelectItem']
@@ -167,8 +172,8 @@ declare module 'vue' {
     SettingsSearch: typeof import('./src/components/settings/SettingsSearch.vue')['default']
     SettingsSection: typeof import('./src/components/settings/SettingsSection.vue')['default']
     SFormItem: typeof import('./src/components/ui/SFormItem.vue')['default']
-    SideBar: typeof import('./src/layouts/components/SideBar.vue')['default']
-    SideBarLogo: typeof import('./src/layouts/components/SideBarLogo.vue')['default']
+    SideBar: typeof import('./src/components/layout/SideBar.vue')['default']
+    SideBarLogo: typeof import('./src/components/layout/SideBarLogo.vue')['default']
     SImg: typeof import('./src/components/ui/SImg.vue')['default']
     SInput: typeof import('./src/components/ui/SInput.vue')['default']
     SLoading: typeof import('./src/components/ui/SLoading.vue')['default']
@@ -198,6 +203,6 @@ declare module 'vue' {
     SwitchThumb: typeof import('reka-ui')['SwitchThumb']
     Toolbar: typeof import('./src/components/player/Toolbar.vue')['default']
     TrackInfo: typeof import('./src/components/player/TrackInfo.vue')['default']
-    WindowControls: typeof import('./src/layouts/components/WindowControls.vue')['default']
+    WindowControls: typeof import('./src/components/layout/WindowControls.vue')['default']
   }
 }
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index ddf84d78..4d2c47a4 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -91,7 +91,7 @@ export default defineConfig({
         },
       }),
       Components({
-        dirs: ["src/components", "src/layouts/components"],
+        dirs: ["src/components"],
         resolvers: [RekaResolver(), IconsResolver({ prefix: "icon", customCollections: ["sp"] })],
       }),
     ],
diff --git a/src/apis/search.ts b/src/apis/search.ts
new file mode 100644
index 00000000..d135e959
--- /dev/null
+++ b/src/apis/search.ts
@@ -0,0 +1,173 @@
+/**
+ * 在线平台搜索接口
+ *
+ * 统一返回 Track / CoverItem，向页面屏蔽各平台原始结构。
+ * 目前仅接入 netease，后续 qqmusic / kugou 在此扩展。
+ */
+
+import type { Track } from "@shared/types/player";
+import type { CoverItem } from "@/types/artist";
+import type { Platform } from "@shared/types/platform";
+import { netease } from "@/apis/netease";
+
+/** 搜索结果通用结构 */
+export interface SearchResult<T> {
+  items: T[];
+  total: number;
+  hasMore: boolean;
+}
+
+interface NeteaseSong {
+  id: number;
+  name: string;
+  ar: { id: number; name: string }[];
+  al: { id: number; name: string; picUrl: string };
+  dt: number;
+}
+interface NeteaseAlbum {
+  id: number;
+  name: string;
+  picUrl: string;
+  artists: { id: number; name: string }[];
+  size: number;
+}
+interface NeteaseArtist {
+  id: number;
+  name: string;
+  picUrl?: string;
+  img1v1Url?: string;
+  albumSize?: number;
+}
+interface NeteasePlaylist {
+  id: number;
+  name: string;
+  coverImgUrl: string;
+  creator?: { nickname: string };
+  trackCount: number;
+}
+
+interface CloudSearchBody {
+  result?: {
+    songs?: NeteaseSong[];
+    albums?: NeteaseAlbum[];
+    artists?: NeteaseArtist[];
+    playlists?: NeteasePlaylist[];
+    songCount?: number;
+    albumCount?: number;
+    artistCount?: number;
+    playlistCount?: number;
+  };
+}
+
+/** netease 搜索 type 编码 */
+const NETEASE_TYPE = { songs: 1, albums: 10, artists: 100, playlists: 1000 } as const;
+
+const neteaseSongToTrack = (song: NeteaseSong): Track => ({
+  id: String(song.id),
+  source: "online",
+  platform: "netease",
+  title: song.name,
+  artists: (song.ar ?? []).map((artist) => ({ id: String(artist.id), name: artist.name })),
+  album: song.al
+    ? { id: String(song.al.id), name: song.al.name, cover: song.al.picUrl }
+    : undefined,
+  duration: song.dt ?? 0,
+  cover: song.al?.picUrl,
+});
+
+const neteaseAlbumToCover = (album: NeteaseAlbum): CoverItem => ({
+  id: String(album.id),
+  title: album.name,
+  cover: album.picUrl,
+  subtitle: (album.artists ?? []).map((artist) => artist.name).join(" / "),
+  trackCount: album.size ?? 0,
+});
+
+const neteaseArtistToCover = (artist: NeteaseArtist): CoverItem => ({
+  id: String(artist.id),
+  title: artist.name,
+  cover: artist.img1v1Url ?? artist.picUrl,
+  subtitle: "",
+  trackCount: artist.albumSize ?? 0,
+});
+
+const neteasePlaylistToCover = (playlist: NeteasePlaylist): CoverItem => ({
+  id: String(playlist.id),
+  title: playlist.name,
+  cover: playlist.coverImgUrl,
+  subtitle: playlist.creator?.nickname ?? "",
+  trackCount: playlist.trackCount ?? 0,
+});
+
+const callNeteaseCloudSearch = (
+  type: keyof typeof NETEASE_TYPE,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<CloudSearchBody> =>
+  netease.cloudsearch<CloudSearchBody>({
+    keywords: keyword,
+    type: NETEASE_TYPE[type],
+    offset,
+    limit,
+  });
+
+const unsupported = (platform: Platform): never => {
+  throw new Error(`Search not yet supported for platform: ${platform}`);
+};
+
+/** 搜索单曲 */
+export const searchSongs = async (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<Track>> => {
+  if (platform !== "netease") return unsupported(platform);
+  const body = await callNeteaseCloudSearch("songs", keyword, offset, limit);
+  const items = (body?.result?.songs ?? []).map(neteaseSongToTrack);
+  const total = body?.result?.songCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
+
+/** 搜索专辑 */
+export const searchAlbums = async (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  if (platform !== "netease") return unsupported(platform);
+  const body = await callNeteaseCloudSearch("albums", keyword, offset, limit);
+  const items = (body?.result?.albums ?? []).map(neteaseAlbumToCover);
+  const total = body?.result?.albumCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
+
+/** 搜索歌手 */
+export const searchArtists = async (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  if (platform !== "netease") return unsupported(platform);
+  const body = await callNeteaseCloudSearch("artists", keyword, offset, limit);
+  const items = (body?.result?.artists ?? []).map(neteaseArtistToCover);
+  const total = body?.result?.artistCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
+
+/** 搜索歌单 */
+export const searchPlaylists = async (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  if (platform !== "netease") return unsupported(platform);
+  const body = await callNeteaseCloudSearch("playlists", keyword, offset, limit);
+  const items = (body?.result?.playlists ?? []).map(neteasePlaylistToCover);
+  const total = body?.result?.playlistCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
diff --git a/src/layouts/components/NavHeader.vue b/src/components/layout/NavHeader.vue
similarity index 99%
rename from src/layouts/components/NavHeader.vue
rename to src/components/layout/NavHeader.vue
index c4fdbaa5..5e05acad 100644
--- a/src/layouts/components/NavHeader.vue
+++ b/src/components/layout/NavHeader.vue
@@ -70,6 +70,7 @@ const onMenuSelect = (key: string): void => {
       >
         <template #icon><IconLucideChevronRight /></template>
       </SButton>
+      <NavSearch />
     </div>
     <!-- 中间 -->
     <div class="flex-1 h-full" />
diff --git a/src/components/layout/NavSearch.vue b/src/components/layout/NavSearch.vue
new file mode 100644
index 00000000..39be3cf6
--- /dev/null
+++ b/src/components/layout/NavSearch.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+const { t } = useI18n();
+const router = useRouter();
+
+const dialogOpen = ref(false);
+const searchQuery = ref("");
+
+const trimmedQuery = computed(() => searchQuery.value.trim());
+
+/** 提交搜索：跳到搜索结果页并关闭弹窗 */
+const onSubmit = (): void => {
+  if (!trimmedQuery.value) return;
+  router.push({ name: "search", query: { q: trimmedQuery.value } });
+  dialogOpen.value = false;
+};
+</script>
+
+<template>
+  <!-- 触发器：只读 SInput，点击打开弹窗 -->
+  <SInput
+    readonly
+    round
+    size="large"
+    class="app-no-drag w-60 cursor-pointer"
+    :placeholder="t('nav.searchPlaceholder')"
+    @click="dialogOpen = true"
+  >
+    <template #prefix>
+      <IconLucideSearch class="size-4 text-on-surface-variant/50 shrink-0" />
+    </template>
+  </SInput>
+
+  <!-- 搜索弹窗 -->
+  <SDialog v-model:open="dialogOpen" :closable="false" width="560px">
+    <div class="flex flex-col gap-3">
+      <SInput
+        v-model="searchQuery"
+        :placeholder="t('nav.searchPlaceholder')"
+        size="large"
+        clearable
+        @keydown.enter="onSubmit"
+      >
+        <template #prefix>
+          <IconLucideSearch class="size-4 text-on-surface-variant/50 shrink-0" />
+        </template>
+      </SInput>
+      <!-- 快捷操作区 -->
+      <div v-if="trimmedQuery" class="flex flex-col gap-1.5">
+        <div class="px-2 text-xs text-on-surface-variant/60">
+          {{ t("nav.searchSection.quick") }}
+        </div>
+        <button
+          type="button"
+          class="flex items-center gap-3 px-3 py-2.5 rounded-lg cursor-pointer text-left bg-transparent border-none hover:bg-on-surface/5 transition-colors duration-200"
+          @click="onSubmit"
+        >
+          <IconLucideSearch class="size-4 text-on-surface-variant/60 shrink-0" />
+          <span class="flex-1 truncate text-sm text-on-surface">
+            {{ t("nav.searchGoto", { keyword: trimmedQuery }) }}
+          </span>
+          <IconLucideArrowRight class="size-4 text-on-surface-variant/40 shrink-0" />
+        </button>
+      </div>
+      <!-- 空态：后续接入搜索历史、热门等 -->
+      <div
+        v-else
+        class="min-h-[200px] flex flex-col items-center justify-center gap-2 text-on-surface-variant/40"
+      >
+        <IconLucideSearch class="size-8" />
+        <span class="text-xs">{{ t("nav.searchEmpty") }}</span>
+      </div>
+    </div>
+  </SDialog>
+</template>
diff --git a/src/layouts/components/SideBar.vue b/src/components/layout/SideBar.vue
similarity index 100%
rename from src/layouts/components/SideBar.vue
rename to src/components/layout/SideBar.vue
diff --git a/src/layouts/components/SideBarLogo.vue b/src/components/layout/SideBarLogo.vue
similarity index 100%
rename from src/layouts/components/SideBarLogo.vue
rename to src/components/layout/SideBarLogo.vue
diff --git a/src/layouts/components/WindowControls.vue b/src/components/layout/WindowControls.vue
similarity index 100%
rename from src/layouts/components/WindowControls.vue
rename to src/components/layout/WindowControls.vue
diff --git a/src/components/list/CoverList.vue b/src/components/list/CoverList.vue
index af0362b5..9a6ad5f3 100644
--- a/src/components/list/CoverList.vue
+++ b/src/components/list/CoverList.vue
@@ -46,6 +46,7 @@ const actualFallback = computed(() => {
 
 const emit = defineEmits<{
   click: [item: CoverItem];
+  reachBottom: [];
 }>();
 
 const virtualListRef = ref<SVirtualListExposed | null>(null);
@@ -103,6 +104,7 @@ const getRowKey = (row: Row): string => row.id;
     :padding-top="paddingTop"
     :padding-bottom="paddingBottom"
     height="100%"
+    @reach-bottom="emit('reachBottom')"
   >
     <template #default="{ item: row }: { item: Row }">
       <div
diff --git a/src/components/ui/SInput.vue b/src/components/ui/SInput.vue
index 7060926b..1c1b3217 100644
--- a/src/components/ui/SInput.vue
+++ b/src/components/ui/SInput.vue
@@ -84,12 +84,12 @@ const handleClear = () => {
       "
     />
 
-    <!-- 清空按钮 -->
+    <!-- 清空按钮：mousedown.prevent 保留输入焦点，避免触发 blur 让 focus-within 宽度回缩导致点击错位 -->
     <Transition name="fade">
       <IconLucideX
         v-if="showClear"
         class="size-3.5 text-on-surface-variant/50 shrink-0 cursor-pointer transition-colors duration-200 hover:text-on-surface"
-        @click="handleClear"
+        @mousedown.prevent.stop="handleClear"
       />
     </Transition>
 
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ff70c028..96b22155 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -78,7 +78,25 @@
     "settings": "Settings",
     "reload": "Reload",
     "devtools": "Developer Tools",
-    "globalSettings": "Global Settings"
+    "globalSettings": "Global Settings",
+    "searchPlaceholder": "Search songs, artists or albums",
+    "searchEmpty": "Start typing to search",
+    "searchGoto": "Search for \"{keyword}\"",
+    "searchSection": {
+      "quick": "Quick"
+    }
+  },
+  "search": {
+    "title": "Search",
+    "titleSuffix": "search results",
+    "emptyKeyword": "Type a keyword to start searching",
+    "noResults": "No matching results",
+    "tabs": {
+      "songs": "Songs",
+      "albums": "Albums",
+      "artists": "Artists",
+      "playlists": "Playlists"
+    }
   },
   "streaming": {
     "hint": "Connect to a streaming platform",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index dac3fe7e..f6499981 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -78,7 +78,25 @@
     "settings": "设置",
     "reload": "热重载",
     "devtools": "开发者工具",
-    "globalSettings": "全局设置"
+    "globalSettings": "全局设置",
+    "searchPlaceholder": "搜索歌曲、歌手或专辑",
+    "searchEmpty": "输入关键词开始搜索",
+    "searchGoto": "搜索「{keyword}」",
+    "searchSection": {
+      "quick": "快捷"
+    }
+  },
+  "search": {
+    "title": "搜索",
+    "titleSuffix": "的搜索结果",
+    "emptyKeyword": "请输入关键词开始搜索",
+    "noResults": "没有找到匹配内容",
+    "tabs": {
+      "songs": "单曲",
+      "albums": "专辑",
+      "artists": "歌手",
+      "playlists": "歌单"
+    }
   },
   "streaming": {
     "hint": "连接到流媒体平台",
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
new file mode 100644
index 00000000..b0b509e7
--- /dev/null
+++ b/src/pages/Search.vue
@@ -0,0 +1,225 @@
+<script setup lang="ts">
+import type { Track } from "@shared/types/player";
+import type { CoverItem } from "@/types/artist";
+import { searchSongs, searchAlbums, searchArtists, searchPlaylists } from "@/apis/search";
+import SongList from "@/components/list/SongList.vue";
+import CoverList from "@/components/list/CoverList.vue";
+
+const { t } = useI18n();
+const route = useRoute();
+
+type TabKey = "songs" | "albums" | "artists" | "playlists";
+
+const activeTab = ref<TabKey>("songs");
+
+const PAGE_SIZE = 50;
+
+/** URL query 中的关键词 */
+const keyword = computed(() => {
+  const q = route.query.q;
+  return typeof q === "string" ? q.trim() : "";
+});
+
+const tabs = computed(() => [
+  { key: "songs", label: t("search.tabs.songs") },
+  { key: "albums", label: t("search.tabs.albums") },
+  { key: "artists", label: t("search.tabs.artists") },
+  { key: "playlists", label: t("search.tabs.playlists") },
+]);
+
+interface TabState<T> {
+  items: T[];
+  total: number;
+  loaded: boolean;
+  loading: boolean;
+  loadingMore: boolean;
+}
+
+const createState = <T,>(): TabState<T> => ({
+  items: [],
+  total: 0,
+  loaded: false,
+  loading: false,
+  loadingMore: false,
+});
+
+const states = reactive({
+  songs: createState<Track>(),
+  albums: createState<CoverItem>(),
+  artists: createState<CoverItem>(),
+  playlists: createState<CoverItem>(),
+});
+
+const error = ref("");
+
+/** 派发到 apis 层的统一调用 */
+const fetchers = {
+  songs: searchSongs,
+  albums: searchAlbums,
+  artists: searchArtists,
+  playlists: searchPlaylists,
+} as const;
+
+/** 拉取指定 tab：append=true 时追加下一页，否则首屏拉取 */
+const fetchTab = async (tab: TabKey, append: boolean): Promise<void> => {
+  if (!keyword.value) return;
+  const state = states[tab];
+  if (append) {
+    if (!state.loaded || state.loadingMore || state.items.length >= state.total) return;
+    state.loadingMore = true;
+  } else {
+    if (state.loading) return;
+    state.loading = true;
+  }
+  error.value = "";
+  try {
+    const offset = append ? state.items.length : 0;
+    const result = await (fetchers[tab] as typeof searchSongs)(
+      "netease",
+      keyword.value,
+      offset,
+      PAGE_SIZE,
+    );
+    if (append) {
+      (state.items as Track[]).push(...(result.items as Track[]));
+    } else {
+      state.items = result.items as never;
+    }
+    state.total = result.total;
+    state.loaded = true;
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : String(err);
+  } finally {
+    state.loading = false;
+    state.loadingMore = false;
+  }
+};
+
+/** 关键词变化：重置所有 tab 状态并拉当前 tab */
+watch(
+  keyword,
+  () => {
+    (Object.keys(states) as TabKey[]).forEach((tab) => {
+      states[tab].items = [];
+      states[tab].total = 0;
+      states[tab].loaded = false;
+      states[tab].loading = false;
+      states[tab].loadingMore = false;
+    });
+    error.value = "";
+    if (keyword.value) fetchTab(activeTab.value, false);
+  },
+  { immediate: true },
+);
+
+/** 切换 tab：未拉过则按需请求 */
+watch(activeTab, (tab) => {
+  if (keyword.value && !states[tab].loaded) fetchTab(tab, false);
+});
+
+const onTabSwitch = (key: string): void => {
+  activeTab.value = key as TabKey;
+};
+
+/** 滚动触底加载下一页 */
+const onReachBottom = (tab: TabKey): void => {
+  fetchTab(tab, true);
+};
+
+/** 当前 tab 首屏加载中 */
+const isInitialLoading = computed(() => {
+  const state = states[activeTab.value];
+  return state.loading && !state.loaded;
+});
+</script>
+
+<template>
+  <div class="flex flex-col h-full">
+    <!-- 顶栏 -->
+    <div class="shrink-0 px-5 pb-2">
+      <h1 class="mt-2 mb-4 truncate">
+        <span class="text-3xl font-bold text-on-surface">
+          {{ keyword || t("search.title") }}
+        </span>
+        <span v-if="keyword" class="ml-2 text-lg text-on-surface-variant/60">
+          {{ t("search.titleSuffix") }}
+        </span>
+      </h1>
+      <STabs :model-value="activeTab" :tabs="tabs" @update:model-value="onTabSwitch" />
+    </div>
+
+    <!-- 空关键词 -->
+    <div v-if="!keyword" class="flex-1 flex items-center justify-center text-on-surface-variant/50">
+      <div class="text-center">
+        <IconLucideSearch class="size-12 mx-auto mb-3 opacity-30" />
+        <div class="text-sm">{{ t("search.emptyKeyword") }}</div>
+      </div>
+    </div>
+    <!-- 错误态 -->
+    <div v-else-if="error" class="flex-1 flex items-center justify-center text-red-500/80 px-6">
+      <div class="text-sm break-all text-center">{{ error }}</div>
+    </div>
+    <!-- 首次加载 -->
+    <div
+      v-else-if="isInitialLoading"
+      class="flex-1 flex items-center justify-center text-on-surface-variant/50"
+    >
+      <div class="text-sm">{{ t("common.loading") }}</div>
+    </div>
+    <!-- 各 tab 内容 -->
+    <div v-else class="flex-1 min-h-0">
+      <template v-if="activeTab === 'songs'">
+        <SongList
+          v-if="states.songs.items.length > 0"
+          :items="states.songs.items"
+          source="online"
+          :show-size="false"
+          @reach-bottom="onReachBottom('songs')"
+        />
+        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
+          <div class="text-sm">{{ t("search.noResults") }}</div>
+        </div>
+      </template>
+      <template v-else-if="activeTab === 'albums'">
+        <CoverList
+          v-if="states.albums.items.length > 0"
+          :items="states.albums.items"
+          :padding-x="20"
+          :padding-top="8"
+          :padding-bottom="20"
+          @reach-bottom="onReachBottom('albums')"
+        />
+        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
+          <div class="text-sm">{{ t("search.noResults") }}</div>
+        </div>
+      </template>
+      <template v-else-if="activeTab === 'artists'">
+        <CoverList
+          v-if="states.artists.items.length > 0"
+          :items="states.artists.items"
+          type="artist"
+          :padding-x="20"
+          :padding-top="8"
+          :padding-bottom="20"
+          @reach-bottom="onReachBottom('artists')"
+        />
+        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
+          <div class="text-sm">{{ t("search.noResults") }}</div>
+        </div>
+      </template>
+      <template v-else>
+        <CoverList
+          v-if="states.playlists.items.length > 0"
+          :items="states.playlists.items"
+          :padding-x="20"
+          :padding-top="8"
+          :padding-bottom="20"
+          @reach-bottom="onReachBottom('playlists')"
+        />
+        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
+          <div class="text-sm">{{ t("search.noResults") }}</div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
diff --git a/src/router/index.ts b/src/router/index.ts
index e49dc71d..aedcb32f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -42,6 +42,11 @@ const router = createRouter({
           name: "folders",
           component: () => import("@/pages/Folders.vue"),
         },
+        {
+          path: "search",
+          name: "search",
+          component: () => import("@/pages/Search.vue"),
+        },
         {
           path: "streaming",
           component: () => import("@/pages/Streaming/Index.vue"),

From d0b95477303a0adf4fbcc1e5408e5145269a0a43 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Wed, 13 May 2026 21:36:15 +0800
Subject: [PATCH 02/33] =?UTF-8?q?fix:=20=E6=B5=81=E5=AA=92=E4=BD=93?=
 =?UTF-8?q?=E6=95=A3=E6=9B=B2=E7=BC=BA=20albumId/artistId=20=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E8=B7=B3=E8=BD=AC=E5=B9=B6=E6=B7=A1?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/components/list/SongList.vue | 42 ++++++++++++++++++++++++++------
 src/utils/navigate.ts            | 14 ++++++-----
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 100ab388..ce4e6876 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Track, TrackSource } from "@shared/types/player";
+import type { Artist, Track, TrackSource } from "@shared/types/player";
 import type { CollectionType } from "@/types/collection";
 import { useMediaStore } from "@/stores/media";
 import { useStatusStore } from "@/stores/status";
@@ -76,7 +76,21 @@ const textCollator = new Intl.Collator(undefined, {
 /** 当前播放歌曲 ID */
 const playingId = computed(() => media.track?.id);
 
+/** 专辑是否可跳转*/
+const isAlbumLinkable = (item: Track): boolean => {
+  if (!item.album?.name) return false;
+  return props.source === "streaming" ? !!item.album.id : true;
+};
+
+/** 歌手是否可跳转*/
+const isArtistLinkable = (artist: Artist): boolean => {
+  if (!artist.name) return false;
+  return props.source === "streaming" ? !!artist.id : true;
+};
+
+/** 排序字段 */
 type SortField = "none" | "title" | "artist" | "album" | "duration" | "size" | "mtime" | "ctime";
+/** 排序方向 */
 type SortOrder = "asc" | "desc";
 
 /** 排序字段 */
@@ -469,8 +483,16 @@ defineExpose({
                       <span
                         v-for="(artist, i) in item.artists"
                         :key="artist.id ?? i"
-                        class="cursor-pointer transition-opacity hover:opacity-70"
-                        @click.stop="navigateToArtist(artist.name, { source, artistId: artist.id })"
+                        class="transition-opacity"
+                        :class="
+                          isArtistLinkable(artist)
+                            ? 'cursor-pointer hover:opacity-70'
+                            : 'opacity-50'
+                        "
+                        @click.stop="
+                          isArtistLinkable(artist) &&
+                          navigateToArtist(artist.name, { source, artistId: artist.id })
+                        "
                       >
                         {{ artist.name }}
                         <span v-if="i < item.artists.length - 1" class="mx-0.5 opacity-50">/</span>
@@ -485,11 +507,17 @@ defineExpose({
               <!-- 专辑 -->
               <div
                 v-if="showAlbum"
-                class="flex-1 min-w-0 truncate text-sm cursor-pointer transition-opacity hover:opacity-70"
-                :class="playingId === item.id ? 'text-primary/70' : 'text-on-surface'"
-                @click.stop="navigateToAlbum(item.album?.name, { source, albumId: item.album?.id })"
+                class="flex-1 min-w-0 truncate text-sm transition-opacity"
+                :class="[
+                  playingId === item.id ? 'text-primary/70' : 'text-on-surface',
+                  isAlbumLinkable(item) ? 'cursor-pointer hover:opacity-70' : 'opacity-50',
+                ]"
+                @click.stop="
+                  isAlbumLinkable(item) &&
+                  navigateToAlbum(item.album?.name, { source, albumId: item.album?.id })
+                "
               >
-                {{ item.album?.name }}
+                {{ item.album?.name || t("collection.unknownAlbum") }}
               </div>
               <!-- 时长 -->
               <div
diff --git a/src/utils/navigate.ts b/src/utils/navigate.ts
index fbdc5698..c6ac3ef8 100644
--- a/src/utils/navigate.ts
+++ b/src/utils/navigate.ts
@@ -3,16 +3,17 @@ import router from "@/router";
 
 /**
  * 跳转到专辑页
- * @param albumName - 专辑名称（本地）或 ID（流媒体）
+ * 流媒体没拿到真实 albumId 时静默忽略，避免用专辑名当 ID 触发服务器 400
+ * @param albumName - 专辑名称（本地用作聚合 key；流媒体仅用于 query 兜底显示）
  * @param options.source - 来源（local/streaming）；默认为 local
- * @param options.albumId - 流媒体专辑 ID；仅 source=streaming 可用，优先级高于 albumName
+ * @param options.albumId - 流媒体专辑 ID
  */
 export const navigateToAlbum = (
   albumName?: string,
   options: { source?: TrackSource; albumId?: string } = {},
 ) => {
   const source = options.source ?? "local";
-  const id = source === "streaming" ? (options.albumId ?? albumName) : albumName;
+  const id = source === "streaming" ? options.albumId : albumName;
   if (!id?.trim()) return;
   const query =
     source === "streaming" && albumName && albumName !== id ? { name: albumName } : undefined;
@@ -25,16 +26,17 @@ export const navigateToAlbum = (
 
 /**
  * 跳转到歌手页
- * @param artistName - 歌手名称（本地）或 ID（流媒体）
+ * 流媒体没拿到真实 artistId 时静默忽略
+ * @param artistName - 歌手名称（本地用作聚合 key；流媒体仅用于 query 兜底显示）
  * @param options.source - 来源（local/streaming）；默认为 local
- * @param options.artistId - 流媒体歌手 ID；仅 source=streaming 可用，优先级高于 artistName
+ * @param options.artistId - 流媒体歌手 ID
  */
 export const navigateToArtist = (
   artistName?: string,
   options: { source?: TrackSource; artistId?: string } = {},
 ) => {
   const source = options.source ?? "local";
-  const id = source === "streaming" ? (options.artistId ?? artistName) : artistName;
+  const id = source === "streaming" ? options.artistId : artistName;
   if (!id?.trim()) return;
   const query =
     source === "streaming" && artistName && artistName !== id ? { name: artistName } : undefined;

From 877c5a369fb763f4d43d29b555b6b3d5b8f8fd87 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Thu, 14 May 2026 00:42:48 +0800
Subject: [PATCH 03/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/apis/kugou/core/config.ts       |   5 +-
 electron/main/apis/kugou/core/request.ts      |  10 +-
 electron/main/apis/kugou/index.ts             |  13 +-
 electron/main/apis/kugou/modules/search.ts    | 224 +++++++++++++++---
 electron/main/apis/qqmusic/modules/search.ts  | 191 +++++++++++++--
 shared/types/platform.ts                      |  10 +
 src/apis/search.ts                            | 173 --------------
 src/apis/search/index.ts                      |  74 ++++++
 src/apis/search/kugou.ts                      |  68 ++++++
 src/apis/search/netease.ts                    | 153 ++++++++++++
 src/apis/search/qqmusic.ts                    | 162 +++++++++++++
 src/components/list/SongList.vue              |  45 ++--
 .../custom/LyricSourceOrderConfig.vue         |   9 +-
 src/i18n/locales/en-US.json                   |   2 +
 src/i18n/locales/zh-CN.json                   |   2 +
 src/pages/Search.vue                          | 207 +++++++++-------
 src/stores/status.ts                          |   8 +-
 src/utils/navigate.ts                         |  28 ++-
 18 files changed, 1026 insertions(+), 358 deletions(-)
 delete mode 100644 src/apis/search.ts
 create mode 100644 src/apis/search/index.ts
 create mode 100644 src/apis/search/kugou.ts
 create mode 100644 src/apis/search/netease.ts
 create mode 100644 src/apis/search/qqmusic.ts

diff --git a/electron/main/apis/kugou/core/config.ts b/electron/main/apis/kugou/core/config.ts
index a11e1602..d35157d7 100644
--- a/electron/main/apis/kugou/core/config.ts
+++ b/electron/main/apis/kugou/core/config.ts
@@ -2,7 +2,10 @@
  * KG API 通用常量
  */
 
-/** 搜索接口（WebFilter 平台，无需鉴权） */
+/** 主搜索（带封面）：mobilecdn 的 /api/v3/search/song，公网无鉴权，响应里 trans_param.union_cover 就是封面 URL 模板 */
+export const KG_MOBILECDN_URL = "http://mobilecdn.kugou.com/api/v3/search/song";
+
+/** 兜底搜索：老的 songsearch，无封面，但不依赖任何 KG 服务可达性变化 */
 export const KG_SEARCH_URL = "https://songsearch.kugou.com/song_search_v2";
 
 /** 歌词搜索/下载接口（走 lyrics.kugou.com 的 expand_search 通道） */
diff --git a/electron/main/apis/kugou/core/request.ts b/electron/main/apis/kugou/core/request.ts
index a6349d6b..a765854b 100644
--- a/electron/main/apis/kugou/core/request.ts
+++ b/electron/main/apis/kugou/core/request.ts
@@ -2,10 +2,10 @@
  * KG 请求层
  *
  * 设计：
- * - 搜索走 songsearch.kugou.com（JSON，无鉴权），透传查询参数
- * - 歌词走 lyrics.kugou.com（JSON，需要 KG-RC/KG-THash/UA 伪装 PC 客户端）
- * - 成功码约定不统一：songsearch 用 error_code=0，lyrics 用 error_code=200（HTTP 风格）
- * - 没有加密 body，纯 fetch GET
+ * - 主搜索走 mobilecdn.kugou.com/api/v3/search/song（公网无鉴权，含封面）
+ * - 兜底搜索走 songsearch.kugou.com（无鉴权，无封面）
+ * - 歌词走 lyrics.kugou.com（需要 KG-RC/KG-THash/UA 伪装 PC 客户端）
+ * - 成功码约定不统一：songsearch/mobilecdn 用 error_code=0，lyrics 用 error_code=200
  */
 
 interface FetchOptions {
@@ -35,7 +35,7 @@ export const kgRequest = async <T = unknown>(
   if (res.status !== 200) throw new Error(`KG HTTP ${res.status}`);
 
   const body = (await res.json()) as KGRawBody;
-  // 0 = songsearch 风格成功码，200 = lyrics.kugou.com 的 HTTP 风格成功码
+  // 0 = mobilecdn/songsearch 风格成功码，200 = lyrics.kugou.com 的 HTTP 风格成功码
   const code = body.error_code ?? body.errcode ?? body.err_code ?? 0;
   if (code !== 0 && code !== 200) throw new Error(`KG API error_code=${code}`);
 
diff --git a/electron/main/apis/kugou/index.ts b/electron/main/apis/kugou/index.ts
index e96a14ed..3e996694 100644
--- a/electron/main/apis/kugou/index.ts
+++ b/electron/main/apis/kugou/index.ts
@@ -3,7 +3,8 @@
  *
  * 与 netease 不同之处：
  * - 无账号体系、无 cookie、无加密 body，纯 fetch GET
- * - 搜索走 songsearch.kugou.com；歌词走 lyrics.kugou.com（需 KG-RC/KG-THash/UA 伪装）
+ * - 搜索主走 mobilecdn.kugou.com（响应里有封面），失败兜底 songsearch.kugou.com（无封面）
+ * - 歌词走 lyrics.kugou.com（需 KG-RC/KG-THash/UA 伪装 PC 客户端）
  * - 歌词是 hash + 歌名 + 时长 三元组匹配（KG 特有，不能只凭 ID）
  *
  * 统一入口：callKugou(name, params)
@@ -68,6 +69,14 @@ export const callKugou = async (name: string, params: KGParams = {}): Promise<an
   if (hit !== undefined) return hit;
 
   const value = await fn(params);
-  cacheSet(key, value);
+  // 空结果不缓存，避免一次失败被钉死 2 分钟
+  if (!isEmptyResult(value)) cacheSet(key, value);
   return value;
 };
+
+const isEmptyResult = (value: unknown): boolean => {
+  if (!value || typeof value !== "object") return false;
+  const v = value as Record<string, unknown>;
+  if (Array.isArray(v.songs) && v.songs.length === 0) return true;
+  return false;
+};
diff --git a/electron/main/apis/kugou/modules/search.ts b/electron/main/apis/kugou/modules/search.ts
index 29bd53cf..5862fb4d 100644
--- a/electron/main/apis/kugou/modules/search.ts
+++ b/electron/main/apis/kugou/modules/search.ts
@@ -1,21 +1,166 @@
 /**
  * 搜索歌曲（KG）
- * endpoint: https://songsearch.kugou.com/song_search_v2
+ *
+ * 主路径：mobilecdn.kugou.com/api/v3/search/song
+ *   公网无鉴权 GET，响应字段是小写，含 trans_param.union_cover（封面 URL，带 `{size}` 占位）
+ *   tramhao/termusic、zonemeen/musicn、UnblockNeteaseMusic 等多个开源项目都在用
+ * 兜底：songsearch.kugou.com/song_search_v2（无封面，PascalCase 字段）
  *
  * params:
  * - keywords  关键词（必填）
  * - page      页码，默认 1
  * - limit     每页数，默认 30
  *
- * 返回字段遵循 qqmusic.search 的结构（duration 为毫秒），并额外带上
- * KG 特有的 hash / audioId / 多品质 sizes&hashes，播放/歌词都要用
+ * 返回结构沿用 qqmusic.search（duration 为毫秒），并带 KG 特有的 hash + 多品质 sizes/hashes
  */
 
-import { KG_SEARCH_URL, decodeName, formatSingerName } from "../core/config";
+import { KG_MOBILECDN_URL, KG_SEARCH_URL, decodeName, formatSingerName } from "../core/config";
 import { kgRequest } from "../core/request";
+import { coreLog } from "@main/utils/logger";
 import type { KGModule } from "../core/types";
 
-interface KGSearchSong {
+type Quality = "128k" | "320k" | "flac" | "flac24bit";
+
+interface NormalizedSong {
+  id: string;
+  audioId: number;
+  hash: string;
+  name: string;
+  artist: string;
+  album: string;
+  albumId: string | number;
+  cover?: string;
+  /** 秒 */
+  interval: number;
+  /** 毫秒 */
+  duration: number;
+  qualities: Quality[];
+  hashes: Partial<Record<Quality, string>>;
+  sizes: Partial<Record<Quality, number>>;
+}
+
+/** trans_param.union_cover 含 `{size}` 占位，统一替成 300 */
+const fillCover = (url: string | undefined, size = 300): string | undefined => {
+  if (!url) return undefined;
+  return url.replace(/\{size\}/g, String(size));
+};
+
+/** 主路径 mobilecdn 返回的字段都是小写蛇形 */
+interface MobileSong {
+  hash?: string;
+  audio_id?: number;
+  songname?: string;
+  filename?: string;
+  singername?: string;
+  album_id?: string | number;
+  album_name?: string;
+  duration?: number;
+  filesize?: number;
+  "320hash"?: string;
+  "320filesize"?: number;
+  sqhash?: string;
+  sqfilesize?: number;
+  /** Hi-Res 字段名不同版本不一，两种都收 */
+  hires_hash?: string;
+  hires_filesize?: number;
+  reshash?: string;
+  resfilesize?: number;
+  /** 翻唱/不同版本聚合 */
+  group?: MobileSong[];
+  trans_param?: { union_cover?: string };
+}
+
+interface MobileResp {
+  status?: number;
+  error_code?: number;
+  data?: {
+    total?: number;
+    info?: MobileSong[];
+  };
+}
+
+/** singername 是 "A、B" / "A,B" 形式的字符串，规范成 "A / B" */
+const formatMobileArtist = (name: string | undefined): string => {
+  if (!name) return "";
+  return decodeName(name)
+    .split(/、|,|;|\//)
+    .map((s) => s.trim())
+    .filter(Boolean)
+    .join(" / ");
+};
+
+const normalizeFromMobile = (raw: MobileSong): NormalizedSong => {
+  const sizes: Partial<Record<Quality, number>> = {};
+  const hashes: Partial<Record<Quality, string>> = {};
+
+  if (raw.filesize && raw.hash) {
+    sizes["128k"] = raw.filesize;
+    hashes["128k"] = raw.hash;
+  }
+  if (raw["320filesize"] && raw["320hash"]) {
+    sizes["320k"] = raw["320filesize"];
+    hashes["320k"] = raw["320hash"];
+  }
+  if (raw.sqfilesize && raw.sqhash) {
+    sizes.flac = raw.sqfilesize;
+    hashes.flac = raw.sqhash;
+  }
+  const hrSize = raw.hires_filesize ?? raw.resfilesize;
+  const hrHash = raw.hires_hash ?? raw.reshash;
+  if (hrSize && hrHash) {
+    sizes.flac24bit = hrSize;
+    hashes.flac24bit = hrHash;
+  }
+
+  const interval = raw.duration ?? 0;
+  return {
+    id: String(raw.audio_id ?? ""),
+    audioId: raw.audio_id ?? 0,
+    hash: raw.hash ?? "",
+    name: decodeName(raw.songname || raw.filename || ""),
+    artist: formatMobileArtist(raw.singername),
+    album: decodeName(raw.album_name ?? ""),
+    albumId: raw.album_id ?? "",
+    cover: fillCover(raw.trans_param?.union_cover),
+    interval,
+    duration: interval * 1000,
+    qualities: Object.keys(hashes) as Quality[],
+    hashes,
+    sizes,
+  };
+};
+
+const searchSongsMobile = async (keywords: string, page: number, limit: number) => {
+  const url =
+    `${KG_MOBILECDN_URL}?keyword=${encodeURIComponent(keywords)}` +
+    `&page=${page}&pagesize=${limit}&format=json&showtype=1`;
+
+  const body = await kgRequest<MobileResp>(url);
+  const raw = body.data?.info ?? [];
+
+  const songs: NormalizedSong[] = [];
+  const seen = new Set<string>();
+  const push = (item: MobileSong) => {
+    const key = `${item.audio_id ?? ""}_${item.hash ?? ""}`;
+    if (seen.has(key)) return;
+    seen.add(key);
+    songs.push(normalizeFromMobile(item));
+  };
+  for (const item of raw) {
+    push(item);
+    for (const sub of item.group ?? []) push(sub);
+  }
+
+  return {
+    code: 200,
+    total: body.data?.total ?? songs.length,
+    songs,
+  };
+};
+
+// ── 兜底：旧 songsearch（无封面，PascalCase 字段） ─────────────────────────────
+
+interface LegacySong {
   Audioid: number;
   SongName: string;
   Singers?: Array<{ name?: string }>;
@@ -30,21 +175,19 @@ interface KGSearchSong {
   SQFileSize?: number;
   ResFileHash?: string;
   ResFileSize?: number;
-  Grp?: KGSearchSong[];
+  Grp?: LegacySong[];
 }
 
-interface KGSearchResp {
+interface LegacyResp {
   status?: number;
   error_code?: number;
   data?: {
     total?: number;
-    lists?: KGSearchSong[];
+    lists?: LegacySong[];
   };
 }
 
-type Quality = "128k" | "320k" | "flac" | "flac24bit";
-
-const normalizeSong = (raw: KGSearchSong) => {
+const normalizeFromLegacy = (raw: LegacySong): NormalizedSong => {
   const sizes: Partial<Record<Quality, number>> = {};
   const hashes: Partial<Record<Quality, string>> = {};
 
@@ -73,54 +216,33 @@ const normalizeSong = (raw: KGSearchSong) => {
     artist: formatSingerName(raw.Singers),
     album: decodeName(raw.AlbumName ?? ""),
     albumId: raw.AlbumID ?? "",
-    /** 秒 */
+    cover: undefined,
     interval: raw.Duration,
-    /** 毫秒，与其它源对齐 */
     duration: raw.Duration * 1000,
-    /** 支持的品质列表（从高到低） */
     qualities: Object.keys(hashes) as Quality[],
     hashes,
     sizes,
   };
 };
 
-const search: KGModule = async (params) => {
-  const {
-    keywords,
-    page = 1,
-    limit = 30,
-  } = params as {
-    keywords?: string;
-    page?: number;
-    limit?: number;
-  };
-
-  if (!keywords) {
-    return { code: 400, total: 0, songs: [], message: "keywords required" };
-  }
-
+const searchSongsLegacy = async (keywords: string, page: number, limit: number) => {
   const url =
     `${KG_SEARCH_URL}?keyword=${encodeURIComponent(keywords)}` +
     `&page=${page}&pagesize=${limit}` +
     `&userid=0&clientver=&platform=WebFilter&filter=2&iscorrection=1&privilege_filter=0&area_code=1`;
 
-  const body = await kgRequest<KGSearchResp>(url);
-
+  const body = await kgRequest<LegacyResp>(url);
   const raw = body.data?.lists ?? [];
-  const songs: ReturnType<typeof normalizeSong>[] = [];
-  // 去重键：audioId + hash（同一首歌不同品质会出现多条）
+  const songs: NormalizedSong[] = [];
   const seen = new Set<string>();
-
-  const push = (item: KGSearchSong) => {
+  const push = (item: LegacySong) => {
     const key = `${item.Audioid}_${item.FileHash}`;
     if (seen.has(key)) return;
     seen.add(key);
-    songs.push(normalizeSong(item));
+    songs.push(normalizeFromLegacy(item));
   };
-
   for (const item of raw) {
     push(item);
-    // Grp 里是翻唱/不同版本，一并展开
     for (const sub of item.Grp ?? []) push(sub);
   }
 
@@ -131,4 +253,30 @@ const search: KGModule = async (params) => {
   };
 };
 
+const search: KGModule = async (params) => {
+  const {
+    keywords,
+    page = 1,
+    limit = 30,
+  } = params as {
+    keywords?: string;
+    page?: number;
+    limit?: number;
+  };
+
+  if (!keywords) {
+    return { code: 400, total: 0, songs: [], message: "keywords required" };
+  }
+
+  // mobilecdn 抛错或空结果都兜底到 songsearch
+  try {
+    const result = await searchSongsMobile(keywords, page, limit);
+    if (result.songs.length > 0) return result;
+    coreLog.warn("[kg] mobilecdn returned 0, fallback to songsearch");
+  } catch (err) {
+    coreLog.warn("[kg] mobilecdn failed, fallback to songsearch:", err);
+  }
+  return await searchSongsLegacy(keywords, page, limit);
+};
+
 export default search;
diff --git a/electron/main/apis/qqmusic/modules/search.ts b/electron/main/apis/qqmusic/modules/search.ts
index 88b9aba0..a5fe964b 100644
--- a/electron/main/apis/qqmusic/modules/search.ts
+++ b/electron/main/apis/qqmusic/modules/search.ts
@@ -1,18 +1,56 @@
 /**
- * 搜索歌曲
- * module: music.search.SearchCgiService / DoSearchForQQMusicLite
+ * 综合搜索（单曲 / 歌手 / 专辑 / 歌单）
  *
  * params:
  * - keywords  关键词（必填）
  * - page      页码，默认 1
  * - limit     每页数，默认 30
- * - type      0 单曲 / 1 歌手 / 2 专辑 / 3 歌单 / 4 MV / 7 歌词 / 8 用户，默认 0
+ * - type      0 单曲 / 1 歌手 / 2 专辑 / 3 歌单，默认 0
+ *
+ * 端点（按类型）：
+ * - 0 → musicu.fcg / DoSearchForQQMusicLite（与 dev 分支一致，稳定）
+ * - 1/2 → c.y.qq.com/.../client_search_cp（jsososo/QQMusicApi 路径，t=9 singer/t=8 album）
+ * - 3 → c.y.qq.com/.../client_music_search_songlist
  */
 
 import { qmRequest } from "../core/request";
-import { formatSingerName } from "../core/config";
+import { QM_HEADERS, formatSingerName } from "../core/config";
 import type { QMModule } from "../core/types";
 
+const C_SEARCH_URL = "https://c.y.qq.com/soso/fcgi-bin/client_search_cp";
+const C_SONGLIST_URL = "https://c.y.qq.com/soso/fcgi-bin/client_music_search_songlist";
+
+const ALBUM_COVER = (mid: string): string =>
+  `https://y.gtimg.cn/music/photo_new/T002R300x300M000${mid}.jpg`;
+const SINGER_COVER = (mid: string): string =>
+  `https://y.gtimg.cn/music/photo_new/T001R300x300M000${mid}.jpg`;
+
+/** 移动端随机 search_id */
+const genSearchId = (): string =>
+  String(
+    Math.floor(Math.random() * 20) * 18014398509481984 +
+      Math.floor(Math.random() * 4194304) * 4294967296 +
+      (Date.now() % 86400000),
+  );
+
+/** c.y.qq.com 返回有时包了 jsonCallback(...)，去壳 */
+const stripCallback = (text: string): string =>
+  text.replace(/^[a-zA-Z_]+\(/, "").replace(/\)$/, "");
+
+const callCSearch = async <T>(
+  url: string,
+  query: Record<string, string | number>,
+): Promise<T> => {
+  const qs = new URLSearchParams(Object.entries(query).map(([k, v]) => [k, String(v)]));
+  const res = await fetch(`${url}?${qs}`, {
+    headers: { Referer: "https://y.qq.com", "User-Agent": QM_HEADERS["User-Agent"] },
+    signal: AbortSignal.timeout(8000),
+  });
+  if (res.status !== 200) throw new Error(`QM c.y HTTP ${res.status}`);
+  const text = await res.text();
+  return JSON.parse(stripCallback(text.trim())) as T;
+};
+
 interface QMSong {
   id: number;
   mid: string;
@@ -29,24 +67,14 @@ interface QMSong {
   };
 }
 
-/** 搜索 search_id：移动端随机数，用于服务端日志/去重 */
-const genSearchId = (): string =>
-  String(
-    Math.floor(Math.random() * 20) * 18014398509481984 +
-      Math.floor(Math.random() * 4194304) * 4294967296 +
-      (Date.now() % 86400000),
-  );
-
-const search: QMModule = async (params) => {
-  const { keywords, page = 1, limit = 30, type = 0 } = params;
-
+const searchSongs = async (keywords: string, page: number, limit: number) => {
   const data = await qmRequest<{
     body?: { item_song?: QMSong[]; meta?: { sum?: number } };
   }>("music.search.SearchCgiService", "DoSearchForQQMusicLite", {
     search_id: genSearchId(),
     remoteplace: "search.android.keyboard",
     query: keywords,
-    search_type: type,
+    search_type: 0,
     num_per_page: limit,
     page_num: page,
     highlight: 0,
@@ -73,4 +101,135 @@ const search: QMModule = async (params) => {
   };
 };
 
+interface CSingerItem {
+  singerID?: number;
+  singerMID?: string;
+  singerName?: string;
+  singerPic?: string;
+  songNum?: number;
+  albumNum?: number;
+}
+
+const searchArtists = async (keywords: string, page: number, limit: number) => {
+  const data = await callCSearch<{
+    data?: { singer?: { list?: CSingerItem[]; totalnum?: number; curnum?: number } };
+  }>(C_SEARCH_URL, {
+    format: "json",
+    n: limit,
+    p: page,
+    w: keywords,
+    cr: 1,
+    g_tk: 5381,
+    t: 9,
+  });
+
+  const list = data?.data?.singer?.list ?? [];
+  const artists = list.map((item) => ({
+    id: String(item.singerID ?? ""),
+    mid: item.singerMID ?? "",
+    name: item.singerName ?? "",
+    cover: item.singerPic || (item.singerMID ? SINGER_COVER(item.singerMID) : ""),
+    songCount: item.songNum ?? 0,
+    albumCount: item.albumNum ?? 0,
+  }));
+  return { code: 200, total: data?.data?.singer?.totalnum ?? artists.length, artists };
+};
+
+interface CAlbumItem {
+  albumID?: number;
+  albumMID?: string;
+  albumName?: string;
+  albumPic?: string;
+  singerName?: string;
+  singer_list?: Array<{ name?: string }>;
+  song_count?: number;
+  songNum?: number;
+  publicTime?: string;
+  publishDate?: string;
+}
+
+const searchAlbums = async (keywords: string, page: number, limit: number) => {
+  const data = await callCSearch<{
+    data?: { album?: { list?: CAlbumItem[]; totalnum?: number; curnum?: number } };
+  }>(C_SEARCH_URL, {
+    format: "json",
+    n: limit,
+    p: page,
+    w: keywords,
+    cr: 1,
+    g_tk: 5381,
+    t: 8,
+  });
+
+  const list = data?.data?.album?.list ?? [];
+  const albums = list.map((item) => ({
+    id: String(item.albumID ?? ""),
+    mid: item.albumMID ?? "",
+    name: item.albumName ?? "",
+    cover: item.albumPic || (item.albumMID ? ALBUM_COVER(item.albumMID) : ""),
+    artist: item.singerName || formatSingerName(item.singer_list),
+    trackCount: item.song_count ?? item.songNum ?? 0,
+    publicTime: item.publicTime ?? item.publishDate ?? "",
+  }));
+  return { code: 200, total: data?.data?.album?.totalnum ?? albums.length, albums };
+};
+
+interface CSonglistItem {
+  dissid?: number | string;
+  dissname?: string;
+  imgurl?: string;
+  creator?: { name?: string };
+  song_count?: number;
+  listennum?: number;
+}
+
+const searchPlaylists = async (keywords: string, page: number, limit: number) => {
+  const data = await callCSearch<{
+    data?: { list?: CSonglistItem[]; display_num?: number; sum?: number };
+  }>(C_SONGLIST_URL, {
+    remoteplace: "txt.yqq.playlist",
+    page_no: page - 1,
+    num_per_page: limit,
+    query: keywords,
+    format: "json",
+    g_tk: 5381,
+  });
+
+  const list = data?.data?.list ?? [];
+  const playlists = list.map((item) => ({
+    id: String(item.dissid ?? ""),
+    name: item.dissname ?? "",
+    cover: item.imgurl ?? "",
+    creator: item.creator?.name ?? "",
+    trackCount: item.song_count ?? 0,
+    playCount: item.listennum ?? 0,
+  }));
+  return {
+    code: 200,
+    total: data?.data?.display_num ?? data?.data?.sum ?? playlists.length,
+    playlists,
+  };
+};
+
+const search: QMModule = async (params) => {
+  const {
+    keywords,
+    page = 1,
+    limit = 30,
+    type = 0,
+  } = params as {
+    keywords?: string;
+    page?: number;
+    limit?: number;
+    type?: number;
+  };
+
+  if (!keywords) return { code: 400, total: 0, message: "keywords required" };
+
+  if (type === 1) return searchArtists(keywords, page, limit);
+  if (type === 2) return searchAlbums(keywords, page, limit);
+  if (type === 3) return searchPlaylists(keywords, page, limit);
+  return searchSongs(keywords, page, limit);
+};
+
 export default search;
diff --git a/shared/types/platform.ts b/shared/types/platform.ts
index 12b32cfa..b03ba898 100644
--- a/shared/types/platform.ts
+++ b/shared/types/platform.ts
@@ -1,2 +1,12 @@
 /** 平台类型 */
 export type Platform = "netease" | "qqmusic" | "kugou";
+
+/** 平台简写 */
+export const PLATFORM_SHORT_NAME: Record<Platform, string> = {
+  netease: "NCM",
+  qqmusic: "QM",
+  kugou: "KG",
+};
+
+/** 全部平台 */
+export const ALL_PLATFORMS: Platform[] = ["netease", "qqmusic", "kugou"];
diff --git a/src/apis/search.ts b/src/apis/search.ts
deleted file mode 100644
index d135e959..00000000
--- a/src/apis/search.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * 在线平台搜索接口
- *
- * 统一返回 Track / CoverItem，向页面屏蔽各平台原始结构。
- * 目前仅接入 netease，后续 qqmusic / kugou 在此扩展。
- */
-
-import type { Track } from "@shared/types/player";
-import type { CoverItem } from "@/types/artist";
-import type { Platform } from "@shared/types/platform";
-import { netease } from "@/apis/netease";
-
-/** 搜索结果通用结构 */
-export interface SearchResult<T> {
-  items: T[];
-  total: number;
-  hasMore: boolean;
-}
-
-interface NeteaseSong {
-  id: number;
-  name: string;
-  ar: { id: number; name: string }[];
-  al: { id: number; name: string; picUrl: string };
-  dt: number;
-}
-interface NeteaseAlbum {
-  id: number;
-  name: string;
-  picUrl: string;
-  artists: { id: number; name: string }[];
-  size: number;
-}
-interface NeteaseArtist {
-  id: number;
-  name: string;
-  picUrl?: string;
-  img1v1Url?: string;
-  albumSize?: number;
-}
-interface NeteasePlaylist {
-  id: number;
-  name: string;
-  coverImgUrl: string;
-  creator?: { nickname: string };
-  trackCount: number;
-}
-
-interface CloudSearchBody {
-  result?: {
-    songs?: NeteaseSong[];
-    albums?: NeteaseAlbum[];
-    artists?: NeteaseArtist[];
-    playlists?: NeteasePlaylist[];
-    songCount?: number;
-    albumCount?: number;
-    artistCount?: number;
-    playlistCount?: number;
-  };
-}
-
-/** netease 搜索 type 编码 */
-const NETEASE_TYPE = { songs: 1, albums: 10, artists: 100, playlists: 1000 } as const;
-
-const neteaseSongToTrack = (song: NeteaseSong): Track => ({
-  id: String(song.id),
-  source: "online",
-  platform: "netease",
-  title: song.name,
-  artists: (song.ar ?? []).map((artist) => ({ id: String(artist.id), name: artist.name })),
-  album: song.al
-    ? { id: String(song.al.id), name: song.al.name, cover: song.al.picUrl }
-    : undefined,
-  duration: song.dt ?? 0,
-  cover: song.al?.picUrl,
-});
-
-const neteaseAlbumToCover = (album: NeteaseAlbum): CoverItem => ({
-  id: String(album.id),
-  title: album.name,
-  cover: album.picUrl,
-  subtitle: (album.artists ?? []).map((artist) => artist.name).join(" / "),
-  trackCount: album.size ?? 0,
-});
-
-const neteaseArtistToCover = (artist: NeteaseArtist): CoverItem => ({
-  id: String(artist.id),
-  title: artist.name,
-  cover: artist.img1v1Url ?? artist.picUrl,
-  subtitle: "",
-  trackCount: artist.albumSize ?? 0,
-});
-
-const neteasePlaylistToCover = (playlist: NeteasePlaylist): CoverItem => ({
-  id: String(playlist.id),
-  title: playlist.name,
-  cover: playlist.coverImgUrl,
-  subtitle: playlist.creator?.nickname ?? "",
-  trackCount: playlist.trackCount ?? 0,
-});
-
-const callNeteaseCloudSearch = (
-  type: keyof typeof NETEASE_TYPE,
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<CloudSearchBody> =>
-  netease.cloudsearch<CloudSearchBody>({
-    keywords: keyword,
-    type: NETEASE_TYPE[type],
-    offset,
-    limit,
-  });
-
-const unsupported = (platform: Platform): never => {
-  throw new Error(`Search not yet supported for platform: ${platform}`);
-};
-
-/** 搜索单曲 */
-export const searchSongs = async (
-  platform: Platform,
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<SearchResult<Track>> => {
-  if (platform !== "netease") return unsupported(platform);
-  const body = await callNeteaseCloudSearch("songs", keyword, offset, limit);
-  const items = (body?.result?.songs ?? []).map(neteaseSongToTrack);
-  const total = body?.result?.songCount ?? items.length;
-  return { items, total, hasMore: offset + items.length < total };
-};
-
-/** 搜索专辑 */
-export const searchAlbums = async (
-  platform: Platform,
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<SearchResult<CoverItem>> => {
-  if (platform !== "netease") return unsupported(platform);
-  const body = await callNeteaseCloudSearch("albums", keyword, offset, limit);
-  const items = (body?.result?.albums ?? []).map(neteaseAlbumToCover);
-  const total = body?.result?.albumCount ?? items.length;
-  return { items, total, hasMore: offset + items.length < total };
-};
-
-/** 搜索歌手 */
-export const searchArtists = async (
-  platform: Platform,
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<SearchResult<CoverItem>> => {
-  if (platform !== "netease") return unsupported(platform);
-  const body = await callNeteaseCloudSearch("artists", keyword, offset, limit);
-  const items = (body?.result?.artists ?? []).map(neteaseArtistToCover);
-  const total = body?.result?.artistCount ?? items.length;
-  return { items, total, hasMore: offset + items.length < total };
-};
-
-/** 搜索歌单 */
-export const searchPlaylists = async (
-  platform: Platform,
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<SearchResult<CoverItem>> => {
-  if (platform !== "netease") return unsupported(platform);
-  const body = await callNeteaseCloudSearch("playlists", keyword, offset, limit);
-  const items = (body?.result?.playlists ?? []).map(neteasePlaylistToCover);
-  const total = body?.result?.playlistCount ?? items.length;
-  return { items, total, hasMore: offset + items.length < total };
-};
diff --git a/src/apis/search/index.ts b/src/apis/search/index.ts
new file mode 100644
index 00000000..bb0ba0bb
--- /dev/null
+++ b/src/apis/search/index.ts
@@ -0,0 +1,74 @@
+/**
+ * 在线平台搜索分发
+ * 对外暴露 searchSongs / searchAlbums / searchArtists / searchPlaylists
+ */
+
+import type { Track } from "@shared/types/player";
+import type { CoverItem } from "@/types/artist";
+import type { Platform } from "@shared/types/platform";
+import * as netease from "./netease";
+import * as qqmusic from "./qqmusic";
+import * as kugou from "./kugou";
+
+/** 搜索结果通用 */
+export interface SearchResult<T> {
+  items: T[];
+  total: number;
+  hasMore: boolean;
+}
+
+const unsupported = (platform: Platform, category: string): never => {
+  throw new Error(`Search not yet supported: ${platform}.${category}`);
+};
+
+/** 搜索单曲 */
+export const searchSongs = (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<Track>> => {
+  if (platform === "netease") return netease.songs(keyword, offset, limit);
+  if (platform === "qqmusic") return qqmusic.songs(keyword, offset, limit);
+  if (platform === "kugou") return kugou.songs(keyword, offset, limit);
+  return unsupported(platform, "songs");
+};
+
+/** 搜索专辑 */
+export const searchAlbums = (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  if (platform === "netease") return netease.albums(keyword, offset, limit);
+  if (platform === "qqmusic") return qqmusic.albums(keyword, offset, limit);
+  if (platform === "kugou") return kugou.albums(keyword, offset, limit);
+  return unsupported(platform, "albums");
+};
+
+/** 搜索歌手 */
+export const searchArtists = (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  if (platform === "netease") return netease.artists(keyword, offset, limit);
+  if (platform === "qqmusic") return qqmusic.artists(keyword, offset, limit);
+  if (platform === "kugou") return kugou.artists(keyword, offset, limit);
+  return unsupported(platform, "artists");
+};
+
+/** 搜索歌单 */
+export const searchPlaylists = (
+  platform: Platform,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  if (platform === "netease") return netease.playlists(keyword, offset, limit);
+  if (platform === "qqmusic") return qqmusic.playlists(keyword, offset, limit);
+  if (platform === "kugou") return kugou.playlists(keyword, offset, limit);
+  return unsupported(platform, "playlists");
+};
diff --git a/src/apis/search/kugou.ts b/src/apis/search/kugou.ts
new file mode 100644
index 00000000..330c13ae
--- /dev/null
+++ b/src/apis/search/kugou.ts
@@ -0,0 +1,68 @@
+import type { Track } from "@shared/types/player";
+import type { CoverItem } from "@/types/artist";
+import { kugou as kugouApi } from "@/apis/kugou";
+import type { SearchResult } from "./index";
+
+interface KGSong {
+  id: string;
+  hash: string;
+  audioId?: number;
+  name: string;
+  artist: string;
+  album?: string;
+  albumId?: string | number;
+  /** gateway 路径才会带，trans_param.union_cover 取出来；兜底路径为空 */
+  cover?: string;
+  duration: number;
+}
+
+interface SongsResp {
+  total?: number;
+  songs?: KGSong[];
+}
+
+const songToTrack = (song: KGSong): Track => ({
+  id: song.hash || song.id,
+  source: "online",
+  platform: "kugou",
+  title: song.name,
+  artists: song.artist ? [{ name: song.artist }] : [],
+  // album.id 暂不暴露（在线专辑详情页未接通），列表里跟着 artist 一起暗显
+  album: song.album ? { name: song.album, cover: song.cover } : undefined,
+  cover: song.cover,
+  duration: song.duration ?? 0,
+});
+
+const empty = <T>(): SearchResult<T> => ({ items: [], total: 0, hasMore: false });
+
+export const songs = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<Track>> => {
+  const body = await kugouApi.search<SongsResp>({
+    keywords: keyword,
+    page: Math.floor(offset / limit) + 1,
+    limit,
+  });
+  const items = (body?.songs ?? []).map(songToTrack);
+  const total = body?.total ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
+
+/* eslint-disable @typescript-eslint/no-unused-vars */
+export const albums = async (
+  _keyword: string,
+  _offset: number,
+  _limit: number,
+): Promise<SearchResult<CoverItem>> => empty();
+export const artists = async (
+  _keyword: string,
+  _offset: number,
+  _limit: number,
+): Promise<SearchResult<CoverItem>> => empty();
+export const playlists = async (
+  _keyword: string,
+  _offset: number,
+  _limit: number,
+): Promise<SearchResult<CoverItem>> => empty();
diff --git a/src/apis/search/netease.ts b/src/apis/search/netease.ts
new file mode 100644
index 00000000..40971e3a
--- /dev/null
+++ b/src/apis/search/netease.ts
@@ -0,0 +1,153 @@
+import type { Track } from "@shared/types/player";
+import type { CoverItem } from "@/types/artist";
+import { netease as neteaseApi } from "@/apis/netease";
+import type { SearchResult } from "./index";
+
+interface NeteaseSong {
+  id: number;
+  name: string;
+  ar: { id: number; name: string }[];
+  al: { id: number; name: string; picUrl: string };
+  dt: number;
+}
+interface NeteaseAlbum {
+  id: number;
+  name: string;
+  picUrl: string;
+  artists: { id: number; name: string }[];
+  size: number;
+}
+interface NeteaseArtist {
+  id: number;
+  name: string;
+  picUrl?: string;
+  img1v1Url?: string;
+  albumSize?: number;
+}
+interface NeteasePlaylist {
+  id: number;
+  name: string;
+  coverImgUrl: string;
+  creator?: { nickname: string };
+  trackCount: number;
+}
+
+interface CloudSearchBody {
+  result?: {
+    songs?: NeteaseSong[];
+    albums?: NeteaseAlbum[];
+    artists?: NeteaseArtist[];
+    playlists?: NeteasePlaylist[];
+    songCount?: number;
+    albumCount?: number;
+    artistCount?: number;
+    playlistCount?: number;
+  };
+}
+
+/** cloudsearch type 编码 */
+const TYPE = { songs: 1, albums: 10, artists: 100, playlists: 1000 } as const;
+
+/** 给 p1/p2.music.126.net 的封面 URL 拼尺寸，原图很大、列表只要 300x300 */
+const withSize = (url: string | undefined, size = 300): string | undefined => {
+  if (!url) return undefined;
+  if (url.includes("?param=")) return url;
+  return `${url}?param=${size}y${size}`;
+};
+
+const call = (
+  type: keyof typeof TYPE,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<CloudSearchBody> =>
+  neteaseApi.cloudsearch<CloudSearchBody>({
+    keywords: keyword,
+    type: TYPE[type],
+    offset,
+    limit,
+  });
+
+const songToTrack = (song: NeteaseSong): Track => {
+  const cover = withSize(song.al?.picUrl);
+  return {
+    id: String(song.id),
+    source: "online",
+    platform: "netease",
+    title: song.name,
+    artists: (song.ar ?? []).map((artist) => ({ id: String(artist.id), name: artist.name })),
+    album: song.al
+      ? { id: String(song.al.id), name: song.al.name, cover }
+      : undefined,
+    duration: song.dt ?? 0,
+    cover,
+  };
+};
+
+const albumToCover = (album: NeteaseAlbum): CoverItem => ({
+  id: String(album.id),
+  title: album.name,
+  cover: withSize(album.picUrl),
+  subtitle: (album.artists ?? []).map((artist) => artist.name).join(" / "),
+  trackCount: album.size ?? 0,
+});
+
+const artistToCover = (artist: NeteaseArtist): CoverItem => ({
+  id: String(artist.id),
+  title: artist.name,
+  cover: withSize(artist.img1v1Url ?? artist.picUrl),
+  subtitle: "",
+  trackCount: artist.albumSize ?? 0,
+});
+
+const playlistToCover = (playlist: NeteasePlaylist): CoverItem => ({
+  id: String(playlist.id),
+  title: playlist.name,
+  cover: withSize(playlist.coverImgUrl),
+  subtitle: playlist.creator?.nickname ?? "",
+  trackCount: playlist.trackCount ?? 0,
+});
+
+export const songs = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<Track>> => {
+  const body = await call("songs", keyword, offset, limit);
+  const items = (body?.result?.songs ?? []).map(songToTrack);
+  const total = body?.result?.songCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
+
+export const albums = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  const body = await call("albums", keyword, offset, limit);
+  const items = (body?.result?.albums ?? []).map(albumToCover);
+  const total = body?.result?.albumCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
+
+export const artists = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  const body = await call("artists", keyword, offset, limit);
+  const items = (body?.result?.artists ?? []).map(artistToCover);
+  const total = body?.result?.artistCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
+
+export const playlists = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  const body = await call("playlists", keyword, offset, limit);
+  const items = (body?.result?.playlists ?? []).map(playlistToCover);
+  const total = body?.result?.playlistCount ?? items.length;
+  return { items, total, hasMore: offset + items.length < total };
+};
diff --git a/src/apis/search/qqmusic.ts b/src/apis/search/qqmusic.ts
new file mode 100644
index 00000000..17ac6bd5
--- /dev/null
+++ b/src/apis/search/qqmusic.ts
@@ -0,0 +1,162 @@
+import type { Track } from "@shared/types/player";
+import type { CoverItem } from "@/types/artist";
+import { qqmusic as qmApi } from "@/apis/qqmusic";
+import type { SearchResult } from "./index";
+
+/** 主进程返回的单曲行 */
+interface QMSong {
+  id: string;
+  mid?: string;
+  name: string;
+  artist: string;
+  album?: string;
+  albumMid?: string;
+  duration: number;
+}
+interface QMAlbumRow {
+  id: string;
+  mid?: string;
+  name: string;
+  cover?: string;
+  artist?: string;
+  trackCount?: number;
+}
+interface QMArtistRow {
+  id: string;
+  mid?: string;
+  name: string;
+  cover?: string;
+  songCount?: number;
+  albumCount?: number;
+}
+interface QMPlaylistRow {
+  id: string;
+  name: string;
+  cover?: string;
+  creator?: string;
+  trackCount?: number;
+}
+
+interface SongsResp {
+  total?: number;
+  songs?: QMSong[];
+}
+interface AlbumsResp {
+  total?: number;
+  albums?: QMAlbumRow[];
+}
+interface ArtistsResp {
+  total?: number;
+  artists?: QMArtistRow[];
+}
+interface PlaylistsResp {
+  total?: number;
+  playlists?: QMPlaylistRow[];
+}
+
+/** type 编码，对齐主进程 search_type */
+const TYPE = { songs: 0, artists: 1, albums: 2, playlists: 3 } as const;
+
+const call = <T>(
+  type: keyof typeof TYPE,
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<T> =>
+  qmApi.search<T>({
+    keywords: keyword,
+    type: TYPE[type],
+    page: Math.floor(offset / limit) + 1,
+    limit,
+  });
+
+const albumCoverByMid = (mid: string): string =>
+  `https://y.gtimg.cn/music/photo_new/T002R300x300M000${mid}.jpg`;
+
+const songToTrack = (song: QMSong): Track => {
+  const cover = song.albumMid ? albumCoverByMid(song.albumMid) : undefined;
+  return {
+    id: song.mid || song.id,
+    source: "online",
+    platform: "qqmusic",
+    title: song.name,
+    // QM 的 song.artist 是合并字符串（"A / B"），没单独 id，列表里会自动暗显
+    artists: song.artist ? [{ name: song.artist }] : [],
+    // 在线专辑详情页还没接通（Artist.vue 的 TODO: online），暂不把 albumMid 当 id 暴露，
+    // 列表里会跟 artist 一起暗显；mid 只留给封面 URL
+    album: song.album ? { name: song.album, cover } : undefined,
+    duration: song.duration ?? 0,
+    cover,
+  };
+};
+
+const albumToCover = (album: QMAlbumRow): CoverItem => ({
+  id: album.mid || album.id,
+  title: album.name,
+  cover: album.cover,
+  subtitle: album.artist ?? "",
+  trackCount: album.trackCount ?? 0,
+});
+
+const artistToCover = (artist: QMArtistRow): CoverItem => ({
+  id: artist.mid || artist.id,
+  title: artist.name,
+  cover: artist.cover,
+  subtitle: "",
+  trackCount: artist.albumCount ?? 0,
+});
+
+const playlistToCover = (playlist: QMPlaylistRow): CoverItem => ({
+  id: playlist.id,
+  title: playlist.name,
+  cover: playlist.cover,
+  subtitle: playlist.creator ?? "",
+  trackCount: playlist.trackCount ?? 0,
+});
+
+/** QM 多个接口不返回可靠总数，用满页启发式判断是否还有下一页 */
+const hasMoreByPage = (got: number, limit: number): boolean => got >= limit;
+
+export const songs = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<Track>> => {
+  const body = await call<SongsResp>("songs", keyword, offset, limit);
+  const items = (body?.songs ?? []).map(songToTrack);
+  const total = body?.total ?? items.length;
+  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
+};
+
+export const albums = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  const body = await call<AlbumsResp>("albums", keyword, offset, limit);
+  const items = (body?.albums ?? []).map(albumToCover);
+  const total = body?.total ?? items.length;
+  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
+};
+
+export const artists = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  const body = await call<ArtistsResp>("artists", keyword, offset, limit);
+  const items = (body?.artists ?? []).map(artistToCover);
+  const total = body?.total ?? items.length;
+  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
+};
+
+export const playlists = async (
+  keyword: string,
+  offset: number,
+  limit: number,
+): Promise<SearchResult<CoverItem>> => {
+  const body = await call<PlaylistsResp>("playlists", keyword, offset, limit);
+  const items = (body?.playlists ?? []).map(playlistToCover);
+  const total = body?.total ?? items.length;
+  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
+};
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index ce4e6876..7d17a947 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -76,16 +76,21 @@ const textCollator = new Intl.Collator(undefined, {
 /** 当前播放歌曲 ID */
 const playingId = computed(() => media.track?.id);
 
-/** 专辑是否可跳转*/
+/** 非本地源需要真实 id */
+const needsRealId = computed(
+  () => props.source === "streaming" || props.source === "online",
+);
+
+/** 专辑是否可跳转 */
 const isAlbumLinkable = (item: Track): boolean => {
   if (!item.album?.name) return false;
-  return props.source === "streaming" ? !!item.album.id : true;
+  return needsRealId.value ? !!item.album.id : true;
 };
 
-/** 歌手是否可跳转*/
+/** 歌手是否可跳转 */
 const isArtistLinkable = (artist: Artist): boolean => {
   if (!artist.name) return false;
-  return props.source === "streaming" ? !!artist.id : true;
+  return needsRealId.value ? !!artist.id : true;
 };
 
 /** 排序字段 */
@@ -480,23 +485,23 @@ defineExpose({
                       {{ getQualityLevel(item.quality) === "hi-res" ? "HR" : "SQ" }}
                     </span>
                     <span class="truncate">
-                      <span
-                        v-for="(artist, i) in item.artists"
-                        :key="artist.id ?? i"
-                        class="transition-opacity"
-                        :class="
-                          isArtistLinkable(artist)
-                            ? 'cursor-pointer hover:opacity-70'
-                            : 'opacity-50'
-                        "
-                        @click.stop="
-                          isArtistLinkable(artist) &&
-                          navigateToArtist(artist.name, { source, artistId: artist.id })
-                        "
-                      >
-                        {{ artist.name }}
+                      <template v-for="(artist, i) in item.artists" :key="artist.id ?? i">
+                        <span
+                          class="transition-opacity"
+                          :class="
+                            isArtistLinkable(artist)
+                              ? 'cursor-pointer hover:opacity-70'
+                              : 'opacity-50'
+                          "
+                          @click.stop="
+                            isArtistLinkable(artist) &&
+                            navigateToArtist(artist.name, { source, artistId: artist.id })
+                          "
+                        >
+                          {{ artist.name }}
+                        </span>
                         <span v-if="i < item.artists.length - 1" class="mx-0.5 opacity-50">/</span>
-                      </span>
+                      </template>
                       <span v-if="!item.artists?.length" class="opacity-50">
                         {{ t("playlist.unknownArtist") }}
                       </span>
diff --git a/src/components/settings/custom/LyricSourceOrderConfig.vue b/src/components/settings/custom/LyricSourceOrderConfig.vue
index 748cc20f..8dd26af6 100644
--- a/src/components/settings/custom/LyricSourceOrderConfig.vue
+++ b/src/components/settings/custom/LyricSourceOrderConfig.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Platform } from "@shared/types/platform";
+import { PLATFORM_SHORT_NAME, type Platform } from "@shared/types/platform";
 import { useSortable } from "@vueuse/integrations/useSortable";
 import { DEFAULT_LYRIC_SOURCE_ORDER } from "@/types/settings";
 import { useSettingsStore } from "@/stores/settings";
@@ -25,12 +25,7 @@ useSortable(listEl, list, {
   fallbackClass: "sortable-ghost",
 });
 
-const labelOf = (v: Platform): string =>
-  ({
-    netease: t("settings.lyricSourcePreference.netease"),
-    qqmusic: t("settings.lyricSourcePreference.qqmusic"),
-    kugou: t("settings.lyricSourcePreference.kugou"),
-  })[v] ?? v;
+const labelOf = (v: Platform): string => PLATFORM_SHORT_NAME[v] ?? v;
 
 const handleConfirm = () => {
   settings.lyric.lyricSourceOrder = [...list.value];
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 96b22155..66df256d 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -91,6 +91,8 @@
     "titleSuffix": "search results",
     "emptyKeyword": "Type a keyword to start searching",
     "noResults": "No matching results",
+    "noResultsHint": "Try another keyword or switch the source",
+    "errorTitle": "Search failed",
     "tabs": {
       "songs": "Songs",
       "albums": "Albums",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index f6499981..b4675ab0 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -91,6 +91,8 @@
     "titleSuffix": "的搜索结果",
     "emptyKeyword": "请输入关键词开始搜索",
     "noResults": "没有找到匹配内容",
+    "noResultsHint": "换个关键词或切换音源试试",
+    "errorTitle": "搜索失败",
     "tabs": {
       "songs": "单曲",
       "albums": "专辑",
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index b0b509e7..d730c857 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
 import type { Track } from "@shared/types/player";
+import { ALL_PLATFORMS, PLATFORM_SHORT_NAME, type Platform } from "@shared/types/platform";
 import type { CoverItem } from "@/types/artist";
 import { searchSongs, searchAlbums, searchArtists, searchPlaylists } from "@/apis/search";
 import SongList from "@/components/list/SongList.vue";
 import CoverList from "@/components/list/CoverList.vue";
+import { useStatusStore } from "@/stores/status";
 
 const { t } = useI18n();
 const route = useRoute();
+const status = useStatusStore();
 
 type TabKey = "songs" | "albums" | "artists" | "playlists";
 
@@ -27,9 +30,12 @@ const tabs = computed(() => [
   { key: "playlists", label: t("search.tabs.playlists") },
 ]);
 
+const platformTabs = ALL_PLATFORMS.map((key) => ({ key, label: PLATFORM_SHORT_NAME[key] }));
+
 interface TabState<T> {
   items: T[];
   total: number;
+  hasMore: boolean;
   loaded: boolean;
   loading: boolean;
   loadingMore: boolean;
@@ -38,6 +44,7 @@ interface TabState<T> {
 const createState = <T,>(): TabState<T> => ({
   items: [],
   total: 0,
+  hasMore: false,
   loaded: false,
   loading: false,
   loadingMore: false,
@@ -65,7 +72,7 @@ const fetchTab = async (tab: TabKey, append: boolean): Promise<void> => {
   if (!keyword.value) return;
   const state = states[tab];
   if (append) {
-    if (!state.loaded || state.loadingMore || state.items.length >= state.total) return;
+    if (!state.loaded || state.loadingMore || !state.hasMore) return;
     state.loadingMore = true;
   } else {
     if (state.loading) return;
@@ -75,7 +82,7 @@ const fetchTab = async (tab: TabKey, append: boolean): Promise<void> => {
   try {
     const offset = append ? state.items.length : 0;
     const result = await (fetchers[tab] as typeof searchSongs)(
-      "netease",
+      status.searchPlatform,
       keyword.value,
       offset,
       PAGE_SIZE,
@@ -86,6 +93,7 @@ const fetchTab = async (tab: TabKey, append: boolean): Promise<void> => {
       state.items = result.items as never;
     }
     state.total = result.total;
+    state.hasMore = result.hasMore;
     state.loaded = true;
   } catch (err) {
     error.value = err instanceof Error ? err.message : String(err);
@@ -95,23 +103,37 @@ const fetchTab = async (tab: TabKey, append: boolean): Promise<void> => {
   }
 };
 
-/** 关键词变化：重置所有 tab 状态并拉当前 tab */
+const resetStates = (): void => {
+  (Object.keys(states) as TabKey[]).forEach((tab) => {
+    states[tab].items = [];
+    states[tab].total = 0;
+    states[tab].hasMore = false;
+    states[tab].loaded = false;
+    states[tab].loading = false;
+    states[tab].loadingMore = false;
+  });
+  error.value = "";
+};
+
+/** 关键词变化：清空状态并拉当前 tab */
 watch(
   keyword,
   () => {
-    (Object.keys(states) as TabKey[]).forEach((tab) => {
-      states[tab].items = [];
-      states[tab].total = 0;
-      states[tab].loaded = false;
-      states[tab].loading = false;
-      states[tab].loadingMore = false;
-    });
-    error.value = "";
+    resetStates();
     if (keyword.value) fetchTab(activeTab.value, false);
   },
   { immediate: true },
 );
 
+/** 平台切换：清空状态并按当前关键词重拉 */
+watch(
+  () => status.searchPlatform,
+  () => {
+    resetStates();
+    if (keyword.value) fetchTab(activeTab.value, false);
+  },
+);
+
 /** 切换 tab：未拉过则按需请求 */
 watch(activeTab, (tab) => {
   if (keyword.value && !states[tab].loaded) fetchTab(tab, false);
@@ -121,6 +143,10 @@ const onTabSwitch = (key: string): void => {
   activeTab.value = key as TabKey;
 };
 
+const onPlatformSwitch = (key: string): void => {
+  status.searchPlatform = key as Platform;
+};
+
 /** 滚动触底加载下一页 */
 const onReachBottom = (tab: TabKey): void => {
   fetchTab(tab, true);
@@ -131,95 +157,112 @@ const isInitialLoading = computed(() => {
   const state = states[activeTab.value];
   return state.loading && !state.loaded;
 });
+
+/** 当前 tab 已加载且为空 */
+const isEmptyResult = computed(() => {
+  const state = states[activeTab.value];
+  return state.loaded && state.items.length === 0;
+});
 </script>
 
 <template>
   <div class="flex flex-col h-full">
     <!-- 顶栏 -->
     <div class="shrink-0 px-5 pb-2">
-      <h1 class="mt-2 mb-4 truncate">
-        <span class="text-3xl font-bold text-on-surface">
-          {{ keyword || t("search.title") }}
-        </span>
-        <span v-if="keyword" class="ml-2 text-lg text-on-surface-variant/60">
-          {{ t("search.titleSuffix") }}
-        </span>
-      </h1>
+      <div class="mt-2 mb-4 flex items-end justify-between gap-4">
+        <h1 class="truncate min-w-0">
+          <span class="text-3xl font-bold text-on-surface">
+            {{ keyword || t("search.title") }}
+          </span>
+          <span v-if="keyword" class="ml-2 text-lg text-on-surface-variant/60">
+            {{ t("search.titleSuffix") }}
+          </span>
+        </h1>
+        <!-- 平台切换：胶囊 segment -->
+        <div
+          class="shrink-0 inline-flex items-center gap-0.5 p-1 rounded-full bg-on-surface/5 border border-solid border-outline-variant/20"
+        >
+          <SButton
+            v-for="p in platformTabs"
+            :key="p.key"
+            :variant="status.searchPlatform === p.key ? 'secondary' : 'ghost'"
+            :type="status.searchPlatform === p.key ? 'primary' : 'default'"
+            size="small"
+            round
+            strong
+            ripple
+            @click="onPlatformSwitch(p.key)"
+          >
+            {{ p.label }}
+          </SButton>
+        </div>
+      </div>
       <STabs :model-value="activeTab" :tabs="tabs" @update:model-value="onTabSwitch" />
     </div>
-
     <!-- 空关键词 -->
-    <div v-if="!keyword" class="flex-1 flex items-center justify-center text-on-surface-variant/50">
-      <div class="text-center">
-        <IconLucideSearch class="size-12 mx-auto mb-3 opacity-30" />
+    <div v-if="!keyword" class="flex-1 flex items-center justify-center">
+      <div class="text-center text-on-surface-variant/60">
+        <IconLucideSearch class="size-14 mx-auto mb-4 opacity-30" />
         <div class="text-sm">{{ t("search.emptyKeyword") }}</div>
       </div>
     </div>
     <!-- 错误态 -->
-    <div v-else-if="error" class="flex-1 flex items-center justify-center text-red-500/80 px-6">
-      <div class="text-sm break-all text-center">{{ error }}</div>
+    <div v-else-if="error" class="flex-1 flex items-center justify-center px-6">
+      <div class="text-center text-red-500/85">
+        <IconLucideTriangleAlert class="size-14 mx-auto mb-4 opacity-50" />
+        <div class="text-sm font-medium mb-1">{{ t("search.errorTitle") }}</div>
+        <div class="text-xs opacity-80 break-all max-w-xs">{{ error }}</div>
+      </div>
     </div>
     <!-- 首次加载 -->
-    <div
-      v-else-if="isInitialLoading"
-      class="flex-1 flex items-center justify-center text-on-surface-variant/50"
-    >
-      <div class="text-sm">{{ t("common.loading") }}</div>
+    <div v-else-if="isInitialLoading" class="flex-1 flex items-center justify-center">
+      <div class="text-center text-on-surface-variant/60">
+        <SLoading class="text-4xl text-primary/70 mb-4 mx-auto block" />
+        <div class="text-sm">{{ t("common.loading") }}</div>
+      </div>
+    </div>
+    <!-- 无结果 -->
+    <div v-else-if="isEmptyResult" class="flex-1 flex items-center justify-center">
+      <div class="text-center text-on-surface-variant/60">
+        <IconLucideSearchX class="size-14 mx-auto mb-4 opacity-30" />
+        <div class="text-sm mb-1">{{ t("search.noResults") }}</div>
+        <div class="text-xs opacity-70">{{ t("search.noResultsHint") }}</div>
+      </div>
     </div>
     <!-- 各 tab 内容 -->
     <div v-else class="flex-1 min-h-0">
-      <template v-if="activeTab === 'songs'">
-        <SongList
-          v-if="states.songs.items.length > 0"
-          :items="states.songs.items"
-          source="online"
-          :show-size="false"
-          @reach-bottom="onReachBottom('songs')"
-        />
-        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
-          <div class="text-sm">{{ t("search.noResults") }}</div>
-        </div>
-      </template>
-      <template v-else-if="activeTab === 'albums'">
-        <CoverList
-          v-if="states.albums.items.length > 0"
-          :items="states.albums.items"
-          :padding-x="20"
-          :padding-top="8"
-          :padding-bottom="20"
-          @reach-bottom="onReachBottom('albums')"
-        />
-        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
-          <div class="text-sm">{{ t("search.noResults") }}</div>
-        </div>
-      </template>
-      <template v-else-if="activeTab === 'artists'">
-        <CoverList
-          v-if="states.artists.items.length > 0"
-          :items="states.artists.items"
-          type="artist"
-          :padding-x="20"
-          :padding-top="8"
-          :padding-bottom="20"
-          @reach-bottom="onReachBottom('artists')"
-        />
-        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
-          <div class="text-sm">{{ t("search.noResults") }}</div>
-        </div>
-      </template>
-      <template v-else>
-        <CoverList
-          v-if="states.playlists.items.length > 0"
-          :items="states.playlists.items"
-          :padding-x="20"
-          :padding-top="8"
-          :padding-bottom="20"
-          @reach-bottom="onReachBottom('playlists')"
-        />
-        <div v-else class="h-full flex items-center justify-center text-on-surface-variant/50">
-          <div class="text-sm">{{ t("search.noResults") }}</div>
-        </div>
-      </template>
+      <SongList
+        v-if="activeTab === 'songs'"
+        :items="states.songs.items"
+        source="online"
+        :show-size="false"
+        @reach-bottom="onReachBottom('songs')"
+      />
+      <CoverList
+        v-else-if="activeTab === 'albums'"
+        :items="states.albums.items"
+        :padding-x="20"
+        :padding-top="8"
+        :padding-bottom="20"
+        @reach-bottom="onReachBottom('albums')"
+      />
+      <CoverList
+        v-else-if="activeTab === 'artists'"
+        :items="states.artists.items"
+        type="artist"
+        :padding-x="20"
+        :padding-top="8"
+        :padding-bottom="20"
+        @reach-bottom="onReachBottom('artists')"
+      />
+      <CoverList
+        v-else
+        :items="states.playlists.items"
+        :padding-x="20"
+        :padding-top="8"
+        :padding-bottom="20"
+        @reach-bottom="onReachBottom('playlists')"
+      />
     </div>
   </div>
 </template>
diff --git a/src/stores/status.ts b/src/stores/status.ts
index 9954e910..22f4e236 100644
--- a/src/stores/status.ts
+++ b/src/stores/status.ts
@@ -1,4 +1,5 @@
 import type { PlayerState, AudioDevice, RepeatMode, ShuffleMode } from "@shared/types/player";
+import type { Platform } from "@shared/types/platform";
 export type { RepeatMode, ShuffleMode } from "@shared/types/player";
 import * as queue from "./queue";
 
@@ -53,8 +54,10 @@ export const useStatusStore = defineStore(
       pointA: null as number | null,
       pointB: null as number | null,
     });
-    /** 当前曲目歌词偏移（ms，正值为歌词提前）；主进程为权威源，本地仅做镜像 */
+    /** 当前曲目歌词偏移（ms，正值为歌词提前） */
     const lyricOffsetMs = ref(0);
+    /** 搜索页选中的平台 */
+    const searchPlatform = ref<Platform>("netease");
     /** 是否正在播放 */
     const isPlaying = computed(() => state.value === "playing");
     /** 是否暂停 */
@@ -95,13 +98,14 @@ export const useStatusStore = defineStore(
       autoClose,
       abLoop,
       lyricOffsetMs,
+      searchPlatform,
       currentTrack,
     };
   },
   {
     persist: {
       storage: localStorage,
-      pick: ["playIndex", "repeatMode", "shuffleMode", "volume", "position"],
+      pick: ["playIndex", "repeatMode", "shuffleMode", "volume", "position", "searchPlatform"],
     },
   },
 );
diff --git a/src/utils/navigate.ts b/src/utils/navigate.ts
index c6ac3ef8..c0a8d3f2 100644
--- a/src/utils/navigate.ts
+++ b/src/utils/navigate.ts
@@ -1,22 +1,26 @@
 import type { TrackSource } from "@shared/types/player";
 import router from "@/router";
 
+/** 非本地源 */
+const isExternal = (source: TrackSource): boolean =>
+  source === "streaming" || source === "online";
+
 /**
  * 跳转到专辑页
- * 流媒体没拿到真实 albumId 时静默忽略，避免用专辑名当 ID 触发服务器 400
- * @param albumName - 专辑名称（本地用作聚合 key；流媒体仅用于 query 兜底显示）
- * @param options.source - 来源（local/streaming）；默认为 local
- * @param options.albumId - 流媒体专辑 ID
+ * 非本地源没拿到真实 albumId 时静默忽略，避免用专辑名当 ID 触发服务器 400 / 路由错位
+ * @param albumName - 专辑名称（本地用作聚合 key；非本地用于 query 兜底显示）
+ * @param options.source - 来源（local/streaming/online）；默认为 local
+ * @param options.albumId - 真实专辑 ID（streaming/online 必填）
  */
 export const navigateToAlbum = (
   albumName?: string,
   options: { source?: TrackSource; albumId?: string } = {},
 ) => {
   const source = options.source ?? "local";
-  const id = source === "streaming" ? options.albumId : albumName;
+  const id = isExternal(source) ? options.albumId : albumName;
   if (!id?.trim()) return;
   const query =
-    source === "streaming" && albumName && albumName !== id ? { name: albumName } : undefined;
+    isExternal(source) && albumName && albumName !== id ? { name: albumName } : undefined;
   router.push({
     name: "collection",
     params: { source, type: "album", id: encodeURIComponent(id) },
@@ -26,20 +30,20 @@ export const navigateToAlbum = (
 
 /**
  * 跳转到歌手页
- * 流媒体没拿到真实 artistId 时静默忽略
- * @param artistName - 歌手名称（本地用作聚合 key；流媒体仅用于 query 兜底显示）
- * @param options.source - 来源（local/streaming）；默认为 local
- * @param options.artistId - 流媒体歌手 ID
+ * 非本地源没拿到真实 artistId 时静默忽略
+ * @param artistName - 歌手名称（本地用作聚合 key；非本地用于 query 兜底显示）
+ * @param options.source - 来源（local/streaming/online）；默认为 local
+ * @param options.artistId - 真实歌手 ID（streaming/online 必填）
  */
 export const navigateToArtist = (
   artistName?: string,
   options: { source?: TrackSource; artistId?: string } = {},
 ) => {
   const source = options.source ?? "local";
-  const id = source === "streaming" ? options.artistId : artistName;
+  const id = isExternal(source) ? options.artistId : artistName;
   if (!id?.trim()) return;
   const query =
-    source === "streaming" && artistName && artistName !== id ? { name: artistName } : undefined;
+    isExternal(source) && artistName && artistName !== id ? { name: artistName } : undefined;
   router.push({
     name: "artist",
     params: { source, id: encodeURIComponent(id) },

From 464cd2d8fade3f96b002cccd4228af8f872a2f13 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Thu, 14 May 2026 10:48:50 +0800
Subject: [PATCH 04/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=AF=B9=E9=BD=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/apis/common/lyric/utils.ts     |  22 +-
 electron/main/apis/qqmusic/modules/search.ts | 210 +++----------------
 src/apis/search/netease.ts                   |   4 +-
 src/apis/search/qqmusic.ts                   | 130 ++----------
 src/components/list/SongList.vue             |   4 +-
 src/utils/navigate.ts                        |   3 +-
 6 files changed, 76 insertions(+), 297 deletions(-)

diff --git a/electron/main/apis/common/lyric/utils.ts b/electron/main/apis/common/lyric/utils.ts
index f24f37c2..a7fa656b 100644
--- a/electron/main/apis/common/lyric/utils.ts
+++ b/electron/main/apis/common/lyric/utils.ts
@@ -27,23 +27,35 @@ export const normalize = (text: string | undefined | null): string => {
 const bothContains = (left: string, right: string): boolean =>
   left.length > 0 && right.length > 0 && (left.includes(right) || right.includes(left));
 
-/** 时长是否接近 */
+/** 时长是否在容差内（ms） */
 const durationClose = (leftMs?: number, rightMs?: number, tolMs = 5000): boolean => {
   if (!leftMs || !rightMs) return false;
   return Math.abs(leftMs - rightMs) <= tolMs;
 };
 
+/**
+ * 时长差是否大到能确认"不是同一首"
+ * @param leftMs - 左时长（ms）
+ * @param rightMs - 右时长（ms）
+ * @param tolMs - 容差（ms）
+ */
+const durationFar = (leftMs?: number, rightMs?: number, tolMs = 20000): boolean => {
+  if (!leftMs || !rightMs) return false;
+  return Math.abs(leftMs - rightMs) > tolMs;
+};
+
 /**
  * 从候选列表里挑出最匹配 track 的那一个
  *
+ * 硬性条件（不满足直接跳过）
+ *  - name 必须全等或双向 includes
+ *  - 双方都给了 duration 时，差距不能超过 20s
+ *
  * 打分规则（分数越高越优先）
  *  - name 全等：+10；name 双向 includes：+4
  *  - artist 全等：+5；artist 双向 includes：+2
  *  - album 全等（且 track 有 album）：+2
  *  - duration 接近（±5s）：+3
- *
- * name 既不等也无 includes 的直接跳过（相关性太差）
- * 最终最高分 < 1 视为无匹配，返回 null
  */
 export const pickBestCandidate = <E>(
   candidates: LyricCandidate<E>[],
@@ -67,6 +79,8 @@ export const pickBestCandidate = <E>(
     else if (bothContains(candName, trackName)) score += 4;
     else continue;
 
+    if (durationFar(candidate.duration, trackDuration)) continue;
+
     if (candArtist === trackArtist) score += 5;
     else if (bothContains(candArtist, trackArtist)) score += 2;
 
diff --git a/electron/main/apis/qqmusic/modules/search.ts b/electron/main/apis/qqmusic/modules/search.ts
index a5fe964b..3575abb7 100644
--- a/electron/main/apis/qqmusic/modules/search.ts
+++ b/electron/main/apis/qqmusic/modules/search.ts
@@ -1,30 +1,13 @@
 /**
- * 综合搜索（单曲 / 歌手 / 专辑 / 歌单）
+ * QM 搜索
  *
- * params:
- * - keywords  关键词（必填）
- * - page      页码，默认 1
- * - limit     每页数，默认 30
- * - type      0 单曲 / 1 歌手 / 2 专辑 / 3 歌单，默认 0
- *
- * 端点（按类型）：
- * - 0 → musicu.fcg / DoSearchForQQMusicLite（与 dev 分支一致，稳定）
- * - 1/2 → c.y.qq.com/.../client_search_cp（jsososo/QQMusicApi 路径，t=9 singer/t=8 album）
- * - 3 → c.y.qq.com/.../client_music_search_songlist
+ * 端点：musicu.fcg / SearchCgiService / DoSearchForQQMusicMobile
  */
 
 import { qmRequest } from "../core/request";
-import { QM_HEADERS, formatSingerName } from "../core/config";
+import { formatSingerName } from "../core/config";
 import type { QMModule } from "../core/types";
 
-const C_SEARCH_URL = "https://c.y.qq.com/soso/fcgi-bin/client_search_cp";
-const C_SONGLIST_URL = "https://c.y.qq.com/soso/fcgi-bin/client_music_search_songlist";
-
-const ALBUM_COVER = (mid: string): string =>
-  `https://y.gtimg.cn/music/photo_new/T002R300x300M000${mid}.jpg`;
-const SINGER_COVER = (mid: string): string =>
-  `https://y.gtimg.cn/music/photo_new/T001R300x300M000${mid}.jpg`;
-
 /** 移动端随机 search_id */
 const genSearchId = (): string =>
   String(
@@ -33,24 +16,6 @@ const genSearchId = (): string =>
       (Date.now() % 86400000),
   );
 
-/** c.y.qq.com 返回有时包了 jsonCallback(...)，去壳 */
-const stripCallback = (text: string): string =>
-  text.replace(/^[a-zA-Z_]+\(/, "").replace(/\)$/, "");
-
-const callCSearch = async <T>(
-  url: string,
-  query: Record<string, string | number>,
-): Promise<T> => {
-  const qs = new URLSearchParams(Object.entries(query).map(([k, v]) => [k, String(v)]));
-  const res = await fetch(`${url}?${qs}`, {
-    headers: { Referer: "https://y.qq.com", "User-Agent": QM_HEADERS["User-Agent"] },
-    signal: AbortSignal.timeout(8000),
-  });
-  if (res.status !== 200) throw new Error(`QM c.y HTTP ${res.status}`);
-  const text = await res.text();
-  return JSON.parse(stripCallback(text.trim())) as T;
-};
-
 interface QMSong {
   id: number;
   mid: string;
@@ -58,30 +23,34 @@ interface QMSong {
   interval: number;
   singer?: Array<{ id?: number; mid?: string; name?: string }>;
   album?: { id?: number; mid?: string; name?: string };
-  file?: {
-    media_mid?: string;
-    size_128mp3?: number;
-    size_320mp3?: number;
-    size_flac?: number;
-    size_hires?: number;
-  };
+  file?: { media_mid?: string };
+}
+interface SongsResp {
+  body?: { item_song?: QMSong[] };
+  meta?: { sum?: number; estimate_sum?: number; nextpage?: number };
 }
 
 const searchSongs = async (keywords: string, page: number, limit: number) => {
-  const data = await qmRequest<{
-    body?: { item_song?: QMSong[]; meta?: { sum?: number } };
-  }>("music.search.SearchCgiService", "DoSearchForQQMusicLite", {
-    search_id: genSearchId(),
-    remoteplace: "search.android.keyboard",
-    query: keywords,
-    search_type: 0,
-    num_per_page: limit,
-    page_num: page,
-    highlight: 0,
-    nqc_flag: 0,
-    page_id: 1,
-    grp: 1,
-  });
+  const data = await qmRequest<SongsResp>(
+    "music.search.SearchCgiService",
+    "DoSearchForQQMusicMobile",
+    {
+      search_id: genSearchId(),
+      remoteplace: "search.android.keyboard",
+      query: keywords,
+      search_type: 0,
+      num_per_page: limit,
+      page_num: page,
+      highlight: 0,
+      nqc_flag: 0,
+      multi_zhida: 0,
+      cat: 2,
+      grp: 1,
+      sin: 0,
+      sem: 0,
+      page_id: 1,
+    },
+  );
 
   const songs = (data?.body?.item_song ?? []).map((song) => ({
     id: String(song.id),
@@ -94,121 +63,8 @@ const searchSongs = async (keywords: string, page: number, limit: number) => {
     mediaMid: song.file?.media_mid ?? "",
   }));
 
-  return {
-    code: 200,
-    total: data?.body?.meta?.sum ?? songs.length,
-    songs,
-  };
-};
-
-interface CSingerItem {
-  singerID?: number;
-  singerMID?: string;
-  singerName?: string;
-  singerPic?: string;
-  songNum?: number;
-  albumNum?: number;
-}
-
-const searchArtists = async (keywords: string, page: number, limit: number) => {
-  const data = await callCSearch<{
-    data?: { singer?: { list?: CSingerItem[]; totalnum?: number; curnum?: number } };
-  }>(C_SEARCH_URL, {
-    format: "json",
-    n: limit,
-    p: page,
-    w: keywords,
-    cr: 1,
-    g_tk: 5381,
-    t: 9,
-  });
-
-  const list = data?.data?.singer?.list ?? [];
-  const artists = list.map((item) => ({
-    id: String(item.singerID ?? ""),
-    mid: item.singerMID ?? "",
-    name: item.singerName ?? "",
-    cover: item.singerPic || (item.singerMID ? SINGER_COVER(item.singerMID) : ""),
-    songCount: item.songNum ?? 0,
-    albumCount: item.albumNum ?? 0,
-  }));
-  return { code: 200, total: data?.data?.singer?.totalnum ?? artists.length, artists };
-};
-
-interface CAlbumItem {
-  albumID?: number;
-  albumMID?: string;
-  albumName?: string;
-  albumPic?: string;
-  singerName?: string;
-  singer_list?: Array<{ name?: string }>;
-  song_count?: number;
-  songNum?: number;
-  publicTime?: string;
-  publishDate?: string;
-}
-
-const searchAlbums = async (keywords: string, page: number, limit: number) => {
-  const data = await callCSearch<{
-    data?: { album?: { list?: CAlbumItem[]; totalnum?: number; curnum?: number } };
-  }>(C_SEARCH_URL, {
-    format: "json",
-    n: limit,
-    p: page,
-    w: keywords,
-    cr: 1,
-    g_tk: 5381,
-    t: 8,
-  });
-
-  const list = data?.data?.album?.list ?? [];
-  const albums = list.map((item) => ({
-    id: String(item.albumID ?? ""),
-    mid: item.albumMID ?? "",
-    name: item.albumName ?? "",
-    cover: item.albumPic || (item.albumMID ? ALBUM_COVER(item.albumMID) : ""),
-    artist: item.singerName || formatSingerName(item.singer_list),
-    trackCount: item.song_count ?? item.songNum ?? 0,
-    publicTime: item.publicTime ?? item.publishDate ?? "",
-  }));
-  return { code: 200, total: data?.data?.album?.totalnum ?? albums.length, albums };
-};
-
-interface CSonglistItem {
-  dissid?: number | string;
-  dissname?: string;
-  imgurl?: string;
-  creator?: { name?: string };
-  song_count?: number;
-  listennum?: number;
-}
-
-const searchPlaylists = async (keywords: string, page: number, limit: number) => {
-  const data = await callCSearch<{
-    data?: { list?: CSonglistItem[]; display_num?: number; sum?: number };
-  }>(C_SONGLIST_URL, {
-    remoteplace: "txt.yqq.playlist",
-    page_no: page - 1,
-    num_per_page: limit,
-    query: keywords,
-    format: "json",
-    g_tk: 5381,
-  });
-
-  const list = data?.data?.list ?? [];
-  const playlists = list.map((item) => ({
-    id: String(item.dissid ?? ""),
-    name: item.dissname ?? "",
-    cover: item.imgurl ?? "",
-    creator: item.creator?.name ?? "",
-    trackCount: item.song_count ?? 0,
-    playCount: item.listennum ?? 0,
-  }));
-  return {
-    code: 200,
-    total: data?.data?.display_num ?? data?.data?.sum ?? playlists.length,
-    playlists,
-  };
+  const total = data?.meta?.estimate_sum ?? data?.meta?.sum ?? songs.length;
+  return { code: 200, total, songs };
 };
 
 const search: QMModule = async (params) => {
@@ -226,9 +82,9 @@ const search: QMModule = async (params) => {
 
   if (!keywords) return { code: 400, total: 0, message: "keywords required" };
 
-  if (type === 1) return searchArtists(keywords, page, limit);
-  if (type === 2) return searchAlbums(keywords, page, limit);
-  if (type === 3) return searchPlaylists(keywords, page, limit);
+  // 仅单曲；其他类型由渲染端返回空
+  if (type !== 0) return { code: 200, total: 0 };
+
   return searchSongs(keywords, page, limit);
 };
 
diff --git a/src/apis/search/netease.ts b/src/apis/search/netease.ts
index 40971e3a..634fb36b 100644
--- a/src/apis/search/netease.ts
+++ b/src/apis/search/netease.ts
@@ -76,9 +76,7 @@ const songToTrack = (song: NeteaseSong): Track => {
     platform: "netease",
     title: song.name,
     artists: (song.ar ?? []).map((artist) => ({ id: String(artist.id), name: artist.name })),
-    album: song.al
-      ? { id: String(song.al.id), name: song.al.name, cover }
-      : undefined,
+    album: song.al ? { id: String(song.al.id), name: song.al.name, cover } : undefined,
     duration: song.dt ?? 0,
     cover,
   };
diff --git a/src/apis/search/qqmusic.ts b/src/apis/search/qqmusic.ts
index 17ac6bd5..372cc84b 100644
--- a/src/apis/search/qqmusic.ts
+++ b/src/apis/search/qqmusic.ts
@@ -13,62 +13,11 @@ interface QMSong {
   albumMid?: string;
   duration: number;
 }
-interface QMAlbumRow {
-  id: string;
-  mid?: string;
-  name: string;
-  cover?: string;
-  artist?: string;
-  trackCount?: number;
-}
-interface QMArtistRow {
-  id: string;
-  mid?: string;
-  name: string;
-  cover?: string;
-  songCount?: number;
-  albumCount?: number;
-}
-interface QMPlaylistRow {
-  id: string;
-  name: string;
-  cover?: string;
-  creator?: string;
-  trackCount?: number;
-}
 
 interface SongsResp {
   total?: number;
   songs?: QMSong[];
 }
-interface AlbumsResp {
-  total?: number;
-  albums?: QMAlbumRow[];
-}
-interface ArtistsResp {
-  total?: number;
-  artists?: QMArtistRow[];
-}
-interface PlaylistsResp {
-  total?: number;
-  playlists?: QMPlaylistRow[];
-}
-
-/** type 编码，对齐主进程 search_type */
-const TYPE = { songs: 0, artists: 1, albums: 2, playlists: 3 } as const;
-
-const call = <T>(
-  type: keyof typeof TYPE,
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<T> =>
-  qmApi.search<T>({
-    keywords: keyword,
-    type: TYPE[type],
-    page: Math.floor(offset / limit) + 1,
-    limit,
-  });
 
 const albumCoverByMid = (mid: string): string =>
   `https://y.gtimg.cn/music/photo_new/T002R300x300M000${mid}.jpg`;
@@ -90,73 +39,38 @@ const songToTrack = (song: QMSong): Track => {
   };
 };
 
-const albumToCover = (album: QMAlbumRow): CoverItem => ({
-  id: album.mid || album.id,
-  title: album.name,
-  cover: album.cover,
-  subtitle: album.artist ?? "",
-  trackCount: album.trackCount ?? 0,
-});
-
-const artistToCover = (artist: QMArtistRow): CoverItem => ({
-  id: artist.mid || artist.id,
-  title: artist.name,
-  cover: artist.cover,
-  subtitle: "",
-  trackCount: artist.albumCount ?? 0,
-});
-
-const playlistToCover = (playlist: QMPlaylistRow): CoverItem => ({
-  id: playlist.id,
-  title: playlist.name,
-  cover: playlist.cover,
-  subtitle: playlist.creator ?? "",
-  trackCount: playlist.trackCount ?? 0,
-});
-
-/** QM 多个接口不返回可靠总数，用满页启发式判断是否还有下一页 */
-const hasMoreByPage = (got: number, limit: number): boolean => got >= limit;
+const empty = <T>(): SearchResult<T> => ({ items: [], total: 0, hasMore: false });
 
 export const songs = async (
   keyword: string,
   offset: number,
   limit: number,
 ): Promise<SearchResult<Track>> => {
-  const body = await call<SongsResp>("songs", keyword, offset, limit);
+  const body = await qmApi.search<SongsResp>({
+    keywords: keyword,
+    type: 0,
+    page: Math.floor(offset / limit) + 1,
+    limit,
+  });
   const items = (body?.songs ?? []).map(songToTrack);
   const total = body?.total ?? items.length;
-  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
+  return { items, total, hasMore: offset + items.length < total };
 };
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
+// 在线专辑/歌手/歌单详情页未接通，搜出来也没法跳，先返回空（同 kugou）
 export const albums = async (
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<SearchResult<CoverItem>> => {
-  const body = await call<AlbumsResp>("albums", keyword, offset, limit);
-  const items = (body?.albums ?? []).map(albumToCover);
-  const total = body?.total ?? items.length;
-  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
-};
-
+  _keyword: string,
+  _offset: number,
+  _limit: number,
+): Promise<SearchResult<CoverItem>> => empty();
 export const artists = async (
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<SearchResult<CoverItem>> => {
-  const body = await call<ArtistsResp>("artists", keyword, offset, limit);
-  const items = (body?.artists ?? []).map(artistToCover);
-  const total = body?.total ?? items.length;
-  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
-};
-
+  _keyword: string,
+  _offset: number,
+  _limit: number,
+): Promise<SearchResult<CoverItem>> => empty();
 export const playlists = async (
-  keyword: string,
-  offset: number,
-  limit: number,
-): Promise<SearchResult<CoverItem>> => {
-  const body = await call<PlaylistsResp>("playlists", keyword, offset, limit);
-  const items = (body?.playlists ?? []).map(playlistToCover);
-  const total = body?.total ?? items.length;
-  return { items, total, hasMore: hasMoreByPage(items.length, limit) };
-};
+  _keyword: string,
+  _offset: number,
+  _limit: number,
+): Promise<SearchResult<CoverItem>> => empty();
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 7d17a947..b45c83f8 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -77,9 +77,7 @@ const textCollator = new Intl.Collator(undefined, {
 const playingId = computed(() => media.track?.id);
 
 /** 非本地源需要真实 id */
-const needsRealId = computed(
-  () => props.source === "streaming" || props.source === "online",
-);
+const needsRealId = computed(() => props.source === "streaming" || props.source === "online");
 
 /** 专辑是否可跳转 */
 const isAlbumLinkable = (item: Track): boolean => {
diff --git a/src/utils/navigate.ts b/src/utils/navigate.ts
index c0a8d3f2..53701678 100644
--- a/src/utils/navigate.ts
+++ b/src/utils/navigate.ts
@@ -2,8 +2,7 @@ import type { TrackSource } from "@shared/types/player";
 import router from "@/router";
 
 /** 非本地源 */
-const isExternal = (source: TrackSource): boolean =>
-  source === "streaming" || source === "online";
+const isExternal = (source: TrackSource): boolean => source === "streaming" || source === "online";
 
 /**
  * 跳转到专辑页

From 5e51672bca395585dd5d93b18bfe848bf9113bf7 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Thu, 14 May 2026 16:30:36 +0800
Subject: [PATCH 05/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20API=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   1 +
 electron/main/core/index.ts                   |   4 +
 electron/main/ipc/externalApi.ts              |  14 +++
 electron/main/ipc/index.ts                    |   2 +
 electron/main/ipc/nowPlaying.ts               |  19 ++-
 electron/main/ipc/player.ts                   |  33 +++--
 electron/main/server/broadcast.ts             |  45 +++++++
 electron/main/server/gate.ts                  |  26 ++++
 electron/main/server/index.ts                 | 113 ++++++++++++++++++
 electron/main/server/routes.ts                |  96 +++++++++++++++
 electron/main/server/ws.ts                    |  95 +++++++++++++++
 electron/main/services/nowPlaying.ts          |  31 ++++-
 electron/main/utils/logger.ts                 |   1 +
 electron/preload/index.d.ts                   |   6 +-
 electron/preload/index.ts                     |   6 +
 package.json                                  |   6 +-
 pnpm-lock.yaml                                |  49 ++++++++
 shared/defaults/settings.ts                   |   5 +
 shared/types/settings.ts                      |  22 ++++
 .../settings/custom/ExternalApiPanel.vue      |  78 ++++++++++++
 src/i18n/locales/en-US.json                   |  25 ++++
 src/i18n/locales/zh-CN.json                   |  25 ++++
 src/settings/categories/services.ts           |  36 ++++++
 23 files changed, 714 insertions(+), 24 deletions(-)
 create mode 100644 electron/main/ipc/externalApi.ts
 create mode 100644 electron/main/server/broadcast.ts
 create mode 100644 electron/main/server/gate.ts
 create mode 100644 electron/main/server/index.ts
 create mode 100644 electron/main/server/routes.ts
 create mode 100644 electron/main/server/ws.ts
 create mode 100644 src/components/settings/custom/ExternalApiPanel.vue

diff --git a/components.d.ts b/components.d.ts
index c6f9c67a..a415a656 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -58,6 +58,7 @@ declare module 'vue' {
     DropdownMenuTrigger: typeof import('reka-ui')['DropdownMenuTrigger']
     EqualizerDialog: typeof import('./src/components/modals/EqualizerDialog.vue')['default']
     ExcludeLyricsConfig: typeof import('./src/components/settings/custom/ExcludeLyricsConfig.vue')['default']
+    ExternalApiPanel: typeof import('./src/components/settings/custom/ExternalApiPanel.vue')['default']
     FileCacheManager: typeof import('./src/components/settings/custom/FileCacheManager.vue')['default']
     FontConfig: typeof import('./src/components/settings/custom/FontConfig.vue')['default']
     FullPlayer: typeof import('./src/components/player/FullPlayer/index.vue')['default']
diff --git a/electron/main/core/index.ts b/electron/main/core/index.ts
index 56078891..ce84e0f6 100644
--- a/electron/main/core/index.ts
+++ b/electron/main/core/index.ts
@@ -8,6 +8,7 @@ import { initDatabase, closeDatabase } from "@main/database";
 import { init as initSongCache } from "@main/services/songCache";
 import { pluginRegistry } from "@main/plugins/registry";
 import { registerCacheScheme, handleCacheProtocol } from "@main/utils/protocol";
+import { startServer, stopServer } from "@main/server";
 import { coreLog, initLogger } from "@main/utils/logger";
 
 /**
@@ -73,6 +74,8 @@ export const initApp = (): void => {
     restoreLyricWindows();
     // 注册全局快捷键
     initGlobalHotkey();
+    // 启动外部 API 服务（fire-and-forget；监听结果通过 getStatus 暴露给渲染端）
+    void startServer();
     app.on("activate", () => {
       if (BrowserWindow.getAllWindows().length === 0) createMainWindow();
     });
@@ -90,6 +93,7 @@ export const initApp = (): void => {
     coreLog.info("应用即将退出，清理资源");
     shutdownMedia();
     closeDatabase();
+    void stopServer();
     void pluginRegistry.shutdown();
   });
 };
diff --git a/electron/main/ipc/externalApi.ts b/electron/main/ipc/externalApi.ts
new file mode 100644
index 00000000..647d457d
--- /dev/null
+++ b/electron/main/ipc/externalApi.ts
@@ -0,0 +1,14 @@
+/**
+ * 外部 API 服务相关 IPC
+ *
+ * - restart：重启服务并返回新状态（端口占用/错误经 ExternalApiStatus.error 暴露）
+ * - getStatus：查询当前运行状态（面板挂载时拉一次）
+ */
+
+import { ipcMain } from "electron";
+import { restartServer, getServerStatus } from "@main/server";
+
+export const registerExternalApiIpc = (): void => {
+  ipcMain.handle("externalApi:restart", () => restartServer());
+  ipcMain.handle("externalApi:getStatus", () => getServerStatus());
+};
diff --git a/electron/main/ipc/index.ts b/electron/main/ipc/index.ts
index ba248ec8..57cdc48c 100644
--- a/electron/main/ipc/index.ts
+++ b/electron/main/ipc/index.ts
@@ -11,6 +11,7 @@ import { registerHotkeyIpc } from "./hotkey";
 import { registerThemeIpc } from "./theme";
 import { registerStreamingIpc } from "./streaming";
 import { registerCacheIpc } from "./cache";
+import { registerExternalApiIpc } from "./externalApi";
 
 /** 注册所有 IPC 处理 */
 export const registerIpcHandlers = (): void => {
@@ -27,4 +28,5 @@ export const registerIpcHandlers = (): void => {
   registerThemeIpc();
   registerStreamingIpc();
   registerCacheIpc();
+  registerExternalApiIpc();
 };
diff --git a/electron/main/ipc/nowPlaying.ts b/electron/main/ipc/nowPlaying.ts
index 4baa2a4b..cb533d2f 100644
--- a/electron/main/ipc/nowPlaying.ts
+++ b/electron/main/ipc/nowPlaying.ts
@@ -1,5 +1,6 @@
 import { ipcMain } from "electron";
 import { broadcast } from "@main/utils/broadcast";
+import { wsBroadcast } from "@main/server/broadcast";
 import * as nowPlaying from "@main/services/nowPlaying";
 import type { NowPlayingUpdatePayload } from "@shared/types/nowPlaying";
 
@@ -17,9 +18,19 @@ export const registerNowPlayingIpc = (): void => {
   // 窗口拉取当前完整快照
   ipcMain.handle("nowPlaying:requestSnapshot", () => nowPlaying.snapshot());
 
-  // 订阅 service 事件并广播给所有窗口
-  nowPlaying.onTrackChange((data) => broadcast("nowPlaying:track-change", data));
-  nowPlaying.onLyricChange((snap) => broadcast("nowPlaying:lyric-change", snap));
+  // 订阅 service 事件：同时广播给渲染端窗口和外部 WS 客户端
+  // position-sync 高频（5Hz），WS 端走 HIGH_FREQ_EVENTS 过滤自动跳过
+  nowPlaying.onTrackChange((data) => {
+    broadcast("nowPlaying:track-change", data);
+    wsBroadcast({ type: "track", data });
+  });
+  nowPlaying.onLyricChange((snap) => {
+    broadcast("nowPlaying:lyric-change", snap);
+    wsBroadcast({ type: "lyric", data: { source: snap.source, lyric: snap.lyric } });
+  });
   nowPlaying.onPositionSync((data) => broadcast("nowPlaying:position-sync", data));
-  nowPlaying.onLyricOffsetChange((data) => broadcast("nowPlaying:lyric-offset-change", data));
+  nowPlaying.onLyricOffsetChange((data) => {
+    broadcast("nowPlaying:lyric-offset-change", data);
+    wsBroadcast({ type: "lyricOffset", data });
+  });
 };
diff --git a/electron/main/ipc/player.ts b/electron/main/ipc/player.ts
index e2bac773..a261fd52 100644
--- a/electron/main/ipc/player.ts
+++ b/electron/main/ipc/player.ts
@@ -1,6 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { app, ipcMain, powerMonitor } from "electron";
 import { sendToMain } from "@main/utils/broadcast";
+import { wsBroadcast } from "@main/server/broadcast";
 import { toCacheUrl } from "@main/utils/protocol";
 import { toMs } from "@main/utils/time";
 import * as mediaService from "@main/services/media";
@@ -57,7 +58,7 @@ const registerNativeEvents = (inst: InstanceType<AudioEngineModule["AudioPlayer"
           setTaskbarProgress(-1);
         }
         nowPlaying.onPlayStateChange(state === "playing");
-        sendToMain("player:event", {
+        const statusEvent = {
           type: "status",
           data: {
             state,
@@ -66,11 +67,14 @@ const registerNativeEvents = (inst: InstanceType<AudioEngineModule["AudioPlayer"
             volume: inst.getVolume(),
             isFinished: false,
           },
-        });
+        };
+        sendToMain("player:event", statusEvent);
+        wsBroadcast(statusEvent);
         break;
       }
       case "ended": {
         sendToMain("player:event", { type: "ended" });
+        wsBroadcast({ type: "ended" });
         mediaService.setPlayState({ status: "Paused" });
         setTaskbarProgress(-1);
         break;
@@ -78,20 +82,21 @@ const registerNativeEvents = (inst: InstanceType<AudioEngineModule["AudioPlayer"
       case "position": {
         const posMs = toMs(event.position ?? 0);
         const durMs = toMs(event.duration ?? 0);
-        sendToMain("player:event", {
+        const positionEvent = {
           type: "position",
           data: { position: posMs, duration: durMs },
-        });
+        };
+        sendToMain("player:event", positionEvent);
+        wsBroadcast(positionEvent);
         mediaService.setTimeline({ currentMs: posMs, totalMs: durMs });
         nowPlaying.onPosition(posMs, true);
         if (store.get("system.taskbarProgress") && durMs > 0) setTaskbarProgress(posMs / durMs);
         break;
       }
       case "fftData": {
-        sendToMain("player:event", {
-          type: "fftData",
-          data: event.fftData ?? [],
-        });
+        const fftEvent = { type: "fftData", data: event.fftData ?? [] };
+        sendToMain("player:event", fftEvent);
+        wsBroadcast(fftEvent);
         break;
       }
       case "outputStalled": {
@@ -126,7 +131,7 @@ export const registerPlayerIpc = (): void => {
     const seq = ++loadSeq;
     try {
       const inst = getPlayer();
-      sendToMain("player:event", {
+      const loadingEvent = {
         type: "status",
         data: {
           state: "loading",
@@ -135,7 +140,9 @@ export const registerPlayerIpc = (): void => {
           volume: inst.getVolume(),
           isFinished: false,
         },
-      });
+      };
+      sendToMain("player:event", loadingEvent);
+      wsBroadcast(loadingEvent);
       // 写一次 SMTC/托盘/标题
       const applyDisplay = (
         title: string,
@@ -545,10 +552,12 @@ export const registerPlayerIpc = (): void => {
     playerLog.error("重建音频输出全部失败，销毁播放器实例");
     resetPlayer();
     stopDevicePolling();
-    sendToMain("player:event", {
+    const stoppedEvent = {
       type: "status",
       data: { state: "stopped", position: 0, duration: 0, volume: 1, isFinished: false },
-    });
+    };
+    sendToMain("player:event", stoppedEvent);
+    wsBroadcast(stoppedEvent);
   };
   powerMonitor.on("resume", resumeHandler);
   // 退出前停止设备轮询
diff --git a/electron/main/server/broadcast.ts b/electron/main/server/broadcast.ts
new file mode 100644
index 00000000..4a6c15ee
--- /dev/null
+++ b/electron/main/server/broadcast.ts
@@ -0,0 +1,45 @@
+/**
+ * WS 客户端注册表 + 事件广播
+ *
+ * 仅负责"推给外部 WS 客户端"这一件事；
+ * 给渲染端的推送由调用方各自 sendToMain，两条路径独立。
+ */
+
+import { serverLog } from "@main/utils/logger";
+import type { WSContext } from "hono/ws";
+
+/** 当前在线的 WS 客户端 */
+const wsClients = new Set<WSContext>();
+
+/** 高频事件名单：默认不向外部 WS 推送（避免带宽爆炸） */
+const HIGH_FREQ_EVENTS = new Set(["fftData", "position"]);
+
+export const addWsClient = (ws: WSContext): void => {
+  wsClients.add(ws);
+  serverLog.info(`WS 客户端已连接，当前在线 ${wsClients.size}`);
+};
+
+export const removeWsClient = (ws: WSContext): void => {
+  if (wsClients.delete(ws)) {
+    serverLog.info(`WS 客户端已断开，当前在线 ${wsClients.size}`);
+  }
+};
+
+export const getWsClientCount = (): number => wsClients.size;
+
+/**
+ * 推送一条 player 事件给所有外部 WS 客户端
+ * @param event - 事件对象 `{ type, data? }`
+ */
+export const wsBroadcast = (event: { type: string; data?: unknown }): void => {
+  if (wsClients.size === 0) return;
+  if (HIGH_FREQ_EVENTS.has(event.type)) return;
+  const payload = JSON.stringify({ kind: "event", ...event });
+  for (const ws of wsClients) {
+    try {
+      ws.send(payload);
+    } catch {
+      // 单个客户端发送失败不影响其他人
+    }
+  }
+};
diff --git a/electron/main/server/gate.ts b/electron/main/server/gate.ts
new file mode 100644
index 00000000..8517ce4f
--- /dev/null
+++ b/electron/main/server/gate.ts
@@ -0,0 +1,26 @@
+/**
+ * 外部 API 门禁中间件
+ * - externalApi.enabled   总开关：关闭时 /api/* 与 /ws 全部 403
+ * - externalApi.wsEnabled 子开关：关闭时 /ws 单独 403，REST 不受影响
+ */
+
+import type { MiddlewareHandler } from "hono";
+import { store } from "@main/store";
+
+/** 总开关 */
+export const externalControlGate: MiddlewareHandler = async (c, next) => {
+  if (!store.get("externalApi.enabled")) {
+    return c.json({ error: "external API disabled" }, 403);
+  }
+  await next();
+  return;
+};
+
+/** WS 子开关 */
+export const wsGate: MiddlewareHandler = async (c, next) => {
+  if (!store.get("externalApi.wsEnabled")) {
+    return c.json({ error: "WebSocket disabled" }, 403);
+  }
+  await next();
+  return;
+};
diff --git a/electron/main/server/index.ts b/electron/main/server/index.ts
new file mode 100644
index 00000000..5aeaad46
--- /dev/null
+++ b/electron/main/server/index.ts
@@ -0,0 +1,113 @@
+/**
+ * 外部 API 服务器：HTTP (Hono) + WebSocket
+ */
+
+import type { Server } from "node:http";
+import { Hono } from "hono";
+import { serve, upgradeWebSocket } from "@hono/node-server";
+import { WebSocketServer } from "ws";
+import { store } from "@main/store";
+import { serverLog } from "@main/utils/logger";
+import type { ExternalApiStatus } from "@shared/types/settings";
+import { externalControlGate, wsGate } from "./gate";
+import { buildRoutes } from "./routes";
+import { wsHandlers } from "./ws";
+
+let runningServer: Server | null = null;
+let runningWss: WebSocketServer | null = null;
+let runningPort: number | null = null;
+let lastError: { code: string; message: string } | null = null;
+
+export const getServerStatus = (): ExternalApiStatus => ({
+  listening: runningServer !== null,
+  port: runningPort,
+  error: lastError,
+});
+
+/** 启动外部 API 服务 */
+export const startServer = (): Promise<ExternalApiStatus> => {
+  return new Promise((resolve) => {
+    if (runningServer) {
+      resolve(getServerStatus());
+      return;
+    }
+
+    const port = store.get("externalApi.port");
+    const hostname = "0.0.0.0";
+
+    const app = new Hono();
+    app.use("/api/*", externalControlGate);
+    app.route("/api", buildRoutes());
+    app.get(
+      "/ws",
+      externalControlGate,
+      wsGate,
+      upgradeWebSocket(() => wsHandlers),
+    );
+    app.get("/", (c) => c.text("SPlayer Next external API"));
+
+    const wss = new WebSocketServer({ noServer: true });
+    let settled = false;
+
+    const server = serve({
+      fetch: app.fetch,
+      port,
+      hostname,
+      websocket: { server: wss },
+    }) as Server;
+
+    // error / listening 互斥：先到先 settle
+    server.once("error", (err: NodeJS.ErrnoException) => {
+      if (settled) return;
+      settled = true;
+      const error = { code: err.code ?? "UNKNOWN", message: err.message };
+      serverLog.error(`外部 API 监听 ${port} 失败 (${error.code}): ${error.message}`);
+      wss.close();
+      try {
+        server.close();
+      } catch {
+        // server.close 在 listen 失败的情况下可能抛 ERR_SERVER_NOT_RUNNING，忽略
+      }
+      runningServer = null;
+      runningWss = null;
+      runningPort = null;
+      lastError = error;
+      resolve(getServerStatus());
+    });
+
+    server.once("listening", () => {
+      if (settled) return;
+      settled = true;
+      runningServer = server;
+      runningWss = wss;
+      runningPort = port;
+      lastError = null;
+      serverLog.info(`外部 API 已启动: http://${hostname}:${port}`);
+      resolve(getServerStatus());
+    });
+  });
+};
+
+/** 停止外部 API 服务 */
+export const stopServer = (): Promise<void> => {
+  if (!runningServer) return Promise.resolve();
+  const server = runningServer;
+  const wss = runningWss;
+  runningServer = null;
+  runningWss = null;
+  runningPort = null;
+  return new Promise((resolve) => {
+    wss?.close();
+    server.close((err) => {
+      if (err) serverLog.warn("外部 API 关闭异常:", err);
+      else serverLog.info("外部 API 已关闭");
+      resolve();
+    });
+  });
+};
+
+/** 配置变更后重启服务 */
+export const restartServer = async (): Promise<ExternalApiStatus> => {
+  await stopServer();
+  return startServer();
+};
diff --git a/electron/main/server/routes.ts b/electron/main/server/routes.ts
new file mode 100644
index 00000000..0adfc3b2
--- /dev/null
+++ b/electron/main/server/routes.ts
@@ -0,0 +1,96 @@
+/**
+ * 外部 API REST 路由
+ * 控制路由：POST，状态查询：GET
+ */
+
+import { Hono } from "hono";
+import { app as electronApp } from "electron";
+import { getPlayer } from "@main/services/engine";
+import { sendToMain } from "@main/utils/broadcast";
+import { toMs } from "@main/utils/time";
+import * as nowPlaying from "@main/services/nowPlaying";
+import { getWsClientCount } from "./broadcast";
+
+export const buildRoutes = (): Hono => {
+  const api = new Hono();
+
+  api.get("/info", (c) =>
+    c.json({
+      name: electronApp.getName(),
+      version: electronApp.getVersion(),
+      wsClients: getWsClientCount(),
+    }),
+  );
+
+  api.get("/status", (c) => {
+    const raw = getPlayer().getStatus();
+    return c.json({
+      state: raw.state,
+      position: toMs(raw.position),
+      duration: toMs(raw.duration),
+      volume: raw.volume,
+      isFinished: raw.isFinished,
+    });
+  });
+
+  api.get("/volume", (c) => c.json({ volume: getPlayer().getVolume() }));
+
+  // 当前播放完整快照
+  api.get("/now-playing", (c) => {
+    const snap = nowPlaying.snapshot();
+    return c.json({
+      track: snap.track,
+      lyric: snap.lyric,
+      source: snap.source,
+      position: snap.position,
+      playing: snap.playing,
+      lyricOffsetMs: snap.lyricOffsetMs,
+    });
+  });
+
+  api.post("/play", (c) => {
+    getPlayer().play();
+    return c.json({ ok: true });
+  });
+
+  api.post("/pause", (c) => {
+    getPlayer().pause();
+    return c.json({ ok: true });
+  });
+
+  api.post("/stop", (c) => {
+    getPlayer().stop();
+    return c.json({ ok: true });
+  });
+
+  api.post("/seek", async (c) => {
+    const body = (await c.req.json().catch(() => null)) as { positionMs?: number } | null;
+    const positionMs = Number(body?.positionMs);
+    if (!Number.isFinite(positionMs) || positionMs < 0) {
+      return c.json({ error: "positionMs (number, >=0) required" }, 400);
+    }
+    await getPlayer().seek(positionMs / 1000);
+    return c.json({ ok: true });
+  });
+
+  api.post("/volume", async (c) => {
+    const body = (await c.req.json().catch(() => null)) as { volume?: number } | null;
+    const volume = Number(body?.volume);
+    if (!Number.isFinite(volume) || volume < 0 || volume > 1) {
+      return c.json({ error: "volume (number, 0..1) required" }, 400);
+    }
+    getPlayer().setVolume(volume);
+    return c.json({ ok: true });
+  });
+
+  api.post("/next", (c) => {
+    sendToMain("player:event", { type: "next" });
+    return c.json({ ok: true });
+  });
+  api.post("/prev", (c) => {
+    sendToMain("player:event", { type: "prev" });
+    return c.json({ ok: true });
+  });
+
+  return api;
+};
diff --git a/electron/main/server/ws.ts b/electron/main/server/ws.ts
new file mode 100644
index 00000000..7e057aa6
--- /dev/null
+++ b/electron/main/server/ws.ts
@@ -0,0 +1,95 @@
+/**
+ * WebSocket 入口：双向通道
+ *
+ * Server → Client：
+ *   - 连接建立：`{ kind: "hello", clients: N }`
+ *   - player 事件：`{ kind: "event", type, data }`（由 wsBroadcast 推）
+ *   - 命令 ack：`{ kind: "ack", op }` / `{ kind: "error", op, error }`
+ *
+ * Client → Server：`{ op: "play" | "pause" | "stop" | "next" | "prev" | "seek" | "setVolume", ... }`
+ */
+
+import type { WSContext } from "hono/ws";
+import { getPlayer } from "@main/services/engine";
+import { sendToMain } from "@main/utils/broadcast";
+import { serverLog } from "@main/utils/logger";
+import { addWsClient, removeWsClient, getWsClientCount } from "./broadcast";
+
+interface ClientMessage {
+  op: string;
+  positionMs?: number;
+  volume?: number;
+}
+
+const ack = (ws: WSContext, op: string): void => {
+  ws.send(JSON.stringify({ kind: "ack", op }));
+};
+
+const fail = (ws: WSContext, op: string, error: string): void => {
+  ws.send(JSON.stringify({ kind: "error", op, error }));
+};
+
+const dispatchCommand = async (ws: WSContext, msg: ClientMessage): Promise<void> => {
+  try {
+    switch (msg.op) {
+      case "play":
+        getPlayer().play();
+        return ack(ws, msg.op);
+      case "pause":
+        getPlayer().pause();
+        return ack(ws, msg.op);
+      case "stop":
+        getPlayer().stop();
+        return ack(ws, msg.op);
+      case "next":
+        sendToMain("player:event", { type: "next" });
+        return ack(ws, msg.op);
+      case "prev":
+        sendToMain("player:event", { type: "prev" });
+        return ack(ws, msg.op);
+      case "seek": {
+        const positionMs = Number(msg.positionMs);
+        if (!Number.isFinite(positionMs) || positionMs < 0) {
+          return fail(ws, msg.op, "positionMs (number, >=0) required");
+        }
+        await getPlayer().seek(positionMs / 1000);
+        return ack(ws, msg.op);
+      }
+      case "setVolume": {
+        const volume = Number(msg.volume);
+        if (!Number.isFinite(volume) || volume < 0 || volume > 1) {
+          return fail(ws, msg.op, "volume (number, 0..1) required");
+        }
+        getPlayer().setVolume(volume);
+        return ack(ws, msg.op);
+      }
+      default:
+        return fail(ws, msg.op ?? "?", "unknown op");
+    }
+  } catch (err) {
+    fail(ws, msg.op ?? "?", err instanceof Error ? err.message : String(err));
+  }
+};
+
+export const wsHandlers = {
+  onOpen(_evt: Event, ws: WSContext) {
+    addWsClient(ws);
+    ws.send(JSON.stringify({ kind: "hello", clients: getWsClientCount() }));
+  },
+  async onMessage(evt: MessageEvent, ws: WSContext) {
+    let msg: ClientMessage;
+    try {
+      msg = JSON.parse(typeof evt.data === "string" ? evt.data : evt.data.toString());
+    } catch {
+      return fail(ws, "?", "invalid json");
+    }
+    await dispatchCommand(ws, msg);
+  },
+  onClose(_evt: CloseEvent, ws: WSContext) {
+    removeWsClient(ws);
+  },
+  onError(_evt: Event, ws: WSContext) {
+    serverLog.warn("WS 客户端错误");
+    removeWsClient(ws);
+  },
+};
diff --git a/electron/main/services/nowPlaying.ts b/electron/main/services/nowPlaying.ts
index 18dc0263..17596279 100644
--- a/electron/main/services/nowPlaying.ts
+++ b/electron/main/services/nowPlaying.ts
@@ -35,13 +35,22 @@ let currentLyricOffsetMs = 0;
 /** 内部事件总线 */
 const emitter = new EventEmitter<NowPlayingEvents>();
 
-/** 从存储中读取指定曲目的偏移；缺省视为 0 */
+/**
+ * 从存储中读取指定曲目的偏移
+ * @param trackId - 曲目 ID
+ * @returns 偏移值（毫秒），缺省视为 0
+ */
 const readOffset = (trackId: string | null | undefined): number => {
   if (!trackId) return 0;
   return store.get("player.lyricOffsets")?.[trackId] ?? 0;
 };
 
-/** 渲染进程同步当前播放状态 */
+/**
+ * 同步当前播放状态
+ * @param track - 当前曲目
+ * @param lyric - 当前歌词
+ * @param source - 当前歌词源
+ */
 export const update = (track: Track | null, lyric: LyricLine[], source: LyricData): void => {
   const trackChanged = (currentTrack?.id ?? null) !== (track?.id ?? null);
   currentTrack = track;
@@ -59,7 +68,11 @@ export const update = (track: Track | null, lyric: LyricLine[], source: LyricDat
   emitter.emit("lyric-change", snapshot());
 };
 
-/** 主进程 position 事件入口（原生 5Hz） */
+/**
+ * 同步播放位置
+ * @param positionMs - 播放位置（毫秒）
+ * @param isPlaying - 是否处于播放态
+ */
 export const onPosition = (positionMs: number, isPlaying: boolean): void => {
   lastPosition = positionMs;
   playing = isPlaying;
@@ -70,7 +83,10 @@ export const onPosition = (positionMs: number, isPlaying: boolean): void => {
   });
 };
 
-/** 播放状态变化时立即同步一次 */
+/**
+ * 同步播放状态
+ * @param isPlaying - 是否处于播放态
+ */
 export const onPlayStateChange = (isPlaying: boolean): void => {
   playing = isPlaying;
   emitter.emit("position-sync", {
@@ -80,7 +96,10 @@ export const onPlayStateChange = (isPlaying: boolean): void => {
   });
 };
 
-/** 单曲偏移的合理上限（毫秒）；超过视为误输入，clamp 防止极端值 */
+/**
+ * 单曲偏移的合理上限（毫秒）
+ * 超过视为误输入，clamp 防止极端值
+ */
 const LYRIC_OFFSET_LIMIT_MS = 60_000;
 
 /**
@@ -105,7 +124,7 @@ export const setLyricOffset = (trackId: string, offsetMs: number): void => {
   }
 };
 
-/** 窗口启动对齐：拉取当前完整状态 */
+/** 拉取当前完整状态 */
 export const snapshot = (): NowPlayingSnapshot => ({
   track: currentTrack,
   lyric: currentLyric,
diff --git a/electron/main/utils/logger.ts b/electron/main/utils/logger.ts
index 6a1953cc..25fce169 100644
--- a/electron/main/utils/logger.ts
+++ b/electron/main/utils/logger.ts
@@ -85,3 +85,4 @@ export const taskbarLog = log.scope("taskbar-lyric");
 export const nativeLog = log.scope("native");
 export const streamingLog = log.scope("streaming");
 export const songCacheLog = log.scope("songCache");
+export const serverLog = log.scope("server");
diff --git a/electron/preload/index.d.ts b/electron/preload/index.d.ts
index 1e05a000..f8b4741f 100644
--- a/electron/preload/index.d.ts
+++ b/electron/preload/index.d.ts
@@ -1,6 +1,6 @@
 import { ElectronAPI } from "@electron-toolkit/preload";
 import { PlayerApi, TrackSource } from "@shared/types/player";
-import { ConfigApi, LocaleCode } from "@shared/types/settings";
+import { ConfigApi, ExternalApiStatus, LocaleCode } from "@shared/types/settings";
 import { LibraryApi } from "@shared/types/library";
 import { NowPlayingApi } from "@shared/types/nowPlaying";
 import { PluginsApi } from "@shared/types/plugin";
@@ -67,6 +67,10 @@ declare global {
       };
       hotkey: HotkeyApi;
       streaming: StreamingApi;
+      externalApi: {
+        restart: () => Promise<ExternalApiStatus>;
+        getStatus: () => Promise<ExternalApiStatus>;
+      };
     };
   }
 }
diff --git a/electron/preload/index.ts b/electron/preload/index.ts
index 6ea978c8..b620af4b 100644
--- a/electron/preload/index.ts
+++ b/electron/preload/index.ts
@@ -358,6 +358,12 @@ const api = {
       activeServerId: string | null;
     }): Promise<void> => ipcRenderer.invoke("streaming:saveServers", payload),
   },
+  externalApi: {
+    // 重启外部 API 服务
+    restart: () => ipcRenderer.invoke("externalApi:restart"),
+    // 查询当前运行状态
+    getStatus: () => ipcRenderer.invoke("externalApi:getStatus"),
+  },
   hotkey: {
     getAll: () => ipcRenderer.invoke("hotkey:getAll"),
     set: (id: HotkeyActionId, binding: HotkeyBinding) =>
diff --git a/package.json b/package.json
index 61fd5c28..b3da26f2 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.2",
     "@electron-toolkit/utils": "^4.0.0",
+    "@hono/node-server": "^2.0.2",
     "@material/material-color-utilities": "^0.4.0",
     "@vueuse/core": "^14.2.1",
     "@vueuse/integrations": "^14.2.1",
@@ -55,13 +56,15 @@
     "electron-log": "^5.4.3",
     "electron-updater": "^6.8.3",
     "font-list": "^2.0.2",
+    "hono": "^4.12.18",
     "localforage": "^1.10.0",
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "reka-ui": "^2.9.7",
     "sortablejs": "^1.15.7",
     "vue-i18n": "^11.3.2",
-    "vue-router": "^5.0.4"
+    "vue-router": "^5.0.4",
+    "ws": "^8.20.1"
   },
   "devDependencies": {
     "@electron-toolkit/eslint-config-ts": "^3.1.0",
@@ -71,6 +74,7 @@
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^22.19.17",
     "@types/sortablejs": "^1.15.9",
+    "@types/ws": "^8.18.1",
     "@vitejs/plugin-vue": "^6.0.5",
     "electron": "^39.8.7",
     "electron-builder": "^26.8.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7b0fc125..54e97eba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       '@electron-toolkit/utils':
         specifier: ^4.0.0
         version: 4.0.0(electron@39.8.7)
+      '@hono/node-server':
+        specifier: ^2.0.2
+        version: 2.0.2(hono@4.12.18)
       '@material/material-color-utilities':
         specifier: ^0.4.0
         version: 0.4.0
@@ -41,6 +44,9 @@ importers:
       font-list:
         specifier: ^2.0.2
         version: 2.0.2
+      hono:
+        specifier: ^4.12.18
+        version: 4.12.18
       localforage:
         specifier: ^1.10.0
         version: 1.10.0
@@ -62,6 +68,9 @@ importers:
       vue-router:
         specifier: ^5.0.4
         version: 5.0.4(@vue/compiler-sfc@3.5.32)(pinia@3.0.4(typescript@5.9.3)(vue@3.5.32(typescript@5.9.3)))(vue@3.5.32(typescript@5.9.3))
+      ws:
+        specifier: ^8.20.1
+        version: 8.20.1
     devDependencies:
       '@electron-toolkit/eslint-config-ts':
         specifier: ^3.1.0
@@ -84,6 +93,9 @@ importers:
       '@types/sortablejs':
         specifier: ^1.15.9
         version: 1.15.9
+      '@types/ws':
+        specifier: ^8.18.1
+        version: 8.18.1
       '@vitejs/plugin-vue':
         specifier: ^6.0.5
         version: 6.0.5(vite@7.3.2(@types/node@22.19.17)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))(vue@3.5.32(typescript@5.9.3))
@@ -666,6 +678,12 @@ packages:
   '@floating-ui/vue@1.1.11':
     resolution: {integrity: sha512-HzHKCNVxnGS35r9fCHBc3+uCnjw9IWIlCPL683cGgM9Kgj2BiAl8x1mS7vtvP6F9S/e/q4O6MApwSHj8hNLGfw==}
 
+  '@hono/node-server@2.0.2':
+    resolution: {integrity: sha512-tXlTi1h/4V7sDe7i97IVP+9re9ZU7wXZZggnR5ucCRclf1+AX6YhGStrR5w8bLj+3Mlyl0pKfBh9gqTqqnGKfQ==}
+    engines: {node: '>=20'}
+    peerDependencies:
+      hono: ^4
+
   '@humanfs/core@0.19.1':
     resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
     engines: {node: '>=18.18.0'}
@@ -1646,6 +1664,9 @@ packages:
   '@types/web-bluetooth@0.0.21':
     resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==}
 
+  '@types/ws@8.18.1':
+    resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
+
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
@@ -2743,6 +2764,10 @@ packages:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
 
+  hono@4.12.18:
+    resolution: {integrity: sha512-RWzP96k/yv0PQfyXnWjs6zot20TqfpfsNXhOnev8d1InAxubW93L11/oNUc3tQqn2G0bSdAOBpX+2uDFHV7kdQ==}
+    engines: {node: '>=16.9.0'}
+
   hookable@5.5.3:
     resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
 
@@ -3918,6 +3943,18 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
+  ws@8.20.1:
+    resolution: {integrity: sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
@@ -4442,6 +4479,10 @@ snapshots:
       - '@vue/composition-api'
       - vue
 
+  '@hono/node-server@2.0.2(hono@4.12.18)':
+    dependencies:
+      hono: 4.12.18
+
   '@humanfs/core@0.19.1': {}
 
   '@humanfs/node@0.16.7':
@@ -5229,6 +5270,10 @@ snapshots:
 
   '@types/web-bluetooth@0.0.21': {}
 
+  '@types/ws@8.18.1':
+    dependencies:
+      '@types/node': 22.19.17
+
   '@types/yauzl@2.10.3':
     dependencies:
       '@types/node': 22.19.17
@@ -6596,6 +6641,8 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
+  hono@4.12.18: {}
+
   hookable@5.5.3: {}
 
   hosted-git-info@4.1.0:
@@ -7814,6 +7861,8 @@ snapshots:
 
   wrappy@1.0.2: {}
 
+  ws@8.20.1: {}
+
   xml-name-validator@4.0.0: {}
 
   xmlbuilder@15.1.1: {}
diff --git a/shared/defaults/settings.ts b/shared/defaults/settings.ts
index 589edf55..d7053101 100644
--- a/shared/defaults/settings.ts
+++ b/shared/defaults/settings.ts
@@ -102,6 +102,11 @@ export const defaultSystemConfig: SystemConfig = {
   streaming: {
     enabled: true,
   },
+  externalApi: {
+    enabled: false,
+    wsEnabled: false,
+    port: 14558,
+  },
   system: {
     rememberWindowState: true,
     taskbarProgress: true,
diff --git a/shared/types/settings.ts b/shared/types/settings.ts
index 7f4b2712..43896f85 100644
--- a/shared/types/settings.ts
+++ b/shared/types/settings.ts
@@ -185,6 +185,26 @@ export interface StreamingSettings {
   enabled: boolean;
 }
 
+/** 外部 API 服务配置 */
+export interface ExternalApiSettings {
+  /** 总开关 */
+  enabled: boolean;
+  /** WebSocket 子开关 */
+  wsEnabled: boolean;
+  /** 监听端口 */
+  port: number;
+}
+
+/** 外部 API 服务运行时状态 */
+export interface ExternalApiStatus {
+  /** 是否正在监听 */
+  listening: boolean;
+  /** 实际监听端口 */
+  port: number | null;
+  /** 上次启动失败的错误 */
+  error: { code: string; message: string } | null;
+}
+
 /** 在线歌词服务配置 */
 export interface OnlineLyricSettings {
   /** 启用在线 TTML 歌词 */
@@ -279,6 +299,8 @@ export interface SystemConfig {
   cache: CacheSettings;
   /** 流媒体总开关 */
   streaming: StreamingSettings;
+  /** 外部 API 服务（HTTP + WS） */
+  externalApi: ExternalApiSettings;
   /** 系统配置 */
   system: {
     /** 记忆窗口状态 */
diff --git a/src/components/settings/custom/ExternalApiPanel.vue b/src/components/settings/custom/ExternalApiPanel.vue
new file mode 100644
index 00000000..2ebaeea6
--- /dev/null
+++ b/src/components/settings/custom/ExternalApiPanel.vue
@@ -0,0 +1,78 @@
+<script setup lang="ts">
+import { useSettingsStore } from "@/stores/settings";
+import { toast } from "@/composables/useToast";
+import type { ExternalApiStatus } from "@shared/types/settings";
+
+defineOptions({ inheritAttrs: false });
+
+const { t } = useI18n();
+const settings = useSettingsStore();
+
+const status = ref<ExternalApiStatus>({ listening: false, port: null, error: null });
+const restarting = ref(false);
+
+/** 配置端口跟实际监听端口不一致 */
+const pendingRestart = computed(
+  () =>
+    status.value.listening &&
+    status.value.port !== null &&
+    status.value.port !== settings.system.externalApi.port,
+);
+
+const restart = async (): Promise<void> => {
+  restarting.value = true;
+  try {
+    const result = await window.api.externalApi.restart();
+    status.value = result;
+    if (result.listening) {
+      toast.success(t("settings.externalApi.restarted"));
+    } else if (result.error?.code === "EADDRINUSE") {
+      toast.error(t("settings.externalApi.portInUse", { port: settings.system.externalApi.port }));
+    } else if (result.error) {
+      toast.error(result.error.message);
+    }
+  } finally {
+    restarting.value = false;
+  }
+};
+
+onMounted(async () => {
+  status.value = await window.api.externalApi.getStatus();
+});
+</script>
+
+<template>
+  <div
+    class="rounded-xl bg-surface-panel border border-solid border-outline-variant/15 px-4 py-3.5 flex items-center justify-between gap-4"
+  >
+    <div class="min-w-0 flex-1">
+      <div class="text-base flex items-center gap-2">
+        {{ t("settings.externalApi.restart") }}
+        <STag v-if="pendingRestart" type="warning" size="small">
+          {{ t("settings.externalApi.pendingChange") }}
+        </STag>
+      </div>
+      <div class="text-sm text-on-surface-variant/70 mt-0.5">
+        {{
+          pendingRestart
+            ? t("settings.externalApi.pendingChangeHint", {
+                configured: settings.system.externalApi.port,
+                running: status.port,
+              })
+            : t("settings.externalApi.restartHint")
+        }}
+      </div>
+    </div>
+    <div class="shrink-0 flex items-center gap-2">
+      <SButton
+        type="primary"
+        variant="secondary"
+        size="small"
+        :loading="restarting"
+        @click="restart"
+      >
+        {{ t("settings.externalApi.restart") }}
+      </SButton>
+    </div>
+  </div>
+</template>
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 66df256d..4e42b51d 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -301,6 +301,7 @@
       "hotkeys": "Hotkeys",
       "musicSpectrum": "Music Spectrum",
       "discord": "Discord RPC",
+      "externalApi": "External API",
       "systemConfig": "System",
       "pluginsList": "Installed Plugins",
       "streaming": "Streaming",
@@ -843,6 +844,30 @@
       "label": "Enable streaming",
       "description": "When disabled, the streaming entry is hidden from the sidebar"
     },
+    "externalApiEnabled": {
+      "label": "Allow external control",
+      "description": "Let external apps control the player via the API"
+    },
+    "externalApiWs": {
+      "label": "Enable WebSocket",
+      "description": "External apps can subscribe to events and send commands"
+    },
+    "externalApiPort": {
+      "label": "Listen port",
+      "description": "TCP port for the external API (1024–65535)"
+    },
+    "externalApiPanel": {
+      "label": "",
+      "description": ""
+    },
+    "externalApi": {
+      "restart": "Restart server",
+      "restartHint": "Restart required after changing port",
+      "restarted": "Server restarted",
+      "portInUse": "Port {port} is already in use, pick another",
+      "pendingChange": "Pending restart",
+      "pendingChangeHint": "Configured {configured}, running {running}"
+    },
     "closeAction": {
       "label": "Close Button Action",
       "description": "What to do when the title bar close button is clicked",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index b4675ab0..3d4c7c44 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -301,6 +301,7 @@
       "hotkeys": "快捷键",
       "musicSpectrum": "音乐频谱",
       "discord": "Discord RPC",
+      "externalApi": "外部 API",
       "systemConfig": "系统配置",
       "pluginsList": "已安装插件",
       "streaming": "流媒体管理",
@@ -843,6 +844,30 @@
       "label": "启用流媒体",
       "description": "关闭后将隐藏侧边栏的流媒体入口"
     },
+    "externalApiEnabled": {
+      "label": "允许外部控制",
+      "description": "允许外部应用通过 API 控制播放器"
+    },
+    "externalApiWs": {
+      "label": "启用 WebSocket",
+      "description": "外部应用可订阅播放事件并发送控制指令"
+    },
+    "externalApiPort": {
+      "label": "监听端口",
+      "description": "外部 API 服务监听的端口（1024–65535）"
+    },
+    "externalApiPanel": {
+      "label": "",
+      "description": ""
+    },
+    "externalApi": {
+      "restart": "重启服务",
+      "restartHint": "修改端口后需重启服务",
+      "restarted": "服务已重启",
+      "portInUse": "端口 {port} 已被占用，请换一个",
+      "pendingChange": "待重启",
+      "pendingChangeHint": "配置端口 {configured}，当前监听 {running}"
+    },
     "closeAction": {
       "label": "关闭按钮行为",
       "description": "点击标题栏关闭按钮时执行的操作",
diff --git a/src/settings/categories/services.ts b/src/settings/categories/services.ts
index 2165870a..4c8b8b96 100644
--- a/src/settings/categories/services.ts
+++ b/src/settings/categories/services.ts
@@ -1,4 +1,5 @@
 import type { SettingCategory } from "@/types/settings-schema";
+import ExternalApiPanel from "@/components/settings/custom/ExternalApiPanel.vue";
 import IconLucideGlobe from "~icons/lucide/globe";
 
 const servicesCategory: SettingCategory = {
@@ -46,6 +47,41 @@ const servicesCategory: SettingCategory = {
         },
       ],
     },
+    {
+      id: "externalApi",
+      tag: { text: "Beta" },
+      items: [
+        {
+          key: "externalApiEnabled",
+          type: "switch",
+          binding: { store: "settings", path: "system.externalApi.enabled" },
+          defaultValue: false,
+          children: [
+            {
+              key: "externalApiWs",
+              type: "switch",
+              binding: { store: "settings", path: "system.externalApi.wsEnabled" },
+              defaultValue: true,
+            },
+            {
+              key: "externalApiPort",
+              type: "number",
+              binding: { store: "settings", path: "system.externalApi.port" },
+              min: 1024,
+              max: 65535,
+              defaultValue: 14558,
+            },
+            {
+              key: "externalApiPanel",
+              type: "custom",
+              component: ExternalApiPanel,
+              fullWidth: true,
+              keywords: ["settings.externalApi.endpoint", "settings.externalApi.restart"],
+            },
+          ],
+        },
+      ],
+    },
   ],
 };
 

From 1a139d6f909422d444cc5178812743431e79abf6 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Thu, 14 May 2026 18:31:52 +0800
Subject: [PATCH 06/33] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20NCM=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=92=AD=E6=94=BE=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/apis/kugou/modules/search.ts    |  9 +-
 electron/main/apis/netease/modules/index.ts   |  5 +
 .../main/apis/netease/modules/song_url.ts     | 27 ++++++
 shared/types/errors.ts                        |  6 ++
 src/apis/search/kugou.ts                      |  4 +-
 src/apis/search/netease.ts                    |  2 +
 src/apis/search/qqmusic.ts                    | 10 +-
 src/apis/url/netease.ts                       | 27 ++++++
 src/i18n/locales/en-US.json                   |  6 +-
 src/i18n/locales/zh-CN.json                   |  6 +-
 src/pages/Search.vue                          | 11 ++-
 src/services/audioSource.ts                   | 91 ++++++++++++++++++-
 src/services/lyricLoader.ts                   | 32 +++++--
 src/utils/errors.ts                           |  2 +
 14 files changed, 210 insertions(+), 28 deletions(-)
 create mode 100644 electron/main/apis/netease/modules/song_url.ts
 create mode 100644 src/apis/url/netease.ts

diff --git a/electron/main/apis/kugou/modules/search.ts b/electron/main/apis/kugou/modules/search.ts
index 5862fb4d..c7cb7720 100644
--- a/electron/main/apis/kugou/modules/search.ts
+++ b/electron/main/apis/kugou/modules/search.ts
@@ -30,6 +30,7 @@ interface NormalizedSong {
   album: string;
   albumId: string | number;
   cover?: string;
+  coverOriginal?: string;
   /** 秒 */
   interval: number;
   /** 毫秒 */
@@ -39,8 +40,8 @@ interface NormalizedSong {
   sizes: Partial<Record<Quality, number>>;
 }
 
-/** trans_param.union_cover 含 `{size}` 占位，统一替成 300 */
-const fillCover = (url: string | undefined, size = 300): string | undefined => {
+/** trans_param.union_cover 含 `{size}` 占位，按需替换 */
+const fillCover = (url: string | undefined, size: number): string | undefined => {
   if (!url) return undefined;
   return url.replace(/\{size\}/g, String(size));
 };
@@ -113,6 +114,7 @@ const normalizeFromMobile = (raw: MobileSong): NormalizedSong => {
   }
 
   const interval = raw.duration ?? 0;
+  const coverTpl = raw.trans_param?.union_cover;
   return {
     id: String(raw.audio_id ?? ""),
     audioId: raw.audio_id ?? 0,
@@ -121,7 +123,8 @@ const normalizeFromMobile = (raw: MobileSong): NormalizedSong => {
     artist: formatMobileArtist(raw.singername),
     album: decodeName(raw.album_name ?? ""),
     albumId: raw.album_id ?? "",
-    cover: fillCover(raw.trans_param?.union_cover),
+    cover: fillCover(coverTpl, 300),
+    coverOriginal: fillCover(coverTpl, 480),
     interval,
     duration: interval * 1000,
     qualities: Object.keys(hashes) as Quality[],
diff --git a/electron/main/apis/netease/modules/index.ts b/electron/main/apis/netease/modules/index.ts
index db5e26fc..3bd809b1 100644
--- a/electron/main/apis/netease/modules/index.ts
+++ b/electron/main/apis/netease/modules/index.ts
@@ -48,6 +48,9 @@ import lyric from "./lyric";
 import lyric_new from "./lyric_new";
 import cloud_lyric_get from "./cloud_lyric_get";
 
+// 播放
+import song_url from "./song_url";
+
 export const modules: Record<string, NeteaseModule> = {
   captcha_sent,
   captcha_verify,
@@ -85,4 +88,6 @@ export const modules: Record<string, NeteaseModule> = {
   lyric,
   lyric_new,
   cloud_lyric_get,
+
+  song_url,
 };
diff --git a/electron/main/apis/netease/modules/song_url.ts b/electron/main/apis/netease/modules/song_url.ts
new file mode 100644
index 00000000..a38cf978
--- /dev/null
+++ b/electron/main/apis/netease/modules/song_url.ts
@@ -0,0 +1,27 @@
+/**
+ * 获取歌曲播放地址（v1 端点，level 而非裸 br）
+ *
+ * params:
+ * - id / ids   歌曲 id（单个或逗号分隔）
+ * - level      音质 level，默认 exhigh（320k MP3）
+ *              standard / exhigh / lossless / hires / jyeffect / sky / jymaster
+ *
+ * 响应：`{ code, data: [{ id, url, br, level, freeTrialInfo, ... }] }`
+ * - url == null：VIP / 版权未开放
+ * - freeTrialInfo != null：仅 30s 试听片段
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const song_url: NeteaseModule = (query, request) => {
+  const ids = query.id ?? query.ids;
+  const data = {
+    ids: `[${String(ids).split(",").join(",")}]`,
+    level: query.level ?? "exhigh",
+    encodeType: "aac",
+  };
+  return request("/api/song/enhance/player/url/v1", data, createOption(query));
+};
+
+export default song_url;
diff --git a/shared/types/errors.ts b/shared/types/errors.ts
index 59dd113f..5743e8bb 100644
--- a/shared/types/errors.ts
+++ b/shared/types/errors.ts
@@ -28,6 +28,12 @@ export enum ErrorCode {
   /** 网络请求超时 */
   NETWORK_TIMEOUT = "NETWORK_TIMEOUT",
 
+  // 在线源相关
+  /** 无法获取播放地址（API + 插件都失败） */
+  URL_RESOLVE_FAILED = "URL_RESOLVE_FAILED",
+  /** 未找到支持该平台的插件 */
+  NO_PLUGIN_AVAILABLE = "NO_PLUGIN_AVAILABLE",
+
   // 扫描相关
   /** 未配置扫描目录 */
   SCAN_NO_DIRS = "SCAN_NO_DIRS",
diff --git a/src/apis/search/kugou.ts b/src/apis/search/kugou.ts
index 330c13ae..03ed450e 100644
--- a/src/apis/search/kugou.ts
+++ b/src/apis/search/kugou.ts
@@ -11,8 +11,8 @@ interface KGSong {
   artist: string;
   album?: string;
   albumId?: string | number;
-  /** gateway 路径才会带，trans_param.union_cover 取出来；兜底路径为空 */
   cover?: string;
+  coverOriginal?: string;
   duration: number;
 }
 
@@ -30,6 +30,7 @@ const songToTrack = (song: KGSong): Track => ({
   // album.id 暂不暴露（在线专辑详情页未接通），列表里跟着 artist 一起暗显
   album: song.album ? { name: song.album, cover: song.cover } : undefined,
   cover: song.cover,
+  coverOriginal: song.coverOriginal,
   duration: song.duration ?? 0,
 });
 
@@ -50,7 +51,6 @@ export const songs = async (
   return { items, total, hasMore: offset + items.length < total };
 };
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
 export const albums = async (
   _keyword: string,
   _offset: number,
diff --git a/src/apis/search/netease.ts b/src/apis/search/netease.ts
index 634fb36b..464f18f5 100644
--- a/src/apis/search/netease.ts
+++ b/src/apis/search/netease.ts
@@ -70,6 +70,7 @@ const call = (
 
 const songToTrack = (song: NeteaseSong): Track => {
   const cover = withSize(song.al?.picUrl);
+  const coverOriginal = withSize(song.al?.picUrl, 1024);
   return {
     id: String(song.id),
     source: "online",
@@ -79,6 +80,7 @@ const songToTrack = (song: NeteaseSong): Track => {
     album: song.al ? { id: String(song.al.id), name: song.al.name, cover } : undefined,
     duration: song.dt ?? 0,
     cover,
+    coverOriginal,
   };
 };
 
diff --git a/src/apis/search/qqmusic.ts b/src/apis/search/qqmusic.ts
index 372cc84b..aab464f8 100644
--- a/src/apis/search/qqmusic.ts
+++ b/src/apis/search/qqmusic.ts
@@ -19,11 +19,13 @@ interface SongsResp {
   songs?: QMSong[];
 }
 
-const albumCoverByMid = (mid: string): string =>
-  `https://y.gtimg.cn/music/photo_new/T002R300x300M000${mid}.jpg`;
+/** QM 封面 URL：size 为像素，T002 限到 800 以内 */
+const albumCoverByMid = (mid: string, size = 300): string =>
+  `https://y.gtimg.cn/music/photo_new/T002R${size}x${size}M000${mid}.jpg`;
 
 const songToTrack = (song: QMSong): Track => {
   const cover = song.albumMid ? albumCoverByMid(song.albumMid) : undefined;
+  const coverOriginal = song.albumMid ? albumCoverByMid(song.albumMid, 800) : undefined;
   return {
     id: song.mid || song.id,
     source: "online",
@@ -36,6 +38,7 @@ const songToTrack = (song: QMSong): Track => {
     album: song.album ? { name: song.album, cover } : undefined,
     duration: song.duration ?? 0,
     cover,
+    coverOriginal,
   };
 };
 
@@ -57,8 +60,7 @@ export const songs = async (
   return { items, total, hasMore: offset + items.length < total };
 };
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// 在线专辑/歌手/歌单详情页未接通，搜出来也没法跳，先返回空（同 kugou）
+// 在线专辑/歌手/歌单详情页未接通
 export const albums = async (
   _keyword: string,
   _offset: number,
diff --git a/src/apis/url/netease.ts b/src/apis/url/netease.ts
new file mode 100644
index 00000000..029f41c0
--- /dev/null
+++ b/src/apis/url/netease.ts
@@ -0,0 +1,27 @@
+import type { Track } from "@shared/types/player";
+import { netease } from "@/apis/netease";
+
+interface SongUrlItem {
+  url: string | null;
+  freeTrialInfo: unknown | null;
+}
+
+interface SongUrlResp {
+  data?: SongUrlItem[];
+}
+
+/**
+ * 调网易云 song_url v1 拿播放地址
+ * @param track - 要解析的 track
+ * @returns 解析出的播放地址，如果无法解析则返回 null
+ * @param track 网易云 Track（track.id 为云端 songId）
+ */
+export const resolveNeteaseUrl = async (track: Track): Promise<string | null> => {
+  const body = await netease.song_url<SongUrlResp>({
+    id: track.id,
+    level: "exhigh",
+  });
+  const item = body?.data?.[0];
+  if (!item?.url || item.freeTrialInfo) return null;
+  return item.url;
+};
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 4e42b51d..9ee2c4cb 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -372,8 +372,8 @@
       "hint": "Picks the highest-ranked when multiple formats are available — e.g. multiple external lyric files, or TTML upgrade"
     },
     "smartPreferOnline": {
-      "label": "Prefer Online Format",
-      "description": "Fetch online when a higher-ranked format is reachable"
+      "label": "Auto-Upgrade Lyric Format",
+      "description": "Fetch a higher-ranked format from other platforms when the current one is low"
     },
     "enableOnlineTTMLLyric": {
       "label": "Enable Online TTML Lyrics",
@@ -1071,6 +1071,8 @@
     "FILE_NOT_SELECTED": "No file selected",
     "NETWORK_ERROR": "Network connection failed",
     "NETWORK_TIMEOUT": "Network request timed out",
+    "URL_RESOLVE_FAILED": "Failed to get playback URL",
+    "NO_PLUGIN_AVAILABLE": "No plugin available for this platform",
     "SCAN_NO_DIRS": "No scan directories configured",
     "SCAN_DIR_EXISTS": "Directory already exists",
     "SCAN_DIR_NOT_FOUND": "Directory not found",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 3d4c7c44..6beb4fbe 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -372,8 +372,8 @@
       "hint": "存在多个可用格式时按此顺序选择，例如本地多个外挂歌词、在线 TTML 升级等场景"
     },
     "smartPreferOnline": {
-      "label": "在线格式优先",
-      "description": "本地格式低于在线可达格式时，从在线获取并覆盖"
+      "label": "自动升级歌词格式",
+      "description": "当前歌词格式较低时，从其他平台获取更高级的格式覆盖"
     },
     "enableOnlineTTMLLyric": {
       "label": "启用在线 TTML 歌词",
@@ -1071,6 +1071,8 @@
     "FILE_NOT_SELECTED": "未选择文件",
     "NETWORK_ERROR": "网络连接失败，请检查网络",
     "NETWORK_TIMEOUT": "网络请求超时",
+    "URL_RESOLVE_FAILED": "无法获取播放地址",
+    "NO_PLUGIN_AVAILABLE": "未找到支持该平台的插件",
     "SCAN_NO_DIRS": "未配置扫描目录",
     "SCAN_DIR_EXISTS": "该目录已存在",
     "SCAN_DIR_NOT_FOUND": "目录不存在",
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index d730c857..00677c07 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -67,7 +67,11 @@ const fetchers = {
   playlists: searchPlaylists,
 } as const;
 
-/** 拉取指定 tab：append=true 时追加下一页，否则首屏拉取 */
+/**
+ * 拉取指定 tab
+ * @param tab - 要拉取的 tab
+ * @param append - 是否追加下一页
+ */
 const fetchTab = async (tab: TabKey, append: boolean): Promise<void> => {
   if (!keyword.value) return;
   const state = states[tab];
@@ -87,10 +91,11 @@ const fetchTab = async (tab: TabKey, append: boolean): Promise<void> => {
       offset,
       PAGE_SIZE,
     );
+    const items = result.items.map((item) => markRaw(item));
     if (append) {
-      (state.items as Track[]).push(...(result.items as Track[]));
+      (state.items as Track[]).push(...(items as Track[]));
     } else {
-      state.items = result.items as never;
+      state.items = items as Track[];
     }
     state.total = result.total;
     state.hasMore = result.hasMore;
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index b6c75d5d..b1a18f57 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -1,20 +1,85 @@
 import type { Track } from "@shared/types/player";
 import { useStreamingStore } from "@/stores/streaming";
 import { useSettingsStore } from "@/stores/settings";
+import { usePluginsStore } from "@/stores/plugins";
+import { resolveNeteaseUrl } from "@/apis/url/netease";
+import { ErrorCode } from "@shared/types/errors";
 import { handleError } from "@/utils/errors";
 
-/** 派生缓存键；返回 null 表示该 track 不参与歌曲缓存 */
+/** Track.platform → 插件 source key */
+const PLATFORM_TO_PLUGIN_SOURCE: Record<string, string> = {
+  netease: "wy",
+  qqmusic: "tx",
+  kugou: "kg",
+};
+
+/**
+ * 派生缓存键
+ * @param track - 要解析的 track
+ * @returns 派生缓存键，如果该 track 不参与歌曲缓存则返回 null
+ */
 const cacheKeyForTrack = (track: Track): string | null => {
   if (track.source === "streaming" && track.serverId && track.originalId) {
     return `s:${track.serverId}:${track.originalId}:`;
   }
-  // 待 online 平台接入：return `o:${track.platform}:${track.originalId}:`;
+  if (track.source === "online" && track.platform && track.id) {
+    return `o:${track.platform}:${track.id}:`;
+  }
   return null;
 };
 
 /**
  * 根据 track 信息解析出最终的音频源 URL
- * @param track 要解析的 track 对象
+ * @param track - 要解析的 track
+ * @returns 解析出的音频源 URL，如果无法解析则返回 null
+ */
+const resolveByPlugin = async (track: Track): Promise<string | null> => {
+  if (!track.platform) return null;
+  const pluginSource = PLATFORM_TO_PLUGIN_SOURCE[track.platform];
+  if (!pluginSource) return null;
+  const plugins = usePluginsStore();
+  const found = plugins.list.find(
+    (info) =>
+      info.enabled &&
+      info.status.state === "ready" &&
+      info.status.sources[pluginSource]?.actions.includes("musicUrl"),
+  );
+  if (!found) {
+    handleError(ErrorCode.NO_PLUGIN_AVAILABLE);
+    return null;
+  }
+  const res = await window.api.plugins.resolveUrl({
+    pluginId: found.manifest.id,
+    source: pluginSource,
+    quality: "hq",
+    musicInfo: {
+      songmid: track.id,
+      name: track.title,
+      singer: track.artists.map((artist) => artist.name).join("/"),
+    },
+  });
+  return res?.url || null;
+};
+
+/**
+ * 解析在线音频源 URL
+ * @param track - 要解析的 track
+ */
+const resolveOnlineUrl = async (track: Track): Promise<string | null> => {
+  try {
+    if (track.platform === "netease") {
+      const url = await resolveNeteaseUrl(track);
+      if (url) return url;
+    }
+  } catch {
+    // 官方 API 异常回落插件
+  }
+  return resolveByPlugin(track);
+};
+
+/**
+ * 根据 track 信息解析出最终的音频源 URL
+ * @param track - 要解析的 track
  */
 export const resolveTrackSource = async (
   track: Track,
@@ -39,7 +104,7 @@ export const resolveTrackSource = async (
       const store = useStreamingStore();
       const streamUrl = await store.getStreamUrl(track);
       if (cacheEnabled) {
-        // 缓存下载用独立 PlaySessionId，避免与播放流并发触发 Jellyfin/Emby 同会话冲突
+        // 缓存下载用独立 PlaySessionId
         const cacheUrl = await store.getStreamUrl(track, { playSessionId: crypto.randomUUID() });
         void window.api.cache.song.fetch(cacheKey!, "streaming", cacheUrl);
       }
@@ -49,6 +114,22 @@ export const resolveTrackSource = async (
       return null;
     }
   }
-  // TODO: online 平台接入
+  // 在线源
+  if (track.source === "online") {
+    try {
+      const url = await resolveOnlineUrl(track);
+      if (!url) {
+        handleError(ErrorCode.URL_RESOLVE_FAILED);
+        return null;
+      }
+      if (cacheEnabled) {
+        void window.api.cache.song.fetch(cacheKey!, "online", url);
+      }
+      return { source: url, fromCache: false };
+    } catch (err) {
+      handleError(err instanceof Error ? err.message : String(err));
+      return null;
+    }
+  }
   return null;
 };
diff --git a/src/services/lyricLoader.ts b/src/services/lyricLoader.ts
index 5947fef5..f50a7fbd 100644
--- a/src/services/lyricLoader.ts
+++ b/src/services/lyricLoader.ts
@@ -153,7 +153,7 @@ const tryTTMLOverlay = async (
  * 获取在线歌词
  * - self：不走第三方
  * - auto + 已有本地：默认不走；smartPreferOnline 开启时按格式优先级筛选可升级平台
- * - auto + 无本地：按音源顺序试，首个命中即返回
+ * - auto + 无本地：按音源顺序试；smart 开启时跳过 lrc 找带时间戳的格式，全是 lrc 则兜底返第一个
  * - 指定平台：查该平台
  */
 const tryOnlineByPreference = async (
@@ -174,15 +174,21 @@ const tryOnlineByPreference = async (
       candidates = order.filter((p) => platformCanUpgrade(p, localFormat, formatOrder));
       if (candidates.length === 0) return null;
     }
+    let lrcFallback: OnlineResult | null = null;
     for (const platform of candidates) {
       const result = await fetchFromPlatform(platform, track);
       if (token !== currentToken) return null;
       if (!result) continue;
       // smart + 有本地：实际拿到的结果必须真的优于本地才接受，否则继续试下一个平台
       if (hasLocal && localFormat && !isOnlineResultUpgrade(result, localFormat)) continue;
+      // smart + 无本地：lrc 不够，记下兜底继续找带时间戳的
+      if (!hasLocal && settings.lyric.smartPreferOnline && result.source.format === "lrc") {
+        lrcFallback ??= result;
+        continue;
+      }
       return result;
     }
-    return null;
+    return lrcFallback;
   }
   return fetchFromPlatform(preference, track);
 };
@@ -239,7 +245,9 @@ export const beginLoad = (): number => {
  * 为当前 track 加载歌词
  *
  * 1. 无 track：commit null 收尾
- * 2. 在线歌曲：暂无
+ * 2. 在线歌曲：
+ *    - 默认顺序下，track.platform 与候选平台一致时走 matchById
+ *    - 不一致则走 matchByQuery
  * 3. 本地歌曲：本地有先立即 commit 显示；再按偏好查在线，命中热替换
  * 4. 本地 + 在线都无：commit null 收尾 loading
  *
@@ -257,7 +265,10 @@ export const loadForTrack = async (detail: TrackDetail | null): Promise<void> =>
     }
     // 在线歌曲
     if (track.source === "online") {
-      commit(token, null, null);
+      const online = await tryOnlineByPreference(token, track, false, null);
+      if (token !== currentToken) return;
+      if (online) await applyOnline(token, track, online, null);
+      else commit(token, null, null);
       return;
     }
     // 流媒体服务器
@@ -312,14 +323,21 @@ const refreshPreference = async (): Promise<void> => {
   const token = currentToken;
   const media = useMediaStore();
   const track = media.track;
-  if (!track || track.source === "online" || track.source === "streaming") return;
-
+  if (!track || track.source === "streaming") return;
+  // 在线歌曲
+  if (track.source === "online") {
+    const online = await tryOnlineByPreference(token, track, false, null);
+    if (token !== currentToken) return;
+    if (online) await applyOnline(token, track, online, null);
+    else commit(token, null, null);
+    return;
+  }
+  // 本地歌曲
   const detail = media.detail;
   const local = detail ? await readLocal(detail) : null;
   if (token !== currentToken) return;
   const localFormat = local?.source.format ?? null;
   const showingOnline = media.activeLyric?.source === "online";
-
   /** 按偏好获取歌词 */
   const online = await tryOnlineByPreference(token, track, !!local, localFormat);
   if (token !== currentToken) return;
diff --git a/src/utils/errors.ts b/src/utils/errors.ts
index cfdef640..64356e07 100644
--- a/src/utils/errors.ts
+++ b/src/utils/errors.ts
@@ -16,6 +16,8 @@ const SKIPPABLE_ERRORS = new Set<string>([
   ErrorCode.FILE_DECODE_ERROR,
   ErrorCode.NETWORK_ERROR,
   ErrorCode.NETWORK_TIMEOUT,
+  ErrorCode.URL_RESOLVE_FAILED,
+  ErrorCode.NO_PLUGIN_AVAILABLE,
 ]);
 
 /** 需要用 dialog 强提示的严重错误（阻断性，用户必须介入） */

From 6568ea728d0cefd5418b145144f6c81475dbcd44 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Fri, 15 May 2026 00:36:59 +0800
Subject: [PATCH 07/33] =?UTF-8?q?fix:=20=E6=AD=8C=E6=9B=B2=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 native/audio-engine/src/player.rs |   3 +
 src/core/player/index.ts          | 113 +++++++++++++++++++-----------
 src/services/lyricLoader.ts       |  57 +++++++++++----
 3 files changed, 116 insertions(+), 57 deletions(-)

diff --git a/native/audio-engine/src/player.rs b/native/audio-engine/src/player.rs
index b9e8cdbc..9d8e8134 100644
--- a/native/audio-engine/src/player.rs
+++ b/native/audio-engine/src/player.rs
@@ -824,8 +824,11 @@ impl InnerPlayer {
     }
 
     /// 停止播放并释放资源
+    /// 显式停止：清掉 current_source，避免后续 play() 在 Stopped 态下用残留源复活上一首
+    /// （`stop_internal` 是内部过渡用，不清；load() 会立即用新源覆盖）
     pub fn stop(&mut self) {
         self.stop_internal();
+        self.current_source = None;
         self.state = PlayerState::Stopped;
         self.emit(PlayerEvent::StateChanged {
             state: PlayerState::Stopped,
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index acccb43f..c65a0968 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -13,8 +13,10 @@ import { resolveTrackSource } from "@/services/audioSource";
 import { extractColorFromUrl } from "@/utils/color";
 import { handleError, isSkippableError } from "@/utils/errors";
 
-/** 竞态 token */
+/** 引擎 load 竞态 token */
 let loadToken = 0;
+/** loadTrack 竞态 token */
+let trackToken = 0;
 /** 连续加载失败计数，成功时重置 */
 let consecutiveFailures = 0;
 /** 连续失败硬上限 */
@@ -22,18 +24,37 @@ const MAX_CONSECUTIVE_FAILURES = 5;
 /** 失败后跳下一首的节流延迟（毫秒） */
 const SKIP_ON_ERROR_DELAY_MS = 1000;
 
+/**
+ * 单曲级失败兜底
+ * 达到连续失败上限 / 队列长度则交 onQueueEnded 停下
+ * @param myToken - 调用方进入失败路径时的 token 快照
+ * @param getCurrentToken - 取该 token 的最新值，setTimeout 触发时再次比对
+ */
+const skipOnFailure = async (myToken: number, getCurrentToken: () => number): Promise<void> => {
+  consecutiveFailures++;
+  if (
+    consecutiveFailures >= MAX_CONSECUTIVE_FAILURES ||
+    consecutiveFailures >= queue.queueLength.value
+  ) {
+    consecutiveFailures = 0;
+    await onQueueEnded();
+    return;
+  }
+  setTimeout(() => {
+    if (myToken === getCurrentToken()) nextTrack();
+  }, SKIP_ON_ERROR_DELAY_MS);
+};
+
+/** load() 的结果；失败时附带错误码，跳曲决策交给调用方 */
+export type LoadOutcome = { ok: true; track: Track | null } | { ok: false; error?: string };
+
 /**
  * 加载音频源
  * @param source - 音频文件路径或网络地址
  * @param autoPlay - 是否自动播放
  * @param meta - 渲染层下发给主进程的权威 Track（用于 SMTC/托盘）
- * @returns 加载成功返回 Track，失败返回 null
  */
-export const load = async (
-  source: string,
-  autoPlay = true,
-  meta?: Track,
-): Promise<Track | null> => {
+export const load = async (source: string, autoPlay = true, meta?: Track): Promise<LoadOutcome> => {
   const status = useStatusStore();
   const token = ++loadToken;
   status.trackLoading = true;
@@ -60,7 +81,7 @@ export const load = async (
   try {
     const result = await window.api.player.load(source, { autoPlay, meta });
     // 竞态保护
-    if (token !== loadToken) return null;
+    if (token !== loadToken) return { ok: false };
     if (result.success && result.data) {
       const { detail, mediaInfo } = result.data;
       consecutiveFailures = 0;
@@ -79,31 +100,12 @@ export const load = async (
       status.currentSource = source;
       playback.setDuration(dur);
       playback.setPlaying(autoPlay);
-      return enriched;
-    } else {
-      status.state = "idle";
-      lyricLoader.loadForTrack(null);
-      if (result.error) {
-        handleError(result.error);
-        // 仅单曲级错误才跳下一首
-        if (isSkippableError(result.error)) {
-          consecutiveFailures++;
-          const reachedHardLimit = consecutiveFailures >= MAX_CONSECUTIVE_FAILURES;
-          const reachedQueueEnd = consecutiveFailures >= queue.queueLength.value;
-          if (reachedHardLimit || reachedQueueEnd) {
-            // 达到上限，停止自动跳曲，等待用户介入
-            consecutiveFailures = 0;
-            await onQueueEnded();
-          } else {
-            setTimeout(() => {
-              // 期间用户可能已手动操作，token 变化则放弃
-              if (token === loadToken) nextTrack();
-            }, SKIP_ON_ERROR_DELAY_MS);
-          }
-        }
-      }
-      return null;
+      return { ok: true, track: enriched };
     }
+    status.state = "idle";
+    lyricLoader.loadForTrack(null);
+    if (result.error) handleError(result.error);
+    return { ok: false, error: result.error };
   } finally {
     if (token === loadToken) status.trackLoading = false;
   }
@@ -116,13 +118,33 @@ export const load = async (
  */
 const loadTrack = async (track: Track | null): Promise<void> => {
   if (!track) return;
-  const resolved = await resolveTrackSource(track);
-  if (!resolved) return;
-  // 乐观更新：同步写入 track，开启歌词加载周期
-  useMediaStore().setTrack(track);
+  const myToken = ++trackToken;
+  // 乐观更新
+  const media = useMediaStore();
+  media.setTrack(track);
   lyricLoader.beginLoad();
-  // meta 随 load 一起下发：SMTC/托盘/标题用 track 上的权威字段
-  await load(resolved.source, true, track);
+  const resolved = await resolveTrackSource(track);
+  // 期间有新点击，让位给最新的 loadTrack
+  if (myToken !== trackToken) return;
+  // 是否可跳曲
+  let shouldSkip = false;
+  // URL 解析失败
+  if (!resolved) {
+    const status = useStatusStore();
+    status.currentSource = null;
+    status.state = "idle";
+    void window.api.player.stop();
+    media.setLyric(null, null);
+    shouldSkip = true;
+  } else {
+    const result = await load(resolved.source, true, track);
+    if (myToken !== trackToken) return;
+    // 引擎失败且属单曲级错误才跳
+    if (!result.ok && result.error && isSkippableError(result.error)) {
+      shouldSkip = true;
+    }
+  }
+  if (shouldSkip) await skipOnFailure(myToken, () => trackToken);
 };
 
 /** 恢复播放 */
@@ -458,7 +480,8 @@ export const insertToQueue = (item: Track, afterIndex?: number): number => {
 export const playNow = async (item: Track): Promise<void> => {
   const status = useStatusStore();
   const media = useMediaStore();
-  if (media.track?.id === item.id) {
+  // 同一首歌且已成功加载
+  if (media.track?.id === item.id && status.currentSource) {
     if (!status.isPlaying) play();
     return;
   }
@@ -487,7 +510,7 @@ export const moveInQueue = (fromIndex: number, toIndex: number): void => {
 let unsubscribe: (() => void) | null = null;
 let initialized = false;
 
-/** 初始化播放器：恢复队列、加载上次歌曲（含歌词）、seek 到上次位置、暂停等待 */
+/** 初始化播放器 */
 export const initPlayer = async (): Promise<void> => {
   if (initialized) return;
   initialized = true;
@@ -528,16 +551,22 @@ export const initPlayer = async (): Promise<void> => {
     status.lyricOffsetMs = offsetMs;
     media.updateLyricIndex(playback.getCurrentTime() + offsetMs);
   });
+  // 获取歌曲偏移
+  try {
+    const snap = await window.api.nowPlaying.requestSnapshot();
+    status.lyricOffsetMs = snap.lyricOffsetMs;
+  } catch (error) {
+    console.error("[player] requestSnapshot failed", error);
+  }
   const lastTrack = status.currentTrack;
   if (lastTrack) {
     const lastPosition = status.position;
-    // 先设置 track 信息（确保播放条显示），再尝试解析 source 并 load
     useMediaStore().setTrack(lastTrack);
     const resolved = await resolveTrackSource(lastTrack);
     if (resolved) {
       lyricLoader.beginLoad();
       const result = await load(resolved.source, settings.system.player.autoPlay, lastTrack);
-      if (result && settings.system.player.rememberLastTrack && lastPosition > 0) {
+      if (result.ok && settings.system.player.rememberLastTrack && lastPosition > 0) {
         await seek(lastPosition);
       }
     } else {
diff --git a/src/services/lyricLoader.ts b/src/services/lyricLoader.ts
index f50a7fbd..0ae1aadc 100644
--- a/src/services/lyricLoader.ts
+++ b/src/services/lyricLoader.ts
@@ -73,15 +73,18 @@ const fetchFromPlatform = async (
 
 /**
  * 是否对该平台尝试 TTML 升级
- * 条件：① 平台支持 TTML（netease/qqmusic）② 总开关已开 ③ 格式优先级里 ttml 排在主格式之前
+ * @param platform - 平台
+ * @param mainFormat - 主格式
  */
 const shouldTryTTML = (
   platform: Platform,
   mainFormat: LyricFormat,
 ): platform is "netease" | "qqmusic" => {
   if (platform !== "netease" && platform !== "qqmusic") return false;
-  if (!useSettingsStore().system.lyric.enableOnlineTTMLLyric) return false;
-  const order = useSettingsStore().lyric.lyricFormatOrder ?? DEFAULT_LYRIC_FORMAT_ORDER;
+  const settings = useSettingsStore();
+  if (!settings.system.lyric.enableOnlineTTMLLyric) return false;
+  if (settings.lyric.lyricSourcePreference === "self") return false;
+  const order = settings.lyric.lyricFormatOrder ?? DEFAULT_LYRIC_FORMAT_ORDER;
   const ttmlIdx = order.indexOf("ttml");
   if (ttmlIdx === -1) return false;
   const mainIdx = order.indexOf(mainFormat);
@@ -151,10 +154,15 @@ const tryTTMLOverlay = async (
 
 /**
  * 获取在线歌词
- * - self：不走第三方
+ * - self：本地歌曲不走第三方；在线歌曲查自家平台
  * - auto + 已有本地：默认不走；smartPreferOnline 开启时按格式优先级筛选可升级平台
- * - auto + 无本地：按音源顺序试；smart 开启时跳过 lrc 找带时间戳的格式，全是 lrc 则兜底返第一个
+ * - auto + 无本地：默认首个命中即返回；smartPreferOnline 开启时按 lyricFormatOrder 跨平台取格式最优
  * - 指定平台：查该平台
+ * @param token - 竞态 token
+ * @param track - 歌曲信息
+ * @param hasLocal - 是否有本地歌词
+ * @param localFormat - 本地歌词格式
+ * @returns 在线歌词结果
  */
 const tryOnlineByPreference = async (
   token: number,
@@ -164,31 +172,50 @@ const tryOnlineByPreference = async (
 ): Promise<OnlineResult | null> => {
   const settings = useSettingsStore();
   const preference = settings.lyric.lyricSourcePreference;
-  if (preference === "self") return null;
+  if (preference === "self") {
+    // 在线歌曲
+    if (track.source === "online" && track.platform) {
+      return fetchFromPlatform(track.platform, track);
+    }
+    return null;
+  }
   if (preference === "auto") {
     const order = settings.lyric.lyricSourceOrder ?? DEFAULT_LYRIC_SOURCE_ORDER;
+    const formatOrder = settings.lyric.lyricFormatOrder ?? DEFAULT_LYRIC_FORMAT_ORDER;
     let candidates: Platform[] = [...order];
     if (hasLocal) {
       if (!settings.lyric.smartPreferOnline || !localFormat) return null;
-      const formatOrder = settings.lyric.lyricFormatOrder ?? DEFAULT_LYRIC_FORMAT_ORDER;
       candidates = order.filter((p) => platformCanUpgrade(p, localFormat, formatOrder));
       if (candidates.length === 0) return null;
     }
-    let lrcFallback: OnlineResult | null = null;
+    // smart + 无本地：按音源顺序遍历，挑 lyricFormatOrder 中优先级最高的结果
+    if (!hasLocal && settings.lyric.smartPreferOnline) {
+      let best: OnlineResult | null = null;
+      let bestRank = Infinity;
+      for (const platform of candidates) {
+        const result = await fetchFromPlatform(platform, track);
+        if (token !== currentToken) return null;
+        if (!result) continue;
+        const idx = formatOrder.indexOf(result.source.format);
+        const rank = idx === -1 ? Infinity : idx;
+        if (rank < bestRank) {
+          best = result;
+          bestRank = rank;
+          // 已经是最高优先级，后续平台无需再试
+          if (rank === 0) break;
+        }
+      }
+      return best;
+    }
+    // 其它：按音源顺序首个有效即返回
     for (const platform of candidates) {
       const result = await fetchFromPlatform(platform, track);
       if (token !== currentToken) return null;
       if (!result) continue;
-      // smart + 有本地：实际拿到的结果必须真的优于本地才接受，否则继续试下一个平台
       if (hasLocal && localFormat && !isOnlineResultUpgrade(result, localFormat)) continue;
-      // smart + 无本地：lrc 不够，记下兜底继续找带时间戳的
-      if (!hasLocal && settings.lyric.smartPreferOnline && result.source.format === "lrc") {
-        lrcFallback ??= result;
-        continue;
-      }
       return result;
     }
-    return lrcFallback;
+    return null;
   }
   return fetchFromPlatform(preference, track);
 };

From 878fc3d0561441efba057a0e7ee350146c212462 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Fri, 15 May 2026 01:03:36 +0800
Subject: [PATCH 08/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20URL=20=E8=A7=A3=E6=9E=90=E4=B8=8E=E8=B7=A8=E8=BF=9B?=
 =?UTF-8?q?=E7=A8=8B=E5=85=8B=E9=9A=86=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 electron/main/plugins/lx-shim.ts        | 44 ++++++++----
 electron/main/plugins/router.ts         | 41 ++++-------
 electron/main/plugins/sandbox.worker.ts | 95 +++++++++++++++++++++++--
 electron/main/utils/logger.ts           |  1 +
 src/core/player/index.ts                |  3 +
 src/services/audioSource.ts             | 59 +++++++++++----
 6 files changed, 181 insertions(+), 62 deletions(-)

diff --git a/electron/main/plugins/lx-shim.ts b/electron/main/plugins/lx-shim.ts
index 829e0fca..96e8b85d 100644
--- a/electron/main/plugins/lx-shim.ts
+++ b/electron/main/plugins/lx-shim.ts
@@ -83,7 +83,7 @@ export interface LxCurrentScriptInfo {
   rawScript: string;
 }
 
-/** lx.utils — 对齐 lx-music-desktop 的签名（不同于 splayer.utils） */
+/** lx.utils — 参数签名与 lx-music 老脚本兼容（与自家 splayer.utils 不同） */
 const buildLxUtils = (): object => ({
   crypto: {
     // 注意：lx 的参数顺序是 (buffer, mode, key, iv)，与我们自家 splayer.utils 不同
@@ -172,13 +172,26 @@ export const installLxShim = (
       const o = opts ?? {};
       const method = ((o.method as string) ?? "GET").toUpperCase() as "GET" | "POST";
       const timeout = typeof o.timeout === "number" ? (o.timeout as number) : undefined;
-      const headers = (o.headers as Record<string, string>) ?? {};
-      const body = (o.body ?? o.form ?? o.formData) as
-        | string
-        | Uint8Array
-        | ArrayBuffer
-        | undefined;
-
+      // headers 强制转纯字符串字典，避免脚本传 Proxy / 带函数的对象触发结构化克隆失败
+      const headers: Record<string, string> = {};
+      const rawHeaders = (o.headers as Record<string, unknown> | undefined) ?? {};
+      for (const [k, v] of Object.entries(rawHeaders)) {
+        if (typeof v === "string") headers[k] = v;
+        else if (v != null) headers[k] = String(v);
+      }
+      // body：保留 string / 字节数组；其它 object 走 JSON 序列化（对齐 needle/json 行为）
+      const rawBody = o.body ?? o.form ?? o.formData;
+      let body: string | Uint8Array | ArrayBuffer | undefined;
+      if (rawBody == null) body = undefined;
+      else if (typeof rawBody === "string") body = rawBody;
+      else if (rawBody instanceof Uint8Array || rawBody instanceof ArrayBuffer) body = rawBody;
+      else if (typeof rawBody === "object") {
+        try {
+          body = JSON.stringify(rawBody);
+        } catch {
+          body = undefined;
+        }
+      }
       let aborted = false;
 
       splayer
@@ -271,7 +284,6 @@ export const installLxShim = (
               const actions = (cap.actions ?? []).filter(
                 (a): a is PluginAction => a === "musicUrl",
               );
-              if (actions.length === 0) continue;
               normalized[key] = {
                 name: cap.name ?? key,
                 actions,
@@ -326,6 +338,7 @@ export const installLxShim = (
   const registerAction = (action: PluginAction): void => {
     handlers.set(action, async (req: unknown) => {
       if (!requestHandler) {
+        splayer.log.warn("[lx-shim] no request handler registered for action", action);
         throw Object.assign(new Error("lx plugin has not registered request handler"), {
           code: "PLUGIN_NOT_READY",
         });
@@ -334,14 +347,21 @@ export const installLxShim = (
       const source = (reqObj.source as string) ?? "";
       // lx 期待 128k/320k/flac/... 音质字符串，宿主的 quality 做一次翻译
       const hostQuality = reqObj.quality as PluginQuality | undefined;
+      const lxType = hostQuality ? mapHostQualityToLx(hostQuality) : undefined;
       const info: Record<string, unknown> = {
-        type: hostQuality ? mapHostQualityToLx(hostQuality) : undefined,
+        type: lxType,
         musicInfo: reqObj.musicInfo ?? {},
       };
-
       const raw = await Promise.resolve(requestHandler({ source, action, info }));
+      // 严格归一为 { url }，避免脚本回包夹带闭包/Proxy 导致 postMessage 克隆失败
       if (typeof raw === "string") return { url: raw } as MusicUrlRes;
-      return raw;
+      if (raw && typeof raw === "object") {
+        const url = (raw as Record<string, unknown>).url;
+        if (typeof url === "string") return { url } as MusicUrlRes;
+      }
+      throw Object.assign(new Error("lx plugin returned invalid musicUrl result"), {
+        code: "PLUGIN_INVALID_RESULT",
+      });
     });
   };
 
diff --git a/electron/main/plugins/router.ts b/electron/main/plugins/router.ts
index 960b7eb0..4c676848 100644
--- a/electron/main/plugins/router.ts
+++ b/electron/main/plugins/router.ts
@@ -11,10 +11,10 @@ import type {
   MusicUrlRes,
   PluginAction,
   PluginResolveUrlArgs,
-  SourceCapability,
 } from "@shared/types/plugin";
 import { ACTION_TIMEOUTS, PluginErrorCodes } from "@shared/defaults/plugin-api";
 import { pluginRegistry, type PluginRuntime } from "./registry";
+import { pluginLog } from "@main/utils/logger";
 
 let reqSeq = 0;
 const nextRequestId = (): string => `r${Date.now().toString(36)}-${++reqSeq}`;
@@ -53,25 +53,6 @@ const callOn = <T>(
   });
 };
 
-/** 判断某插件的指定源是否支持该动作 */
-const supportsAction = (
-  rt: PluginRuntime,
-  source: string | undefined,
-  action: PluginAction,
-): { ok: boolean; source?: string } => {
-  if (rt.status.state !== "ready") return { ok: false };
-  const sources = rt.status.sources;
-  if (source) {
-    const cap: SourceCapability | undefined = sources[source];
-    if (!cap) return { ok: false };
-    return { ok: cap.actions.includes(action), source };
-  }
-  for (const [key, cap] of Object.entries(sources)) {
-    if (cap.actions.includes(action)) return { ok: true, source: key };
-  }
-  return { ok: false };
-};
-
 export const resolveUrl = async (args: PluginResolveUrlArgs): Promise<MusicUrlRes> => {
   const rt = pluginRegistry.getRuntime(args.pluginId);
   if (!rt) {
@@ -79,17 +60,21 @@ export const resolveUrl = async (args: PluginResolveUrlArgs): Promise<MusicUrlRe
       code: PluginErrorCodes.NOT_FOUND,
     });
   }
-  const check = supportsAction(rt, args.source, "musicUrl");
-  if (!check.ok) {
-    throw Object.assign(
-      new Error(`plugin ${args.pluginId} does not support musicUrl on source ${args.source}`),
-      { code: PluginErrorCodes.ACTION_UNSUPPORTED },
-    );
+  if (rt.status.state !== "ready") {
+    throw Object.assign(new Error(`plugin ${args.pluginId} not ready`), {
+      code: PluginErrorCodes.NOT_READY,
+    });
   }
+  // 不卡 inited 声明，调到 sandbox 让脚本自己判 source；handler 没注册时 sandbox 端回 ACTION_UNREGISTERED
   const params: MusicUrlReq = {
-    source: check.source!,
+    source: args.source ?? "",
     quality: args.quality ?? "hq",
     musicInfo: args.musicInfo,
   };
-  return callOn<MusicUrlRes>(rt, "musicUrl", params, ACTION_TIMEOUTS.musicUrl);
+  try {
+    return await callOn<MusicUrlRes>(rt, "musicUrl", params, ACTION_TIMEOUTS.musicUrl);
+  } catch (err) {
+    pluginLog.warn("resolveUrl rejected", args.pluginId, (err as Error)?.message);
+    throw err;
+  }
 };
diff --git a/electron/main/plugins/sandbox.worker.ts b/electron/main/plugins/sandbox.worker.ts
index efd9341c..2f84395e 100644
--- a/electron/main/plugins/sandbox.worker.ts
+++ b/electron/main/plugins/sandbox.worker.ts
@@ -42,7 +42,62 @@ if (!parentPort) {
   process.exit(1);
 }
 
-const send = (msg: SandboxOut): void => parentPort.postMessage(msg);
+/**
+ * 深度剥离不可克隆字段
+ * 保留 string/number/bool/null/Uint8Array/纯字典/数组；丢函数/symbol；
+ * Buffer 转 Uint8Array、普通对象用 Object.create(null) 重建以脱掉 vm.Context 原型链
+ * @param value - 任意值
+ * @param depth - 递归深度上限
+ */
+const sanitizeForIpc = (value: unknown, depth = 0): unknown => {
+  if (depth > 6) return null;
+  if (value == null) return value;
+  const t = typeof value;
+  if (t === "string" || t === "number" || t === "boolean" || t === "bigint") return value;
+  if (t === "function" || t === "symbol") return undefined;
+  if (Buffer.isBuffer(value)) return new Uint8Array(value);
+  if (value instanceof Uint8Array || value instanceof ArrayBuffer) return value;
+  if (Array.isArray(value)) {
+    return value
+      .map((v) => sanitizeForIpc(v, depth + 1))
+      .filter((v) => v !== undefined);
+  }
+  if (t === "object") {
+    const out: Record<string, unknown> = Object.create(null);
+    try {
+      for (const k of Object.keys(value as object)) {
+        const cleaned = sanitizeForIpc((value as Record<string, unknown>)[k], depth + 1);
+        if (cleaned !== undefined) out[k] = cleaned;
+      }
+    } catch {
+      // Proxy 的 ownKeys 可能抛，直接返回空字典
+    }
+    return out;
+  }
+  return undefined;
+};
+
+/**
+ * 跨 worker→main 边界发消息
+ * 直发；失败 → sanitize 后重发；仍失败 → 抛带 kind 上下文的错误（不是无意义的 "object could not be cloned"）
+ * @param msg - 待发消息
+ */
+const send = (msg: SandboxOut): void => {
+  try {
+    parentPort.postMessage(msg);
+    return;
+  } catch {
+    // 走 sanitize 重试
+    try {
+      parentPort.postMessage(sanitizeForIpc(msg) as SandboxOut);
+      return;
+    } catch (err2) {
+      throw new Error(
+        `[sandbox] postMessage failed for kind=${msg.kind}: ${(err2 as Error).message}`,
+      );
+    }
+  }
+};
 
 /** 等待主进程 init 再启动，避免 TDZ */
 let initialized = false;
@@ -73,7 +128,22 @@ const hostCall = (method: HostCallMethod, args: unknown[]): Promise<unknown> =>
   const callId = nextCallId();
   return new Promise<unknown>((resolve, reject) => {
     hostCallWaiters.set(callId, { resolve, reject });
-    send({ kind: "hostCall", callId, method, args });
+    try {
+      // 提前 sanitize，防止脚本传 Proxy / 闭包 / vm 对象触发 clone 失败
+      send({
+        kind: "hostCall",
+        callId,
+        method,
+        args: sanitizeForIpc(args) as unknown[],
+      });
+    } catch (err) {
+      hostCallWaiters.delete(callId);
+      reject(
+        Object.assign(new Error((err as Error).message), {
+          code: "PLUGIN_ARGS_NOT_CLONEABLE",
+        }),
+      );
+    }
   });
 };
 
@@ -99,10 +169,15 @@ const buildSplayer = (init: Extract<SandboxIn, { kind: "init" }>): HostApi => ({
   },
 
   log: {
-    debug: (...args) => send({ kind: "log", level: "debug", args }),
-    info: (...args) => send({ kind: "log", level: "info", args }),
-    warn: (...args) => send({ kind: "log", level: "warn", args }),
-    error: (...args) => send({ kind: "log", level: "error", args }),
+    // 脚本可能 console.log 整个 response 含 Buffer / vm 对象，先 sanitize 再发
+    debug: (...args) =>
+      send({ kind: "log", level: "debug", args: sanitizeForIpc(args) as unknown[] }),
+    info: (...args) =>
+      send({ kind: "log", level: "info", args: sanitizeForIpc(args) as unknown[] }),
+    warn: (...args) =>
+      send({ kind: "log", level: "warn", args: sanitizeForIpc(args) as unknown[] }),
+    error: (...args) =>
+      send({ kind: "log", level: "error", args: sanitizeForIpc(args) as unknown[] }),
   },
 
   storage: {
@@ -338,7 +413,13 @@ parentPort.on("message", async (event) => {
               error: { code: "PLUGIN_CANCELLED", message: "cancelled" },
             });
           } else {
-            send({ kind: "result", requestId: msg.requestId, ok: true, data });
+            // 兜底 sanitize：lx-shim 已归一过的结果再剥一次原型链，保证跨进程一定 cloneable
+            send({
+              kind: "result",
+              requestId: msg.requestId,
+              ok: true,
+              data: sanitizeForIpc(data),
+            });
           }
         } catch (err) {
           inflight.delete(msg.requestId);
diff --git a/electron/main/utils/logger.ts b/electron/main/utils/logger.ts
index 25fce169..8386334e 100644
--- a/electron/main/utils/logger.ts
+++ b/electron/main/utils/logger.ts
@@ -86,3 +86,4 @@ export const nativeLog = log.scope("native");
 export const streamingLog = log.scope("streaming");
 export const songCacheLog = log.scope("songCache");
 export const serverLog = log.scope("server");
+export const pluginLog = log.scope("plugin");
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index c65a0968..274dba19 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -5,6 +5,7 @@ import { useMediaStore } from "@/stores/media";
 import { useSettingsStore } from "@/stores/settings";
 import { useStatusStore } from "@/stores/status";
 import { useStreamingStore } from "@/stores/streaming";
+import { usePluginsStore } from "@/stores/plugins";
 import * as queue from "@/stores/queue";
 import * as playback from "@/services/playback";
 import * as lyricLoader from "@/services/lyricLoader";
@@ -520,6 +521,8 @@ export const initPlayer = async (): Promise<void> => {
   await settings.syncSystem();
   // 流媒体 store 必须在恢复队列前就绪，否则队列里的 streaming track 拿不到 cfg
   await useStreamingStore().init();
+  // 插件 store 同理：在线歌曲 URL 兜底走插件，列表必须在 loadTrack 前就绪
+  void usePluginsStore().load();
   await queue.restoreQueue();
   const status = useStatusStore();
   // 恢复上次的音量和播放模式到主进程
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index b1a18f57..4391db11 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -38,27 +38,56 @@ const resolveByPlugin = async (track: Track): Promise<string | null> => {
   const pluginSource = PLATFORM_TO_PLUGIN_SOURCE[track.platform];
   if (!pluginSource) return null;
   const plugins = usePluginsStore();
-  const found = plugins.list.find(
-    (info) =>
-      info.enabled &&
-      info.status.state === "ready" &&
-      info.status.sources[pluginSource]?.actions.includes("musicUrl"),
+  // 任意 enabled+ready 插件都拿来试；声明了对应 source 的优先
+  // 不强求 inited 上报，让插件脚本自己按 source 字段路由
+  const ready = plugins.list.filter(
+    (info) => info.enabled && info.status.state === "ready",
   );
-  if (!found) {
+  if (ready.length === 0) {
     handleError(ErrorCode.NO_PLUGIN_AVAILABLE);
     return null;
   }
-  const res = await window.api.plugins.resolveUrl({
-    pluginId: found.manifest.id,
+  const preferred = ready.filter(
+    (info) => info.status.state === "ready" && info.status.sources[pluginSource],
+  );
+  const candidates = preferred.length > 0 ? preferred : ready;
+  // MusicInfoBase 形状；id / songmid / songId 三种别名都给，兼容不同年代脚本
+  const totalSec = track.duration > 0 ? Math.round(track.duration / 1000) : 0;
+  const interval = totalSec > 0
+    ? `${Math.floor(totalSec / 60)
+        .toString()
+        .padStart(2, "0")}:${(totalSec % 60).toString().padStart(2, "0")}`
+    : null;
+  const singer = track.artists.map((artist) => artist.name).join("/");
+  const musicInfo = {
+    id: track.id,
+    songmid: track.id,
+    songId: track.id,
+    name: track.title,
+    singer,
     source: pluginSource,
-    quality: "hq",
-    musicInfo: {
-      songmid: track.id,
-      name: track.title,
-      singer: track.artists.map((artist) => artist.name).join("/"),
+    interval,
+    meta: {
+      songId: track.id,
+      albumName: track.album?.name ?? "",
+      albumId: track.album?.id,
+      picUrl: track.cover ?? null,
     },
-  });
-  return res?.url || null;
+  };
+  for (const plugin of candidates) {
+    try {
+      const res = await window.api.plugins.resolveUrl({
+        pluginId: plugin.manifest.id,
+        source: pluginSource,
+        quality: "hq",
+        musicInfo,
+      });
+      if (res?.url) return res.url;
+    } catch (err) {
+      console.warn("[plugin] resolveUrl failed", plugin.manifest.id, err);
+    }
+  }
+  return null;
 };
 
 /**

From 0c726911dba9998ee4c350ae8957d0bddd36700b Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Fri, 15 May 2026 12:37:51 +0800
Subject: [PATCH 09/33] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=85=BC=E5=AE=B9=E3=80=81QM=20=E6=AD=8C=E8=AF=8D?=
 =?UTF-8?q?=E4=B8=8E=20SMTC=20=E5=9C=A8=E7=BA=BF=E5=B0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/plugins-development.md                | 118 +++++++++++----------
 docs/plugins-usage.md                      |   2 +-
 electron/main/apis/common/lyric/qqmusic.ts |   6 +-
 electron/main/ipc/lyrics.ts                |  11 +-
 electron/main/ipc/player.ts                |  15 +--
 electron/main/plugins/lx-shim.ts           |  43 +++++---
 electron/main/plugins/registry.ts          |   6 ++
 electron/main/plugins/sandbox.ts           |   5 +
 electron/main/plugins/sandbox.worker.ts    |  12 ++-
 electron/main/services/songCache.ts        |  48 ++++++++-
 shared/types/errors.ts                     |   4 +-
 shared/types/player.ts                     |   6 +-
 shared/types/plugin.ts                     |   4 +-
 src/apis/search/qqmusic.ts                 |   2 +
 src/i18n/locales/en-US.json                |   4 +-
 src/i18n/locales/zh-CN.json                |   4 +-
 src/services/audioSource.ts                |  26 +++--
 src/services/lyricLoader.ts                |   4 +-
 18 files changed, 212 insertions(+), 108 deletions(-)

diff --git a/docs/plugins-development.md b/docs/plugins-development.md
index 625aec35..d8ed8c04 100644
--- a/docs/plugins-development.md
+++ b/docs/plugins-development.md
@@ -71,7 +71,7 @@ splayer.on("lyric", async (req) => {
 
 - **没有** Node 内置模块（`fs` / `net` / `child_process` 等），**没有** `require` / `import`
 - **没有** DOM / Electron API（`window` 仅在 lx 兼容模式下作为 `{ lx }` 垫片）
-- **有** 以下全局：`splayer`、`Buffer`、`URL` / `URLSearchParams`、`TextEncoder` / `TextDecoder`、`Promise`、`setTimeout` / `setInterval` / `clearTimeout` / `clearInterval` / `setImmediate` / `clearImmediate` / `queueMicrotask`、`console`（重定向到 `splayer.log`）
+- **有** 以下全局：`splayer`、`Buffer`、`URL` / `URLSearchParams`、`TextEncoder` / `TextDecoder`、`btoa` / `atob`、`Promise`、`setTimeout` / `setInterval` / `clearTimeout` / `clearInterval` / `setImmediate` / `clearImmediate` / `queueMicrotask`、`console`（重定向到 `splayer.log`）
 
 硬性约束：
 
@@ -101,7 +101,7 @@ splayer.register({
   sources: {
     [sourceKey: string]: {
       name: string;                    // 展示名
-      actions: ("musicUrl" | "lyric" | "pic")[];
+      actions: "musicUrl"[];           // 当前 level 1 仅 musicUrl；lyric / pic 计划在 level 2 加入
       qualities?: ("lq" | "sq" | "hq" | "lossless" | "hi-res")[];
     };
   };
@@ -118,29 +118,47 @@ splayer.register({
 | `sq`       | 有损 ≥ 192kbps                                |
 | `lq`       | 有损 < 192kbps                                |
 
-lx 脚本声明的 `128k/192k/320k/flac/flac24bit/ape/wav` 会被垫片自动映射到上面的等级；handler 收到的 `info.type` 也会反向映射为 lx 原生值，老脚本无需改动。
+lx 脚本声明的 `128k/192k/320k/flac/flac24bit/ape/wav` 会被垫片自动映射到上面的等级；**lx 脚本的** handler 经由 `lx.on('request')` 收到的 `info.type` 也会反向映射为 lx 原生值，老脚本无需改动。
 
-**必须在脚本同步部分调用**。注册完后宿主才知道这个插件能做什么、支持哪些源。
+**建议在脚本同步部分调用**。注册完后 UI 才能显示插件支持的源/动作；handler 真正被分派依赖请求里的 `source` 字段，宿主不会因为没 register 就拒绝调用，但 UI 上会看不到能力声明。
 
 ### 注册动作处理器
 
 ```ts
 splayer.on("musicUrl", async (req) => res);
-splayer.on("lyric", async (req) => res);
-splayer.on("pic", async (req) => res);
 ```
 
-每个 action 最多一个 handler，重复注册后者覆盖前者。目前仅这三个动作，搜索和元数据由宿主自身负责。
+每个 action 最多一个 handler，重复注册后者覆盖前者。**当前 level 1 只实现了 `musicUrl`，`lyric` / `pic` 在路线图（计划在 level 2 加入）**，搜索与元数据由宿主自身负责。
 
 #### 请求/响应形状
 
-| Action     | 请求                             | 响应                                    | 默认超时 |
-| ---------- | -------------------------------- | --------------------------------------- | -------- |
-| `musicUrl` | `{ source, quality, musicInfo }` | `{ url, quality?, expire? }`            | 20 s     |
-| `lyric`    | `{ source, musicInfo }`          | `{ lyric, tlyric?, rlyric?, lxlyric? }` | 15 s     |
-| `pic`      | `{ source, musicInfo }`          | `{ url }`                               | 15 s     |
+下表仅列 level 1 已实现的 `musicUrl`：
 
-`musicInfo`：宿主会传至少 `{ songmid }`，可能还带 `name` / `singer` 等用于辅助识别。
+| Action     | 请求                             | 响应                         | 默认超时 |
+| ---------- | -------------------------------- | ---------------------------- | -------- |
+| `musicUrl` | `{ source, quality, musicInfo }` | `{ url, quality?, expire? }` | 20 s     |
+
+`musicInfo` 当前由宿主实际下发的字段集（splayer-native 与 lx 兼容路径共用同一份）：
+
+```ts
+{
+  id: string,           // Track 主键
+  songmid: string,      // 与 id 同值，兼容旧脚本字段名
+  songId: string,       // 与 id 同值，兼容更旧的字段名
+  name: string,         // 歌曲名
+  singer: string,       // "/" 拼接的艺术家串
+  source: string,       // "wy" | "tx" | "kg" | ...，与请求外层 source 一致
+  interval: string|null,// "mm:ss" 格式时长
+  meta: {
+    songId: string,
+    albumName: string,
+    albumId?: string,
+    picUrl?: string,
+  },
+}
+```
+
+如果脚本声明 `@platform lx`（或以 `gz_` 压缩分发），lx 垫片会原样把上述对象交给 `lx.on('request')` 的 handler —— 字段与 `LX.Music.MusicInfo` 形状基本对齐。
 
 handler 抛出的异常会被宿主捕获，错误码透传到上层。超时未返回 → 被主进程 cancel。
 
@@ -194,7 +212,7 @@ splayer.storage.keys(): Promise<string[]>;
 splayer.getSetting<T>(key: string): T | undefined;
 ```
 
-同步读取用户在设置界面给此插件配置的值。设置 schema 通过 `register()` 扩展的能力将在后续 API level 加入；当前 level 1 下返回 `undefined`。
+同步读取用户给此插件配置的值（来源是 `settings.json` 里 `plugins.perPlugin.{id}.{key}`）。未配置时返回 `undefined`。设置 schema 通过 `register()` 声明的能力将在后续 API level 加入；当前只能从外部写入配置，UI 编辑入口尚未开放。
 
 ### 工具（`splayer.utils`）
 
@@ -225,22 +243,23 @@ splayer.utils.zlib.gunzip(data) / gzip(data)
 
 handler 抛异常时可通过 `err.code` 带上错误码；不带的话宿主默认 `PLUGIN_HANDLER_ERROR`。
 
-| Code                        | 含义                    |
-| --------------------------- | ----------------------- |
-| `PLUGIN_NOT_FOUND`          | 找不到指定插件          |
-| `PLUGIN_DISABLED`           | 插件已禁用              |
-| `PLUGIN_NOT_READY`          | 插件未就绪 / 沙箱未启动 |
-| `PLUGIN_ACTION_UNSUPPORTED` | 插件没注册该动作        |
-| `PLUGIN_LOAD_TIMEOUT`       | 加载超 10 秒            |
-| `PLUGIN_SCRIPT_ERROR`       | 脚本语法或运行错误      |
-| `PLUGIN_INVALID_MANIFEST`   | 头部字段缺失或不合法    |
-| `PLUGIN_API_LEVEL_MISMATCH` | 声明 apiLevel 高于宿主  |
-| `PLUGIN_REQUEST_TIMEOUT`    | 动作或 request 超时     |
-| `PLUGIN_CANCELLED`          | 被上层取消              |
-| `PLUGIN_NETWORK_ERROR`      | 网络错误                |
-| `PLUGIN_URL_NOT_ALLOWED`    | URL 协议不在白名单      |
-| `PLUGIN_HANDLER_ERROR`      | handler 默认错误码      |
-| `PLUGIN_WORKER_CRASHED`     | 子进程崩溃              |
+| Code                        | 含义                                                               |
+| --------------------------- | ------------------------------------------------------------------ |
+| `PLUGIN_NOT_FOUND`          | 找不到指定插件                                                     |
+| `PLUGIN_DISABLED`           | 插件已禁用                                                         |
+| `PLUGIN_NOT_READY`          | 插件未就绪 / 沙箱未启动                                            |
+| `PLUGIN_ACTION_UNSUPPORTED` | 插件没注册该动作                                                   |
+| `PLUGIN_LOAD_TIMEOUT`       | 加载超 10 秒                                                       |
+| `PLUGIN_SCRIPT_ERROR`       | 脚本语法或运行错误                                                 |
+| `PLUGIN_INVALID_MANIFEST`   | 头部字段缺失或不合法                                               |
+| `PLUGIN_API_LEVEL_MISMATCH` | 声明 apiLevel 高于宿主                                             |
+| `PLUGIN_REQUEST_TIMEOUT`    | 动作或 request 超时                                                |
+| `PLUGIN_CANCELLED`          | 被上层取消                                                         |
+| `PLUGIN_NETWORK_ERROR`      | 网络错误                                                           |
+| `PLUGIN_URL_NOT_ALLOWED`    | URL 协议不在白名单                                                 |
+| `PLUGIN_HANDLER_ERROR`      | handler 默认错误码                                                 |
+| `PLUGIN_WORKER_CRASHED`     | 子进程崩溃                                                         |
+| `PLUGIN_INVALID_RESULT`     | 插件返回的结果形状不合法（musicUrl 必须是字符串 URL 或 `{ url }`） |
 
 ## 完整示例结构
 
@@ -253,44 +272,31 @@ handler 抛异常时可通过 `err.code` 带上错误码；不带的话宿主默
  * @apiLevel 1
  */
 
-const SOURCES = ["sa", "sb"]; // 你内部的源标识
-
 splayer.register({
   sources: {
-    sa: { name: "SA 音源", actions: ["musicUrl", "lyric"], qualities: ["lq", "hq"] },
-    sb: { name: "SB 音源", actions: ["musicUrl", "pic"], qualities: ["lq", "hq", "lossless"] },
+    sa: { name: "SA 音源", actions: ["musicUrl"], qualities: ["lq", "hq"] },
+    sb: { name: "SB 音源", actions: ["musicUrl"], qualities: ["lq", "hq", "lossless"] },
   },
 });
 
 const apis = {
-  sa: {
-    musicUrl: async ({ musicInfo, quality }) => {
-      /* ... */
-    },
-    lyric: async ({ musicInfo }) => {
-      /* ... */
-    },
+  sa: async ({ musicInfo, quality }) => {
+    /* 调用 SA 接口拿到 url */
+    return { url: "https://...", quality };
   },
-  sb: {
-    musicUrl: async ({ musicInfo, quality }) => {
-      /* ... */
-    },
-    pic: async ({ musicInfo }) => {
-      /* ... */
-    },
+  sb: async ({ musicInfo, quality }) => {
+    /* 调用 SB 接口拿到 url */
+    return { url: "https://...", quality };
   },
 };
 
-const dispatch = (action) => async (req) => {
-  const fn = apis[req.source]?.[action];
-  if (!fn)
+splayer.on("musicUrl", async (req) => {
+  const fn = apis[req.source];
+  if (!fn) {
     throw Object.assign(new Error("source not supported"), { code: "PLUGIN_ACTION_UNSUPPORTED" });
+  }
   return fn(req);
-};
-
-splayer.on("musicUrl", dispatch("musicUrl"));
-splayer.on("lyric", dispatch("lyric"));
-splayer.on("pic", dispatch("pic"));
+});
 ```
 
 ## 调试
diff --git a/docs/plugins-usage.md b/docs/plugins-usage.md
index 1d9deb64..6130220e 100644
--- a/docs/plugins-usage.md
+++ b/docs/plugins-usage.md
@@ -63,7 +63,7 @@ SPlayer-Next 支持通过插件扩展音乐能力，包括 URL 解析、歌词
 我们兼容 lx-music-desktop 的 user_api 脚本。绝大多数 lx 公开脚本可以直接拖入使用，SPlayer 会自动注入 `window.lx` 垫片。两点注意：
 
 - lx 脚本默认只一个能启用（跟 lx 本身一致）
-- 垫片覆盖了 `lx.request` / `lx.on('request')` / `lx.send('inited')` / `lx.utils`（crypto / buffer / zlib / base64）这些最常用的 API，如果脚本用了非主流或 lx 新版 API，可能出现"插件加载错误"
+- 垫片覆盖了 `lx.request` / `lx.on('request')` / `lx.send('inited')` / `lx.utils`（crypto / buffer / zlib）这些最常用的 API，如果脚本用了非主流或 lx 新版 API，可能出现"插件加载错误"
 
 ## 常见问题
 
diff --git a/electron/main/apis/common/lyric/qqmusic.ts b/electron/main/apis/common/lyric/qqmusic.ts
index f7be058b..d621b55e 100644
--- a/electron/main/apis/common/lyric/qqmusic.ts
+++ b/electron/main/apis/common/lyric/qqmusic.ts
@@ -30,9 +30,9 @@ const pickFormatted = (
 };
 
 /**
- * 按 QQMusic song id 直取歌词
- * @param id  数字 id（QM 歌词接口必需）
- * @param mid 字符串 mid（用于 AMLL TTML DB 等外部映射；可选）
+ * 按 QQMusic 数字 songID 直取歌词
+ * @param id  数字 songID
+ * @param mid 字符串 mid（用于 AMLL TTML DB 等外部映射）
  */
 export const getByPlatformId = async (
   id: string,
diff --git a/electron/main/ipc/lyrics.ts b/electron/main/ipc/lyrics.ts
index 296cb00e..36cc4eb4 100644
--- a/electron/main/ipc/lyrics.ts
+++ b/electron/main/ipc/lyrics.ts
@@ -37,7 +37,12 @@ const dedup = <T>(key: string, run: () => Promise<T>): Promise<T> => {
   return promise;
 };
 
-/** 按 (platform, id) 直取 */
+/**
+ * 按 (platform, id) 直取
+ * @param platform 平台
+ * @param id 平台 id
+ * @returns 歌词匹配结果
+ */
 const resolveById = async (platform: Platform, id: string): Promise<LyricMatchResponse> => {
   try {
     switch (platform) {
@@ -91,9 +96,11 @@ const resolveTTMLOverlay = async (
     };
     const fingerprint = buildFingerprint(track);
     const cached = getMatchedId(fingerprint, platform);
-    // QM mid 放前面
+    // QM mid 放前面（AMLL DB 早期 QM 条目以 mid 为文件名的居多）
     if (platform === "qqmusic") push(cached?.extra?.mid);
     if (track.platform === platform) push(track.id);
+    // QM 在线 Track 默认走 byId
+    if (track.platform === platform) push(track.extId);
     push(cached?.platformId);
     if (ids.length === 0) return { ok: true, data: null };
     return { ok: true, data: await fetchTTML(platform, ids) };
diff --git a/electron/main/ipc/player.ts b/electron/main/ipc/player.ts
index a261fd52..a05ba5b6 100644
--- a/electron/main/ipc/player.ts
+++ b/electron/main/ipc/player.ts
@@ -127,7 +127,8 @@ export const registerPlayerIpc = (): void => {
   ipcMain.handle("player:load", async (_event, source: string, options: LoadOptions = {}) => {
     const autoPlay = options.autoPlay ?? true;
     const authoritative = options.meta ?? null;
-    const isStreaming = authoritative?.source === "streaming";
+    // 非本地音源
+    const isRemote = authoritative != null && authoritative.source !== "local";
     const seq = ++loadSeq;
     try {
       const inst = getPlayer();
@@ -177,12 +178,12 @@ export const registerPlayerIpc = (): void => {
         : formatArtists(parseArtists(meta.artist ?? ""));
       const displayAlbum = authoritative?.album?.name ?? parseAlbum(meta.album ?? "")?.name ?? "";
       // 本地封面
-      const localCover = isStreaming ? null : (inst.getCoverRaw() ?? null);
+      const localCover = isRemote ? null : (inst.getCoverRaw() ?? null);
       applyDisplay(displayTitle, displayArtist, displayAlbum, localCover ?? undefined, durationMs);
-      // 流媒体高清封面
-      if (isStreaming && authoritative?.cover && /^https?:\/\//i.test(authoritative.cover)) {
-        const coverUrl = authoritative.cover;
-        void fetchBytes(coverUrl).then((buf) => {
+      // 远端高清封面
+      const remoteCover = isRemote ? (authoritative?.coverOriginal ?? authoritative?.cover) : null;
+      if (remoteCover && /^https?:\/\//i.test(remoteCover)) {
+        void fetchBytes(remoteCover).then((buf) => {
           if (!buf) return;
           if (seq !== loadSeq) return;
           mediaService.setMetadata({
@@ -209,7 +210,7 @@ export const registerPlayerIpc = (): void => {
         },
         mediaInfo: {
           duration: durationMs,
-          cover: isStreaming ? undefined : toCacheUrl(meta.cover),
+          cover: isRemote ? undefined : toCacheUrl(meta.cover),
           quality,
         },
       };
diff --git a/electron/main/plugins/lx-shim.ts b/electron/main/plugins/lx-shim.ts
index 96e8b85d..ea944a94 100644
--- a/electron/main/plugins/lx-shim.ts
+++ b/electron/main/plugins/lx-shim.ts
@@ -179,25 +179,41 @@ export const installLxShim = (
         if (typeof v === "string") headers[k] = v;
         else if (v != null) headers[k] = String(v);
       }
-      // body：保留 string / 字节数组；其它 object 走 JSON 序列化（对齐 needle/json 行为）
-      const rawBody = o.body ?? o.form ?? o.formData;
+      // form/formData 在 needle 里会被 urlencode/multipart 序列化
+      // 这里 body 优先，其次 form/formData 走 URLSearchParams 序列化并补 content-type
+      const rawBody = o.body;
+      const rawForm = (o.form ?? o.formData) as Record<string, unknown> | undefined;
       let body: string | Uint8Array | ArrayBuffer | undefined;
-      if (rawBody == null) body = undefined;
-      else if (typeof rawBody === "string") body = rawBody;
-      else if (rawBody instanceof Uint8Array || rawBody instanceof ArrayBuffer) body = rawBody;
-      else if (typeof rawBody === "object") {
-        try {
-          body = JSON.stringify(rawBody);
-        } catch {
-          body = undefined;
+      let formContentType: string | undefined;
+      if (rawBody != null) {
+        if (typeof rawBody === "string") body = rawBody;
+        else if (rawBody instanceof Uint8Array || rawBody instanceof ArrayBuffer) body = rawBody;
+        else if (typeof rawBody === "object") {
+          try {
+            body = JSON.stringify(rawBody);
+          } catch {
+            body = undefined;
+          }
+        }
+      } else if (rawForm && typeof rawForm === "object") {
+        const usp = new URLSearchParams();
+        for (const [field, value] of Object.entries(rawForm)) {
+          if (value == null) continue;
+          usp.append(field, String(value));
         }
+        body = usp.toString();
+        formContentType = "application/x-www-form-urlencoded";
       }
+      // 默认 content-type 放前面，让用户传的 headers 仍能覆盖
+      const finalHeaders: Record<string, string> = formContentType
+        ? { "content-type": formContentType, ...headers }
+        : headers;
       let aborted = false;
 
       splayer
         .request(url, {
           method,
-          headers,
+          headers: finalHeaders,
           body,
           timeout,
           responseType: "text",
@@ -282,8 +298,11 @@ export const installLxShim = (
                 if (host) mapped.add(host);
               }
               const actions = (cap.actions ?? []).filter(
-                (a): a is PluginAction => a === "musicUrl",
+                (action): action is PluginAction => action === "musicUrl",
               );
+              // 不支持任何宿主已识别动作的源直接丢弃，避免 audioSource 误把
+              // lyric-only 脚本当成 musicUrl 候选去调，结果走到归一校验抛 PLUGIN_INVALID_RESULT
+              if (actions.length === 0) continue;
               normalized[key] = {
                 name: cap.name ?? key,
                 actions,
diff --git a/electron/main/plugins/registry.ts b/electron/main/plugins/registry.ts
index b0f37fcb..0dfa5ccc 100644
--- a/electron/main/plugins/registry.ts
+++ b/electron/main/plugins/registry.ts
@@ -292,6 +292,12 @@ class PluginRegistry extends EventEmitter {
           // 沿当前状态再广播一次，渲染端就能拿到 updateInfo 字段
           this.setStatus(rt, rt.status);
         },
+        onSourcesUpdate: (sources) => {
+          // 异步 lx.send('inited') / splayer.register 触发
+          if (rt.status.state !== "ready") return;
+          const merged = { ...rt.status.sources, ...sources };
+          this.setStatus(rt, { state: "ready", sources: merged });
+        },
         onFatal: (error) => {
           // 同时记录到主日志，避免错误只在 UI 卡片里可见
           coreLog.error(`[plugin:${rt.manifest.id}] fatal ${error.code}: ${error.message}`);
diff --git a/electron/main/plugins/sandbox.ts b/electron/main/plugins/sandbox.ts
index 8b22f576..eda71cf1 100644
--- a/electron/main/plugins/sandbox.ts
+++ b/electron/main/plugins/sandbox.ts
@@ -36,6 +36,8 @@ export interface SandboxEvents {
   onFatal: (error: PluginErrorPayload) => void;
   /** 脚本上报"有新版本" */
   onUpdateAvailable: (info: PluginUpdateInfo) => void;
+  /** sources 增量上报 */
+  onSourcesUpdate: (sources: Record<string, SourceCapability>) => void;
   /** 子进程退出（可能是崩溃或主动 kill）。isCrash=true 表示非主动 kill */
   onExit: (isCrash: boolean, code: number | null) => void;
 }
@@ -245,6 +247,9 @@ export class Sandbox {
       case "updateAvailable":
         this.events.onUpdateAvailable(msg.info);
         return;
+      case "sourcesUpdate":
+        this.events.onSourcesUpdate(msg.sources);
+        return;
       case "log":
         this.events.onLog(msg.level, msg.args);
         return;
diff --git a/electron/main/plugins/sandbox.worker.ts b/electron/main/plugins/sandbox.worker.ts
index 2f84395e..85c98304 100644
--- a/electron/main/plugins/sandbox.worker.ts
+++ b/electron/main/plugins/sandbox.worker.ts
@@ -58,9 +58,7 @@ const sanitizeForIpc = (value: unknown, depth = 0): unknown => {
   if (Buffer.isBuffer(value)) return new Uint8Array(value);
   if (value instanceof Uint8Array || value instanceof ArrayBuffer) return value;
   if (Array.isArray(value)) {
-    return value
-      .map((v) => sanitizeForIpc(v, depth + 1))
-      .filter((v) => v !== undefined);
+    return value.map((v) => sanitizeForIpc(v, depth + 1)).filter((v) => v !== undefined);
   }
   if (t === "object") {
     const out: Record<string, unknown> = Object.create(null);
@@ -159,6 +157,8 @@ const buildSplayer = (init: Extract<SandboxIn, { kind: "init" }>): HostApi => ({
 
   register: (caps) => {
     registeredSources = { ...registeredSources, ...caps.sources };
+    // 异步 register 时主进程的 status.sources 已经定格，主动通知刷新
+    send({ kind: "sourcesUpdate", sources: registeredSources });
   },
 
   on: <A extends PluginAction>(
@@ -281,6 +281,10 @@ const runScript = (init: Extract<SandboxIn, { kind: "init" }>): void => {
     URLSearchParams,
     TextEncoder,
     TextDecoder,
+    // Web 标准 base64
+    // vm.createContext 模式下必须显式注入，否则 ReferenceError 把脚本打成 fatal
+    btoa: (str: string): string => Buffer.from(str, "binary").toString("base64"),
+    atob: (str: string): string => Buffer.from(str, "base64").toString("binary"),
     // console 转发到 log
     console: {
       log: splayer.log.info,
@@ -302,6 +306,8 @@ const runScript = (init: Extract<SandboxIn, { kind: "init" }>): void => {
     handlers,
     (sources) => {
       registeredSources = { ...registeredSources, ...sources };
+      // 同 register：异步 lx.send('inited') 时也要补发 sourcesUpdate
+      send({ kind: "sourcesUpdate", sources: registeredSources });
     },
     (info) => {
       send({ kind: "updateAvailable", info });
diff --git a/electron/main/services/songCache.ts b/electron/main/services/songCache.ts
index c71e0a16..cc62a53f 100644
--- a/electron/main/services/songCache.ts
+++ b/electron/main/services/songCache.ts
@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import fsp from "node:fs/promises";
+import fsp, { type FileHandle } from "node:fs/promises";
 import path from "node:path";
 import crypto from "node:crypto";
 import { Readable } from "node:stream";
@@ -26,6 +26,41 @@ const MAX_CONCURRENT = 2;
 /** 一批 LRU 淘汰数 */
 const EVICT_BATCH = 8;
 
+/**
+ * 拒绝的响应 Content-Type 前缀（命中即不入缓存）
+ * 第三方代理常用 200 包一段 HTML/JSON 错误体冒充音频，这里第一道拦截
+ */
+const REJECTED_MIME_PREFIXES = ["text/html", "application/json", "application/xml", "text/xml"];
+
+const isRejectedMime = (mime: string | null): boolean => {
+  if (!mime) return false;
+  const lower = mime.toLowerCase();
+  return REJECTED_MIME_PREFIXES.some((prefix) => lower.startsWith(prefix));
+};
+
+/**
+ * 文件头是否像音频
+ *
+ * 反向看首字节，挡 HTML/JSON 错误页冒充音频的常见骗局。
+ * 不做正向 magic 枚举（容器太多枚举不全反而漏判），剩余漏网坏文件由 player.ts:228
+ * 的解码失败 invalidate 兜底
+ */
+const looksLikeAudio = async (filePath: string): Promise<boolean> => {
+  let fd: FileHandle | null = null;
+  try {
+    fd = await fsp.open(filePath, "r");
+    const buf = Buffer.alloc(4);
+    const { bytesRead } = await fd.read(buf, 0, 4, 0);
+    if (bytesRead === 0) return false;
+    // '<' = HTML/XML，'{' = JSON 对象，'[' = JSON 数组
+    return buf[0] !== 0x3c && buf[0] !== 0x7b && buf[0] !== 0x5b;
+  } catch {
+    return false;
+  } finally {
+    if (fd) await fd.close().catch(() => {});
+  }
+};
+
 interface InFlight {
   promise: Promise<string | null>;
   controller: AbortController;
@@ -186,6 +221,11 @@ const runDownload = async (
     }
 
     const mime = response.headers.get("content-type");
+    // 拦截第三方代理常用 200+html 错误页冒充音频
+    if (isRejectedMime(mime)) {
+      songCacheLog.warn(`[fetch] reject mime key=${cacheKey} mime=${mime}`);
+      return null;
+    }
     const contentLengthHeader = response.headers.get("content-length");
     const declaredSize = contentLengthHeader ? Number(contentLengthHeader) : NaN;
     if (Number.isFinite(declaredSize) && declaredSize > sizeLimitBytes()) {
@@ -208,6 +248,12 @@ const runDownload = async (
       songCacheLog.warn(`[fetch] post oversize key=${cacheKey} actual=${stat.size}`);
       return null;
     }
+    // 拦截首字节看着像音频才放行
+    if (!(await looksLikeAudio(partPath))) {
+      await fsp.unlink(partPath).catch(() => {});
+      songCacheLog.warn(`[fetch] not audio key=${cacheKey} mime=${mime} size=${stat.size}`);
+      return null;
+    }
 
     await fsp.rename(partPath, finalPath);
     const now = Date.now();
diff --git a/shared/types/errors.ts b/shared/types/errors.ts
index 5743e8bb..c6fd818f 100644
--- a/shared/types/errors.ts
+++ b/shared/types/errors.ts
@@ -23,9 +23,9 @@ export enum ErrorCode {
   FILE_NOT_SELECTED = "FILE_NOT_SELECTED",
 
   // 网络相关
-  /** 网络连接失败 */
+  /** 音源连接失败 */
   NETWORK_ERROR = "NETWORK_ERROR",
-  /** 网络请求超时 */
+  /** 音源响应超时 */
   NETWORK_TIMEOUT = "NETWORK_TIMEOUT",
 
   // 在线源相关
diff --git a/shared/types/player.ts b/shared/types/player.ts
index a5d88b80..c3b7e11e 100644
--- a/shared/types/player.ts
+++ b/shared/types/player.ts
@@ -58,7 +58,11 @@ export interface AudioQuality {
 
 /** 歌曲信息 */
 export interface Track {
+  /** 平台 id */
   id: string;
+  /** 平台二级 id */
+  extId?: string;
+  /** 歌曲来源 */
   source: TrackSource;
   /** 在线平台 */
   platform?: Platform;
@@ -96,7 +100,7 @@ export interface Track {
 export interface TrackDetail {
   quality: AudioQuality;
   embeddedLyric?: string;
-  /** 外部歌词文件列表（同目录下扫描到的所有歌词文件） */
+  /** 外部歌词文件列表 */
   externalLyrics: { format: LyricFormat; path: string }[];
 }
 
diff --git a/shared/types/plugin.ts b/shared/types/plugin.ts
index 71cd2b8b..3270232f 100644
--- a/shared/types/plugin.ts
+++ b/shared/types/plugin.ts
@@ -229,7 +229,9 @@ export type SandboxOut =
       args: unknown[];
     }
   | { kind: "fatal"; error: PluginErrorPayload }
-  | { kind: "pong" };
+  | { kind: "pong" }
+  /** sources 增量上报 */
+  | { kind: "sourcesUpdate"; sources: Record<string, SourceCapability> };
 
 /** worker 调用回宿主的方法名 */
 export type HostCallMethod =
diff --git a/src/apis/search/qqmusic.ts b/src/apis/search/qqmusic.ts
index aab464f8..266906f6 100644
--- a/src/apis/search/qqmusic.ts
+++ b/src/apis/search/qqmusic.ts
@@ -26,8 +26,10 @@ const albumCoverByMid = (mid: string, size = 300): string =>
 const songToTrack = (song: QMSong): Track => {
   const cover = song.albumMid ? albumCoverByMid(song.albumMid) : undefined;
   const coverOriginal = song.albumMid ? albumCoverByMid(song.albumMid, 800) : undefined;
+  // id 优先 mid
   return {
     id: song.mid || song.id,
+    extId: song.mid && song.id !== song.mid ? song.id : undefined,
     source: "online",
     platform: "qqmusic",
     title: song.name,
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 9ee2c4cb..9145b03c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1069,8 +1069,8 @@
     "FILE_NO_AUDIO_STREAM": "No audio stream found in file",
     "FILE_DECODE_ERROR": "Audio decode failed",
     "FILE_NOT_SELECTED": "No file selected",
-    "NETWORK_ERROR": "Network connection failed",
-    "NETWORK_TIMEOUT": "Network request timed out",
+    "NETWORK_ERROR": "Failed to reach audio source, check network or try another",
+    "NETWORK_TIMEOUT": "Audio source timed out, check network or try another",
     "URL_RESOLVE_FAILED": "Failed to get playback URL",
     "NO_PLUGIN_AVAILABLE": "No plugin available for this platform",
     "SCAN_NO_DIRS": "No scan directories configured",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 6beb4fbe..fed8b35c 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -1069,8 +1069,8 @@
     "FILE_NO_AUDIO_STREAM": "文件中未找到音频流",
     "FILE_DECODE_ERROR": "音频解码失败",
     "FILE_NOT_SELECTED": "未选择文件",
-    "NETWORK_ERROR": "网络连接失败，请检查网络",
-    "NETWORK_TIMEOUT": "网络请求超时",
+    "NETWORK_ERROR": "音源连接失败，请检查网络或更换音源",
+    "NETWORK_TIMEOUT": "音源响应超时，请检查网络或更换音源",
     "URL_RESOLVE_FAILED": "无法获取播放地址",
     "NO_PLUGIN_AVAILABLE": "未找到支持该平台的插件",
     "SCAN_NO_DIRS": "未配置扫描目录",
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index 4391db11..3278d35c 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -38,26 +38,24 @@ const resolveByPlugin = async (track: Track): Promise<string | null> => {
   const pluginSource = PLATFORM_TO_PLUGIN_SOURCE[track.platform];
   if (!pluginSource) return null;
   const plugins = usePluginsStore();
-  // 任意 enabled+ready 插件都拿来试；声明了对应 source 的优先
-  // 不强求 inited 上报，让插件脚本自己按 source 字段路由
-  const ready = plugins.list.filter(
-    (info) => info.enabled && info.status.state === "ready",
+  const candidates = plugins.list.filter(
+    (info) =>
+      info.enabled &&
+      info.status.state === "ready" &&
+      info.status.sources[pluginSource]?.actions.includes("musicUrl"),
   );
-  if (ready.length === 0) {
+  if (candidates.length === 0) {
     handleError(ErrorCode.NO_PLUGIN_AVAILABLE);
     return null;
   }
-  const preferred = ready.filter(
-    (info) => info.status.state === "ready" && info.status.sources[pluginSource],
-  );
-  const candidates = preferred.length > 0 ? preferred : ready;
   // MusicInfoBase 形状；id / songmid / songId 三种别名都给，兼容不同年代脚本
   const totalSec = track.duration > 0 ? Math.round(track.duration / 1000) : 0;
-  const interval = totalSec > 0
-    ? `${Math.floor(totalSec / 60)
-        .toString()
-        .padStart(2, "0")}:${(totalSec % 60).toString().padStart(2, "0")}`
-    : null;
+  const interval =
+    totalSec > 0
+      ? `${Math.floor(totalSec / 60)
+          .toString()
+          .padStart(2, "0")}:${(totalSec % 60).toString().padStart(2, "0")}`
+      : null;
   const singer = track.artists.map((artist) => artist.name).join("/");
   const musicInfo = {
     id: track.id,
diff --git a/src/services/lyricLoader.ts b/src/services/lyricLoader.ts
index 0ae1aadc..6a174e84 100644
--- a/src/services/lyricLoader.ts
+++ b/src/services/lyricLoader.ts
@@ -53,9 +53,11 @@ const fetchFromPlatform = async (
   track: Track,
 ): Promise<OnlineResult | null> => {
   const mode = track.platform === platform ? "byId" : "byQuery";
+  // QM lyric 接口要数字 songID
+  const lookupId = platform === "qqmusic" ? (track.extId ?? track.id) : track.id;
   const resp =
     mode === "byId"
-      ? await window.api.lyrics.matchById(platform, track.id)
+      ? await window.api.lyrics.matchById(platform, lookupId)
       : await window.api.lyrics.matchByQuery(platform, track);
   if (!resp.ok || !resp.data) return null;
   const data = resp.data;

From 65f67e14acf8f9ce828d68fe15f362e8a975415e Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Fri, 15 May 2026 18:09:47 +0800
Subject: [PATCH 10/33] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=20NCM=20?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9B=B8=E5=85=B3=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   5 +
 electron/main/apis/netease/modules/index.ts   |   2 +
 .../main/apis/netease/modules/song_detail.ts  |  24 ++
 shared/types/player.ts                        |  10 +
 src/apis/search/hot.ts                        |  51 +++
 src/apis/search/netease.ts                    |  40 +--
 src/apis/search/suggest.ts                    |  86 +++++
 src/apis/song/netease.ts                      |  35 ++
 src/apis/url/netease.ts                       |  27 --
 src/components/layout/NavSearch.vue           | 333 +++++++++++++++---
 src/components/list/PlaylistPanel.vue         |  10 +-
 src/components/list/SongList.vue              |  18 +-
 .../player/FullPlayer/PlayerData.vue          |  50 ++-
 src/components/player/TrackInfo.vue           |  37 +-
 src/components/ui/SDialog.vue                 |  19 +-
 src/core/player/index.ts                      |  16 +
 src/i18n/locales/en-US.json                   |   4 +-
 src/i18n/locales/zh-CN.json                   |   4 +-
 src/services/audioSource.ts                   |   2 +-
 src/stores/data.ts                            |  45 +++
 src/types/netease.ts                          | 128 +++++++
 src/utils/format.ts                           |  17 +
 src/utils/netease.ts                          |  97 +++++
 uno.config.ts                                 |   8 +
 24 files changed, 923 insertions(+), 145 deletions(-)
 create mode 100644 electron/main/apis/netease/modules/song_detail.ts
 create mode 100644 src/apis/search/hot.ts
 create mode 100644 src/apis/search/suggest.ts
 create mode 100644 src/apis/song/netease.ts
 delete mode 100644 src/apis/url/netease.ts
 create mode 100644 src/stores/data.ts
 create mode 100644 src/types/netease.ts
 create mode 100644 src/utils/netease.ts

diff --git a/components.d.ts b/components.d.ts
index a415a656..4a554293 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -74,14 +74,18 @@ declare module 'vue' {
     IconLucideCircleCheck: typeof import('~icons/lucide/circle-check')['default']
     IconLucideCircleX: typeof import('~icons/lucide/circle-x')['default']
     IconLucideDatabase: typeof import('~icons/lucide/database')['default']
+    IconLucideDisc: typeof import('~icons/lucide/disc')['default']
     IconLucideDisc3: typeof import('~icons/lucide/disc3')['default']
     IconLucideEllipsis: typeof import('~icons/lucide/ellipsis')['default']
     IconLucideExternalLink: typeof import('~icons/lucide/external-link')['default']
+    IconLucideFlame: typeof import('~icons/lucide/flame')['default']
+    IconLucideFlameKindling: typeof import('~icons/lucide/flame-kindling')['default']
     IconLucideFolder: typeof import('~icons/lucide/folder')['default']
     IconLucideFolderOpen: typeof import('~icons/lucide/folder-open')['default']
     IconLucideFolderPlus: typeof import('~icons/lucide/folder-plus')['default']
     IconLucideGithub: typeof import('~icons/lucide/github')['default']
     IconLucideHardDrive: typeof import('~icons/lucide/hard-drive')['default']
+    IconLucideHistory: typeof import('~icons/lucide/history')['default']
     IconLucideInfo: typeof import('~icons/lucide/info')['default']
     IconLucideLink: typeof import('~icons/lucide/link')['default']
     IconLucideListMusic: typeof import('~icons/lucide/list-music')['default']
@@ -118,6 +122,7 @@ declare module 'vue' {
     IconLucideVolume2: typeof import('~icons/lucide/volume2')['default']
     IconLucideVolumeX: typeof import('~icons/lucide/volume-x')['default']
     IconLucideX: typeof import('~icons/lucide/x')['default']
+    IconLucideZap: typeof import('~icons/lucide/zap')['default']
     IconSpLossless: typeof import('~icons/sp/lossless')['default']
     LyricFormatOrderConfig: typeof import('./src/components/settings/custom/LyricFormatOrderConfig.vue')['default']
     Lyrics: typeof import('./src/components/player/Lyrics/index.vue')['default']
diff --git a/electron/main/apis/netease/modules/index.ts b/electron/main/apis/netease/modules/index.ts
index 3bd809b1..4387d751 100644
--- a/electron/main/apis/netease/modules/index.ts
+++ b/electron/main/apis/netease/modules/index.ts
@@ -49,6 +49,7 @@ import lyric_new from "./lyric_new";
 import cloud_lyric_get from "./cloud_lyric_get";
 
 // 播放
+import song_detail from "./song_detail";
 import song_url from "./song_url";
 
 export const modules: Record<string, NeteaseModule> = {
@@ -89,5 +90,6 @@ export const modules: Record<string, NeteaseModule> = {
   lyric_new,
   cloud_lyric_get,
 
+  song_detail,
   song_url,
 };
diff --git a/electron/main/apis/netease/modules/song_detail.ts b/electron/main/apis/netease/modules/song_detail.ts
new file mode 100644
index 00000000..d8714a60
--- /dev/null
+++ b/electron/main/apis/netease/modules/song_detail.ts
@@ -0,0 +1,24 @@
+/**
+ * 获取歌曲详情
+ *
+ * params:
+ * - ids   歌曲 id（单个或逗号分隔）
+ *
+ * 响应：`{ code, songs: [{ id, name, ar, al, dt, ... }], privileges: [...] }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const song_detail: NeteaseModule = (query, request) => {
+  const ids = String(query.ids ?? "")
+    .split(",")
+    .map((s) => s.trim())
+    .filter(Boolean);
+  const data = {
+    c: `[${ids.map((id) => `{"id":${id}}`).join(",")}]`,
+  };
+  return request("/api/v3/song/detail", data, createOption(query));
+};
+
+export default song_detail;
diff --git a/shared/types/player.ts b/shared/types/player.ts
index c3b7e11e..b30c28da 100644
--- a/shared/types/player.ts
+++ b/shared/types/player.ts
@@ -56,6 +56,14 @@ export interface AudioQuality {
   codec: string;
 }
 
+/**
+ * 付费等级
+ * - 0: 免费
+ * - 1: VIP
+ * - 2: 需购买（数字专辑等）
+ */
+export type TrackFee = 0 | 1 | 2;
+
 /** 歌曲信息 */
 export interface Track {
   /** 平台 id */
@@ -94,6 +102,8 @@ export interface Track {
   ctime?: number;
   /** 音质信息 */
   quality?: AudioQuality;
+  /** 付费等级 */
+  fee?: TrackFee;
 }
 
 /** 歌曲详细信息 */
diff --git a/src/apis/search/hot.ts b/src/apis/search/hot.ts
new file mode 100644
index 00000000..60fcd834
--- /dev/null
+++ b/src/apis/search/hot.ts
@@ -0,0 +1,51 @@
+/**
+ * 热搜（仅网易云），10min 缓存
+ */
+
+import { neteaseCall } from "@/apis/netease";
+
+export interface HotSearchItem {
+  /** 关键词 */
+  keyword: string;
+  /** 描述/补充 */
+  content?: string;
+  /** 图标 url */
+  iconUrl?: string;
+  /** 热度 */
+  score?: number;
+}
+
+interface NeteaseHotDetailResp {
+  data?: Array<{
+    searchWord: string;
+    score?: number;
+    content?: string;
+    iconUrl?: string;
+    iconType?: number;
+  }>;
+}
+
+const CACHE_TTL = 10 * 60 * 1000;
+
+let cache: { items: HotSearchItem[]; at: number } | null = null;
+
+/**
+ * 取网易云热搜（按 TTL 缓存）
+ */
+export const getHotSearches = async (): Promise<HotSearchItem[]> => {
+  const now = Date.now();
+  if (cache && now - cache.at < CACHE_TTL) return cache.items;
+
+  const res = await neteaseCall<NeteaseHotDetailResp>("search_hot_detail");
+  const items: HotSearchItem[] = (res.data ?? [])
+    .filter((row) => row.searchWord)
+    .map((row) => ({
+      keyword: row.searchWord,
+      content: row.content,
+      iconUrl: row.iconUrl,
+      score: row.score,
+    }));
+
+  cache = { items, at: now };
+  return items;
+};
diff --git a/src/apis/search/netease.ts b/src/apis/search/netease.ts
index 464f18f5..3eee66c0 100644
--- a/src/apis/search/netease.ts
+++ b/src/apis/search/netease.ts
@@ -1,15 +1,10 @@
 import type { Track } from "@shared/types/player";
 import type { CoverItem } from "@/types/artist";
+import type { NeteaseSong } from "@/types/netease";
 import { netease as neteaseApi } from "@/apis/netease";
+import { songsToTracks, withPicSize } from "@/utils/netease";
 import type { SearchResult } from "./index";
 
-interface NeteaseSong {
-  id: number;
-  name: string;
-  ar: { id: number; name: string }[];
-  al: { id: number; name: string; picUrl: string };
-  dt: number;
-}
 interface NeteaseAlbum {
   id: number;
   name: string;
@@ -48,13 +43,6 @@ interface CloudSearchBody {
 /** cloudsearch type 编码 */
 const TYPE = { songs: 1, albums: 10, artists: 100, playlists: 1000 } as const;
 
-/** 给 p1/p2.music.126.net 的封面 URL 拼尺寸，原图很大、列表只要 300x300 */
-const withSize = (url: string | undefined, size = 300): string | undefined => {
-  if (!url) return undefined;
-  if (url.includes("?param=")) return url;
-  return `${url}?param=${size}y${size}`;
-};
-
 const call = (
   type: keyof typeof TYPE,
   keyword: string,
@@ -68,26 +56,10 @@ const call = (
     limit,
   });
 
-const songToTrack = (song: NeteaseSong): Track => {
-  const cover = withSize(song.al?.picUrl);
-  const coverOriginal = withSize(song.al?.picUrl, 1024);
-  return {
-    id: String(song.id),
-    source: "online",
-    platform: "netease",
-    title: song.name,
-    artists: (song.ar ?? []).map((artist) => ({ id: String(artist.id), name: artist.name })),
-    album: song.al ? { id: String(song.al.id), name: song.al.name, cover } : undefined,
-    duration: song.dt ?? 0,
-    cover,
-    coverOriginal,
-  };
-};
-
 const albumToCover = (album: NeteaseAlbum): CoverItem => ({
   id: String(album.id),
   title: album.name,
-  cover: withSize(album.picUrl),
+  cover: withPicSize(album.picUrl),
   subtitle: (album.artists ?? []).map((artist) => artist.name).join(" / "),
   trackCount: album.size ?? 0,
 });
@@ -95,7 +67,7 @@ const albumToCover = (album: NeteaseAlbum): CoverItem => ({
 const artistToCover = (artist: NeteaseArtist): CoverItem => ({
   id: String(artist.id),
   title: artist.name,
-  cover: withSize(artist.img1v1Url ?? artist.picUrl),
+  cover: withPicSize(artist.img1v1Url ?? artist.picUrl),
   subtitle: "",
   trackCount: artist.albumSize ?? 0,
 });
@@ -103,7 +75,7 @@ const artistToCover = (artist: NeteaseArtist): CoverItem => ({
 const playlistToCover = (playlist: NeteasePlaylist): CoverItem => ({
   id: String(playlist.id),
   title: playlist.name,
-  cover: withSize(playlist.coverImgUrl),
+  cover: withPicSize(playlist.coverImgUrl),
   subtitle: playlist.creator?.nickname ?? "",
   trackCount: playlist.trackCount ?? 0,
 });
@@ -114,7 +86,7 @@ export const songs = async (
   limit: number,
 ): Promise<SearchResult<Track>> => {
   const body = await call("songs", keyword, offset, limit);
-  const items = (body?.result?.songs ?? []).map(songToTrack);
+  const items = songsToTracks(body?.result?.songs);
   const total = body?.result?.songCount ?? items.length;
   return { items, total, hasMore: offset + items.length < total };
 };
diff --git a/src/apis/search/suggest.ts b/src/apis/search/suggest.ts
new file mode 100644
index 00000000..ea0eac55
--- /dev/null
+++ b/src/apis/search/suggest.ts
@@ -0,0 +1,86 @@
+/**
+ * 搜索建议
+ */
+
+import { neteaseCall } from "@/apis/netease";
+
+export interface SuggestSongItem {
+  id: number;
+  name: string;
+  /** 多个歌手用 " / " 连接 */
+  artist?: string;
+  album?: string;
+}
+
+export interface SuggestSimpleItem {
+  id: number;
+  name: string;
+  subtitle?: string;
+}
+
+export interface SuggestData {
+  songs: SuggestSongItem[];
+  albums: SuggestSimpleItem[];
+  artists: SuggestSimpleItem[];
+  playlists: SuggestSimpleItem[];
+}
+
+interface NeteaseSuggestResp {
+  result?: {
+    songs?: Array<{
+      id: number;
+      name: string;
+      artists?: Array<{ name: string }>;
+      album?: { name: string };
+    }>;
+    albums?: Array<{
+      id: number;
+      name: string;
+      artist?: { name: string };
+    }>;
+    artists?: Array<{ id: number; name: string }>;
+    playlists?: Array<{ id: number; name: string }>;
+  };
+}
+
+const EMPTY: SuggestData = { songs: [], albums: [], artists: [], playlists: [] };
+
+/**
+ * 取网易云搜索建议
+ * @param keyword - 关键词
+ * @returns 分类建议；keyword 空 / 接口失败时返回空集
+ */
+export const getSearchSuggest = async (keyword: string): Promise<SuggestData> => {
+  const word = keyword.trim();
+  if (!word) return { ...EMPTY };
+
+  const res = await neteaseCall<NeteaseSuggestResp>("search_suggest", {
+    keywords: word,
+    type: "web",
+  });
+  const raw = res.result ?? {};
+  return {
+    songs: (raw.songs ?? []).map((song) => ({
+      id: song.id,
+      name: song.name,
+      artist: (song.artists ?? [])
+        .map((artist) => artist.name)
+        .filter(Boolean)
+        .join(" / "),
+      album: song.album?.name,
+    })),
+    albums: (raw.albums ?? []).map((album) => ({
+      id: album.id,
+      name: album.name,
+      subtitle: album.artist?.name,
+    })),
+    artists: (raw.artists ?? []).map((artist) => ({
+      id: artist.id,
+      name: artist.name,
+    })),
+    playlists: (raw.playlists ?? []).map((playlist) => ({
+      id: playlist.id,
+      name: playlist.name,
+    })),
+  };
+};
diff --git a/src/apis/song/netease.ts b/src/apis/song/netease.ts
new file mode 100644
index 00000000..6f6bf815
--- /dev/null
+++ b/src/apis/song/netease.ts
@@ -0,0 +1,35 @@
+import type { Track } from "@shared/types/player";
+import type { NeteaseSong } from "@/types/netease";
+import { netease as neteaseApi } from "@/apis/netease";
+import { songsToTracks } from "@/utils/netease";
+
+/**
+ * 按 ID 批量取歌曲详情
+ * @param ids - 网易云 songId 列表
+ * @returns 与传入 ids 对应的 Track 列表
+ */
+export const songsByIds = async (ids: Array<string | number>): Promise<Track[]> => {
+  const cleaned = ids.map((v) => String(v).trim()).filter(Boolean);
+  if (cleaned.length === 0) return [];
+  const body = await neteaseApi.song_detail<{ songs?: NeteaseSong[] }>({ ids: cleaned.join(",") });
+  return songsToTracks(body?.songs);
+};
+
+interface SongUrlResp {
+  data?: {
+    url: string | null;
+    freeTrialInfo: unknown | null;
+  }[];
+}
+
+/**
+ * 解析网易云 Track 的可播放 URL
+ * VIP 试听片段 / 无版权 → 返回 null
+ * @param track - track.id 为云端 songId
+ */
+export const resolveNeteaseUrl = async (track: Track): Promise<string | null> => {
+  const body = await neteaseApi.song_url<SongUrlResp>({ id: track.id, level: "exhigh" });
+  const item = body?.data?.[0];
+  if (!item?.url || item.freeTrialInfo) return null;
+  return item.url;
+};
diff --git a/src/apis/url/netease.ts b/src/apis/url/netease.ts
deleted file mode 100644
index 029f41c0..00000000
--- a/src/apis/url/netease.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Track } from "@shared/types/player";
-import { netease } from "@/apis/netease";
-
-interface SongUrlItem {
-  url: string | null;
-  freeTrialInfo: unknown | null;
-}
-
-interface SongUrlResp {
-  data?: SongUrlItem[];
-}
-
-/**
- * 调网易云 song_url v1 拿播放地址
- * @param track - 要解析的 track
- * @returns 解析出的播放地址，如果无法解析则返回 null
- * @param track 网易云 Track（track.id 为云端 songId）
- */
-export const resolveNeteaseUrl = async (track: Track): Promise<string | null> => {
-  const body = await netease.song_url<SongUrlResp>({
-    id: track.id,
-    level: "exhigh",
-  });
-  const item = body?.data?.[0];
-  if (!item?.url || item.freeTrialInfo) return null;
-  return item.url;
-};
diff --git a/src/components/layout/NavSearch.vue b/src/components/layout/NavSearch.vue
index 39be3cf6..d0b075f1 100644
--- a/src/components/layout/NavSearch.vue
+++ b/src/components/layout/NavSearch.vue
@@ -1,73 +1,302 @@
 <script setup lang="ts">
-const { t } = useI18n();
+import { useDataStore } from "@/stores/data";
+import { getHotSearches, type HotSearchItem } from "@/apis/search/hot";
+import { getSearchSuggest, type SuggestData } from "@/apis/search/suggest";
+import { songsByIds as getNeteaseSongsByIds } from "@/apis/song/netease";
+import { formatCompact } from "@/utils/format";
+import * as player from "@/core/player";
+
+const { t, locale } = useI18n();
 const router = useRouter();
+const data = useDataStore();
 
 const dialogOpen = ref(false);
 const searchQuery = ref("");
 
 const trimmedQuery = computed(() => searchQuery.value.trim());
 
-/** 提交搜索：跳到搜索结果页并关闭弹窗 */
-const onSubmit = (): void => {
-  if (!trimmedQuery.value) return;
-  router.push({ name: "search", query: { q: trimmedQuery.value } });
+/** 热搜结果 */
+const hotItems = ref<HotSearchItem[]>([]);
+
+const loadHot = async (): Promise<void> => {
+  try {
+    hotItems.value = await getHotSearches();
+  } catch (err) {
+    console.warn("[NavSearch] hot search failed:", err);
+    hotItems.value = [];
+  }
+};
+
+/** 搜索建议 */
+const EMPTY_SUGGEST: SuggestData = { songs: [], albums: [], artists: [], playlists: [] };
+const suggest = ref<SuggestData>({ ...EMPTY_SUGGEST });
+
+const loadSuggest = useDebounceFn(async (keyword: string) => {
+  try {
+    suggest.value = await getSearchSuggest(keyword);
+  } catch (err) {
+    console.warn("[NavSearch] suggest failed:", err);
+  }
+}, 300);
+
+/** 跳转到搜索页 */
+const submit = (raw: string): void => {
+  const word = raw.trim();
+  if (!word) return;
+  data.addSearchHistory(word);
+  router.push({ name: "search", query: { q: word } });
+  dialogOpen.value = false;
+};
+
+const onSubmit = (): void => submit(trimmedQuery.value);
+const onPickKeyword = (keyword: string): void => submit(keyword);
+const onRemoveHistory = (keyword: string): void => data.removeSearchHistory(keyword);
+const onClearHistory = (): void => data.clearSearchHistory();
+
+/** 单曲建议点击：取详情后插队播放，关闭弹窗；用户输入的关键词记入历史 */
+const onPickSong = async (id: number): Promise<void> => {
+  if (trimmedQuery.value) data.addSearchHistory(trimmedQuery.value);
   dialogOpen.value = false;
+  try {
+    const [track] = await getNeteaseSongsByIds([id]);
+    if (track) await player.playNow(track);
+  } catch (err) {
+    console.warn("[NavSearch] play suggest song failed:", err);
+  }
 };
+
+const bodyRef = ref<HTMLElement | null>(null);
+const bodyHeight = ref<number | null>(null);
+
+useResizeObserver(bodyRef, (entries) => {
+  if (bodyHeight.value === null) return;
+  const next = entries[0]?.borderBoxSize?.[0]?.blockSize;
+  if (next != null) bodyHeight.value = next;
+});
+
+const bodyStyle = computed(() =>
+  bodyHeight.value !== null ? { height: `${bodyHeight.value}px` } : undefined,
+);
+
+watch(trimmedQuery, (kw, prev) => {
+  // 输入变化即清空建议
+  suggest.value = { ...EMPTY_SUGGEST };
+  if (kw) {
+    // 进入搜索建议
+    if (!prev) bodyHeight.value = 0;
+    loadSuggest(kw);
+  }
+});
+
+watch(dialogOpen, (open) => {
+  if (open) {
+    searchQuery.value = "";
+    loadHot();
+  } else {
+    // 关闭复位：下次开弹仍是 auto 起手
+    bodyHeight.value = null;
+  }
+});
+
+onMounted(() => {
+  loadHot();
+});
 </script>
 
 <template>
-  <!-- 触发器：只读 SInput，点击打开弹窗 -->
-  <SInput
-    readonly
-    round
-    size="large"
-    class="app-no-drag w-60 cursor-pointer"
-    :placeholder="t('nav.searchPlaceholder')"
+  <!-- 搜索框触发器 -->
+  <div
+    role="button"
+    :aria-label="t('nav.searchPlaceholder')"
+    class="app-no-drag w-60 h-10 px-4 cursor-pointer flex items-center gap-2 rounded-full border border-solid bg-on-surface/3 border-on-surface/15 hover:bg-on-surface/10 hover:border-on-surface/25 transition-colors duration-250 select-none"
     @click="dialogOpen = true"
+    @mousedown.prevent
   >
-    <template #prefix>
-      <IconLucideSearch class="size-4 text-on-surface-variant/50 shrink-0" />
-    </template>
-  </SInput>
-
+    <IconLucideSearch class="size-4 text-on-surface-variant/50 shrink-0" />
+    <span class="flex-1 min-w-0 truncate text-base text-on-surface-variant/40">
+      {{ t("nav.searchPlaceholder") }}
+    </span>
+  </div>
   <!-- 搜索弹窗 -->
-  <SDialog v-model:open="dialogOpen" :closable="false" width="560px">
-    <div class="flex flex-col gap-3">
-      <SInput
-        v-model="searchQuery"
-        :placeholder="t('nav.searchPlaceholder')"
-        size="large"
-        clearable
-        @keydown.enter="onSubmit"
-      >
-        <template #prefix>
-          <IconLucideSearch class="size-4 text-on-surface-variant/50 shrink-0" />
-        </template>
-      </SInput>
-      <!-- 快捷操作区 -->
-      <div v-if="trimmedQuery" class="flex flex-col gap-1.5">
-        <div class="px-2 text-xs text-on-surface-variant/60">
-          {{ t("nav.searchSection.quick") }}
-        </div>
-        <button
-          type="button"
-          class="flex items-center gap-3 px-3 py-2.5 rounded-lg cursor-pointer text-left bg-transparent border-none hover:bg-on-surface/5 transition-colors duration-200"
-          @click="onSubmit"
+  <SDialog
+    v-model:open="dialogOpen"
+    :closable="false"
+    :content-style="{ padding: 0 }"
+    width="560px"
+    top="12vh"
+  >
+    <div class="flex flex-col">
+      <!-- 顶栏：输入框 -->
+      <div class="px-4 pt-4 pb-3">
+        <SInput
+          v-model="searchQuery"
+          :placeholder="t('nav.searchPlaceholder')"
+          size="large"
+          clearable
+          @keydown.enter="onSubmit"
         >
-          <IconLucideSearch class="size-4 text-on-surface-variant/60 shrink-0" />
-          <span class="flex-1 truncate text-sm text-on-surface">
-            {{ t("nav.searchGoto", { keyword: trimmedQuery }) }}
-          </span>
-          <IconLucideArrowRight class="size-4 text-on-surface-variant/40 shrink-0" />
-        </button>
+          <template #prefix>
+            <IconLucideSearch class="size-4 text-on-surface-variant/50 shrink-0" />
+          </template>
+        </SInput>
       </div>
-      <!-- 空态：后续接入搜索历史、热门等 -->
-      <div
-        v-else
-        class="min-h-[200px] flex flex-col items-center justify-center gap-2 text-on-surface-variant/40"
-      >
-        <IconLucideSearch class="size-8" />
-        <span class="text-xs">{{ t("nav.searchEmpty") }}</span>
+      <div class="overflow-hidden transition-[height] duration-300 ease-out" :style="bodyStyle">
+        <div ref="bodyRef" class="max-h-[65vh] overflow-y-auto px-4 pb-4 flex flex-col gap-4">
+          <template v-if="trimmedQuery">
+            <!-- 快捷跳转 -->
+            <div class="flex flex-col gap-1.5">
+              <div class="px-2 flex items-center gap-1.5 text-sm font-medium text-primary">
+                <IconLucideZap class="size-4" />
+                <span>{{ t("nav.searchSection.quick") }}</span>
+              </div>
+              <div
+                class="min-w-0 flex items-center gap-2.5 px-2 py-1.5 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors duration-200"
+                @click="onSubmit"
+              >
+                <span class="flex-1 truncate text-sm text-on-surface">
+                  {{ t("nav.searchGoto", { keyword: trimmedQuery }) }}
+                </span>
+                <IconLucideArrowRight class="size-4 shrink-0 text-on-surface-variant" />
+              </div>
+            </div>
+            <div v-if="suggest.songs.length > 0" class="flex flex-col gap-1.5">
+              <div class="px-2 flex items-center gap-1.5 text-sm font-medium text-primary">
+                <IconLucideMusic class="size-4" />
+                <span>{{ t("search.tabs.songs") }}</span>
+              </div>
+              <div
+                v-for="song in suggest.songs"
+                :key="song.id"
+                class="min-w-0 flex items-center gap-2.5 px-2 py-1.5 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors duration-200"
+                @click="onPickSong(song.id)"
+              >
+                <div class="flex-1 min-w-0 flex flex-col leading-tight">
+                  <span class="truncate text-sm text-on-surface">{{ song.name }}</span>
+                  <span v-if="song.artist" class="truncate text-xs text-on-surface-variant">
+                    {{ song.artist }}
+                    <template v-if="song.album">· {{ song.album }}</template>
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div v-if="suggest.artists.length > 0" class="flex flex-col gap-1.5">
+              <div class="px-2 flex items-center gap-1.5 text-sm font-medium text-primary">
+                <IconLucideUser class="size-4" />
+                <span>{{ t("search.tabs.artists") }}</span>
+              </div>
+              <div
+                v-for="artist in suggest.artists"
+                :key="artist.id"
+                class="min-w-0 flex items-center gap-2.5 px-2 py-1.5 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors duration-200"
+                @click="onPickKeyword(artist.name)"
+              >
+                <span class="flex-1 truncate text-sm text-on-surface">{{ artist.name }}</span>
+              </div>
+            </div>
+            <div v-if="suggest.albums.length > 0" class="flex flex-col gap-1.5">
+              <div class="px-2 flex items-center gap-1.5 text-sm font-medium text-primary">
+                <IconLucideDisc class="size-4" />
+                <span>{{ t("search.tabs.albums") }}</span>
+              </div>
+              <div
+                v-for="album in suggest.albums"
+                :key="album.id"
+                class="min-w-0 flex items-center gap-2.5 px-2 py-1.5 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors duration-200"
+                @click="onPickKeyword(album.name)"
+              >
+                <div class="flex-1 min-w-0 flex flex-col leading-tight">
+                  <span class="truncate text-sm text-on-surface">{{ album.name }}</span>
+                  <span v-if="album.subtitle" class="truncate text-xs text-on-surface-variant">
+                    {{ album.subtitle }}
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div v-if="suggest.playlists.length > 0" class="flex flex-col gap-1.5">
+              <div class="px-2 flex items-center gap-1.5 text-sm font-medium text-primary">
+                <IconLucideListMusic class="size-4" />
+                <span>{{ t("search.tabs.playlists") }}</span>
+              </div>
+              <div
+                v-for="playlist in suggest.playlists"
+                :key="playlist.id"
+                class="min-w-0 flex items-center gap-2.5 px-2 py-1.5 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors duration-200"
+                @click="onPickKeyword(playlist.name)"
+              >
+                <span class="flex-1 truncate text-sm text-on-surface">{{ playlist.name }}</span>
+              </div>
+            </div>
+          </template>
+          <template v-else>
+            <!-- 历史 -->
+            <div v-if="data.searchHistory.length > 0" class="flex flex-col gap-2">
+              <div class="px-2 flex items-center justify-between">
+                <div class="flex items-center gap-1.5 text-sm font-medium text-primary">
+                  <IconLucideHistory class="size-4" />
+                  <span>{{ t("nav.searchSection.history") }}</span>
+                </div>
+                <SButton variant="ghost" size="tiny" circle @click="onClearHistory">
+                  <template #icon><IconLucideTrash2 /></template>
+                </SButton>
+              </div>
+              <div class="flex flex-wrap gap-1.5">
+                <STag
+                  v-for="word in data.searchHistory"
+                  :key="word"
+                  type="default"
+                  round
+                  closable
+                  class="max-w-50 cursor-pointer hover:bg-on-surface/20 transition-colors duration-200"
+                  @click="onPickKeyword(word)"
+                  @close="onRemoveHistory(word)"
+                >
+                  <span class="truncate">{{ word }}</span>
+                </STag>
+              </div>
+            </div>
+            <!-- 空内容提示 -->
+            <div
+              v-if="data.searchHistory.length === 0 && hotItems.length === 0"
+              class="py-10 flex flex-col items-center justify-center gap-2 text-on-surface-variant/40"
+            >
+              <IconLucideSearch class="size-8" />
+              <span class="text-xs">{{ t("nav.searchEmpty") }}</span>
+            </div>
+            <!-- 热搜 -->
+            <div v-if="hotItems.length > 0" class="flex flex-col gap-2">
+              <div class="px-2 flex items-center gap-1.5 text-sm font-medium text-primary">
+                <IconLucideFlame class="size-4" />
+                <span>{{ t("nav.searchSection.hot") }}</span>
+              </div>
+              <div class="grid grid-cols-2 gap-x-2 gap-y-0.5">
+                <div
+                  v-for="(item, idx) in hotItems.slice(0, 20)"
+                  :key="`${item.keyword}-${idx}`"
+                  class="min-h-11 min-w-0 flex items-center gap-2.5 px-2 py-1.5 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors duration-200"
+                  @click="onPickKeyword(item.keyword)"
+                >
+                  <span
+                    class="shrink-0 w-5 text-center text-sm font-semibold tabular-nums text-on-surface-variant/50"
+                  >
+                    {{ idx + 1 }}
+                  </span>
+                  <div class="flex-1 min-w-0 flex flex-col leading-tight">
+                    <span class="truncate text-sm text-on-surface">{{ item.keyword }}</span>
+                    <span v-if="item.content" class="truncate text-xs text-on-surface-variant">
+                      {{ item.content }}
+                    </span>
+                  </div>
+                  <span
+                    v-if="item.score"
+                    class="shrink-0 text-xs tabular-nums text-on-surface-variant/50"
+                  >
+                    {{ formatCompact(item.score, locale) }}
+                  </span>
+                </div>
+              </div>
+            </div>
+          </template>
+        </div>
       </div>
     </div>
   </SDialog>
diff --git a/src/components/list/PlaylistPanel.vue b/src/components/list/PlaylistPanel.vue
index d4c131e4..42dd6c59 100644
--- a/src/components/list/PlaylistPanel.vue
+++ b/src/components/list/PlaylistPanel.vue
@@ -24,13 +24,9 @@ const formatArtists = (artists: Track["artists"]): string => {
 };
 
 /** 播放指定索引的歌曲 */
-const playAtIndex = async (index: number): Promise<void> => {
-  // 关闭播放列表
+const handlePlayItem = async (index: number): Promise<void> => {
   statusStore.playlistOpen = false;
-  if (index === statusStore.playIndex) return;
-  statusStore.playIndex = index;
-  const track = statusStore.currentTrack;
-  if (track?.path) await player.load(track.path);
+  await player.playAtIndex(index);
 };
 
 const clearConfirmOpen = ref(false);
@@ -114,7 +110,7 @@ const btnType = computed(() => (props.cover ? "cover" : "default"));
                     : 'border-transparent bg-on-surface/5 hover:bg-on-surface/10 hover:border-primary/30 active:bg-on-surface/14',
                 isDragging && draggedIndex === index ? 'opacity-30 scale-95' : 'opacity-100',
               ]"
-              @click="playAtIndex(index)"
+              @click="handlePlayItem(index)"
               @mousedown="handlePointerDown($event, index, item.title)"
               @touchstart.passive="handlePointerDown($event, index, item.title)"
             >
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index b45c83f8..67bb2524 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -464,12 +464,12 @@ defineExpose({
                     </span>
                     <span
                       v-if="item.comment"
-                      class="text-xs shrink-0 max-w-40 truncate"
+                      class="flex-1 min-w-0 text-base truncate"
                       :class="
                         playingId === item.id ? 'text-primary/60' : 'text-on-surface-variant/60'
                       "
                     >
-                      {{ item.comment }}
+                      ({{ item.comment }})
                     </span>
                   </div>
                   <div
@@ -478,10 +478,22 @@ defineExpose({
                   >
                     <span
                       v-if="isLosslessQuality(item.quality)"
-                      class="shrink-0 px-1 rounded text-[10px] leading-[18px] font-bold border border-solid text-[#D4A44A] border-[#D4A44A]/40"
+                      class="shrink-0 px-1 rounded text-[10px] leading-[18px] font-bold border border-solid text-amber-400 border-amber-400/40"
                     >
                       {{ getQualityLevel(item.quality) === "hi-res" ? "HR" : "SQ" }}
                     </span>
+                    <span
+                      v-if="item.fee === 1"
+                      class="shrink-0 px-1 rounded text-[10px] leading-[18px] font-bold border border-solid text-red-400 border-red-400/40"
+                    >
+                      VIP
+                    </span>
+                    <span
+                      v-else-if="item.fee === 2"
+                      class="shrink-0 px-1 rounded text-[10px] leading-[18px] font-bold border border-solid text-red-400 border-red-400/40"
+                    >
+                      EP
+                    </span>
                     <span class="truncate">
                       <template v-for="(artist, i) in item.artists" :key="artist.id ?? i">
                         <span
diff --git a/src/components/player/FullPlayer/PlayerData.vue b/src/components/player/FullPlayer/PlayerData.vue
index 1ec747c7..9b6bcf97 100644
--- a/src/components/player/FullPlayer/PlayerData.vue
+++ b/src/components/player/FullPlayer/PlayerData.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
+import type { Artist } from "@shared/types/player";
 import type { SSelectOption } from "@/components/ui/SSelect.vue";
 import { useMediaStore } from "@/stores/media";
 import { useStatusStore } from "@/stores/status";
 import { useSettingsStore } from "@/stores/settings";
 import { getQualityLabel, getQualityLevel } from "@/utils/quality";
-import { navigateToAlbum } from "@/utils/navigate";
+import { navigateToAlbum, navigateToArtist } from "@/utils/navigate";
 
 const { t } = useI18n();
 
@@ -34,8 +35,34 @@ const lyricSourceOptions = computed<SSelectOption[]>(() => [
   { value: "self", label: t("settings.lyricSourcePreference.self") },
 ]);
 
+/** 非本地源需要真实 id 才能跳转 */
+const needsRealId = computed(
+  () => media.track?.source === "streaming" || media.track?.source === "online",
+);
+
+/** 歌手是否可跳转 */
+const isArtistLinkable = (artist: Artist): boolean => {
+  if (!artist.name) return false;
+  return needsRealId.value ? !!artist.id : true;
+};
+
+/** 专辑是否可跳转 */
+const isAlbumLinkable = computed((): boolean => {
+  const album = media.track?.album;
+  if (!album?.name) return false;
+  return needsRealId.value ? !!album.id : true;
+});
+
+/** 跳转到歌手页 */
+const goToArtist = (artist: Artist): void => {
+  if (!isArtistLinkable(artist)) return;
+  status.isExpanded = false;
+  navigateToArtist(artist.name, { source: media.track?.source, artistId: artist.id });
+};
+
 /** 跳转到专辑页 */
-const goToAlbum = () => {
+const goToAlbum = (): void => {
+  if (!isAlbumLinkable.value) return;
   const track = media.track;
   if (!track?.album?.name) return;
   status.isExpanded = false;
@@ -170,20 +197,29 @@ const alignItems = computed(() => {
       <IconLucideMic class="shrink-0 translate-y-px text-cover/40" />
       <span class="truncate">
         <template v-if="media.track.artists.length">
-          <template v-for="(artist, index) in media.track.artists" :key="index">
-            <span class="cursor-pointer transition-colors hover:text-cover">
+          <template v-for="(artist, index) in media.track.artists" :key="artist.id ?? index">
+            <span
+              :class="
+                isArtistLinkable(artist) ? 'cursor-pointer transition-colors hover:text-cover' : ''
+              "
+              @click="goToArtist(artist)"
+            >
               {{ artist.name }}
             </span>
-            <span v-if="index < media.track.artists.length - 1">/</span>
+            <span v-if="index < media.track.artists.length - 1" class="mx-0.5 opacity-50">/</span>
           </template>
         </template>
-        <span v-else class="opacity-60">{{ t("playlist.unknownArtist") }}</span>
+        <span v-else class="opacity-50">{{ t("playlist.unknownArtist") }}</span>
       </span>
     </div>
     <!-- 专辑 -->
     <div v-if="albumText" class="max-w-full flex items-center gap-1.5 text-[1.2em] text-cover/60">
       <IconLucideDisc3 class="shrink-0 translate-y-px text-cover/40" />
-      <span class="truncate cursor-pointer transition-colors hover:text-cover" @click="goToAlbum">
+      <span
+        class="truncate"
+        :class="isAlbumLinkable ? 'cursor-pointer transition-colors hover:text-cover' : ''"
+        @click="goToAlbum"
+      >
         {{ albumText }}
       </span>
     </div>
diff --git a/src/components/player/TrackInfo.vue b/src/components/player/TrackInfo.vue
index f53989a1..cfb813c2 100644
--- a/src/components/player/TrackInfo.vue
+++ b/src/components/player/TrackInfo.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import type { Artist } from "@shared/types/player";
 import { useStatusStore } from "@/stores/status";
 import { useMediaStore } from "@/stores/media";
+import { navigateToArtist } from "@/utils/navigate";
 
 withDefaults(
   defineProps<{
@@ -22,6 +24,14 @@ const currentLyricText = computed(() => {
   const text = line.words.map((w) => w.word).join("");
   return line.translatedLyric ? `${text}（${line.translatedLyric}）` : text;
 });
+
+/** 歌手是否可跳转：非本地需有真实 id */
+const isArtistLinkable = (artist: Artist): boolean => {
+  if (!artist.name) return false;
+  const source = media.track?.source;
+  if (source === "streaming" || source === "online") return !!artist.id;
+  return true;
+};
 </script>
 
 <template>
@@ -68,14 +78,25 @@ const currentLyricText = computed(() => {
             :class="compact ? 'text-xs leading-tight mt-0.5' : 'text-sm mt-1'"
           >
             <template v-if="media.track.artists.length">
-              <span
-                v-for="(artist, i) in media.track.artists"
-                :key="artist.id ?? i"
-                class="cursor-pointer transition-colors hover:text-primary"
-              >
-                {{ artist.name }}
-                <span v-if="i < media.track.artists.length - 1" class="mx-1 opacity-60">/</span>
-              </span>
+              <template v-for="(artist, i) in media.track.artists" :key="artist.id ?? i">
+                <span
+                  :class="
+                    isArtistLinkable(artist)
+                      ? 'cursor-pointer transition-opacity hover:opacity-70'
+                      : ''
+                  "
+                  @click.stop="
+                    isArtistLinkable(artist) &&
+                    navigateToArtist(artist.name, {
+                      source: media.track?.source,
+                      artistId: artist.id,
+                    })
+                  "
+                >
+                  {{ artist.name }}
+                </span>
+                <span v-if="i < media.track.artists.length - 1" class="mx-0.5 opacity-50">/</span>
+              </template>
             </template>
             <span v-else class="opacity-50">{{ $t("playlist.unknownArtist") }}</span>
           </div>
diff --git a/src/components/ui/SDialog.vue b/src/components/ui/SDialog.vue
index b0632981..65e730b6 100644
--- a/src/components/ui/SDialog.vue
+++ b/src/components/ui/SDialog.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { CSSProperties } from "vue";
+
 export interface SDialogProps {
   /** 控制打开状态（v-model:open） */
   open?: boolean;
@@ -16,6 +18,10 @@ export interface SDialogProps {
   width?: string;
   /** 高度，支持 CSS 值（默认 auto，受 max-h 限制） */
   height?: string;
+  /** 距视口顶部偏移 */
+  top?: string;
+  /** 内容区自定义样式 */
+  contentStyle?: string | CSSProperties;
 }
 
 const props = withDefaults(defineProps<SDialogProps>(), {
@@ -26,10 +32,11 @@ const props = withDefaults(defineProps<SDialogProps>(), {
   height: "auto",
 });
 
-const contentStyle = computed(() => ({
+const containerStyle = computed(() => ({
   width: props.width,
   height: props.height === "auto" ? undefined : props.height,
   maxHeight: props.height === "auto" ? "85vh" : undefined,
+  top: props.top,
 }));
 
 const emit = defineEmits<{
@@ -67,12 +74,15 @@ const setOpen = (val: boolean): void => {
         ]"
       />
       <DialogContent
-        :style="contentStyle"
+        :style="containerStyle"
         :class="[
-          'fixed top-1/2 left-1/2 z-300 -translate-x-1/2 -translate-y-1/2',
+          'fixed left-1/2 z-300 -translate-x-1/2',
+          top ? '' : 'top-1/2 -translate-y-1/2',
           'rounded-xl shadow-xl overflow-hidden',
           'flex flex-col',
-          'data-[state=open]:animate-dialog-in data-[state=closed]:animate-dialog-out',
+          top
+            ? 'data-[state=open]:animate-dialog-in-top data-[state=closed]:animate-dialog-out-top'
+            : 'data-[state=open]:animate-dialog-in data-[state=closed]:animate-dialog-out',
           'focus:outline-none',
           cover
             ? 'bg-black/55 backdrop-blur-xl backdrop-saturate-160 border border-solid border-white/10 text-cover'
@@ -103,6 +113,7 @@ const setOpen = (val: boolean): void => {
             height === 'auto' && !title && 'pt-4',
             height === 'auto' && !$slots.footer && 'pb-4',
           ]"
+          :style="contentStyle"
         >
           <slot />
         </div>
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index 274dba19..34a851e6 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -351,6 +351,22 @@ export const nextTrack = async (): Promise<void> => {
   await loadTrack(status.currentTrack);
 };
 
+/**
+ * 跳到队列指定位置并播放
+ * 同一首则不重新加载，仅在暂停时恢复播放
+ * @param index - 队列位置
+ */
+export const playAtIndex = async (index: number): Promise<void> => {
+  const status = useStatusStore();
+  if (index < 0 || index >= queue.queueLength.value) return;
+  if (index === status.playIndex) {
+    if (!status.isPlaying && useMediaStore().track) play();
+    return;
+  }
+  status.playIndex = index;
+  await loadTrack(status.currentTrack);
+};
+
 /** 播放上一首，首位时回绕到末尾 */
 export const prevTrack = async (): Promise<void> => {
   const status = useStatusStore();
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 9145b03c..b96bab05 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -83,7 +83,9 @@
     "searchEmpty": "Start typing to search",
     "searchGoto": "Search for \"{keyword}\"",
     "searchSection": {
-      "quick": "Quick"
+      "quick": "Quick",
+      "history": "Recent searches",
+      "hot": "Trending"
     }
   },
   "search": {
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index fed8b35c..6318107d 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -83,7 +83,9 @@
     "searchEmpty": "输入关键词开始搜索",
     "searchGoto": "搜索「{keyword}」",
     "searchSection": {
-      "quick": "快捷"
+      "quick": "快捷",
+      "history": "搜索历史",
+      "hot": "热搜榜"
     }
   },
   "search": {
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index 3278d35c..a940f483 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -2,7 +2,7 @@ import type { Track } from "@shared/types/player";
 import { useStreamingStore } from "@/stores/streaming";
 import { useSettingsStore } from "@/stores/settings";
 import { usePluginsStore } from "@/stores/plugins";
-import { resolveNeteaseUrl } from "@/apis/url/netease";
+import { resolveNeteaseUrl } from "@/apis/song/netease";
 import { ErrorCode } from "@shared/types/errors";
 import { handleError } from "@/utils/errors";
 
diff --git a/src/stores/data.ts b/src/stores/data.ts
new file mode 100644
index 00000000..118fb020
--- /dev/null
+++ b/src/stores/data.ts
@@ -0,0 +1,45 @@
+const MAX_SEARCH_HISTORY = 20;
+
+/**
+ * 通用本地数据 store
+ * 用于沉淀那些跨页面、需持久化、但不归属任何业务模块的小块数据
+ */
+export const useDataStore = defineStore(
+  "data",
+  () => {
+    /** 搜索历史（最新在前，去重，最多 20 条） */
+    const searchHistory = ref<string[]>([]);
+
+    /** 写入搜索历史 */
+    const addSearchHistory = (keyword: string): void => {
+      const word = keyword.trim();
+      if (!word) return;
+      const next = [word, ...searchHistory.value.filter((existing) => existing !== word)];
+      if (next.length > MAX_SEARCH_HISTORY) next.length = MAX_SEARCH_HISTORY;
+      searchHistory.value = next;
+    };
+
+    /** 移除某条搜索历史 */
+    const removeSearchHistory = (keyword: string): void => {
+      searchHistory.value = searchHistory.value.filter((existing) => existing !== keyword);
+    };
+
+    /** 清空搜索历史 */
+    const clearSearchHistory = (): void => {
+      searchHistory.value = [];
+    };
+
+    return {
+      searchHistory,
+      addSearchHistory,
+      removeSearchHistory,
+      clearSearchHistory,
+    };
+  },
+  {
+    persist: {
+      storage: localStorage,
+      pick: ["searchHistory"],
+    },
+  },
+);
diff --git a/src/types/netease.ts b/src/types/netease.ts
new file mode 100644
index 00000000..18519df4
--- /dev/null
+++ b/src/types/netease.ts
@@ -0,0 +1,128 @@
+/**
+ * 网易云接口原始数据类型
+ */
+
+/** 歌手 */
+export interface NeteaseArtist {
+  id: number;
+  name: string;
+  /** 翻译名 */
+  tns?: string[];
+  /** 别名 */
+  alias?: string[];
+}
+
+/** 专辑 */
+export interface NeteaseAlbumLite {
+  id: number;
+  name: string;
+  picUrl: string;
+  /** 翻译名 */
+  tns?: string[];
+  /** picUrl 对应的字符串 ID */
+  pic_str?: string;
+  /** 发行时间（Unix ms） */
+  publishTime?: number;
+}
+
+/** 单音质规格 */
+export interface NeteaseQuality {
+  /** 比特率（bps） */
+  br: number;
+  /** 文件 ID */
+  fid: number;
+  /** 文件大小（字节） */
+  size: number;
+  /** 音量增益 */
+  vd: number;
+  /** 采样率 */
+  sr: number;
+}
+
+/** 试听权限 */
+export interface NeteaseFreeTrialPrivilege {
+  userConsumable: boolean;
+  resConsumable: boolean;
+}
+
+/** 计费信息项 */
+export interface NeteaseChargeInfo {
+  rate: number;
+  chargeType: number;
+}
+
+/** 歌曲级权限 */
+export interface NeteasePrivilege {
+  id: number;
+  /** 0=免费 1=付费 4=未上架 8=低质 */
+  fee: number;
+  /** 是否已购：0=未购 1=已购 */
+  payed: number;
+  st: number;
+  /** 播放等级 */
+  pl: number;
+  /** 下载等级 */
+  dl: number;
+  /** 试听最高 br */
+  fl: number;
+  flLevel: string;
+  /** 播放最高 br */
+  playMaxbr: number;
+  playMaxBrLevel: string;
+  /** 下载最高 br */
+  downloadMaxbr: number;
+  downloadMaxBrLevel: string;
+  /** 综合最高 br */
+  maxbr: number;
+  maxBrLevel: string;
+  plLevel: string;
+  dlLevel: string;
+  freeTrialPrivilege?: NeteaseFreeTrialPrivilege;
+  chargeInfoList?: NeteaseChargeInfo[];
+}
+
+/**
+ * 网易云歌曲对象
+ */
+export interface NeteaseSong {
+  id: number;
+  name: string;
+  /** 别名 */
+  alia?: string[];
+  /** 翻译名（中英互译） */
+  tns?: string[];
+  /** 歌手列表 */
+  ar: NeteaseArtist[];
+  /** 专辑 */
+  al: NeteaseAlbumLite;
+  /** 时长（毫秒） */
+  dt: number;
+  /** 高音质（320k） */
+  h?: NeteaseQuality | null;
+  /** 中音质（192k） */
+  m?: NeteaseQuality | null;
+  /** 低音质（128k） */
+  l?: NeteaseQuality | null;
+  /** 无损 */
+  sq?: NeteaseQuality | null;
+  /** Hi-Res */
+  hr?: NeteaseQuality | null;
+  /** 版权 */
+  fee?: number;
+  /** 流行度 0-100 */
+  pop?: number;
+  /** MV ID，0 表示无 */
+  mv?: number;
+  /** 版权 ID */
+  copyright?: number;
+  /** CD 编号 */
+  cd?: string;
+  /** 碟内序号 */
+  no?: number;
+  /** 位标识（VIP、付费试听等位标） */
+  mark?: number;
+  /** 发行时间（Unix ms），song 顶层有时也会返回 */
+  publishTime?: number;
+  /** 歌曲级权限 */
+  privilege?: NeteasePrivilege;
+}
diff --git a/src/utils/format.ts b/src/utils/format.ts
index e3965671..c65f46a7 100644
--- a/src/utils/format.ts
+++ b/src/utils/format.ts
@@ -5,3 +5,20 @@ export const formatFileSize = (bytes: number): string => {
   if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
   return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)} GB`;
 };
+
+/**
+ * 按 locale 紧凑展示一个数字，如 `9.9万` / `9.9M`
+ * @param value - 原值，非有限数返回空串
+ * @param locale - BCP-47 locale，如 "zh-CN" / "en-US"
+ */
+export const formatCompact = (value: number | undefined | null, locale: string): string => {
+  if (value == null || !Number.isFinite(value)) return "";
+  try {
+    return new Intl.NumberFormat(locale, {
+      notation: "compact",
+      maximumFractionDigits: 1,
+    }).format(value);
+  } catch {
+    return String(value);
+  }
+};
diff --git a/src/utils/netease.ts b/src/utils/netease.ts
new file mode 100644
index 00000000..2781e99e
--- /dev/null
+++ b/src/utils/netease.ts
@@ -0,0 +1,97 @@
+/**
+ * 网易云专属工具：原始接口数据 → 应用层模型 的格式化
+ */
+
+import type { AudioQuality, Track, TrackFee } from "@shared/types/player";
+import type { NeteaseSong } from "@/types/netease";
+
+/**
+ * 网易云 fee → 应用层 TrackFee
+ * 网易云 fee：0=免费 1=VIP 4=购买专辑 8=会员高音质（视作 VIP）
+ * @param fee - 网易云原始 fee
+ */
+const toTrackFee = (fee: number | undefined): TrackFee | undefined => {
+  if (fee === 0) return 0;
+  if (fee === 1 || fee === 8) return 1;
+  if (fee === 4) return 2;
+  return undefined;
+};
+
+/**
+ * 给网易云封面 URL 拼尺寸
+ * @param url - 网易云封面原始 URL
+ * @param size - 期望像素边长，默认 300
+ */
+export const withPicSize = (url: string | undefined, size = 300): string | undefined => {
+  if (!url) return undefined;
+  if (url.includes("?param=")) return url;
+  return `${url}?param=${size}y${size}`;
+};
+
+/**
+ * 根据网易云 song 对象选择最佳音质
+ * @param song - 网易云原始 song 对象
+ * @returns 最佳音质
+ */
+const pickQuality = (song: NeteaseSong): AudioQuality | undefined => {
+  if (song.hr) {
+    return {
+      codec: "flac",
+      sampleRate: Math.max(song.hr.sr ?? 0, 96000),
+      bitsPerSample: 24,
+      bitRate: song.hr.br,
+      channels: 2,
+    };
+  }
+  if (song.sq) {
+    return {
+      codec: "flac",
+      sampleRate: song.sq.sr,
+      bitsPerSample: 16,
+      bitRate: song.sq.br,
+      channels: 2,
+    };
+  }
+  const mp3 = song.h ?? song.m ?? song.l;
+  if (mp3) {
+    return {
+      codec: "mp3",
+      sampleRate: mp3.sr,
+      bitsPerSample: 16,
+      bitRate: mp3.br,
+      channels: 2,
+    };
+  }
+  return undefined;
+};
+
+/**
+ * 网易云 song → 应用层 Track
+ * @param song - 网易云原始 song 对象
+ */
+export const songToTrack = (song: NeteaseSong): Track => {
+  const cover = withPicSize(song.al?.picUrl);
+  const coverOriginal = withPicSize(song.al?.picUrl, 1024);
+  const comment = song.alia?.find((s) => s?.trim()) ?? undefined;
+  return {
+    id: String(song.id),
+    source: "online",
+    platform: "netease",
+    title: song.name,
+    comment,
+    artists: (song.ar ?? []).map((artist) => ({ id: String(artist.id), name: artist.name })),
+    album: song.al ? { id: String(song.al.id), name: song.al.name, cover } : undefined,
+    duration: song.dt ?? 0,
+    cover,
+    coverOriginal,
+    quality: pickQuality(song),
+    fee: toTrackFee(song.fee),
+  };
+};
+
+/**
+ * 网易云 songs 列表 → Track 列表，空/缺省安全
+ * @param songs - 接口返回的 songs 数组
+ */
+export const songsToTracks = (songs: NeteaseSong[] | undefined | null): Track[] =>
+  songs?.map(songToTrack) ?? [];
diff --git a/uno.config.ts b/uno.config.ts
index d4e817c9..7c871420 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -25,6 +25,10 @@ export default defineConfig({
           "{ from { opacity: 0; transform: translate(-50%, -50%) scale(0.96) } to { opacity: 1; transform: translate(-50%, -50%) scale(1) } }",
         "dialog-out":
           "{ from { opacity: 1; transform: translate(-50%, -50%) scale(1) } to { opacity: 0; transform: translate(-50%, -50%) scale(0.96) } }",
+        "dialog-in-top":
+          "{ from { opacity: 0; transform: translateX(-50%) scale(0.96) } to { opacity: 1; transform: translateX(-50%) scale(1) } }",
+        "dialog-out-top":
+          "{ from { opacity: 1; transform: translateX(-50%) scale(1) } to { opacity: 0; transform: translateX(-50%) scale(0.96) } }",
         "panel-in":
           "{ from { opacity: 0; transform: scale(0.97) } to { opacity: 1; transform: scale(1) } }",
         "panel-out":
@@ -54,6 +58,8 @@ export default defineConfig({
         "overlay-out": "150ms",
         "dialog-in": "200ms",
         "dialog-out": "150ms",
+        "dialog-in-top": "200ms",
+        "dialog-out-top": "150ms",
         "panel-in": "250ms",
         "panel-out": "150ms",
         "select-in": "150ms",
@@ -73,6 +79,8 @@ export default defineConfig({
         "overlay-out": "ease-in",
         "dialog-in": "cubic-bezier(0.16, 1, 0.3, 1)",
         "dialog-out": "ease-in",
+        "dialog-in-top": "cubic-bezier(0.16, 1, 0.3, 1)",
+        "dialog-out-top": "ease-in",
         "panel-in": "cubic-bezier(0.16, 1, 0.3, 1)",
         "panel-out": "ease-in",
         "select-in": "cubic-bezier(0.16, 1, 0.3, 1)",

From 85a4f84e77c58544964dc60973eaceb4a04a3739 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Sun, 17 May 2026 00:40:15 +0800
Subject: [PATCH 11/33] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  23 +-
 .../apis/netease/modules/login_qr_create.ts   |   3 -
 electron/main/ipc/apis.ts                     |  27 +-
 electron/main/window/login.ts                 | 137 +++++++++
 electron/preload/index.ts                     |   5 +
 package.json                                  |   1 +
 pnpm-lock.yaml                                | 170 ++++++++++-
 shared/types/apis.ts                          |  20 +-
 src/apis/login/netease.ts                     | 104 +++++++
 src/assets/images/ncm.png                     | Bin 0 -> 6670 bytes
 src/assets/images/vip.png                     | Bin 0 -> 3587 bytes
 src/components/layout/NavHeader.vue           |   1 +
 src/components/layout/NavUser.vue             | 113 +++++++
 src/components/modals/LoginCookieDialog.vue   |  79 +++++
 src/components/modals/LoginDialog.vue         | 275 ++++++++++++++++++
 src/components/ui/SAlert.vue                  | 115 ++++++++
 src/components/ui/SInput.vue                  | 122 ++++++--
 src/core/player/index.ts                      |  34 ++-
 src/i18n/locales/en-US.json                   |  30 ++
 src/i18n/locales/zh-CN.json                   |  30 ++
 src/stores/user.ts                            |  96 +++---
 src/types/user.ts                             |  17 ++
 22 files changed, 1284 insertions(+), 118 deletions(-)
 create mode 100644 electron/main/window/login.ts
 create mode 100644 src/apis/login/netease.ts
 create mode 100644 src/assets/images/ncm.png
 create mode 100644 src/assets/images/vip.png
 create mode 100644 src/components/layout/NavUser.vue
 create mode 100644 src/components/modals/LoginCookieDialog.vue
 create mode 100644 src/components/modals/LoginDialog.vue
 create mode 100644 src/components/ui/SAlert.vue
 create mode 100644 src/types/user.ts

diff --git a/components.d.ts b/components.d.ts
index 4a554293..046fc44a 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -17,7 +17,6 @@ declare module 'vue' {
     AutoCloseDialog: typeof import('./src/components/modals/AutoCloseDialog.vue')['default']
     BackgroundImagePicker: typeof import('./src/components/settings/custom/BackgroundImagePicker.vue')['default']
     BottomSpectrum: typeof import('./src/components/player/FullPlayer/BottomSpectrum.vue')['default']
-    CacheManager: typeof import('./src/components/settings/custom/CacheManager.vue')['default']
     ComboboxAnchor: typeof import('reka-ui')['ComboboxAnchor']
     ComboboxContent: typeof import('reka-ui')['ComboboxContent']
     ComboboxEmpty: typeof import('reka-ui')['ComboboxEmpty']
@@ -37,6 +36,7 @@ declare module 'vue' {
     ContextMenuSubContent: typeof import('reka-ui')['ContextMenuSubContent']
     ContextMenuSubTrigger: typeof import('reka-ui')['ContextMenuSubTrigger']
     ContextMenuTrigger: typeof import('reka-ui')['ContextMenuTrigger']
+    CookieInputDialog: typeof import('./src/components/modals/CookieInputDialog.vue')['default']
     CoverList: typeof import('./src/components/list/CoverList.vue')['default']
     DbCacheManager: typeof import('./src/components/settings/custom/DbCacheManager.vue')['default']
     DeviceSelector: typeof import('./src/components/settings/custom/DeviceSelector.vue')['default']
@@ -65,7 +65,6 @@ declare module 'vue' {
     HotkeyConfig: typeof import('./src/components/settings/custom/HotkeyConfig.vue')['default']
     IconLucideArrowRight: typeof import('~icons/lucide/arrow-right')['default']
     IconLucideArrowUpCircle: typeof import('~icons/lucide/arrow-up-circle')['default']
-    IconLucideBan: typeof import('~icons/lucide/ban')['default']
     IconLucideCheck: typeof import('~icons/lucide/check')['default']
     IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideChevronLeft: typeof import('~icons/lucide/chevron-left')['default']
@@ -76,21 +75,18 @@ declare module 'vue' {
     IconLucideDatabase: typeof import('~icons/lucide/database')['default']
     IconLucideDisc: typeof import('~icons/lucide/disc')['default']
     IconLucideDisc3: typeof import('~icons/lucide/disc3')['default']
-    IconLucideEllipsis: typeof import('~icons/lucide/ellipsis')['default']
     IconLucideExternalLink: typeof import('~icons/lucide/external-link')['default']
     IconLucideFlame: typeof import('~icons/lucide/flame')['default']
-    IconLucideFlameKindling: typeof import('~icons/lucide/flame-kindling')['default']
-    IconLucideFolder: typeof import('~icons/lucide/folder')['default']
     IconLucideFolderOpen: typeof import('~icons/lucide/folder-open')['default']
-    IconLucideFolderPlus: typeof import('~icons/lucide/folder-plus')['default']
     IconLucideGithub: typeof import('~icons/lucide/github')['default']
-    IconLucideHardDrive: typeof import('~icons/lucide/hard-drive')['default']
     IconLucideHistory: typeof import('~icons/lucide/history')['default']
     IconLucideInfo: typeof import('~icons/lucide/info')['default']
+    IconLucideKeyRound: typeof import('~icons/lucide/key-round')['default']
     IconLucideLink: typeof import('~icons/lucide/link')['default']
+    IconLucideLink2: typeof import('~icons/lucide/link2')['default']
     IconLucideListMusic: typeof import('~icons/lucide/list-music')['default']
     IconLucideLocate: typeof import('~icons/lucide/locate')['default']
-    IconLucideLock: typeof import('~icons/lucide/lock')['default']
+    IconLucideLogOut: typeof import('~icons/lucide/log-out')['default']
     IconLucideMaximize: typeof import('~icons/lucide/maximize')['default']
     IconLucideMessageCircle: typeof import('~icons/lucide/message-circle')['default']
     IconLucideMic: typeof import('~icons/lucide/mic')['default']
@@ -103,9 +99,9 @@ declare module 'vue' {
     IconLucidePlus: typeof import('~icons/lucide/plus')['default']
     IconLucidePower: typeof import('~icons/lucide/power')['default']
     IconLucidePuzzle: typeof import('~icons/lucide/puzzle')['default']
-    IconLucideRefreshCw: typeof import('~icons/lucide/refresh-cw')['default']
     IconLucideRepeat: typeof import('~icons/lucide/repeat')['default']
     IconLucideRepeat1: typeof import('~icons/lucide/repeat1')['default']
+    IconLucideScanLine: typeof import('~icons/lucide/scan-line')['default']
     IconLucideSearch: typeof import('~icons/lucide/search')['default']
     IconLucideSearchX: typeof import('~icons/lucide/search-x')['default']
     IconLucideSettings: typeof import('~icons/lucide/settings')['default']
@@ -116,19 +112,22 @@ declare module 'vue' {
     IconLucideTextQuote: typeof import('~icons/lucide/text-quote')['default']
     IconLucideTrash2: typeof import('~icons/lucide/trash2')['default']
     IconLucideTriangleAlert: typeof import('~icons/lucide/triangle-alert')['default']
-    IconLucideUnlock: typeof import('~icons/lucide/unlock')['default']
     IconLucideUser: typeof import('~icons/lucide/user')['default']
+    IconLucideUserRound: typeof import('~icons/lucide/user-round')['default']
     IconLucideVolume1: typeof import('~icons/lucide/volume1')['default']
     IconLucideVolume2: typeof import('~icons/lucide/volume2')['default']
     IconLucideVolumeX: typeof import('~icons/lucide/volume-x')['default']
     IconLucideX: typeof import('~icons/lucide/x')['default']
     IconLucideZap: typeof import('~icons/lucide/zap')['default']
     IconSpLossless: typeof import('~icons/sp/lossless')['default']
+    LoginCookieDialog: typeof import('./src/components/modals/LoginCookieDialog.vue')['default']
+    LoginDialog: typeof import('./src/components/modals/LoginDialog.vue')['default']
     LyricFormatOrderConfig: typeof import('./src/components/settings/custom/LyricFormatOrderConfig.vue')['default']
     Lyrics: typeof import('./src/components/player/Lyrics/index.vue')['default']
     LyricSourceOrderConfig: typeof import('./src/components/settings/custom/LyricSourceOrderConfig.vue')['default']
     NavHeader: typeof import('./src/components/layout/NavHeader.vue')['default']
     NavSearch: typeof import('./src/components/layout/NavSearch.vue')['default']
+    NavUser: typeof import('./src/components/layout/NavUser.vue')['default']
     NumberFieldDecrement: typeof import('reka-ui')['NumberFieldDecrement']
     NumberFieldIncrement: typeof import('reka-ui')['NumberFieldIncrement']
     NumberFieldInput: typeof import('reka-ui')['NumberFieldInput']
@@ -147,6 +146,7 @@ declare module 'vue' {
     PopoverTrigger: typeof import('reka-ui')['PopoverTrigger']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    SAlert: typeof import('./src/components/ui/SAlert.vue')['default']
     SButton: typeof import('./src/components/ui/SButton.vue')['default']
     SCard: typeof import('./src/components/ui/SCard.vue')['default']
     SCheckbox: typeof import('./src/components/ui/SCheckbox.vue')['default']
@@ -159,8 +159,6 @@ declare module 'vue' {
     SDivider: typeof import('./src/components/ui/SDivider.vue')['default']
     SDrawer: typeof import('./src/components/ui/SDrawer.vue')['default']
     SDropdownMenu: typeof import('./src/components/ui/SDropdownMenu.vue')['default']
-    SearchDialog: typeof import('./src/components/layout/SearchDialog.vue')['default']
-    SearchOverlay: typeof import('./src/components/search/SearchOverlay.vue')['default']
     SelectContent: typeof import('reka-ui')['SelectContent']
     SelectIcon: typeof import('reka-ui')['SelectIcon']
     SelectItem: typeof import('reka-ui')['SelectItem']
@@ -187,7 +185,6 @@ declare module 'vue' {
     SMarquee: typeof import('./src/components/ui/SMarquee.vue')['default']
     SMenu: typeof import('./src/components/ui/SMenu.vue')['default']
     SNumberInput: typeof import('./src/components/ui/SNumberInput.vue')['default']
-    SongCacheSizeLimit: typeof import('./src/components/settings/custom/SongCacheSizeLimit.vue')['default']
     SongList: typeof import('./src/components/list/SongList.vue')['default']
     SpeedDialog: typeof import('./src/components/modals/SpeedDialog.vue')['default']
     SPopover: typeof import('./src/components/ui/SPopover.vue')['default']
diff --git a/electron/main/apis/netease/modules/login_qr_create.ts b/electron/main/apis/netease/modules/login_qr_create.ts
index 0f13d57c..63d485f3 100644
--- a/electron/main/apis/netease/modules/login_qr_create.ts
+++ b/electron/main/apis/netease/modules/login_qr_create.ts
@@ -1,8 +1,5 @@
 /**
  * 生成二维码登录 URL（可选返回 data URL 图像）
- *
- * 注：原实现依赖 qrcode 包生成图像；这里只返回 URL，
- * 渲染端可自行使用现成的 QR 生成器（更贴合 Electron 架构，避免再引入一个 Node 依赖）。
  */
 
 import type { NeteaseModule } from "../core/types";
diff --git a/electron/main/ipc/apis.ts b/electron/main/ipc/apis.ts
index e454d436..25cc54ae 100644
--- a/electron/main/ipc/apis.ts
+++ b/electron/main/ipc/apis.ts
@@ -7,9 +7,11 @@
  */
 
 import { ipcMain } from "electron";
-import { callNetease, clearNeteaseCookies } from "@main/apis/netease";
+import { callNetease, clearNeteaseCookies, mergeNeteaseCookies } from "@main/apis/netease";
+import { cookieToJson } from "@main/apis/netease/core/cookie";
 import { callQQMusic } from "@main/apis/qqmusic";
 import { callKugou } from "@main/apis/kugou";
+import { openNeteaseLoginWindow } from "@main/window/login";
 import { coreLog } from "@main/utils/logger";
 import type { ApiPlatform } from "@shared/types/apis";
 
@@ -54,4 +56,27 @@ export const registerApisIpc = (): void => {
   ipcMain.handle("apis:clearSession", (_evt, platform: ApiPlatform) => {
     if (platform === "netease") clearNeteaseCookies();
   });
+
+  // 打开 NCM 官方网页登录，成功后把 cookies 合并写入 session
+  ipcMain.handle("apis:openLoginWeb", async (_evt, platform: ApiPlatform) => {
+    if (platform !== "netease") return { ok: false, error: "unsupported platform" };
+    try {
+      const cookies = await openNeteaseLoginWindow();
+      if (!cookies) return { ok: false, error: "canceled" };
+      mergeNeteaseCookies(cookies);
+      return { ok: true };
+    } catch (err) {
+      coreLog.warn("[apis] openLoginWeb failed:", err);
+      return { ok: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  });
+
+  // 手动写入 cookie 登录
+  ipcMain.handle("apis:setCookie", (_evt, platform: ApiPlatform, raw: string) => {
+    if (platform !== "netease") return { ok: false, error: "unsupported platform" };
+    const parsed = cookieToJson(raw);
+    if (!parsed.MUSIC_U) return { ok: false, error: "missing MUSIC_U" };
+    mergeNeteaseCookies(parsed);
+    return { ok: true };
+  });
 };
diff --git a/electron/main/window/login.ts b/electron/main/window/login.ts
new file mode 100644
index 00000000..c070914b
--- /dev/null
+++ b/electron/main/window/login.ts
@@ -0,0 +1,137 @@
+/**
+ * NCM 网页登录窗口
+ *
+ * 打开一个独立的 BrowserWindow 加载网易云官方登录页，使用专属 session 分区
+ * 隔离 cookie；用户登录成功后从该分区读取 MUSIC_U 等关键 cookie 返回。
+ *
+ * 同一时刻只允许一个登录窗口存在。
+ */
+
+import { BrowserWindow, session } from "electron";
+import { getMainWindow } from "./main";
+import { coreLog } from "@main/utils/logger";
+
+const LOGIN_PARTITION = "persist:netease-login";
+const LOGIN_URL = "https://music.163.com/#/login";
+
+/** 关心的关键 cookie；未取到 MUSIC_U 视为未登录 */
+const COOKIE_KEYS = ["MUSIC_U", "__csrf", "NMTID", "MUSIC_A"];
+
+/**
+ * 伪装成普通桌面 Chrome
+ * 默认 UA 含 "Electron/..."，NCM 会判定为不受支持环境，渲染极慢且无法跳转
+ */
+const FAKE_UA =
+  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36";
+
+let activeWin: BrowserWindow | null = null;
+let pollTimer: NodeJS.Timeout | null = null;
+
+const getLoginSession = (): Electron.Session => session.fromPartition(LOGIN_PARTITION);
+
+const stopPolling = (): void => {
+  if (pollTimer) {
+    clearInterval(pollTimer);
+    pollTimer = null;
+  }
+};
+
+/**
+ * 收集登录会话中的 cookies
+ * @returns 含 MUSIC_U 时返回完整 cookies 对象，否则 null
+ */
+const collectCookies = async (): Promise<Record<string, string> | null> => {
+  const ses = getLoginSession();
+  // 按 URL 取，能拿到 domain 和 .domain 两种维度，否则部分 cookie 漏取
+  const all = await ses.cookies.get({ url: "https://music.163.com" });
+  const musicU = all.find((c) => c.name === "MUSIC_U");
+  if (!musicU?.value) return null;
+  const out: Record<string, string> = {};
+  for (const key of COOKIE_KEYS) {
+    const hit = all.find((c) => c.name === key);
+    if (hit?.value) out[key] = hit.value;
+  }
+  return out;
+};
+
+/**
+ * 打开 NCM 网页登录窗口
+ * @returns 登录成功返回 cookies 对象；用户关闭窗口返回 null
+ */
+export const openNeteaseLoginWindow = async (): Promise<Record<string, string> | null> => {
+  // 已存在则先聚焦
+  if (activeWin && !activeWin.isDestroyed()) {
+    activeWin.focus();
+    return null;
+  }
+
+  // 清掉旧的登录会话，避免残留 cookie 干扰
+  const ses = getLoginSession();
+  await ses.clearStorageData({ storages: ["cookies", "localstorage", "indexdb"] });
+  // 整个分区都伪装 UA，否则部分 XHR 仍会被识别成 Electron
+  ses.setUserAgent(FAKE_UA);
+
+  const parent = getMainWindow() ?? undefined;
+
+  activeWin = new BrowserWindow({
+    parent,
+    modal: false,
+    width: 1024,
+    height: 720,
+    minWidth: 800,
+    minHeight: 600,
+    center: true,
+    title: "登录网易云音乐",
+    autoHideMenuBar: true,
+    backgroundColor: "#ffffff",
+    show: false,
+    webPreferences: {
+      session: ses,
+      // sandbox 模式下 NCM 的 JS 渲染极慢；登录窗口里没有自家代码，关闭沙箱影响可控
+      sandbox: false,
+      spellcheck: false,
+      backgroundThrottling: false,
+      nodeIntegration: false,
+      contextIsolation: true,
+    },
+  });
+
+  // 顶层导航和 XHR 都使用伪装 UA
+  activeWin.webContents.setUserAgent(FAKE_UA);
+
+  // 阻止新窗口
+  activeWin.webContents.setWindowOpenHandler(() => ({ action: "deny" }));
+
+  return await new Promise<Record<string, string> | null>((resolve) => {
+    let settled = false;
+    const finish = (result: Record<string, string> | null): void => {
+      if (settled) return;
+      settled = true;
+      stopPolling();
+      if (activeWin && !activeWin.isDestroyed()) activeWin.destroy();
+      activeWin = null;
+      resolve(result);
+    };
+
+    // ready-to-show 比 did-finish-load 更早，避免被 NCM 大量异步资源拖住显示
+    activeWin!.once("ready-to-show", () => activeWin?.show());
+
+    activeWin!.webContents.once("dom-ready", () => {
+      pollTimer = setInterval(async () => {
+        try {
+          const cookies = await collectCookies();
+          if (cookies) finish(cookies);
+        } catch (err) {
+          coreLog.warn("[login] poll cookies failed:", err);
+        }
+      }, 1000);
+    });
+
+    activeWin!.on("closed", () => finish(null));
+
+    activeWin!.loadURL(LOGIN_URL, { userAgent: FAKE_UA }).catch((err) => {
+      coreLog.error("[login] loadURL failed:", err);
+      finish(null);
+    });
+  });
+};
diff --git a/electron/preload/index.ts b/electron/preload/index.ts
index b620af4b..143b5a6d 100644
--- a/electron/preload/index.ts
+++ b/electron/preload/index.ts
@@ -283,6 +283,11 @@ const api = {
       ipcRenderer.invoke("apis:call", platform, name, params ?? {}),
     // 清空指定平台的登录态
     clearSession: (platform: string) => ipcRenderer.invoke("apis:clearSession", platform),
+    // 打开官方网页登录窗口
+    openLoginWeb: (platform: string) => ipcRenderer.invoke("apis:openLoginWeb", platform),
+    // 手动写入 cookie 登录
+    setCookie: (platform: string, cookie: string) =>
+      ipcRenderer.invoke("apis:setCookie", platform, cookie),
   },
   lyrics: {
     // 按 id 直取某平台歌词
diff --git a/package.json b/package.json
index b3da26f2..8f4c1641 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "pinia-plugin-persistedstate": "^4.7.1",
     "reka-ui": "^2.9.7",
     "sortablejs": "^1.15.7",
+    "uqr": "^0.1.3",
     "vue-i18n": "^11.3.2",
     "vue-router": "^5.0.4",
     "ws": "^8.20.1"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 54e97eba..3f9b4768 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,7 +25,7 @@ importers:
         version: 14.2.1(vue@3.5.32(typescript@5.9.3))
       '@vueuse/integrations':
         specifier: ^14.2.1
-        version: 14.2.1(sortablejs@1.15.7)(vue@3.5.32(typescript@5.9.3))
+        version: 14.2.1(qrcode@1.5.4)(sortablejs@1.15.7)(vue@3.5.32(typescript@5.9.3))
       atomically:
         specifier: ^2.1.1
         version: 2.1.1
@@ -62,6 +62,9 @@ importers:
       sortablejs:
         specifier: ^1.15.7
         version: 1.15.7
+      uqr:
+        specifier: ^0.1.3
+        version: 0.1.3
       vue-i18n:
         specifier: ^11.3.2
         version: 11.3.2(vue@3.5.32(typescript@5.9.3))
@@ -2128,6 +2131,10 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
   caniuse-lite@1.0.30001787:
     resolution: {integrity: sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==}
 
@@ -2181,6 +2188,9 @@ packages:
     peerDependencies:
       typanion: '*'
 
+  cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -2275,6 +2285,10 @@ packages:
       supports-color:
         optional: true
 
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
   decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
@@ -2318,6 +2332,9 @@ packages:
   detect-node@2.1.0:
     resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
 
+  dijkstrajs@1.0.3:
+    resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
+
   dir-compare@4.2.0:
     resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}
 
@@ -2611,6 +2628,10 @@ packages:
   filelist@1.0.6:
     resolution: {integrity: sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==}
 
+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
   find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
@@ -2951,6 +2972,10 @@ packages:
   localforage@1.10.0:
     resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
 
+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+
   locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
@@ -3210,10 +3235,18 @@ packages:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
 
+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+
   p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
 
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+
   p-locate@5.0.0:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
@@ -3222,6 +3255,10 @@ packages:
     resolution: {integrity: sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==}
     engines: {node: '>=18'}
 
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
   package-json-from-dist@1.0.1:
     resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
 
@@ -3311,6 +3348,10 @@ packages:
     resolution: {integrity: sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==}
     engines: {node: '>=10.4.0'}
 
+  pngjs@5.0.0:
+    resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
+    engines: {node: '>=10.13.0'}
+
   postcss-selector-parser@7.1.1:
     resolution: {integrity: sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==}
     engines: {node: '>=4'}
@@ -3361,6 +3402,11 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
+  qrcode@1.5.4:
+    resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
   quansync@0.2.11:
     resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
 
@@ -3400,6 +3446,9 @@ packages:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
+  require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+
   resedit@1.7.2:
     resolution: {integrity: sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==}
     engines: {node: '>=12', npm: '>=6'}
@@ -3483,6 +3532,9 @@ packages:
     resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==}
     engines: {node: '>=10'}
 
+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -3801,6 +3853,9 @@ packages:
     peerDependencies:
       browserslist: '>= 4.21.0'
 
+  uqr@0.1.3:
+    resolution: {integrity: sha512-0rjE8iEJe4YmT9TOhwsZtqCMRLc5DXZUI2UEYUUg63ikBkqqE5EYWaI0etFe/5KUcmcYwLih2RND1kq+hrUJXA==}
+
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
@@ -3918,6 +3973,9 @@ packages:
   when-exit@2.1.5:
     resolution: {integrity: sha512-VGkKJ564kzt6Ms1dbgPP/yuIoQCrsFAnRbptpC5wOEsDaNsbCB2bnfnaA8i/vRs5tjUSEOtIuvl9/MyVsvQZCg==}
 
+  which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
+
   which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
@@ -3932,6 +3990,10 @@ packages:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
 
+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+
   wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -3963,6 +4025,9 @@ packages:
     resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}
     engines: {node: '>=8.0'}
 
+  y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+
   y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -3982,10 +4047,18 @@ packages:
     engines: {node: '>= 14.6'}
     hasBin: true
 
+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+
   yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
 
+  yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
+
   yargs@17.7.2:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
@@ -5634,12 +5707,13 @@ snapshots:
       '@vueuse/shared': 14.2.1(vue@3.5.32(typescript@5.9.3))
       vue: 3.5.32(typescript@5.9.3)
 
-  '@vueuse/integrations@14.2.1(sortablejs@1.15.7)(vue@3.5.32(typescript@5.9.3))':
+  '@vueuse/integrations@14.2.1(qrcode@1.5.4)(sortablejs@1.15.7)(vue@3.5.32(typescript@5.9.3))':
     dependencies:
       '@vueuse/core': 14.2.1(vue@3.5.32(typescript@5.9.3))
       '@vueuse/shared': 14.2.1(vue@3.5.32(typescript@5.9.3))
       vue: 3.5.32(typescript@5.9.3)
     optionalDependencies:
+      qrcode: 1.5.4
       sortablejs: 1.15.7
 
   '@vueuse/metadata@14.2.1': {}
@@ -5891,6 +5965,9 @@ snapshots:
 
   callsites@3.1.0: {}
 
+  camelcase@5.3.1:
+    optional: true
+
   caniuse-lite@1.0.30001787: {}
 
   chalk@4.1.2:
@@ -5932,6 +6009,13 @@ snapshots:
     dependencies:
       typanion: 3.14.0
 
+  cliui@6.0.0:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
+    optional: true
+
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
@@ -6009,6 +6093,9 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  decamelize@1.2.0:
+    optional: true
+
   decompress-response@6.0.0:
     dependencies:
       mimic-response: 3.1.0
@@ -6048,6 +6135,9 @@ snapshots:
   detect-node@2.1.0:
     optional: true
 
+  dijkstrajs@1.0.3:
+    optional: true
+
   dir-compare@4.2.0:
     dependencies:
       minimatch: 3.1.5
@@ -6451,6 +6541,12 @@ snapshots:
     dependencies:
       minimatch: 5.1.9
 
+  find-up@4.1.0:
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+    optional: true
+
   find-up@5.0.0:
     dependencies:
       locate-path: 6.0.0
@@ -6804,6 +6900,11 @@ snapshots:
     dependencies:
       lie: 3.1.1
 
+  locate-path@5.0.0:
+    dependencies:
+      p-locate: 4.1.0
+    optional: true
+
   locate-path@6.0.0:
     dependencies:
       p-locate: 5.0.0
@@ -7096,16 +7197,29 @@ snapshots:
 
   p-cancelable@2.1.1: {}
 
+  p-limit@2.3.0:
+    dependencies:
+      p-try: 2.2.0
+    optional: true
+
   p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
 
+  p-locate@4.1.0:
+    dependencies:
+      p-limit: 2.3.0
+    optional: true
+
   p-locate@5.0.0:
     dependencies:
       p-limit: 3.1.0
 
   p-map@7.0.4: {}
 
+  p-try@2.2.0:
+    optional: true
+
   package-json-from-dist@1.0.1: {}
 
   package-manager-detector@1.6.0: {}
@@ -7177,6 +7291,9 @@ snapshots:
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
+  pngjs@5.0.0:
+    optional: true
+
   postcss-selector-parser@7.1.1:
     dependencies:
       cssesc: 3.0.0
@@ -7234,6 +7351,13 @@ snapshots:
 
   punycode@2.3.1: {}
 
+  qrcode@1.5.4:
+    dependencies:
+      dijkstrajs: 1.0.3
+      pngjs: 5.0.0
+      yargs: 15.4.1
+    optional: true
+
   quansync@0.2.11: {}
 
   quansync@1.0.0: {}
@@ -7281,6 +7405,9 @@ snapshots:
 
   require-directory@2.1.1: {}
 
+  require-main-filename@2.0.0:
+    optional: true
+
   resedit@1.7.2:
     dependencies:
       pe-library: 0.4.1
@@ -7380,6 +7507,9 @@ snapshots:
       type-fest: 0.13.1
     optional: true
 
+  set-blocking@2.0.0:
+    optional: true
+
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
@@ -7733,6 +7863,8 @@ snapshots:
       escalade: 3.2.0
       picocolors: 1.1.1
 
+  uqr@0.1.3: {}
+
   uri-js@4.4.1:
     dependencies:
       punycode: 2.3.1
@@ -7837,6 +7969,9 @@ snapshots:
 
   when-exit@2.1.5: {}
 
+  which-module@2.0.1:
+    optional: true
+
   which@2.0.2:
     dependencies:
       isexe: 2.0.0
@@ -7847,6 +7982,13 @@ snapshots:
 
   word-wrap@1.2.5: {}
 
+  wrap-ansi@6.2.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+    optional: true
+
   wrap-ansi@7.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -7867,6 +8009,9 @@ snapshots:
 
   xmlbuilder@15.1.1: {}
 
+  y18n@4.0.3:
+    optional: true
+
   y18n@5.0.8: {}
 
   yallist@3.1.1: {}
@@ -7877,8 +8022,29 @@ snapshots:
 
   yaml@2.8.3: {}
 
+  yargs-parser@18.1.3:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+    optional: true
+
   yargs-parser@21.1.1: {}
 
+  yargs@15.4.1:
+    dependencies:
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+    optional: true
+
   yargs@17.7.2:
     dependencies:
       cliui: 8.0.1
diff --git a/shared/types/apis.ts b/shared/types/apis.ts
index 241e9573..078c6189 100644
--- a/shared/types/apis.ts
+++ b/shared/types/apis.ts
@@ -23,6 +23,24 @@ export interface ApisApi {
     name: string,
     params?: Record<string, unknown>,
   ) => Promise<ApiCallResponse>;
-  /** 清空指定平台的登录态（目前仅 netease 有意义） */
+  /**
+   * 清空指定平台的登录态
+   * @param platform 音源平台
+   */
   clearSession: (platform: ApiPlatform) => Promise<void>;
+  /**
+   * 打开官方网页登录
+   * @param platform 音源平台
+   * @returns 登录成功 `{ ok: true }`；用户取消 / 失败 `{ ok: false, error }`
+   */
+  openLoginWeb: (platform: ApiPlatform) => Promise<{ ok: true } | { ok: false; error: string }>;
+  /**
+   * 手动写入 cookie 登录（目前仅 netease）
+   * @param platform 音源平台
+   * @param cookie 形如 `MUSIC_U=xxx; __csrf=yyy` 的 cookie 字符串
+   */
+  setCookie: (
+    platform: ApiPlatform,
+    cookie: string,
+  ) => Promise<{ ok: true } | { ok: false; error: string }>;
 }
diff --git a/src/apis/login/netease.ts b/src/apis/login/netease.ts
new file mode 100644
index 00000000..3dace32f
--- /dev/null
+++ b/src/apis/login/netease.ts
@@ -0,0 +1,104 @@
+/**
+ * 网易云登录相关
+ */
+
+import type { UserProfile } from "@/types/user";
+import { netease as neteaseApi } from "@/apis/netease";
+
+interface QrKeyResp {
+  data?: { unikey?: string };
+}
+
+interface QrCheckResp {
+  code?: number;
+  cookie?: string;
+  nickname?: string;
+  avatarUrl?: string;
+  message?: string;
+}
+
+interface LoginStatusBody {
+  data?: {
+    code?: number;
+    account?: { id?: number } | null;
+    profile?: (Partial<UserProfile> & { userId?: number }) | null;
+  };
+}
+
+/**
+ * 生成扫码登录二维码 key
+ * @returns 二维码 key
+ */
+export const qrKey = async (): Promise<string> => {
+  const body = await neteaseApi.login_qr_key<QrKeyResp>({ timestamp: Date.now() });
+  const unikey = body?.data?.unikey;
+  if (!unikey) throw new Error("qr key missing");
+  return unikey;
+};
+
+export type QrStatusCode = 800 | 801 | 802 | 803;
+
+export interface QrCheckResult {
+  code: QrStatusCode;
+  cookie?: string;
+  nickname?: string;
+  avatarUrl?: string;
+}
+
+/**
+ * 轮询扫码状态
+ * - 800 已过期 / 801 待扫码 / 802 待确认 / 803 已确认（含 cookie）
+ * @param key 二维码 key
+ * @returns 扫码状态和结果
+ */
+export const qrCheck = async (key: string): Promise<QrCheckResult> => {
+  const body = await neteaseApi.login_qr_check<QrCheckResp>({ key, timestamp: Date.now() });
+  const code = (body?.code ?? 801) as QrStatusCode;
+  return {
+    code,
+    cookie: body?.cookie,
+    nickname: body?.nickname,
+    avatarUrl: body?.avatarUrl,
+  };
+};
+
+/**
+ * 二维码内容
+ * @param key 二维码 key
+ * @returns 二维码内容
+ */
+export const qrContent = (key: string): string => `https://music.163.com/login?codekey=${key}`;
+
+/**
+ * 校验 cookie 并取当前用户 profile
+ * @returns 已登录返回 profile；未登录或 cookie 失效返回 null
+ */
+export const fetchLoginStatus = async (): Promise<UserProfile | null> => {
+  const body = await neteaseApi.login_status<LoginStatusBody>();
+  const raw = body?.data?.profile;
+  if (!raw?.userId) return null;
+  return {
+    userId: raw.userId,
+    nickname: raw.nickname ?? "",
+    avatarUrl: raw.avatarUrl,
+    backgroundUrl: raw.backgroundUrl,
+    signature: raw.signature,
+    vipType: raw.vipType,
+    gender: raw.gender,
+    province: raw.province,
+    city: raw.city,
+  };
+};
+
+/**
+ * 续期登录 cookie
+ * set-cookie 由主进程 SESSION_MUTATING 自动写回 SQLite
+ */
+export const refreshLogin = async (): Promise<void> => {
+  await neteaseApi.login_refresh();
+};
+
+/** 服务端登出（仅打断 server session，不清本地 cookie） */
+export const logoutNetease = async (): Promise<void> => {
+  await neteaseApi.logout();
+};
diff --git a/src/assets/images/ncm.png b/src/assets/images/ncm.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cfc5467b0948000330a7c0dd3da221be6c2ac31
GIT binary patch
literal 6670
zcmV+p8u8_cP)<h;3K|Lk000e1NJLTq0077U0077c1^@s6tyr#}000mGNkl<ZcmeF4
zO^h8^R>yBWrzcUIC?k|Ojwab4h7SoT?WM8X4v3GKT^MB$yCl1y*q#N8AqW;A1{O$6
zK16nocZdm)9UTFJIF9i$v4jM}AT|!NV@If4aau3qxQqL%?%PwZyXw8FbMLKptLj*N
zeCyr1_uO;-_x$fyy^o3M;NSJ*$G`FE+S+g2I=y!G)~U6>wDPyNPMy4B<%d>oTDf!k
z)XBRx%~ej09)sOjxMO31*dRu1tgP9Xv9V)gh*%<~ItX18g&?0jbNuITt(|zqI`{)C
z*Y96B^huWG@0mP*-I)A4R=#DO`z0$sYvpk(hjU}@v#I_m0%kWB4qGUQ4PwN`N^WB&
z{|+%kED=-0mX#k6Ys8!_AN+3;O5?3(j{nT<wG)4M>-5Qwx3>@dhsm-xtnTNnJZVM$
z6oD8B5L?d^Ys4I}SHz%=#ZZlT6Xes=Cw|Sc`0vg3p&#X0_Q#g~Plqy2^(X?Z5XjBb
zMGV?lBqoW?R`n|iiwSb;nG+{(t({!Y^6Ve2-si07pCXVF0?!ef#3->UHLNv3est!{
z{kKl7y<xVq%O*3=);Fwo6oCW~AVzJh60^i^TZ>u|<o4+kzx?&B&#&1{_A6~0((;PH
zauLX1A$E!3Hg+^7$fu{*Ue5FEU-I1iT$={8tRj#K0>o}^W0+WOYEvVEa59kP`Cm0v
zs^t`clo247iRmUbE+hzwij#pR+O&)!&=UlRX<~bkxpN7^RD_~MN;<!<4JrZw5FoaR
z@p-Ch3BqQEsc2qhy{8ED9RXsTSg-S=k{~<BVcA=Cl{8-w7#0HATRSm-(5p&<Jo3ez
zzsU8p>L6O0Ge`u8bz;8CxdQ~*dFq(!bB-#sG;hEN<ge_+{;Z1!2x9JKe=u8QT(8vI
z5hG9$`!fV7-rU8b`4MBJu8$Z28~X(ZN)XHtB+IjxOZW6r5f~i;`#G>j5I)ag(a?A0
zS`hSa)CfGc%Y_1jJ%VKSCcjhU=zog9$Pp-WVUHmBB>UFLaf$7|>hB2xWiAv1DL&7e
z8~r3;PdZS|jEsQgLcs~!OhJ(Cdy`+a*ZQXjC<40(I8GD<F<EwMH(wJ)KoJ0eT~6!}
z#F*pcsVD-9z#akxCnndAAOD8UdeVyi^%em&JOTnw!i~w-?z`_7BPdsuia_rXfE$x+
zV)*8|-aDfXC<37ofEyE&o1YG?SoJ9agFwJ?gH8HVgK$QjPz1sw@RTJ;{zQ1as&Oy~
zjM|a>2}=<3=%_Impz{x$Ib)EAzx%5B`fINj@>75FjzQdO?mhUzi)Ll@m^pOx=m1d&
z;?koK<dGn%RLN2ifDi=#W0x))f*&Cd0w9n8;TqxI;TK=pBM)`Sqs&qrNvrWkAjm^$
z*`(IAL4crkq#*Fy)Ge2#E~H|XAyuLj=sYyZjJdzK)c<;g00HfSIke%B&gmXAQQ*cT
zH%5QiDRhKI)<*!dB#IrpwDZVoZxs8K7%ru*6K+gWH&X4JMSzVpOQ6}@c&{KKWTf4A
zt)#1236gH#9I%WLosIQ@8y#fO?ifj;1nD5SLNvjiqsy72%4SG{9aZ;+nx_QmLC?Bn
zP70>7+`^s|Z0W)VB}f-2d$w`^vu8Xtgsr}E>{wWZ;k5<Rs00ZHWgJC})+}w}XqRby
zATh$qyl7TS3DOLwrIku;_5g^<(eb=}PYFVgw-8Q}*evrPjVIWw$vNGLwRuf#_5iBw
zn>R>CAxe;j-3&1x1?1qGr4Lmh20`qI;_|uYE9mysq4oU`P=YMLkJ-TyV^Q!!l!t%+
z)nM<AU0GdSVBP%N)Ae=p`JaEUkpKJb=MA!P{+#*Z?F;7a#~+z{H*d~YP;+<s-g?cQ
z;bk8r$nbn@?a|8WvEm)EETIVcMZ_pKK;2OLhOc>?7C{8a0Z9<ZfIy6`i*Fn5Lm0}C
zU-n_%HD%E^ugs9{DM9x2CQBuRWz@b~jbFAURh?q#X4uUTb$ZMB1pDWI_Pxfl31!Rm
zhkmUD+3jHn!HmHSu$$$TNQ2v}(cQ{-KmK_4s#&r#t6Z2%5@rr&9m+P-I*d}ICkV?Y
zW(+ppA-nX@6aJsl!#0Ucl2ayT61U`n1P}rtpJf>L$d}mD=Q^V%h}(dNnl;LSFnQdc
zAOvVxXBXEHf|&wBAdrK+F4|79jZO)Y3IGs-S%bYoESuUcb7I+{di@X>9YGv9Nd2Ij
zUwe$pk@<-9^X{k!!bY5#BX(DDiWH&^$zFnXmw7-y`$Lk^5QP0k=#6+)ATV?AoT2KT
z=JgMOQ4oY#Bj$d?bvv6`Hn{G!Z+h>B>`8Zs6Et7jhf;qi1gY&0$kD}q17dLEQ)`Ic
z=p_P!B?!+DVw1zo7?6XdRp<z~d+j5U%9W?b^MNK2KrJc_mLR-oFxJcgG2AnP7{qAN
zf0adbiB$=UD07emi8XU@I^~Gb#X~&l9)y8`8B`PzT4@G>!4ZVhDgtE2OV1a~61PvU
z8BV9VAcixScHOn6%RyjJ1c4Z#PpdZ0pDW%PzMSqcbKgKX&!z`oc&YeCM4d_Ip|tqk
zU<d*^SXwQ1xmgKDZ<bS}&1%FcC4E@v9*Xi|FW#jLHarJ%GprJ)S$_?JAaphX(9Gq<
zrPyn5GS%gBYQI%3z#;zrdy?1aK_@dTSV0_8^1)A{a}0F`K@d)?LUa~{fEesGLg;I&
zg8(LI8SxqI3Es9k+LT8>?I~I6QR_WH+>)W*#b$RP2cMSfdP&9T4H>#3MI9QBEPR_g
zM8&SUvSZ5cH9_b^mJGffwhVF<0r}eN#m}M<kiI^Ist=|RmRUI^yF&TbR!^@9LMOI$
zcz^k>$>E5>(uV8(_N4L}+aOBncE-l5w*;XB5g&jc$L9I7#aH0?=xJJ)<zU|e4veuG
zVRmWi>rl$|mLPPPPbWBXkoxFpQr87ph~;3D_F|O52lgkVG4!XZvzG*6B=!ZA4S5&j
z7}7F@8H9l;1pdDL*H!)A5rj_i9f^6)5&N_XJ2^gG)<!pG0D(Wm$H$oMq@cTZ1o8dW
zLS~KF&pB9zK#m~?5X5K6HDn(lXs-xDXE1tUxK!AbOY1hN2RT@VG%4HnGW5sLNzyBV
z_|6`D;*S|5R$#I=9}77ghC?SwuL$BZdq506=;S&!bjq6C$G*_^bg6I1B<T%77@d7O
zol`5H`t$0t9!KVt331QoV1e0_`V17Fwp3OhDoJ`nkO$8EW@X1T$s{n4CS}`}Vb8(r
z(Y9XG^2~Y!Hy_yAIDbz3`4GMemHNDepEL#@kc4+PkT&%%^>V!+2!JC}Fk{Ug*c5Be
z!BI4%fE<uS>bt8~{;d(n0Z9;ahn!UyFnsrl&gK--UJ!&&$4S8=&_V`)vjcK)l<QuH
zO0gGW)Ez}n*Z)D(6oHG)<;oBR0y2Pv#E88Z?Umc=>vb;(;<LX0GSbh5v6Kke=>#jw
zpE_c=wtT)6d!^<Vt6bZVGZaynS@#pt`Ov2{d4l+WOvi`n@N%a@*pMS6OC6+%tv)_2
z`o1j48FDshKZul3PUAXxg7~awr?F;_@4gzO_Xu{DQ>1Ma-u+1Sg>n#k(SU<3o9EAp
z4+F}6Fo^h`K9=<@<2reQlsA`c0Ae(ruCKSL(x_~x4kr*d?5R|vM)wtxe&Zr)ntby+
z*s<KhM(X$or;m$B>7ze(-J}Tuu#7?y5T?S-?7X(HhYjewGEMHW)|Zk4{ZmVPf|%>J
zva-6`xC%B(+i{J6na?V~=~-5qG(miTjj=iRIZbmN3^`cqyVufG`gK5UXXMQQ%Pj^K
zh$8iMne~z;h!hw`Jw#f+svaH88ougY(>zB05agh}9}D*(E33y0zM!LtfMW=fgcw|!
z*jrmhcq3_oF!D(JnnqY&`OIecz<Qo%4qS(j7{|SJc0m$fOc`9-5VOvfuJe;6h!2=P
z!Bf`(ZI>oxJp|Z>a6?|!Q@)09=q=|py<T+OTcwAYkL6+2y{37-gG|$QLY7OGAaxJ5
znmAAJG%44#3}j_#(zN{kay(nupBLh_&vCD$eMllDCGD{y086g>BFPejH`hr(^y$F5
z_IyUZsXcKDO;~5A&vCCbP<_engQfGk%QRVnNI{rJ*njveueL5;kh-$4-qey$Iv_}A
zXvj{x3yrHO(6?En2|;RHjhpQgl%Xwa@^G!HO@bGxy0`4S2cA76HUZN6_$4K$*kF%}
z$r42BQ;ZF|bU8vGN&RSAZz`NIefCt4L%RRLFUcVR^_C&Y5=7d8ECE6SDJ2IsOzjeg
zG^Y3r2tK|+euyIRtxre3NfN}T<0Kt6ua3|1YM$Ou_ZSeQf$Fo=q0Omq_QH3cwyEEh
zBuNmd^K_cDZe2a;FUCsW3Q}iBjC|jv4sYj?V(zmCih)I)&LtD1+AQhll2TCKyK%GH
zxd^$^{eYDG&IKtssLv8QrIi9URY{TrsWP-lUY9}H#GbCoNS}vDmycz?e3n^dJ*i#~
ziXbsS?gQz>Gsw}S-jMkm5=d7H-bS}jpaf|FR-2-}%a=B7`7CvOmpML%1bx_tC_&mp
zV!~y8NaE|3bO!6gK4iEA@$L29`qGVm*PSo5Gsr$9(r5p7yI`q_5@Z4VJ|lA<*4R>F
zm0|N)W~Gi%k_1U@V=N_!?{kK75H7k7F%v9mW8Qt~GHagB6z(NSkQ9I^+aT@yF5gli
z-E2$AU&hDhy30XCV&|X;66@s1=liv~`1}L=9ZBbhtRsCE6RXcc`8Ftm#9C(TUt_lc
zzl-mMT3KCfW71yPWzQZMva))NBw0z4AkvK^%M2t2+CDbLoJH`L4<Si>4*3*3wSA)m
zkE%LJ5`>WrsWNz3dD5@h!CnHGK;}BM#3WxETcraCZN$O`-M*3}L42Hwb!_PK&Q<)0
z@ne@PPaq%qC9-w#ZArDtI;jn4l|~9OlO>4s<Vb))qbdY|k4=n{eA_u`qXrigLJvPN
zu%KA&ZTzXdDZCLwr_hvO)siKM)Wev^hFcdeczx?RBmRP!q><a`@%{0hko%8DM$ah}
z>u_aGlZ|gBOOO<g4H+SQW)XUYk)Pm}J|p4x5PfD2Y(TaGF0ass`0PWdpQ0p75b3E1
zqbore3+ye=S;W~zpfj8Ba|+n(@~cwFMES=qT{c`-m1&db`wfY0+Uk4RWC_Bv2PwF*
zHtN_DVirLU0+HEdGb0fEqzGgnMabuM2x8DCvK3+WK<^MGS%LsI!AROxV(vq*Wh>Au
zg08YKlOT|R6e-^iaUFB^knSZ?UYaFM5b1iK0Aq9x5l~e+Ans;>-_5Af9WT!m2Mk*g
zXAddn;2G0zAKhsa<eKca_y9yYno+lj(5We%1U0eQ_j`5cwIL<PJe?`rOPV0l_4Q)Z
zlK{1{x+<yGst%)Z%q2@JV-^&~PM>|<0`*2ZATiJ^(!I?4;`s)>000TMNkl<ZNfQKM
zr0dfz-Xw^9kR<g^h8Wn1y|JW=0V$U4^YkW95b0aZnet<vW|curc|QU<HUj^6PuX{O
zE&a0bsmHf7y0&Ac$rD7nQ3tfHzBPjxgr7~G+9e_FrXtwW1vw5KJ!)2jZ(H~I+Mq6Q
zPM#nHA0h#RPD3PhC3W}>Le~0{x}obp4D1Q5w@RPSJBpd%s&uB3mpnlLYU(i!AAa#g
zRCFe+^&yFr)V_w&F68Jk@TAKtZ1wdwcKu!u#Ah0224O!E8_2SLNaB`UT?PTfq}?vb
z0k&XV_P^=1^Z=%*{t)GQLXeNd$Gw2`;0rI2bS^A$Hthq&Y2>{L`fs0JGZ3?DCw-Pz
zJ|9Bs%FkX91TcIaa>ahKj(v5)3<6O$>`4+MJg@7@w#kPS=wrq}f1A3Y$})TKUNVV3
zaA-nkiSCefdP5MF4S*_jo_EgDq0;)k^{}6SAfO#t$ZO*hq<{?QAVpuB`o2EwukSN^
zOg;9M`|XJNx;F#?gsqDgNJIiTd^%LrXiX)Ev32on15pTemPe$#MhJdV@(}JL<WKE#
zZJDHSE`g_X_CSZvzLNS~Nv{av8ys{f9orSSZQ3E|Ar69{q~sxO^mJ9$XRyI1{OihA
zpLTjh5FDL)PR+|+YT-lQg;OgA8>t_@eJE{LQm=OeVQIn$BypBH%pg9aA3DY?;Kv8K
zq!`e5^r5tVz<P~T^^PET<vRi~`tea$bg8sMfNy4LS7WxcZ{N*oi~p*Z1YrbXB=Ug=
zlCV_p(J{8V3@SdD(P#8spK$9XK>(QNA^^^{R9GsoWRTV$Q$2{mpyK0m-)0Yd?JYq#
z1qlJTZrTZh`2sl@Oy-xGf0x0mZ?gv;^_CzQ58wdLwN#ivlqB`&fsZda&>mtiLr>Qt
zBS_a)&S{UO)|}goZV?1Zl7mn=Tn^r8m&0t&VAify8l`(r5Wwd>NxpCr4DK5beRU0?
zKFccb02d#BnBjR>fRB!4*6lq(0FTj$j^Nr?_>wkGYkc+exjy6wv8)1vzAmk>9T@~c
zaAfoRS+BRmqr(ZOHIT%2^mO|Al!hb+vpa)VpZwo%>tG1N48mwdy5C93Ye>RFF#<+X
zzmIj8HINXt(+?Zx&xKI6R2|6?#0L#VD@fv_qg)qq5HKvehCG|#C;JW3vj0BUAr4P`
z+7DHCPy_)KND^YxjxHyB;EDhu9U4(sN-_w9^oyB;<(0#)&*|U@LTAJv33{1HhO+E}
z?2w+NB))|b2B)Er155@<5FCRfF*=H62qP{+kcAw1u{*Xn`yqR1+o$X6OZi-UOw0yL
z5I|$9XS2w4Xd%!DGDcy@!t2m&gwzL_u@i}5D}xcAcnoQC3c3bO5CG;Qt8|_*hL=%<
zfFtk_0x|T+>|-?cKw`*@oj$ti>VhwWQQiGM=MSDBbPk=z+L-H@LI4to1SDi(1H25f
zKnm<|zfKj?29{Oe8xz-M>K+9_0GK@qB#E`;qK&dZ7B;|;g+O(LAwP7$LI{L5XbW=i
zx@=F3Yw#T6vZ{>LXb6JSkc9L3u1G?gP9O$^A&4OjDS^x^gAmY^fjkKHND=Z8${>`d
zE_xgxcug7Vbs-P~JiBOXnQe@UAOOvJc{AYKQqU<8f|+24Gzb9>X$X3Rz$Zn>M<|0(
zp1P1n(zb7%4f}+grIoLqKGYu_LFg1_5H|1OIvK6Q7X}w_BOSiCJ06abAUm!b!!m)<
z5W=`TO{)=LzcEIvMokbxfzgmrkpNJlfXJ+X3B(w~eq+}2omZnL$PNsqcmlj>_a?gR
za)=lM77QK?B0tF;*Od~a)ZdJjy6iFrLTuQLI9Qb68RexCq@vpi5JpY{1kzL#=`O3o
zmhc;5AY6CYbh1q;LFROgTVl9?87f)u3m*|B#%w?+L1yu&d_~X@Je#|F6auQUV9zq~
zi&>J{lIxzC--)?OkQOjQ3>Q$O1QmHLR3uTfJTr2ggi(nap#%|j41u*_H?oYrq^Xm|
z+3S9Yr;o%Ic9mB(C5RV%JCz{^BynU(<(UekV5W1Vz|I|ucmCJ^7bBnqS&UJu5(FU+
z)gTLj32_KgNW;BYBR6EA4cc;Tb4`9L2ej}E0+Y;`uV!-eMNkAF1wjgFAPd2Za7_Rc
z)CgrL>jWYp?lt!j$|BT7&;=2>rVYwaFQ^kERR%XExiMdk)c>WqO#l=41T#U65a5u;
z34xEe*W5=ai%=Iq*U}src*AgmCDxsR`>F0J0#XF-K#)yoZLOyW)F3dF>`e&r*-*Su
zKNNw$2z+J<lHCZbRMja013@6WVF_Zc55yaFLlFp#!1amA%>RVes`?axK_FncG0C^h
ze+|MJbz&q4bmu1AnEd#wul~KeCbcC+pg#z}jmcA2ul}z!`4cPprwAwlKSAIVxG~v%
zeRVh0L=jK~b`U5yu|tqN|6nIi|5pSQfdYYDP80;09NPZpB2)iU1jdX&$#=(zf*_B+
zfAv4@aqqR#eZ5o!#*08^t`(fH2owadsmZqUzav#q1jdd)nG1Ua$q#M+_1J+?{}llc
zD05+tAV=Q6`rr2EyH@m15g0Q9@9uJ;z+jIcyvnouEm9RlV5|u2=fDg>9=~+upG<Dv
z6M&;t6oLLDU}L}FK*^ICf)x3O@;@z7{ZA1X8v+%ve}EuI-oNspG1;3&|0x2aLLhr{
zC-!HZK0pv|ZytW=_p;3VkZTo1VCV=C>%@GOpOpmp=KA`V#^f(oRnR;|V0Z}RFYm<s
zLC-1)Lb1m#UHR8M%YK*Z<%+hh2*g8x7$?^2TBs!m6&}BI`K>I^|A=c9MPO(M5ZlD~
zJiq1=go=+{zVat1;#x%!7zzT!G_k$NpM?ZL0g9N4xK>dF`i=mxOiVZNqY*(+#8i}J
z`LD3!=e3F=&^H8#U1FG6ZfbjDf}oJi%*KNcKW&EcoW$tA@gR`BN$e8CZG3J;5EOG9
zcI1Q0XU!yE)3>F7h)U83<mNqMm6#=V+uGWiAg%$PIv%<F;h8+kf8FNkyMQeS`j->}
z?-HBDD6uNFOiU2hAaCwE^1+9{WhVE&$;p6zGSMNUY3B%J=2{VhHWrCVV$;_KZ-O`j
zcn>`%14k}>xH_5K`vsHdXYIXrtmsz?SrGIu3IfE|JH#3>N9+|bxbxYjAPoj1NZA@b
z&wJ$Zl{YPmzis8IFYn%aGS9PTO_rTACi}h>KHmFp#uVS`_^D05$jq>Q>B{<~e?kOy
zW8n*1o!H=;KW(gJHfFN#6GOxjF-2@y`8Kge%-Qn6|Nb8U0RR6J6@gX&000I_L_t&o
Y04q^}G_M0%X#fBK07*qoM6N<$f~KQ;X#fBK

literal 0
HcmV?d00001

diff --git a/src/assets/images/vip.png b/src/assets/images/vip.png
new file mode 100644
index 0000000000000000000000000000000000000000..009df9a16c899374c03a2ca13740bf2f9cc16acd
GIT binary patch
literal 3587
zcmX9=3pmr=A0M&axu(da-2S;oX4cP|nVDHL%tEZ>no5a8Z?2I`<gz4}aviCph@zyq
z%|ausr6nZEWwcx)a@qcS-}iaWIp6cWeLkOap65KzNh6aE%Sx$9fj}TxdjifyWPL;v
z`qwtmih;TlL<SN{I2H~9N$>h+ih&A?RY0I^AhM&I-QiG2I1Gk^!vPo!3x(nj9<((#
zKL~}|!QmJvR20X<;RnskL@V6P3=pMYFj1vwAk57EYqW*K5h4V0b0`!lii;3LuBe@W
zKww267>uavKm7kvcoC5(3x^~B<rTTWzX(_W_=iQL0RYhdW<@Rr4o4#psDBGY;36EP
zND=^`U@#N_U;qG%M509-1OkUd;!!Ass2&EJVY9HJhzJmg6mg9+>Ac=fksbmHg+rl4
zM0`%)Okek8Hv<U(1T=b#(ZuiX!yynDByyI^al~NwoL(XtJ>J<O(!*mh@gfZfKy+SS
zUpE$Ii9;a?Xw*2fWwN^sk4AG_8fUp|JPOJ0XHT*iI3xmt0C>Gj3;-vhQ2^W=35N}|
z(XmK`6~bbM-Ft#e8fVb)XcQ5HX{)T@(i<^I#D@DZcOrp+L>?zO5iw{tB4M(#&6Ply
z;q(#!z>7?#5Q$g>;O<Ba3-BN7p!>PGxDfDDtPUgqA8vcuURB|U#kAa`v7bF2VbDDs
z9h@vJTPyE|_<B2Hu`YOg0L7i#(gZ-EBpb~AoGfn_a*+3lP=DVsR_8dQiG;;E<8W!0
z!^eBOn`i|HI1CNI3sRCDG3c`=js<&r`MQvaC=|V-<VH-S=tu)iPiOntoR{^!E-sUu
zEqrz_yS`?S-mpQTg!+1;;INA}*x3ON8IQXZ;GZ6O=~i4!aY`Z{fZwHF&rgcO0r1Z1
zhmq$3YYOi$tL~-z9aeEOGc)QkpUcjUjT~gQ#)ky8+%F$tw$RIqd3~MZZtmV>5{2Z5
zM<QyA3i_T_9mimZ2*d!Rd9dX<7J!rS`0RvOM>Kkaay$)(XVq3QNTeJ*zV>#`po?46
z{R&z}DlP3=QdsCrAB$68^W2d{L7`{_!c&UfKQ9M%$%W(!@@3C!jrwZQc3|e)5)#;>
zS#jR;qYH5wJ7}S!S)#CWTWwsncL-)4O-@J{&7QAiF#aroKvF^WI2$(#<nKFCp{@f;
zU6Q#-2?I~Pv-x^X9haPtHSV6bXr;iij<y5r*?HEJ=1kpTSZ9)%xO5kIdmS}c3p`eb
zzywkur{t4sY|l_SK)Min;`j@hoSQp8<i58`tL%-KyCT15*Ny7c^MbXK`B+}_#+==K
zHP!J4PEo(p=FbG>LMP6Jg)bhQn0j>a$YbvEQLKLI;uy!eK#-JO9V5_KeUtq2e2!kx
zxD!!M2UP0yv8l=Y^jmVj2epV))8BWeyuYahU-JneNZ3AaBe#)yF)NcbRj&G>mQyBf
zBo?W|kk2*@l`Ne$Za%&*EOToe`fa35uA)~m5Z)|-=P94w^>oosyZ@qj;stz4?Fcnb
z*i)EWvhQ)X(>@R14=TPNpy<MOwf1Hksn9%e0y<;HC)>Bs-wF7#UDH~R3RzmT{W^}-
z^xwb5wXt4UK4k-5RIHdc^fOAUy!@5Z3OXS-aC5%+iTj>hR{6$`J&@**3J!l#wF?~;
z0dWlv3!BKl6`jmV)|_BU%4v%QJz@B^-~4K?opI(A8EljUW})svoaM)kN%}H1`V%Fk
zugg8`N|u&ZTmauDtt)&f1-~+DCA|pzLY6#sa_*srG3+VS7^L#!m>l7@>qGALC<szo
zxBY$sY@~Al4Sh{RVbM+XAPB*NZa7r1m2R~=W2ghGoXh&6X;GwI|NEjY<708IKl(yl
zPDZ7~+uIiHslxZp&*Wj}x4pNCHD>sdl^g10LUb0?`Xa#wUA=OrY_6P}j>_}g?*J70
zG|uJeP0A;|3ZCrA(`tNf;_0s0VC>1wU_U$hMj_d*<aEVwFqqc(&9nJxcM3g8yf~K;
zFeG62-<AQ7QDR_&^`yGvT=yjIxuzc(-SVEs4%@vB*dOO|vS~hUZXS*NmQw~DL7&7)
zv4=jpVwS>-KYAQe+1eBon4ihlcp=3X6g%o=iN(K{3Q~#JUpp{x*Eitk;Uj2gvc-ZL
zF;X?QreHUuG*JoqC@eWH$9~5P+8j83s;Z6~ExGyDd%v{wTI(9g{(oBvGtuZ}o^8C>
zVtYGXq02+6%!smGZ%h0)&*1w-3ssWw+yR|9ry1R%zG&kDnU#iP)%okutY?yfX1Uhh
z$)!kl<NpcfUzBdSj$jsB(H1jj7WGt<B`6N{M&U;C?MvkndSj**QuMU=^`YlLQB94$
zs#I{ppz-b^C;wQw*HlEASZx%lH0$z5CFS@u20Q|WW>$!!wpH}>xG=kOzC=l{&CNNb
z1}m<ZDCd+r2G)KwNb?`R_0qJJJFeZzY*Sf^_`_S{MZTNgV-V*&=Bm`p96$QV@Kl}f
zU1VW$;z~zPM~Ba4_GWOnTP8l(<OP1Xi)_#kMb#P9-PlcIH*&`)YMPh+Y-wTzSnJLu
z=YTkk{g}C0_YEhmM8iN8%KO2kR~UkiQL?}(*k5}2MMGKg*HW@UI5&hAq%Wwh7wCQP
zQRj=t5A^(~5L9T&DJsuj|MGE4K{M;>rbJ-;!@?5<Y9HeNSF$^KIqsXZ&>-D}$`dS(
zb|o7On%=$ocKEju{Ul_WCYyR&PVSZe(|rqVCl8+&91*r<@Y8E???=;7?SnUAsjU@{
zjFUDMi{f)^2$ciUpL~?=UOniK-5i}&4xu?*zZ~=JoPk^E;9RJi>0;*<)0856;hEI+
za%=1Ou^P|$k6hVJzmU$}A=G!*P~r3bqo=-A-Vy3)*9=r%YfxJ22sxs-OBg+NZ8+Xp
zXJ^9emA(SUsS7-&-*i^n(9o+(`9XCn@3ZaR`{3lEQ@^~Nuk990EJ{4H*>&{Pp}a$x
z7j`ZyCLU$4LCh4^zP&9l7eaKz#pvT(J9fstTdQxUQF)K=O$<0%TlrZJM|86PD3ye!
zqWpCo-L_uJ^yl<kKIcfzBJlesoc&B=|L|vrHDk}qyIoNYMLbEQ9dcN|QVUp^Qt4oe
z^A!4Yr8+&N#Mo%)dBy%Izs;hkDT@M|_LF%<qI(8!kt%bVm}~1>uZ2#a#l<G}-h@Yd
zd&dc>u<3wdhi`2Zm&8ANzqG`dY##fpY^i98jBlm=8gtfP!>^ZZ&w5;X&2su`RoPYk
z;q=jMqgU3Ex@DnzgRG;z9*IHa7@EfOb$`sy$<~_*U$f`eCdl^2z^MFY*r1Rk^YGIf
z%S|h8ZjYPM-|dHrN8ic};UIh0;u4hBe+@l&U{a7-8*9GoGtDoW4U?Ul^P~qJ>F&5?
z`;;P+MX^i%wLef`D7IWgb6cD=-y=}Gx%Clb1mZKP8E@)%D-lG7bBJszJ$fo{qo-Vm
zWxW_&d>Lf1xn1+po7I^7c*U__t~P>x(wm3sk6o;KRxG8Z);7uM!4?K$CZUz*hz`TU
zIojV-v)I2*X^lqs4Fk&qx_n-2^+k<^3r4?KU&Vi_TZ;*J2*&Ld{>qWz!ac7KrxX@m
z{@&O&;<iVwF@%+C9>;n?>ps&2EUWvi^E}K~_bEi^_gPozZ#5KDw9HxbxTt8Uz(0Nq
z^zV~ZNfsvto%3~OZ#<V<V0sme$xofxHl?p&YB<v!dq6_HZzXaHJQ8(!Axiw`<U(Az
z@<N5YUm~=O2_|S#=bCVl)3t_9AzyC%sjaa~882q@>JNQ#UWZtBpUlF<mqs0$Zf2;E
zqokKlr0@Rgr+u!N6Mt7^bj+%Eg+yiRX9!aASi`+ojpaswU24boR9;k<%j%vJ^9~E@
zi&C0?k`4ZAi5k0$C|M^bv$(>+DfVK^8Y8mQ8!=_+lMiLvK3t=y2F=dT&r5lDn9dz<
z79W}ohX@VV6ow#8Be&0H14foFd7q_b-Ign}_0_2USC}7?h_8*lj~~&>=?K_mClmRs
z%Ww6wu6@TGV`uZ;dnWYbJiS*J1LdvK{>IFheg#Eek?z$J_sQF_&0ic+*OTqQb#l5C
zj@Xpjezws;;q3F|;Jv|i3cDAmfu?&jTA4l3*K2Kv;5`icLy}5bLyrS846dD&Yt1yS
z@pjs<b+EOq<YZ6}pdH&3ig2CkM6>k#KsD`V-)XUoTef!zwGo`IXP8O@@B-MjuJ;7{
z1Z0gHn>yTHGPd4w^Mb}k@RJfBj(Bz0opSL6>n@-N8{7Q-sY&)tyN--Z@e6*<Glth|
z>M>Rq3!*>NN~=-lvQwLRRg#8h#CBHe3!^C6UGC0jDc7k~>MgH;^Q@E>^TdQaX-<pH
z9qXO7E>>14E#N?HyQF^i$KDsXCtV*l`d{$O@-eV&Np{%*{G3!N{$tY5x>ESAH)Pd3
zqJU}AQz)~we3wDg`77~gyL+N|?D`wAb1m0YZHJyt-Y2JP%_=T+#YS$MUga&8mTOdZ
zYuwN^<AhurV|d)6R0H`A3H9c(z2CMJhvO?23pNCrHlI$OFCXt#{<+Jr?yQ1D(pa)h
zyFgPP^zOk3QvLKoo-^~6Rzu9lSI(+XD3*KkV6e+?vC15EvCrCRJ~9X+jy)?~W=Y`=
zE&p>u+5v<YNVwp-%8l!;u0G<bhZ;j&_0YS~`jZ(}SC1;mnXuKdgjEe@my%Y#YEt8V
h(B<VUb9$PE+op#k-<Vfb4v9XkAbUF!?g`d6@&9RnvYY?_

literal 0
HcmV?d00001

diff --git a/src/components/layout/NavHeader.vue b/src/components/layout/NavHeader.vue
index 5e05acad..5dfc9ea1 100644
--- a/src/components/layout/NavHeader.vue
+++ b/src/components/layout/NavHeader.vue
@@ -76,6 +76,7 @@ const onMenuSelect = (key: string): void => {
     <div class="flex-1 h-full" />
     <!-- 右侧 -->
     <div class="flex items-center gap-3 shrink-0">
+      <NavUser />
       <SDropdownMenu :items="menuItems" @select="onMenuSelect">
         <template #trigger>
           <SButton class="app-no-drag" variant="tertiary" circle :size="40">
diff --git a/src/components/layout/NavUser.vue b/src/components/layout/NavUser.vue
new file mode 100644
index 00000000..f1163915
--- /dev/null
+++ b/src/components/layout/NavUser.vue
@@ -0,0 +1,113 @@
+<script setup lang="ts">
+import { useUserStore } from "@/stores/user";
+import { dialog } from "@/composables/useDialog";
+import { toast } from "@/composables/useToast";
+import vipImg from "@/assets/images/vip.png";
+
+const { t } = useI18n();
+const user = useUserStore();
+
+const loginOpen = ref(false);
+const popoverOpen = ref(false);
+
+/** 启动时校验登录态（cookie 仍有效就刷新 profile） */
+onMounted(() => {
+  if (user.profile) {
+    user.fetchStatus().catch(() => undefined);
+  }
+});
+
+const isVip = computed(() => !!user.profile?.vipType && user.profile.vipType !== 0);
+
+const onTriggerClick = (): void => {
+  if (!user.isLoggedIn) loginOpen.value = true;
+};
+
+const handleLogout = async (): Promise<void> => {
+  popoverOpen.value = false;
+  const ok = await dialog.confirm({
+    title: t("login.logoutConfirmTitle"),
+    content: t("login.logoutConfirmDesc"),
+    type: "warning",
+  });
+  if (!ok) return;
+  await user.logout();
+  toast.success(t("login.logoutDone"));
+};
+</script>
+
+<template>
+  <SPopover
+    v-if="user.isLoggedIn"
+    v-model:open="popoverOpen"
+    trigger="click"
+    align="end"
+    content-class="w-40"
+  >
+    <template #trigger>
+      <div
+        class="app-no-drag inline-flex items-center gap-2 h-10 pl-1 pr-3 rounded-full bg-on-surface/6 hover:bg-on-surface/10 transition-colors cursor-pointer select-none"
+      >
+        <span
+          class="size-8 rounded-full overflow-hidden bg-on-surface/10 flex items-center justify-center"
+        >
+          <img
+            v-if="user.profile?.avatarUrl"
+            :src="user.profile.avatarUrl"
+            alt="avatar"
+            class="size-full object-cover"
+            referrerpolicy="no-referrer"
+          />
+          <IconLucideUserRound v-else class="size-4 text-on-surface-variant" />
+        </span>
+        <span class="text-sm text-on-surface max-w-[7rem] truncate">
+          {{ user.profile?.nickname || t("login.unknownUser") }}
+        </span>
+        <img v-if="isVip" :src="vipImg" alt="VIP" class="h-4 shrink-0" />
+        <IconLucideChevronDown
+          :class="[
+            'size-3 text-on-surface-variant transition-transform duration-200',
+            popoverOpen && 'rotate-180',
+          ]"
+        />
+      </div>
+    </template>
+
+    <div class="flex flex-col items-center gap-2">
+      <span
+        class="size-12 rounded-full overflow-hidden bg-on-surface/10 flex items-center justify-center"
+      >
+        <img
+          v-if="user.profile?.avatarUrl"
+          :src="user.profile.avatarUrl"
+          alt="avatar"
+          class="size-full object-cover"
+          referrerpolicy="no-referrer"
+        />
+        <IconLucideUserRound v-else class="size-5 text-on-surface-variant" />
+      </span>
+      <div class="flex items-center gap-1.5">
+        <span class="text-sm font-semibold text-on-surface truncate max-w-30">
+          {{ user.profile?.nickname || t("login.unknownUser") }}
+        </span>
+        <img v-if="isVip" :src="vipImg" alt="VIP" class="h-4 shrink-0" />
+      </div>
+      <span
+        v-if="user.profile?.signature"
+        class="text-xs text-on-surface-variant text-center line-clamp-2"
+      >
+        {{ user.profile.signature }}
+      </span>
+      <SButton variant="secondary" size="small" class="mt-1" block @click="handleLogout">
+        <template #icon><IconLucideLogOut /></template>
+        {{ t("login.logout") }}
+      </SButton>
+    </div>
+  </SPopover>
+
+  <SButton v-else class="app-no-drag" variant="tertiary" :size="40" circle @click="onTriggerClick">
+    <template #icon><IconLucideUserRound /></template>
+  </SButton>
+
+  <LoginDialog v-model:open="loginOpen" />
+</template>
diff --git a/src/components/modals/LoginCookieDialog.vue b/src/components/modals/LoginCookieDialog.vue
new file mode 100644
index 00000000..32837ed4
--- /dev/null
+++ b/src/components/modals/LoginCookieDialog.vue
@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import { toast } from "@/composables/useToast";
+import { useUserStore } from "@/stores/user";
+
+const props = defineProps<{ open: boolean }>();
+const emit = defineEmits<{
+  "update:open": [value: boolean];
+  /** 登录成功 */
+  success: [];
+}>();
+
+const { t } = useI18n();
+const user = useUserStore();
+
+const raw = ref("");
+const loading = ref(false);
+
+watch(
+  () => props.open,
+  (open) => {
+    if (!open) {
+      raw.value = "";
+      loading.value = false;
+    }
+  },
+);
+
+const submit = async (): Promise<void> => {
+  const value = raw.value.trim();
+  if (!value || !/MUSIC_U\s*=/i.test(value)) {
+    toast.error(t("login.cookieInvalid"));
+    return;
+  }
+  loading.value = true;
+  try {
+    const res = await window.api.apis.setCookie("netease", value);
+    if (!res.ok) {
+      toast.error(t("login.cookieInvalid"));
+      return;
+    }
+    const ok = await user.fetchStatus();
+    if (!ok) {
+      toast.error(t("login.failed"));
+      return;
+    }
+    toast.success(t("login.success"));
+    emit("success");
+    emit("update:open", false);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const onOpenUpdate = (value: boolean): void => emit("update:open", value);
+</script>
+
+<template>
+  <SDialog :open="open" :title="t('login.manualCookie')" width="420px" @update:open="onOpenUpdate">
+    <div class="flex flex-col gap-3">
+      <SAlert>{{ t("login.cookieHint") }}</SAlert>
+      <SInput
+        v-model="raw"
+        type="textarea"
+        :rows="4"
+        clearable
+        :placeholder="t('login.cookiePlaceholder')"
+        :disabled="loading"
+      />
+    </div>
+    <template #footer="{ close }">
+      <SButton variant="tertiary" :disabled="loading" @click="close">
+        {{ t("common.cancel") }}
+      </SButton>
+      <SButton type="primary" :loading="loading" @click="submit">
+        {{ t("login.cookieConfirm") }}
+      </SButton>
+    </template>
+  </SDialog>
+</template>
diff --git a/src/components/modals/LoginDialog.vue b/src/components/modals/LoginDialog.vue
new file mode 100644
index 00000000..aba31196
--- /dev/null
+++ b/src/components/modals/LoginDialog.vue
@@ -0,0 +1,275 @@
+<script setup lang="ts">
+import { renderSVG } from "uqr";
+import { useUserStore } from "@/stores/user";
+import { toast } from "@/composables/useToast";
+import { dialog } from "@/composables/useDialog";
+import { REPO_NAME } from "@/utils/config";
+import { qrKey, qrCheck, qrContent, type QrStatusCode } from "@/apis/login/netease";
+
+const props = defineProps<{ open: boolean }>();
+const emit = defineEmits<{ "update:open": [value: boolean] }>();
+
+const { t } = useI18n();
+const user = useUserStore();
+
+const loading = ref(false);
+const cookieDialogOpen = ref(false);
+
+const qrUrl = ref("");
+const qrUnikey = ref("");
+const qrStatus = ref<QrStatusCode>(801);
+const scannedNickname = ref("");
+const scannedAvatar = ref("");
+
+const qrTip = computed(() => {
+  switch (qrStatus.value) {
+    case 800:
+      return t("login.qrTipExpired");
+    case 801:
+      return t("login.qrTipWaiting");
+    case 802:
+      return t("login.qrTipScanned");
+    case 803:
+      return t("login.qrTipDone");
+    default:
+      return t("login.qrTipUnknown");
+  }
+});
+
+const finishLogin = async (): Promise<boolean> => {
+  const ok = await user.fetchStatus();
+  if (ok) {
+    toast.success(t("login.success"));
+    emit("update:open", false);
+    return true;
+  }
+  toast.error(t("login.failed"));
+  return false;
+};
+
+const resetScanned = (): void => {
+  scannedNickname.value = "";
+  scannedAvatar.value = "";
+};
+
+/** 取新 unikey + 渲染二维码 SVG。错误纠错级 H：中心遮挡 logo 后仍可扫码
+ *  用 data URL + <img> 渲染，避免 v-html 注入 SVG 的 XSS 风险面 */
+const refreshQr = async (): Promise<void> => {
+  resetScanned();
+  qrStatus.value = 801;
+  try {
+    const key = await qrKey();
+    qrUnikey.value = key;
+    const svg = renderSVG(qrContent(key), {
+      ecc: "H",
+      border: 0,
+      pixelSize: 8,
+      whiteColor: "#ffffff",
+      blackColor: "#000000",
+    });
+    qrUrl.value = `data:image/svg+xml;utf8,${encodeURIComponent(svg)}`;
+  } catch (err) {
+    console.warn("[login] qr key failed:", err);
+    qrUnikey.value = "";
+    qrUrl.value = "";
+  }
+};
+
+/** 803 时 cookie 已由主进程 SESSION_MUTATING 自动落库，这里只拉 profile */
+const handleQrSuccess = async (cookie: string): Promise<void> => {
+  if (!cookie || !cookie.includes("MUSIC_U")) {
+    toast.error(t("login.failed"));
+    void refreshQr();
+    return;
+  }
+  loading.value = true;
+  try {
+    await finishLogin();
+  } finally {
+    loading.value = false;
+  }
+};
+
+const pollOnce = async (): Promise<void> => {
+  if (!qrUnikey.value) return;
+  let result: Awaited<ReturnType<typeof qrCheck>>;
+  try {
+    result = await qrCheck(qrUnikey.value);
+  } catch {
+    return;
+  }
+  qrStatus.value = result.code;
+  if (result.code === 800) {
+    void refreshQr();
+    return;
+  }
+  if (result.code === 802) {
+    if (result.nickname) scannedNickname.value = result.nickname;
+    if (result.avatarUrl) scannedAvatar.value = result.avatarUrl;
+    return;
+  }
+  if (result.code === 803 && result.cookie) {
+    pause();
+    await handleQrSuccess(result.cookie);
+  }
+};
+
+const { pause, resume } = useIntervalFn(pollOnce, 1500, { immediate: false });
+
+const startQrFlow = async (): Promise<void> => {
+  pause();
+  await refreshQr();
+  if (qrUnikey.value) resume();
+};
+
+watch(
+  () => props.open,
+  (open) => {
+    if (open) {
+      void startQrFlow();
+    } else {
+      pause();
+      loading.value = false;
+      qrUnikey.value = "";
+      qrUrl.value = "";
+      resetScanned();
+    }
+  },
+  { immediate: true },
+);
+
+/** 自动获取：先弹安全提示，确认后才打开官方登录窗口 */
+const startAutoFetch = async (): Promise<void> => {
+  if (loading.value) return;
+  const ok = await dialog.confirm({
+    title: t("login.autoFetchTitle"),
+    content: t("login.autoFetchTip"),
+    confirmText: t("login.autoFetchConfirm"),
+    type: "warning",
+  });
+  if (!ok) return;
+
+  loading.value = true;
+  pause();
+  try {
+    const res = await window.api.apis.openLoginWeb("netease");
+    if (!res.ok) {
+      if (res.error !== "canceled") toast.error(t("login.failed"));
+      resume();
+      return;
+    }
+    await finishLogin();
+  } finally {
+    loading.value = false;
+  }
+};
+
+const openManualCookie = (): void => {
+  pause();
+  cookieDialogOpen.value = true;
+};
+
+/** cookie 弹窗关闭后恢复扫码轮询 */
+const onCookieDialogOpen = (open: boolean): void => {
+  cookieDialogOpen.value = open;
+  if (!open && props.open) resume();
+};
+
+const onCookieSuccess = (): void => {
+  emit("update:open", false);
+};
+
+const onOpenUpdate = (value: boolean): void => {
+  emit("update:open", value);
+};
+</script>
+
+<template>
+  <SDialog :open="open" :closable="false" width="380px" @update:open="onOpenUpdate">
+    <div class="flex flex-col items-center gap-4 py-3">
+      <div class="flex flex-col items-center gap-2">
+        <SLogo :size="48" />
+        <div class="text-xl font-semibold text-on-surface">{{ REPO_NAME }}</div>
+      </div>
+      <!-- 二维码 -->
+      <div
+        class="relative size-40 mt-4 rounded-2xl bg-white p-3 border border-solid border-on-surface/12 shadow-sm overflow-hidden"
+      >
+        <img
+          v-if="qrUrl"
+          :src="qrUrl"
+          alt="QR"
+          :class="[
+            'size-full',
+            qrStatus === 802 && 'opacity-30 blur-4',
+            qrStatus === 800 && 'opacity-40',
+          ]"
+        />
+        <div v-else class="size-full flex items-center justify-center text-gray-400">
+          <SLoading class="size-6" />
+        </div>
+        <div
+          v-if="qrUrl && qrStatus !== 802 && qrStatus !== 800"
+          class="absolute inset-0 flex items-center justify-center pointer-events-none"
+        >
+          <div class="size-8 rounded-lg bg-white overflow-hidden">
+            <img src="/icons/logo-icon.png" alt="logo" class="size-full object-contain" />
+          </div>
+        </div>
+        <!-- 扫码后的预览 -->
+        <Transition name="fade">
+          <div
+            v-if="qrStatus === 802 && scannedNickname"
+            class="absolute inset-0 flex flex-col items-center justify-center gap-1.5"
+          >
+            <img
+              v-if="scannedAvatar"
+              :src="scannedAvatar"
+              referrerpolicy="no-referrer"
+              alt="avatar"
+              class="size-12 rounded-full object-cover"
+            />
+            <div
+              class="text-xs font-semibold text-gray-900 [text-shadow:0_0_4px_white,0_0_8px_white]"
+            >
+              {{ scannedNickname }}
+            </div>
+          </div>
+        </Transition>
+        <!-- 过期遮罩 -->
+        <div
+          v-if="qrStatus === 800"
+          class="absolute inset-0 flex items-center justify-center text-xs font-medium text-gray-700 bg-white/70 cursor-pointer select-none"
+          @click="refreshQr"
+        >
+          {{ t("login.qrRefresh") }}
+        </div>
+      </div>
+      <div class="text-xs text-on-surface-variant">{{ qrTip }}</div>
+      <!-- 辅助登录方式 -->
+      <div class="flex items-center gap-2 pt-1">
+        <SButton variant="ghost" size="small" :disabled="loading" @click="startAutoFetch">
+          <template #icon><IconLucideScanLine /></template>
+          {{ t("login.autoFetch") }}
+        </SButton>
+        <div class="h-3 w-px bg-outline-variant/40" />
+        <SButton variant="ghost" size="small" :disabled="loading" @click="openManualCookie">
+          <template #icon><IconLucideKeyRound /></template>
+          {{ t("login.manualCookie") }}
+        </SButton>
+      </div>
+    </div>
+    <template #footer="{ close }">
+      <SButton variant="tertiary" class="mx-auto" :disabled="loading" @click="close">
+        <template #icon><IconLucideX /></template>
+        {{ t("common.cancel") }}
+      </SButton>
+    </template>
+  </SDialog>
+  <!-- 手动输入 -->
+  <LoginCookieDialog
+    :open="cookieDialogOpen"
+    @update:open="onCookieDialogOpen"
+    @success="onCookieSuccess"
+  />
+</template>
diff --git a/src/components/ui/SAlert.vue b/src/components/ui/SAlert.vue
new file mode 100644
index 00000000..8261a26d
--- /dev/null
+++ b/src/components/ui/SAlert.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import type { Component } from "vue";
+import IconLucideInfo from "~icons/lucide/info";
+import IconLucideCheckCircle2 from "~icons/lucide/check-circle-2";
+import IconLucideAlertTriangle from "~icons/lucide/alert-triangle";
+import IconLucideXCircle from "~icons/lucide/x-circle";
+
+type AlertType = "default" | "info" | "success" | "warning" | "error";
+type AlertVariant = "soft" | "outline";
+
+const props = withDefaults(
+  defineProps<{
+    /** 主题色 */
+    type?: AlertType;
+    /** 视觉变体 */
+    variant?: AlertVariant;
+    /** 标题 */
+    title?: string;
+    /** 自定义图标 */
+    icon?: Component;
+    /** 不显示图标 */
+    hideIcon?: boolean;
+  }>(),
+  {
+    type: "default",
+    variant: "soft",
+    hideIcon: false,
+  },
+);
+
+const defaultIcon = computed<Component>(() => {
+  switch (props.type) {
+    case "success":
+      return IconLucideCheckCircle2;
+    case "warning":
+      return IconLucideAlertTriangle;
+    case "error":
+      return IconLucideXCircle;
+    default:
+      return IconLucideInfo;
+  }
+});
+
+/** 图标 + 文字配色 */
+const textIconClasses = computed(() => {
+  switch (props.type) {
+    case "info":
+      return "text-blue-700 dark:text-blue-400 [&_.alert-icon]:text-blue-600 dark:[&_.alert-icon]:text-blue-400";
+    case "success":
+      return "text-green-700 dark:text-green-400 [&_.alert-icon]:text-green-600 dark:[&_.alert-icon]:text-green-400";
+    case "warning":
+      return "text-amber-700 dark:text-amber-400 [&_.alert-icon]:text-amber-600 dark:[&_.alert-icon]:text-amber-400";
+    case "error":
+      return "text-red-700 dark:text-red-400 [&_.alert-icon]:text-red-600 dark:[&_.alert-icon]:text-red-400";
+    default:
+      return "text-on-surface [&_.alert-icon]:text-primary";
+  }
+});
+
+/** 底色 */
+const softBgClass = computed(() => {
+  switch (props.type) {
+    case "info":
+      return "bg-blue-500/8";
+    case "success":
+      return "bg-green-500/8";
+    case "warning":
+      return "bg-amber-500/10";
+    case "error":
+      return "bg-red-500/8";
+    default:
+      return "bg-primary/8";
+  }
+});
+
+/** 左侧色条颜色 */
+const outlineBorderClass = computed(() => {
+  switch (props.type) {
+    case "info":
+      return "border-blue-500";
+    case "success":
+      return "border-green-500";
+    case "warning":
+      return "border-amber-500";
+    case "error":
+      return "border-red-500";
+    default:
+      return "border-primary";
+  }
+});
+
+const containerClasses = computed(() =>
+  props.variant === "outline"
+    ? [
+        "border-0 border-l-4 border-solid bg-on-surface/3 rounded-lg",
+        outlineBorderClass.value,
+        textIconClasses.value,
+      ]
+    : ["rounded-lg", softBgClass.value, textIconClasses.value],
+);
+</script>
+
+<template>
+  <div class="flex gap-2 p-3 text-xs leading-relaxed" :class="containerClasses">
+    <component
+      :is="icon ?? defaultIcon"
+      v-if="!hideIcon"
+      class="alert-icon size-4 shrink-0 mt-0.5"
+    />
+    <div class="flex-1 min-w-0">
+      <div v-if="title" class="text-sm font-semibold mb-1">{{ title }}</div>
+      <slot />
+    </div>
+  </div>
+</template>
diff --git a/src/components/ui/SInput.vue b/src/components/ui/SInput.vue
index 1c1b3217..24b6f0fe 100644
--- a/src/components/ui/SInput.vue
+++ b/src/components/ui/SInput.vue
@@ -7,7 +7,11 @@ export interface SInputProps {
   readonly?: boolean;
   clearable?: boolean;
   round?: boolean;
-  type?: string;
+  type?: "text" | "password" | "email" | "number" | "url" | "search" | "tel" | "textarea";
+  /** 多行行数 */
+  rows?: number;
+  /** 是否显示原生缩放手柄 */
+  resize?: "none" | "vertical" | "horizontal" | "both";
   /** 尺寸 */
   size?: "small" | "medium" | "large";
   /** 状态色（错误等） */
@@ -22,11 +26,34 @@ const props = withDefaults(defineProps<SInputProps>(), {
   clearable: false,
   round: false,
   type: "text",
+  rows: 3,
+  resize: "none",
   size: "medium",
   status: "default",
 });
 
+const isTextarea = computed(() => props.type === "textarea");
+
+const resizeClass = computed(() => {
+  switch (props.resize) {
+    case "vertical":
+      return "resize-y";
+    case "horizontal":
+      return "resize-x";
+    case "both":
+      return "resize";
+    default:
+      return "resize-none";
+  }
+});
+
 const sizeClasses = computed(() => {
+  if (isTextarea.value) {
+    // 多行容器不限定高度，仅设字号 + 内边距
+    if (props.size === "small") return "px-2 py-1.5 text-xs";
+    if (props.size === "large") return "px-4 py-2.5 text-base";
+    return "px-3 py-2 text-sm";
+  }
   if (props.size === "small") return "h-7 px-2 text-xs";
   if (props.size === "large") return "h-10 px-4 text-base";
   return "h-8.5 px-3 text-sm";
@@ -48,8 +75,9 @@ const handleClear = () => {
 
 <template>
   <div
-    class="flex items-center gap-2 text-on-surface border border-solid transition-[border-color,box-shadow,background-color,width,opacity] duration-250"
+    class="text-on-surface border border-solid transition-[border-color,box-shadow,background-color,width,opacity] duration-250"
     :class="[
+      isTextarea ? 'relative block' : 'flex items-center gap-2',
       sizeClasses,
       round ? 'rounded-full' : 'rounded-lg',
       isFocused
@@ -62,38 +90,70 @@ const handleClear = () => {
       disabled ? 'opacity-50 cursor-not-allowed' : '',
     ]"
   >
-    <!-- 前置插槽 -->
-    <slot name="prefix" />
+    <!-- 多行 -->
+    <template v-if="isTextarea">
+      <textarea
+        :value="modelValue"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :readonly="readonly"
+        :rows="rows"
+        class="w-full block bg-transparent outline-none border-none shadow-none text-on-surface placeholder:text-on-surface-variant/40 disabled:cursor-not-allowed"
+        :class="[resizeClass, readonly ? 'cursor-pointer' : '', showClear ? 'pr-5' : '']"
+        @input="emit('update:modelValue', ($event.target as HTMLTextAreaElement).value)"
+        @focus="
+          isFocused = true;
+          emit('focus');
+        "
+        @blur="
+          isFocused = false;
+          emit('blur');
+        "
+      />
+      <!-- 清空按钮（textarea 模式右上角浮动） -->
+      <Transition name="fade">
+        <IconLucideX
+          v-if="showClear"
+          class="absolute top-2 right-2 size-3.5 text-on-surface-variant/50 cursor-pointer transition-colors duration-200 hover:text-on-surface"
+          @mousedown.prevent.stop="handleClear"
+        />
+      </Transition>
+    </template>
 
-    <input
-      :value="modelValue"
-      :type="type"
-      :placeholder="placeholder"
-      :disabled="disabled"
-      :readonly="readonly"
-      class="flex-1 min-w-0 h-full bg-transparent outline-none border-none shadow-none text-on-surface placeholder:text-on-surface-variant/40 disabled:cursor-not-allowed"
-      :class="readonly ? 'cursor-pointer' : ''"
-      @input="emit('update:modelValue', ($event.target as HTMLInputElement).value)"
-      @focus="
-        isFocused = true;
-        emit('focus');
-      "
-      @blur="
-        isFocused = false;
-        emit('blur');
-      "
-    />
+    <template v-else>
+      <!-- 前置插槽 -->
+      <slot name="prefix" />
 
-    <!-- 清空按钮：mousedown.prevent 保留输入焦点，避免触发 blur 让 focus-within 宽度回缩导致点击错位 -->
-    <Transition name="fade">
-      <IconLucideX
-        v-if="showClear"
-        class="size-3.5 text-on-surface-variant/50 shrink-0 cursor-pointer transition-colors duration-200 hover:text-on-surface"
-        @mousedown.prevent.stop="handleClear"
+      <input
+        :value="modelValue"
+        :type="type"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :readonly="readonly"
+        class="flex-1 min-w-0 h-full bg-transparent outline-none border-none shadow-none text-on-surface placeholder:text-on-surface-variant/40 disabled:cursor-not-allowed"
+        :class="readonly ? 'cursor-pointer' : ''"
+        @input="emit('update:modelValue', ($event.target as HTMLInputElement).value)"
+        @focus="
+          isFocused = true;
+          emit('focus');
+        "
+        @blur="
+          isFocused = false;
+          emit('blur');
+        "
       />
-    </Transition>
 
-    <!-- 后置插槽 -->
-    <slot name="suffix" />
+      <!-- 清空按钮：mousedown.prevent 保留输入焦点，避免触发 blur 让 focus-within 宽度回缩导致点击错位 -->
+      <Transition name="fade">
+        <IconLucideX
+          v-if="showClear"
+          class="size-3.5 text-on-surface-variant/50 shrink-0 cursor-pointer transition-colors duration-200 hover:text-on-surface"
+          @mousedown.prevent.stop="handleClear"
+        />
+      </Transition>
+
+      <!-- 后置插槽 -->
+      <slot name="suffix" />
+    </template>
   </div>
 </template>
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index 34a851e6..178b3460 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -49,6 +49,21 @@ const skipOnFailure = async (myToken: number, getCurrentToken: () => number): Pr
 /** load() 的结果；失败时附带错误码，跳曲决策交给调用方 */
 export type LoadOutcome = { ok: true; track: Track | null } | { ok: false; error?: string };
 
+/**
+ * 切歌通用前置
+ * @param duration 新歌时长（毫秒），未知时传 0
+ */
+const resetForLoad = (duration: number): void => {
+  const status = useStatusStore();
+  status.state = "loading";
+  status.trackLoading = true;
+  status.position = 0;
+  status.duration = duration;
+  playback.setCurrentTime(0, { force: true });
+  playback.setDuration(duration);
+  playback.setPlaying(false);
+};
+
 /**
  * 加载音频源
  * @param source - 音频文件路径或网络地址
@@ -58,21 +73,12 @@ export type LoadOutcome = { ok: true; track: Track | null } | { ok: false; error
 export const load = async (source: string, autoPlay = true, meta?: Track): Promise<LoadOutcome> => {
   const status = useStatusStore();
   const token = ++loadToken;
-  status.trackLoading = true;
   // 切歌即清空 AB 循环（per-song 状态）
   abLoop.reset();
   // 清除上一次 seek 残留
   seekTarget = null;
   playback.setSeeking(false);
-  // 不提前重置，保持播放状态
-  const wasPlaying = status.isPlaying;
-  status.state = wasPlaying ? "playing" : "loading";
-  // 立即重置进度
-  const initialDuration = meta?.duration ?? 0;
-  status.position = 0;
-  status.duration = initialDuration;
-  playback.setCurrentTime(0, { force: true });
-  playback.setDuration(initialDuration);
+  resetForLoad(meta?.duration ?? 0);
   // 非本地并行歌词与取色
   const isOnline = meta?.source !== "local";
   if (isOnline) {
@@ -121,9 +127,11 @@ const loadTrack = async (track: Track | null): Promise<void> => {
   if (!track) return;
   const myToken = ++trackToken;
   // 乐观更新
-  const media = useMediaStore();
-  media.setTrack(track);
+  useMediaStore().setTrack(track);
   lyricLoader.beginLoad();
+  resetForLoad(track.duration ?? 0);
+  void window.api.player.stop();
+  // 解析 URL
   const resolved = await resolveTrackSource(track);
   // 期间有新点击，让位给最新的 loadTrack
   if (myToken !== trackToken) return;
@@ -135,7 +143,7 @@ const loadTrack = async (track: Track | null): Promise<void> => {
     status.currentSource = null;
     status.state = "idle";
     void window.api.player.stop();
-    media.setLyric(null, null);
+    useMediaStore().setLyric(null, null);
     shouldSkip = true;
   } else {
     const result = await load(resolved.source, true, track);
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index b96bab05..898734bc 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -88,6 +88,36 @@
       "hot": "Trending"
     }
   },
+  "login": {
+    "description": "Link your account for cloud playlists, favorites and personalized recommendations",
+    "thisApp": "This app",
+    "netease": "NetEase Music",
+    "qrTitle": "Scan to sign in",
+    "qrTipWaiting": "Open the Cloud Music app and scan the QR code",
+    "qrTipScanned": "Scanned, please confirm in the app",
+    "qrTipExpired": "QR code expired, refreshing",
+    "qrTipDone": "Signed in",
+    "qrTipUnknown": "Unknown state, please retry",
+    "qrRefresh": "Refresh QR code",
+    "autoFetch": "Auto fetch",
+    "autoFetchTitle": "Before you continue",
+    "autoFetchTip": "This feature can't guarantee account safety — use it at your own discretion. If the official page goes blank or unresponsive, close it and try again.",
+    "autoFetchConfirm": "I understand",
+    "manualCookie": "Manual cookie",
+    "openWeb": "Sign in",
+    "cookieHint": "Only the MUSIC_U field from your cookie is needed. e.g. MUSIC_U=xxxx;",
+    "cookiePlaceholder": "Paste cookie, must contain MUSIC_U=xxx;",
+    "cookieInvalid": "Invalid cookie. MUSIC_U is required.",
+    "cookieConfirm": "Sign in",
+    "back": "Back",
+    "success": "Signed in",
+    "failed": "Sign-in failed, please try again",
+    "unknownUser": "Unknown user",
+    "logout": "Sign out",
+    "logoutConfirmTitle": "Sign out",
+    "logoutConfirmDesc": "Sign out of the current account?",
+    "logoutDone": "Signed out"
+  },
   "search": {
     "title": "Search",
     "titleSuffix": "search results",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 6318107d..7e85a1ed 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -88,6 +88,36 @@
       "hot": "热搜榜"
     }
   },
+  "login": {
+    "description": "绑定您的账号，使用云端歌单、收藏与个性化推荐",
+    "thisApp": "本软件",
+    "netease": "网易云音乐",
+    "qrTitle": "扫码登录",
+    "qrTipWaiting": "请打开云音乐 APP 扫码登录",
+    "qrTipScanned": "扫描成功，请在客户端确认登录",
+    "qrTipExpired": "二维码已过期，正在重试",
+    "qrTipDone": "登录成功",
+    "qrTipUnknown": "状态异常，请重试",
+    "qrRefresh": "刷新二维码",
+    "autoFetch": "自动获取",
+    "autoFetchTitle": "使用前告知",
+    "autoFetchTip": "该功能无法保证账号绝对安全，请自行判断是否使用。打开窗口后如出现白屏或无法点击，请关闭并重试",
+    "autoFetchConfirm": "我已了解",
+    "manualCookie": "手动输入",
+    "openWeb": "前往登录",
+    "cookieHint": "只需 Cookie 中的 MUSIC_U 字段，例如：MUSIC_U=xxxx;",
+    "cookiePlaceholder": "粘贴 Cookie，至少需要 MUSIC_U=xxx;",
+    "cookieInvalid": "Cookie 无效，必须包含 MUSIC_U",
+    "cookieConfirm": "登录",
+    "back": "返回",
+    "success": "登录成功",
+    "failed": "登录失败，请重试",
+    "unknownUser": "未知用户",
+    "logout": "退出登录",
+    "logoutConfirmTitle": "退出登录",
+    "logoutConfirmDesc": "确认退出当前账号？",
+    "logoutDone": "已退出登录"
+  },
   "search": {
     "title": "搜索",
     "titleSuffix": "的搜索结果",
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 3dbb3733..5e3f0bae 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -1,70 +1,58 @@
-/**
- * 用户登录态 Store
- *
- * - cookie 由主进程维护，这里只缓存"展示用"的 profile
- * - `isLoggedIn` 由 `profile != null` 派生
- * - 启动时通过 `fetchStatus()` 向 Netease 校验 cookie 是否仍有效
- */
+import type { UserProfile } from "@/types/user";
+import { clearNeteaseSession } from "@/apis/netease";
+import {
+  fetchLoginStatus,
+  refreshLogin as refreshLoginApi,
+  logoutNetease,
+} from "@/apis/login/netease";
 
-import { clearNeteaseSession, neteaseCall } from "@/apis/netease";
-
-/** 用户基础资料（对齐 Netease /login/status 返回的关键字段） */
-export interface UserProfile {
-  userId: number;
-  nickname: string;
-  avatarUrl?: string;
-  backgroundUrl?: string;
-  signature?: string;
-  /** 0=普通会员，非 0=黑胶 VIP（具体级别见官方文档） */
-  vipType?: number;
-  gender?: number;
-  province?: number;
-  city?: number;
-}
-
-interface LoginStatusBody {
-  data?: {
-    code?: number;
-    account?: { id?: number } | null;
-    profile?: (Partial<UserProfile> & { userId?: number }) | null;
-  };
-}
+/** 保活间隔 */
+const REFRESH_INTERVAL_MS = 24 * 60 * 60 * 1000;
 
 export const useUserStore = defineStore(
   "user",
   () => {
+    /** 用户基础资料 */
     const profile = ref<UserProfile | null>(null);
+    /** 上一次 login_refresh 时间戳（毫秒） */
+    const lastRefreshAt = ref<number>(0);
+    /** 是否已登录 */
     const isLoggedIn = computed(() => profile.value !== null);
 
-    /** 用给定 profile 填充登录态（一般由登录成功回调调用） */
-    const setProfile = (p: UserProfile | null): void => {
-      profile.value = p;
+    /**
+     * 用给定 profile 填充登录态
+     * @param newProfile 用户基础资料
+     */
+    const setProfile = (newProfile: UserProfile | null): void => {
+      profile.value = newProfile;
+      if (newProfile) lastRefreshAt.value = Date.now();
+      else lastRefreshAt.value = 0;
+    };
+
+    /** 后台续期 cookie，失败静默 */
+    const refresh = async (): Promise<void> => {
+      try {
+        await refreshLoginApi();
+        lastRefreshAt.value = Date.now();
+      } catch {}
     };
 
-    /** 调 /login/status 校验 cookie 并同步最新 profile；失效则清空 */
+    /** 校验 cookie 并同步最新 profile */
     const fetchStatus = async (): Promise<boolean> => {
       try {
-        const body = await neteaseCall<LoginStatusBody>("login_status");
-        const data = body?.data;
-        const p = data?.profile;
-        if (p?.userId) {
-          profile.value = {
-            userId: p.userId,
-            nickname: p.nickname ?? "",
-            avatarUrl: p.avatarUrl,
-            backgroundUrl: p.backgroundUrl,
-            signature: p.signature,
-            vipType: p.vipType,
-            gender: p.gender,
-            province: p.province,
-            city: p.city,
-          };
+        const latest = await fetchLoginStatus();
+        if (latest) {
+          profile.value = latest;
+          if (Date.now() - lastRefreshAt.value > REFRESH_INTERVAL_MS) {
+            void refresh();
+          }
           return true;
         }
         profile.value = null;
+        lastRefreshAt.value = 0;
         return false;
       } catch {
-        // 网络失败时保留缓存的 profile，不强制登出（离线可用性）
+        // 网络失败保留缓存的 profile，不强制登出（离线可用性）
         return profile.value !== null;
       }
     };
@@ -72,21 +60,21 @@ export const useUserStore = defineStore(
     /** 登出：服务端清会话 + 主进程清 cookie + 本地清 profile */
     const logout = async (): Promise<void> => {
       try {
-        await neteaseCall("logout");
+        await logoutNetease();
       } catch {
         /* 忽略：即使服务端登出失败也要清本地 */
       }
       await clearNeteaseSession();
       profile.value = null;
+      lastRefreshAt.value = 0;
     };
 
-    return { profile, isLoggedIn, setProfile, fetchStatus, logout };
+    return { profile, lastRefreshAt, isLoggedIn, setProfile, fetchStatus, logout };
   },
   {
     persist: {
       storage: localStorage,
-      // 只持久化 profile；cookie 在主进程自管
-      pick: ["profile"],
+      pick: ["profile", "lastRefreshAt"],
     },
   },
 );
diff --git a/src/types/user.ts b/src/types/user.ts
new file mode 100644
index 00000000..64e32495
--- /dev/null
+++ b/src/types/user.ts
@@ -0,0 +1,17 @@
+/**
+ * 用户登录相关类型
+ */
+
+/** 用户基础资料 */
+export interface UserProfile {
+  userId: number;
+  nickname: string;
+  avatarUrl?: string;
+  backgroundUrl?: string;
+  signature?: string;
+  /** 0=普通，非 0=黑胶 VIP */
+  vipType?: number;
+  gender?: number;
+  province?: number;
+  city?: number;
+}

From 0f94b40a81f60564ea7c5bb0bcd8105e3711aa83 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Sun, 17 May 2026 23:29:05 +0800
Subject: [PATCH 12/33] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=88=97=E8=A1=A8=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   5 +
 electron/main/apis/netease/core/request.ts    |  17 +-
 electron/main/apis/netease/modules/album.ts   |  16 ++
 .../apis/netease/modules/album_sublist.ts     |  22 +++
 .../main/apis/netease/modules/artist_album.ts |  24 +++
 .../main/apis/netease/modules/artist_songs.ts |  28 +++
 .../apis/netease/modules/artist_sublist.ts    |  22 +++
 electron/main/apis/netease/modules/artists.ts |  16 ++
 electron/main/apis/netease/modules/index.ts   |  30 +++
 electron/main/apis/netease/modules/like.ts    |  24 +++
 .../main/apis/netease/modules/likelist.ts     |  18 ++
 .../apis/netease/modules/playlist_detail.ts   |  26 +++
 electron/main/ipc/lyrics.ts                   |   4 +-
 shared/types/platform.ts                      |   6 +
 shared/types/player.ts                        |   6 +-
 src/apis/login/netease.ts                     |  28 +--
 src/apis/netease.ts                           |  12 +-
 src/apis/search/kugou.ts                      |   3 +-
 src/apis/search/netease.ts                    |   2 +-
 src/apis/search/qqmusic.ts                    |   3 +-
 src/apis/song/netease.ts                      |  12 +-
 src/apis/user/netease.ts                      | 185 ++++++++++++++++++
 src/components/layout/NavUser.vue             |  56 +++++-
 src/components/layout/SideBar.vue             |   3 +-
 src/components/list/CoverList.vue             |  23 +++
 src/components/list/SongList.vue              |  30 ++-
 .../player/FullPlayer/PlayerData.vue          |  20 +-
 src/components/player/TrackInfo.vue           |   2 +-
 src/components/ui/SVirtualList.vue            |   8 +-
 src/pages/Artist.vue                          |  97 ++++++---
 src/pages/Collection.vue                      | 101 +++++-----
 src/pages/Search.vue                          |  17 +-
 src/pages/Streaming/Playlists.vue             |   4 +-
 src/services/artistLoader.ts                  | 107 ++++++++++
 src/services/audioSource.ts                   |  30 +--
 src/services/collectionLoader.ts              | 173 ++++++++++++++++
 src/services/lyricLoader.ts                   |  15 +-
 src/stores/user.ts                            | 179 +++++++++++++++--
 src/types/user.ts                             |  12 ++
 src/utils/navigate.ts                         |  26 ++-
 src/utils/netease.ts                          |  68 +++++--
 41 files changed, 1270 insertions(+), 210 deletions(-)
 create mode 100644 electron/main/apis/netease/modules/album.ts
 create mode 100644 electron/main/apis/netease/modules/album_sublist.ts
 create mode 100644 electron/main/apis/netease/modules/artist_album.ts
 create mode 100644 electron/main/apis/netease/modules/artist_songs.ts
 create mode 100644 electron/main/apis/netease/modules/artist_sublist.ts
 create mode 100644 electron/main/apis/netease/modules/artists.ts
 create mode 100644 electron/main/apis/netease/modules/like.ts
 create mode 100644 electron/main/apis/netease/modules/likelist.ts
 create mode 100644 electron/main/apis/netease/modules/playlist_detail.ts
 create mode 100644 src/apis/user/netease.ts
 create mode 100644 src/services/artistLoader.ts
 create mode 100644 src/services/collectionLoader.ts

diff --git a/components.d.ts b/components.d.ts
index 046fc44a..fe9a441b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -75,10 +75,14 @@ declare module 'vue' {
     IconLucideDatabase: typeof import('~icons/lucide/database')['default']
     IconLucideDisc: typeof import('~icons/lucide/disc')['default']
     IconLucideDisc3: typeof import('~icons/lucide/disc3')['default']
+    IconLucideEllipsis: typeof import('~icons/lucide/ellipsis')['default']
     IconLucideExternalLink: typeof import('~icons/lucide/external-link')['default']
     IconLucideFlame: typeof import('~icons/lucide/flame')['default']
+    IconLucideFolder: typeof import('~icons/lucide/folder')['default']
     IconLucideFolderOpen: typeof import('~icons/lucide/folder-open')['default']
+    IconLucideFolderPlus: typeof import('~icons/lucide/folder-plus')['default']
     IconLucideGithub: typeof import('~icons/lucide/github')['default']
+    IconLucideHardDrive: typeof import('~icons/lucide/hard-drive')['default']
     IconLucideHistory: typeof import('~icons/lucide/history')['default']
     IconLucideInfo: typeof import('~icons/lucide/info')['default']
     IconLucideKeyRound: typeof import('~icons/lucide/key-round')['default']
@@ -99,6 +103,7 @@ declare module 'vue' {
     IconLucidePlus: typeof import('~icons/lucide/plus')['default']
     IconLucidePower: typeof import('~icons/lucide/power')['default']
     IconLucidePuzzle: typeof import('~icons/lucide/puzzle')['default']
+    IconLucideRefreshCw: typeof import('~icons/lucide/refresh-cw')['default']
     IconLucideRepeat: typeof import('~icons/lucide/repeat')['default']
     IconLucideRepeat1: typeof import('~icons/lucide/repeat1')['default']
     IconLucideScanLine: typeof import('~icons/lucide/scan-line')['default']
diff --git a/electron/main/apis/netease/core/request.ts b/electron/main/apis/netease/core/request.ts
index 286b6252..5b17aee7 100644
--- a/electron/main/apis/netease/core/request.ts
+++ b/electron/main/apis/netease/core/request.ts
@@ -45,6 +45,19 @@ export interface RequestResponse {
   cookie: string[];
 }
 
+/** 非 200 响应抛出的错误 */
+export class NeteaseRequestError extends Error {
+  readonly response: RequestResponse;
+  constructor(response: RequestResponse) {
+    const body = response.body as { code?: number | string; msg?: string; message?: string };
+    const code = body?.code ?? response.status;
+    const msg = body?.msg ?? body?.message ?? "";
+    super(msg ? `netease ${code}: ${msg}` : `netease ${code}`);
+    this.name = "NeteaseRequestError";
+    this.response = response;
+  }
+}
+
 interface NeteaseBody {
   code?: number | string;
   [key: string]: unknown;
@@ -215,7 +228,7 @@ export const createRequest = async (
   } catch (err) {
     answer.status = 502;
     answer.body = { code: 502, msg: err instanceof Error ? err.message : String(err) };
-    throw answer;
+    throw new NeteaseRequestError(answer);
   }
 
   // 收集 set-cookie（Node fetch 通过 headers.getSetCookie 暴露原始多值头）
@@ -254,7 +267,7 @@ export const createRequest = async (
   answer.status = answer.status > 100 && answer.status < 600 ? answer.status : 400;
 
   if (answer.status === 200) return answer;
-  throw answer;
+  throw new NeteaseRequestError(answer);
 };
 
 /** 宽松的 boolean 解析：原始 util/index.js 里的 toBoolean */
diff --git a/electron/main/apis/netease/modules/album.ts b/electron/main/apis/netease/modules/album.ts
new file mode 100644
index 00000000..06c8b21f
--- /dev/null
+++ b/electron/main/apis/netease/modules/album.ts
@@ -0,0 +1,16 @@
+/**
+ * 专辑详情（元数据 + 曲目）
+ *
+ * params:
+ * - id 专辑 id
+ *
+ * 响应：`{ code, album: { id, name, picUrl, artists, description, ... }, songs: NeteaseSong[] }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const album: NeteaseModule = (query, request) =>
+  request(`/api/v1/album/${query.id}`, {}, createOption(query, "weapi"));
+
+export default album;
diff --git a/electron/main/apis/netease/modules/album_sublist.ts b/electron/main/apis/netease/modules/album_sublist.ts
new file mode 100644
index 00000000..b82f5ee3
--- /dev/null
+++ b/electron/main/apis/netease/modules/album_sublist.ts
@@ -0,0 +1,22 @@
+/**
+ * 用户收藏的专辑列表
+ *
+ * params:
+ * - limit / offset 分页
+ *
+ * 响应：`{ code, count, hasMore, data: [{ id, name, picUrl, artists, ... }] }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const albumSublist: NeteaseModule = (query, request) => {
+  const data = {
+    limit: query.limit ?? 50,
+    offset: query.offset ?? 0,
+    total: true,
+  };
+  return request("/api/album/sublist", data, createOption(query, "weapi"));
+};
+
+export default albumSublist;
diff --git a/electron/main/apis/netease/modules/artist_album.ts b/electron/main/apis/netease/modules/artist_album.ts
new file mode 100644
index 00000000..a603ceec
--- /dev/null
+++ b/electron/main/apis/netease/modules/artist_album.ts
@@ -0,0 +1,24 @@
+/**
+ * 歌手专辑列表
+ *
+ * params:
+ * - id     歌手 id
+ * - limit  返回数量，默认 30
+ * - offset 偏移
+ *
+ * 响应：`{ code, hotAlbums: [...], more, artist }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const artistAlbum: NeteaseModule = (query, request) => {
+  const data = {
+    limit: query.limit ?? 30,
+    offset: query.offset ?? 0,
+    total: true,
+  };
+  return request(`/api/artist/albums/${query.id}`, data, createOption(query, "weapi"));
+};
+
+export default artistAlbum;
diff --git a/electron/main/apis/netease/modules/artist_songs.ts b/electron/main/apis/netease/modules/artist_songs.ts
new file mode 100644
index 00000000..4eaf0990
--- /dev/null
+++ b/electron/main/apis/netease/modules/artist_songs.ts
@@ -0,0 +1,28 @@
+/**
+ * 歌手全部歌曲（分页）
+ *
+ * params:
+ * - id     歌手 id
+ * - order  排序：hot（热门，默认） / time（时间）
+ * - limit  返回数量，默认 50
+ * - offset 偏移
+ *
+ * 响应：`{ code, songs: NeteaseSong[], more, total }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const artistSongs: NeteaseModule = (query, request) => {
+  const data = {
+    id: query.id,
+    private_cloud: "true",
+    work_type: 1,
+    order: query.order ?? "hot",
+    offset: query.offset ?? 0,
+    limit: query.limit ?? 50,
+  };
+  return request("/api/v1/artist/songs", data, createOption(query, "weapi"));
+};
+
+export default artistSongs;
diff --git a/electron/main/apis/netease/modules/artist_sublist.ts b/electron/main/apis/netease/modules/artist_sublist.ts
new file mode 100644
index 00000000..6f258275
--- /dev/null
+++ b/electron/main/apis/netease/modules/artist_sublist.ts
@@ -0,0 +1,22 @@
+/**
+ * 用户收藏的歌手列表
+ *
+ * params:
+ * - limit / offset 分页
+ *
+ * 响应：`{ code, count, hasMore, data: [{ id, name, picUrl, albumSize, ... }] }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const artistSublist: NeteaseModule = (query, request) => {
+  const data = {
+    limit: query.limit ?? 50,
+    offset: query.offset ?? 0,
+    total: true,
+  };
+  return request("/api/artist/sublist", data, createOption(query, "weapi"));
+};
+
+export default artistSublist;
diff --git a/electron/main/apis/netease/modules/artists.ts b/electron/main/apis/netease/modules/artists.ts
new file mode 100644
index 00000000..44e6c425
--- /dev/null
+++ b/electron/main/apis/netease/modules/artists.ts
@@ -0,0 +1,16 @@
+/**
+ * 歌手信息与热门歌曲
+ *
+ * params:
+ * - id 歌手 id
+ *
+ * 响应：`{ code, artist: {...}, hotSongs: NeteaseSong[], more }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const artists: NeteaseModule = (query, request) =>
+  request(`/api/v1/artist/${query.id}`, {}, createOption(query, "weapi"));
+
+export default artists;
diff --git a/electron/main/apis/netease/modules/index.ts b/electron/main/apis/netease/modules/index.ts
index 4387d751..04db16a1 100644
--- a/electron/main/apis/netease/modules/index.ts
+++ b/electron/main/apis/netease/modules/index.ts
@@ -52,6 +52,23 @@ import cloud_lyric_get from "./cloud_lyric_get";
 import song_detail from "./song_detail";
 import song_url from "./song_url";
 
+// 歌单 / 喜欢
+import playlist_detail from "./playlist_detail";
+import likelist from "./likelist";
+import like from "./like";
+
+// 专辑
+import album from "./album";
+
+// 歌手
+import artists from "./artists";
+import artist_album from "./artist_album";
+import artist_songs from "./artist_songs";
+
+// 用户收藏
+import album_sublist from "./album_sublist";
+import artist_sublist from "./artist_sublist";
+
 export const modules: Record<string, NeteaseModule> = {
   captcha_sent,
   captcha_verify,
@@ -92,4 +109,17 @@ export const modules: Record<string, NeteaseModule> = {
 
   song_detail,
   song_url,
+
+  playlist_detail,
+  likelist,
+  like,
+
+  album,
+
+  artists,
+  artist_album,
+  artist_songs,
+
+  album_sublist,
+  artist_sublist,
 };
diff --git a/electron/main/apis/netease/modules/like.ts b/electron/main/apis/netease/modules/like.ts
new file mode 100644
index 00000000..fa3da44e
--- /dev/null
+++ b/electron/main/apis/netease/modules/like.ts
@@ -0,0 +1,24 @@
+/**
+ * 红心 / 取消红心
+ *
+ * params:
+ * - id    歌曲 id
+ * - like  true 红心，false 取消
+ *
+ * 响应：`{ code, songs: [], playlistId }`
+ * code !== 200 表示失败（如未登录、歌单未创建等）
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const like: NeteaseModule = (query, request) => {
+  const data = {
+    trackId: query.id,
+    like: query.like === true || query.like === "true",
+    time: 3,
+  };
+  return request("/api/song/like", data, createOption(query, "weapi"));
+};
+
+export default like;
diff --git a/electron/main/apis/netease/modules/likelist.ts b/electron/main/apis/netease/modules/likelist.ts
new file mode 100644
index 00000000..1406948e
--- /dev/null
+++ b/electron/main/apis/netease/modules/likelist.ts
@@ -0,0 +1,18 @@
+/**
+ * 喜欢歌曲 id 列表
+ *
+ * params:
+ * - uid  用户 id
+ *
+ * 响应：`{ code, checkPoint, ids: number[] }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const likelist: NeteaseModule = (query, request) => {
+  const data = { uid: query.uid };
+  return request("/api/song/like/get", data, createOption(query, "weapi"));
+};
+
+export default likelist;
diff --git a/electron/main/apis/netease/modules/playlist_detail.ts b/electron/main/apis/netease/modules/playlist_detail.ts
new file mode 100644
index 00000000..630dc09c
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_detail.ts
@@ -0,0 +1,26 @@
+/**
+ * 歌单详情
+ *
+ * params:
+ * - id  歌单 id
+ * - s   收藏者数量，默认 8
+ *
+ * 响应：`{ code, playlist: { id, name, ..., tracks, trackIds }, privileges }`
+ * tracks 服务端可能截断；trackIds 是全量，需要时再走 song_detail 拉完整 song
+ *
+ * 加密：默认 eapi（对齐 NCM 增强版 playlist_detail 行为）
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistDetail: NeteaseModule = (query, request) => {
+  const data = {
+    id: query.id,
+    n: 100000,
+    s: query.s ?? 8,
+  };
+  return request("/api/v6/playlist/detail", data, createOption(query));
+};
+
+export default playlistDetail;
diff --git a/electron/main/ipc/lyrics.ts b/electron/main/ipc/lyrics.ts
index 36cc4eb4..8779b981 100644
--- a/electron/main/ipc/lyrics.ts
+++ b/electron/main/ipc/lyrics.ts
@@ -98,9 +98,9 @@ const resolveTTMLOverlay = async (
     const cached = getMatchedId(fingerprint, platform);
     // QM mid 放前面（AMLL DB 早期 QM 条目以 mid 为文件名的居多）
     if (platform === "qqmusic") push(cached?.extra?.mid);
-    if (track.platform === platform) push(track.id);
+    if (track.source === platform) push(track.id);
     // QM 在线 Track 默认走 byId
-    if (track.platform === platform) push(track.extId);
+    if (track.source === platform) push(track.extId);
     push(cached?.platformId);
     if (ids.length === 0) return { ok: true, data: null };
     return { ok: true, data: await fetchTTML(platform, ids) };
diff --git a/shared/types/platform.ts b/shared/types/platform.ts
index b03ba898..91fd0402 100644
--- a/shared/types/platform.ts
+++ b/shared/types/platform.ts
@@ -10,3 +10,9 @@ export const PLATFORM_SHORT_NAME: Record<Platform, string> = {
 
 /** 全部平台 */
 export const ALL_PLATFORMS: Platform[] = ["netease", "qqmusic", "kugou"];
+
+const PLATFORM_SET = new Set<string>(ALL_PLATFORMS);
+
+/** 判断给定 source 是否为在线平台（netease / qqmusic / kugou），同时类型收窄 */
+export const isPlatform = (source: string | undefined): source is Platform =>
+  source !== undefined && PLATFORM_SET.has(source);
diff --git a/shared/types/player.ts b/shared/types/player.ts
index b30c28da..99659468 100644
--- a/shared/types/player.ts
+++ b/shared/types/player.ts
@@ -10,8 +10,8 @@ export type RepeatMode = "off" | "list" | "one";
 /** 随机模式 */
 export type ShuffleMode = "off" | "on";
 
-/** 歌曲来源 */
-export type TrackSource = "local" | "online" | "streaming";
+/** 歌曲来源：本地 / 流媒体 / 在线平台 */
+export type TrackSource = "local" | "streaming" | Platform;
 
 /** 歌手 */
 export interface Artist {
@@ -72,8 +72,6 @@ export interface Track {
   extId?: string;
   /** 歌曲来源 */
   source: TrackSource;
-  /** 在线平台 */
-  platform?: Platform;
   /** 本地路径 */
   path?: string;
   /** 流媒体服务器实例 ID（仅 source==='streaming'） */
diff --git a/src/apis/login/netease.ts b/src/apis/login/netease.ts
index 3dace32f..114f09d8 100644
--- a/src/apis/login/netease.ts
+++ b/src/apis/login/netease.ts
@@ -5,32 +5,12 @@
 import type { UserProfile } from "@/types/user";
 import { netease as neteaseApi } from "@/apis/netease";
 
-interface QrKeyResp {
-  data?: { unikey?: string };
-}
-
-interface QrCheckResp {
-  code?: number;
-  cookie?: string;
-  nickname?: string;
-  avatarUrl?: string;
-  message?: string;
-}
-
-interface LoginStatusBody {
-  data?: {
-    code?: number;
-    account?: { id?: number } | null;
-    profile?: (Partial<UserProfile> & { userId?: number }) | null;
-  };
-}
-
 /**
  * 生成扫码登录二维码 key
  * @returns 二维码 key
  */
 export const qrKey = async (): Promise<string> => {
-  const body = await neteaseApi.login_qr_key<QrKeyResp>({ timestamp: Date.now() });
+  const body = await neteaseApi.login_qr_key({ timestamp: Date.now() });
   const unikey = body?.data?.unikey;
   if (!unikey) throw new Error("qr key missing");
   return unikey;
@@ -52,7 +32,7 @@ export interface QrCheckResult {
  * @returns 扫码状态和结果
  */
 export const qrCheck = async (key: string): Promise<QrCheckResult> => {
-  const body = await neteaseApi.login_qr_check<QrCheckResp>({ key, timestamp: Date.now() });
+  const body = await neteaseApi.login_qr_check({ key, timestamp: Date.now() });
   const code = (body?.code ?? 801) as QrStatusCode;
   return {
     code,
@@ -74,8 +54,8 @@ export const qrContent = (key: string): string => `https://music.163.com/login?c
  * @returns 已登录返回 profile；未登录或 cookie 失效返回 null
  */
 export const fetchLoginStatus = async (): Promise<UserProfile | null> => {
-  const body = await neteaseApi.login_status<LoginStatusBody>();
-  const raw = body?.data?.profile;
+  const body = await neteaseApi.login_status();
+  const raw = body?.data?.profile as (Partial<UserProfile> & { userId?: number }) | undefined;
   if (!raw?.userId) return null;
   return {
     userId: raw.userId,
diff --git a/src/apis/netease.ts b/src/apis/netease.ts
index f8cbd1ee..4af5ec31 100644
--- a/src/apis/netease.ts
+++ b/src/apis/netease.ts
@@ -2,10 +2,10 @@
  * Netease API 渲染端
  *
  * 用 Proxy 把所有接口代理到主进程：`netease.search({keywords})` 实际等于
- * `window.api.apis.call("netease", "search", {keywords})`。
+ * `window.api.apis.call("netease", "search", {keywords})`
  *
- * 调用约定：成功 → 返回 body；失败 → 抛 Error。
- * 想取原始响应（含 HTTP status）用 `neteaseRaw`。
+ * 调用约定：成功 → 返回 body；失败 → 抛 Error
+ * 想取原始响应（含 HTTP status）用 `neteaseRaw`
  */
 
 import type { ApiCallResponse } from "@shared/types/apis";
@@ -30,7 +30,7 @@ export const neteaseRaw = async (
  * @param name 接口名
  * @param params 接口参数
  */
-export const neteaseCall = async <T = unknown>(
+export const neteaseCall = async <T = any>(
   name: string,
   params?: Record<string, unknown>,
 ): Promise<T> => {
@@ -38,7 +38,7 @@ export const neteaseCall = async <T = unknown>(
   return res.body as T;
 };
 
-type NeteaseProxy = Record<string, <T = unknown>(params?: Record<string, unknown>) => Promise<T>>;
+type NeteaseProxy = Record<string, <T = any>(params?: Record<string, unknown>) => Promise<T>>;
 
 /**
  * 任意方法调用：`netease.search(...)` / `netease.song_url_v1(...)`
@@ -46,7 +46,7 @@ type NeteaseProxy = Record<string, <T = unknown>(params?: Record<string, unknown
 export const netease: NeteaseProxy = new Proxy({} as NeteaseProxy, {
   get:
     (_t, name: string) =>
-    <T = unknown>(params?: Record<string, unknown>) =>
+    <T = any>(params?: Record<string, unknown>) =>
       neteaseCall<T>(name, params),
 });
 
diff --git a/src/apis/search/kugou.ts b/src/apis/search/kugou.ts
index 03ed450e..e74d5dce 100644
--- a/src/apis/search/kugou.ts
+++ b/src/apis/search/kugou.ts
@@ -23,8 +23,7 @@ interface SongsResp {
 
 const songToTrack = (song: KGSong): Track => ({
   id: song.hash || song.id,
-  source: "online",
-  platform: "kugou",
+  source: "kugou",
   title: song.name,
   artists: song.artist ? [{ name: song.artist }] : [],
   // album.id 暂不暴露（在线专辑详情页未接通），列表里跟着 artist 一起暗显
diff --git a/src/apis/search/netease.ts b/src/apis/search/netease.ts
index 3eee66c0..8c75bc7e 100644
--- a/src/apis/search/netease.ts
+++ b/src/apis/search/netease.ts
@@ -49,7 +49,7 @@ const call = (
   offset: number,
   limit: number,
 ): Promise<CloudSearchBody> =>
-  neteaseApi.cloudsearch<CloudSearchBody>({
+  neteaseApi.cloudsearch({
     keywords: keyword,
     type: TYPE[type],
     offset,
diff --git a/src/apis/search/qqmusic.ts b/src/apis/search/qqmusic.ts
index 266906f6..c95cd788 100644
--- a/src/apis/search/qqmusic.ts
+++ b/src/apis/search/qqmusic.ts
@@ -30,8 +30,7 @@ const songToTrack = (song: QMSong): Track => {
   return {
     id: song.mid || song.id,
     extId: song.mid && song.id !== song.mid ? song.id : undefined,
-    source: "online",
-    platform: "qqmusic",
+    source: "qqmusic",
     title: song.name,
     // QM 的 song.artist 是合并字符串（"A / B"），没单独 id，列表里会自动暗显
     artists: song.artist ? [{ name: song.artist }] : [],
diff --git a/src/apis/song/netease.ts b/src/apis/song/netease.ts
index 6f6bf815..633a0f01 100644
--- a/src/apis/song/netease.ts
+++ b/src/apis/song/netease.ts
@@ -1,5 +1,4 @@
 import type { Track } from "@shared/types/player";
-import type { NeteaseSong } from "@/types/netease";
 import { netease as neteaseApi } from "@/apis/netease";
 import { songsToTracks } from "@/utils/netease";
 
@@ -11,24 +10,17 @@ import { songsToTracks } from "@/utils/netease";
 export const songsByIds = async (ids: Array<string | number>): Promise<Track[]> => {
   const cleaned = ids.map((v) => String(v).trim()).filter(Boolean);
   if (cleaned.length === 0) return [];
-  const body = await neteaseApi.song_detail<{ songs?: NeteaseSong[] }>({ ids: cleaned.join(",") });
+  const body = await neteaseApi.song_detail({ ids: cleaned.join(",") });
   return songsToTracks(body?.songs);
 };
 
-interface SongUrlResp {
-  data?: {
-    url: string | null;
-    freeTrialInfo: unknown | null;
-  }[];
-}
-
 /**
  * 解析网易云 Track 的可播放 URL
  * VIP 试听片段 / 无版权 → 返回 null
  * @param track - track.id 为云端 songId
  */
 export const resolveNeteaseUrl = async (track: Track): Promise<string | null> => {
-  const body = await neteaseApi.song_url<SongUrlResp>({ id: track.id, level: "exhigh" });
+  const body = await neteaseApi.song_url({ id: track.id, level: "exhigh" });
   const item = body?.data?.[0];
   if (!item?.url || item.freeTrialInfo) return null;
   return item.url;
diff --git a/src/apis/user/netease.ts b/src/apis/user/netease.ts
new file mode 100644
index 00000000..8145a7a1
--- /dev/null
+++ b/src/apis/user/netease.ts
@@ -0,0 +1,185 @@
+import type { Album, Artist, Playlist, Track } from "@shared/types/player";
+import type { UserSubcount } from "@/types/user";
+import { netease as neteaseApi } from "@/apis/netease";
+import { songsToTracks, toAlbum, toArtist, toPlaylist, toSubcount } from "@/utils/netease";
+import { songsByIds } from "@/apis/song/netease";
+
+const PAGE_SIZE = 50;
+
+/** song_detail 单批上限，500 在 URL 长度与延迟之间比较折中 */
+const SONG_DETAIL_BATCH = 500;
+
+/**
+ * 通用分页直到拉完
+ * @param fetcher 第 N 页拉取函数（offset/limit），返回 `{ data, hasMore }`
+ * @param extract 单项 raw → Item
+ */
+const fetchAllPages = async <Item>(
+  fetcher: (offset: number, limit: number) => Promise<{ data?: any[]; hasMore?: boolean }>,
+  extract: (raw: any) => Item,
+): Promise<Item[]> => {
+  const all: Item[] = [];
+  let offset = 0;
+  while (true) {
+    const resp = await fetcher(offset, PAGE_SIZE);
+    const list = resp.data ?? [];
+    all.push(...list.map(extract));
+    if (!resp.hasMore || list.length < PAGE_SIZE) break;
+    offset += PAGE_SIZE;
+  }
+  return all;
+};
+
+/** fetchPlaylist 可选参数 */
+export interface FetchPlaylistOptions {
+  /** 元数据回调 */
+  onMeta?: (meta: Playlist) => void;
+  /** 曲目分批回调 */
+  onBatch?: (batch: Track[]) => void;
+  /** 中断信号 */
+  signal?: AbortSignal;
+}
+
+/**
+ * 拉取歌单：元数据 + 全部曲目
+ *
+ * 1) `playlist/detail` 一次返回 元数据 + 前 ~1000 首完整 song + 全量 trackIds
+ * 2) 若 trackIds 还有未覆盖的，按 500 一批走 `song/detail` 补尾
+ *
+ * @param playlistId 歌单 id
+ * @param options 元数据/曲目回调与中断信号
+ */
+export const fetchPlaylist = async (
+  playlistId: string,
+  options: FetchPlaylistOptions = {},
+): Promise<void> => {
+  if (options.signal?.aborted) return;
+  const body = await neteaseApi.playlist_detail({ id: playlistId });
+  if (options.signal?.aborted) return;
+  const raw = body?.playlist;
+  if (!raw) return;
+
+  options.onMeta?.(toPlaylist(raw));
+
+  const firstBatch = songsToTracks(raw.tracks);
+  if (firstBatch.length > 0) options.onBatch?.(firstBatch);
+
+  const have = new Set(firstBatch.map((t) => Number(t.id)));
+  const missing: number[] = (raw.trackIds ?? [])
+    .map((item: { id: number }) => item.id)
+    .filter((tid: number) => !have.has(tid));
+
+  for (let i = 0; i < missing.length; i += SONG_DETAIL_BATCH) {
+    if (options.signal?.aborted) return;
+    const chunk = missing.slice(i, i + SONG_DETAIL_BATCH);
+    const batch = await songsByIds(chunk);
+    if (options.signal?.aborted) return;
+    if (batch.length > 0) options.onBatch?.(batch);
+  }
+};
+
+/** 用户全部歌单 */
+export const fetchUserPlaylists = async (uid: number, total?: number): Promise<Playlist[]> => {
+  const body = await neteaseApi.user_playlist({
+    uid,
+    limit: total && total > 0 ? total : 1000,
+    offset: 0,
+  });
+  return (body?.playlist ?? []).map(toPlaylist);
+};
+
+/** 用户订阅计数 */
+export const fetchSubcount = async (): Promise<UserSubcount> => {
+  const body = await neteaseApi.user_subcount();
+  return toSubcount(body ?? {});
+};
+
+/** 用户喜欢歌曲 id 列表 */
+export const fetchLikelist = async (uid: number): Promise<string[]> => {
+  const body = await neteaseApi.likelist({ uid });
+  return ((body?.ids as number[]) ?? []).map(String);
+};
+
+/** 用户收藏专辑 */
+export const fetchUserAlbums = (): Promise<Album[]> =>
+  fetchAllPages(async (offset, limit) => {
+    const body = await neteaseApi.album_sublist({ limit, offset });
+    return { data: body?.data, hasMore: body?.hasMore };
+  }, toAlbum);
+
+/** 用户收藏歌手 */
+export const fetchUserArtists = (): Promise<Artist[]> =>
+  fetchAllPages(async (offset, limit) => {
+    const body = await neteaseApi.artist_sublist({ limit, offset });
+    return { data: body?.data, hasMore: body?.hasMore };
+  }, toArtist);
+
+/** 切换红心 */
+export const toggleLikeSong = async (trackId: string, like: boolean): Promise<boolean> => {
+  const body = await neteaseApi.like({ id: trackId, like });
+  return body?.code === 200;
+};
+
+/** 用户等级 */
+export const fetchUserLevel = async (): Promise<number | undefined> => {
+  const body = await neteaseApi.user_level();
+  const level = body?.data?.level;
+  return typeof level === "number" ? level : undefined;
+};
+
+/**
+ * 拉取专辑：元数据 + 全部曲目
+ * @param albumId 专辑 id
+ */
+export const fetchAlbum = async (
+  albumId: string,
+): Promise<{ album: Album; tracks: Track[]; description?: string } | null> => {
+  const body = await neteaseApi.album({ id: albumId });
+  const raw = body?.album;
+  if (!raw) return null;
+  return {
+    album: toAlbum(raw),
+    tracks: songsToTracks(body?.songs),
+    description: typeof raw.description === "string" ? raw.description : undefined,
+  };
+};
+
+/**
+ * 拉取歌手：基本资料 + 热门 50 首 + 全部专辑
+ * 两次并行请求（artists + artist_album），专辑用 200 的 limit 覆盖绝大多数情况
+ * 更多歌曲通过 fetchArtistSongs 触底分页拉
+ * @param artistId 歌手 id
+ */
+export const fetchArtist = async (
+  artistId: string,
+): Promise<{ artist: Artist; tracks: Track[]; albums: Album[] } | null> => {
+  const [profile, albums] = await Promise.all([
+    neteaseApi.artists({ id: artistId }),
+    neteaseApi.artist_album({ id: artistId, limit: 200 }),
+  ]);
+  const rawArtist = profile?.artist;
+  if (!rawArtist) return null;
+  return {
+    artist: toArtist(rawArtist),
+    tracks: songsToTracks(profile?.hotSongs),
+    albums: (albums?.hotAlbums ?? []).map(toAlbum),
+  };
+};
+
+/**
+ * 触底加载更多歌手歌曲
+ * @param artistId 歌手 id
+ * @param offset 偏移（首屏 50 首之后从 50 起）
+ * @param limit 单页数量，默认 50
+ */
+export const fetchArtistSongs = async (
+  artistId: string,
+  offset: number,
+  limit = 50,
+): Promise<{ tracks: Track[]; more: boolean }> => {
+  const body = await neteaseApi.artist_songs({ id: artistId, offset, limit, order: "hot" });
+  return {
+    tracks: songsToTracks(body?.songs),
+    more: !!body?.more,
+  };
+};
diff --git a/src/components/layout/NavUser.vue b/src/components/layout/NavUser.vue
index f1163915..11297efa 100644
--- a/src/components/layout/NavUser.vue
+++ b/src/components/layout/NavUser.vue
@@ -3,6 +3,9 @@ import { useUserStore } from "@/stores/user";
 import { dialog } from "@/composables/useDialog";
 import { toast } from "@/composables/useToast";
 import vipImg from "@/assets/images/vip.png";
+import IconLucideListMusic from "~icons/lucide/list-music";
+import IconLucideDisc3 from "~icons/lucide/disc-3";
+import IconLucideUserRound from "~icons/lucide/user-round";
 
 const { t } = useI18n();
 const user = useUserStore();
@@ -19,6 +22,30 @@ onMounted(() => {
 
 const isVip = computed(() => !!user.profile?.vipType && user.profile.vipType !== 0);
 
+/** 收藏计数 */
+const stats = computed(() => [
+  {
+    key: "playlist",
+    label: t("collection.playlist"),
+    icon: markRaw(IconLucideListMusic),
+    value:
+      (user.subcount.createdPlaylistCount || 0) + (user.subcount.subPlaylistCount || 0) ||
+      user.playlists.length,
+  },
+  {
+    key: "album",
+    label: t("collection.album"),
+    icon: markRaw(IconLucideDisc3),
+    value: user.subcount.albumCount ?? user.albums.length,
+  },
+  {
+    key: "artist",
+    label: t("artist.label"),
+    icon: markRaw(IconLucideUserRound),
+    value: user.subcount.artistCount ?? user.artists.length,
+  },
+]);
+
 const onTriggerClick = (): void => {
   if (!user.isLoggedIn) loginOpen.value = true;
 };
@@ -90,6 +117,12 @@ const handleLogout = async (): Promise<void> => {
         <span class="text-sm font-semibold text-on-surface truncate max-w-30">
           {{ user.profile?.nickname || t("login.unknownUser") }}
         </span>
+        <span
+          v-if="user.level !== undefined"
+          class="shrink-0 inline-flex items-center px-1.5 py-0.5 rounded-full text-[10px] font-semibold leading-none bg-amber-500/15 text-amber-600 dark:text-amber-400 tabular-nums"
+        >
+          Lv.{{ user.level }}
+        </span>
         <img v-if="isVip" :src="vipImg" alt="VIP" class="h-4 shrink-0" />
       </div>
       <span
@@ -98,7 +131,28 @@ const handleLogout = async (): Promise<void> => {
       >
         {{ user.profile.signature }}
       </span>
-      <SButton variant="secondary" size="small" class="mt-1" block @click="handleLogout">
+      <SDivider class="w-full" />
+      <!-- 收藏计数 -->
+      <div class="w-full flex items-stretch justify-around gap-1">
+        <div
+          v-for="item in stats"
+          :key="item.key"
+          :title="item.label"
+          class="group flex flex-1 flex-col items-center gap-2 px-2 py-1.5 rounded-lg cursor-pointer transition-colors duration-200 hover:bg-on-surface/8 active:bg-on-surface/12"
+        >
+          <component
+            :is="item.icon"
+            class="size-4 text-on-surface-variant/70 transition-colors duration-200 group-hover:text-primary"
+          />
+          <span
+            class="text-sm font-semibold text-on-surface tabular-nums leading-none transition-colors duration-200 group-hover:text-primary"
+          >
+            {{ item.value }}
+          </span>
+        </div>
+      </div>
+      <SDivider class="w-full" />
+      <SButton variant="secondary" size="small" block @click="handleLogout">
         <template #icon><IconLucideLogOut /></template>
         {{ t("login.logout") }}
       </SButton>
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 21418524..ce0ee39a 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -2,6 +2,7 @@
 import type { SMenuItem } from "@/components/ui/SMenu.vue";
 import { useSettingsStore } from "@/stores/settings";
 import { usePlaylistStore } from "@/stores/playlist";
+import { navigateToPlaylist } from "@/utils/navigate";
 import IconLucideHome from "~icons/lucide/home";
 import IconLucideMusic from "~icons/lucide/music";
 import IconLucideUser from "~icons/lucide/user";
@@ -22,7 +23,7 @@ const handleCreate = async () => {
   const playlist = await playlistStore.create(
     t("collection.create", { type: t("collection.playlist") }),
   );
-  router.push(`/collection/local/playlist/${playlist.id}`);
+  navigateToPlaylist(playlist.id);
 };
 
 const menuItems = computed<SMenuItem[]>(() => [
diff --git a/src/components/list/CoverList.vue b/src/components/list/CoverList.vue
index 9a6ad5f3..afc5f5c7 100644
--- a/src/components/list/CoverList.vue
+++ b/src/components/list/CoverList.vue
@@ -22,6 +22,10 @@ export interface CoverListProps {
   paddingTop?: number;
   /** 底部 padding（px） */
   paddingBottom?: number;
+  /** 是否还能继续触底加载 */
+  hasMore?: boolean;
+  /** 触底加载中 */
+  loadingMore?: boolean;
 }
 
 const props = withDefaults(defineProps<CoverListProps>(), {
@@ -32,8 +36,12 @@ const props = withDefaults(defineProps<CoverListProps>(), {
   paddingX: 0,
   paddingTop: 0,
   paddingBottom: 0,
+  hasMore: false,
+  loadingMore: false,
 });
 
+const { t } = useI18n();
+
 const coverRounded = computed(() => {
   if (props.type === "artist") return "rounded-full";
   return props.rounded;
@@ -106,6 +114,21 @@ const getRowKey = (row: Row): string => row.id;
     height="100%"
     @reach-bottom="emit('reachBottom')"
   >
+    <template #footer>
+      <div
+        v-if="rows.length > 0 && loadingMore"
+        class="py-3 flex items-center justify-center gap-2 text-sm text-on-surface-variant/50"
+      >
+        <SLoading class="size-3.5 text-primary/70 shrink-0" />
+        <span>{{ t("common.loading") }}</span>
+      </div>
+      <div
+        v-else-if="rows.length > 0 && !hasMore"
+        class="py-3 text-center text-sm text-on-surface-variant/40"
+      >
+        {{ t("common.noMore") }}
+      </div>
+    </template>
     <template #default="{ item: row }: { item: Row }">
       <div
         class="grid"
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 67bb2524..d5018b15 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -34,14 +34,18 @@ const props = withDefaults(
     showDuration?: boolean;
     /** 显示文件大小 */
     showSize?: boolean;
-    /** 是否启用排序交互（默认关闭） */
+    /** 是否启用排序交互 */
     enableSort?: boolean;
     /** 列表来源 */
     source?: TrackSource;
     /** 集合类型 */
     collectionType?: CollectionType;
-    /** 集合 ID（用于从歌单移除） */
+    /** 集合 ID */
     collectionId?: string;
+    /** 是否还能继续触底加载 */
+    hasMore?: boolean;
+    /** 触底加载中 */
+    loadingMore?: boolean;
   }>(),
   {
     searchQuery: "",
@@ -53,6 +57,8 @@ const props = withDefaults(
     source: "local",
     collectionType: undefined,
     collectionId: undefined,
+    hasMore: false,
+    loadingMore: false,
   },
 );
 
@@ -77,7 +83,7 @@ const textCollator = new Intl.Collator(undefined, {
 const playingId = computed(() => media.track?.id);
 
 /** 非本地源需要真实 id */
-const needsRealId = computed(() => props.source === "streaming" || props.source === "online");
+const needsRealId = computed(() => props.source !== undefined && props.source !== "local");
 
 /** 专辑是否可跳转 */
 const isAlbumLinkable = (item: Track): boolean => {
@@ -238,8 +244,11 @@ defineExpose({
         @reach-bottom="emit('reachBottom')"
       >
         <!-- 搜索无结果 -->
-        <template v-if="searchQuery && sortedItems.length === 0" #empty>
-          <div class="flex flex-col items-center gap-2 text-on-surface-variant/40">
+        <template #empty>
+          <div
+            v-if="searchQuery"
+            class="flex flex-col items-center gap-2 text-on-surface-variant/40"
+          >
             <IconLucideSearchX class="size-8" />
             <span class="text-sm">{{ t("songList.noResults") }}</span>
           </div>
@@ -556,8 +565,15 @@ defineExpose({
         <template #footer>
           <slot name="footer">
             <div
-              v-if="sortedItems.length > 0"
-              class="py-3 text-center text-xs text-on-surface-variant/40"
+              v-if="sortedItems.length > 0 && loadingMore"
+              class="py-3 flex items-center justify-center gap-2 text-sm text-on-surface-variant/50"
+            >
+              <SLoading class="size-3.5 text-primary/70 shrink-0" />
+              <span>{{ t("common.loading") }}</span>
+            </div>
+            <div
+              v-else-if="sortedItems.length > 0 && !hasMore"
+              class="py-3 text-center text-sm text-on-surface-variant/40"
             >
               {{ t("common.noMore") }}
             </div>
diff --git a/src/components/player/FullPlayer/PlayerData.vue b/src/components/player/FullPlayer/PlayerData.vue
index 9b6bcf97..209749ea 100644
--- a/src/components/player/FullPlayer/PlayerData.vue
+++ b/src/components/player/FullPlayer/PlayerData.vue
@@ -36,9 +36,10 @@ const lyricSourceOptions = computed<SSelectOption[]>(() => [
 ]);
 
 /** 非本地源需要真实 id 才能跳转 */
-const needsRealId = computed(
-  () => media.track?.source === "streaming" || media.track?.source === "online",
-);
+const needsRealId = computed(() => {
+  const source = media.track?.source;
+  return source !== undefined && source !== "local";
+});
 
 /** 歌手是否可跳转 */
 const isArtistLinkable = (artist: Artist): boolean => {
@@ -71,14 +72,11 @@ const goToAlbum = (): void => {
 
 /** 来源标签 */
 const sourceLabel = computed(() => {
-  switch (media.track?.source) {
-    case "online":
-      return "ONLINE";
-    case "streaming":
-      return "STREAMING";
-    default:
-      return "LOCAL";
-  }
+  const source = media.track?.source;
+  if (!source) return "LOCAL";
+  if (source === "local") return "LOCAL";
+  if (source === "streaming") return "STREAMING";
+  return source.toUpperCase();
 });
 
 /** 是否禁用歌词来源切换 */
diff --git a/src/components/player/TrackInfo.vue b/src/components/player/TrackInfo.vue
index cfb813c2..f669c551 100644
--- a/src/components/player/TrackInfo.vue
+++ b/src/components/player/TrackInfo.vue
@@ -29,7 +29,7 @@ const currentLyricText = computed(() => {
 const isArtistLinkable = (artist: Artist): boolean => {
   if (!artist.name) return false;
   const source = media.track?.source;
-  if (source === "streaming" || source === "online") return !!artist.id;
+  if (source && source !== "local") return !!artist.id;
   return true;
 };
 </script>
diff --git a/src/components/ui/SVirtualList.vue b/src/components/ui/SVirtualList.vue
index f0bcb09c..974024dd 100644
--- a/src/components/ui/SVirtualList.vue
+++ b/src/components/ui/SVirtualList.vue
@@ -94,11 +94,11 @@ const updateTops = (fromIndex = 0): void => {
 
 const totalHeight = computed(() => {
   if (props.itemFixed) {
-    return props.items.length * props.itemHeight + props.paddingTop + props.paddingBottom;
+    return props.items.length * props.itemHeight + props.paddingTop;
   }
-  if (itemTops.value.length === 0) return props.paddingTop + props.paddingBottom;
+  if (itemTops.value.length === 0) return props.paddingTop;
   const last = itemTops.value.length - 1;
-  return itemTops.value[last] + itemHeights.value[last] + props.paddingTop + props.paddingBottom;
+  return itemTops.value[last] + itemHeights.value[last] + props.paddingTop;
 });
 
 const actualStartIndex = ref(0);
@@ -393,6 +393,8 @@ defineExpose({
         <div v-if="$slots.footer && items.length > 0" class="shrink-0">
           <slot name="footer" />
         </div>
+        <!-- 底部 spacer -->
+        <div v-if="paddingBottom > 0" class="shrink-0" :style="{ height: `${paddingBottom}px` }" />
       </div>
     </template>
   </div>
diff --git a/src/pages/Artist.vue b/src/pages/Artist.vue
index 36f33186..e708c734 100644
--- a/src/pages/Artist.vue
+++ b/src/pages/Artist.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { TrackSource } from "@shared/types/player";
 import type { ArtistProfile, CoverItem } from "@/types/artist";
-import { useLibraryStore } from "@/stores/library";
 import { useSettingsStore } from "@/stores/settings";
-import { useStreamingStore } from "@/stores/streaming";
+import { loadArtist as loadArtistService } from "@/services/artistLoader";
+import { fetchArtistSongs } from "@/apis/user/netease";
 import { navigateToAlbum } from "@/utils/navigate";
 import SongList from "@/components/list/SongList.vue";
 import { formatTime } from "@/utils/time";
@@ -18,8 +18,6 @@ import IconLucideListChecks from "~icons/lucide/list-checks";
 
 const { t } = useI18n();
 const route = useRoute();
-const libraryStore = useLibraryStore();
-const streamingStore = useStreamingStore();
 const { appearance } = useSettingsStore();
 
 const tabTransitionName = computed(() => {
@@ -31,6 +29,13 @@ const source = route.params.source as TrackSource;
 const id = route.params.id as string;
 
 const artist = shallowRef<ArtistProfile | null>(null);
+/** 正在加载（任一来源） */
+const loading = ref(false);
+/** 取消当次加载 */
+let loadAbort: AbortController | null = null;
+/** NCM 歌手歌曲分页：是否还有更多 + 加载中 */
+const hasMoreSongs = ref(false);
+const loadingMore = ref(false);
 
 /** 在线头像未到位时，用任一曲目的封面顶替 */
 const fallbackTrackCover = computed(() => artist.value?.tracks.find((t) => t.cover)?.cover);
@@ -47,42 +52,62 @@ const handleListScroll = (event: Event) => {
   }
 };
 
-/** 加载数据 */
-const loadArtist = async () => {
+/** 加载数据：派发到 services/artistLoader，本组件只管 ref + loading + abort */
+const loadArtist = async (): Promise<void> => {
   collapsed.value = false;
-  if (source === "local") {
-    const artistName = decodeURIComponent(id);
-    artist.value = await libraryStore.getArtistProfile(artistName);
-    // 获取歌手头像
-    if (artist.value && !artist.value.avatar) {
-      const res = await window.api.library.fetchArtistAvatar(artistName);
-      if (res.success && res.data && artist.value?.name === artistName) {
-        libraryStore.setArtistAvatar(artistName, res.data);
-        artist.value = { ...artist.value, avatar: res.data };
-      }
+  loadAbort?.abort();
+  const myAbort = new AbortController();
+  loadAbort = myAbort;
+  loading.value = true;
+  hasMoreSongs.value = false;
+
+  try {
+    await loadArtistService(source, id, {
+      fallbackName: typeof route.query.name === "string" ? route.query.name : undefined,
+      signal: myAbort.signal,
+      onUpdate: (next) => {
+        if (myAbort.signal.aborted) return;
+        artist.value = next;
+        // 仅 NCM 支持触底分页（artist_songs）；首屏 50 首后开放加载更多
+        if (next && source === "netease" && next.tracks.length >= 50) {
+          hasMoreSongs.value = true;
+        }
+      },
+    });
+  } finally {
+    if (!myAbort.signal.aborted) loading.value = false;
+  }
+};
+
+/** 触底加载更多 NCM 歌手歌曲 */
+const onReachBottom = async (): Promise<void> => {
+  if (source !== "netease" || !hasMoreSongs.value || loadingMore.value || !artist.value) return;
+  const current = artist.value;
+  loadingMore.value = true;
+  try {
+    const { tracks, more } = await fetchArtistSongs(decodeURIComponent(id), current.tracks.length);
+    if (loadAbort?.signal.aborted || artist.value?.id !== current.id) return;
+    if (tracks.length === 0) {
+      hasMoreSongs.value = false;
+      return;
     }
-  } else if (source === "streaming") {
-    const artistId = decodeURIComponent(id);
-    const cached = streamingStore.artists.find((a) => a.id === artistId);
-    const fallbackName = typeof route.query.name === "string" ? route.query.name : artistId;
-    // 直接拿歌手名下所有歌曲
-    const tracks = await streamingStore.fetchArtistSongs(artistId);
     artist.value = {
-      id: artistId,
-      name: cached?.name ?? fallbackName,
-      avatar: cached?.avatar,
-      source,
-      tracks,
-      albums: [],
-      trackCount: tracks.length,
-      albumCount: 0,
+      ...current,
+      tracks: [...current.tracks, ...tracks],
+      trackCount: current.tracks.length + tracks.length,
     };
+    hasMoreSongs.value = more;
+  } finally {
+    loadingMore.value = false;
   }
-  // TODO: online
 };
 
 loadArtist();
 
+onBeforeUnmount(() => {
+  loadAbort?.abort();
+});
+
 /** 总时长 */
 const totalDuration = computed(() => {
   if (!artist.value) return "";
@@ -246,9 +271,12 @@ const albumItems = computed<CoverItem[]>(() => {
               :search-query="searchQuery"
               :source="source"
               :show-size="source === 'local'"
+              :has-more="hasMoreSongs"
+              :loading-more="loadingMore"
               enable-sort
               @scroll="handleListScroll"
               @change="loadArtist"
+              @reach-bottom="onReachBottom"
             />
           </div>
           <!-- 专辑网格 -->
@@ -262,6 +290,13 @@ const albumItems = computed<CoverItem[]>(() => {
           </div>
         </Transition>
       </div>
+      <!-- 加载中 -->
+      <div v-else-if="loading" key="loading" class="flex-1 flex items-center justify-center">
+        <div class="text-center text-on-surface-variant/60">
+          <SLoading class="text-4xl text-primary/70 mb-4 mx-auto block" />
+          <div class="text-sm">{{ t("common.loading") }}</div>
+        </div>
+      </div>
       <!-- 空状态 -->
       <div v-else-if="artist" key="empty" class="flex-1 flex items-center justify-center">
         <div class="text-center text-on-surface-variant/50">
diff --git a/src/pages/Collection.vue b/src/pages/Collection.vue
index a123af2d..138c5128 100644
--- a/src/pages/Collection.vue
+++ b/src/pages/Collection.vue
@@ -3,8 +3,7 @@ import type { TrackSource } from "@shared/types/player";
 import type { Collection, CollectionType } from "@/types/collection";
 import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
 import { usePlaylistStore } from "@/stores/playlist";
-import { useLibraryStore } from "@/stores/library";
-import { useStreamingStore } from "@/stores/streaming";
+import { loadCollection as loadCollectionService } from "@/services/collectionLoader";
 import SongList from "@/components/list/SongList.vue";
 import { formatTime } from "@/utils/time";
 import * as player from "@/core/player";
@@ -14,18 +13,21 @@ import IconLucideListChecks from "~icons/lucide/list-checks";
 import IconLucideListMusic from "~icons/lucide/list-music";
 import IconLucideHourglass from "~icons/lucide/hourglass";
 import IconLucideCalendar from "~icons/lucide/calendar";
+import IconLucideUser from "~icons/lucide/user";
 
 const { t } = useI18n();
 const route = useRoute();
 const playlistStore = usePlaylistStore();
-const libraryStore = useLibraryStore();
-const streamingStore = useStreamingStore();
 
 const source = route.params.source as TrackSource;
 const type = route.params.type as CollectionType;
 const id = route.params.id as string;
 
 const collection = shallowRef<Collection | null>(null);
+/** 正在加载（任一来源） */
+const loading = ref(false);
+/** 取消当次加载（路由切换/卸载时 abort） */
+let loadAbort: AbortController | null = null;
 
 /** 是否可编辑 */
 const editable = source === "local" && type === "playlist";
@@ -43,52 +45,34 @@ const handleListScroll = (event: Event) => {
   }
 };
 
-/** 加载数据 */
-const loadCollection = async () => {
+/** 加载数据：派发到 services/collectionLoader，本组件只管 ref + loading + abort */
+const loadCollection = async (): Promise<void> => {
   collapsed.value = false;
-  if (source === "local" && type === "playlist") {
-    collection.value = await playlistStore.get(id);
-  } else if (source === "local" && type === "album") {
-    const albumName = decodeURIComponent(id);
-    collection.value = await libraryStore.getAlbumCollection(albumName);
-  } else if (source === "streaming") {
-    const originalId = decodeURIComponent(id);
-    // 名称兜底
-    const fallbackName = typeof route.query.name === "string" ? route.query.name : originalId;
-    if (type === "album") {
-      const album = streamingStore.albums.find((a) => a.id === originalId);
-      const tracks = await streamingStore.fetchAlbumSongs(originalId);
-      collection.value = {
-        id: originalId,
-        type,
-        source,
-        title: album?.name ?? fallbackName,
-        cover: album?.cover ?? tracks[0]?.cover,
-        creator: album?.artist,
-        tracks,
-        trackCount: tracks.length,
-      };
-    } else if (type === "playlist") {
-      const pl = streamingStore.playlists.find((p) => p.id === originalId);
-      const tracks = await streamingStore.fetchPlaylistSongs(originalId);
-      collection.value = {
-        id: originalId,
-        type,
-        source,
-        title: pl?.name ?? fallbackName,
-        cover: pl?.cover ?? tracks[0]?.cover,
-        description: pl?.description,
-        creator: pl?.owner,
-        tracks,
-        trackCount: tracks.length,
-      };
-    }
+  loadAbort?.abort();
+  const myAbort = new AbortController();
+  loadAbort = myAbort;
+  loading.value = true;
+
+  try {
+    await loadCollectionService(source, type, id, {
+      fallbackName: typeof route.query.name === "string" ? route.query.name : undefined,
+      signal: myAbort.signal,
+      onUpdate: (next) => {
+        if (myAbort.signal.aborted) return;
+        collection.value = next;
+      },
+    });
+  } finally {
+    if (!myAbort.signal.aborted) loading.value = false;
   }
-  // TODO: online / radio
 };
 
 loadCollection();
 
+onBeforeUnmount(() => {
+  loadAbort?.abort();
+});
+
 const typeLabel = computed(() => {
   const map: Record<CollectionType, string> = {
     album: t("collection.album"),
@@ -105,12 +89,18 @@ const totalDuration = computed(() => {
   return total > 0 ? formatTime(total) : "";
 });
 
-/** 歌手文本 */
+/** 歌手文本（仅专辑有 artists 列表时单独成行） */
 const artistText = computed(() => {
-  if (!collection.value?.artists?.length) return collection.value?.creator ?? "";
+  if (!collection.value?.artists?.length) return "";
   return collection.value.artists.map((a) => a.name).join(" / ");
 });
 
+/** 创建者（歌单作者）：合集元信息行内的小 chip */
+const creatorText = computed(() => {
+  if (collection.value?.artists?.length) return "";
+  return collection.value?.creator ?? "";
+});
+
 /** 更新时间文本 */
 const updateTimeText = computed(() => {
   if (!collection.value?.updateTime) return "";
@@ -234,15 +224,19 @@ const handleMoreMenu = (key: string) => {
                 <div
                   class="flex items-center gap-3 text-sm leading-none text-on-surface-variant/50"
                 >
-                  <span class="flex items-center gap-1">
+                  <span v-if="creatorText" class="flex items-center gap-1 min-w-0">
+                    <IconLucideUser class="shrink-0" />
+                    <span class="truncate">{{ creatorText }}</span>
+                  </span>
+                  <span class="flex items-center gap-1 shrink-0">
                     <IconLucideListMusic class="shrink-0" />
                     {{ t("common.totalSongs", { count: collection.tracks.length }) }}
                   </span>
-                  <span v-if="totalDuration" class="flex items-center gap-1">
+                  <span v-if="totalDuration" class="flex items-center gap-1 shrink-0">
                     <IconLucideHourglass class="shrink-0" />
                     {{ t("collection.totalDuration", { time: totalDuration }) }}
                   </span>
-                  <span v-if="updateTimeText" class="flex items-center gap-1">
+                  <span v-if="updateTimeText" class="flex items-center gap-1 shrink-0">
                     <IconLucideCalendar class="shrink-0" />
                     {{ updateTimeText }}
                   </span>
@@ -296,7 +290,7 @@ const handleMoreMenu = (key: string) => {
       </div>
     </div>
     <Transition name="fade" mode="out-in" :duration="150">
-      <!-- 歌曲列表 -->
+      <!-- 歌曲列表（首批到位即渲染，剩余批次会自动追加） -->
       <div
         v-if="collection && collection.tracks.length > 0"
         :key="collection.id"
@@ -316,6 +310,13 @@ const handleMoreMenu = (key: string) => {
           @change="loadCollection"
         />
       </div>
+      <!-- 加载中 -->
+      <div v-else-if="loading" key="loading" class="flex-1 flex items-center justify-center">
+        <div class="text-center text-on-surface-variant/60">
+          <SLoading class="text-4xl text-primary/70 mb-4 mx-auto block" />
+          <div class="text-sm">{{ t("common.loading") }}</div>
+        </div>
+      </div>
       <!-- 空状态 -->
       <div v-else-if="collection" key="empty" class="flex-1 flex items-center justify-center">
         <div class="text-center text-on-surface-variant/50">
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index 00677c07..d205793e 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -6,6 +6,7 @@ import { searchSongs, searchAlbums, searchArtists, searchPlaylists } from "@/api
 import SongList from "@/components/list/SongList.vue";
 import CoverList from "@/components/list/CoverList.vue";
 import { useStatusStore } from "@/stores/status";
+import { navigateToAlbum, navigateToPlaylist } from "@/utils/navigate";
 
 const { t } = useI18n();
 const route = useRoute();
@@ -239,8 +240,10 @@ const isEmptyResult = computed(() => {
       <SongList
         v-if="activeTab === 'songs'"
         :items="states.songs.items"
-        source="online"
+        :source="status.searchPlatform"
         :show-size="false"
+        :has-more="states.songs.hasMore"
+        :loading-more="states.songs.loadingMore"
         @reach-bottom="onReachBottom('songs')"
       />
       <CoverList
@@ -249,6 +252,11 @@ const isEmptyResult = computed(() => {
         :padding-x="20"
         :padding-top="8"
         :padding-bottom="20"
+        :has-more="states.albums.hasMore"
+        :loading-more="states.albums.loadingMore"
+        @click="
+          (item) => navigateToAlbum(item.title, { source: status.searchPlatform, albumId: item.id })
+        "
         @reach-bottom="onReachBottom('albums')"
       />
       <CoverList
@@ -258,6 +266,8 @@ const isEmptyResult = computed(() => {
         :padding-x="20"
         :padding-top="8"
         :padding-bottom="20"
+        :has-more="states.artists.hasMore"
+        :loading-more="states.artists.loadingMore"
         @reach-bottom="onReachBottom('artists')"
       />
       <CoverList
@@ -266,6 +276,11 @@ const isEmptyResult = computed(() => {
         :padding-x="20"
         :padding-top="8"
         :padding-bottom="20"
+        :has-more="states.playlists.hasMore"
+        :loading-more="states.playlists.loadingMore"
+        @click="
+          (item) => navigateToPlaylist(item.id, { source: status.searchPlatform, name: item.title })
+        "
         @reach-bottom="onReachBottom('playlists')"
       />
     </div>
diff --git a/src/pages/Streaming/Playlists.vue b/src/pages/Streaming/Playlists.vue
index 89fa19cb..175371f8 100644
--- a/src/pages/Streaming/Playlists.vue
+++ b/src/pages/Streaming/Playlists.vue
@@ -2,10 +2,10 @@
 import type { CoverItem } from "@/types/artist";
 import type { Playlist } from "@shared/types/player";
 import { useStreamingStore } from "@/stores/streaming";
+import { navigateToPlaylist } from "@/utils/navigate";
 import CoverList from "@/components/list/CoverList.vue";
 
 const { t } = useI18n();
-const router = useRouter();
 const streaming = useStreamingStore();
 const { playlists, loading, isConnected } = storeToRefs(streaming);
 
@@ -33,7 +33,7 @@ const items = computed<CoverItem[]>(() =>
 );
 
 const handleClick = (item: CoverItem): void => {
-  router.push(`/collection/streaming/playlist/${encodeURIComponent(item.id)}`);
+  navigateToPlaylist(item.id, { source: "streaming", name: item.title });
 };
 </script>
 
diff --git a/src/services/artistLoader.ts b/src/services/artistLoader.ts
new file mode 100644
index 00000000..2be500f9
--- /dev/null
+++ b/src/services/artistLoader.ts
@@ -0,0 +1,107 @@
+/**
+ * 歌手页加载服务：按 source 派发到具体来源
+ */
+
+import type { TrackSource } from "@shared/types/player";
+import type { ArtistProfile, CoverItem } from "@/types/artist";
+import { useLibraryStore } from "@/stores/library";
+import { useStreamingStore } from "@/stores/streaming";
+import { fetchArtist } from "@/apis/user/netease";
+
+export interface LoadArtistOptions {
+  /** 名称兜底（在线源元数据返回前用于占位） */
+  fallbackName?: string;
+  /** 数据更新回调（一次或多次） */
+  onUpdate: (artist: ArtistProfile | null) => void;
+  /** 中断信号 */
+  signal?: AbortSignal;
+}
+
+/**
+ * 加载指定歌手
+ * @param source 来源：local / streaming / netease
+ * @param id     歌手 id（route 原始字符串）
+ * @param options 回调与中断信号
+ */
+export const loadArtist = async (
+  source: TrackSource,
+  id: string,
+  options: LoadArtistOptions,
+): Promise<void> => {
+  if (source === "local") {
+    await loadLocal(id, options);
+    return;
+  }
+  if (source === "streaming") {
+    await loadStreaming(id, options);
+    return;
+  }
+  if (source === "netease") {
+    await loadNetease(id, options);
+    return;
+  }
+  options.onUpdate(null);
+};
+
+const loadLocal = async (id: string, options: LoadArtistOptions): Promise<void> => {
+  const libraryStore = useLibraryStore();
+  const artistName = decodeURIComponent(id);
+  const profile = await libraryStore.getArtistProfile(artistName);
+  if (options.signal?.aborted) return;
+  options.onUpdate(profile);
+
+  // 头像异步补：本地无头像时去主进程取一次，命中后再次 onUpdate
+  if (profile && !profile.avatar) {
+    const res = await window.api.library.fetchArtistAvatar(artistName);
+    if (options.signal?.aborted) return;
+    if (res.success && res.data) {
+      libraryStore.setArtistAvatar(artistName, res.data);
+      options.onUpdate({ ...profile, avatar: res.data });
+    }
+  }
+};
+
+const loadStreaming = async (id: string, options: LoadArtistOptions): Promise<void> => {
+  const streamingStore = useStreamingStore();
+  const artistId = decodeURIComponent(id);
+  const cached = streamingStore.artists.find((a) => a.id === artistId);
+  const fallbackName = options.fallbackName ?? artistId;
+  const tracks = await streamingStore.fetchArtistSongs(artistId);
+  if (options.signal?.aborted) return;
+  options.onUpdate({
+    id: artistId,
+    name: cached?.name ?? fallbackName,
+    avatar: cached?.avatar,
+    source: "streaming",
+    tracks,
+    albums: [],
+    trackCount: tracks.length,
+    albumCount: 0,
+  });
+};
+
+const loadNetease = async (id: string, options: LoadArtistOptions): Promise<void> => {
+  const result = await fetchArtist(decodeURIComponent(id));
+  if (options.signal?.aborted) return;
+  if (!result) {
+    options.onUpdate(null);
+    return;
+  }
+  const albums: CoverItem[] = result.albums.map((album) => ({
+    id: album.id ?? "",
+    title: album.name,
+    cover: album.cover,
+    subtitle: album.artist,
+    trackCount: album.trackCount ?? 0,
+  }));
+  options.onUpdate({
+    id,
+    name: result.artist.name,
+    avatar: result.artist.avatar,
+    source: "netease",
+    tracks: result.tracks,
+    albums,
+    trackCount: result.tracks.length,
+    albumCount: albums.length,
+  });
+};
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index a940f483..3b103ad5 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -1,4 +1,5 @@
-import type { Track } from "@shared/types/player";
+import type { Track, TrackSource } from "@shared/types/player";
+import type { Platform } from "@shared/types/platform";
 import { useStreamingStore } from "@/stores/streaming";
 import { useSettingsStore } from "@/stores/settings";
 import { usePluginsStore } from "@/stores/plugins";
@@ -6,13 +7,20 @@ import { resolveNeteaseUrl } from "@/apis/song/netease";
 import { ErrorCode } from "@shared/types/errors";
 import { handleError } from "@/utils/errors";
 
-/** Track.platform → 插件 source key */
-const PLATFORM_TO_PLUGIN_SOURCE: Record<string, string> = {
+/** 在线平台 source → 插件 source key */
+const PLATFORM_TO_PLUGIN_SOURCE: Record<Platform, string> = {
   netease: "wy",
   qqmusic: "tx",
   kugou: "kg",
 };
 
+/**
+ * 检查给定 source 是否为在线平台
+ * @param source - 要检查的 source
+ */
+const isOnlinePlatform = (source: TrackSource): source is Platform =>
+  source === "netease" || source === "qqmusic" || source === "kugou";
+
 /**
  * 派生缓存键
  * @param track - 要解析的 track
@@ -22,8 +30,8 @@ const cacheKeyForTrack = (track: Track): string | null => {
   if (track.source === "streaming" && track.serverId && track.originalId) {
     return `s:${track.serverId}:${track.originalId}:`;
   }
-  if (track.source === "online" && track.platform && track.id) {
-    return `o:${track.platform}:${track.id}:`;
+  if (isOnlinePlatform(track.source) && track.id) {
+    return `o:${track.source}:${track.id}:`;
   }
   return null;
 };
@@ -34,8 +42,8 @@ const cacheKeyForTrack = (track: Track): string | null => {
  * @returns 解析出的音频源 URL，如果无法解析则返回 null
  */
 const resolveByPlugin = async (track: Track): Promise<string | null> => {
-  if (!track.platform) return null;
-  const pluginSource = PLATFORM_TO_PLUGIN_SOURCE[track.platform];
+  if (!isOnlinePlatform(track.source)) return null;
+  const pluginSource = PLATFORM_TO_PLUGIN_SOURCE[track.source];
   if (!pluginSource) return null;
   const plugins = usePluginsStore();
   const candidates = plugins.list.filter(
@@ -94,7 +102,7 @@ const resolveByPlugin = async (track: Track): Promise<string | null> => {
  */
 const resolveOnlineUrl = async (track: Track): Promise<string | null> => {
   try {
-    if (track.platform === "netease") {
+    if (track.source === "netease") {
       const url = await resolveNeteaseUrl(track);
       if (url) return url;
     }
@@ -141,8 +149,8 @@ export const resolveTrackSource = async (
       return null;
     }
   }
-  // 在线源
-  if (track.source === "online") {
+  // 在线源（netease / qqmusic / kugou）
+  if (isOnlinePlatform(track.source)) {
     try {
       const url = await resolveOnlineUrl(track);
       if (!url) {
@@ -150,7 +158,7 @@ export const resolveTrackSource = async (
         return null;
       }
       if (cacheEnabled) {
-        void window.api.cache.song.fetch(cacheKey!, "online", url);
+        void window.api.cache.song.fetch(cacheKey!, track.source, url);
       }
       return { source: url, fromCache: false };
     } catch (err) {
diff --git a/src/services/collectionLoader.ts b/src/services/collectionLoader.ts
new file mode 100644
index 00000000..3929237d
--- /dev/null
+++ b/src/services/collectionLoader.ts
@@ -0,0 +1,173 @@
+/**
+ * 合集加载服务：按 source/type 派发到具体来源
+ *
+ * 调用约定：
+ * - 所有来源都通过 `options.onUpdate(collection)` 回调上报
+ * - 一次性来源（local / streaming）只回调一次最终值
+ * - 增量来源（netease）会多次回调，UI 边收边显
+ */
+
+import type { Track, TrackSource } from "@shared/types/player";
+import type { Collection, CollectionType } from "@/types/collection";
+import { usePlaylistStore } from "@/stores/playlist";
+import { useLibraryStore } from "@/stores/library";
+import { useStreamingStore } from "@/stores/streaming";
+import { fetchAlbum, fetchPlaylist } from "@/apis/user/netease";
+
+export interface LoadCollectionOptions {
+  /** 名称兜底 */
+  fallbackName?: string;
+  /** 数据更新回调（首次填充 + 后续增量批次都会触发） */
+  onUpdate: (collection: Collection | null) => void;
+  /** 中断信号 */
+  signal?: AbortSignal;
+}
+
+/**
+ * 加载指定合集
+ * @param source 来源：local / streaming / netease（未来扩展 qqmusic / kugou）
+ * @param type   类型：playlist / album
+ * @param id     合集 id（route 原始字符串）
+ * @param options 回调与中断信号
+ */
+export const loadCollection = async (
+  source: TrackSource,
+  type: CollectionType,
+  id: string,
+  options: LoadCollectionOptions,
+): Promise<void> => {
+  if (source === "local" && type === "playlist") {
+    const result = await usePlaylistStore().get(id);
+    if (options.signal?.aborted) return;
+    options.onUpdate(result);
+    return;
+  }
+  if (source === "local" && type === "album") {
+    const result = await useLibraryStore().getAlbumCollection(decodeURIComponent(id));
+    if (options.signal?.aborted) return;
+    options.onUpdate(result);
+    return;
+  }
+  if (source === "streaming") {
+    await loadStreaming(type, id, options);
+    return;
+  }
+  if (source === "netease" && type === "playlist") {
+    await loadNeteasePlaylist(id, options);
+    return;
+  }
+  if (source === "netease" && type === "album") {
+    await loadNeteaseAlbum(id, options);
+    return;
+  }
+  options.onUpdate(null);
+};
+
+const loadStreaming = async (
+  type: CollectionType,
+  id: string,
+  options: LoadCollectionOptions,
+): Promise<void> => {
+  const streamingStore = useStreamingStore();
+  const originalId = decodeURIComponent(id);
+  const fallbackName = options.fallbackName ?? originalId;
+
+  if (type === "album") {
+    const album = streamingStore.albums.find((a) => a.id === originalId);
+    const tracks = await streamingStore.fetchAlbumSongs(originalId);
+    if (options.signal?.aborted) return;
+    options.onUpdate({
+      id: originalId,
+      type,
+      source: "streaming",
+      title: album?.name ?? fallbackName,
+      cover: album?.cover ?? tracks[0]?.cover,
+      creator: album?.artist,
+      tracks,
+      trackCount: tracks.length,
+    });
+    return;
+  }
+  if (type === "playlist") {
+    const pl = streamingStore.playlists.find((p) => p.id === originalId);
+    const tracks = await streamingStore.fetchPlaylistSongs(originalId);
+    if (options.signal?.aborted) return;
+    options.onUpdate({
+      id: originalId,
+      type,
+      source: "streaming",
+      title: pl?.name ?? fallbackName,
+      cover: pl?.cover ?? tracks[0]?.cover,
+      description: pl?.description,
+      creator: pl?.owner,
+      tracks,
+      trackCount: tracks.length,
+    });
+  }
+};
+
+const loadNeteaseAlbum = async (id: string, options: LoadCollectionOptions): Promise<void> => {
+  const result = await fetchAlbum(decodeURIComponent(id));
+  if (options.signal?.aborted) return;
+  if (!result) {
+    options.onUpdate(null);
+    return;
+  }
+  options.onUpdate({
+    id,
+    type: "album",
+    source: "netease",
+    title: result.album.name,
+    cover: result.album.cover,
+    description: result.description,
+    creator: result.album.artist,
+    tracks: result.tracks,
+    trackCount: result.tracks.length,
+  });
+};
+
+const loadNeteasePlaylist = async (id: string, options: LoadCollectionOptions): Promise<void> => {
+  const accumulated: Track[] = [];
+  let meta: {
+    name: string;
+    cover?: string;
+    description?: string;
+    creator?: string;
+    trackCount?: number;
+  } | null = null;
+
+  const buildCurrent = (): Collection | null => {
+    if (!meta) return null;
+    return {
+      id,
+      type: "playlist",
+      source: "netease",
+      title: meta.name,
+      cover: meta.cover,
+      description: meta.description,
+      creator: meta.creator,
+      tracks: [...accumulated],
+      trackCount: meta.trackCount ?? accumulated.length,
+    };
+  };
+
+  await fetchPlaylist(id, {
+    signal: options.signal,
+    onMeta: (m) => {
+      if (options.signal?.aborted) return;
+      meta = {
+        name: m.name,
+        cover: m.cover,
+        description: m.description,
+        creator: m.owner,
+        trackCount: m.trackCount,
+      };
+      options.onUpdate(buildCurrent());
+    },
+    onBatch: (batch) => {
+      if (options.signal?.aborted) return;
+      accumulated.push(...batch);
+      options.onUpdate(buildCurrent());
+    },
+  });
+};
diff --git a/src/services/lyricLoader.ts b/src/services/lyricLoader.ts
index 6a174e84..2ff24c4f 100644
--- a/src/services/lyricLoader.ts
+++ b/src/services/lyricLoader.ts
@@ -5,6 +5,7 @@
 import type { Track, TrackDetail } from "@shared/types/player";
 import type { LyricData, LyricFormat, LyricInput } from "@shared/types/lyrics";
 import type { Platform } from "@shared/types/platform";
+import { isPlatform } from "@shared/types/platform";
 import { bestExternalIndex, detectFormat } from "@/utils/lyric/parse";
 import { useMediaStore } from "@/stores/media";
 import { useSettingsStore } from "@/stores/settings";
@@ -52,7 +53,7 @@ const fetchFromPlatform = async (
   platform: Platform,
   track: Track,
 ): Promise<OnlineResult | null> => {
-  const mode = track.platform === platform ? "byId" : "byQuery";
+  const mode = track.source === platform ? "byId" : "byQuery";
   // QM lyric 接口要数字 songID
   const lookupId = platform === "qqmusic" ? (track.extId ?? track.id) : track.id;
   const resp =
@@ -176,8 +177,8 @@ const tryOnlineByPreference = async (
   const preference = settings.lyric.lyricSourcePreference;
   if (preference === "self") {
     // 在线歌曲
-    if (track.source === "online" && track.platform) {
-      return fetchFromPlatform(track.platform, track);
+    if (isPlatform(track.source)) {
+      return fetchFromPlatform(track.source, track);
     }
     return null;
   }
@@ -292,8 +293,8 @@ export const loadForTrack = async (detail: TrackDetail | null): Promise<void> =>
       commit(token, null, null);
       return;
     }
-    // 在线歌曲
-    if (track.source === "online") {
+    // 在线歌曲（任一在线平台）
+    if (isPlatform(track.source)) {
       const online = await tryOnlineByPreference(token, track, false, null);
       if (token !== currentToken) return;
       if (online) await applyOnline(token, track, online, null);
@@ -353,8 +354,8 @@ const refreshPreference = async (): Promise<void> => {
   const media = useMediaStore();
   const track = media.track;
   if (!track || track.source === "streaming") return;
-  // 在线歌曲
-  if (track.source === "online") {
+  // 在线歌曲（任一在线平台）
+  if (isPlatform(track.source)) {
     const online = await tryOnlineByPreference(token, track, false, null);
     if (token !== currentToken) return;
     if (online) await applyOnline(token, track, online, null);
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 5e3f0bae..2e2cd44b 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -1,14 +1,30 @@
-import type { UserProfile } from "@/types/user";
+import type { Album, Artist, Playlist } from "@shared/types/player";
+import type { UserProfile, UserSubcount } from "@/types/user";
 import { clearNeteaseSession } from "@/apis/netease";
 import {
   fetchLoginStatus,
   refreshLogin as refreshLoginApi,
   logoutNetease,
 } from "@/apis/login/netease";
+import {
+  fetchLikelist,
+  fetchSubcount,
+  fetchUserAlbums,
+  fetchUserArtists,
+  fetchUserLevel,
+  fetchUserPlaylists,
+  toggleLikeSong,
+} from "@/apis/user/netease";
 
-/** 保活间隔 */
+/** 登录 cookie 保活间隔 */
 const REFRESH_INTERVAL_MS = 24 * 60 * 60 * 1000;
 
+const emptySubcount = (): UserSubcount => ({
+  createdPlaylistCount: 0,
+  subPlaylistCount: 0,
+  artistCount: 0,
+});
+
 export const useUserStore = defineStore(
   "user",
   () => {
@@ -19,14 +35,129 @@ export const useUserStore = defineStore(
     /** 是否已登录 */
     const isLoggedIn = computed(() => profile.value !== null);
 
+    /** 全部歌单（创建+收藏；首条恒为「我喜欢的音乐」） */
+    const playlists = shallowRef<Playlist[]>([]);
+    /** 红心歌曲 id 集合（Set 用于 O(1) 判定） */
+    const likedSongIds = ref<Set<string>>(new Set());
+    /** 收藏专辑 */
+    const albums = shallowRef<Album[]>([]);
+    /** 收藏歌手 */
+    const artists = shallowRef<Artist[]>([]);
+    /** 用户等级 */
+    const level = ref<number | undefined>(undefined);
+    /** 订阅计数 */
+    const subcount = ref<UserSubcount>(emptySubcount());
+    /** 内容拉取最近时间（ms） */
+    const lastFetchedAt = ref<number>(0);
+    /** 是否在拉内容 */
+    const contentLoading = ref(false);
+
+    /** 「我喜欢的音乐」歌单 id（数组首条） */
+    const likedPlaylistId = computed<string | null>(() => playlists.value[0]?.id ?? null);
+
     /**
-     * 用给定 profile 填充登录态
-     * @param newProfile 用户基础资料
+     * 自建歌单（含我喜欢；按 createdPlaylistCount 切分）
+     * NCM /user/playlist 返回数组前 createdPlaylistCount 条为自建，其后为收藏
      */
+    const createdPlaylists = computed<Playlist[]>(() => {
+      const n = subcount.value.createdPlaylistCount || 0;
+      if (n <= 0) return playlists.value.slice(0, 1);
+      return playlists.value.slice(0, n);
+    });
+
+    /** 收藏歌单 */
+    const subscribedPlaylists = computed<Playlist[]>(() => {
+      const n = subcount.value.createdPlaylistCount || 0;
+      return playlists.value.slice(n > 0 ? n : 1);
+    });
+
+    /** 是否红心 */
+    const isLiked = (trackId: string): boolean => likedSongIds.value.has(trackId);
+
+    /** 清空所有用户内容 */
+    const clearContent = (): void => {
+      playlists.value = [];
+      likedSongIds.value = new Set();
+      albums.value = [];
+      artists.value = [];
+      level.value = undefined;
+      subcount.value = emptySubcount();
+      lastFetchedAt.value = 0;
+    };
+
+    /**
+     * 全量拉取用户内容（歌单 + 喜欢 id + 收藏专辑/歌手 + 计数）
+     * 并行发起，失败的子任务不会阻塞其他类目
+     */
+    const loadContent = async (uid: number): Promise<void> => {
+      if (!uid) return;
+      contentLoading.value = true;
+      try {
+        const sub = await fetchSubcount().catch((err) => {
+          console.warn("[user] subcount failed:", err);
+          return emptySubcount();
+        });
+        subcount.value = sub;
+
+        // 用 subcount 推算歌单 limit，避免一次请求带回上千条
+        const playlistTotal = (sub.createdPlaylistCount || 0) + (sub.subPlaylistCount || 0) || 50;
+
+        const settled = await Promise.allSettled([
+          fetchUserPlaylists(uid, playlistTotal),
+          fetchLikelist(uid),
+          fetchUserAlbums(),
+          fetchUserArtists(),
+          fetchUserLevel(),
+        ]);
+
+        const [plRes, likeRes, albumRes, artistRes, levelRes] = settled;
+        if (plRes.status === "fulfilled") playlists.value = plRes.value;
+        if (likeRes.status === "fulfilled") likedSongIds.value = new Set(likeRes.value);
+        if (albumRes.status === "fulfilled") albums.value = albumRes.value;
+        if (artistRes.status === "fulfilled") artists.value = artistRes.value;
+        if (levelRes.status === "fulfilled") level.value = levelRes.value;
+
+        for (const r of settled) {
+          if (r.status === "rejected") console.warn("[user] content load failed:", r.reason);
+        }
+        lastFetchedAt.value = Date.now();
+      } finally {
+        contentLoading.value = false;
+      }
+    };
+
+    /** 切换红心，乐观更新，失败回滚 */
+    const toggleLike = async (trackId: string): Promise<boolean> => {
+      const wasLiked = likedSongIds.value.has(trackId);
+      const next = new Set(likedSongIds.value);
+      if (wasLiked) next.delete(trackId);
+      else next.add(trackId);
+      likedSongIds.value = next;
+      try {
+        const ok = await toggleLikeSong(trackId, !wasLiked);
+        if (!ok) throw new Error("like api returned non-200");
+        return true;
+      } catch (err) {
+        const rollback = new Set(likedSongIds.value);
+        if (wasLiked) rollback.add(trackId);
+        else rollback.delete(trackId);
+        likedSongIds.value = rollback;
+        console.warn("[user] toggle like failed:", err);
+        return false;
+      }
+    };
+
+    /** uid 变更 → 拉取/清空用户内容 */
+    const syncContent = (uid: number | undefined): void => {
+      if (uid) void loadContent(uid);
+      else clearContent();
+    };
+
+    /** 用给定 profile 填充登录态 */
     const setProfile = (newProfile: UserProfile | null): void => {
       profile.value = newProfile;
-      if (newProfile) lastRefreshAt.value = Date.now();
-      else lastRefreshAt.value = 0;
+      lastRefreshAt.value = newProfile ? Date.now() : 0;
+      syncContent(newProfile?.userId);
     };
 
     /** 后台续期 cookie，失败静默 */
@@ -37,12 +168,13 @@ export const useUserStore = defineStore(
       } catch {}
     };
 
-    /** 校验 cookie 并同步最新 profile */
+    /** 校验 cookie 并同步最新 profile + 用户内容 */
     const fetchStatus = async (): Promise<boolean> => {
       try {
         const latest = await fetchLoginStatus();
         if (latest) {
           profile.value = latest;
+          syncContent(latest.userId);
           if (Date.now() - lastRefreshAt.value > REFRESH_INTERVAL_MS) {
             void refresh();
           }
@@ -50,6 +182,7 @@ export const useUserStore = defineStore(
         }
         profile.value = null;
         lastRefreshAt.value = 0;
+        syncContent(undefined);
         return false;
       } catch {
         // 网络失败保留缓存的 profile，不强制登出（离线可用性）
@@ -57,24 +190,48 @@ export const useUserStore = defineStore(
       }
     };
 
-    /** 登出：服务端清会话 + 主进程清 cookie + 本地清 profile */
+    /** 登出：服务端清会话 + 主进程清 cookie + 本地清 profile 与内容 */
     const logout = async (): Promise<void> => {
       try {
         await logoutNetease();
       } catch {
-        /* 忽略：即使服务端登出失败也要清本地 */
+        /* 服务端登出失败仍要清本地 */
       }
       await clearNeteaseSession();
       profile.value = null;
       lastRefreshAt.value = 0;
+      syncContent(undefined);
     };
 
-    return { profile, lastRefreshAt, isLoggedIn, setProfile, fetchStatus, logout };
+    return {
+      profile,
+      lastRefreshAt,
+      isLoggedIn,
+      setProfile,
+      fetchStatus,
+      logout,
+
+      playlists,
+      likedSongIds,
+      albums,
+      artists,
+      level,
+      subcount,
+      lastFetchedAt,
+      contentLoading,
+      likedPlaylistId,
+      createdPlaylists,
+      subscribedPlaylists,
+      isLiked,
+      loadContent,
+      toggleLike,
+      clearContent,
+    };
   },
   {
     persist: {
       storage: localStorage,
-      pick: ["profile", "lastRefreshAt"],
+      pick: ["profile", "lastRefreshAt", "level"],
     },
   },
 );
diff --git a/src/types/user.ts b/src/types/user.ts
index 64e32495..00308310 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -15,3 +15,15 @@ export interface UserProfile {
   province?: number;
   city?: number;
 }
+
+/** 用户订阅计数（/user/subcount） */
+export interface UserSubcount {
+  /** 自建歌单数 */
+  createdPlaylistCount: number;
+  /** 收藏歌单数 */
+  subPlaylistCount: number;
+  /** 收藏专辑数 */
+  albumCount?: number;
+  /** 收藏歌手数 */
+  artistCount: number;
+}
diff --git a/src/utils/navigate.ts b/src/utils/navigate.ts
index 53701678..0b7a491b 100644
--- a/src/utils/navigate.ts
+++ b/src/utils/navigate.ts
@@ -2,7 +2,7 @@ import type { TrackSource } from "@shared/types/player";
 import router from "@/router";
 
 /** 非本地源 */
-const isExternal = (source: TrackSource): boolean => source === "streaming" || source === "online";
+const isExternal = (source: TrackSource): boolean => source !== "local";
 
 /**
  * 跳转到专辑页
@@ -31,8 +31,8 @@ export const navigateToAlbum = (
  * 跳转到歌手页
  * 非本地源没拿到真实 artistId 时静默忽略
  * @param artistName - 歌手名称（本地用作聚合 key；非本地用于 query 兜底显示）
- * @param options.source - 来源（local/streaming/online）；默认为 local
- * @param options.artistId - 真实歌手 ID（streaming/online 必填）
+ * @param options.source - 来源；默认为 local
+ * @param options.artistId - 真实歌手 ID（非本地必填）
  */
 export const navigateToArtist = (
   artistName?: string,
@@ -49,3 +49,23 @@ export const navigateToArtist = (
     query,
   });
 };
+
+/**
+ * 跳转到歌单页
+ * 任意来源都依赖 playlistId（不像专辑/歌手有本地"按名聚合"的语义）
+ * @param playlistId - 歌单 ID（必填）
+ * @param options.source - 来源；默认为 local
+ * @param options.name - 标题兜底（元数据返回前用于头部占位）
+ */
+export const navigateToPlaylist = (
+  playlistId: string | undefined,
+  options: { source?: TrackSource; name?: string } = {},
+) => {
+  if (!playlistId?.trim()) return;
+  const source = options.source ?? "local";
+  router.push({
+    name: "collection",
+    params: { source, type: "playlist", id: encodeURIComponent(playlistId) },
+    query: options.name ? { name: options.name } : undefined,
+  });
+};
diff --git a/src/utils/netease.ts b/src/utils/netease.ts
index 2781e99e..dbee4886 100644
--- a/src/utils/netease.ts
+++ b/src/utils/netease.ts
@@ -1,14 +1,11 @@
-/**
- * 网易云专属工具：原始接口数据 → 应用层模型 的格式化
- */
-
-import type { AudioQuality, Track, TrackFee } from "@shared/types/player";
+import type { Album, Artist, AudioQuality, Playlist, Track, TrackFee } from "@shared/types/player";
+import type { UserSubcount } from "@/types/user";
 import type { NeteaseSong } from "@/types/netease";
 
 /**
- * 网易云 fee → 应用层 TrackFee
- * 网易云 fee：0=免费 1=VIP 4=购买专辑 8=会员高音质（视作 VIP）
- * @param fee - 网易云原始 fee
+ *  fee → 应用层 TrackFee
+ *  fee：0=免费 1=VIP 4=购买专辑 8=会员高音质（视作 VIP）
+ * @param fee - 原始 fee
  */
 const toTrackFee = (fee: number | undefined): TrackFee | undefined => {
   if (fee === 0) return 0;
@@ -18,8 +15,8 @@ const toTrackFee = (fee: number | undefined): TrackFee | undefined => {
 };
 
 /**
- * 给网易云封面 URL 拼尺寸
- * @param url - 网易云封面原始 URL
+ * 给封面 URL 拼尺寸
+ * @param url - 封面原始 URL
  * @param size - 期望像素边长，默认 300
  */
 export const withPicSize = (url: string | undefined, size = 300): string | undefined => {
@@ -29,8 +26,8 @@ export const withPicSize = (url: string | undefined, size = 300): string | undef
 };
 
 /**
- * 根据网易云 song 对象选择最佳音质
- * @param song - 网易云原始 song 对象
+ * 根据 song 对象选择最佳音质
+ * @param song - 原始 song 对象
  * @returns 最佳音质
  */
 const pickQuality = (song: NeteaseSong): AudioQuality | undefined => {
@@ -66,8 +63,8 @@ const pickQuality = (song: NeteaseSong): AudioQuality | undefined => {
 };
 
 /**
- * 网易云 song → 应用层 Track
- * @param song - 网易云原始 song 对象
+ *  song → 应用层 Track
+ * @param song - 原始 song 对象
  */
 export const songToTrack = (song: NeteaseSong): Track => {
   const cover = withPicSize(song.al?.picUrl);
@@ -75,8 +72,7 @@ export const songToTrack = (song: NeteaseSong): Track => {
   const comment = song.alia?.find((s) => s?.trim()) ?? undefined;
   return {
     id: String(song.id),
-    source: "online",
-    platform: "netease",
+    source: "netease",
     title: song.name,
     comment,
     artists: (song.ar ?? []).map((artist) => ({ id: String(artist.id), name: artist.name })),
@@ -90,8 +86,46 @@ export const songToTrack = (song: NeteaseSong): Track => {
 };
 
 /**
- * 网易云 songs 列表 → Track 列表，空/缺省安全
+ *  songs 列表 → Track 列表，空/缺省安全
  * @param songs - 接口返回的 songs 数组
  */
 export const songsToTracks = (songs: NeteaseSong[] | undefined | null): Track[] =>
   songs?.map(songToTrack) ?? [];
+
+/**
+ * 歌单条目 → 应用层 Playlist
+ * 适用 `/user/playlist` 与 `/playlist/detail` 的 playlist 字段
+ */
+export const toPlaylist = (raw: any): Playlist => ({
+  id: String(raw.id),
+  name: raw.name,
+  cover: withPicSize(raw.coverImgUrl),
+  description: raw.description,
+  trackCount: raw.trackCount,
+  owner: raw.creator?.nickname,
+});
+
+/** 收藏专辑（/album/sublist 元素）→ 应用层 Album */
+export const toAlbum = (raw: any): Album => ({
+  id: String(raw.id),
+  name: raw.name,
+  cover: withPicSize(raw.picUrl),
+  artist: raw.artists?.map((a: { name: string }) => a.name).join(" / ") ?? raw.artist?.name,
+  trackCount: raw.size,
+  year: raw.publishTime ? new Date(raw.publishTime).getFullYear() : undefined,
+});
+
+/** 收藏歌手（/artist/sublist 元素）→ 应用层 Artist */
+export const toArtist = (raw: any): Artist => ({
+  id: String(raw.id),
+  name: raw.name,
+  avatar: withPicSize(raw.img1v1Url ?? raw.picUrl),
+  albumCount: raw.albumSize,
+});
+
+/** 订阅计数（/user/subcount）→ 应用层 UserSubcount */
+export const toSubcount = (raw: any): UserSubcount => ({
+  createdPlaylistCount: raw.createdPlaylistCount ?? 0,
+  subPlaylistCount: raw.subPlaylistCount ?? 0,
+  artistCount: raw.artistCount ?? 0,
+});

From 255520b705c2407c6a7d01fecd4413d4d2847b3b Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Mon, 18 May 2026 00:28:02 +0800
Subject: [PATCH 13/33] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=20&=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E6=97=A0=E6=B3=95=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/SideBar.vue     | 116 +++++++++++++++++++++-----
 src/components/layout/SideBarLogo.vue |  30 ++++---
 src/i18n/locales/en-US.json           |   3 +
 src/i18n/locales/zh-CN.json           |   3 +
 src/pages/Folders.vue                 |   7 +-
 src/services/lyricLoader.ts           |  78 ++++++++++-------
 src/stores/status.ts                  |  13 ++-
 src/utils/time.ts                     |  10 ++-
 8 files changed, 189 insertions(+), 71 deletions(-)

diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index ce0ee39a..e584ce49 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -1,7 +1,10 @@
 <script setup lang="ts">
 import type { SMenuItem } from "@/components/ui/SMenu.vue";
+import type { SSelectOption } from "@/components/ui/SSelect.vue";
 import { useSettingsStore } from "@/stores/settings";
+import { useStatusStore } from "@/stores/status";
 import { usePlaylistStore } from "@/stores/playlist";
+import { useUserStore } from "@/stores/user";
 import { navigateToPlaylist } from "@/utils/navigate";
 import IconLucideHome from "~icons/lucide/home";
 import IconLucideMusic from "~icons/lucide/music";
@@ -11,21 +14,100 @@ import IconLucideFolder from "~icons/lucide/folder";
 import IconLucideServer from "~icons/lucide/server";
 import IconLucideListMusic from "~icons/lucide/list-music";
 import IconLucidePlus from "~icons/lucide/plus";
+import IconLucideChevronDown from "~icons/lucide/chevron-down";
 import SButton from "@/components/ui/SButton.vue";
+import SPopselect from "@/components/ui/SPopselect.vue";
 
 const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
 const { appearance, system: systemSettings } = useSettingsStore();
+const status = useStatusStore();
 const playlistStore = usePlaylistStore();
+const userStore = useUserStore();
+
+const sourceOptions = computed<SSelectOption[]>(() => [
+  { value: "local", label: t("collection.localPlaylist") },
+  { value: "online", label: t("collection.onlinePlaylist") },
+]);
 
 const handleCreate = async () => {
+  if (status.myPlaylistSource !== "local") return;
   const playlist = await playlistStore.create(
     t("collection.create", { type: t("collection.playlist") }),
   );
   navigateToPlaylist(playlist.id);
 };
 
+/** 我的歌单分组头部 */
+const renderMyHeader = () =>
+  h("div", { class: "flex items-center justify-between gap-2 pl-3 pr-1 min-h-10" }, [
+    h(
+      SPopselect,
+      {
+        modelValue: status.myPlaylistSource,
+        options: sourceOptions.value,
+        side: "bottom",
+        align: "start",
+        "onUpdate:modelValue": (v) => (status.myPlaylistSource = v as "local" | "online"),
+      },
+      {
+        trigger: () =>
+          h(
+            "span",
+            {
+              class:
+                "inline-flex items-center gap-1 text-sm text-on-surface-variant/70 hover:text-on-surface cursor-pointer leading-none transition-colors duration-200",
+            },
+            [
+              t("collection.my", { type: t("collection.playlist") }),
+              h(IconLucideChevronDown, { class: "size-3.5" }),
+            ],
+          ),
+      },
+    ),
+    h(
+      SButton,
+      { variant: "tertiary", size: "tiny", round: true, onClick: handleCreate },
+      { icon: () => h(IconLucidePlus, { class: "size-3.5" }) },
+    ),
+  ]);
+
+/** 「收藏的歌单」分组头部 */
+const renderSubscribedHeader = () =>
+  h("div", { class: "flex items-center px-3 min-h-10" }, [
+    h(
+      "span",
+      { class: "text-sm text-on-surface-variant/70" },
+      t("collection.subscribed", { type: t("collection.playlist") }),
+    ),
+  ]);
+
+/** 我的歌单 */
+const myPlaylistItems = computed<SMenuItem[]>(() => {
+  if (status.myPlaylistSource === "local") {
+    return playlistStore.playlists.map((pl) => ({
+      key: `/collection/local/playlist/${pl.id}`,
+      label: pl.title,
+      icon: markRaw(IconLucideListMusic),
+    }));
+  }
+  return userStore.createdPlaylists.map((pl) => ({
+    key: `/collection/netease/playlist/${pl.id}`,
+    label: pl.name,
+    icon: markRaw(IconLucideListMusic),
+  }));
+});
+
+/** 收藏的歌单 */
+const subscribedItems = computed<SMenuItem[]>(() =>
+  userStore.subscribedPlaylists.map((pl) => ({
+    key: `/collection/netease/playlist/${pl.id}`,
+    label: pl.name,
+    icon: markRaw(IconLucideListMusic),
+  })),
+);
+
 const menuItems = computed<SMenuItem[]>(() => [
   // 本地音乐分组
   { key: "/", label: t("nav.home"), icon: markRaw(IconLucideHome) },
@@ -40,30 +122,18 @@ const menuItems = computed<SMenuItem[]>(() => [
         { key: "/streaming", label: t("nav.streaming"), icon: markRaw(IconLucideServer) },
       ] satisfies SMenuItem[])
     : []),
-  // 歌单分组
+  // 我的歌单
   { key: "divider-playlist", type: "divider" },
-  {
-    key: "playlist-group",
-    type: "group",
-    render: () =>
-      h("div", { class: "flex items-center justify-between px-3 py-2" }, [
-        h(
-          "span",
-          { class: "text-sm text-on-surface-variant/70" },
-          t("collection.my", { type: t("collection.playlist") }),
-        ),
-        h(
-          SButton,
-          { variant: "tertiary", size: "tiny", round: true, onClick: handleCreate },
-          { icon: () => h(IconLucidePlus, { class: "size-3.5" }) },
-        ),
-      ]),
-  },
-  ...playlistStore.playlists.map((pl) => ({
-    key: `/collection/local/playlist/${pl.id}`,
-    label: pl.title,
-    icon: markRaw(IconLucideListMusic),
-  })),
+  { key: "my-playlist-group", type: "group", render: renderMyHeader },
+  ...myPlaylistItems.value,
+  // 收藏的歌单
+  ...(status.myPlaylistSource === "online" && subscribedItems.value.length > 0
+    ? ([
+        { key: "divider-subscribed", type: "divider" },
+        { key: "subscribed-group", type: "group", render: renderSubscribedHeader },
+        ...subscribedItems.value,
+      ] satisfies SMenuItem[])
+    : []),
 ]);
 
 const activeKey = computed(() => {
diff --git a/src/components/layout/SideBarLogo.vue b/src/components/layout/SideBarLogo.vue
index 84f6b62b..2c5718f2 100644
--- a/src/components/layout/SideBarLogo.vue
+++ b/src/components/layout/SideBarLogo.vue
@@ -2,19 +2,27 @@
 defineProps<{
   collapsed: boolean;
 }>();
+
+const router = useRouter();
+
+const goHome = (): void => {
+  router.push("/");
+};
 </script>
 
 <template>
-  <RouterLink
-    to="/"
-    class="flex items-center justify-center h-16 shrink-0 px-4 no-underline cursor-pointer transition-transform duration-300 hover:scale-105 active:scale-100"
-  >
-    <SLogo :size="30" class="shrink-0" />
-    <span
-      class="text-[22px] text-primary mt-0.5 leading-10 overflow-hidden whitespace-nowrap font-logo transition-[width,opacity,margin] duration-300"
-      :class="collapsed ? 'w-0 opacity-0 ml-0' : 'w-[90px] ml-2'"
+  <div class="flex items-center justify-center h-16 shrink-0 px-4">
+    <div
+      class="inline-flex items-center cursor-pointer transition-transform duration-300 hover:scale-105 active:scale-100"
+      @click="goHome"
     >
-      SPlayer
-    </span>
-  </RouterLink>
+      <SLogo :size="30" class="shrink-0" />
+      <span
+        class="text-[22px] text-primary mt-0.5 leading-10 overflow-hidden whitespace-nowrap font-logo transition-[width,opacity,margin] duration-300"
+        :class="collapsed ? 'w-0 opacity-0 ml-0' : 'w-[90px] ml-2'"
+      >
+        SPlayer
+      </span>
+    </div>
+  </div>
 </template>
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 898734bc..2a87237c 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1068,6 +1068,9 @@
     "playlist": "Playlist",
     "radio": "Radio",
     "my": "My {type}s",
+    "subscribed": "Subscribed {type}s",
+    "localPlaylist": "Local Playlists",
+    "onlinePlaylist": "Online Playlists",
     "create": "New {type}",
     "name": "{type} Name",
     "description": "Description",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 7e85a1ed..7b20bf32 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -1068,6 +1068,9 @@
     "playlist": "歌单",
     "radio": "电台",
     "my": "我的{type}",
+    "subscribed": "收藏的{type}",
+    "localPlaylist": "本地歌单",
+    "onlinePlaylist": "在线歌单",
     "create": "新建{type}",
     "name": "{type}名称",
     "description": "{type}描述",
diff --git a/src/pages/Folders.vue b/src/pages/Folders.vue
index a9624740..2c541178 100644
--- a/src/pages/Folders.vue
+++ b/src/pages/Folders.vue
@@ -17,7 +17,7 @@ const { tracks, initialized, folderTree, folderCount } = storeToRefs(libraryStor
 const trackCount = computed(() => tracks.value.filter((tr) => !!tr.path).length);
 
 const expanded = ref<string[]>([]);
-const selectedFolder = ref<FolderNode | null>(null);
+const selectedFolder = shallowRef<FolderNode | null>(null);
 
 // 默认展开/选中只在首次拿到非空树时执行一次，之后用户的折叠/选择不再被覆盖
 let defaultsApplied = false;
@@ -57,7 +57,10 @@ watch(
   { immediate: true },
 );
 
-const selectedTracks = computed<Track[]>(() => selectedFolder.value?.tracks ?? []);
+const selectedTracks = computed<Track[]>(() => {
+  const folder = selectedFolder.value;
+  return folder ? toRaw(folder.tracks) : [];
+});
 
 const handlePlayAll = (): void => {
   if (selectedTracks.value.length === 0) return;
diff --git a/src/services/lyricLoader.ts b/src/services/lyricLoader.ts
index 2ff24c4f..5b19fbc9 100644
--- a/src/services/lyricLoader.ts
+++ b/src/services/lyricLoader.ts
@@ -141,18 +141,25 @@ const isOnlineResultUpgrade = (result: OnlineResult, localFormat: LyricFormat):
  * TTML 异步升级
  * @param token - 竞态 token
  * @param track - 歌曲信息
- * @param platform - 平台
- * @returns 是否成功
  */
-const tryTTMLOverlay = async (
-  token: number,
-  track: Track,
-  platform: "netease" | "qqmusic",
-): Promise<void> => {
-  const resp = await window.api.lyrics.fetchTTMLOverlay(track, platform);
+const tryTTMLOverlay = async (token: number, track: Track): Promise<void> => {
+  const order = useSettingsStore().lyric.lyricSourceOrder ?? DEFAULT_LYRIC_SOURCE_ORDER;
+  const candidates = order.filter(
+    (p): p is "netease" | "qqmusic" => p === "netease" || p === "qqmusic",
+  );
+  if (candidates.length === 0) return;
+  const responses = await Promise.all(
+    candidates.map((p) => window.api.lyrics.fetchTTMLOverlay(track, p)),
+  );
   if (token !== currentToken) return;
-  if (!resp.ok || !resp.data) return;
-  commit(token, { source: "online", format: "ttml", platform }, { content: resp.data });
+  for (let i = 0; i < candidates.length; i++) {
+    const resp = responses[i];
+    if (resp.ok && resp.data) {
+      const platform = candidates[i];
+      commit(token, { source: "online", format: "ttml", platform }, { content: resp.data });
+      return;
+    }
+  }
 };
 
 /**
@@ -191,23 +198,25 @@ const tryOnlineByPreference = async (
       candidates = order.filter((p) => platformCanUpgrade(p, localFormat, formatOrder));
       if (candidates.length === 0) return null;
     }
-    // smart + 无本地：按音源顺序遍历，挑 lyricFormatOrder 中优先级最高的结果
-    if (!hasLocal && settings.lyric.smartPreferOnline) {
+    // smart：并行拉所有候选，谁先回有内容就先 commit，后到的 rank 更高才替换
+    if (settings.lyric.smartPreferOnline) {
       let best: OnlineResult | null = null;
-      let bestRank = Infinity;
-      for (const platform of candidates) {
-        const result = await fetchFromPlatform(platform, track);
-        if (token !== currentToken) return null;
-        if (!result) continue;
-        const idx = formatOrder.indexOf(result.source.format);
-        const rank = idx === -1 ? Infinity : idx;
-        if (rank < bestRank) {
-          best = result;
-          bestRank = rank;
-          // 已经是最高优先级，后续平台无需再试
-          if (rank === 0) break;
-        }
-      }
+      const localIdx = hasLocal && localFormat ? formatOrder.indexOf(localFormat) : -1;
+      let bestRank = localIdx === -1 ? Infinity : localIdx;
+      await Promise.all(
+        candidates.map(async (platform) => {
+          const result = await fetchFromPlatform(platform, track);
+          if (token !== currentToken || !result) return;
+          const idx = formatOrder.indexOf(result.source.format);
+          const rank = idx === -1 ? Infinity : idx;
+          if (rank < bestRank) {
+            best = result;
+            bestRank = rank;
+            commit(token, result.source, result.input);
+          }
+        }),
+      );
+      if (token !== currentToken) return null;
       return best;
     }
     // 其它：按音源顺序首个有效即返回
@@ -251,16 +260,25 @@ const applyOnline = async (
   online: OnlineResult,
   fallbackLocal: LocalLyric | null,
 ): Promise<void> => {
-  commit(token, online.source, online.input);
-  if (token !== currentToken) return;
-  if (useMediaStore().parsedLyric.length === 0) {
+  const media = useMediaStore();
+  const current = media.activeLyric;
+  // 跳过同源同格式
+  const alreadyCommitted =
+    current?.source === "online" &&
+    current.platform === online.source.platform &&
+    current.format === online.source.format;
+  if (!alreadyCommitted) {
+    commit(token, online.source, online.input);
+    if (token !== currentToken) return;
+  }
+  if (media.parsedLyric.length === 0) {
     if (fallbackLocal) {
       commitLocal(token, fallbackLocal);
       return;
     }
   }
   if (shouldTryTTML(online.source.platform, online.source.format)) {
-    await tryTTMLOverlay(token, track, online.source.platform);
+    await tryTTMLOverlay(token, track);
   }
 };
 
diff --git a/src/stores/status.ts b/src/stores/status.ts
index 22f4e236..120d2a51 100644
--- a/src/stores/status.ts
+++ b/src/stores/status.ts
@@ -58,6 +58,8 @@ export const useStatusStore = defineStore(
     const lyricOffsetMs = ref(0);
     /** 搜索页选中的平台 */
     const searchPlatform = ref<Platform>("netease");
+    /** 侧栏「我的歌单」当前展示来源 */
+    const myPlaylistSource = ref<"local" | "online">("local");
     /** 是否正在播放 */
     const isPlaying = computed(() => state.value === "playing");
     /** 是否暂停 */
@@ -99,13 +101,22 @@ export const useStatusStore = defineStore(
       abLoop,
       lyricOffsetMs,
       searchPlatform,
+      myPlaylistSource,
       currentTrack,
     };
   },
   {
     persist: {
       storage: localStorage,
-      pick: ["playIndex", "repeatMode", "shuffleMode", "volume", "position", "searchPlatform"],
+      pick: [
+        "playIndex",
+        "repeatMode",
+        "shuffleMode",
+        "volume",
+        "position",
+        "searchPlatform",
+        "myPlaylistSource",
+      ],
     },
   },
 );
diff --git a/src/utils/time.ts b/src/utils/time.ts
index cbbcaccb..183f50cc 100644
--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@@ -1,13 +1,15 @@
 /**
- * 格式化毫秒为 m:ss
+ * 格式化毫秒：< 1 小时输出 m:ss，≥ 1 小时输出 h:mm:ss
  * @param ms 毫秒
  * @returns 格式化后的时间
  */
 export const formatTime = (ms: number): string => {
   const totalSec = Math.floor(ms / 1000);
-  const min = Math.floor(totalSec / 60);
-  const sec = totalSec % 60;
-  return `${min}:${sec.toString().padStart(2, "0")}`;
+  const h = Math.floor(totalSec / 3600);
+  const m = Math.floor((totalSec % 3600) / 60);
+  const s = totalSec % 60;
+  const pad = (n: number): string => n.toString().padStart(2, "0");
+  return h > 0 ? `${h}:${pad(m)}:${pad(s)}` : `${m}:${pad(s)}`;
 };
 
 /**

From a1948b1c206c2dca4dace0dfeebba43808158c8f Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Mon, 18 May 2026 10:12:08 +0800
Subject: [PATCH 14/33] =?UTF-8?q?feat:=20=E6=AD=8C=E6=9B=B2=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E5=BB=B6=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/NavSearch.vue |  2 +-
 src/core/player/events.ts           |  3 +++
 src/core/player/index.ts            |  8 ++++++
 src/services/audioSource.ts         | 40 +++++++++++++++++++--------
 src/services/cacheScheduler.ts      | 42 +++++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 12 deletions(-)
 create mode 100644 src/services/cacheScheduler.ts

diff --git a/src/components/layout/NavSearch.vue b/src/components/layout/NavSearch.vue
index d0b075f1..576e4b50 100644
--- a/src/components/layout/NavSearch.vue
+++ b/src/components/layout/NavSearch.vue
@@ -53,7 +53,7 @@ const onPickKeyword = (keyword: string): void => submit(keyword);
 const onRemoveHistory = (keyword: string): void => data.removeSearchHistory(keyword);
 const onClearHistory = (): void => data.clearSearchHistory();
 
-/** 单曲建议点击：取详情后插队播放，关闭弹窗；用户输入的关键词记入历史 */
+/** 单曲建议点击 */
 const onPickSong = async (id: number): Promise<void> => {
   if (trimmedQuery.value) data.addSearchHistory(trimmedQuery.value);
   dialogOpen.value = false;
diff --git a/src/core/player/events.ts b/src/core/player/events.ts
index 21d39289..1def44b9 100644
--- a/src/core/player/events.ts
+++ b/src/core/player/events.ts
@@ -4,6 +4,7 @@ import { useStatusStore } from "@/stores/status";
 import * as playback from "@/services/playback";
 import * as autoClose from "@/services/autoClose";
 import * as abLoop from "@/services/abLoop";
+import * as cacheScheduler from "@/services/cacheScheduler";
 import {
   hasReachedSeekTarget,
   isSeeking,
@@ -55,6 +56,8 @@ export const handleEvent = async (event: PlayerEvent): Promise<void> => {
       useMediaStore().updateLyricIndex(adjusted + status.lyricOffsetMs);
       // AB 循环：到达 B 点 seek 回 A
       abLoop.checkLoop(adjusted);
+      // 推进延时缓存调度
+      cacheScheduler.tick(adjusted);
       break;
     }
     case "fftData":
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index 178b3460..090bf36a 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -10,6 +10,7 @@ import * as queue from "@/stores/queue";
 import * as playback from "@/services/playback";
 import * as lyricLoader from "@/services/lyricLoader";
 import * as abLoop from "@/services/abLoop";
+import * as cacheScheduler from "@/services/cacheScheduler";
 import { resolveTrackSource } from "@/services/audioSource";
 import { extractColorFromUrl } from "@/utils/color";
 import { handleError, isSkippableError } from "@/utils/errors";
@@ -62,6 +63,8 @@ const resetForLoad = (duration: number): void => {
   playback.setCurrentTime(0, { force: true });
   playback.setDuration(duration);
   playback.setPlaying(false);
+  // 上一首未达到缓存触发阈值的请求丢弃
+  cacheScheduler.cancel();
 };
 
 /**
@@ -151,6 +154,8 @@ const loadTrack = async (track: Track | null): Promise<void> => {
     // 引擎失败且属单曲级错误才跳
     if (!result.ok && result.error && isSkippableError(result.error)) {
       shouldSkip = true;
+    } else if (result.ok && resolved.cacheRequest) {
+      cacheScheduler.schedule(track.id, resolved.cacheRequest);
     }
   }
   if (shouldSkip) await skipOnFailure(myToken, () => trackToken);
@@ -596,6 +601,9 @@ export const initPlayer = async (): Promise<void> => {
       if (result.ok && settings.system.player.rememberLastTrack && lastPosition > 0) {
         await seek(lastPosition);
       }
+      if (result.ok && resolved.cacheRequest) {
+        cacheScheduler.schedule(lastTrack.id, resolved.cacheRequest);
+      }
     } else {
       status.state = "idle";
     }
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index 3b103ad5..e8b42b62 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -113,15 +113,21 @@ const resolveOnlineUrl = async (track: Track): Promise<string | null> => {
 };
 
 /**
- * 根据 track 信息解析出最终的音频源 URL
- * @param track - 要解析的 track
+ * 解析结果
+ * - fromCache 为 true 时表示音源直接命中本地缓存
+ * - cacheRequest 存在时表示尚未缓存，调用方应在合适时机（如播放达到阈值后）触发它
  */
-export const resolveTrackSource = async (
-  track: Track,
-): Promise<{
+export interface ResolvedTrackSource {
   source: string;
   fromCache: boolean;
-} | null> => {
+  cacheRequest?: () => void;
+}
+
+/**
+ * 根据 track 信息解析出最终的音频源 URL
+ * @param track - 要解析的 track
+ */
+export const resolveTrackSource = async (track: Track): Promise<ResolvedTrackSource | null> => {
   // 本地文件
   if (track.source === "local") {
     return track.path ? { source: track.path, fromCache: false } : null;
@@ -138,12 +144,21 @@ export const resolveTrackSource = async (
     try {
       const store = useStreamingStore();
       const streamUrl = await store.getStreamUrl(track);
+      const result: ResolvedTrackSource = { source: streamUrl, fromCache: false };
       if (cacheEnabled) {
         // 缓存下载用独立 PlaySessionId
-        const cacheUrl = await store.getStreamUrl(track, { playSessionId: crypto.randomUUID() });
-        void window.api.cache.song.fetch(cacheKey!, "streaming", cacheUrl);
+        result.cacheRequest = async () => {
+          try {
+            const cacheUrl = await store.getStreamUrl(track, {
+              playSessionId: crypto.randomUUID(),
+            });
+            void window.api.cache.song.fetch(cacheKey, "streaming", cacheUrl);
+          } catch (err) {
+            console.warn("[cache] streaming getStreamUrl failed", err);
+          }
+        };
       }
-      return { source: streamUrl, fromCache: false };
+      return result;
     } catch (err) {
       handleError(err instanceof Error ? err.message : String(err));
       return null;
@@ -157,10 +172,13 @@ export const resolveTrackSource = async (
         handleError(ErrorCode.URL_RESOLVE_FAILED);
         return null;
       }
+      const result: ResolvedTrackSource = { source: url, fromCache: false };
       if (cacheEnabled) {
-        void window.api.cache.song.fetch(cacheKey!, track.source, url);
+        result.cacheRequest = () => {
+          void window.api.cache.song.fetch(cacheKey!, track.source, url);
+        };
       }
-      return { source: url, fromCache: false };
+      return result;
     } catch (err) {
       handleError(err instanceof Error ? err.message : String(err));
       return null;
diff --git a/src/services/cacheScheduler.ts b/src/services/cacheScheduler.ts
new file mode 100644
index 00000000..1c1477a6
--- /dev/null
+++ b/src/services/cacheScheduler.ts
@@ -0,0 +1,42 @@
+import { useMediaStore } from "@/stores/media";
+
+/** 触发缓存所需的最低播放位置（毫秒） */
+const TRIGGER_AT_MS = 20_000;
+
+interface Pending {
+  trackId: string;
+  fire: () => void;
+}
+
+let pending: Pending | null = null;
+
+/**
+ * 调度一个延时缓存请求，自动覆盖上一首未触发的
+ * @param trackId - 关联的 Track id，用于切歌时判别归属
+ * @param fire - 实际触发缓存下载的回调
+ */
+export const schedule = (trackId: string, fire: () => void): void => {
+  pending = { trackId, fire };
+};
+
+/** 取消当前 pending；切歌或新一轮加载前调用 */
+export const cancel = (): void => {
+  pending = null;
+};
+
+/**
+ * 推进检查；由 position 事件驱动，到达阈值且当前曲目仍是被调度的那一首才触发
+ * @param positionMs - 当前播放位置（毫秒）
+ */
+export const tick = (positionMs: number): void => {
+  if (!pending) return;
+  if (positionMs < TRIGGER_AT_MS) return;
+  // 兜底：当前曲目已变
+  if (useMediaStore().track?.id !== pending.trackId) {
+    pending = null;
+    return;
+  }
+  const fire = pending.fire;
+  pending = null;
+  fire();
+};

From a5da16bd1069a2a921c1c6fc5da6fe4137e0d80b Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Mon, 18 May 2026 15:51:41 +0800
Subject: [PATCH 15/33] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=88=91?=
 =?UTF-8?q?=E5=96=9C=E6=AC=A2=E7=9A=84=E9=9F=B3=E4=B9=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                            |   7 +
 package.json                               |   1 +
 pnpm-lock.yaml                             |  10 +
 src/apis/user/netease.ts                   |   6 +-
 src/components/layout/SideBar.vue          |   8 +-
 src/components/list/SongList.vue           |  26 +++
 src/components/player/FullPlayer/index.vue |  19 +-
 src/components/player/PlayerBar.vue        |  44 +++-
 src/components/player/TrackInfo.vue        |  19 +-
 src/components/ui/SInput.vue               |   4 +-
 src/components/ui/SMarquee.vue             |   5 +-
 src/components/ui/STabs.vue                |  49 +++--
 src/composables/useFavorite.ts             |  73 +++++++
 src/i18n/locales/en-US.json                |  23 +++
 src/i18n/locales/zh-CN.json                |  23 +++
 src/pages/Liked.vue                        | 228 +++++++++++++++++++++
 src/pages/Search.vue                       |  26 +--
 src/router/index.ts                        |   5 +
 src/stores/library.ts                      |  60 +++++-
 src/stores/status.ts                       |   4 +
 src/stores/user.ts                         | 171 +++++++++++++---
 21 files changed, 738 insertions(+), 73 deletions(-)
 create mode 100644 src/composables/useFavorite.ts
 create mode 100644 src/pages/Liked.vue

diff --git a/components.d.ts b/components.d.ts
index fe9a441b..fc9c6d89 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -83,6 +83,7 @@ declare module 'vue' {
     IconLucideFolderPlus: typeof import('~icons/lucide/folder-plus')['default']
     IconLucideGithub: typeof import('~icons/lucide/github')['default']
     IconLucideHardDrive: typeof import('~icons/lucide/hard-drive')['default']
+    IconLucideHeart: typeof import('~icons/lucide/heart')['default']
     IconLucideHistory: typeof import('~icons/lucide/history')['default']
     IconLucideInfo: typeof import('~icons/lucide/info')['default']
     IconLucideKeyRound: typeof import('~icons/lucide/key-round')['default']
@@ -90,6 +91,7 @@ declare module 'vue' {
     IconLucideLink2: typeof import('~icons/lucide/link2')['default']
     IconLucideListMusic: typeof import('~icons/lucide/list-music')['default']
     IconLucideLocate: typeof import('~icons/lucide/locate')['default']
+    IconLucideLock: typeof import('~icons/lucide/lock')['default']
     IconLucideLogOut: typeof import('~icons/lucide/log-out')['default']
     IconLucideMaximize: typeof import('~icons/lucide/maximize')['default']
     IconLucideMessageCircle: typeof import('~icons/lucide/message-circle')['default']
@@ -117,6 +119,7 @@ declare module 'vue' {
     IconLucideTextQuote: typeof import('~icons/lucide/text-quote')['default']
     IconLucideTrash2: typeof import('~icons/lucide/trash2')['default']
     IconLucideTriangleAlert: typeof import('~icons/lucide/triangle-alert')['default']
+    IconLucideUnlock: typeof import('~icons/lucide/unlock')['default']
     IconLucideUser: typeof import('~icons/lucide/user')['default']
     IconLucideUserRound: typeof import('~icons/lucide/user-round')['default']
     IconLucideVolume1: typeof import('~icons/lucide/volume1')['default']
@@ -124,6 +127,9 @@ declare module 'vue' {
     IconLucideVolumeX: typeof import('~icons/lucide/volume-x')['default']
     IconLucideX: typeof import('~icons/lucide/x')['default']
     IconLucideZap: typeof import('~icons/lucide/zap')['default']
+    IconMaterialSymbolsFavoriteOutline: typeof import('~icons/material-symbols/favorite-outline')['default']
+    IconMaterialSymbolsFavoriteOutlineRounded: typeof import('~icons/material-symbols/favorite-outline-rounded')['default']
+    IconSpHeartFill: typeof import('~icons/sp/heart-fill')['default']
     IconSpLossless: typeof import('~icons/sp/lossless')['default']
     LoginCookieDialog: typeof import('./src/components/modals/LoginCookieDialog.vue')['default']
     LoginDialog: typeof import('./src/components/modals/LoginDialog.vue')['default']
@@ -181,6 +187,7 @@ declare module 'vue' {
     SettingsSearch: typeof import('./src/components/settings/SettingsSearch.vue')['default']
     SettingsSection: typeof import('./src/components/settings/SettingsSection.vue')['default']
     SFormItem: typeof import('./src/components/ui/SFormItem.vue')['default']
+    SHeartButton: typeof import('./src/components/ui/SHeartButton.vue')['default']
     SideBar: typeof import('./src/components/layout/SideBar.vue')['default']
     SideBarLogo: typeof import('./src/components/layout/SideBarLogo.vue')['default']
     SImg: typeof import('./src/components/ui/SImg.vue')['default']
diff --git a/package.json b/package.json
index 8f4c1641..137b5846 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
     "@electron-toolkit/eslint-config-ts": "^3.1.0",
     "@electron-toolkit/tsconfig": "^2.0.0",
     "@iconify-json/lucide": "^1.2.101",
+    "@iconify-json/material-symbols": "^1.2.73",
     "@napi-rs/cli": "^3.6.1",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^22.19.17",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3f9b4768..d8229b3a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -84,6 +84,9 @@ importers:
       '@iconify-json/lucide':
         specifier: ^1.2.101
         version: 1.2.101
+      '@iconify-json/material-symbols':
+        specifier: ^1.2.73
+        version: 1.2.73
       '@napi-rs/cli':
         specifier: ^3.6.1
         version: 3.6.1(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0)(@types/node@22.19.17)
@@ -706,6 +709,9 @@ packages:
   '@iconify-json/lucide@1.2.101':
     resolution: {integrity: sha512-JUN7uuSLRG3GK/9c5b8cK9e7sL6EAWDaASIwBOd0zUeKS0ACcokJubo2RMQHyVUVpd8mYkrR3Zd2mkH9ghhw1Q==}
 
+  '@iconify-json/material-symbols@1.2.73':
+    resolution: {integrity: sha512-XCZ9PiO47hofN9p8VTfLyCCJXd95OH4gIkkplkBfeZpz3K6cWYDj7oCy+rnc1AVMmoFyDEyjdEVvr+Oqz9yVTA==}
+
   '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
 
@@ -4571,6 +4577,10 @@ snapshots:
     dependencies:
       '@iconify/types': 2.0.0
 
+  '@iconify-json/material-symbols@1.2.73':
+    dependencies:
+      '@iconify/types': 2.0.0
+
   '@iconify/types@2.0.0': {}
 
   '@iconify/utils@3.1.0':
diff --git a/src/apis/user/netease.ts b/src/apis/user/netease.ts
index 8145a7a1..6b3e3ce4 100644
--- a/src/apis/user/netease.ts
+++ b/src/apis/user/netease.ts
@@ -38,6 +38,8 @@ export interface FetchPlaylistOptions {
   onBatch?: (batch: Track[]) => void;
   /** 中断信号 */
   signal?: AbortSignal;
+  /** 绕过请求响应缓存 */
+  fresh?: boolean;
 }
 
 /**
@@ -54,7 +56,9 @@ export const fetchPlaylist = async (
   options: FetchPlaylistOptions = {},
 ): Promise<void> => {
   if (options.signal?.aborted) return;
-  const body = await neteaseApi.playlist_detail({ id: playlistId });
+  const params: Record<string, unknown> = { id: playlistId };
+  if (options.fresh) params.timestamp = Date.now();
+  const body = await neteaseApi.playlist_detail(params);
   if (options.signal?.aborted) return;
   const raw = body?.playlist;
   if (!raw) return;
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index e584ce49..5776b376 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -13,6 +13,7 @@ import IconLucideDisc3 from "~icons/lucide/disc-3";
 import IconLucideFolder from "~icons/lucide/folder";
 import IconLucideServer from "~icons/lucide/server";
 import IconLucideListMusic from "~icons/lucide/list-music";
+import IconMaterialSymbolsFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
 import IconLucidePlus from "~icons/lucide/plus";
 import IconLucideChevronDown from "~icons/lucide/chevron-down";
 import SButton from "@/components/ui/SButton.vue";
@@ -92,7 +93,8 @@ const myPlaylistItems = computed<SMenuItem[]>(() => {
       icon: markRaw(IconLucideListMusic),
     }));
   }
-  return userStore.createdPlaylists.map((pl) => ({
+  // 在线模式
+  return userStore.createdPlaylists.slice(1).map((pl) => ({
     key: `/collection/netease/playlist/${pl.id}`,
     label: pl.name,
     icon: markRaw(IconLucideListMusic),
@@ -115,10 +117,10 @@ const menuItems = computed<SMenuItem[]>(() => [
   { key: "/artists/local", label: t("artist.label"), icon: markRaw(IconLucideUser) },
   { key: "/albums/local", label: t("album.label"), icon: markRaw(IconLucideDisc3) },
   { key: "/folders", label: t("folder.label"), icon: markRaw(IconLucideFolder) },
-  // 流媒体（受 system.streaming.enabled 总开关控制）
+  { key: "divider-personal", type: "divider" },
+  { key: "/liked", label: t("nav.liked"), icon: markRaw(IconMaterialSymbolsFavoriteOutline) },
   ...(systemSettings.streaming.enabled
     ? ([
-        { key: "divider-streaming", type: "divider" },
         { key: "/streaming", label: t("nav.streaming"), icon: markRaw(IconLucideServer) },
       ] satisfies SMenuItem[])
     : []),
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index d5018b15..ffb3222e 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -6,6 +6,7 @@ import { useStatusStore } from "@/stores/status";
 import { useSettingsStore } from "@/stores/settings";
 import { useTrackMenu } from "@/composables/useTrackMenu";
 import { useMultiSelect } from "@/composables/useMultiSelect";
+import { useFavorite } from "@/composables/useFavorite";
 import { formatTime } from "@/utils/time";
 import { formatFileSize } from "@/utils/format";
 import { isLosslessQuality, getQualityLevel } from "@/utils/quality";
@@ -19,6 +20,8 @@ import IconLucideListMinus from "~icons/lucide/list-minus";
 import IconLucideTrash2 from "~icons/lucide/trash-2";
 import IconLucideArrowLeftRight from "~icons/lucide/arrow-left-right";
 import IconLucideX from "~icons/lucide/x";
+import IconFavorite from "~icons/material-symbols/favorite-rounded";
+import IconFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
 
 const props = withDefaults(
   defineProps<{
@@ -66,6 +69,7 @@ const { t } = useI18n();
 const media = useMediaStore();
 const status = useStatusStore();
 const settings = useSettingsStore();
+const fav = useFavorite();
 
 /** 悬浮布局且播放栏可见时 */
 const isFloatingPlayerBar = computed(
@@ -385,6 +389,7 @@ defineExpose({
                 </div>
               </div>
               <div v-if="showAlbum" class="flex-1 min-w-0">{{ t("songList.album") }}</div>
+              <div class="w-7 shrink-0 text-center">{{ t("songList.actions") }}</div>
               <div v-if="showDuration" class="w-16 shrink-0 text-center">
                 {{ t("songList.duration") }}
               </div>
@@ -543,6 +548,27 @@ defineExpose({
               >
                 {{ item.album?.name || t("collection.unknownAlbum") }}
               </div>
+              <!-- 红心：批量模式下隐藏，其余始终显示 -->
+              <div
+                v-if="!batch.active.value"
+                class="w-7 shrink-0 flex items-center justify-center"
+                @click.stop
+              >
+                <SButton
+                  type="primary"
+                  variant="text"
+                  circle
+                  :size="28"
+                  :icon-size="20"
+                  @click="fav.toggle(item)"
+                >
+                  <template #icon>
+                    <IconFavorite v-if="fav.isLiked(item)" />
+                    <IconFavoriteOutline v-else />
+                  </template>
+                </SButton>
+              </div>
+              <div v-else class="w-7 shrink-0" />
               <!-- 时长 -->
               <div
                 v-if="showDuration"
diff --git a/src/components/player/FullPlayer/index.vue b/src/components/player/FullPlayer/index.vue
index 6c6a8faa..f2524371 100644
--- a/src/components/player/FullPlayer/index.vue
+++ b/src/components/player/FullPlayer/index.vue
@@ -3,17 +3,21 @@ import { useStatusStore } from "@/stores/status";
 import { useMediaStore } from "@/stores/media";
 import { useSettingsStore } from "@/stores/settings";
 import { usePlaybackTime } from "@/composables/usePlaybackTime";
+import { useFavorite } from "@/composables/useFavorite";
 import Lyrics from "@/components/player/Lyrics/index.vue";
 import { useWindowControls } from "@/composables/useWindowControls";
 import { useSettingsDialog } from "@/settings/useSettingsDialog";
 import * as player from "@/core/player";
 import { formatTime, formatSignedSec } from "@/utils/time";
+import IconFavorite from "~icons/material-symbols/favorite-rounded";
+import IconFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
 
 const { t } = useI18n();
 const status = useStatusStore();
 const media = useMediaStore();
 const settings = useSettingsStore();
 const settingsDialog = useSettingsDialog();
+const fav = useFavorite();
 const { isPlaying, isLoading, position, duration, isExpanded, repeatMode, shuffleMode, showLyric } =
   storeToRefs(status);
 
@@ -377,10 +381,23 @@ const resetLyricOffset = (): void => writeOffset(0);
           @mouseenter="onBarEnter"
           @mouseleave="onBarLeave"
         >
-          <div class="flex-1 min-w-0 flex items-center justify-start">
+          <div class="flex-1 min-w-0 flex items-center justify-start gap-2">
             <SButton type="cover" variant="ghost" size="large" circle @click="collapse">
               <template #icon><IconLucideChevronDown /></template>
             </SButton>
+            <SButton
+              type="cover"
+              variant="ghost"
+              size="large"
+              circle
+              :disabled="!hasTrack"
+              @click="fav.toggle(media.track)"
+            >
+              <template #icon>
+                <IconFavorite v-if="fav.isLiked(media.track)" />
+                <IconFavoriteOutline v-else />
+              </template>
+            </SButton>
           </div>
           <div class="shrink-0 flex flex-col items-center gap-1 w-[clamp(360px,35%,480px)]">
             <div class="flex items-center gap-3">
diff --git a/src/components/player/PlayerBar.vue b/src/components/player/PlayerBar.vue
index 762fde7c..9eb12ce5 100644
--- a/src/components/player/PlayerBar.vue
+++ b/src/components/player/PlayerBar.vue
@@ -1,11 +1,17 @@
 <script setup lang="ts">
 import { useStatusStore } from "@/stores/status";
 import { useSettingsStore } from "@/stores/settings";
+import { useMediaStore } from "@/stores/media";
+import { useFavorite } from "@/composables/useFavorite";
 import * as player from "@/core/player";
 import { formatTime } from "@/utils/time";
+import IconFavorite from "~icons/material-symbols/favorite-rounded";
+import IconFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
 
 const status = useStatusStore();
 const settings = useSettingsStore();
+const media = useMediaStore();
+const fav = useFavorite();
 const { position, duration } = storeToRefs(status);
 
 /** 是否是浮动模式 */
@@ -22,7 +28,23 @@ const onSeekDragEnd = (value: number): void => {
     <PlayerControls compact />
     <div class="flex flex-col flex-1 min-w-0 gap-1 pt-2 pb-1">
       <div class="flex items-center gap-2 min-w-0">
-        <TrackInfo compact class="flex-1" />
+        <TrackInfo compact class="flex-1">
+          <template #title-trailing>
+            <SButton
+              type="primary"
+              variant="text"
+              circle
+              :size="24"
+              :icon-size="16"
+              @click="fav.toggle(media.track)"
+            >
+              <template #icon>
+                <IconFavorite v-if="fav.isLiked(media.track)" />
+                <IconFavoriteOutline v-else />
+              </template>
+            </SButton>
+          </template>
+        </TrackInfo>
         <span class="text-xs text-on-surface-variant/70 tabular-nums shrink-0">
           {{ formatTime(position) }} / {{ formatTime(duration) }}
         </span>
@@ -60,8 +82,24 @@ const onSeekDragEnd = (value: number): void => {
         <template #popover="{ value }">{{ formatTime(value) }}</template>
       </SSlider>
     </div>
-    <div class="grid grid-cols-[1fr_auto_1fr] items-center h-full px-3">
-      <TrackInfo />
+    <div class="grid grid-cols-[1fr_auto_1fr] items-center h-full px-3 gap-3">
+      <TrackInfo>
+        <template #title-trailing>
+          <SButton
+            type="primary"
+            variant="text"
+            circle
+            :size="28"
+            :icon-size="18"
+            @click="fav.toggle(media.track)"
+          >
+            <template #icon>
+              <IconFavorite v-if="fav.isLiked(media.track)" />
+              <IconFavoriteOutline v-else />
+            </template>
+          </SButton>
+        </template>
+      </TrackInfo>
       <PlayerControls class="mx-15" />
       <div class="flex items-center justify-end gap-3 min-w-0">
         <span class="text-xs text-on-surface-variant tabular-nums shrink-0">
diff --git a/src/components/player/TrackInfo.vue b/src/components/player/TrackInfo.vue
index f669c551..d73d7499 100644
--- a/src/components/player/TrackInfo.vue
+++ b/src/components/player/TrackInfo.vue
@@ -55,13 +55,18 @@ const isArtistLinkable = (artist: Artist): boolean => {
     <!-- 歌曲信息：仅文本切歌时滑动 -->
     <Transition name="slide-left" mode="out-in">
       <div v-if="media.track" :key="media.track.id" class="min-w-0 flex-1">
-        <SMarquee
-          :class="
-            compact ? 'font-medium text-sm leading-tight' : 'font-bold text-base leading-snug'
-          "
-        >
-          {{ media.track.title }}
-        </SMarquee>
+        <div class="flex items-center gap-1.5 min-w-0">
+          <SMarquee
+            fit
+            class="min-w-0"
+            :class="
+              compact ? 'font-medium text-sm leading-tight' : 'font-bold text-base leading-snug'
+            "
+          >
+            {{ media.track.title }}
+          </SMarquee>
+          <slot name="title-trailing" />
+        </div>
         <Transition name="slide-up" mode="out-in">
           <SMarquee
             v-if="currentLyricText"
diff --git a/src/components/ui/SInput.vue b/src/components/ui/SInput.vue
index 24b6f0fe..8e5ccb08 100644
--- a/src/components/ui/SInput.vue
+++ b/src/components/ui/SInput.vue
@@ -54,9 +54,9 @@ const sizeClasses = computed(() => {
     if (props.size === "large") return "px-4 py-2.5 text-base";
     return "px-3 py-2 text-sm";
   }
-  if (props.size === "small") return "h-7 px-2 text-xs";
+  if (props.size === "small") return "h-8 px-2 text-xs";
   if (props.size === "large") return "h-10 px-4 text-base";
-  return "h-8.5 px-3 text-sm";
+  return "h-9 px-3 text-sm";
 });
 
 const emit = defineEmits<{
diff --git a/src/components/ui/SMarquee.vue b/src/components/ui/SMarquee.vue
index 8de2c7a9..050b5b18 100644
--- a/src/components/ui/SMarquee.vue
+++ b/src/components/ui/SMarquee.vue
@@ -6,12 +6,15 @@ export interface SMarqueeProps {
   delay?: number;
   /** 两段文本之间的间距（px） */
   gap?: number;
+  /** 收缩适应内容 */
+  fit?: boolean;
 }
 
 const props = withDefaults(defineProps<SMarqueeProps>(), {
   speed: 30,
   delay: 2000,
   gap: 50,
+  fit: false,
 });
 
 const containerRef = ref<HTMLElement>();
@@ -44,7 +47,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div ref="containerRef" class="overflow-hidden w-full">
+  <div ref="containerRef" class="overflow-hidden" :class="fit ? 'max-w-full' : 'w-full'">
     <div
       class="inline-flex whitespace-nowrap min-w-full will-change-transform"
       :class="isOverflowing && 's-marquee-scrolling'"
diff --git a/src/components/ui/STabs.vue b/src/components/ui/STabs.vue
index a1f77eb1..630ee2d4 100644
--- a/src/components/ui/STabs.vue
+++ b/src/components/ui/STabs.vue
@@ -27,12 +27,15 @@ export interface STabsProps {
     | "flex-end";
   /** 是否启用动画 */
   animated?: boolean;
+  /** 圆角胶囊 */
+  round?: boolean;
 }
 
 const props = withDefaults(defineProps<STabsProps>(), {
   type: "bar",
   size: "medium",
   animated: false,
+  round: false,
 });
 
 const emit = defineEmits<{
@@ -64,7 +67,7 @@ const setTabRef = (key: string, el: unknown): void => {
 /** 当前是否有面板内容 */
 const hasContent = computed(() => !!slots[props.modelValue]);
 
-/** 同步高亮条 left/width */
+/** 同步高亮条：用 offset* 对齐 absolute 的 padding-box 基准，避免 border / padding 推算误差 */
 const updateIndicator = (): void => {
   if (!containerRef.value) return;
   const active = tabRefs.value[props.modelValue];
@@ -72,19 +75,25 @@ const updateIndicator = (): void => {
     indicatorStyle.value = {};
     return;
   }
-  const containerRect = containerRef.value.getBoundingClientRect();
-  const activeRect = active.getBoundingClientRect();
   if (props.type === "bar") {
     const barWidth = 24;
-    const center = activeRect.left - containerRect.left + activeRect.width / 2;
+    const center = active.offsetLeft + active.offsetWidth / 2;
     indicatorStyle.value = {
       left: `${center - barWidth / 2}px`,
       width: `${barWidth}px`,
     };
+  } else if (props.type === "segment") {
+    // 整盒覆盖当前 tab，上下/左右间距由 container 的 padding 自动决定，绝对对称
+    indicatorStyle.value = {
+      left: `${active.offsetLeft}px`,
+      top: `${active.offsetTop}px`,
+      width: `${active.offsetWidth}px`,
+      height: `${active.offsetHeight}px`,
+    };
   } else {
     indicatorStyle.value = {
-      left: `${activeRect.left - containerRect.left}px`,
-      width: `${activeRect.width}px`,
+      left: `${active.offsetLeft}px`,
+      width: `${active.offsetWidth}px`,
     };
   }
 };
@@ -154,13 +163,27 @@ onMounted(() => {
   }
 });
 
-/** 尺寸到样式 class 的映射 */
+/** 尺寸到样式 class 的映射（line / bar 用：tab 自带高度） */
 const sizeClasses: Record<string, string> = {
   small: "text-xs h-7 px-2.5",
   medium: "text-sm h-8 px-3",
   large: "text-base h-10 px-3.5",
 };
 
+/** segment 外框总高度，与 SButton / SInput 同套：h-8/h-9/h-10 */
+const segmentOuterHeight: Record<string, string> = {
+  small: "h-8",
+  medium: "h-9",
+  large: "h-10",
+};
+
+/** segment 模式 tab 仅控制字号与水平 padding，高度交给外框 */
+const segmentTabClasses: Record<string, string> = {
+  small: "text-xs px-2.5",
+  medium: "text-sm px-3",
+  large: "text-base px-3.5",
+};
+
 /** 根据切换方向生成过渡 class */
 const panelTransitionClasses = computed(() => {
   const active = "transition-[transform,opacity] duration-240 ease-[cubic-bezier(0.4,0,0.2,1)]";
@@ -188,8 +211,11 @@ const panelTransitionClasses = computed(() => {
     class="relative items-center select-none"
     :style="(type === 'line' || type === 'bar') && justifyContent ? { justifyContent } : undefined"
     :class="[
-      type === 'segment' &&
-        'flex w-full gap-1 p-1 rounded-lg bg-on-surface/5 border border-solid border-outline-variant/15',
+      type === 'segment' && [
+        'flex w-full gap-1 p-0.5 bg-on-surface/3 border border-solid border-on-surface/15',
+        segmentOuterHeight[size],
+        round ? 'rounded-full' : 'rounded-lg',
+      ],
       type === 'line' &&
         (justifyContent ? 'flex w-full pb-1' : 'flex w-full justify-start gap-3 pb-1'),
       type === 'bar' && (justifyContent ? 'flex w-full pb-1' : 'inline-flex shrink-0 gap-3 pb-1'),
@@ -202,7 +228,7 @@ const panelTransitionClasses = computed(() => {
       :class="[
         'absolute pointer-events-none transition-[left,width] duration-320 ease-[cubic-bezier(0.4,0,0.2,1)]',
         type === 'segment'
-          ? 'inset-y-1 bg-primary/25 rounded-md shadow-sm'
+          ? ['bg-primary/12', round ? 'rounded-full' : 'rounded-md']
           : 'bottom-0.5 h-[3px] bg-primary rounded-full',
       ]"
       :style="indicatorStyle"
@@ -217,8 +243,7 @@ const panelTransitionClasses = computed(() => {
       :aria-disabled="tab.disabled ? 'true' : 'false'"
       class="relative z-1 inline-flex items-center justify-center whitespace-nowrap outline-none transition-colors duration-200"
       :class="[
-        type === 'segment' && 'flex-1',
-        sizeClasses[size],
+        type === 'segment' ? ['flex-1 h-full', segmentTabClasses[size]] : sizeClasses[size],
         tab.disabled ? 'opacity-40 cursor-not-allowed' : 'cursor-pointer',
         modelValue === tab.key
           ? {
diff --git a/src/composables/useFavorite.ts b/src/composables/useFavorite.ts
new file mode 100644
index 00000000..6be67ac7
--- /dev/null
+++ b/src/composables/useFavorite.ts
@@ -0,0 +1,73 @@
+import type { Track } from "@shared/types/player";
+import { useLibraryStore } from "@/stores/library";
+import { useUserStore } from "@/stores/user";
+import { toast } from "@/composables/useToast";
+import { useI18n } from "vue-i18n";
+
+/**
+ * 红心收藏的统一入口
+ * 按 track.source 分发
+ * 返回的 `isLiked` 在模板里直接调用即可保持响应式
+ * - local: useLibraryStore.toggleLike
+ * - netease: useUserStore.toggleLike
+ */
+export const useFavorite = () => {
+  const library = useLibraryStore();
+  const user = useUserStore();
+  const { t } = useI18n();
+
+  /**
+   * 当前 Track 是否已收藏
+   * @param track 歌曲
+   * @returns 是否已收藏
+   */
+  const isLiked = (track: Track | null | undefined): boolean => {
+    if (!track) return false;
+    if (track.source === "local") return library.isLiked(track.id);
+    if (track.source === "netease") return user.isLiked(track.id);
+    return false;
+  };
+
+  /**
+   * 是否支持收藏
+   * @param track 歌曲
+   * @returns 是否支持收藏
+   */
+  const isSupported = (track: Track | null | undefined): boolean => {
+    if (!track) return false;
+    if (track.source === "local") return true;
+    if (track.source === "netease") return user.isLoggedIn;
+    return false;
+  };
+
+  /**
+   * 切换收藏
+   * @param track 歌曲
+   * @returns 是否切换成功
+   */
+  const toggle = async (track: Track | null | undefined): Promise<void> => {
+    if (!track) return;
+    if (track.source === "local") {
+      const next = library.toggleLike(track.id);
+      toast.success(t(next ? "liked.toast.added" : "liked.toast.removed"));
+      return;
+    }
+    if (track.source === "netease") {
+      if (!user.isLoggedIn) {
+        toast.warning(t("liked.toast.needLogin"));
+        return;
+      }
+      const wasLiked = user.isLiked(track.id);
+      const ok = await user.toggleLike(track.id);
+      if (!ok) {
+        toast.error(t("liked.toast.failed"));
+        return;
+      }
+      toast.success(t(wasLiked ? "liked.toast.removed" : "liked.toast.added"));
+      return;
+    }
+    toast.warning(t("liked.toast.unsupported"));
+  };
+
+  return { isLiked, isSupported, toggle };
+};
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 2a87237c..b4466628 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -10,6 +10,8 @@
     "loading": "Loading",
     "noData": "No data",
     "noMore": "No more ~",
+    "refresh": "Refresh",
+    "refreshCache": "Refresh cache",
     "success": "Success",
     "error": "Error",
     "playAll": "Play All",
@@ -74,6 +76,7 @@
   "nav": {
     "home": "Home",
     "library": "Library",
+    "liked": "Liked Songs",
     "streaming": "Streaming",
     "settings": "Settings",
     "reload": "Reload",
@@ -209,6 +212,7 @@
   "songList": {
     "title": "Title",
     "album": "Album",
+    "actions": "Actions",
     "size": "Size",
     "duration": "Duration",
     "noResults": "No matching songs",
@@ -272,6 +276,25 @@
     "clearConfirmTitle": "Clear Playlist",
     "clearConfirmContent": "Are you sure you want to clear the entire playlist? This cannot be undone."
   },
+  "liked": {
+    "title": "Liked Songs",
+    "tabs": {
+      "local": "Local",
+      "online": "Online"
+    },
+    "empty": {
+      "local": "No liked local songs yet — click the heart next to a song to add it",
+      "online": "No liked songs on your NetEase account yet"
+    },
+    "needLogin": "Log in to NetEase to view online liked songs",
+    "toast": {
+      "added": "Added to liked",
+      "removed": "Removed from liked",
+      "needLogin": "Please log in to NetEase first",
+      "unsupported": "This source does not support liking",
+      "failed": "Action failed, please try again"
+    }
+  },
   "library": {
     "title": "Library",
     "empty": "Library is empty",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 7b20bf32..0495a08e 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -10,6 +10,8 @@
     "loading": "加载中",
     "noData": "暂无数据",
     "noMore": "没有更多了 ~",
+    "refresh": "刷新",
+    "refreshCache": "刷新缓存",
     "success": "操作成功",
     "error": "操作失败",
     "playAll": "播放全部",
@@ -74,6 +76,7 @@
   "nav": {
     "home": "首页",
     "library": "音乐库",
+    "liked": "我喜欢的音乐",
     "streaming": "流媒体",
     "settings": "设置",
     "reload": "热重载",
@@ -209,6 +212,7 @@
   "songList": {
     "title": "标题",
     "album": "专辑",
+    "actions": "操作",
     "size": "大小",
     "duration": "时长",
     "noResults": "没有匹配的歌曲",
@@ -272,6 +276,25 @@
     "clearConfirmTitle": "清空播放列表",
     "clearConfirmContent": "确认清空全部播放列表吗？此操作不可撤销！"
   },
+  "liked": {
+    "title": "我喜欢的音乐",
+    "tabs": {
+      "local": "本地",
+      "online": "在线"
+    },
+    "empty": {
+      "local": "还没有收藏的本地歌曲，点击歌曲右侧的红心试试",
+      "online": "网易云账号下还没有喜欢的歌曲"
+    },
+    "needLogin": "请先登录网易云账号查看在线喜欢",
+    "toast": {
+      "added": "已添加到喜欢",
+      "removed": "已从喜欢中移除",
+      "needLogin": "请先登录网易云账号",
+      "unsupported": "该来源暂不支持喜欢",
+      "failed": "操作失败，请稍后重试"
+    }
+  },
   "library": {
     "title": "音乐库",
     "empty": "音乐库为空",
diff --git a/src/pages/Liked.vue b/src/pages/Liked.vue
new file mode 100644
index 00000000..bfbc5933
--- /dev/null
+++ b/src/pages/Liked.vue
@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import type { Track } from "@shared/types/player";
+import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
+import { useLibraryStore } from "@/stores/library";
+import { useUserStore } from "@/stores/user";
+import { useStatusStore } from "@/stores/status";
+import SongList from "@/components/list/SongList.vue";
+import * as player from "@/core/player";
+import IconLucideListChecks from "~icons/lucide/list-checks";
+import IconLucideRefreshCw from "~icons/lucide/refresh-cw";
+
+const { t } = useI18n();
+const router = useRouter();
+const library = useLibraryStore();
+const user = useUserStore();
+const status = useStatusStore();
+
+/** 当前 tab */
+const tab = computed({
+  get: () => status.likedPageTab,
+  set: (v: "local" | "online") => (status.likedPageTab = v),
+});
+
+const tabs = computed(() => [
+  { key: "local", label: t("liked.tabs.local") },
+  { key: "online", label: t("liked.tabs.online") },
+]);
+
+const searchQuery = ref("");
+
+/** 本地喜欢列表 */
+const localTracks = computed<Track[]>(() => {
+  const byId = new Map<string, Track>(library.tracks.map((track) => [track.id, track]));
+  const list: Track[] = [];
+  for (const id of library.likedOrderedIds) {
+    const track = byId.get(id);
+    if (track) list.push(track);
+  }
+  return list;
+});
+
+watch(
+  () => [tab.value, user.isLoggedIn, user.likedPlaylistId] as const,
+  ([nextTab, loggedIn, plId]) => {
+    if (nextTab !== "online" || !loggedIn || !plId) return;
+    user.ensureLikedPlaylist();
+  },
+  { immediate: true },
+);
+
+/** 当前 tab 的曲目 */
+const currentTracks = computed<Track[]>(() =>
+  tab.value === "local" ? localTracks.value : user.likedPlaylistTracks,
+);
+
+const handlePlayAll = (): void => {
+  if (currentTracks.value.length === 0) return;
+  player.playFrom(currentTracks.value, 0);
+};
+
+// 直进 /liked（没先访问 Library 页）时本地库未初始化，需要手动触发
+onMounted(() => {
+  if (!library.initialized) library.load();
+});
+
+const goToLogin = (): void => {
+  router.push("/library");
+};
+
+/** SongList 引用：本地 / 在线两个分支共用同一 ref，因为同时只挂载一个 */
+const songListRef = shallowRef<InstanceType<typeof SongList> | null>(null);
+
+/** 更多菜单：刷新仅在线 tab 有意义；批量管理两边都可 */
+const moreMenuItems = computed<DropdownMenuItem[]>(() => {
+  const items: DropdownMenuItem[] = [];
+  if (tab.value === "online") {
+    items.push({
+      key: "refresh",
+      label: t("common.refreshCache"),
+      icon: markRaw(IconLucideRefreshCw),
+    });
+  }
+  items.push({
+    key: "batch",
+    label: t("songList.batch.manage"),
+    icon: markRaw(IconLucideListChecks),
+  });
+  return items;
+});
+
+const handleMoreMenu = (key: string): void => {
+  if (key === "refresh") {
+    user.ensureLikedPlaylist(true);
+  } else if (key === "batch") {
+    songListRef.value?.enterBatch();
+  }
+};
+</script>
+
+<template>
+  <div class="flex flex-col h-full">
+    <!-- 顶栏 -->
+    <div class="shrink-0 px-5 pb-2">
+      <div class="flex items-center justify-between mt-2 mb-4">
+        <div class="flex items-baseline gap-4">
+          <h1 class="text-3xl font-bold text-on-surface">{{ t("liked.title") }}</h1>
+          <span
+            v-if="currentTracks.length > 0"
+            class="text-sm text-on-surface-variant/50 flex items-center gap-1"
+          >
+            <IconLucideMusic class="size-3.5" />
+            {{ t("common.totalSongs", { count: currentTracks.length }) }}
+          </span>
+        </div>
+      </div>
+      <div class="flex items-center justify-between gap-4">
+        <div class="flex items-center gap-3">
+          <SButton
+            type="primary"
+            variant="secondary"
+            round
+            :disabled="currentTracks.length === 0"
+            @click="handlePlayAll"
+          >
+            <template #icon>
+              <IconLucidePlay />
+            </template>
+            {{ t("common.playAll") }}
+          </SButton>
+          <SDropdownMenu :items="moreMenuItems" align="start" @select="handleMoreMenu">
+            <template #trigger>
+              <SButton variant="secondary" circle>
+                <template #icon>
+                  <IconLucideEllipsis />
+                </template>
+              </SButton>
+            </template>
+          </SDropdownMenu>
+        </div>
+        <div class="flex items-center gap-3">
+          <SInput
+            v-model="searchQuery"
+            :placeholder="t('common.search')"
+            clearable
+            round
+            class="w-40 focus-within:w-56"
+          >
+            <template #prefix>
+              <IconLucideSearch class="size-4 text-on-surface-variant/40 shrink-0" />
+            </template>
+          </SInput>
+          <div class="w-48">
+            <STabs v-model="tab" :tabs="tabs" type="segment" round />
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 列表 -->
+    <Transition name="fade" mode="out-in" :duration="150">
+      <!-- 本地 tab -->
+      <div v-if="tab === 'local' && localTracks.length > 0" key="local-list" class="flex-1 min-h-0">
+        <SongList
+          ref="songListRef"
+          :items="localTracks"
+          :search-query="searchQuery"
+          :show-size="false"
+          source="local"
+          enable-sort
+        />
+      </div>
+      <div
+        v-else-if="tab === 'local'"
+        key="local-empty"
+        class="flex-1 flex items-center justify-center"
+      >
+        <div class="text-center text-on-surface-variant/50">
+          <IconMaterialSymbolsFavoriteOutlineRounded class="size-12 mx-auto mb-3 opacity-30" />
+          <div class="text-sm">{{ t("liked.empty.local") }}</div>
+        </div>
+      </div>
+      <!-- 在线 tab -->
+      <div
+        v-else-if="tab === 'online' && !user.isLoggedIn"
+        key="online-login"
+        class="flex-1 flex items-center justify-center"
+      >
+        <div class="text-center text-on-surface-variant/50">
+          <IconMaterialSymbolsFavoriteOutlineRounded class="size-12 mx-auto mb-3 opacity-30" />
+          <div class="text-sm mb-4">{{ t("liked.needLogin") }}</div>
+          <SButton type="primary" variant="secondary" @click="goToLogin">
+            {{ t("login.netease") }}
+          </SButton>
+        </div>
+      </div>
+      <div
+        v-else-if="tab === 'online' && user.likedPlaylistTracks.length > 0"
+        key="online-list"
+        class="flex-1 min-h-0"
+      >
+        <SongList
+          ref="songListRef"
+          :items="user.likedPlaylistTracks"
+          :search-query="searchQuery"
+          source="netease"
+          :collection-id="user.likedPlaylistId ?? undefined"
+          collection-type="playlist"
+          enable-sort
+        />
+      </div>
+      <div
+        v-else-if="tab === 'online' && user.likedPlaylistLoading"
+        key="online-loading"
+        class="flex-1 flex items-center justify-center"
+      >
+        <div class="text-center text-on-surface-variant/60">
+          <SLoading class="text-4xl text-primary/70 mb-4 mx-auto block" />
+          <div class="text-sm">{{ t("common.loading") }}</div>
+        </div>
+      </div>
+      <div v-else key="online-empty" class="flex-1 flex items-center justify-center">
+        <div class="text-center text-on-surface-variant/50">
+          <IconMaterialSymbolsFavoriteOutlineRounded class="size-12 mx-auto mb-3 opacity-30" />
+          <div class="text-sm">{{ t("liked.empty.online") }}</div>
+        </div>
+      </div>
+    </Transition>
+  </div>
+</template>
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index d205793e..1e2424c8 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -180,27 +180,19 @@ const isEmptyResult = computed(() => {
           <span class="text-3xl font-bold text-on-surface">
             {{ keyword || t("search.title") }}
           </span>
-          <span v-if="keyword" class="ml-2 text-lg text-on-surface-variant/60">
+          <span v-if="keyword" class="ml-2 font-medium text-lg text-on-surface-variant/60">
             {{ t("search.titleSuffix") }}
           </span>
         </h1>
-        <!-- 平台切换：胶囊 segment -->
-        <div
-          class="shrink-0 inline-flex items-center gap-0.5 p-1 rounded-full bg-on-surface/5 border border-solid border-outline-variant/20"
-        >
-          <SButton
-            v-for="p in platformTabs"
-            :key="p.key"
-            :variant="status.searchPlatform === p.key ? 'secondary' : 'ghost'"
-            :type="status.searchPlatform === p.key ? 'primary' : 'default'"
-            size="small"
+        <!-- 平台切换 -->
+        <div class="shrink-0 w-40">
+          <STabs
+            :model-value="status.searchPlatform"
+            :tabs="platformTabs"
+            type="segment"
             round
-            strong
-            ripple
-            @click="onPlatformSwitch(p.key)"
-          >
-            {{ p.label }}
-          </SButton>
+            @update:model-value="onPlatformSwitch"
+          />
         </div>
       </div>
       <STabs :model-value="activeTab" :tabs="tabs" @update:model-value="onTabSwitch" />
diff --git a/src/router/index.ts b/src/router/index.ts
index aedcb32f..796e85bc 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -17,6 +17,11 @@ const router = createRouter({
           name: "library",
           component: () => import("@/pages/Library.vue"),
         },
+        {
+          path: "liked",
+          name: "liked",
+          component: () => import("@/pages/Liked.vue"),
+        },
         {
           path: "collection/:source/:type/:id",
           name: "collection",
diff --git a/src/stores/library.ts b/src/stores/library.ts
index 316c3f99..d15816e3 100644
--- a/src/stores/library.ts
+++ b/src/stores/library.ts
@@ -7,6 +7,9 @@ import { buildFolderTree, countFolders } from "@/utils/folderTree";
 
 const trackDb = localforage.createInstance({ name: "splayer", storeName: "library" });
 
+/** 本地喜欢 id 在 trackDb 内的持久化 key */
+const LIKED_IDS_KEY = "liked-ids";
+
 export const useLibraryStore = defineStore("library", () => {
   /** 曲目列表 */
   const tracks = shallowRef<Track[]>([]);
@@ -20,6 +23,37 @@ export const useLibraryStore = defineStore("library", () => {
   const initialized = ref(false);
   /** 歌手头像缓存 */
   const artistAvatars = shallowRef<Record<string, string>>({});
+  /** 本地红心 id */
+  const likedOrderedIds = shallowRef<string[]>([]);
+  /** 本地红心 id 集合 */
+  const likedIdSet = shallowRef<Set<string>>(new Set());
+
+  /** 持久化喜欢列表 */
+  const persistLiked = (): void => {
+    trackDb.setItem(LIKED_IDS_KEY, [...likedOrderedIds.value]).catch(() => {});
+  };
+
+  /** 是否已收藏 */
+  const isLiked = (trackId: string): boolean => likedIdSet.value.has(trackId);
+
+  /**
+   * 切换收藏
+   * @param trackId 歌曲 id
+   */
+  const toggleLike = (trackId: string): boolean => {
+    if (!trackId) return false;
+    const next = new Set(likedIdSet.value);
+    if (next.has(trackId)) {
+      next.delete(trackId);
+      likedOrderedIds.value = likedOrderedIds.value.filter((id) => id !== trackId);
+    } else {
+      next.add(trackId);
+      likedOrderedIds.value = [trackId, ...likedOrderedIds.value];
+    }
+    likedIdSet.value = next;
+    persistLiked();
+    return next.has(trackId);
+  };
 
   /** 标准化歌手名 */
   const normalizeArtistName = (name: string): string => name.trim().toLowerCase();
@@ -72,8 +106,15 @@ export const useLibraryStore = defineStore("library", () => {
   /** 加载曲目和目录列表 */
   const load = async (): Promise<void> => {
     // 先从 IndexedDB 读缓存，立即渲染
-    const cached = await trackDb.getItem<Track[]>("tracks").catch(() => null);
+    const [cached, likedCached] = await Promise.all([
+      trackDb.getItem<Track[]>("tracks").catch(() => null),
+      trackDb.getItem<string[]>(LIKED_IDS_KEY).catch(() => null),
+    ]);
     if (cached?.length) tracks.value = cached;
+    if (Array.isArray(likedCached)) {
+      likedOrderedIds.value = likedCached;
+      likedIdSet.value = new Set(likedCached);
+    }
     // 拿最新数据并回写缓存
     const [tracksRes, dirsRes] = await Promise.all([
       window.api.library.getTracks(),
@@ -177,11 +218,22 @@ export const useLibraryStore = defineStore("library", () => {
   const deleteTracks = async (paths: string[]): Promise<{ deleted: number; failed: number }> => {
     const res = await window.api.library.deleteTracks(paths);
     if (res.success) {
-      // 从本地列表中移除已删除的曲目
+      // 找出被删歌曲的 id，用于裁喜欢
       const pathSet = new Set(paths);
+      const deletedIds = new Set(
+        tracks.value.filter((t) => t.path && pathSet.has(t.path)).map((t) => t.id),
+      );
+      // 从本地列表中移除已删除的曲目
       const remaining = tracks.value.filter((t) => !t.path || !pathSet.has(t.path));
       tracks.value = remaining;
       cacheTracks(remaining);
+      // 同步剪掉失效的喜欢 id
+      if (deletedIds.size > 0 && likedOrderedIds.value.some((id) => deletedIds.has(id))) {
+        const filtered = likedOrderedIds.value.filter((id) => !deletedIds.has(id));
+        likedOrderedIds.value = filtered;
+        likedIdSet.value = new Set(filtered);
+        persistLiked();
+      }
       return res.data ?? { deleted: 0, failed: paths.length };
     }
     return { deleted: 0, failed: paths.length };
@@ -273,6 +325,10 @@ export const useLibraryStore = defineStore("library", () => {
     scanProgress,
     initialized,
     artistAvatars,
+    likedOrderedIds,
+    likedIdSet,
+    isLiked,
+    toggleLike,
     load,
     startScan,
     cancelScan,
diff --git a/src/stores/status.ts b/src/stores/status.ts
index 120d2a51..443fc763 100644
--- a/src/stores/status.ts
+++ b/src/stores/status.ts
@@ -60,6 +60,8 @@ export const useStatusStore = defineStore(
     const searchPlatform = ref<Platform>("netease");
     /** 侧栏「我的歌单」当前展示来源 */
     const myPlaylistSource = ref<"local" | "online">("local");
+    /** 「我喜欢的音乐」页当前 tab */
+    const likedPageTab = ref<"local" | "online">("local");
     /** 是否正在播放 */
     const isPlaying = computed(() => state.value === "playing");
     /** 是否暂停 */
@@ -102,6 +104,7 @@ export const useStatusStore = defineStore(
       lyricOffsetMs,
       searchPlatform,
       myPlaylistSource,
+      likedPageTab,
       currentTrack,
     };
   },
@@ -116,6 +119,7 @@ export const useStatusStore = defineStore(
         "position",
         "searchPlatform",
         "myPlaylistSource",
+        "likedPageTab",
       ],
     },
   },
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 2e2cd44b..59de125d 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -1,4 +1,5 @@
-import type { Album, Artist, Playlist } from "@shared/types/player";
+import localforage from "localforage";
+import type { Album, Artist, Playlist, Track } from "@shared/types/player";
 import type { UserProfile, UserSubcount } from "@/types/user";
 import { clearNeteaseSession } from "@/apis/netease";
 import {
@@ -8,6 +9,7 @@ import {
 } from "@/apis/login/netease";
 import {
   fetchLikelist,
+  fetchPlaylist,
   fetchSubcount,
   fetchUserAlbums,
   fetchUserArtists,
@@ -19,11 +21,27 @@ import {
 /** 登录 cookie 保活间隔 */
 const REFRESH_INTERVAL_MS = 24 * 60 * 60 * 1000;
 
-const emptySubcount = (): UserSubcount => ({
+/** 用户数据持久化键 */
+/** 「我喜欢的音乐」歌单曲目 */
+const LIKED_PLAYLIST_CACHE_KEY = "liked-playlist";
+/** 用户红心 id 列表 */
+const LIKED_SONG_IDS_CACHE_KEY = "liked-song-ids";
+/** 用户歌单元数据列表 */
+const PLAYLISTS_CACHE_KEY = "playlists";
+
+interface LikedPlaylistCache {
+  playlistId: string;
+  tracks: Track[];
+  cachedAt: number;
+}
+
+const cacheDb = localforage.createInstance({ name: "splayer", storeName: "user-cache" });
+
+const EMPTY_SUBCOUNT: UserSubcount = {
   createdPlaylistCount: 0,
   subPlaylistCount: 0,
   artistCount: 0,
-});
+};
 
 export const useUserStore = defineStore(
   "user",
@@ -34,10 +52,9 @@ export const useUserStore = defineStore(
     const lastRefreshAt = ref<number>(0);
     /** 是否已登录 */
     const isLoggedIn = computed(() => profile.value !== null);
-
-    /** 全部歌单（创建+收藏；首条恒为「我喜欢的音乐」） */
+    /** 全部歌单 */
     const playlists = shallowRef<Playlist[]>([]);
-    /** 红心歌曲 id 集合（Set 用于 O(1) 判定） */
+    /** 红心歌曲 id 集合 */
     const likedSongIds = ref<Set<string>>(new Set());
     /** 收藏专辑 */
     const albums = shallowRef<Album[]>([]);
@@ -46,17 +63,25 @@ export const useUserStore = defineStore(
     /** 用户等级 */
     const level = ref<number | undefined>(undefined);
     /** 订阅计数 */
-    const subcount = ref<UserSubcount>(emptySubcount());
+    const subcount = ref<UserSubcount>(EMPTY_SUBCOUNT);
     /** 内容拉取最近时间（ms） */
     const lastFetchedAt = ref<number>(0);
     /** 是否在拉内容 */
     const contentLoading = ref(false);
+    /** 「我喜欢的音乐」歌单 */
+    const likedPlaylistTracks = shallowRef<Track[]>([]);
+    /** 是否在拉取歌单曲目 */
+    const likedPlaylistLoading = ref(false);
+    /** 当前 tracks 关联的 playlistId */
+    let currentLikedPlaylistId: string | null = null;
+    /** 进行中的拉取 */
+    let likedPlaylistAbort: AbortController | null = null;
 
-    /** 「我喜欢的音乐」歌单 id（数组首条） */
+    /** 「我喜欢的音乐」歌单 id */
     const likedPlaylistId = computed<string | null>(() => playlists.value[0]?.id ?? null);
 
     /**
-     * 自建歌单（含我喜欢；按 createdPlaylistCount 切分）
+     * 自建歌单
      * NCM /user/playlist 返回数组前 createdPlaylistCount 条为自建，其后为收藏
      */
     const createdPlaylists = computed<Playlist[]>(() => {
@@ -81,27 +106,112 @@ export const useUserStore = defineStore(
       albums.value = [];
       artists.value = [];
       level.value = undefined;
-      subcount.value = emptySubcount();
+      subcount.value = EMPTY_SUBCOUNT;
       lastFetchedAt.value = 0;
+      likedPlaylistAbort?.abort();
+      likedPlaylistTracks.value = [];
+      likedPlaylistLoading.value = false;
+      currentLikedPlaylistId = null;
+    };
+
+    /** 从缓存填充喜欢歌单 */
+    const hydrateLikedPlaylistFromCache = async (playlistId: string): Promise<void> => {
+      try {
+        const cached = await cacheDb.getItem<LikedPlaylistCache>(LIKED_PLAYLIST_CACHE_KEY);
+        if (cached && cached.playlistId === playlistId && cached.tracks.length > 0) {
+          likedPlaylistTracks.value = cached.tracks;
+        }
+      } catch {
+        console.error("[user] hydrate liked playlist from cache failed");
+      }
+    };
+
+    /** 拉取最新喜欢歌单曲目 */
+    const refreshLikedPlaylist = async (playlistId: string): Promise<void> => {
+      likedPlaylistAbort?.abort();
+      const controller = new AbortController();
+      likedPlaylistAbort = controller;
+      if (likedPlaylistTracks.value.length === 0) likedPlaylistLoading.value = true;
+      try {
+        const accumulated: Track[] = [];
+        await fetchPlaylist(playlistId, {
+          signal: controller.signal,
+          fresh: true,
+          onBatch: (batch) => {
+            if (controller.signal.aborted) return;
+            accumulated.push(...batch);
+            likedPlaylistTracks.value = [...accumulated];
+          },
+        });
+        if (controller.signal.aborted) return;
+        if (accumulated.length > 0) {
+          const payload: LikedPlaylistCache = {
+            playlistId,
+            tracks: accumulated.map((track) => ({ ...track })),
+            cachedAt: Date.now(),
+          };
+          cacheDb.setItem(LIKED_PLAYLIST_CACHE_KEY, payload).catch(() => {});
+        }
+      } finally {
+        if (!controller.signal.aborted) likedPlaylistLoading.value = false;
+      }
+    };
+
+    /**
+     * 确保「我喜欢的音乐」曲目已就绪
+     * - 首次访问该歌单：缓存即时上屏 + 网络刷新
+     * - 再次访问：仅当 likedSongIds 数量与已加载曲目数量不一致时才刷新（外部增删过 → 数据脏）
+     * @param force true 强制走网络刷新（用户手动点刷新时用）
+     */
+    const ensureLikedPlaylist = async (force = false): Promise<void> => {
+      const playlistId = likedPlaylistId.value;
+      if (!playlistId) return;
+      if (currentLikedPlaylistId !== playlistId) {
+        currentLikedPlaylistId = playlistId;
+        likedPlaylistTracks.value = [];
+        await hydrateLikedPlaylistFromCache(playlistId);
+        refreshLikedPlaylist(playlistId);
+        return;
+      }
+      if (force || likedSongIds.value.size !== likedPlaylistTracks.value.length) {
+        refreshLikedPlaylist(playlistId);
+      }
+    };
+
+    /** 从缓存恢复轻量内容 */
+    const hydrateContentFromCache = async (): Promise<void> => {
+      try {
+        const [cachedIds, cachedPlaylists] = await Promise.all([
+          cacheDb.getItem<string[]>(LIKED_SONG_IDS_CACHE_KEY),
+          cacheDb.getItem<Playlist[]>(PLAYLISTS_CACHE_KEY),
+        ]);
+        if (Array.isArray(cachedIds) && cachedIds.length > 0) {
+          likedSongIds.value = new Set(cachedIds);
+        }
+        if (Array.isArray(cachedPlaylists) && cachedPlaylists.length > 0) {
+          playlists.value = cachedPlaylists;
+        }
+      } catch {
+        console.error("[user] hydrate content from cache failed");
+      }
     };
 
     /**
-     * 全量拉取用户内容（歌单 + 喜欢 id + 收藏专辑/歌手 + 计数）
+     * 全量拉取用户内容
      * 并行发起，失败的子任务不会阻塞其他类目
      */
     const loadContent = async (uid: number): Promise<void> => {
       if (!uid) return;
       contentLoading.value = true;
+      // 缓存即时上屏，不阻塞后续网络
+      await hydrateContentFromCache();
       try {
         const sub = await fetchSubcount().catch((err) => {
           console.warn("[user] subcount failed:", err);
-          return emptySubcount();
+          return EMPTY_SUBCOUNT;
         });
         subcount.value = sub;
-
-        // 用 subcount 推算歌单 limit，避免一次请求带回上千条
         const playlistTotal = (sub.createdPlaylistCount || 0) + (sub.subPlaylistCount || 0) || 50;
-
         const settled = await Promise.allSettled([
           fetchUserPlaylists(uid, playlistTotal),
           fetchLikelist(uid),
@@ -109,10 +219,16 @@ export const useUserStore = defineStore(
           fetchUserArtists(),
           fetchUserLevel(),
         ]);
-
+        /** 拉取结果 */
         const [plRes, likeRes, albumRes, artistRes, levelRes] = settled;
-        if (plRes.status === "fulfilled") playlists.value = plRes.value;
-        if (likeRes.status === "fulfilled") likedSongIds.value = new Set(likeRes.value);
+        if (plRes.status === "fulfilled") {
+          playlists.value = plRes.value;
+          cacheDb.setItem(PLAYLISTS_CACHE_KEY, plRes.value).catch(() => {});
+        }
+        if (likeRes.status === "fulfilled") {
+          likedSongIds.value = new Set(likeRes.value);
+          cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, likeRes.value).catch(() => {});
+        }
         if (albumRes.status === "fulfilled") albums.value = albumRes.value;
         if (artistRes.status === "fulfilled") artists.value = artistRes.value;
         if (levelRes.status === "fulfilled") level.value = levelRes.value;
@@ -126,7 +242,10 @@ export const useUserStore = defineStore(
       }
     };
 
-    /** 切换红心，乐观更新，失败回滚 */
+    /**
+     * 切换红心状态
+     * @param trackId - 曲目全局 id
+     */
     const toggleLike = async (trackId: string): Promise<boolean> => {
       const wasLiked = likedSongIds.value.has(trackId);
       const next = new Set(likedSongIds.value);
@@ -136,6 +255,7 @@ export const useUserStore = defineStore(
       try {
         const ok = await toggleLikeSong(trackId, !wasLiked);
         if (!ok) throw new Error("like api returned non-200");
+        cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, [...next]).catch(() => {});
         return true;
       } catch (err) {
         const rollback = new Set(likedSongIds.value);
@@ -147,7 +267,7 @@ export const useUserStore = defineStore(
       }
     };
 
-    /** uid 变更 → 拉取/清空用户内容 */
+    /** 同步用户内容 */
     const syncContent = (uid: number | undefined): void => {
       if (uid) void loadContent(uid);
       else clearContent();
@@ -160,7 +280,7 @@ export const useUserStore = defineStore(
       syncContent(newProfile?.userId);
     };
 
-    /** 后台续期 cookie，失败静默 */
+    /** 续期 cookie */
     const refresh = async (): Promise<void> => {
       try {
         await refreshLoginApi();
@@ -168,7 +288,7 @@ export const useUserStore = defineStore(
       } catch {}
     };
 
-    /** 校验 cookie 并同步最新 profile + 用户内容 */
+    /** 校验 cookie 并同步最新 profile 与用户内容 */
     const fetchStatus = async (): Promise<boolean> => {
       try {
         const latest = await fetchLoginStatus();
@@ -190,12 +310,12 @@ export const useUserStore = defineStore(
       }
     };
 
-    /** 登出：服务端清会话 + 主进程清 cookie + 本地清 profile 与内容 */
+    /** 登出 */
     const logout = async (): Promise<void> => {
       try {
         await logoutNetease();
       } catch {
-        /* 服务端登出失败仍要清本地 */
+        console.error("[user] logout failed");
       }
       await clearNeteaseSession();
       profile.value = null;
@@ -220,11 +340,14 @@ export const useUserStore = defineStore(
       lastFetchedAt,
       contentLoading,
       likedPlaylistId,
+      likedPlaylistTracks,
+      likedPlaylistLoading,
       createdPlaylists,
       subscribedPlaylists,
       isLiked,
       loadContent,
       toggleLike,
+      ensureLikedPlaylist,
       clearContent,
     };
   },

From ecc291b1a8f9d8f17025e5859b9a05020b6c8562 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Mon, 18 May 2026 16:33:57 +0800
Subject: [PATCH 16/33] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/SideBar.vue |   3 +
 src/components/list/SongList.vue  |  38 ++++----
 src/composables/useTrackMenu.ts   |  15 ++--
 src/core/player/index.ts          |   9 +-
 src/i18n/locales/en-US.json       |   8 ++
 src/i18n/locales/zh-CN.json       |   8 ++
 src/pages/History.vue             | 142 ++++++++++++++++++++++++++++++
 src/router/index.ts               |   5 ++
 src/stores/history.ts             |  89 +++++++++++++++++++
 9 files changed, 289 insertions(+), 28 deletions(-)
 create mode 100644 src/pages/History.vue
 create mode 100644 src/stores/history.ts

diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 5776b376..67b55307 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -14,6 +14,7 @@ import IconLucideFolder from "~icons/lucide/folder";
 import IconLucideServer from "~icons/lucide/server";
 import IconLucideListMusic from "~icons/lucide/list-music";
 import IconMaterialSymbolsFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
+import IconLucideHistory from "~icons/lucide/history";
 import IconLucidePlus from "~icons/lucide/plus";
 import IconLucideChevronDown from "~icons/lucide/chevron-down";
 import SButton from "@/components/ui/SButton.vue";
@@ -117,6 +118,7 @@ const menuItems = computed<SMenuItem[]>(() => [
   { key: "/artists/local", label: t("artist.label"), icon: markRaw(IconLucideUser) },
   { key: "/albums/local", label: t("album.label"), icon: markRaw(IconLucideDisc3) },
   { key: "/folders", label: t("folder.label"), icon: markRaw(IconLucideFolder) },
+  // 个人歌曲
   { key: "divider-personal", type: "divider" },
   { key: "/liked", label: t("nav.liked"), icon: markRaw(IconMaterialSymbolsFavoriteOutline) },
   ...(systemSettings.streaming.enabled
@@ -124,6 +126,7 @@ const menuItems = computed<SMenuItem[]>(() => [
         { key: "/streaming", label: t("nav.streaming"), icon: markRaw(IconLucideServer) },
       ] satisfies SMenuItem[])
     : []),
+  { key: "/history", label: t("nav.history"), icon: markRaw(IconLucideHistory) },
   // 我的歌单
   { key: "divider-playlist", type: "divider" },
   { key: "my-playlist-group", type: "group", render: renderMyHeader },
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index ffb3222e..8720f8b5 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -86,19 +86,28 @@ const textCollator = new Intl.Collator(undefined, {
 /** 当前播放歌曲 ID */
 const playingId = computed(() => media.track?.id);
 
-/** 非本地源需要真实 id */
-const needsRealId = computed(() => props.source !== undefined && props.source !== "local");
-
-/** 专辑是否可跳转 */
+/** 专辑是否可跳转：本地不要求 id，其他源需要 album.id */
 const isAlbumLinkable = (item: Track): boolean => {
   if (!item.album?.name) return false;
-  return needsRealId.value ? !!item.album.id : true;
+  return item.source === "local" || !!item.album.id;
 };
 
-/** 歌手是否可跳转 */
-const isArtistLinkable = (artist: Artist): boolean => {
+/** 歌手是否可跳转：本地不要求 id，其他源需要 artist.id */
+const isArtistLinkable = (item: Track, artist: Artist): boolean => {
   if (!artist.name) return false;
-  return needsRealId.value ? !!artist.id : true;
+  return item.source === "local" || !!artist.id;
+};
+
+/** 跳转到歌手页 */
+const goArtist = (item: Track, artist: Artist): void => {
+  if (!isArtistLinkable(item, artist)) return;
+  navigateToArtist(artist.name, { source: item.source, artistId: artist.id });
+};
+
+/** 跳转到专辑页 */
+const goAlbum = (item: Track): void => {
+  if (!isAlbumLinkable(item)) return;
+  navigateToAlbum(item.album?.name, { source: item.source, albumId: item.album?.id });
 };
 
 /** 排序字段 */
@@ -198,7 +207,6 @@ const { deleteConfirmOpen, deleteDialogTitle, deleteDialogContent } = batch;
 /** 右键菜单 */
 const contextTrack = shallowRef<Track | undefined>();
 const { items: contextMenuItems, handleSelect: onContextMenu } = useTrackMenu(contextTrack, {
-  source: props.source,
   collectionType: props.collectionType,
   onRemove: (track) => batch.requestDelete([track], "remove"),
   onDeleteFile: (track) => batch.requestDelete([track], "file"),
@@ -513,14 +521,11 @@ defineExpose({
                         <span
                           class="transition-opacity"
                           :class="
-                            isArtistLinkable(artist)
+                            isArtistLinkable(item, artist)
                               ? 'cursor-pointer hover:opacity-70'
                               : 'opacity-50'
                           "
-                          @click.stop="
-                            isArtistLinkable(artist) &&
-                            navigateToArtist(artist.name, { source, artistId: artist.id })
-                          "
+                          @click.stop="goArtist(item, artist)"
                         >
                           {{ artist.name }}
                         </span>
@@ -541,10 +546,7 @@ defineExpose({
                   playingId === item.id ? 'text-primary/70' : 'text-on-surface',
                   isAlbumLinkable(item) ? 'cursor-pointer hover:opacity-70' : 'opacity-50',
                 ]"
-                @click.stop="
-                  isAlbumLinkable(item) &&
-                  navigateToAlbum(item.album?.name, { source, albumId: item.album?.id })
-                "
+                @click.stop="goAlbum(item)"
               >
                 {{ item.album?.name || t("collection.unknownAlbum") }}
               </div>
diff --git a/src/composables/useTrackMenu.ts b/src/composables/useTrackMenu.ts
index 1e11666f..acab189a 100644
--- a/src/composables/useTrackMenu.ts
+++ b/src/composables/useTrackMenu.ts
@@ -1,5 +1,5 @@
 import type { Ref } from "vue";
-import type { Track, TrackSource } from "@shared/types/player";
+import type { Track } from "@shared/types/player";
 import type { CollectionType } from "@/types/collection";
 import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
 import { usePlaylistStore } from "@/stores/playlist";
@@ -15,8 +15,6 @@ import IconTrash2 from "~icons/lucide/trash-2";
 import IconListMinus from "~icons/lucide/list-minus";
 
 export interface TrackMenuOptions {
-  /** 列表来源 */
-  source?: TrackSource;
   /** 集合类型（仅 playlist 启用"从XX移除"） */
   collectionType?: CollectionType;
   /** 从集合移除回调 */
@@ -34,8 +32,9 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
   const { t } = useI18n();
   const playlistStore = usePlaylistStore();
 
-  // 状态判断
-  const isLocal = options.source === "local";
+  // 本地操作（资源管理器 / 复制路径 / 删除文件）按右键的那首歌判断；
+  // playlist 是列表语境，沿用集合级
+  const isLocal = computed(() => track.value?.source === "local");
   const isPlaylist = options.collectionType === "playlist";
 
   // 菜单项
@@ -70,13 +69,13 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
       label: t("songList.context.showInExplorer"),
       icon: markRaw(IconFolderOpen),
       separator: true,
-      show: isLocal,
+      show: isLocal.value,
     },
     {
       key: "copyPath",
       label: t("songList.context.copyPath"),
       icon: markRaw(IconCopy),
-      show: isLocal,
+      show: isLocal.value,
     },
     {
       key: "removeFromCollection",
@@ -90,7 +89,7 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
       label: t("songList.context.deleteFile"),
       icon: markRaw(IconTrash2),
       separator: !isPlaylist,
-      show: isLocal,
+      show: isLocal.value,
     },
   ]);
 
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index 090bf36a..79e18c90 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -6,6 +6,7 @@ import { useSettingsStore } from "@/stores/settings";
 import { useStatusStore } from "@/stores/status";
 import { useStreamingStore } from "@/stores/streaming";
 import { usePluginsStore } from "@/stores/plugins";
+import { useHistoryStore } from "@/stores/history";
 import * as queue from "@/stores/queue";
 import * as playback from "@/services/playback";
 import * as lyricLoader from "@/services/lyricLoader";
@@ -154,8 +155,12 @@ const loadTrack = async (track: Track | null): Promise<void> => {
     // 引擎失败且属单曲级错误才跳
     if (!result.ok && result.error && isSkippableError(result.error)) {
       shouldSkip = true;
-    } else if (result.ok && resolved.cacheRequest) {
-      cacheScheduler.schedule(track.id, resolved.cacheRequest);
+    } else if (result.ok) {
+      // 用户主动触发的成功播放记入历史；initPlayer 的恢复路径走 load() 不经此处
+      useHistoryStore().record(track);
+      if (resolved.cacheRequest) {
+        cacheScheduler.schedule(track.id, resolved.cacheRequest);
+      }
     }
   }
   if (shouldSkip) await skipOnFailure(myToken, () => trackToken);
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index b4466628..281697aa 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -77,6 +77,7 @@
     "home": "Home",
     "library": "Library",
     "liked": "Liked Songs",
+    "history": "Play History",
     "streaming": "Streaming",
     "settings": "Settings",
     "reload": "Reload",
@@ -295,6 +296,13 @@
       "failed": "Action failed, please try again"
     }
   },
+  "history": {
+    "title": "Play History",
+    "empty": "No playback history yet — play something to get started",
+    "clear": "Clear history",
+    "clearConfirmTitle": "Clear Play History",
+    "clearConfirmContent": "Clear all play history? This cannot be undone."
+  },
   "library": {
     "title": "Library",
     "empty": "Library is empty",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 0495a08e..953d4ae4 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -77,6 +77,7 @@
     "home": "首页",
     "library": "音乐库",
     "liked": "我喜欢的音乐",
+    "history": "播放历史",
     "streaming": "流媒体",
     "settings": "设置",
     "reload": "热重载",
@@ -295,6 +296,13 @@
       "failed": "操作失败，请稍后重试"
     }
   },
+  "history": {
+    "title": "播放历史",
+    "empty": "还没有播放记录，先去随便听点什么吧",
+    "clear": "清空历史",
+    "clearConfirmTitle": "清空播放历史",
+    "clearConfirmContent": "确认清空全部播放历史吗？此操作不可撤销！"
+  },
   "library": {
     "title": "音乐库",
     "empty": "音乐库为空",
diff --git a/src/pages/History.vue b/src/pages/History.vue
new file mode 100644
index 00000000..c654c05e
--- /dev/null
+++ b/src/pages/History.vue
@@ -0,0 +1,142 @@
+<script setup lang="ts">
+import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
+import { useHistoryStore } from "@/stores/history";
+import SongList from "@/components/list/SongList.vue";
+import * as player from "@/core/player";
+import IconLucideListChecks from "~icons/lucide/list-checks";
+import IconLucideTrash2 from "~icons/lucide/trash-2";
+
+const { t } = useI18n();
+const history = useHistoryStore();
+
+const searchQuery = ref("");
+
+const handlePlayAll = (): void => {
+  if (history.tracks.length === 0) return;
+  player.playFrom(history.tracks, 0);
+};
+
+const songListRef = shallowRef<InstanceType<typeof SongList> | null>(null);
+
+const clearConfirmOpen = ref(false);
+
+/** 更多菜单 */
+const moreMenuItems = computed<DropdownMenuItem[]>(() => [
+  {
+    key: "batch",
+    label: t("songList.batch.manage"),
+    icon: markRaw(IconLucideListChecks),
+  },
+  {
+    key: "clear",
+    label: t("history.clear"),
+    icon: markRaw(IconLucideTrash2),
+    separator: true,
+  },
+]);
+
+const handleMoreMenu = (key: string): void => {
+  if (key === "batch") {
+    songListRef.value?.enterBatch();
+  } else if (key === "clear") {
+    clearConfirmOpen.value = true;
+  }
+};
+
+const handleClear = (): void => {
+  history.clear();
+  clearConfirmOpen.value = false;
+};
+
+onMounted(() => {
+  history.load();
+});
+</script>
+
+<template>
+  <div class="flex flex-col h-full">
+    <!-- 顶栏 -->
+    <div class="shrink-0 px-5 pb-2">
+      <div class="flex items-center justify-between mt-2 mb-4">
+        <div class="flex items-baseline gap-4">
+          <h1 class="text-3xl font-bold text-on-surface">{{ t("history.title") }}</h1>
+          <span
+            v-if="history.tracks.length > 0"
+            class="text-sm text-on-surface-variant/50 flex items-center gap-1"
+          >
+            <IconLucideMusic class="size-3.5" />
+            {{ t("common.totalSongs", { count: history.tracks.length }) }}
+          </span>
+        </div>
+      </div>
+      <div class="flex items-center justify-between gap-4">
+        <div class="flex items-center gap-3">
+          <SButton
+            type="primary"
+            variant="secondary"
+            round
+            :disabled="history.tracks.length === 0"
+            @click="handlePlayAll"
+          >
+            <template #icon>
+              <IconLucidePlay />
+            </template>
+            {{ t("common.playAll") }}
+          </SButton>
+          <SDropdownMenu :items="moreMenuItems" align="start" @select="handleMoreMenu">
+            <template #trigger>
+              <SButton variant="secondary" circle :disabled="history.tracks.length === 0">
+                <template #icon>
+                  <IconLucideEllipsis />
+                </template>
+              </SButton>
+            </template>
+          </SDropdownMenu>
+        </div>
+        <div class="flex items-center gap-3">
+          <SInput
+            v-model="searchQuery"
+            :placeholder="t('common.search')"
+            clearable
+            round
+            class="w-40 focus-within:w-56"
+          >
+            <template #prefix>
+              <IconLucideSearch class="size-4 text-on-surface-variant/40 shrink-0" />
+            </template>
+          </SInput>
+        </div>
+      </div>
+    </div>
+    <!-- 列表 -->
+    <Transition name="fade" mode="out-in" :duration="150">
+      <div v-if="history.tracks.length > 0" key="list" class="flex-1 min-h-0">
+        <SongList
+          ref="songListRef"
+          :items="history.tracks"
+          :search-query="searchQuery"
+          :show-size="false"
+          enable-sort
+        />
+      </div>
+      <div v-else key="empty" class="flex-1 flex items-center justify-center">
+        <div class="text-center text-on-surface-variant/50">
+          <IconLucideHistory class="size-12 mx-auto mb-3 opacity-30" />
+          <div class="text-sm">{{ t("history.empty") }}</div>
+        </div>
+      </div>
+    </Transition>
+    <!-- 清空确认 -->
+    <SDialog v-model:open="clearConfirmOpen" :title="t('history.clearConfirmTitle')">
+      {{ t("history.clearConfirmContent") }}
+      <template #footer="{ close }">
+        <SButton variant="secondary" @click="close">
+          {{ t("common.cancel") }}
+        </SButton>
+        <SButton type="error" variant="secondary" @click="handleClear">
+          {{ t("common.confirm") }}
+        </SButton>
+      </template>
+    </SDialog>
+  </div>
+</template>
diff --git a/src/router/index.ts b/src/router/index.ts
index 796e85bc..626e8100 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -22,6 +22,11 @@ const router = createRouter({
           name: "liked",
           component: () => import("@/pages/Liked.vue"),
         },
+        {
+          path: "history",
+          name: "history",
+          component: () => import("@/pages/History.vue"),
+        },
         {
           path: "collection/:source/:type/:id",
           name: "collection",
diff --git a/src/stores/history.ts b/src/stores/history.ts
new file mode 100644
index 00000000..72a2fc0a
--- /dev/null
+++ b/src/stores/history.ts
@@ -0,0 +1,89 @@
+import localforage from "localforage";
+import type { Track } from "@shared/types/player";
+
+const db = localforage.createInstance({ name: "splayer", storeName: "history" });
+const HISTORY_KEY = "entries";
+
+/** 历史条数上限，超出按时间倒序裁掉尾部 */
+const MAX_HISTORY = 500;
+
+/** 单条播放历史 */
+export interface HistoryEntry {
+  track: Track;
+  /** 最近一次播放时间（unix ms） */
+  playedAt: number;
+}
+
+/** 同源同 id 视为同一首 */
+const keyOf = (track: Track): string => `${track.source}:${track.id}`;
+
+export const useHistoryStore = defineStore("history", () => {
+  /** 倒序：最近播放在前 */
+  const entries = shallowRef<HistoryEntry[]>([]);
+  const initialized = ref(false);
+  let pending = false;
+
+  const persist = (): void => {
+    db.setItem(HISTORY_KEY, toRaw(entries.value)).catch(() => {});
+  };
+
+  /** 加载持久化数据（幂等） */
+  const load = async (): Promise<void> => {
+    if (initialized.value || pending) return;
+    pending = true;
+    const cached = await db.getItem<HistoryEntry[]>(HISTORY_KEY).catch(() => null);
+    if (Array.isArray(cached) && cached.length > 0) entries.value = cached;
+    initialized.value = true;
+    pending = false;
+  };
+
+  /**
+   * 记录一次播放
+   * @param track 当前播放曲目
+   */
+  const record = (track: Track): void => {
+    if (!track?.id) return;
+    const key = keyOf(track);
+    const playedAt = Date.now();
+    const next: HistoryEntry[] = [{ track, playedAt }];
+    for (const item of entries.value) {
+      if (keyOf(item.track) === key) continue;
+      next.push(item);
+      if (next.length >= MAX_HISTORY) break;
+    }
+    entries.value = next;
+    persist();
+  };
+
+  /**
+   * 移除单条历史
+   * @param track 要删除的曲目
+   */
+  const remove = (track: Track): void => {
+    const key = keyOf(track);
+    const next = entries.value.filter((entry) => keyOf(entry.track) !== key);
+    if (next.length === entries.value.length) return;
+    entries.value = next;
+    persist();
+  };
+
+  /** 清空全部历史 */
+  const clear = (): void => {
+    if (entries.value.length === 0) return;
+    entries.value = [];
+    persist();
+  };
+
+  /** 按时间倒序的扁平曲目列表 */
+  const tracks = computed<Track[]>(() => entries.value.map((entry) => entry.track));
+
+  return {
+    entries,
+    tracks,
+    initialized,
+    load,
+    record,
+    remove,
+    clear,
+  };
+});

From 48bbda4d5094edfcb40ed1020bcd522e687b8de7 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Mon, 18 May 2026 18:30:57 +0800
Subject: [PATCH 17/33] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=AD=8C?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=8E=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   2 +
 electron/main/apis/netease/index.ts           |  23 ++-
 electron/main/apis/netease/modules/index.ts   |  14 ++
 .../apis/netease/modules/playlist_create.ts   |  24 +++
 .../apis/netease/modules/playlist_delete.ts   |  19 ++
 .../netease/modules/playlist_desc_update.ts   |  19 ++
 .../netease/modules/playlist_name_update.ts   |  19 ++
 .../netease/modules/playlist_order_update.ts  |  18 ++
 .../netease/modules/playlist_subscribe.ts     |  20 ++
 .../apis/netease/modules/playlist_tracks.ts   |  25 +++
 src/apis/user/netease.ts                      |  98 +++++++++
 src/components/layout/SideBar.vue             |  24 ++-
 src/components/list/SongList.vue              |  17 ++
 .../modals/PlaylistCreateDialog.vue           |  95 +++++++++
 .../modals/PlaylistPickerDialog.vue           | 121 +++++++++++
 src/composables/useMultiSelect.ts             |  10 +-
 src/composables/useTrackMenu.ts               |  42 +---
 src/i18n/locales/en-US.json                   |   7 +-
 src/i18n/locales/zh-CN.json                   |   7 +-
 src/pages/Collection.vue                      | 116 +++++++++--
 src/services/collectionLoader.ts              |   3 +
 src/stores/user.ts                            | 193 ++++++++++++++----
 22 files changed, 805 insertions(+), 111 deletions(-)
 create mode 100644 electron/main/apis/netease/modules/playlist_create.ts
 create mode 100644 electron/main/apis/netease/modules/playlist_delete.ts
 create mode 100644 electron/main/apis/netease/modules/playlist_desc_update.ts
 create mode 100644 electron/main/apis/netease/modules/playlist_name_update.ts
 create mode 100644 electron/main/apis/netease/modules/playlist_order_update.ts
 create mode 100644 electron/main/apis/netease/modules/playlist_subscribe.ts
 create mode 100644 electron/main/apis/netease/modules/playlist_tracks.ts
 create mode 100644 src/components/modals/PlaylistCreateDialog.vue
 create mode 100644 src/components/modals/PlaylistPickerDialog.vue

diff --git a/components.d.ts b/components.d.ts
index fc9c6d89..36188e0d 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -148,7 +148,9 @@ declare module 'vue' {
     PlayerControls: typeof import('./src/components/player/PlayerControls.vue')['default']
     PlayerCover: typeof import('./src/components/player/FullPlayer/PlayerCover.vue')['default']
     PlayerData: typeof import('./src/components/player/FullPlayer/PlayerData.vue')['default']
+    PlaylistCreateDialog: typeof import('./src/components/modals/PlaylistCreateDialog.vue')['default']
     PlaylistPanel: typeof import('./src/components/list/PlaylistPanel.vue')['default']
+    PlaylistPickerDialog: typeof import('./src/components/modals/PlaylistPickerDialog.vue')['default']
     PluginManager: typeof import('./src/components/settings/custom/PluginManager.vue')['default']
     PopoverArrow: typeof import('reka-ui')['PopoverArrow']
     PopoverContent: typeof import('reka-ui')['PopoverContent']
diff --git a/electron/main/apis/netease/index.ts b/electron/main/apis/netease/index.ts
index 6c66c501..90836f21 100644
--- a/electron/main/apis/netease/index.ts
+++ b/electron/main/apis/netease/index.ts
@@ -31,6 +31,18 @@ const SESSION_MUTATING: ReadonlySet<string> = new Set([
   "register_anonimous",
 ]);
 
+/** 写类接口：每次都必须打到服务端，不要走 2 分钟响应缓存 */
+const NON_CACHEABLE: ReadonlySet<string> = new Set([
+  "like",
+  "playlist_create",
+  "playlist_delete",
+  "playlist_tracks",
+  "playlist_subscribe",
+  "playlist_name_update",
+  "playlist_desc_update",
+  "playlist_order_update",
+]);
+
 /** 内存缓存：避免每次调用都走 SELECT（SQLite 仅在首次 load 时读一次） */
 let sessionCache: Record<string, string> | null = null;
 
@@ -97,9 +109,12 @@ export const callNetease = async (
   const session = loadSession();
 
   // 读缓存；调用方如不想命中，按原项目惯例在 params 里带 `timestamp: Date.now()` 即可
-  const cacheKey = buildCacheKey(name, params);
-  const hit = cacheGet(cacheKey);
-  if (hit) return hit;
+  const cacheable = !NON_CACHEABLE.has(name);
+  const cacheKey = cacheable ? buildCacheKey(name, params) : "";
+  if (cacheable) {
+    const hit = cacheGet(cacheKey);
+    if (hit) return hit;
+  }
 
   const query = {
     ...params,
@@ -121,7 +136,7 @@ export const callNetease = async (
   }
 
   const value = { status: res.status, body: res.body };
-  if (res.status === 200) cacheSet(cacheKey, value);
+  if (cacheable && res.status === 200) cacheSet(cacheKey, value);
 
   return value;
 };
diff --git a/electron/main/apis/netease/modules/index.ts b/electron/main/apis/netease/modules/index.ts
index 04db16a1..127d8d2a 100644
--- a/electron/main/apis/netease/modules/index.ts
+++ b/electron/main/apis/netease/modules/index.ts
@@ -54,6 +54,13 @@ import song_url from "./song_url";
 
 // 歌单 / 喜欢
 import playlist_detail from "./playlist_detail";
+import playlist_create from "./playlist_create";
+import playlist_delete from "./playlist_delete";
+import playlist_tracks from "./playlist_tracks";
+import playlist_subscribe from "./playlist_subscribe";
+import playlist_name_update from "./playlist_name_update";
+import playlist_desc_update from "./playlist_desc_update";
+import playlist_order_update from "./playlist_order_update";
 import likelist from "./likelist";
 import like from "./like";
 
@@ -111,6 +118,13 @@ export const modules: Record<string, NeteaseModule> = {
   song_url,
 
   playlist_detail,
+  playlist_create,
+  playlist_delete,
+  playlist_tracks,
+  playlist_subscribe,
+  playlist_name_update,
+  playlist_desc_update,
+  playlist_order_update,
   likelist,
   like,
 
diff --git a/electron/main/apis/netease/modules/playlist_create.ts b/electron/main/apis/netease/modules/playlist_create.ts
new file mode 100644
index 00000000..8772ccb6
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_create.ts
@@ -0,0 +1,24 @@
+/**
+ * 新建歌单
+ *
+ * params:
+ * - name     歌单名
+ * - privacy  0 公开 / 10 私密，默认 0
+ * - type     NORMAL / VIDEO，默认 NORMAL
+ *
+ * 响应：`{ code, id, playlist: { id, name, ... } }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistCreate: NeteaseModule = (query, request) => {
+  const data = {
+    name: query.name,
+    privacy: query.privacy ?? 0,
+    type: query.type ?? "NORMAL",
+  };
+  return request("/api/playlist/create", data, createOption(query, "weapi"));
+};
+
+export default playlistCreate;
diff --git a/electron/main/apis/netease/modules/playlist_delete.ts b/electron/main/apis/netease/modules/playlist_delete.ts
new file mode 100644
index 00000000..994a9c5e
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_delete.ts
@@ -0,0 +1,19 @@
+/**
+ * 删除歌单
+ *
+ * params:
+ * - id  歌单 id（单个）
+ *
+ * 走 eapi /playlist/remove，data 字段是 `pid`（NCM 现行实现）
+ * 响应：`{ code }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistDelete: NeteaseModule = (query, request) => {
+  const data = { pid: query.id };
+  return request("/api/playlist/remove", data, createOption(query, "eapi"));
+};
+
+export default playlistDelete;
diff --git a/electron/main/apis/netease/modules/playlist_desc_update.ts b/electron/main/apis/netease/modules/playlist_desc_update.ts
new file mode 100644
index 00000000..b216c316
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_desc_update.ts
@@ -0,0 +1,19 @@
+/**
+ * 更新歌单描述
+ *
+ * params:
+ * - id    歌单 id
+ * - desc  新描述（空字符串清空）
+ *
+ * 响应：`{ code }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistDescUpdate: NeteaseModule = (query, request) => {
+  const data = { id: query.id, desc: query.desc ?? "" };
+  return request("/api/playlist/desc/update", data, createOption(query, "eapi"));
+};
+
+export default playlistDescUpdate;
diff --git a/electron/main/apis/netease/modules/playlist_name_update.ts b/electron/main/apis/netease/modules/playlist_name_update.ts
new file mode 100644
index 00000000..0fe2f926
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_name_update.ts
@@ -0,0 +1,19 @@
+/**
+ * 更新歌单名
+ *
+ * params:
+ * - id    歌单 id
+ * - name  新名字
+ *
+ * 响应：`{ code }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistNameUpdate: NeteaseModule = (query, request) => {
+  const data = { id: query.id, name: query.name };
+  return request("/api/playlist/update/name", data, createOption(query, "eapi"));
+};
+
+export default playlistNameUpdate;
diff --git a/electron/main/apis/netease/modules/playlist_order_update.ts b/electron/main/apis/netease/modules/playlist_order_update.ts
new file mode 100644
index 00000000..5c1d7292
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_order_update.ts
@@ -0,0 +1,18 @@
+/**
+ * 调整"我的歌单"显示顺序（仅自建）
+ *
+ * params:
+ * - ids  期望顺序的歌单 id 数组（JSON 字符串）
+ *
+ * 响应：`{ code }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistOrderUpdate: NeteaseModule = (query, request) => {
+  const data = { ids: query.ids };
+  return request("/api/playlist/order/update", data, createOption(query, "eapi"));
+};
+
+export default playlistOrderUpdate;
diff --git a/electron/main/apis/netease/modules/playlist_subscribe.ts b/electron/main/apis/netease/modules/playlist_subscribe.ts
new file mode 100644
index 00000000..91015803
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_subscribe.ts
@@ -0,0 +1,20 @@
+/**
+ * 订阅 / 取消订阅歌单
+ *
+ * params:
+ * - id  歌单 id
+ * - t   1 订阅 / 2 取消，默认 1
+ *
+ * 响应：`{ code }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistSubscribe: NeteaseModule = (query, request) => {
+  const action = query.t === 2 ? "unsubscribe" : "subscribe";
+  const data = { id: query.id };
+  return request(`/api/playlist/${action}`, data, createOption(query, "weapi"));
+};
+
+export default playlistSubscribe;
diff --git a/electron/main/apis/netease/modules/playlist_tracks.ts b/electron/main/apis/netease/modules/playlist_tracks.ts
new file mode 100644
index 00000000..89f4f1c5
--- /dev/null
+++ b/electron/main/apis/netease/modules/playlist_tracks.ts
@@ -0,0 +1,25 @@
+/**
+ * 歌单增/删歌曲
+ *
+ * params:
+ * - op      "add" 或 "del"
+ * - pid     歌单 id
+ * - tracks  曲目 id 列表（逗号分隔字符串，由 wrapper 拼好）
+ *
+ * 响应：`{ code, count, trackIds, cloudCount }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const playlistTracks: NeteaseModule = (query, request) => {
+  const data = {
+    op: query.op,
+    pid: query.pid,
+    trackIds: `[${query.tracks}]`,
+    imme: "true",
+  };
+  return request("/api/playlist/manipulate/tracks", data, createOption(query, "weapi"));
+};
+
+export default playlistTracks;
diff --git a/src/apis/user/netease.ts b/src/apis/user/netease.ts
index 6b3e3ce4..7986cc71 100644
--- a/src/apis/user/netease.ts
+++ b/src/apis/user/netease.ts
@@ -124,6 +124,104 @@ export const toggleLikeSong = async (trackId: string, like: boolean): Promise<bo
   return body?.code === 200;
 };
 
+/**
+ * 新建歌单
+ * @param name 歌单名
+ * @param privacy 0 公开 / 10 私密
+ * @returns 新建的歌单元数据；失败返回 null
+ */
+export const createPlaylist = async (
+  name: string,
+  privacy: 0 | 10 = 0,
+): Promise<Playlist | null> => {
+  const body = await neteaseApi.playlist_create({ name, privacy });
+  if (body?.code !== 200 || !body.playlist) return null;
+  return toPlaylist(body.playlist);
+};
+
+/**
+ * 删除歌单
+ * @param id 歌单 id
+ */
+export const deletePlaylist = async (id: string): Promise<boolean> => {
+  const body = await neteaseApi.playlist_delete({ id });
+  return body?.code === 200;
+};
+
+/**
+ * 改歌单名
+ * @param id 歌单 id
+ * @param name 新名称
+ */
+export const updatePlaylistName = async (id: string, name: string): Promise<boolean> => {
+  const body = await neteaseApi.playlist_name_update({ id, name });
+  return body?.code === 200;
+};
+
+/**
+ * 改歌单描述
+ * @param id 歌单 id
+ * @param desc 新描述（空字符串清空）
+ */
+export const updatePlaylistDesc = async (id: string, desc: string): Promise<boolean> => {
+  const body = await neteaseApi.playlist_desc_update({ id, desc });
+  return body?.code === 200;
+};
+
+/**
+ * 把曲目加入歌单
+ * @param playlistId 歌单 id
+ * @param trackIds 曲目 id 列表
+ * @returns 实际加入条数；失败返回 0
+ */
+export const addToPlaylist = async (playlistId: string, trackIds: string[]): Promise<number> => {
+  if (trackIds.length === 0) return 0;
+  const body = await neteaseApi.playlist_tracks({
+    op: "add",
+    pid: playlistId,
+    tracks: trackIds.join(","),
+  });
+  if (body?.code !== 200) return 0;
+  return typeof body.count === "number" ? body.count : trackIds.length;
+};
+
+/**
+ * 从歌单移除曲目
+ * @param playlistId 歌单 id
+ * @param trackIds 曲目 id 列表
+ */
+export const removeFromPlaylist = async (
+  playlistId: string,
+  trackIds: string[],
+): Promise<boolean> => {
+  if (trackIds.length === 0) return false;
+  const body = await neteaseApi.playlist_tracks({
+    op: "del",
+    pid: playlistId,
+    tracks: trackIds.join(","),
+  });
+  return body?.code === 200;
+};
+
+/**
+ * 订阅 / 取消订阅他人歌单
+ * @param id 歌单 id
+ * @param subscribe true 订阅 / false 取消
+ */
+export const subscribePlaylist = async (id: string, subscribe: boolean): Promise<boolean> => {
+  const body = await neteaseApi.playlist_subscribe({ id, t: subscribe ? 1 : 2 });
+  return body?.code === 200;
+};
+
+/**
+ * 重排自建歌单顺序
+ * @param ids 期望顺序的歌单 id 数组
+ */
+export const reorderPlaylists = async (ids: string[]): Promise<boolean> => {
+  const body = await neteaseApi.playlist_order_update({ ids: JSON.stringify(ids) });
+  return body?.code === 200;
+};
+
 /** 用户等级 */
 export const fetchUserLevel = async (): Promise<number | undefined> => {
   const body = await neteaseApi.user_level();
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 67b55307..950a97a8 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -5,7 +5,6 @@ import { useSettingsStore } from "@/stores/settings";
 import { useStatusStore } from "@/stores/status";
 import { usePlaylistStore } from "@/stores/playlist";
 import { useUserStore } from "@/stores/user";
-import { navigateToPlaylist } from "@/utils/navigate";
 import IconLucideHome from "~icons/lucide/home";
 import IconLucideMusic from "~icons/lucide/music";
 import IconLucideUser from "~icons/lucide/user";
@@ -33,12 +32,19 @@ const sourceOptions = computed<SSelectOption[]>(() => [
   { value: "online", label: t("collection.onlinePlaylist") },
 ]);
 
-const handleCreate = async () => {
-  if (status.myPlaylistSource !== "local") return;
-  const playlist = await playlistStore.create(
-    t("collection.create", { type: t("collection.playlist") }),
+const createDialogOpen = ref(false);
+const createMode = ref<"local" | "online">("local");
+
+const handleCreate = (): void => {
+  createMode.value = status.myPlaylistSource;
+  createDialogOpen.value = true;
+};
+
+/** 新建成功后跳转到该歌单 */
+const handleCreated = (playlistId: string): void => {
+  router.push(
+    `/collection/${createMode.value === "local" ? "local" : "netease"}/playlist/${playlistId}`,
   );
-  navigateToPlaylist(playlist.id);
 };
 
 /** 我的歌单分组头部 */
@@ -183,5 +189,11 @@ onMounted(() => {
         @select="onSelect"
       />
     </div>
+    <!-- 新建歌单 -->
+    <PlaylistCreateDialog
+      v-model:open="createDialogOpen"
+      :mode="createMode"
+      @created="handleCreated"
+    />
   </div>
 </template>
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 8720f8b5..8ec18350 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -7,6 +7,7 @@ import { useSettingsStore } from "@/stores/settings";
 import { useTrackMenu } from "@/composables/useTrackMenu";
 import { useMultiSelect } from "@/composables/useMultiSelect";
 import { useFavorite } from "@/composables/useFavorite";
+import PlaylistPickerDialog from "@/components/modals/PlaylistPickerDialog.vue";
 import { formatTime } from "@/utils/time";
 import { formatFileSize } from "@/utils/format";
 import { isLosslessQuality, getQualityLevel } from "@/utils/quality";
@@ -204,10 +205,24 @@ const batch = useMultiSelect(sortedItems, {
 });
 const { deleteConfirmOpen, deleteDialogTitle, deleteDialogContent } = batch;
 
+/** 添加到歌单弹窗：mode 跟随被操作曲目的 source（仅 local / netease 走得通） */
+const pickerOpen = ref(false);
+const pickerTracks = shallowRef<Track[]>([]);
+const pickerMode = ref<"local" | "online">("local");
+const openPicker = (tracks: Track[]): void => {
+  if (tracks.length === 0) return;
+  const source = tracks[0].source;
+  if (source !== "local" && source !== "netease") return;
+  pickerTracks.value = tracks;
+  pickerMode.value = source === "netease" ? "online" : "local";
+  pickerOpen.value = true;
+};
+
 /** 右键菜单 */
 const contextTrack = shallowRef<Track | undefined>();
 const { items: contextMenuItems, handleSelect: onContextMenu } = useTrackMenu(contextTrack, {
   collectionType: props.collectionType,
+  onAddToPlaylist: (track) => openPicker([track]),
   onRemove: (track) => batch.requestDelete([track], "remove"),
   onDeleteFile: (track) => batch.requestDelete([track], "file"),
 });
@@ -631,5 +646,7 @@ defineExpose({
         <SButton type="error" @click="batch.confirmDelete">{{ t("common.confirm") }}</SButton>
       </template>
     </SDialog>
+    <!-- 添加到歌单 -->
+    <PlaylistPickerDialog v-model:open="pickerOpen" :mode="pickerMode" :tracks="pickerTracks" />
   </div>
 </template>
diff --git a/src/components/modals/PlaylistCreateDialog.vue b/src/components/modals/PlaylistCreateDialog.vue
new file mode 100644
index 00000000..78530cd6
--- /dev/null
+++ b/src/components/modals/PlaylistCreateDialog.vue
@@ -0,0 +1,95 @@
+<script setup lang="ts">
+import { usePlaylistStore } from "@/stores/playlist";
+import { useUserStore } from "@/stores/user";
+import { toast } from "@/composables/useToast";
+
+const props = defineProps<{
+  open: boolean;
+  /** 本地 / 在线 */
+  mode: "local" | "online";
+}>();
+const emit = defineEmits<{
+  "update:open": [value: boolean];
+  /** 新建成功，参数为新歌单 id */
+  created: [playlistId: string];
+}>();
+
+const { t } = useI18n();
+const playlistStore = usePlaylistStore();
+const userStore = useUserStore();
+
+const name = ref("");
+const privacy = ref<0 | 10>(0);
+const submitting = ref(false);
+
+watch(
+  () => props.open,
+  (open) => {
+    if (!open) {
+      name.value = "";
+      privacy.value = 0;
+      submitting.value = false;
+    }
+  },
+);
+
+const handleConfirm = async (): Promise<void> => {
+  const value = name.value.trim();
+  if (!value || submitting.value) return;
+  submitting.value = true;
+  try {
+    const id =
+      props.mode === "local"
+        ? (await playlistStore.create(value)).id
+        : (await userStore.createPlaylist(value, privacy.value))?.id;
+    if (!id) {
+      toast.error(t("liked.toast.failed"));
+      return;
+    }
+    emit("created", id);
+    emit("update:open", false);
+  } finally {
+    submitting.value = false;
+  }
+};
+</script>
+
+<template>
+  <SDialog
+    :open="open"
+    :title="t('collection.create', { type: t('collection.playlist') })"
+    width="400px"
+    @update:open="(v) => emit('update:open', v)"
+  >
+    <div class="flex flex-col gap-4">
+      <SInput
+        v-model="name"
+        :placeholder="t('collection.playlist')"
+        clearable
+        :disabled="submitting"
+        @keyup.enter="handleConfirm"
+      />
+      <div v-if="mode === 'online'" class="flex items-center justify-between">
+        <span class="text-sm text-on-surface">{{ t("collection.privacy.private") }}</span>
+        <SSwitch
+          :model-value="privacy === 10"
+          :disabled="submitting"
+          @update:model-value="(v: boolean) => (privacy = v ? 10 : 0)"
+        />
+      </div>
+    </div>
+    <template #footer="{ close }">
+      <SButton variant="tertiary" :disabled="submitting" @click="close">
+        {{ t("common.cancel") }}
+      </SButton>
+      <SButton
+        type="primary"
+        :disabled="!name.trim()"
+        :loading="submitting"
+        @click="handleConfirm"
+      >
+        {{ t("common.confirm") }}
+      </SButton>
+    </template>
+  </SDialog>
+</template>
diff --git a/src/components/modals/PlaylistPickerDialog.vue b/src/components/modals/PlaylistPickerDialog.vue
new file mode 100644
index 00000000..5f270fcf
--- /dev/null
+++ b/src/components/modals/PlaylistPickerDialog.vue
@@ -0,0 +1,121 @@
+<script setup lang="ts">
+import type { Track } from "@shared/types/player";
+import { usePlaylistStore } from "@/stores/playlist";
+import { useUserStore } from "@/stores/user";
+import { toast } from "@/composables/useToast";
+import PlaylistCreateDialog from "./PlaylistCreateDialog.vue";
+import IconLucidePlus from "~icons/lucide/plus";
+
+const props = defineProps<{
+  open: boolean;
+  /** 本地 / 在线 */
+  mode: "local" | "online";
+  /** 要加入的曲目 */
+  tracks: Track[];
+}>();
+const emit = defineEmits<{ "update:open": [value: boolean] }>();
+
+const { t } = useI18n();
+const playlistStore = usePlaylistStore();
+const userStore = useUserStore();
+
+/** 列表项的统一形状 */
+interface PickerEntry {
+  id: string;
+  name: string;
+  cover?: string;
+  trackCount: number;
+}
+
+/** 当前 mode 下的歌单 */
+const entries = computed<PickerEntry[]>(() => {
+  if (props.mode === "local") {
+    return playlistStore.playlists.map((pl) => ({
+      id: pl.id,
+      name: pl.title,
+      trackCount: pl.trackCount ?? 0,
+    }));
+  }
+  // 跳过"我喜欢"，红心按钮负责那条路径
+  return userStore.createdPlaylists
+    .filter(
+      (pl): pl is typeof pl & { id: string } =>
+        !!pl.id && pl.id !== userStore.likedPlaylistId,
+    )
+    .map((pl) => ({
+      id: pl.id,
+      name: pl.name,
+      cover: pl.cover,
+      trackCount: pl.trackCount ?? 0,
+    }));
+});
+
+const createDialogOpen = ref(false);
+const submitting = ref(false);
+
+const handlePick = async (playlistId: string): Promise<void> => {
+  if (submitting.value) return;
+  submitting.value = true;
+  try {
+    let success = false;
+    if (props.mode === "local") {
+      const count = await playlistStore.addTracks(playlistId, props.tracks);
+      success = count > 0;
+    } else {
+      const ids = props.tracks.map((track) => track.id);
+      const count = await userStore.addTracksToPlaylist(playlistId, ids);
+      success = count > 0;
+    }
+    toast[success ? "success" : "error"](t(success ? "liked.toast.added" : "liked.toast.failed"));
+    if (success) emit("update:open", false);
+  } finally {
+    submitting.value = false;
+  }
+};
+</script>
+
+<template>
+  <SDialog
+    :open="open"
+    :title="t('collection.addTo', { type: t('collection.playlist') })"
+    width="420px"
+    @update:open="(v) => emit('update:open', v)"
+  >
+    <div class="max-h-96 overflow-y-auto flex flex-col">
+      <!-- 新建 -->
+      <div
+        class="flex items-center gap-3 p-2 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors"
+        @click="createDialogOpen = true"
+      >
+        <div
+          class="size-12 rounded-md shrink-0 flex items-center justify-center bg-primary/10 text-primary"
+        >
+          <IconLucidePlus class="size-5" />
+        </div>
+        <span class="text-sm text-on-surface">
+          {{ t("collection.create", { type: t("collection.playlist") }) }}
+        </span>
+      </div>
+      <!-- 歌单项 -->
+      <div
+        v-for="entry in entries"
+        :key="entry.id"
+        class="flex items-center gap-3 p-2 rounded-lg cursor-pointer hover:bg-on-surface/5 transition-colors"
+        :class="submitting ? 'pointer-events-none opacity-50' : ''"
+        @click="handlePick(entry.id)"
+      >
+        <SImg :src="entry.cover" :alt="entry.name" class="size-12 rounded-md shrink-0" />
+        <div class="flex-1 min-w-0 flex flex-col gap-0.5">
+          <span class="text-sm text-on-surface truncate">{{ entry.name }}</span>
+          <span class="text-xs text-on-surface-variant/60 tabular-nums">
+            {{ t("common.totalSongs", { count: entry.trackCount }) }}
+          </span>
+        </div>
+      </div>
+    </div>
+    <template #footer="{ close }">
+      <SButton variant="tertiary" @click="close">{{ t("common.cancel") }}</SButton>
+    </template>
+  </SDialog>
+  <PlaylistCreateDialog v-model:open="createDialogOpen" :mode="mode" />
+</template>
diff --git a/src/composables/useMultiSelect.ts b/src/composables/useMultiSelect.ts
index daecb2e1..ac7adfee 100644
--- a/src/composables/useMultiSelect.ts
+++ b/src/composables/useMultiSelect.ts
@@ -3,6 +3,7 @@ import type { Track, TrackSource } from "@shared/types/player";
 import type { CollectionType } from "@/types/collection";
 import { usePlaylistStore } from "@/stores/playlist";
 import { useLibraryStore } from "@/stores/library";
+import { useUserStore } from "@/stores/user";
 import * as player from "@/core/player";
 
 export interface MultiSelectOptions {
@@ -23,6 +24,7 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
   const { t } = useI18n();
   const playlistStore = usePlaylistStore();
   const libraryStore = useLibraryStore();
+  const userStore = useUserStore();
 
   const active = ref(false);
   const selectedIds = ref(new Set<string>());
@@ -108,10 +110,14 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
       if (options.source.value === "local") {
         await playlistStore.removeTracks(
           options.collectionId.value,
-          tracks.map((t) => t.id),
+          tracks.map((track) => track.id),
+        );
+      } else if (options.source.value === "netease") {
+        await userStore.removeTracksFromPlaylist(
+          options.collectionId.value,
+          tracks.map((track) => track.id),
         );
       }
-      // TODO: online
     }
     deleteConfirmOpen.value = false;
     exit();
diff --git a/src/composables/useTrackMenu.ts b/src/composables/useTrackMenu.ts
index acab189a..0f7682ba 100644
--- a/src/composables/useTrackMenu.ts
+++ b/src/composables/useTrackMenu.ts
@@ -2,21 +2,20 @@ import type { Ref } from "vue";
 import type { Track } from "@shared/types/player";
 import type { CollectionType } from "@/types/collection";
 import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
-import { usePlaylistStore } from "@/stores/playlist";
 import * as player from "@/core/player";
 import IconPlay from "~icons/lucide/play";
 import IconListEnd from "~icons/lucide/list-end";
 import IconListPlus from "~icons/lucide/list-plus";
-import IconPlus from "~icons/lucide/plus";
-import IconLucideListMusic from "~icons/lucide/list-music";
 import IconFolderOpen from "~icons/lucide/folder-open";
 import IconCopy from "~icons/lucide/copy";
 import IconTrash2 from "~icons/lucide/trash-2";
 import IconListMinus from "~icons/lucide/list-minus";
 
 export interface TrackMenuOptions {
-  /** 集合类型（仅 playlist 启用"从XX移除"） */
+  /** 集合类型 */
   collectionType?: CollectionType;
+  /** 添加到歌单 */
+  onAddToPlaylist?: (track: Track) => void;
   /** 从集合移除回调 */
   onRemove?: (track: Track) => void;
   /** 删除文件回调 */
@@ -30,7 +29,6 @@ export interface TrackMenuOptions {
  */
 export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOptions = {}) => {
   const { t } = useI18n();
-  const playlistStore = usePlaylistStore();
 
   // 本地操作（资源管理器 / 复制路径 / 删除文件）按右键的那首歌判断；
   // playlist 是列表语境，沿用集合级
@@ -46,23 +44,7 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
       label: t("collection.addTo", { type: t("collection.playlist") }),
       icon: markRaw(IconListPlus),
       separator: true,
-      children: [
-        {
-          key: "playlist:new",
-          label: t("collection.create", { type: t("collection.playlist") }),
-          icon: markRaw(IconPlus),
-        },
-        ...(playlistStore.playlists.length > 0
-          ? [
-              { key: "playlist:divider", label: "", separator: true },
-              ...playlistStore.playlists.map((pl) => ({
-                key: `playlist:${pl.id}`,
-                label: pl.title,
-                icon: markRaw(IconLucideListMusic),
-              })),
-            ]
-          : []),
-      ],
+      show: !!options.onAddToPlaylist,
     },
     {
       key: "showInExplorer",
@@ -96,19 +78,6 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
   const handleSelect = async (key: string): Promise<void> => {
     const current = track.value;
     if (!current) return;
-    // 歌单相关
-    if (key === "playlist:new") {
-      const playlist = await playlistStore.create(
-        t("collection.create", { type: t("collection.playlist") }),
-      );
-      await playlistStore.addTracks(playlist.id, [current]);
-      return;
-    }
-    if (key.startsWith("playlist:")) {
-      await playlistStore.addTracks(key.slice("playlist:".length), [current]);
-      return;
-    }
-    // 歌曲相关
     switch (key) {
       case "play":
         player.playNow(current);
@@ -116,6 +85,9 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
       case "playNext":
         player.insertToQueue(current);
         break;
+      case "addToPlaylist":
+        options.onAddToPlaylist?.(current);
+        break;
       case "showInExplorer":
         if (current.path) window.api.system.showInExplorer(current.path);
         break;
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 281697aa..ef196d27 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -1111,7 +1111,12 @@
     "removeFrom": "Remove from {type}",
     "tracksAdded": "{count} songs added",
     "tracksRemoved": "{count} songs removed",
-    "edit": "Edit {type}"
+    "edit": "Edit {type}",
+    "subscribe": "Subscribe",
+    "unsubscribe": "Unsubscribe",
+    "privacy": {
+      "private": "Make private"
+    }
   },
   "artist": {
     "label": "Artists",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 953d4ae4..9e9dc226 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -1111,7 +1111,12 @@
     "removeFrom": "从{type}移除",
     "tracksAdded": "已添加 {count} 首歌曲",
     "tracksRemoved": "已移除 {count} 首歌曲",
-    "edit": "编辑{type}"
+    "edit": "编辑{type}",
+    "subscribe": "收藏",
+    "unsubscribe": "取消收藏",
+    "privacy": {
+      "private": "设为私密"
+    }
   },
   "artist": {
     "label": "艺术家",
diff --git a/src/pages/Collection.vue b/src/pages/Collection.vue
index 138c5128..1f8771b5 100644
--- a/src/pages/Collection.vue
+++ b/src/pages/Collection.vue
@@ -3,6 +3,7 @@ import type { TrackSource } from "@shared/types/player";
 import type { Collection, CollectionType } from "@/types/collection";
 import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
 import { usePlaylistStore } from "@/stores/playlist";
+import { useUserStore } from "@/stores/user";
 import { loadCollection as loadCollectionService } from "@/services/collectionLoader";
 import SongList from "@/components/list/SongList.vue";
 import { formatTime } from "@/utils/time";
@@ -14,10 +15,13 @@ import IconLucideListMusic from "~icons/lucide/list-music";
 import IconLucideHourglass from "~icons/lucide/hourglass";
 import IconLucideCalendar from "~icons/lucide/calendar";
 import IconLucideUser from "~icons/lucide/user";
+import IconMaterialSymbolsFavoriteRounded from "~icons/material-symbols/favorite-rounded";
+import IconMaterialSymbolsFavoriteOutlineRounded from "~icons/material-symbols/favorite-outline-rounded";
 
 const { t } = useI18n();
 const route = useRoute();
 const playlistStore = usePlaylistStore();
+const userStore = useUserStore();
 
 const source = route.params.source as TrackSource;
 const type = route.params.type as CollectionType;
@@ -29,8 +33,29 @@ const loading = ref(false);
 /** 取消当次加载（路由切换/卸载时 abort） */
 let loadAbort: AbortController | null = null;
 
-/** 是否可编辑 */
-const editable = source === "local" && type === "playlist";
+/** 是否本地歌单 */
+const isLocalPlaylist = source === "local" && type === "playlist";
+/** 是否网易云歌单 */
+const isNeteasePlaylist = source === "netease" && type === "playlist";
+/** 是否网易云自建歌单 */
+const isOnlineCreated = computed(
+  () => isNeteasePlaylist && userStore.createdPlaylists.some((pl) => pl.id === id),
+);
+/** 是否"我喜欢的音乐"歌单 */
+const isLikedPlaylist = computed(
+  () => isNeteasePlaylist && userStore.likedPlaylistId === id,
+);
+/** 是否在线收藏的他人歌单 */
+const isOnlineSubscribed = computed(
+  () => isNeteasePlaylist && userStore.subscribedPlaylists.some((pl) => pl.id === id),
+);
+/** 可改名 / 删除 */
+const canManage = computed(
+  () => isLocalPlaylist || (isOnlineCreated.value && !isLikedPlaylist.value),
+);
+/** 是否显示收藏按钮 */
+const canSubscribe = computed(() => isNeteasePlaylist && !isOnlineCreated.value);
+const subscribeBusy = ref(false);
 
 /** 折叠状态 */
 const collapsed = ref(false);
@@ -46,7 +71,7 @@ const handleListScroll = (event: Event) => {
 };
 
 /** 加载数据：派发到 services/collectionLoader，本组件只管 ref + loading + abort */
-const loadCollection = async (): Promise<void> => {
+const loadCollection = async (fresh = false): Promise<void> => {
   collapsed.value = false;
   loadAbort?.abort();
   const myAbort = new AbortController();
@@ -57,6 +82,7 @@ const loadCollection = async (): Promise<void> => {
     await loadCollectionService(source, type, id, {
       fallbackName: typeof route.query.name === "string" ? route.query.name : undefined,
       signal: myAbort.signal,
+      fresh,
       onUpdate: (next) => {
         if (myAbort.signal.aborted) return;
         collection.value = next;
@@ -120,16 +146,21 @@ const songListRef = shallowRef<InstanceType<typeof SongList> | null>(null);
 /** 更多菜单 */
 const editLabel = computed(() => t("collection.edit", { type: typeLabel.value }));
 
-const moreMenuItems = computed<DropdownMenuItem[]>(() => [
-  { key: "batchManage", label: t("songList.batch.manage"), icon: IconLucideListChecks },
-  { key: "edit", label: editLabel.value, icon: IconLucidePencil },
-  {
-    key: "delete",
-    label: t("collection.delete", { type: typeLabel.value }),
-    icon: IconLucideTrash2,
-    separator: true,
-  },
-]);
+const moreMenuItems = computed<DropdownMenuItem[]>(() => {
+  const list: DropdownMenuItem[] = [
+    { key: "batchManage", label: t("songList.batch.manage"), icon: IconLucideListChecks },
+  ];
+  if (canManage.value) {
+    list.push({ key: "edit", label: editLabel.value, icon: IconLucidePencil });
+    list.push({
+      key: "delete",
+      label: t("collection.delete", { type: typeLabel.value }),
+      icon: IconLucideTrash2,
+      separator: true,
+    });
+  }
+  return list;
+});
 
 /** 编辑弹窗 */
 const editDialogOpen = ref(false);
@@ -145,11 +176,20 @@ const openEditDialog = () => {
 
 const handleSaveEdit = async () => {
   if (!collection.value || !editTitle.value.trim()) return;
-  await playlistStore.update(collection.value.id, {
-    title: editTitle.value.trim(),
-    description: editDescription.value.trim() || undefined,
-  });
-  await loadCollection();
+  const title = editTitle.value.trim();
+  const description = editDescription.value.trim();
+  if (isLocalPlaylist) {
+    await playlistStore.update(collection.value.id, {
+      title,
+      description: description || undefined,
+    });
+  } else {
+    await userStore.updatePlaylist(collection.value.id, {
+      name: title,
+      description,
+    });
+  }
+  await loadCollection(true);
   editDialogOpen.value = false;
 };
 
@@ -160,11 +200,32 @@ const router = useRouter();
 
 const handleDelete = async () => {
   if (!collection.value) return;
-  await playlistStore.remove(collection.value.id);
+  if (isLocalPlaylist) {
+    await playlistStore.remove(collection.value.id);
+  } else {
+    const ok = await userStore.deletePlaylist(collection.value.id);
+    if (!ok) {
+      deleteConfirmOpen.value = false;
+      return;
+    }
+  }
   deleteConfirmOpen.value = false;
   router.back();
 };
 
+/** 收藏 / 取消收藏 */
+const handleToggleSubscribe = async (): Promise<void> => {
+  if (!collection.value || subscribeBusy.value) return;
+  subscribeBusy.value = true;
+  try {
+    const next = !isOnlineSubscribed.value;
+    const ok = await userStore.togglePlaylistSubscribe(collection.value.id, next);
+    if (ok && !next) router.back();
+  } finally {
+    subscribeBusy.value = false;
+  }
+};
+
 const handleMoreMenu = (key: string) => {
   switch (key) {
     case "batchManage":
@@ -259,8 +320,21 @@ const handleMoreMenu = (key: string) => {
                 </template>
                 {{ t("common.playAll") }}
               </SButton>
+              <SButton
+                v-if="canSubscribe"
+                variant="secondary"
+                round
+                :disabled="subscribeBusy"
+                @click="handleToggleSubscribe"
+              >
+                <template #icon>
+                  <IconMaterialSymbolsFavoriteRounded v-if="isOnlineSubscribed" />
+                  <IconMaterialSymbolsFavoriteOutlineRounded v-else />
+                </template>
+                {{ t(isOnlineSubscribed ? "collection.unsubscribe" : "collection.subscribe") }}
+              </SButton>
               <SDropdownMenu
-                v-if="editable"
+                v-if="moreMenuItems.length > 0"
                 :items="moreMenuItems"
                 align="start"
                 @select="handleMoreMenu"
@@ -307,7 +381,7 @@ const handleMoreMenu = (key: string) => {
           :collection-id="id"
           enable-sort
           @scroll="handleListScroll"
-          @change="loadCollection"
+          @change="loadCollection(true)"
         />
       </div>
       <!-- 加载中 -->
diff --git a/src/services/collectionLoader.ts b/src/services/collectionLoader.ts
index 3929237d..3f5d948a 100644
--- a/src/services/collectionLoader.ts
+++ b/src/services/collectionLoader.ts
@@ -21,6 +21,8 @@ export interface LoadCollectionOptions {
   onUpdate: (collection: Collection | null) => void;
   /** 中断信号 */
   signal?: AbortSignal;
+  /** 强制绕过主进程响应缓存（在 mutate 后重载时用） */
+  fresh?: boolean;
 }
 
 /**
@@ -153,6 +155,7 @@ const loadNeteasePlaylist = async (id: string, options: LoadCollectionOptions):
 
   await fetchPlaylist(id, {
     signal: options.signal,
+    fresh: options.fresh,
     onMeta: (m) => {
       if (options.signal?.aborted) return;
       meta = {
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 59de125d..3757c9e6 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -16,6 +16,13 @@ import {
   fetchUserLevel,
   fetchUserPlaylists,
   toggleLikeSong,
+  createPlaylist as apiCreatePlaylist,
+  deletePlaylist as apiDeletePlaylist,
+  updatePlaylistName,
+  updatePlaylistDesc,
+  addToPlaylist,
+  removeFromPlaylist,
+  subscribePlaylist,
 } from "@/apis/user/netease";
 
 /** 登录 cookie 保活间隔 */
@@ -64,10 +71,6 @@ export const useUserStore = defineStore(
     const level = ref<number | undefined>(undefined);
     /** 订阅计数 */
     const subcount = ref<UserSubcount>(EMPTY_SUBCOUNT);
-    /** 内容拉取最近时间（ms） */
-    const lastFetchedAt = ref<number>(0);
-    /** 是否在拉内容 */
-    const contentLoading = ref(false);
     /** 「我喜欢的音乐」歌单 */
     const likedPlaylistTracks = shallowRef<Track[]>([]);
     /** 是否在拉取歌单曲目 */
@@ -107,7 +110,6 @@ export const useUserStore = defineStore(
       artists.value = [];
       level.value = undefined;
       subcount.value = EMPTY_SUBCOUNT;
-      lastFetchedAt.value = 0;
       likedPlaylistAbort?.abort();
       likedPlaylistTracks.value = [];
       likedPlaylistLoading.value = false;
@@ -196,49 +198,46 @@ export const useUserStore = defineStore(
       }
     };
 
+    /**
+     * 拉取并应用用户歌单
+     * @param uid 用户 ID
+     */
+    const fetchAndApplyPlaylists = async (uid: number): Promise<void> => {
+      const sub = await fetchSubcount();
+      subcount.value = sub;
+      const total = (sub.createdPlaylistCount || 0) + (sub.subPlaylistCount || 0) || 50;
+      const list = await fetchUserPlaylists(uid, total);
+      playlists.value = list;
+      cacheDb.setItem(PLAYLISTS_CACHE_KEY, list).catch(() => {});
+    };
+
     /**
      * 全量拉取用户内容
      * 并行发起，失败的子任务不会阻塞其他类目
      */
     const loadContent = async (uid: number): Promise<void> => {
       if (!uid) return;
-      contentLoading.value = true;
       // 缓存即时上屏，不阻塞后续网络
       await hydrateContentFromCache();
-      try {
-        const sub = await fetchSubcount().catch((err) => {
-          console.warn("[user] subcount failed:", err);
-          return EMPTY_SUBCOUNT;
-        });
-        subcount.value = sub;
-        const playlistTotal = (sub.createdPlaylistCount || 0) + (sub.subPlaylistCount || 0) || 50;
-        const settled = await Promise.allSettled([
-          fetchUserPlaylists(uid, playlistTotal),
-          fetchLikelist(uid),
-          fetchUserAlbums(),
-          fetchUserArtists(),
-          fetchUserLevel(),
-        ]);
-        /** 拉取结果 */
-        const [plRes, likeRes, albumRes, artistRes, levelRes] = settled;
-        if (plRes.status === "fulfilled") {
-          playlists.value = plRes.value;
-          cacheDb.setItem(PLAYLISTS_CACHE_KEY, plRes.value).catch(() => {});
-        }
-        if (likeRes.status === "fulfilled") {
-          likedSongIds.value = new Set(likeRes.value);
-          cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, likeRes.value).catch(() => {});
-        }
-        if (albumRes.status === "fulfilled") albums.value = albumRes.value;
-        if (artistRes.status === "fulfilled") artists.value = artistRes.value;
-        if (levelRes.status === "fulfilled") level.value = levelRes.value;
-
-        for (const r of settled) {
-          if (r.status === "rejected") console.warn("[user] content load failed:", r.reason);
+      const settled = await Promise.allSettled([
+        fetchAndApplyPlaylists(uid),
+        fetchLikelist(uid),
+        fetchUserAlbums(),
+        fetchUserArtists(),
+        fetchUserLevel(),
+      ]);
+      const [_plRes, likeRes, albumRes, artistRes, levelRes] = settled;
+      if (likeRes.status === "fulfilled") {
+        likedSongIds.value = new Set(likeRes.value);
+        cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, likeRes.value).catch(() => {});
+      }
+      if (albumRes.status === "fulfilled") albums.value = albumRes.value;
+      if (artistRes.status === "fulfilled") artists.value = artistRes.value;
+      if (levelRes.status === "fulfilled") level.value = levelRes.value;
+      for (const result of settled) {
+        if (result.status === "rejected") {
+          console.warn("[user] content load failed:", result.reason);
         }
-        lastFetchedAt.value = Date.now();
-      } finally {
-        contentLoading.value = false;
       }
     };
 
@@ -267,6 +266,113 @@ export const useUserStore = defineStore(
       }
     };
 
+    /** 重新获取歌单列表 */
+    const refreshPlaylists = async (): Promise<void> => {
+      const uid = profile.value?.userId;
+      if (!uid) return;
+      try {
+        await fetchAndApplyPlaylists(uid);
+      } catch (err) {
+        console.warn("[user] refreshPlaylists failed:", err);
+      }
+    };
+
+    /**
+     * 新建歌单
+     * @param name 歌单名称
+     * @param privacy 歌单隐私设置，0 为公开，10 为私密
+     */
+    const createPlaylist = async (name: string, privacy: 0 | 10 = 0): Promise<Playlist | null> => {
+      const created = await apiCreatePlaylist(name, privacy);
+      if (!created?.id) return null;
+      await refreshPlaylists();
+      return created;
+    };
+
+    /** 
+     * 删除自建歌单
+     * @param id 歌单 ID
+     * @returns 是否删除成功
+     */
+    const deletePlaylist = async (id: string): Promise<boolean> => {
+      const ok = await apiDeletePlaylist(id);
+      if (ok) await refreshPlaylists();
+      return ok;
+    };
+
+    /** 
+     * 改歌单名/描述
+     * @param id 歌单 ID
+     * @param data 包含要更新的名称和描述
+     * @returns 是否更新成功
+     */
+    const updatePlaylist = async (
+      id: string,
+      data: { name?: string; description?: string },
+    ): Promise<boolean> => {
+      const tasks: Promise<boolean>[] = [];
+      if (typeof data.name === "string") tasks.push(updatePlaylistName(id, data.name));
+      if (typeof data.description === "string")
+        tasks.push(updatePlaylistDesc(id, data.description));
+      if (tasks.length === 0) return true;
+      const results = await Promise.all(tasks);
+      if (!results.every(Boolean)) return false;
+      await refreshPlaylists();
+      return true;
+    };
+
+    /** 
+     * 加歌到歌单
+     * @param playlistId 歌单 ID
+     * @param trackIds 曲目 ID 列表
+     * @returns 成功添加的曲目数量
+     */
+    const addTracksToPlaylist = async (playlistId: string, trackIds: string[]): Promise<number> => {
+      const count = await addToPlaylist(playlistId, trackIds);
+      if (count <= 0) return 0;
+      if (playlistId === likedPlaylistId.value) {
+        const next = new Set(likedSongIds.value);
+        for (const trackId of trackIds) next.add(trackId);
+        likedSongIds.value = next;
+        cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, [...next]).catch(() => {});
+      }
+      return count;
+    };
+
+    /** 从歌单移除曲目
+     * @param playlistId 歌单 ID
+     * @param trackIds 曲目 ID 列表
+     * @returns 是否移除成功
+     */
+    const removeTracksFromPlaylist = async (
+      playlistId: string,
+      trackIds: string[],
+    ): Promise<boolean> => {
+      const ok = await removeFromPlaylist(playlistId, trackIds);
+      if (!ok) return false;
+      if (playlistId === likedPlaylistId.value) {
+        const removeSet = new Set(trackIds);
+        const next = new Set(likedSongIds.value);
+        for (const trackId of trackIds) next.delete(trackId);
+        likedSongIds.value = next;
+        cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, [...next]).catch(() => {});
+        likedPlaylistTracks.value = likedPlaylistTracks.value.filter(
+          (track) => !removeSet.has(track.id),
+        );
+      }
+      return true;
+    };
+
+    /** 订阅 / 取消订阅他人歌单 */
+    const togglePlaylistSubscribe = async (
+      playlistId: string,
+      subscribe: boolean,
+    ): Promise<boolean> => {
+      const ok = await subscribePlaylist(playlistId, subscribe);
+      if (ok) await refreshPlaylists();
+      return ok;
+    };
+
     /** 同步用户内容 */
     const syncContent = (uid: number | undefined): void => {
       if (uid) void loadContent(uid);
@@ -337,8 +443,6 @@ export const useUserStore = defineStore(
       artists,
       level,
       subcount,
-      lastFetchedAt,
-      contentLoading,
       likedPlaylistId,
       likedPlaylistTracks,
       likedPlaylistLoading,
@@ -349,6 +453,13 @@ export const useUserStore = defineStore(
       toggleLike,
       ensureLikedPlaylist,
       clearContent,
+
+      createPlaylist,
+      deletePlaylist,
+      updatePlaylist,
+      addTracksToPlaylist,
+      removeTracksFromPlaylist,
+      togglePlaylistSubscribe,
     };
   },
   {

From 82bc430af1f3c77e4fab8cb4d1e1a47ed9fb9f9a Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Tue, 19 May 2026 01:09:30 +0800
Subject: [PATCH 18/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E6=AD=8C=E5=8D=95=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/apis/netease/index.ts           |   9 +-
 .../apis/netease/modules/playlist_delete.ts   |   6 +-
 .../netease/modules/playlist_order_update.ts  |   2 +-
 .../netease/modules/playlist_subscribe.ts     |   2 +-
 .../apis/netease/modules/playlist_tracks.ts   |  25 ++-
 src/apis/user/netease.ts                      |  98 ++++-----
 src/components/layout/SideBar.vue             |   5 +-
 src/components/list/SongList.vue              |  30 ++-
 .../modals/PlaylistCreateDialog.vue           |  21 +-
 .../modals/PlaylistPickerDialog.vue           |  25 ++-
 .../collection/useCollectionSubscribe.ts      |  56 +++++
 .../collection/usePlaylistManage.ts           | 119 ++++++++++
 src/composables/useMultiSelect.ts             |  42 ++--
 src/composables/useTrackMenu.ts               |  12 +-
 src/pages/Collection.vue                      | 204 +++++++-----------
 src/pages/History.vue                         |  16 +-
 src/pages/Liked.vue                           |   3 +-
 src/services/collectionLoader.ts              |   3 -
 src/stores/history.ts                         |  54 ++---
 src/stores/status.ts                          |   5 +-
 src/stores/user.ts                            |  56 ++---
 src/types/collection.ts                       |   3 +
 22 files changed, 468 insertions(+), 328 deletions(-)
 create mode 100644 src/composables/collection/useCollectionSubscribe.ts
 create mode 100644 src/composables/collection/usePlaylistManage.ts

diff --git a/electron/main/apis/netease/index.ts b/electron/main/apis/netease/index.ts
index 90836f21..f189ca9d 100644
--- a/electron/main/apis/netease/index.ts
+++ b/electron/main/apis/netease/index.ts
@@ -31,7 +31,7 @@ const SESSION_MUTATING: ReadonlySet<string> = new Set([
   "register_anonimous",
 ]);
 
-/** 写类接口：每次都必须打到服务端，不要走 2 分钟响应缓存 */
+/** 不采用缓存的实时接口 */
 const NON_CACHEABLE: ReadonlySet<string> = new Set([
   "like",
   "playlist_create",
@@ -41,9 +41,12 @@ const NON_CACHEABLE: ReadonlySet<string> = new Set([
   "playlist_name_update",
   "playlist_desc_update",
   "playlist_order_update",
+  "playlist_detail",
+  "user_playlist",
+  "user_subcount",
 ]);
 
-/** 内存缓存：避免每次调用都走 SELECT（SQLite 仅在首次 load 时读一次） */
+/** 内存缓存 */
 let sessionCache: Record<string, string> | null = null;
 
 const loadSession = (): Record<string, string> => {
@@ -108,7 +111,7 @@ export const callNetease = async (
 
   const session = loadSession();
 
-  // 读缓存；调用方如不想命中，按原项目惯例在 params 里带 `timestamp: Date.now()` 即可
+  // 读缓存
   const cacheable = !NON_CACHEABLE.has(name);
   const cacheKey = cacheable ? buildCacheKey(name, params) : "";
   if (cacheable) {
diff --git a/electron/main/apis/netease/modules/playlist_delete.ts b/electron/main/apis/netease/modules/playlist_delete.ts
index 994a9c5e..c1cb7ee2 100644
--- a/electron/main/apis/netease/modules/playlist_delete.ts
+++ b/electron/main/apis/netease/modules/playlist_delete.ts
@@ -3,8 +3,6 @@
  *
  * params:
  * - id  歌单 id（单个）
- *
- * 走 eapi /playlist/remove，data 字段是 `pid`（NCM 现行实现）
  * 响应：`{ code }`
  */
 
@@ -12,8 +10,8 @@ import { createOption } from "../core/option";
 import type { NeteaseModule } from "../core/types";
 
 const playlistDelete: NeteaseModule = (query, request) => {
-  const data = { pid: query.id };
-  return request("/api/playlist/remove", data, createOption(query, "eapi"));
+  const data = { ids: `[${query.id}]` };
+  return request("/api/playlist/remove", data, createOption(query, "weapi"));
 };
 
 export default playlistDelete;
diff --git a/electron/main/apis/netease/modules/playlist_order_update.ts b/electron/main/apis/netease/modules/playlist_order_update.ts
index 5c1d7292..9b577bc7 100644
--- a/electron/main/apis/netease/modules/playlist_order_update.ts
+++ b/electron/main/apis/netease/modules/playlist_order_update.ts
@@ -12,7 +12,7 @@ import type { NeteaseModule } from "../core/types";
 
 const playlistOrderUpdate: NeteaseModule = (query, request) => {
   const data = { ids: query.ids };
-  return request("/api/playlist/order/update", data, createOption(query, "eapi"));
+  return request("/api/playlist/order/update", data, createOption(query, "weapi"));
 };
 
 export default playlistOrderUpdate;
diff --git a/electron/main/apis/netease/modules/playlist_subscribe.ts b/electron/main/apis/netease/modules/playlist_subscribe.ts
index 91015803..5d64514b 100644
--- a/electron/main/apis/netease/modules/playlist_subscribe.ts
+++ b/electron/main/apis/netease/modules/playlist_subscribe.ts
@@ -14,7 +14,7 @@ import type { NeteaseModule } from "../core/types";
 const playlistSubscribe: NeteaseModule = (query, request) => {
   const action = query.t === 2 ? "unsubscribe" : "subscribe";
   const data = { id: query.id };
-  return request(`/api/playlist/${action}`, data, createOption(query, "weapi"));
+  return request(`/api/playlist/${action}`, data, createOption(query, "eapi"));
 };
 
 export default playlistSubscribe;
diff --git a/electron/main/apis/netease/modules/playlist_tracks.ts b/electron/main/apis/netease/modules/playlist_tracks.ts
index 89f4f1c5..fb81f474 100644
--- a/electron/main/apis/netease/modules/playlist_tracks.ts
+++ b/electron/main/apis/netease/modules/playlist_tracks.ts
@@ -7,19 +7,34 @@
  * - tracks  曲目 id 列表（逗号分隔字符串，由 wrapper 拼好）
  *
  * 响应：`{ code, count, trackIds, cloudCount }`
+ *
+ * 走默认 eapi。服务端 512 表示重复/受限，按 NCM 现行实现重试时把 trackIds 翻倍以强制写入
  */
 
 import { createOption } from "../core/option";
+import { NeteaseRequestError } from "../core/request";
 import type { NeteaseModule } from "../core/types";
 
-const playlistTracks: NeteaseModule = (query, request) => {
-  const data = {
+const playlistTracks: NeteaseModule = async (query, request) => {
+  const tracks = String(query.tracks ?? "").split(",");
+  const buildData = (ids: string[]) => ({
     op: query.op,
     pid: query.pid,
-    trackIds: `[${query.tracks}]`,
+    trackIds: JSON.stringify(ids),
     imme: "true",
-  };
-  return request("/api/playlist/manipulate/tracks", data, createOption(query, "weapi"));
+  });
+  try {
+    return await request("/api/playlist/manipulate/tracks", buildData(tracks), createOption(query));
+  } catch (err) {
+    if (err instanceof NeteaseRequestError && err.response.body?.code === 512) {
+      return request(
+        "/api/playlist/manipulate/tracks",
+        buildData([...tracks, ...tracks]),
+        createOption(query),
+      );
+    }
+    throw err;
+  }
 };
 
 export default playlistTracks;
diff --git a/src/apis/user/netease.ts b/src/apis/user/netease.ts
index 7986cc71..b5807bbb 100644
--- a/src/apis/user/netease.ts
+++ b/src/apis/user/netease.ts
@@ -9,6 +9,23 @@ const PAGE_SIZE = 50;
 /** song_detail 单批上限，500 在 URL 长度与延迟之间比较折中 */
 const SONG_DETAIL_BATCH = 500;
 
+interface NeteaseError {
+  code?: number;
+  message?: string;
+  msg?: string;
+}
+
+/**
+ * 校验网易云接口响应：code !== 200 时抛 Error，message 取自 body.message / body.msg
+ */
+const ensureOk = <T>(body: T): T => {
+  const meta = body as NeteaseError | null | undefined;
+  if (!meta || meta.code !== 200) {
+    throw new Error(meta?.message ?? meta?.msg ?? "");
+  }
+  return body;
+};
+
 /**
  * 通用分页直到拉完
  * @param fetcher 第 N 页拉取函数（offset/limit），返回 `{ data, hasMore }`
@@ -38,8 +55,6 @@ export interface FetchPlaylistOptions {
   onBatch?: (batch: Track[]) => void;
   /** 中断信号 */
   signal?: AbortSignal;
-  /** 绕过请求响应缓存 */
-  fresh?: boolean;
 }
 
 /**
@@ -56,9 +71,7 @@ export const fetchPlaylist = async (
   options: FetchPlaylistOptions = {},
 ): Promise<void> => {
   if (options.signal?.aborted) return;
-  const params: Record<string, unknown> = { id: playlistId };
-  if (options.fresh) params.timestamp = Date.now();
-  const body = await neteaseApi.playlist_detail(params);
+  const body = await neteaseApi.playlist_detail({ id: playlistId });
   if (options.signal?.aborted) return;
   const raw = body?.playlist;
   if (!raw) return;
@@ -119,23 +132,18 @@ export const fetchUserArtists = (): Promise<Artist[]> =>
   }, toArtist);
 
 /** 切换红心 */
-export const toggleLikeSong = async (trackId: string, like: boolean): Promise<boolean> => {
-  const body = await neteaseApi.like({ id: trackId, like });
-  return body?.code === 200;
+export const toggleLikeSong = async (trackId: string, like: boolean): Promise<void> => {
+  ensureOk(await neteaseApi.like({ id: trackId, like }));
 };
 
 /**
  * 新建歌单
  * @param name 歌单名
  * @param privacy 0 公开 / 10 私密
- * @returns 新建的歌单元数据；失败返回 null
+ * @returns 新建的歌单元数据
  */
-export const createPlaylist = async (
-  name: string,
-  privacy: 0 | 10 = 0,
-): Promise<Playlist | null> => {
-  const body = await neteaseApi.playlist_create({ name, privacy });
-  if (body?.code !== 200 || !body.playlist) return null;
+export const createPlaylist = async (name: string, privacy: 0 | 10 = 0): Promise<Playlist> => {
+  const body = ensureOk(await neteaseApi.playlist_create({ name, privacy }));
   return toPlaylist(body.playlist);
 };
 
@@ -143,9 +151,8 @@ export const createPlaylist = async (
  * 删除歌单
  * @param id 歌单 id
  */
-export const deletePlaylist = async (id: string): Promise<boolean> => {
-  const body = await neteaseApi.playlist_delete({ id });
-  return body?.code === 200;
+export const deletePlaylist = async (id: string): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_delete({ id }));
 };
 
 /**
@@ -153,9 +160,8 @@ export const deletePlaylist = async (id: string): Promise<boolean> => {
  * @param id 歌单 id
  * @param name 新名称
  */
-export const updatePlaylistName = async (id: string, name: string): Promise<boolean> => {
-  const body = await neteaseApi.playlist_name_update({ id, name });
-  return body?.code === 200;
+export const updatePlaylistName = async (id: string, name: string): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_name_update({ id, name }));
 };
 
 /**
@@ -163,25 +169,25 @@ export const updatePlaylistName = async (id: string, name: string): Promise<bool
  * @param id 歌单 id
  * @param desc 新描述（空字符串清空）
  */
-export const updatePlaylistDesc = async (id: string, desc: string): Promise<boolean> => {
-  const body = await neteaseApi.playlist_desc_update({ id, desc });
-  return body?.code === 200;
+export const updatePlaylistDesc = async (id: string, desc: string): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_desc_update({ id, desc }));
 };
 
 /**
  * 把曲目加入歌单
  * @param playlistId 歌单 id
  * @param trackIds 曲目 id 列表
- * @returns 实际加入条数；失败返回 0
+ * @returns 实际加入条数
  */
 export const addToPlaylist = async (playlistId: string, trackIds: string[]): Promise<number> => {
   if (trackIds.length === 0) return 0;
-  const body = await neteaseApi.playlist_tracks({
-    op: "add",
-    pid: playlistId,
-    tracks: trackIds.join(","),
-  });
-  if (body?.code !== 200) return 0;
+  const body = ensureOk(
+    await neteaseApi.playlist_tracks({
+      op: "add",
+      pid: playlistId,
+      tracks: trackIds.join(","),
+    }),
+  );
   return typeof body.count === "number" ? body.count : trackIds.length;
 };
 
@@ -190,17 +196,15 @@ export const addToPlaylist = async (playlistId: string, trackIds: string[]): Pro
  * @param playlistId 歌单 id
  * @param trackIds 曲目 id 列表
  */
-export const removeFromPlaylist = async (
-  playlistId: string,
-  trackIds: string[],
-): Promise<boolean> => {
-  if (trackIds.length === 0) return false;
-  const body = await neteaseApi.playlist_tracks({
-    op: "del",
-    pid: playlistId,
-    tracks: trackIds.join(","),
-  });
-  return body?.code === 200;
+export const removeFromPlaylist = async (playlistId: string, trackIds: string[]): Promise<void> => {
+  if (trackIds.length === 0) return;
+  ensureOk(
+    await neteaseApi.playlist_tracks({
+      op: "del",
+      pid: playlistId,
+      tracks: trackIds.join(","),
+    }),
+  );
 };
 
 /**
@@ -208,18 +212,16 @@ export const removeFromPlaylist = async (
  * @param id 歌单 id
  * @param subscribe true 订阅 / false 取消
  */
-export const subscribePlaylist = async (id: string, subscribe: boolean): Promise<boolean> => {
-  const body = await neteaseApi.playlist_subscribe({ id, t: subscribe ? 1 : 2 });
-  return body?.code === 200;
+export const subscribePlaylist = async (id: string, subscribe: boolean): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_subscribe({ id, t: subscribe ? 1 : 2 }));
 };
 
 /**
  * 重排自建歌单顺序
  * @param ids 期望顺序的歌单 id 数组
  */
-export const reorderPlaylists = async (ids: string[]): Promise<boolean> => {
-  const body = await neteaseApi.playlist_order_update({ ids: JSON.stringify(ids) });
-  return body?.code === 200;
+export const reorderPlaylists = async (ids: string[]): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_order_update({ ids: JSON.stringify(ids) }));
 };
 
 /** 用户等级 */
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 950a97a8..4ae7c533 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { SMenuItem } from "@/components/ui/SMenu.vue";
 import type { SSelectOption } from "@/components/ui/SSelect.vue";
+import type { ContentScope } from "@/types/collection";
 import { useSettingsStore } from "@/stores/settings";
 import { useStatusStore } from "@/stores/status";
 import { usePlaylistStore } from "@/stores/playlist";
@@ -33,7 +34,7 @@ const sourceOptions = computed<SSelectOption[]>(() => [
 ]);
 
 const createDialogOpen = ref(false);
-const createMode = ref<"local" | "online">("local");
+const createMode = ref<ContentScope>("local");
 
 const handleCreate = (): void => {
   createMode.value = status.myPlaylistSource;
@@ -57,7 +58,7 @@ const renderMyHeader = () =>
         options: sourceOptions.value,
         side: "bottom",
         align: "start",
-        "onUpdate:modelValue": (v) => (status.myPlaylistSource = v as "local" | "online"),
+        "onUpdate:modelValue": (v) => (status.myPlaylistSource = v as ContentScope),
       },
       {
         trigger: () =>
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 8ec18350..b0787a53 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Artist, Track, TrackSource } from "@shared/types/player";
-import type { CollectionType } from "@/types/collection";
+import type { CollectionType, ContentScope } from "@/types/collection";
 import { useMediaStore } from "@/stores/media";
 import { useStatusStore } from "@/stores/status";
 import { useSettingsStore } from "@/stores/settings";
@@ -17,6 +17,7 @@ import * as player from "@/core/player";
 import IconArrowUpDown from "~icons/lucide/arrow-up-down";
 import IconArrowUpAz from "~icons/lucide/arrow-up-az";
 import IconLucideListEnd from "~icons/lucide/list-end";
+import IconLucideListPlus from "~icons/lucide/list-plus";
 import IconLucideListMinus from "~icons/lucide/list-minus";
 import IconLucideTrash2 from "~icons/lucide/trash-2";
 import IconLucideArrowLeftRight from "~icons/lucide/arrow-left-right";
@@ -201,20 +202,21 @@ const batch = useMultiSelect(sortedItems, {
   source: computed(() => props.source),
   collectionType: computed(() => props.collectionType),
   collectionId: computed(() => props.collectionId),
-  onChanged: () => emit("change"),
+  onChanged: (removedIds) => emit("change", removedIds),
 });
 const { deleteConfirmOpen, deleteDialogTitle, deleteDialogContent } = batch;
 
-/** 添加到歌单弹窗：mode 跟随被操作曲目的 source（仅 local / netease 走得通） */
+/** 添加到歌单相关 */
 const pickerOpen = ref(false);
 const pickerTracks = shallowRef<Track[]>([]);
-const pickerMode = ref<"local" | "online">("local");
+const pickerMode = computed<ContentScope>(() => (props.source === "netease" ? "online" : "local"));
+
+/**
+ * 打开添加到歌单
+ * @param tracks 添加的歌曲
+ */
 const openPicker = (tracks: Track[]): void => {
-  if (tracks.length === 0) return;
-  const source = tracks[0].source;
-  if (source !== "local" && source !== "netease") return;
   pickerTracks.value = tracks;
-  pickerMode.value = source === "netease" ? "online" : "local";
   pickerOpen.value = true;
 };
 
@@ -230,7 +232,7 @@ const { items: contextMenuItems, handleSelect: onContextMenu } = useTrackMenu(co
 const emit = defineEmits<{
   scroll: [event: Event];
   reachBottom: [];
-  change: [];
+  change: [removedIds: string[]];
 }>();
 
 onActivated(batch.exit);
@@ -322,6 +324,16 @@ defineExpose({
                 <template #icon><IconLucideListEnd class="size-3.5" /></template>
                 <span>{{ t("songList.batch.addToQueue") }}</span>
               </SButton>
+              <SButton
+                v-if="source === 'local' || source === 'netease'"
+                variant="ghost"
+                size="small"
+                :disabled="batch.selectedCount.value === 0"
+                @click="openPicker(batch.selectedItems.value)"
+              >
+                <template #icon><IconLucideListPlus class="size-3.5" /></template>
+                <span>{{ t("collection.addTo", { type: t("collection.playlist") }) }}</span>
+              </SButton>
               <SButton
                 v-if="batch.canRemove.value"
                 variant="ghost"
diff --git a/src/components/modals/PlaylistCreateDialog.vue b/src/components/modals/PlaylistCreateDialog.vue
index 78530cd6..a9bc1b80 100644
--- a/src/components/modals/PlaylistCreateDialog.vue
+++ b/src/components/modals/PlaylistCreateDialog.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { ContentScope } from "@/types/collection";
 import { usePlaylistStore } from "@/stores/playlist";
 import { useUserStore } from "@/stores/user";
 import { toast } from "@/composables/useToast";
@@ -6,7 +7,7 @@ import { toast } from "@/composables/useToast";
 const props = defineProps<{
   open: boolean;
   /** 本地 / 在线 */
-  mode: "local" | "online";
+  mode: ContentScope;
 }>();
 const emit = defineEmits<{
   "update:open": [value: boolean];
@@ -41,13 +42,16 @@ const handleConfirm = async (): Promise<void> => {
     const id =
       props.mode === "local"
         ? (await playlistStore.create(value)).id
-        : (await userStore.createPlaylist(value, privacy.value))?.id;
+        : (await userStore.createPlaylist(value, privacy.value)).id;
     if (!id) {
       toast.error(t("liked.toast.failed"));
       return;
     }
     emit("created", id);
     emit("update:open", false);
+  } catch (err) {
+    const message = err instanceof Error && err.message ? err.message : t("liked.toast.failed");
+    toast.error(message);
   } finally {
     submitting.value = false;
   }
@@ -65,12 +69,12 @@ const handleConfirm = async (): Promise<void> => {
       <SInput
         v-model="name"
         :placeholder="t('collection.playlist')"
-        clearable
         :disabled="submitting"
+        clearable
         @keyup.enter="handleConfirm"
       />
-      <div v-if="mode === 'online'" class="flex items-center justify-between">
-        <span class="text-sm text-on-surface">{{ t("collection.privacy.private") }}</span>
+      <div v-if="mode === 'online'" class="flex items-center gap-2">
+        <span class="text-on-surface">{{ t("collection.privacy.private") }}</span>
         <SSwitch
           :model-value="privacy === 10"
           :disabled="submitting"
@@ -82,12 +86,7 @@ const handleConfirm = async (): Promise<void> => {
       <SButton variant="tertiary" :disabled="submitting" @click="close">
         {{ t("common.cancel") }}
       </SButton>
-      <SButton
-        type="primary"
-        :disabled="!name.trim()"
-        :loading="submitting"
-        @click="handleConfirm"
-      >
+      <SButton type="primary" :disabled="!name.trim()" :loading="submitting" @click="handleConfirm">
         {{ t("common.confirm") }}
       </SButton>
     </template>
diff --git a/src/components/modals/PlaylistPickerDialog.vue b/src/components/modals/PlaylistPickerDialog.vue
index 5f270fcf..d2f2d7e9 100644
--- a/src/components/modals/PlaylistPickerDialog.vue
+++ b/src/components/modals/PlaylistPickerDialog.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { Track } from "@shared/types/player";
+import type { ContentScope } from "@/types/collection";
 import { usePlaylistStore } from "@/stores/playlist";
 import { useUserStore } from "@/stores/user";
 import { toast } from "@/composables/useToast";
@@ -9,7 +10,7 @@ import IconLucidePlus from "~icons/lucide/plus";
 const props = defineProps<{
   open: boolean;
   /** 本地 / 在线 */
-  mode: "local" | "online";
+  mode: ContentScope;
   /** 要加入的曲目 */
   tracks: Track[];
 }>();
@@ -39,8 +40,7 @@ const entries = computed<PickerEntry[]>(() => {
   // 跳过"我喜欢"，红心按钮负责那条路径
   return userStore.createdPlaylists
     .filter(
-      (pl): pl is typeof pl & { id: string } =>
-        !!pl.id && pl.id !== userStore.likedPlaylistId,
+      (pl): pl is typeof pl & { id: string } => !!pl.id && pl.id !== userStore.likedPlaylistId,
     )
     .map((pl) => ({
       id: pl.id,
@@ -57,17 +57,22 @@ const handlePick = async (playlistId: string): Promise<void> => {
   if (submitting.value) return;
   submitting.value = true;
   try {
-    let success = false;
+    let count = 0;
     if (props.mode === "local") {
-      const count = await playlistStore.addTracks(playlistId, props.tracks);
-      success = count > 0;
+      count = await playlistStore.addTracks(playlistId, props.tracks);
     } else {
       const ids = props.tracks.map((track) => track.id);
-      const count = await userStore.addTracksToPlaylist(playlistId, ids);
-      success = count > 0;
+      count = await userStore.addTracksToPlaylist(playlistId, ids);
     }
-    toast[success ? "success" : "error"](t(success ? "liked.toast.added" : "liked.toast.failed"));
-    if (success) emit("update:open", false);
+    if (count > 0) {
+      toast.success(t("liked.toast.added"));
+      emit("update:open", false);
+    } else {
+      toast.error(t("liked.toast.failed"));
+    }
+  } catch (err) {
+    const message = err instanceof Error && err.message ? err.message : t("liked.toast.failed");
+    toast.error(message);
   } finally {
     submitting.value = false;
   }
diff --git a/src/composables/collection/useCollectionSubscribe.ts b/src/composables/collection/useCollectionSubscribe.ts
new file mode 100644
index 00000000..91fb2c61
--- /dev/null
+++ b/src/composables/collection/useCollectionSubscribe.ts
@@ -0,0 +1,56 @@
+import type { Ref } from "vue";
+import type { Collection } from "@/types/collection";
+import { useUserStore } from "@/stores/user";
+import { toast } from "@/composables/useToast";
+
+/**
+ * 通用收藏 / 取消收藏
+ *
+ * 当前支持：netease playlist
+ * 待接入：netease album / radio
+ */
+export const useCollectionSubscribe = (collection: Ref<Collection | null>) => {
+  const { t } = useI18n();
+  const userStore = useUserStore();
+  const busy = ref(false);
+
+  /** 当前是否已收藏 */
+  const isSubscribed = computed(() => {
+    const current = collection.value;
+    if (!current || current.source !== "netease") return false;
+    if (current.type === "playlist") {
+      return userStore.subscribedPlaylists.some((item) => item.id === current.id);
+    }
+    return false;
+  });
+
+  /** 是否显示收藏按钮：仅 netease，且不是自建（自建无法再"收藏"） */
+  const available = computed(() => {
+    const current = collection.value;
+    if (!current || current.source !== "netease") return false;
+    if (current.type === "playlist") {
+      return !userStore.createdPlaylists.some((item) => item.id === current.id);
+    }
+    return false;
+  });
+
+  /** 切换收藏状态 */
+  const toggle = async (): Promise<void> => {
+    const current = collection.value;
+    if (!current || busy.value || !available.value) return;
+    busy.value = true;
+    try {
+      const next = !isSubscribed.value;
+      if (current.type === "playlist") {
+        await userStore.togglePlaylistSubscribe(current.id, next);
+      }
+    } catch (err) {
+      const message = err instanceof Error && err.message ? err.message : t("liked.toast.failed");
+      toast.error(message);
+    } finally {
+      busy.value = false;
+    }
+  };
+
+  return { available, isSubscribed, busy, toggle };
+};
diff --git a/src/composables/collection/usePlaylistManage.ts b/src/composables/collection/usePlaylistManage.ts
new file mode 100644
index 00000000..816f55ab
--- /dev/null
+++ b/src/composables/collection/usePlaylistManage.ts
@@ -0,0 +1,119 @@
+import type { Ref } from "vue";
+import type { Collection } from "@/types/collection";
+import { usePlaylistStore } from "@/stores/playlist";
+import { useUserStore } from "@/stores/user";
+import { toast } from "@/composables/useToast";
+
+export interface PlaylistManageOptions {
+  /** 编辑成功后回调 */
+  onEdited?: () => void;
+  /** 删除成功后回调 */
+  onDeleted?: () => void;
+}
+
+/** 取服务端错误 message，没有则用兜底 */
+const errorMessage = (err: unknown, fallback: string): string =>
+  err instanceof Error && err.message ? err.message : fallback;
+
+/**
+ * 歌单管理：编辑（改名/改描述）与删除
+ */
+export const usePlaylistManage = (
+  collection: Ref<Collection | null>,
+  options: PlaylistManageOptions = {},
+) => {
+  const { t } = useI18n();
+  const playlistStore = usePlaylistStore();
+  const userStore = useUserStore();
+
+  /** 是否可管理 */
+  const canManage = computed(() => {
+    const current = collection.value;
+    if (!current || current.type !== "playlist") return false;
+    if (current.source === "local") return true;
+    if (current.source !== "netease") return false;
+    const isCreated = userStore.createdPlaylists.some((item) => item.id === current.id);
+    const isLiked = userStore.likedPlaylistId === current.id;
+    return isCreated && !isLiked;
+  });
+
+  /** 编辑弹窗 */
+  const editOpen = ref(false);
+  const editTitle = ref("");
+  const editDescription = ref("");
+  const submitting = ref(false);
+
+  const openEdit = (): void => {
+    const current = collection.value;
+    if (!current) return;
+    editTitle.value = current.title;
+    editDescription.value = current.description ?? "";
+    editOpen.value = true;
+  };
+
+  const saveEdit = async (): Promise<void> => {
+    const current = collection.value;
+    if (!current || submitting.value || !editTitle.value.trim()) return;
+    submitting.value = true;
+    try {
+      const title = editTitle.value.trim();
+      const description = editDescription.value.trim();
+      if (current.source === "local") {
+        await playlistStore.update(current.id, {
+          title,
+          description: description || undefined,
+        });
+      } else {
+        await userStore.updatePlaylist(current.id, { name: title, description });
+      }
+      editOpen.value = false;
+      options.onEdited?.();
+    } catch (err) {
+      toast.error(errorMessage(err, t("liked.toast.failed")));
+    } finally {
+      submitting.value = false;
+    }
+  };
+
+  /** 删除弹窗 */
+  const deleteOpen = ref(false);
+  const deleting = ref(false);
+
+  const openDelete = (): void => {
+    if (!collection.value) return;
+    deleteOpen.value = true;
+  };
+
+  const confirmDelete = async (): Promise<void> => {
+    const current = collection.value;
+    if (!current || deleting.value) return;
+    deleting.value = true;
+    try {
+      if (current.source === "local") {
+        await playlistStore.remove(current.id);
+      } else {
+        await userStore.deletePlaylist(current.id);
+      }
+      deleteOpen.value = false;
+      options.onDeleted?.();
+    } catch (err) {
+      toast.error(errorMessage(err, t("liked.toast.failed")));
+    } finally {
+      deleting.value = false;
+    }
+  };
+
+  return {
+    canManage,
+    editOpen,
+    editTitle,
+    editDescription,
+    submitting,
+    openEdit,
+    saveEdit,
+    deleteOpen,
+    deleting,
+    openDelete,
+    confirmDelete,
+  };
+};
diff --git a/src/composables/useMultiSelect.ts b/src/composables/useMultiSelect.ts
index ac7adfee..f6315a0c 100644
--- a/src/composables/useMultiSelect.ts
+++ b/src/composables/useMultiSelect.ts
@@ -4,6 +4,7 @@ import type { CollectionType } from "@/types/collection";
 import { usePlaylistStore } from "@/stores/playlist";
 import { useLibraryStore } from "@/stores/library";
 import { useUserStore } from "@/stores/user";
+import { toast } from "@/composables/useToast";
 import * as player from "@/core/player";
 
 export interface MultiSelectOptions {
@@ -13,8 +14,11 @@ export interface MultiSelectOptions {
   collectionType: Ref<CollectionType | undefined>;
   /** 集合 ID */
   collectionId: Ref<string | undefined>;
-  /** 删除/移除完成后的回调 */
-  onChanged?: () => void;
+  /**
+   * 删除/移除完成后的回调
+   * @param removedIds 成功删除的曲目 id 列表
+   */
+  onChanged?: (removedIds: string[]) => void;
 }
 
 /**
@@ -103,25 +107,25 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
 
   const confirmDelete = async (): Promise<void> => {
     const tracks = pendingDeleteTracks.value;
-    if (pendingDeleteAction.value === "file") {
-      const paths = tracks.map((t) => t.path).filter((p): p is string => !!p);
-      if (paths.length > 0) await libraryStore.deleteTracks(paths);
-    } else if (options.collectionId.value) {
-      if (options.source.value === "local") {
-        await playlistStore.removeTracks(
-          options.collectionId.value,
-          tracks.map((track) => track.id),
-        );
-      } else if (options.source.value === "netease") {
-        await userStore.removeTracksFromPlaylist(
-          options.collectionId.value,
-          tracks.map((track) => track.id),
-        );
+    const ids = tracks.map((track) => track.id);
+    try {
+      if (pendingDeleteAction.value === "file") {
+        const paths = tracks.map((t) => t.path).filter((p): p is string => !!p);
+        if (paths.length > 0) await libraryStore.deleteTracks(paths);
+      } else if (options.collectionId.value) {
+        if (options.source.value === "local") {
+          await playlistStore.removeTracks(options.collectionId.value, ids);
+        } else if (options.source.value === "netease") {
+          await userStore.removeTracksFromPlaylist(options.collectionId.value, ids);
+        }
       }
+      deleteConfirmOpen.value = false;
+      exit();
+      options.onChanged?.(ids);
+    } catch (err) {
+      const message = err instanceof Error && err.message ? err.message : t("liked.toast.failed");
+      toast.error(message);
     }
-    deleteConfirmOpen.value = false;
-    exit();
-    options.onChanged?.();
   };
 
   const cancelDelete = (): void => {
diff --git a/src/composables/useTrackMenu.ts b/src/composables/useTrackMenu.ts
index 0f7682ba..9ab26a92 100644
--- a/src/composables/useTrackMenu.ts
+++ b/src/composables/useTrackMenu.ts
@@ -29,12 +29,14 @@ export interface TrackMenuOptions {
  */
 export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOptions = {}) => {
   const { t } = useI18n();
-
-  // 本地操作（资源管理器 / 复制路径 / 删除文件）按右键的那首歌判断；
-  // playlist 是列表语境，沿用集合级
+  // 可本地操作
   const isLocal = computed(() => track.value?.source === "local");
   const isPlaylist = options.collectionType === "playlist";
-
+  // 是否添加到歌单
+  const canAddToPlaylist = computed(() => {
+    const source = track.value?.source;
+    return source === "local" || source === "netease";
+  });
   // 菜单项
   const items = computed<DropdownMenuItem[]>(() => [
     { key: "play", label: t("songList.context.play"), icon: markRaw(IconPlay) },
@@ -44,7 +46,7 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
       label: t("collection.addTo", { type: t("collection.playlist") }),
       icon: markRaw(IconListPlus),
       separator: true,
-      show: !!options.onAddToPlaylist,
+      show: canAddToPlaylist.value,
     },
     {
       key: "showInExplorer",
diff --git a/src/pages/Collection.vue b/src/pages/Collection.vue
index 1f8771b5..75f513b3 100644
--- a/src/pages/Collection.vue
+++ b/src/pages/Collection.vue
@@ -2,9 +2,9 @@
 import type { TrackSource } from "@shared/types/player";
 import type { Collection, CollectionType } from "@/types/collection";
 import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
-import { usePlaylistStore } from "@/stores/playlist";
-import { useUserStore } from "@/stores/user";
 import { loadCollection as loadCollectionService } from "@/services/collectionLoader";
+import { useCollectionSubscribe } from "@/composables/collection/useCollectionSubscribe";
+import { usePlaylistManage } from "@/composables/collection/usePlaylistManage";
 import SongList from "@/components/list/SongList.vue";
 import { formatTime } from "@/utils/time";
 import * as player from "@/core/player";
@@ -20,43 +20,18 @@ import IconMaterialSymbolsFavoriteOutlineRounded from "~icons/material-symbols/f
 
 const { t } = useI18n();
 const route = useRoute();
-const playlistStore = usePlaylistStore();
-const userStore = useUserStore();
+const router = useRouter();
 
 const source = route.params.source as TrackSource;
 const type = route.params.type as CollectionType;
 const id = route.params.id as string;
 
 const collection = shallowRef<Collection | null>(null);
-/** 正在加载（任一来源） */
+/** 正在加载 */
 const loading = ref(false);
-/** 取消当次加载（路由切换/卸载时 abort） */
+/** 取消当次加载 */
 let loadAbort: AbortController | null = null;
 
-/** 是否本地歌单 */
-const isLocalPlaylist = source === "local" && type === "playlist";
-/** 是否网易云歌单 */
-const isNeteasePlaylist = source === "netease" && type === "playlist";
-/** 是否网易云自建歌单 */
-const isOnlineCreated = computed(
-  () => isNeteasePlaylist && userStore.createdPlaylists.some((pl) => pl.id === id),
-);
-/** 是否"我喜欢的音乐"歌单 */
-const isLikedPlaylist = computed(
-  () => isNeteasePlaylist && userStore.likedPlaylistId === id,
-);
-/** 是否在线收藏的他人歌单 */
-const isOnlineSubscribed = computed(
-  () => isNeteasePlaylist && userStore.subscribedPlaylists.some((pl) => pl.id === id),
-);
-/** 可改名 / 删除 */
-const canManage = computed(
-  () => isLocalPlaylist || (isOnlineCreated.value && !isLikedPlaylist.value),
-);
-/** 是否显示收藏按钮 */
-const canSubscribe = computed(() => isNeteasePlaylist && !isOnlineCreated.value);
-const subscribeBusy = ref(false);
-
 /** 折叠状态 */
 const collapsed = ref(false);
 
@@ -70,8 +45,8 @@ const handleListScroll = (event: Event) => {
   }
 };
 
-/** 加载数据：派发到 services/collectionLoader，本组件只管 ref + loading + abort */
-const loadCollection = async (fresh = false): Promise<void> => {
+/** 加载数据 */
+const loadCollection = async (): Promise<void> => {
   collapsed.value = false;
   loadAbort?.abort();
   const myAbort = new AbortController();
@@ -82,7 +57,6 @@ const loadCollection = async (fresh = false): Promise<void> => {
     await loadCollectionService(source, type, id, {
       fallbackName: typeof route.query.name === "string" ? route.query.name : undefined,
       signal: myAbort.signal,
-      fresh,
       onUpdate: (next) => {
         if (myAbort.signal.aborted) return;
         collection.value = next;
@@ -93,11 +67,20 @@ const loadCollection = async (fresh = false): Promise<void> => {
   }
 };
 
-loadCollection();
-
-onBeforeUnmount(() => {
-  loadAbort?.abort();
-});
+/**
+ * 乐观过滤本地 tracks
+ * @param removedIds 已成功删除的曲目 id 列表
+ */
+const handleTracksRemoved = (removedIds: string[]): void => {
+  if (!collection.value || removedIds.length === 0) return;
+  const removed = new Set(removedIds);
+  const tracks = collection.value.tracks.filter((track) => !removed.has(track.id));
+  collection.value = {
+    ...collection.value,
+    tracks,
+    trackCount: tracks.length,
+  };
+};
 
 const typeLabel = computed(() => {
   const map: Record<CollectionType, string> = {
@@ -115,13 +98,13 @@ const totalDuration = computed(() => {
   return total > 0 ? formatTime(total) : "";
 });
 
-/** 歌手文本（仅专辑有 artists 列表时单独成行） */
+/** 歌手文本 */
 const artistText = computed(() => {
   if (!collection.value?.artists?.length) return "";
   return collection.value.artists.map((a) => a.name).join(" / ");
 });
 
-/** 创建者（歌单作者）：合集元信息行内的小 chip */
+/** 创建者（歌单作者） */
 const creatorText = computed(() => {
   if (collection.value?.artists?.length) return "";
   return collection.value?.creator ?? "";
@@ -143,6 +126,18 @@ const searchQuery = ref("");
 /** 歌曲列表引用 */
 const songListRef = shallowRef<InstanceType<typeof SongList> | null>(null);
 
+/** 收藏 / 取消收藏 */
+const subscribe = useCollectionSubscribe(collection);
+
+/** 歌单管理：编辑 + 删除 */
+const manage = usePlaylistManage(collection, {
+  onEdited: () => loadCollection(),
+  onDeleted: () => {
+    if (window.history.length > 1) router.back();
+    else router.replace("/");
+  },
+});
+
 /** 更多菜单 */
 const editLabel = computed(() => t("collection.edit", { type: typeLabel.value }));
 
@@ -150,7 +145,7 @@ const moreMenuItems = computed<DropdownMenuItem[]>(() => {
   const list: DropdownMenuItem[] = [
     { key: "batchManage", label: t("songList.batch.manage"), icon: IconLucideListChecks },
   ];
-  if (canManage.value) {
+  if (manage.canManage.value) {
     list.push({ key: "edit", label: editLabel.value, icon: IconLucidePencil });
     list.push({
       key: "delete",
@@ -162,84 +157,27 @@ const moreMenuItems = computed<DropdownMenuItem[]>(() => {
   return list;
 });
 
-/** 编辑弹窗 */
-const editDialogOpen = ref(false);
-const editTitle = ref("");
-const editDescription = ref("");
-
-const openEditDialog = () => {
-  if (!collection.value) return;
-  editTitle.value = collection.value.title;
-  editDescription.value = collection.value.description ?? "";
-  editDialogOpen.value = true;
-};
-
-const handleSaveEdit = async () => {
-  if (!collection.value || !editTitle.value.trim()) return;
-  const title = editTitle.value.trim();
-  const description = editDescription.value.trim();
-  if (isLocalPlaylist) {
-    await playlistStore.update(collection.value.id, {
-      title,
-      description: description || undefined,
-    });
-  } else {
-    await userStore.updatePlaylist(collection.value.id, {
-      name: title,
-      description,
-    });
-  }
-  await loadCollection(true);
-  editDialogOpen.value = false;
-};
-
-/** 删除确认 */
-const deleteConfirmOpen = ref(false);
-const deleteTitle = ref("");
-const router = useRouter();
-
-const handleDelete = async () => {
-  if (!collection.value) return;
-  if (isLocalPlaylist) {
-    await playlistStore.remove(collection.value.id);
-  } else {
-    const ok = await userStore.deletePlaylist(collection.value.id);
-    if (!ok) {
-      deleteConfirmOpen.value = false;
-      return;
-    }
-  }
-  deleteConfirmOpen.value = false;
-  router.back();
-};
-
-/** 收藏 / 取消收藏 */
-const handleToggleSubscribe = async (): Promise<void> => {
-  if (!collection.value || subscribeBusy.value) return;
-  subscribeBusy.value = true;
-  try {
-    const next = !isOnlineSubscribed.value;
-    const ok = await userStore.togglePlaylistSubscribe(collection.value.id, next);
-    if (ok && !next) router.back();
-  } finally {
-    subscribeBusy.value = false;
-  }
-};
-
 const handleMoreMenu = (key: string) => {
   switch (key) {
     case "batchManage":
       songListRef.value?.enterBatch();
       break;
     case "edit":
-      openEditDialog();
+      manage.openEdit();
       break;
     case "delete":
-      deleteTitle.value = collection.value?.title ?? "";
-      deleteConfirmOpen.value = true;
+      manage.openDelete();
       break;
   }
 };
+
+onMounted(() => {
+  loadCollection();
+});
+
+onBeforeUnmount(() => {
+  loadAbort?.abort();
+});
 </script>
 
 <template>
@@ -321,17 +259,23 @@ const handleMoreMenu = (key: string) => {
                 {{ t("common.playAll") }}
               </SButton>
               <SButton
-                v-if="canSubscribe"
+                v-if="subscribe.available.value"
                 variant="secondary"
                 round
-                :disabled="subscribeBusy"
-                @click="handleToggleSubscribe"
+                :disabled="subscribe.busy.value"
+                @click="subscribe.toggle"
               >
                 <template #icon>
-                  <IconMaterialSymbolsFavoriteRounded v-if="isOnlineSubscribed" />
+                  <IconMaterialSymbolsFavoriteRounded v-if="subscribe.isSubscribed.value" />
                   <IconMaterialSymbolsFavoriteOutlineRounded v-else />
                 </template>
-                {{ t(isOnlineSubscribed ? "collection.unsubscribe" : "collection.subscribe") }}
+                {{
+                  t(
+                    subscribe.isSubscribed.value
+                      ? "collection.unsubscribe"
+                      : "collection.subscribe",
+                  )
+                }}
               </SButton>
               <SDropdownMenu
                 v-if="moreMenuItems.length > 0"
@@ -381,7 +325,7 @@ const handleMoreMenu = (key: string) => {
           :collection-id="id"
           enable-sort
           @scroll="handleListScroll"
-          @change="loadCollection(true)"
+          @change="handleTracksRemoved"
         />
       </div>
       <!-- 加载中 -->
@@ -400,30 +344,44 @@ const handleMoreMenu = (key: string) => {
       </div>
     </Transition>
     <!-- 编辑弹窗 -->
-    <SDialog v-model:open="editDialogOpen" :title="editLabel" width="400px">
+    <SDialog v-model:open="manage.editOpen.value" :title="editLabel" width="400px">
       <div class="flex flex-col gap-4">
         <SFormItem :label="t('collection.name', { type: typeLabel })">
-          <SInput v-model="editTitle" />
+          <SInput v-model="manage.editTitle.value" :disabled="manage.submitting.value" />
         </SFormItem>
         <SFormItem :label="t('collection.description', { type: typeLabel })">
-          <SInput v-model="editDescription" />
+          <SInput v-model="manage.editDescription.value" :disabled="manage.submitting.value" />
         </SFormItem>
       </div>
       <template #footer="{ close }">
-        <SButton variant="secondary" @click="close">{{ t("common.cancel") }}</SButton>
-        <SButton type="primary" :disabled="!editTitle.trim()" @click="handleSaveEdit">
+        <SButton variant="secondary" :disabled="manage.submitting.value" @click="close">
+          {{ t("common.cancel") }}
+        </SButton>
+        <SButton
+          type="primary"
+          :disabled="!manage.editTitle.value.trim()"
+          :loading="manage.submitting.value"
+          @click="manage.saveEdit"
+        >
           {{ t("common.confirm") }}
         </SButton>
       </template>
     </SDialog>
     <!-- 删除确认 -->
-    <SDialog v-model:open="deleteConfirmOpen" :title="t('collection.delete', { type: typeLabel })">
+    <SDialog
+      v-model:open="manage.deleteOpen.value"
+      :title="t('collection.delete', { type: typeLabel })"
+    >
       <p class="text-sm text-on-surface-variant">
-        {{ t("collection.deleteConfirm", { type: typeLabel, title: deleteTitle }) }}
+        {{ t("collection.deleteConfirm", { type: typeLabel, title: collection?.title ?? "" }) }}
       </p>
       <template #footer="{ close }">
-        <SButton variant="secondary" @click="close">{{ t("common.cancel") }}</SButton>
-        <SButton type="error" @click="handleDelete">{{ t("common.confirm") }}</SButton>
+        <SButton variant="secondary" :disabled="manage.deleting.value" @click="close">
+          {{ t("common.cancel") }}
+        </SButton>
+        <SButton type="error" :loading="manage.deleting.value" @click="manage.confirmDelete">
+          {{ t("common.confirm") }}
+        </SButton>
       </template>
     </SDialog>
   </div>
diff --git a/src/pages/History.vue b/src/pages/History.vue
index c654c05e..fabd7da9 100644
--- a/src/pages/History.vue
+++ b/src/pages/History.vue
@@ -3,7 +3,6 @@ import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
 import { useHistoryStore } from "@/stores/history";
 import SongList from "@/components/list/SongList.vue";
 import * as player from "@/core/player";
-import IconLucideListChecks from "~icons/lucide/list-checks";
 import IconLucideTrash2 from "~icons/lucide/trash-2";
 
 const { t } = useI18n();
@@ -16,31 +15,19 @@ const handlePlayAll = (): void => {
   player.playFrom(history.tracks, 0);
 };
 
-const songListRef = shallowRef<InstanceType<typeof SongList> | null>(null);
-
 const clearConfirmOpen = ref(false);
 
 /** 更多菜单 */
 const moreMenuItems = computed<DropdownMenuItem[]>(() => [
-  {
-    key: "batch",
-    label: t("songList.batch.manage"),
-    icon: markRaw(IconLucideListChecks),
-  },
   {
     key: "clear",
     label: t("history.clear"),
     icon: markRaw(IconLucideTrash2),
-    separator: true,
   },
 ]);
 
 const handleMoreMenu = (key: string): void => {
-  if (key === "batch") {
-    songListRef.value?.enterBatch();
-  } else if (key === "clear") {
-    clearConfirmOpen.value = true;
-  }
+  if (key === "clear") clearConfirmOpen.value = true;
 };
 
 const handleClear = (): void => {
@@ -112,7 +99,6 @@ onMounted(() => {
     <Transition name="fade" mode="out-in" :duration="150">
       <div v-if="history.tracks.length > 0" key="list" class="flex-1 min-h-0">
         <SongList
-          ref="songListRef"
           :items="history.tracks"
           :search-query="searchQuery"
           :show-size="false"
diff --git a/src/pages/Liked.vue b/src/pages/Liked.vue
index bfbc5933..3efdd29b 100644
--- a/src/pages/Liked.vue
+++ b/src/pages/Liked.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { Track } from "@shared/types/player";
+import type { ContentScope } from "@/types/collection";
 import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
 import { useLibraryStore } from "@/stores/library";
 import { useUserStore } from "@/stores/user";
@@ -18,7 +19,7 @@ const status = useStatusStore();
 /** 当前 tab */
 const tab = computed({
   get: () => status.likedPageTab,
-  set: (v: "local" | "online") => (status.likedPageTab = v),
+  set: (v: ContentScope) => (status.likedPageTab = v),
 });
 
 const tabs = computed(() => [
diff --git a/src/services/collectionLoader.ts b/src/services/collectionLoader.ts
index 3f5d948a..3929237d 100644
--- a/src/services/collectionLoader.ts
+++ b/src/services/collectionLoader.ts
@@ -21,8 +21,6 @@ export interface LoadCollectionOptions {
   onUpdate: (collection: Collection | null) => void;
   /** 中断信号 */
   signal?: AbortSignal;
-  /** 强制绕过主进程响应缓存（在 mutate 后重载时用） */
-  fresh?: boolean;
 }
 
 /**
@@ -155,7 +153,6 @@ const loadNeteasePlaylist = async (id: string, options: LoadCollectionOptions):
 
   await fetchPlaylist(id, {
     signal: options.signal,
-    fresh: options.fresh,
     onMeta: (m) => {
       if (options.signal?.aborted) return;
       meta = {
diff --git a/src/stores/history.ts b/src/stores/history.ts
index 72a2fc0a..b24d9b55 100644
--- a/src/stores/history.ts
+++ b/src/stores/history.ts
@@ -20,58 +20,49 @@ const keyOf = (track: Track): string => `${track.source}:${track.id}`;
 export const useHistoryStore = defineStore("history", () => {
   /** 倒序：最近播放在前 */
   const entries = shallowRef<HistoryEntry[]>([]);
-  const initialized = ref(false);
-  let pending = false;
 
-  const persist = (): void => {
-    db.setItem(HISTORY_KEY, toRaw(entries.value)).catch(() => {});
+  const readFromDisk = async (): Promise<HistoryEntry[]> => {
+    const cached = await db.getItem<HistoryEntry[]>(HISTORY_KEY).catch(() => null);
+    return Array.isArray(cached) ? cached : [];
+  };
+
+  const apply = async (next: HistoryEntry[]): Promise<void> => {
+    entries.value = next;
+    await db.setItem(HISTORY_KEY, toRaw(next)).catch(() => {});
   };
 
-  /** 加载持久化数据（幂等） */
   const load = async (): Promise<void> => {
-    if (initialized.value || pending) return;
-    pending = true;
-    const cached = await db.getItem<HistoryEntry[]>(HISTORY_KEY).catch(() => null);
-    if (Array.isArray(cached) && cached.length > 0) entries.value = cached;
-    initialized.value = true;
-    pending = false;
+    entries.value = await readFromDisk();
   };
 
   /**
-   * 记录一次播放
+   * 记录一次播放：每次都以硬盘为真值源，避免内存未 load 时覆盖旧历史
    * @param track 当前播放曲目
    */
-  const record = (track: Track): void => {
+  const record = async (track: Track): Promise<void> => {
     if (!track?.id) return;
     const key = keyOf(track);
-    const playedAt = Date.now();
-    const next: HistoryEntry[] = [{ track, playedAt }];
-    for (const item of entries.value) {
-      if (keyOf(item.track) === key) continue;
-      next.push(item);
-      if (next.length >= MAX_HISTORY) break;
-    }
-    entries.value = next;
-    persist();
+    const list = await readFromDisk();
+    const filtered = list.filter((item) => keyOf(item.track) !== key);
+    const next = [{ track, playedAt: Date.now() }, ...filtered].slice(0, MAX_HISTORY);
+    await apply(next);
   };
 
   /**
    * 移除单条历史
    * @param track 要删除的曲目
    */
-  const remove = (track: Track): void => {
+  const remove = async (track: Track): Promise<void> => {
     const key = keyOf(track);
-    const next = entries.value.filter((entry) => keyOf(entry.track) !== key);
-    if (next.length === entries.value.length) return;
-    entries.value = next;
-    persist();
+    const list = await readFromDisk();
+    const next = list.filter((entry) => keyOf(entry.track) !== key);
+    if (next.length === list.length) return;
+    await apply(next);
   };
 
   /** 清空全部历史 */
-  const clear = (): void => {
-    if (entries.value.length === 0) return;
-    entries.value = [];
-    persist();
+  const clear = async (): Promise<void> => {
+    await apply([]);
   };
 
   /** 按时间倒序的扁平曲目列表 */
@@ -80,7 +71,6 @@ export const useHistoryStore = defineStore("history", () => {
   return {
     entries,
     tracks,
-    initialized,
     load,
     record,
     remove,
diff --git a/src/stores/status.ts b/src/stores/status.ts
index 443fc763..02285275 100644
--- a/src/stores/status.ts
+++ b/src/stores/status.ts
@@ -1,5 +1,6 @@
 import type { PlayerState, AudioDevice, RepeatMode, ShuffleMode } from "@shared/types/player";
 import type { Platform } from "@shared/types/platform";
+import type { ContentScope } from "@/types/collection";
 export type { RepeatMode, ShuffleMode } from "@shared/types/player";
 import * as queue from "./queue";
 
@@ -59,9 +60,9 @@ export const useStatusStore = defineStore(
     /** 搜索页选中的平台 */
     const searchPlatform = ref<Platform>("netease");
     /** 侧栏「我的歌单」当前展示来源 */
-    const myPlaylistSource = ref<"local" | "online">("local");
+    const myPlaylistSource = ref<ContentScope>("local");
     /** 「我喜欢的音乐」页当前 tab */
-    const likedPageTab = ref<"local" | "online">("local");
+    const likedPageTab = ref<ContentScope>("local");
     /** 是否正在播放 */
     const isPlaying = computed(() => state.value === "playing");
     /** 是否暂停 */
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 3757c9e6..2a9b3cab 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -83,10 +83,7 @@ export const useUserStore = defineStore(
     /** 「我喜欢的音乐」歌单 id */
     const likedPlaylistId = computed<string | null>(() => playlists.value[0]?.id ?? null);
 
-    /**
-     * 自建歌单
-     * NCM /user/playlist 返回数组前 createdPlaylistCount 条为自建，其后为收藏
-     */
+    /** 自建歌单 */
     const createdPlaylists = computed<Playlist[]>(() => {
       const n = subcount.value.createdPlaylistCount || 0;
       if (n <= 0) return playlists.value.slice(0, 1);
@@ -138,7 +135,6 @@ export const useUserStore = defineStore(
         const accumulated: Track[] = [];
         await fetchPlaylist(playlistId, {
           signal: controller.signal,
-          fresh: true,
           onBatch: (batch) => {
             if (controller.signal.aborted) return;
             accumulated.push(...batch);
@@ -252,8 +248,7 @@ export const useUserStore = defineStore(
       else next.add(trackId);
       likedSongIds.value = next;
       try {
-        const ok = await toggleLikeSong(trackId, !wasLiked);
-        if (!ok) throw new Error("like api returned non-200");
+        await toggleLikeSong(trackId, !wasLiked);
         cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, [...next]).catch(() => {});
         return true;
       } catch (err) {
@@ -282,46 +277,40 @@ export const useUserStore = defineStore(
      * @param name 歌单名称
      * @param privacy 歌单隐私设置，0 为公开，10 为私密
      */
-    const createPlaylist = async (name: string, privacy: 0 | 10 = 0): Promise<Playlist | null> => {
+    const createPlaylist = async (name: string, privacy: 0 | 10 = 0): Promise<Playlist> => {
       const created = await apiCreatePlaylist(name, privacy);
-      if (!created?.id) return null;
       await refreshPlaylists();
       return created;
     };
 
-    /** 
+    /**
      * 删除自建歌单
      * @param id 歌单 ID
-     * @returns 是否删除成功
      */
-    const deletePlaylist = async (id: string): Promise<boolean> => {
-      const ok = await apiDeletePlaylist(id);
-      if (ok) await refreshPlaylists();
-      return ok;
+    const deletePlaylist = async (id: string): Promise<void> => {
+      await apiDeletePlaylist(id);
+      await refreshPlaylists();
     };
 
-    /** 
+    /**
      * 改歌单名/描述
      * @param id 歌单 ID
      * @param data 包含要更新的名称和描述
-     * @returns 是否更新成功
      */
     const updatePlaylist = async (
       id: string,
       data: { name?: string; description?: string },
-    ): Promise<boolean> => {
-      const tasks: Promise<boolean>[] = [];
+    ): Promise<void> => {
+      const tasks: Promise<void>[] = [];
       if (typeof data.name === "string") tasks.push(updatePlaylistName(id, data.name));
       if (typeof data.description === "string")
         tasks.push(updatePlaylistDesc(id, data.description));
-      if (tasks.length === 0) return true;
-      const results = await Promise.all(tasks);
-      if (!results.every(Boolean)) return false;
+      if (tasks.length === 0) return;
+      await Promise.all(tasks);
       await refreshPlaylists();
-      return true;
     };
 
-    /** 
+    /**
      * 加歌到歌单
      * @param playlistId 歌单 ID
      * @param trackIds 曲目 ID 列表
@@ -336,20 +325,20 @@ export const useUserStore = defineStore(
         likedSongIds.value = next;
         cacheDb.setItem(LIKED_SONG_IDS_CACHE_KEY, [...next]).catch(() => {});
       }
+      await refreshPlaylists();
       return count;
     };
 
-    /** 从歌单移除曲目
+    /**
+     * 从歌单移除曲目
      * @param playlistId 歌单 ID
      * @param trackIds 曲目 ID 列表
-     * @returns 是否移除成功
      */
     const removeTracksFromPlaylist = async (
       playlistId: string,
       trackIds: string[],
-    ): Promise<boolean> => {
-      const ok = await removeFromPlaylist(playlistId, trackIds);
-      if (!ok) return false;
+    ): Promise<void> => {
+      await removeFromPlaylist(playlistId, trackIds);
       if (playlistId === likedPlaylistId.value) {
         const removeSet = new Set(trackIds);
         const next = new Set(likedSongIds.value);
@@ -360,17 +349,16 @@ export const useUserStore = defineStore(
           (track) => !removeSet.has(track.id),
         );
       }
-      return true;
+      await refreshPlaylists();
     };
 
     /** 订阅 / 取消订阅他人歌单 */
     const togglePlaylistSubscribe = async (
       playlistId: string,
       subscribe: boolean,
-    ): Promise<boolean> => {
-      const ok = await subscribePlaylist(playlistId, subscribe);
-      if (ok) await refreshPlaylists();
-      return ok;
+    ): Promise<void> => {
+      await subscribePlaylist(playlistId, subscribe);
+      await refreshPlaylists();
     };
 
     /** 同步用户内容 */
diff --git a/src/types/collection.ts b/src/types/collection.ts
index 42ece4c4..44406710 100644
--- a/src/types/collection.ts
+++ b/src/types/collection.ts
@@ -3,6 +3,9 @@ import type { Track, Artist, TrackSource } from "@shared/types/player";
 /** 合集类型 */
 export type CollectionType = "album" | "playlist" | "radio";
 
+/** 内容范畴：本地 / 在线 */
+export type ContentScope = "local" | "online";
+
 /** 歌单持久化结构 */
 export interface PlaylistRecord {
   id: string;

From 1ca89bdb39cdfe3602bf5422638faeb549e2deaa Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Tue, 19 May 2026 01:29:53 +0800
Subject: [PATCH 19/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=98=E6=9B=B4=E8=A7=A6=E5=8F=91=E6=97=A0=E5=85=B3?=
 =?UTF-8?q?=20watch=20=E9=87=8D=E8=B7=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/settings.ts | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/stores/settings.ts b/src/stores/settings.ts
index 1497bde7..184d2728 100644
--- a/src/stores/settings.ts
+++ b/src/stores/settings.ts
@@ -87,6 +87,25 @@ export const useSettingsStore = defineStore(
       } catch {}
     };
 
+    /**
+     * 按 dot-path 写入嵌套对象，仅触发对应叶子节点的 reactive
+     * @param target 要写入的对象
+     * @param path 形如 "player.equalizer.bands"
+     * @param value 新值
+     */
+    const setByPath = (target: Record<string, unknown>, path: string, value: unknown): void => {
+      const keys = path.split(".");
+      const last = keys.pop();
+      if (!last) return;
+      let cursor: Record<string, unknown> = target;
+      for (const key of keys) {
+        const next = cursor[key];
+        if (next === null || typeof next !== "object") return;
+        cursor = next as Record<string, unknown>;
+      }
+      cursor[last] = value;
+    };
+
     /** IPC 订阅取消回调集合 */
     const unsubscribers: Array<() => void> = [
       // 订阅桌面歌词配置变化：歌词窗口点锁定按钮等场景需要回流到主窗口设置页
@@ -136,10 +155,13 @@ export const useSettingsStore = defineStore(
       })
       .catch(() => {});
 
-    /** 写入后端配置并更新本地 */
+    /**
+     * 写入后端配置并同步本地
+     * 只更新指定路径，避免触发无关 watch
+     */
     const setSystem = async (keyPath: string, value: unknown): Promise<void> => {
       await window.api.config.set(keyPath, value);
-      await syncSystem();
+      setByPath(system, keyPath, value);
       // 后处理
       if (keyPath === "player.fadeEnabled" || keyPath === "player.fadeDuration") {
         await window.api.player.setFadeDuration(

From 398c3e5be352218ebdcc888745bf3a75e992fcc6 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Tue, 19 May 2026 14:19:50 +0800
Subject: [PATCH 20/33] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/apis/netease/index.ts           |   1 +
 .../main/apis/netease/modules/album_sub.ts    |  20 +
 electron/main/apis/netease/modules/index.ts   |   2 +
 electron/main/server/broadcast.ts             |   6 +-
 electron/main/utils/protocol.ts               |   2 +
 package.json                                  |   3 +-
 pnpm-lock.yaml                                | 545 +++---------------
 src/apis/album/netease.ts                     |  29 +
 src/apis/artist/netease.ts                    |  43 ++
 src/apis/playlist/netease.ts                  | 143 +++++
 src/apis/user/netease.ts                      | 218 +------
 src/components/layout/NavUser.vue             |  10 +-
 src/components/layout/SideBarLogo.vue         |   4 +-
 src/components/settings/SettingsContent.vue   |   2 +-
 .../collection/useCollectionSubscribe.ts      |  10 +-
 src/pages/Artist.vue                          |   2 +-
 src/services/artistLoader.ts                  |   2 +-
 src/services/audioSource.ts                   |  38 +-
 src/services/collectionLoader.ts              |   3 +-
 src/settings/categories/services.ts           |   2 +-
 src/stores/history.ts                         |  44 +-
 src/stores/user.ts                            |  14 +-
 src/types/user.ts                             |   2 -
 src/utils/navigate.ts                         |   6 +-
 src/utils/netease.ts                          |  17 +
 25 files changed, 440 insertions(+), 728 deletions(-)
 create mode 100644 electron/main/apis/netease/modules/album_sub.ts
 create mode 100644 src/apis/album/netease.ts
 create mode 100644 src/apis/artist/netease.ts
 create mode 100644 src/apis/playlist/netease.ts

diff --git a/electron/main/apis/netease/index.ts b/electron/main/apis/netease/index.ts
index f189ca9d..a67792d2 100644
--- a/electron/main/apis/netease/index.ts
+++ b/electron/main/apis/netease/index.ts
@@ -44,6 +44,7 @@ const NON_CACHEABLE: ReadonlySet<string> = new Set([
   "playlist_detail",
   "user_playlist",
   "user_subcount",
+  "album_sub",
 ]);
 
 /** 内存缓存 */
diff --git a/electron/main/apis/netease/modules/album_sub.ts b/electron/main/apis/netease/modules/album_sub.ts
new file mode 100644
index 00000000..0dfba53d
--- /dev/null
+++ b/electron/main/apis/netease/modules/album_sub.ts
@@ -0,0 +1,20 @@
+/**
+ * 收藏 / 取消收藏专辑
+ *
+ * params:
+ * - id 专辑 id
+ * - t  1 收藏 / 2 取消，默认 1
+ *
+ * 响应：`{ code }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const albumSub: NeteaseModule = (query, request) => {
+  const path = query.t === 2 ? "/api/album/sub/cancel" : "/api/album/sub";
+  const data = { id: query.id };
+  return request(path, data, createOption(query, "weapi"));
+};
+
+export default albumSub;
diff --git a/electron/main/apis/netease/modules/index.ts b/electron/main/apis/netease/modules/index.ts
index 127d8d2a..1669132f 100644
--- a/electron/main/apis/netease/modules/index.ts
+++ b/electron/main/apis/netease/modules/index.ts
@@ -66,6 +66,7 @@ import like from "./like";
 
 // 专辑
 import album from "./album";
+import album_sub from "./album_sub";
 
 // 歌手
 import artists from "./artists";
@@ -129,6 +130,7 @@ export const modules: Record<string, NeteaseModule> = {
   like,
 
   album,
+  album_sub,
 
   artists,
   artist_album,
diff --git a/electron/main/server/broadcast.ts b/electron/main/server/broadcast.ts
index 4a6c15ee..5f3d5427 100644
--- a/electron/main/server/broadcast.ts
+++ b/electron/main/server/broadcast.ts
@@ -38,8 +38,10 @@ export const wsBroadcast = (event: { type: string; data?: unknown }): void => {
   for (const ws of wsClients) {
     try {
       ws.send(payload);
-    } catch {
-      // 单个客户端发送失败不影响其他人
+    } catch (err) {
+      // 发送失败的多半已经断开但 onClose/onError 未触发；主动清理避免反复抛错
+      serverLog.warn("WS 推送失败，移除失效客户端", err);
+      removeWsClient(ws);
     }
   }
 };
diff --git a/electron/main/utils/protocol.ts b/electron/main/utils/protocol.ts
index 85d88567..111fcbca 100644
--- a/electron/main/utils/protocol.ts
+++ b/electron/main/utils/protocol.ts
@@ -14,6 +14,8 @@ export const registerCacheScheme = (): void => {
     {
       scheme: SCHEME,
       privileges: {
+        standard: true,
+        corsEnabled: true,
         secure: true,
         supportFetchAPI: true,
         bypassCSP: true,
diff --git a/package.json b/package.json
index 137b5846..720d5dfe 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
   "devDependencies": {
     "@electron-toolkit/eslint-config-ts": "^3.1.0",
     "@electron-toolkit/tsconfig": "^2.0.0",
+    "@electron/rebuild": "^4.0.4",
     "@iconify-json/lucide": "^1.2.101",
     "@iconify-json/material-symbols": "^1.2.73",
     "@napi-rs/cli": "^3.6.1",
@@ -78,7 +79,7 @@
     "@types/sortablejs": "^1.15.9",
     "@types/ws": "^8.18.1",
     "@vitejs/plugin-vue": "^6.0.5",
-    "electron": "^39.8.7",
+    "electron": "^41.6.1",
     "electron-builder": "^26.8.1",
     "electron-vite": "^5.0.0",
     "eslint": "^9.39.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d8229b3a..72ba3b0a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,10 +10,10 @@ importers:
     dependencies:
       '@electron-toolkit/preload':
         specifier: ^3.0.2
-        version: 3.0.2(electron@39.8.7)
+        version: 3.0.2(electron@41.6.1)
       '@electron-toolkit/utils':
         specifier: ^4.0.0
-        version: 4.0.0(electron@39.8.7)
+        version: 4.0.0(electron@41.6.1)
       '@hono/node-server':
         specifier: ^2.0.2
         version: 2.0.2(hono@4.12.18)
@@ -81,6 +81,9 @@ importers:
       '@electron-toolkit/tsconfig':
         specifier: ^2.0.0
         version: 2.0.0(@types/node@22.19.17)
+      '@electron/rebuild':
+        specifier: ^4.0.4
+        version: 4.0.4
       '@iconify-json/lucide':
         specifier: ^1.2.101
         version: 1.2.101
@@ -106,8 +109,8 @@ importers:
         specifier: ^6.0.5
         version: 6.0.5(vite@7.3.2(@types/node@22.19.17)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))(vue@3.5.32(typescript@5.9.3))
       electron:
-        specifier: ^39.8.7
-        version: 39.8.7
+        specifier: ^41.6.1
+        version: 41.6.1
       electron-builder:
         specifier: ^26.8.1
         version: 26.8.1(electron-builder-squirrel-windows@26.8.1)
@@ -299,8 +302,8 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
 
-  '@electron/rebuild@4.0.3':
-    resolution: {integrity: sha512-u9vpTHRMkOYCs/1FLiSVAFZ7FbjsXK+bQuzviJZa+lG7BHZl1nz52/IcGvwa3sk80/fc3llutBkbCq10Vh8WQA==}
+  '@electron/rebuild@4.0.4':
+    resolution: {integrity: sha512-Rzc39XPdk/+/wBG8MfwAHohXflep0ITUfulb6Rgz3R0NeSB1noE+E9/M/cb8ftCAiyDD9PPhLuuWgE1GaInbKg==}
     engines: {node: '>=22.12.0'}
     hasBin: true
 
@@ -874,10 +877,6 @@ packages:
     resolution: {integrity: sha512-x66fjdH6i+lNYPae5URSQGTjBL68Av6hi09jvC5Ci96iTkwfqrPhCj46aylQZmgMaG89rOZCIKqS7ApC8ZDVjg==}
     engines: {node: '>= 16'}
 
-  '@isaacs/cliui@8.0.2':
-    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
-    engines: {node: '>=12'}
-
   '@isaacs/fs-minipass@4.0.1':
     resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
     engines: {node: '>=18.0.0'}
@@ -1262,14 +1261,6 @@ packages:
     resolution: {integrity: sha512-enkZYyuCdo+9jneCPE/0fjIta4wWnvVN9hBo2HuiMpRF0q3lzv1J6b/cl7i0mxZUKhBrV3aCKDBQnCOhwKbPmQ==}
     engines: {node: '>= 10'}
 
-  '@npmcli/agent@3.0.0':
-    resolution: {integrity: sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
-  '@npmcli/fs@4.0.0':
-    resolution: {integrity: sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   '@octokit/auth-token@6.0.0':
     resolution: {integrity: sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==}
     engines: {node: '>= 20'}
@@ -1452,10 +1443,6 @@ packages:
   '@oxc-project/types@0.124.0':
     resolution: {integrity: sha512-VBFWMTBvHxS11Z5Lvlr3IWgrwhMTXV+Md+EQF0Xf60+wAdsGFTBx7X7K/hP4pi8N7dcm1RvcHwDxZ16Qx8keUg==}
 
-  '@pkgjs/parseargs@0.11.0':
-    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
-    engines: {node: '>=14'}
-
   '@polka/url@1.0.0-next.29':
     resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
 
@@ -1658,6 +1645,9 @@ packages:
   '@types/node@22.19.17':
     resolution: {integrity: sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==}
 
+  '@types/node@24.12.4':
+    resolution: {integrity: sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==}
+
   '@types/plist@3.0.5':
     resolution: {integrity: sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==}
 
@@ -1945,9 +1935,9 @@ packages:
     engines: {node: '>=10.0.0'}
     deprecated: this version has critical issues, please update to the latest version
 
-  abbrev@3.0.1:
-    resolution: {integrity: sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==}
-    engines: {node: ^18.17.0 || >=20.5.0}
+  abbrev@4.0.0:
+    resolution: {integrity: sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==}
+    engines: {node: ^20.17.0 || >=22.9.0}
 
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
@@ -1978,18 +1968,10 @@ packages:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
-  ansi-regex@6.2.2:
-    resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==}
-    engines: {node: '>=12'}
-
   ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
-  ansi-styles@6.2.3:
-    resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
-    engines: {node: '>=12'}
-
   app-builder-bin@5.0.0-alpha.12:
     resolution: {integrity: sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==}
 
@@ -2117,10 +2099,6 @@ packages:
     resolution: {integrity: sha512-tixWYgm5ZoOD+3g6UTea91eow5z6AAHaho3g0V9CNSNb45gM8SmflpAc+GRd1InC4AqN/07Unrgp56Y94N9hJQ==}
     engines: {node: '>=20.19.0'}
 
-  cacache@19.0.1:
-    resolution: {integrity: sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   cacheable-lookup@5.0.4:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
@@ -2173,14 +2151,6 @@ packages:
     resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==}
     engines: {node: '>=8'}
 
-  cli-cursor@3.1.0:
-    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: '>=8'}
-
-  cli-spinners@2.9.2:
-    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
-    engines: {node: '>=6'}
-
   cli-truncate@2.1.0:
     resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
     engines: {node: '>=8'}
@@ -2204,10 +2174,6 @@ packages:
   clone-response@1.0.3:
     resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
 
-  clone@1.0.4:
-    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
-    engines: {node: '>=0.8'}
-
   color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
@@ -2306,9 +2272,6 @@ packages:
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
-  defaults@1.0.4:
-    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
-
   defer-to-connect@2.0.1:
     resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
     engines: {node: '>=10'}
@@ -2368,9 +2331,6 @@ packages:
   duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
 
-  eastasianwidth@0.2.0:
-    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
-
   ejs@3.1.10:
     resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
     engines: {node: '>=0.10.0'}
@@ -2412,8 +2372,8 @@ packages:
     resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
     engines: {node: '>=8.0.0'}
 
-  electron@39.8.7:
-    resolution: {integrity: sha512-B3TmzbUEeIvrhJ0QcoFp8/tgnVA3vsm0wkdYWzC22hsk9zTVqkzyrrz40cjd0nMTTIrGWxxfDO2tdQTCMe9Bjw==}
+  electron@41.6.1:
+    resolution: {integrity: sha512-3y1Q0AkPnqwaJJZV146KlZ63VIVlQVlWdLiArkwnGUOxZAZD5cvag4TMUsu/gN+FZhkkpelgvdTXPZvTb34I8A==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
@@ -2428,12 +2388,6 @@ packages:
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
-  emoji-regex@9.2.2:
-    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
-
-  encoding@0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
-
   end-of-stream@1.4.5:
     resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
 
@@ -2652,10 +2606,6 @@ packages:
   font-list@2.0.2:
     resolution: {integrity: sha512-kNG2sY5+Nh5bbWL9kgAi+k8tuXfZ3m+6fjNGF4iUITTyex2S6wITREgr9ZqY1xw2+mFM6Bi5NPEPpRB6jLLOnw==}
 
-  foreground-child@3.3.1:
-    resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
-    engines: {node: '>=14'}
-
   form-data@4.0.5:
     resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
     engines: {node: '>= 6'}
@@ -2671,6 +2621,10 @@ packages:
     resolution: {integrity: sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==}
     engines: {node: '>=14.14'}
 
+  fs-extra@11.3.5:
+    resolution: {integrity: sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==}
+    engines: {node: '>=14.14'}
+
   fs-extra@7.0.1:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
@@ -2683,10 +2637,6 @@ packages:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
     engines: {node: '>=10'}
 
-  fs-minipass@3.0.3:
-    resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -2728,11 +2678,6 @@ packages:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
 
-  glob@10.4.5:
-    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
-    hasBin: true
-
   glob@13.0.6:
     resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==}
     engines: {node: 18 || 20 || >=22}
@@ -2862,10 +2807,6 @@ packages:
   ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
 
-  ip-address@10.1.0:
-    resolution: {integrity: sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==}
-    engines: {node: '>= 12'}
-
   is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -2878,14 +2819,6 @@ packages:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
 
-  is-interactive@1.0.0:
-    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
-    engines: {node: '>=8'}
-
-  is-unicode-supported@0.1.0:
-    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: '>=10'}
-
   is-what@5.5.0:
     resolution: {integrity: sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==}
     engines: {node: '>=18'}
@@ -2905,8 +2838,9 @@ packages:
     resolution: {integrity: sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==}
     engines: {node: '>=18'}
 
-  jackspeak@3.4.3:
-    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+  isexe@4.0.0:
+    resolution: {integrity: sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==}
+    engines: {node: '>=20'}
 
   jake@10.9.4:
     resolution: {integrity: sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==}
@@ -2958,6 +2892,9 @@ packages:
   jsonfile@6.2.0:
     resolution: {integrity: sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==}
 
+  jsonfile@6.2.1:
+    resolution: {integrity: sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==}
+
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
@@ -2999,17 +2936,10 @@ packages:
   lodash@4.18.1:
     resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==}
 
-  log-symbols@4.1.0:
-    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: '>=10'}
-
   lowercase-keys@2.0.0:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
 
-  lru-cache@10.4.3:
-    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
-
   lru-cache@11.3.3:
     resolution: {integrity: sha512-JvNw9Y81y33E+BEYPr0U7omo+U9AySnsMsEiXgwT6yqd31VQWTLNQqmT4ou5eqPFUrTfIDFta2wKhB1hyohtAQ==}
     engines: {node: 20 || >=22}
@@ -3031,10 +2961,6 @@ packages:
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
-  make-fetch-happen@14.0.3:
-    resolution: {integrity: sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   matcher@3.0.0:
     resolution: {integrity: sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==}
     engines: {node: '>=10'}
@@ -3059,10 +2985,6 @@ packages:
     engines: {node: '>=4.0.0'}
     hasBin: true
 
-  mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
-
   mimic-response@1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
     engines: {node: '>=4'}
@@ -3089,30 +3011,6 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
-  minipass-collect@2.0.1:
-    resolution: {integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minipass-fetch@4.0.1:
-    resolution: {integrity: sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
-  minipass-flush@1.0.7:
-    resolution: {integrity: sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==}
-    engines: {node: '>= 8'}
-
-  minipass-pipeline@1.2.4:
-    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
-    engines: {node: '>=8'}
-
-  minipass-sized@1.0.3:
-    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
-    engines: {node: '>=8'}
-
-  minipass@3.3.6:
-    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
-    engines: {node: '>=8'}
-
   minipass@7.1.3:
     resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -3159,10 +3057,6 @@ packages:
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
-  negotiator@1.0.0:
-    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
-    engines: {node: '>= 0.6'}
-
   node-abi@3.89.0:
     resolution: {integrity: sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==}
     engines: {node: '>=10'}
@@ -3180,17 +3074,17 @@ packages:
   node-fetch-native@1.6.7:
     resolution: {integrity: sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==}
 
-  node-gyp@11.5.0:
-    resolution: {integrity: sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
+  node-gyp@12.3.0:
+    resolution: {integrity: sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg==}
+    engines: {node: ^20.17.0 || >=22.9.0}
     hasBin: true
 
   node-releases@2.0.37:
     resolution: {integrity: sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==}
 
-  nopt@8.1.0:
-    resolution: {integrity: sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==}
-    engines: {node: ^18.17.0 || >=20.5.0}
+  nopt@9.0.0:
+    resolution: {integrity: sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==}
+    engines: {node: ^20.17.0 || >=22.9.0}
     hasBin: true
 
   normalize-url@6.1.0:
@@ -3216,18 +3110,10 @@ packages:
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
-  onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
-
   optionator@0.9.4:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
 
-  ora@5.4.1:
-    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
-    engines: {node: '>=10'}
-
   oxc-parser@0.124.0:
     resolution: {integrity: sha512-h07SFj/tp2U3cf3+LFX6MmOguQiM9ahwpGs0ZK5CGhgL8p4kk24etrJKsEzhXAvo7mfvoKTZooZ5MLKAPRmJ1g==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -3257,10 +3143,6 @@ packages:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
 
-  p-map@7.0.4:
-    resolution: {integrity: sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==}
-    engines: {node: '>=18'}
-
   p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
@@ -3290,10 +3172,6 @@ packages:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
-  path-scurry@1.11.1:
-    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
-    engines: {node: '>=16 || 14 >=14.18'}
-
   path-scurry@2.0.2:
     resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
     engines: {node: 18 || 20 || >=22}
@@ -3386,9 +3264,9 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
-  proc-log@5.0.0:
-    resolution: {integrity: sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
+  proc-log@6.1.0:
+    resolution: {integrity: sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==}
+    engines: {node: ^20.17.0 || >=22.9.0}
 
   progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
@@ -3472,10 +3350,6 @@ packages:
   responselike@2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
 
-  restore-cursor@3.1.0:
-    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: '>=8'}
-
   retry@0.12.0:
     resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
     engines: {node: '>= 4'}
@@ -3578,14 +3452,6 @@ packages:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
 
-  socks-proxy-agent@8.0.5:
-    resolution: {integrity: sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==}
-    engines: {node: '>= 14'}
-
-  socks@2.8.7:
-    resolution: {integrity: sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==}
-    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
-
   sortablejs@1.15.7:
     resolution: {integrity: sha512-Kk8wLQPlS+yi1ZEf48a4+fzHa4yxjC30M/Sr2AnQu+f/MPwvvX9XjZ6OWejiz8crBsLwSq8GHqaxaET7u6ux0A==}
 
@@ -3607,10 +3473,6 @@ packages:
   sprintf-js@1.1.3:
     resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
 
-  ssri@12.0.0:
-    resolution: {integrity: sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   stat-mode@1.0.0:
     resolution: {integrity: sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==}
     engines: {node: '>= 6'}
@@ -3619,10 +3481,6 @@ packages:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
 
-  string-width@5.1.2:
-    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
-    engines: {node: '>=12'}
-
   string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
 
@@ -3630,10 +3488,6 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
-  strip-ansi@7.2.0:
-    resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==}
-    engines: {node: '>=12'}
-
   strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
@@ -3764,18 +3618,17 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici-types@7.16.0:
+    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+
+  undici@6.25.0:
+    resolution: {integrity: sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==}
+    engines: {node: '>=18.17'}
+
   unimport@5.7.0:
     resolution: {integrity: sha512-njnL6sp8lEA8QQbZrt+52p/g4X0rw3bnGGmUcJnt1jeG8+iiqO779aGz0PirCtydAIVcuTBRlJ52F0u46z309Q==}
     engines: {node: '>=18.12.0'}
 
-  unique-filename@4.0.0:
-    resolution: {integrity: sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
-  unique-slug@5.0.0:
-    resolution: {integrity: sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   universal-user-agent@7.0.3:
     resolution: {integrity: sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==}
 
@@ -3970,9 +3823,6 @@ packages:
       typescript:
         optional: true
 
-  wcwidth@1.0.1:
-    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
-
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
@@ -3992,6 +3842,11 @@ packages:
     engines: {node: ^18.17.0 || >=20.5.0}
     hasBin: true
 
+  which@6.0.1:
+    resolution: {integrity: sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==}
+    engines: {node: ^20.17.0 || >=22.9.0}
+    hasBin: true
+
   word-wrap@1.2.5:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
@@ -4004,10 +3859,6 @@ packages:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
 
-  wrap-ansi@8.1.0:
-    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
-    engines: {node: '>=12'}
-
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
@@ -4208,17 +4059,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron-toolkit/preload@3.0.2(electron@39.8.7)':
+  '@electron-toolkit/preload@3.0.2(electron@41.6.1)':
     dependencies:
-      electron: 39.8.7
+      electron: 41.6.1
 
   '@electron-toolkit/tsconfig@2.0.0(@types/node@22.19.17)':
     dependencies:
       '@types/node': 22.19.17
 
-  '@electron-toolkit/utils@4.0.0(electron@39.8.7)':
+  '@electron-toolkit/utils@4.0.0(electron@41.6.1)':
     dependencies:
-      electron: 39.8.7
+      electron: 41.6.1
 
   '@electron/asar@3.4.1':
     dependencies:
@@ -4279,21 +4130,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/rebuild@4.0.3':
+  '@electron/rebuild@4.0.4':
     dependencies:
       '@malept/cross-spawn-promise': 2.0.0
       debug: 4.4.3
-      detect-libc: 2.1.2
-      got: 11.8.6
-      graceful-fs: 4.2.11
       node-abi: 4.28.0
       node-api-version: 0.2.1
-      node-gyp: 11.5.0
-      ora: 5.4.1
+      node-gyp: 12.3.0
       read-binary-file-arch: 1.0.6
-      semver: 7.7.4
-      tar: 7.5.13
-      yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
 
@@ -4313,7 +4157,7 @@ snapshots:
     dependencies:
       cross-dirname: 0.1.0
       debug: 4.4.3
-      fs-extra: 11.3.4
+      fs-extra: 11.3.5
       minimist: 1.2.8
       postject: 1.0.0-alpha.6
     transitivePeerDependencies:
@@ -4734,15 +4578,6 @@ snapshots:
 
   '@intlify/shared@11.3.2': {}
 
-  '@isaacs/cliui@8.0.2':
-    dependencies:
-      string-width: 5.1.2
-      string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.2.0
-      strip-ansi-cjs: strip-ansi@6.0.1
-      wrap-ansi: 8.1.0
-      wrap-ansi-cjs: wrap-ansi@7.0.0
-
   '@isaacs/fs-minipass@4.0.1':
     dependencies:
       minipass: 7.1.3
@@ -5047,20 +4882,6 @@ snapshots:
       - '@emnapi/core'
       - '@emnapi/runtime'
 
-  '@npmcli/agent@3.0.0':
-    dependencies:
-      agent-base: 7.1.4
-      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.6
-      lru-cache: 10.4.3
-      socks-proxy-agent: 8.0.5
-    transitivePeerDependencies:
-      - supports-color
-
-  '@npmcli/fs@4.0.0':
-    dependencies:
-      semver: 7.7.4
-
   '@octokit/auth-token@6.0.0': {}
 
   '@octokit/core@7.0.6':
@@ -5191,9 +5012,6 @@ snapshots:
 
   '@oxc-project/types@0.124.0': {}
 
-  '@pkgjs/parseargs@0.11.0':
-    optional: true
-
   '@polka/url@1.0.0-next.29': {}
 
   '@quansync/fs@1.0.0':
@@ -5336,6 +5154,10 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/node@24.12.4':
+    dependencies:
+      undici-types: 7.16.0
+
   '@types/plist@3.0.5':
     dependencies:
       '@types/node': 22.19.17
@@ -5734,7 +5556,7 @@ snapshots:
 
   '@xmldom/xmldom@0.8.12': {}
 
-  abbrev@3.0.1: {}
+  abbrev@4.0.0: {}
 
   acorn-jsx@5.3.2(acorn@8.16.0):
     dependencies:
@@ -5759,14 +5581,10 @@ snapshots:
 
   ansi-regex@5.0.1: {}
 
-  ansi-regex@6.2.2: {}
-
   ansi-styles@4.3.0:
     dependencies:
       color-convert: 2.0.1
 
-  ansi-styles@6.2.3: {}
-
   app-builder-bin@5.0.0-alpha.12: {}
 
   app-builder-lib@26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@26.8.1):
@@ -5777,7 +5595,7 @@ snapshots:
       '@electron/get': 3.1.0
       '@electron/notarize': 2.5.0
       '@electron/osx-sign': 1.3.3
-      '@electron/rebuild': 4.0.3
+      '@electron/rebuild': 4.0.4
       '@electron/universal': 2.0.3
       '@malept/flatpak-bundler': 0.4.0
       '@types/fs-extra': 9.0.13
@@ -5941,21 +5759,6 @@ snapshots:
 
   cac@7.0.0: {}
 
-  cacache@19.0.1:
-    dependencies:
-      '@npmcli/fs': 4.0.0
-      fs-minipass: 3.0.3
-      glob: 10.4.5
-      lru-cache: 10.4.3
-      minipass: 7.1.3
-      minipass-collect: 2.0.1
-      minipass-flush: 1.0.7
-      minipass-pipeline: 1.2.4
-      p-map: 7.0.4
-      ssri: 12.0.0
-      tar: 7.5.13
-      unique-filename: 4.0.0
-
   cacheable-lookup@5.0.4: {}
 
   cacheable-request@7.0.4:
@@ -6001,12 +5804,6 @@ snapshots:
 
   ci-info@4.4.0: {}
 
-  cli-cursor@3.1.0:
-    dependencies:
-      restore-cursor: 3.1.0
-
-  cli-spinners@2.9.2: {}
-
   cli-truncate@2.1.0:
     dependencies:
       slice-ansi: 3.0.0
@@ -6036,8 +5833,6 @@ snapshots:
     dependencies:
       mimic-response: 1.0.1
 
-  clone@1.0.4: {}
-
   color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
@@ -6114,10 +5909,6 @@ snapshots:
 
   deep-is@0.1.4: {}
 
-  defaults@1.0.4:
-    dependencies:
-      clone: 1.0.4
-
   defer-to-connect@2.0.1: {}
 
   define-data-property@1.1.4:
@@ -6192,8 +5983,6 @@ snapshots:
 
   duplexer@0.1.2: {}
 
-  eastasianwidth@0.2.0: {}
-
   ejs@3.1.10:
     dependencies:
       jake: 10.9.4
@@ -6277,10 +6066,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  electron@39.8.7:
+  electron@41.6.1:
     dependencies:
       '@electron/get': 2.0.3
-      '@types/node': 22.19.17
+      '@types/node': 24.12.4
       extract-zip: 2.0.1
     transitivePeerDependencies:
       - supports-color
@@ -6289,13 +6078,6 @@ snapshots:
 
   emoji-regex@8.0.0: {}
 
-  emoji-regex@9.2.2: {}
-
-  encoding@0.1.13:
-    dependencies:
-      iconv-lite: 0.6.3
-    optional: true
-
   end-of-stream@1.4.5:
     dependencies:
       once: 1.4.0
@@ -6571,11 +6353,6 @@ snapshots:
 
   font-list@2.0.2: {}
 
-  foreground-child@3.3.1:
-    dependencies:
-      cross-spawn: 7.0.6
-      signal-exit: 4.1.0
-
   form-data@4.0.5:
     dependencies:
       asynckit: 0.4.0
@@ -6598,6 +6375,13 @@ snapshots:
       jsonfile: 6.2.0
       universalify: 2.0.1
 
+  fs-extra@11.3.5:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.2.1
+      universalify: 2.0.1
+    optional: true
+
   fs-extra@7.0.1:
     dependencies:
       graceful-fs: 4.2.11
@@ -6617,10 +6401,6 @@ snapshots:
       jsonfile: 6.2.0
       universalify: 2.0.1
 
-  fs-minipass@3.0.3:
-    dependencies:
-      minipass: 7.1.3
-
   fs.realpath@1.0.0: {}
 
   fsevents@2.3.3:
@@ -6664,15 +6444,6 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@10.4.5:
-    dependencies:
-      foreground-child: 3.3.1
-      jackspeak: 3.4.3
-      minimatch: 9.0.9
-      minipass: 7.1.3
-      package-json-from-dist: 1.0.1
-      path-scurry: 1.11.1
-
   glob@13.0.6:
     dependencies:
       minimatch: 10.2.5
@@ -6814,8 +6585,6 @@ snapshots:
 
   ini@1.3.8: {}
 
-  ip-address@10.1.0: {}
-
   is-extglob@2.1.1: {}
 
   is-fullwidth-code-point@3.0.0: {}
@@ -6824,10 +6593,6 @@ snapshots:
     dependencies:
       is-extglob: 2.1.1
 
-  is-interactive@1.0.0: {}
-
-  is-unicode-supported@0.1.0: {}
-
   is-what@5.5.0: {}
 
   isbinaryfile@4.0.10: {}
@@ -6838,11 +6603,7 @@ snapshots:
 
   isexe@3.1.5: {}
 
-  jackspeak@3.4.3:
-    dependencies:
-      '@isaacs/cliui': 8.0.2
-    optionalDependencies:
-      '@pkgjs/parseargs': 0.11.0
+  isexe@4.0.0: {}
 
   jake@10.9.4:
     dependencies:
@@ -6885,6 +6646,13 @@ snapshots:
     optionalDependencies:
       graceful-fs: 4.2.11
 
+  jsonfile@6.2.1:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+    optional: true
+
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
@@ -6927,15 +6695,8 @@ snapshots:
 
   lodash@4.18.1: {}
 
-  log-symbols@4.1.0:
-    dependencies:
-      chalk: 4.1.2
-      is-unicode-supported: 0.1.0
-
   lowercase-keys@2.0.0: {}
 
-  lru-cache@10.4.3: {}
-
   lru-cache@11.3.3: {}
 
   lru-cache@5.1.1:
@@ -6964,22 +6725,6 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  make-fetch-happen@14.0.3:
-    dependencies:
-      '@npmcli/agent': 3.0.0
-      cacache: 19.0.1
-      http-cache-semantics: 4.2.0
-      minipass: 7.1.3
-      minipass-fetch: 4.0.1
-      minipass-flush: 1.0.7
-      minipass-pipeline: 1.2.4
-      negotiator: 1.0.0
-      proc-log: 5.0.0
-      promise-retry: 2.0.1
-      ssri: 12.0.0
-    transitivePeerDependencies:
-      - supports-color
-
   matcher@3.0.0:
     dependencies:
       escape-string-regexp: 4.0.0
@@ -6997,8 +6742,6 @@ snapshots:
 
   mime@2.6.0: {}
 
-  mimic-fn@2.1.0: {}
-
   mimic-response@1.0.1: {}
 
   mimic-response@3.1.0: {}
@@ -7021,34 +6764,6 @@ snapshots:
 
   minimist@1.2.8: {}
 
-  minipass-collect@2.0.1:
-    dependencies:
-      minipass: 7.1.3
-
-  minipass-fetch@4.0.1:
-    dependencies:
-      minipass: 7.1.3
-      minipass-sized: 1.0.3
-      minizlib: 3.1.0
-    optionalDependencies:
-      encoding: 0.1.13
-
-  minipass-flush@1.0.7:
-    dependencies:
-      minipass: 3.3.6
-
-  minipass-pipeline@1.2.4:
-    dependencies:
-      minipass: 3.3.6
-
-  minipass-sized@1.0.3:
-    dependencies:
-      minipass: 3.3.6
-
-  minipass@3.3.6:
-    dependencies:
-      yallist: 4.0.0
-
   minipass@7.1.3: {}
 
   minizlib@3.1.0:
@@ -7084,8 +6799,6 @@ snapshots:
 
   natural-compare@1.4.0: {}
 
-  negotiator@1.0.0: {}
-
   node-abi@3.89.0:
     dependencies:
       semver: 7.7.4
@@ -7103,26 +6816,24 @@ snapshots:
 
   node-fetch-native@1.6.7: {}
 
-  node-gyp@11.5.0:
+  node-gyp@12.3.0:
     dependencies:
       env-paths: 2.2.1
       exponential-backoff: 3.1.3
       graceful-fs: 4.2.11
-      make-fetch-happen: 14.0.3
-      nopt: 8.1.0
-      proc-log: 5.0.0
+      nopt: 9.0.0
+      proc-log: 6.1.0
       semver: 7.7.4
       tar: 7.5.13
       tinyglobby: 0.2.16
-      which: 5.0.0
-    transitivePeerDependencies:
-      - supports-color
+      undici: 6.25.0
+      which: 6.0.1
 
   node-releases@2.0.37: {}
 
-  nopt@8.1.0:
+  nopt@9.0.0:
     dependencies:
-      abbrev: 3.0.1
+      abbrev: 4.0.0
 
   normalize-url@6.1.0: {}
 
@@ -7147,10 +6858,6 @@ snapshots:
     dependencies:
       wrappy: 1.0.2
 
-  onetime@5.1.2:
-    dependencies:
-      mimic-fn: 2.1.0
-
   optionator@0.9.4:
     dependencies:
       deep-is: 0.1.4
@@ -7160,18 +6867,6 @@ snapshots:
       type-check: 0.4.0
       word-wrap: 1.2.5
 
-  ora@5.4.1:
-    dependencies:
-      bl: 4.1.0
-      chalk: 4.1.2
-      cli-cursor: 3.1.0
-      cli-spinners: 2.9.2
-      is-interactive: 1.0.0
-      is-unicode-supported: 0.1.0
-      log-symbols: 4.1.0
-      strip-ansi: 6.0.1
-      wcwidth: 1.0.1
-
   oxc-parser@0.124.0(@emnapi/core@1.9.0)(@emnapi/runtime@1.9.0):
     dependencies:
       '@oxc-project/types': 0.124.0
@@ -7225,8 +6920,6 @@ snapshots:
     dependencies:
       p-limit: 3.1.0
 
-  p-map@7.0.4: {}
-
   p-try@2.2.0:
     optional: true
 
@@ -7246,11 +6939,6 @@ snapshots:
 
   path-key@3.1.1: {}
 
-  path-scurry@1.11.1:
-    dependencies:
-      lru-cache: 10.4.3
-      minipass: 7.1.3
-
   path-scurry@2.0.2:
     dependencies:
       lru-cache: 11.3.3
@@ -7339,7 +7027,7 @@ snapshots:
 
   prettier@3.8.1: {}
 
-  proc-log@5.0.0: {}
+  proc-log@6.1.0: {}
 
   progress@2.0.3: {}
 
@@ -7432,11 +7120,6 @@ snapshots:
     dependencies:
       lowercase-keys: 2.0.0
 
-  restore-cursor@3.1.0:
-    dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-
   retry@0.12.0: {}
 
   rfdc@1.4.1: {}
@@ -7555,20 +7238,8 @@ snapshots:
       is-fullwidth-code-point: 3.0.0
     optional: true
 
-  smart-buffer@4.2.0: {}
-
-  socks-proxy-agent@8.0.5:
-    dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3
-      socks: 2.8.7
-    transitivePeerDependencies:
-      - supports-color
-
-  socks@2.8.7:
-    dependencies:
-      ip-address: 10.1.0
-      smart-buffer: 4.2.0
+  smart-buffer@4.2.0:
+    optional: true
 
   sortablejs@1.15.7: {}
 
@@ -7586,10 +7257,6 @@ snapshots:
   sprintf-js@1.1.3:
     optional: true
 
-  ssri@12.0.0:
-    dependencies:
-      minipass: 7.1.3
-
   stat-mode@1.0.0: {}
 
   string-width@4.2.3:
@@ -7598,12 +7265,6 @@ snapshots:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  string-width@5.1.2:
-    dependencies:
-      eastasianwidth: 0.2.0
-      emoji-regex: 9.2.2
-      strip-ansi: 7.2.0
-
   string_decoder@1.3.0:
     dependencies:
       safe-buffer: 5.2.1
@@ -7612,10 +7273,6 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
-  strip-ansi@7.2.0:
-    dependencies:
-      ansi-regex: 6.2.2
-
   strip-json-comments@2.0.1: {}
 
   strip-json-comments@3.1.1: {}
@@ -7760,6 +7417,10 @@ snapshots:
 
   undici-types@6.21.0: {}
 
+  undici-types@7.16.0: {}
+
+  undici@6.25.0: {}
+
   unimport@5.7.0:
     dependencies:
       acorn: 8.16.0
@@ -7777,14 +7438,6 @@ snapshots:
       unplugin: 2.3.11
       unplugin-utils: 0.3.1
 
-  unique-filename@4.0.0:
-    dependencies:
-      unique-slug: 5.0.0
-
-  unique-slug@5.0.0:
-    dependencies:
-      imurmurhash: 0.1.4
-
   universal-user-agent@7.0.3: {}
 
   universalify@0.1.2: {}
@@ -7971,10 +7624,6 @@ snapshots:
     optionalDependencies:
       typescript: 5.9.3
 
-  wcwidth@1.0.1:
-    dependencies:
-      defaults: 1.0.4
-
   webpack-virtual-modules@0.6.2: {}
 
   when-exit@2.1.5: {}
@@ -7990,6 +7639,10 @@ snapshots:
     dependencies:
       isexe: 3.1.5
 
+  which@6.0.1:
+    dependencies:
+      isexe: 4.0.0
+
   word-wrap@1.2.5: {}
 
   wrap-ansi@6.2.0:
@@ -8005,12 +7658,6 @@ snapshots:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
-  wrap-ansi@8.1.0:
-    dependencies:
-      ansi-styles: 6.2.3
-      string-width: 5.1.2
-      strip-ansi: 7.2.0
-
   wrappy@1.0.2: {}
 
   ws@8.20.1: {}
diff --git a/src/apis/album/netease.ts b/src/apis/album/netease.ts
new file mode 100644
index 00000000..86c4b178
--- /dev/null
+++ b/src/apis/album/netease.ts
@@ -0,0 +1,29 @@
+import type { Album, Track } from "@shared/types/player";
+import { netease as neteaseApi } from "@/apis/netease";
+import { ensureOk, songsToTracks, toAlbum } from "@/utils/netease";
+
+/**
+ * 拉取专辑：元数据 + 全部曲目
+ * @param albumId 专辑 id
+ */
+export const fetchAlbum = async (
+  albumId: string,
+): Promise<{ album: Album; tracks: Track[]; description?: string } | null> => {
+  const body = await neteaseApi.album({ id: albumId });
+  const raw = body?.album;
+  if (!raw) return null;
+  return {
+    album: toAlbum(raw),
+    tracks: songsToTracks(body?.songs),
+    description: typeof raw.description === "string" ? raw.description : undefined,
+  };
+};
+
+/**
+ * 收藏 / 取消收藏专辑
+ * @param id 专辑 id
+ * @param subscribe true 收藏 / false 取消
+ */
+export const subscribeAlbum = async (id: string, subscribe: boolean): Promise<void> => {
+  ensureOk(await neteaseApi.album_sub({ id, t: subscribe ? 1 : 2 }));
+};
diff --git a/src/apis/artist/netease.ts b/src/apis/artist/netease.ts
new file mode 100644
index 00000000..51bc6b92
--- /dev/null
+++ b/src/apis/artist/netease.ts
@@ -0,0 +1,43 @@
+import type { Album, Artist, Track } from "@shared/types/player";
+import { netease as neteaseApi } from "@/apis/netease";
+import { songsToTracks, toAlbum, toArtist } from "@/utils/netease";
+
+/**
+ * 拉取歌手：基本资料 + 热门 50 首 + 全部专辑
+ * 两次并行请求（artists + artist_album），专辑用 200 的 limit 覆盖绝大多数情况
+ * 更多歌曲通过 fetchArtistSongs 触底分页拉
+ * @param artistId 歌手 id
+ */
+export const fetchArtist = async (
+  artistId: string,
+): Promise<{ artist: Artist; tracks: Track[]; albums: Album[] } | null> => {
+  const [profile, albums] = await Promise.all([
+    neteaseApi.artists({ id: artistId }),
+    neteaseApi.artist_album({ id: artistId, limit: 200 }),
+  ]);
+  const rawArtist = profile?.artist;
+  if (!rawArtist) return null;
+  return {
+    artist: toArtist(rawArtist),
+    tracks: songsToTracks(profile?.hotSongs),
+    albums: (albums?.hotAlbums ?? []).map(toAlbum),
+  };
+};
+
+/**
+ * 触底加载更多歌手歌曲
+ * @param artistId 歌手 id
+ * @param offset 偏移（首屏 50 首之后从 50 起）
+ * @param limit 单页数量，默认 50
+ */
+export const fetchArtistSongs = async (
+  artistId: string,
+  offset: number,
+  limit = 50,
+): Promise<{ tracks: Track[]; more: boolean }> => {
+  const body = await neteaseApi.artist_songs({ id: artistId, offset, limit, order: "hot" });
+  return {
+    tracks: songsToTracks(body?.songs),
+    more: !!body?.more,
+  };
+};
diff --git a/src/apis/playlist/netease.ts b/src/apis/playlist/netease.ts
new file mode 100644
index 00000000..b0e6e4d3
--- /dev/null
+++ b/src/apis/playlist/netease.ts
@@ -0,0 +1,143 @@
+import type { Playlist, Track } from "@shared/types/player";
+import { netease as neteaseApi } from "@/apis/netease";
+import { ensureOk, songsToTracks, toPlaylist } from "@/utils/netease";
+import { songsByIds } from "@/apis/song/netease";
+
+/** song_detail 单批上限 */
+const SONG_DETAIL_BATCH = 500;
+
+/** fetchPlaylist 可选参数 */
+export interface FetchPlaylistOptions {
+  /** 元数据回调 */
+  onMeta?: (meta: Playlist) => void;
+  /** 曲目分批回调 */
+  onBatch?: (batch: Track[]) => void;
+  /** 中断信号 */
+  signal?: AbortSignal;
+}
+
+/**
+ * 拉取歌单：元数据 + 全部曲目
+ *
+ * 1) `playlist/detail` 一次返回 元数据 + 前 ~1000 首完整 song + 全量 trackIds
+ * 2) 若 trackIds 还有未覆盖的，按 500 一批走 `song/detail` 补尾
+ *
+ * @param playlistId 歌单 id
+ * @param options 元数据/曲目回调与中断信号
+ */
+export const fetchPlaylist = async (
+  playlistId: string,
+  options: FetchPlaylistOptions = {},
+): Promise<void> => {
+  if (options.signal?.aborted) return;
+  const body = await neteaseApi.playlist_detail({ id: playlistId });
+  if (options.signal?.aborted) return;
+  const raw = body?.playlist;
+  if (!raw) return;
+
+  options.onMeta?.(toPlaylist(raw));
+
+  const firstBatch = songsToTracks(raw.tracks);
+  if (firstBatch.length > 0) options.onBatch?.(firstBatch);
+
+  const have = new Set(firstBatch.map((t) => Number(t.id)));
+  const missing: number[] = (raw.trackIds ?? [])
+    .map((item: { id: number }) => item.id)
+    .filter((tid: number) => !have.has(tid));
+
+  for (let i = 0; i < missing.length; i += SONG_DETAIL_BATCH) {
+    if (options.signal?.aborted) return;
+    const chunk = missing.slice(i, i + SONG_DETAIL_BATCH);
+    const batch = await songsByIds(chunk);
+    if (options.signal?.aborted) return;
+    if (batch.length > 0) options.onBatch?.(batch);
+  }
+};
+
+/**
+ * 新建歌单
+ * @param name 歌单名
+ * @param privacy 0 公开 / 10 私密
+ * @returns 新建的歌单元数据
+ */
+export const createPlaylist = async (name: string, privacy: 0 | 10 = 0): Promise<Playlist> => {
+  const body = ensureOk(await neteaseApi.playlist_create({ name, privacy }));
+  return toPlaylist(body.playlist);
+};
+
+/**
+ * 删除歌单
+ * @param id 歌单 id
+ */
+export const deletePlaylist = async (id: string): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_delete({ id }));
+};
+
+/**
+ * 改歌单名
+ * @param id 歌单 id
+ * @param name 新名称
+ */
+export const updatePlaylistName = async (id: string, name: string): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_name_update({ id, name }));
+};
+
+/**
+ * 改歌单描述
+ * @param id 歌单 id
+ * @param desc 新描述（空字符串清空）
+ */
+export const updatePlaylistDesc = async (id: string, desc: string): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_desc_update({ id, desc }));
+};
+
+/**
+ * 把曲目加入歌单
+ * @param playlistId 歌单 id
+ * @param trackIds 曲目 id 列表
+ * @returns 实际加入条数
+ */
+export const addToPlaylist = async (playlistId: string, trackIds: string[]): Promise<number> => {
+  if (trackIds.length === 0) return 0;
+  const body = ensureOk(
+    await neteaseApi.playlist_tracks({
+      op: "add",
+      pid: playlistId,
+      tracks: trackIds.join(","),
+    }),
+  );
+  return typeof body.count === "number" ? body.count : trackIds.length;
+};
+
+/**
+ * 从歌单移除曲目
+ * @param playlistId 歌单 id
+ * @param trackIds 曲目 id 列表
+ */
+export const removeFromPlaylist = async (playlistId: string, trackIds: string[]): Promise<void> => {
+  if (trackIds.length === 0) return;
+  ensureOk(
+    await neteaseApi.playlist_tracks({
+      op: "del",
+      pid: playlistId,
+      tracks: trackIds.join(","),
+    }),
+  );
+};
+
+/**
+ * 订阅 / 取消订阅他人歌单
+ * @param id 歌单 id
+ * @param subscribe true 订阅 / false 取消
+ */
+export const subscribePlaylist = async (id: string, subscribe: boolean): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_subscribe({ id, t: subscribe ? 1 : 2 }));
+};
+
+/**
+ * 重排自建歌单顺序
+ * @param ids 期望顺序的歌单 id 数组
+ */
+export const reorderPlaylists = async (ids: string[]): Promise<void> => {
+  ensureOk(await neteaseApi.playlist_order_update({ ids: JSON.stringify(ids) }));
+};
diff --git a/src/apis/user/netease.ts b/src/apis/user/netease.ts
index b5807bbb..aebe1e88 100644
--- a/src/apis/user/netease.ts
+++ b/src/apis/user/netease.ts
@@ -1,31 +1,10 @@
-import type { Album, Artist, Playlist, Track } from "@shared/types/player";
+import type { Album, Artist, Playlist } from "@shared/types/player";
 import type { UserSubcount } from "@/types/user";
 import { netease as neteaseApi } from "@/apis/netease";
-import { songsToTracks, toAlbum, toArtist, toPlaylist, toSubcount } from "@/utils/netease";
-import { songsByIds } from "@/apis/song/netease";
+import { ensureOk, toAlbum, toArtist, toPlaylist, toSubcount } from "@/utils/netease";
 
 const PAGE_SIZE = 50;
 
-/** song_detail 单批上限，500 在 URL 长度与延迟之间比较折中 */
-const SONG_DETAIL_BATCH = 500;
-
-interface NeteaseError {
-  code?: number;
-  message?: string;
-  msg?: string;
-}
-
-/**
- * 校验网易云接口响应：code !== 200 时抛 Error，message 取自 body.message / body.msg
- */
-const ensureOk = <T>(body: T): T => {
-  const meta = body as NeteaseError | null | undefined;
-  if (!meta || meta.code !== 200) {
-    throw new Error(meta?.message ?? meta?.msg ?? "");
-  }
-  return body;
-};
-
 /**
  * 通用分页直到拉完
  * @param fetcher 第 N 页拉取函数（offset/limit），返回 `{ data, hasMore }`
@@ -47,54 +26,6 @@ const fetchAllPages = async <Item>(
   return all;
 };
 
-/** fetchPlaylist 可选参数 */
-export interface FetchPlaylistOptions {
-  /** 元数据回调 */
-  onMeta?: (meta: Playlist) => void;
-  /** 曲目分批回调 */
-  onBatch?: (batch: Track[]) => void;
-  /** 中断信号 */
-  signal?: AbortSignal;
-}
-
-/**
- * 拉取歌单：元数据 + 全部曲目
- *
- * 1) `playlist/detail` 一次返回 元数据 + 前 ~1000 首完整 song + 全量 trackIds
- * 2) 若 trackIds 还有未覆盖的，按 500 一批走 `song/detail` 补尾
- *
- * @param playlistId 歌单 id
- * @param options 元数据/曲目回调与中断信号
- */
-export const fetchPlaylist = async (
-  playlistId: string,
-  options: FetchPlaylistOptions = {},
-): Promise<void> => {
-  if (options.signal?.aborted) return;
-  const body = await neteaseApi.playlist_detail({ id: playlistId });
-  if (options.signal?.aborted) return;
-  const raw = body?.playlist;
-  if (!raw) return;
-
-  options.onMeta?.(toPlaylist(raw));
-
-  const firstBatch = songsToTracks(raw.tracks);
-  if (firstBatch.length > 0) options.onBatch?.(firstBatch);
-
-  const have = new Set(firstBatch.map((t) => Number(t.id)));
-  const missing: number[] = (raw.trackIds ?? [])
-    .map((item: { id: number }) => item.id)
-    .filter((tid: number) => !have.has(tid));
-
-  for (let i = 0; i < missing.length; i += SONG_DETAIL_BATCH) {
-    if (options.signal?.aborted) return;
-    const chunk = missing.slice(i, i + SONG_DETAIL_BATCH);
-    const batch = await songsByIds(chunk);
-    if (options.signal?.aborted) return;
-    if (batch.length > 0) options.onBatch?.(batch);
-  }
-};
-
 /** 用户全部歌单 */
 export const fetchUserPlaylists = async (uid: number, total?: number): Promise<Playlist[]> => {
   const body = await neteaseApi.user_playlist({
@@ -136,154 +67,9 @@ export const toggleLikeSong = async (trackId: string, like: boolean): Promise<vo
   ensureOk(await neteaseApi.like({ id: trackId, like }));
 };
 
-/**
- * 新建歌单
- * @param name 歌单名
- * @param privacy 0 公开 / 10 私密
- * @returns 新建的歌单元数据
- */
-export const createPlaylist = async (name: string, privacy: 0 | 10 = 0): Promise<Playlist> => {
-  const body = ensureOk(await neteaseApi.playlist_create({ name, privacy }));
-  return toPlaylist(body.playlist);
-};
-
-/**
- * 删除歌单
- * @param id 歌单 id
- */
-export const deletePlaylist = async (id: string): Promise<void> => {
-  ensureOk(await neteaseApi.playlist_delete({ id }));
-};
-
-/**
- * 改歌单名
- * @param id 歌单 id
- * @param name 新名称
- */
-export const updatePlaylistName = async (id: string, name: string): Promise<void> => {
-  ensureOk(await neteaseApi.playlist_name_update({ id, name }));
-};
-
-/**
- * 改歌单描述
- * @param id 歌单 id
- * @param desc 新描述（空字符串清空）
- */
-export const updatePlaylistDesc = async (id: string, desc: string): Promise<void> => {
-  ensureOk(await neteaseApi.playlist_desc_update({ id, desc }));
-};
-
-/**
- * 把曲目加入歌单
- * @param playlistId 歌单 id
- * @param trackIds 曲目 id 列表
- * @returns 实际加入条数
- */
-export const addToPlaylist = async (playlistId: string, trackIds: string[]): Promise<number> => {
-  if (trackIds.length === 0) return 0;
-  const body = ensureOk(
-    await neteaseApi.playlist_tracks({
-      op: "add",
-      pid: playlistId,
-      tracks: trackIds.join(","),
-    }),
-  );
-  return typeof body.count === "number" ? body.count : trackIds.length;
-};
-
-/**
- * 从歌单移除曲目
- * @param playlistId 歌单 id
- * @param trackIds 曲目 id 列表
- */
-export const removeFromPlaylist = async (playlistId: string, trackIds: string[]): Promise<void> => {
-  if (trackIds.length === 0) return;
-  ensureOk(
-    await neteaseApi.playlist_tracks({
-      op: "del",
-      pid: playlistId,
-      tracks: trackIds.join(","),
-    }),
-  );
-};
-
-/**
- * 订阅 / 取消订阅他人歌单
- * @param id 歌单 id
- * @param subscribe true 订阅 / false 取消
- */
-export const subscribePlaylist = async (id: string, subscribe: boolean): Promise<void> => {
-  ensureOk(await neteaseApi.playlist_subscribe({ id, t: subscribe ? 1 : 2 }));
-};
-
-/**
- * 重排自建歌单顺序
- * @param ids 期望顺序的歌单 id 数组
- */
-export const reorderPlaylists = async (ids: string[]): Promise<void> => {
-  ensureOk(await neteaseApi.playlist_order_update({ ids: JSON.stringify(ids) }));
-};
-
 /** 用户等级 */
 export const fetchUserLevel = async (): Promise<number | undefined> => {
   const body = await neteaseApi.user_level();
   const level = body?.data?.level;
   return typeof level === "number" ? level : undefined;
 };
-
-/**
- * 拉取专辑：元数据 + 全部曲目
- * @param albumId 专辑 id
- */
-export const fetchAlbum = async (
-  albumId: string,
-): Promise<{ album: Album; tracks: Track[]; description?: string } | null> => {
-  const body = await neteaseApi.album({ id: albumId });
-  const raw = body?.album;
-  if (!raw) return null;
-  return {
-    album: toAlbum(raw),
-    tracks: songsToTracks(body?.songs),
-    description: typeof raw.description === "string" ? raw.description : undefined,
-  };
-};
-
-/**
- * 拉取歌手：基本资料 + 热门 50 首 + 全部专辑
- * 两次并行请求（artists + artist_album），专辑用 200 的 limit 覆盖绝大多数情况
- * 更多歌曲通过 fetchArtistSongs 触底分页拉
- * @param artistId 歌手 id
- */
-export const fetchArtist = async (
-  artistId: string,
-): Promise<{ artist: Artist; tracks: Track[]; albums: Album[] } | null> => {
-  const [profile, albums] = await Promise.all([
-    neteaseApi.artists({ id: artistId }),
-    neteaseApi.artist_album({ id: artistId, limit: 200 }),
-  ]);
-  const rawArtist = profile?.artist;
-  if (!rawArtist) return null;
-  return {
-    artist: toArtist(rawArtist),
-    tracks: songsToTracks(profile?.hotSongs),
-    albums: (albums?.hotAlbums ?? []).map(toAlbum),
-  };
-};
-
-/**
- * 触底加载更多歌手歌曲
- * @param artistId 歌手 id
- * @param offset 偏移（首屏 50 首之后从 50 起）
- * @param limit 单页数量，默认 50
- */
-export const fetchArtistSongs = async (
-  artistId: string,
-  offset: number,
-  limit = 50,
-): Promise<{ tracks: Track[]; more: boolean }> => {
-  const body = await neteaseApi.artist_songs({ id: artistId, offset, limit, order: "hot" });
-  return {
-    tracks: songsToTracks(body?.songs),
-    more: !!body?.more,
-  };
-};
diff --git a/src/components/layout/NavUser.vue b/src/components/layout/NavUser.vue
index 11297efa..5da39e09 100644
--- a/src/components/layout/NavUser.vue
+++ b/src/components/layout/NavUser.vue
@@ -36,7 +36,7 @@ const stats = computed(() => [
     key: "album",
     label: t("collection.album"),
     icon: markRaw(IconLucideDisc3),
-    value: user.subcount.albumCount ?? user.albums.length,
+    value: user.albums.length,
   },
   {
     key: "artist",
@@ -113,10 +113,10 @@ const handleLogout = async (): Promise<void> => {
         />
         <IconLucideUserRound v-else class="size-5 text-on-surface-variant" />
       </span>
-      <div class="flex items-center gap-1.5">
-        <span class="text-sm font-semibold text-on-surface truncate max-w-30">
-          {{ user.profile?.nickname || t("login.unknownUser") }}
-        </span>
+      <span class="w-full text-sm font-semibold text-on-surface text-center truncate">
+        {{ user.profile?.nickname || t("login.unknownUser") }}
+      </span>
+      <div v-if="user.level !== undefined || isVip" class="flex items-center gap-1.5">
         <span
           v-if="user.level !== undefined"
           class="shrink-0 inline-flex items-center px-1.5 py-0.5 rounded-full text-[10px] font-semibold leading-none bg-amber-500/15 text-amber-600 dark:text-amber-400 tabular-nums"
diff --git a/src/components/layout/SideBarLogo.vue b/src/components/layout/SideBarLogo.vue
index 2c5718f2..0ad03203 100644
--- a/src/components/layout/SideBarLogo.vue
+++ b/src/components/layout/SideBarLogo.vue
@@ -13,7 +13,9 @@ const goHome = (): void => {
 <template>
   <div class="flex items-center justify-center h-16 shrink-0 px-4">
     <div
-      class="inline-flex items-center cursor-pointer transition-transform duration-300 hover:scale-105 active:scale-100"
+      role="link"
+      tabindex="0"
+      class="inline-flex items-center cursor-pointer transform-gpu transition-transform duration-300 hover:scale-105 active:scale-100"
       @click="goHome"
     >
       <SLogo :size="30" class="shrink-0" />
diff --git a/src/components/settings/SettingsContent.vue b/src/components/settings/SettingsContent.vue
index 0c3a01e3..04a95822 100644
--- a/src/components/settings/SettingsContent.vue
+++ b/src/components/settings/SettingsContent.vue
@@ -84,7 +84,7 @@ onMounted(() => {
       </Transition>
 
       <!-- 底部 -->
-      <div class="shrink-0 mt-4 px-1 flex items-center gap-1">
+      <div class="shrink-0 mt-auto pt-4 px-1 flex items-center gap-1">
         <SButton variant="text" size="tiny" @click="openExternal(REPO_URL)">
           <template #icon><IconLucideGithub /></template>
           {{ REPO_NAME }}
diff --git a/src/composables/collection/useCollectionSubscribe.ts b/src/composables/collection/useCollectionSubscribe.ts
index 91fb2c61..c76915e6 100644
--- a/src/composables/collection/useCollectionSubscribe.ts
+++ b/src/composables/collection/useCollectionSubscribe.ts
@@ -6,8 +6,8 @@ import { toast } from "@/composables/useToast";
 /**
  * 通用收藏 / 取消收藏
  *
- * 当前支持：netease playlist
- * 待接入：netease album / radio
+ * 当前支持：netease playlist / album
+ * 待接入：netease radio
  */
 export const useCollectionSubscribe = (collection: Ref<Collection | null>) => {
   const { t } = useI18n();
@@ -21,6 +21,9 @@ export const useCollectionSubscribe = (collection: Ref<Collection | null>) => {
     if (current.type === "playlist") {
       return userStore.subscribedPlaylists.some((item) => item.id === current.id);
     }
+    if (current.type === "album") {
+      return userStore.albums.some((item) => item.id === current.id);
+    }
     return false;
   });
 
@@ -31,6 +34,7 @@ export const useCollectionSubscribe = (collection: Ref<Collection | null>) => {
     if (current.type === "playlist") {
       return !userStore.createdPlaylists.some((item) => item.id === current.id);
     }
+    if (current.type === "album") return true;
     return false;
   });
 
@@ -43,6 +47,8 @@ export const useCollectionSubscribe = (collection: Ref<Collection | null>) => {
       const next = !isSubscribed.value;
       if (current.type === "playlist") {
         await userStore.togglePlaylistSubscribe(current.id, next);
+      } else if (current.type === "album") {
+        await userStore.toggleAlbumSubscribe(current.id, next);
       }
     } catch (err) {
       const message = err instanceof Error && err.message ? err.message : t("liked.toast.failed");
diff --git a/src/pages/Artist.vue b/src/pages/Artist.vue
index e708c734..391387d2 100644
--- a/src/pages/Artist.vue
+++ b/src/pages/Artist.vue
@@ -3,7 +3,7 @@ import type { TrackSource } from "@shared/types/player";
 import type { ArtistProfile, CoverItem } from "@/types/artist";
 import { useSettingsStore } from "@/stores/settings";
 import { loadArtist as loadArtistService } from "@/services/artistLoader";
-import { fetchArtistSongs } from "@/apis/user/netease";
+import { fetchArtistSongs } from "@/apis/artist/netease";
 import { navigateToAlbum } from "@/utils/navigate";
 import SongList from "@/components/list/SongList.vue";
 import { formatTime } from "@/utils/time";
diff --git a/src/services/artistLoader.ts b/src/services/artistLoader.ts
index 2be500f9..0bf8c271 100644
--- a/src/services/artistLoader.ts
+++ b/src/services/artistLoader.ts
@@ -6,7 +6,7 @@ import type { TrackSource } from "@shared/types/player";
 import type { ArtistProfile, CoverItem } from "@/types/artist";
 import { useLibraryStore } from "@/stores/library";
 import { useStreamingStore } from "@/stores/streaming";
-import { fetchArtist } from "@/apis/user/netease";
+import { fetchArtist } from "@/apis/artist/netease";
 
 export interface LoadArtistOptions {
   /** 名称兜底（在线源元数据返回前用于占位） */
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index e8b42b62..c61d3dbb 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -36,15 +36,19 @@ const cacheKeyForTrack = (track: Track): string | null => {
   return null;
 };
 
+/** 在线 URL 解析结果；失败时携带原因，由调用方决定提示 */
+type OnlineResolveResult = { url: string } | { url: null; errorCode: ErrorCode };
+
 /**
  * 根据 track 信息解析出最终的音频源 URL
  * @param track - 要解析的 track
- * @returns 解析出的音频源 URL，如果无法解析则返回 null
+ * @returns 解析结果，失败时带原因码
  */
-const resolveByPlugin = async (track: Track): Promise<string | null> => {
-  if (!isOnlinePlatform(track.source)) return null;
+const resolveByPlugin = async (track: Track): Promise<OnlineResolveResult> => {
+  const fail = (errorCode: ErrorCode): OnlineResolveResult => ({ url: null, errorCode });
+  if (!isOnlinePlatform(track.source)) return fail(ErrorCode.URL_RESOLVE_FAILED);
   const pluginSource = PLATFORM_TO_PLUGIN_SOURCE[track.source];
-  if (!pluginSource) return null;
+  if (!pluginSource) return fail(ErrorCode.URL_RESOLVE_FAILED);
   const plugins = usePluginsStore();
   const candidates = plugins.list.filter(
     (info) =>
@@ -52,10 +56,7 @@ const resolveByPlugin = async (track: Track): Promise<string | null> => {
       info.status.state === "ready" &&
       info.status.sources[pluginSource]?.actions.includes("musicUrl"),
   );
-  if (candidates.length === 0) {
-    handleError(ErrorCode.NO_PLUGIN_AVAILABLE);
-    return null;
-  }
+  if (candidates.length === 0) return fail(ErrorCode.NO_PLUGIN_AVAILABLE);
   // MusicInfoBase 形状；id / songmid / songId 三种别名都给，兼容不同年代脚本
   const totalSec = track.duration > 0 ? Math.round(track.duration / 1000) : 0;
   const interval =
@@ -88,23 +89,23 @@ const resolveByPlugin = async (track: Track): Promise<string | null> => {
         quality: "hq",
         musicInfo,
       });
-      if (res?.url) return res.url;
+      if (res?.url) return { url: res.url };
     } catch (err) {
       console.warn("[plugin] resolveUrl failed", plugin.manifest.id, err);
     }
   }
-  return null;
+  return { url: null, errorCode: ErrorCode.URL_RESOLVE_FAILED };
 };
 
 /**
  * 解析在线音频源 URL
  * @param track - 要解析的 track
  */
-const resolveOnlineUrl = async (track: Track): Promise<string | null> => {
+const resolveOnlineUrl = async (track: Track): Promise<OnlineResolveResult> => {
   try {
     if (track.source === "netease") {
       const url = await resolveNeteaseUrl(track);
-      if (url) return url;
+      if (url) return { url };
     }
   } catch {
     // 官方 API 异常回落插件
@@ -120,7 +121,7 @@ const resolveOnlineUrl = async (track: Track): Promise<string | null> => {
 export interface ResolvedTrackSource {
   source: string;
   fromCache: boolean;
-  cacheRequest?: () => void;
+  cacheRequest?: () => Promise<void>;
 }
 
 /**
@@ -167,15 +168,16 @@ export const resolveTrackSource = async (track: Track): Promise<ResolvedTrackSou
   // 在线源（netease / qqmusic / kugou）
   if (isOnlinePlatform(track.source)) {
     try {
-      const url = await resolveOnlineUrl(track);
-      if (!url) {
-        handleError(ErrorCode.URL_RESOLVE_FAILED);
+      const resolved = await resolveOnlineUrl(track);
+      if (resolved.url === null) {
+        handleError(resolved.errorCode);
         return null;
       }
+      const url = resolved.url;
       const result: ResolvedTrackSource = { source: url, fromCache: false };
       if (cacheEnabled) {
-        result.cacheRequest = () => {
-          void window.api.cache.song.fetch(cacheKey!, track.source, url);
+        result.cacheRequest = async () => {
+          void window.api.cache.song.fetch(cacheKey, track.source, url);
         };
       }
       return result;
diff --git a/src/services/collectionLoader.ts b/src/services/collectionLoader.ts
index 3929237d..a0c4457b 100644
--- a/src/services/collectionLoader.ts
+++ b/src/services/collectionLoader.ts
@@ -12,7 +12,8 @@ import type { Collection, CollectionType } from "@/types/collection";
 import { usePlaylistStore } from "@/stores/playlist";
 import { useLibraryStore } from "@/stores/library";
 import { useStreamingStore } from "@/stores/streaming";
-import { fetchAlbum, fetchPlaylist } from "@/apis/user/netease";
+import { fetchAlbum } from "@/apis/album/netease";
+import { fetchPlaylist } from "@/apis/playlist/netease";
 
 export interface LoadCollectionOptions {
   /** 名称兜底 */
diff --git a/src/settings/categories/services.ts b/src/settings/categories/services.ts
index 4c8b8b96..3962d9aa 100644
--- a/src/settings/categories/services.ts
+++ b/src/settings/categories/services.ts
@@ -61,7 +61,7 @@ const servicesCategory: SettingCategory = {
               key: "externalApiWs",
               type: "switch",
               binding: { store: "settings", path: "system.externalApi.wsEnabled" },
-              defaultValue: true,
+              defaultValue: false,
             },
             {
               key: "externalApiPort",
diff --git a/src/stores/history.ts b/src/stores/history.ts
index b24d9b55..e3e6f2cc 100644
--- a/src/stores/history.ts
+++ b/src/stores/history.ts
@@ -20,49 +20,49 @@ const keyOf = (track: Track): string => `${track.source}:${track.id}`;
 export const useHistoryStore = defineStore("history", () => {
   /** 倒序：最近播放在前 */
   const entries = shallowRef<HistoryEntry[]>([]);
+  let loaded = false;
 
-  const readFromDisk = async (): Promise<HistoryEntry[]> => {
-    const cached = await db.getItem<HistoryEntry[]>(HISTORY_KEY).catch(() => null);
-    return Array.isArray(cached) ? cached : [];
-  };
-
-  const apply = async (next: HistoryEntry[]): Promise<void> => {
-    entries.value = next;
-    await db.setItem(HISTORY_KEY, toRaw(next)).catch(() => {});
+  /** 持久化 */
+  const persist = (): void => {
+    void db.setItem(HISTORY_KEY, toRaw(entries.value)).catch(() => {});
   };
 
+  /** 启动时读一次盘，之后内存为真值源 */
   const load = async (): Promise<void> => {
-    entries.value = await readFromDisk();
+    if (loaded) return;
+    loaded = true;
+    const cached = await db.getItem<HistoryEntry[]>(HISTORY_KEY).catch(() => null);
+    if (Array.isArray(cached)) entries.value = cached;
   };
 
   /**
-   * 记录一次播放：每次都以硬盘为真值源，避免内存未 load 时覆盖旧历史
+   * 记录一次播放：同源同 id 去重后置顶
    * @param track 当前播放曲目
    */
-  const record = async (track: Track): Promise<void> => {
+  const record = (track: Track): void => {
     if (!track?.id) return;
     const key = keyOf(track);
-    const list = await readFromDisk();
-    const filtered = list.filter((item) => keyOf(item.track) !== key);
-    const next = [{ track, playedAt: Date.now() }, ...filtered].slice(0, MAX_HISTORY);
-    await apply(next);
+    const filtered = entries.value.filter((item) => keyOf(item.track) !== key);
+    entries.value = [{ track, playedAt: Date.now() }, ...filtered].slice(0, MAX_HISTORY);
+    persist();
   };
 
   /**
    * 移除单条历史
    * @param track 要删除的曲目
    */
-  const remove = async (track: Track): Promise<void> => {
+  const remove = (track: Track): void => {
     const key = keyOf(track);
-    const list = await readFromDisk();
-    const next = list.filter((entry) => keyOf(entry.track) !== key);
-    if (next.length === list.length) return;
-    await apply(next);
+    const next = entries.value.filter((entry) => keyOf(entry.track) !== key);
+    if (next.length === entries.value.length) return;
+    entries.value = next;
+    persist();
   };
 
   /** 清空全部历史 */
-  const clear = async (): Promise<void> => {
-    await apply([]);
+  const clear = (): void => {
+    entries.value = [];
+    persist();
   };
 
   /** 按时间倒序的扁平曲目列表 */
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 2a9b3cab..13071e19 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -9,13 +9,15 @@ import {
 } from "@/apis/login/netease";
 import {
   fetchLikelist,
-  fetchPlaylist,
   fetchSubcount,
   fetchUserAlbums,
   fetchUserArtists,
   fetchUserLevel,
   fetchUserPlaylists,
   toggleLikeSong,
+} from "@/apis/user/netease";
+import {
+  fetchPlaylist,
   createPlaylist as apiCreatePlaylist,
   deletePlaylist as apiDeletePlaylist,
   updatePlaylistName,
@@ -23,7 +25,8 @@ import {
   addToPlaylist,
   removeFromPlaylist,
   subscribePlaylist,
-} from "@/apis/user/netease";
+} from "@/apis/playlist/netease";
+import { subscribeAlbum } from "@/apis/album/netease";
 
 /** 登录 cookie 保活间隔 */
 const REFRESH_INTERVAL_MS = 24 * 60 * 60 * 1000;
@@ -361,6 +364,12 @@ export const useUserStore = defineStore(
       await refreshPlaylists();
     };
 
+    /** 收藏 / 取消收藏专辑 */
+    const toggleAlbumSubscribe = async (albumId: string, subscribe: boolean): Promise<void> => {
+      await subscribeAlbum(albumId, subscribe);
+      albums.value = await fetchUserAlbums();
+    };
+
     /** 同步用户内容 */
     const syncContent = (uid: number | undefined): void => {
       if (uid) void loadContent(uid);
@@ -448,6 +457,7 @@ export const useUserStore = defineStore(
       addTracksToPlaylist,
       removeTracksFromPlaylist,
       togglePlaylistSubscribe,
+      toggleAlbumSubscribe,
     };
   },
   {
diff --git a/src/types/user.ts b/src/types/user.ts
index 00308310..7482d426 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -22,8 +22,6 @@ export interface UserSubcount {
   createdPlaylistCount: number;
   /** 收藏歌单数 */
   subPlaylistCount: number;
-  /** 收藏专辑数 */
-  albumCount?: number;
   /** 收藏歌手数 */
   artistCount: number;
 }
diff --git a/src/utils/navigate.ts b/src/utils/navigate.ts
index 0b7a491b..5a3058e3 100644
--- a/src/utils/navigate.ts
+++ b/src/utils/navigate.ts
@@ -7,9 +7,9 @@ const isExternal = (source: TrackSource): boolean => source !== "local";
 /**
  * 跳转到专辑页
  * 非本地源没拿到真实 albumId 时静默忽略，避免用专辑名当 ID 触发服务器 400 / 路由错位
- * @param albumName - 专辑名称（本地用作聚合 key；非本地用于 query 兜底显示）
- * @param options.source - 来源（local/streaming/online）；默认为 local
- * @param options.albumId - 真实专辑 ID（streaming/online 必填）
+ * @param albumName - 专辑名称
+ * @param options.source - 来源
+ * @param options.albumId - 真实专辑 ID
  */
 export const navigateToAlbum = (
   albumName?: string,
diff --git a/src/utils/netease.ts b/src/utils/netease.ts
index dbee4886..c95e0c1f 100644
--- a/src/utils/netease.ts
+++ b/src/utils/netease.ts
@@ -2,6 +2,23 @@ import type { Album, Artist, AudioQuality, Playlist, Track, TrackFee } from "@sh
 import type { UserSubcount } from "@/types/user";
 import type { NeteaseSong } from "@/types/netease";
 
+interface NeteaseError {
+  code?: number;
+  message?: string;
+  msg?: string;
+}
+
+/**
+ * 校验网易云接口响应：code !== 200 时抛 Error，message 取自 body.message / body.msg
+ */
+export const ensureOk = <T>(body: T): T => {
+  const meta = body as NeteaseError | null | undefined;
+  if (!meta || meta.code !== 200) {
+    throw new Error(meta?.message ?? meta?.msg ?? "");
+  }
+  return body;
+};
+
 /**
  *  fee → 应用层 TrackFee
  *  fee：0=免费 1=VIP 4=购买专辑 8=会员高音质（视作 VIP）

From fa9ed168eadd10c940bdb447d7e11d83cfd53b5d Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Tue, 19 May 2026 17:46:11 +0800
Subject: [PATCH 21/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E6=94=B6=E8=97=8F=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/album/netease.ts         |   2 +-
 src/apis/artist/netease.ts        |   2 +-
 src/apis/playlist/netease.ts      |   2 +-
 src/apis/search/netease.ts        |   2 +-
 src/apis/song/netease.ts          |   2 +-
 src/apis/user/netease.ts          |   2 +-
 src/components/layout/SideBar.vue |   2 +
 src/composables/useCopyText.ts    |  27 ++++++
 src/composables/useTrackMenu.ts   | 137 ++++++++++++++++++++----------
 src/i18n/locales/en-US.json       |  22 ++++-
 src/i18n/locales/zh-CN.json       |  22 ++++-
 src/pages/Favorites.vue           | 122 ++++++++++++++++++++++++++
 src/pages/Streaming/Albums.vue    |  12 +--
 src/pages/Streaming/Artists.vue   |   9 +-
 src/pages/Streaming/Playlists.vue |   9 +-
 src/router/index.ts               |   5 ++
 src/services/artistLoader.ts      |  11 +--
 src/utils/format/coverItem.ts     |  56 ++++++++++++
 src/utils/{ => format}/netease.ts |   3 +-
 src/utils/format/shareUrl.ts      |  19 +++++
 20 files changed, 382 insertions(+), 86 deletions(-)
 create mode 100644 src/composables/useCopyText.ts
 create mode 100644 src/pages/Favorites.vue
 create mode 100644 src/utils/format/coverItem.ts
 rename src/utils/{ => format}/netease.ts (97%)
 create mode 100644 src/utils/format/shareUrl.ts

diff --git a/src/apis/album/netease.ts b/src/apis/album/netease.ts
index 86c4b178..ae1eed42 100644
--- a/src/apis/album/netease.ts
+++ b/src/apis/album/netease.ts
@@ -1,6 +1,6 @@
 import type { Album, Track } from "@shared/types/player";
 import { netease as neteaseApi } from "@/apis/netease";
-import { ensureOk, songsToTracks, toAlbum } from "@/utils/netease";
+import { ensureOk, songsToTracks, toAlbum } from "@/utils/format/netease";
 
 /**
  * 拉取专辑：元数据 + 全部曲目
diff --git a/src/apis/artist/netease.ts b/src/apis/artist/netease.ts
index 51bc6b92..bf47bdcc 100644
--- a/src/apis/artist/netease.ts
+++ b/src/apis/artist/netease.ts
@@ -1,6 +1,6 @@
 import type { Album, Artist, Track } from "@shared/types/player";
 import { netease as neteaseApi } from "@/apis/netease";
-import { songsToTracks, toAlbum, toArtist } from "@/utils/netease";
+import { songsToTracks, toAlbum, toArtist } from "@/utils/format/netease";
 
 /**
  * 拉取歌手：基本资料 + 热门 50 首 + 全部专辑
diff --git a/src/apis/playlist/netease.ts b/src/apis/playlist/netease.ts
index b0e6e4d3..5ed191f2 100644
--- a/src/apis/playlist/netease.ts
+++ b/src/apis/playlist/netease.ts
@@ -1,6 +1,6 @@
 import type { Playlist, Track } from "@shared/types/player";
 import { netease as neteaseApi } from "@/apis/netease";
-import { ensureOk, songsToTracks, toPlaylist } from "@/utils/netease";
+import { ensureOk, songsToTracks, toPlaylist } from "@/utils/format/netease";
 import { songsByIds } from "@/apis/song/netease";
 
 /** song_detail 单批上限 */
diff --git a/src/apis/search/netease.ts b/src/apis/search/netease.ts
index 8c75bc7e..d1b2a34e 100644
--- a/src/apis/search/netease.ts
+++ b/src/apis/search/netease.ts
@@ -2,7 +2,7 @@ import type { Track } from "@shared/types/player";
 import type { CoverItem } from "@/types/artist";
 import type { NeteaseSong } from "@/types/netease";
 import { netease as neteaseApi } from "@/apis/netease";
-import { songsToTracks, withPicSize } from "@/utils/netease";
+import { songsToTracks, withPicSize } from "@/utils/format/netease";
 import type { SearchResult } from "./index";
 
 interface NeteaseAlbum {
diff --git a/src/apis/song/netease.ts b/src/apis/song/netease.ts
index 633a0f01..ff8844a1 100644
--- a/src/apis/song/netease.ts
+++ b/src/apis/song/netease.ts
@@ -1,6 +1,6 @@
 import type { Track } from "@shared/types/player";
 import { netease as neteaseApi } from "@/apis/netease";
-import { songsToTracks } from "@/utils/netease";
+import { songsToTracks } from "@/utils/format/netease";
 
 /**
  * 按 ID 批量取歌曲详情
diff --git a/src/apis/user/netease.ts b/src/apis/user/netease.ts
index aebe1e88..cca7b118 100644
--- a/src/apis/user/netease.ts
+++ b/src/apis/user/netease.ts
@@ -1,7 +1,7 @@
 import type { Album, Artist, Playlist } from "@shared/types/player";
 import type { UserSubcount } from "@/types/user";
 import { netease as neteaseApi } from "@/apis/netease";
-import { ensureOk, toAlbum, toArtist, toPlaylist, toSubcount } from "@/utils/netease";
+import { ensureOk, toAlbum, toArtist, toPlaylist, toSubcount } from "@/utils/format/netease";
 
 const PAGE_SIZE = 50;
 
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 4ae7c533..29f46a38 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -14,6 +14,7 @@ import IconLucideFolder from "~icons/lucide/folder";
 import IconLucideServer from "~icons/lucide/server";
 import IconLucideListMusic from "~icons/lucide/list-music";
 import IconMaterialSymbolsFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
+import IconLucideStar from "~icons/lucide/star";
 import IconLucideHistory from "~icons/lucide/history";
 import IconLucidePlus from "~icons/lucide/plus";
 import IconLucideChevronDown from "~icons/lucide/chevron-down";
@@ -133,6 +134,7 @@ const menuItems = computed<SMenuItem[]>(() => [
         { key: "/streaming", label: t("nav.streaming"), icon: markRaw(IconLucideServer) },
       ] satisfies SMenuItem[])
     : []),
+  { key: "/favorites", label: t("nav.favorites"), icon: markRaw(IconLucideStar) },
   { key: "/history", label: t("nav.history"), icon: markRaw(IconLucideHistory) },
   // 我的歌单
   { key: "divider-playlist", type: "divider" },
diff --git a/src/composables/useCopyText.ts b/src/composables/useCopyText.ts
new file mode 100644
index 00000000..bef0cd7c
--- /dev/null
+++ b/src/composables/useCopyText.ts
@@ -0,0 +1,27 @@
+import { toast } from "@/composables/useToast";
+
+/**
+ * 复制文本到剪贴板，自动 toast 反馈
+ */
+export const useCopyText = () => {
+  const { t } = useI18n();
+
+  /**
+   * 复制文本
+   * @param text - 要复制的内容
+   */
+  const copy = async (text: string | null | undefined): Promise<void> => {
+    if (!text) {
+      toast.error(t("common.copyFailed"));
+      return;
+    }
+    try {
+      await navigator.clipboard.writeText(text);
+      toast.success(t("common.copied"));
+    } catch {
+      toast.error(t("common.copyFailed"));
+    }
+  };
+
+  return { copy };
+};
diff --git a/src/composables/useTrackMenu.ts b/src/composables/useTrackMenu.ts
index 9ab26a92..158ba5d2 100644
--- a/src/composables/useTrackMenu.ts
+++ b/src/composables/useTrackMenu.ts
@@ -3,6 +3,8 @@ import type { Track } from "@shared/types/player";
 import type { CollectionType } from "@/types/collection";
 import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
 import * as player from "@/core/player";
+import { useCopyText } from "@/composables/useCopyText";
+import { getShareUrl } from "@/utils/format/shareUrl";
 import IconPlay from "~icons/lucide/play";
 import IconListEnd from "~icons/lucide/list-end";
 import IconListPlus from "~icons/lucide/list-plus";
@@ -10,6 +12,8 @@ import IconFolderOpen from "~icons/lucide/folder-open";
 import IconCopy from "~icons/lucide/copy";
 import IconTrash2 from "~icons/lucide/trash-2";
 import IconListMinus from "~icons/lucide/list-minus";
+import IconSearch from "~icons/lucide/search";
+import IconMoreHorizontal from "~icons/lucide/more-horizontal";
 
 export interface TrackMenuOptions {
   /** 集合类型 */
@@ -29,53 +33,84 @@ export interface TrackMenuOptions {
  */
 export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOptions = {}) => {
   const { t } = useI18n();
-  // 可本地操作
-  const isLocal = computed(() => track.value?.source === "local");
+  const router = useRouter();
+  const { copy } = useCopyText();
   const isPlaylist = options.collectionType === "playlist";
-  // 是否添加到歌单
-  const canAddToPlaylist = computed(() => {
+  // 菜单项
+  const items = computed<DropdownMenuItem[]>(() => {
     const source = track.value?.source;
-    return source === "local" || source === "netease";
+    const isLocal = source === "local";
+    const canAddToPlaylist = source === "local" || source === "netease";
+    const isOnline = source !== "local" && source !== "streaming";
+    return [
+      { key: "play", label: t("songList.context.play"), icon: markRaw(IconPlay) },
+      { key: "playNext", label: t("songList.context.playNext"), icon: markRaw(IconListEnd) },
+      {
+        key: "addToPlaylist",
+        label: t("collection.addTo", { type: t("collection.playlist") }),
+        icon: markRaw(IconListPlus),
+        separator: true,
+        show: canAddToPlaylist,
+      },
+      {
+        key: "showInExplorer",
+        label: t("songList.context.showInExplorer"),
+        icon: markRaw(IconFolderOpen),
+        separator: true,
+        show: isLocal,
+      },
+      {
+        key: "copyPath",
+        label: t("songList.context.copyPath"),
+        icon: markRaw(IconCopy),
+        show: isLocal,
+      },
+      {
+        key: "removeFromCollection",
+        label: t("collection.removeFrom", { type: t("collection.playlist") }),
+        icon: markRaw(IconListMinus),
+        separator: true,
+        show: isPlaylist,
+      },
+      {
+        key: "deleteFile",
+        label: t("songList.context.deleteFile"),
+        icon: markRaw(IconTrash2),
+        separator: !isPlaylist,
+        show: isLocal,
+      },
+      {
+        key: "searchSame",
+        label: t("songList.context.searchSame"),
+        icon: markRaw(IconSearch),
+        separator: true,
+      },
+      {
+        key: "more",
+        label: t("songList.context.more"),
+        icon: markRaw(IconMoreHorizontal),
+        children: [
+          {
+            key: "copyTitle",
+            label: t("songList.context.copyTitle"),
+            icon: markRaw(IconCopy),
+          },
+          {
+            key: "copyId",
+            label: t("songList.context.copyId"),
+            icon: markRaw(IconCopy),
+            show: !isLocal,
+          },
+          {
+            key: "copyUrl",
+            label: t("songList.context.copyUrl"),
+            icon: markRaw(IconCopy),
+            show: isOnline,
+          },
+        ],
+      },
+    ];
   });
-  // 菜单项
-  const items = computed<DropdownMenuItem[]>(() => [
-    { key: "play", label: t("songList.context.play"), icon: markRaw(IconPlay) },
-    { key: "playNext", label: t("songList.context.playNext"), icon: markRaw(IconListEnd) },
-    {
-      key: "addToPlaylist",
-      label: t("collection.addTo", { type: t("collection.playlist") }),
-      icon: markRaw(IconListPlus),
-      separator: true,
-      show: canAddToPlaylist.value,
-    },
-    {
-      key: "showInExplorer",
-      label: t("songList.context.showInExplorer"),
-      icon: markRaw(IconFolderOpen),
-      separator: true,
-      show: isLocal.value,
-    },
-    {
-      key: "copyPath",
-      label: t("songList.context.copyPath"),
-      icon: markRaw(IconCopy),
-      show: isLocal.value,
-    },
-    {
-      key: "removeFromCollection",
-      label: t("collection.removeFrom", { type: t("collection.playlist") }),
-      icon: markRaw(IconListMinus),
-      separator: true,
-      show: isPlaylist,
-    },
-    {
-      key: "deleteFile",
-      label: t("songList.context.deleteFile"),
-      icon: markRaw(IconTrash2),
-      separator: !isPlaylist,
-      show: isLocal.value,
-    },
-  ]);
 
   const handleSelect = async (key: string): Promise<void> => {
     const current = track.value;
@@ -94,7 +129,7 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
         if (current.path) window.api.system.showInExplorer(current.path);
         break;
       case "copyPath":
-        if (current.path) navigator.clipboard.writeText(current.path);
+        await copy(current.path);
         break;
       case "removeFromCollection":
         options.onRemove?.(current);
@@ -102,6 +137,18 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
       case "deleteFile":
         options.onDeleteFile?.(current);
         break;
+      case "searchSame":
+        router.push({ path: "/search", query: { q: current.title } });
+        break;
+      case "copyTitle":
+        await copy(current.title);
+        break;
+      case "copyId":
+        await copy(current.id);
+        break;
+      case "copyUrl":
+        await copy(getShareUrl(current));
+        break;
     }
   };
 
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ef196d27..d4055a46 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -14,6 +14,8 @@
     "refreshCache": "Refresh cache",
     "success": "Success",
     "error": "Error",
+    "copied": "Copied",
+    "copyFailed": "Copy failed",
     "playAll": "Play All",
     "totalSongs": "{count} songs",
     "totalAlbums": "{count} albums",
@@ -78,6 +80,7 @@
     "library": "Library",
     "liked": "Liked Songs",
     "history": "Play History",
+    "favorites": "Favorites",
     "streaming": "Streaming",
     "settings": "Settings",
     "reload": "Reload",
@@ -237,9 +240,14 @@
     "context": {
       "play": "Play",
       "playNext": "Play Next",
-      "showInExplorer": "Show in Explorer",
+      "showInExplorer": "Open Location",
       "copyPath": "Copy File Path",
-      "deleteFile": "Delete File"
+      "deleteFile": "Delete File",
+      "searchSame": "Search by Name",
+      "more": "More",
+      "copyTitle": "Copy Title",
+      "copyId": "Copy Song ID",
+      "copyUrl": "Share Song Link"
     },
     "batch": {
       "manage": "Batch Manage",
@@ -303,6 +311,16 @@
     "clearConfirmTitle": "Clear Play History",
     "clearConfirmContent": "Clear all play history? This cannot be undone."
   },
+  "favorites": {
+    "title": "Favorites",
+    "empty": "Nothing here yet — go explore and save something you like",
+    "notLogin": "Sign in to see your favorites",
+    "tabs": {
+      "playlist": "Playlists",
+      "album": "Albums",
+      "artist": "Artists"
+    }
+  },
   "library": {
     "title": "Library",
     "empty": "Library is empty",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 9e9dc226..89ad91d6 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -14,6 +14,8 @@
     "refreshCache": "刷新缓存",
     "success": "操作成功",
     "error": "操作失败",
+    "copied": "已复制",
+    "copyFailed": "复制失败",
     "playAll": "播放全部",
     "totalSongs": "共 {count} 首",
     "totalAlbums": "共 {count} 张专辑",
@@ -78,6 +80,7 @@
     "library": "音乐库",
     "liked": "我喜欢的音乐",
     "history": "播放历史",
+    "favorites": "我的收藏",
     "streaming": "流媒体",
     "settings": "设置",
     "reload": "热重载",
@@ -237,9 +240,14 @@
     "context": {
       "play": "播放",
       "playNext": "下一首播放",
-      "showInExplorer": "在文件管理器中显示",
+      "showInExplorer": "打开文件位置",
       "copyPath": "复制文件路径",
-      "deleteFile": "删除文件"
+      "deleteFile": "删除文件",
+      "searchSame": "同名搜索",
+      "more": "更多操作",
+      "copyTitle": "复制歌曲名称",
+      "copyId": "复制歌曲 ID",
+      "copyUrl": "分享歌曲链接"
     },
     "batch": {
       "manage": "批量管理",
@@ -303,6 +311,16 @@
     "clearConfirmTitle": "清空播放历史",
     "clearConfirmContent": "确认清空全部播放历史吗？此操作不可撤销！"
   },
+  "favorites": {
+    "title": "我的收藏",
+    "empty": "这里还空空如也，去发现一些喜欢的内容吧",
+    "notLogin": "登录后才能查看收藏的内容",
+    "tabs": {
+      "playlist": "歌单",
+      "album": "专辑",
+      "artist": "歌手"
+    }
+  },
   "library": {
     "title": "音乐库",
     "empty": "音乐库为空",
diff --git a/src/pages/Favorites.vue b/src/pages/Favorites.vue
new file mode 100644
index 00000000..25694590
--- /dev/null
+++ b/src/pages/Favorites.vue
@@ -0,0 +1,122 @@
+<script setup lang="ts">
+import type { CoverItem } from "@/types/artist";
+import { useUserStore } from "@/stores/user";
+import {
+  albumsToCoverItems,
+  artistsToCoverItems,
+  playlistToCoverItem,
+} from "@/utils/format/coverItem";
+import CoverList from "@/components/list/CoverList.vue";
+import IconLucideListMusic from "~icons/lucide/list-music";
+import IconLucideDisc3 from "~icons/lucide/disc-3";
+import IconLucideUser from "~icons/lucide/user";
+import IconMaterialSymbolsFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
+
+const { t } = useI18n();
+const router = useRouter();
+const user = useUserStore();
+
+type FavTab = "playlist" | "album" | "artist";
+
+const activeTab = ref<FavTab>("playlist");
+
+const tabs = computed(() => [
+  { key: "playlist" satisfies FavTab, label: t("favorites.tabs.playlist") },
+  { key: "album" satisfies FavTab, label: t("favorites.tabs.album") },
+  { key: "artist" satisfies FavTab, label: t("favorites.tabs.artist") },
+]);
+
+const playlistItems = computed<CoverItem[]>(() =>
+  user.subscribedPlaylists.map((pl) => ({
+    ...playlistToCoverItem(pl),
+    subtitle: pl.trackCount ? t("common.totalSongs", { count: pl.trackCount }) : "",
+  })),
+);
+
+const albumItems = computed<CoverItem[]>(() => albumsToCoverItems(user.albums));
+
+const artistItems = computed<CoverItem[]>(() => artistsToCoverItems(user.artists));
+
+const currentItems = computed<CoverItem[]>(() => {
+  if (activeTab.value === "playlist") return playlistItems.value;
+  if (activeTab.value === "album") return albumItems.value;
+  return artistItems.value;
+});
+
+const countMeta = computed(() => {
+  switch (activeTab.value) {
+    case "album":
+      return {
+        icon: IconLucideDisc3,
+        text: t("common.totalAlbums", { count: albumItems.value.length }),
+      };
+    case "artist":
+      return {
+        icon: IconLucideUser,
+        text: t("common.totalArtists", { count: artistItems.value.length }),
+      };
+    case "playlist":
+    default:
+      return {
+        icon: IconLucideListMusic,
+        text: t("common.totalPlaylists", { count: playlistItems.value.length }),
+      };
+  }
+});
+
+const handleClick = (item: CoverItem): void => {
+  if (activeTab.value === "artist") {
+    router.push(`/artist/netease/${encodeURIComponent(item.id)}`);
+  } else {
+    router.push(`/collection/netease/${activeTab.value}/${encodeURIComponent(item.id)}`);
+  }
+};
+</script>
+
+<template>
+  <div class="flex flex-col h-full">
+    <!-- 顶栏 -->
+    <div class="shrink-0 px-5 pb-2">
+      <div class="flex items-baseline gap-4 mt-2 mb-4 min-w-0">
+        <h1 class="text-3xl font-bold text-on-surface shrink-0">{{ t("favorites.title") }}</h1>
+        <Transition name="fade" mode="out-in">
+          <span
+            v-if="user.isLoggedIn"
+            :key="activeTab"
+            class="flex items-center gap-1.5 text-sm text-on-surface-variant/50 truncate"
+          >
+            <component :is="countMeta.icon" class="size-3.5 shrink-0" />
+            {{ countMeta.text }}
+          </span>
+        </Transition>
+      </div>
+      <STabs v-model="activeTab" :tabs="tabs" />
+    </div>
+    <!-- 未登录 -->
+    <div v-if="!user.isLoggedIn" class="flex-1 flex items-center justify-center">
+      <div class="text-center text-on-surface-variant/60">
+        <IconMaterialSymbolsFavoriteOutline class="size-12 mx-auto mb-3 opacity-30" />
+        <div class="text-sm">{{ t("favorites.notLogin") }}</div>
+      </div>
+    </div>
+    <!-- 内容 -->
+    <Transition v-else name="fade" mode="out-in" :duration="150">
+      <div v-if="currentItems.length > 0" :key="activeTab" class="flex-1 min-h-0">
+        <CoverList
+          :items="currentItems"
+          :type="activeTab === 'artist' ? 'artist' : 'default'"
+          :padding-x="20"
+          :padding-top="8"
+          :padding-bottom="20"
+          @click="handleClick"
+        />
+      </div>
+      <div v-else key="empty" class="flex-1 flex items-center justify-center">
+        <div class="text-center text-on-surface-variant/50">
+          <IconMaterialSymbolsFavoriteOutline class="size-12 mx-auto mb-3 opacity-30" />
+          <div class="text-sm">{{ t("favorites.empty") }}</div>
+        </div>
+      </div>
+    </Transition>
+  </div>
+</template>
diff --git a/src/pages/Streaming/Albums.vue b/src/pages/Streaming/Albums.vue
index fa1d0d16..752bfa67 100644
--- a/src/pages/Streaming/Albums.vue
+++ b/src/pages/Streaming/Albums.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { CoverItem } from "@/types/artist";
-import type { Album } from "@shared/types/player";
 import { useStreamingStore } from "@/stores/streaming";
+import { albumsToCoverItems } from "@/utils/format/coverItem";
 import CoverList from "@/components/list/CoverList.vue";
 
 const { t } = useI18n();
@@ -22,15 +22,7 @@ onMounted(() => {
   if (isConnected.value && albums.value.length === 0) refresh();
 });
 
-const items = computed<CoverItem[]>(() =>
-  albums.value.map((a: Album) => ({
-    id: a.id ?? "",
-    title: a.name,
-    cover: a.cover,
-    subtitle: a.artist ?? "",
-    trackCount: a.trackCount ?? 0,
-  })),
-);
+const items = computed<CoverItem[]>(() => albumsToCoverItems(albums.value));
 
 const handleClick = (item: CoverItem): void => {
   router.push(`/collection/streaming/album/${encodeURIComponent(item.id)}`);
diff --git a/src/pages/Streaming/Artists.vue b/src/pages/Streaming/Artists.vue
index 056b9a6a..2a569e0f 100644
--- a/src/pages/Streaming/Artists.vue
+++ b/src/pages/Streaming/Artists.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { CoverItem } from "@/types/artist";
-import type { Artist } from "@shared/types/player";
 import { useStreamingStore } from "@/stores/streaming";
+import { artistToCoverItem } from "@/utils/format/coverItem";
 import CoverList from "@/components/list/CoverList.vue";
 
 const { t } = useI18n();
@@ -23,12 +23,9 @@ onMounted(() => {
 });
 
 const items = computed<CoverItem[]>(() =>
-  artists.value.map((a: Artist) => ({
-    id: a.id ?? "",
-    title: a.name,
-    cover: a.avatar,
+  artists.value.map((a) => ({
+    ...artistToCoverItem(a),
     subtitle: a.albumCount ? t("common.totalAlbums", { count: a.albumCount }) : "",
-    trackCount: 0,
   })),
 );
 
diff --git a/src/pages/Streaming/Playlists.vue b/src/pages/Streaming/Playlists.vue
index 175371f8..13548163 100644
--- a/src/pages/Streaming/Playlists.vue
+++ b/src/pages/Streaming/Playlists.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { CoverItem } from "@/types/artist";
-import type { Playlist } from "@shared/types/player";
 import { useStreamingStore } from "@/stores/streaming";
 import { navigateToPlaylist } from "@/utils/navigate";
+import { playlistToCoverItem } from "@/utils/format/coverItem";
 import CoverList from "@/components/list/CoverList.vue";
 
 const { t } = useI18n();
@@ -23,12 +23,9 @@ onMounted(() => {
 });
 
 const items = computed<CoverItem[]>(() =>
-  playlists.value.map((p: Playlist) => ({
-    id: p.id ?? "",
-    title: p.name,
-    cover: p.cover,
+  playlists.value.map((p) => ({
+    ...playlistToCoverItem(p),
     subtitle: p.trackCount ? t("common.totalSongs", { count: p.trackCount }) : "",
-    trackCount: p.trackCount ?? 0,
   })),
 );
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 626e8100..2b626342 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -27,6 +27,11 @@ const router = createRouter({
           name: "history",
           component: () => import("@/pages/History.vue"),
         },
+        {
+          path: "favorites",
+          name: "favorites",
+          component: () => import("@/pages/Favorites.vue"),
+        },
         {
           path: "collection/:source/:type/:id",
           name: "collection",
diff --git a/src/services/artistLoader.ts b/src/services/artistLoader.ts
index 0bf8c271..19834c8e 100644
--- a/src/services/artistLoader.ts
+++ b/src/services/artistLoader.ts
@@ -3,10 +3,11 @@
  */
 
 import type { TrackSource } from "@shared/types/player";
-import type { ArtistProfile, CoverItem } from "@/types/artist";
+import type { ArtistProfile } from "@/types/artist";
 import { useLibraryStore } from "@/stores/library";
 import { useStreamingStore } from "@/stores/streaming";
 import { fetchArtist } from "@/apis/artist/netease";
+import { albumsToCoverItems } from "@/utils/format/coverItem";
 
 export interface LoadArtistOptions {
   /** 名称兜底（在线源元数据返回前用于占位） */
@@ -87,13 +88,7 @@ const loadNetease = async (id: string, options: LoadArtistOptions): Promise<void
     options.onUpdate(null);
     return;
   }
-  const albums: CoverItem[] = result.albums.map((album) => ({
-    id: album.id ?? "",
-    title: album.name,
-    cover: album.cover,
-    subtitle: album.artist,
-    trackCount: album.trackCount ?? 0,
-  }));
+  const albums = albumsToCoverItems(result.albums);
   options.onUpdate({
     id,
     name: result.artist.name,
diff --git a/src/utils/format/coverItem.ts b/src/utils/format/coverItem.ts
new file mode 100644
index 00000000..1bd9533c
--- /dev/null
+++ b/src/utils/format/coverItem.ts
@@ -0,0 +1,56 @@
+import type { Album, Artist, Playlist } from "@shared/types/player";
+import type { CoverItem } from "@/types/artist";
+
+/**
+ * 领域模型 Album → 展示模型 CoverItem
+ * @param album - 领域模型 Album
+ */
+export const albumToCoverItem = (album: Album): CoverItem => ({
+  id: album.id ?? "",
+  title: album.name,
+  cover: album.cover,
+  subtitle: album.artist ?? "",
+  trackCount: album.trackCount ?? 0,
+});
+
+/**
+ * 领域模型 Artist → 展示模型 CoverItem
+ * @param artist - 领域模型 Artist
+ */
+export const artistToCoverItem = (artist: Artist): CoverItem => ({
+  id: artist.id ?? "",
+  title: artist.name,
+  cover: artist.avatar,
+  trackCount: 0,
+});
+
+/**
+ * 领域模型 Playlist → 展示模型 CoverItem
+ * @param playlist - 领域模型 Playlist
+ */
+export const playlistToCoverItem = (playlist: Playlist): CoverItem => ({
+  id: playlist.id ?? "",
+  title: playlist.name,
+  cover: playlist.cover,
+  trackCount: playlist.trackCount ?? 0,
+});
+
+/**
+ * 批量转换：Album[] → CoverItem[]
+ * @param albums - 领域模型 Album 列表
+ */
+export const albumsToCoverItems = (albums: Album[]): CoverItem[] => albums.map(albumToCoverItem);
+
+/**
+ * 批量转换：Artist[] → CoverItem[]
+ * @param artists - 领域模型 Artist 列表
+ */
+export const artistsToCoverItems = (artists: Artist[]): CoverItem[] =>
+  artists.map(artistToCoverItem);
+
+/**
+ * 批量转换：Playlist[] → CoverItem[]
+ * @param playlists - 领域模型 Playlist 列表
+ */
+export const playlistsToCoverItems = (playlists: Playlist[]): CoverItem[] =>
+  playlists.map(playlistToCoverItem);
diff --git a/src/utils/netease.ts b/src/utils/format/netease.ts
similarity index 97%
rename from src/utils/netease.ts
rename to src/utils/format/netease.ts
index c95e0c1f..9c9e481c 100644
--- a/src/utils/netease.ts
+++ b/src/utils/format/netease.ts
@@ -9,7 +9,8 @@ interface NeteaseError {
 }
 
 /**
- * 校验网易云接口响应：code !== 200 时抛 Error，message 取自 body.message / body.msg
+ * 校验网易云接口响应
+ * code !== 200 时抛 Error，message 取自 body.message / body.msg
  */
 export const ensureOk = <T>(body: T): T => {
   const meta = body as NeteaseError | null | undefined;
diff --git a/src/utils/format/shareUrl.ts b/src/utils/format/shareUrl.ts
new file mode 100644
index 00000000..9ece53cc
--- /dev/null
+++ b/src/utils/format/shareUrl.ts
@@ -0,0 +1,19 @@
+import type { Track } from "@shared/types/player";
+
+/**
+ * 取在线平台的歌曲分享链接
+ * @param track - 当前歌曲，本地/流媒体/不支持平台返回 null
+ */
+export const getShareUrl = (track: Track | null | undefined): string | null => {
+  if (!track?.id) return null;
+  switch (track.source) {
+    case "netease":
+      return `https://music.163.com/#/song?id=${track.id}`;
+    case "qqmusic":
+      return `https://y.qq.com/n/ryqq_v2/songDetail/${track.id}`;
+    case "kugou":
+      return `https://www.kugou.com/mixsong/${track.id}.html`;
+    default:
+      return null;
+  }
+};

From fe11bd50a3185419621d4df140a787300f8bc8f5 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Tue, 19 May 2026 17:57:08 +0800
Subject: [PATCH 22/33] =?UTF-8?q?fix:=20=E8=B7=AF=E7=94=B1=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/NavUser.vue | 13 +++++--
 src/components/list/SongList.vue  | 65 ++++++++++++++++++++++++-------
 src/pages/Artist.vue              | 33 ++++++++++++----
 src/pages/Favorites.vue           | 17 +++++++-
 src/pages/Search.vue              | 13 ++++++-
 5 files changed, 112 insertions(+), 29 deletions(-)

diff --git a/src/components/layout/NavUser.vue b/src/components/layout/NavUser.vue
index 5da39e09..874b0793 100644
--- a/src/components/layout/NavUser.vue
+++ b/src/components/layout/NavUser.vue
@@ -8,6 +8,7 @@ import IconLucideDisc3 from "~icons/lucide/disc-3";
 import IconLucideUserRound from "~icons/lucide/user-round";
 
 const { t } = useI18n();
+const router = useRouter();
 const user = useUserStore();
 
 const loginOpen = ref(false);
@@ -25,7 +26,7 @@ const isVip = computed(() => !!user.profile?.vipType && user.profile.vipType !==
 /** 收藏计数 */
 const stats = computed(() => [
   {
-    key: "playlist",
+    key: "playlist" as const,
     label: t("collection.playlist"),
     icon: markRaw(IconLucideListMusic),
     value:
@@ -33,13 +34,13 @@ const stats = computed(() => [
       user.playlists.length,
   },
   {
-    key: "album",
+    key: "album" as const,
     label: t("collection.album"),
     icon: markRaw(IconLucideDisc3),
     value: user.albums.length,
   },
   {
-    key: "artist",
+    key: "artist" as const,
     label: t("artist.label"),
     icon: markRaw(IconLucideUserRound),
     value: user.subcount.artistCount ?? user.artists.length,
@@ -50,6 +51,11 @@ const onTriggerClick = (): void => {
   if (!user.isLoggedIn) loginOpen.value = true;
 };
 
+const handleStatClick = (key: "playlist" | "album" | "artist"): void => {
+  popoverOpen.value = false;
+  router.push({ path: "/favorites", query: { tab: key } });
+};
+
 const handleLogout = async (): Promise<void> => {
   popoverOpen.value = false;
   const ok = await dialog.confirm({
@@ -139,6 +145,7 @@ const handleLogout = async (): Promise<void> => {
           :key="item.key"
           :title="item.label"
           class="group flex flex-1 flex-col items-center gap-2 px-2 py-1.5 rounded-lg cursor-pointer transition-colors duration-200 hover:bg-on-surface/8 active:bg-on-surface/12"
+          @click="handleStatClick(item.key)"
         >
           <component
             :is="item.icon"
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index b0787a53..10734f55 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -197,6 +197,17 @@ const scrollToPlaying = (): void => {
   if (playingIndex.value >= 0) virtualListRef.value?.scrollToIndex(playingIndex.value);
 };
 
+/** 当前滚动位置 */
+const scrollTop = ref(0);
+
+/** 回顶按钮显示阈值 */
+const canScrollTop = computed(() => scrollTop.value > 100);
+
+const onScroll = (event: Event): void => {
+  scrollTop.value = (event.target as HTMLElement).scrollTop;
+  emit("scroll", event);
+};
+
 /** 批量操作 */
 const batch = useMultiSelect(sortedItems, {
   source: computed(() => props.source),
@@ -269,7 +280,7 @@ defineExpose({
         :get-item-key="(item: Track) => item.id"
         item-fixed
         height="100%"
-        @scroll="(event: Event) => emit('scroll', event)"
+        @scroll="onScroll"
         @reach-bottom="emit('reachBottom')"
       >
         <!-- 搜索无结果 -->
@@ -636,20 +647,44 @@ defineExpose({
         </template>
       </SVirtualList>
     </SContextMenu>
-    <!-- 定位歌曲 -->
-    <Transition name="fade">
-      <div
-        v-if="playingIndex >= 0 && !batch.active.value"
-        class="absolute right-6 z-20 rounded-full bg-surface-panel backdrop-blur-2xl backdrop-saturate-150 shadow-lg border border-solid border-primary/10 transition-[bottom] duration-300"
-        :class="isFloatingPlayerBar ? 'bottom-26' : 'bottom-5'"
-      >
-        <SButton type="primary" variant="bordered" circle :size="40" @click="scrollToPlaying">
-          <template #icon>
-            <IconLucideLocate class="size-4.5" />
-          </template>
-        </SButton>
-      </div>
-    </Transition>
+    <!-- 浮动按钮 -->
+    <div
+      class="absolute right-6 z-20 flex flex-col gap-3 transition-[bottom] duration-300"
+      :class="isFloatingPlayerBar ? 'bottom-26' : 'bottom-5'"
+    >
+      <!-- 回到顶部 -->
+      <Transition name="fade">
+        <div
+          v-if="canScrollTop && !batch.active.value"
+          class="rounded-full bg-surface-panel backdrop-blur-2xl backdrop-saturate-150 shadow-lg border border-solid border-primary/10"
+        >
+          <SButton
+            type="primary"
+            variant="bordered"
+            circle
+            :size="40"
+            @click="virtualListRef?.scrollTo(0)"
+          >
+            <template #icon>
+              <IconLucideArrowUp class="size-4.5" />
+            </template>
+          </SButton>
+        </div>
+      </Transition>
+      <!-- 定位歌曲 -->
+      <Transition name="fade">
+        <div
+          v-if="playingIndex >= 0 && !batch.active.value"
+          class="rounded-full bg-surface-panel backdrop-blur-2xl backdrop-saturate-150 shadow-lg border border-solid border-primary/10"
+        >
+          <SButton type="primary" variant="bordered" circle :size="40" @click="scrollToPlaying">
+            <template #icon>
+              <IconLucideLocate class="size-4.5" />
+            </template>
+          </SButton>
+        </div>
+      </Transition>
+    </div>
     <!-- 删除确认弹窗 -->
     <SDialog v-model:open="deleteConfirmOpen" :title="deleteDialogTitle">
       <p class="text-sm text-on-surface-variant">{{ deleteDialogContent }}</p>
diff --git a/src/pages/Artist.vue b/src/pages/Artist.vue
index 391387d2..6fc1df81 100644
--- a/src/pages/Artist.vue
+++ b/src/pages/Artist.vue
@@ -18,6 +18,7 @@ import IconLucideListChecks from "~icons/lucide/list-checks";
 
 const { t } = useI18n();
 const route = useRoute();
+const router = useRouter();
 const { appearance } = useSettingsStore();
 
 const tabTransitionName = computed(() => {
@@ -29,11 +30,11 @@ const source = route.params.source as TrackSource;
 const id = route.params.id as string;
 
 const artist = shallowRef<ArtistProfile | null>(null);
-/** 正在加载（任一来源） */
+/** 正在加载 */
 const loading = ref(false);
 /** 取消当次加载 */
 let loadAbort: AbortController | null = null;
-/** NCM 歌手歌曲分页：是否还有更多 + 加载中 */
+/** 是否还有更多 */
 const hasMoreSongs = ref(false);
 const loadingMore = ref(false);
 
@@ -52,7 +53,7 @@ const handleListScroll = (event: Event) => {
   }
 };
 
-/** 加载数据：派发到 services/artistLoader，本组件只管 ref + loading + abort */
+/** 加载数据 */
 const loadArtist = async (): Promise<void> => {
   collapsed.value = false;
   loadAbort?.abort();
@@ -68,7 +69,6 @@ const loadArtist = async (): Promise<void> => {
       onUpdate: (next) => {
         if (myAbort.signal.aborted) return;
         artist.value = next;
-        // 仅 NCM 支持触底分页（artist_songs）；首屏 50 首后开放加载更多
         if (next && source === "netease" && next.tracks.length >= 50) {
           hasMoreSongs.value = true;
         }
@@ -79,7 +79,7 @@ const loadArtist = async (): Promise<void> => {
   }
 };
 
-/** 触底加载更多 NCM 歌手歌曲 */
+/** 触底加载 */
 const onReachBottom = async (): Promise<void> => {
   if (source !== "netease" || !hasMoreSongs.value || loadingMore.value || !artist.value) return;
   const current = artist.value;
@@ -134,8 +134,21 @@ const handleMoreMenu = (key: string) => {
   if (key === "batchManage") songListRef.value?.enterBatch();
 };
 
+type ArtistTab = "songs" | "albums";
+
+const ARTIST_TAB_KEYS: readonly ArtistTab[] = ["songs", "albums"];
+
 /** 当前 tab */
-const activeTab = ref("songs");
+const activeTab = computed<ArtistTab>(() => {
+  const tab = route.query.tab;
+  return typeof tab === "string" && (ARTIST_TAB_KEYS as readonly string[]).includes(tab)
+    ? (tab as ArtistTab)
+    : "songs";
+});
+
+const onTabSwitch = (key: string): void => {
+  router.replace({ query: { ...route.query, tab: key } });
+};
 
 watch(activeTab, (tab) => {
   if (tab === "albums") collapsed.value = true;
@@ -254,7 +267,13 @@ const albumItems = computed<CoverItem[]>(() => {
         </div>
       </div>
       <!-- Tab 切换 -->
-      <STabs v-model="activeTab" :tabs="tabs" type="bar" size="large" />
+      <STabs
+        :model-value="activeTab"
+        :tabs="tabs"
+        type="bar"
+        size="large"
+        @update:model-value="onTabSwitch"
+      />
     </div>
     <Transition name="fade" mode="out-in" :duration="150">
       <div
diff --git a/src/pages/Favorites.vue b/src/pages/Favorites.vue
index 25694590..1f021695 100644
--- a/src/pages/Favorites.vue
+++ b/src/pages/Favorites.vue
@@ -13,12 +13,25 @@ import IconLucideUser from "~icons/lucide/user";
 import IconMaterialSymbolsFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
 
 const { t } = useI18n();
+const route = useRoute();
 const router = useRouter();
 const user = useUserStore();
 
 type FavTab = "playlist" | "album" | "artist";
 
-const activeTab = ref<FavTab>("playlist");
+const TAB_KEYS: readonly FavTab[] = ["playlist", "album", "artist"];
+
+/** 当前 tab */
+const activeTab = computed<FavTab>(() => {
+  const tab = route.query.tab;
+  return typeof tab === "string" && (TAB_KEYS as readonly string[]).includes(tab)
+    ? (tab as FavTab)
+    : "playlist";
+});
+
+const onTabSwitch = (key: string): void => {
+  router.replace({ query: { ...route.query, tab: key } });
+};
 
 const tabs = computed(() => [
   { key: "playlist" satisfies FavTab, label: t("favorites.tabs.playlist") },
@@ -90,7 +103,7 @@ const handleClick = (item: CoverItem): void => {
           </span>
         </Transition>
       </div>
-      <STabs v-model="activeTab" :tabs="tabs" />
+      <STabs :model-value="activeTab" :tabs="tabs" @update:model-value="onTabSwitch" />
     </div>
     <!-- 未登录 -->
     <div v-if="!user.isLoggedIn" class="flex-1 flex items-center justify-center">
diff --git a/src/pages/Search.vue b/src/pages/Search.vue
index 1e2424c8..7c5ec44b 100644
--- a/src/pages/Search.vue
+++ b/src/pages/Search.vue
@@ -10,11 +10,20 @@ import { navigateToAlbum, navigateToPlaylist } from "@/utils/navigate";
 
 const { t } = useI18n();
 const route = useRoute();
+const router = useRouter();
 const status = useStatusStore();
 
 type TabKey = "songs" | "albums" | "artists" | "playlists";
 
-const activeTab = ref<TabKey>("songs");
+const TAB_KEYS: readonly TabKey[] = ["songs", "albums", "artists", "playlists"];
+
+/** 当前 tab */
+const activeTab = computed<TabKey>(() => {
+  const tab = route.query.tab;
+  return typeof tab === "string" && (TAB_KEYS as readonly string[]).includes(tab)
+    ? (tab as TabKey)
+    : "songs";
+});
 
 const PAGE_SIZE = 50;
 
@@ -146,7 +155,7 @@ watch(activeTab, (tab) => {
 });
 
 const onTabSwitch = (key: string): void => {
-  activeTab.value = key as TabKey;
+  router.replace({ query: { ...route.query, tab: key } });
 };
 
 const onPlatformSwitch = (key: string): void => {

From e540062c2568674daabf3a90c51acc395d7c0907 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Tue, 19 May 2026 18:30:30 +0800
Subject: [PATCH 23/33] =?UTF-8?q?feat:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=B0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  1 +
 src/components/layout/SideBar.vue             |  9 +++-
 .../modals/PlaylistPickerDialog.vue           | 12 +++--
 src/components/ui/SMenu.vue                   | 45 +++++++++++++++----
 src/i18n/locales/en-US.json                   |  5 +++
 src/i18n/locales/zh-CN.json                   |  5 +++
 src/settings/categories/appearance.ts         |  6 +++
 src/stores/playlist.ts                        |  8 +++-
 src/stores/settings.ts                        |  1 +
 src/types/collection.ts                       |  1 +
 src/types/settings.ts                         |  2 +
 11 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 36188e0d..c6346840 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -64,6 +64,7 @@ declare module 'vue' {
     FullPlayer: typeof import('./src/components/player/FullPlayer/index.vue')['default']
     HotkeyConfig: typeof import('./src/components/settings/custom/HotkeyConfig.vue')['default']
     IconLucideArrowRight: typeof import('~icons/lucide/arrow-right')['default']
+    IconLucideArrowUp: typeof import('~icons/lucide/arrow-up')['default']
     IconLucideArrowUpCircle: typeof import('~icons/lucide/arrow-up-circle')['default']
     IconLucideCheck: typeof import('~icons/lucide/check')['default']
     IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 29f46a38..5af26077 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -100,6 +100,7 @@ const myPlaylistItems = computed<SMenuItem[]>(() => {
       key: `/collection/local/playlist/${pl.id}`,
       label: pl.title,
       icon: markRaw(IconLucideListMusic),
+      cover: appearance.sidebarPlaylistCover ? (pl.cover ?? "") : undefined,
     }));
   }
   // 在线模式
@@ -107,6 +108,7 @@ const myPlaylistItems = computed<SMenuItem[]>(() => {
     key: `/collection/netease/playlist/${pl.id}`,
     label: pl.name,
     icon: markRaw(IconLucideListMusic),
+    cover: appearance.sidebarPlaylistCover ? pl.cover : undefined,
   }));
 });
 
@@ -116,6 +118,7 @@ const subscribedItems = computed<SMenuItem[]>(() =>
     key: `/collection/netease/playlist/${pl.id}`,
     label: pl.name,
     icon: markRaw(IconLucideListMusic),
+    cover: appearance.sidebarPlaylistCover ? pl.cover : undefined,
   })),
 );
 
@@ -183,7 +186,11 @@ onMounted(() => {
     <SideBarLogo :collapsed="appearance.sidebarCollapsed" />
     <div
       class="flex-1 min-h-0 pb-3 overflow-y-auto transition-[padding] duration-300"
-      :class="appearance.sidebarCollapsed ? 'px-2' : 'px-3'"
+      :class="
+        appearance.sidebarCollapsed
+          ? 'px-2 [&::-webkit-scrollbar]:hidden'
+          : 'px-3 [scrollbar-gutter:stable]'
+      "
     >
       <SMenu
         :items="menuItems"
diff --git a/src/components/modals/PlaylistPickerDialog.vue b/src/components/modals/PlaylistPickerDialog.vue
index d2f2d7e9..f4a80df2 100644
--- a/src/components/modals/PlaylistPickerDialog.vue
+++ b/src/components/modals/PlaylistPickerDialog.vue
@@ -34,6 +34,7 @@ const entries = computed<PickerEntry[]>(() => {
     return playlistStore.playlists.map((pl) => ({
       id: pl.id,
       name: pl.title,
+      cover: pl.cover,
       trackCount: pl.trackCount ?? 0,
     }));
   }
@@ -53,6 +54,10 @@ const entries = computed<PickerEntry[]>(() => {
 const createDialogOpen = ref(false);
 const submitting = ref(false);
 
+/**
+ * 分类型添加歌曲
+ * @param playlistId 歌单 ID
+ */
 const handlePick = async (playlistId: string): Promise<void> => {
   if (submitting.value) return;
   submitting.value = true;
@@ -65,11 +70,12 @@ const handlePick = async (playlistId: string): Promise<void> => {
       count = await userStore.addTracksToPlaylist(playlistId, ids);
     }
     if (count > 0) {
-      toast.success(t("liked.toast.added"));
-      emit("update:open", false);
+      toast.success(t("collection.tracksAdded", { count }));
     } else {
-      toast.error(t("liked.toast.failed"));
+      // 全部重复
+      toast.warning(t("collection.alreadyInPlaylist"));
     }
+    emit("update:open", false);
   } catch (err) {
     const message = err instanceof Error && err.message ? err.message : t("liked.toast.failed");
     toast.error(message);
diff --git a/src/components/ui/SMenu.vue b/src/components/ui/SMenu.vue
index ab39a0a7..9edd2f1b 100644
--- a/src/components/ui/SMenu.vue
+++ b/src/components/ui/SMenu.vue
@@ -7,6 +7,7 @@ export interface SMenuItem {
   key: string;
   label?: string;
   icon?: Component;
+  cover?: string;
   disabled?: boolean;
   /** group 类型的自定义渲染内容 */
   render?: () => VNode;
@@ -33,14 +34,32 @@ const sizeClass = computed(() => {
   const collapsed = props.collapsed;
   switch (props.size) {
     case "small":
-      return { item: "h-9 px-2.5 text-sm gap-2.5", icon: collapsed ? "size-5" : "size-[18px]" };
+      return {
+        item: collapsed ? "h-9 text-sm gap-0 justify-center" : "h-9 px-2.5 text-sm gap-2.5",
+        coverItem: collapsed
+          ? "h-10 text-sm gap-0 justify-center"
+          : "h-11 px-2.5 text-sm gap-2.5",
+        icon: collapsed ? "size-5" : "size-4.5",
+        cover: collapsed ? "size-6" : "size-8",
+      };
     case "large":
       return {
-        item: "h-11 px-3.5 text-[15px] gap-3.5",
-        icon: collapsed ? "size-6" : "size-[22px]",
+        item: collapsed
+          ? "h-11 text-[15px] gap-0 justify-center"
+          : "h-11 px-3.5 text-[15px] gap-3.5",
+        coverItem: collapsed
+          ? "h-12 text-[15px] gap-0 justify-center"
+          : "h-14 px-3.5 text-[15px] gap-3.5",
+        icon: collapsed ? "size-6" : "size-5.5",
+        cover: collapsed ? "size-7" : "size-10",
       };
     default:
-      return { item: "h-10.5 px-3 text-sm gap-3", icon: collapsed ? "size-5.5" : "size-5" };
+      return {
+        item: collapsed ? "h-10.5 text-sm gap-0 justify-center" : "h-10.5 px-3 text-sm gap-3",
+        coverItem: collapsed ? "h-11 text-sm gap-0 justify-center" : "h-13 px-3 text-sm gap-3",
+        icon: collapsed ? "size-5.5" : "size-5",
+        cover: collapsed ? "size-7" : "size-9",
+      };
   }
 });
 
@@ -73,9 +92,9 @@ const handleSelect = (item: SMenuItem) => {
         side="right"
       >
         <div
-          class="relative flex items-center rounded-lg cursor-pointer select-none overflow-hidden whitespace-nowrap transition-[background-color,color] duration-250"
+          class="relative flex items-center rounded-lg cursor-pointer select-none overflow-hidden whitespace-nowrap transition-[background-color,color,height,padding] duration-250"
           :class="[
-            sizeClass.item,
+            item.cover !== undefined ? sizeClass.coverItem : sizeClass.item,
             modelValue === item.key
               ? 'bg-primary/10 text-primary'
               : 'text-on-surface/80 hover:bg-on-surface/5',
@@ -83,14 +102,22 @@ const handleSelect = (item: SMenuItem) => {
           ]"
           @click="handleSelect(item)"
         >
+          <SImg
+            v-if="item.cover !== undefined"
+            :src="item.cover"
+            :class="[
+              sizeClass.cover,
+              'shrink-0 rounded-md object-cover transition-[width,height] duration-300',
+            ]"
+          />
           <component
             :is="item.icon"
-            v-if="item.icon"
+            v-else-if="item.icon"
             :class="[sizeClass.icon, 'shrink-0 transition-[width,height] duration-300']"
           />
           <span
-            class="truncate transition-opacity duration-300"
-            :class="collapsed ? 'opacity-0' : 'opacity-100'"
+            class="truncate transition-[opacity,width] duration-300"
+            :class="collapsed ? 'opacity-0 w-0' : 'opacity-100'"
           >
             {{ item.label }}
           </span>
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d4055a46..8b62ad65 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -866,6 +866,10 @@
       "label": "Collapse Sidebar",
       "description": "Collapse the sidebar to icon-only mode"
     },
+    "sidebarPlaylistCover": {
+      "label": "Show Playlist Covers",
+      "description": "Show playlist covers instead of default icons in the sidebar"
+    },
     "fontConfig": {
       "label": "Font Settings",
       "description": "Configure fonts for the app, lyrics, and external lyric windows",
@@ -1129,6 +1133,7 @@
     "removeFrom": "Remove from {type}",
     "tracksAdded": "{count} songs added",
     "tracksRemoved": "{count} songs removed",
+    "alreadyInPlaylist": "Already in the playlist",
     "edit": "Edit {type}",
     "subscribe": "Subscribe",
     "unsubscribe": "Unsubscribe",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 89ad91d6..614bd45d 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -866,6 +866,10 @@
       "label": "折叠侧边栏",
       "description": "将侧边栏折叠为图标模式"
     },
+    "sidebarPlaylistCover": {
+      "label": "歌单显示封面",
+      "description": "侧边栏的歌单项以歌单封面替代默认图标"
+    },
     "fontConfig": {
       "label": "字体配置",
       "description": "统一配置应用、歌词和外部歌词窗口的字体",
@@ -1129,6 +1133,7 @@
     "removeFrom": "从{type}移除",
     "tracksAdded": "已添加 {count} 首歌曲",
     "tracksRemoved": "已移除 {count} 首歌曲",
+    "alreadyInPlaylist": "歌曲已在歌单中",
     "edit": "编辑{type}",
     "subscribe": "收藏",
     "unsubscribe": "取消收藏",
diff --git a/src/settings/categories/appearance.ts b/src/settings/categories/appearance.ts
index 51c6112b..00576a16 100644
--- a/src/settings/categories/appearance.ts
+++ b/src/settings/categories/appearance.ts
@@ -154,6 +154,12 @@ const appearanceCategory: SettingCategory = {
           binding: { store: "settings", path: "appearance.sidebarCollapsed" },
           defaultValue: false,
         },
+        {
+          key: "sidebarPlaylistCover",
+          type: "switch",
+          binding: { store: "settings", path: "appearance.sidebarPlaylistCover" },
+          defaultValue: false,
+        },
       ],
     },
   ],
diff --git a/src/stores/playlist.ts b/src/stores/playlist.ts
index 3806fe20..9ab8ad34 100644
--- a/src/stores/playlist.ts
+++ b/src/stores/playlist.ts
@@ -42,7 +42,6 @@ export const usePlaylistStore = defineStore("playlist", () => {
     }
     return {
       ...meta,
-      cover: tracks.find((t) => t.cover)?.cover,
       tracks,
       trackCount: tracks.length,
     };
@@ -108,6 +107,9 @@ export const usePlaylistStore = defineStore("playlist", () => {
     record.trackIds.unshift(...newIds);
     record.trackCount = record.trackIds.length;
     record.updateTime = Date.now();
+    // 更新封面
+    const candidateCover = tracks.find((track) => track.cover)?.cover;
+    if (candidateCover) record.cover = candidateCover;
     await db.setItem(id, record);
     const idx = playlists.value.findIndex((p) => p.id === id);
     if (idx !== -1) {
@@ -115,6 +117,7 @@ export const usePlaylistStore = defineStore("playlist", () => {
       next[idx] = {
         ...next[idx],
         trackCount: record.trackCount,
+        cover: record.cover,
         updateTime: record.updateTime,
       };
       playlists.value = next;
@@ -130,6 +133,8 @@ export const usePlaylistStore = defineStore("playlist", () => {
     record.trackIds = record.trackIds.filter((tid) => !removeSet.has(tid));
     record.trackCount = record.trackIds.length;
     record.updateTime = Date.now();
+    // 删空时清空封面；其余情况保留旧值（下次 addTracks 才刷新）
+    if (record.trackIds.length === 0) record.cover = undefined;
     await db.setItem(id, record);
     const idx = playlists.value.findIndex((p) => p.id === id);
     if (idx !== -1) {
@@ -137,6 +142,7 @@ export const usePlaylistStore = defineStore("playlist", () => {
       next[idx] = {
         ...next[idx],
         trackCount: record.trackCount,
+        cover: record.cover,
         updateTime: record.updateTime,
       };
       playlists.value = next;
diff --git a/src/stores/settings.ts b/src/stores/settings.ts
index 184d2728..01eaf13f 100644
--- a/src/stores/settings.ts
+++ b/src/stores/settings.ts
@@ -23,6 +23,7 @@ export const useSettingsStore = defineStore(
       layoutMode: "default",
       routeTransition: "fade",
       sidebarCollapsed: false,
+      sidebarPlaylistCover: false,
       closeAction: "hide",
       rememberCloseChoice: false,
       fontFamily: "",
diff --git a/src/types/collection.ts b/src/types/collection.ts
index 44406710..0f85d7dd 100644
--- a/src/types/collection.ts
+++ b/src/types/collection.ts
@@ -16,6 +16,7 @@ export interface PlaylistRecord {
   /** 歌曲 ID 列表 */
   trackIds: string[];
   trackCount?: number;
+  cover?: string;
   createTime?: number;
   updateTime?: number;
 }
diff --git a/src/types/settings.ts b/src/types/settings.ts
index a0d56a90..d6010786 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -134,6 +134,8 @@ export interface AppearanceSettings {
   routeTransition: RouteTransition;
   /** 侧边栏折叠 */
   sidebarCollapsed: boolean;
+  /** 侧边栏歌单项显示封面 */
+  sidebarPlaylistCover: boolean;
   /** 点击关闭按钮的行为 */
   closeAction: "quit" | "hide";
   /** 记忆关闭选择 */

From 23be55e44e2966392d3689e84884c44c511d7c40 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Tue, 19 May 2026 22:53:17 +0800
Subject: [PATCH 24/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E5=B1=95=E5=BC=80=E5=8A=A8=E7=94=BB=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/SideBar.vue | 19 ++++++++++++-------
 src/components/ui/SMenu.vue       | 29 +++++++++++++----------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index 5af26077..f78bd8b5 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -95,12 +95,14 @@ const renderSubscribedHeader = () =>
 
 /** 我的歌单 */
 const myPlaylistItems = computed<SMenuItem[]>(() => {
+  const showCover = appearance.sidebarPlaylistCover;
   if (status.myPlaylistSource === "local") {
     return playlistStore.playlists.map((pl) => ({
       key: `/collection/local/playlist/${pl.id}`,
       label: pl.title,
       icon: markRaw(IconLucideListMusic),
-      cover: appearance.sidebarPlaylistCover ? (pl.cover ?? "") : undefined,
+      cover: pl.cover ?? "",
+      showCover,
     }));
   }
   // 在线模式
@@ -108,19 +110,22 @@ const myPlaylistItems = computed<SMenuItem[]>(() => {
     key: `/collection/netease/playlist/${pl.id}`,
     label: pl.name,
     icon: markRaw(IconLucideListMusic),
-    cover: appearance.sidebarPlaylistCover ? pl.cover : undefined,
+    cover: pl.cover ?? "",
+    showCover,
   }));
 });
 
 /** 收藏的歌单 */
-const subscribedItems = computed<SMenuItem[]>(() =>
-  userStore.subscribedPlaylists.map((pl) => ({
+const subscribedItems = computed<SMenuItem[]>(() => {
+  const showCover = appearance.sidebarPlaylistCover;
+  return userStore.subscribedPlaylists.map((pl) => ({
     key: `/collection/netease/playlist/${pl.id}`,
     label: pl.name,
     icon: markRaw(IconLucideListMusic),
-    cover: appearance.sidebarPlaylistCover ? pl.cover : undefined,
-  })),
-);
+    cover: pl.cover ?? "",
+    showCover,
+  }));
+});
 
 const menuItems = computed<SMenuItem[]>(() => [
   // 本地音乐分组
diff --git a/src/components/ui/SMenu.vue b/src/components/ui/SMenu.vue
index 9edd2f1b..d2efc75d 100644
--- a/src/components/ui/SMenu.vue
+++ b/src/components/ui/SMenu.vue
@@ -7,7 +7,10 @@ export interface SMenuItem {
   key: string;
   label?: string;
   icon?: Component;
+  /** 封面 URL */
   cover?: string;
+  /** 是否以封面形式展示 */
+  showCover?: boolean;
   disabled?: boolean;
   /** group 类型的自定义渲染内容 */
   render?: () => VNode;
@@ -35,28 +38,22 @@ const sizeClass = computed(() => {
   switch (props.size) {
     case "small":
       return {
-        item: collapsed ? "h-9 text-sm gap-0 justify-center" : "h-9 px-2.5 text-sm gap-2.5",
-        coverItem: collapsed
-          ? "h-10 text-sm gap-0 justify-center"
-          : "h-11 px-2.5 text-sm gap-2.5",
+        item: "h-9 px-2.5 text-sm gap-2.5",
+        coverItem: "h-11 px-2.5 text-sm gap-2.5",
         icon: collapsed ? "size-5" : "size-4.5",
         cover: collapsed ? "size-6" : "size-8",
       };
     case "large":
       return {
-        item: collapsed
-          ? "h-11 text-[15px] gap-0 justify-center"
-          : "h-11 px-3.5 text-[15px] gap-3.5",
-        coverItem: collapsed
-          ? "h-12 text-[15px] gap-0 justify-center"
-          : "h-14 px-3.5 text-[15px] gap-3.5",
+        item: "h-11 px-3.5 text-[15px] gap-3.5",
+        coverItem: collapsed ? "h-14 px-2.5 text-[15px] gap-3.5" : "h-14 px-3.5 text-[15px] gap-3.5",
         icon: collapsed ? "size-6" : "size-5.5",
         cover: collapsed ? "size-7" : "size-10",
       };
     default:
       return {
-        item: collapsed ? "h-10.5 text-sm gap-0 justify-center" : "h-10.5 px-3 text-sm gap-3",
-        coverItem: collapsed ? "h-11 text-sm gap-0 justify-center" : "h-13 px-3 text-sm gap-3",
+        item: "h-10.5 px-3 text-sm gap-3",
+        coverItem: collapsed ? "h-13 px-2.5 text-sm gap-3" : "h-13 px-3 text-sm gap-3",
         icon: collapsed ? "size-5.5" : "size-5",
         cover: collapsed ? "size-7" : "size-9",
       };
@@ -94,7 +91,7 @@ const handleSelect = (item: SMenuItem) => {
         <div
           class="relative flex items-center rounded-lg cursor-pointer select-none overflow-hidden whitespace-nowrap transition-[background-color,color,height,padding] duration-250"
           :class="[
-            item.cover !== undefined ? sizeClass.coverItem : sizeClass.item,
+            item.showCover ? sizeClass.coverItem : sizeClass.item,
             modelValue === item.key
               ? 'bg-primary/10 text-primary'
               : 'text-on-surface/80 hover:bg-on-surface/5',
@@ -103,7 +100,7 @@ const handleSelect = (item: SMenuItem) => {
           @click="handleSelect(item)"
         >
           <SImg
-            v-if="item.cover !== undefined"
+            v-if="item.showCover"
             :src="item.cover"
             :class="[
               sizeClass.cover,
@@ -116,8 +113,8 @@ const handleSelect = (item: SMenuItem) => {
             :class="[sizeClass.icon, 'shrink-0 transition-[width,height] duration-300']"
           />
           <span
-            class="truncate transition-[opacity,width] duration-300"
-            :class="collapsed ? 'opacity-0 w-0' : 'opacity-100'"
+            class="truncate transition-opacity duration-300"
+            :class="collapsed ? 'opacity-0' : 'opacity-100'"
           >
             {{ item.label }}
           </span>

From 724179a272c93c4a37e0a6138336aea0fb3d89c4 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Wed, 20 May 2026 00:57:36 +0800
Subject: [PATCH 25/33] =?UTF-8?q?feat:=20=E6=88=91=E7=9A=84=E4=BA=91?=
 =?UTF-8?q?=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/apis/netease/index.ts           |   2 +
 electron/main/apis/netease/modules/index.ts   |   2 +
 .../apis/netease/modules/user_cloud_del.ts    |  19 ++
 shared/types/player.ts                        |   2 +
 src/apis/cloud/netease.ts                     |  64 +++++++
 src/components/layout/SideBar.vue             |   4 +-
 src/components/list/SongList.vue              |  21 +++
 src/components/ui/SMenu.vue                   |   4 +-
 src/composables/useMultiSelect.ts             |  37 ++--
 src/composables/useTrackMenu.ts               |  15 ++
 src/i18n/locales/en-US.json                   |  10 +
 src/i18n/locales/zh-CN.json                   |  10 +
 src/pages/Cloud.vue                           | 172 ++++++++++++++++++
 src/pages/Collection.vue                      |   1 +
 src/router/index.ts                           |   5 +
 src/stores/user.ts                            | 124 +++++++++++++
 src/types/collection.ts                       |   2 +-
 src/types/netease.ts                          |  21 +++
 src/utils/format/netease.ts                   |   1 +
 19 files changed, 501 insertions(+), 15 deletions(-)
 create mode 100644 electron/main/apis/netease/modules/user_cloud_del.ts
 create mode 100644 src/apis/cloud/netease.ts
 create mode 100644 src/pages/Cloud.vue

diff --git a/electron/main/apis/netease/index.ts b/electron/main/apis/netease/index.ts
index a67792d2..840da81d 100644
--- a/electron/main/apis/netease/index.ts
+++ b/electron/main/apis/netease/index.ts
@@ -44,6 +44,8 @@ const NON_CACHEABLE: ReadonlySet<string> = new Set([
   "playlist_detail",
   "user_playlist",
   "user_subcount",
+  "user_cloud",
+  "user_cloud_del",
   "album_sub",
 ]);
 
diff --git a/electron/main/apis/netease/modules/index.ts b/electron/main/apis/netease/modules/index.ts
index 1669132f..cfad0876 100644
--- a/electron/main/apis/netease/modules/index.ts
+++ b/electron/main/apis/netease/modules/index.ts
@@ -23,6 +23,7 @@ import register_anonimous from "./register_anonimous";
 // 用户
 import user_account from "./user_account";
 import user_cloud from "./user_cloud";
+import user_cloud_del from "./user_cloud_del";
 import user_detail from "./user_detail";
 import user_detail_new from "./user_detail_new";
 import user_followeds from "./user_followeds";
@@ -92,6 +93,7 @@ export const modules: Record<string, NeteaseModule> = {
 
   user_account,
   user_cloud,
+  user_cloud_del,
   user_detail,
   user_detail_new,
   user_followeds,
diff --git a/electron/main/apis/netease/modules/user_cloud_del.ts b/electron/main/apis/netease/modules/user_cloud_del.ts
new file mode 100644
index 00000000..656060cd
--- /dev/null
+++ b/electron/main/apis/netease/modules/user_cloud_del.ts
@@ -0,0 +1,19 @@
+/**
+ * 删除云盘歌曲
+ *
+ * params:
+ * - id  歌曲 id 或 id 列表
+ * 响应：`{ code }`
+ */
+
+import { createOption } from "../core/option";
+import type { NeteaseModule } from "../core/types";
+
+const userCloudDel: NeteaseModule = (query, request) => {
+  const raw = query.id;
+  const ids = Array.isArray(raw) ? raw : [raw];
+  const data = { songIds: JSON.stringify(ids) };
+  return request("/api/cloud/del", data, createOption(query, "weapi"));
+};
+
+export default userCloudDel;
diff --git a/shared/types/player.ts b/shared/types/player.ts
index 99659468..a39aa72f 100644
--- a/shared/types/player.ts
+++ b/shared/types/player.ts
@@ -102,6 +102,8 @@ export interface Track {
   quality?: AudioQuality;
   /** 付费等级 */
   fee?: TrackFee;
+  /** 云盘歌曲 */
+  cloud?: boolean;
 }
 
 /** 歌曲详细信息 */
diff --git a/src/apis/cloud/netease.ts b/src/apis/cloud/netease.ts
new file mode 100644
index 00000000..d0a46aa6
--- /dev/null
+++ b/src/apis/cloud/netease.ts
@@ -0,0 +1,64 @@
+import type { Track } from "@shared/types/player";
+import type { NeteaseSong } from "@/types/netease";
+import { netease as neteaseApi } from "@/apis/netease";
+import { ensureOk, songsToTracks } from "@/utils/format/netease";
+
+interface CloudItem {
+  songId?: number;
+  fileName?: string;
+  fileSize?: number;
+  simpleSong?: NeteaseSong;
+}
+
+interface UserCloudBody {
+  code?: number;
+  data?: CloudItem[];
+  count?: number;
+  size?: number;
+  maxSize?: number;
+  hasMore?: boolean;
+}
+
+export interface CloudPage {
+  /** 本页转换后的曲目 */
+  tracks: Track[];
+  /** 云盘总曲目数 */
+  count: number;
+  /** 已用容量（字节） */
+  size: number;
+  /** 总容量（字节） */
+  maxSize: number;
+  /** 是否还有下一页 */
+  hasMore: boolean;
+}
+
+/**
+ * 拉取一页云盘数据
+ * @param offset 偏移
+ * @param limit 单页数量
+ */
+export const fetchUserCloud = async (offset: number, limit = 200): Promise<CloudPage> => {
+  const body = (await neteaseApi.user_cloud({ offset, limit })) as UserCloudBody;
+  ensureOk(body);
+  const songs = (body.data ?? [])
+    .map((item) => item.simpleSong)
+    .filter((song): song is NeteaseSong => !!song);
+  // 标记云盘
+  const tracks = songsToTracks(songs).map((track) => ({ ...track, cloud: true }));
+  return {
+    tracks,
+    count: body.count ?? 0,
+    size: body.size ?? 0,
+    maxSize: body.maxSize ?? 0,
+    hasMore: body.hasMore ?? offset + songs.length < (body.count ?? 0),
+  };
+};
+
+/**
+ * 从云盘删除歌曲
+ * @param ids 曲目 id 列表（字符串，会原样下发为数字数组）
+ */
+export const deleteCloudSongs = async (ids: string[]): Promise<void> => {
+  if (ids.length === 0) return;
+  ensureOk(await neteaseApi.user_cloud_del({ id: ids.map(Number) }));
+};
diff --git a/src/components/layout/SideBar.vue b/src/components/layout/SideBar.vue
index f78bd8b5..f832c4cc 100644
--- a/src/components/layout/SideBar.vue
+++ b/src/components/layout/SideBar.vue
@@ -16,6 +16,7 @@ import IconLucideListMusic from "~icons/lucide/list-music";
 import IconMaterialSymbolsFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
 import IconLucideStar from "~icons/lucide/star";
 import IconLucideHistory from "~icons/lucide/history";
+import IconLucideCloud from "~icons/lucide/cloud";
 import IconLucidePlus from "~icons/lucide/plus";
 import IconLucideChevronDown from "~icons/lucide/chevron-down";
 import SButton from "@/components/ui/SButton.vue";
@@ -137,12 +138,13 @@ const menuItems = computed<SMenuItem[]>(() => [
   // 个人歌曲
   { key: "divider-personal", type: "divider" },
   { key: "/liked", label: t("nav.liked"), icon: markRaw(IconMaterialSymbolsFavoriteOutline) },
+  { key: "/favorites", label: t("nav.favorites"), icon: markRaw(IconLucideStar) },
+  { key: "/cloud", label: t("nav.cloud"), icon: markRaw(IconLucideCloud) },
   ...(systemSettings.streaming.enabled
     ? ([
         { key: "/streaming", label: t("nav.streaming"), icon: markRaw(IconLucideServer) },
       ] satisfies SMenuItem[])
     : []),
-  { key: "/favorites", label: t("nav.favorites"), icon: markRaw(IconLucideStar) },
   { key: "/history", label: t("nav.history"), icon: markRaw(IconLucideHistory) },
   // 我的歌单
   { key: "divider-playlist", type: "divider" },
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 10734f55..532ea025 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -22,6 +22,8 @@ import IconLucideListMinus from "~icons/lucide/list-minus";
 import IconLucideTrash2 from "~icons/lucide/trash-2";
 import IconLucideArrowLeftRight from "~icons/lucide/arrow-left-right";
 import IconLucideX from "~icons/lucide/x";
+import IconLucideCloud from "~icons/lucide/cloud";
+import IconLucideCloudOff from "~icons/lucide/cloud-off";
 import IconFavorite from "~icons/material-symbols/favorite-rounded";
 import IconFavoriteOutline from "~icons/material-symbols/favorite-outline-rounded";
 
@@ -238,6 +240,7 @@ const { items: contextMenuItems, handleSelect: onContextMenu } = useTrackMenu(co
   onAddToPlaylist: (track) => openPicker([track]),
   onRemove: (track) => batch.requestDelete([track], "remove"),
   onDeleteFile: (track) => batch.requestDelete([track], "file"),
+  onRemoveFromCloud: (track) => batch.requestDelete([track], "cloud"),
 });
 
 const emit = defineEmits<{
@@ -357,6 +360,17 @@ defineExpose({
                   {{ t("collection.removeFrom", { type: batch.collectionTypeLabel.value }) }}
                 </span>
               </SButton>
+              <SButton
+                v-if="batch.canRemoveFromCloud.value"
+                type="error"
+                variant="ghost"
+                size="small"
+                :disabled="batch.selectedCount.value === 0"
+                @click="batch.batchRemoveFromCloud"
+              >
+                <template #icon><IconLucideCloudOff class="size-3.5" /></template>
+                <span>{{ t("cloud.removeAction") }}</span>
+              </SButton>
               <SButton
                 v-if="source === 'local'"
                 type="error"
@@ -522,6 +536,13 @@ defineExpose({
                     >
                       {{ item.title }}
                     </span>
+                    <IconLucideCloud
+                      v-if="item.cloud"
+                      class="size-3.5 shrink-0 self-center"
+                      :class="
+                        playingId === item.id ? 'text-primary/60' : 'text-on-surface-variant/60'
+                      "
+                    />
                     <span
                       v-if="item.comment"
                       class="flex-1 min-w-0 text-base truncate"
diff --git a/src/components/ui/SMenu.vue b/src/components/ui/SMenu.vue
index d2efc75d..c327bd7d 100644
--- a/src/components/ui/SMenu.vue
+++ b/src/components/ui/SMenu.vue
@@ -46,7 +46,9 @@ const sizeClass = computed(() => {
     case "large":
       return {
         item: "h-11 px-3.5 text-[15px] gap-3.5",
-        coverItem: collapsed ? "h-14 px-2.5 text-[15px] gap-3.5" : "h-14 px-3.5 text-[15px] gap-3.5",
+        coverItem: collapsed
+          ? "h-14 px-2.5 text-[15px] gap-3.5"
+          : "h-14 px-3.5 text-[15px] gap-3.5",
         icon: collapsed ? "size-6" : "size-5.5",
         cover: collapsed ? "size-7" : "size-10",
       };
diff --git a/src/composables/useMultiSelect.ts b/src/composables/useMultiSelect.ts
index f6315a0c..6d3dbb15 100644
--- a/src/composables/useMultiSelect.ts
+++ b/src/composables/useMultiSelect.ts
@@ -83,6 +83,7 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
   };
 
   const canRemove = computed(() => options.collectionType.value === "playlist");
+  const canRemoveFromCloud = computed(() => options.collectionType.value === "cloud");
 
   const collectionTypeLabel = computed(() => {
     const map: Record<string, string> = {
@@ -93,7 +94,7 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
     return options.collectionType.value ? (map[options.collectionType.value] ?? "") : "";
   });
 
-  type DeleteAction = "remove" | "file";
+  type DeleteAction = "remove" | "file" | "cloud";
   const deleteConfirmOpen = ref(false);
   const pendingDeleteTracks = shallowRef<Track[]>([]);
   const pendingDeleteAction = ref<DeleteAction>("remove");
@@ -112,6 +113,8 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
       if (pendingDeleteAction.value === "file") {
         const paths = tracks.map((t) => t.path).filter((p): p is string => !!p);
         if (paths.length > 0) await libraryStore.deleteTracks(paths);
+      } else if (pendingDeleteAction.value === "cloud") {
+        await userStore.removeCloudTracks(ids);
       } else if (options.collectionId.value) {
         if (options.source.value === "local") {
           await playlistStore.removeTracks(options.collectionId.value, ids);
@@ -133,11 +136,11 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
   };
 
   /** 确认弹窗标题 */
-  const deleteDialogTitle = computed(() =>
-    pendingDeleteAction.value === "file"
-      ? t("songList.delete.fileTitle")
-      : t("collection.removeFrom", { type: collectionTypeLabel.value }),
-  );
+  const deleteDialogTitle = computed(() => {
+    if (pendingDeleteAction.value === "file") return t("songList.delete.fileTitle");
+    if (pendingDeleteAction.value === "cloud") return t("cloud.removeTitle");
+    return t("collection.removeFrom", { type: collectionTypeLabel.value });
+  });
 
   /** 确认弹窗内容 */
   const deleteDialogContent = computed(() => {
@@ -145,13 +148,17 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
     const type = collectionTypeLabel.value;
     if (count === 1) {
       const title = pendingDeleteTracks.value[0].title;
-      return pendingDeleteAction.value === "file"
-        ? t("songList.delete.fileConfirmOne", { title })
-        : t("songList.delete.removeConfirmOne", { title, type });
+      if (pendingDeleteAction.value === "file") {
+        return t("songList.delete.fileConfirmOne", { title });
+      }
+      if (pendingDeleteAction.value === "cloud") {
+        return t("cloud.removeConfirmOne", { title });
+      }
+      return t("songList.delete.removeConfirmOne", { title, type });
     }
-    return pendingDeleteAction.value === "file"
-      ? t("songList.delete.fileConfirm", { count })
-      : t("songList.delete.removeConfirm", { count, type });
+    if (pendingDeleteAction.value === "file") return t("songList.delete.fileConfirm", { count });
+    if (pendingDeleteAction.value === "cloud") return t("cloud.removeConfirm", { count });
+    return t("songList.delete.removeConfirm", { count, type });
   });
 
   const addToQueue = (): void => {
@@ -171,6 +178,10 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
     requestDelete(selectedItems.value, "file");
   };
 
+  const batchRemoveFromCloud = (): void => {
+    requestDelete(selectedItems.value, "cloud");
+  };
+
   return {
     // 选择状态
     active,
@@ -188,6 +199,7 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
     toggleSelectAll,
     // 集合信息
     canRemove,
+    canRemoveFromCloud,
     collectionTypeLabel,
     // 删除弹窗
     deleteConfirmOpen,
@@ -200,5 +212,6 @@ export const useMultiSelect = (items: Ref<Track[]>, options: MultiSelectOptions)
     addToQueue,
     batchRemove,
     batchDelete,
+    batchRemoveFromCloud,
   };
 };
diff --git a/src/composables/useTrackMenu.ts b/src/composables/useTrackMenu.ts
index 158ba5d2..0ae50007 100644
--- a/src/composables/useTrackMenu.ts
+++ b/src/composables/useTrackMenu.ts
@@ -12,6 +12,7 @@ import IconFolderOpen from "~icons/lucide/folder-open";
 import IconCopy from "~icons/lucide/copy";
 import IconTrash2 from "~icons/lucide/trash-2";
 import IconListMinus from "~icons/lucide/list-minus";
+import IconCloudOff from "~icons/lucide/cloud-off";
 import IconSearch from "~icons/lucide/search";
 import IconMoreHorizontal from "~icons/lucide/more-horizontal";
 
@@ -24,6 +25,8 @@ export interface TrackMenuOptions {
   onRemove?: (track: Track) => void;
   /** 删除文件回调 */
   onDeleteFile?: (track: Track) => void;
+  /** 从云盘删除回调 */
+  onRemoveFromCloud?: (track: Track) => void;
 }
 
 /**
@@ -36,10 +39,12 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
   const router = useRouter();
   const { copy } = useCopyText();
   const isPlaylist = options.collectionType === "playlist";
+  const isCloudView = options.collectionType === "cloud";
   // 菜单项
   const items = computed<DropdownMenuItem[]>(() => {
     const source = track.value?.source;
     const isLocal = source === "local";
+    const showCloudRemove = isCloudView && track.value?.cloud === true;
     const canAddToPlaylist = source === "local" || source === "netease";
     const isOnline = source !== "local" && source !== "streaming";
     return [
@@ -79,6 +84,13 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
         separator: !isPlaylist,
         show: isLocal,
       },
+      {
+        key: "removeFromCloud",
+        label: t("cloud.removeAction"),
+        icon: markRaw(IconCloudOff),
+        separator: true,
+        show: showCloudRemove,
+      },
       {
         key: "searchSame",
         label: t("songList.context.searchSame"),
@@ -137,6 +149,9 @@ export const useTrackMenu = (track: Ref<Track | undefined>, options: TrackMenuOp
       case "deleteFile":
         options.onDeleteFile?.(current);
         break;
+      case "removeFromCloud":
+        options.onRemoveFromCloud?.(current);
+        break;
       case "searchSame":
         router.push({ path: "/search", query: { q: current.title } });
         break;
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 8b62ad65..2dba3176 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -81,6 +81,7 @@
     "liked": "Liked Songs",
     "history": "Play History",
     "favorites": "Favorites",
+    "cloud": "My Cloud",
     "streaming": "Streaming",
     "settings": "Settings",
     "reload": "Reload",
@@ -304,6 +305,15 @@
       "failed": "Action failed, please try again"
     }
   },
+  "cloud": {
+    "title": "My Cloud",
+    "empty": "No songs in your cloud yet — upload some via the NetEase Music app",
+    "needLogin": "Sign in to view your cloud library",
+    "removeAction": "Remove from cloud",
+    "removeTitle": "Remove from Cloud",
+    "removeConfirmOne": "Remove \"{title}\" from your cloud? This cannot be undone.",
+    "removeConfirm": "Remove {count} songs from your cloud? This cannot be undone."
+  },
   "history": {
     "title": "Play History",
     "empty": "No playback history yet — play something to get started",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 614bd45d..bfe09777 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -81,6 +81,7 @@
     "liked": "我喜欢的音乐",
     "history": "播放历史",
     "favorites": "我的收藏",
+    "cloud": "我的云盘",
     "streaming": "流媒体",
     "settings": "设置",
     "reload": "热重载",
@@ -304,6 +305,15 @@
       "failed": "操作失败，请稍后重试"
     }
   },
+  "cloud": {
+    "title": "我的云盘",
+    "empty": "云盘里还没有歌曲，先去网易云音乐 App 上传一些吧",
+    "needLogin": "登录后才能查看云盘歌曲",
+    "removeAction": "从云盘删除",
+    "removeTitle": "删除云盘歌曲",
+    "removeConfirmOne": "确认从云盘删除「{title}」？此操作不可撤销",
+    "removeConfirm": "确认从云盘删除选中的 {count} 首歌？此操作不可撤销"
+  },
   "history": {
     "title": "播放历史",
     "empty": "还没有播放记录，先去随便听点什么吧",
diff --git a/src/pages/Cloud.vue b/src/pages/Cloud.vue
new file mode 100644
index 00000000..80204cae
--- /dev/null
+++ b/src/pages/Cloud.vue
@@ -0,0 +1,172 @@
+<script setup lang="ts">
+import type { DropdownMenuItem } from "@/components/ui/SDropdownMenu.vue";
+import { useUserStore } from "@/stores/user";
+import SongList from "@/components/list/SongList.vue";
+import { formatFileSize } from "@/utils/format";
+import * as player from "@/core/player";
+import IconLucideRefreshCw from "~icons/lucide/refresh-cw";
+import IconLucideListChecks from "~icons/lucide/list-checks";
+import IconLucideCloud from "~icons/lucide/cloud";
+import IconLucideHardDrive from "~icons/lucide/hard-drive";
+
+const { t } = useI18n();
+const router = useRouter();
+const user = useUserStore();
+
+const searchQuery = ref("");
+
+/** 已用容量百分比 */
+const usagePercent = computed(() => {
+  if (user.cloudMaxSize <= 0) return 0;
+  return Math.min(100, Math.round((user.cloudSize / user.cloudMaxSize) * 100));
+});
+
+const usageText = computed(() => {
+  if (user.cloudMaxSize <= 0) return "";
+  return `${formatFileSize(user.cloudSize)} / ${formatFileSize(user.cloudMaxSize)}`;
+});
+
+/** 当前曲目数 */
+const trackCount = computed(() => user.cloudCount || user.cloudTracks.length);
+
+const handlePlayAll = (): void => {
+  if (user.cloudTracks.length === 0) return;
+  player.playFrom(user.cloudTracks, 0);
+};
+
+const songListRef = shallowRef<InstanceType<typeof SongList> | null>(null);
+
+const moreMenuItems = computed<DropdownMenuItem[]>(() => [
+  { key: "refresh", label: t("common.refreshCache"), icon: markRaw(IconLucideRefreshCw) },
+  { key: "batch", label: t("songList.batch.manage"), icon: markRaw(IconLucideListChecks) },
+]);
+
+const handleMoreMenu = (key: string): void => {
+  if (key === "refresh") user.ensureCloud(true);
+  else if (key === "batch") songListRef.value?.enterBatch();
+};
+
+const goToLogin = (): void => {
+  router.push("/library");
+};
+
+watch(
+  () => user.isLoggedIn,
+  (loggedIn) => {
+    if (loggedIn) user.ensureCloud();
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <div class="flex flex-col h-full">
+    <!-- 顶栏 -->
+    <div class="shrink-0 px-5 pb-2">
+      <div class="flex items-center justify-between mt-2 mb-4">
+        <div class="flex items-baseline gap-4 min-w-0">
+          <h1 class="text-3xl font-bold text-on-surface shrink-0">{{ t("cloud.title") }}</h1>
+          <div
+            v-if="user.isLoggedIn && trackCount > 0"
+            class="flex items-center gap-4 text-sm text-on-surface-variant/50 truncate"
+          >
+            <span class="flex items-center gap-1">
+              <IconLucideCloud class="size-3.5" />
+              {{ t("common.totalSongs", { count: trackCount }) }}
+            </span>
+            <span v-if="usageText" class="flex items-center gap-2 min-w-0">
+              <IconLucideHardDrive class="size-3.5 shrink-0" />
+              <span
+                class="relative h-1.5 w-20 rounded-full bg-on-surface/10 overflow-hidden shrink-0"
+              >
+                <span
+                  class="absolute inset-y-0 left-0 bg-primary rounded-full transition-[width] duration-300"
+                  :style="{ width: `${usagePercent}%` }"
+                />
+              </span>
+              <span class="text-xs truncate">{{ usageText }}</span>
+            </span>
+          </div>
+        </div>
+      </div>
+      <div class="flex items-center justify-between gap-4">
+        <div class="flex items-center gap-3">
+          <SButton
+            type="primary"
+            variant="secondary"
+            round
+            :disabled="user.cloudTracks.length === 0"
+            @click="handlePlayAll"
+          >
+            <template #icon>
+              <IconLucidePlay />
+            </template>
+            {{ t("common.playAll") }}
+          </SButton>
+          <SDropdownMenu :items="moreMenuItems" align="start" @select="handleMoreMenu">
+            <template #trigger>
+              <SButton variant="secondary" circle :disabled="!user.isLoggedIn">
+                <template #icon>
+                  <IconLucideEllipsis />
+                </template>
+              </SButton>
+            </template>
+          </SDropdownMenu>
+        </div>
+        <SInput
+          v-model="searchQuery"
+          :placeholder="t('common.search')"
+          clearable
+          round
+          class="w-40 focus-within:w-56"
+        >
+          <template #prefix>
+            <IconLucideSearch class="size-4 text-on-surface-variant/40 shrink-0" />
+          </template>
+        </SInput>
+      </div>
+    </div>
+    <!-- 列表 -->
+    <Transition name="fade" mode="out-in" :duration="150">
+      <!-- 未登录 -->
+      <div v-if="!user.isLoggedIn" key="login" class="flex-1 flex items-center justify-center">
+        <div class="text-center text-on-surface-variant/50">
+          <IconLucideCloud class="size-12 mx-auto mb-3 opacity-30" />
+          <div class="text-sm mb-4">{{ t("cloud.needLogin") }}</div>
+          <SButton type="primary" variant="secondary" @click="goToLogin">
+            {{ t("login.netease") }}
+          </SButton>
+        </div>
+      </div>
+      <!-- 列表 -->
+      <div v-else-if="user.cloudTracks.length > 0" key="list" class="flex-1 min-h-0">
+        <SongList
+          ref="songListRef"
+          :items="user.cloudTracks"
+          :search-query="searchQuery"
+          source="netease"
+          collection-type="cloud"
+          enable-sort
+        />
+      </div>
+      <!-- 加载中 -->
+      <div
+        v-else-if="user.cloudLoading"
+        key="loading"
+        class="flex-1 flex items-center justify-center"
+      >
+        <div class="text-center text-on-surface-variant/60">
+          <SLoading class="text-4xl text-primary/70 mb-4 mx-auto block" />
+          <div class="text-sm">{{ t("common.loading") }}</div>
+        </div>
+      </div>
+      <!-- 空 -->
+      <div v-else key="empty" class="flex-1 flex items-center justify-center">
+        <div class="text-center text-on-surface-variant/50">
+          <IconLucideCloud class="size-12 mx-auto mb-3 opacity-30" />
+          <div class="text-sm">{{ t("cloud.empty") }}</div>
+        </div>
+      </div>
+    </Transition>
+  </div>
+</template>
diff --git a/src/pages/Collection.vue b/src/pages/Collection.vue
index 75f513b3..6432fe76 100644
--- a/src/pages/Collection.vue
+++ b/src/pages/Collection.vue
@@ -87,6 +87,7 @@ const typeLabel = computed(() => {
     album: t("collection.album"),
     playlist: t("collection.playlist"),
     radio: t("collection.radio"),
+    cloud: t("cloud.title"),
   };
   return map[type] ?? "";
 });
diff --git a/src/router/index.ts b/src/router/index.ts
index 2b626342..fb1d1898 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -32,6 +32,11 @@ const router = createRouter({
           name: "favorites",
           component: () => import("@/pages/Favorites.vue"),
         },
+        {
+          path: "cloud",
+          name: "cloud",
+          component: () => import("@/pages/Cloud.vue"),
+        },
         {
           path: "collection/:source/:type/:id",
           name: "collection",
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 13071e19..00ff84ed 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -27,6 +27,7 @@ import {
   subscribePlaylist,
 } from "@/apis/playlist/netease";
 import { subscribeAlbum } from "@/apis/album/netease";
+import { fetchUserCloud, deleteCloudSongs } from "@/apis/cloud/netease";
 
 /** 登录 cookie 保活间隔 */
 const REFRESH_INTERVAL_MS = 24 * 60 * 60 * 1000;
@@ -38,6 +39,8 @@ const LIKED_PLAYLIST_CACHE_KEY = "liked-playlist";
 const LIKED_SONG_IDS_CACHE_KEY = "liked-song-ids";
 /** 用户歌单元数据列表 */
 const PLAYLISTS_CACHE_KEY = "playlists";
+/** 云盘曲目缓存 */
+const CLOUD_CACHE_KEY = "cloud-tracks";
 
 interface LikedPlaylistCache {
   playlistId: string;
@@ -45,6 +48,15 @@ interface LikedPlaylistCache {
   cachedAt: number;
 }
 
+interface CloudCache {
+  userId: number;
+  tracks: Track[];
+  count: number;
+  size: number;
+  maxSize: number;
+  cachedAt: number;
+}
+
 const cacheDb = localforage.createInstance({ name: "splayer", storeName: "user-cache" });
 
 const EMPTY_SUBCOUNT: UserSubcount = {
@@ -83,6 +95,19 @@ export const useUserStore = defineStore(
     /** 进行中的拉取 */
     let likedPlaylistAbort: AbortController | null = null;
 
+    /** 云盘曲目 */
+    const cloudTracks = shallowRef<Track[]>([]);
+    /** 云盘曲目总数（服务端返回，可能 > tracks.length 在拉取过程中） */
+    const cloudCount = ref(0);
+    /** 已用容量（字节） */
+    const cloudSize = ref(0);
+    /** 总容量（字节） */
+    const cloudMaxSize = ref(0);
+    /** 是否在拉取云盘 */
+    const cloudLoading = ref(false);
+    /** 进行中的云盘拉取 */
+    let cloudAbort: AbortController | null = null;
+
     /** 「我喜欢的音乐」歌单 id */
     const likedPlaylistId = computed<string | null>(() => playlists.value[0]?.id ?? null);
 
@@ -114,6 +139,12 @@ export const useUserStore = defineStore(
       likedPlaylistTracks.value = [];
       likedPlaylistLoading.value = false;
       currentLikedPlaylistId = null;
+      cloudAbort?.abort();
+      cloudTracks.value = [];
+      cloudCount.value = 0;
+      cloudSize.value = 0;
+      cloudMaxSize.value = 0;
+      cloudLoading.value = false;
     };
 
     /** 从缓存填充喜欢歌单 */
@@ -179,6 +210,90 @@ export const useUserStore = defineStore(
       }
     };
 
+    /** 恢复云盘缓存 */
+    const hydrateCloudFromCache = async (userId: number): Promise<void> => {
+      try {
+        const cached = await cacheDb.getItem<CloudCache>(CLOUD_CACHE_KEY);
+        if (!cached || cached.userId !== userId || cached.tracks.length === 0) return;
+        cloudTracks.value = cached.tracks;
+        cloudCount.value = cached.count;
+        cloudSize.value = cached.size;
+        cloudMaxSize.value = cached.maxSize;
+      } catch {
+        console.error("[user] hydrate cloud from cache failed");
+      }
+    };
+
+    /** 把当前云盘状态写回 */
+    const persistCloudCache = (): void => {
+      const userId = profile.value?.userId;
+      if (!userId) return;
+      const payload: CloudCache = {
+        userId,
+        tracks: cloudTracks.value.map((track) => ({ ...track })),
+        count: cloudCount.value,
+        size: cloudSize.value,
+        maxSize: cloudMaxSize.value,
+        cachedAt: Date.now(),
+      };
+      cacheDb.setItem(CLOUD_CACHE_KEY, payload).catch(() => {});
+    };
+
+    /** 分页获取云盘全部曲目 */
+    const refreshCloud = async (): Promise<void> => {
+      cloudAbort?.abort();
+      const controller = new AbortController();
+      cloudAbort = controller;
+      if (cloudTracks.value.length === 0) cloudLoading.value = true;
+      try {
+        const accumulated: Track[] = [];
+        let offset = 0;
+        const limit = 500;
+        while (true) {
+          if (controller.signal.aborted) return;
+          const page = await fetchUserCloud(offset, limit);
+          if (controller.signal.aborted) return;
+          cloudCount.value = page.count;
+          cloudSize.value = page.size;
+          cloudMaxSize.value = page.maxSize;
+          accumulated.push(...page.tracks);
+          cloudTracks.value = [...accumulated];
+          if (!page.hasMore || page.tracks.length < limit) break;
+          offset += page.tracks.length;
+        }
+        if (!controller.signal.aborted) persistCloudCache();
+      } catch (err) {
+        console.warn("[user] cloud load failed:", err);
+      } finally {
+        if (!controller.signal.aborted) cloudLoading.value = false;
+      }
+    };
+
+    /**
+     * 确保云盘曲目已就绪
+     * @param force true 时无论是否有缓存都重新拉取
+     */
+    const ensureCloud = async (force = false): Promise<void> => {
+      const userId = profile.value?.userId;
+      if (!userId) return;
+      if (!force && cloudTracks.value.length > 0) return;
+      if (cloudTracks.value.length === 0) await hydrateCloudFromCache(userId);
+      await refreshCloud();
+    };
+
+    /**
+     * 从云盘删除歌曲
+     * @param trackIds 曲目 id 列表
+     */
+    const removeCloudTracks = async (trackIds: string[]): Promise<void> => {
+      if (trackIds.length === 0) return;
+      await deleteCloudSongs(trackIds);
+      const removeSet = new Set(trackIds);
+      cloudTracks.value = cloudTracks.value.filter((track) => !removeSet.has(track.id));
+      cloudCount.value = Math.max(0, cloudCount.value - trackIds.length);
+      persistCloudCache();
+    };
+
     /** 从缓存恢复轻量内容 */
     const hydrateContentFromCache = async (): Promise<void> => {
       try {
@@ -451,6 +566,15 @@ export const useUserStore = defineStore(
       ensureLikedPlaylist,
       clearContent,
 
+      cloudTracks,
+      cloudCount,
+      cloudSize,
+      cloudMaxSize,
+      cloudLoading,
+      ensureCloud,
+      refreshCloud,
+      removeCloudTracks,
+
       createPlaylist,
       deletePlaylist,
       updatePlaylist,
diff --git a/src/types/collection.ts b/src/types/collection.ts
index 0f85d7dd..1a3540c8 100644
--- a/src/types/collection.ts
+++ b/src/types/collection.ts
@@ -1,7 +1,7 @@
 import type { Track, Artist, TrackSource } from "@shared/types/player";
 
 /** 合集类型 */
-export type CollectionType = "album" | "playlist" | "radio";
+export type CollectionType = "album" | "playlist" | "radio" | "cloud";
 
 /** 内容范畴：本地 / 在线 */
 export type ContentScope = "local" | "online";
diff --git a/src/types/netease.ts b/src/types/netease.ts
index 18519df4..514aa54a 100644
--- a/src/types/netease.ts
+++ b/src/types/netease.ts
@@ -125,4 +125,25 @@ export interface NeteaseSong {
   publishTime?: number;
   /** 歌曲级权限 */
   privilege?: NeteasePrivilege;
+  /** 用户云盘信息 */
+  pc?: NeteasePrivateCloud | null;
+}
+
+/** 用户云盘私有信息 */
+export interface NeteasePrivateCloud {
+  /** 文件名 */
+  fn?: string;
+  md5?: string;
+  /** 比特率 */
+  br?: number;
+  /** 上传时的歌手名 */
+  ar?: string;
+  /** 上传时的专辑名 */
+  alb?: string;
+  /** 歌曲名 */
+  sn?: string;
+  cid?: string;
+  cf?: number;
+  vd?: number;
+  st?: number;
 }
diff --git a/src/utils/format/netease.ts b/src/utils/format/netease.ts
index 9c9e481c..c204c380 100644
--- a/src/utils/format/netease.ts
+++ b/src/utils/format/netease.ts
@@ -100,6 +100,7 @@ export const songToTrack = (song: NeteaseSong): Track => {
     coverOriginal,
     quality: pickQuality(song),
     fee: toTrackFee(song.fee),
+    cloud: song.pc != null ? true : undefined,
   };
 };
 

From cf57310fd8b556973211795c1813ccef4aa0b982 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Wed, 20 May 2026 09:59:48 +0800
Subject: [PATCH 26/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E6=AD=8C=E8=AF=8D=E6=97=B6=E9=97=B4=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/ipc/player.ts                   |  1 +
 electron/main/services/nowPlaying.ts          | 30 +++++++++++++++++--
 shared/types/nowPlaying.ts                    |  6 +++-
 shared/utils/lyricSync.ts                     | 23 ++++++++++++++
 .../desktop-lyric/components/LyricLine.vue    |  9 ++----
 .../components/IslandLyricLine.vue            |  9 ++----
 .../shared/composables/useNowPlayingSync.ts   | 22 +++++++++++---
 .../components/TaskbarLyricLine.vue           |  9 ++----
 8 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/electron/main/ipc/player.ts b/electron/main/ipc/player.ts
index a05ba5b6..1cabf5e3 100644
--- a/electron/main/ipc/player.ts
+++ b/electron/main/ipc/player.ts
@@ -379,6 +379,7 @@ export const registerPlayerIpc = (): void => {
   ipcMain.handle("player:setSpeed", (_event, speed: number) => {
     try {
       getPlayer().setSpeed(speed);
+      nowPlaying.onSpeedChange(speed);
       return { success: true };
     } catch (error) {
       return fail(ErrorCode.UNKNOWN, error);
diff --git a/electron/main/services/nowPlaying.ts b/electron/main/services/nowPlaying.ts
index 17596279..3542e22a 100644
--- a/electron/main/services/nowPlaying.ts
+++ b/electron/main/services/nowPlaying.ts
@@ -27,8 +27,12 @@ let currentLyric: LyricLine[] = [];
 let currentSource: LyricData = null;
 /** 最近一次播放位置（毫秒） */
 let lastPosition = 0;
+/** lastPosition 真实成立的墙钟时刻（Date.now 毫秒），用于补偿其过期时长 */
+let lastPositionAt = 0;
 /** 当前是否处于播放态 */
 let playing = false;
+/** 当前播放速度倍率（0.5 ~ 2.0） */
+let playSpeed = 1.0;
 /** 当前曲目对应的歌词偏移（ms，正值为歌词提前） */
 let currentLyricOffsetMs = 0;
 
@@ -75,11 +79,13 @@ export const update = (track: Track | null, lyric: LyricLine[], source: LyricDat
  */
 export const onPosition = (positionMs: number, isPlaying: boolean): void => {
   lastPosition = positionMs;
+  lastPositionAt = Date.now();
   playing = isPlaying;
   emitter.emit("position-sync", {
     position: positionMs,
     playing: isPlaying,
-    sendTimestamp: Date.now(),
+    speed: playSpeed,
+    sendTimestamp: lastPositionAt,
   });
 };
 
@@ -92,10 +98,28 @@ export const onPlayStateChange = (isPlaying: boolean): void => {
   emitter.emit("position-sync", {
     position: lastPosition,
     playing: isPlaying,
+    speed: playSpeed,
+    // 暂停态接收端不补偿延迟，恢复态不能用陈旧时间戳，故取当前时刻
     sendTimestamp: Date.now(),
   });
 };
 
+/**
+ * 同步播放速度
+ * @param speed - 播放速度倍率（0.5 ~ 2.0）
+ *
+ * 立即广播一帧 position-sync，让窗口当帧换挡，无需等待下一个 5Hz 周期
+ */
+export const onSpeedChange = (speed: number): void => {
+  playSpeed = Number.isFinite(speed) ? speed : 1.0;
+  emitter.emit("position-sync", {
+    position: lastPosition,
+    playing,
+    speed: playSpeed,
+    sendTimestamp: lastPositionAt || Date.now(),
+  });
+};
+
 /**
  * 单曲偏移的合理上限（毫秒）
  * 超过视为误输入，clamp 防止极端值
@@ -131,8 +155,10 @@ export const snapshot = (): NowPlayingSnapshot => ({
   source: currentSource,
   position: lastPosition,
   playing,
+  speed: playSpeed,
   lyricOffsetMs: currentLyricOffsetMs,
-  sendTimestamp: Date.now(),
+  // 用 position 的成立时刻，接收端据此补偿其过期时长
+  sendTimestamp: lastPositionAt || Date.now(),
 });
 
 /** 清空 */
diff --git a/shared/types/nowPlaying.ts b/shared/types/nowPlaying.ts
index e6230e1b..b2f5d284 100644
--- a/shared/types/nowPlaying.ts
+++ b/shared/types/nowPlaying.ts
@@ -15,9 +15,11 @@ export interface NowPlayingSnapshot {
   source: LyricData;
   position: number;
   playing: boolean;
+  /** 播放速度倍率（0.5 ~ 2.0） */
+  speed: number;
   /** 当前曲目的歌词偏移（ms，正值为歌词提前） */
   lyricOffsetMs: number;
-  /** 发送时刻的主进程时钟（Date.now 毫秒），接收端用于补偿 IPC 延迟 */
+  /** position 真实成立的主进程时钟（Date.now 毫秒），接收端用于补偿其过期时长 */
   sendTimestamp: number;
 }
 
@@ -25,6 +27,8 @@ export interface NowPlayingSnapshot {
 export interface NowPlayingPositionSync {
   position: number;
   playing: boolean;
+  /** 播放速度倍率（0.5 ~ 2.0） */
+  speed: number;
   sendTimestamp: number;
 }
 
diff --git a/shared/utils/lyricSync.ts b/shared/utils/lyricSync.ts
index 3c11a835..d2b4b6e9 100644
--- a/shared/utils/lyricSync.ts
+++ b/shared/utils/lyricSync.ts
@@ -65,6 +65,29 @@ export const pickPrimaryIndex = (lines: LyricLine[], time: number): number => {
   return latest;
 };
 
+/**
+ * 计算单词的逐字扫动进度 [0,1]
+ *
+ * 含与应用内引擎一致的 preRoll 提前量：每个词在 startTime 之前提前开始扫动，
+ * 让相邻词亮区衔接而非硬切，也使外部歌词与应用内的起亮时刻对齐
+ *
+ * @param word - 单词时间区间
+ * @param lineStartTime - 所属行的起始时间（ms），preRoll 不会越过行首
+ * @param currentMs - 当前播放毫秒
+ * @returns 扫动进度，0 未开始，1 已完成
+ */
+export const getWordSweepProgress = (
+  word: { startTime: number; endTime: number },
+  lineStartTime: number,
+  currentMs: number,
+): number => {
+  const wordDuration = Math.abs(word.endTime - word.startTime) || 1;
+  const preRoll = Math.min(80, wordDuration * 0.3);
+  const adjustedStart = Math.max(lineStartTime, word.startTime - preRoll);
+  const adjustedDuration = Math.max(1, word.endTime - adjustedStart);
+  return Math.max(0, Math.min(1, (currentMs - adjustedStart) / adjustedDuration));
+};
+
 const LAST_LINE_FALLBACK_MS = 8000;
 
 /**
diff --git a/windows/desktop-lyric/components/LyricLine.vue b/windows/desktop-lyric/components/LyricLine.vue
index d6d0616f..ace03f84 100644
--- a/windows/desktop-lyric/components/LyricLine.vue
+++ b/windows/desktop-lyric/components/LyricLine.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { LyricLine } from "@shared/types/lyrics";
 import type { DesktopLyricAlign } from "@shared/types/settings";
+import { getWordSweepProgress } from "@shared/utils/lyricSync";
 import { getNowPlayingCurrentMs } from "@windows/shared/composables/useNowPlayingSync";
 
 const props = defineProps<{
@@ -31,13 +32,7 @@ const getWordProgress = (
   word: { startTime: number; endTime: number },
   currentMs: number,
 ): string => {
-  const span = word.endTime - word.startTime;
-  const progress =
-    span <= 0
-      ? currentMs >= word.startTime
-        ? 1
-        : 0
-      : Math.max(0, Math.min(1, (currentMs - word.startTime) / span));
+  const progress = getWordSweepProgress(word, props.line.startTime, currentMs);
   const pct = (progress * 100).toFixed(1);
   const px = progress * 6 - 3;
   const signed = px >= 0 ? `+ ${px.toFixed(2)}px` : `- ${(-px).toFixed(2)}px`;
diff --git a/windows/dynamic-island/components/IslandLyricLine.vue b/windows/dynamic-island/components/IslandLyricLine.vue
index 568934a2..caffee80 100644
--- a/windows/dynamic-island/components/IslandLyricLine.vue
+++ b/windows/dynamic-island/components/IslandLyricLine.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { LyricLine } from "@shared/types/lyrics";
+import { getWordSweepProgress } from "@shared/utils/lyricSync";
 import { getNowPlayingCurrentMs } from "@windows/shared/composables/useNowPlayingSync";
 
 const props = defineProps<{
@@ -15,13 +16,7 @@ const getWordProgress = (
   word: { startTime: number; endTime: number },
   currentMs: number,
 ): string => {
-  const span = word.endTime - word.startTime;
-  const progress =
-    span <= 0
-      ? currentMs >= word.startTime
-        ? 1
-        : 0
-      : Math.max(0, Math.min(1, (currentMs - word.startTime) / span));
+  const progress = getWordSweepProgress(word, props.line.startTime, currentMs);
   const pct = (progress * 100).toFixed(1);
   const px = progress * 4 - 2;
   const signed = px >= 0 ? `+ ${px.toFixed(2)}px` : `- ${(-px).toFixed(2)}px`;
diff --git a/windows/shared/composables/useNowPlayingSync.ts b/windows/shared/composables/useNowPlayingSync.ts
index 09bee9a1..107e9789 100644
--- a/windows/shared/composables/useNowPlayingSync.ts
+++ b/windows/shared/composables/useNowPlayingSync.ts
@@ -44,6 +44,8 @@ export const useNowPlayingSync = (options: NowPlayingSyncOptions): NowPlayingSyn
   let rafId: number | null = null;
   /** 当前曲目歌词偏移（ms，正值为歌词提前） */
   let lyricOffsetMs = 0;
+  /** 当前播放速度倍率，插值时把墙钟时长换算到源时间 */
+  let speed = 1.0;
 
   const resetAnchor = (positionMs: number, sendTimestamp: number): void => {
     const ipcDelay = Math.max(0, Date.now() - sendTimestamp);
@@ -54,15 +56,26 @@ export const useNowPlayingSync = (options: NowPlayingSyncOptions): NowPlayingSyn
     anchorInitialized = true;
   };
 
+  // 倍速变化：先按旧 speed 把锚点推到当前再换挡，避免视觉跳变
+  const applySpeed = (nextSpeed: number): void => {
+    if (nextSpeed === speed) return;
+    if (anchorInitialized && playing.value) {
+      anchorPos += (performance.now() - anchorPerf) * speed;
+      anchorPerf = performance.now();
+    }
+    speed = nextSpeed;
+  };
+
   // 仅当与 RAF 插值的偏差超过阈值时才重置锚点，避免每次 5Hz 同步都打断动画
-  const applyAnchor = (positionMs: number, sendTimestamp: number): void => {
+  const applyAnchor = (positionMs: number, sendTimestamp: number, nextSpeed: number): void => {
+    applySpeed(nextSpeed);
     if (!anchorInitialized || !playing.value) {
       resetAnchor(positionMs, sendTimestamp);
       return;
     }
     const ipcDelay = Math.max(0, Date.now() - sendTimestamp);
     const candidate = positionMs + ipcDelay;
-    const projected = anchorPos + (performance.now() - anchorPerf);
+    const projected = anchorPos + (performance.now() - anchorPerf) * speed;
     if (Math.abs(candidate - projected) > SYNC_DRIFT_THRESHOLD) {
       resetAnchor(positionMs, sendTimestamp);
     }
@@ -73,13 +86,14 @@ export const useNowPlayingSync = (options: NowPlayingSyncOptions): NowPlayingSyn
     const mainLines = snap.lyric.filter((line) => !line.isBG);
     lyric.value = clampLastLineEnd(mainLines, snap.track?.duration);
     playing.value = snap.playing;
+    speed = snap.speed;
     lyricOffsetMs = snap.lyricOffsetMs;
     primaryIndex.value = -1;
     resetAnchor(snap.position, snap.sendTimestamp);
   };
 
   const syncOnce = (): void => {
-    const next = playing.value ? anchorPos + (performance.now() - anchorPerf) : anchorPos;
+    const next = playing.value ? anchorPos + (performance.now() - anchorPerf) * speed : anchorPos;
     currentNowPlayingMs = next + lyricOffsetMs;
     const idx = pickIndex(lyric.value, currentNowPlayingMs);
     if (idx !== primaryIndex.value) primaryIndex.value = idx;
@@ -112,7 +126,7 @@ export const useNowPlayingSync = (options: NowPlayingSyncOptions): NowPlayingSyn
       }),
       window.api.nowPlaying.onPositionSync((data) => {
         playing.value = data.playing;
-        applyAnchor(data.position, data.sendTimestamp);
+        applyAnchor(data.position, data.sendTimestamp, data.speed);
         kickTick();
       }),
       window.api.nowPlaying.onLyricOffsetChange(({ offsetMs }) => {
diff --git a/windows/taskbar-lyric/components/TaskbarLyricLine.vue b/windows/taskbar-lyric/components/TaskbarLyricLine.vue
index d48bd13b..7740a58f 100644
--- a/windows/taskbar-lyric/components/TaskbarLyricLine.vue
+++ b/windows/taskbar-lyric/components/TaskbarLyricLine.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { LyricLine } from "@shared/types/lyrics";
+import { getWordSweepProgress } from "@shared/utils/lyricSync";
 import { getNowPlayingCurrentMs } from "@windows/shared/composables/useNowPlayingSync";
 
 const props = withDefaults(
@@ -58,13 +59,7 @@ const getWordProgress = (
   word: { startTime: number; endTime: number },
   currentMs: number,
 ): string => {
-  const span = word.endTime - word.startTime;
-  const progress =
-    span <= 0
-      ? currentMs >= word.startTime
-        ? 1
-        : 0
-      : Math.max(0, Math.min(1, (currentMs - word.startTime) / span));
+  const progress = getWordSweepProgress(word, props.line?.startTime ?? 0, currentMs);
   const pct = (progress * 100).toFixed(1);
   const px = progress * 4 - 2;
   const signed = px >= 0 ? `+ ${px.toFixed(2)}px` : `- ${(-px).toFixed(2)}px`;

From 5e71a1bd58b83596ec619df37aee4c6db5eff0f9 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Wed, 20 May 2026 16:29:01 +0800
Subject: [PATCH 27/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=9F=B3?=
 =?UTF-8?q?=E8=B4=A8=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  1 +
 .../main/apis/netease/modules/song_url.ts     |  1 -
 src/apis/song/netease.ts                      | 18 +++-
 src/components/list/SongList.vue              | 13 ++-
 src/components/player/PlayerBar.vue           |  2 +
 src/components/player/QualityControl.vue      | 95 ++++++++++++++++++
 src/components/player/Toolbar.vue             |  2 +
 src/components/ui/SPopselect.vue              |  1 +
 src/core/player/index.ts                      | 27 ++++++
 src/i18n/locales/en-US.json                   | 15 +++
 src/i18n/locales/zh-CN.json                   | 15 +++
 src/layouts/MainLayout.vue                    |  3 +-
 src/services/audioSource.ts                   | 21 +++-
 src/settings/categories/appearance.ts         |  6 ++
 src/settings/categories/player.ts             | 97 +++++++++++--------
 src/stores/media.ts                           |  6 +-
 src/stores/settings.ts                        |  2 +
 src/types/settings.ts                         |  5 +
 src/utils/quality.ts                          | 27 +++++-
 19 files changed, 294 insertions(+), 63 deletions(-)
 create mode 100644 src/components/player/QualityControl.vue

diff --git a/components.d.ts b/components.d.ts
index c6346840..c40162bd 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -158,6 +158,7 @@ declare module 'vue' {
     PopoverPortal: typeof import('reka-ui')['PopoverPortal']
     PopoverRoot: typeof import('reka-ui')['PopoverRoot']
     PopoverTrigger: typeof import('reka-ui')['PopoverTrigger']
+    QualityControl: typeof import('./src/components/player/QualityControl.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SAlert: typeof import('./src/components/ui/SAlert.vue')['default']
diff --git a/electron/main/apis/netease/modules/song_url.ts b/electron/main/apis/netease/modules/song_url.ts
index a38cf978..b964f600 100644
--- a/electron/main/apis/netease/modules/song_url.ts
+++ b/electron/main/apis/netease/modules/song_url.ts
@@ -19,7 +19,6 @@ const song_url: NeteaseModule = (query, request) => {
   const data = {
     ids: `[${String(ids).split(",").join(",")}]`,
     level: query.level ?? "exhigh",
-    encodeType: "aac",
   };
   return request("/api/song/enhance/player/url/v1", data, createOption(query));
 };
diff --git a/src/apis/song/netease.ts b/src/apis/song/netease.ts
index ff8844a1..3ca185e6 100644
--- a/src/apis/song/netease.ts
+++ b/src/apis/song/netease.ts
@@ -1,4 +1,5 @@
 import type { Track } from "@shared/types/player";
+import type { QualityLevel } from "@/utils/quality";
 import { netease as neteaseApi } from "@/apis/netease";
 import { songsToTracks } from "@/utils/format/netease";
 
@@ -14,13 +15,26 @@ export const songsByIds = async (ids: Array<string | number>): Promise<Track[]>
   return songsToTracks(body?.songs);
 };
 
+/** 项目音质档位 → 网易云 song/url v1 的 level 参数 */
+const NETEASE_LEVEL: Record<QualityLevel, string> = {
+  lq: "standard",
+  sq: "higher",
+  hq: "exhigh",
+  lossless: "lossless",
+  "hi-res": "hires",
+};
+
 /**
  * 解析网易云 Track 的可播放 URL
  * VIP 试听片段 / 无版权 → 返回 null
  * @param track - track.id 为云端 songId
+ * @param songLevel - 音质偏好；实际可用级别取决于账号权限
  */
-export const resolveNeteaseUrl = async (track: Track): Promise<string | null> => {
-  const body = await neteaseApi.song_url({ id: track.id, level: "exhigh" });
+export const resolveNeteaseUrl = async (
+  track: Track,
+  songLevel: QualityLevel,
+): Promise<string | null> => {
+  const body = await neteaseApi.song_url({ id: track.id, level: NETEASE_LEVEL[songLevel] });
   const item = body?.data?.[0];
   if (!item?.url || item.freeTrialInfo) return null;
   return item.url;
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 532ea025..c78989fa 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -10,7 +10,7 @@ import { useFavorite } from "@/composables/useFavorite";
 import PlaylistPickerDialog from "@/components/modals/PlaylistPickerDialog.vue";
 import { formatTime } from "@/utils/time";
 import { formatFileSize } from "@/utils/format";
-import { isLosslessQuality, getQualityLevel } from "@/utils/quality";
+import { isLosslessQuality, getQualityLabel } from "@/utils/quality";
 import { navigateToAlbum, navigateToArtist } from "@/utils/navigate";
 import type { SVirtualListExposed } from "@/components/ui/SVirtualList.vue";
 import * as player from "@/core/player";
@@ -558,10 +558,15 @@ defineExpose({
                     :class="playingId === item.id ? 'text-primary/70' : 'text-on-surface-variant'"
                   >
                     <span
-                      v-if="isLosslessQuality(item.quality)"
-                      class="shrink-0 px-1 rounded text-[10px] leading-[18px] font-bold border border-solid text-amber-400 border-amber-400/40"
+                      v-if="item.quality"
+                      class="shrink-0 px-1 rounded text-[10px] leading-[18px] font-bold border border-solid"
+                      :class="
+                        isLosslessQuality(item.quality)
+                          ? 'text-amber-500 border-amber-500/40'
+                          : 'text-on-surface-variant border-on-surface-variant/40'
+                      "
                     >
-                      {{ getQualityLevel(item.quality) === "hi-res" ? "HR" : "SQ" }}
+                      {{ getQualityLabel(item.quality) }}
                     </span>
                     <span
                       v-if="item.fee === 1"
diff --git a/src/components/player/PlayerBar.vue b/src/components/player/PlayerBar.vue
index 9eb12ce5..5450ba25 100644
--- a/src/components/player/PlayerBar.vue
+++ b/src/components/player/PlayerBar.vue
@@ -31,6 +31,7 @@ const onSeekDragEnd = (value: number): void => {
         <TrackInfo compact class="flex-1">
           <template #title-trailing>
             <SButton
+              class="-my-1"
               type="primary"
               variant="text"
               circle
@@ -86,6 +87,7 @@ const onSeekDragEnd = (value: number): void => {
       <TrackInfo>
         <template #title-trailing>
           <SButton
+            class="-my-1"
             type="primary"
             variant="text"
             circle
diff --git a/src/components/player/QualityControl.vue b/src/components/player/QualityControl.vue
new file mode 100644
index 00000000..daabb11b
--- /dev/null
+++ b/src/components/player/QualityControl.vue
@@ -0,0 +1,95 @@
+<script setup lang="ts">
+/**
+ * Toolbar 里的音质控件（底部播放栏与全屏播放器共用）
+ * 网易云歌曲：popselect 切换在线音质偏好并热替换当前歌曲
+ * 其余来源：只读标签，展示引擎解码后的实际音质
+ */
+import type { SSelectOption } from "@/components/ui/SSelect.vue";
+import type { QualityLevel } from "@/utils/quality";
+import { useMediaStore } from "@/stores/media";
+import { useSettingsStore } from "@/stores/settings";
+import { getQualityLabel } from "@/utils/quality";
+import * as player from "@/core/player";
+
+const props = withDefaults(defineProps<{ cover?: boolean }>(), { cover: false });
+
+const { t } = useI18n();
+const media = useMediaStore();
+const settings = useSettingsStore();
+
+/** 是否支持切换在线音质 */
+const isNetease = computed(() => media.track?.source === "netease");
+
+/** 实际播放音质 */
+const qualityLabel = computed(() => getQualityLabel(media.detail?.quality));
+
+/** 音质偏好下拉选项 */
+const qualityOptions = computed<SSelectOption[]>(() => [
+  { value: "lq", label: t("settings.songLevel.lq") },
+  { value: "sq", label: t("settings.songLevel.sq") },
+  { value: "hq", label: t("settings.songLevel.hq") },
+  { value: "lossless", label: t("settings.songLevel.lossless") },
+  { value: "hi-res", label: t("settings.songLevel.hi-res") },
+]);
+
+const chipBase =
+  "inline-flex min-w-9 shrink-0 items-center justify-center px-2 py-1 leading-none rounded-md border border-solid text-xs";
+
+/** 切换音质 */
+const onQualityChange = (value: string | number | boolean): void => {
+  settings.player.songLevel = value as QualityLevel;
+  void player.reloadCurrentTrack();
+};
+</script>
+
+<template>
+  <SPopselect
+    v-if="isNetease"
+    :model-value="settings.player.songLevel"
+    :options="qualityOptions"
+    side="top"
+    :side-offset="8"
+    :cover="cover"
+    @update:model-value="onQualityChange"
+  >
+    <template #header>
+      <div
+        :class="[
+          'w-0 min-w-full px-2.5 pt-2 pb-1.5 text-xs leading-snug border-b border-b-solid',
+          cover
+            ? 'text-cover/55 border-b-white/10'
+            : 'text-on-surface-variant/70 border-b-on-surface/8',
+        ]"
+      >
+        <div class="mb-0.5 text-sm font-medium" :class="cover ? 'text-cover' : 'text-on-surface'">
+          {{ t("settings.songLevel.switchTitle") }}
+        </div>
+        {{ t("settings.songLevel.switchHint") }}
+      </div>
+    </template>
+    <template #trigger>
+      <span
+        :class="[
+          chipBase,
+          'cursor-pointer transition-colors',
+          cover
+            ? 'border-cover/30 text-cover/80 hover:border-cover/60'
+            : 'border-on-surface-variant/30 text-on-surface-variant hover:border-on-surface-variant/60',
+        ]"
+      >
+        {{ qualityLabel }}
+      </span>
+    </template>
+  </SPopselect>
+  <span
+    v-else-if="media.detail?.quality"
+    :class="[
+      chipBase,
+      cover
+        ? 'border-cover/25 text-cover/55'
+        : 'border-on-surface-variant/25 text-on-surface-variant/80',
+    ]"
+  >
+    {{ qualityLabel }}
+  </span>
+</template>
diff --git a/src/components/player/Toolbar.vue b/src/components/player/Toolbar.vue
index e6463958..ff37671b 100644
--- a/src/components/player/Toolbar.vue
+++ b/src/components/player/Toolbar.vue
@@ -75,6 +75,8 @@ const onMoreMenuSelect = (key: string): void => {
 
 <template>
   <div class="flex items-center gap-1">
+    <!-- 在线音质 -->
+    <QualityControl v-if="settings.appearance.showQualitySwitch" :cover="cover" />
     <SPopover trigger="hover" side="top" :cover="cover" content-class="px-3 pb-2 pt-3">
       <template #trigger>
         <SButton
diff --git a/src/components/ui/SPopselect.vue b/src/components/ui/SPopselect.vue
index 05d60026..10c4163b 100644
--- a/src/components/ui/SPopselect.vue
+++ b/src/components/ui/SPopselect.vue
@@ -69,6 +69,7 @@ const handleChange = (val: string): void => {
             : 'bg-surface-bright',
         ]"
       >
+        <slot name="header" />
         <SelectViewport class="p-1 max-h-60">
           <SelectItem
             v-for="opt in options"
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index 79e18c90..92ba9be6 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -166,6 +166,33 @@ const loadTrack = async (track: Track | null): Promise<void> => {
   if (shouldSkip) await skipOnFailure(myToken, () => trackToken);
 };
 
+/**
+ * 热替换当前播放
+ * 切换在线音质后调用：按新音质重新解析 URL，并从当前进度续播
+ */
+export const reloadCurrentTrack = async (): Promise<void> => {
+  const media = useMediaStore();
+  const track = media.track;
+  if (!track || track.source !== "netease") return;
+  const status = useStatusStore();
+  const wasPlaying = status.isPlaying;
+  const resumePosition = Math.round(playback.getCurrentTime());
+  // 抢占加载令牌，与 loadTrack 互相取消
+  const myToken = ++trackToken;
+  const resolved = await resolveTrackSource(track);
+  if (myToken !== trackToken) return;
+  // 解析失败：保留当前播放，不打断
+  if (!resolved) return;
+  // 以暂停态加载，seek 回原进度后再决定是否播放，避免从 0 漏音
+  const result = await load(resolved.source, false, track);
+  if (myToken !== trackToken || !result.ok) return;
+  if (resumePosition > 0) await seek(resumePosition);
+  if (wasPlaying) await play();
+  if (resolved.cacheRequest) {
+    cacheScheduler.schedule(track.id, resolved.cacheRequest);
+  }
+};
+
 /** 恢复播放 */
 export const play = async (): Promise<void> => {
   const status = useStatusStore();
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 2dba3176..6cd143f5 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -428,6 +428,17 @@
       "label": "Loudness Normalization",
       "description": "Automatically balance volume levels between tracks"
     },
+    "songLevel": {
+      "label": "Online Audio Quality",
+      "description": "Preferred quality for online tracks; the actual level depends on what your account supports",
+      "switchTitle": "Switch Quality",
+      "switchHint": "Subject to your account permissions",
+      "lq": "Standard (LQ)",
+      "sq": "Higher (SQ)",
+      "hq": "Extreme (HQ)",
+      "lossless": "Lossless",
+      "hi-res": "Hi-Res"
+    },
     "outputDevice": {
       "label": "Output Device",
       "description": "Select audio output device",
@@ -880,6 +891,10 @@
       "label": "Show Playlist Covers",
       "description": "Show playlist covers instead of default icons in the sidebar"
     },
+    "showQualitySwitch": {
+      "label": "Show Quick Quality Switch",
+      "description": "Show the online audio quality tag in the player bar for quick switching"
+    },
     "fontConfig": {
       "label": "Font Settings",
       "description": "Configure fonts for the app, lyrics, and external lyric windows",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index bfe09777..37975a0d 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -428,6 +428,17 @@
       "label": "音量均衡",
       "description": "自动调节不同歌曲之间的音量差异"
     },
+    "songLevel": {
+      "label": "在线歌曲音质",
+      "description": "在线歌曲的音质偏好，取决于账号实际可用级别",
+      "switchTitle": "音质切换",
+      "switchHint": "以账号具体权限为准",
+      "lq": "标准 (LQ)",
+      "sq": "较高 (SQ)",
+      "hq": "极高 (HQ)",
+      "lossless": "无损 (Lossless)",
+      "hi-res": "高解析度无损 (Hi-Res)"
+    },
     "outputDevice": {
       "label": "输出设备",
       "description": "选择音频输出设备",
@@ -880,6 +891,10 @@
       "label": "歌单显示封面",
       "description": "侧边栏的歌单项以歌单封面替代默认图标"
     },
+    "showQualitySwitch": {
+      "label": "显示快捷音质切换",
+      "description": "在播放栏显示在线音质标签，可点击快速切换音质"
+    },
     "fontConfig": {
       "label": "字体配置",
       "description": "统一配置应用、歌词和外部歌词窗口的字体",
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 9c09ed1c..ba90f464 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -63,7 +63,8 @@ const playerBarWrapperClass = computed(() => {
 
 /** 内层播放条样式 */
 const playerBarInnerClass = computed(() => {
-  const base = "pointer-events-auto";
+  // 禁用底部播放栏交互
+  const base = isExpanded.value ? "pointer-events-none" : "pointer-events-auto";
   switch (appearance.layoutMode) {
     case "floating":
       return `${base} mx-auto max-w-4xl glass-panel rounded-full shadow-xl border border-solid border-primary/10`;
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index c61d3dbb..5048357f 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -1,5 +1,6 @@
 import type { Track, TrackSource } from "@shared/types/player";
 import type { Platform } from "@shared/types/platform";
+import type { QualityLevel } from "@/utils/quality";
 import { useStreamingStore } from "@/stores/streaming";
 import { useSettingsStore } from "@/stores/settings";
 import { usePluginsStore } from "@/stores/plugins";
@@ -23,13 +24,18 @@ const isOnlinePlatform = (source: TrackSource): source is Platform =>
 
 /**
  * 派生缓存键
+ * netease 把音质档位并入键，使不同音质的同一首歌互不覆盖
  * @param track - 要解析的 track
+ * @param songLevel - 在线歌曲音质档位
  * @returns 派生缓存键，如果该 track 不参与歌曲缓存则返回 null
  */
-const cacheKeyForTrack = (track: Track): string | null => {
+const cacheKeyForTrack = (track: Track, songLevel: QualityLevel): string | null => {
   if (track.source === "streaming" && track.serverId && track.originalId) {
     return `s:${track.serverId}:${track.originalId}:`;
   }
+  if (track.source === "netease" && track.id) {
+    return `o:netease:${track.id}:${songLevel}`;
+  }
   if (isOnlinePlatform(track.source) && track.id) {
     return `o:${track.source}:${track.id}:`;
   }
@@ -100,11 +106,15 @@ const resolveByPlugin = async (track: Track): Promise<OnlineResolveResult> => {
 /**
  * 解析在线音频源 URL
  * @param track - 要解析的 track
+ * @param songLevel - 在线歌曲音质档位（仅网易云官方接口生效）
  */
-const resolveOnlineUrl = async (track: Track): Promise<OnlineResolveResult> => {
+const resolveOnlineUrl = async (
+  track: Track,
+  songLevel: QualityLevel,
+): Promise<OnlineResolveResult> => {
   try {
     if (track.source === "netease") {
-      const url = await resolveNeteaseUrl(track);
+      const url = await resolveNeteaseUrl(track, songLevel);
       if (url) return { url };
     }
   } catch {
@@ -134,7 +144,8 @@ export const resolveTrackSource = async (track: Track): Promise<ResolvedTrackSou
     return track.path ? { source: track.path, fromCache: false } : null;
   }
   const settings = useSettingsStore();
-  const cacheKey = cacheKeyForTrack(track);
+  const songLevel = settings.player.songLevel;
+  const cacheKey = cacheKeyForTrack(track, songLevel);
   const cacheEnabled = settings.system.cache?.songCache?.enabled === true && cacheKey !== null;
   if (cacheEnabled) {
     const cached = await window.api.cache.song.lookup(cacheKey!);
@@ -168,7 +179,7 @@ export const resolveTrackSource = async (track: Track): Promise<ResolvedTrackSou
   // 在线源（netease / qqmusic / kugou）
   if (isOnlinePlatform(track.source)) {
     try {
-      const resolved = await resolveOnlineUrl(track);
+      const resolved = await resolveOnlineUrl(track, songLevel);
       if (resolved.url === null) {
         handleError(resolved.errorCode);
         return null;
diff --git a/src/settings/categories/appearance.ts b/src/settings/categories/appearance.ts
index 00576a16..1a4d4160 100644
--- a/src/settings/categories/appearance.ts
+++ b/src/settings/categories/appearance.ts
@@ -160,6 +160,12 @@ const appearanceCategory: SettingCategory = {
           binding: { store: "settings", path: "appearance.sidebarPlaylistCover" },
           defaultValue: false,
         },
+        {
+          key: "showQualitySwitch",
+          type: "switch",
+          binding: { store: "settings", path: "appearance.showQualitySwitch" },
+          defaultValue: false,
+        },
       ],
     },
   ],
diff --git a/src/settings/categories/player.ts b/src/settings/categories/player.ts
index 7cbb3d8c..db37503a 100644
--- a/src/settings/categories/player.ts
+++ b/src/settings/categories/player.ts
@@ -5,7 +5,60 @@ import IconLucidePlay from "~icons/lucide/play";
 const playerCategory: SettingCategory = {
   id: "player",
   icon: IconLucidePlay,
-  sections: [
+  sections: [{
+      id: "playControl",
+      items: [
+        {
+          key: "autoPlay",
+          type: "switch",
+          binding: { store: "settings", path: "system.player.autoPlay" },
+          defaultValue: true,
+        },
+        {
+          key: "rememberLastTrack",
+          type: "switch",
+          binding: { store: "settings", path: "system.player.rememberLastTrack" },
+          defaultValue: false,
+        },
+        {
+          key: "fadeEnabled",
+          type: "switch",
+          binding: { store: "settings", path: "system.player.fadeEnabled" },
+          defaultValue: true,
+          children: [
+            {
+              key: "fadeDuration",
+              type: "slider",
+              binding: { store: "settings", path: "system.player.fadeDuration" },
+              min: 100,
+              max: 600,
+              step: 100,
+              defaultValue: 200,
+              marks: { 100: "100", 200: "200", 600: "600" },
+            },
+          ],
+        },
+        {
+          key: "loudnessNormalization",
+          type: "switch",
+          binding: { store: "settings", path: "system.player.loudnessNormalization" },
+          defaultValue: false,
+        },
+        {
+          key: "songLevel",
+          type: "select",
+          binding: { store: "settings", path: "player.songLevel" },
+          options: [
+            { value: "lq", labelKey: "settings.songLevel.lq" },
+            { value: "sq", labelKey: "settings.songLevel.sq" },
+            { value: "hq", labelKey: "settings.songLevel.hq" },
+            { value: "lossless", labelKey: "settings.songLevel.lossless" },
+            { value: "hi-res", labelKey: "settings.songLevel.hi-res" },
+          ],
+          defaultValue: "hq",
+        },
+      ],
+    },
     {
       id: "playback",
       items: [
@@ -62,47 +115,7 @@ const playerCategory: SettingCategory = {
         },
       ],
     },
-    {
-      id: "playControl",
-      items: [
-        {
-          key: "autoPlay",
-          type: "switch",
-          binding: { store: "settings", path: "system.player.autoPlay" },
-          defaultValue: true,
-        },
-        {
-          key: "rememberLastTrack",
-          type: "switch",
-          binding: { store: "settings", path: "system.player.rememberLastTrack" },
-          defaultValue: false,
-        },
-        {
-          key: "fadeEnabled",
-          type: "switch",
-          binding: { store: "settings", path: "system.player.fadeEnabled" },
-          defaultValue: true,
-          children: [
-            {
-              key: "fadeDuration",
-              type: "slider",
-              binding: { store: "settings", path: "system.player.fadeDuration" },
-              min: 100,
-              max: 600,
-              step: 100,
-              defaultValue: 200,
-              marks: { 100: "100", 200: "200", 600: "600" },
-            },
-          ],
-        },
-        {
-          key: "loudnessNormalization",
-          type: "switch",
-          binding: { store: "settings", path: "system.player.loudnessNormalization" },
-          defaultValue: false,
-        },
-      ],
-    },
+    
     {
       id: "device",
       items: [
diff --git a/src/stores/media.ts b/src/stores/media.ts
index 099fc595..dbc4761d 100644
--- a/src/stores/media.ts
+++ b/src/stores/media.ts
@@ -47,13 +47,13 @@ export const useMediaStore = defineStore("media", () => {
   };
 
   /**
-   * 更新 track / detail
+   * 更新 track
    * @param newTrack - 新的歌曲信息
-   * @param newDetail - 新的歌曲详细信息
+   * @param newDetail - 新的歌曲详细信息；省略则保留现有 detail
    */
   const setTrack = (newTrack: Track, newDetail?: TrackDetail): void => {
     track.value = newTrack;
-    detail.value = newDetail ?? null;
+    if (newDetail) detail.value = newDetail;
   };
 
   /**
diff --git a/src/stores/settings.ts b/src/stores/settings.ts
index 01eaf13f..4675795c 100644
--- a/src/stores/settings.ts
+++ b/src/stores/settings.ts
@@ -24,6 +24,7 @@ export const useSettingsStore = defineStore(
       routeTransition: "fade",
       sidebarCollapsed: false,
       sidebarPlaylistCover: false,
+      showQualitySwitch: false,
       closeAction: "hide",
       rememberCloseChoice: false,
       fontFamily: "",
@@ -38,6 +39,7 @@ export const useSettingsStore = defineStore(
       outputDevice: null,
       enableSpectrum: false,
       spectrumBarWidth: 4,
+      songLevel: "hq",
     });
 
     /** 歌词 */
diff --git a/src/types/settings.ts b/src/types/settings.ts
index d6010786..64fb5984 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -1,6 +1,7 @@
 import type { LyricFormat } from "@shared/types/lyrics";
 import { DEFAULT_LYRIC_FORMAT_ORDER as DEFAULT_LYRIC_FORMAT_ORDER_SHARED } from "@shared/types/lyrics";
 import type { Platform } from "@shared/types/platform";
+import type { QualityLevel } from "@/utils/quality";
 
 /** 播放器背景类型 */
 export type PlayerBgType = "blur" | "solid";
@@ -124,6 +125,8 @@ export interface PlayerSettings {
   enableSpectrum: boolean;
   /** 频谱单条宽度（px） */
   spectrumBarWidth: number;
+  /** 在线歌曲音质偏好；实际可用级别取决于账号权限 */
+  songLevel: QualityLevel;
 }
 
 /** 外观设置 */
@@ -136,6 +139,8 @@ export interface AppearanceSettings {
   sidebarCollapsed: boolean;
   /** 侧边栏歌单项显示封面 */
   sidebarPlaylistCover: boolean;
+  /** 播放栏显示快捷音质切换 */
+  showQualitySwitch: boolean;
   /** 点击关闭按钮的行为 */
   closeAction: "quit" | "hide";
   /** 记忆关闭选择 */
diff --git a/src/utils/quality.ts b/src/utils/quality.ts
index d934cd75..bf0a9167 100644
--- a/src/utils/quality.ts
+++ b/src/utils/quality.ts
@@ -6,7 +6,7 @@ export type QualityLevel = "hi-res" | "lossless" | "hq" | "sq" | "lq";
 /** 无损编解码器 */
 const LOSSLESS_CODECS = new Set(["flac", "alac", "ape", "wav", "aiff", "wavpack", "tta"]);
 
-/** 等级显示文案 */
+/** 等级短码文案 */
 const QUALITY_LABELS: Record<QualityLevel, string> = {
   "hi-res": "Hi-Res",
   lossless: "Lossless",
@@ -15,6 +15,15 @@ const QUALITY_LABELS: Record<QualityLevel, string> = {
   lq: "LQ",
 };
 
+/** 等级完整文案 */
+const QUALITY_FULL_LABELS: Record<QualityLevel, string> = {
+  "hi-res": "Hi-Res",
+  lossless: "Lossless",
+  hq: "High Quality",
+  sq: "Standard Quality",
+  lq: "Low Quality",
+};
+
 /**
  * 判断音质等级；信息不全时回落到 LQ
  * @param quality - AudioQuality；undefined / 无 codec 时按最低档处理
@@ -34,12 +43,20 @@ export const getQualityLevel = (quality: AudioQuality | undefined): QualityLevel
 };
 
 /**
- * 取音质等级显示文案
- * @param quality - AudioQuality
- * @returns 标签文案（英文）
+ * 取音质等级短码文案
+ * @param quality - AudioQuality；未知时返回空串（避免加载中误显示 LQ）
+ * @returns 短码文案（LQ / SQ / HQ / Lossless / Hi-Res）
  */
 export const getQualityLabel = (quality: AudioQuality | undefined): string =>
-  QUALITY_LABELS[getQualityLevel(quality)];
+  quality ? QUALITY_LABELS[getQualityLevel(quality)] : "";
+
+/**
+ * 取音质等级完整文案
+ * @param quality - AudioQuality；未知时返回空串
+ * @returns 完整文案（Low Quality / Standard Quality / High Quality / Lossless / Hi-Res）
+ */
+export const getQualityFullLabel = (quality: AudioQuality | undefined): string =>
+  quality ? QUALITY_FULL_LABELS[getQualityLevel(quality)] : "";
 
 /** 是否为无损级别（hi-res 或 lossless） */
 export const isLosslessQuality = (quality: AudioQuality | undefined): boolean => {

From 6e9a349b22cfec3604adf1c7f19374ce3d0b2de8 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Wed, 20 May 2026 18:16:56 +0800
Subject: [PATCH 28/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9F=B3?=
 =?UTF-8?q?=E9=A2=91=E8=BF=87=E6=9C=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/apis/netease/modules/song_url.ts     |  1 +
 src/apis/song/netease.ts                      | 17 +++++++++++--
 src/components/player/QualityControl.vue      |  2 +-
 src/core/player/index.ts                      | 25 ++++++++++++++++---
 src/services/audioSource.ts                   | 13 +++++++---
 5 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/electron/main/apis/netease/modules/song_url.ts b/electron/main/apis/netease/modules/song_url.ts
index b964f600..064abab0 100644
--- a/electron/main/apis/netease/modules/song_url.ts
+++ b/electron/main/apis/netease/modules/song_url.ts
@@ -19,6 +19,7 @@ const song_url: NeteaseModule = (query, request) => {
   const data = {
     ids: `[${String(ids).split(",").join(",")}]`,
     level: query.level ?? "exhigh",
+    encodeType: "flac",
   };
   return request("/api/song/enhance/player/url/v1", data, createOption(query));
 };
diff --git a/src/apis/song/netease.ts b/src/apis/song/netease.ts
index 3ca185e6..04e3f7e9 100644
--- a/src/apis/song/netease.ts
+++ b/src/apis/song/netease.ts
@@ -24,18 +24,31 @@ const NETEASE_LEVEL: Record<QualityLevel, string> = {
   "hi-res": "hires",
 };
 
+/** 兜底 URL 有效期（秒） */
+const DEFAULT_URL_EXPI_SECONDS = 1200;
+
+/** 网易云 URL 解析结果 */
+export interface NeteaseUrlResult {
+  url: string;
+  /** URL 失效时刻（epoch ms） */
+  expiresAt: number;
+}
+
 /**
  * 解析网易云 Track 的可播放 URL
  * VIP 试听片段 / 无版权 → 返回 null
  * @param track - track.id 为云端 songId
  * @param songLevel - 音质偏好；实际可用级别取决于账号权限
+ * @returns 可播放 URL 与失效时刻（接口 expi，通常 1200s）
  */
 export const resolveNeteaseUrl = async (
   track: Track,
   songLevel: QualityLevel,
-): Promise<string | null> => {
+): Promise<NeteaseUrlResult | null> => {
   const body = await neteaseApi.song_url({ id: track.id, level: NETEASE_LEVEL[songLevel] });
   const item = body?.data?.[0];
   if (!item?.url || item.freeTrialInfo) return null;
-  return item.url;
+  const expi =
+    typeof item.expi === "number" && item.expi > 0 ? item.expi : DEFAULT_URL_EXPI_SECONDS;
+  return { url: item.url, expiresAt: Date.now() + expi * 1000 };
 };
diff --git a/src/components/player/QualityControl.vue b/src/components/player/QualityControl.vue
index daabb11b..429e1bc1 100644
--- a/src/components/player/QualityControl.vue
+++ b/src/components/player/QualityControl.vue
@@ -44,7 +44,7 @@ const onQualityChange = (value: string | number | boolean): void => {
 
 <template>
   <SPopselect
-    v-if="isNetease"
+    v-if="isNetease && media.detail?.quality"
     :model-value="settings.player.songLevel"
     :options="qualityOptions"
     side="top"
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index 92ba9be6..aa9aef71 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -20,6 +20,10 @@ import { handleError, isSkippableError } from "@/utils/errors";
 let loadToken = 0;
 /** loadTrack 竞态 token */
 let trackToken = 0;
+/** 当前音源 URL 的失效时刻（epoch ms） */
+let sourceExpiresAt = Number.POSITIVE_INFINITY;
+/** URL 过期提前量 */
+const URL_EXPIRY_MARGIN_MS = 60_000;
 /** 连续加载失败计数，成功时重置 */
 let consecutiveFailures = 0;
 /** 连续失败硬上限 */
@@ -64,6 +68,7 @@ const resetForLoad = (duration: number): void => {
   playback.setCurrentTime(0, { force: true });
   playback.setDuration(duration);
   playback.setPlaying(false);
+  sourceExpiresAt = Number.POSITIVE_INFINITY;
   // 上一首未达到缓存触发阈值的请求丢弃
   cacheScheduler.cancel();
 };
@@ -156,6 +161,7 @@ const loadTrack = async (track: Track | null): Promise<void> => {
     if (!result.ok && result.error && isSkippableError(result.error)) {
       shouldSkip = true;
     } else if (result.ok) {
+      sourceExpiresAt = resolved.expiresAt ?? Number.POSITIVE_INFINITY;
       // 用户主动触发的成功播放记入历史；initPlayer 的恢复路径走 load() 不经此处
       useHistoryStore().record(track);
       if (resolved.cacheRequest) {
@@ -168,14 +174,15 @@ const loadTrack = async (track: Track | null): Promise<void> => {
 
 /**
  * 热替换当前播放
- * 切换在线音质后调用：按新音质重新解析 URL，并从当前进度续播
+ * 切换在线音质、或在线 URL 过期时调用：重新解析 URL 并从当前进度续播
+ * @param forcePlay - 重载后强制播放
  */
-export const reloadCurrentTrack = async (): Promise<void> => {
+export const reloadCurrentTrack = async (forcePlay?: boolean): Promise<void> => {
   const media = useMediaStore();
   const track = media.track;
   if (!track || track.source !== "netease") return;
   const status = useStatusStore();
-  const wasPlaying = status.isPlaying;
+  const shouldPlay = forcePlay ?? status.isPlaying;
   const resumePosition = Math.round(playback.getCurrentTime());
   // 抢占加载令牌，与 loadTrack 互相取消
   const myToken = ++trackToken;
@@ -186,8 +193,9 @@ export const reloadCurrentTrack = async (): Promise<void> => {
   // 以暂停态加载，seek 回原进度后再决定是否播放，避免从 0 漏音
   const result = await load(resolved.source, false, track);
   if (myToken !== trackToken || !result.ok) return;
+  sourceExpiresAt = resolved.expiresAt ?? Number.POSITIVE_INFINITY;
   if (resumePosition > 0) await seek(resumePosition);
-  if (wasPlaying) await play();
+  if (shouldPlay) await play();
   if (resolved.cacheRequest) {
     cacheScheduler.schedule(track.id, resolved.cacheRequest);
   }
@@ -195,6 +203,14 @@ export const reloadCurrentTrack = async (): Promise<void> => {
 
 /** 恢复播放 */
 export const play = async (): Promise<void> => {
+  // 在线地址将过期
+  if (
+    useMediaStore().track?.source === "netease" &&
+    Date.now() >= sourceExpiresAt - URL_EXPIRY_MARGIN_MS
+  ) {
+    await reloadCurrentTrack(true);
+    return;
+  }
   const status = useStatusStore();
   const prev = status.state;
   status.state = "playing";
@@ -630,6 +646,7 @@ export const initPlayer = async (): Promise<void> => {
     if (resolved) {
       lyricLoader.beginLoad();
       const result = await load(resolved.source, settings.system.player.autoPlay, lastTrack);
+      if (result.ok) sourceExpiresAt = resolved.expiresAt ?? Number.POSITIVE_INFINITY;
       if (result.ok && settings.system.player.rememberLastTrack && lastPosition > 0) {
         await seek(lastPosition);
       }
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index 5048357f..5ad3fdf5 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -42,8 +42,10 @@ const cacheKeyForTrack = (track: Track, songLevel: QualityLevel): string | null
   return null;
 };
 
-/** 在线 URL 解析结果；失败时携带原因，由调用方决定提示 */
-type OnlineResolveResult = { url: string } | { url: null; errorCode: ErrorCode };
+/** 在线 URL 解析结果 */
+type OnlineResolveResult =
+  | { url: string; expiresAt?: number }
+  | { url: null; errorCode: ErrorCode };
 
 /**
  * 根据 track 信息解析出最终的音频源 URL
@@ -114,8 +116,8 @@ const resolveOnlineUrl = async (
 ): Promise<OnlineResolveResult> => {
   try {
     if (track.source === "netease") {
-      const url = await resolveNeteaseUrl(track, songLevel);
-      if (url) return { url };
+      const resolved = await resolveNeteaseUrl(track, songLevel);
+      if (resolved) return { url: resolved.url, expiresAt: resolved.expiresAt };
     }
   } catch {
     // 官方 API 异常回落插件
@@ -131,6 +133,8 @@ const resolveOnlineUrl = async (
 export interface ResolvedTrackSource {
   source: string;
   fromCache: boolean;
+  /** 在线 URL 失效时刻 */
+  expiresAt?: number;
   cacheRequest?: () => Promise<void>;
 }
 
@@ -186,6 +190,7 @@ export const resolveTrackSource = async (track: Track): Promise<ResolvedTrackSou
       }
       const url = resolved.url;
       const result: ResolvedTrackSource = { source: url, fromCache: false };
+      if (resolved.expiresAt !== undefined) result.expiresAt = resolved.expiresAt;
       if (cacheEnabled) {
         result.cacheRequest = async () => {
           void window.api.cache.song.fetch(cacheKey, track.source, url);

From 0db1a402e9c70477768dbd977a4ca5e943fb2bc4 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Wed, 20 May 2026 18:19:30 +0800
Subject: [PATCH 29/33] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings/categories/player.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/settings/categories/player.ts b/src/settings/categories/player.ts
index db37503a..d741e987 100644
--- a/src/settings/categories/player.ts
+++ b/src/settings/categories/player.ts
@@ -5,7 +5,8 @@ import IconLucidePlay from "~icons/lucide/play";
 const playerCategory: SettingCategory = {
   id: "player",
   icon: IconLucidePlay,
-  sections: [{
+  sections: [
+    {
       id: "playControl",
       items: [
         {
@@ -115,7 +116,7 @@ const playerCategory: SettingCategory = {
         },
       ],
     },
-    
+
     {
       id: "device",
       items: [

From 80e9a3a86476c464c889f2a9f4b1140ddd2e100e Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Wed, 20 May 2026 23:43:13 +0800
Subject: [PATCH 30/33] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/server/routes.ts        | 12 +-----------
 src/components/modals/LoginDialog.vue | 11 +++++++----
 src/stores/user.ts                    |  8 --------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/electron/main/server/routes.ts b/electron/main/server/routes.ts
index 0adfc3b2..49d65228 100644
--- a/electron/main/server/routes.ts
+++ b/electron/main/server/routes.ts
@@ -36,17 +36,7 @@ export const buildRoutes = (): Hono => {
   api.get("/volume", (c) => c.json({ volume: getPlayer().getVolume() }));
 
   // 当前播放完整快照
-  api.get("/now-playing", (c) => {
-    const snap = nowPlaying.snapshot();
-    return c.json({
-      track: snap.track,
-      lyric: snap.lyric,
-      source: snap.source,
-      position: snap.position,
-      playing: snap.playing,
-      lyricOffsetMs: snap.lyricOffsetMs,
-    });
-  });
+  api.get("/now-playing", (c) => c.json(nowPlaying.snapshot()));
 
   api.post("/play", (c) => {
     getPlayer().play();
diff --git a/src/components/modals/LoginDialog.vue b/src/components/modals/LoginDialog.vue
index aba31196..401b7b09 100644
--- a/src/components/modals/LoginDialog.vue
+++ b/src/components/modals/LoginDialog.vue
@@ -79,12 +79,13 @@ const refreshQr = async (): Promise<void> => {
 const handleQrSuccess = async (cookie: string): Promise<void> => {
   if (!cookie || !cookie.includes("MUSIC_U")) {
     toast.error(t("login.failed"));
-    void refreshQr();
+    void startQrFlow();
     return;
   }
   loading.value = true;
   try {
-    await finishLogin();
+    const ok = await finishLogin();
+    if (!ok) void startQrFlow();
   } finally {
     loading.value = false;
   }
@@ -119,7 +120,8 @@ const { pause, resume } = useIntervalFn(pollOnce, 1500, { immediate: false });
 const startQrFlow = async (): Promise<void> => {
   pause();
   await refreshQr();
-  if (qrUnikey.value) resume();
+  // 拉 key 期间弹窗可能已关闭，避免后台空转轮询
+  if (qrUnikey.value && props.open) resume();
 };
 
 watch(
@@ -158,7 +160,8 @@ const startAutoFetch = async (): Promise<void> => {
       resume();
       return;
     }
-    await finishLogin();
+    const ok = await finishLogin();
+    if (!ok) void startQrFlow();
   } finally {
     loading.value = false;
   }
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 00ff84ed..04e0018e 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -491,13 +491,6 @@ export const useUserStore = defineStore(
       else clearContent();
     };
 
-    /** 用给定 profile 填充登录态 */
-    const setProfile = (newProfile: UserProfile | null): void => {
-      profile.value = newProfile;
-      lastRefreshAt.value = newProfile ? Date.now() : 0;
-      syncContent(newProfile?.userId);
-    };
-
     /** 续期 cookie */
     const refresh = async (): Promise<void> => {
       try {
@@ -545,7 +538,6 @@ export const useUserStore = defineStore(
       profile,
       lastRefreshAt,
       isLoggedIn,
-      setProfile,
       fetchStatus,
       logout,
 

From 35f8703299ab7734e5bb644e6198795be7cf9014 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Wed, 20 May 2026 23:54:04 +0800
Subject: [PATCH 31/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=AD=8C?=
 =?UTF-8?q?=E6=9B=B2=E6=92=AD=E6=94=BE=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/ipc/player.ts        |  7 +++++
 native/audio-engine/index.d.ts     |  2 +-
 native/audio-engine/src/decoder.rs | 34 ++++++++++++---------
 native/audio-engine/src/lib.rs     |  6 +++-
 native/audio-engine/src/player.rs  |  9 +++++-
 native/audio-engine/src/shared.rs  | 13 ++++++++
 shared/types/player.ts             |  1 +
 src/apis/song/netease.ts           | 17 ++---------
 src/core/player/events.ts          |  5 +++
 src/core/player/index.ts           | 49 +++++++++++++++++++-----------
 src/services/audioSource.ts        |  9 ++----
 11 files changed, 96 insertions(+), 56 deletions(-)

diff --git a/electron/main/ipc/player.ts b/electron/main/ipc/player.ts
index 1cabf5e3..8de5aede 100644
--- a/electron/main/ipc/player.ts
+++ b/electron/main/ipc/player.ts
@@ -79,6 +79,13 @@ const registerNativeEvents = (inst: InstanceType<AudioEngineModule["AudioPlayer"
         setTaskbarProgress(-1);
         break;
       }
+      case "sourceError": {
+        // 音源失效（网络中断 / URL 过期）
+        sendToMain("player:event", { type: "sourceError" });
+        mediaService.setPlayState({ status: "Paused" });
+        setTaskbarProgress(-1);
+        break;
+      }
       case "position": {
         const posMs = toMs(event.position ?? 0);
         const durMs = toMs(event.duration ?? 0);
diff --git a/native/audio-engine/index.d.ts b/native/audio-engine/index.d.ts
index f36aefd7..3763f1b9 100644
--- a/native/audio-engine/index.d.ts
+++ b/native/audio-engine/index.d.ts
@@ -160,7 +160,7 @@ export interface JsMusicMetadata {
 
 /** 播放器事件，推送给 JS 侧 */
 export interface JsPlayerEvent {
-  /** 事件类型："stateChanged" | "ended" | "position" | "fftData" | "outputStalled" */
+  /** 事件类型："stateChanged" | "ended" | "sourceError" | "position" | "fftData" | "outputStalled" */
   type: string
   /** 状态（仅 stateChanged 时有值） */
   state?: string
diff --git a/native/audio-engine/src/decoder.rs b/native/audio-engine/src/decoder.rs
index 18751c1f..1ee27213 100644
--- a/native/audio-engine/src/decoder.rs
+++ b/native/audio-engine/src/decoder.rs
@@ -378,18 +378,27 @@ fn run_decoding_loop(data: &mut DecoderData, shared: &Shared) {
                     return;
                 }
 
-                // 读取下一个数据包
-                match data.input_ctx.packets().next() {
-                    Some((stream, packet)) if stream.index() == data.audio_stream_index => {
-                        consecutive_read_failures = 0;
-                        if data.decoder.send_packet(&packet).is_err() {
-                            return;
+                // 读取下一个数据包；Packet::read 能区分真正的 EOF 与读取失败
+                let mut packet = ffmpeg::codec::packet::Packet::empty();
+                match packet.read(&mut data.input_ctx) {
+                    Ok(()) => {
+                        if packet.stream() == data.audio_stream_index {
+                            consecutive_read_failures = 0;
+                            if data.decoder.send_packet(&packet).is_err() {
+                                return;
+                            }
                         }
+                        // 非音频包：跳过
                     }
-                    None => {
-                        // 未读到数据包：可能是真正的文件结束，也可能是网络中断
+                    Err(ffmpeg::Error::Eof) => {
+                        // 真正的文件结束，刷新解码器
+                        let _ = data.decoder.send_eof();
+                        eof_sent = true;
+                    }
+                    Err(err) => {
+                        // 读取失败：网络中断 / URL 失效
                         consecutive_read_failures += 1;
-
+                        warn!(error = %err, retries = consecutive_read_failures, "音频源读取失败");
                         if consecutive_read_failures <= NETWORK_READ_RETRIES {
                             // 网络流可能恢复，等待后重试
                             std::thread::sleep(std::time::Duration::from_millis(
@@ -397,14 +406,11 @@ fn run_decoding_loop(data: &mut DecoderData, shared: &Shared) {
                             ));
                             continue;
                         }
-
-                        // 重试耗尽，刷新解码器
+                        // 重试耗尽：标记音源失效，仍走 EOF 流程把已缓冲数据放完
+                        shared.mark_decode_failed();
                         let _ = data.decoder.send_eof();
                         eof_sent = true;
                     }
-                    _ => {
-                        // 非音频包，跳过
-                    }
                 }
             }
             Err(err) => {
diff --git a/native/audio-engine/src/lib.rs b/native/audio-engine/src/lib.rs
index 60eeea81..2272386a 100644
--- a/native/audio-engine/src/lib.rs
+++ b/native/audio-engine/src/lib.rs
@@ -113,7 +113,7 @@ pub struct JsAudioDevice {
 #[napi(object)]
 #[derive(Default)]
 pub struct JsPlayerEvent {
-    /// 事件类型："stateChanged" | "ended" | "position" | "fftData" | "outputStalled"
+    /// 事件类型："stateChanged" | "ended" | "sourceError" | "position" | "fftData" | "outputStalled"
     #[napi(js_name = "type")]
     pub event_type: String,
     /// 状态（仅 stateChanged 时有值）
@@ -199,6 +199,10 @@ impl AudioPlayer {
                     event_type: "ended".into(),
                     ..Default::default()
                 },
+                PlayerEvent::SourceError => JsPlayerEvent {
+                    event_type: "sourceError".into(),
+                    ..Default::default()
+                },
                 PlayerEvent::Position { position, duration } => JsPlayerEvent {
                     event_type: "position".into(),
                     position: Some(position),
diff --git a/native/audio-engine/src/player.rs b/native/audio-engine/src/player.rs
index 9d8e8134..355f031b 100644
--- a/native/audio-engine/src/player.rs
+++ b/native/audio-engine/src/player.rs
@@ -23,6 +23,8 @@ pub enum PlayerEvent {
     StateChanged { state: PlayerState },
     /// 播放结束
     Ended,
+    /// 音源失效（网络中断 / URL 过期）
+    SourceError,
     /// 位置更新（秒）—— 由内部定时器推送
     Position { position: f64, duration: f64 },
     /// FFT 频谱数据推送
@@ -322,7 +324,12 @@ impl InnerPlayer {
 
                 // 检测播放结束：all_consumed 表示 rodio 侧已消费完所有数据
                 if shared.is_all_consumed() {
-                    cb(PlayerEvent::Ended);
+                    // 解码因读取失败中止 → 音源失效事件；否则正常结束
+                    if shared.is_decode_failed() {
+                        cb(PlayerEvent::SourceError);
+                    } else {
+                        cb(PlayerEvent::Ended);
+                    }
                     cb(PlayerEvent::StateChanged {
                         state: PlayerState::Stopped,
                     });
diff --git a/native/audio-engine/src/shared.rs b/native/audio-engine/src/shared.rs
index f1042b6b..6d15c088 100644
--- a/native/audio-engine/src/shared.rs
+++ b/native/audio-engine/src/shared.rs
@@ -29,6 +29,8 @@ pub struct Shared {
     /// 所有数据已被消费完毕（DecoderSource 返回 None 时设置）
     /// 比 is_done() 更准确：is_done 只表示缓冲区空，all_consumed 表示 rodio 侧已消费完
     all_consumed: AtomicBool,
+    /// 解码线程因读取失败（网络中断 / URL 失效）中止，区别于正常 EOF
+    decode_failed: AtomicBool,
     /// 音量归一化增益因子（线性值，1.0 = 无增益）
     /// 使用 AtomicU32 + f32::to_bits/from_bits 实现原子 f32
     normalization_gain: AtomicU32,
@@ -54,6 +56,7 @@ impl Shared {
             sample_rate,
             channels,
             all_consumed: AtomicBool::new(false),
+            decode_failed: AtomicBool::new(false),
             normalization_gain: AtomicU32::new(1.0_f32.to_bits()),
             normalization_enabled: AtomicBool::new(false),
             interrupt_flag: Mutex::new(None),
@@ -112,6 +115,16 @@ impl Shared {
         self.all_consumed.load(Ordering::Acquire)
     }
 
+    /// 标记解码因读取失败中止（网络中断 / URL 失效）
+    pub fn mark_decode_failed(&self) {
+        self.decode_failed.store(true, Ordering::Release);
+    }
+
+    /// 解码是否因读取失败中止
+    pub fn is_decode_failed(&self) -> bool {
+        self.decode_failed.load(Ordering::Acquire)
+    }
+
     /// 基于实际消费采样数的精确播放位置（秒）
     pub fn consumed_position(&self) -> f64 {
         let samples = self.samples_consumed.load(Ordering::Relaxed);
diff --git a/shared/types/player.ts b/shared/types/player.ts
index a39aa72f..7f5acd30 100644
--- a/shared/types/player.ts
+++ b/shared/types/player.ts
@@ -162,6 +162,7 @@ export type PlayerEvent =
   | { type: "status"; data: PlayerStatus }
   | { type: "position"; data: { position: number; duration: number } }
   | { type: "ended" }
+  | { type: "sourceError" }
   | { type: "play" }
   | { type: "pause" }
   | { type: "next" }
diff --git a/src/apis/song/netease.ts b/src/apis/song/netease.ts
index 04e3f7e9..3ca185e6 100644
--- a/src/apis/song/netease.ts
+++ b/src/apis/song/netease.ts
@@ -24,31 +24,18 @@ const NETEASE_LEVEL: Record<QualityLevel, string> = {
   "hi-res": "hires",
 };
 
-/** 兜底 URL 有效期（秒） */
-const DEFAULT_URL_EXPI_SECONDS = 1200;
-
-/** 网易云 URL 解析结果 */
-export interface NeteaseUrlResult {
-  url: string;
-  /** URL 失效时刻（epoch ms） */
-  expiresAt: number;
-}
-
 /**
  * 解析网易云 Track 的可播放 URL
  * VIP 试听片段 / 无版权 → 返回 null
  * @param track - track.id 为云端 songId
  * @param songLevel - 音质偏好；实际可用级别取决于账号权限
- * @returns 可播放 URL 与失效时刻（接口 expi，通常 1200s）
  */
 export const resolveNeteaseUrl = async (
   track: Track,
   songLevel: QualityLevel,
-): Promise<NeteaseUrlResult | null> => {
+): Promise<string | null> => {
   const body = await neteaseApi.song_url({ id: track.id, level: NETEASE_LEVEL[songLevel] });
   const item = body?.data?.[0];
   if (!item?.url || item.freeTrialInfo) return null;
-  const expi =
-    typeof item.expi === "number" && item.expi > 0 ? item.expi : DEFAULT_URL_EXPI_SECONDS;
-  return { url: item.url, expiresAt: Date.now() + expi * 1000 };
+  return item.url;
 };
diff --git a/src/core/player/events.ts b/src/core/player/events.ts
index 1def44b9..e04e05ff 100644
--- a/src/core/player/events.ts
+++ b/src/core/player/events.ts
@@ -12,6 +12,7 @@ import {
   pause,
   play,
   prevTrack,
+  recoverFromSourceFailure,
   refreshDevices,
   seek,
   setRepeatMode,
@@ -81,6 +82,10 @@ export const handleEvent = async (event: PlayerEvent): Promise<void> => {
       }
       break;
     }
+    case "sourceError":
+      // 音源失效（网络中断 / URL 过期）
+      await recoverFromSourceFailure();
+      break;
     case "play":
       await play();
       break;
diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index aa9aef71..b80db262 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -20,10 +20,6 @@ import { handleError, isSkippableError } from "@/utils/errors";
 let loadToken = 0;
 /** loadTrack 竞态 token */
 let trackToken = 0;
-/** 当前音源 URL 的失效时刻（epoch ms） */
-let sourceExpiresAt = Number.POSITIVE_INFINITY;
-/** URL 过期提前量 */
-const URL_EXPIRY_MARGIN_MS = 60_000;
 /** 连续加载失败计数，成功时重置 */
 let consecutiveFailures = 0;
 /** 连续失败硬上限 */
@@ -68,7 +64,6 @@ const resetForLoad = (duration: number): void => {
   playback.setCurrentTime(0, { force: true });
   playback.setDuration(duration);
   playback.setPlaying(false);
-  sourceExpiresAt = Number.POSITIVE_INFINITY;
   // 上一首未达到缓存触发阈值的请求丢弃
   cacheScheduler.cancel();
 };
@@ -161,7 +156,6 @@ const loadTrack = async (track: Track | null): Promise<void> => {
     if (!result.ok && result.error && isSkippableError(result.error)) {
       shouldSkip = true;
     } else if (result.ok) {
-      sourceExpiresAt = resolved.expiresAt ?? Number.POSITIVE_INFINITY;
       // 用户主动触发的成功播放记入历史；initPlayer 的恢复路径走 load() 不经此处
       useHistoryStore().record(track);
       if (resolved.cacheRequest) {
@@ -186,14 +180,18 @@ export const reloadCurrentTrack = async (forcePlay?: boolean): Promise<void> =>
   const resumePosition = Math.round(playback.getCurrentTime());
   // 抢占加载令牌，与 loadTrack 互相取消
   const myToken = ++trackToken;
+  // resolveTrackSource 联网解析较慢，先置加载态，让播放键立即给出反馈
+  status.trackLoading = true;
   const resolved = await resolveTrackSource(track);
   if (myToken !== trackToken) return;
   // 解析失败：保留当前播放，不打断
-  if (!resolved) return;
+  if (!resolved) {
+    status.trackLoading = false;
+    return;
+  }
   // 以暂停态加载，seek 回原进度后再决定是否播放，避免从 0 漏音
   const result = await load(resolved.source, false, track);
   if (myToken !== trackToken || !result.ok) return;
-  sourceExpiresAt = resolved.expiresAt ?? Number.POSITIVE_INFINITY;
   if (resumePosition > 0) await seek(resumePosition);
   if (shouldPlay) await play();
   if (resolved.cacheRequest) {
@@ -201,16 +199,34 @@ export const reloadCurrentTrack = async (forcePlay?: boolean): Promise<void> =>
   }
 };
 
-/** 恢复播放 */
-export const play = async (): Promise<void> => {
-  // 在线地址将过期
-  if (
-    useMediaStore().track?.source === "netease" &&
-    Date.now() >= sourceExpiresAt - URL_EXPIRY_MARGIN_MS
-  ) {
-    await reloadCurrentTrack(true);
+/** 同一首歌因源失效连续重载的次数，换歌时归零 */
+let sourceRecoveryCount = 0;
+/** sourceRecoveryCount 对应的 track id */
+let sourceRecoveryTrackId: string | null = null;
+
+/**
+ * 源失效恢复
+ * 重载一次后仍失败则放弃跳曲
+ */
+export const recoverFromSourceFailure = async (): Promise<void> => {
+  const track = useMediaStore().track;
+  if (!track) return;
+  if (sourceRecoveryTrackId !== track.id) {
+    sourceRecoveryTrackId = track.id;
+    sourceRecoveryCount = 0;
+  }
+  // 最多重载一次
+  if (sourceRecoveryCount >= 1) {
+    sourceRecoveryCount = 0;
+    await nextTrack();
     return;
   }
+  sourceRecoveryCount++;
+  await reloadCurrentTrack(true);
+};
+
+/** 恢复播放 */
+export const play = async (): Promise<void> => {
   const status = useStatusStore();
   const prev = status.state;
   status.state = "playing";
@@ -646,7 +662,6 @@ export const initPlayer = async (): Promise<void> => {
     if (resolved) {
       lyricLoader.beginLoad();
       const result = await load(resolved.source, settings.system.player.autoPlay, lastTrack);
-      if (result.ok) sourceExpiresAt = resolved.expiresAt ?? Number.POSITIVE_INFINITY;
       if (result.ok && settings.system.player.rememberLastTrack && lastPosition > 0) {
         await seek(lastPosition);
       }
diff --git a/src/services/audioSource.ts b/src/services/audioSource.ts
index 5ad3fdf5..e294f991 100644
--- a/src/services/audioSource.ts
+++ b/src/services/audioSource.ts
@@ -43,9 +43,7 @@ const cacheKeyForTrack = (track: Track, songLevel: QualityLevel): string | null
 };
 
 /** 在线 URL 解析结果 */
-type OnlineResolveResult =
-  | { url: string; expiresAt?: number }
-  | { url: null; errorCode: ErrorCode };
+type OnlineResolveResult = { url: string } | { url: null; errorCode: ErrorCode };
 
 /**
  * 根据 track 信息解析出最终的音频源 URL
@@ -117,7 +115,7 @@ const resolveOnlineUrl = async (
   try {
     if (track.source === "netease") {
       const resolved = await resolveNeteaseUrl(track, songLevel);
-      if (resolved) return { url: resolved.url, expiresAt: resolved.expiresAt };
+      if (resolved) return { url: resolved };
     }
   } catch {
     // 官方 API 异常回落插件
@@ -133,8 +131,6 @@ const resolveOnlineUrl = async (
 export interface ResolvedTrackSource {
   source: string;
   fromCache: boolean;
-  /** 在线 URL 失效时刻 */
-  expiresAt?: number;
   cacheRequest?: () => Promise<void>;
 }
 
@@ -190,7 +186,6 @@ export const resolveTrackSource = async (track: Track): Promise<ResolvedTrackSou
       }
       const url = resolved.url;
       const result: ResolvedTrackSource = { source: url, fromCache: false };
-      if (resolved.expiresAt !== undefined) result.expiresAt = resolved.expiresAt;
       if (cacheEnabled) {
         result.cacheRequest = async () => {
           void window.api.cache.song.fetch(cacheKey, track.source, url);

From 1be1e419ac977ac914b294898a318ac76e355d0c Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Wed, 20 May 2026 23:59:22 +0800
Subject: [PATCH 32/33] =?UTF-8?q?feat:=20=E6=B8=85=E7=90=86=E6=8F=90?=
 =?UTF-8?q?=E5=89=8D=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/player/index.ts | 1 -
 src/stores/status.ts     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/player/index.ts b/src/core/player/index.ts
index b80db262..8e064c91 100644
--- a/src/core/player/index.ts
+++ b/src/core/player/index.ts
@@ -57,7 +57,6 @@ export type LoadOutcome = { ok: true; track: Track | null } | { ok: false; error
  */
 const resetForLoad = (duration: number): void => {
   const status = useStatusStore();
-  status.state = "loading";
   status.trackLoading = true;
   status.position = 0;
   status.duration = duration;
diff --git a/src/stores/status.ts b/src/stores/status.ts
index 02285275..d9aac20b 100644
--- a/src/stores/status.ts
+++ b/src/stores/status.ts
@@ -68,7 +68,7 @@ export const useStatusStore = defineStore(
     /** 是否暂停 */
     const isPaused = computed(() => state.value === "paused");
     /** 是否加载中 */
-    const isLoading = computed(() => state.value === "loading" || trackLoading.value);
+    const isLoading = computed(() => trackLoading.value);
     /** 播放进度 */
     const progress = computed(() => (duration.value > 0 ? position.value / duration.value : 0));
     /**

From 58920e10e151aeeb7e801cf921b43a1d313d5ec4 Mon Sep 17 00:00:00 2001
From: imsyy <one@imsyy.top>
Date: Thu, 21 May 2026 00:02:45 +0800
Subject: [PATCH 33/33] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86lint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                          | 7 -------
 src/components/player/QualityControl.vue | 7 +------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index c40162bd..eb040d8c 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -36,7 +36,6 @@ declare module 'vue' {
     ContextMenuSubContent: typeof import('reka-ui')['ContextMenuSubContent']
     ContextMenuSubTrigger: typeof import('reka-ui')['ContextMenuSubTrigger']
     ContextMenuTrigger: typeof import('reka-ui')['ContextMenuTrigger']
-    CookieInputDialog: typeof import('./src/components/modals/CookieInputDialog.vue')['default']
     CoverList: typeof import('./src/components/list/CoverList.vue')['default']
     DbCacheManager: typeof import('./src/components/settings/custom/DbCacheManager.vue')['default']
     DeviceSelector: typeof import('./src/components/settings/custom/DeviceSelector.vue')['default']
@@ -84,12 +83,10 @@ declare module 'vue' {
     IconLucideFolderPlus: typeof import('~icons/lucide/folder-plus')['default']
     IconLucideGithub: typeof import('~icons/lucide/github')['default']
     IconLucideHardDrive: typeof import('~icons/lucide/hard-drive')['default']
-    IconLucideHeart: typeof import('~icons/lucide/heart')['default']
     IconLucideHistory: typeof import('~icons/lucide/history')['default']
     IconLucideInfo: typeof import('~icons/lucide/info')['default']
     IconLucideKeyRound: typeof import('~icons/lucide/key-round')['default']
     IconLucideLink: typeof import('~icons/lucide/link')['default']
-    IconLucideLink2: typeof import('~icons/lucide/link2')['default']
     IconLucideListMusic: typeof import('~icons/lucide/list-music')['default']
     IconLucideLocate: typeof import('~icons/lucide/locate')['default']
     IconLucideLock: typeof import('~icons/lucide/lock')['default']
@@ -122,15 +119,12 @@ declare module 'vue' {
     IconLucideTriangleAlert: typeof import('~icons/lucide/triangle-alert')['default']
     IconLucideUnlock: typeof import('~icons/lucide/unlock')['default']
     IconLucideUser: typeof import('~icons/lucide/user')['default']
-    IconLucideUserRound: typeof import('~icons/lucide/user-round')['default']
     IconLucideVolume1: typeof import('~icons/lucide/volume1')['default']
     IconLucideVolume2: typeof import('~icons/lucide/volume2')['default']
     IconLucideVolumeX: typeof import('~icons/lucide/volume-x')['default']
     IconLucideX: typeof import('~icons/lucide/x')['default']
     IconLucideZap: typeof import('~icons/lucide/zap')['default']
-    IconMaterialSymbolsFavoriteOutline: typeof import('~icons/material-symbols/favorite-outline')['default']
     IconMaterialSymbolsFavoriteOutlineRounded: typeof import('~icons/material-symbols/favorite-outline-rounded')['default']
-    IconSpHeartFill: typeof import('~icons/sp/heart-fill')['default']
     IconSpLossless: typeof import('~icons/sp/lossless')['default']
     LoginCookieDialog: typeof import('./src/components/modals/LoginCookieDialog.vue')['default']
     LoginDialog: typeof import('./src/components/modals/LoginDialog.vue')['default']
@@ -191,7 +185,6 @@ declare module 'vue' {
     SettingsSearch: typeof import('./src/components/settings/SettingsSearch.vue')['default']
     SettingsSection: typeof import('./src/components/settings/SettingsSection.vue')['default']
     SFormItem: typeof import('./src/components/ui/SFormItem.vue')['default']
-    SHeartButton: typeof import('./src/components/ui/SHeartButton.vue')['default']
     SideBar: typeof import('./src/components/layout/SideBar.vue')['default']
     SideBarLogo: typeof import('./src/components/layout/SideBarLogo.vue')['default']
     SImg: typeof import('./src/components/ui/SImg.vue')['default']
diff --git a/src/components/player/QualityControl.vue b/src/components/player/QualityControl.vue
index 429e1bc1..390e0fae 100644
--- a/src/components/player/QualityControl.vue
+++ b/src/components/player/QualityControl.vue
@@ -1,9 +1,4 @@
 <script setup lang="ts">
-/**
- * Toolbar 里的音质控件（底部播放栏与全屏播放器共用）
- * 网易云歌曲：popselect 切换在线音质偏好并热替换当前歌曲
- * 其余来源：只读标签，展示引擎解码后的实际音质
- */
 import type { SSelectOption } from "@/components/ui/SSelect.vue";
 import type { QualityLevel } from "@/utils/quality";
 import { useMediaStore } from "@/stores/media";
@@ -11,7 +6,7 @@ import { useSettingsStore } from "@/stores/settings";
 import { getQualityLabel } from "@/utils/quality";
 import * as player from "@/core/player";
 
-const props = withDefaults(defineProps<{ cover?: boolean }>(), { cover: false });
+withDefaults(defineProps<{ cover?: boolean }>(), { cover: false });
 
 const { t } = useI18n();
 const media = useMediaStore();