From 307060ca49d402f42fd042c3d9a87cbf44fd0e4d Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Wed, 20 May 2026 16:28:35 +0800
Subject: [PATCH 01/39] Update deps, async play_music, Progress rewrite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add packageManager metadata to package.json and bump web-audio-api in src-tauri/Cargo.toml. Make play_music an async Tauri command with Result return and async audio decoding + error handling. Svelte updates: minor import formatting in Header, PlayerBar now imports and uses Progress (replacing the Slider volume control), and Progress.svelte was heavily rewritten — modernized reactive logic, improved pointer handling, accessibility attributes, and updated styles.
---
 package.json                        |   3 +-
 src-tauri/Cargo.lock                | 397 ++++++++++------------------
 src-tauri/Cargo.toml                |   2 +-
 src-tauri/src/lib.rs                |  15 +-
 src/lib/components/Header.svelte    |   4 +-
 src/lib/components/PlayerBar.svelte |   4 +-
 src/lib/components/Progress.svelte  | 271 +++++++++----------
 7 files changed, 292 insertions(+), 404 deletions(-)

diff --git a/package.json b/package.json
index 2f37191..6cba909 100644
--- a/package.json
+++ b/package.json
@@ -30,5 +30,6 @@
     "svelte-check": "^4.4.5",
     "typescript": "~5.6.3",
     "vite": "^6.4.1"
-  }
+  },
+  "packageManager": "pnpm@11.1.3+sha512.c85357fe17ca12dd23dd7071822666dfd7e3cb76fe214e3370b5ea2fb34f2a231185509b63e717f3cd0acb38dd3f8d82bcd5e8172400ae678b70ea4fbed0896d"
 }
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 6d60a71..336bfce 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -40,9 +40,9 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14"
 
 [[package]]
 name = "alsa"
-version = "0.9.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
+checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
 dependencies = [
  "alsa-sys",
  "bitflags 2.11.0",
@@ -52,9 +52,9 @@ dependencies = [
 
 [[package]]
 name = "alsa-sys"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
+checksum = "ad7569085a265dd3f607ebecce7458eaab2132a84393534c95b18dcbc3f31e04"
 dependencies = [
  "libc",
  "pkg-config",
@@ -268,24 +268,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "bindgen"
-version = "0.72.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-dependencies = [
- "bitflags 2.11.0",
- "cexpr",
- "clang-sys",
- "itertools",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -475,8 +457,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
 dependencies = [
  "find-msvc-tools",
- "jobserver",
- "libc",
  "shlex",
 ]
 
@@ -486,15 +466,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfb"
 version = "0.7.3"
@@ -534,17 +505,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.8.9",
-]
-
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -622,45 +582,46 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-rs"
-version = "0.11.3"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
+checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
 dependencies = [
- "bitflags 1.3.2",
- "core-foundation-sys",
- "coreaudio-sys",
-]
-
-[[package]]
-name = "coreaudio-sys"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6"
-dependencies = [
- "bindgen",
+ "bitflags 2.11.0",
+ "libc",
+ "objc2-audio-toolbox",
+ "objc2-core-audio",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
 ]
 
 [[package]]
 name = "cpal"
-version = "0.15.3"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
+checksum = "d8942da362c0f0d895d7cac616263f2f9424edc5687364dfd1d25ef7eba506d7"
 dependencies = [
  "alsa",
- "core-foundation-sys",
  "coreaudio-rs",
  "dasp_sample",
  "jni",
  "js-sys",
  "libc",
  "mach2",
- "ndk 0.8.0",
+ "ndk",
  "ndk-context",
- "oboe",
+ "num-derive",
+ "num-traits",
+ "objc2",
+ "objc2-audio-toolbox",
+ "objc2-avf-audio",
+ "objc2-core-audio",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.54.0",
+ "windows",
 ]
 
 [[package]]
@@ -1009,12 +970,6 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
 [[package]]
 name = "embed-resource"
 version = "3.0.7"
@@ -1142,14 +1097,13 @@ dependencies = [
 
 [[package]]
 name = "fft-convolver"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdcf0473d3952d710173f7f2acc8ff88065928e01b7d5467ec28449a3abae4fc"
+checksum = "ecb4fbed063c755ecaa4cd1356cd82cc48e9d5c7edd5c30cd144656833fc0661"
 dependencies = [
- "num",
  "realfft",
- "rustfft",
- "thiserror 1.0.69",
+ "rtsan-standalone",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2028,15 +1982,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.17"
@@ -2088,16 +2033,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
-[[package]]
-name = "jobserver"
-version = "0.1.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
-dependencies = [
- "getrandom 0.3.4",
- "libc",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.91"
@@ -2185,7 +2120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
 dependencies = [
  "gtk-sys",
- "libloading 0.7.4",
+ "libloading",
  "once_cell",
 ]
 
@@ -2205,16 +2140,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "libredox"
 version = "0.1.14"
@@ -2265,9 +2190,9 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
 [[package]]
 name = "mach2"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
 dependencies = [
  "libc",
 ]
@@ -2335,12 +2260,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -2383,20 +2302,6 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
-[[package]]
-name = "ndk"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
-dependencies = [
- "bitflags 2.11.0",
- "jni-sys",
- "log",
- "ndk-sys 0.5.0+25.2.9519653",
- "num_enum",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "ndk"
 version = "0.9.0"
@@ -2406,7 +2311,7 @@ dependencies = [
  "bitflags 2.11.0",
  "jni-sys",
  "log",
- "ndk-sys 0.6.0+11769913",
+ "ndk-sys",
  "num_enum",
  "raw-window-handle",
  "thiserror 1.0.69",
@@ -2418,15 +2323,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
-[[package]]
-name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
-dependencies = [
- "jni-sys",
-]
-
 [[package]]
 name = "ndk-sys"
 version = "0.6.0+11769913"
@@ -2444,9 +2340,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "no_denormals"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50a63f8a8efd33b4706cecbc4b845b0c63e9c883f8a5404a0fd7ce2a0933421f"
+checksum = "b6bcfe410abc339c9f8c226aceebf946bf26e3e2eca738be3fec9e9ee97d54aa"
 
 [[package]]
 name = "nodrop"
@@ -2454,40 +2350,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-complex"
 version = "0.4.6"
@@ -2524,34 +2386,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "num-iter"
-version = "0.1.45"
+name = "num-traits"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
- "num-integer",
- "num-traits",
 ]
 
 [[package]]
-name = "num-rational"
-version = "0.4.2"
+name = "num_cpus"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
@@ -2599,6 +2449,54 @@ dependencies = [
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc2-audio-toolbox"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
+dependencies = [
+ "bitflags 2.11.0",
+ "libc",
+ "objc2",
+ "objc2-core-audio",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-avf-audio"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-audio"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2"
+dependencies = [
+ "dispatch2",
+ "objc2",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-audio-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
+dependencies = [
+ "bitflags 2.11.0",
+ "objc2",
+]
+
 [[package]]
 name = "objc2-core-foundation"
 version = "0.3.2"
@@ -2606,7 +2504,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
  "bitflags 2.11.0",
+ "block2",
  "dispatch2",
+ "libc",
  "objc2",
 ]
 
@@ -2646,6 +2546,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.11.0",
  "block2",
+ "libc",
  "objc2",
  "objc2-core-foundation",
 ]
@@ -2699,29 +2600,6 @@ dependencies = [
  "objc2-foundation",
 ]
 
-[[package]]
-name = "oboe"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
-dependencies = [
- "jni",
- "ndk 0.8.0",
- "ndk-context",
- "num-derive",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.4"
@@ -3436,6 +3314,36 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7204ed6420f698836b76d4d5c2ec5dec7585fd5c3a788fd1cde855d1de598239"
 
+[[package]]
+name = "rtsan-standalone"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fd1b6d61d69481a68e555916d3a52213846f5c2d2140bdc74ebc308e2338fc3"
+dependencies = [
+ "rtsan-standalone-macros",
+ "rtsan-standalone-sys",
+]
+
+[[package]]
+name = "rtsan-standalone-macros"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8320af894782374141c8e0d4521ee613a8f24d7ab08b6ad359881311e37b9ef"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "rtsan-standalone-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "362a9c531f731e574a870cdb28ee7d81178ba7a87ed54380eb9b8d8f0c3b5301"
+dependencies = [
+ "num_cpus",
+ "tempfile",
+]
+
 [[package]]
 name = "rubato"
 version = "0.14.1"
@@ -3863,7 +3771,7 @@ checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3"
 dependencies = [
  "bytemuck",
  "js-sys",
- "ndk 0.9.0",
+ "ndk",
  "objc2",
  "objc2-core-foundation",
  "objc2-core-graphics",
@@ -4239,9 +4147,9 @@ dependencies = [
  "jni",
  "libc",
  "log",
- "ndk 0.9.0",
+ "ndk",
  "ndk-context",
- "ndk-sys 0.6.0+11769913",
+ "ndk-sys",
  "objc2",
  "objc2-app-kit",
  "objc2-foundation",
@@ -4251,7 +4159,7 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -4322,7 +4230,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows 0.61.3",
+ "windows",
 ]
 
 [[package]]
@@ -4435,7 +4343,7 @@ dependencies = [
  "tauri-plugin",
  "thiserror 2.0.18",
  "url",
- "windows 0.61.3",
+ "windows",
  "zbus",
 ]
 
@@ -4461,7 +4369,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows 0.61.3",
+ "windows",
 ]
 
 [[package]]
@@ -4486,7 +4394,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows 0.61.3",
+ "windows",
  "wry",
 ]
 
@@ -5229,9 +5137,9 @@ dependencies = [
 
 [[package]]
 name = "web-audio-api"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015053d21b75159d00b45f8b862d9c05b783440537d9751d659ad2982911eb7f"
+checksum = "84af8a6acf0652c839297eebf360d25e6108c7376085cd446fc59289101110dd"
 dependencies = [
  "almost",
  "arc-swap",
@@ -5332,7 +5240,7 @@ checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
  "windows-implement",
  "windows-interface",
@@ -5356,7 +5264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
  "thiserror 2.0.18",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
 ]
 
@@ -5406,16 +5314,6 @@ dependencies = [
  "windows-version",
 ]
 
-[[package]]
-name = "windows"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.61.3"
@@ -5438,16 +5336,6 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
-dependencies = [
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.61.2"
@@ -5529,15 +5417,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -5965,7 +5844,7 @@ dependencies = [
  "javascriptcore-rs",
  "jni",
  "libc",
- "ndk 0.9.0",
+ "ndk",
  "objc2",
  "objc2-app-kit",
  "objc2-core-foundation",
@@ -5983,7 +5862,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows 0.61.3",
+ "windows",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 47b049b..8ce0e0a 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -22,5 +22,5 @@ tauri = { version = "2", features = [] }
 tauri-plugin-opener = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-web-audio-api = "1.2.0"
+web-audio-api = "1.4.0"
 
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index e7f1264..cd743ea 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -6,14 +6,17 @@ use web_audio_api::context::{AudioContext, BaseAudioContext};
 use web_audio_api::node::{AudioNode, AudioScheduledSourceNode};
 
 #[command]
-fn play_music(name: &str) -> String {
+async fn play_music(name: &str) -> Result<String, String> {
     let context = AudioContext::default();
 
     let current_dir = std::env::current_dir().unwrap();
     let file_path = current_dir.join("..").join("static").join(name);
 
-    let file = File::open(file_path).unwrap();
-    let buffer = context.decode_audio_data_sync(file).unwrap();
+    let file = File::open(file_path).map_err(|e| format!("Failed to open file: {}", e))?;
+    let buffer = context
+        .decode_audio_data(file)
+        .await
+        .map_err(|e| format!("Failed to decode audio data: {}", e))?;
 
     let mut src = context.create_buffer_source();
     src.set_buffer(buffer);
@@ -30,10 +33,10 @@ fn play_music(name: &str) -> String {
 
     src.start();
 
-    let buffer_duration = src.buffer().unwrap().duration() as f64;
-    let sleep_duration = std::time::Duration::from_secs_f64(buffer_duration);
+    // let buffer_duration = src.buffer().unwrap().duration() as f64;
+    // let sleep_duration = std::time::Duration::from_secs_f64(buffer_duration);
 
-    format!("Playing music: {}", name)
+    Ok(format!("Playing music: {}", name))
 }
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index d9319b5..ce3cb21 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-import { invoke } from '@tauri-apps/api/core'
-import 'mdui/components/button.js'
+  import { invoke } from '@tauri-apps/api/core'
+  import 'mdui/components/button.js'
 
   async function playMusic() {
     await invoke('play_music', {
diff --git a/src/lib/components/PlayerBar.svelte b/src/lib/components/PlayerBar.svelte
index 1e37292..b227ad5 100644
--- a/src/lib/components/PlayerBar.svelte
+++ b/src/lib/components/PlayerBar.svelte
@@ -1,5 +1,6 @@
 <script>
   import { playerState } from '$lib/player.svelte'
+  import Progress from './Progress.svelte'
   import Slider from './Slider.svelte'
 
   async function switchTrack(step) {
@@ -76,7 +77,8 @@
     <div class="flex items-center min-w-37.5 justify-end">
       <mdui-button-icon icon="volume_up--rounded" class="text-lg opacity-70">
       </mdui-button-icon>
-      <Slider value="100" class="w-32" />
+      <!-- <Slider value="100" class="w-32" /> -->
+       <Progress value="100" class="w-32" />
     </div>
   </div>
 </mdui-bottom-app-bar>
diff --git a/src/lib/components/Progress.svelte b/src/lib/components/Progress.svelte
index 0d01747..c854c2c 100644
--- a/src/lib/components/Progress.svelte
+++ b/src/lib/components/Progress.svelte
@@ -1,147 +1,150 @@
 <script>
-  import { onDestroy, onMount } from 'svelte'
-
-  export let value = 0
-  export let cssStyle = ''
-  export let width = 100
-  export let thumbHeight = 18
-  export let height = 12
-
-  let startMove = false
-  let input
-
-  let dx
-
-  function mouseDown(ev) {
-    startMove = true
-    let _value = (ev.offsetX / input.offsetWidth) * 100
-    value = _value
-    dx = ev.offsetX
-    input.dispatchEvent(new CustomEvent('mousedown', { detail: _value }))
-  }
-
-  function mouseMove(ev) {
-    ev.stopPropagation()
-    if (!startMove) return
-    dx += ev.movementX
-    let _value = Math.min(100, Math.max(0, (dx / input.offsetWidth) * 100))
-    value = _value
-    input.dispatchEvent(new CustomEvent('mousemove', { detail: value }))
-  }
-
-  function mouseUp() {
-    if (startMove) {
-      startMove = false
-      dx = 0
-      input.dispatchEvent(new CustomEvent('mouseup', { detail: value }))
+    let {
+        value = $bindable(0),
+        cssStyle = '',
+        width = 100,
+        height = 12,
+        thumbHeight = 18,
+    } = $props()
+
+    let startMove = $state(false)
+    let dx = 0
+    let inputEl
+
+    let progressRaw = $derived(value / 100)
+    let scale = $derived((width - 4) / width)
+
+    function mouseDown(ev) {
+        startMove = true
+        dx = ev.offsetX
+        let _value = clamp((ev.offsetX / inputEl.offsetWidth) * 100, 0, 100)
+        value = _value
     }
-  }
 
-  onMount(() => {
-    document.addEventListener('mouseup', mouseUp)
-    document.addEventListener('mousemove', mouseMove, {
-      passive: true,
-      capture: true,
-    })
-  })
+    function mouseMove(ev) {
+        ev.stopPropagation()
+        if (!startMove) return
+        dx += ev.movementX
+        let _value = clamp((dx / inputEl.offsetWidth) * 100, 0, 100)
+        value = _value
+    }
 
-  onDestroy(() => {
-    document.removeEventListener('mousemove', mouseMove)
-    document.removeEventListener('mouseup', mouseUp)
-  })
+    $effect(() => {
+        if (startMove) {
+            const onGlobalMouseUp = () => {
+                startMove = false
+                dx = 0
+            }
+
+            document.addEventListener('mousemove', mouseMove, {
+                passive: true,
+                capture: true,
+            })
+            document.addEventListener('mouseup', onGlobalMouseUp)
+
+            return () => {
+                document.removeEventListener('mousemove', mouseMove)
+                document.removeEventListener('mouseup', onGlobalMouseUp)
+            }
+        }
+    })
 
-  $: progressRaw = value / 100
-  let scale = (width - 4) / width
+    function clamp(val, min, max) {
+        return Math.min(max, Math.max(min, val))
+    }
 </script>
 
 <div
-  bind:this={input}
-  class="container"
-  style="--width: {width}; --thumbHeight: {thumbHeight}; --scale: {scale}; {cssStyle}"
-  on:mousedown={mouseDown}
-  on:mousemove={mouseMove}
-  role="slider"
-  aria-label="Progress slider"
-  aria-valuemin="0"
-  aria-valuemax="100"
-  aria-valuenow={value}
-  tabindex="0"
+    bind:this={inputEl}
+    class="container"
+    style="--width: {width}; --thumbHeight: {thumbHeight}; --scale: {scale}; {cssStyle}"
+    onmousedown={mouseDown}
+    role="slider"
+    aria-valuemin={0}
+    aria-valuemax={100}
+    aria-valuenow={value}
+    aria-valuetext={`${Math.round(value)}%`}
+    tabindex="0"
 >
-  <div class="track" style="--height: {height}; --progress: {progressRaw};">
-    <div class="thumb-box"></div>
-  </div>
+    <div class="track" style="--height: {height}; --progress: {progressRaw};">
+        <div class="thumb-box"></div>
+    </div>
 
-  <div class="divider" style="--progress: {progressRaw};"></div>
+    <div class="divider" style="--progress: {progressRaw};"></div>
 </div>
 
 <style>
-  .container {
-    --width: 100;
-    width: calc(1px * var(--width));
-    --thumbHeight: 18;
-    position: relative;
-    contain: paint;
-    height: calc(var(--thumbHeight) * 1px);
-  }
-
-  .track {
-    --progress: 0;
-    --height: 12;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: calc(100% - 2px);
-    height: calc(var(--height) * 1px);
-    border-radius: 12px;
-    overflow: hidden;
-  }
-
-  .container > *,
-  .track > * {
-    pointer-events: none;
-  }
-
-  .thumb-box {
-    width: 100%;
-    height: calc(var(--height) * 1px);
-    position: relative;
-    display: flex;
-    gap: 7px;
-  }
-
-  .thumb-box::before {
-    content: '';
-    position: relative;
-    box-sizing: border-box;
-    left: 0;
-    width: calc(var(--progress) * var(--width) * 1px - 3px);
-    height: 100%;
-    border-radius: 12px 6px 6px 12px;
-    background-color: var(--controlColor);
-  }
-
-  .thumb-box::after {
-    content: '';
-    box-sizing: border-box;
-    position: relative;
-    right: 0;
-    width: calc((1 - var(--progress)) * var(--width) * 1px - 3px);
-    height: 100%;
-    border-radius: 6px 12px 12px 6px;
-    background-color: var(--controlBright);
-  }
-
-  .divider {
-    position: absolute;
-    box-sizing: border-box;
-    top: 50%;
-    left: calc(var(--progress) * var(--scale) * 100% + 2px);
-    transform: translate(-50%, -50%);
-    display: flex;
-    width: 1px;
-    border: solid 1px var(--controlBlack);
-    height: calc(var(--thumbHeight) * 1px);
-    pointer-events: none;
-  }
-</style>
\ No newline at end of file
+    .container {
+        --width: 100;
+        width: calc(1px * var(--width));
+        --thumbHeight: 18;
+        position: relative;
+        contain: paint;
+        height: calc(var(--thumbHeight) * 1px);
+    }
+
+    .track {
+        --progress: 0;
+        --height: 12;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        width: calc(100% - 2px);
+        height: calc(var(--height) * 1px);
+        border-radius: 12px;
+        overflow: hidden;
+    }
+
+    .container > *,
+    .track > * {
+        pointer-events: none;
+    }
+
+    .thumb-box {
+        width: 100%;
+        height: calc(var(--height) * 1px);
+        position: relative;
+        display: flex;
+        gap: 7px;
+    }
+
+    .thumb-box::before {
+        content: '';
+        position: relative;
+        box-sizing: border-box;
+        left: 0;
+        width: calc(var(--progress) * var(--width) * 1px - 3px);
+        height: 100%;
+        border-radius: 12px 4px 4px 12px;
+        background-color: rgb(var(--mdui-color-primary));
+    }
+
+    .thumb-box::after {
+        content: '';
+        box-sizing: border-box;
+        position: relative;
+        right: 0;
+        width: calc((1 - var(--progress)) * var(--width) * 1px - 3px);
+        height: 100%;
+        border-radius: 4px 12px 12px 4px;
+        background-color: rgb(
+            var(--mdui-color-surface-container-highest-light)
+        );
+    }
+
+    .divider {
+        position: absolute;
+        box-sizing: border-box;
+        top: 50%;
+        left: calc(var(--progress) * var(--scale) * 100% + 2px);
+        transform: translate(-50%, -50%);
+        display: flex;
+        width: 1.5px;
+        border: solid 1.5px rgb(var(--mdui-color-primary));
+        border-radius: 3px;
+        height: calc(var(--thumbHeight) * 1px);
+        pointer-events: none;
+        transition: all 0s ease;
+    }
+</style>

From f45587c5ad83d7be3ecdeb88f8785609686de0f9 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Wed, 20 May 2026 20:50:02 +0800
Subject: [PATCH 02/39] update

---
 src-tauri/src/commands.rs           | 61 +++++++++++++++++++++++++++++
 src-tauri/src/lib.rs                | 49 ++++-------------------
 src/lib/components/PlayerBar.svelte | 14 +++++--
 3 files changed, 79 insertions(+), 45 deletions(-)
 create mode 100644 src-tauri/src/commands.rs

diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
new file mode 100644
index 0000000..12481d8
--- /dev/null
+++ b/src-tauri/src/commands.rs
@@ -0,0 +1,61 @@
+use std::fs::File;
+use std::sync::OnceLock;
+
+use tauri::command;
+
+use web_audio_api::context::{AudioContext, BaseAudioContext};
+use web_audio_api::node::{AudioNode, AudioScheduledSourceNode};
+use web_audio_api::MediaElement;
+
+fn get_audio_context() -> &'static AudioContext {
+    static CONTEXT: OnceLock<AudioContext> = OnceLock::new();
+    CONTEXT.get_or_init(|| AudioContext::default())
+}
+
+#[command]
+pub async fn play_music(name: &str) -> Result<String, String> {
+    let current_dir = std::env::current_dir().unwrap();
+    let file_path = current_dir.join("..").join("static").join(name);
+
+    let file = File::open(&file_path).map_err(|e| format!("Failed to open file: {}", e))?;
+
+    let context = get_audio_context();
+
+    let buffer = context
+        .decode_audio_data(file)
+        .await
+        .map_err(|e| format!("Failed to decode audio data: {}", e))?;
+
+    let mut src = context.create_buffer_source();
+    src.set_buffer(buffer);
+    src.set_loop(false);
+    src.connect(&context.destination());
+
+    src.start();
+
+    Ok(format!("Playing music: {}", name))
+}
+
+#[command]
+pub async fn pause_music() {
+    let context = get_audio_context();
+    context.suspend().await;
+}
+
+#[command]
+pub async fn resume_music() {
+    let context = get_audio_context();
+    context.resume().await;
+}
+
+#[command]
+pub async fn current_time() -> f64 {
+    let context = get_audio_context();
+    context.current_time()
+}
+
+#[command]
+pub async fn set_current_time(time: f64) {
+    let context = get_audio_context();
+    // TODO: set_current_time
+}
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index cd743ea..36be0ec 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,49 +1,16 @@
-use std::fs::File;
-
-use tauri::command;
-
-use web_audio_api::context::{AudioContext, BaseAudioContext};
-use web_audio_api::node::{AudioNode, AudioScheduledSourceNode};
-
-#[command]
-async fn play_music(name: &str) -> Result<String, String> {
-    let context = AudioContext::default();
-
-    let current_dir = std::env::current_dir().unwrap();
-    let file_path = current_dir.join("..").join("static").join(name);
-
-    let file = File::open(file_path).map_err(|e| format!("Failed to open file: {}", e))?;
-    let buffer = context
-        .decode_audio_data(file)
-        .await
-        .map_err(|e| format!("Failed to decode audio data: {}", e))?;
-
-    let mut src = context.create_buffer_source();
-    src.set_buffer(buffer);
-    src.set_loop(false);
-
-    // // create a biquad filter
-    // let biquad = context.create_biquad_filter();
-    // biquad.frequency().set_value(125.);
-    // connect the audio nodes
-    // src.connect(&biquad);
-    // biquad.connect(&context.destination());
-
-    src.connect(&context.destination());
-
-    src.start();
-
-    // let buffer_duration = src.buffer().unwrap().duration() as f64;
-    // let sleep_duration = std::time::Duration::from_secs_f64(buffer_duration);
-
-    Ok(format!("Playing music: {}", name))
-}
+mod commands;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
         // .plugin(tauri_plugin_opener::init())
-        .invoke_handler(tauri::generate_handler![play_music])
+        .invoke_handler(tauri::generate_handler![
+            commands::play_music,
+            commands::pause_music,
+            commands::resume_music,
+            commands::current_time,
+            commands::set_current_time
+        ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
diff --git a/src/lib/components/PlayerBar.svelte b/src/lib/components/PlayerBar.svelte
index b227ad5..f04652e 100644
--- a/src/lib/components/PlayerBar.svelte
+++ b/src/lib/components/PlayerBar.svelte
@@ -21,6 +21,7 @@
 
   export function toggle() {
     playerState.isPlaying = !playerState.isPlaying
+    playerState.isPlaying ? resume_music() : pause_music()
   }
 </script>
 
@@ -57,8 +58,10 @@
         onkeydown={e => e.key === 'Enter' && prev()}
       ></mdui-button-icon>
       <mdui-button-icon
-        variant="filled" 
-        icon={playerState.isPlaying ? 'pause--rounded' : 'play_arrow--rounded'}
+        variant="filled"
+        icon={playerState.isPlaying
+          ? 'pause--rounded'
+          : 'play_arrow--rounded'}
         role="button"
         tabindex="0"
         onclick={toggle}
@@ -75,10 +78,13 @@
     </div>
 
     <div class="flex items-center min-w-37.5 justify-end">
-      <mdui-button-icon icon="volume_up--rounded" class="text-lg opacity-70">
+      <mdui-button-icon
+        icon="volume_up--rounded"
+        class="text-lg opacity-70"
+      >
       </mdui-button-icon>
       <!-- <Slider value="100" class="w-32" /> -->
-       <Progress value="100" class="w-32" />
+      <Progress value="100" class="w-32" />
     </div>
   </div>
 </mdui-bottom-app-bar>

From 6a9ecda90f9fa7f0fbbc0900ada22d95652b60d9 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Thu, 21 May 2026 17:32:03 +0800
Subject: [PATCH 03/39] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=9F=B3?=
 =?UTF-8?q?=E9=A2=91=E6=92=AD=E6=94=BE=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8E=E5=85=83=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增lofty依赖用于解析音频文件元数据
- 合并暂停/恢复为切换播放状态的接口
- 新增获取歌曲信息的后端命令
- 完善前端播放器状态管理与UI展示
- 优化进度条组件支持键盘与鼠标操作
---
 src-tauri/Cargo.lock                |  48 ++++++
 src-tauri/Cargo.toml                |   1 +
 src-tauri/src/commands.rs           | 135 +++++++++++++----
 src-tauri/src/lib.rs                |   6 +-
 src/lib/components/Header.svelte    |  50 ++++---
 src/lib/components/PlayerBar.svelte | 223 +++++++++++++++++++---------
 src/lib/components/Progress.svelte  |  31 +++-
 src/lib/components/Slider.svelte    |  63 ++++----
 src/lib/player.svelte.ts            |  18 +++
 9 files changed, 420 insertions(+), 155 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 336bfce..5336def 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -798,6 +798,12 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
+[[package]]
+name = "data-encoding"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
+
 [[package]]
 name = "deranged"
 version = "0.5.8"
@@ -2176,6 +2182,32 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lofty"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec4feeff6c7d75093278133a06e827d7af6d2bfe20b0f331f9d10338a5ec7ca"
+dependencies = [
+ "byteorder",
+ "data-encoding",
+ "flate2",
+ "lofty_attr",
+ "log",
+ "ogg_pager",
+ "paste",
+]
+
+[[package]]
+name = "lofty_attr"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "458ace39169e4b83c4f77ae3d42d5d1d11c422feef590219a97c973d3b524557"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "log"
 version = "0.4.29"
@@ -2600,6 +2632,15 @@ dependencies = [
  "objc2-foundation",
 ]
 
+[[package]]
+name = "ogg_pager"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d36b1d6964c3ac92b7aea701057e02b6b91143d70d83b20abf75a231a3c0216"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.4"
@@ -2688,6 +2729,12 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pathdiff"
 version = "0.2.3"
@@ -4237,6 +4284,7 @@ dependencies = [
 name = "tauri-app"
 version = "0.1.0"
 dependencies = [
+ "lofty",
  "serde",
  "serde_json",
  "tauri",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 8ce0e0a..1027eb2 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -23,4 +23,5 @@ tauri-plugin-opener = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 web-audio-api = "1.4.0"
+lofty = "0.24.0"
 
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index 12481d8..f64cf00 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -1,61 +1,138 @@
-use std::fs::File;
-use std::sync::OnceLock;
+use std::path::PathBuf;
+use std::sync::{Mutex, OnceLock};
 
+use lofty::prelude::*;
+use lofty::probe::Probe;
 use tauri::command;
 
 use web_audio_api::context::{AudioContext, BaseAudioContext};
-use web_audio_api::node::{AudioNode, AudioScheduledSourceNode};
+use web_audio_api::node::AudioNode;
 use web_audio_api::MediaElement;
 
+use serde::Serialize;
+
 fn get_audio_context() -> &'static AudioContext {
     static CONTEXT: OnceLock<AudioContext> = OnceLock::new();
     CONTEXT.get_or_init(|| AudioContext::default())
 }
 
-#[command]
-pub async fn play_music(name: &str) -> Result<String, String> {
+struct AudioState {
+    media: Option<MediaElement>,
+}
+
+fn get_audio_state() -> &'static Mutex<AudioState> {
+    static STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
+    STATE.get_or_init(|| {
+        Mutex::new(AudioState { media: None })
+    })
+}
+
+fn test_path() -> PathBuf {
     let current_dir = std::env::current_dir().unwrap();
-    let file_path = current_dir.join("..").join("static").join(name);
+    current_dir.join("..").join("static")
+}
 
-    let file = File::open(&file_path).map_err(|e| format!("Failed to open file: {}", e))?;
+#[command]
+pub async fn play_music(name: &str) -> Result<String, String> {
+    let file_path = test_path().join(name);
 
+    let mut media = MediaElement::new(&file_path).map_err(|e| format!("Failed to create media element: {}", e))?;
     let context = get_audio_context();
+    let src = context.create_media_element_source(&mut media);
+    src.connect(&context.destination());
 
-    let buffer = context
-        .decode_audio_data(file)
-        .await
-        .map_err(|e| format!("Failed to decode audio data: {}", e))?;
+    media.set_loop(false);
+    media.set_current_time(0.0);
 
-    let mut src = context.create_buffer_source();
-    src.set_buffer(buffer);
-    src.set_loop(false);
-    src.connect(&context.destination());
+    let mut state = get_audio_state().lock().map_err(|_| "Failed to lock audio state")?;
 
-    src.start();
+    if let Some(old_media) = state.media.replace(media) {
+        old_media.pause();
+    }
+
+    if let Some(ref media) = state.media {
+        media.play();
+    }
 
     Ok(format!("Playing music: {}", name))
 }
 
 #[command]
-pub async fn pause_music() {
-    let context = get_audio_context();
-    context.suspend().await;
+pub async fn toggle_music() -> Result<bool, String> {
+    let state = get_audio_state().lock().map_err(|_| "Failed to lock audio state")?;
+    if let Some(ref media) = state.media {
+        if media.paused() {
+            media.play();
+            Ok(true)
+        } else {
+            media.pause();
+            Ok(false)
+        }
+    } else {
+        Err("No media available".into())
+    }
 }
 
 #[command]
-pub async fn resume_music() {
-    let context = get_audio_context();
-    context.resume().await;
+pub async fn current_time() -> f64 {
+    let state = get_audio_state().lock().unwrap();
+    if let Some(ref media) = state.media {
+        media.current_time()
+    } else {
+        0.0
+    }
 }
 
 #[command]
-pub async fn current_time() -> f64 {
-    let context = get_audio_context();
-    context.current_time()
+pub async fn set_current_time(time: f64) {
+    let state = get_audio_state().lock().unwrap();
+    if let Some(ref media) = state.media {
+        media.set_current_time(time);
+    }
+}
+
+
+#[derive(Serialize)]
+pub struct SongInfo {
+    title: String,
+    artist: String,
+    album: String,
+    duration: f64,
+    sample_rate: Option<u32>
 }
 
 #[command]
-pub async fn set_current_time(time: f64) {
-    let context = get_audio_context();
-    // TODO: set_current_time
-}
\ No newline at end of file
+pub fn get_song_info(name: String) -> SongInfo {
+    let file_path = test_path().join(name);
+    let tagged_file = Probe::open(&file_path)
+        .unwrap()
+        .read()
+        .unwrap();
+
+    let tag = tagged_file.primary_tag()
+        .or_else(|| tagged_file.first_tag());
+
+    let title = tag
+        .and_then(|t| t.title())
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| "Unknown".to_string());
+    let artist = tag
+        .and_then(|t| t.artist())
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| "Unknown".to_string());
+    let album = tag
+        .and_then(|t| t.album())
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| "Unknown".to_string());
+
+    let props = tagged_file.properties();
+    let duration = props.duration().as_secs_f64();
+
+    SongInfo {
+        title,
+        artist,
+        album,
+        duration,
+        sample_rate: props.sample_rate(),
+    }
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 36be0ec..592076e 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -6,10 +6,10 @@ pub fn run() {
         // .plugin(tauri_plugin_opener::init())
         .invoke_handler(tauri::generate_handler![
             commands::play_music,
-            commands::pause_music,
-            commands::resume_music,
+            commands::toggle_music,
             commands::current_time,
-            commands::set_current_time
+            commands::set_current_time,
+            commands::get_song_info
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index ce3cb21..774d826 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -1,26 +1,38 @@
 <script lang="ts">
-  import { invoke } from '@tauri-apps/api/core'
-  import 'mdui/components/button.js'
+    import { playerState, type SongInfo } from '$lib/player.svelte'
+    import { invoke } from '@tauri-apps/api/core'
+    import 'mdui/components/button.js'
 
-  async function playMusic() {
-    await invoke('play_music', {
-      name: 'music/40mP 初音ミク - 恋愛裁判.flac',
-    })
-  }
+    async function playMusic() {
+        await invoke('play_music', {
+            name: 'music/40mP 初音ミク - 恋愛裁判.flac',
+        })
+
+        playerState.isPlaying = true
+        
+        let song_info = await invoke<SongInfo>("get_song_info", {name: "music/40mP 初音ミク - 恋愛裁判.flac"})
+        playerState.current = {
+            title: song_info?.title,
+            artist: song_info?.artist,
+            path: "music/40mP 初音ミク - 恋愛裁判.flac"
+        }
+        playerState.duration = song_info.duration
+    }
 </script>
 
 <header
-  class="flex items-center justify-between px-8 py-4 bg-(--controlBackground) border-b border-(--controlGray) mt-14 shadow-sm"
+    class="flex items-center justify-between px-8 py-4 bg-(--controlBackground) border-b border-(--controlGray) mt-14 shadow-sm"
 >
-  <div class="header-left">Header PlaceHolder</div>
-  <mdui-button variant="filled"
-    onclick={playMusic}
-    onkeydown={(e: KeyboardEvent) => {
-      if (e.key === 'Enter' || e.key === ' ') playMusic()
-    }}
-    class="px-4 py-2"
-    role="none"
-  >
-    播放音乐
-  </mdui-button>
+    <div class="header-left">Header PlaceHolder</div>
+    <mdui-button
+        variant="filled"
+        onclick={playMusic}
+        onkeydown={(e: KeyboardEvent) => {
+            if (e.key === 'Enter' || e.key === ' ') playMusic()
+        }}
+        class="px-4 py-2"
+        role="none"
+    >
+        播放音乐
+    </mdui-button>
 </header>
diff --git a/src/lib/components/PlayerBar.svelte b/src/lib/components/PlayerBar.svelte
index f04652e..cd9b3d9 100644
--- a/src/lib/components/PlayerBar.svelte
+++ b/src/lib/components/PlayerBar.svelte
@@ -1,90 +1,167 @@
 <script>
-  import { playerState } from '$lib/player.svelte'
-  import Progress from './Progress.svelte'
-  import Slider from './Slider.svelte'
+    import { playerState } from '$lib/player.svelte'
+    import { invoke } from '@tauri-apps/api/core'
+    import Progress from './Progress.svelte'
+    import Slider from './Slider.svelte'
 
-  async function switchTrack(step) {
-    if (!playerState.playlist.length || !playerState.current) return
+    let currentTime = $state(0)
+    let volume = $state(0)
+    let muted = $state(false)
+    let silder = $state(null)
 
-    const len = playerState.playlist.length
-    const currentIndex = playerState.playlist.indexOf(playerState.current)
+    async function switchTrack(step) {
+        if (!playerState.playlist.length || !playerState.current) return
 
-    const newIndex = (currentIndex + step + len) % len
+        const len = playerState.playlist.length
+        const currentIndex = playerState.playlist.indexOf(playerState.current)
 
-    playerState.current = playerState.playlist[newIndex]
-    playerState.progress = 0
-    playerState.isPlaying = true
-  }
+        const newIndex = (currentIndex + step + len) % len
 
-  export const next = () => switchTrack(1)
-  export const prev = () => switchTrack(-1)
+        playerState.current = playerState.playlist[newIndex]
+        playerState.progress = 0
+        playerState.isPlaying = true
+    }
 
-  export function toggle() {
-    playerState.isPlaying = !playerState.isPlaying
-    playerState.isPlaying ? resume_music() : pause_music()
-  }
+    export const next = () => switchTrack(1)
+    export const prev = () => switchTrack(-1)
+
+    export async function toggle() {
+        playerState.isPlaying = await invoke('toggle_music')
+    }
+
+    let volumeIcon = $derived(getVolumeIcon(volume, muted))
+
+    function getVolumeIcon(volume, muted) {
+        if (muted) return 'volume_off--rounded'
+        if (volume === 0) return 'volume_mute--rounded'
+        return volume > 50 ? 'volume_up--rounded' : 'volume_down--rounded'
+    }
+
+    async function seek(time) {
+        console.log(time)
+        stopPolling()
+        await invoke('set_current_time', { time })
+        currentTime = time
+        if (playerState.isPlaying) startPolling()
+    }
+    
+    let pollTimer
+
+    function startPolling() {
+        stopPolling()
+        pollTimer = setInterval(async () => {
+            try {
+                currentTime = await invoke('current_time')
+            } catch {}
+        }, 250)
+    }
+
+    function stopPolling() {
+        if (pollTimer) {
+            clearInterval(pollTimer)
+            pollTimer = null
+        }
+    }
+
+    $effect(() => {
+        if (playerState.isPlaying) {
+            startPolling()
+        } else {
+            stopPolling()
+        }
+        return stopPolling
+    })
+
+    $effect(() => {
+        if (playerState.current) {
+            currentTime = 0
+        }
+    })
+    
+    function formatTime(seconds) {
+        if (!seconds || !isFinite(seconds)) return '00:00'
+        const m = Math.floor(seconds / 60)
+        const s = Math.floor(seconds % 60)
+        return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
+    }
 </script>
 
 <mdui-bottom-app-bar
-  class="relative flex flex-col h-24 px-4 pb-2"
-  style="--z-index: 10"
+    class="relative flex flex-col h-24 px-4 pb-2"
+    style="--z-index: 10"
 >
-  <Slider
-    value="100"
-    class="absolute top-0 left-0 w-full px-2 -translate-y-1/2"
-  />
-
-  <div class="info">
-    <div>{playerState.current?.title}</div>
-    <div class="artist">{playerState.current?.artist}</div>
-  </div>
-
-  <div class="flex items-center justify-between w-full h-full mt-2">
-    <div class="flex flex-col justify-center min-w-37.5 overflow-hidden">
-      <div class="text-sm font-medium truncate">
-        {playerState.current?.title ?? '未在播放'}
-      </div>
-      <div class="text-xs opacity-70 truncate">
-        {playerState.current?.artist ?? '未知艺术家'}
-      </div>
+        <div class="absolute top-0 left-0 w-full flex items-center gap-2 px-2 -translate-y-1/2">
+        <span class="text-xs tabular-nums text-black min-w-10 text-right">
+            {formatTime(currentTime)}
+        </span>
+        <div class="flex-1">
+            <Slider
+                bind:value={currentTime}
+                bind:this={silder}
+                oninput={e => seek(e.target.value)}
+                duration = {playerState.duration}
+            />
+        </div>
+        <span class="text-xs tabular-nums text-black min-w-10">
+            {formatTime(playerState.duration)}
+        </span>
     </div>
 
-    <div class="flex items-center gap-2">
-      <mdui-button-icon
-        icon="skip_previous--rounded"
-        role="button"
-        tabindex="0"
-        onclick={prev}
-        onkeydown={e => e.key === 'Enter' && prev()}
-      ></mdui-button-icon>
-      <mdui-button-icon
-        variant="filled"
-        icon={playerState.isPlaying
-          ? 'pause--rounded'
-          : 'play_arrow--rounded'}
-        role="button"
-        tabindex="0"
-        onclick={toggle}
-        onkeydown={e => e.key === 'Enter' && toggle()}
-      >
-      </mdui-button-icon>
-      <mdui-button-icon
-        icon="skip_next--rounded"
-        role="button"
-        tabindex="0"
-        onclick={next}
-        onkeydown={e => e.key === 'Enter' && next()}
-      ></mdui-button-icon>
+    <div class="info">
+        <div>{playerState.current?.title}</div>
+        <div class="artist">{playerState.current?.artist}</div>
     </div>
 
-    <div class="flex items-center min-w-37.5 justify-end">
-      <mdui-button-icon
-        icon="volume_up--rounded"
-        class="text-lg opacity-70"
-      >
-      </mdui-button-icon>
-      <!-- <Slider value="100" class="w-32" /> -->
-      <Progress value="100" class="w-32" />
+    <div class="flex items-center justify-between w-full h-full mt-2">
+        <div class="flex flex-col justify-center min-w-37.5 overflow-hidden">
+            <div class="text-sm font-medium truncate">
+                {playerState.current?.title ?? '未在播放'}
+            </div>
+            <div class="text-xs opacity-70 truncate">
+                {playerState.current?.artist ?? '未知艺术家'}
+            </div>
+        </div>
+
+        <div class="flex items-center gap-2">
+            <mdui-button-icon
+                icon="skip_previous--rounded"
+                role="button"
+                tabindex="0"
+                onclick={prev}
+                onkeydown={e => e.key === 'Enter' && prev()}
+            ></mdui-button-icon>
+            <mdui-button-icon
+                variant="filled"
+                icon={playerState.isPlaying
+                    ? 'pause--rounded'
+                    : 'play_arrow--rounded'}
+                role="button"
+                tabindex="0"
+                onclick={toggle}
+                onkeydown={e => e.key === 'Enter' && toggle()}
+            >
+            </mdui-button-icon>
+            <mdui-button-icon
+                icon="skip_next--rounded"
+                role="button"
+                tabindex="0"
+                onclick={next}
+                onkeydown={e => e.key === 'Enter' && next()}
+            ></mdui-button-icon>
+        </div>
+
+        <div class="flex items-center min-w-37.5 justify-end">
+            <mdui-button-icon
+                icon={volumeIcon}
+                onclick={() => (muted = !muted)}
+                onkeydown={e => e.key === 'Enter' && (muted = !muted)}
+                role="button"
+                tabindex="0"
+                class="text-lg opacity-70"
+            >
+            </mdui-button-icon>
+            <!-- <Slider value="100" class="w-32" /> -->
+            <Progress bind:value={volume} class="w-32" />
+        </div>
     </div>
-  </div>
 </mdui-bottom-app-bar>
diff --git a/src/lib/components/Progress.svelte b/src/lib/components/Progress.svelte
index c854c2c..46f68c9 100644
--- a/src/lib/components/Progress.svelte
+++ b/src/lib/components/Progress.svelte
@@ -5,6 +5,9 @@
         width = 100,
         height = 12,
         thumbHeight = 18,
+        onmousedown,
+        onmouseover,
+        onmousemove,
     } = $props()
 
     let startMove = $state(false)
@@ -14,19 +17,32 @@
     let progressRaw = $derived(value / 100)
     let scale = $derived((width - 4) / width)
 
-    function mouseDown(ev) {
+    function mouseDown(e) {
         startMove = true
-        dx = ev.offsetX
-        let _value = clamp((ev.offsetX / inputEl.offsetWidth) * 100, 0, 100)
+        dx = e.offsetX
+        let _value = clamp((e.offsetX / inputEl.offsetWidth) * 100, 0, 100)
         value = _value
+        onmousedown?.(e)
     }
 
-    function mouseMove(ev) {
-        ev.stopPropagation()
+    function mouseMove(e) {
+        e.stopPropagation()
         if (!startMove) return
-        dx += ev.movementX
+        dx += e.movementX
         let _value = clamp((dx / inputEl.offsetWidth) * 100, 0, 100)
         value = _value
+        onmousemove?.(e)
+    }
+    
+    function handleKeydown(e) {
+        if (e.key === 'ArrowUp' || e.key === 'ArrowRight') {
+            e.preventDefault()
+            value = clamp(value + 10, 0, 100)
+            console.log(value)
+        } else if (e.key === 'ArrowDown' || e.key === 'ArrowLeft') {
+            e.preventDefault()
+            value = clamp(value - 10, 0, 100)
+        }
     }
 
     $effect(() => {
@@ -59,6 +75,9 @@
     class="container"
     style="--width: {width}; --thumbHeight: {thumbHeight}; --scale: {scale}; {cssStyle}"
     onmousedown={mouseDown}
+    {onmouseover}
+    onfocus={onmouseover}
+    onkeydown={handleKeydown}
     role="slider"
     aria-valuemin={0}
     aria-valuemax={100}
diff --git a/src/lib/components/Slider.svelte b/src/lib/components/Slider.svelte
index eebc193..c11dfc9 100644
--- a/src/lib/components/Slider.svelte
+++ b/src/lib/components/Slider.svelte
@@ -1,12 +1,18 @@
 <script>
-  let { value, classList } = $props()
-  import { onMount } from 'svelte'
+    let {
+        value = $bindable(0),
+        classList,
+        oninput,
+        onchange,
+        duration,
+    } = $props()
+    import { onMount } from 'svelte'
 
-  let sliderRef = $state(null)
+    let sliderRef = $state(null)
 
-  const size = 1.5
+    const size = 1.5
 
-  const styleText = `
+    const styleText = `
           .handle .elevation,
           .handle::before {
             position: absolute;
@@ -25,30 +31,37 @@
           }
           `
 
-  function updateSliderStyle(elem) {
-    const shadow = elem?.shadowRoot
-    if (shadow) {
-      const childNodes = Array.from(shadow.childNodes)
+    function updateSliderStyle(elem) {
+        const shadow = elem?.shadowRoot
+        if (shadow) {
+            const childNodes = Array.from(shadow.childNodes)
 
-      childNodes.forEach(childNode => {
-        if (childNode.nodeName === 'STYLE') {
-          console.log(childNode.textContent)
-          childNode.textContent += styleText
-        }
-      })
+            childNodes.forEach(childNode => {
+                if (childNode.nodeName === 'STYLE') {
+                    console.log(childNode.textContent)
+                    childNode.textContent += styleText
+                }
+            })
 
-      if (!childNodes.some(node => node.nodeName === 'STYLE')) {
-        const style = document.createElement('style')
-        style.textContent = styleText
-        shadow.appendChild(style)
-      }
+            if (!childNodes.some(node => node.nodeName === 'STYLE')) {
+                const style = document.createElement('style')
+                style.textContent = styleText
+                shadow.appendChild(style)
+            }
+        }
     }
-  }
 
-  onMount(() => {
-    updateSliderStyle(sliderRef)
-  })
+    onMount(() => {
+        updateSliderStyle(sliderRef)
+    })
 </script>
 
-<mdui-slider nolabel value class={classList} bind:this={sliderRef}
+<mdui-slider
+    nolabel
+    max={duration}
+    {value}
+    class={classList}
+    {oninput}
+    {onchange}
+    bind:this={sliderRef}
 ></mdui-slider>
diff --git a/src/lib/player.svelte.ts b/src/lib/player.svelte.ts
index 20ebdda..b936e47 100644
--- a/src/lib/player.svelte.ts
+++ b/src/lib/player.svelte.ts
@@ -3,6 +3,10 @@ type PlayerState = {
   isPlaying: boolean
   playlist: Track[]
   progress: number
+  duration: number
+  volume: number
+  isMuted: boolean
+  previousVolume: number
 }
 
 type Track = {
@@ -16,4 +20,18 @@ export const playerState = $state<PlayerState>({
   isPlaying: false,
   playlist: [],
   progress: 0,
+  duration: 0,
+  volume: 0.8,
+  isMuted: false,
+  previousVolume: 0.8,
 })
+
+export interface SongInfo {
+  title: string;
+  artist: string;
+  album: string;
+  duration: number;
+  sample_rate?: number;
+  bit_depth?: number;
+  channels?: number;
+}
\ No newline at end of file

From cbf9e2fecff6c7895915885f0c8b02a4cb88d92a Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Fri, 22 May 2026 15:50:34 +0800
Subject: [PATCH 04/39] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E9=9F=B3=E4=B9=90=E6=92=AD=E6=94=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=9F=B3=E9=87=8F=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=92=8C=E5=85=83=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重构播放器状态管理为类形式，统一控制播放逻辑
- 新增音量调节和静音功能，支持实时生效
- 添加专辑封面展示，使用base64嵌入音频封面图片
- 重命名相关方法和类型，统一代码命名规范
- 新增git提交信息规范文档
- 添加默认封面静态资源
---
 .trae/rules/git-commit-message.md   |   4 +
 src-tauri/Cargo.lock                |   1 +
 src-tauri/Cargo.toml                |   1 +
 src-tauri/src/commands.rs           |  58 ++++++++++--
 src-tauri/src/lib.rs                |   3 +-
 src/lib/components/Header.svelte    |  15 +--
 src/lib/components/PlayerBar.svelte | 140 +++++++++-------------------
 src/lib/player.svelte.ts            | 108 ++++++++++++++-------
 static/default_cover.png            | Bin 0 -> 242434 bytes
 9 files changed, 180 insertions(+), 150 deletions(-)
 create mode 100644 .trae/rules/git-commit-message.md
 create mode 100644 static/default_cover.png

diff --git a/.trae/rules/git-commit-message.md b/.trae/rules/git-commit-message.md
new file mode 100644
index 0000000..76a55c7
--- /dev/null
+++ b/.trae/rules/git-commit-message.md
@@ -0,0 +1,4 @@
+alwaysApply: true
+scene: git_message
+---
+使用无序列表逐条描述具体变更，每条以 `- ` 开头，动词使用一般现在时（如 Add, Fix, Update, Merge, Improve）。
\ No newline at end of file
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 5336def..397424a 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4284,6 +4284,7 @@ dependencies = [
 name = "tauri-app"
 version = "0.1.0"
 dependencies = [
+ "base64 0.22.1",
  "lofty",
  "serde",
  "serde_json",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 1027eb2..9e8377a 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -24,4 +24,5 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 web-audio-api = "1.4.0"
 lofty = "0.24.0"
+base64 = "0.22.1"
 
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index f64cf00..3ab1482 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -1,12 +1,12 @@
 use std::path::PathBuf;
 use std::sync::{Mutex, OnceLock};
-
+use base64::{Engine as _, engine::general_purpose};
 use lofty::prelude::*;
 use lofty::probe::Probe;
 use tauri::command;
 
 use web_audio_api::context::{AudioContext, BaseAudioContext};
-use web_audio_api::node::AudioNode;
+use web_audio_api::node::{AudioNode, GainNode};
 use web_audio_api::MediaElement;
 
 use serde::Serialize;
@@ -18,12 +18,17 @@ fn get_audio_context() -> &'static AudioContext {
 
 struct AudioState {
     media: Option<MediaElement>,
+    gain_node: Option<GainNode>,
+    volume: f32,
 }
 
 fn get_audio_state() -> &'static Mutex<AudioState> {
     static STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
     STATE.get_or_init(|| {
-        Mutex::new(AudioState { media: None })
+        Mutex::new(AudioState { 
+            media: None, 
+            gain_node: None, 
+            volume: 0.8 })
     })
 }
 
@@ -39,17 +44,26 @@ pub async fn play_music(name: &str) -> Result<String, String> {
     let mut media = MediaElement::new(&file_path).map_err(|e| format!("Failed to create media element: {}", e))?;
     let context = get_audio_context();
     let src = context.create_media_element_source(&mut media);
-    src.connect(&context.destination());
+    
+    // src.connect(&context.destination());
+    let gain_node = context.create_gain();
+
+    src.connect(&gain_node);
+    gain_node.connect(&context.destination());
 
     media.set_loop(false);
     media.set_current_time(0.0);
 
     let mut state = get_audio_state().lock().map_err(|_| "Failed to lock audio state")?;
+    
+    gain_node.gain().set_value(state.volume);
 
     if let Some(old_media) = state.media.replace(media) {
         old_media.pause();
     }
 
+    state.gain_node = Some(gain_node);
+
     if let Some(ref media) = state.media {
         media.play();
     }
@@ -75,7 +89,9 @@ pub async fn toggle_music() -> Result<bool, String> {
 
 #[command]
 pub async fn current_time() -> f64 {
-    let state = get_audio_state().lock().unwrap();
+    let Ok(state) = get_audio_state().lock() else { 
+        return 0.0; 
+    };
     if let Some(ref media) = state.media {
         media.current_time()
     } else {
@@ -93,16 +109,17 @@ pub async fn set_current_time(time: f64) {
 
 
 #[derive(Serialize)]
-pub struct SongInfo {
+pub struct TrackInfo {
     title: String,
     artist: String,
     album: String,
     duration: f64,
-    sample_rate: Option<u32>
+    sample_rate: Option<u32>,
+    cover: Option<String>,
 }
 
 #[command]
-pub fn get_song_info(name: String) -> SongInfo {
+pub fn get_track_info(name: String) -> TrackInfo {
     let file_path = test_path().join(name);
     let tagged_file = Probe::open(&file_path)
         .unwrap()
@@ -125,14 +142,37 @@ pub fn get_song_info(name: String) -> SongInfo {
         .map(|s| s.to_string())
         .unwrap_or_else(|| "Unknown".to_string());
 
+    let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
+        let b64_encoded = general_purpose::STANDARD.encode(pic.data());
+        let mime_type = pic.mime_type()
+            .map(|m| m.as_str())
+            .unwrap_or("image/jpeg");
+        format!("data:{};base64,{}", mime_type, b64_encoded)
+    });
+
     let props = tagged_file.properties();
     let duration = props.duration().as_secs_f64();
 
-    SongInfo {
+    TrackInfo {
         title,
         artist,
         album,
         duration,
         sample_rate: props.sample_rate(),
+        cover,
+    }
+}
+
+#[command]
+pub async fn set_volume(volume: u8) -> Result<(), String> {
+    let mut state = get_audio_state().lock().map_err(|_| "Failed to lock audio state")?;
+    let volume: f32 = volume as f32 / 100.0;
+    let safe_volume = volume.clamp(0.0, 1.0);
+    state.volume = safe_volume;
+
+    if let Some(ref gain_node) = state.gain_node {
+        gain_node.gain().set_value(safe_volume);
     }
+
+    Ok(())
 }
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 592076e..fa8e507 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -9,7 +9,8 @@ pub fn run() {
             commands::toggle_music,
             commands::current_time,
             commands::set_current_time,
-            commands::get_song_info
+            commands::get_track_info,
+            commands::set_volume
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index 774d826..9ef1d4f 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { playerState, type SongInfo } from '$lib/player.svelte'
+    import { playerState, type TrackInfo } from '$lib/player.svelte'
     import { invoke } from '@tauri-apps/api/core'
     import 'mdui/components/button.js'
 
@@ -7,16 +7,11 @@
         await invoke('play_music', {
             name: 'music/40mP 初音ミク - 恋愛裁判.flac',
         })
-
-        playerState.isPlaying = true
         
-        let song_info = await invoke<SongInfo>("get_song_info", {name: "music/40mP 初音ミク - 恋愛裁判.flac"})
-        playerState.current = {
-            title: song_info?.title,
-            artist: song_info?.artist,
-            path: "music/40mP 初音ミク - 恋愛裁判.flac"
-        }
-        playerState.duration = song_info.duration
+        const track = await invoke<TrackInfo>("get_track_info", {name: "music/40mP 初音ミク - 恋愛裁判.flac"})
+        playerState.current = track
+        playerState.playing = true
+        playerState.startPolling()
     }
 </script>
 
diff --git a/src/lib/components/PlayerBar.svelte b/src/lib/components/PlayerBar.svelte
index cd9b3d9..719aa27 100644
--- a/src/lib/components/PlayerBar.svelte
+++ b/src/lib/components/PlayerBar.svelte
@@ -1,35 +1,12 @@
 <script>
     import { playerState } from '$lib/player.svelte'
-    import { invoke } from '@tauri-apps/api/core'
     import Progress from './Progress.svelte'
     import Slider from './Slider.svelte'
 
-    let currentTime = $state(0)
-    let volume = $state(0)
-    let muted = $state(false)
-    let silder = $state(null)
-
-    async function switchTrack(step) {
-        if (!playerState.playlist.length || !playerState.current) return
-
-        const len = playerState.playlist.length
-        const currentIndex = playerState.playlist.indexOf(playerState.current)
-
-        const newIndex = (currentIndex + step + len) % len
-
-        playerState.current = playerState.playlist[newIndex]
-        playerState.progress = 0
-        playerState.isPlaying = true
-    }
-
-    export const next = () => switchTrack(1)
-    export const prev = () => switchTrack(-1)
-
-    export async function toggle() {
-        playerState.isPlaying = await invoke('toggle_music')
-    }
-
-    let volumeIcon = $derived(getVolumeIcon(volume, muted))
+    let slider = $state(null)
+    let volumeIcon = $derived(
+        getVolumeIcon(playerState.volume, playerState.muted),
+    )
 
     function getVolumeIcon(volume, muted) {
         if (muted) return 'volume_off--rounded'
@@ -37,88 +14,56 @@
         return volume > 50 ? 'volume_up--rounded' : 'volume_down--rounded'
     }
 
-    async function seek(time) {
-        console.log(time)
-        stopPolling()
-        await invoke('set_current_time', { time })
-        currentTime = time
-        if (playerState.isPlaying) startPolling()
-    }
-    
-    let pollTimer
-
-    function startPolling() {
-        stopPolling()
-        pollTimer = setInterval(async () => {
-            try {
-                currentTime = await invoke('current_time')
-            } catch {}
-        }, 250)
-    }
-
-    function stopPolling() {
-        if (pollTimer) {
-            clearInterval(pollTimer)
-            pollTimer = null
-        }
-    }
-
-    $effect(() => {
-        if (playerState.isPlaying) {
-            startPolling()
-        } else {
-            stopPolling()
-        }
-        return stopPolling
-    })
-
-    $effect(() => {
-        if (playerState.current) {
-            currentTime = 0
-        }
-    })
-    
     function formatTime(seconds) {
         if (!seconds || !isFinite(seconds)) return '00:00'
         const m = Math.floor(seconds / 60)
         const s = Math.floor(seconds % 60)
         return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
     }
+
+    $effect(() => {
+        playerState.setVolume()
+    })
 </script>
 
 <mdui-bottom-app-bar
     class="relative flex flex-col h-24 px-4 pb-2"
     style="--z-index: 10"
 >
-        <div class="absolute top-0 left-0 w-full flex items-center gap-2 px-2 -translate-y-1/2">
+    <div
+        class="absolute top-0 left-0 w-full flex items-center gap-2 px-2 -translate-y-1/2"
+    >
         <span class="text-xs tabular-nums text-black min-w-10 text-right">
-            {formatTime(currentTime)}
+            {formatTime(playerState.currentTime)}
         </span>
         <div class="flex-1">
             <Slider
-                bind:value={currentTime}
-                bind:this={silder}
-                oninput={e => seek(e.target.value)}
-                duration = {playerState.duration}
+                bind:value={playerState.currentTime}
+                bind:this={slider}
+                oninput={e => playerState.seek(+e.target.value)}
+                duration={playerState.current?.duration ?? 0}
             />
         </div>
         <span class="text-xs tabular-nums text-black min-w-10">
-            {formatTime(playerState.duration)}
+            {formatTime(playerState.current?.duration ?? 0)}
         </span>
     </div>
 
-    <div class="info">
-        <div>{playerState.current?.title}</div>
-        <div class="artist">{playerState.current?.artist}</div>
-    </div>
-
     <div class="flex items-center justify-between w-full h-full mt-2">
-        <div class="flex flex-col justify-center min-w-37.5 overflow-hidden">
-            <div class="text-sm font-medium truncate">
-                {playerState.current?.title ?? '未在播放'}
-            </div>
-            <div class="text-xs opacity-70 truncate">
-                {playerState.current?.artist ?? '未知艺术家'}
+        <div class="flex min-w-37.5 gap-2">
+            <img
+                src={playerState.current?.cover ??
+                    'default_cover.png'}
+                alt="Album Cover"
+                class="w-16 h-16 rounded object-cover shadow-sm bg-gray-200"
+            />
+            <div class="flex flex-col justify-center overflow-hidden">
+                <div class="text-sm font-medium truncate">
+                    {playerState.current?.title ?? '未在播放'}
+                </div>
+                <div class="text-xs opacity-70 truncate">
+                    {playerState.current?.artist ?? '未知艺术家'}
+                </div>
             </div>
         </div>
 
@@ -127,41 +72,42 @@
                 icon="skip_previous--rounded"
                 role="button"
                 tabindex="0"
-                onclick={prev}
-                onkeydown={e => e.key === 'Enter' && prev()}
+                onclick={() => playerState.prev()}
+                onkeydown={e => e.key === 'Enter' && playerState.prev()}
             ></mdui-button-icon>
             <mdui-button-icon
                 variant="filled"
-                icon={playerState.isPlaying
+                icon={playerState.playing
                     ? 'pause--rounded'
                     : 'play_arrow--rounded'}
                 role="button"
                 tabindex="0"
-                onclick={toggle}
-                onkeydown={e => e.key === 'Enter' && toggle()}
+                onclick={() => playerState.toggle()}
+                onkeydown={e => e.key === 'Enter' && playerState.toggle()}
             >
             </mdui-button-icon>
             <mdui-button-icon
                 icon="skip_next--rounded"
                 role="button"
                 tabindex="0"
-                onclick={next}
-                onkeydown={e => e.key === 'Enter' && next()}
+                onclick={() => playerState.next()}
+                onkeydown={e => e.key === 'Enter' && playerState.next()}
             ></mdui-button-icon>
         </div>
 
         <div class="flex items-center min-w-37.5 justify-end">
             <mdui-button-icon
                 icon={volumeIcon}
-                onclick={() => (muted = !muted)}
-                onkeydown={e => e.key === 'Enter' && (muted = !muted)}
+                onclick={() => (playerState.muted = !playerState.muted)}
+                onkeydown={e =>
+                    e.key === 'Enter' &&
+                    (playerState.muted = !playerState.muted)}
                 role="button"
                 tabindex="0"
                 class="text-lg opacity-70"
             >
             </mdui-button-icon>
-            <!-- <Slider value="100" class="w-32" /> -->
-            <Progress bind:value={volume} class="w-32" />
+            <Progress bind:value={playerState.volume} class="w-32" />
         </div>
     </div>
 </mdui-bottom-app-bar>
diff --git a/src/lib/player.svelte.ts b/src/lib/player.svelte.ts
index b936e47..f56ad89 100644
--- a/src/lib/player.svelte.ts
+++ b/src/lib/player.svelte.ts
@@ -1,37 +1,79 @@
-type PlayerState = {
-  current: Track | null
-  isPlaying: boolean
-  playlist: Track[]
-  progress: number
-  duration: number
-  volume: number
-  isMuted: boolean
-  previousVolume: number
+import { invoke } from "@tauri-apps/api/core"
+
+
+class PlayerState {
+    current = $state<TrackInfo | null>(null)
+    playing = $state(false)
+    playlist = $state<any[]>([])
+    currentTime = $state(0)
+    volume = $state(80)
+    muted = $state(false)
+
+    #pollTimer: any = null
+
+    startPolling = () => {
+        this.stopPolling()
+        this.#pollTimer = setInterval(async () => {
+            if (!this.playing) {
+                this.stopPolling()
+                return
+            }
+            this.currentTime = await invoke('current_time')
+        }, 250)
+    }
+
+    stopPolling = () => {
+        if (this.#pollTimer) {
+            clearInterval(this.#pollTimer)
+            this.#pollTimer = null
+        }
+    }
+
+    toggle = async () => {
+        this.playing = await invoke('toggle_music')
+        if (this.playing) {
+            this.startPolling()
+        } else {
+            this.stopPolling()
+        }
+    }
+
+    seek = async (time: number) => {
+        this.stopPolling()
+        await invoke('set_current_time', { time })
+        this.currentTime = time
+        if (this.playing) this.startPolling()
+    }
+
+    setVolume = async () => {
+        await invoke('set_volume', { volume: this.volume })
+    }
+
+    switchTrack = async (step: number) => {
+        if (!this.playlist.length || !this.current) return
+
+        const len = this.playlist.length
+        const currentIndex = this.playlist.indexOf(this.current)
+        const newIndex = (currentIndex + step + len) % len
+
+        this.current = this.playlist[newIndex]
+        this.currentTime = 0
+        this.playing = true
+
+        this.startPolling()
+    }
+
+    next = () => this.switchTrack(1)
+    prev = () => this.switchTrack(-1)
 }
 
-type Track = {
-  title: string
-  artist: string
-  path: string
+export interface TrackInfo {
+    title: string
+    artist: string
+    album: string
+    duration: number
+    sample_rate?: number
+    cover?: string
 }
 
-export const playerState = $state<PlayerState>({
-  current: null,
-  isPlaying: false,
-  playlist: [],
-  progress: 0,
-  duration: 0,
-  volume: 0.8,
-  isMuted: false,
-  previousVolume: 0.8,
-})
-
-export interface SongInfo {
-  title: string;
-  artist: string;
-  album: string;
-  duration: number;
-  sample_rate?: number;
-  bit_depth?: number;
-  channels?: number;
-}
\ No newline at end of file
+export const playerState = new PlayerState()
\ No newline at end of file
diff --git a/static/default_cover.png b/static/default_cover.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c7c6c15a78201b9168776e4bb79d6bb387ff4dc
GIT binary patch
literal 242434
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

literal 0
HcmV?d00001


From 9e516391e9e7f16c8a994aa3e84eb3aaa3472a64 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sat, 23 May 2026 14:32:45 +0800
Subject: [PATCH 05/39] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=90=E6=96=87=E4=BB=B6=E5=A4=B9=E6=89=AB=E6=8F=8F=E4=B8=8E?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E6=92=AD=E6=94=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增依赖：walkdir 用于遍历目录、tauri-plugin-dialog 用于选择文件夹
2. 新增 scan_music_directory 命令，支持扫描指定目录下的音轨文件
3. 重构播放器状态管理，替换 playerState 为 Player 类
4. 更新导航栏按钮，添加从文件夹导入音乐并播放的功能
5. 移除旧的硬编码测试播放逻辑，优化音量控制逻辑
6. 更新权限配置，添加对话框插件权限
7. 更新包管理器与依赖版本
---
 package.json                        |   3 +-
 pnpm-lock.yaml                      |  15 +++
 src-tauri/Cargo.lock                |  83 ++++++++++++++++
 src-tauri/Cargo.toml                |   2 +
 src-tauri/capabilities/default.json |   3 +-
 src-tauri/src/commands.rs           | 141 ++++++++++++++++++----------
 src-tauri/src/lib.rs                |   5 +-
 src/lib/components/Header.svelte    |  24 -----
 src/lib/components/NavRail.svelte   |  49 +++++++++-
 src/lib/components/PlayerBar.svelte |  57 ++++++-----
 src/lib/player.svelte.ts            |  53 +++++++----
 11 files changed, 307 insertions(+), 128 deletions(-)

diff --git a/package.json b/package.json
index 6cba909..9bf8a25 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "@mdui/icons": "^1.0.3",
     "@tailwindcss/vite": "^4.2.2",
     "@tauri-apps/api": "^2.10.1",
+    "@tauri-apps/plugin-dialog": "~2.7.1",
     "@tauri-apps/plugin-opener": "^2.5.3",
     "material-symbols": "^0.43.0",
     "mdui": "^2.1.4",
@@ -31,5 +32,5 @@
     "typescript": "~5.6.3",
     "vite": "^6.4.1"
   },
-  "packageManager": "pnpm@11.1.3+sha512.c85357fe17ca12dd23dd7071822666dfd7e3cb76fe214e3370b5ea2fb34f2a231185509b63e717f3cd0acb38dd3f8d82bcd5e8172400ae678b70ea4fbed0896d"
+  "packageManager": "pnpm@11.2.2+sha512.36e6621fad506178936455e70247b8808ef4ec25797a9f437a93281a020484e2607f6a469a22e982987c3dbb8866e3071514ab10a4a1749e06edcd1ec118436f"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 99a3523..b48cf13 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17,6 +17,9 @@ importers:
       '@tauri-apps/api':
         specifier: ^2.10.1
         version: 2.10.1
+      '@tauri-apps/plugin-dialog':
+        specifier: ~2.7.1
+        version: 2.7.1
       '@tauri-apps/plugin-opener':
         specifier: ^2.5.3
         version: 2.5.3
@@ -535,6 +538,9 @@ packages:
   '@tauri-apps/api@2.10.1':
     resolution: {integrity: sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw==}
 
+  '@tauri-apps/api@2.11.0':
+    resolution: {integrity: sha512-7CinYODhky9lmO23xHnUFv0Xt43fbtWMyxZcLcRBlFkcgXKuEirBvHpmtJ89YMhyeGcq20Wuc47Fa4XjyniywA==}
+
   '@tauri-apps/cli-darwin-arm64@2.10.1':
     resolution: {integrity: sha512-Z2OjCXiZ+fbYZy7PmP3WRnOpM9+Fy+oonKDEmUE6MwN4IGaYqgceTjwHucc/kEEYZos5GICve35f7ZiizgqEnQ==}
     engines: {node: '>= 10'}
@@ -611,6 +617,9 @@ packages:
     engines: {node: '>= 10'}
     hasBin: true
 
+  '@tauri-apps/plugin-dialog@2.7.1':
+    resolution: {integrity: sha512-OK1UBXYt+ojcmxMktzzuyonYIFta8CmAASpX+CA+DTGK24KlHjhYI6x2iOJ/TjZF4N7/ACK1oFmEOjIY9IhzOQ==}
+
   '@tauri-apps/plugin-opener@2.5.3':
     resolution: {integrity: sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ==}
 
@@ -1287,6 +1296,8 @@ snapshots:
 
   '@tauri-apps/api@2.10.1': {}
 
+  '@tauri-apps/api@2.11.0': {}
+
   '@tauri-apps/cli-darwin-arm64@2.10.1':
     optional: true
 
@@ -1334,6 +1345,10 @@ snapshots:
       '@tauri-apps/cli-win32-ia32-msvc': 2.10.1
       '@tauri-apps/cli-win32-x64-msvc': 2.10.1
 
+  '@tauri-apps/plugin-dialog@2.7.1':
+    dependencies:
+      '@tauri-apps/api': 2.11.0
+
   '@tauri-apps/plugin-opener@2.5.3':
     dependencies:
       '@tauri-apps/api': 2.10.1
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 397424a..e267359 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -3355,6 +3355,30 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "rfd"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
+dependencies = [
+ "block2",
+ "dispatch2",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "js-sys",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "rtrb"
 version = "0.3.3"
@@ -4290,7 +4314,9 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-build",
+ "tauri-plugin-dialog",
  "tauri-plugin-opener",
+ "walkdir",
  "web-audio-api",
 ]
 
@@ -4374,6 +4400,48 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "tauri-plugin-dialog"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65981abb771e74e571a38196c3baa11c459379164791eba0e67abc1a5fac9884"
+dependencies = [
+ "log",
+ "raw-window-handle",
+ "rfd",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "tauri-plugin-fs",
+ "thiserror 2.0.18",
+ "url",
+]
+
+[[package]]
+name = "tauri-plugin-fs"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7ecc274121aca0c036a2b42d1cbe83d368d348f54e0bb8a735c2b1548e8f371"
+dependencies = [
+ "anyhow",
+ "dunce",
+ "glob",
+ "log",
+ "objc2-foundation",
+ "percent-encoding",
+ "schemars 0.8.22",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-plugin",
+ "tauri-utils",
+ "thiserror 2.0.18",
+ "toml 1.0.7+spec-1.1.0",
+ "url",
+]
+
 [[package]]
 name = "tauri-plugin-opener"
 version = "2.5.3"
@@ -4665,6 +4733,21 @@ dependencies = [
  "winnow 0.7.15",
 ]
 
+[[package]]
+name = "toml"
+version = "1.0.7+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd28d57d8a6f6e458bc0b8784f8fdcc4b99a437936056fa122cb234f18656a96"
+dependencies = [
+ "indexmap 2.13.0",
+ "serde_core",
+ "serde_spanned 1.0.4",
+ "toml_datetime 1.0.1+spec-1.1.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 1.0.0",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.3"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 9e8377a..7a52231 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -25,4 +25,6 @@ serde_json = "1"
 web-audio-api = "1.4.0"
 lofty = "0.24.0"
 base64 = "0.22.1"
+walkdir = "2.5.0"
+tauri-plugin-dialog = "2"
 
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 8ff4eff..ed4becc 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -12,6 +12,7 @@
     "core:window:allow-start-dragging",
     "core:window:allow-minimize",
     "core:window:allow-toggle-maximize",
-    "core:window:allow-close"
+    "core:window:allow-close",
+    "dialog:default"
   ]
 }
\ No newline at end of file
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index 3ab1482..b133143 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -1,10 +1,11 @@
-use std::path::PathBuf;
-use std::sync::{Mutex, OnceLock};
-use base64::{Engine as _, engine::general_purpose};
+use base64::{engine::general_purpose, Engine as _};
 use lofty::prelude::*;
 use lofty::probe::Probe;
+use std::path::Path;
+use std::sync::{Mutex, OnceLock};
 use tauri::command;
 
+use walkdir::WalkDir;
 use web_audio_api::context::{AudioContext, BaseAudioContext};
 use web_audio_api::node::{AudioNode, GainNode};
 use web_audio_api::MediaElement;
@@ -25,26 +26,26 @@ struct AudioState {
 fn get_audio_state() -> &'static Mutex<AudioState> {
     static STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
     STATE.get_or_init(|| {
-        Mutex::new(AudioState { 
-            media: None, 
-            gain_node: None, 
-            volume: 0.8 })
+        Mutex::new(AudioState {
+            media: None,
+            gain_node: None,
+            volume: 0.8,
+        })
     })
 }
 
-fn test_path() -> PathBuf {
-    let current_dir = std::env::current_dir().unwrap();
-    current_dir.join("..").join("static")
-}
-
 #[command]
-pub async fn play_music(name: &str) -> Result<String, String> {
-    let file_path = test_path().join(name);
+pub async fn play_music(full_path: &str) -> Result<String, String> {
+    let file_path = Path::new(&full_path);
+    if !file_path.exists() {
+        return Err("音频文件不存在或已被移动".into());
+    }
 
-    let mut media = MediaElement::new(&file_path).map_err(|e| format!("Failed to create media element: {}", e))?;
+    let mut media = MediaElement::new(&file_path)
+        .map_err(|e| format!("Failed to create media element: {}", e))?;
     let context = get_audio_context();
     let src = context.create_media_element_source(&mut media);
-    
+
     // src.connect(&context.destination());
     let gain_node = context.create_gain();
 
@@ -54,8 +55,10 @@ pub async fn play_music(name: &str) -> Result<String, String> {
     media.set_loop(false);
     media.set_current_time(0.0);
 
-    let mut state = get_audio_state().lock().map_err(|_| "Failed to lock audio state")?;
-    
+    let mut state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
     gain_node.gain().set_value(state.volume);
 
     if let Some(old_media) = state.media.replace(media) {
@@ -68,12 +71,14 @@ pub async fn play_music(name: &str) -> Result<String, String> {
         media.play();
     }
 
-    Ok(format!("Playing music: {}", name))
+    Ok(format!("Playing music: {}", full_path))
 }
 
 #[command]
 pub async fn toggle_music() -> Result<bool, String> {
-    let state = get_audio_state().lock().map_err(|_| "Failed to lock audio state")?;
+    let state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
     if let Some(ref media) = state.media {
         if media.paused() {
             media.play();
@@ -89,8 +94,8 @@ pub async fn toggle_music() -> Result<bool, String> {
 
 #[command]
 pub async fn current_time() -> f64 {
-    let Ok(state) = get_audio_state().lock() else { 
-        return 0.0; 
+    let Ok(state) = get_audio_state().lock() else {
+        return 0.0;
     };
     if let Some(ref media) = state.media {
         media.current_time()
@@ -107,7 +112,6 @@ pub async fn set_current_time(time: f64) {
     }
 }
 
-
 #[derive(Serialize)]
 pub struct TrackInfo {
     title: String,
@@ -116,63 +120,98 @@ pub struct TrackInfo {
     duration: f64,
     sample_rate: Option<u32>,
     cover: Option<String>,
+    path: String,
 }
 
 #[command]
-pub fn get_track_info(name: String) -> TrackInfo {
-    let file_path = test_path().join(name);
-    let tagged_file = Probe::open(&file_path)
-        .unwrap()
-        .read()
-        .unwrap();
-
-    let tag = tagged_file.primary_tag()
+pub async fn set_volume(volume: u8) -> Result<(), String> {
+    let mut state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+    let volume: f32 = volume as f32 / 100.0;
+    let safe_volume = volume.clamp(0.0, 1.0);
+    state.volume = safe_volume;
+
+    if let Some(ref gain_node) = state.gain_node {
+        gain_node.gain().set_value(safe_volume);
+    }
+
+    Ok(())
+}
+
+fn parse_single_track(file_path: &Path) -> Option<TrackInfo> {
+    let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
+    let tag = tagged_file
+        .primary_tag()
         .or_else(|| tagged_file.first_tag());
 
     let title = tag
         .and_then(|t| t.title())
         .map(|s| s.to_string())
-        .unwrap_or_else(|| "Unknown".to_string());
+        .unwrap_or_else(|| {
+            file_path
+                .file_stem()
+                .and_then(|s| s.to_str())
+                .unwrap_or("Unknown Track")
+                .to_string()
+        });
+
     let artist = tag
         .and_then(|t| t.artist())
         .map(|s| s.to_string())
-        .unwrap_or_else(|| "Unknown".to_string());
+        .unwrap_or_else(|| "Unknown Artist".to_string());
+
     let album = tag
         .and_then(|t| t.album())
         .map(|s| s.to_string())
-        .unwrap_or_else(|| "Unknown".to_string());
+        .unwrap_or_else(|| "Unknown Album".to_string());
+
+    let props = tagged_file.properties();
+    let duration = props.duration().as_secs_f64();
+    let sample_rate = props.sample_rate();
 
     let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
         let b64_encoded = general_purpose::STANDARD.encode(pic.data());
-        let mime_type = pic.mime_type()
-            .map(|m| m.as_str())
-            .unwrap_or("image/jpeg");
+        let mime_type = pic.mime_type().map(|m| m.as_str()).unwrap_or("image/jpeg");
         format!("data:{};base64,{}", mime_type, b64_encoded)
     });
 
-    let props = tagged_file.properties();
-    let duration = props.duration().as_secs_f64();
-
-    TrackInfo {
+    Some(TrackInfo {
         title,
         artist,
         album,
         duration,
-        sample_rate: props.sample_rate(),
+        sample_rate,
         cover,
-    }
+        path: file_path.to_string_lossy().into_owned(),
+    })
 }
 
+static SUPPORTED_EXT: [&str; 4] = ["mp3", "flac", "m4a", "wav"];
+
 #[command]
-pub async fn set_volume(volume: u8) -> Result<(), String> {
-    let mut state = get_audio_state().lock().map_err(|_| "Failed to lock audio state")?;
-    let volume: f32 = volume as f32 / 100.0;
-    let safe_volume = volume.clamp(0.0, 1.0);
-    state.volume = safe_volume;
+pub async fn scan_music_directory(dir_path: String) -> Result<Vec<TrackInfo>, String> {
+    let root_path = Path::new(&dir_path);
+    if !root_path.is_dir() {
+        return Err("Invalid directory path".into());
+    }
 
-    if let Some(ref gain_node) = state.gain_node {
-        gain_node.gain().set_value(safe_volume);
+    let mut playlist = Vec::new();
+
+    for entry in WalkDir::new(root_path).into_iter().filter_map(|e| e.ok()) {
+        let path = entry.path();
+        if !path.is_file() {
+            continue;
+        }
+        if let Some(ext) = path.extension().and_then(|s| s.to_str()) {
+            let ext = ext.to_lowercase();
+            if SUPPORTED_EXT.contains(&ext.as_str()) {
+                if let Some(track) = parse_single_track(path) {
+                    playlist.push(track);
+                }
+            }
+        }
     }
 
-    Ok(())
+    Ok(playlist)
 }
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index fa8e507..a652c42 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -3,14 +3,15 @@ mod commands;
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
+        .plugin(tauri_plugin_dialog::init())
         // .plugin(tauri_plugin_opener::init())
         .invoke_handler(tauri::generate_handler![
             commands::play_music,
             commands::toggle_music,
             commands::current_time,
             commands::set_current_time,
-            commands::get_track_info,
-            commands::set_volume
+            commands::set_volume,
+            commands::scan_music_directory,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index 9ef1d4f..e8e2c03 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -1,33 +1,9 @@
 <script lang="ts">
-    import { playerState, type TrackInfo } from '$lib/player.svelte'
-    import { invoke } from '@tauri-apps/api/core'
     import 'mdui/components/button.js'
-
-    async function playMusic() {
-        await invoke('play_music', {
-            name: 'music/40mP 初音ミク - 恋愛裁判.flac',
-        })
-        
-        const track = await invoke<TrackInfo>("get_track_info", {name: "music/40mP 初音ミク - 恋愛裁判.flac"})
-        playerState.current = track
-        playerState.playing = true
-        playerState.startPolling()
-    }
 </script>
 
 <header
     class="flex items-center justify-between px-8 py-4 bg-(--controlBackground) border-b border-(--controlGray) mt-14 shadow-sm"
 >
     <div class="header-left">Header PlaceHolder</div>
-    <mdui-button
-        variant="filled"
-        onclick={playMusic}
-        onkeydown={(e: KeyboardEvent) => {
-            if (e.key === 'Enter' || e.key === ' ') playMusic()
-        }}
-        class="px-4 py-2"
-        role="none"
-    >
-        播放音乐
-    </mdui-button>
 </header>
diff --git a/src/lib/components/NavRail.svelte b/src/lib/components/NavRail.svelte
index ef952e9..5acabc3 100644
--- a/src/lib/components/NavRail.svelte
+++ b/src/lib/components/NavRail.svelte
@@ -1,10 +1,55 @@
 <script lang="ts">
+  import { player, type TrackInfo } from '$lib/player.svelte'
+  import { invoke } from '@tauri-apps/api/core'
+  import { open } from '@tauri-apps/plugin-dialog'
   import 'mdui/components/navigation-rail-item.js'
   import 'mdui/components/navigation-rail.js'
+
+  async function importMusicFolder(): Promise<TrackInfo[] | undefined> {
+    const selectedDir = await open({
+      directory: true,
+      multiple: false,
+      title: '选择你的音乐库文件夹',
+    })
+
+    if (!selectedDir) {
+      console.error('音频文件不存在或已被移动')
+      return
+    }
+
+    try {
+      const tracks: TrackInfo[] = await invoke('scan_music_directory', {
+        dirPath: selectedDir,
+      })
+
+      console.log(`成功扫描到 ${tracks.length} 首歌曲！`, tracks)
+      return tracks
+    } catch (err) {
+      console.error('扫描音乐文件夹失败:', err)
+    }
+  }
+
+  async function playMusic() {
+    const playlist = await importMusicFolder()
+    if (!playlist) return
+
+    player.playlist = playlist
+    player.playByIndex(0)
+  }
 </script>
 
 <mdui-navigation-rail style="--z-index: 1">
-  <mdui-fab lowered icon="search--outlined" slot="top"></mdui-fab>
+  <mdui-fab
+    lowered
+    icon="playlist_add--rounded"
+    slot="top"
+    onclick={playMusic}
+    onkeydown={(e: KeyboardEvent) => {
+      if (e.key === 'Enter' || e.key === ' ') playMusic()
+    }}
+    role="button"
+    tabindex="0"
+  ></mdui-fab>
   <!-- <mdui-button-icon icon="settings" slot="bottom"></mdui-button-icon> -->
 
   <mdui-navigation-rail-item icon="watch_later--outlined" class="mb-4"
@@ -19,6 +64,4 @@
   <mdui-navigation-rail-item icon="person--outlined"
     >Artist</mdui-navigation-rail-item
   >
-
-
 </mdui-navigation-rail>
diff --git a/src/lib/components/PlayerBar.svelte b/src/lib/components/PlayerBar.svelte
index 719aa27..07f1b61 100644
--- a/src/lib/components/PlayerBar.svelte
+++ b/src/lib/components/PlayerBar.svelte
@@ -1,11 +1,11 @@
 <script>
-    import { playerState } from '$lib/player.svelte'
+    import { player } from '$lib/player.svelte'
     import Progress from './Progress.svelte'
     import Slider from './Slider.svelte'
 
     let slider = $state(null)
     let volumeIcon = $derived(
-        getVolumeIcon(playerState.volume, playerState.muted),
+        getVolumeIcon(player.volume, player.muted),
     )
 
     function getVolumeIcon(volume, muted) {
@@ -20,10 +20,6 @@
         const s = Math.floor(seconds % 60)
         return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
     }
-
-    $effect(() => {
-        playerState.setVolume()
-    })
 </script>
 
 <mdui-bottom-app-bar
@@ -34,35 +30,35 @@
         class="absolute top-0 left-0 w-full flex items-center gap-2 px-2 -translate-y-1/2"
     >
         <span class="text-xs tabular-nums text-black min-w-10 text-right">
-            {formatTime(playerState.currentTime)}
+            {formatTime(player.currentTime)}
         </span>
         <div class="flex-1">
             <Slider
-                bind:value={playerState.currentTime}
+                bind:value={player.currentTime}
                 bind:this={slider}
-                oninput={e => playerState.seek(+e.target.value)}
-                duration={playerState.current?.duration ?? 0}
+                oninput={e => player.seek(+e.target.value)}
+                duration={player.currentTrack?.duration ?? 0}
             />
         </div>
         <span class="text-xs tabular-nums text-black min-w-10">
-            {formatTime(playerState.current?.duration ?? 0)}
+            {formatTime(player.currentTrack?.duration ?? 0)}
         </span>
     </div>
 
-    <div class="flex items-center justify-between w-full h-full mt-2">
-        <div class="flex min-w-37.5 gap-2">
+    <div class="flex items-center w-full h-full mt-2">
+        <div class="flex flex-1 min-w-37.5 gap-2">
             <img
-                src={playerState.current?.cover ??
+                src={player.currentTrack?.cover ??
                     'default_cover.png'}
                 alt="Album Cover"
                 class="w-16 h-16 rounded object-cover shadow-sm bg-gray-200"
             />
             <div class="flex flex-col justify-center overflow-hidden">
                 <div class="text-sm font-medium truncate">
-                    {playerState.current?.title ?? '未在播放'}
+                    {player.currentTrack?.title ?? '未在播放'}
                 </div>
                 <div class="text-xs opacity-70 truncate">
-                    {playerState.current?.artist ?? '未知艺术家'}
+                    {player.currentTrack?.artist ?? '未知艺术家'}
                 </div>
             </div>
         </div>
@@ -72,42 +68,43 @@
                 icon="skip_previous--rounded"
                 role="button"
                 tabindex="0"
-                onclick={() => playerState.prev()}
-                onkeydown={e => e.key === 'Enter' && playerState.prev()}
+                onclick={() => player.prev()}
+                onkeydown={e => e.key === 'Enter' && player.prev()}
             ></mdui-button-icon>
             <mdui-button-icon
                 variant="filled"
-                icon={playerState.playing
+                icon={player.playing
                     ? 'pause--rounded'
                     : 'play_arrow--rounded'}
                 role="button"
                 tabindex="0"
-                onclick={() => playerState.toggle()}
-                onkeydown={e => e.key === 'Enter' && playerState.toggle()}
+                onclick={() => player.toggle()}
+                onkeydown={e => e.key === 'Enter' && player.toggle()}
             >
             </mdui-button-icon>
             <mdui-button-icon
                 icon="skip_next--rounded"
                 role="button"
                 tabindex="0"
-                onclick={() => playerState.next()}
-                onkeydown={e => e.key === 'Enter' && playerState.next()}
+                onclick={() => player.next()}
+                onkeydown={e => e.key === 'Enter' && player.next()}
             ></mdui-button-icon>
         </div>
-
-        <div class="flex items-center min-w-37.5 justify-end">
+        <div class="flex flex-1 items-center min-w-37.5 justify-end">
+            <mdui-button-icon
+            icon="playlist_play--rounded"
+            ></mdui-button-icon>
             <mdui-button-icon
                 icon={volumeIcon}
-                onclick={() => (playerState.muted = !playerState.muted)}
+                onclick={() => (player.muted = !player.muted)}
                 onkeydown={e =>
                     e.key === 'Enter' &&
-                    (playerState.muted = !playerState.muted)}
+                    (player.muted = !player.muted)}
                 role="button"
                 tabindex="0"
                 class="text-lg opacity-70"
-            >
-            </mdui-button-icon>
-            <Progress bind:value={playerState.volume} class="w-32" />
+            ></mdui-button-icon>
+            <Progress bind:value={player.volume} class="w-32" />
         </div>
     </div>
 </mdui-bottom-app-bar>
diff --git a/src/lib/player.svelte.ts b/src/lib/player.svelte.ts
index f56ad89..cbf8610 100644
--- a/src/lib/player.svelte.ts
+++ b/src/lib/player.svelte.ts
@@ -1,14 +1,27 @@
 import { invoke } from "@tauri-apps/api/core"
 
 
-class PlayerState {
-    current = $state<TrackInfo | null>(null)
+class Player {
+    currentIndex = $state<number>(-1)
     playing = $state(false)
     playlist = $state<any[]>([])
     currentTime = $state(0)
-    volume = $state(80)
     muted = $state(false)
 
+    currentTrack = $derived<TrackInfo | null>(
+        this.currentIndex >= 0 && this.currentIndex < this.playlist.length
+            ? this.playlist[this.currentIndex]
+            : null
+    )
+    // duration = $derived(this.currentTrack?.duration ?? 0)
+
+    #volume = $state(80);
+    get volume() { return this.#volume }
+    set volume(volume: number) {
+        this.#volume = volume
+        invoke('set_volume', { volume }).catch(console.error)
+    }
+
     #pollTimer: any = null
 
     startPolling = () => {
@@ -45,22 +58,29 @@ class PlayerState {
         if (this.playing) this.startPolling()
     }
 
-    setVolume = async () => {
-        await invoke('set_volume', { volume: this.volume })
-    }
+    playByIndex = async (index: number) => {
+        if (index < 0 || index >= this.playlist.length) return
 
-    switchTrack = async (step: number) => {
-        if (!this.playlist.length || !this.current) return
+        try {
+            const track = this.playlist[index]
+            await invoke('play_music', { fullPath: track.path })
 
-        const len = this.playlist.length
-        const currentIndex = this.playlist.indexOf(this.current)
-        const newIndex = (currentIndex + step + len) % len
+            this.currentIndex = index
+            this.currentTime = 0
+            this.playing = true
 
-        this.current = this.playlist[newIndex]
-        this.currentTime = 0
-        this.playing = true
+            this.startPolling()
+        } catch (err) {
+            console.error('切换歌曲失败:', err)
+        }
+    }
 
-        this.startPolling()
+    switchTrack = async (step: number) => {
+        const len = this.playlist.length
+        if (len === 0) return
+        
+        const newIndex = (this.currentIndex + step + len) % len
+        this.playByIndex(newIndex)
     }
 
     next = () => this.switchTrack(1)
@@ -74,6 +94,7 @@ export interface TrackInfo {
     duration: number
     sample_rate?: number
     cover?: string
+    path: string
 }
 
-export const playerState = new PlayerState()
\ No newline at end of file
+export const player = new Player()
\ No newline at end of file

From d5d73ecd6dfe6904d7f3090b9bda26b9475c36c2 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 24 May 2026 03:03:15 +0800
Subject: [PATCH 06/39] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=90=E6=92=AD=E6=94=BE=E5=99=A8=E6=A0=B8=E5=BF=83=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

本次提交实现了完整的音乐播放器功能：
1. 新增媒体库管理模块，支持扫描、加载本地音乐文件
2. 新增最近播放功能，记录并展示最近播放的歌曲
3. 新增音乐封面加载和懒加载显示功能
4. 重构播放器逻辑，自动切歌和更新播放状态
5. 新增Library和Recent页面，完善导航栏路由
6. 重构进度条和滑块组件，优化交互体验
7. 新增TrackList组件，支持列表展示歌曲信息和交互
8. 后端新增对应命令，支持封面读取、最近播放数据持久化
---
 src-tauri/src/commands.rs           | 267 +++++++++++++++++++++++++---
 src-tauri/src/lib.rs                |   5 +
 src/lib/components/NavRail.svelte   | 112 ++++++------
 src/lib/components/PlayerBar.svelte |  71 +++++---
 src/lib/components/Progress.svelte  |  88 +++++----
 src/lib/components/Slider.svelte    | 122 ++++++++-----
 src/lib/components/TrackList.svelte | 160 +++++++++++++++++
 src/lib/library.svelte.ts           |  50 ++++++
 src/lib/player.svelte.ts            |  18 +-
 src/lib/recent.svelte.ts            |  74 ++++++++
 src/lib/trackCovers.svelte.ts       |  51 ++++++
 src/routes/+layout.svelte           |   5 +-
 src/routes/library/+page.svelte     |  61 +++++++
 src/routes/recent/+page.svelte      |  63 +++++++
 14 files changed, 965 insertions(+), 182 deletions(-)
 create mode 100644 src/lib/components/TrackList.svelte
 create mode 100644 src/lib/library.svelte.ts
 create mode 100644 src/lib/recent.svelte.ts
 create mode 100644 src/lib/trackCovers.svelte.ts
 create mode 100644 src/routes/library/+page.svelte
 create mode 100644 src/routes/recent/+page.svelte

diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index b133143..8864402 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -1,16 +1,20 @@
 use base64::{engine::general_purpose, Engine as _};
 use lofty::prelude::*;
 use lofty::probe::Probe;
+use std::fs::{self, File};
 use std::path::Path;
 use std::sync::{Mutex, OnceLock};
-use tauri::command;
+use tauri::{command, Manager};
 
 use walkdir::WalkDir;
 use web_audio_api::context::{AudioContext, BaseAudioContext};
 use web_audio_api::node::{AudioNode, GainNode};
 use web_audio_api::MediaElement;
 
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
+
+const RECENTLY_PLAYED_FILE: &str = "recently_played.json";
+const MAX_RECENTLY_PLAYED: usize = 100;
 
 fn get_audio_context() -> &'static AudioContext {
     static CONTEXT: OnceLock<AudioContext> = OnceLock::new();
@@ -34,6 +38,17 @@ fn get_audio_state() -> &'static Mutex<AudioState> {
     })
 }
 
+#[derive(Serialize, Deserialize, Clone)]
+pub struct TrackInfo {
+    title: String,
+    artist: String,
+    album: String,
+    duration: f64,
+    sample_rate: Option<u32>,
+    cover: Option<String>,
+    path: String,
+}
+
 #[command]
 pub async fn play_music(full_path: &str) -> Result<String, String> {
     let file_path = Path::new(&full_path);
@@ -112,17 +127,6 @@ pub async fn set_current_time(time: f64) {
     }
 }
 
-#[derive(Serialize)]
-pub struct TrackInfo {
-    title: String,
-    artist: String,
-    album: String,
-    duration: f64,
-    sample_rate: Option<u32>,
-    cover: Option<String>,
-    path: String,
-}
-
 #[command]
 pub async fn set_volume(volume: u8) -> Result<(), String> {
     let mut state = get_audio_state()
@@ -170,27 +174,87 @@ fn parse_single_track(file_path: &Path) -> Option<TrackInfo> {
     let duration = props.duration().as_secs_f64();
     let sample_rate = props.sample_rate();
 
-    let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
-        let b64_encoded = general_purpose::STANDARD.encode(pic.data());
-        let mime_type = pic.mime_type().map(|m| m.as_str()).unwrap_or("image/jpeg");
-        format!("data:{};base64,{}", mime_type, b64_encoded)
-    });
-
     Some(TrackInfo {
         title,
         artist,
         album,
         duration,
         sample_rate,
-        cover,
+        cover: None,
         path: file_path.to_string_lossy().into_owned(),
     })
 }
 
+#[command]
+pub async fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
+    let file_path = Path::new(&full_path);
+
+    if !file_path.exists() {
+        return Err("音频文件不存在或已被移动".into());
+    }
+
+    let tagged_file = Probe::open(file_path)
+        .map_err(|e| format!("无法打开音频文件: {}", e))?
+        .read()
+        .map_err(|e| format!("无法读取音频元数据: {}", e))?;
+
+    let tag = tagged_file
+        .primary_tag()
+        .or_else(|| tagged_file.first_tag());
+
+    let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
+        let b64_encoded = general_purpose::STANDARD.encode(pic.data());
+        let mime_type = pic.mime_type().map(|m| m.as_str()).unwrap_or("image/jpeg");
+        format!("data:{};base64,{}", mime_type, b64_encoded)
+    });
+
+    Ok(cover)
+}
+
+async fn scan_music_directory_logic(
+    app_handle: &tauri::AppHandle,
+) -> Result<Vec<TrackInfo>, String> {
+    let music_dir = app_handle
+        .path()
+        .audio_dir()
+        .map_err(|e| format!("无法获取系统音乐目录: {}", e))?;
+
+    let mut tracks = Vec::new();
+    visit_dirs(&music_dir, &mut tracks);
+
+    Ok(tracks)
+}
+
+fn visit_dirs(dir: &Path, tracks: &mut Vec<TrackInfo>) {
+    if let Ok(entries) = fs::read_dir(dir) {
+        for entry in entries.flatten() {
+            let path = entry.path();
+            if path.is_dir() {
+                visit_dirs(&path, tracks);
+            } else if let Some(ext) = path.extension().and_then(|s| s.to_str()) {
+                let ext_lower = ext.to_lowercase();
+                if ext_lower == "mp3"
+                    || ext_lower == "flac"
+                    || ext_lower == "wav"
+                    || ext_lower == "m4a"
+                    || ext_lower == "ogg"
+                {
+                    if let Some(track) = parse_single_track(&path) {
+                        tracks.push(track);
+                    }
+                }
+            }
+        }
+    }
+}
+
 static SUPPORTED_EXT: [&str; 4] = ["mp3", "flac", "m4a", "wav"];
 
 #[command]
-pub async fn scan_music_directory(dir_path: String) -> Result<Vec<TrackInfo>, String> {
+pub async fn scan_music_directory(
+    app_handle: tauri::AppHandle,
+    dir_path: String,
+) -> Result<Vec<TrackInfo>, String> {
     let root_path = Path::new(&dir_path);
     if !root_path.is_dir() {
         return Err("Invalid directory path".into());
@@ -213,5 +277,166 @@ pub async fn scan_music_directory(dir_path: String) -> Result<Vec<TrackInfo>, St
         }
     }
 
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
+    }
+
+    let json_file_path = app_data_path.join("library.json");
+
+    let file = File::create(&json_file_path).map_err(|e| format!("无法创建库文件: {}", e))?;
+
+    serde_json::to_writer_pretty(file, &playlist).map_err(|e| format!("写入 JSON 失败: {}", e))?;
+
     Ok(playlist)
 }
+
+#[command]
+pub async fn load_music_library(app_handle: tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("无法获取数据目录: {}", e))?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
+    }
+
+    let json_file_path = app_data_path.join("library.json");
+
+    if !json_file_path.exists() {
+        return rebuild_and_get_library(&app_handle).await;
+    }
+
+    let file = File::open(&json_file_path).map_err(|e| format!("无法打开库文件: {}", e))?;
+
+    match serde_json::from_reader::<_, Vec<TrackInfo>>(file) {
+        Ok(mut library) => {
+            let had_covers = library.iter().any(|track| track.cover.is_some());
+
+            if had_covers {
+                for track in &mut library {
+                    track.cover = None;
+                }
+
+                save_music_library(&app_handle, &library)?;
+            }
+
+            Ok(library)
+        }
+        Err(e) => {
+            println!("[load_music_library] JSON 解析失败，准备重建: {}", e);
+            let _ = std::fs::remove_file(json_file_path);
+            rebuild_and_get_library(&app_handle).await
+        }
+    }
+}
+
+async fn rebuild_and_get_library(app_handle: &tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+    let fresh_library = scan_music_directory_logic(app_handle).await?;
+
+    save_music_library(app_handle, &fresh_library)?;
+
+    Ok(fresh_library)
+}
+
+pub fn save_music_library(
+    app_handle: &tauri::AppHandle,
+    library: &Vec<TrackInfo>,
+) -> Result<(), String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("{}", e))?;
+
+    let json_file_path = app_data_path.join("library.json");
+    let temp_file_path = app_data_path.join("library.json.tmp");
+
+    let json_str = serde_json::to_string_pretty(library).map_err(|e| format!("{}", e))?;
+
+    std::fs::write(&temp_file_path, json_str).map_err(|e| format!("{}", e))?;
+    std::fs::rename(temp_file_path, json_file_path).map_err(|e| format!("{}", e))?;
+
+    Ok(())
+}
+
+fn recently_played_path(app_handle: &tauri::AppHandle) -> Result<std::path::PathBuf, String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
+    }
+
+    Ok(app_data_path.join(RECENTLY_PLAYED_FILE))
+}
+
+fn read_recently_played(app_handle: &tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+    let file_path = recently_played_path(app_handle)?;
+
+    if !file_path.exists() {
+        return Ok(Vec::new());
+    }
+
+    let file = File::open(&file_path).map_err(|e| format!("无法打开最近播放文件: {}", e))?;
+
+    serde_json::from_reader::<_, Vec<TrackInfo>>(file)
+        .map_err(|e| format!("无法解析最近播放文件: {}", e))
+}
+
+fn save_recently_played(app_handle: &tauri::AppHandle, tracks: &[TrackInfo]) -> Result<(), String> {
+    let file_path = recently_played_path(app_handle)?;
+    let temp_file_path = file_path.with_extension("json.tmp");
+
+    let json =
+        serde_json::to_string_pretty(tracks).map_err(|e| format!("序列化最近播放失败: {}", e))?;
+
+    std::fs::write(&temp_file_path, json)
+        .map_err(|e| format!("写入最近播放临时文件失败: {}", e))?;
+
+    std::fs::rename(temp_file_path, file_path).map_err(|e| format!("保存最近播放失败: {}", e))?;
+
+    Ok(())
+}
+
+#[command]
+pub async fn load_recently_played(app_handle: tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+    read_recently_played(&app_handle)
+}
+
+#[command]
+pub async fn add_recently_played(
+    app_handle: tauri::AppHandle,
+    track: TrackInfo,
+) -> Result<Vec<TrackInfo>, String> {
+    let mut list = read_recently_played(&app_handle).unwrap_or_default();
+
+    let mut track = track;
+
+    // 不建议把 base64 封面写入 recently_played.json，否则文件会越来越大
+    track.cover = None;
+
+    // 去重：同一路径只保留一条，并把新的放到最前面
+    list.retain(|item| item.path != track.path);
+    list.insert(0, track);
+
+    if list.len() > MAX_RECENTLY_PLAYED {
+        list.truncate(MAX_RECENTLY_PLAYED);
+    }
+
+    save_recently_played(&app_handle, &list)?;
+
+    Ok(list)
+}
+
+#[command]
+pub async fn clear_recently_played(app_handle: tauri::AppHandle) -> Result<(), String> {
+    save_recently_played(&app_handle, &[])?;
+    Ok(())
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index a652c42..0e1d7aa 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -12,6 +12,11 @@ pub fn run() {
             commands::set_current_time,
             commands::set_volume,
             commands::scan_music_directory,
+            commands::load_music_library,
+            commands::get_track_cover,
+            commands::load_recently_played,
+            commands::add_recently_played,
+            commands::clear_recently_played,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src/lib/components/NavRail.svelte b/src/lib/components/NavRail.svelte
index 5acabc3..77ff42b 100644
--- a/src/lib/components/NavRail.svelte
+++ b/src/lib/components/NavRail.svelte
@@ -1,67 +1,71 @@
 <script lang="ts">
-  import { player, type TrackInfo } from '$lib/player.svelte'
-  import { invoke } from '@tauri-apps/api/core'
-  import { open } from '@tauri-apps/plugin-dialog'
-  import 'mdui/components/navigation-rail-item.js'
-  import 'mdui/components/navigation-rail.js'
+    import { musicLibrary } from '$lib/library.svelte'
+    import { player, type TrackInfo } from '$lib/player.svelte'
+    import { invoke } from '@tauri-apps/api/core'
+    import { open } from '@tauri-apps/plugin-dialog'
+    import 'mdui/components/navigation-rail-item.js'
+    import 'mdui/components/navigation-rail.js'
 
-  async function importMusicFolder(): Promise<TrackInfo[] | undefined> {
-    const selectedDir = await open({
-      directory: true,
-      multiple: false,
-      title: '选择你的音乐库文件夹',
-    })
+    async function importMusicFolder(): Promise<TrackInfo[] | undefined> {
+        const selectedDir = await open({
+            directory: true,
+            multiple: false,
+            title: '选择你的音乐库文件夹',
+        })
 
-    if (!selectedDir) {
-      console.error('音频文件不存在或已被移动')
-      return
-    }
+        if (!selectedDir) {
+            console.error('音频文件不存在或已被移动')
+            return
+        }
 
-    try {
-      const tracks: TrackInfo[] = await invoke('scan_music_directory', {
-        dirPath: selectedDir,
-      })
+        try {
+            const tracks: TrackInfo[] = await invoke('scan_music_directory', {
+                dirPath: selectedDir,
+            })
 
-      console.log(`成功扫描到 ${tracks.length} 首歌曲！`, tracks)
-      return tracks
-    } catch (err) {
-      console.error('扫描音乐文件夹失败:', err)
+            console.log(`成功扫描到 ${tracks.length} 首歌曲！`, tracks)
+            return tracks
+        } catch (err) {
+            console.error('扫描音乐文件夹失败:', err)
+        }
     }
-  }
 
-  async function playMusic() {
-    const playlist = await importMusicFolder()
-    if (!playlist) return
+    async function playMusic() {
+        const playlist = await importMusicFolder()
+        if (!playlist) return
+
+        player.playlist = playlist
+        player.playByIndex(0)
 
-    player.playlist = playlist
-    player.playByIndex(0)
-  }
+        musicLibrary.tracks = playlist
+    }
 </script>
 
 <mdui-navigation-rail style="--z-index: 1">
-  <mdui-fab
-    lowered
-    icon="playlist_add--rounded"
-    slot="top"
-    onclick={playMusic}
-    onkeydown={(e: KeyboardEvent) => {
-      if (e.key === 'Enter' || e.key === ' ') playMusic()
-    }}
-    role="button"
-    tabindex="0"
-  ></mdui-fab>
-  <!-- <mdui-button-icon icon="settings" slot="bottom"></mdui-button-icon> -->
+    <mdui-fab
+        lowered
+        icon="playlist_add--rounded"
+        slot="top"
+        onclick={playMusic}
+        onkeydown={(e: KeyboardEvent) => {
+            if (e.key === 'Enter' || e.key === ' ') playMusic()
+        }}
+        role="button"
+        tabindex="0"
+    ></mdui-fab>
+    <!-- <mdui-button-icon icon="settings" slot="bottom"></mdui-button-icon> -->
 
-  <mdui-navigation-rail-item icon="watch_later--outlined" class="mb-4"
-    >Recent</mdui-navigation-rail-item
-  >
-  <mdui-navigation-rail-item icon="library_music--outlined"
-    >Library</mdui-navigation-rail-item
-  >
-  <mdui-navigation-rail-item icon="track_changes--outlined"
-    >Track</mdui-navigation-rail-item
-  >
-  <mdui-navigation-rail-item icon="person--outlined"
-    >Artist</mdui-navigation-rail-item
-  >
+    <mdui-navigation-rail-item
+        icon="watch_later--outlined"
+        href="/recent">Recent</mdui-navigation-rail-item
+    >
+    <mdui-navigation-rail-item icon="library_music--outlined" href="/library"
+        >Library</mdui-navigation-rail-item
+    >
+    <mdui-navigation-rail-item icon="track_changes--outlined"
+        >Track</mdui-navigation-rail-item
+    >
+    <mdui-navigation-rail-item icon="person--outlined"
+        >Artist</mdui-navigation-rail-item
+    >
 </mdui-navigation-rail>
diff --git a/src/lib/components/PlayerBar.svelte b/src/lib/components/PlayerBar.svelte
index 07f1b61..55675ce 100644
--- a/src/lib/components/PlayerBar.svelte
+++ b/src/lib/components/PlayerBar.svelte
@@ -1,25 +1,51 @@
-<script>
+<script lang="ts">
     import { player } from '$lib/player.svelte'
+    import { trackCovers } from '$lib/trackCovers.svelte'
     import Progress from './Progress.svelte'
     import Slider from './Slider.svelte'
 
-    let slider = $state(null)
-    let volumeIcon = $derived(
-        getVolumeIcon(player.volume, player.muted),
-    )
+    let slider = $state<Slider | null>(null)
+    let currentCover = $state<string | null>(null)
 
-    function getVolumeIcon(volume, muted) {
+    let volumeIcon = $derived(getVolumeIcon(player.volume, player.muted))
+
+    function getVolumeIcon(volume: number, muted: boolean) {
         if (muted) return 'volume_off--rounded'
         if (volume === 0) return 'volume_mute--rounded'
         return volume > 50 ? 'volume_up--rounded' : 'volume_down--rounded'
     }
 
-    function formatTime(seconds) {
+    function formatTime(seconds: number) {
         if (!seconds || !isFinite(seconds)) return '00:00'
         const m = Math.floor(seconds / 60)
         const s = Math.floor(seconds % 60)
         return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
     }
+
+    function handleSeekInput(e: Event): void {
+        const target = e.currentTarget as HTMLElement & {
+            value: number | string
+        }
+
+        player.seek(Number(target.value))
+    }
+
+    $effect(() => {
+        const track = player.currentTrack
+
+        if (!track) {
+            currentCover = null
+            return
+        }
+
+        currentCover = trackCovers.get(track)
+
+        trackCovers.load(track).then(cover => {
+            if (player.currentTrack?.path === track.path) {
+                currentCover = cover
+            }
+        })
+    })
 </script>
 
 <mdui-bottom-app-bar
@@ -27,7 +53,7 @@
     style="--z-index: 10"
 >
     <div
-        class="absolute top-0 left-0 w-full flex items-center gap-2 px-2 -translate-y-1/2"
+        class="absolute top-2 left-0 w-full flex items-center -translate-y-1/2"
     >
         <span class="text-xs tabular-nums text-black min-w-10 text-right">
             {formatTime(player.currentTime)}
@@ -36,7 +62,7 @@
             <Slider
                 bind:value={player.currentTime}
                 bind:this={slider}
-                oninput={e => player.seek(+e.target.value)}
+                oninput={handleSeekInput}
                 duration={player.currentTrack?.duration ?? 0}
             />
         </div>
@@ -48,8 +74,7 @@
     <div class="flex items-center w-full h-full mt-2">
         <div class="flex flex-1 min-w-37.5 gap-2">
             <img
-                src={player.currentTrack?.cover ??
-                    'default_cover.png'}
+                src={currentCover ?? '/default_cover.png'}
                 alt="Album Cover"
                 class="w-16 h-16 rounded object-cover shadow-sm bg-gray-200"
             />
@@ -69,17 +94,17 @@
                 role="button"
                 tabindex="0"
                 onclick={() => player.prev()}
-                onkeydown={e => e.key === 'Enter' && player.prev()}
+                onkeydown={(e: KeyboardEvent) =>
+                    e.key === 'Enter' && player.prev()}
             ></mdui-button-icon>
             <mdui-button-icon
                 variant="filled"
-                icon={player.playing
-                    ? 'pause--rounded'
-                    : 'play_arrow--rounded'}
+                icon={player.playing ? 'pause--rounded' : 'play_arrow--rounded'}
                 role="button"
                 tabindex="0"
                 onclick={() => player.toggle()}
-                onkeydown={e => e.key === 'Enter' && player.toggle()}
+                onkeydown={(e: KeyboardEvent) =>
+                    e.key === 'Enter' && player.toggle()}
             >
             </mdui-button-icon>
             <mdui-button-icon
@@ -87,24 +112,22 @@
                 role="button"
                 tabindex="0"
                 onclick={() => player.next()}
-                onkeydown={e => e.key === 'Enter' && player.next()}
+                onkeydown={(e: KeyboardEvent) =>
+                    e.key === 'Enter' && player.next()}
             ></mdui-button-icon>
         </div>
         <div class="flex flex-1 items-center min-w-37.5 justify-end">
-            <mdui-button-icon
-            icon="playlist_play--rounded"
-            ></mdui-button-icon>
+            <mdui-button-icon icon="playlist_play--rounded"></mdui-button-icon>
             <mdui-button-icon
                 icon={volumeIcon}
                 onclick={() => (player.muted = !player.muted)}
-                onkeydown={e =>
-                    e.key === 'Enter' &&
-                    (player.muted = !player.muted)}
+                onkeydown={(e: KeyboardEvent) =>
+                    e.key === 'Enter' && (player.muted = !player.muted)}
                 role="button"
                 tabindex="0"
                 class="text-lg opacity-70"
             ></mdui-button-icon>
-            <Progress bind:value={player.volume} class="w-32" />
+            <Progress bind:value={player.volume} />
         </div>
     </div>
 </mdui-bottom-app-bar>
diff --git a/src/lib/components/Progress.svelte b/src/lib/components/Progress.svelte
index 46f68c9..a521c6c 100644
--- a/src/lib/components/Progress.svelte
+++ b/src/lib/components/Progress.svelte
@@ -1,4 +1,15 @@
-<script>
+<script lang="ts">
+    type SliderProps = {
+        value?: number
+        cssStyle?: string
+        width?: number
+        height?: number
+        thumbHeight?: number
+        onmousedown?: (event: MouseEvent) => void
+        onmouseover?: (event: MouseEvent | FocusEvent) => void
+        onmousemove?: (event: MouseEvent) => void
+    }
+
     let {
         value = $bindable(0),
         cssStyle = '',
@@ -8,37 +19,50 @@
         onmousedown,
         onmouseover,
         onmousemove,
-    } = $props()
+    }: SliderProps = $props()
 
     let startMove = $state(false)
     let dx = 0
-    let inputEl
+    let inputEl: HTMLDivElement | null = null
 
     let progressRaw = $derived(value / 100)
     let scale = $derived((width - 4) / width)
 
-    function mouseDown(e) {
+    function clamp(val: number, min: number, max: number): number {
+        return Math.min(max, Math.max(min, val))
+    }
+
+    function getPercentFromOffset(offsetX: number): number {
+        if (!inputEl) return value
+
+        return clamp((offsetX / inputEl.offsetWidth) * 100, 0, 100)
+    }
+
+    function mouseDown(e: MouseEvent): void {
+        if (!inputEl) return
+
         startMove = true
         dx = e.offsetX
-        let _value = clamp((e.offsetX / inputEl.offsetWidth) * 100, 0, 100)
-        value = _value
+        value = getPercentFromOffset(e.offsetX)
+
         onmousedown?.(e)
     }
 
-    function mouseMove(e) {
+    function mouseMove(e: MouseEvent): void {
         e.stopPropagation()
-        if (!startMove) return
+
+        if (!startMove || !inputEl) return
+
         dx += e.movementX
-        let _value = clamp((dx / inputEl.offsetWidth) * 100, 0, 100)
-        value = _value
+        value = clamp((dx / inputEl.offsetWidth) * 100, 0, 100)
+
         onmousemove?.(e)
     }
-    
-    function handleKeydown(e) {
+
+    function handleKeydown(e: KeyboardEvent): void {
         if (e.key === 'ArrowUp' || e.key === 'ArrowRight') {
             e.preventDefault()
             value = clamp(value + 10, 0, 100)
-            console.log(value)
         } else if (e.key === 'ArrowDown' || e.key === 'ArrowLeft') {
             e.preventDefault()
             value = clamp(value - 10, 0, 100)
@@ -46,28 +70,28 @@
     }
 
     $effect(() => {
-        if (startMove) {
-            const onGlobalMouseUp = () => {
-                startMove = false
-                dx = 0
-            }
-
-            document.addEventListener('mousemove', mouseMove, {
-                passive: true,
-                capture: true,
+        if (!startMove) return
+
+        const onGlobalMouseUp = (): void => {
+            startMove = false
+            dx = 0
+        }
+
+        document.addEventListener('mousemove', mouseMove, {
+            passive: true,
+            capture: true
+        })
+
+        document.addEventListener('mouseup', onGlobalMouseUp)
+
+        return () => {
+            document.removeEventListener('mousemove', mouseMove, {
+                capture: true
             })
-            document.addEventListener('mouseup', onGlobalMouseUp)
 
-            return () => {
-                document.removeEventListener('mousemove', mouseMove)
-                document.removeEventListener('mouseup', onGlobalMouseUp)
-            }
+            document.removeEventListener('mouseup', onGlobalMouseUp)
         }
     })
-
-    function clamp(val, min, max) {
-        return Math.min(max, Math.max(min, val))
-    }
 </script>
 
 <div
@@ -166,4 +190,4 @@
         pointer-events: none;
         transition: all 0s ease;
     }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/lib/components/Slider.svelte b/src/lib/components/Slider.svelte
index c11dfc9..c70e732 100644
--- a/src/lib/components/Slider.svelte
+++ b/src/lib/components/Slider.svelte
@@ -1,67 +1,103 @@
-<script>
+<script lang="ts">
+    import { onMount } from 'svelte'
+
+    type MduiSliderElement = HTMLElement & {
+        value: number | string
+        shadowRoot: ShadowRoot | null
+    }
+
+    type SliderProps = {
+        value?: number
+        classList?: string
+        class?: string
+        duration?: number
+        oninput?: (event: Event) => void
+        onchange?: (event: Event) => void
+    }
+
     let {
         value = $bindable(0),
-        classList,
+        classList = '',
+        class: className = '',
         oninput,
         onchange,
-        duration,
-    } = $props()
-    import { onMount } from 'svelte'
+        duration = 0
+    }: SliderProps = $props()
 
-    let sliderRef = $state(null)
+    let sliderRef = $state<MduiSliderElement | null>(null)
 
     const size = 1.5
 
     const styleText = `
-          .handle .elevation,
-          .handle::before {
+        .handle .elevation,
+        .handle::before {
             position: absolute;
             display: block;
             content: " ";
-            left: ${size / 4}rem!important;
-            top: ${size / 4}rem!important;
-            width: ${size / 2}rem!important;
-            height: ${size / 2}rem!important;
-          }
-
-          .handle {
-            width: ${size}rem!important;
-            height: ${size}rem!important;
-            margin-top: ${-size / 2}rem!important;
-          }
-          `
-
-    function updateSliderStyle(elem) {
+            left: ${size / 4}rem !important;
+            top: ${size / 4}rem !important;
+            width: ${size / 2}rem !important;
+            height: ${size / 2}rem !important;
+        }
+
+        .handle {
+            width: ${size}rem !important;
+            height: ${size}rem !important;
+            margin-top: ${-size / 2}rem !important;
+        }
+    `
+
+    function updateSliderStyle(elem: MduiSliderElement | null): void {
         const shadow = elem?.shadowRoot
-        if (shadow) {
-            const childNodes = Array.from(shadow.childNodes)
-
-            childNodes.forEach(childNode => {
-                if (childNode.nodeName === 'STYLE') {
-                    console.log(childNode.textContent)
-                    childNode.textContent += styleText
-                }
-            })
-
-            if (!childNodes.some(node => node.nodeName === 'STYLE')) {
-                const style = document.createElement('style')
-                style.textContent = styleText
-                shadow.appendChild(style)
-            }
+        if (!shadow) return
+
+        const styleId = 'custom-slider-style'
+        const existingStyle = shadow.querySelector<HTMLStyleElement>(
+            `style[data-id="${styleId}"]`
+        )
+
+        if (existingStyle) {
+            existingStyle.textContent = styleText
+            return
         }
+
+        const style = document.createElement('style')
+        style.dataset.id = styleId
+        style.textContent = styleText
+        shadow.appendChild(style)
+    }
+
+    function getSliderValue(event: Event): number {
+        const target = event.currentTarget as MduiSliderElement | null
+        const rawValue = target?.value ?? 0
+        const numericValue = Number(rawValue)
+
+        return Number.isFinite(numericValue) ? numericValue : 0
+    }
+
+    function handleInput(event: Event): void {
+        value = getSliderValue(event)
+        oninput?.(event)
+    }
+
+    function handleChange(event: Event): void {
+        value = getSliderValue(event)
+        onchange?.(event)
     }
 
     onMount(() => {
-        updateSliderStyle(sliderRef)
+        requestAnimationFrame(() => {
+            updateSliderStyle(sliderRef)
+        })
     })
 </script>
 
 <mdui-slider
     nolabel
     max={duration}
-    {value}
-    class={classList}
-    {oninput}
-    {onchange}
+    value={value}
+    class={`${classList} ${className}`}
+    oninput={handleInput}
+    onchange={handleChange}
     bind:this={sliderRef}
-></mdui-slider>
+></mdui-slider>
\ No newline at end of file
diff --git a/src/lib/components/TrackList.svelte b/src/lib/components/TrackList.svelte
new file mode 100644
index 0000000..6d7fd13
--- /dev/null
+++ b/src/lib/components/TrackList.svelte
@@ -0,0 +1,160 @@
+<script lang="ts">
+    import { player, type TrackInfo } from '$lib/player.svelte'
+    import { trackCovers } from '$lib/trackCovers.svelte'
+    import 'mdui/components/list-item.js'
+    import 'mdui/components/list.js'
+
+    let { tracks }: { tracks: TrackInfo[] } = $props()
+
+    function formatDuration(seconds: number): string {
+        const mins = Math.floor(seconds / 60)
+        const secs = Math.floor(seconds % 60)
+        return `${mins}:${secs.toString().padStart(2, '0')}`
+    }
+
+    function lazyCover(node: HTMLElement, track: TrackInfo) {
+        let currentTrack = track
+
+        const observer = new IntersectionObserver(
+            entries => {
+                const entry = entries[0]
+
+                if (entry.isIntersecting) {
+                    void trackCovers.load(currentTrack)
+                    observer.disconnect()
+                }
+            },
+            {
+                rootMargin: '300px',
+            },
+        )
+
+        observer.observe(node)
+
+        return {
+            update(nextTrack: TrackInfo) {
+                currentTrack = nextTrack
+            },
+            destroy() {
+                observer.disconnect()
+            },
+        }
+    }
+
+    function handlePlay(clickedTrack: TrackInfo, clickedIndex: number) {
+        player.playlist = tracks
+        player.playByIndex(clickedIndex)
+
+        void trackCovers.load(clickedTrack)
+    }
+</script>
+
+<mdui-list class="flex flex-col w-full">
+    <mdui-list-subheader
+        class="flex pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b *:justify-center *:self-center"
+        noninteractive
+    >
+        <div class="w-12 text-center flex">#</div>
+        <div class="flex-1 pl-2 text-left">标题</div>
+        <div class="flex-1 text-left hidden md:block">专辑</div>
+        <div class="w-16">时长</div>
+    </mdui-list-subheader>
+
+    <div class="flex flex-col gap-1 mt-2">
+        {#each tracks as track, index (track.path)}
+            {@const isCurrent =
+                player.playlist[player.currentIndex]?.path === track.path}
+            {@const cover = trackCovers.get(track)}
+
+            <mdui-list-item
+                class="group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none
+             active:scale-[0.995] themed-item
+             {isCurrent ? 'themed-item-active' : ''}"
+                ondblclick={() => handlePlay(track, index)}
+                role="button"
+                tabindex="0"
+            >
+                <mdui-ripple></mdui-ripple>
+
+                <div class="flex items-center w-full">
+                    <div
+                        class="w-12 flex justify-center items-center text-sm themed-text-secondary z-10 shrink-0"
+                    >
+                        {#if isCurrent && player.playing}
+                            <div class="flex items-end gap-0.5 h-3.5">
+                                <span
+                                    class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate]"
+                                ></span>
+                                <span
+                                    class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.2s]"
+                                ></span>
+                                <span
+                                    class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.4s]"
+                                ></span>
+                            </div>
+                        {:else}
+                            <span
+                                class={isCurrent
+                                    ? 'font-bold themed-text-accent'
+                                    : 'group-hover:text-[rgb(var(--mdui-color-on-surface))]'}
+                            >
+                                {index + 1}
+                            </span>
+                        {/if}
+                    </div>
+
+                    <div
+                        class="flex-1 flex items-center gap-4 pl-3 overflow-hidden z-10"
+                    >
+                        <div
+                            use:lazyCover={track}
+                            class="w-10 h-10 rounded-md overflow-hidden themed-surface-container shrink-0 transition-transform duration-300 group-hover:scale-105 group-hover:shadow-md"
+                        >
+                            {#if cover}
+                                <img
+                                    src={cover}
+                                    alt="cover"
+                                    class="w-full h-full object-cover"
+                                    loading="lazy"
+                                />
+                            {:else}
+                                <div
+                                    class="w-full h-full flex items-center justify-center text-base themed-surface-high"
+                                >
+                                    🎵
+                                </div>
+                            {/if}
+                        </div>
+
+                        <div class="flex flex-col min-w-0">
+                            <span
+                                class="text-sm font-medium truncate {isCurrent
+                                    ? 'themed-text-accent'
+                                    : 'themed-text-primary'}"
+                            >
+                                {track.title}
+                            </span>
+                            <span
+                                class="text-xs truncate themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] mt-0.5"
+                            >
+                                {track.artist}
+                            </span>
+                        </div>
+                    </div>
+
+                    <div
+                        class="flex-1 text-sm truncate hidden md:block z-10 themed-text-secondary"
+                    >
+                        {track.album}
+                    </div>
+
+                    <div
+                        class="w-16 text-sm font-mono z-10 themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] shrink-0"
+                    >
+                        {formatDuration(track.duration)}
+                    </div>
+                </div>
+            </mdui-list-item>
+        {/each}
+    </div>
+</mdui-list>
diff --git a/src/lib/library.svelte.ts b/src/lib/library.svelte.ts
new file mode 100644
index 0000000..c41caf6
--- /dev/null
+++ b/src/lib/library.svelte.ts
@@ -0,0 +1,50 @@
+import { invoke } from '@tauri-apps/api/core'
+import type { TrackInfo } from './player.svelte'
+
+class MusicLibrary {
+    tracks = $state<TrackInfo[]>([])
+    isLoading = $state(false)
+    error = $state<string | null>(null)
+
+    private refreshPromise: Promise<TrackInfo[]> | null = null
+
+    async refresh(options: { force?: boolean } = {}): Promise<TrackInfo[]> {
+        const { force = false } = options
+
+        if (this.refreshPromise) {
+            return this.refreshPromise
+        }
+
+        if (!force && this.tracks.length > 0) {
+            return this.tracks
+        }
+
+        this.isLoading = true
+        this.error = null
+
+        this.refreshPromise = (async () => {
+            try {
+                console.trace('[MusicLibrary] refresh called')
+                console.log('[MusicLibrary] invoke load_music_library start')
+
+                const tracks = await invoke<TrackInfo[]>('load_music_library')
+
+                console.log('[MusicLibrary] invoke load_music_library end', tracks.length)
+
+                this.tracks = tracks
+                return tracks
+            } catch (err) {
+                console.error('全局加载媒体库失败:', err)
+                this.error = String(err)
+                return this.tracks
+            } finally {
+                this.isLoading = false
+                this.refreshPromise = null
+            }
+        })()
+
+        return this.refreshPromise
+    }
+}
+
+export const musicLibrary = new MusicLibrary()
\ No newline at end of file
diff --git a/src/lib/player.svelte.ts b/src/lib/player.svelte.ts
index cbf8610..6ff4268 100644
--- a/src/lib/player.svelte.ts
+++ b/src/lib/player.svelte.ts
@@ -1,4 +1,5 @@
 import { invoke } from "@tauri-apps/api/core"
+import { recentlyPlayed } from "./recent.svelte"
 
 
 class Player {
@@ -32,6 +33,9 @@ class Player {
                 return
             }
             this.currentTime = await invoke('current_time')
+            if (this.currentTrack && this.currentTime >= this.currentTrack.duration) {
+                this.next()
+            }
         }, 250)
     }
 
@@ -63,11 +67,17 @@ class Player {
 
         try {
             const track = this.playlist[index]
-            await invoke('play_music', { fullPath: track.path })
 
+            if (!track) {
+                return
+            }
+            
             this.currentIndex = index
             this.currentTime = 0
             this.playing = true
+            await invoke('play_music', { fullPath: track.path })
+
+            recentlyPlayed.add(track)
 
             this.startPolling()
         } catch (err) {
@@ -78,7 +88,7 @@ class Player {
     switchTrack = async (step: number) => {
         const len = this.playlist.length
         if (len === 0) return
-        
+
         const newIndex = (this.currentIndex + step + len) % len
         this.playByIndex(newIndex)
     }
@@ -92,8 +102,8 @@ export interface TrackInfo {
     artist: string
     album: string
     duration: number
-    sample_rate?: number
-    cover?: string
+    sample_rate?: number | null
+    cover?: string | null
     path: string
 }
 
diff --git a/src/lib/recent.svelte.ts b/src/lib/recent.svelte.ts
new file mode 100644
index 0000000..beda1b0
--- /dev/null
+++ b/src/lib/recent.svelte.ts
@@ -0,0 +1,74 @@
+import type { TrackInfo } from '$lib/player.svelte'
+import { invoke } from '@tauri-apps/api/core'
+
+class RecentlyPlayed {
+    tracks = $state<TrackInfo[]>([])
+    isLoading = $state(false)
+    error = $state<string | null>(null)
+
+    private loadPromise: Promise<TrackInfo[]> | null = null
+
+    async load(): Promise<TrackInfo[]> {
+        if (this.loadPromise) {
+            return this.loadPromise
+        }
+
+        this.isLoading = true
+        this.error = null
+
+        this.loadPromise = invoke<TrackInfo[]>('load_recently_played')
+            .then((tracks) => {
+                this.tracks = tracks
+                return tracks
+            })
+            .catch((err) => {
+                console.error('加载最近播放失败:', err)
+                this.error = String(err)
+                return this.tracks
+            })
+            .finally(() => {
+                this.isLoading = false
+                this.loadPromise = null
+            })
+
+        return this.loadPromise
+    }
+
+    async add(track: TrackInfo): Promise<TrackInfo[]> {
+        const safeTrack: TrackInfo = {
+            ...track,
+            cover: null
+        }
+
+        // 先立即更新前端状态，让 UI 马上变化
+        this.tracks = [
+            safeTrack,
+            ...this.tracks.filter((item) => item.path !== safeTrack.path)
+        ].slice(0, 100)
+
+        try {
+            const tracks = await invoke<TrackInfo[]>('add_recently_played', {
+                track: safeTrack
+            })
+
+            this.tracks = tracks
+            return tracks
+        } catch (err) {
+            console.error('写入最近播放失败:', err)
+            this.error = String(err)
+            return this.tracks
+        }
+    }
+
+    async clear() {
+        try {
+            await invoke('clear_recently_played')
+            this.tracks = []
+        } catch (err) {
+            console.error('清空最近播放失败:', err)
+            this.error = String(err)
+        }
+    }
+}
+
+export const recentlyPlayed = new RecentlyPlayed()
\ No newline at end of file
diff --git a/src/lib/trackCovers.svelte.ts b/src/lib/trackCovers.svelte.ts
new file mode 100644
index 0000000..e19289a
--- /dev/null
+++ b/src/lib/trackCovers.svelte.ts
@@ -0,0 +1,51 @@
+import type { TrackInfo } from '$lib/player.svelte'
+import { invoke } from '@tauri-apps/api/core'
+
+class TrackCovers {
+    covers = $state<Record<string, string | null>>({})
+    loading = $state<Record<string, boolean>>({})
+
+    private promises = new Map<string, Promise<string | null>>()
+
+    async load(track: TrackInfo | null | undefined): Promise<string | null> {
+        if (!track?.path) return null
+
+        if (this.covers[track.path] !== undefined) {
+            return this.covers[track.path]
+        }
+
+        if (this.promises.has(track.path)) {
+            return await this.promises.get(track.path)!
+        }
+
+        this.loading[track.path] = true
+
+        const promise = invoke<string | null>('get_track_cover', {
+            fullPath: track.path
+        })
+            .then((cover) => {
+                this.covers[track.path] = cover
+                return cover
+            })
+            .catch((err) => {
+                console.error('加载封面失败:', track.path, err)
+                this.covers[track.path] = null
+                return null
+            })
+            .finally(() => {
+                this.loading[track.path] = false
+                this.promises.delete(track.path)
+            })
+
+        this.promises.set(track.path, promise)
+
+        return await promise
+    }
+
+    get(track: TrackInfo | null | undefined): string | null {
+        if (!track?.path) return null
+        return this.covers[track.path] ?? null
+    }
+}
+
+export const trackCovers = new TrackCovers()
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index b084323..ddb267a 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,5 @@
-<script>
+<script lang="ts">
   import Appbar from '$lib/components/Appbar.svelte'
-  import Header from '$lib/components/Header.svelte'
   import NavRail from '$lib/components/NavRail.svelte'
   import PlayerBar from '$lib/components/PlayerBar.svelte'
   import 'mdui'
@@ -18,8 +17,6 @@
   <mdui-layout-main
     class="flex flex-col h-screen w-screen overflow-hidden bg-(--controlWhite) text-(--controlBlack)"
   >
-    <Header />
-
     {@render children()}
   </mdui-layout-main>
 </mdui-layout>
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
new file mode 100644
index 0000000..d796582
--- /dev/null
+++ b/src/routes/library/+page.svelte
@@ -0,0 +1,61 @@
+<script lang="ts">
+    import TrackList from '$lib/components/TrackList.svelte'
+    import { musicLibrary } from '$lib/library.svelte'
+    import { player } from '$lib/player.svelte'
+    import 'mdui/components/list-item.js'
+    import 'mdui/components/list-subheader.js'
+    import 'mdui/components/list.js'
+    import 'mdui/components/ripple.js'
+    import { onMount } from 'svelte'
+
+    let didInit = false
+
+    onMount(() => {
+        if (didInit) return
+        didInit = true
+
+        void initLibraryPage()
+    })
+
+    async function initLibraryPage() {
+        try {
+            console.trace('[library/+page.svelte] onMount init')
+
+            const tracks = await musicLibrary.refresh()
+
+            if (player.playlist.length === 0 && tracks.length > 0) {
+                player.playlist = tracks
+
+                if (player.currentIndex === -1) {
+                    player.currentIndex = 0
+                }
+            }
+        } catch (err) {
+            console.error('加载本地媒体库失败:', err)
+        }
+    }
+</script>
+
+<section class="w-full min-h-full overflow-y-auto">
+    {#if musicLibrary.tracks.length !== 0}
+        <header
+            class="flex justify-between items-end pb-3 border-b themed-border"
+        >
+            <h2 class="text-2xl font-bold tracking-wide themed-text-primary">
+                我的音乐库
+            </h2>
+            <span class="text-sm themed-text-secondary"
+                >{musicLibrary.tracks.length} 首歌曲</span
+            >
+        </header>
+        <TrackList tracks={musicLibrary.tracks} />
+    {:else}
+        <div class="flex h-full w-full justify-center items-center">
+            {#if musicLibrary.isLoading}
+                正在加载媒体库...
+            {:else}
+                没有音乐哦
+            {/if}
+        </div>
+    {/if}
+</section>
diff --git a/src/routes/recent/+page.svelte b/src/routes/recent/+page.svelte
new file mode 100644
index 0000000..83f583e
--- /dev/null
+++ b/src/routes/recent/+page.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+    import TrackList from '$lib/components/TrackList.svelte'
+    import { recentlyPlayed } from '$lib/recent.svelte'
+    import { onMount } from 'svelte'
+
+    import 'mdui/components/button.js'
+    import 'mdui/components/circular-progress.js'
+
+    onMount(() => {
+        void recentlyPlayed.load()
+    })
+</script>
+
+<svelte:head>
+    <title>最近播放</title>
+</svelte:head>
+
+<section class="w-full min-h-full overflow-y-auto">
+    <header class="flex items-end justify-between gap-4 shrink-0 pb-3 border-b themed-border">
+        <div class="min-w-0">
+            <h1 class="text-2xl font-bold themed-text-primary">最近播放</h1>
+            <p class="text-sm themed-text-secondary mt-1">
+                这里会显示你最近播放过的歌曲
+            </p>
+        </div>
+
+        {#if recentlyPlayed.tracks.length > 0}
+            <mdui-button
+                variant="outlined"
+                onclick={() => recentlyPlayed.clear()}
+                onkeydown={(e: KeyboardEvent) => {
+                    if (e.key === 'Enter' || e.key === ' ') recentlyPlayed.clear()
+                }}
+                role="button"
+                tabindex="0"
+            >
+                清空
+            </mdui-button>
+        {/if}
+    </header>
+
+    {#if recentlyPlayed.isLoading}
+        <div class="flex-1 flex items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else if recentlyPlayed.error}
+        <div class="flex-1 flex items-center justify-center text-red-500">
+            {recentlyPlayed.error}
+        </div>
+    {:else if recentlyPlayed.tracks.length === 0}
+        <div
+            class="flex-1 flex flex-col items-center justify-center gap-2 themed-text-secondary"
+        >
+            <div class="text-5xl">🎧</div>
+            <div class="text-base font-medium">还没有最近播放记录</div>
+            <div class="text-sm">播放一首歌后，它会出现在这里</div>
+        </div>
+    {:else}
+        <div class="flex-1 overflow-auto">
+            <TrackList tracks={recentlyPlayed.tracks} />
+        </div>
+    {/if}
+</section>
\ No newline at end of file

From 8af9d2e1147f2d69984cfbc791d197800c26597c Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 24 May 2026 03:11:47 +0800
Subject: [PATCH 07/39] Update TrackList.svelte

add color for Track List Component
---
 src/lib/components/TrackList.svelte | 60 +++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/src/lib/components/TrackList.svelte b/src/lib/components/TrackList.svelte
index 6d7fd13..07d93f2 100644
--- a/src/lib/components/TrackList.svelte
+++ b/src/lib/components/TrackList.svelte
@@ -158,3 +158,63 @@
         {/each}
     </div>
 </mdui-list>
+
+<style>
+    @keyframes bounce {
+        from {
+            height: 4px;
+        }
+        to {
+            height: 14px;
+        }
+    }
+
+    .themed-text-primary {
+        color: rgb(var(--mdui-color-on-surface));
+    }
+
+    .themed-text-secondary {
+        color: rgb(var(--mdui-color-on-surface-variant));
+    }
+
+    .themed-text-accent {
+        color: rgb(var(--mdui-color-primary));
+    }
+
+    .themed-border {
+        border-color: rgb(var(--mdui-color-outline-variant));
+    }
+
+    .themed-border-b {
+        border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
+    }
+
+    .themed-surface-container {
+        background-color: rgb(var(--mdui-color-surface-container-highest));
+    }
+
+    .themed-surface-high {
+        background-color: rgb(var(--mdui-color-surface-container-high));
+    }
+
+    .themed-bar {
+        background-color: rgb(var(--mdui-color-primary));
+    }
+
+    .themed-item {
+        background-color: transparent;
+        border: 1px solid transparent;
+    }
+
+    .themed-item:hover {
+        background-color: rgb(var(--mdui-color-surface-container));
+        box-shadow:
+            0 4px 6px -1px rgba(0, 0, 0, 0.1),
+            0 2px 4px -1px rgba(0, 0, 0, 0.06);
+    }
+
+    .themed-item-active {
+        background-color: rgb(var(--mdui-color-surface-container));
+        border-color: rgb(var(--mdui-color-outline-variant));
+    }
+</style>

From deda3e97836f759d38141f32dee955e380148561 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 24 May 2026 23:22:13 +0800
Subject: [PATCH 08/39] feat: add media library pages and shared components

- add tracks, artists, and albums library pages
- introduce reusable MediaGrid for media card layouts
- add LibraryFilters to share search and sort controls
- wrap mdui select and text field as reusable base components
- add SearchField preset for repeated search inputs
- define shared Track, Artist, Album, and Playlist types
- reorganize components, features, state, utils, and types directories
- refactor PlayerBar, TrackList, and PlaylistGrid structure
- clean up redundant files and improve import paths
---
 src-tauri/src/commands.rs                     |  32 +--
 src/app.css                                   |   5 +
 src/lib/components/Header.svelte              |   9 -
 src/lib/components/PlayerBar.svelte           | 133 ----------
 src/lib/components/PlaylistCard.svelte        |  28 --
 src/lib/components/Playlists.svelte           |  19 --
 src/lib/components/RecentSongs.svelte         |  19 --
 src/lib/components/SongCard.svelte            |  36 ---
 src/lib/components/TrackList.svelte           | 220 ----------------
 src/lib/components/base/Button.svelte         |  14 +
 src/lib/components/base/IconButton.svelte     |  12 +
 .../{Slider.svelte => base/MduiSlider.svelte} |   0
 src/lib/components/base/SearchField.svelte    |  34 +++
 src/lib/components/base/Select.svelte         |  73 ++++++
 .../{Progress.svelte => base/Slider.svelte}   |   0
 src/lib/components/base/TextField.svelte      |  56 ++++
 src/lib/components/media/MediaGrid.svelte     | 119 +++++++++
 src/lib/features/Filters.svelte               |  37 +++
 src/lib/features/PlayerBar.svelte             | 131 ++++++++++
 src/lib/features/PlaylistGrid.svelte          |  23 ++
 src/lib/features/TrackList.svelte             | 240 ++++++++++++++++++
 .../shell}/Appbar.svelte                      |   0
 .../shell}/NavRail.svelte                     |  20 +-
 .../covers.svelte.ts}                         |   7 +-
 src/lib/{ => state}/library.svelte.ts         |  16 +-
 src/lib/{ => state}/player.svelte.ts          |  16 +-
 src/lib/{ => state}/recent.svelte.ts          |  17 +-
 src/lib/types/index.ts                        |   1 +
 src/lib/types/types.ts                        |  38 +++
 src/lib/utils/index.ts                        |   1 +
 src/lib/utils/time.ts                         |  34 +++
 src/routes/+layout.svelte                     |   6 +-
 src/routes/+page.svelte                       |   4 +-
 src/routes/album/+page.svelte                 | 196 ++++++++++++++
 src/routes/artists/+page.svelte               | 177 +++++++++++++
 src/routes/library/+page.svelte               | 154 +++++++----
 src/routes/recent/+page.svelte                |  30 +--
 37 files changed, 1369 insertions(+), 588 deletions(-)
 delete mode 100644 src/lib/components/Header.svelte
 delete mode 100644 src/lib/components/PlayerBar.svelte
 delete mode 100644 src/lib/components/PlaylistCard.svelte
 delete mode 100644 src/lib/components/Playlists.svelte
 delete mode 100644 src/lib/components/RecentSongs.svelte
 delete mode 100644 src/lib/components/SongCard.svelte
 delete mode 100644 src/lib/components/TrackList.svelte
 create mode 100644 src/lib/components/base/Button.svelte
 create mode 100644 src/lib/components/base/IconButton.svelte
 rename src/lib/components/{Slider.svelte => base/MduiSlider.svelte} (100%)
 create mode 100644 src/lib/components/base/SearchField.svelte
 create mode 100644 src/lib/components/base/Select.svelte
 rename src/lib/components/{Progress.svelte => base/Slider.svelte} (100%)
 create mode 100644 src/lib/components/base/TextField.svelte
 create mode 100644 src/lib/components/media/MediaGrid.svelte
 create mode 100644 src/lib/features/Filters.svelte
 create mode 100644 src/lib/features/PlayerBar.svelte
 create mode 100644 src/lib/features/PlaylistGrid.svelte
 create mode 100644 src/lib/features/TrackList.svelte
 rename src/lib/{components => features/shell}/Appbar.svelte (100%)
 rename src/lib/{components => features/shell}/NavRail.svelte (73%)
 rename src/lib/{trackCovers.svelte.ts => state/covers.svelte.ts} (87%)
 rename src/lib/{ => state}/library.svelte.ts (67%)
 rename src/lib/{ => state}/player.svelte.ts (91%)
 rename src/lib/{ => state}/recent.svelte.ts (78%)
 create mode 100644 src/lib/types/index.ts
 create mode 100644 src/lib/types/types.ts
 create mode 100644 src/lib/utils/index.ts
 create mode 100644 src/lib/utils/time.ts
 create mode 100644 src/routes/album/+page.svelte
 create mode 100644 src/routes/artists/+page.svelte

diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index 8864402..0e6afdb 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -39,7 +39,7 @@ fn get_audio_state() -> &'static Mutex<AudioState> {
 }
 
 #[derive(Serialize, Deserialize, Clone)]
-pub struct TrackInfo {
+pub struct Track {
     title: String,
     artist: String,
     album: String,
@@ -143,7 +143,7 @@ pub async fn set_volume(volume: u8) -> Result<(), String> {
     Ok(())
 }
 
-fn parse_single_track(file_path: &Path) -> Option<TrackInfo> {
+fn parse_single_track(file_path: &Path) -> Option<Track> {
     let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
     let tag = tagged_file
         .primary_tag()
@@ -174,7 +174,7 @@ fn parse_single_track(file_path: &Path) -> Option<TrackInfo> {
     let duration = props.duration().as_secs_f64();
     let sample_rate = props.sample_rate();
 
-    Some(TrackInfo {
+    Some(Track {
         title,
         artist,
         album,
@@ -213,7 +213,7 @@ pub async fn get_track_cover(full_path: String) -> Result<Option<String>, String
 
 async fn scan_music_directory_logic(
     app_handle: &tauri::AppHandle,
-) -> Result<Vec<TrackInfo>, String> {
+) -> Result<Vec<Track>, String> {
     let music_dir = app_handle
         .path()
         .audio_dir()
@@ -225,7 +225,7 @@ async fn scan_music_directory_logic(
     Ok(tracks)
 }
 
-fn visit_dirs(dir: &Path, tracks: &mut Vec<TrackInfo>) {
+fn visit_dirs(dir: &Path, tracks: &mut Vec<Track>) {
     if let Ok(entries) = fs::read_dir(dir) {
         for entry in entries.flatten() {
             let path = entry.path();
@@ -254,7 +254,7 @@ static SUPPORTED_EXT: [&str; 4] = ["mp3", "flac", "m4a", "wav"];
 pub async fn scan_music_directory(
     app_handle: tauri::AppHandle,
     dir_path: String,
-) -> Result<Vec<TrackInfo>, String> {
+) -> Result<Vec<Track>, String> {
     let root_path = Path::new(&dir_path);
     if !root_path.is_dir() {
         return Err("Invalid directory path".into());
@@ -296,7 +296,7 @@ pub async fn scan_music_directory(
 }
 
 #[command]
-pub async fn load_music_library(app_handle: tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+pub async fn load_music_library(app_handle: tauri::AppHandle) -> Result<Vec<Track>, String> {
     let app_data_path = app_handle
         .path()
         .app_data_dir()
@@ -314,7 +314,7 @@ pub async fn load_music_library(app_handle: tauri::AppHandle) -> Result<Vec<Trac
 
     let file = File::open(&json_file_path).map_err(|e| format!("无法打开库文件: {}", e))?;
 
-    match serde_json::from_reader::<_, Vec<TrackInfo>>(file) {
+    match serde_json::from_reader::<_, Vec<Track>>(file) {
         Ok(mut library) => {
             let had_covers = library.iter().any(|track| track.cover.is_some());
 
@@ -336,7 +336,7 @@ pub async fn load_music_library(app_handle: tauri::AppHandle) -> Result<Vec<Trac
     }
 }
 
-async fn rebuild_and_get_library(app_handle: &tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+async fn rebuild_and_get_library(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
     let fresh_library = scan_music_directory_logic(app_handle).await?;
 
     save_music_library(app_handle, &fresh_library)?;
@@ -346,7 +346,7 @@ async fn rebuild_and_get_library(app_handle: &tauri::AppHandle) -> Result<Vec<Tr
 
 pub fn save_music_library(
     app_handle: &tauri::AppHandle,
-    library: &Vec<TrackInfo>,
+    library: &Vec<Track>,
 ) -> Result<(), String> {
     let app_data_path = app_handle
         .path()
@@ -377,7 +377,7 @@ fn recently_played_path(app_handle: &tauri::AppHandle) -> Result<std::path::Path
     Ok(app_data_path.join(RECENTLY_PLAYED_FILE))
 }
 
-fn read_recently_played(app_handle: &tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+fn read_recently_played(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
     let file_path = recently_played_path(app_handle)?;
 
     if !file_path.exists() {
@@ -386,11 +386,11 @@ fn read_recently_played(app_handle: &tauri::AppHandle) -> Result<Vec<TrackInfo>,
 
     let file = File::open(&file_path).map_err(|e| format!("无法打开最近播放文件: {}", e))?;
 
-    serde_json::from_reader::<_, Vec<TrackInfo>>(file)
+    serde_json::from_reader::<_, Vec<Track>>(file)
         .map_err(|e| format!("无法解析最近播放文件: {}", e))
 }
 
-fn save_recently_played(app_handle: &tauri::AppHandle, tracks: &[TrackInfo]) -> Result<(), String> {
+fn save_recently_played(app_handle: &tauri::AppHandle, tracks: &[Track]) -> Result<(), String> {
     let file_path = recently_played_path(app_handle)?;
     let temp_file_path = file_path.with_extension("json.tmp");
 
@@ -406,15 +406,15 @@ fn save_recently_played(app_handle: &tauri::AppHandle, tracks: &[TrackInfo]) ->
 }
 
 #[command]
-pub async fn load_recently_played(app_handle: tauri::AppHandle) -> Result<Vec<TrackInfo>, String> {
+pub async fn load_recently_played(app_handle: tauri::AppHandle) -> Result<Vec<Track>, String> {
     read_recently_played(&app_handle)
 }
 
 #[command]
 pub async fn add_recently_played(
     app_handle: tauri::AppHandle,
-    track: TrackInfo,
-) -> Result<Vec<TrackInfo>, String> {
+    track: Track,
+) -> Result<Vec<Track>, String> {
     let mut list = read_recently_played(&app_handle).unwrap_or_default();
 
     let mut track = track;
diff --git a/src/app.css b/src/app.css
index 348e34e..3f639d8 100644
--- a/src/app.css
+++ b/src/app.css
@@ -93,6 +93,11 @@ h6 {
   font-weight: inherit;
 }
 
+p {
+  margin: 0;
+  padding: 0;
+}
+
 /*
   Reset links to optimize for opt-in styling instead of opt-out.
 */
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
deleted file mode 100644
index e8e2c03..0000000
--- a/src/lib/components/Header.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-<script lang="ts">
-    import 'mdui/components/button.js'
-</script>
-
-<header
-    class="flex items-center justify-between px-8 py-4 bg-(--controlBackground) border-b border-(--controlGray) mt-14 shadow-sm"
->
-    <div class="header-left">Header PlaceHolder</div>
-</header>
diff --git a/src/lib/components/PlayerBar.svelte b/src/lib/components/PlayerBar.svelte
deleted file mode 100644
index 55675ce..0000000
--- a/src/lib/components/PlayerBar.svelte
+++ /dev/null
@@ -1,133 +0,0 @@
-<script lang="ts">
-    import { player } from '$lib/player.svelte'
-    import { trackCovers } from '$lib/trackCovers.svelte'
-    import Progress from './Progress.svelte'
-    import Slider from './Slider.svelte'
-
-    let slider = $state<Slider | null>(null)
-    let currentCover = $state<string | null>(null)
-
-    let volumeIcon = $derived(getVolumeIcon(player.volume, player.muted))
-
-    function getVolumeIcon(volume: number, muted: boolean) {
-        if (muted) return 'volume_off--rounded'
-        if (volume === 0) return 'volume_mute--rounded'
-        return volume > 50 ? 'volume_up--rounded' : 'volume_down--rounded'
-    }
-
-    function formatTime(seconds: number) {
-        if (!seconds || !isFinite(seconds)) return '00:00'
-        const m = Math.floor(seconds / 60)
-        const s = Math.floor(seconds % 60)
-        return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
-    }
-
-    function handleSeekInput(e: Event): void {
-        const target = e.currentTarget as HTMLElement & {
-            value: number | string
-        }
-
-        player.seek(Number(target.value))
-    }
-
-    $effect(() => {
-        const track = player.currentTrack
-
-        if (!track) {
-            currentCover = null
-            return
-        }
-
-        currentCover = trackCovers.get(track)
-
-        trackCovers.load(track).then(cover => {
-            if (player.currentTrack?.path === track.path) {
-                currentCover = cover
-            }
-        })
-    })
-</script>
-
-<mdui-bottom-app-bar
-    class="relative flex flex-col h-24 px-4 pb-2"
-    style="--z-index: 10"
->
-    <div
-        class="absolute top-2 left-0 w-full flex items-center -translate-y-1/2"
-    >
-        <span class="text-xs tabular-nums text-black min-w-10 text-right">
-            {formatTime(player.currentTime)}
-        </span>
-        <div class="flex-1">
-            <Slider
-                bind:value={player.currentTime}
-                bind:this={slider}
-                oninput={handleSeekInput}
-                duration={player.currentTrack?.duration ?? 0}
-            />
-        </div>
-        <span class="text-xs tabular-nums text-black min-w-10">
-            {formatTime(player.currentTrack?.duration ?? 0)}
-        </span>
-    </div>
-
-    <div class="flex items-center w-full h-full mt-2">
-        <div class="flex flex-1 min-w-37.5 gap-2">
-            <img
-                src={currentCover ?? '/default_cover.png'}
-                alt="Album Cover"
-                class="w-16 h-16 rounded object-cover shadow-sm bg-gray-200"
-            />
-            <div class="flex flex-col justify-center overflow-hidden">
-                <div class="text-sm font-medium truncate">
-                    {player.currentTrack?.title ?? '未在播放'}
-                </div>
-                <div class="text-xs opacity-70 truncate">
-                    {player.currentTrack?.artist ?? '未知艺术家'}
-                </div>
-            </div>
-        </div>
-
-        <div class="flex items-center gap-2">
-            <mdui-button-icon
-                icon="skip_previous--rounded"
-                role="button"
-                tabindex="0"
-                onclick={() => player.prev()}
-                onkeydown={(e: KeyboardEvent) =>
-                    e.key === 'Enter' && player.prev()}
-            ></mdui-button-icon>
-            <mdui-button-icon
-                variant="filled"
-                icon={player.playing ? 'pause--rounded' : 'play_arrow--rounded'}
-                role="button"
-                tabindex="0"
-                onclick={() => player.toggle()}
-                onkeydown={(e: KeyboardEvent) =>
-                    e.key === 'Enter' && player.toggle()}
-            >
-            </mdui-button-icon>
-            <mdui-button-icon
-                icon="skip_next--rounded"
-                role="button"
-                tabindex="0"
-                onclick={() => player.next()}
-                onkeydown={(e: KeyboardEvent) =>
-                    e.key === 'Enter' && player.next()}
-            ></mdui-button-icon>
-        </div>
-        <div class="flex flex-1 items-center min-w-37.5 justify-end">
-            <mdui-button-icon icon="playlist_play--rounded"></mdui-button-icon>
-            <mdui-button-icon
-                icon={volumeIcon}
-                onclick={() => (player.muted = !player.muted)}
-                onkeydown={(e: KeyboardEvent) =>
-                    e.key === 'Enter' && (player.muted = !player.muted)}
-                role="button"
-                tabindex="0"
-                class="text-lg opacity-70"
-            ></mdui-button-icon>
-            <Progress bind:value={player.volume} />
-        </div>
-    </div>
-</mdui-bottom-app-bar>
diff --git a/src/lib/components/PlaylistCard.svelte b/src/lib/components/PlaylistCard.svelte
deleted file mode 100644
index eed8668..0000000
--- a/src/lib/components/PlaylistCard.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-<script lang="ts">
-  export let playlist: {
-    id: number
-    name: string
-    cover: string
-  }
-</script>
-
-<div class="transition-transform duration-200 hover:-translate-y-2">
-  <md-card
-    style="--md-card-container-color: var(--controlBackground2); --md-card-container-shape: 12px;"
-    class="p-4 h-full flex flex-col"
-  >
-    <div
-      class="w-full aspect-square rounded-lg overflow-hidden mb-4 transition-all duration-300 hover:scale-105 hover:shadow-lg"
-    >
-      <img
-        src={playlist.cover}
-        alt={playlist.name}
-        class="w-full h-full object-cover"
-      />
-    </div>
-    <div class="playlist-info">
-      <h3 class="text-base font-medium mb-2">{playlist.name}</h3>
-      <p class="text-sm text-(--controlBlack52)">播放列表</p>
-    </div>
-  </md-card>
-</div>
\ No newline at end of file
diff --git a/src/lib/components/Playlists.svelte b/src/lib/components/Playlists.svelte
deleted file mode 100644
index 7020867..0000000
--- a/src/lib/components/Playlists.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script lang="ts">
-  import PlaylistCard from './PlaylistCard.svelte'
-
-  export let playlists: Array<{
-    id: number
-    name: string
-    cover: string
-  }>
-</script>
-
-<section class="mb-12">
-  <div
-    class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-6"
-  >
-    {#each playlists as playlist}
-      <PlaylistCard {playlist} />
-    {/each}
-  </div>
-</section>
\ No newline at end of file
diff --git a/src/lib/components/RecentSongs.svelte b/src/lib/components/RecentSongs.svelte
deleted file mode 100644
index 1b9b6b2..0000000
--- a/src/lib/components/RecentSongs.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script lang="ts">
-  import SongCard from './SongCard.svelte'
-
-  export let songs: Array<{
-    id: number
-    title: string
-    artist: string
-    album: string
-    cover: string
-  }>
-</script>
-
-<section>
-  <div class="flex flex-col gap-4">
-    {#each songs as song}
-      <SongCard {song} />
-    {/each}
-  </div>
-</section>
\ No newline at end of file
diff --git a/src/lib/components/SongCard.svelte b/src/lib/components/SongCard.svelte
deleted file mode 100644
index adbe7c7..0000000
--- a/src/lib/components/SongCard.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-<script lang="ts">
-  export let song: {
-    id: number
-    title: string
-    artist: string
-    album: string
-    cover: string
-  }
-</script>
-
-<md-card
-  style="--md-card-container-color: var(--controlBackground2); --md-card-container-shape: 8px;"
-  class="p-4 flex items-center gap-4"
->
-  <div class="w-14 h-14 rounded overflow-hidden">
-    <img
-      src={song.cover}
-      alt={song.title}
-      class="w-full h-full object-cover"
-    />
-  </div>
-  <div class="flex-1">
-    <h3 class="text-base font-medium mb-1">{song.title}</h3>
-    <p class="text-sm text-(--controlBlack52)">
-      {song.artist} - {song.album}
-    </p>
-  </div>
-  <div class="flex gap-2">
-    <md-icon-button>
-      <md-icon class="material-symbols-rounded">play_arrow</md-icon>
-    </md-icon-button>
-    <md-icon-button>
-      <md-icon class="material-symbols-rounded">more_vert</md-icon>
-    </md-icon-button>
-  </div>
-</md-card>
\ No newline at end of file
diff --git a/src/lib/components/TrackList.svelte b/src/lib/components/TrackList.svelte
deleted file mode 100644
index 07d93f2..0000000
--- a/src/lib/components/TrackList.svelte
+++ /dev/null
@@ -1,220 +0,0 @@
-<script lang="ts">
-    import { player, type TrackInfo } from '$lib/player.svelte'
-    import { trackCovers } from '$lib/trackCovers.svelte'
-    import 'mdui/components/list-item.js'
-    import 'mdui/components/list.js'
-
-    let { tracks }: { tracks: TrackInfo[] } = $props()
-
-    function formatDuration(seconds: number): string {
-        const mins = Math.floor(seconds / 60)
-        const secs = Math.floor(seconds % 60)
-        return `${mins}:${secs.toString().padStart(2, '0')}`
-    }
-
-    function lazyCover(node: HTMLElement, track: TrackInfo) {
-        let currentTrack = track
-
-        const observer = new IntersectionObserver(
-            entries => {
-                const entry = entries[0]
-
-                if (entry.isIntersecting) {
-                    void trackCovers.load(currentTrack)
-                    observer.disconnect()
-                }
-            },
-            {
-                rootMargin: '300px',
-            },
-        )
-
-        observer.observe(node)
-
-        return {
-            update(nextTrack: TrackInfo) {
-                currentTrack = nextTrack
-            },
-            destroy() {
-                observer.disconnect()
-            },
-        }
-    }
-
-    function handlePlay(clickedTrack: TrackInfo, clickedIndex: number) {
-        player.playlist = tracks
-        player.playByIndex(clickedIndex)
-
-        void trackCovers.load(clickedTrack)
-    }
-</script>
-
-<mdui-list class="flex flex-col w-full">
-    <mdui-list-subheader
-        class="flex pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b *:justify-center *:self-center"
-        noninteractive
-    >
-        <div class="w-12 text-center flex">#</div>
-        <div class="flex-1 pl-2 text-left">标题</div>
-        <div class="flex-1 text-left hidden md:block">专辑</div>
-        <div class="w-16">时长</div>
-    </mdui-list-subheader>
-
-    <div class="flex flex-col gap-1 mt-2">
-        {#each tracks as track, index (track.path)}
-            {@const isCurrent =
-                player.playlist[player.currentIndex]?.path === track.path}
-            {@const cover = trackCovers.get(track)}
-
-            <mdui-list-item
-                class="group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none
-             active:scale-[0.995] themed-item
-             {isCurrent ? 'themed-item-active' : ''}"
-                ondblclick={() => handlePlay(track, index)}
-                role="button"
-                tabindex="0"
-            >
-                <mdui-ripple></mdui-ripple>
-
-                <div class="flex items-center w-full">
-                    <div
-                        class="w-12 flex justify-center items-center text-sm themed-text-secondary z-10 shrink-0"
-                    >
-                        {#if isCurrent && player.playing}
-                            <div class="flex items-end gap-0.5 h-3.5">
-                                <span
-                                    class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate]"
-                                ></span>
-                                <span
-                                    class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.2s]"
-                                ></span>
-                                <span
-                                    class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.4s]"
-                                ></span>
-                            </div>
-                        {:else}
-                            <span
-                                class={isCurrent
-                                    ? 'font-bold themed-text-accent'
-                                    : 'group-hover:text-[rgb(var(--mdui-color-on-surface))]'}
-                            >
-                                {index + 1}
-                            </span>
-                        {/if}
-                    </div>
-
-                    <div
-                        class="flex-1 flex items-center gap-4 pl-3 overflow-hidden z-10"
-                    >
-                        <div
-                            use:lazyCover={track}
-                            class="w-10 h-10 rounded-md overflow-hidden themed-surface-container shrink-0 transition-transform duration-300 group-hover:scale-105 group-hover:shadow-md"
-                        >
-                            {#if cover}
-                                <img
-                                    src={cover}
-                                    alt="cover"
-                                    class="w-full h-full object-cover"
-                                    loading="lazy"
-                                />
-                            {:else}
-                                <div
-                                    class="w-full h-full flex items-center justify-center text-base themed-surface-high"
-                                >
-                                    🎵
-                                </div>
-                            {/if}
-                        </div>
-
-                        <div class="flex flex-col min-w-0">
-                            <span
-                                class="text-sm font-medium truncate {isCurrent
-                                    ? 'themed-text-accent'
-                                    : 'themed-text-primary'}"
-                            >
-                                {track.title}
-                            </span>
-                            <span
-                                class="text-xs truncate themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] mt-0.5"
-                            >
-                                {track.artist}
-                            </span>
-                        </div>
-                    </div>
-
-                    <div
-                        class="flex-1 text-sm truncate hidden md:block z-10 themed-text-secondary"
-                    >
-                        {track.album}
-                    </div>
-
-                    <div
-                        class="w-16 text-sm font-mono z-10 themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] shrink-0"
-                    >
-                        {formatDuration(track.duration)}
-                    </div>
-                </div>
-            </mdui-list-item>
-        {/each}
-    </div>
-</mdui-list>
-
-<style>
-    @keyframes bounce {
-        from {
-            height: 4px;
-        }
-        to {
-            height: 14px;
-        }
-    }
-
-    .themed-text-primary {
-        color: rgb(var(--mdui-color-on-surface));
-    }
-
-    .themed-text-secondary {
-        color: rgb(var(--mdui-color-on-surface-variant));
-    }
-
-    .themed-text-accent {
-        color: rgb(var(--mdui-color-primary));
-    }
-
-    .themed-border {
-        border-color: rgb(var(--mdui-color-outline-variant));
-    }
-
-    .themed-border-b {
-        border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
-    }
-
-    .themed-surface-container {
-        background-color: rgb(var(--mdui-color-surface-container-highest));
-    }
-
-    .themed-surface-high {
-        background-color: rgb(var(--mdui-color-surface-container-high));
-    }
-
-    .themed-bar {
-        background-color: rgb(var(--mdui-color-primary));
-    }
-
-    .themed-item {
-        background-color: transparent;
-        border: 1px solid transparent;
-    }
-
-    .themed-item:hover {
-        background-color: rgb(var(--mdui-color-surface-container));
-        box-shadow:
-            0 4px 6px -1px rgba(0, 0, 0, 0.1),
-            0 2px 4px -1px rgba(0, 0, 0, 0.06);
-    }
-
-    .themed-item-active {
-        background-color: rgb(var(--mdui-color-surface-container));
-        border-color: rgb(var(--mdui-color-outline-variant));
-    }
-</style>
diff --git a/src/lib/components/base/Button.svelte b/src/lib/components/base/Button.svelte
new file mode 100644
index 0000000..c59c789
--- /dev/null
+++ b/src/lib/components/base/Button.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+    const { onclick = () => {}, children, ...props } = $props()
+</script>
+
+<mdui-button
+    onclick={() => onclick()}
+    onkeydown={(e: KeyboardEvent) =>
+        (e.key === 'Enter' || e.key === ' ') && onclick()}
+    role="button"
+    tabindex="0"
+    {...props}
+>
+    {@render children()}
+</mdui-button>
diff --git a/src/lib/components/base/IconButton.svelte b/src/lib/components/base/IconButton.svelte
new file mode 100644
index 0000000..fd9f7f4
--- /dev/null
+++ b/src/lib/components/base/IconButton.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+    const { onclick = () => {}, ...props } = $props()
+</script>
+
+<mdui-button-icon
+    onclick={() => onclick()}
+    onkeydown={(e: KeyboardEvent) =>
+        (e.key === 'Enter' || e.key === ' ') && onclick()}
+    role="button"
+    tabindex="0"
+    {...props}
+></mdui-button-icon>
diff --git a/src/lib/components/Slider.svelte b/src/lib/components/base/MduiSlider.svelte
similarity index 100%
rename from src/lib/components/Slider.svelte
rename to src/lib/components/base/MduiSlider.svelte
diff --git a/src/lib/components/base/SearchField.svelte b/src/lib/components/base/SearchField.svelte
new file mode 100644
index 0000000..79df8ad
--- /dev/null
+++ b/src/lib/components/base/SearchField.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+    import TextField from './TextField.svelte'
+
+    type SearchFieldProps = {
+        value?: string
+        placeholder?: string
+        class?: string
+        onchange?: (value: string, event: Event) => void
+        oninput?: (value: string, event: Event) => void
+        [key: string]: unknown
+    }
+
+    let {
+        value = $bindable(''),
+        placeholder = '搜索...',
+        class: className = '',
+        onchange,
+        oninput,
+        ...props
+    }: SearchFieldProps = $props()
+</script>
+
+<TextField
+    bind:value
+    variant="outlined"
+    type="search"
+    icon="search"
+    clearable
+    {placeholder}
+    class={className}
+    {onchange}
+    {oninput}
+    {...props}
+/>
\ No newline at end of file
diff --git a/src/lib/components/base/Select.svelte b/src/lib/components/base/Select.svelte
new file mode 100644
index 0000000..7aced8f
--- /dev/null
+++ b/src/lib/components/base/Select.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+    import 'mdui/components/menu-item.js'
+    import 'mdui/components/select.js'
+
+    export type SelectOption = {
+        label: string
+        value: string
+    }
+
+    type SelectProps = {
+        value?: string
+        options: SelectOption[]
+        placeholder?: string
+        class?: string
+        onchange?: (value: string, event: Event) => void
+        [key: string]: unknown
+    }
+
+    let {
+        value = $bindable(''),
+        options,
+        placeholder,
+        class: className = '',
+        onchange,
+        ...props
+    }: SelectProps = $props()
+
+    let opened = $state(false)
+
+    function handleChange(event: Event) {
+        const target = event.currentTarget as HTMLElement & { value: string }
+
+        value = target.value
+        opened = false
+        onchange?.(value, event)
+    }
+
+    function handleClick() {
+        opened = !opened
+    }
+
+    function handleKeydown(event: KeyboardEvent) {
+        if (event.key === 'Enter' || event.key === ' ') {
+            opened = !opened
+        }
+
+        if (event.key === 'Escape') {
+            opened = false
+        }
+    }
+</script>
+
+<div class={className}>
+    <mdui-select
+        {value}
+        {placeholder}
+        end-icon={opened
+            ? 'arrow_drop_up--rounded'
+            : 'arrow_drop_down--rounded'}
+        onchange={handleChange}
+        onclick={handleClick}
+        onkeydown={handleKeydown}
+        onblur={() => (opened = false)}
+        aria-expanded={opened}
+        {...props}
+    >
+        {#each options as option (option.value)}
+            <mdui-menu-item value={option.value}>
+                {option.label}
+            </mdui-menu-item>
+        {/each}
+    </mdui-select>
+</div>
diff --git a/src/lib/components/Progress.svelte b/src/lib/components/base/Slider.svelte
similarity index 100%
rename from src/lib/components/Progress.svelte
rename to src/lib/components/base/Slider.svelte
diff --git a/src/lib/components/base/TextField.svelte b/src/lib/components/base/TextField.svelte
new file mode 100644
index 0000000..a4fe110
--- /dev/null
+++ b/src/lib/components/base/TextField.svelte
@@ -0,0 +1,56 @@
+<script lang="ts">
+    import 'mdui/components/text-field.js'
+
+    type TextFieldProps = {
+        value?: string
+        variant?: 'filled' | 'outlined'
+        type?: string
+        icon?: string
+        placeholder?: string
+        clearable?: boolean
+        class?: string
+        oninput?: (value: string, event: Event) => void
+        onchange?: (value: string, event: Event) => void
+        [key: string]: unknown
+    }
+
+    let {
+        value = $bindable(''),
+        variant = 'outlined',
+        type = 'text',
+        icon,
+        placeholder,
+        clearable = false,
+        class: className = '',
+        oninput,
+        onchange,
+        ...props
+    }: TextFieldProps = $props()
+
+    function handleInput(event: Event) {
+        const target = event.currentTarget as HTMLElement & { value: string }
+
+        value = target.value
+        oninput?.(value, event)
+    }
+
+    function handleChange(event: Event) {
+        const target = event.currentTarget as HTMLElement & { value: string }
+
+        value = target.value
+        onchange?.(value, event)
+    }
+</script>
+
+<mdui-text-field
+    {variant}
+    {type}
+    {icon}
+    {placeholder}
+    {clearable}
+    value={value}
+    class={className}
+    oninput={handleInput}
+    onchange={handleChange}
+    {...props}
+></mdui-text-field>
\ No newline at end of file
diff --git a/src/lib/components/media/MediaGrid.svelte b/src/lib/components/media/MediaGrid.svelte
new file mode 100644
index 0000000..6bf3d44
--- /dev/null
+++ b/src/lib/components/media/MediaGrid.svelte
@@ -0,0 +1,119 @@
+<script lang="ts">
+    import 'mdui/components/button-icon.js'
+
+    export type MediaGridItem = {
+        id: string | number
+        title: string
+        subtitle?: string
+        image?: string | null
+        href?: string
+        shape?: 'square' | 'circle'
+    }
+
+    let {
+        items,
+        emptyTitle = '暂无内容',
+        emptyDescription = '这里还没有可以显示的内容',
+    }: {
+        items: MediaGridItem[]
+        emptyTitle?: string
+        emptyDescription?: string
+    } = $props()
+</script>
+
+{#snippet mediaCard(item: MediaGridItem)}
+    <a
+        href={item.href ?? undefined}
+        class="group block outline-none"
+        aria-label={item.title}
+    >
+        <div
+            class="rounded-2xl p-3 transition-all duration-200
+                   bg-[rgb(var(--mdui-color-surface-container))]
+                   border border-transparent
+                   hover:-translate-y-1 hover:shadow-lg
+                   hover:border-[rgb(var(--mdui-color-outline-variant))]
+                   focus-visible:ring-2 focus-visible:ring-[rgb(var(--mdui-color-primary))]"
+        >
+            <div
+                class="relative mb-3 aspect-square overflow-hidden
+                       bg-[rgb(var(--mdui-color-surface-container-highest))]
+                       {item.shape === 'circle'
+                    ? 'rounded-full'
+                    : 'rounded-xl'}"
+            >
+                {#if item.image}
+                    <img
+                        src={item.image}
+                        alt={item.title}
+                        class="h-full w-full object-cover transition-transform duration-300 group-hover:scale-105"
+                        loading="lazy"
+                    />
+                {:else}
+                    <div
+                        class="flex h-full w-full items-center justify-center text-4xl
+                               text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        {item.shape === 'circle' ? '👤' : '🎵'}
+                    </div>
+                {/if}
+
+                <div
+                    class="absolute inset-0 flex items-end justify-end p-3 opacity-0
+                           transition-opacity duration-200 group-hover:opacity-100"
+                >
+                    <mdui-button-icon
+                        variant="filled"
+                        icon="play_arrow--rounded"
+                    ></mdui-button-icon>
+                </div>
+            </div>
+
+            <div class="min-w-0">
+                <h3
+                    class="truncate text-sm font-semibold
+                           text-[rgb(var(--mdui-color-on-surface))]"
+                >
+                    {item.title}
+                </h3>
+
+                {#if item.subtitle}
+                    <p
+                        class="mt-0 truncate text-xs
+                               text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        {item.subtitle}
+                    </p>
+                {/if}
+            </div>
+        </div>
+    </a>
+{/snippet}
+
+{#if items.length === 0}
+    <div
+        class="flex min-h-60 flex-col items-center justify-center rounded-3xl
+               border border-dashed border-[rgb(var(--mdui-color-outline-variant))]
+               text-center"
+    >
+        <div class="text-5xl">🎧</div>
+        <div class="mt-3 text-base font-medium">{emptyTitle}</div>
+        <div class="mt-1 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]">
+            {emptyDescription}
+        </div>
+    </div>
+{:else}
+    <section>
+        <div
+            class="grid grid-cols-2 gap-4
+                   sm:grid-cols-3
+                   md:grid-cols-4
+                   lg:grid-cols-5
+                   xl:grid-cols-6"
+        >
+            {#each items as item (item.id)}
+                {@render mediaCard(item)}
+            {/each}
+        </div>
+    </section>
+{/if}
\ No newline at end of file
diff --git a/src/lib/features/Filters.svelte b/src/lib/features/Filters.svelte
new file mode 100644
index 0000000..b451e16
--- /dev/null
+++ b/src/lib/features/Filters.svelte
@@ -0,0 +1,37 @@
+<script lang="ts" generics="T extends string">
+    import SearchField from '$lib/components/base/SearchField.svelte'
+    import Select from '$lib/components/base/Select.svelte'
+
+    type SortOption<T extends string> = {
+        label: string
+        value: T
+    }
+
+    type LibraryFiltersProps<T extends string> = {
+        query?: string
+        sortBy?: T
+        searchPlaceholder?: string
+        sortOptions: SortOption<T>[]
+        class?: string
+    }
+
+    let {
+        query = $bindable(''),
+        sortBy = $bindable<T>(),
+        searchPlaceholder = '搜索...',
+        sortOptions,
+        class: className = '',
+    }: LibraryFiltersProps<T> = $props()
+</script>
+
+<div class={`flex gap-3 md:flex-row md:items-center p-2 ${className}`}>
+    <SearchField
+        bind:value={query}
+        placeholder={searchPlaceholder}
+    />
+
+    <Select
+        bind:value={sortBy}
+        options={sortOptions}
+    />
+</div>
\ No newline at end of file
diff --git a/src/lib/features/PlayerBar.svelte b/src/lib/features/PlayerBar.svelte
new file mode 100644
index 0000000..1dfc3c8
--- /dev/null
+++ b/src/lib/features/PlayerBar.svelte
@@ -0,0 +1,131 @@
+<script lang="ts">
+    // Mdui 的 M2 Slider,用于播放进度
+    import MduiSlider from '$lib/components/base/MduiSlider.svelte'
+    // M3 自定义 Slider
+    import IconButton from '$lib/components/base/IconButton.svelte'
+    import Slider from '$lib/components/base/Slider.svelte'
+    import { trackCovers } from '$lib/state/covers.svelte'
+    import { player } from '$lib/state/player.svelte'
+    import { formatTime } from '$lib/utils'
+
+    let slider = $state<MduiSlider | null>(null)
+    let currentCover = $state<string | null>(null)
+
+    let volumeIcon = $derived(getVolumeIcon(player.volume, player.muted))
+
+    function getVolumeIcon(volume: number, muted: boolean) {
+        if (muted) return 'volume_off--rounded'
+        if (volume === 0) return 'volume_mute--rounded'
+        return volume > 50 ? 'volume_up--rounded' : 'volume_down--rounded'
+    }
+    function handleSeekInput(e: Event): void {
+        const target = e.currentTarget as HTMLElement & {
+            value: number | string
+        }
+
+        player.seek(Number(target.value))
+    }
+
+    $effect(() => {
+        const track = player.currentTrack
+
+        if (!track) {
+            currentCover = null
+            return
+        }
+
+        currentCover = trackCovers.get(track)
+
+        trackCovers.load(track).then(cover => {
+            if (player.currentTrack?.path === track.path) {
+                currentCover = cover
+            }
+        })
+    })
+</script>
+
+{#snippet progressArea()}
+    <div
+        class="absolute top-2 left-0 w-full flex items-center -translate-y-1/2"
+    >
+        <span class="text-xs tabular-nums text-black min-w-10 text-right">
+            {formatTime(player.currentTime)}
+        </span>
+
+        <div class="flex-1">
+            <MduiSlider
+                bind:value={player.currentTime}
+                bind:this={slider}
+                oninput={handleSeekInput}
+                duration={player.currentTrack?.duration ?? 0}
+            />
+        </div>
+
+        <span class="text-xs tabular-nums text-black min-w-10">
+            {formatTime(player.currentTrack?.duration ?? 0)}
+        </span>
+    </div>
+{/snippet}
+
+{#snippet nowPlayingInfo()}
+    <div class="flex flex-1 min-w-37.5 gap-2">
+        <img
+            src={currentCover ?? '/default_cover.png'}
+            alt="Album Cover"
+            class="w-16 h-16 rounded object-cover shadow-sm bg-gray-200"
+        />
+
+        <div class="flex flex-col justify-center overflow-hidden">
+            <div class="text-sm font-medium truncate">
+                {player.currentTrack?.title ?? '未在播放'}
+            </div>
+
+            <div class="text-xs opacity-70 truncate">
+                {player.currentTrack?.artist ?? '未知艺术家'}
+            </div>
+        </div>
+    </div>
+{/snippet}
+
+{#snippet transportControls()}
+    <div class="flex items-center gap-2">
+        <IconButton
+            icon="skip_previous--rounded"
+            onclick={() => player.prev()}
+        />
+
+        <IconButton
+            variant="filled"
+            icon={player.playing ? 'pause--rounded' : 'play_arrow--rounded'}
+            onclick={() => player.toggle()}
+        />
+
+        <IconButton icon="skip_next--rounded" onclick={() => player.next()} />
+    </div>
+{/snippet}
+
+{#snippet volumeControls()}
+    <div class="flex flex-1 items-center min-w-37.5 justify-end">
+        <IconButton icon="playlist_play--rounded" />
+
+        <IconButton
+            icon={volumeIcon}
+            onclick={() => (player.muted = !player.muted)}
+            class="text-lg opacity-70"
+        />
+
+        <Slider bind:value={player.volume} />
+    </div>
+{/snippet}
+
+<mdui-bottom-app-bar
+    class="relative flex flex-col h-24 px-4 pb-2"
+    style="--z-index: 10"
+>
+    {@render progressArea()}
+    <div class="flex items-center w-full h-full mt-2">
+        {@render nowPlayingInfo()}
+        {@render transportControls()}
+        {@render volumeControls()}
+    </div>
+</mdui-bottom-app-bar>
diff --git a/src/lib/features/PlaylistGrid.svelte b/src/lib/features/PlaylistGrid.svelte
new file mode 100644
index 0000000..b710cac
--- /dev/null
+++ b/src/lib/features/PlaylistGrid.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+    import MediaGrid from '$lib/components/media/MediaGrid.svelte'
+    import type { Playlist } from '$lib/types'
+
+    let { playlists }: { playlists: Playlist[] } = $props()
+
+    let items = $derived(
+        playlists.map((playlist) => ({
+            id: playlist.id,
+            title: playlist.name,
+            subtitle: '播放列表',
+            image: playlist.cover,
+            href: `/playlists/${playlist.id}`,
+            shape: 'square' as const,
+        })),
+    )
+</script>
+
+<MediaGrid
+    {items}
+    emptyTitle="暂无播放列表"
+    emptyDescription="创建一个播放列表后，它会显示在这里"
+/>
\ No newline at end of file
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
new file mode 100644
index 0000000..91482c8
--- /dev/null
+++ b/src/lib/features/TrackList.svelte
@@ -0,0 +1,240 @@
+<script lang="ts">
+    import { trackCovers } from '$lib/state/covers.svelte'
+    import { player } from '$lib/state/player.svelte'
+    import type { Track } from '$lib/types'
+    import { formatDuration } from '$lib/utils'
+    import 'mdui/components/list-item.js'
+    import 'mdui/components/list.js'
+
+    let { tracks }: { tracks: Track[] } = $props()
+
+    function lazyCover(node: HTMLElement, track: Track) {
+        let currentTrack = track
+
+        const observer = new IntersectionObserver(
+            entries => {
+                const entry = entries[0]
+
+                if (entry.isIntersecting) {
+                    void trackCovers.load(currentTrack)
+                    observer.disconnect()
+                }
+            },
+            {
+                rootMargin: '300px',
+            },
+        )
+
+        observer.observe(node)
+
+        return {
+            update(nextTrack: Track) {
+                currentTrack = nextTrack
+            },
+            destroy() {
+                observer.disconnect()
+            },
+        }
+    }
+
+    function handlePlay(clickedTrack: Track, clickedIndex: number) {
+        player.playlist = tracks
+        player.playByIndex(clickedIndex)
+
+        void trackCovers.load(clickedTrack)
+    }
+</script>
+
+{#snippet playingIndicator()}
+    <div class="flex items-end gap-0.5 h-3.5">
+        <span
+            class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate]"
+        ></span>
+        <span
+            class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.2s]"
+        ></span>
+        <span
+            class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.4s]"
+        ></span>
+    </div>
+{/snippet}
+
+{#snippet trackIndex(index: number, isCurrent: boolean)}
+    <div
+        class="w-12 flex justify-center items-center text-sm themed-text-secondary z-10 shrink-0"
+    >
+        {#if isCurrent && player.playing}
+            {@render playingIndicator()}
+        {:else}
+            <span
+                class={isCurrent
+                    ? 'font-bold themed-text-accent'
+                    : 'group-hover:text-[rgb(var(--mdui-color-on-surface))]'}
+            >
+                {index + 1}
+            </span>
+        {/if}
+    </div>
+{/snippet}
+
+{#snippet trackCover(track: Track, cover: string | null)}
+    <div
+        use:lazyCover={track}
+        class="w-10 h-10 rounded-md overflow-hidden themed-surface-container shrink-0 transition-transform duration-300 group-hover:scale-105 group-hover:shadow-md"
+    >
+        {#if cover}
+            <img
+                src={cover}
+                alt="cover"
+                class="w-full h-full object-cover"
+                loading="lazy"
+            />
+        {:else}
+            <div
+                class="w-full h-full flex items-center justify-center text-base themed-surface-high"
+            >
+                🎵
+            </div>
+        {/if}
+    </div>
+{/snippet}
+
+{#snippet trackTitle(track: Track, cover: string | null, isCurrent: boolean)}
+    <div class="flex-1 flex items-center gap-4 pl-3 overflow-hidden z-10">
+        {@render trackCover(track, cover)}
+
+        <div class="flex flex-col min-w-0">
+            <span
+                class="text-sm font-medium truncate {isCurrent
+                    ? 'themed-text-accent'
+                    : 'themed-text-primary'}"
+            >
+                {track.title}
+            </span>
+
+            <span
+                class="text-xs truncate themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] mt-0.5"
+            >
+                {track.artist}
+            </span>
+        </div>
+    </div>
+{/snippet}
+
+{#snippet trackAlbum(track: Track)}
+    <div
+        class="flex-1 text-sm truncate hidden md:block z-10 themed-text-secondary"
+    >
+        {track.album}
+    </div>
+{/snippet}
+
+{#snippet trackDuration(track: Track)}
+    <div
+        class="w-16 text-sm font-mono z-10 themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] shrink-0"
+    >
+        {formatDuration(track.duration)}
+    </div>
+{/snippet}
+
+{#snippet trackItem(track: Track, index: number)}
+    {@const isCurrent =
+        player.playlist[player.currentIndex]?.path === track.path}
+    {@const cover = trackCovers.get(track)}
+
+    <mdui-list-item
+        class="group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none
+             active:scale-[0.995] themed-item
+             {isCurrent ? 'themed-item-active' : ''}"
+        ondblclick={() => handlePlay(track, index)}
+        role="button"
+        tabindex="0"
+    >
+        <mdui-ripple></mdui-ripple>
+
+        <div class="flex items-center w-full">
+            {@render trackIndex(index, isCurrent)}
+            {@render trackTitle(track, cover, isCurrent)}
+            {@render trackAlbum(track)}
+            {@render trackDuration(track)}
+        </div>
+    </mdui-list-item>
+{/snippet}
+
+<mdui-list class="flex flex-col w-full">
+    <mdui-list-subheader
+        class="flex pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b *:justify-center *:self-center"
+        noninteractive
+    >
+        <div class="w-12 text-center flex">#</div>
+        <div class="flex-1 pl-2 text-left">标题</div>
+        <div class="flex-1 text-left hidden md:block">专辑</div>
+        <div class="w-16">时长</div>
+    </mdui-list-subheader>
+
+    <div class="flex flex-col gap-1 mt-2">
+        {#each tracks as track, index (track.path)}
+            {@render trackItem(track, index)}
+        {/each}
+    </div>
+</mdui-list>
+
+<style>
+    @keyframes bounce {
+        from {
+            height: 4px;
+        }
+        to {
+            height: 14px;
+        }
+    }
+
+    .themed-text-primary {
+        color: rgb(var(--mdui-color-on-surface));
+    }
+
+    .themed-text-secondary {
+        color: rgb(var(--mdui-color-on-surface-variant));
+    }
+
+    .themed-text-accent {
+        color: rgb(var(--mdui-color-primary));
+    }
+
+    .themed-border {
+        border-color: rgb(var(--mdui-color-outline-variant));
+    }
+
+    .themed-border-b {
+        border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
+    }
+
+    .themed-surface-container {
+        background-color: rgb(var(--mdui-color-surface-container-highest));
+    }
+
+    .themed-surface-high {
+        background-color: rgb(var(--mdui-color-surface-container-high));
+    }
+
+    .themed-bar {
+        background-color: rgb(var(--mdui-color-primary));
+    }
+
+    .themed-item {
+        background-color: transparent;
+        border: 1px solid transparent;
+    }
+
+    .themed-item:hover {
+        background-color: rgb(var(--mdui-color-surface-container));
+        box-shadow:
+            0 4px 6px -1px rgba(0, 0, 0, 0.1),
+            0 2px 4px -1px rgba(0, 0, 0, 0.06);
+    }
+
+    .themed-item-active {
+        background-color: rgb(var(--mdui-color-surface-container));
+        border-color: rgb(var(--mdui-color-outline-variant));
+    }
+</style>
diff --git a/src/lib/components/Appbar.svelte b/src/lib/features/shell/Appbar.svelte
similarity index 100%
rename from src/lib/components/Appbar.svelte
rename to src/lib/features/shell/Appbar.svelte
diff --git a/src/lib/components/NavRail.svelte b/src/lib/features/shell/NavRail.svelte
similarity index 73%
rename from src/lib/components/NavRail.svelte
rename to src/lib/features/shell/NavRail.svelte
index 77ff42b..154f8ae 100644
--- a/src/lib/components/NavRail.svelte
+++ b/src/lib/features/shell/NavRail.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
-    import { musicLibrary } from '$lib/library.svelte'
-    import { player, type TrackInfo } from '$lib/player.svelte'
+    import { musicLibrary } from '$lib/state/library.svelte'
+    import { player } from '$lib/state/player.svelte'
+    import type { Track } from '$lib/types'
     import { invoke } from '@tauri-apps/api/core'
     import { open } from '@tauri-apps/plugin-dialog'
     import 'mdui/components/navigation-rail-item.js'
     import 'mdui/components/navigation-rail.js'
 
-    async function importMusicFolder(): Promise<TrackInfo[] | undefined> {
+    async function importMusicFolder(): Promise<Track[] | undefined> {
         const selectedDir = await open({
             directory: true,
             multiple: false,
@@ -19,7 +20,7 @@
         }
 
         try {
-            const tracks: TrackInfo[] = await invoke('scan_music_directory', {
+            const tracks: Track[] = await invoke('scan_music_directory', {
                 dirPath: selectedDir,
             })
 
@@ -55,17 +56,16 @@
     ></mdui-fab>
     <!-- <mdui-button-icon icon="settings" slot="bottom"></mdui-button-icon> -->
 
-    <mdui-navigation-rail-item
-        icon="watch_later--outlined"
-        href="/recent">Recent</mdui-navigation-rail-item
+    <mdui-navigation-rail-item icon="watch_later--outlined" href="/recent"
+        >Recent</mdui-navigation-rail-item
     >
     <mdui-navigation-rail-item icon="library_music--outlined" href="/library"
         >Library</mdui-navigation-rail-item
     >
-    <mdui-navigation-rail-item icon="track_changes--outlined"
-        >Track</mdui-navigation-rail-item
+    <mdui-navigation-rail-item icon="track_changes--outlined" href="/album"
+        >Album</mdui-navigation-rail-item
     >
-    <mdui-navigation-rail-item icon="person--outlined"
+    <mdui-navigation-rail-item icon="person--outlined" href="/artists"
         >Artist</mdui-navigation-rail-item
     >
 </mdui-navigation-rail>
diff --git a/src/lib/trackCovers.svelte.ts b/src/lib/state/covers.svelte.ts
similarity index 87%
rename from src/lib/trackCovers.svelte.ts
rename to src/lib/state/covers.svelte.ts
index e19289a..879545b 100644
--- a/src/lib/trackCovers.svelte.ts
+++ b/src/lib/state/covers.svelte.ts
@@ -1,5 +1,6 @@
-import type { TrackInfo } from '$lib/player.svelte'
+
 import { invoke } from '@tauri-apps/api/core'
+import type { Track } from '../types/types'
 
 class TrackCovers {
     covers = $state<Record<string, string | null>>({})
@@ -7,7 +8,7 @@ class TrackCovers {
 
     private promises = new Map<string, Promise<string | null>>()
 
-    async load(track: TrackInfo | null | undefined): Promise<string | null> {
+    async load(track: Track | null | undefined): Promise<string | null> {
         if (!track?.path) return null
 
         if (this.covers[track.path] !== undefined) {
@@ -42,7 +43,7 @@ class TrackCovers {
         return await promise
     }
 
-    get(track: TrackInfo | null | undefined): string | null {
+    get(track: Track | null | undefined): string | null {
         if (!track?.path) return null
         return this.covers[track.path] ?? null
     }
diff --git a/src/lib/library.svelte.ts b/src/lib/state/library.svelte.ts
similarity index 67%
rename from src/lib/library.svelte.ts
rename to src/lib/state/library.svelte.ts
index c41caf6..de0f174 100644
--- a/src/lib/library.svelte.ts
+++ b/src/lib/state/library.svelte.ts
@@ -1,14 +1,14 @@
 import { invoke } from '@tauri-apps/api/core'
-import type { TrackInfo } from './player.svelte'
+import type { Track } from '../types/types'
 
 class MusicLibrary {
-    tracks = $state<TrackInfo[]>([])
+    tracks = $state<Track[]>([])
     isLoading = $state(false)
     error = $state<string | null>(null)
 
-    private refreshPromise: Promise<TrackInfo[]> | null = null
+    private refreshPromise: Promise<Track[]> | null = null
 
-    async refresh(options: { force?: boolean } = {}): Promise<TrackInfo[]> {
+    async refresh(options: { force?: boolean } = {}): Promise<Track[]> {
         const { force = false } = options
 
         if (this.refreshPromise) {
@@ -24,13 +24,7 @@ class MusicLibrary {
 
         this.refreshPromise = (async () => {
             try {
-                console.trace('[MusicLibrary] refresh called')
-                console.log('[MusicLibrary] invoke load_music_library start')
-
-                const tracks = await invoke<TrackInfo[]>('load_music_library')
-
-                console.log('[MusicLibrary] invoke load_music_library end', tracks.length)
-
+                const tracks = await invoke<Track[]>('load_music_library')
                 this.tracks = tracks
                 return tracks
             } catch (err) {
diff --git a/src/lib/player.svelte.ts b/src/lib/state/player.svelte.ts
similarity index 91%
rename from src/lib/player.svelte.ts
rename to src/lib/state/player.svelte.ts
index 6ff4268..8c168ae 100644
--- a/src/lib/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -1,4 +1,5 @@
 import { invoke } from "@tauri-apps/api/core"
+import type { Track } from "../types/types"
 import { recentlyPlayed } from "./recent.svelte"
 
 
@@ -9,7 +10,7 @@ class Player {
     currentTime = $state(0)
     muted = $state(false)
 
-    currentTrack = $derived<TrackInfo | null>(
+    currentTrack = $derived<Track | null>(
         this.currentIndex >= 0 && this.currentIndex < this.playlist.length
             ? this.playlist[this.currentIndex]
             : null
@@ -88,7 +89,8 @@ class Player {
     switchTrack = async (step: number) => {
         const len = this.playlist.length
         if (len === 0) return
-
+        
+        this.stopPolling()
         const newIndex = (this.currentIndex + step + len) % len
         this.playByIndex(newIndex)
     }
@@ -97,14 +99,4 @@ class Player {
     prev = () => this.switchTrack(-1)
 }
 
-export interface TrackInfo {
-    title: string
-    artist: string
-    album: string
-    duration: number
-    sample_rate?: number | null
-    cover?: string | null
-    path: string
-}
-
 export const player = new Player()
\ No newline at end of file
diff --git a/src/lib/recent.svelte.ts b/src/lib/state/recent.svelte.ts
similarity index 78%
rename from src/lib/recent.svelte.ts
rename to src/lib/state/recent.svelte.ts
index beda1b0..7babfff 100644
--- a/src/lib/recent.svelte.ts
+++ b/src/lib/state/recent.svelte.ts
@@ -1,14 +1,15 @@
-import type { TrackInfo } from '$lib/player.svelte'
+
 import { invoke } from '@tauri-apps/api/core'
+import type { Track } from '../types/types'
 
 class RecentlyPlayed {
-    tracks = $state<TrackInfo[]>([])
+    tracks = $state<Track[]>([])
     isLoading = $state(false)
     error = $state<string | null>(null)
 
-    private loadPromise: Promise<TrackInfo[]> | null = null
+    private loadPromise: Promise<Track[]> | null = null
 
-    async load(): Promise<TrackInfo[]> {
+    async load(): Promise<Track[]> {
         if (this.loadPromise) {
             return this.loadPromise
         }
@@ -16,7 +17,7 @@ class RecentlyPlayed {
         this.isLoading = true
         this.error = null
 
-        this.loadPromise = invoke<TrackInfo[]>('load_recently_played')
+        this.loadPromise = invoke<Track[]>('load_recently_played')
             .then((tracks) => {
                 this.tracks = tracks
                 return tracks
@@ -34,8 +35,8 @@ class RecentlyPlayed {
         return this.loadPromise
     }
 
-    async add(track: TrackInfo): Promise<TrackInfo[]> {
-        const safeTrack: TrackInfo = {
+    async add(track: Track): Promise<Track[]> {
+        const safeTrack: Track = {
             ...track,
             cover: null
         }
@@ -47,7 +48,7 @@ class RecentlyPlayed {
         ].slice(0, 100)
 
         try {
-            const tracks = await invoke<TrackInfo[]>('add_recently_played', {
+            const tracks = await invoke<Track[]>('add_recently_played', {
                 track: safeTrack
             })
 
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
new file mode 100644
index 0000000..c9f6f04
--- /dev/null
+++ b/src/lib/types/index.ts
@@ -0,0 +1 @@
+export * from './types'
diff --git a/src/lib/types/types.ts b/src/lib/types/types.ts
new file mode 100644
index 0000000..b65bab7
--- /dev/null
+++ b/src/lib/types/types.ts
@@ -0,0 +1,38 @@
+export interface Track {
+    title: string
+    artist: string
+    album: string
+    duration: number
+    sampleRate?: number | null
+    cover?: string | null
+    path: string
+}
+
+export interface Playlist {
+  id: number
+  name: string
+  cover: string
+}
+
+
+export interface Artist {
+    id: string
+    name: string
+    cover?: string | null
+    trackCount: number
+    albumCount: number
+    duration: number
+    tracks: Track[]
+}
+
+
+export interface Album {
+    id: string
+    title: string
+    artist: string
+    cover?: string | null
+    trackCount: number
+    duration: number
+    tracks: Track[]
+    representativeTrack: Track
+}
\ No newline at end of file
diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts
new file mode 100644
index 0000000..478680d
--- /dev/null
+++ b/src/lib/utils/index.ts
@@ -0,0 +1 @@
+export { formatDuration, formatTime } from './time'
diff --git a/src/lib/utils/time.ts b/src/lib/utils/time.ts
new file mode 100644
index 0000000..9daf708
--- /dev/null
+++ b/src/lib/utils/time.ts
@@ -0,0 +1,34 @@
+export function formatSeconds(
+  seconds: number,
+  options: {
+    padMinutes?: boolean
+    showHours?: boolean
+  } = {}
+): string {
+  const { padMinutes = false, showHours = false } = options
+
+  if (!Number.isFinite(seconds) || seconds <= 0) {
+    return padMinutes ? '00:00' : '0:00'
+  }
+
+  const total = Math.floor(seconds)
+  const h = Math.floor(total / 3600)
+  const m = Math.floor((total % 3600) / 60)
+  const s = total % 60
+
+  if (h > 0 || showHours) {
+    return `${h}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`
+  }
+
+  const minutes = padMinutes ? String(m).padStart(2, '0') : String(m)
+
+  return `${minutes}:${String(s).padStart(2, '0')}`
+}
+
+export function formatTime(seconds: number): string {
+  return formatSeconds(seconds, { padMinutes: true })
+}
+
+export function formatDuration(seconds: number): string {
+  return formatSeconds(seconds)
+}
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index ddb267a..97707fc 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import Appbar from '$lib/components/Appbar.svelte'
-  import NavRail from '$lib/components/NavRail.svelte'
-  import PlayerBar from '$lib/components/PlayerBar.svelte'
+  import PlayerBar from '$lib/features/PlayerBar.svelte'
+  import Appbar from '$lib/features/shell/Appbar.svelte'
+  import NavRail from '$lib/features/shell/NavRail.svelte'
   import 'mdui'
   import 'mdui/mdui.css'
   import '../app.css'
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 554da60..2d83075 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-  import Playlists from "$lib/components/Playlists.svelte"
-  import RecentSongs from "$lib/components/RecentSongs.svelte"
+  import Playlists from "$lib/features/PlaylistGrid.svelte"
 
   const playlists = [
     {
@@ -67,7 +66,6 @@
 
 <div class="overflow-y-auto p-8">
   <Playlists {playlists} />
-  <RecentSongs songs={recentSongs} />
 </div>
 
 <style lang="postcss">
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
new file mode 100644
index 0000000..55ad744
--- /dev/null
+++ b/src/routes/album/+page.svelte
@@ -0,0 +1,196 @@
+<script lang="ts">
+    import MediaGrid from '$lib/components/media/MediaGrid.svelte'
+    import { trackCovers } from '$lib/state/covers.svelte'
+    import { musicLibrary } from '$lib/state/library.svelte'
+    import type { Album, Track } from '$lib/types'
+    import { onMount } from 'svelte'
+
+    import Button from '$lib/components/base/Button.svelte'
+    import Filters from '$lib/features/Filters.svelte'
+    import 'mdui/components/button.js'
+    import 'mdui/components/circular-progress.js'
+    import 'mdui/components/menu-item.js'
+    import 'mdui/components/select.js'
+    import 'mdui/components/text-field.js'
+    type SortBy = 'title' | 'artist' | 'trackCount'
+
+    let query = $state('')
+    let sortBy = $state<SortBy>('title')
+
+    const collator = new Intl.Collator('zh-Hans-CN', {
+        numeric: true,
+        sensitivity: 'base',
+    })
+
+    onMount(() => {
+        void musicLibrary.refresh()
+    })
+
+    function createAlbumId(title: string, artist: string) {
+        return encodeURIComponent(`${artist}__${title}`)
+    }
+
+    function getAlbumTitle(track: Track) {
+        return track.album?.trim() || '未知专辑'
+    }
+
+    function getAlbumArtist(track: Track) {
+        return track.artist?.trim() || '未知艺术家'
+    }
+
+    function buildAlbums(tracks: Track[]): Album[] {
+        const albumMap = new Map<
+            string,
+            {
+                title: string
+                artist: string
+                tracks: Track[]
+                duration: number
+                cover?: string | null
+                representativeTrack: Track
+            }
+        >()
+
+        for (const track of tracks) {
+            const title = getAlbumTitle(track)
+            const artist = getAlbumArtist(track)
+            const key = `${artist.toLowerCase()}__${title.toLowerCase()}`
+
+            if (!albumMap.has(key)) {
+                albumMap.set(key, {
+                    title,
+                    artist,
+                    tracks: [],
+                    duration: 0,
+                    cover: track.cover ?? null,
+                    representativeTrack: track,
+                })
+            }
+
+            const album = albumMap.get(key)!
+
+            album.tracks.push(track)
+            album.duration += track.duration
+
+            if (!album.cover && track.cover) {
+                album.cover = track.cover
+            }
+        }
+
+        return Array.from(albumMap.values()).map(album => ({
+            id: createAlbumId(album.title, album.artist),
+            title: album.title,
+            artist: album.artist,
+            cover: album.cover,
+            trackCount: album.tracks.length,
+            duration: album.duration,
+            tracks: album.tracks,
+            representativeTrack: album.representativeTrack,
+        }))
+    }
+
+    let albums = $derived.by(() => buildAlbums(musicLibrary.tracks))
+
+    let filteredAlbums = $derived.by(() => {
+        const keyword = query.trim().toLowerCase()
+
+        const list = keyword
+            ? albums.filter(album =>
+                  [album.title, album.artist].some(value =>
+                      value.toLowerCase().includes(keyword),
+                  ),
+              )
+            : albums
+
+        return [...list].sort((a, b) => {
+            if (sortBy === 'title') {
+                return collator.compare(a.title, b.title)
+            }
+
+            if (sortBy === 'artist') {
+                return collator.compare(a.artist, b.artist)
+            }
+
+            return b[sortBy] - a[sortBy]
+        })
+    })
+
+    $effect(() => {
+        for (const album of filteredAlbums) {
+            void trackCovers.load(album.representativeTrack)
+        }
+    })
+
+    let albumItems = $derived(
+        filteredAlbums.map(album => ({
+            id: album.id,
+            title: album.title,
+            subtitle: `${album.artist} · ${album.trackCount} 首歌曲`,
+            image: trackCovers.get(album.representativeTrack) ?? album.cover,
+            href: `/albums/${album.id}`,
+            shape: 'square' as const,
+        })),
+    )
+</script>
+
+<svelte:head>
+    <title>专辑</title>
+</svelte:head>
+
+<section class="flex h-full min-h-0 flex-col gap-6 overflow-hidden">
+    <header
+        class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
+    >
+        <div class="flex flex-wrap items-end justify-between gap-4">
+            <div class="min-w-0">
+                <p
+                    class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
+                >
+                    Albums
+                </p>
+
+                <h1
+                    class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]"
+                >
+                    专辑
+                </h1>
+            </div>
+
+            <Button
+                variant="outlined"
+                onclick={() => musicLibrary.refresh({ force: true })}
+            >
+                刷新
+            </Button>
+        </div>
+
+        <Filters
+            bind:query
+            bind:sortBy
+            searchPlaceholder="搜索专辑或歌手..."
+            sortOptions={[
+                    { label: '按专辑名排序', value: 'title' },
+                    { label: '按歌手排序', value: 'artist' },
+                    { label: '按歌曲数排序', value: 'trackCount' },
+                ]}
+        />
+    </header>
+
+    {#if musicLibrary.isLoading}
+        <div class="flex flex-1 items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else if musicLibrary.error}
+        <div class="flex flex-1 items-center justify-center text-red-500">
+            {musicLibrary.error}
+        </div>
+    {:else}
+        <div class="min-h-0 flex-1 overflow-auto pb-8">
+            <MediaGrid
+                items={albumItems}
+                emptyTitle="没有找到专辑"
+                emptyDescription="尝试刷新媒体库或修改搜索关键词"
+            />
+        </div>
+    {/if}
+</section>
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
new file mode 100644
index 0000000..271c910
--- /dev/null
+++ b/src/routes/artists/+page.svelte
@@ -0,0 +1,177 @@
+<script lang="ts">
+    import MediaGrid from '$lib/components/media/MediaGrid.svelte'
+    import { musicLibrary } from '$lib/state/library.svelte'
+    import type { Artist, Track } from '$lib/types'
+    import { onMount } from 'svelte'
+
+    import Button from '$lib/components/base/Button.svelte'
+    import Filters from '$lib/features/Filters.svelte'
+    import 'mdui/components/button.js'
+    import 'mdui/components/circular-progress.js'
+
+    type SortBy = 'name' | 'trackCount' | 'albumCount'
+
+    let query = $state('')
+    let sortBy = $state<SortBy>('name')
+
+    const collator = new Intl.Collator('zh-Hans-CN', {
+        numeric: true,
+        sensitivity: 'base',
+    })
+
+    onMount(() => {
+        void musicLibrary.refresh()
+    })
+
+    function createArtistId(name: string) {
+        return encodeURIComponent(name)
+    }
+
+    function buildArtists(tracks: Track[]): Artist[] {
+        const artistMap = new Map<
+            string,
+            {
+                name: string
+                tracks: Track[]
+                albums: Set<string>
+                duration: number
+                cover?: string | null
+            }
+        >()
+
+        for (const track of tracks) {
+            const name = track.artist?.trim() || '未知艺术家'
+            const key = name.toLowerCase()
+
+            if (!artistMap.has(key)) {
+                artistMap.set(key, {
+                    name,
+                    tracks: [],
+                    albums: new Set(),
+                    duration: 0,
+                    cover: track.cover ?? null,
+                })
+            }
+
+            const artist = artistMap.get(key)!
+
+            artist.tracks.push(track)
+            artist.duration += track.duration
+
+            if (track.album?.trim()) {
+                artist.albums.add(track.album.trim())
+            }
+
+            if (!artist.cover && track.cover) {
+                artist.cover = track.cover
+            }
+        }
+
+        return Array.from(artistMap.values()).map(artist => ({
+            id: createArtistId(artist.name),
+            name: artist.name,
+            cover: artist.cover,
+            trackCount: artist.tracks.length,
+            albumCount: artist.albums.size,
+            duration: artist.duration,
+            tracks: artist.tracks,
+        }))
+    }
+
+    let artists = $derived.by(() => buildArtists(musicLibrary.tracks))
+
+    let filteredArtists = $derived.by(() => {
+        const keyword = query.trim().toLowerCase()
+
+        const list = keyword
+            ? artists.filter(artist =>
+                  artist.name.toLowerCase().includes(keyword),
+              )
+            : artists
+
+        return [...list].sort((a, b) => {
+            if (sortBy === 'name') {
+                return collator.compare(a.name, b.name)
+            }
+
+            return b[sortBy] - a[sortBy]
+        })
+    })
+
+    let artistItems = $derived(
+        filteredArtists.map(artist => ({
+            id: artist.id,
+            title: artist.name,
+            subtitle: `${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`,
+            image: artist.cover,
+            href: `/artists/${artist.id}`,
+            shape: 'circle' as const,
+        })),
+    )
+
+    let totalDuration = $derived(
+        artists.reduce((sum, artist) => sum + artist.duration, 0),
+    )
+</script>
+
+<svelte:head>
+    <title>歌手</title>
+</svelte:head>
+
+<section class="flex h-full min-h-0 flex-col gap-6 overflow-hidden">
+    <header
+        class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
+    >
+        <div class="flex flex-wrap items-end justify-between gap-4">
+            <div class="min-w-0">
+                <p
+                    class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
+                >
+                    Artists
+                </p>
+
+                <h1
+                    class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]"
+                >
+                    歌手
+                </h1>
+            </div>
+
+            <Button
+                variant="outlined"
+                onclick={() => musicLibrary.refresh({ force: true })}
+            >
+                刷新
+            </Button>
+        </div>
+
+        <Filters
+            bind:query
+            bind:sortBy
+            searchPlaceholder="搜索歌手..."
+            sortOptions={[
+                { label: '按名称排序', value: 'name' },
+                { label: '按歌曲数排序', value: 'trackCount' },
+                { label: '按专辑数排序', value: 'albumCount' },
+            ]}
+        />
+    </header>
+
+    {#if musicLibrary.isLoading}
+        <div class="flex flex-1 items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else if musicLibrary.error}
+        <div class="flex flex-1 items-center justify-center text-red-500">
+            {musicLibrary.error}
+        </div>
+    {:else}
+        <div class="min-h-0 flex-1 overflow-auto pb-8">
+            <MediaGrid
+                items={artistItems}
+                emptyTitle="没有找到歌手"
+                emptyDescription="尝试刷新媒体库或修改搜索关键词"
+            />
+        </div>
+    {/if}
+</section>
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index d796582..df72cbb 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -1,61 +1,129 @@
 <script lang="ts">
-    import TrackList from '$lib/components/TrackList.svelte'
-    import { musicLibrary } from '$lib/library.svelte'
-    import { player } from '$lib/player.svelte'
-    import 'mdui/components/list-item.js'
-    import 'mdui/components/list-subheader.js'
-    import 'mdui/components/list.js'
-    import 'mdui/components/ripple.js'
+    import TrackList from '$lib/features/TrackList.svelte'
+    import { musicLibrary } from '$lib/state/library.svelte'
+    import { player } from '$lib/state/player.svelte'
+    import type { Track } from '$lib/types'
     import { onMount } from 'svelte'
 
-    let didInit = false
+    import Button from '$lib/components/base/Button.svelte'
+    import Filters from '$lib/features/Filters.svelte'
+    import 'mdui/components/button.js'
+    import 'mdui/components/circular-progress.js'
 
-    onMount(() => {
-        if (didInit) return
-        didInit = true
+    type SortBy = 'title' | 'artist' | 'album'
+
+    let query = $state('')
+    let sortBy = $state<SortBy>('title')
 
-        void initLibraryPage()
+    const collator = new Intl.Collator('zh-Hans-CN', {
+        numeric: true,
+        sensitivity: 'base',
     })
 
-    async function initLibraryPage() {
-        try {
-            console.trace('[library/+page.svelte] onMount init')
+    onMount(() => {
+        void musicLibrary.refresh()
+    })
 
-            const tracks = await musicLibrary.refresh()
+    let filteredTracks = $derived.by(() => {
+        const keyword = query.trim().toLowerCase()
 
-            if (player.playlist.length === 0 && tracks.length > 0) {
-                player.playlist = tracks
+        const tracks = keyword
+            ? musicLibrary.tracks.filter(track =>
+                  [track.title, track.artist, track.album, track.path]
+                      .filter(Boolean)
+                      .some(value => value.toLowerCase().includes(keyword)),
+              )
+            : musicLibrary.tracks
 
-                if (player.currentIndex === -1) {
-                    player.currentIndex = 0
-                }
-            }
-        } catch (err) {
-            console.error('加载本地媒体库失败:', err)
-        }
+        return [...tracks].sort((a, b) => {
+            return collator.compare(a[sortBy] ?? '', b[sortBy] ?? '')
+        })
+    })
+
+    let totalDuration = $derived(
+        musicLibrary.tracks.reduce((sum, track) => sum + track.duration, 0),
+    )
+
+    function playAll() {
+        if (filteredTracks.length === 0) return
+
+        player.playlist = filteredTracks
+        void player.playByIndex(0)
     }
 </script>
 
-<section class="w-full min-h-full overflow-y-auto">
-    {#if musicLibrary.tracks.length !== 0}
-        <header
-            class="flex justify-between items-end pb-3 border-b themed-border"
+<svelte:head>
+    <title>歌曲</title>
+</svelte:head>
+
+<section class="flex h-full min-h-0 flex-col gap-6 overflow-hidden">
+    <header
+        class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
+    >
+        <div class="flex flex-wrap items-end justify-between gap-4">
+            <div class="min-w-0">
+                <p
+                    class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
+                >
+                    Library
+                </p>
+
+                <h1
+                    class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]"
+                >
+                    歌曲
+                </h1>
+            </div>
+
+            <div class="flex items-center gap-2">
+                <Button
+                    variant="filled"
+                    disabled={filteredTracks.length === 0}
+                    onclick={playAll}
+                >
+                    播放全部
+                </Button>
+
+                <Button
+                    variant="outlined"
+                    onclick={() => musicLibrary.refresh({ force: true })}
+                >
+                    刷新
+                </Button>
+            </div>
+        </div>
+
+        <Filters
+            bind:query
+            bind:sortBy
+            searchPlaceholder="搜索标题、歌手、专辑..."
+            sortOptions={[
+                    { label: '按标题排序', value: 'title' },
+                    { label: '按歌手排序', value: 'artist' },
+                    { label: '按专辑排序', value: 'album' },
+                ]}
+        />
+    </header>
+
+    {#if musicLibrary.isLoading}
+        <div class="flex flex-1 items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else if musicLibrary.error}
+        <div class="flex flex-1 items-center justify-center text-red-500">
+            {musicLibrary.error}
+        </div>
+    {:else if filteredTracks.length === 0}
+        <div
+            class="flex flex-1 flex-col items-center justify-center gap-2 text-[rgb(var(--mdui-color-on-surface-variant))]"
         >
-            <h2 class="text-2xl font-bold tracking-wide themed-text-primary">
-                我的音乐库
-            </h2>
-            <span class="text-sm themed-text-secondary"
-                >{musicLibrary.tracks.length} 首歌曲</span
-            >
-        </header>
-        <TrackList tracks={musicLibrary.tracks} />
+            <div class="text-5xl">🎵</div>
+            <div class="text-base font-medium">没有找到歌曲</div>
+            <div class="text-sm">尝试刷新媒体库或修改搜索关键词</div>
+        </div>
     {:else}
-        <div class="flex h-full w-full justify-center items-center">
-            {#if musicLibrary.isLoading}
-                正在加载媒体库...
-            {:else}
-                没有音乐哦
-            {/if}
+        <div class="min-h-0 flex-1 overflow-auto">
+            <TrackList tracks={filteredTracks as Track[]} />
         </div>
     {/if}
 </section>
diff --git a/src/routes/recent/+page.svelte b/src/routes/recent/+page.svelte
index 83f583e..085984a 100644
--- a/src/routes/recent/+page.svelte
+++ b/src/routes/recent/+page.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-    import TrackList from '$lib/components/TrackList.svelte'
-    import { recentlyPlayed } from '$lib/recent.svelte'
+    import TrackList from '$lib/features/TrackList.svelte'
+    import { recentlyPlayed } from '$lib/state/recent.svelte'
     import { onMount } from 'svelte'
 
+    import Button from '$lib/components/base/Button.svelte'
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
 
@@ -16,26 +17,25 @@
 </svelte:head>
 
 <section class="w-full min-h-full overflow-y-auto">
-    <header class="flex items-end justify-between gap-4 shrink-0 pb-3 border-b themed-border">
+    <header
+        class="flex items-end justify-between gap-4 shrink-0 pb-3 border-b themed-border"
+    >
         <div class="min-w-0">
-            <h1 class="text-2xl font-bold themed-text-primary">最近播放</h1>
+            <p
+                class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
+            >
+                Recent
+            </p>
+            <h1 class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]">最近播放</h1>
             <p class="text-sm themed-text-secondary mt-1">
                 这里会显示你最近播放过的歌曲
             </p>
         </div>
 
         {#if recentlyPlayed.tracks.length > 0}
-            <mdui-button
-                variant="outlined"
-                onclick={() => recentlyPlayed.clear()}
-                onkeydown={(e: KeyboardEvent) => {
-                    if (e.key === 'Enter' || e.key === ' ') recentlyPlayed.clear()
-                }}
-                role="button"
-                tabindex="0"
-            >
+            <Button variant="outlined" onclick={() => recentlyPlayed.clear()}>
                 清空
-            </mdui-button>
+            </Button>
         {/if}
     </header>
 
@@ -60,4 +60,4 @@
             <TrackList tracks={recentlyPlayed.tracks} />
         </div>
     {/if}
-</section>
\ No newline at end of file
+</section>

From 2d050a64f18d3dfb96c60d1af8f108f0ca67bc8a Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Mon, 25 May 2026 15:35:05 +0800
Subject: [PATCH 09/39] Add Heading, parse album artist, UI refactor

Add a reusable Heading.svelte and refactor several pages to use it (album, artists, library, recent) to reduce duplicate header markup and unify loading/error states. Parse and store album artist in the Tauri backend: Track gained an album_artist field and parse_single_track now extracts AlbumArtist/AlbumArtists (with debug tag printing). Update frontend types: Track.albumArtist added; removed unused duration fields from Artist and Album and removed Album.artist; adjust album-building logic to group albums by title only and update IDs/search/sort accordingly. MediaGrid markup updated to use mdui-card and cleanup item layout/hover behavior. Misc: app.html link formatting, root page now redirects to /library, and small formatting/signature fixes in commands.rs.
---
 src-tauri/src/commands.rs                 |  21 ++-
 src/app.html                              |  41 ++----
 src/lib/components/base/Heading.svelte    |  35 +++++
 src/lib/components/media/MediaGrid.svelte |  96 +++++++-------
 src/lib/types/types.ts                    |   4 +-
 src/routes/+layout.svelte                 |  30 ++---
 src/routes/+page.svelte                   |  79 ++----------
 src/routes/album/+page.svelte             | 148 ++++++++--------------
 src/routes/artists/+page.svelte           | 107 ++++++----------
 src/routes/library/+page.svelte           | 124 ++++++++----------
 src/routes/recent/+page.svelte            |  67 ++++------
 11 files changed, 312 insertions(+), 440 deletions(-)
 create mode 100644 src/lib/components/base/Heading.svelte

diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index 0e6afdb..c9d00ff 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -43,6 +43,7 @@ pub struct Track {
     title: String,
     artist: String,
     album: String,
+    album_artist: String,
     duration: f64,
     sample_rate: Option<u32>,
     cover: Option<String>,
@@ -145,6 +146,13 @@ pub async fn set_volume(volume: u8) -> Result<(), String> {
 
 fn parse_single_track(file_path: &Path) -> Option<Track> {
     let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
+    for tag in tagged_file.tags() {
+        println!("==== TAG {:?} ====", tag.tag_type());
+
+        for item in tag.items() {
+            println!("{:?} = {:?}", item.key(), item.value());
+        }
+    }
     let tag = tagged_file
         .primary_tag()
         .or_else(|| tagged_file.first_tag());
@@ -170,6 +178,14 @@ fn parse_single_track(file_path: &Path) -> Option<Track> {
         .map(|s| s.to_string())
         .unwrap_or_else(|| "Unknown Album".to_string());
 
+    let album_artist = tag
+        .and_then(|t| {
+            t.get_string(ItemKey::AlbumArtist)
+                .or_else(|| t.get_string(ItemKey::AlbumArtists))
+        })
+        .map(|s| s.to_string())
+        .unwrap_or_default();
+
     let props = tagged_file.properties();
     let duration = props.duration().as_secs_f64();
     let sample_rate = props.sample_rate();
@@ -178,6 +194,7 @@ fn parse_single_track(file_path: &Path) -> Option<Track> {
         title,
         artist,
         album,
+        album_artist,
         duration,
         sample_rate,
         cover: None,
@@ -211,9 +228,7 @@ pub async fn get_track_cover(full_path: String) -> Result<Option<String>, String
     Ok(cover)
 }
 
-async fn scan_music_directory_logic(
-    app_handle: &tauri::AppHandle,
-) -> Result<Vec<Track>, String> {
+async fn scan_music_directory_logic(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
     let music_dir = app_handle
         .path()
         .audio_dir()
diff --git a/src/app.html b/src/app.html
index d8b86cf..89a6390 100644
--- a/src/app.html
+++ b/src/app.html
@@ -8,34 +8,19 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <title>Tauri + SvelteKit + Typescript App</title>
   <!-- Filled -->
-<link
-  href="https://fonts.googleapis.com/icon?family=Material+Icons"
-  rel="stylesheet"
-/>
-
-<!-- Outlined -->
-<link
-  href="https://fonts.googleapis.com/icon?family=Material+Icons+Outlined"
-  rel="stylesheet"
-/>
-
-<!-- Rounded -->
-<link
-  href="https://fonts.googleapis.com/icon?family=Material+Icons+Round"
-  rel="stylesheet"
-/>
-
-<!-- Sharp -->
-<link
-  href="https://fonts.googleapis.com/icon?family=Material+Icons+Sharp"
-  rel="stylesheet"
-/>
-
-<!-- Two Tone -->
-<link
-  href="https://fonts.googleapis.com/icon?family=Material+Icons+Two+Tone"
-  rel="stylesheet"
-/>
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+
+  <!-- Outlined -->
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Outlined" rel="stylesheet" />
+
+  <!-- Rounded -->
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Round" rel="stylesheet" />
+
+  <!-- Sharp -->
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Sharp" rel="stylesheet" />
+
+  <!-- Two Tone -->
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Two+Tone" rel="stylesheet" />
   %sveltekit.head%
 </head>
 
diff --git a/src/lib/components/base/Heading.svelte b/src/lib/components/base/Heading.svelte
new file mode 100644
index 0000000..d0070e0
--- /dev/null
+++ b/src/lib/components/base/Heading.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+    import type { Snippet } from 'svelte'
+
+    type PageHeadingProps = {
+        eyebrow: string
+        title: string
+        children: Snippet
+        class?: string
+    }
+
+    let {
+        eyebrow,
+        title,
+        children,
+        class: className = '',
+    }: PageHeadingProps = $props()
+</script>
+
+<div class="flex flex-wrap items-end justify-between gap-4">
+    <div class="min-w-0">
+        <p
+            class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
+        >
+            {eyebrow}
+        </p>
+
+        <h1
+            class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]"
+        >
+            {title}
+        </h1>
+    </div>
+
+    {@render children()}
+</div>
diff --git a/src/lib/components/media/MediaGrid.svelte b/src/lib/components/media/MediaGrid.svelte
index 6bf3d44..80df282 100644
--- a/src/lib/components/media/MediaGrid.svelte
+++ b/src/lib/components/media/MediaGrid.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import 'mdui/components/button-icon.js'
+    import 'mdui/components/card.js'
 
     export type MediaGridItem = {
         id: string | number
@@ -22,72 +23,61 @@
 </script>
 
 {#snippet mediaCard(item: MediaGridItem)}
-    <a
+    <mdui-card
         href={item.href ?? undefined}
         class="group block outline-none"
         aria-label={item.title}
     >
         <div
-            class="rounded-2xl p-3 transition-all duration-200
-                   bg-[rgb(var(--mdui-color-surface-container))]
-                   border border-transparent
-                   hover:-translate-y-1 hover:shadow-lg
-                   hover:border-[rgb(var(--mdui-color-outline-variant))]
-                   focus-visible:ring-2 focus-visible:ring-[rgb(var(--mdui-color-primary))]"
-        >
-            <div
-                class="relative mb-3 aspect-square overflow-hidden
+            class="relative mb-3 aspect-square overflow
                        bg-[rgb(var(--mdui-color-surface-container-highest))]
                        {item.shape === 'circle'
-                    ? 'rounded-full'
-                    : 'rounded-xl'}"
-            >
-                {#if item.image}
-                    <img
-                        src={item.image}
-                        alt={item.title}
-                        class="h-full w-full object-cover transition-transform duration-300 group-hover:scale-105"
-                        loading="lazy"
-                    />
-                {:else}
-                    <div
-                        class="flex h-full w-full items-center justify-center text-4xl
-                               text-[rgb(var(--mdui-color-on-surface-variant))]"
-                    >
-                        {item.shape === 'circle' ? '👤' : '🎵'}
-                    </div>
-                {/if}
-
+                ? 'rounded-full'
+                : 'rounded-t-xl'}"
+        >
+            {#if item.image}
+                <img
+                    src={item.image}
+                    alt={item.title}
+                    class="h-full w-full object-cover transition-transform duration-300 group-hover:scale-105"
+                    loading="lazy"
+                />
+            {:else}
                 <div
-                    class="absolute inset-0 flex items-end justify-end p-3 opacity-0
-                           transition-opacity duration-200 group-hover:opacity-100"
+                    class="flex h-full w-full items-center justify-center text-4xl
+                               text-[rgb(var(--mdui-color-on-surface-variant))]"
                 >
-                    <mdui-button-icon
-                        variant="filled"
-                        icon="play_arrow--rounded"
-                    ></mdui-button-icon>
+                    {item.shape === 'circle' ? '👤' : '🎵'}
                 </div>
+            {/if}
+
+            <div
+                class="absolute inset-0 flex items-end justify-end p-3 opacity-0
+                           transition-opacity duration-200 group-hover:opacity-100"
+            >
+                <mdui-button-icon variant="filled" icon="play_arrow--rounded"
+                ></mdui-button-icon>
             </div>
+        </div>
 
-            <div class="min-w-0">
-                <h3
-                    class="truncate text-sm font-semibold
+        <div class="min-w-0 px-2">
+            <h2
+                class="truncate text-sm font-semibold
                            text-[rgb(var(--mdui-color-on-surface))]"
-                >
-                    {item.title}
-                </h3>
+            >
+                {item.title}
+            </h2>
 
-                {#if item.subtitle}
-                    <p
-                        class="mt-0 truncate text-xs
+            {#if item.subtitle}
+                <p
+                    class="mt-0 truncate text-xs
                                text-[rgb(var(--mdui-color-on-surface-variant))]"
-                    >
-                        {item.subtitle}
-                    </p>
-                {/if}
-            </div>
+                >
+                    {item.subtitle}
+                </p>
+            {/if}
         </div>
-    </a>
+    </mdui-card>
 {/snippet}
 
 {#if items.length === 0}
@@ -98,7 +88,9 @@
     >
         <div class="text-5xl">🎧</div>
         <div class="mt-3 text-base font-medium">{emptyTitle}</div>
-        <div class="mt-1 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]">
+        <div
+            class="mt-1 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+        >
             {emptyDescription}
         </div>
     </div>
@@ -116,4 +108,4 @@
             {/each}
         </div>
     </section>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/src/lib/types/types.ts b/src/lib/types/types.ts
index b65bab7..e915e05 100644
--- a/src/lib/types/types.ts
+++ b/src/lib/types/types.ts
@@ -2,6 +2,7 @@ export interface Track {
     title: string
     artist: string
     album: string
+    albumArtist: string
     duration: number
     sampleRate?: number | null
     cover?: string | null
@@ -21,7 +22,6 @@ export interface Artist {
     cover?: string | null
     trackCount: number
     albumCount: number
-    duration: number
     tracks: Track[]
 }
 
@@ -29,10 +29,8 @@ export interface Artist {
 export interface Album {
     id: string
     title: string
-    artist: string
     cover?: string | null
     trackCount: number
-    duration: number
     tracks: Track[]
     representativeTrack: Track
 }
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 97707fc..8b80d67 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,22 +1,22 @@
 <script lang="ts">
-  import PlayerBar from '$lib/features/PlayerBar.svelte'
-  import Appbar from '$lib/features/shell/Appbar.svelte'
-  import NavRail from '$lib/features/shell/NavRail.svelte'
-  import 'mdui'
-  import 'mdui/mdui.css'
-  import '../app.css'
+    import PlayerBar from '$lib/features/PlayerBar.svelte'
+    import Appbar from '$lib/features/shell/Appbar.svelte'
+    import NavRail from '$lib/features/shell/NavRail.svelte'
+    import 'mdui'
+    import 'mdui/mdui.css'
+    import '../app.css'
 
-  let { children } = $props()
+    let { children } = $props()
 </script>
 
 <mdui-layout full-height>
-  <Appbar />
-  <PlayerBar />
-  <NavRail />
+    <Appbar />
+    <PlayerBar />
+    <NavRail />
 
-  <mdui-layout-main
-    class="flex flex-col h-screen w-screen overflow-hidden bg-(--controlWhite) text-(--controlBlack)"
-  >
-    {@render children()}
-  </mdui-layout-main>
+    <mdui-layout-main
+        class="flex flex-col h-screen w-screen overflow-hidden bg-(--controlWhite) text-(--controlBlack)"
+    >
+        {@render children()}
+    </mdui-layout-main>
 </mdui-layout>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 2d83075..f12c787 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,76 +1,15 @@
 <script lang="ts">
-  import Playlists from "$lib/features/PlaylistGrid.svelte"
+    import { goto } from '$app/navigation'
+    import { onMount } from 'svelte'
 
-  const playlists = [
-    {
-      id: 1,
-      name: '我的歌单',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-    {
-      id: 2,
-      name: '收藏的艺术家',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-    {
-      id: 3,
-      name: '收藏的专辑',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-    {
-      id: 4,
-      name: '最近播放',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-  ]
-
-  const recentSongs = [
-    {
-      id: 1,
-      title: '残酷天使的行动纲领',
-      artist: '高桥洋子',
-      album: 'NEON GENESIS EVANGELION',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-    {
-      id: 2,
-      title: '魂のルフラン',
-      artist: '高桥洋子',
-      album: 'NEON GENESIS EVANGELION II',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-    {
-      id: 3,
-      title: 'Beautiful World',
-      artist: '宇多田光',
-      album: 'Beautiful World/Kiss & Cry',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-    {
-      id: 4,
-      title: 'One Last Kiss',
-      artist: '宇多田光',
-      album: 'One Last Kiss',
-      cover:
-        'https://pic1.zhimg.com/v2-b8472d97dd297753225bdae079343f50_1440w.jpeg',
-    },
-  ]
+    onMount(() => {
+        goto('/library', { replaceState: true })
+    })
 </script>
 
-<div class="overflow-y-auto p-8">
-  <Playlists {playlists} />
-</div>
-
 <style lang="postcss">
-  @reference "tailwindcss";
-  :global(html) {
-    background-color: theme(--color-gray-100);
-  }
+    @reference "tailwindcss";
+    :global(html) {
+        background-color: theme(--color-gray-100);
+    }
 </style>
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 55ad744..4c95767 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -1,18 +1,16 @@
 <script lang="ts">
+    import Button from '$lib/components/base/Button.svelte'
+    import Heading from '$lib/components/base/Heading.svelte'
     import MediaGrid from '$lib/components/media/MediaGrid.svelte'
+    import Filters from '$lib/features/Filters.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import type { Album, Track } from '$lib/types'
     import { onMount } from 'svelte'
 
-    import Button from '$lib/components/base/Button.svelte'
-    import Filters from '$lib/features/Filters.svelte'
-    import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
-    import 'mdui/components/menu-item.js'
-    import 'mdui/components/select.js'
-    import 'mdui/components/text-field.js'
-    type SortBy = 'title' | 'artist' | 'trackCount'
+
+    type SortBy = 'title' | 'trackCount'
 
     let query = $state('')
     let sortBy = $state<SortBy>('title')
@@ -26,26 +24,20 @@
         void musicLibrary.refresh()
     })
 
-    function createAlbumId(title: string, artist: string) {
-        return encodeURIComponent(`${artist}__${title}`)
+    function createAlbumId(title: string) {
+        return encodeURIComponent(title)
     }
 
     function getAlbumTitle(track: Track) {
         return track.album?.trim() || '未知专辑'
     }
 
-    function getAlbumArtist(track: Track) {
-        return track.artist?.trim() || '未知艺术家'
-    }
-
     function buildAlbums(tracks: Track[]): Album[] {
         const albumMap = new Map<
             string,
             {
                 title: string
-                artist: string
                 tracks: Track[]
-                duration: number
                 cover?: string | null
                 representativeTrack: Track
             }
@@ -53,15 +45,12 @@
 
         for (const track of tracks) {
             const title = getAlbumTitle(track)
-            const artist = getAlbumArtist(track)
-            const key = `${artist.toLowerCase()}__${title.toLowerCase()}`
+            const key = title.toLowerCase()
 
             if (!albumMap.has(key)) {
                 albumMap.set(key, {
                     title,
-                    artist,
                     tracks: [],
-                    duration: 0,
                     cover: track.cover ?? null,
                     representativeTrack: track,
                 })
@@ -70,22 +59,16 @@
             const album = albumMap.get(key)!
 
             album.tracks.push(track)
-            album.duration += track.duration
 
             if (!album.cover && track.cover) {
                 album.cover = track.cover
             }
         }
 
-        return Array.from(albumMap.values()).map(album => ({
-            id: createAlbumId(album.title, album.artist),
-            title: album.title,
-            artist: album.artist,
-            cover: album.cover,
+        return Array.from(albumMap.values()).map((album) => ({
+            ...album,
+            id: createAlbumId(album.title),
             trackCount: album.tracks.length,
-            duration: album.duration,
-            tracks: album.tracks,
-            representativeTrack: album.representativeTrack,
         }))
     }
 
@@ -95,10 +78,8 @@
         const keyword = query.trim().toLowerCase()
 
         const list = keyword
-            ? albums.filter(album =>
-                  [album.title, album.artist].some(value =>
-                      value.toLowerCase().includes(keyword),
-                  ),
+            ? albums.filter((album) =>
+                  album.title.toLowerCase().includes(keyword),
               )
             : albums
 
@@ -107,11 +88,7 @@
                 return collator.compare(a.title, b.title)
             }
 
-            if (sortBy === 'artist') {
-                return collator.compare(a.artist, b.artist)
-            }
-
-            return b[sortBy] - a[sortBy]
+            return b.trackCount - a.trackCount
         })
     })
 
@@ -122,10 +99,10 @@
     })
 
     let albumItems = $derived(
-        filteredAlbums.map(album => ({
+        filteredAlbums.map((album) => ({
             id: album.id,
             title: album.title,
-            subtitle: `${album.artist} · ${album.trackCount} 首歌曲`,
+            subtitle: `${album.trackCount} 首歌曲`,
             image: trackCovers.get(album.representativeTrack) ?? album.cover,
             href: `/albums/${album.id}`,
             shape: 'square' as const,
@@ -137,60 +114,41 @@
     <title>专辑</title>
 </svelte:head>
 
-<section class="flex h-full min-h-0 flex-col gap-6 overflow-hidden">
-    <header
-        class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
-    >
-        <div class="flex flex-wrap items-end justify-between gap-4">
-            <div class="min-w-0">
-                <p
-                    class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
-                >
-                    Albums
-                </p>
-
-                <h1
-                    class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]"
-                >
-                    专辑
-                </h1>
-            </div>
-
-            <Button
-                variant="outlined"
-                onclick={() => musicLibrary.refresh({ force: true })}
-            >
-                刷新
-            </Button>
-        </div>
-
-        <Filters
-            bind:query
-            bind:sortBy
-            searchPlaceholder="搜索专辑或歌手..."
-            sortOptions={[
-                    { label: '按专辑名排序', value: 'title' },
-                    { label: '按歌手排序', value: 'artist' },
-                    { label: '按歌曲数排序', value: 'trackCount' },
-                ]}
+<header class="flex flex-col gap-4 pb-5">
+    <Heading eyebrow="Albums" title="专辑">
+        <Button
+            variant="outlined"
+            onclick={() => musicLibrary.refresh({ force: true })}
+        >
+            刷新
+        </Button>
+    </Heading>
+
+    <Filters
+        bind:query
+        bind:sortBy
+        searchPlaceholder="搜索专辑..."
+        sortOptions={[
+            { label: '按专辑名排序', value: 'title' },
+            { label: '按歌曲数排序', value: 'trackCount' },
+        ]}
+    />
+</header>
+
+{#if musicLibrary.isLoading}
+    <div class="flex flex-1 items-center justify-center">
+        <mdui-circular-progress></mdui-circular-progress>
+    </div>
+{:else if musicLibrary.error}
+    <div class="flex flex-1 items-center justify-center text-red-500">
+        {musicLibrary.error}
+    </div>
+{:else}
+    <div class="min-h-0 flex-1 overflow-auto pb-8">
+        <MediaGrid
+            items={albumItems}
+            emptyTitle="没有找到专辑"
+            emptyDescription="尝试刷新媒体库或修改搜索关键词"
         />
-    </header>
-
-    {#if musicLibrary.isLoading}
-        <div class="flex flex-1 items-center justify-center">
-            <mdui-circular-progress></mdui-circular-progress>
-        </div>
-    {:else if musicLibrary.error}
-        <div class="flex flex-1 items-center justify-center text-red-500">
-            {musicLibrary.error}
-        </div>
-    {:else}
-        <div class="min-h-0 flex-1 overflow-auto pb-8">
-            <MediaGrid
-                items={albumItems}
-                emptyTitle="没有找到专辑"
-                emptyDescription="尝试刷新媒体库或修改搜索关键词"
-            />
-        </div>
-    {/if}
-</section>
+    </div>
+{/if}
\ No newline at end of file
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index 271c910..7a22f82 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -5,6 +5,7 @@
     import { onMount } from 'svelte'
 
     import Button from '$lib/components/base/Button.svelte'
+    import Heading from '$lib/components/base/Heading.svelte'
     import Filters from '$lib/features/Filters.svelte'
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
@@ -34,7 +35,6 @@
                 name: string
                 tracks: Track[]
                 albums: Set<string>
-                duration: number
                 cover?: string | null
             }
         >()
@@ -48,7 +48,6 @@
                     name,
                     tracks: [],
                     albums: new Set(),
-                    duration: 0,
                     cover: track.cover ?? null,
                 })
             }
@@ -56,7 +55,6 @@
             const artist = artistMap.get(key)!
 
             artist.tracks.push(track)
-            artist.duration += track.duration
 
             if (track.album?.trim()) {
                 artist.albums.add(track.album.trim())
@@ -73,7 +71,6 @@
             cover: artist.cover,
             trackCount: artist.tracks.length,
             albumCount: artist.albums.size,
-            duration: artist.duration,
             tracks: artist.tracks,
         }))
     }
@@ -108,70 +105,50 @@
             shape: 'circle' as const,
         })),
     )
-
-    let totalDuration = $derived(
-        artists.reduce((sum, artist) => sum + artist.duration, 0),
-    )
 </script>
 
 <svelte:head>
-    <title>歌手</title>
+    <title>艺术家</title>
 </svelte:head>
 
-<section class="flex h-full min-h-0 flex-col gap-6 overflow-hidden">
-    <header
-        class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
-    >
-        <div class="flex flex-wrap items-end justify-between gap-4">
-            <div class="min-w-0">
-                <p
-                    class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
-                >
-                    Artists
-                </p>
-
-                <h1
-                    class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]"
-                >
-                    歌手
-                </h1>
-            </div>
-
-            <Button
-                variant="outlined"
-                onclick={() => musicLibrary.refresh({ force: true })}
-            >
-                刷新
-            </Button>
-        </div>
-
-        <Filters
-            bind:query
-            bind:sortBy
-            searchPlaceholder="搜索歌手..."
-            sortOptions={[
-                { label: '按名称排序', value: 'name' },
-                { label: '按歌曲数排序', value: 'trackCount' },
-                { label: '按专辑数排序', value: 'albumCount' },
-            ]}
+<header
+    class="flex flex-col gap-4 pb-5"
+>
+    <Heading eyebrow="artist" title="艺术家">
+        <Button
+            variant="outlined"
+            onclick={() => musicLibrary.refresh({ force: true })}
+        >
+            刷新
+        </Button>
+    </Heading>
+
+    <Filters
+        bind:query
+        bind:sortBy
+        searchPlaceholder="搜索歌手..."
+        sortOptions={[
+            { label: '按名称排序', value: 'name' },
+            { label: '按歌曲数排序', value: 'trackCount' },
+            { label: '按专辑数排序', value: 'albumCount' },
+        ]}
+    />
+</header>
+
+{#if musicLibrary.isLoading}
+    <div class="flex flex-1 items-center justify-center">
+        <mdui-circular-progress></mdui-circular-progress>
+    </div>
+{:else if musicLibrary.error}
+    <div class="flex flex-1 items-center justify-center text-red-500">
+        {musicLibrary.error}
+    </div>
+{:else}
+    <div class="min-h-0 flex-1 overflow-auto pb-8">
+        <MediaGrid
+            items={artistItems}
+            emptyTitle="没有找到歌手"
+            emptyDescription="尝试刷新媒体库或修改搜索关键词"
         />
-    </header>
-
-    {#if musicLibrary.isLoading}
-        <div class="flex flex-1 items-center justify-center">
-            <mdui-circular-progress></mdui-circular-progress>
-        </div>
-    {:else if musicLibrary.error}
-        <div class="flex flex-1 items-center justify-center text-red-500">
-            {musicLibrary.error}
-        </div>
-    {:else}
-        <div class="min-h-0 flex-1 overflow-auto pb-8">
-            <MediaGrid
-                items={artistItems}
-                emptyTitle="没有找到歌手"
-                emptyDescription="尝试刷新媒体库或修改搜索关键词"
-            />
-        </div>
-    {/if}
-</section>
+    </div>
+{/if}
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index df72cbb..df063aa 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -6,6 +6,7 @@
     import { onMount } from 'svelte'
 
     import Button from '$lib/components/base/Button.svelte'
+    import Heading from '$lib/components/base/Heading.svelte'
     import Filters from '$lib/features/Filters.svelte'
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
@@ -56,74 +57,57 @@
     <title>歌曲</title>
 </svelte:head>
 
-<section class="flex h-full min-h-0 flex-col gap-6 overflow-hidden">
-    <header
-        class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
-    >
-        <div class="flex flex-wrap items-end justify-between gap-4">
-            <div class="min-w-0">
-                <p
-                    class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
-                >
-                    Library
-                </p>
-
-                <h1
-                    class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]"
-                >
-                    歌曲
-                </h1>
-            </div>
-
-            <div class="flex items-center gap-2">
-                <Button
-                    variant="filled"
-                    disabled={filteredTracks.length === 0}
-                    onclick={playAll}
-                >
-                    播放全部
-                </Button>
-
-                <Button
-                    variant="outlined"
-                    onclick={() => musicLibrary.refresh({ force: true })}
-                >
-                    刷新
-                </Button>
-            </div>
+<header
+    class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
+>
+    <Heading eyebrow="library" title="歌曲">
+        <div class="flex items-center gap-2">
+            <Button
+                variant="filled"
+                disabled={filteredTracks.length === 0}
+                onclick={playAll}
+            >
+                播放全部
+            </Button>
+
+            <Button
+                variant="outlined"
+                onclick={() => musicLibrary.refresh({ force: true })}
+            >
+                刷新
+            </Button>
         </div>
-
-        <Filters
-            bind:query
-            bind:sortBy
-            searchPlaceholder="搜索标题、歌手、专辑..."
-            sortOptions={[
-                    { label: '按标题排序', value: 'title' },
-                    { label: '按歌手排序', value: 'artist' },
-                    { label: '按专辑排序', value: 'album' },
-                ]}
-        />
-    </header>
-
-    {#if musicLibrary.isLoading}
-        <div class="flex flex-1 items-center justify-center">
-            <mdui-circular-progress></mdui-circular-progress>
-        </div>
-    {:else if musicLibrary.error}
-        <div class="flex flex-1 items-center justify-center text-red-500">
-            {musicLibrary.error}
-        </div>
-    {:else if filteredTracks.length === 0}
-        <div
-            class="flex flex-1 flex-col items-center justify-center gap-2 text-[rgb(var(--mdui-color-on-surface-variant))]"
-        >
-            <div class="text-5xl">🎵</div>
-            <div class="text-base font-medium">没有找到歌曲</div>
-            <div class="text-sm">尝试刷新媒体库或修改搜索关键词</div>
-        </div>
-    {:else}
-        <div class="min-h-0 flex-1 overflow-auto">
-            <TrackList tracks={filteredTracks as Track[]} />
-        </div>
-    {/if}
-</section>
+    </Heading>
+    <Filters
+        bind:query
+        bind:sortBy
+        searchPlaceholder="搜索标题、歌手、专辑..."
+        sortOptions={[
+            { label: '按标题排序', value: 'title' },
+            { label: '按歌手排序', value: 'artist' },
+            { label: '按专辑排序', value: 'album' },
+        ]}
+    />
+</header>
+
+{#if musicLibrary.isLoading}
+    <div class="flex flex-1 items-center justify-center">
+        <mdui-circular-progress></mdui-circular-progress>
+    </div>
+{:else if musicLibrary.error}
+    <div class="flex flex-1 items-center justify-center text-red-500">
+        {musicLibrary.error}
+    </div>
+{:else if filteredTracks.length === 0}
+    <div
+        class="flex flex-1 flex-col items-center justify-center gap-2 text-[rgb(var(--mdui-color-on-surface-variant))]"
+    >
+        <div class="text-5xl">🎵</div>
+        <div class="text-base font-medium">没有找到歌曲</div>
+        <div class="text-sm">尝试刷新媒体库或修改搜索关键词</div>
+    </div>
+{:else}
+    <div class="min-h-0 flex-1 overflow-auto">
+        <TrackList tracks={filteredTracks as Track[]} />
+    </div>
+{/if}
diff --git a/src/routes/recent/+page.svelte b/src/routes/recent/+page.svelte
index 085984a..6aab7fb 100644
--- a/src/routes/recent/+page.svelte
+++ b/src/routes/recent/+page.svelte
@@ -4,6 +4,7 @@
     import { onMount } from 'svelte'
 
     import Button from '$lib/components/base/Button.svelte'
+    import Heading from '$lib/components/base/Heading.svelte'
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
 
@@ -16,48 +17,36 @@
     <title>最近播放</title>
 </svelte:head>
 
-<section class="w-full min-h-full overflow-y-auto">
-    <header
-        class="flex items-end justify-between gap-4 shrink-0 pb-3 border-b themed-border"
-    >
-        <div class="min-w-0">
-            <p
-                class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
-            >
-                Recent
-            </p>
-            <h1 class="mt-1 text-3xl font-bold tracking-tight text-[rgb(var(--mdui-color-on-surface))]">最近播放</h1>
-            <p class="text-sm themed-text-secondary mt-1">
-                这里会显示你最近播放过的歌曲
-            </p>
-        </div>
-
+<header
+    class="flex items-end justify-between gap-4 shrink-0 pb-3 border-b themed-border"
+>
+    <Heading eyebrow="Recent" title="最近播放">
         {#if recentlyPlayed.tracks.length > 0}
             <Button variant="outlined" onclick={() => recentlyPlayed.clear()}>
                 清空
             </Button>
         {/if}
-    </header>
+    </Heading>
+</header>
 
-    {#if recentlyPlayed.isLoading}
-        <div class="flex-1 flex items-center justify-center">
-            <mdui-circular-progress></mdui-circular-progress>
-        </div>
-    {:else if recentlyPlayed.error}
-        <div class="flex-1 flex items-center justify-center text-red-500">
-            {recentlyPlayed.error}
-        </div>
-    {:else if recentlyPlayed.tracks.length === 0}
-        <div
-            class="flex-1 flex flex-col items-center justify-center gap-2 themed-text-secondary"
-        >
-            <div class="text-5xl">🎧</div>
-            <div class="text-base font-medium">还没有最近播放记录</div>
-            <div class="text-sm">播放一首歌后，它会出现在这里</div>
-        </div>
-    {:else}
-        <div class="flex-1 overflow-auto">
-            <TrackList tracks={recentlyPlayed.tracks} />
-        </div>
-    {/if}
-</section>
+{#if recentlyPlayed.isLoading}
+    <div class="flex-1 flex items-center justify-center">
+        <mdui-circular-progress></mdui-circular-progress>
+    </div>
+{:else if recentlyPlayed.error}
+    <div class="flex-1 flex items-center justify-center text-red-500">
+        {recentlyPlayed.error}
+    </div>
+{:else if recentlyPlayed.tracks.length === 0}
+    <div
+        class="flex-1 flex flex-col items-center justify-center gap-2 themed-text-secondary"
+    >
+        <div class="text-5xl">🎧</div>
+        <div class="text-base font-medium">还没有最近播放记录</div>
+        <div class="text-sm">播放一首歌后，它会出现在这里</div>
+    </div>
+{:else}
+    <div class="flex-1 overflow-auto">
+        <TrackList tracks={recentlyPlayed.tracks} />
+    </div>
+{/if}

From 3d86a7648d7139f30c5b5f8a10f74fdde9b857b6 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Mon, 25 May 2026 20:15:40 +0800
Subject: [PATCH 10/39] add settings and extension

---
 src-tauri/src/audio.rs                 |  28 ++
 src-tauri/src/commands.rs              | 457 -------------------------
 src-tauri/src/commands/library.rs      | 199 +++++++++++
 src-tauri/src/commands/mod.rs          |   4 +
 src-tauri/src/commands/playback.rs     | 110 ++++++
 src-tauri/src/commands/recent.rs       |  84 +++++
 src-tauri/src/commands/settings.rs     |  63 ++++
 src-tauri/src/lib.rs                   |  52 ++-
 src-tauri/src/metadata.rs              |  59 ++++
 src-tauri/src/models/mod.rs            |   4 +
 src-tauri/src/models/settings.rs       |  31 ++
 src-tauri/src/models/track.rs          |  13 +
 src/lib/components/base/Heading.svelte |  10 +-
 src/lib/extensions/builtin.ts          |  60 ++++
 src/lib/extensions/registry.svelte.ts  |  48 +++
 src/lib/features/shell/NavRail.svelte  |   6 +
 src/lib/state/covers.svelte.ts         |   2 +-
 src/lib/state/library.svelte.ts        |   2 +-
 src/lib/state/player.svelte.ts         |   2 +-
 src/lib/state/recent.svelte.ts         |   2 +-
 src/lib/state/settings.svelte.ts       |  88 +++++
 src/lib/types/extension.ts             |  22 ++
 src/lib/types/index.ts                 |   8 +-
 src/lib/types/{types.ts => music.ts}   |   0
 src/lib/types/settings.ts              |  10 +
 src/routes/+layout.svelte              |   7 +
 src/routes/album/+page.svelte          |  10 +-
 src/routes/artists/+page.svelte        |   4 +-
 src/routes/library/+page.svelte        |   4 +-
 src/routes/recent/+page.svelte         |   4 +-
 src/routes/settings/+page.svelte       | 246 +++++++++++++
 31 files changed, 1148 insertions(+), 491 deletions(-)
 create mode 100644 src-tauri/src/audio.rs
 delete mode 100644 src-tauri/src/commands.rs
 create mode 100644 src-tauri/src/commands/library.rs
 create mode 100644 src-tauri/src/commands/mod.rs
 create mode 100644 src-tauri/src/commands/playback.rs
 create mode 100644 src-tauri/src/commands/recent.rs
 create mode 100644 src-tauri/src/commands/settings.rs
 create mode 100644 src-tauri/src/metadata.rs
 create mode 100644 src-tauri/src/models/mod.rs
 create mode 100644 src-tauri/src/models/settings.rs
 create mode 100644 src-tauri/src/models/track.rs
 create mode 100644 src/lib/extensions/builtin.ts
 create mode 100644 src/lib/extensions/registry.svelte.ts
 create mode 100644 src/lib/state/settings.svelte.ts
 create mode 100644 src/lib/types/extension.ts
 rename src/lib/types/{types.ts => music.ts} (100%)
 create mode 100644 src/lib/types/settings.ts
 create mode 100644 src/routes/settings/+page.svelte

diff --git a/src-tauri/src/audio.rs b/src-tauri/src/audio.rs
new file mode 100644
index 0000000..fd8ae86
--- /dev/null
+++ b/src-tauri/src/audio.rs
@@ -0,0 +1,28 @@
+use std::sync::{Mutex, OnceLock};
+
+use web_audio_api::context::AudioContext;
+use web_audio_api::node::GainNode;
+use web_audio_api::MediaElement;
+
+pub fn get_audio_context() -> &'static AudioContext {
+    static CONTEXT: OnceLock<AudioContext> = OnceLock::new();
+    CONTEXT.get_or_init(|| AudioContext::default())
+}
+
+pub struct AudioState {
+    pub media: Option<MediaElement>,
+    pub gain_node: Option<GainNode>,
+    pub volume: f32,
+}
+
+pub fn get_audio_state() -> &'static Mutex<AudioState> {
+    static STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
+
+    STATE.get_or_init(|| {
+        Mutex::new(AudioState {
+            media: None,
+            gain_node: None,
+            volume: 0.8,
+        })
+    })
+}
\ No newline at end of file
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
deleted file mode 100644
index c9d00ff..0000000
--- a/src-tauri/src/commands.rs
+++ /dev/null
@@ -1,457 +0,0 @@
-use base64::{engine::general_purpose, Engine as _};
-use lofty::prelude::*;
-use lofty::probe::Probe;
-use std::fs::{self, File};
-use std::path::Path;
-use std::sync::{Mutex, OnceLock};
-use tauri::{command, Manager};
-
-use walkdir::WalkDir;
-use web_audio_api::context::{AudioContext, BaseAudioContext};
-use web_audio_api::node::{AudioNode, GainNode};
-use web_audio_api::MediaElement;
-
-use serde::{Deserialize, Serialize};
-
-const RECENTLY_PLAYED_FILE: &str = "recently_played.json";
-const MAX_RECENTLY_PLAYED: usize = 100;
-
-fn get_audio_context() -> &'static AudioContext {
-    static CONTEXT: OnceLock<AudioContext> = OnceLock::new();
-    CONTEXT.get_or_init(|| AudioContext::default())
-}
-
-struct AudioState {
-    media: Option<MediaElement>,
-    gain_node: Option<GainNode>,
-    volume: f32,
-}
-
-fn get_audio_state() -> &'static Mutex<AudioState> {
-    static STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
-    STATE.get_or_init(|| {
-        Mutex::new(AudioState {
-            media: None,
-            gain_node: None,
-            volume: 0.8,
-        })
-    })
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-pub struct Track {
-    title: String,
-    artist: String,
-    album: String,
-    album_artist: String,
-    duration: f64,
-    sample_rate: Option<u32>,
-    cover: Option<String>,
-    path: String,
-}
-
-#[command]
-pub async fn play_music(full_path: &str) -> Result<String, String> {
-    let file_path = Path::new(&full_path);
-    if !file_path.exists() {
-        return Err("音频文件不存在或已被移动".into());
-    }
-
-    let mut media = MediaElement::new(&file_path)
-        .map_err(|e| format!("Failed to create media element: {}", e))?;
-    let context = get_audio_context();
-    let src = context.create_media_element_source(&mut media);
-
-    // src.connect(&context.destination());
-    let gain_node = context.create_gain();
-
-    src.connect(&gain_node);
-    gain_node.connect(&context.destination());
-
-    media.set_loop(false);
-    media.set_current_time(0.0);
-
-    let mut state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
-
-    gain_node.gain().set_value(state.volume);
-
-    if let Some(old_media) = state.media.replace(media) {
-        old_media.pause();
-    }
-
-    state.gain_node = Some(gain_node);
-
-    if let Some(ref media) = state.media {
-        media.play();
-    }
-
-    Ok(format!("Playing music: {}", full_path))
-}
-
-#[command]
-pub async fn toggle_music() -> Result<bool, String> {
-    let state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
-    if let Some(ref media) = state.media {
-        if media.paused() {
-            media.play();
-            Ok(true)
-        } else {
-            media.pause();
-            Ok(false)
-        }
-    } else {
-        Err("No media available".into())
-    }
-}
-
-#[command]
-pub async fn current_time() -> f64 {
-    let Ok(state) = get_audio_state().lock() else {
-        return 0.0;
-    };
-    if let Some(ref media) = state.media {
-        media.current_time()
-    } else {
-        0.0
-    }
-}
-
-#[command]
-pub async fn set_current_time(time: f64) {
-    let state = get_audio_state().lock().unwrap();
-    if let Some(ref media) = state.media {
-        media.set_current_time(time);
-    }
-}
-
-#[command]
-pub async fn set_volume(volume: u8) -> Result<(), String> {
-    let mut state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
-    let volume: f32 = volume as f32 / 100.0;
-    let safe_volume = volume.clamp(0.0, 1.0);
-    state.volume = safe_volume;
-
-    if let Some(ref gain_node) = state.gain_node {
-        gain_node.gain().set_value(safe_volume);
-    }
-
-    Ok(())
-}
-
-fn parse_single_track(file_path: &Path) -> Option<Track> {
-    let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
-    for tag in tagged_file.tags() {
-        println!("==== TAG {:?} ====", tag.tag_type());
-
-        for item in tag.items() {
-            println!("{:?} = {:?}", item.key(), item.value());
-        }
-    }
-    let tag = tagged_file
-        .primary_tag()
-        .or_else(|| tagged_file.first_tag());
-
-    let title = tag
-        .and_then(|t| t.title())
-        .map(|s| s.to_string())
-        .unwrap_or_else(|| {
-            file_path
-                .file_stem()
-                .and_then(|s| s.to_str())
-                .unwrap_or("Unknown Track")
-                .to_string()
-        });
-
-    let artist = tag
-        .and_then(|t| t.artist())
-        .map(|s| s.to_string())
-        .unwrap_or_else(|| "Unknown Artist".to_string());
-
-    let album = tag
-        .and_then(|t| t.album())
-        .map(|s| s.to_string())
-        .unwrap_or_else(|| "Unknown Album".to_string());
-
-    let album_artist = tag
-        .and_then(|t| {
-            t.get_string(ItemKey::AlbumArtist)
-                .or_else(|| t.get_string(ItemKey::AlbumArtists))
-        })
-        .map(|s| s.to_string())
-        .unwrap_or_default();
-
-    let props = tagged_file.properties();
-    let duration = props.duration().as_secs_f64();
-    let sample_rate = props.sample_rate();
-
-    Some(Track {
-        title,
-        artist,
-        album,
-        album_artist,
-        duration,
-        sample_rate,
-        cover: None,
-        path: file_path.to_string_lossy().into_owned(),
-    })
-}
-
-#[command]
-pub async fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
-    let file_path = Path::new(&full_path);
-
-    if !file_path.exists() {
-        return Err("音频文件不存在或已被移动".into());
-    }
-
-    let tagged_file = Probe::open(file_path)
-        .map_err(|e| format!("无法打开音频文件: {}", e))?
-        .read()
-        .map_err(|e| format!("无法读取音频元数据: {}", e))?;
-
-    let tag = tagged_file
-        .primary_tag()
-        .or_else(|| tagged_file.first_tag());
-
-    let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
-        let b64_encoded = general_purpose::STANDARD.encode(pic.data());
-        let mime_type = pic.mime_type().map(|m| m.as_str()).unwrap_or("image/jpeg");
-        format!("data:{};base64,{}", mime_type, b64_encoded)
-    });
-
-    Ok(cover)
-}
-
-async fn scan_music_directory_logic(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
-    let music_dir = app_handle
-        .path()
-        .audio_dir()
-        .map_err(|e| format!("无法获取系统音乐目录: {}", e))?;
-
-    let mut tracks = Vec::new();
-    visit_dirs(&music_dir, &mut tracks);
-
-    Ok(tracks)
-}
-
-fn visit_dirs(dir: &Path, tracks: &mut Vec<Track>) {
-    if let Ok(entries) = fs::read_dir(dir) {
-        for entry in entries.flatten() {
-            let path = entry.path();
-            if path.is_dir() {
-                visit_dirs(&path, tracks);
-            } else if let Some(ext) = path.extension().and_then(|s| s.to_str()) {
-                let ext_lower = ext.to_lowercase();
-                if ext_lower == "mp3"
-                    || ext_lower == "flac"
-                    || ext_lower == "wav"
-                    || ext_lower == "m4a"
-                    || ext_lower == "ogg"
-                {
-                    if let Some(track) = parse_single_track(&path) {
-                        tracks.push(track);
-                    }
-                }
-            }
-        }
-    }
-}
-
-static SUPPORTED_EXT: [&str; 4] = ["mp3", "flac", "m4a", "wav"];
-
-#[command]
-pub async fn scan_music_directory(
-    app_handle: tauri::AppHandle,
-    dir_path: String,
-) -> Result<Vec<Track>, String> {
-    let root_path = Path::new(&dir_path);
-    if !root_path.is_dir() {
-        return Err("Invalid directory path".into());
-    }
-
-    let mut playlist = Vec::new();
-
-    for entry in WalkDir::new(root_path).into_iter().filter_map(|e| e.ok()) {
-        let path = entry.path();
-        if !path.is_file() {
-            continue;
-        }
-        if let Some(ext) = path.extension().and_then(|s| s.to_str()) {
-            let ext = ext.to_lowercase();
-            if SUPPORTED_EXT.contains(&ext.as_str()) {
-                if let Some(track) = parse_single_track(path) {
-                    playlist.push(track);
-                }
-            }
-        }
-    }
-
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
-    }
-
-    let json_file_path = app_data_path.join("library.json");
-
-    let file = File::create(&json_file_path).map_err(|e| format!("无法创建库文件: {}", e))?;
-
-    serde_json::to_writer_pretty(file, &playlist).map_err(|e| format!("写入 JSON 失败: {}", e))?;
-
-    Ok(playlist)
-}
-
-#[command]
-pub async fn load_music_library(app_handle: tauri::AppHandle) -> Result<Vec<Track>, String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("无法获取数据目录: {}", e))?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
-    }
-
-    let json_file_path = app_data_path.join("library.json");
-
-    if !json_file_path.exists() {
-        return rebuild_and_get_library(&app_handle).await;
-    }
-
-    let file = File::open(&json_file_path).map_err(|e| format!("无法打开库文件: {}", e))?;
-
-    match serde_json::from_reader::<_, Vec<Track>>(file) {
-        Ok(mut library) => {
-            let had_covers = library.iter().any(|track| track.cover.is_some());
-
-            if had_covers {
-                for track in &mut library {
-                    track.cover = None;
-                }
-
-                save_music_library(&app_handle, &library)?;
-            }
-
-            Ok(library)
-        }
-        Err(e) => {
-            println!("[load_music_library] JSON 解析失败，准备重建: {}", e);
-            let _ = std::fs::remove_file(json_file_path);
-            rebuild_and_get_library(&app_handle).await
-        }
-    }
-}
-
-async fn rebuild_and_get_library(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
-    let fresh_library = scan_music_directory_logic(app_handle).await?;
-
-    save_music_library(app_handle, &fresh_library)?;
-
-    Ok(fresh_library)
-}
-
-pub fn save_music_library(
-    app_handle: &tauri::AppHandle,
-    library: &Vec<Track>,
-) -> Result<(), String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("{}", e))?;
-
-    let json_file_path = app_data_path.join("library.json");
-    let temp_file_path = app_data_path.join("library.json.tmp");
-
-    let json_str = serde_json::to_string_pretty(library).map_err(|e| format!("{}", e))?;
-
-    std::fs::write(&temp_file_path, json_str).map_err(|e| format!("{}", e))?;
-    std::fs::rename(temp_file_path, json_file_path).map_err(|e| format!("{}", e))?;
-
-    Ok(())
-}
-
-fn recently_played_path(app_handle: &tauri::AppHandle) -> Result<std::path::PathBuf, String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
-    }
-
-    Ok(app_data_path.join(RECENTLY_PLAYED_FILE))
-}
-
-fn read_recently_played(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
-    let file_path = recently_played_path(app_handle)?;
-
-    if !file_path.exists() {
-        return Ok(Vec::new());
-    }
-
-    let file = File::open(&file_path).map_err(|e| format!("无法打开最近播放文件: {}", e))?;
-
-    serde_json::from_reader::<_, Vec<Track>>(file)
-        .map_err(|e| format!("无法解析最近播放文件: {}", e))
-}
-
-fn save_recently_played(app_handle: &tauri::AppHandle, tracks: &[Track]) -> Result<(), String> {
-    let file_path = recently_played_path(app_handle)?;
-    let temp_file_path = file_path.with_extension("json.tmp");
-
-    let json =
-        serde_json::to_string_pretty(tracks).map_err(|e| format!("序列化最近播放失败: {}", e))?;
-
-    std::fs::write(&temp_file_path, json)
-        .map_err(|e| format!("写入最近播放临时文件失败: {}", e))?;
-
-    std::fs::rename(temp_file_path, file_path).map_err(|e| format!("保存最近播放失败: {}", e))?;
-
-    Ok(())
-}
-
-#[command]
-pub async fn load_recently_played(app_handle: tauri::AppHandle) -> Result<Vec<Track>, String> {
-    read_recently_played(&app_handle)
-}
-
-#[command]
-pub async fn add_recently_played(
-    app_handle: tauri::AppHandle,
-    track: Track,
-) -> Result<Vec<Track>, String> {
-    let mut list = read_recently_played(&app_handle).unwrap_or_default();
-
-    let mut track = track;
-
-    // 不建议把 base64 封面写入 recently_played.json，否则文件会越来越大
-    track.cover = None;
-
-    // 去重：同一路径只保留一条，并把新的放到最前面
-    list.retain(|item| item.path != track.path);
-    list.insert(0, track);
-
-    if list.len() > MAX_RECENTLY_PLAYED {
-        list.truncate(MAX_RECENTLY_PLAYED);
-    }
-
-    save_recently_played(&app_handle, &list)?;
-
-    Ok(list)
-}
-
-#[command]
-pub async fn clear_recently_played(app_handle: tauri::AppHandle) -> Result<(), String> {
-    save_recently_played(&app_handle, &[])?;
-    Ok(())
-}
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
new file mode 100644
index 0000000..6bccb7f
--- /dev/null
+++ b/src-tauri/src/commands/library.rs
@@ -0,0 +1,199 @@
+use std::fs::{self, File};
+use std::path::Path;
+
+use base64::{engine::general_purpose, Engine as _};
+use lofty::prelude::*;
+use lofty::probe::Probe;
+use tauri::{command, Manager};
+use walkdir::WalkDir;
+
+use crate::metadata::parse_single_track;
+use crate::models::Track;
+
+const SUPPORTED_EXT: [&str; 5] = ["mp3", "flac", "m4a", "wav", "ogg"];
+
+#[command]
+pub async fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
+    let file_path = Path::new(&full_path);
+
+    if !file_path.exists() {
+        return Err("音频文件不存在或已被移动".into());
+    }
+
+    let tagged_file = Probe::open(file_path)
+        .map_err(|e| format!("无法打开音频文件: {}", e))?
+        .read()
+        .map_err(|e| format!("无法读取音频元数据: {}", e))?;
+
+    let tag = tagged_file
+        .primary_tag()
+        .or_else(|| tagged_file.first_tag());
+
+    let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
+        let b64_encoded = general_purpose::STANDARD.encode(pic.data());
+        let mime_type = pic.mime_type().map(|m| m.as_str()).unwrap_or("image/jpeg");
+
+        format!("data:{};base64,{}", mime_type, b64_encoded)
+    });
+
+    Ok(cover)
+}
+
+async fn scan_music_directory_logic(
+    app_handle: &tauri::AppHandle,
+) -> Result<Vec<Track>, String> {
+    let music_dir = app_handle
+        .path()
+        .audio_dir()
+        .map_err(|e| format!("无法获取系统音乐目录: {}", e))?;
+
+    let mut tracks = Vec::new();
+
+    visit_dirs(&music_dir, &mut tracks);
+
+    Ok(tracks)
+}
+
+fn visit_dirs(dir: &Path, tracks: &mut Vec<Track>) {
+    if let Ok(entries) = fs::read_dir(dir) {
+        for entry in entries.flatten() {
+            let path = entry.path();
+
+            if path.is_dir() {
+                visit_dirs(&path, tracks);
+                continue;
+            }
+
+            if !is_supported_audio_file(&path) {
+                continue;
+            }
+
+            if let Some(track) = parse_single_track(&path) {
+                tracks.push(track);
+            }
+        }
+    }
+}
+
+fn is_supported_audio_file(path: &Path) -> bool {
+    path.extension()
+        .and_then(|ext| ext.to_str())
+        .map(|ext| SUPPORTED_EXT.contains(&ext.to_lowercase().as_str()))
+        .unwrap_or(false)
+}
+
+#[command]
+pub async fn scan_music_directory(
+    app_handle: tauri::AppHandle,
+    dir_path: String,
+) -> Result<Vec<Track>, String> {
+    let root_path = Path::new(&dir_path);
+
+    if !root_path.is_dir() {
+        return Err("Invalid directory path".into());
+    }
+
+    let mut playlist = Vec::new();
+
+    for entry in WalkDir::new(root_path).into_iter().filter_map(|entry| entry.ok()) {
+        let path = entry.path();
+
+        if !path.is_file() || !is_supported_audio_file(path) {
+            continue;
+        }
+
+        if let Some(track) = parse_single_track(path) {
+            playlist.push(track);
+        }
+    }
+
+    save_music_library(&app_handle, &playlist)?;
+
+    Ok(playlist)
+}
+
+#[command]
+pub async fn load_music_library(
+    app_handle: tauri::AppHandle,
+) -> Result<Vec<Track>, String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("无法获取数据目录: {}", e))?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path)
+            .map_err(|e| format!("创建数据目录失败: {}", e))?;
+    }
+
+    let json_file_path = app_data_path.join("library.json");
+
+    if !json_file_path.exists() {
+        return rebuild_and_get_library(&app_handle).await;
+    }
+
+    let file = File::open(&json_file_path)
+        .map_err(|e| format!("无法打开库文件: {}", e))?;
+
+    match serde_json::from_reader::<_, Vec<Track>>(file) {
+        Ok(mut library) => {
+            let had_covers = library.iter().any(|track| track.cover.is_some());
+
+            if had_covers {
+                for track in &mut library {
+                    track.cover = None;
+                }
+
+                save_music_library(&app_handle, &library)?;
+            }
+
+            Ok(library)
+        }
+        Err(error) => {
+            println!("[load_music_library] JSON 解析失败，准备重建: {}", error);
+
+            let _ = fs::remove_file(json_file_path);
+
+            rebuild_and_get_library(&app_handle).await
+        }
+    }
+}
+
+async fn rebuild_and_get_library(
+    app_handle: &tauri::AppHandle,
+) -> Result<Vec<Track>, String> {
+    let fresh_library = scan_music_directory_logic(app_handle).await?;
+
+    save_music_library(app_handle, &fresh_library)?;
+
+    Ok(fresh_library)
+}
+
+pub fn save_music_library(
+    app_handle: &tauri::AppHandle,
+    library: &[Track],
+) -> Result<(), String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("{}", e))?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path)
+            .map_err(|e| format!("创建数据目录失败: {}", e))?;
+    }
+
+    let json_file_path = app_data_path.join("library.json");
+    let temp_file_path = app_data_path.join("library.json.tmp");
+
+    let json_str = serde_json::to_string_pretty(library)
+        .map_err(|e| format!("{}", e))?;
+
+    fs::write(&temp_file_path, json_str)
+        .map_err(|e| format!("{}", e))?;
+
+    fs::rename(temp_file_path, json_file_path)
+        .map_err(|e| format!("{}", e))?;
+
+    Ok(())
+}
\ No newline at end of file
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
new file mode 100644
index 0000000..68a7ac7
--- /dev/null
+++ b/src-tauri/src/commands/mod.rs
@@ -0,0 +1,4 @@
+pub mod recent;
+pub mod settings;
+pub mod playback;
+pub mod library;
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
new file mode 100644
index 0000000..c86e95e
--- /dev/null
+++ b/src-tauri/src/commands/playback.rs
@@ -0,0 +1,110 @@
+use std::path::Path;
+
+use tauri::command;
+use web_audio_api::context::BaseAudioContext;
+use web_audio_api::node::AudioNode;
+use web_audio_api::MediaElement;
+
+use crate::audio::{get_audio_context, get_audio_state};
+
+#[command]
+pub async fn play_music(full_path: &str) -> Result<String, String> {
+    let file_path = Path::new(full_path);
+
+    if !file_path.exists() {
+        return Err("音频文件不存在或已被移动".into());
+    }
+
+    let mut media = MediaElement::new(file_path)
+        .map_err(|e| format!("Failed to create media element: {}", e))?;
+
+    let context = get_audio_context();
+    let src = context.create_media_element_source(&mut media);
+
+    let gain_node = context.create_gain();
+
+    src.connect(&gain_node);
+    gain_node.connect(&context.destination());
+
+    media.set_loop(false);
+    media.set_current_time(0.0);
+
+    let mut state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
+    gain_node.gain().set_value(state.volume);
+
+    if let Some(old_media) = state.media.replace(media) {
+        old_media.pause();
+    }
+
+    state.gain_node = Some(gain_node);
+
+    if let Some(ref media) = state.media {
+        media.play();
+    }
+
+    Ok(format!("Playing music: {}", full_path))
+}
+
+#[command]
+pub async fn toggle_music() -> Result<bool, String> {
+    let state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
+    if let Some(ref media) = state.media {
+        if media.paused() {
+            media.play();
+            Ok(true)
+        } else {
+            media.pause();
+            Ok(false)
+        }
+    } else {
+        Err("No media available".into())
+    }
+}
+
+#[command]
+pub async fn current_time() -> f64 {
+    let Ok(state) = get_audio_state().lock() else {
+        return 0.0;
+    };
+
+    if let Some(ref media) = state.media {
+        media.current_time()
+    } else {
+        0.0
+    }
+}
+
+#[command]
+pub async fn set_current_time(time: f64) {
+    let Ok(state) = get_audio_state().lock() else {
+        return;
+    };
+
+    if let Some(ref media) = state.media {
+        media.set_current_time(time);
+    }
+}
+
+#[command]
+pub async fn set_volume(volume: u8) -> Result<(), String> {
+    let mut state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
+    let volume = volume as f32 / 100.0;
+    let safe_volume = volume.clamp(0.0, 1.0);
+
+    state.volume = safe_volume;
+
+    if let Some(ref gain_node) = state.gain_node {
+        gain_node.gain().set_value(safe_volume);
+    }
+
+    Ok(())
+}
\ No newline at end of file
diff --git a/src-tauri/src/commands/recent.rs b/src-tauri/src/commands/recent.rs
new file mode 100644
index 0000000..3d9a9f2
--- /dev/null
+++ b/src-tauri/src/commands/recent.rs
@@ -0,0 +1,84 @@
+use crate::models::Track;
+
+use std::fs::{self, File};
+use tauri::{command, Manager};
+
+const RECENTLY_PLAYED_FILE: &str = "recently_played.json";
+const MAX_RECENTLY_PLAYED: usize = 100;
+
+fn recently_played_path(app_handle: &tauri::AppHandle) -> Result<std::path::PathBuf, String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
+    }
+
+    Ok(app_data_path.join(RECENTLY_PLAYED_FILE))
+}
+
+pub fn read_recently_played(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
+    let file_path = recently_played_path(app_handle)?;
+
+    if !file_path.exists() {
+        return Ok(Vec::new());
+    }
+
+    let file = File::open(&file_path).map_err(|e| format!("无法打开最近播放文件: {}", e))?;
+
+    serde_json::from_reader::<_, Vec<Track>>(file)
+        .map_err(|e| format!("无法解析最近播放文件: {}", e))
+}
+
+pub fn save_recently_played(app_handle: &tauri::AppHandle, tracks: &[Track]) -> Result<(), String> {
+    let file_path = recently_played_path(app_handle)?;
+    let temp_file_path = file_path.with_extension("json.tmp");
+
+    let json =
+        serde_json::to_string_pretty(tracks).map_err(|e| format!("序列化最近播放失败: {}", e))?;
+
+    std::fs::write(&temp_file_path, json)
+        .map_err(|e| format!("写入最近播放临时文件失败: {}", e))?;
+
+    std::fs::rename(temp_file_path, file_path).map_err(|e| format!("保存最近播放失败: {}", e))?;
+
+    Ok(())
+}
+
+#[command]
+pub async fn load_recently_played(app_handle: tauri::AppHandle) -> Result<Vec<Track>, String> {
+    read_recently_played(&app_handle)
+}
+
+#[command]
+pub async fn add_recently_played(
+    app_handle: tauri::AppHandle,
+    track: Track,
+) -> Result<Vec<Track>, String> {
+    let mut list = read_recently_played(&app_handle).unwrap_or_default();
+
+    let mut track = track;
+
+    // 不要把 base64 封面写入 recently_played.json，否则文件会越来越大
+    track.cover = None;
+
+    // 去重：同一路径只保留一条，并把新的放到最前面
+    list.retain(|item| item.path != track.path);
+    list.insert(0, track);
+
+    if list.len() > MAX_RECENTLY_PLAYED {
+        list.truncate(MAX_RECENTLY_PLAYED);
+    }
+
+    save_recently_played(&app_handle, &list)?;
+
+    Ok(list)
+}
+
+#[command]
+pub async fn clear_recently_played(app_handle: tauri::AppHandle) -> Result<(), String> {
+    save_recently_played(&app_handle, &[])?;
+    Ok(())
+}
diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs
new file mode 100644
index 0000000..b10de62
--- /dev/null
+++ b/src-tauri/src/commands/settings.rs
@@ -0,0 +1,63 @@
+use std::fs;
+use std::fs::File;
+use std::path::PathBuf;
+
+use tauri::{command, Manager};
+
+use crate::models::settings::AppSettings;
+
+const SETTINGS_FILE: &str = "settings.json";
+
+fn settings_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path)
+            .map_err(|e| format!("创建应用数据目录失败: {}", e))?;
+    }
+
+    Ok(app_data_path.join(SETTINGS_FILE))
+}
+
+#[command]
+pub async fn load_settings(app_handle: tauri::AppHandle) -> Result<AppSettings, String> {
+    let path = settings_path(&app_handle)?;
+
+    if !path.exists() {
+        let settings = AppSettings::default();
+        save_settings(app_handle, settings.clone()).await?;
+        return Ok(settings);
+    }
+
+    let file = File::open(&path).map_err(|e| format!("无法打开设置文件: {}", e))?;
+
+    match serde_json::from_reader::<_, AppSettings>(file) {
+        Ok(settings) => Ok(settings),
+        Err(_) => {
+            let settings = AppSettings::default();
+            save_settings(app_handle, settings.clone()).await?;
+            Ok(settings)
+        }
+    }
+}
+
+#[command]
+pub async fn save_settings(
+    app_handle: tauri::AppHandle,
+    settings: AppSettings,
+) -> Result<AppSettings, String> {
+    let path = settings_path(&app_handle)?;
+    let temp_path = path.with_extension("json.tmp");
+
+    let json = serde_json::to_string_pretty(&settings)
+        .map_err(|e| format!("序列化设置失败: {}", e))?;
+
+    fs::write(&temp_path, json).map_err(|e| format!("写入设置临时文件失败: {}", e))?;
+
+    fs::rename(temp_path, path).map_err(|e| format!("保存设置失败: {}", e))?;
+
+    Ok(settings)
+}
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 0e1d7aa..084691f 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,4 +1,32 @@
+mod audio;
 mod commands;
+mod metadata;
+mod models;
+
+use commands::library::{
+    get_track_cover,
+    load_music_library,
+    scan_music_directory,
+};
+
+use commands::playback::{
+    current_time,
+    play_music,
+    set_current_time,
+    set_volume,
+    toggle_music,
+};
+
+use commands::recent::{
+    add_recently_played,
+    clear_recently_played,
+    load_recently_played,
+};
+
+use commands::settings::{
+    load_settings,
+    save_settings,
+};
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -6,17 +34,19 @@ pub fn run() {
         .plugin(tauri_plugin_dialog::init())
         // .plugin(tauri_plugin_opener::init())
         .invoke_handler(tauri::generate_handler![
-            commands::play_music,
-            commands::toggle_music,
-            commands::current_time,
-            commands::set_current_time,
-            commands::set_volume,
-            commands::scan_music_directory,
-            commands::load_music_library,
-            commands::get_track_cover,
-            commands::load_recently_played,
-            commands::add_recently_played,
-            commands::clear_recently_played,
+            play_music,
+            toggle_music,
+            current_time,
+            set_current_time,
+            set_volume,
+            scan_music_directory,
+            load_music_library,
+            get_track_cover,
+            load_recently_played,
+            add_recently_played,
+            clear_recently_played,
+            save_settings,
+            load_settings,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/metadata.rs b/src-tauri/src/metadata.rs
new file mode 100644
index 0000000..a9a5431
--- /dev/null
+++ b/src-tauri/src/metadata.rs
@@ -0,0 +1,59 @@
+use std::path::Path;
+
+use lofty::prelude::*;
+use lofty::probe::Probe;
+use lofty::tag::ItemKey;
+
+use crate::models::Track;
+
+pub fn parse_single_track(file_path: &Path) -> Option<Track> {
+    let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
+
+    let tag = tagged_file
+        .primary_tag()
+        .or_else(|| tagged_file.first_tag());
+
+    let title = tag
+        .and_then(|t| t.title())
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| {
+            file_path
+                .file_stem()
+                .and_then(|s| s.to_str())
+                .unwrap_or("Unknown Track")
+                .to_string()
+        });
+
+    let artist = tag
+        .and_then(|t| t.artist())
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| "Unknown Artist".to_string());
+
+    let album = tag
+        .and_then(|t| t.album())
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| "Unknown Album".to_string());
+
+    let album_artist = tag
+        .and_then(|t| {
+            t.get_string(ItemKey::AlbumArtist)
+                .or_else(|| t.get_string(ItemKey::AlbumArtists))
+        })
+        .map(|s| s.to_string())
+        .unwrap_or_default();
+
+    let props = tagged_file.properties();
+    let duration = props.duration().as_secs_f64();
+    let sample_rate = props.sample_rate();
+
+    Some(Track {
+        title,
+        artist,
+        album,
+        album_artist,
+        duration,
+        sample_rate,
+        cover: None,
+        path: file_path.to_string_lossy().into_owned(),
+    })
+}
\ No newline at end of file
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
new file mode 100644
index 0000000..6234cc8
--- /dev/null
+++ b/src-tauri/src/models/mod.rs
@@ -0,0 +1,4 @@
+pub mod settings;
+pub mod track;
+
+pub use track::Track;
\ No newline at end of file
diff --git a/src-tauri/src/models/settings.rs b/src-tauri/src/models/settings.rs
new file mode 100644
index 0000000..145f8e3
--- /dev/null
+++ b/src-tauri/src/models/settings.rs
@@ -0,0 +1,31 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AppSettings {
+    pub theme: ThemeMode,
+    pub volume: u8,
+    pub library_dirs: Vec<String>,
+    pub scan_on_startup: bool,
+    pub reduce_motion: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ThemeMode {
+    System,
+    Light,
+    Dark,
+}
+
+impl Default for AppSettings {
+    fn default() -> Self {
+        Self {
+            theme: ThemeMode::System,
+            volume: 80,
+            library_dirs: Vec::new(),
+            scan_on_startup: false,
+            reduce_motion: false,
+        }
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/models/track.rs b/src-tauri/src/models/track.rs
new file mode 100644
index 0000000..64baa77
--- /dev/null
+++ b/src-tauri/src/models/track.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone)]
+pub struct Track {
+    pub title: String,
+    pub artist: String,
+    pub album: String,
+    pub album_artist: String,
+    pub duration: f64,
+    pub sample_rate: Option<u32>,
+    pub cover: Option<String>,
+    pub path: String,
+}
diff --git a/src/lib/components/base/Heading.svelte b/src/lib/components/base/Heading.svelte
index d0070e0..e12aa2e 100644
--- a/src/lib/components/base/Heading.svelte
+++ b/src/lib/components/base/Heading.svelte
@@ -4,7 +4,7 @@
     type PageHeadingProps = {
         eyebrow: string
         title: string
-        children: Snippet
+        children?: Snippet
         class?: string
     }
 
@@ -16,8 +16,8 @@
     }: PageHeadingProps = $props()
 </script>
 
-<div class="flex flex-wrap items-end justify-between gap-4">
-    <div class="min-w-0">
+<div class="flex justify-between mx-2">
+    <div>
         <p
             class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
         >
@@ -31,5 +31,7 @@
         </h1>
     </div>
 
-    {@render children()}
+    {#if children}
+        {@render children()}
+    {/if}
 </div>
diff --git a/src/lib/extensions/builtin.ts b/src/lib/extensions/builtin.ts
new file mode 100644
index 0000000..24166e1
--- /dev/null
+++ b/src/lib/extensions/builtin.ts
@@ -0,0 +1,60 @@
+import { extensionRegistry } from './registry.svelte'
+
+let registered = false
+
+export function registerBuiltinExtensions() {
+    if (registered) return
+
+    registered = true
+
+    extensionRegistry.register({
+        id: 'kino.library',
+        name: 'Library',
+        description: '媒体库基础功能',
+        navItems: [
+            {
+                id: 'tracks',
+                title: '歌曲',
+                icon: 'music_note--rounded',
+                href: '/tracks',
+                order: 10,
+            },
+            {
+                id: 'artists',
+                title: '歌手',
+                icon: 'person--rounded',
+                href: '/artists',
+                order: 20,
+            },
+            {
+                id: 'albums',
+                title: '专辑',
+                icon: 'album--rounded',
+                href: '/albums',
+                order: 30,
+            },
+            {
+                id: 'recent',
+                title: '最近播放',
+                icon: 'history--rounded',
+                href: '/recent',
+                order: 40,
+            },
+        ],
+    })
+
+    extensionRegistry.register({
+        id: 'kino.settings',
+        name: 'Settings',
+        description: '应用设置页面',
+        navItems: [
+            {
+                id: 'settings',
+                title: '设置',
+                icon: 'settings--rounded',
+                href: '/settings',
+                order: 100,
+            },
+        ],
+    })
+}
\ No newline at end of file
diff --git a/src/lib/extensions/registry.svelte.ts b/src/lib/extensions/registry.svelte.ts
new file mode 100644
index 0000000..64edc69
--- /dev/null
+++ b/src/lib/extensions/registry.svelte.ts
@@ -0,0 +1,48 @@
+import type { AppExtension, ExtensionCommand, ExtensionNavItem } from '$lib/types'
+
+class ExtensionRegistry {
+    extensions = $state<AppExtension[]>([])
+
+    register(extension: AppExtension) {
+        if (this.extensions.some((item) => item.id === extension.id)) {
+            return
+        }
+
+        this.extensions = [
+            ...this.extensions,
+            {
+                enabled: true,
+                ...extension,
+            },
+        ]
+    }
+
+    setEnabled(id: string, enabled: boolean) {
+        this.extensions = this.extensions.map((extension) =>
+            extension.id === id
+                ? {
+                      ...extension,
+                      enabled,
+                  }
+                : extension,
+        )
+    }
+
+    get enabledExtensions() {
+        return this.extensions.filter((extension) => extension.enabled !== false)
+    }
+
+    get navItems(): ExtensionNavItem[] {
+        return this.enabledExtensions
+            .flatMap((extension) => extension.navItems ?? [])
+            .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
+    }
+
+    get commands(): ExtensionCommand[] {
+        return this.enabledExtensions.flatMap(
+            (extension) => extension.commands ?? [],
+        )
+    }
+}
+
+export const extensionRegistry = new ExtensionRegistry()
\ No newline at end of file
diff --git a/src/lib/features/shell/NavRail.svelte b/src/lib/features/shell/NavRail.svelte
index 154f8ae..d94b00d 100644
--- a/src/lib/features/shell/NavRail.svelte
+++ b/src/lib/features/shell/NavRail.svelte
@@ -68,4 +68,10 @@
     <mdui-navigation-rail-item icon="person--outlined" href="/artists"
         >Artist</mdui-navigation-rail-item
     >
+
+    <mdui-navigation-rail-item
+        icon="settings--outlined"
+        href="/settings"
+        slot="bottom">Settings</mdui-navigation-rail-item
+    >
 </mdui-navigation-rail>
diff --git a/src/lib/state/covers.svelte.ts b/src/lib/state/covers.svelte.ts
index 879545b..635d815 100644
--- a/src/lib/state/covers.svelte.ts
+++ b/src/lib/state/covers.svelte.ts
@@ -1,6 +1,6 @@
 
 import { invoke } from '@tauri-apps/api/core'
-import type { Track } from '../types/types'
+import type { Track } from '../types/music'
 
 class TrackCovers {
     covers = $state<Record<string, string | null>>({})
diff --git a/src/lib/state/library.svelte.ts b/src/lib/state/library.svelte.ts
index de0f174..6cd0b26 100644
--- a/src/lib/state/library.svelte.ts
+++ b/src/lib/state/library.svelte.ts
@@ -1,5 +1,5 @@
 import { invoke } from '@tauri-apps/api/core'
-import type { Track } from '../types/types'
+import type { Track } from '../types/music'
 
 class MusicLibrary {
     tracks = $state<Track[]>([])
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 8c168ae..de86076 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -1,5 +1,5 @@
 import { invoke } from "@tauri-apps/api/core"
-import type { Track } from "../types/types"
+import type { Track } from "../types/music"
 import { recentlyPlayed } from "./recent.svelte"
 
 
diff --git a/src/lib/state/recent.svelte.ts b/src/lib/state/recent.svelte.ts
index 7babfff..a95d396 100644
--- a/src/lib/state/recent.svelte.ts
+++ b/src/lib/state/recent.svelte.ts
@@ -1,6 +1,6 @@
 
 import { invoke } from '@tauri-apps/api/core'
-import type { Track } from '../types/types'
+import type { Track } from '../types/music'
 
 class RecentlyPlayed {
     tracks = $state<Track[]>([])
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
new file mode 100644
index 0000000..78dae8e
--- /dev/null
+++ b/src/lib/state/settings.svelte.ts
@@ -0,0 +1,88 @@
+import type { AppSettings } from '$lib/types'
+import { invoke } from '@tauri-apps/api/core'
+
+export const DEFAULT_SETTINGS: AppSettings = {
+    theme: 'system',
+    volume: 80,
+    libraryDirs: [],
+    scanOnStartup: false,
+    reduceMotion: false,
+}
+
+class SettingsState {
+    data = $state<AppSettings>({ ...DEFAULT_SETTINGS })
+    isLoading = $state(false)
+    error = $state<string | null>(null)
+
+    #saveTimer: ReturnType<typeof setTimeout> | null = null
+
+    async load(): Promise<AppSettings> {
+        this.isLoading = true
+        this.error = null
+
+        try {
+            this.data = await invoke<AppSettings>('load_settings')
+            return this.data
+        } catch (error) {
+            console.error('加载设置失败:', error)
+            this.error = String(error)
+            return this.data
+        } finally {
+            this.isLoading = false
+        }
+    }
+
+    update(patch: Partial<AppSettings>) {
+        this.data = {
+            ...this.data,
+            ...patch,
+        }
+
+        this.scheduleSave()
+    }
+
+    async save(): Promise<AppSettings> {
+        this.error = null
+
+        try {
+            this.data = await invoke<AppSettings>('save_settings', {
+                settings: this.data,
+            })
+
+            return this.data
+        } catch (error) {
+            console.error('保存设置失败:', error)
+            this.error = String(error)
+            return this.data
+        }
+    }
+
+    scheduleSave() {
+        if (this.#saveTimer) {
+            clearTimeout(this.#saveTimer)
+        }
+
+        this.#saveTimer = setTimeout(() => {
+            void this.save()
+        }, 300)
+    }
+
+    addLibraryDir(dir: string) {
+        const value = dir.trim()
+
+        if (!value) return
+        if (this.data.libraryDirs.includes(value)) return
+
+        this.update({
+            libraryDirs: [...this.data.libraryDirs, value],
+        })
+    }
+
+    removeLibraryDir(dir: string) {
+        this.update({
+            libraryDirs: this.data.libraryDirs.filter((item) => item !== dir),
+        })
+    }
+}
+
+export const settings = new SettingsState()
\ No newline at end of file
diff --git a/src/lib/types/extension.ts b/src/lib/types/extension.ts
new file mode 100644
index 0000000..6873d28
--- /dev/null
+++ b/src/lib/types/extension.ts
@@ -0,0 +1,22 @@
+export interface ExtensionNavItem {
+    id: string
+    title: string
+    icon: string
+    href: string
+    order?: number
+}
+
+export interface ExtensionCommand {
+    id: string
+    title: string
+    run: () => void | Promise<void>
+}
+
+export interface AppExtension {
+    id: string
+    name: string
+    description?: string
+    enabled?: boolean
+    navItems?: ExtensionNavItem[]
+    commands?: ExtensionCommand[]
+}
\ No newline at end of file
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index c9f6f04..7f20cfa 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -1 +1,7 @@
-export * from './types'
+export type {
+    AppExtension,
+    ExtensionCommand,
+    ExtensionNavItem
+} from './extension'
+export type { Album, Artist, Playlist, Track } from './music'
+export type { AppSettings, ThemeMode } from './settings'
diff --git a/src/lib/types/types.ts b/src/lib/types/music.ts
similarity index 100%
rename from src/lib/types/types.ts
rename to src/lib/types/music.ts
diff --git a/src/lib/types/settings.ts b/src/lib/types/settings.ts
new file mode 100644
index 0000000..057a21b
--- /dev/null
+++ b/src/lib/types/settings.ts
@@ -0,0 +1,10 @@
+
+export type ThemeMode = 'system' | 'light' | 'dark'
+
+export interface AppSettings {
+    theme: ThemeMode
+    volume: number
+    libraryDirs: string[]
+    scanOnStartup: boolean
+    reduceMotion: boolean
+}
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 8b80d67..09c326d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,11 +2,18 @@
     import PlayerBar from '$lib/features/PlayerBar.svelte'
     import Appbar from '$lib/features/shell/Appbar.svelte'
     import NavRail from '$lib/features/shell/NavRail.svelte'
+    import { settings } from '$lib/state/settings.svelte'
     import 'mdui'
     import 'mdui/mdui.css'
+    import { onMount } from 'svelte'
     import '../app.css'
 
     let { children } = $props()
+
+
+    onMount(() => {
+        void settings.load()
+    })
 </script>
 
 <mdui-layout full-height>
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 4c95767..7c4cb58 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -65,7 +65,7 @@
             }
         }
 
-        return Array.from(albumMap.values()).map((album) => ({
+        return Array.from(albumMap.values()).map(album => ({
             ...album,
             id: createAlbumId(album.title),
             trackCount: album.tracks.length,
@@ -78,7 +78,7 @@
         const keyword = query.trim().toLowerCase()
 
         const list = keyword
-            ? albums.filter((album) =>
+            ? albums.filter(album =>
                   album.title.toLowerCase().includes(keyword),
               )
             : albums
@@ -99,7 +99,7 @@
     })
 
     let albumItems = $derived(
-        filteredAlbums.map((album) => ({
+        filteredAlbums.map(album => ({
             id: album.id,
             title: album.title,
             subtitle: `${album.trackCount} 首歌曲`,
@@ -114,7 +114,7 @@
     <title>专辑</title>
 </svelte:head>
 
-<header class="flex flex-col gap-4 pb-5">
+<header class="pb-5">
     <Heading eyebrow="Albums" title="专辑">
         <Button
             variant="outlined"
@@ -151,4 +151,4 @@
             emptyDescription="尝试刷新媒体库或修改搜索关键词"
         />
     </div>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index 7a22f82..2dc8557 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -111,9 +111,7 @@
     <title>艺术家</title>
 </svelte:head>
 
-<header
-    class="flex flex-col gap-4 pb-5"
->
+<header class="pb-5">
     <Heading eyebrow="artist" title="艺术家">
         <Button
             variant="outlined"
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index df063aa..8e845ad 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -57,9 +57,7 @@
     <title>歌曲</title>
 </svelte:head>
 
-<header
-    class="flex flex-col gap-4 border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5"
->
+<header class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5">
     <Heading eyebrow="library" title="歌曲">
         <div class="flex items-center gap-2">
             <Button
diff --git a/src/routes/recent/+page.svelte b/src/routes/recent/+page.svelte
index 6aab7fb..3a45c23 100644
--- a/src/routes/recent/+page.svelte
+++ b/src/routes/recent/+page.svelte
@@ -17,9 +17,7 @@
     <title>最近播放</title>
 </svelte:head>
 
-<header
-    class="flex items-end justify-between gap-4 shrink-0 pb-3 border-b themed-border"
->
+<header class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5">
     <Heading eyebrow="Recent" title="最近播放">
         {#if recentlyPlayed.tracks.length > 0}
             <Button variant="outlined" onclick={() => recentlyPlayed.clear()}>
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
new file mode 100644
index 0000000..700101a
--- /dev/null
+++ b/src/routes/settings/+page.svelte
@@ -0,0 +1,246 @@
+<script lang="ts">
+    import Button from '$lib/components/base/Button.svelte'
+    import Heading from '$lib/components/base/Heading.svelte'
+    import Select from '$lib/components/base/Select.svelte'
+    import TextField from '$lib/components/base/TextField.svelte'
+    import { registerBuiltinExtensions } from '$lib/extensions/builtin'
+    import { extensionRegistry } from '$lib/extensions/registry.svelte'
+    import { settings } from '$lib/state/settings.svelte'
+    import type { ThemeMode } from '$lib/types'
+    import { onMount } from 'svelte'
+
+    import 'mdui/components/circular-progress.js'
+    import 'mdui/components/switch.js'
+
+    let newLibraryDir = $state('')
+
+    const themeOptions: { label: string; value: ThemeMode }[] = [
+        { label: '跟随系统', value: 'system' },
+        { label: '浅色模式', value: 'light' },
+        { label: '深色模式', value: 'dark' },
+    ]
+
+    onMount(() => {
+        registerBuiltinExtensions()
+        void settings.load()
+    })
+
+    function addLibraryDir() {
+        settings.addLibraryDir(newLibraryDir)
+        newLibraryDir = ''
+    }
+
+    function handleSwitchChange(
+        event: Event,
+        key: 'scanOnStartup' | 'reduceMotion',
+    ) {
+        const target = event.currentTarget as HTMLElement & {
+            checked: boolean
+        }
+
+        settings.update({
+            [key]: target.checked,
+        })
+    }
+</script>
+
+<svelte:head>
+    <title>设置</title>
+</svelte:head>
+
+<section class="flex h-full min-h-0 flex-col gap-6 overflow-auto pb-10">
+    <Heading eyebrow="Settings" title="设置" />
+
+    {#if settings.isLoading}
+        <div class="flex flex-1 items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else}
+        <div class="grid gap-6">
+            <section
+                class="rounded-3xl bg-[rgb(var(--mdui-color-surface-container))] p-5"
+            >
+                <h2
+                    class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+                >
+                    外观
+                </h2>
+
+                <div class="mt-4 grid gap-4">
+                    <div class="flex items-center justify-between gap-4">
+                        <div>
+                            <div class="text-sm font-medium">主题</div>
+                            <div
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                设置应用的明暗模式
+                            </div>
+                        </div>
+
+                        <div class="w-48">
+                            <Select
+                                value={settings.data.theme}
+                                options={themeOptions}
+                                onchange={(value) => {
+                                    settings.update({
+                                        theme: value as ThemeMode,
+                                    })
+                                }}
+                            />
+                        </div>
+                    </div>
+
+                    <div class="flex items-center justify-between gap-4">
+                        <div>
+                            <div class="text-sm font-medium">减少动画</div>
+                            <div
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                降低界面动画和过渡效果
+                            </div>
+                        </div>
+
+                        <mdui-switch
+                            checked={settings.data.reduceMotion}
+                            onchange={(event: Event) =>
+                                handleSwitchChange(event, 'reduceMotion')}
+                        ></mdui-switch>
+                    </div>
+                </div>
+            </section>
+
+            <section
+                class="rounded-3xl bg-[rgb(var(--mdui-color-surface-container))] p-5"
+            >
+                <h2
+                    class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+                >
+                    媒体库
+                </h2>
+
+                <div class="mt-4 grid gap-4">
+                    <div class="flex items-center justify-between gap-4">
+                        <div>
+                            <div class="text-sm font-medium">启动时扫描</div>
+                            <div
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                应用启动时自动刷新媒体库
+                            </div>
+                        </div>
+
+                        <mdui-switch
+                            checked={settings.data.scanOnStartup}
+                            onchange={(event: Event) =>
+                                handleSwitchChange(event, 'scanOnStartup')}
+                        ></mdui-switch>
+                    </div>
+
+                    <div class="grid gap-3">
+                        <div>
+                            <div class="text-sm font-medium">媒体库目录</div>
+                            <div
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                后续可以接入 Tauri 文件夹选择器
+                            </div>
+                        </div>
+
+                        <div class="flex gap-2">
+                            <TextField
+                                bind:value={newLibraryDir}
+                                variant="outlined"
+                                placeholder="输入音乐目录路径"
+                            />
+
+                            <Button variant="filled" onclick={addLibraryDir}>
+                                添加
+                            </Button>
+                        </div>
+
+                        {#if settings.data.libraryDirs.length > 0}
+                            <div class="grid gap-2">
+                                {#each settings.data.libraryDirs as dir (dir)}
+                                    <div
+                                        class="flex items-center justify-between gap-3 rounded-2xl bg-[rgb(var(--mdui-color-surface-container-highest))] px-4 py-3"
+                                    >
+                                        <div class="truncate text-sm">
+                                            {dir}
+                                        </div>
+
+                                        <Button
+                                            variant="text"
+                                            onclick={() =>
+                                                settings.removeLibraryDir(dir)}
+                                        >
+                                            移除
+                                        </Button>
+                                    </div>
+                                {/each}
+                            </div>
+                        {:else}
+                            <div
+                                class="rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-4 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                暂未添加媒体库目录
+                            </div>
+                        {/if}
+                    </div>
+                </div>
+            </section>
+
+            <section
+                class="rounded-3xl bg-[rgb(var(--mdui-color-surface-container))] p-5"
+            >
+                <h2
+                    class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+                >
+                    扩展
+                </h2>
+
+                <div class="mt-4 grid gap-3">
+                    {#each extensionRegistry.extensions as extension (extension.id)}
+                        <div
+                            class="flex items-center justify-between gap-4 rounded-2xl bg-[rgb(var(--mdui-color-surface-container-highest))] px-4 py-3"
+                        >
+                            <div class="min-w-0">
+                                <div class="text-sm font-medium">
+                                    {extension.name}
+                                </div>
+
+                                {#if extension.description}
+                                    <div
+                                        class="mt-1 text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                                    >
+                                        {extension.description}
+                                    </div>
+                                {/if}
+                            </div>
+
+                            <mdui-switch
+                                checked={extension.enabled !== false}
+                                onchange={(event: Event) => {
+                                    const target =
+                                        event.currentTarget as HTMLElement & {
+                                            checked: boolean
+                                        }
+
+                                    extensionRegistry.setEnabled(
+                                        extension.id,
+                                        target.checked,
+                                    )
+                                }}
+                            ></mdui-switch>
+                        </div>
+                    {/each}
+                </div>
+            </section>
+
+            {#if settings.error}
+                <div class="text-sm text-red-500">
+                    {settings.error}
+                </div>
+            {/if}
+        </div>
+    {/if}
+</section>
\ No newline at end of file

From 9642880c05aca180c151a889cd0cc3027f427b46 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Mon, 25 May 2026 20:54:06 +0800
Subject: [PATCH 11/39] Refactor settings page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refactor src/routes/settings/+page.svelte to use these components: sections (外观, 媒体库, 扩展) are replaced with SettingsSection, individual rows use SettingsRow, and list items use SettingsListItem; imports were updated accordingly. Functionality (switches, theme select, library dir add/remove, extension toggles) is preserved while markup is simplified and made more consistent.
---
 .../features/settings/SettingsListItem.svelte |  41 +++
 src/lib/features/settings/SettingsRow.svelte  |  37 +++
 .../features/settings/SettingsSection.svelte  |  33 +++
 src/routes/settings/+page.svelte              | 265 +++++++-----------
 4 files changed, 210 insertions(+), 166 deletions(-)
 create mode 100644 src/lib/features/settings/SettingsListItem.svelte
 create mode 100644 src/lib/features/settings/SettingsRow.svelte
 create mode 100644 src/lib/features/settings/SettingsSection.svelte

diff --git a/src/lib/features/settings/SettingsListItem.svelte b/src/lib/features/settings/SettingsListItem.svelte
new file mode 100644
index 0000000..8497606
--- /dev/null
+++ b/src/lib/features/settings/SettingsListItem.svelte
@@ -0,0 +1,41 @@
+<script lang="ts">
+    import type { Snippet } from 'svelte'
+
+    type SettingsListItemProps = {
+        title: string
+        description?: string
+        children?: Snippet
+        class?: string
+    }
+
+    let {
+        title,
+        description,
+        children,
+        class: className = '',
+    }: SettingsListItemProps = $props()
+</script>
+
+<div
+    class={`flex items-center justify-between gap-4 rounded-2xl bg-[rgb(var(--mdui-color-surface-container-highest))] px-4 py-3 ${className}`}
+>
+    <div class="min-w-0">
+        <div class="truncate text-sm font-medium">
+            {title}
+        </div>
+
+        {#if description}
+            <div
+                class="mt-1 text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+            >
+                {description}
+            </div>
+        {/if}
+    </div>
+
+    {#if children}
+        <div class="shrink-0">
+            {@render children()}
+        </div>
+    {/if}
+</div>
\ No newline at end of file
diff --git a/src/lib/features/settings/SettingsRow.svelte b/src/lib/features/settings/SettingsRow.svelte
new file mode 100644
index 0000000..3c2c6de
--- /dev/null
+++ b/src/lib/features/settings/SettingsRow.svelte
@@ -0,0 +1,37 @@
+<script lang="ts">
+    import type { Snippet } from 'svelte'
+
+    type SettingsRowProps = {
+        title: string
+        description?: string
+        children?: Snippet
+        class?: string
+    }
+
+    let {
+        title,
+        description,
+        children,
+        class: className = '',
+    }: SettingsRowProps = $props()
+</script>
+
+<div class={`flex items-center justify-between gap-4 ${className}`}>
+    <div class="min-w-0">
+        <div class="text-sm font-medium">{title}</div>
+
+        {#if description}
+            <div
+                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+            >
+                {description}
+            </div>
+        {/if}
+    </div>
+
+    {#if children}
+        <div class="shrink-0">
+            {@render children()}
+        </div>
+    {/if}
+</div>
\ No newline at end of file
diff --git a/src/lib/features/settings/SettingsSection.svelte b/src/lib/features/settings/SettingsSection.svelte
new file mode 100644
index 0000000..003da9a
--- /dev/null
+++ b/src/lib/features/settings/SettingsSection.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+    import type { Snippet } from 'svelte'
+
+    type SettingsSectionProps = {
+        title: string
+        children?: Snippet
+        class?: string
+        contentClass?: string
+    }
+
+    let {
+        title,
+        children,
+        class: className = '',
+        contentClass = 'mt-4 grid gap-4',
+    }: SettingsSectionProps = $props()
+</script>
+
+<section
+    class={`rounded-3xl bg-[rgb(var(--mdui-color-surface-container))] p-5 ${className}`}
+>
+    <h2
+        class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+    >
+        {title}
+    </h2>
+
+    {#if children}
+        <div class={contentClass}>
+            {@render children()}
+        </div>
+    {/if}
+</section>
\ No newline at end of file
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 700101a..cb2cde6 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -5,6 +5,9 @@
     import TextField from '$lib/components/base/TextField.svelte'
     import { registerBuiltinExtensions } from '$lib/extensions/builtin'
     import { extensionRegistry } from '$lib/extensions/registry.svelte'
+    import SettingsListItem from '$lib/features/settings/SettingsListItem.svelte'
+    import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
+    import SettingsSection from '$lib/features/settings/SettingsSection.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import type { ThemeMode } from '$lib/types'
     import { onMount } from 'svelte'
@@ -57,184 +60,114 @@
         </div>
     {:else}
         <div class="grid gap-6">
-            <section
-                class="rounded-3xl bg-[rgb(var(--mdui-color-surface-container))] p-5"
-            >
-                <h2
-                    class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
-                >
-                    外观
-                </h2>
-
-                <div class="mt-4 grid gap-4">
-                    <div class="flex items-center justify-between gap-4">
-                        <div>
-                            <div class="text-sm font-medium">主题</div>
-                            <div
-                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
-                                设置应用的明暗模式
-                            </div>
-                        </div>
-
-                        <div class="w-48">
-                            <Select
-                                value={settings.data.theme}
-                                options={themeOptions}
-                                onchange={(value) => {
-                                    settings.update({
-                                        theme: value as ThemeMode,
-                                    })
-                                }}
-                            />
-                        </div>
+            <SettingsSection title="外观">
+                <SettingsRow title="主题" description="设置应用的明暗模式">
+                    <div class="w-48">
+                        <Select
+                            value={settings.data.theme}
+                            options={themeOptions}
+                            onchange={value => {
+                                settings.update({
+                                    theme: value as ThemeMode,
+                                })
+                            }}
+                        />
                     </div>
+                </SettingsRow>
 
-                    <div class="flex items-center justify-between gap-4">
-                        <div>
-                            <div class="text-sm font-medium">减少动画</div>
-                            <div
-                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
-                                降低界面动画和过渡效果
-                            </div>
-                        </div>
-
-                        <mdui-switch
-                            checked={settings.data.reduceMotion}
-                            onchange={(event: Event) =>
-                                handleSwitchChange(event, 'reduceMotion')}
-                        ></mdui-switch>
-                    </div>
-                </div>
-            </section>
-
-            <section
-                class="rounded-3xl bg-[rgb(var(--mdui-color-surface-container))] p-5"
-            >
-                <h2
-                    class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+                <SettingsRow
+                    title="减少动画"
+                    description="降低界面动画和过渡效果"
+                >
+                    <mdui-switch
+                        checked={settings.data.reduceMotion}
+                        onchange={(event: Event) =>
+                            handleSwitchChange(event, 'reduceMotion')}
+                    ></mdui-switch>
+                </SettingsRow>
+            </SettingsSection>
+
+            <SettingsSection title="媒体库">
+                <SettingsRow
+                    title="启动时扫描"
+                    description="应用启动时自动刷新媒体库"
                 >
-                    媒体库
-                </h2>
-
-                <div class="mt-4 grid gap-4">
-                    <div class="flex items-center justify-between gap-4">
-                        <div>
-                            <div class="text-sm font-medium">启动时扫描</div>
-                            <div
-                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
-                                应用启动时自动刷新媒体库
-                            </div>
+                    <mdui-switch
+                        checked={settings.data.scanOnStartup}
+                        onchange={(event: Event) =>
+                            handleSwitchChange(event, 'scanOnStartup')}
+                    ></mdui-switch>
+                </SettingsRow>
+
+                <div class="grid gap-3">
+                    <div>
+                        <div class="text-sm font-medium">媒体库目录</div>
+                        <div
+                            class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                        >
+                            后续可以接入 Tauri 文件夹选择器
                         </div>
-
-                        <mdui-switch
-                            checked={settings.data.scanOnStartup}
-                            onchange={(event: Event) =>
-                                handleSwitchChange(event, 'scanOnStartup')}
-                        ></mdui-switch>
                     </div>
 
-                    <div class="grid gap-3">
-                        <div>
-                            <div class="text-sm font-medium">媒体库目录</div>
-                            <div
-                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
-                                后续可以接入 Tauri 文件夹选择器
-                            </div>
-                        </div>
-
-                        <div class="flex gap-2">
-                            <TextField
-                                bind:value={newLibraryDir}
-                                variant="outlined"
-                                placeholder="输入音乐目录路径"
-                            />
+                    <div class="flex gap-2">
+                        <TextField
+                            bind:value={newLibraryDir}
+                            variant="outlined"
+                            placeholder="输入音乐目录路径"
+                        />
 
-                            <Button variant="filled" onclick={addLibraryDir}>
-                                添加
-                            </Button>
-                        </div>
-
-                        {#if settings.data.libraryDirs.length > 0}
-                            <div class="grid gap-2">
-                                {#each settings.data.libraryDirs as dir (dir)}
-                                    <div
-                                        class="flex items-center justify-between gap-3 rounded-2xl bg-[rgb(var(--mdui-color-surface-container-highest))] px-4 py-3"
-                                    >
-                                        <div class="truncate text-sm">
-                                            {dir}
-                                        </div>
-
-                                        <Button
-                                            variant="text"
-                                            onclick={() =>
-                                                settings.removeLibraryDir(dir)}
-                                        >
-                                            移除
-                                        </Button>
-                                    </div>
-                                {/each}
-                            </div>
-                        {:else}
-                            <div
-                                class="rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-4 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
-                                暂未添加媒体库目录
-                            </div>
-                        {/if}
+                        <Button variant="filled" onclick={addLibraryDir}>
+                            添加
+                        </Button>
                     </div>
-                </div>
-            </section>
 
-            <section
-                class="rounded-3xl bg-[rgb(var(--mdui-color-surface-container))] p-5"
-            >
-                <h2
-                    class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
-                >
-                    扩展
-                </h2>
-
-                <div class="mt-4 grid gap-3">
-                    {#each extensionRegistry.extensions as extension (extension.id)}
+                    {#if settings.data.libraryDirs.length > 0}
+                        <div class="grid gap-2">
+                            {#each settings.data.libraryDirs as dir (dir)}
+                                <SettingsListItem title={dir}>
+                                    <Button
+                                        variant="text"
+                                        onclick={() =>
+                                            settings.removeLibraryDir(dir)}
+                                    >
+                                        移除
+                                    </Button>
+                                </SettingsListItem>
+                            {/each}
+                        </div>
+                    {:else}
                         <div
-                            class="flex items-center justify-between gap-4 rounded-2xl bg-[rgb(var(--mdui-color-surface-container-highest))] px-4 py-3"
+                            class={`rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-4 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]`}
                         >
-                            <div class="min-w-0">
-                                <div class="text-sm font-medium">
-                                    {extension.name}
-                                </div>
-
-                                {#if extension.description}
-                                    <div
-                                        class="mt-1 text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                                    >
-                                        {extension.description}
-                                    </div>
-                                {/if}
-                            </div>
-
-                            <mdui-switch
-                                checked={extension.enabled !== false}
-                                onchange={(event: Event) => {
-                                    const target =
-                                        event.currentTarget as HTMLElement & {
-                                            checked: boolean
-                                        }
-
-                                    extensionRegistry.setEnabled(
-                                        extension.id,
-                                        target.checked,
-                                    )
-                                }}
-                            ></mdui-switch>
+                            暂未添加媒体库目录
                         </div>
-                    {/each}
+                    {/if}
                 </div>
-            </section>
+            </SettingsSection>
+
+            <SettingsSection title="扩展" contentClass="mt-4 grid gap-3">
+                {#each extensionRegistry.extensions as extension (extension.id)}
+                    <SettingsListItem
+                        title={extension.name}
+                        description={extension.description}
+                    >
+                        <mdui-switch
+                            checked={extension.enabled !== false}
+                            onchange={(event: Event) => {
+                                const target =
+                                    event.currentTarget as HTMLElement & {
+                                        checked: boolean
+                                    }
+
+                                extensionRegistry.setEnabled(
+                                    extension.id,
+                                    target.checked,
+                                )
+                            }}
+                        ></mdui-switch>
+                    </SettingsListItem>
+                {/each}
+            </SettingsSection>
 
             {#if settings.error}
                 <div class="text-sm text-red-500">
@@ -243,4 +176,4 @@
             {/if}
         </div>
     {/if}
-</section>
\ No newline at end of file
+</section>

From 2ce78b06b51eaa43f5ad2d3d224468a5873f7b51 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Tue, 26 May 2026 15:13:51 +0800
Subject: [PATCH 12/39] fix styles

---
 src-tauri/src/lib.rs                         |  23 +
 src-tauri/src/models/settings.rs             |   4 +-
 src-tauri/src/models/track.rs                |   1 +
 src/app.css                                  | 806 ++++++++++---------
 src/lib/components/media/MediaGrid.svelte    |   4 +-
 src/lib/extensions/builtin.ts                |  15 -
 src/lib/features/TrackList.svelte            |   2 +-
 src/lib/features/settings/SettingsRow.svelte |   2 +-
 src/lib/features/shell/NavRail.svelte        |   6 +-
 src/lib/state/settings.svelte.ts             |   2 +-
 src/lib/types/settings.ts                    |   2 +-
 src/routes/+layout.svelte                    |  17 +-
 src/routes/+page.svelte                      |   6 +-
 src/routes/settings/+page.svelte             | 244 +++---
 14 files changed, 585 insertions(+), 549 deletions(-)

diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 084691f..087af21 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -3,6 +3,8 @@ mod commands;
 mod metadata;
 mod models;
 
+use std::thread;
+
 use commands::library::{
     get_track_cover,
     load_music_library,
@@ -28,11 +30,32 @@ use commands::settings::{
     save_settings,
 };
 
+fn scan_media_libraries(dirs: Vec<String>) {
+    println!("开始扫描以下目录中的音乐文件: {:?}", dirs);
+    // 扫描
+    
+}
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
         // .plugin(tauri_plugin_opener::init())
+        // .setup(|app| {
+        //     let app_handle = app.handle().clone();
+            
+        //     thread::spawn(move || {
+        //         let scan_on_startup = true;
+        //         let library_dirs = vec![String::from("D:/Music")];
+
+        //         if scan_on_startup && !library_dirs.is_empty() {
+        //             scan_media_libraries(library_dirs);
+        //             // app_handle.emit("scan-finished", "success").unwrap();
+        //         }
+        //     });
+
+        //     Ok(())
+        // })
         .invoke_handler(tauri::generate_handler![
             play_music,
             toggle_music,
diff --git a/src-tauri/src/models/settings.rs b/src-tauri/src/models/settings.rs
index 145f8e3..85ccab1 100644
--- a/src-tauri/src/models/settings.rs
+++ b/src-tauri/src/models/settings.rs
@@ -13,7 +13,7 @@ pub struct AppSettings {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum ThemeMode {
-    System,
+    Auto,
     Light,
     Dark,
 }
@@ -21,7 +21,7 @@ pub enum ThemeMode {
 impl Default for AppSettings {
     fn default() -> Self {
         Self {
-            theme: ThemeMode::System,
+            theme: ThemeMode::Auto,
             volume: 80,
             library_dirs: Vec::new(),
             scan_on_startup: false,
diff --git a/src-tauri/src/models/track.rs b/src-tauri/src/models/track.rs
index 64baa77..a2a2514 100644
--- a/src-tauri/src/models/track.rs
+++ b/src-tauri/src/models/track.rs
@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct Track {
     pub title: String,
     pub artist: String,
diff --git a/src/app.css b/src/app.css
index 3f639d8..407ca74 100644
--- a/src/app.css
+++ b/src/app.css
@@ -5,407 +5,409 @@
 @import "tailwindcss/utilities.css" layer(utilities);
 @import 'material-symbols';
 
-* {
-  transition: all 0.2s ease;
-}
-
-/*
-  1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
-  2. Remove default margins and padding
-  3. Reset all borders.
-*/
-
-/* *, */
-html,
-body,
-::after,
-::before,
-::backdrop,
-::file-selector-button {
-  box-sizing: border-box; /* 1 */
-  margin: 0; /* 2 */
-  padding: 0; /* 2 */
-  border: 0 solid; /* 3 */
-}
-
-/*
-  1. Use a consistent sensible line-height in all browsers.
-  2. Prevent adjustments of font size after orientation changes in iOS.
-  3. Use a more readable tab size.
-  4. Use the user's configured `sans` font-family by default.
-  5. Use the user's configured `sans` font-feature-settings by default.
-  6. Use the user's configured `sans` font-variation-settings by default.
-  7. Disable tap highlights on iOS.
-*/
-
-html,
-:host {
-  line-height: 1.5; /* 1 */
-  -webkit-text-size-adjust: 100%; /* 2 */
-  tab-size: 4; /* 3 */
-  font-family: --theme(
-    --default-font-family,
-    ui-sans-serif,
-    system-ui,
-    sans-serif,
-    'Apple Color Emoji',
-    'Segoe UI Emoji',
-    'Segoe UI Symbol',
-    'Noto Color Emoji'
-  ); /* 4 */
-  font-feature-settings: --theme(--default-font-feature-settings, normal); /* 5 */
-  font-variation-settings: --theme(--default-font-variation-settings, normal); /* 6 */
-  -webkit-tap-highlight-color: transparent; /* 7 */
-}
-
-/*
-  1. Add the correct height in Firefox.
-  2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
-  3. Reset the default border style to a 1px solid border.
-*/
-
-hr {
-  height: 0; /* 1 */
-  color: inherit; /* 2 */
-  border-top-width: 1px; /* 3 */
-}
-
-/*
-  Add the correct text decoration in Chrome, Edge, and Safari.
-*/
-
-abbr:where([title]) {
-  -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted;
-}
-
-/*
-  Remove the default font size and weight for headings.
-*/
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-size: inherit;
-  font-weight: inherit;
-}
-
-p {
-  margin: 0;
-  padding: 0;
-}
-
-/*
-  Reset links to optimize for opt-in styling instead of opt-out.
-*/
-
-a {
-  color: inherit;
-  -webkit-text-decoration: inherit;
-  text-decoration: inherit;
-}
-
-/*
-  Add the correct font weight in Edge and Safari.
-*/
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-/*
-  1. Use the user's configured `mono` font-family by default.
-  2. Use the user's configured `mono` font-feature-settings by default.
-  3. Use the user's configured `mono` font-variation-settings by default.
-  4. Correct the odd `em` font sizing in all browsers.
-*/
-
-code,
-kbd,
-samp,
-pre {
-  font-family: --theme(
-    --default-mono-font-family,
-    ui-monospace,
-    SFMono-Regular,
-    Menlo,
-    Monaco,
-    Consolas,
-    'Liberation Mono',
-    'Courier New',
-    monospace
-  ); /* 1 */
-  font-feature-settings: --theme(--default-mono-font-feature-settings, normal); /* 2 */
-  font-variation-settings: --theme(--default-mono-font-variation-settings, normal); /* 3 */
-  font-size: 1em; /* 4 */
-}
-
-/*
-  Add the correct font size in all browsers.
-*/
-
-small {
-  font-size: 80%;
-}
-
-/*
-  Prevent `sub` and `sup` elements from affecting the line height in all browsers.
-*/
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-/*
-  1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
-  2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
-  3. Remove gaps between table borders by default.
-*/
-
-table {
-  text-indent: 0; /* 1 */
-  border-color: inherit; /* 2 */
-  border-collapse: collapse; /* 3 */
-}
-
-/*
-  Use the modern Firefox focus style for all focusable elements.
-*/
-
-:-moz-focusring {
-  outline: auto;
-}
-
-/*
-  Add the correct vertical alignment in Chrome and Firefox.
-*/
-
-progress {
-  vertical-align: baseline;
-}
-
-/*
-  Add the correct display in Chrome and Safari.
-*/
-
-summary {
-  display: list-item;
-}
-
-/*
-  Make lists unstyled by default.
-*/
-
-ol,
-ul,
-menu {
-  list-style: none;
-}
-
-/*
-  1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)
-  2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)
-      This can trigger a poorly considered lint error in some tools but is included by design.
-*/
-
-img,
-svg,
-video,
-canvas,
-audio,
-iframe,
-embed,
-object {
-  display: block; /* 1 */
-  vertical-align: middle; /* 2 */
-}
-
-/*
-  Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)
-*/
-
-img,
-video {
-  max-width: 100%;
-  height: auto;
-}
-
-/*
-  1. Inherit font styles in all browsers.
-  2. Remove border radius in all browsers.
-  3. Remove background color in all browsers.
-  4. Ensure consistent opacity for disabled states in all browsers.
-*/
-
-button,
-input,
-select,
-optgroup,
-textarea,
-::file-selector-button {
-  font: inherit; /* 1 */
-  font-feature-settings: inherit; /* 1 */
-  font-variation-settings: inherit; /* 1 */
-  letter-spacing: inherit; /* 1 */
-  color: inherit; /* 1 */
-  border-radius: 0; /* 2 */
-  background-color: transparent; /* 3 */
-  opacity: 1; /* 4 */
-}
-
-/*
-  Restore default font weight.
-*/
-
-:where(select:is([multiple], [size])) optgroup {
-  font-weight: bolder;
-}
-
-/*
-  Restore indentation.
-*/
-
-:where(select:is([multiple], [size])) optgroup option {
-  padding-inline-start: 20px;
-}
-
-/*
-  Restore space after button.
-*/
-
-::file-selector-button {
-  margin-inline-end: 4px;
-}
-
-/*
-  Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
-*/
-
-::placeholder {
-  opacity: 1;
-}
-
-/*
-  Set the default placeholder color to a semi-transparent version of the current text color in browsers that do not
-  crash when using `color-mix(…)` with `currentcolor`. (https://github.com/tailwindlabs/tailwindcss/issues/17194)
-*/
-
-@supports (not (-webkit-appearance: -apple-pay-button)) /* Not Safari */ or
-  (contain-intrinsic-size: 1px) /* Safari 17+ */ {
+@layer base {
+  * {
+    transition: all 0.2s ease;
+  }
+
+  /*
+    1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
+    2. Remove default margins and padding
+    3. Reset all borders.
+  */
+
+  /* *, */
+  html,
+  body,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    box-sizing: border-box; /* 1 */
+    margin: 0; /* 2 */
+    padding: 0; /* 2 */
+    border: 0 solid; /* 3 */
+  }
+
+  /*
+    1. Use a consistent sensible line-height in all browsers.
+    2. Prevent adjustments of font size after orientation changes in iOS.
+    3. Use a more readable tab size.
+    4. Use the user's configured `sans` font-family by default.
+    5. Use the user's configured `sans` font-feature-settings by default.
+    6. Use the user's configured `sans` font-variation-settings by default.
+    7. Disable tap highlights on iOS.
+  */
+
+  html,
+  :host {
+    line-height: 1.5; /* 1 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+    tab-size: 4; /* 3 */
+    font-family: --theme(
+      --default-font-family,
+      ui-sans-serif,
+      system-ui,
+      sans-serif,
+      'Apple Color Emoji',
+      'Segoe UI Emoji',
+      'Segoe UI Symbol',
+      'Noto Color Emoji'
+    ); /* 4 */
+    font-feature-settings: --theme(--default-font-feature-settings, normal); /* 5 */
+    font-variation-settings: --theme(--default-font-variation-settings, normal); /* 6 */
+    -webkit-tap-highlight-color: transparent; /* 7 */
+  }
+
+  /*
+    1. Add the correct height in Firefox.
+    2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
+    3. Reset the default border style to a 1px solid border.
+  */
+
+  hr {
+    height: 0; /* 1 */
+    color: inherit; /* 2 */
+    border-top-width: 1px; /* 3 */
+  }
+
+  /*
+    Add the correct text decoration in Chrome, Edge, and Safari.
+  */
+
+  abbr:where([title]) {
+    -webkit-text-decoration: underline dotted;
+    text-decoration: underline dotted;
+  }
+
+  /*
+    Remove the default font size and weight for headings.
+  */
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-size: inherit;
+    font-weight: inherit;
+  }
+
+  p {
+    margin: 0;
+    padding: 0;
+  }
+
+  /*
+    Reset links to optimize for opt-in styling instead of opt-out.
+  */
+
+  a {
+    color: inherit;
+    -webkit-text-decoration: inherit;
+    text-decoration: inherit;
+  }
+
+  /*
+    Add the correct font weight in Edge and Safari.
+  */
+
+  b,
+  strong {
+    font-weight: bolder;
+  }
+
+  /*
+    1. Use the user's configured `mono` font-family by default.
+    2. Use the user's configured `mono` font-feature-settings by default.
+    3. Use the user's configured `mono` font-variation-settings by default.
+    4. Correct the odd `em` font sizing in all browsers.
+  */
+
+  code,
+  kbd,
+  samp,
+  pre {
+    font-family: --theme(
+      --default-mono-font-family,
+      ui-monospace,
+      SFMono-Regular,
+      Menlo,
+      Monaco,
+      Consolas,
+      'Liberation Mono',
+      'Courier New',
+      monospace
+    ); /* 1 */
+    font-feature-settings: --theme(--default-mono-font-feature-settings, normal); /* 2 */
+    font-variation-settings: --theme(--default-mono-font-variation-settings, normal); /* 3 */
+    font-size: 1em; /* 4 */
+  }
+
+  /*
+    Add the correct font size in all browsers.
+  */
+
+  small {
+    font-size: 80%;
+  }
+
+  /*
+    Prevent `sub` and `sup` elements from affecting the line height in all browsers.
+  */
+
+  sub,
+  sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+  }
+
+  sub {
+    bottom: -0.25em;
+  }
+
+  sup {
+    top: -0.5em;
+  }
+
+  /*
+    1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
+    2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
+    3. Remove gaps between table borders by default.
+  */
+
+  table {
+    text-indent: 0; /* 1 */
+    border-color: inherit; /* 2 */
+    border-collapse: collapse; /* 3 */
+  }
+
+  /*
+    Use the modern Firefox focus style for all focusable elements.
+  */
+
+  :-moz-focusring {
+    outline: auto;
+  }
+
+  /*
+    Add the correct vertical alignment in Chrome and Firefox.
+  */
+
+  progress {
+    vertical-align: baseline;
+  }
+
+  /*
+    Add the correct display in Chrome and Safari.
+  */
+
+  summary {
+    display: list-item;
+  }
+
+  /*
+    Make lists unstyled by default.
+  */
+
+  ol,
+  ul,
+  menu {
+    list-style: none;
+  }
+
+  /*
+    1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)
+    2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)
+        This can trigger a poorly considered lint error in some tools but is included by design.
+  */
+
+  img,
+  svg,
+  video,
+  canvas,
+  audio,
+  iframe,
+  embed,
+  object {
+    display: block; /* 1 */
+    vertical-align: middle; /* 2 */
+  }
+
+  /*
+    Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)
+  */
+
+  img,
+  video {
+    max-width: 100%;
+    height: auto;
+  }
+
+  /*
+    1. Inherit font styles in all browsers.
+    2. Remove border radius in all browsers.
+    3. Remove background color in all browsers.
+    4. Ensure consistent opacity for disabled states in all browsers.
+  */
+
+  button,
+  input,
+  select,
+  optgroup,
+  textarea,
+  ::file-selector-button {
+    font: inherit; /* 1 */
+    font-feature-settings: inherit; /* 1 */
+    font-variation-settings: inherit; /* 1 */
+    letter-spacing: inherit; /* 1 */
+    color: inherit; /* 1 */
+    border-radius: 0; /* 2 */
+    background-color: transparent; /* 3 */
+    opacity: 1; /* 4 */
+  }
+
+  /*
+    Restore default font weight.
+  */
+
+  :where(select:is([multiple], [size])) optgroup {
+    font-weight: bolder;
+  }
+
+  /*
+    Restore indentation.
+  */
+
+  :where(select:is([multiple], [size])) optgroup option {
+    padding-inline-start: 20px;
+  }
+
+  /*
+    Restore space after button.
+  */
+
+  ::file-selector-button {
+    margin-inline-end: 4px;
+  }
+
+  /*
+    Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
+  */
+
   ::placeholder {
-    color: color-mix(in oklab, currentcolor 50%, transparent);
-  }
-}
-
-/*
-  Prevent resizing textareas horizontally by default.
-*/
-
-textarea {
-  resize: vertical;
-}
-
-/*
-  Remove the inner padding in Chrome and Safari on macOS.
-*/
-
-::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-/*
-  1. Ensure date/time inputs have the same height when empty in iOS Safari.
-  2. Ensure text alignment can be changed on date/time inputs in iOS Safari.
-*/
-
-::-webkit-date-and-time-value {
-  min-height: 1lh; /* 1 */
-  text-align: inherit; /* 2 */
-}
-
-/*
-  Prevent height from changing on date/time inputs in macOS Safari when the input is set to `display: block`.
-*/
-
-::-webkit-datetime-edit {
-  display: inline-flex;
-}
-
-/*
-  Remove excess padding from pseudo-elements in date/time inputs to ensure consistent height across browsers.
-*/
-
-::-webkit-datetime-edit-fields-wrapper {
-  padding: 0;
-}
-
-::-webkit-datetime-edit,
-::-webkit-datetime-edit-year-field,
-::-webkit-datetime-edit-month-field,
-::-webkit-datetime-edit-day-field,
-::-webkit-datetime-edit-hour-field,
-::-webkit-datetime-edit-minute-field,
-::-webkit-datetime-edit-second-field,
-::-webkit-datetime-edit-millisecond-field,
-::-webkit-datetime-edit-meridiem-field {
-  padding-block: 0;
-}
-
-/*
-  Center dropdown marker shown on inputs with paired `<datalist>`s in Chrome. (https://github.com/tailwindlabs/tailwindcss/issues/18499)
-*/
-
-::-webkit-calendar-picker-indicator {
-  line-height: 1;
-}
-
-/*
-  Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
-*/
-
-:-moz-ui-invalid {
-  box-shadow: none;
-}
-
-/*
-  Correct the inability to style the border radius in iOS Safari.
-*/
-
-button,
-input:where([type='button'], [type='reset'], [type='submit']),
-::file-selector-button {
-  appearance: button;
-}
-
-/*
-  Correct the cursor style of increment and decrement buttons in Safari.
-*/
-
-::-webkit-inner-spin-button,
-::-webkit-outer-spin-button {
-  height: auto;
-}
-
-/*
-  Make elements with the HTML hidden attribute stay hidden by default.
-*/
-
-[hidden]:where(:not([hidden='until-found'])) {
-  display: none !important;
+    opacity: 1;
+  }
+
+  /*
+    Set the default placeholder color to a semi-transparent version of the current text color in browsers that do not
+    crash when using `color-mix(…)` with `currentcolor`. (https://github.com/tailwindlabs/tailwindcss/issues/17194)
+  */
+
+  @supports (not (-webkit-appearance: -apple-pay-button)) /* Not Safari */ or
+    (contain-intrinsic-size: 1px) /* Safari 17+ */ {
+    ::placeholder {
+      color: color-mix(in oklab, currentcolor 50%, transparent);
+    }
+  }
+
+  /*
+    Prevent resizing textareas horizontally by default.
+  */
+
+  textarea {
+    resize: vertical;
+  }
+
+  /*
+    Remove the inner padding in Chrome and Safari on macOS.
+  */
+
+  ::-webkit-search-decoration {
+    -webkit-appearance: none;
+  }
+
+  /*
+    1. Ensure date/time inputs have the same height when empty in iOS Safari.
+    2. Ensure text alignment can be changed on date/time inputs in iOS Safari.
+  */
+
+  ::-webkit-date-and-time-value {
+    min-height: 1lh; /* 1 */
+    text-align: inherit; /* 2 */
+  }
+
+  /*
+    Prevent height from changing on date/time inputs in macOS Safari when the input is set to `display: block`.
+  */
+
+  ::-webkit-datetime-edit {
+    display: inline-flex;
+  }
+
+  /*
+    Remove excess padding from pseudo-elements in date/time inputs to ensure consistent height across browsers.
+  */
+
+  ::-webkit-datetime-edit-fields-wrapper {
+    padding: 0;
+  }
+
+  ::-webkit-datetime-edit,
+  ::-webkit-datetime-edit-year-field,
+  ::-webkit-datetime-edit-month-field,
+  ::-webkit-datetime-edit-day-field,
+  ::-webkit-datetime-edit-hour-field,
+  ::-webkit-datetime-edit-minute-field,
+  ::-webkit-datetime-edit-second-field,
+  ::-webkit-datetime-edit-millisecond-field,
+  ::-webkit-datetime-edit-meridiem-field {
+    padding-block: 0;
+  }
+
+  /*
+    Center dropdown marker shown on inputs with paired `<datalist>`s in Chrome. (https://github.com/tailwindlabs/tailwindcss/issues/18499)
+  */
+
+  ::-webkit-calendar-picker-indicator {
+    line-height: 1;
+  }
+
+  /*
+    Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
+  */
+
+  :-moz-ui-invalid {
+    box-shadow: none;
+  }
+
+  /*
+    Correct the inability to style the border radius in iOS Safari.
+  */
+
+  button,
+  input:where([type='button'], [type='reset'], [type='submit']),
+  ::file-selector-button {
+    appearance: button;
+  }
+
+  /*
+    Correct the cursor style of increment and decrement buttons in Safari.
+  */
+
+  ::-webkit-inner-spin-button,
+  ::-webkit-outer-spin-button {
+    height: auto;
+  }
+
+  /*
+    Make elements with the HTML hidden attribute stay hidden by default.
+  */
+
+  [hidden]:where(:not([hidden='until-found'])) {
+    display: none !important;
+  }
 }
\ No newline at end of file
diff --git a/src/lib/components/media/MediaGrid.svelte b/src/lib/components/media/MediaGrid.svelte
index 80df282..b9f2e68 100644
--- a/src/lib/components/media/MediaGrid.svelte
+++ b/src/lib/components/media/MediaGrid.svelte
@@ -25,7 +25,7 @@
 {#snippet mediaCard(item: MediaGridItem)}
     <mdui-card
         href={item.href ?? undefined}
-        class="group block outline-none"
+        class="group"
         aria-label={item.title}
     >
         <div
@@ -39,7 +39,7 @@
                 <img
                     src={item.image}
                     alt={item.title}
-                    class="h-full w-full object-cover transition-transform duration-300 group-hover:scale-105"
+                    class="h-full w-full object-cover group-hover:scale-105"
                     loading="lazy"
                 />
             {:else}
diff --git a/src/lib/extensions/builtin.ts b/src/lib/extensions/builtin.ts
index 24166e1..5a65d21 100644
--- a/src/lib/extensions/builtin.ts
+++ b/src/lib/extensions/builtin.ts
@@ -42,19 +42,4 @@ export function registerBuiltinExtensions() {
             },
         ],
     })
-
-    extensionRegistry.register({
-        id: 'kino.settings',
-        name: 'Settings',
-        description: '应用设置页面',
-        navItems: [
-            {
-                id: 'settings',
-                title: '设置',
-                icon: 'settings--rounded',
-                href: '/settings',
-                order: 100,
-            },
-        ],
-    })
 }
\ No newline at end of file
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 91482c8..05e010f 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -80,7 +80,7 @@
 {#snippet trackCover(track: Track, cover: string | null)}
     <div
         use:lazyCover={track}
-        class="w-10 h-10 rounded-md overflow-hidden themed-surface-container shrink-0 transition-transform duration-300 group-hover:scale-105 group-hover:shadow-md"
+        class="w-10 h-10 rounded-md overflow-hidden themed-surface-container shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
     >
         {#if cover}
             <img
diff --git a/src/lib/features/settings/SettingsRow.svelte b/src/lib/features/settings/SettingsRow.svelte
index 3c2c6de..ec9f3ea 100644
--- a/src/lib/features/settings/SettingsRow.svelte
+++ b/src/lib/features/settings/SettingsRow.svelte
@@ -18,7 +18,7 @@
 
 <div class={`flex items-center justify-between gap-4 ${className}`}>
     <div class="min-w-0">
-        <div class="text-sm font-medium">{title}</div>
+        <div class="text-sm font-medium text-[rgb(var(--mdui-color-on-surface))]">{title}</div>
 
         {#if description}
             <div
diff --git a/src/lib/features/shell/NavRail.svelte b/src/lib/features/shell/NavRail.svelte
index d94b00d..2caca44 100644
--- a/src/lib/features/shell/NavRail.svelte
+++ b/src/lib/features/shell/NavRail.svelte
@@ -31,7 +31,7 @@
         }
     }
 
-    async function playMusic() {
+    async function imoprtMusic() {
         const playlist = await importMusicFolder()
         if (!playlist) return
 
@@ -47,9 +47,9 @@
         lowered
         icon="playlist_add--rounded"
         slot="top"
-        onclick={playMusic}
+        onclick={imoprtMusic}
         onkeydown={(e: KeyboardEvent) => {
-            if (e.key === 'Enter' || e.key === ' ') playMusic()
+            if (e.key === 'Enter' || e.key === ' ') imoprtMusic()
         }}
         role="button"
         tabindex="0"
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index 78dae8e..04b0ffe 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -2,7 +2,7 @@ import type { AppSettings } from '$lib/types'
 import { invoke } from '@tauri-apps/api/core'
 
 export const DEFAULT_SETTINGS: AppSettings = {
-    theme: 'system',
+    theme: 'auto',
     volume: 80,
     libraryDirs: [],
     scanOnStartup: false,
diff --git a/src/lib/types/settings.ts b/src/lib/types/settings.ts
index 057a21b..88bd643 100644
--- a/src/lib/types/settings.ts
+++ b/src/lib/types/settings.ts
@@ -1,5 +1,5 @@
 
-export type ThemeMode = 'system' | 'light' | 'dark'
+export type ThemeMode = 'auto' | 'light' | 'dark'
 
 export interface AppSettings {
     theme: ThemeMode
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 09c326d..2f9d97e 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -10,10 +10,16 @@
 
     let { children } = $props()
 
-
     onMount(() => {
         void settings.load()
     })
+
+    $effect(() => {
+        document.documentElement.style.setProperty(
+            '--transition-duration',
+            settings.data.reduceMotion ? '0s' : '0.2s',
+        )
+    })
 </script>
 
 <mdui-layout full-height>
@@ -27,3 +33,12 @@
         {@render children()}
     </mdui-layout-main>
 </mdui-layout>
+
+<style lang="postcss">
+    @reference "tailwindcss";
+    @layer base {
+        :global(*) {
+            transition: all var(--transition-duration, 0.2s) ease;
+        }
+    }
+</style>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index f12c787..0b72a39 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -9,7 +9,9 @@
 
 <style lang="postcss">
     @reference "tailwindcss";
-    :global(html) {
-        background-color: theme(--color-gray-100);
+    @layer base {
+        :global(html) {
+            background-color: theme(--color-gray-100);
+        }
     }
 </style>
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index cb2cde6..b9b3844 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -2,7 +2,6 @@
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
     import Select from '$lib/components/base/Select.svelte'
-    import TextField from '$lib/components/base/TextField.svelte'
     import { registerBuiltinExtensions } from '$lib/extensions/builtin'
     import { extensionRegistry } from '$lib/extensions/registry.svelte'
     import SettingsListItem from '$lib/features/settings/SettingsListItem.svelte'
@@ -12,13 +11,15 @@
     import type { ThemeMode } from '$lib/types'
     import { onMount } from 'svelte'
 
+    import { open } from '@tauri-apps/plugin-dialog'
     import 'mdui/components/circular-progress.js'
     import 'mdui/components/switch.js'
+    import { setTheme } from 'mdui/functions/setTheme.js'
 
     let newLibraryDir = $state('')
 
     const themeOptions: { label: string; value: ThemeMode }[] = [
-        { label: '跟随系统', value: 'system' },
+        { label: '跟随系统', value: 'auto' },
         { label: '浅色模式', value: 'light' },
         { label: '深色模式', value: 'dark' },
     ]
@@ -45,6 +46,22 @@
             [key]: target.checked,
         })
     }
+
+    async function handleSelectDirectory() {
+        try {
+            const selected = await open({
+                directory: true,
+                multiple: false,
+                title: '选择音乐媒体库目录',
+            })
+
+            if (selected && typeof selected === 'string') {
+                settings.addLibraryDir(selected)
+            }
+        } catch (err) {
+            console.error('打开文件夹选择器失败:', err)
+        }
+    }
 </script>
 
 <svelte:head>
@@ -54,126 +71,117 @@
 <section class="flex h-full min-h-0 flex-col gap-6 overflow-auto pb-10">
     <Heading eyebrow="Settings" title="设置" />
 
-    {#if settings.isLoading}
-        <div class="flex flex-1 items-center justify-center">
-            <mdui-circular-progress></mdui-circular-progress>
-        </div>
-    {:else}
-        <div class="grid gap-6">
-            <SettingsSection title="外观">
-                <SettingsRow title="主题" description="设置应用的明暗模式">
-                    <div class="w-48">
-                        <Select
-                            value={settings.data.theme}
-                            options={themeOptions}
-                            onchange={value => {
-                                settings.update({
-                                    theme: value as ThemeMode,
-                                })
-                            }}
-                        />
+    <div
+        class="flex flex-1 items-center justify-center"
+        class:hidden={!settings.isLoading}
+    >
+        <mdui-circular-progress></mdui-circular-progress>
+    </div>
+
+    <div class="grid gap-6" class:hidden={settings.isLoading}>
+        <SettingsSection title="外观">
+            <SettingsRow title="主题" description="设置应用的明暗模式">
+                <div class="w-48">
+                    <Select
+                        value={settings.data?.theme}
+                        options={themeOptions}
+                        onchange={value => {
+                            settings.update({
+                                theme: value as ThemeMode,
+                            })
+                            setTheme(value as ThemeMode)
+                        }}
+                    />
+                </div>
+            </SettingsRow>
+
+            <SettingsRow title="减少动画" description="降低界面动画和过渡效果">
+                <mdui-switch
+                    checked={settings.data?.reduceMotion}
+                    onchange={(event: Event) =>
+                        handleSwitchChange(event, 'reduceMotion')}
+                ></mdui-switch>
+            </SettingsRow>
+        </SettingsSection>
+
+        <SettingsSection title="媒体库">
+            <SettingsRow
+                title="启动时扫描"
+                description="应用启动时自动刷新媒体库"
+            >
+                <mdui-switch
+                    checked={settings.data?.scanOnStartup}
+                    onchange={(event: Event) =>
+                        handleSwitchChange(event, 'scanOnStartup')}
+                ></mdui-switch>
+            </SettingsRow>
+            <div class="grid gap-3">
+                <div>
+                    <div class="text-sm font-medium">媒体库目录</div>
+                    <div
+                        class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        管理应用扫描音乐文件的本地文件夹
                     </div>
-                </SettingsRow>
+                </div>
 
-                <SettingsRow
-                    title="减少动画"
-                    description="降低界面动画和过渡效果"
-                >
-                    <mdui-switch
-                        checked={settings.data.reduceMotion}
-                        onchange={(event: Event) =>
-                            handleSwitchChange(event, 'reduceMotion')}
-                    ></mdui-switch>
-                </SettingsRow>
-            </SettingsSection>
+                <div class="flex">
+                    <Button variant="tonal" onclick={handleSelectDirectory}>
+                        选择本地文件夹
+                    </Button>
+                </div>
 
-            <SettingsSection title="媒体库">
-                <SettingsRow
-                    title="启动时扫描"
-                    description="应用启动时自动刷新媒体库"
+                {#if settings.data?.libraryDirs?.length > 0}
+                    <div class="grid gap-2 mt-2">
+                        {#each settings.data.libraryDirs as dir (dir)}
+                            <SettingsListItem title={dir}>
+                                <Button
+                                    variant="text"
+                                    onclick={() =>
+                                        settings.removeLibraryDir(dir)}
+                                >
+                                    <span class="text-red-500">移除</span>
+                                </Button>
+                            </SettingsListItem>
+                        {/each}
+                    </div>
+                {:else}
+                    <div
+                        class="rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-4 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        暂未添加媒体库目录，应用将无法扫描到任何歌曲。
+                    </div>
+                {/if}
+            </div>
+        </SettingsSection>
+
+        <SettingsSection title="扩展" contentClass="mt-4 grid gap-3">
+            {#each extensionRegistry.extensions as extension (extension.id)}
+                <SettingsListItem
+                    title={extension.name}
+                    description={extension.description}
                 >
                     <mdui-switch
-                        checked={settings.data.scanOnStartup}
-                        onchange={(event: Event) =>
-                            handleSwitchChange(event, 'scanOnStartup')}
+                        checked={extension.enabled !== false}
+                        onchange={(event: Event) => {
+                            const target =
+                                event.currentTarget as HTMLElement & {
+                                    checked: boolean
+                                }
+                            extensionRegistry.setEnabled(
+                                extension.id,
+                                target.checked,
+                            )
+                        }}
                     ></mdui-switch>
-                </SettingsRow>
-
-                <div class="grid gap-3">
-                    <div>
-                        <div class="text-sm font-medium">媒体库目录</div>
-                        <div
-                            class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                        >
-                            后续可以接入 Tauri 文件夹选择器
-                        </div>
-                    </div>
-
-                    <div class="flex gap-2">
-                        <TextField
-                            bind:value={newLibraryDir}
-                            variant="outlined"
-                            placeholder="输入音乐目录路径"
-                        />
-
-                        <Button variant="filled" onclick={addLibraryDir}>
-                            添加
-                        </Button>
-                    </div>
-
-                    {#if settings.data.libraryDirs.length > 0}
-                        <div class="grid gap-2">
-                            {#each settings.data.libraryDirs as dir (dir)}
-                                <SettingsListItem title={dir}>
-                                    <Button
-                                        variant="text"
-                                        onclick={() =>
-                                            settings.removeLibraryDir(dir)}
-                                    >
-                                        移除
-                                    </Button>
-                                </SettingsListItem>
-                            {/each}
-                        </div>
-                    {:else}
-                        <div
-                            class={`rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-4 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]`}
-                        >
-                            暂未添加媒体库目录
-                        </div>
-                    {/if}
-                </div>
-            </SettingsSection>
-
-            <SettingsSection title="扩展" contentClass="mt-4 grid gap-3">
-                {#each extensionRegistry.extensions as extension (extension.id)}
-                    <SettingsListItem
-                        title={extension.name}
-                        description={extension.description}
-                    >
-                        <mdui-switch
-                            checked={extension.enabled !== false}
-                            onchange={(event: Event) => {
-                                const target =
-                                    event.currentTarget as HTMLElement & {
-                                        checked: boolean
-                                    }
-
-                                extensionRegistry.setEnabled(
-                                    extension.id,
-                                    target.checked,
-                                )
-                            }}
-                        ></mdui-switch>
-                    </SettingsListItem>
-                {/each}
-            </SettingsSection>
-
-            {#if settings.error}
-                <div class="text-sm text-red-500">
-                    {settings.error}
-                </div>
-            {/if}
-        </div>
-    {/if}
+                </SettingsListItem>
+            {/each}
+        </SettingsSection>
+
+        {#if settings.error}
+            <div class="text-sm text-red-500">
+                {settings.error}
+            </div>
+        {/if}
+    </div>
 </section>

From c6f67e96f6231d8c75d0722ec0fa0dcac932491e Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Thu, 28 May 2026 20:45:33 +0800
Subject: [PATCH 13/39] refactor(library): move startup scan to Tauri setup
 with event-driven sync

- Move `scanOnStartup` logic from frontend layout to Tauri backend `.setup` hook
- Read `settings.json` natively in Rust to determine startup scanning behavior
- Utilize `spawn_blocking` for disk I/O to prevent blocking Tokio async threads
- Implement `library:refreshed` event using domain-based naming convention
- Update frontend layout to only load cached data for near-instant zero-lag startup
- Register event listener in root layout component to smoothly sync scanned tracks
---
 src-tauri/src/commands/library.rs     | 242 +++++++++++-----------
 src-tauri/src/lib.rs                  |  57 +++---
 src/app.css                           |   2 +
 src/lib/features/shell/NavRail.svelte | 115 +++++------
 src/lib/state/library.svelte.ts       |  29 ++-
 src/lib/state/player.svelte.ts        | 283 +++++++++++++++++++++-----
 src/lib/utils/library.ts              |  26 +++
 src/routes/+layout.svelte             |  11 +
 src/routes/+layout.ts                 |  14 ++
 src/routes/+page.svelte               |  17 --
 src/routes/+page.ts                   |   5 +
 src/routes/album/+page.svelte         |   7 +-
 src/routes/artists/+page.svelte       |   9 +-
 src/routes/library/+page.svelte       |  10 +-
 src/routes/recent/+page.svelte        |   5 -
 src/routes/settings/+page.svelte      |  51 ++---
 16 files changed, 546 insertions(+), 337 deletions(-)
 create mode 100644 src/lib/utils/library.ts
 delete mode 100644 src/routes/+page.svelte
 create mode 100644 src/routes/+page.ts

diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index 6bccb7f..56a7188 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -1,3 +1,4 @@
+use std::collections::HashSet;
 use std::fs::{self, File};
 use std::path::Path;
 
@@ -7,109 +8,135 @@ use lofty::probe::Probe;
 use tauri::{command, Manager};
 use walkdir::WalkDir;
 
+use crate::commands::settings::load_settings;
 use crate::metadata::parse_single_track;
+use crate::models::settings::AppSettings;
 use crate::models::Track;
 
 const SUPPORTED_EXT: [&str; 5] = ["mp3", "flac", "m4a", "wav", "ogg"];
 
-#[command]
-pub async fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
-    let file_path = Path::new(&full_path);
+fn is_supported_audio_file(path: &Path) -> bool {
+    path.extension()
+        .and_then(|ext| ext.to_str())
+        .map(|ext| {
+            SUPPORTED_EXT.contains(&ext.to_lowercase().as_str())
+        })
+        .unwrap_or(false)
+}
 
-    if !file_path.exists() {
-        return Err("音频文件不存在或已被移动".into());
+fn scan_single_directory(dir: &str) -> Result<Vec<Track>, String> {
+    let root_path = Path::new(dir);
+
+    if !root_path.exists() || !root_path.is_dir() {
+        return Err(format!("无效目录: {}", dir));
     }
 
-    let tagged_file = Probe::open(file_path)
-        .map_err(|e| format!("无法打开音频文件: {}", e))?
-        .read()
-        .map_err(|e| format!("无法读取音频元数据: {}", e))?;
+    let mut tracks = Vec::new();
 
-    let tag = tagged_file
-        .primary_tag()
-        .or_else(|| tagged_file.first_tag());
+    for entry in WalkDir::new(root_path)
+        .follow_links(false)
+        .into_iter()
+        .filter_map(Result::ok)
+    {
+        let path = entry.path();
 
-    let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
-        let b64_encoded = general_purpose::STANDARD.encode(pic.data());
-        let mime_type = pic.mime_type().map(|m| m.as_str()).unwrap_or("image/jpeg");
+        if !path.is_file() || !is_supported_audio_file(path) {
+            continue;
+        }
 
-        format!("data:{};base64,{}", mime_type, b64_encoded)
-    });
+        if let Some(mut track) = parse_single_track(path) {
+            track.cover = None;
+            tracks.push(track);
+        }
+    }
 
-    Ok(cover)
+    Ok(tracks)
 }
 
-async fn scan_music_directory_logic(
-    app_handle: &tauri::AppHandle,
-) -> Result<Vec<Track>, String> {
-    let music_dir = app_handle
-        .path()
-        .audio_dir()
-        .map_err(|e| format!("无法获取系统音乐目录: {}", e))?;
+fn dedupe_tracks(tracks: &mut Vec<Track>) {
+    let mut seen = HashSet::new();
+    tracks.retain(|track| seen.insert(track.path.clone()));
+}
 
-    let mut tracks = Vec::new();
+pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<Track>, String> {
+    let mut all_tracks = Vec::new();
 
-    visit_dirs(&music_dir, &mut tracks);
+    for dir in dirs {
+        if let Ok(mut tracks) = scan_single_directory(&dir) {
+            all_tracks.append(&mut tracks);
+        }
+    }
 
-    Ok(tracks)
+    dedupe_tracks(&mut all_tracks);
+    Ok(all_tracks)
 }
 
-fn visit_dirs(dir: &Path, tracks: &mut Vec<Track>) {
-    if let Ok(entries) = fs::read_dir(dir) {
-        for entry in entries.flatten() {
-            let path = entry.path();
+pub fn save_music_library(
+    app_handle: &tauri::AppHandle,
+    library: &[Track],
+) -> Result<(), String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| e.to_string())?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path)
+            .map_err(|e| format!("创建数据目录失败: {}", e))?;
+    }
 
-            if path.is_dir() {
-                visit_dirs(&path, tracks);
-                continue;
-            }
+    let json_file_path = app_data_path.join("library.json");
+    let temp_file_path = app_data_path.join("library.json.tmp");
 
-            if !is_supported_audio_file(&path) {
-                continue;
-            }
+    let json_str = serde_json::to_string_pretty(library)
+        .map_err(|e| e.to_string())?;
 
-            if let Some(track) = parse_single_track(&path) {
-                tracks.push(track);
-            }
-        }
-    }
-}
+    fs::write(&temp_file_path, json_str).map_err(|e| e.to_string())?;
+    fs::rename(temp_file_path, json_file_path).map_err(|e| e.to_string())?;
 
-fn is_supported_audio_file(path: &Path) -> bool {
-    path.extension()
-        .and_then(|ext| ext.to_str())
-        .map(|ext| SUPPORTED_EXT.contains(&ext.to_lowercase().as_str()))
-        .unwrap_or(false)
+    Ok(())
 }
 
 #[command]
-pub async fn scan_music_directory(
-    app_handle: tauri::AppHandle,
-    dir_path: String,
-) -> Result<Vec<Track>, String> {
-    let root_path = Path::new(&dir_path);
+pub fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
+    let file_path = Path::new(&full_path);
 
-    if !root_path.is_dir() {
-        return Err("Invalid directory path".into());
+    if !file_path.exists() {
+        return Err("音频文件不存在".into());
     }
 
-    let mut playlist = Vec::new();
+    let tagged_file = Probe::open(file_path)
+        .map_err(|e| e.to_string())?
+        .read()
+        .map_err(|e| e.to_string())?;
 
-    for entry in WalkDir::new(root_path).into_iter().filter_map(|entry| entry.ok()) {
-        let path = entry.path();
+    let tag = tagged_file
+        .primary_tag()
+        .or_else(|| tagged_file.first_tag());
 
-        if !path.is_file() || !is_supported_audio_file(path) {
-            continue;
-        }
+    let cover = tag
+        .and_then(|t| t.pictures().first())
+        .map(|pic| {
+            let b64_encoded = general_purpose::STANDARD.encode(pic.data());
+            let mime_type = pic
+                .mime_type()
+                .map(|m| m.as_str())
+                .unwrap_or("image/jpeg");
 
-        if let Some(track) = parse_single_track(path) {
-            playlist.push(track);
-        }
-    }
+            format!("data:{};base64,{}", mime_type, b64_encoded)
+        });
 
-    save_music_library(&app_handle, &playlist)?;
+    Ok(cover)
+}
 
-    Ok(playlist)
+#[command]
+pub fn scan_music_directories(
+    app_handle: tauri::AppHandle,
+    dirs: Vec<String>,
+) -> Result<Vec<Track>, String> {
+    let tracks = execute_scan(dirs)?;
+    save_music_library(&app_handle, &tracks)?;
+    Ok(tracks)
 }
 
 #[command]
@@ -119,12 +146,7 @@ pub async fn load_music_library(
     let app_data_path = app_handle
         .path()
         .app_data_dir()
-        .map_err(|e| format!("无法获取数据目录: {}", e))?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path)
-            .map_err(|e| format!("创建数据目录失败: {}", e))?;
-    }
+        .map_err(|e| e.to_string())?;
 
     let json_file_path = app_data_path.join("library.json");
 
@@ -132,28 +154,12 @@ pub async fn load_music_library(
         return rebuild_and_get_library(&app_handle).await;
     }
 
-    let file = File::open(&json_file_path)
-        .map_err(|e| format!("无法打开库文件: {}", e))?;
+    let file = File::open(&json_file_path).map_err(|e| e.to_string())?;
 
     match serde_json::from_reader::<_, Vec<Track>>(file) {
-        Ok(mut library) => {
-            let had_covers = library.iter().any(|track| track.cover.is_some());
-
-            if had_covers {
-                for track in &mut library {
-                    track.cover = None;
-                }
-
-                save_music_library(&app_handle, &library)?;
-            }
-
-            Ok(library)
-        }
-        Err(error) => {
-            println!("[load_music_library] JSON 解析失败，准备重建: {}", error);
-
-            let _ = fs::remove_file(json_file_path);
-
+        Ok(library) => Ok(library),
+        Err(_) => {
+            let _ = fs::remove_file(&json_file_path);
             rebuild_and_get_library(&app_handle).await
         }
     }
@@ -162,38 +168,18 @@ pub async fn load_music_library(
 async fn rebuild_and_get_library(
     app_handle: &tauri::AppHandle,
 ) -> Result<Vec<Track>, String> {
-    let fresh_library = scan_music_directory_logic(app_handle).await?;
-
-    save_music_library(app_handle, &fresh_library)?;
-
-    Ok(fresh_library)
-}
-
-pub fn save_music_library(
-    app_handle: &tauri::AppHandle,
-    library: &[Track],
-) -> Result<(), String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("{}", e))?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path)
-            .map_err(|e| format!("创建数据目录失败: {}", e))?;
-    }
-
-    let json_file_path = app_data_path.join("library.json");
-    let temp_file_path = app_data_path.join("library.json.tmp");
-
-    let json_str = serde_json::to_string_pretty(library)
-        .map_err(|e| format!("{}", e))?;
-
-    fs::write(&temp_file_path, json_str)
-        .map_err(|e| format!("{}", e))?;
-
-    fs::rename(temp_file_path, json_file_path)
-        .map_err(|e| format!("{}", e))?;
+    let settings: AppSettings = load_settings(app_handle.clone()).await?;
+
+    let tracks = tauri::async_runtime::spawn_blocking({
+        let handle = app_handle.clone();
+        move || {
+            let res = execute_scan(settings.library_dirs)?;
+            save_music_library(&handle, &res)?;
+            Ok::<Vec<Track>, String>(res)
+        }
+    })
+    .await
+    .map_err(|e| e.to_string())??;
 
-    Ok(())
+    Ok(tracks)
 }
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 087af21..37ef9b7 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -3,12 +3,12 @@ mod commands;
 mod metadata;
 mod models;
 
-use std::thread;
-
 use commands::library::{
     get_track_cover,
+    save_music_library,
     load_music_library,
-    scan_music_directory,
+    execute_scan,
+    scan_music_directories,
 };
 
 use commands::playback::{
@@ -29,40 +29,49 @@ use commands::settings::{
     load_settings,
     save_settings,
 };
+use tauri::Emitter;
 
-fn scan_media_libraries(dirs: Vec<String>) {
-    println!("开始扫描以下目录中的音乐文件: {:?}", dirs);
-    // 扫描
-    
+pub fn init_startup_scan(app_handle: tauri::AppHandle) {
+    tauri::async_runtime::spawn(async move {
+        if let Ok(settings) = crate::commands::settings::load_settings(app_handle.clone()).await {
+            if settings.scan_on_startup {
+                if let Ok(tracks) = crate::commands::library::execute_scan(settings.library_dirs) {
+                    let _ = crate::commands::library::save_music_library(&app_handle, &tracks);
+                }
+            }
+        }
+    });
 }
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
-        // .plugin(tauri_plugin_opener::init())
-        // .setup(|app| {
-        //     let app_handle = app.handle().clone();
-            
-        //     thread::spawn(move || {
-        //         let scan_on_startup = true;
-        //         let library_dirs = vec![String::from("D:/Music")];
-
-        //         if scan_on_startup && !library_dirs.is_empty() {
-        //             scan_media_libraries(library_dirs);
-        //             // app_handle.emit("scan-finished", "success").unwrap();
-        //         }
-        //     });
-
-        //     Ok(())
-        // })
+        .setup(|app| {
+            let handle = app.handle().clone();
+            tauri::async_runtime::spawn(async move {
+                if let Ok(settings) = load_settings(handle.clone()).await {
+                    if settings.scan_on_startup {
+                        let _ = tauri::async_runtime::spawn_blocking(move || {
+                            if let Ok(tracks) = execute_scan(settings.library_dirs) {
+                                if save_music_library(&handle, &tracks).is_ok() {
+                                    let _ = handle.emit("library:refreshed", tracks);
+                                }
+                            }
+                        })
+                        .await;
+                    }
+                }
+            });
+            Ok(())
+        })
         .invoke_handler(tauri::generate_handler![
             play_music,
             toggle_music,
             current_time,
             set_current_time,
             set_volume,
-            scan_music_directory,
+            scan_music_directories,
             load_music_library,
             get_track_cover,
             load_recently_played,
diff --git a/src/app.css b/src/app.css
index 407ca74..c6a14df 100644
--- a/src/app.css
+++ b/src/app.css
@@ -6,6 +6,7 @@
 @import 'material-symbols';
 
 @layer base {
+  
   * {
     transition: all 0.2s ease;
   }
@@ -57,6 +58,7 @@
     font-feature-settings: --theme(--default-font-feature-settings, normal); /* 5 */
     font-variation-settings: --theme(--default-font-variation-settings, normal); /* 6 */
     -webkit-tap-highlight-color: transparent; /* 7 */
+    background-color: theme(--color-gray-100);
   }
 
   /*
diff --git a/src/lib/features/shell/NavRail.svelte b/src/lib/features/shell/NavRail.svelte
index 2caca44..b051f36 100644
--- a/src/lib/features/shell/NavRail.svelte
+++ b/src/lib/features/shell/NavRail.svelte
@@ -1,77 +1,78 @@
 <script lang="ts">
-    import { musicLibrary } from '$lib/state/library.svelte'
-    import { player } from '$lib/state/player.svelte'
-    import type { Track } from '$lib/types'
-    import { invoke } from '@tauri-apps/api/core'
-    import { open } from '@tauri-apps/plugin-dialog'
-    import 'mdui/components/navigation-rail-item.js'
-    import 'mdui/components/navigation-rail.js'
+    import { page } from '$app/state'
 
-    async function importMusicFolder(): Promise<Track[] | undefined> {
-        const selectedDir = await open({
-            directory: true,
-            multiple: false,
-            title: '选择你的音乐库文件夹',
-        })
+    import { importMusicDirectory } from '$lib/utils/library'
 
-        if (!selectedDir) {
-            console.error('音频文件不存在或已被移动')
-            return
-        }
-
-        try {
-            const tracks: Track[] = await invoke('scan_music_directory', {
-                dirPath: selectedDir,
-            })
+    import 'mdui/components/navigation-rail-item.js'
+    import 'mdui/components/navigation-rail.js'
 
-            console.log(`成功扫描到 ${tracks.length} 首歌曲！`, tracks)
-            return tracks
-        } catch (err) {
-            console.error('扫描音乐文件夹失败:', err)
-        }
+    type NavItem = {
+        label: string
+        href: string
+        icon: string
+        slot?: 'bottom'
     }
 
-    async function imoprtMusic() {
-        const playlist = await importMusicFolder()
-        if (!playlist) return
-
-        player.playlist = playlist
-        player.playByIndex(0)
+    const navItems: NavItem[] = [
+        {
+            label: 'Recent',
+            href: '/recent',
+            icon: 'watch_later--outlined',
+        },
+        {
+            label: 'Library',
+            href: '/library',
+            icon: 'library_music--outlined',
+        },
+        {
+            label: 'Album',
+            href: '/album',
+            icon: 'track_changes--outlined',
+        },
+        {
+            label: 'Artist',
+            href: '/artists',
+            icon: 'person--outlined',
+        },
+        {
+            label: 'Settings',
+            href: '/settings',
+            icon: 'settings--outlined',
+            slot: 'bottom',
+        },
+    ]
 
-        musicLibrary.tracks = playlist
-    }
+    const currentRoute = $derived.by(() => {
+        return (
+            navItems.find(item => page.url.pathname.startsWith(item.href))
+                ?.href ?? '/library'
+        )
+    })
 </script>
 
-<mdui-navigation-rail style="--z-index: 1">
+<mdui-navigation-rail style="--z-index: 1" value={currentRoute}>
     <mdui-fab
         lowered
         icon="playlist_add--rounded"
         slot="top"
-        onclick={imoprtMusic}
+        onclick={importMusicDirectory}
         onkeydown={(e: KeyboardEvent) => {
-            if (e.key === 'Enter' || e.key === ' ') imoprtMusic()
+            if (e.key === 'Enter' || e.key === ' ') {
+                importMusicDirectory()
+            }
         }}
         role="button"
         tabindex="0"
     ></mdui-fab>
-    <!-- <mdui-button-icon icon="settings" slot="bottom"></mdui-button-icon> -->
-
-    <mdui-navigation-rail-item icon="watch_later--outlined" href="/recent"
-        >Recent</mdui-navigation-rail-item
-    >
-    <mdui-navigation-rail-item icon="library_music--outlined" href="/library"
-        >Library</mdui-navigation-rail-item
-    >
-    <mdui-navigation-rail-item icon="track_changes--outlined" href="/album"
-        >Album</mdui-navigation-rail-item
-    >
-    <mdui-navigation-rail-item icon="person--outlined" href="/artists"
-        >Artist</mdui-navigation-rail-item
-    >
 
-    <mdui-navigation-rail-item
-        icon="settings--outlined"
-        href="/settings"
-        slot="bottom">Settings</mdui-navigation-rail-item
-    >
+    {#each navItems as item}
+        <mdui-navigation-rail-item
+            value={item.href}
+            href={item.href}
+            icon={item.icon}
+            slot={item.slot}
+        >
+            {item.label}
+        </mdui-navigation-rail-item>
+    {/each}
 </mdui-navigation-rail>
diff --git a/src/lib/state/library.svelte.ts b/src/lib/state/library.svelte.ts
index 6cd0b26..94bf84f 100644
--- a/src/lib/state/library.svelte.ts
+++ b/src/lib/state/library.svelte.ts
@@ -1,5 +1,6 @@
 import { invoke } from '@tauri-apps/api/core'
 import type { Track } from '../types/music'
+import { settings } from './settings.svelte'
 
 class MusicLibrary {
     tracks = $state<Track[]>([])
@@ -8,7 +9,7 @@ class MusicLibrary {
 
     private refreshPromise: Promise<Track[]> | null = null
 
-    async refresh(options: { force?: boolean } = {}): Promise<Track[]> {
+    async load(options: { force?: boolean } = {}): Promise<Track[]> {
         const { force = false } = options
 
         if (this.refreshPromise) {
@@ -39,6 +40,32 @@ class MusicLibrary {
 
         return this.refreshPromise
     }
+
+    async scan(): Promise<Track[]> {
+        try {
+            this.isLoading = true
+            this.error = null
+
+            const tracks = await invoke<Track[]>(
+                'scan_music_directories',
+                {
+                    dirs: settings.data.libraryDirs,
+                }
+            )
+
+            this.tracks = tracks
+
+            return tracks
+        } catch (err) {
+            console.error('扫描媒体库失败:', err)
+
+            this.error = String(err)
+
+            return this.tracks
+        } finally {
+            this.isLoading = false
+        }
+    }
 }
 
 export const musicLibrary = new MusicLibrary()
\ No newline at end of file
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index de86076..8e804df 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -2,57 +2,207 @@ import { invoke } from "@tauri-apps/api/core"
 import type { Track } from "../types/music"
 import { recentlyPlayed } from "./recent.svelte"
 
+type PlayMode = 'list' | 'single' | 'shuffle'
+
+interface QueueSource {
+    type: 'album' | 'playlist' | 'search' | 'artist' | 'local'
+    id: string
+}
 
 class Player {
+    queue = $state<Track[]>([])
     currentIndex = $state<number>(-1)
-    playing = $state(false)
-    playlist = $state<any[]>([])
-    currentTime = $state(0)
-    muted = $state(false)
-
-    currentTrack = $derived<Track | null>(
-        this.currentIndex >= 0 && this.currentIndex < this.playlist.length
-            ? this.playlist[this.currentIndex]
-            : null
-    )
-    // duration = $derived(this.currentTrack?.duration ?? 0)
-
-    #volume = $state(80);
+    playing = $state<boolean>(false)
+    currentTime = $state<number>(0)
+    playMode = $state<PlayMode>('list')
+    queueSource = $state<QueueSource | null>(null)
+    playbackHistory: string[] = []
+    #muted = $state<boolean>(false)
+    #volume = $state<number>(80)
+    #previousVolume = 80
+    #pollTimer: any = null
+    private loadToken = 0
+
+    constructor() {}
+
+    get currentTrack(): Track | null {
+        if (this.currentIndex >= 0 && this.currentIndex < this.queue.length) {
+            return this.queue[this.currentIndex]
+        }
+        return null
+    }
+
     get volume() { return this.#volume }
     set volume(volume: number) {
         this.#volume = volume
+        if (volume > 0) {
+            this.#muted = false
+        }
         invoke('set_volume', { volume }).catch(console.error)
     }
 
-    #pollTimer: any = null
+    get muted() { return this.#muted }
+    set muted(value: boolean) {
+        this.#muted = value
+        if (value) {
+            this.#previousVolume = this.#volume
+            this.#volume = 0
+            invoke('set_volume', { volume: 0 }).catch(console.error)
+        } else {
+            this.#volume = this.#previousVolume
+            invoke('set_volume', { volume: this.#previousVolume }).catch(console.error)
+        }
+    }
 
-    startPolling = () => {
-        this.stopPolling()
-        this.#pollTimer = setInterval(async () => {
-            if (!this.playing) {
-                this.stopPolling()
-                return
+    replaceQueueAndPlay(tracks: Track[], targetId: string, source: QueueSource | null = null) {
+        if (tracks.length === 0) {
+            this.queue = []
+            this.currentIndex = -1
+            this.playing = false
+            this.queueSource = null
+            this.playbackHistory = []
+            this.stopPolling()
+            invoke('toggle_music').catch(console.error)
+            return
+        }
+
+        const nextQueue = [...tracks]
+        const index = nextQueue.findIndex(t => t.id === targetId)
+        const nextIndex = index !== -1 ? index : 0
+
+        this.playbackHistory = []
+        this.queue = nextQueue
+        this.queueSource = source
+        this.currentIndex = nextIndex
+        void this.loadAndPlay()
+    }
+
+    appendTrack(track: Track) {
+        if (this.queue.some(t => t.id === track.id)) return
+        this.queue = [...this.queue, track]
+    }
+
+    insertNext(track: Track) {
+        const existingIndex = this.queue.findIndex(item => item.id === track.id)
+        if (existingIndex === this.currentIndex && this.currentIndex !== -1) {
+            return
+        }
+
+        let nextQueue = [...this.queue]
+        let nextIndex = this.currentIndex
+
+        if (existingIndex !== -1) {
+            nextQueue.splice(existingIndex, 1)
+            if (existingIndex < nextIndex) {
+                nextIndex--
             }
-            this.currentTime = await invoke('current_time')
-            if (this.currentTrack && this.currentTime >= this.currentTrack.duration) {
-                this.next()
+        }
+
+        if (nextQueue.length === 0 || nextIndex === -1) {
+            this.queue = [track]
+            this.currentIndex = 0
+            return
+        }
+
+        nextQueue.splice(nextIndex + 1, 0, track)
+        this.queue = nextQueue
+        this.currentIndex = nextIndex
+    }
+
+    removeTrack(id: string) {
+        const removeIndex = this.queue.findIndex(t => t.id === id)
+        if (removeIndex === -1) return
+
+        const isCurrent = removeIndex === this.currentIndex
+        const nextQueue = this.queue.filter(t => t.id !== id)
+
+        if (nextQueue.length === 0) {
+            this.queue = []
+            this.currentIndex = -1
+            this.playing = false
+            this.queueSource = null
+            this.playbackHistory = []
+            this.stopPolling()
+            invoke('toggle_music').catch(console.error)
+            return
+        }
+
+        if (isCurrent) {
+            const nextIndex = Math.min(removeIndex, nextQueue.length - 1)
+            this.queue = nextQueue
+            this.currentIndex = nextIndex
+            void this.loadAndPlay()
+            return
+        }
+
+        let nextIndex = this.currentIndex
+        if (removeIndex < nextIndex) {
+            nextIndex--
+        }
+        this.queue = nextQueue
+        this.currentIndex = nextIndex
+    }
+
+    private getNextIndex(): number {
+        if (this.queue.length <= 1) return 0
+        if (this.playMode === 'shuffle') {
+            let nextIndex = this.currentIndex
+            while (nextIndex === this.currentIndex) {
+                nextIndex = Math.floor(Math.random() * this.queue.length)
             }
-        }, 250)
+            return nextIndex
+        }
+        return this.currentIndex >= this.queue.length - 1 ? 0 : this.currentIndex + 1
     }
 
-    stopPolling = () => {
-        if (this.#pollTimer) {
-            clearInterval(this.#pollTimer)
-            this.#pollTimer = null
+    private getPrevIndex(): number {
+        if (this.queue.length <= 1) return 0
+        if (this.playMode === 'shuffle') {
+            let prevIndex = this.currentIndex
+            while (prevIndex === this.currentIndex) {
+                prevIndex = Math.floor(Math.random() * this.queue.length)
+            }
+            return prevIndex
+        }
+        return this.currentIndex <= 0 ? this.queue.length - 1 : this.currentIndex - 1
+    }
+
+    next() {
+        if (this.queue.length === 0) return
+        const current = this.currentTrack
+        if (current) {
+            this.playbackHistory.push(current.id)
         }
+        this.currentIndex = this.getNextIndex()
+        void this.loadAndPlay()
+    }
+
+    prev() {
+        if (this.queue.length === 0) return
+        if (this.playbackHistory.length > 0) {
+            const lastId = this.playbackHistory.pop()
+            const index = this.queue.findIndex(t => t.id === lastId)
+            if (index !== -1) {
+                this.currentIndex = index
+                void this.loadAndPlay()
+                return
+            }
+        }
+        this.currentIndex = this.getPrevIndex()
+        void this.loadAndPlay()
     }
 
     toggle = async () => {
-        this.playing = await invoke('toggle_music')
-        if (this.playing) {
-            this.startPolling()
-        } else {
-            this.stopPolling()
+        try {
+            const isPlayingNow = await invoke<boolean>('toggle_music')
+            this.playing = isPlayingNow
+            if (this.playing) {
+                this.startPolling()
+            } else {
+                this.stopPolling()
+            }
+        } catch (err) {
+            console.error(err)
         }
     }
 
@@ -63,40 +213,69 @@ class Player {
         if (this.playing) this.startPolling()
     }
 
-    playByIndex = async (index: number) => {
-        if (index < 0 || index >= this.playlist.length) return
+    private async loadAndPlay() {
+        const track = this.currentTrack
+        if (!track) return
+
+        const currentToken = ++this.loadToken
+        this.stopPolling()
 
         try {
-            const track = this.playlist[index]
+            this.currentTime = 0
+            if (track.path) {
+                await invoke('play_music', { fullPath: track.path })
+            } else {
+                await invoke('play_online_music', { url: track.url, id: track.id })
+            }
 
-            if (!track) {
+            if (currentToken !== this.loadToken) {
                 return
             }
-            
-            this.currentIndex = index
-            this.currentTime = 0
-            this.playing = true
-            await invoke('play_music', { fullPath: track.path })
 
+            this.playing = true
             recentlyPlayed.add(track)
-
             this.startPolling()
         } catch (err) {
-            console.error('切换歌曲失败:', err)
+            if (currentToken === this.loadToken) {
+                this.playing = false
+                console.error(err)
+            }
         }
     }
 
-    switchTrack = async (step: number) => {
-        const len = this.playlist.length
-        if (len === 0) return
-        
+    private startPolling = () => {
         this.stopPolling()
-        const newIndex = (this.currentIndex + step + len) % len
-        this.playByIndex(newIndex)
+        this.#pollTimer = setInterval(async () => {
+            if (!this.playing) {
+                this.stopPolling()
+                return
+            }
+            try {
+                this.currentTime = await invoke<number>('current_time')
+                if (this.currentTrack && this.currentTime >= this.currentTrack.duration - 0.5) {
+                    if (this.playMode === 'single') {
+                        this.currentTime = 0
+                        void this.loadAndPlay()
+                    } else {
+                        this.next()
+                    }
+                }
+            } catch (e) {
+                this.stopPolling()
+            }
+        }, 250)
     }
 
-    next = () => this.switchTrack(1)
-    prev = () => this.switchTrack(-1)
+    private stopPolling = () => {
+        if (this.#pollTimer) {
+            clearInterval(this.#pollTimer)
+            this.#pollTimer = null
+        }
+    }
+
+    destroy() {
+        this.stopPolling()
+    }
 }
 
 export const player = new Player()
\ No newline at end of file
diff --git a/src/lib/utils/library.ts b/src/lib/utils/library.ts
new file mode 100644
index 0000000..047dd30
--- /dev/null
+++ b/src/lib/utils/library.ts
@@ -0,0 +1,26 @@
+import { musicLibrary } from '$lib/state/library.svelte'
+import { settings } from '$lib/state/settings.svelte'
+import { open } from '@tauri-apps/plugin-dialog'
+
+export async function importMusicDirectory() {
+    try {
+        const selected = await open({
+            directory: true,
+            multiple: false,
+            title: '选择音乐媒体库目录',
+        })
+
+        if (!selected || typeof selected !== 'string') return
+
+        settings.addLibraryDir(selected)
+
+        await musicLibrary.scan()
+    } catch (err) {
+        console.error('导入音乐媒体库目录失败:', err)
+    }
+}
+
+export async function removeMusicDirectory(dir: string) {
+    settings.removeLibraryDir(dir)
+    await musicLibrary.scan()
+}
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 2f9d97e..2b88139 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,7 +2,9 @@
     import PlayerBar from '$lib/features/PlayerBar.svelte'
     import Appbar from '$lib/features/shell/Appbar.svelte'
     import NavRail from '$lib/features/shell/NavRail.svelte'
+    import { musicLibrary } from '$lib/state/library.svelte'
     import { settings } from '$lib/state/settings.svelte'
+    import { listen } from '@tauri-apps/api/event'
     import 'mdui'
     import 'mdui/mdui.css'
     import { onMount } from 'svelte'
@@ -12,6 +14,15 @@
 
     onMount(() => {
         void settings.load()
+        onMount(() => {
+            const unlistenPromise = listen<any[]>("library:refreshed", (event) => {
+                musicLibrary.tracks = event.payload
+            })
+
+            return () => {
+                void unlistenPromise.then((unlisten) => unlisten())
+            }
+        })
     })
 
     $effect(() => {
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 1b04546..02086ed 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -3,5 +3,19 @@
 // See: https://svelte.dev/docs/kit/single-page-apps
 // See: https://v2.tauri.app/start/frontend/sveltekit/ for more info
 
+import { musicLibrary } from '$lib/state/library.svelte'
+import { recentlyPlayed } from '$lib/state/recent.svelte'
+import { settings } from '$lib/state/settings.svelte'
+
 export const prerender = true
 export const ssr = false
+export async function load() {
+    await settings.load()
+
+    await Promise.all([
+        recentlyPlayed.load(),
+        musicLibrary.load(),
+    ])
+
+    return {}
+}
\ No newline at end of file
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
deleted file mode 100644
index 0b72a39..0000000
--- a/src/routes/+page.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-    import { goto } from '$app/navigation'
-    import { onMount } from 'svelte'
-
-    onMount(() => {
-        goto('/library', { replaceState: true })
-    })
-</script>
-
-<style lang="postcss">
-    @reference "tailwindcss";
-    @layer base {
-        :global(html) {
-            background-color: theme(--color-gray-100);
-        }
-    }
-</style>
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
new file mode 100644
index 0000000..dca901d
--- /dev/null
+++ b/src/routes/+page.ts
@@ -0,0 +1,5 @@
+import { redirect } from '@sveltejs/kit'
+
+export async function load() {
+    redirect(307, '/library')
+}
\ No newline at end of file
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 7c4cb58..9cd9bb8 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -6,7 +6,6 @@
     import { trackCovers } from '$lib/state/covers.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import type { Album, Track } from '$lib/types'
-    import { onMount } from 'svelte'
 
     import 'mdui/components/circular-progress.js'
 
@@ -20,10 +19,6 @@
         sensitivity: 'base',
     })
 
-    onMount(() => {
-        void musicLibrary.refresh()
-    })
-
     function createAlbumId(title: string) {
         return encodeURIComponent(title)
     }
@@ -118,7 +113,7 @@
     <Heading eyebrow="Albums" title="专辑">
         <Button
             variant="outlined"
-            onclick={() => musicLibrary.refresh({ force: true })}
+            onclick={() => musicLibrary.scan()}
         >
             刷新
         </Button>
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index 2dc8557..ebc9645 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -2,7 +2,6 @@
     import MediaGrid from '$lib/components/media/MediaGrid.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import type { Artist, Track } from '$lib/types'
-    import { onMount } from 'svelte'
 
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
@@ -19,11 +18,7 @@
         numeric: true,
         sensitivity: 'base',
     })
-
-    onMount(() => {
-        void musicLibrary.refresh()
-    })
-
+    
     function createArtistId(name: string) {
         return encodeURIComponent(name)
     }
@@ -115,7 +110,7 @@
     <Heading eyebrow="artist" title="艺术家">
         <Button
             variant="outlined"
-            onclick={() => musicLibrary.refresh({ force: true })}
+            onclick={() => musicLibrary.scan()}
         >
             刷新
         </Button>
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index 8e845ad..f9981cb 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -3,7 +3,6 @@
     import { musicLibrary } from '$lib/state/library.svelte'
     import { player } from '$lib/state/player.svelte'
     import type { Track } from '$lib/types'
-    import { onMount } from 'svelte'
 
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
@@ -21,10 +20,6 @@
         sensitivity: 'base',
     })
 
-    onMount(() => {
-        void musicLibrary.refresh()
-    })
-
     let filteredTracks = $derived.by(() => {
         const keyword = query.trim().toLowerCase()
 
@@ -48,8 +43,7 @@
     function playAll() {
         if (filteredTracks.length === 0) return
 
-        player.playlist = filteredTracks
-        void player.playByIndex(0)
+        player.replaceQueueAndPlay(filteredTracks, filteredTracks[0].id)
     }
 </script>
 
@@ -70,7 +64,7 @@
 
             <Button
                 variant="outlined"
-                onclick={() => musicLibrary.refresh({ force: true })}
+                onclick={() => musicLibrary.scan()}
             >
                 刷新
             </Button>
diff --git a/src/routes/recent/+page.svelte b/src/routes/recent/+page.svelte
index 3a45c23..c12e543 100644
--- a/src/routes/recent/+page.svelte
+++ b/src/routes/recent/+page.svelte
@@ -1,16 +1,11 @@
 <script lang="ts">
     import TrackList from '$lib/features/TrackList.svelte'
     import { recentlyPlayed } from '$lib/state/recent.svelte'
-    import { onMount } from 'svelte'
 
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
-
-    onMount(() => {
-        void recentlyPlayed.load()
-    })
 </script>
 
 <svelte:head>
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index b9b3844..b5554e3 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -9,14 +9,13 @@
     import SettingsSection from '$lib/features/settings/SettingsSection.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import type { ThemeMode } from '$lib/types'
+    import { importMusicDirectory, removeMusicDirectory } from '$lib/utils/library'
     import { onMount } from 'svelte'
 
-    import { open } from '@tauri-apps/plugin-dialog'
+    import { setTheme } from '@tauri-apps/api/app'
     import 'mdui/components/circular-progress.js'
     import 'mdui/components/switch.js'
-    import { setTheme } from 'mdui/functions/setTheme.js'
-
-    let newLibraryDir = $state('')
+    import { setTheme as setMduiTheme } from 'mdui/functions/setTheme.js'
 
     const themeOptions: { label: string; value: ThemeMode }[] = [
         { label: '跟随系统', value: 'auto' },
@@ -29,11 +28,6 @@
         void settings.load()
     })
 
-    function addLibraryDir() {
-        settings.addLibraryDir(newLibraryDir)
-        newLibraryDir = ''
-    }
-
     function handleSwitchChange(
         event: Event,
         key: 'scanOnStartup' | 'reduceMotion',
@@ -47,20 +41,18 @@
         })
     }
 
-    async function handleSelectDirectory() {
-        try {
-            const selected = await open({
-                directory: true,
-                multiple: false,
-                title: '选择音乐媒体库目录',
-            })
-
-            if (selected && typeof selected === 'string') {
-                settings.addLibraryDir(selected)
-            }
-        } catch (err) {
-            console.error('打开文件夹选择器失败:', err)
-        }
+    export async function setThemeMode(theme: ThemeMode) {
+        settings.update({
+            theme,
+        })
+
+        await applyTheme(theme)
+    }
+
+    export async function applyTheme(theme: ThemeMode) {
+        setMduiTheme(theme)
+
+        await setTheme(theme === 'auto' ? null : theme)
     }
 </script>
 
@@ -85,12 +77,7 @@
                     <Select
                         value={settings.data?.theme}
                         options={themeOptions}
-                        onchange={value => {
-                            settings.update({
-                                theme: value as ThemeMode,
-                            })
-                            setTheme(value as ThemeMode)
-                        }}
+                        onchange={value => setThemeMode(value as ThemeMode)}
                     />
                 </div>
             </SettingsRow>
@@ -126,8 +113,8 @@
                 </div>
 
                 <div class="flex">
-                    <Button variant="tonal" onclick={handleSelectDirectory}>
-                        选择本地文件夹
+                    <Button variant="tonal" onclick={importMusicDirectory}>
+                        添加本地文件夹
                     </Button>
                 </div>
 
@@ -138,7 +125,7 @@
                                 <Button
                                     variant="text"
                                     onclick={() =>
-                                        settings.removeLibraryDir(dir)}
+                                        removeMusicDirectory(dir)}
                                 >
                                     <span class="text-red-500">移除</span>
                                 </Button>

From 45cc9c5d39c9d39427807f4562d3ed490e238aaa Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Thu, 28 May 2026 20:45:55 +0800
Subject: [PATCH 14/39] feat(player): extend Track model with id/url and
 implement playback queue

- Add unique `id` and Tauri-compatible `url` fields to `Track` schema
- Implement core playback queue data structure to manage track order and navigation
- Prepare state definitions for upcoming `player:queue-updated` event synchronization
---
 src-tauri/src/metadata.rs         |  3 ++-
 src-tauri/src/models/mod.rs       |  2 +-
 src-tauri/src/models/track.rs     |  9 +++++++++
 src/lib/features/TrackList.svelte | 14 ++++++--------
 src/lib/types/music.ts            |  2 ++
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src-tauri/src/metadata.rs b/src-tauri/src/metadata.rs
index a9a5431..3501b7d 100644
--- a/src-tauri/src/metadata.rs
+++ b/src-tauri/src/metadata.rs
@@ -4,7 +4,7 @@ use lofty::prelude::*;
 use lofty::probe::Probe;
 use lofty::tag::ItemKey;
 
-use crate::models::Track;
+use crate::models::{generate_track_id, Track};
 
 pub fn parse_single_track(file_path: &Path) -> Option<Track> {
     let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
@@ -47,6 +47,7 @@ pub fn parse_single_track(file_path: &Path) -> Option<Track> {
     let sample_rate = props.sample_rate();
 
     Some(Track {
+        id: generate_track_id(&file_path.to_string_lossy()),
         title,
         artist,
         album,
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
index 6234cc8..db7612e 100644
--- a/src-tauri/src/models/mod.rs
+++ b/src-tauri/src/models/mod.rs
@@ -1,4 +1,4 @@
 pub mod settings;
 pub mod track;
 
-pub use track::Track;
\ No newline at end of file
+pub use track::{generate_track_id, Track};
\ No newline at end of file
diff --git a/src-tauri/src/models/track.rs b/src-tauri/src/models/track.rs
index a2a2514..8c3ef54 100644
--- a/src-tauri/src/models/track.rs
+++ b/src-tauri/src/models/track.rs
@@ -1,8 +1,11 @@
+use std::hash::{Hash, Hasher};
+
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Track {
+    pub id: String,
     pub title: String,
     pub artist: String,
     pub album: String,
@@ -12,3 +15,9 @@ pub struct Track {
     pub cover: Option<String>,
     pub path: String,
 }
+
+pub fn generate_track_id(path: &str) -> String {
+    let mut hasher = std::collections::hash_map::DefaultHasher::new();
+    path.hash(&mut hasher);
+    format!("{:x}", hasher.finish())
+}
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 05e010f..1fa9b76 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -37,9 +37,8 @@
         }
     }
 
-    function handlePlay(clickedTrack: Track, clickedIndex: number) {
-        player.playlist = tracks
-        player.playByIndex(clickedIndex)
+    function handlePlay(clickedTrack: Track) {
+        player.replaceQueueAndPlay(tracks, clickedTrack.id)
 
         void trackCovers.load(clickedTrack)
     }
@@ -138,15 +137,14 @@
 {/snippet}
 
 {#snippet trackItem(track: Track, index: number)}
-    {@const isCurrent =
-        player.playlist[player.currentIndex]?.path === track.path}
+    {@const isCurrent = player.currentTrack?.id === track.id}
     {@const cover = trackCovers.get(track)}
 
     <mdui-list-item
         class="group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none
              active:scale-[0.995] themed-item
              {isCurrent ? 'themed-item-active' : ''}"
-        ondblclick={() => handlePlay(track, index)}
+        ondblclick={() => handlePlay(track)}
         role="button"
         tabindex="0"
     >
@@ -201,9 +199,9 @@
         color: rgb(var(--mdui-color-primary));
     }
 
-    .themed-border {
+    /* .themed-border {
         border-color: rgb(var(--mdui-color-outline-variant));
-    }
+    } */
 
     .themed-border-b {
         border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
diff --git a/src/lib/types/music.ts b/src/lib/types/music.ts
index e915e05..663907c 100644
--- a/src/lib/types/music.ts
+++ b/src/lib/types/music.ts
@@ -1,4 +1,5 @@
 export interface Track {
+    id: string
     title: string
     artist: string
     album: string
@@ -7,6 +8,7 @@ export interface Track {
     sampleRate?: number | null
     cover?: string | null
     path: string
+    url?: string
 }
 
 export interface Playlist {

From 4cecbb2492f0b4bdee8dbcf5ce98df04b9232d2c Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sat, 30 May 2026 16:55:04 +0800
Subject: [PATCH 15/39] refactor: simplify state architecture and isolate
 player playlist

refactor: simplify state architecture and isolate player playlist

- Rename `queue` to `playlist` in `Player` state to clarify domain boundaries
- Move `library:refreshed` event listener into `MusicLibrary` constructor for better encapsulation
- Remove `builtin.ts` and decouple core modules from the extension registry
- Streamline main `onMount` initialization to focus solely on cache loading
---
 src-tauri/Cargo.toml                  |  2 +-
 src-tauri/src/lib.rs                  | 62 +++++++++++++++++----------
 src/lib/extensions/builtin.ts         | 45 -------------------
 src/lib/extensions/registry.svelte.ts | 48 ---------------------
 src/lib/features/TrackList.svelte     |  2 +-
 src/lib/state/library.svelte.ts       | 16 +++++++
 src/lib/state/player.svelte.ts        | 61 +++++++++++---------------
 src/routes/+layout.svelte             | 11 +----
 src/routes/library/+page.svelte       |  2 +-
 src/routes/settings/+page.svelte      | 26 -----------
 10 files changed, 86 insertions(+), 189 deletions(-)
 delete mode 100644 src/lib/extensions/builtin.ts
 delete mode 100644 src/lib/extensions/registry.svelte.ts

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 7a52231..083a934 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -18,7 +18,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 tauri-build = { version = "2", features = [] }
 
 [dependencies]
-tauri = { version = "2", features = [] }
+tauri = { version = "2", features = ["tray-icon"] }
 tauri-plugin-opener = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 37ef9b7..85ed046 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -2,34 +2,21 @@ mod audio;
 mod commands;
 mod metadata;
 mod models;
+use tauri::{
+    menu::{Menu, MenuItem},
+    tray::{MouseButton, TrayIconBuilder, TrayIconEvent},
+    Emitter, Manager,
+};
 
 use commands::library::{
-    get_track_cover,
-    save_music_library,
-    load_music_library,
-    execute_scan,
-    scan_music_directories,
+    execute_scan, get_track_cover, load_music_library, save_music_library, scan_music_directories,
 };
 
-use commands::playback::{
-    current_time,
-    play_music,
-    set_current_time,
-    set_volume,
-    toggle_music,
-};
+use commands::playback::{current_time, play_music, set_current_time, set_volume, toggle_music};
 
-use commands::recent::{
-    add_recently_played,
-    clear_recently_played,
-    load_recently_played,
-};
+use commands::recent::{add_recently_played, clear_recently_played, load_recently_played};
 
-use commands::settings::{
-    load_settings,
-    save_settings,
-};
-use tauri::Emitter;
+use commands::settings::{load_settings, save_settings};
 
 pub fn init_startup_scan(app_handle: tauri::AppHandle) {
     tauri::async_runtime::spawn(async move {
@@ -48,6 +35,37 @@ pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
         .setup(|app| {
+            let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
+            let menu = Menu::with_items(app, &[&quit_i])?;
+
+            let _tray = TrayIconBuilder::new()
+                .icon(app.default_window_icon().unwrap().clone())
+                .menu(&menu)
+                .show_menu_on_left_click(false)
+                .on_menu_event(|app: &tauri::AppHandle, event| match event.id.as_ref() {
+                    "quit" => {
+                        app.exit(0);
+                    }
+                    _ => {}
+                })
+                .on_tray_icon_event(|tray, event| match event {
+                    TrayIconEvent::Click {
+                        button: MouseButton::Left,
+                        ..
+                    } => {
+                        let app = tray.app_handle();
+                        if let Some(window) = app.get_webview_window("main") {
+                            let _ = window.unminimize();
+                            let _ = window.show();
+                            let _ = window.set_focus();
+                        }
+                    }
+                    _ => {
+                        println!("unhandled event {event:?}");
+                    }
+                })
+                .build(app)?;
+
             let handle = app.handle().clone();
             tauri::async_runtime::spawn(async move {
                 if let Ok(settings) = load_settings(handle.clone()).await {
diff --git a/src/lib/extensions/builtin.ts b/src/lib/extensions/builtin.ts
deleted file mode 100644
index 5a65d21..0000000
--- a/src/lib/extensions/builtin.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { extensionRegistry } from './registry.svelte'
-
-let registered = false
-
-export function registerBuiltinExtensions() {
-    if (registered) return
-
-    registered = true
-
-    extensionRegistry.register({
-        id: 'kino.library',
-        name: 'Library',
-        description: '媒体库基础功能',
-        navItems: [
-            {
-                id: 'tracks',
-                title: '歌曲',
-                icon: 'music_note--rounded',
-                href: '/tracks',
-                order: 10,
-            },
-            {
-                id: 'artists',
-                title: '歌手',
-                icon: 'person--rounded',
-                href: '/artists',
-                order: 20,
-            },
-            {
-                id: 'albums',
-                title: '专辑',
-                icon: 'album--rounded',
-                href: '/albums',
-                order: 30,
-            },
-            {
-                id: 'recent',
-                title: '最近播放',
-                icon: 'history--rounded',
-                href: '/recent',
-                order: 40,
-            },
-        ],
-    })
-}
\ No newline at end of file
diff --git a/src/lib/extensions/registry.svelte.ts b/src/lib/extensions/registry.svelte.ts
deleted file mode 100644
index 64edc69..0000000
--- a/src/lib/extensions/registry.svelte.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { AppExtension, ExtensionCommand, ExtensionNavItem } from '$lib/types'
-
-class ExtensionRegistry {
-    extensions = $state<AppExtension[]>([])
-
-    register(extension: AppExtension) {
-        if (this.extensions.some((item) => item.id === extension.id)) {
-            return
-        }
-
-        this.extensions = [
-            ...this.extensions,
-            {
-                enabled: true,
-                ...extension,
-            },
-        ]
-    }
-
-    setEnabled(id: string, enabled: boolean) {
-        this.extensions = this.extensions.map((extension) =>
-            extension.id === id
-                ? {
-                      ...extension,
-                      enabled,
-                  }
-                : extension,
-        )
-    }
-
-    get enabledExtensions() {
-        return this.extensions.filter((extension) => extension.enabled !== false)
-    }
-
-    get navItems(): ExtensionNavItem[] {
-        return this.enabledExtensions
-            .flatMap((extension) => extension.navItems ?? [])
-            .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
-    }
-
-    get commands(): ExtensionCommand[] {
-        return this.enabledExtensions.flatMap(
-            (extension) => extension.commands ?? [],
-        )
-    }
-}
-
-export const extensionRegistry = new ExtensionRegistry()
\ No newline at end of file
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 1fa9b76..5bdce29 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -38,7 +38,7 @@
     }
 
     function handlePlay(clickedTrack: Track) {
-        player.replaceQueueAndPlay(tracks, clickedTrack.id)
+        player.replacePlaylistAndPlay(tracks, clickedTrack.id)
 
         void trackCovers.load(clickedTrack)
     }
diff --git a/src/lib/state/library.svelte.ts b/src/lib/state/library.svelte.ts
index 94bf84f..78c8c01 100644
--- a/src/lib/state/library.svelte.ts
+++ b/src/lib/state/library.svelte.ts
@@ -1,4 +1,5 @@
 import { invoke } from '@tauri-apps/api/core'
+import { listen } from '@tauri-apps/api/event'
 import type { Track } from '../types/music'
 import { settings } from './settings.svelte'
 
@@ -7,8 +8,23 @@ class MusicLibrary {
     isLoading = $state(false)
     error = $state<string | null>(null)
 
+    initialized = false
+
     private refreshPromise: Promise<Track[]> | null = null
 
+    constructor() {
+        void this.setupListener()
+    }
+
+    private async setupListener() {
+        await listen<Track[]>(
+            'library:refreshed',
+            event => {
+                this.tracks = event.payload
+            },
+        )
+    }
+
     async load(options: { force?: boolean } = {}): Promise<Track[]> {
         const { force = false } = options
 
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 8e804df..248b319 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -4,18 +4,12 @@ import { recentlyPlayed } from "./recent.svelte"
 
 type PlayMode = 'list' | 'single' | 'shuffle'
 
-interface QueueSource {
-    type: 'album' | 'playlist' | 'search' | 'artist' | 'local'
-    id: string
-}
-
 class Player {
-    queue = $state<Track[]>([])
+    playlist = $state<Track[]>([])
     currentIndex = $state<number>(-1)
     playing = $state<boolean>(false)
     currentTime = $state<number>(0)
     playMode = $state<PlayMode>('list')
-    queueSource = $state<QueueSource | null>(null)
     playbackHistory: string[] = []
     #muted = $state<boolean>(false)
     #volume = $state<number>(80)
@@ -26,8 +20,8 @@ class Player {
     constructor() {}
 
     get currentTrack(): Track | null {
-        if (this.currentIndex >= 0 && this.currentIndex < this.queue.length) {
-            return this.queue[this.currentIndex]
+        if (this.currentIndex >= 0 && this.currentIndex < this.playlist.length) {
+            return this.playlist[this.currentIndex]
         }
         return null
     }
@@ -54,12 +48,11 @@ class Player {
         }
     }
 
-    replaceQueueAndPlay(tracks: Track[], targetId: string, source: QueueSource | null = null) {
+    replacePlaylistAndPlay(tracks: Track[], targetId: string) {
         if (tracks.length === 0) {
-            this.queue = []
+            this.playlist = []
             this.currentIndex = -1
             this.playing = false
-            this.queueSource = null
             this.playbackHistory = []
             this.stopPolling()
             invoke('toggle_music').catch(console.error)
@@ -71,24 +64,23 @@ class Player {
         const nextIndex = index !== -1 ? index : 0
 
         this.playbackHistory = []
-        this.queue = nextQueue
-        this.queueSource = source
+        this.playlist = nextQueue
         this.currentIndex = nextIndex
         void this.loadAndPlay()
     }
 
     appendTrack(track: Track) {
-        if (this.queue.some(t => t.id === track.id)) return
-        this.queue = [...this.queue, track]
+        if (this.playlist.some(t => t.id === track.id)) return
+        this.playlist = [...this.playlist, track]
     }
 
     insertNext(track: Track) {
-        const existingIndex = this.queue.findIndex(item => item.id === track.id)
+        const existingIndex = this.playlist.findIndex(item => item.id === track.id)
         if (existingIndex === this.currentIndex && this.currentIndex !== -1) {
             return
         }
 
-        let nextQueue = [...this.queue]
+        let nextQueue = [...this.playlist]
         let nextIndex = this.currentIndex
 
         if (existingIndex !== -1) {
@@ -99,28 +91,27 @@ class Player {
         }
 
         if (nextQueue.length === 0 || nextIndex === -1) {
-            this.queue = [track]
+            this.playlist = [track]
             this.currentIndex = 0
             return
         }
 
         nextQueue.splice(nextIndex + 1, 0, track)
-        this.queue = nextQueue
+        this.playlist = nextQueue
         this.currentIndex = nextIndex
     }
 
     removeTrack(id: string) {
-        const removeIndex = this.queue.findIndex(t => t.id === id)
+        const removeIndex = this.playlist.findIndex(t => t.id === id)
         if (removeIndex === -1) return
 
         const isCurrent = removeIndex === this.currentIndex
-        const nextQueue = this.queue.filter(t => t.id !== id)
+        const nextQueue = this.playlist.filter(t => t.id !== id)
 
         if (nextQueue.length === 0) {
-            this.queue = []
+            this.playlist = []
             this.currentIndex = -1
             this.playing = false
-            this.queueSource = null
             this.playbackHistory = []
             this.stopPolling()
             invoke('toggle_music').catch(console.error)
@@ -129,7 +120,7 @@ class Player {
 
         if (isCurrent) {
             const nextIndex = Math.min(removeIndex, nextQueue.length - 1)
-            this.queue = nextQueue
+            this.playlist = nextQueue
             this.currentIndex = nextIndex
             void this.loadAndPlay()
             return
@@ -139,36 +130,36 @@ class Player {
         if (removeIndex < nextIndex) {
             nextIndex--
         }
-        this.queue = nextQueue
+        this.playlist = nextQueue
         this.currentIndex = nextIndex
     }
 
     private getNextIndex(): number {
-        if (this.queue.length <= 1) return 0
+        if (this.playlist.length <= 1) return 0
         if (this.playMode === 'shuffle') {
             let nextIndex = this.currentIndex
             while (nextIndex === this.currentIndex) {
-                nextIndex = Math.floor(Math.random() * this.queue.length)
+                nextIndex = Math.floor(Math.random() * this.playlist.length)
             }
             return nextIndex
         }
-        return this.currentIndex >= this.queue.length - 1 ? 0 : this.currentIndex + 1
+        return this.currentIndex >= this.playlist.length - 1 ? 0 : this.currentIndex + 1
     }
 
     private getPrevIndex(): number {
-        if (this.queue.length <= 1) return 0
+        if (this.playlist.length <= 1) return 0
         if (this.playMode === 'shuffle') {
             let prevIndex = this.currentIndex
             while (prevIndex === this.currentIndex) {
-                prevIndex = Math.floor(Math.random() * this.queue.length)
+                prevIndex = Math.floor(Math.random() * this.playlist.length)
             }
             return prevIndex
         }
-        return this.currentIndex <= 0 ? this.queue.length - 1 : this.currentIndex - 1
+        return this.currentIndex <= 0 ? this.playlist.length - 1 : this.currentIndex - 1
     }
 
     next() {
-        if (this.queue.length === 0) return
+        if (this.playlist.length === 0) return
         const current = this.currentTrack
         if (current) {
             this.playbackHistory.push(current.id)
@@ -178,10 +169,10 @@ class Player {
     }
 
     prev() {
-        if (this.queue.length === 0) return
+        if (this.playlist.length === 0) return
         if (this.playbackHistory.length > 0) {
             const lastId = this.playbackHistory.pop()
-            const index = this.queue.findIndex(t => t.id === lastId)
+            const index = this.playlist.findIndex(t => t.id === lastId)
             if (index !== -1) {
                 this.currentIndex = index
                 void this.loadAndPlay()
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 2b88139..7ef0336 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -4,7 +4,6 @@
     import NavRail from '$lib/features/shell/NavRail.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import { settings } from '$lib/state/settings.svelte'
-    import { listen } from '@tauri-apps/api/event'
     import 'mdui'
     import 'mdui/mdui.css'
     import { onMount } from 'svelte'
@@ -14,15 +13,7 @@
 
     onMount(() => {
         void settings.load()
-        onMount(() => {
-            const unlistenPromise = listen<any[]>("library:refreshed", (event) => {
-                musicLibrary.tracks = event.payload
-            })
-
-            return () => {
-                void unlistenPromise.then((unlisten) => unlisten())
-            }
-        })
+        void musicLibrary.load()
     })
 
     $effect(() => {
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index f9981cb..b92eb3b 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -43,7 +43,7 @@
     function playAll() {
         if (filteredTracks.length === 0) return
 
-        player.replaceQueueAndPlay(filteredTracks, filteredTracks[0].id)
+        player.replacePlaylistAndPlay(filteredTracks, filteredTracks[0].id)
     }
 </script>
 
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index b5554e3..f33ff70 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -2,8 +2,6 @@
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
     import Select from '$lib/components/base/Select.svelte'
-    import { registerBuiltinExtensions } from '$lib/extensions/builtin'
-    import { extensionRegistry } from '$lib/extensions/registry.svelte'
     import SettingsListItem from '$lib/features/settings/SettingsListItem.svelte'
     import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
     import SettingsSection from '$lib/features/settings/SettingsSection.svelte'
@@ -24,7 +22,6 @@
     ]
 
     onMount(() => {
-        registerBuiltinExtensions()
         void settings.load()
     })
 
@@ -142,29 +139,6 @@
             </div>
         </SettingsSection>
 
-        <SettingsSection title="扩展" contentClass="mt-4 grid gap-3">
-            {#each extensionRegistry.extensions as extension (extension.id)}
-                <SettingsListItem
-                    title={extension.name}
-                    description={extension.description}
-                >
-                    <mdui-switch
-                        checked={extension.enabled !== false}
-                        onchange={(event: Event) => {
-                            const target =
-                                event.currentTarget as HTMLElement & {
-                                    checked: boolean
-                                }
-                            extensionRegistry.setEnabled(
-                                extension.id,
-                                target.checked,
-                            )
-                        }}
-                    ></mdui-switch>
-                </SettingsListItem>
-            {/each}
-        </SettingsSection>
-
         {#if settings.error}
             <div class="text-sm text-red-500">
                 {settings.error}

From 89a3507d4d546d3d19db3cbe4848123346b91ca5 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sat, 30 May 2026 19:35:39 +0800
Subject: [PATCH 16/39] Add QueueDrawer

---
 package.json                                  |   1 +
 pnpm-lock.yaml                                |  10 ++
 src-tauri/Cargo.lock                          |  29 ++++
 src-tauri/Cargo.toml                          |   1 +
 src-tauri/capabilities/default.json           |   3 +-
 src-tauri/src/lib.rs                          |   1 +
 .../components/base/PlayingIndicator.svelte   |  18 +++
 src/lib/features/PlayerBar.svelte             |  21 ++-
 src/lib/features/QueueDrawer.svelte           | 125 ++++++++++++++++++
 src/lib/features/TrackList.svelte             |  23 +---
 src/lib/state/player.svelte.ts                |  70 ++++++++++
 src/routes/+layout.svelte                     |   4 +
 12 files changed, 282 insertions(+), 24 deletions(-)
 create mode 100644 src/lib/components/base/PlayingIndicator.svelte
 create mode 100644 src/lib/features/QueueDrawer.svelte

diff --git a/package.json b/package.json
index 9bf8a25..e00494d 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "@tauri-apps/api": "^2.10.1",
     "@tauri-apps/plugin-dialog": "~2.7.1",
     "@tauri-apps/plugin-opener": "^2.5.3",
+    "@tauri-apps/plugin-store": "^2.4.3",
     "material-symbols": "^0.43.0",
     "mdui": "^2.1.4",
     "tailwindcss": "^4.2.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b48cf13..60ed583 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,6 +23,9 @@ importers:
       '@tauri-apps/plugin-opener':
         specifier: ^2.5.3
         version: 2.5.3
+      '@tauri-apps/plugin-store':
+        specifier: ^2.4.3
+        version: 2.4.3
       material-symbols:
         specifier: ^0.43.0
         version: 0.43.0
@@ -623,6 +626,9 @@ packages:
   '@tauri-apps/plugin-opener@2.5.3':
     resolution: {integrity: sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ==}
 
+  '@tauri-apps/plugin-store@2.4.3':
+    resolution: {integrity: sha512-9LWPj9yMphRi9czEtUv87XHbl1b6xgd9EXpPrUnq6nG7+nbtoF84d4Kwz9xhAv/Hf30sr58pq7EOlyI936y8qw==}
+
   '@types/cookie@0.6.0':
     resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
 
@@ -1353,6 +1359,10 @@ snapshots:
     dependencies:
       '@tauri-apps/api': 2.10.1
 
+  '@tauri-apps/plugin-store@2.4.3':
+    dependencies:
+      '@tauri-apps/api': 2.11.0
+
   '@types/cookie@0.6.0': {}
 
   '@types/estree@1.0.8': {}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index e267359..fe547a4 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4316,6 +4316,7 @@ dependencies = [
  "tauri-build",
  "tauri-plugin-dialog",
  "tauri-plugin-opener",
+ "tauri-plugin-store",
  "walkdir",
  "web-audio-api",
 ]
@@ -4464,6 +4465,22 @@ dependencies = [
  "zbus",
 ]
 
+[[package]]
+name = "tauri-plugin-store"
+version = "2.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c72dda16786eb4a3f903e43a17b64d8d78dc0f00fe2aa4b757c28f617a8630b"
+dependencies = [
+ "dunce",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "tauri-runtime"
 version = "2.10.1"
@@ -4690,9 +4707,21 @@ dependencies = [
  "mio",
  "pin-project-lite",
  "socket2",
+ "tokio-macros",
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.18"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 083a934..7686823 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -27,4 +27,5 @@ lofty = "0.24.0"
 base64 = "0.22.1"
 walkdir = "2.5.0"
 tauri-plugin-dialog = "2"
+tauri-plugin-store = "2"
 
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index ed4becc..f6b915d 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -13,6 +13,7 @@
     "core:window:allow-minimize",
     "core:window:allow-toggle-maximize",
     "core:window:allow-close",
-    "dialog:default"
+    "dialog:default",
+    "store:default"
   ]
 }
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 85ed046..7ab0700 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -34,6 +34,7 @@ pub fn init_startup_scan(app_handle: tauri::AppHandle) {
 pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_store::Builder::new().build())
         .setup(|app| {
             let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
             let menu = Menu::with_items(app, &[&quit_i])?;
diff --git a/src/lib/components/base/PlayingIndicator.svelte b/src/lib/components/base/PlayingIndicator.svelte
new file mode 100644
index 0000000..f533df2
--- /dev/null
+++ b/src/lib/components/base/PlayingIndicator.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+    type Props = {
+        color?: string
+    }
+    let { color = 'rgb(var(--mdui-color-primary))' }: Props = $props()
+</script>
+
+<div class="flex items-end gap-0.5 h-3.5">
+    <span
+        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate] bg-[{color}]"
+    ></span>
+    <span
+        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate_0.2s] bg-[{color}]"
+    ></span>
+    <span
+        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate_0.4s] bg-[{color}]"
+    ></span>
+</div>
diff --git a/src/lib/features/PlayerBar.svelte b/src/lib/features/PlayerBar.svelte
index 1dfc3c8..2c59012 100644
--- a/src/lib/features/PlayerBar.svelte
+++ b/src/lib/features/PlayerBar.svelte
@@ -12,6 +12,11 @@
     let currentCover = $state<string | null>(null)
 
     let volumeIcon = $derived(getVolumeIcon(player.volume, player.muted))
+    let playModeIcon = $derived.by(() => {
+        if (player.playMode === 'single') return 'repeat_one--rounded'
+        if (player.playMode === 'shuffle') return 'shuffle--rounded'
+        return 'repeat--rounded'
+    })
 
     function getVolumeIcon(volume: number, muted: boolean) {
         if (muted) return 'volume_off--rounded'
@@ -105,13 +110,23 @@
 {/snippet}
 
 {#snippet volumeControls()}
-    <div class="flex flex-1 items-center min-w-37.5 justify-end">
-        <IconButton icon="playlist_play--rounded" />
+    <div class="flex flex-1 items-center min-w-37.5 justify-end gap-1">
+        <IconButton
+            icon={playModeIcon}
+            onclick={() => player.cyclePlayMode()}
+            class="opacity-70 hover:opacity-100"
+        />
+
+        <IconButton
+            icon="playlist_play--rounded"
+            onclick={() => player.toggleQueue()}
+            class={player.queueOpen ? 'text-[rgb(var(--mdui-color-primary))]' : 'opacity-70 hover:opacity-100'}
+        />
 
         <IconButton
             icon={volumeIcon}
             onclick={() => (player.muted = !player.muted)}
-            class="text-lg opacity-70"
+            class="text-lg opacity-70 hover:opacity-100"
         />
 
         <Slider bind:value={player.volume} />
diff --git a/src/lib/features/QueueDrawer.svelte b/src/lib/features/QueueDrawer.svelte
new file mode 100644
index 0000000..c51b8ff
--- /dev/null
+++ b/src/lib/features/QueueDrawer.svelte
@@ -0,0 +1,125 @@
+<script lang="ts">
+    import IconButton from '$lib/components/base/IconButton.svelte'
+    import PlayingIndicator from '$lib/components/base/PlayingIndicator.svelte'
+    import { trackCovers } from '$lib/state/covers.svelte'
+    import { player } from '$lib/state/player.svelte'
+    import { formatDuration } from '$lib/utils'
+    import '@mdui/icons/equalizer--rounded.js'
+    import '@mdui/icons/play-arrow--rounded.js'
+
+    function handlePlay(index: number) {
+        player.playTrackInQueue(index)
+    }
+
+    function handleRemove(id: string, e: Event) {
+        e.stopPropagation()
+        player.removeTrack(id)
+    }
+
+    function lazyCover(node: HTMLImageElement, track: any) {
+        let currentTrack = track
+        const observer = new IntersectionObserver(
+            entries => {
+                const entry = entries[0]
+                if (entry.isIntersecting) {
+                    trackCovers.load(currentTrack).then(cover => {
+                        if (cover) {
+                            node.src = cover
+                        }
+                    })
+                    observer.disconnect()
+                }
+            },
+            { rootMargin: '100px' }
+        )
+        observer.observe(node)
+        return {
+            update(nextTrack: any) {
+                currentTrack = nextTrack
+            },
+            destroy() {
+                observer.disconnect()
+            }
+        }
+    }
+</script>
+
+<mdui-navigation-drawer
+    open={player.queueOpen}
+    placement="right"
+    close-on-overlay-click
+    close-on-esc
+    onclose={() => { player.queueOpen = false }}
+    class="w-96 max-w-full flex flex-col h-full bg-[rgb(var(--mdui-color-surface-container))] border-l border-[rgb(var(--mdui-color-outline-variant))]"
+>
+    <div class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))]">
+        <div class="flex items-center gap-2">
+            <span class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]">播放队列</span>
+            <span class="px-2 py-0.5 text-xs rounded-full bg-[rgb(var(--mdui-color-secondary-container))] text-[rgb(var(--mdui-color-on-secondary-container))] font-medium">
+                {player.playlist.length}
+            </span>
+        </div>
+        <IconButton icon="close--rounded" onclick={() => { player.queueOpen = false }} />
+    </div>
+
+    <div class="flex-1 overflow-y-auto p-2 space-y-1">
+        {#if player.playlist.length === 0}
+            <div class="flex flex-col items-center justify-center h-64 text-center p-6 text-[rgb(var(--mdui-color-on-surface-variant))]">
+                <span class="text-4xl mb-2">🎵</span>
+                <p class="text-sm">队列为空</p>
+            </div>
+        {:else}
+            {#each player.playlist as track, index (track.id)}
+                {@const isCurrent = player.currentIndex === index}
+                <div
+                    role="button"
+                    tabindex="0"
+                    ondblclick={() => handlePlay(index)}
+                    onkeydown={(e) => { if (e.key === 'Enter' || e.key === ' ') handlePlay(index) }}
+                    class="group flex items-center gap-3 p-2.5 rounded-lg cursor-pointer transition-all duration-200 select-none outline-none
+                           {isCurrent 
+                               ? 'bg-[rgb(var(--mdui-color-secondary-container))] text-[rgb(var(--mdui-color-on-secondary-container))] border border-[rgb(var(--mdui-color-outline-variant))]' 
+                               : 'hover:bg-[rgb(var(--mdui-color-surface-container-high))] text-[rgb(var(--mdui-color-on-surface))] border border-transparent'}"
+                >
+                    <div class="relative w-10 h-10 rounded overflow-hidden bg-[rgb(var(--mdui-color-surface-container-highest))] shrink-0 flex items-center justify-center">
+                        <img
+                            use:lazyCover={track}
+                            src={trackCovers.get(track) || '/default_cover.png'}
+                            alt="cover"
+                            class="w-full h-full object-cover"
+                        />
+                        {#if isCurrent}
+                            <div class="absolute inset-0 bg-black/40 flex items-center justify-center text-[rgb(var(--mdui-color-inverse-primary-light))] text-lg">
+                                {#if player.playing}
+                                    <PlayingIndicator color="rgb(var(--mdui-color-inverse-primary-light))"/>
+                                {:else}
+                                    <mdui-icon-play-arrow--rounded></mdui-icon-play-arrow--rounded>
+                                {/if}
+                            </div>
+                        {/if}
+                    </div>
+
+                    <div class="flex-1 min-w-0">
+                        <div class="text-sm font-medium truncate {isCurrent ? 'text-[rgb(var(--mdui-color-primary))] font-semibold' : ''}">
+                            {track.title}
+                        </div>
+                        <div class="text-xs truncate text-[rgb(var(--mdui-color-on-surface-variant))] mt-0.5">
+                            {track.artist}
+                        </div>
+                    </div>
+
+                    <div class="flex items-center gap-1.5 shrink-0">
+                        <span class="text-xs font-mono text-[rgb(var(--mdui-color-on-surface-variant))]">
+                            {formatDuration(track.duration)}
+                        </span>
+                        <IconButton
+                            icon="close--rounded"
+                            class="opacity-0 group-hover:opacity-100 transition-opacity duration-200 text-xs text-[rgb(var(--mdui-color-on-surface-variant))] hover:text-red-500"
+                            onclick={(e: MouseEvent) => handleRemove(track.id, e)}
+                        />
+                    </div>
+                </div>
+            {/each}
+        {/if}
+    </div>
+</mdui-navigation-drawer>
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 5bdce29..0c8ad5b 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import PlayingIndicator from '$lib/components/base/PlayingIndicator.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
     import { player } from '$lib/state/player.svelte'
     import type { Track } from '$lib/types'
@@ -44,26 +45,12 @@
     }
 </script>
 
-{#snippet playingIndicator()}
-    <div class="flex items-end gap-0.5 h-3.5">
-        <span
-            class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate]"
-        ></span>
-        <span
-            class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.2s]"
-        ></span>
-        <span
-            class="w-0.5 themed-bar h-full animate-[bounce_0.8s_infinite_alternate_0.4s]"
-        ></span>
-    </div>
-{/snippet}
-
 {#snippet trackIndex(index: number, isCurrent: boolean)}
     <div
         class="w-12 flex justify-center items-center text-sm themed-text-secondary z-10 shrink-0"
     >
         {#if isCurrent && player.playing}
-            {@render playingIndicator()}
+            <PlayingIndicator/>
         {:else}
             <span
                 class={isCurrent
@@ -214,11 +201,7 @@
     .themed-surface-high {
         background-color: rgb(var(--mdui-color-surface-container-high));
     }
-
-    .themed-bar {
-        background-color: rgb(var(--mdui-color-primary));
-    }
-
+    
     .themed-item {
         background-color: transparent;
         border: 1px solid transparent;
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 248b319..7177f11 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -1,15 +1,26 @@
 import { invoke } from "@tauri-apps/api/core"
+import { load } from "@tauri-apps/plugin-store"
 import type { Track } from "../types/music"
 import { recentlyPlayed } from "./recent.svelte"
 
 type PlayMode = 'list' | 'single' | 'shuffle'
 
+interface PersistedState {
+    playlist: Track[]
+    currentIndex: number
+    playMode: PlayMode
+    volume: number
+}
+
+const STORE_NAME = "player-state.json"
+
 class Player {
     playlist = $state<Track[]>([])
     currentIndex = $state<number>(-1)
     playing = $state<boolean>(false)
     currentTime = $state<number>(0)
     playMode = $state<PlayMode>('list')
+    queueOpen = $state<boolean>(false)
     playbackHistory: string[] = []
     #muted = $state<boolean>(false)
     #volume = $state<number>(80)
@@ -33,6 +44,7 @@ class Player {
             this.#muted = false
         }
         invoke('set_volume', { volume }).catch(console.error)
+        void this.persist()
     }
 
     get muted() { return this.#muted }
@@ -67,6 +79,7 @@ class Player {
         this.playlist = nextQueue
         this.currentIndex = nextIndex
         void this.loadAndPlay()
+        void this.persist()
     }
 
     appendTrack(track: Track) {
@@ -134,6 +147,24 @@ class Player {
         this.currentIndex = nextIndex
     }
 
+    playTrackInQueue(index: number) {
+        if (index < 0 || index >= this.playlist.length) return
+        this.currentIndex = index
+        void this.loadAndPlay()
+        void this.persist()
+    }
+
+    cyclePlayMode() {
+        const modes: PlayMode[] = ['list', 'single', 'shuffle']
+        const currentModeIndex = modes.indexOf(this.playMode)
+        this.playMode = modes[(currentModeIndex + 1) % modes.length]
+        void this.persist()
+    }
+
+    toggleQueue() {
+        this.queueOpen = !this.queueOpen
+    }
+
     private getNextIndex(): number {
         if (this.playlist.length <= 1) return 0
         if (this.playMode === 'shuffle') {
@@ -204,6 +235,45 @@ class Player {
         if (this.playing) this.startPolling()
     }
 
+    async loadState() {
+        try {
+            const store = await load(STORE_NAME)
+            const playlist = await store.get<Track[]>("playlist")
+            const currentIndex = await store.get<number>("currentIndex")
+            const playMode = await store.get<PlayMode>("playMode")
+            const volume = await store.get<number>("volume")
+
+            if (playlist && playlist.length > 0) {
+                this.playlist = playlist
+            }
+            if (typeof currentIndex === "number" && currentIndex >= 0) {
+                this.currentIndex = currentIndex
+            }
+            if (playMode) {
+                this.playMode = playMode
+            }
+            if (typeof volume === "number") {
+                this.#volume = volume
+                invoke('set_volume', { volume }).catch(console.error)
+            }
+        } catch (err) {
+            console.error(err)
+        }
+    }
+
+    private async persist() {
+        try {
+            const store = await load(STORE_NAME)
+            await store.set("playlist", this.playlist.map(t => ({ ...t, cover: null })))
+            await store.set("currentIndex", this.currentIndex)
+            await store.set("playMode", this.playMode)
+            await store.set("volume", this.#volume)
+            await store.save()
+        } catch (err) {
+            console.error(err)
+        }
+    }
+
     private async loadAndPlay() {
         const track = this.currentTrack
         if (!track) return
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7ef0336..72e2d9b 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
     import PlayerBar from '$lib/features/PlayerBar.svelte'
+    import QueueDrawer from '$lib/features/QueueDrawer.svelte'
     import Appbar from '$lib/features/shell/Appbar.svelte'
     import NavRail from '$lib/features/shell/NavRail.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
+    import { player } from '$lib/state/player.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import 'mdui'
     import 'mdui/mdui.css'
@@ -14,6 +16,7 @@
     onMount(() => {
         void settings.load()
         void musicLibrary.load()
+        void player.loadState()
     })
 
     $effect(() => {
@@ -28,6 +31,7 @@
     <Appbar />
     <PlayerBar />
     <NavRail />
+    <QueueDrawer />
 
     <mdui-layout-main
         class="flex flex-col h-screen w-screen overflow-hidden bg-(--controlWhite) text-(--controlBlack)"

From 0c37e7bbcc05d11acb2fa911ec76ad26c339e3ff Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sat, 30 May 2026 21:37:56 +0800
Subject: [PATCH 17/39] feat: implement isolated player playlist and queue
 management

- Separate player playlist state from the core music library tracks
- Implement `replacePlaylistAndPlay` to handle explicit queue overrides
- Update playback controls (next, prev) to operate strictly on the active playlist
- Add utility methods for appending, inserting, and removing tracks within the queue
---
 src/lib/components/base/Heading.svelte |  4 +++-
 src/lib/features/QueueDrawer.svelte    |  3 ++-
 src/lib/features/TrackList.svelte      |  2 +-
 src/routes/+layout.svelte              |  4 ++--
 src/routes/album/+page.svelte          |  5 +----
 src/routes/artists/+page.svelte        | 14 ++++++++------
 src/routes/library/+page.svelte        |  2 --
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/lib/components/base/Heading.svelte b/src/lib/components/base/Heading.svelte
index e12aa2e..3614c0e 100644
--- a/src/lib/components/base/Heading.svelte
+++ b/src/lib/components/base/Heading.svelte
@@ -32,6 +32,8 @@
     </div>
 
     {#if children}
-        {@render children()}
+        <div class="flex items-center gap-2">
+            {@render children()}
+        </div>
     {/if}
 </div>
diff --git a/src/lib/features/QueueDrawer.svelte b/src/lib/features/QueueDrawer.svelte
index c51b8ff..3a8f6bb 100644
--- a/src/lib/features/QueueDrawer.svelte
+++ b/src/lib/features/QueueDrawer.svelte
@@ -47,10 +47,11 @@
 <mdui-navigation-drawer
     open={player.queueOpen}
     placement="right"
+    modal
     close-on-overlay-click
     close-on-esc
     onclose={() => { player.queueOpen = false }}
-    class="w-96 max-w-full flex flex-col h-full bg-[rgb(var(--mdui-color-surface-container))] border-l border-[rgb(var(--mdui-color-outline-variant))]"
+    class="mt-32 h-[calc(100vh-var(--spacing)*(24+14+20))] [&::part(panel)]:mt-20 [&::part(overlay)]:bg-transparent"
 >
     <div class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))]">
         <div class="flex items-center gap-2">
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 0c8ad5b..6dcc92b 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -148,7 +148,7 @@
 
 <mdui-list class="flex flex-col w-full">
     <mdui-list-subheader
-        class="flex pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b *:justify-center *:self-center"
+        class="sticky flex pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b *:justify-center *:self-center"
         noninteractive
     >
         <div class="w-12 text-center flex">#</div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 72e2d9b..de71a18 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -31,8 +31,6 @@
     <Appbar />
     <PlayerBar />
     <NavRail />
-    <QueueDrawer />
-
     <mdui-layout-main
         class="flex flex-col h-screen w-screen overflow-hidden bg-(--controlWhite) text-(--controlBlack)"
     >
@@ -40,6 +38,8 @@
     </mdui-layout-main>
 </mdui-layout>
 
+<QueueDrawer />
+
 <style lang="postcss">
     @reference "tailwindcss";
     @layer base {
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 9cd9bb8..0ae20df 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -111,10 +111,7 @@
 
 <header class="pb-5">
     <Heading eyebrow="Albums" title="专辑">
-        <Button
-            variant="outlined"
-            onclick={() => musicLibrary.scan()}
-        >
+        <Button variant="outlined" onclick={() => musicLibrary.scan()}>
             刷新
         </Button>
     </Heading>
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index ebc9645..c2c4067 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -108,12 +108,14 @@
 
 <header class="pb-5">
     <Heading eyebrow="artist" title="艺术家">
-        <Button
-            variant="outlined"
-            onclick={() => musicLibrary.scan()}
-        >
-            刷新
-        </Button>
+        <div class="flex items-center gap-2">
+            <Button
+                variant="outlined"
+                onclick={() => musicLibrary.scan()}
+            >
+                刷新
+            </Button>
+        </div>
     </Heading>
 
     <Filters
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index b92eb3b..aa6bd66 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -53,7 +53,6 @@
 
 <header class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5">
     <Heading eyebrow="library" title="歌曲">
-        <div class="flex items-center gap-2">
             <Button
                 variant="filled"
                 disabled={filteredTracks.length === 0}
@@ -68,7 +67,6 @@
             >
                 刷新
             </Button>
-        </div>
     </Heading>
     <Filters
         bind:query

From 9b69b888a7b2df4b69e88e15c131c442ec9aaaca Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 31 May 2026 01:32:12 +0800
Subject: [PATCH 18/39] Add SearchBar, global search & responsive lists

Introduce a new SearchBar component and a globalSearch state; integrate search into Appbar and library/album/artist pages. Refactor TrackList to support configurable columns, grid layout, tag rendering, and a cleaner lazyCover action; improve styling and extract tag/column utilities. Move bounce keyframes into PlayingIndicator and apply bar color via inline style. Revamp album and artist pages to be responsive with mobile master-detail views, bind window width, replace previous Filters/MediaGrid UI, and add playAll hooks that use the player state. Add segmented sort controls to the library page and wire sorting/searching to derived track lists.
---
 .../components/base/PlayingIndicator.svelte   |  20 +-
 src/lib/components/base/SearchBar.svelte      |  32 ++
 src/lib/features/TrackList.svelte             | 202 ++++++++-----
 src/lib/features/shell/Appbar.svelte          |  10 +-
 src/lib/state/search.svelte.ts                |   5 +
 src/routes/album/+page.svelte                 | 216 +++++++++-----
 src/routes/artists/+page.svelte               | 280 +++++++++++++-----
 src/routes/library/+page.svelte               | 119 ++++----
 8 files changed, 612 insertions(+), 272 deletions(-)
 create mode 100644 src/lib/components/base/SearchBar.svelte
 create mode 100644 src/lib/state/search.svelte.ts

diff --git a/src/lib/components/base/PlayingIndicator.svelte b/src/lib/components/base/PlayingIndicator.svelte
index f533df2..b4ef748 100644
--- a/src/lib/components/base/PlayingIndicator.svelte
+++ b/src/lib/components/base/PlayingIndicator.svelte
@@ -7,12 +7,26 @@
 
 <div class="flex items-end gap-0.5 h-3.5">
     <span
-        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate] bg-[{color}]"
+        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate]"
+        style="background-color: {color};"
     ></span>
     <span
-        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate_0.2s] bg-[{color}]"
+        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate_0.2s]"
+        style="background-color: {color};"
     ></span>
     <span
-        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate_0.4s] bg-[{color}]"
+        class="w-0.5 h-full animate-[bounce_0.8s_infinite_alternate_0.4s]"
+        style="background-color: {color};"
     ></span>
 </div>
+
+<style>
+    @keyframes bounce {
+        from {
+            height: 4px;
+        }
+        to {
+            height: 14px;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/lib/components/base/SearchBar.svelte b/src/lib/components/base/SearchBar.svelte
new file mode 100644
index 0000000..4aeb707
--- /dev/null
+++ b/src/lib/components/base/SearchBar.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+  import '@mdui/icons/close--rounded.js'
+  import '@mdui/icons/search--rounded.js'
+
+  let { value = $bindable('') } = $props()
+</script>
+
+<div
+  class="flex items-center gap-2 w-full h-9 px-3 rounded-full transition-all duration-200 bg-[rgb(var(--mdui-color-surface-container-high))] focus-within:bg-[rgb(var(--mdui-color-surface-container-highest))] focus-within:shadow-sm"
+  onpointerdown={e => e.stopPropagation()}
+  role="searchbox"
+  tabindex="0"
+>
+  <mdui-icon-search--rounded class="text-[rgb(var(--mdui-color-on-surface-variant))] text-base shrink-0"></mdui-icon-search--rounded>
+  <input
+    type="text"
+    placeholder="搜索歌曲、歌手、专辑..."
+    bind:value={value}
+    class="flex-1 h-full bg-transparent border-none outline-none text-sm text-[rgb(var(--mdui-color-on-surface))] placeholder-[rgb(var(--mdui-color-on-surface-variant))]"
+  />
+  {#if value}
+    <div
+      class="flex items-center justify-center w-6 h-6 rounded-full cursor-pointer bg-transparent hover:bg-(--fade) active:bg-(--controlBlackAcrylic) text-base shrink-0"
+      onclick={() => value = ''}
+      onkeydown={e => { if (e.key === 'Enter' || e.key === ' ') value = '' }}
+      role="button"
+      tabindex="0"
+    >
+      <mdui-icon-close--rounded class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"></mdui-icon-close--rounded>
+    </div>
+  {/if}
+</div>
\ No newline at end of file
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 6dcc92b..fe40507 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -7,37 +7,58 @@
     import 'mdui/components/list-item.js'
     import 'mdui/components/list.js'
 
-    let { tracks }: { tracks: Track[] } = $props()
-
-    function lazyCover(node: HTMLElement, track: Track) {
-        let currentTrack = track
-
-        const observer = new IntersectionObserver(
-            entries => {
-                const entry = entries[0]
-
-                if (entry.isIntersecting) {
-                    void trackCovers.load(currentTrack)
-                    observer.disconnect()
-                }
-            },
-            {
-                rootMargin: '300px',
-            },
-        )
-
-        observer.observe(node)
-
-        return {
-            update(nextTrack: Track) {
-                currentTrack = nextTrack
-            },
-            destroy() {
+    type TrackColumn = 'index' | 'title' | 'album' | 'tags' | 'duration'
+
+    interface Props {
+        tracks: Track[]
+        columns?: TrackColumn[]
+    }
+
+    const columnWidths: Record<TrackColumn, string> = {
+        index: '48px',
+        title: '1fr',
+        album: '1fr',
+        tags: 'auto',
+        duration: '60px',
+    }
+
+    let { tracks, columns = ['index', 'title', 'album', 'duration'] }: Props =
+        $props()
+
+    let gridTemplate = $derived(
+        columns.map(column => columnWidths[column]).join(' '),
+    )
+
+    function lazyCover(track: Track) {
+        return (node: HTMLElement) => {
+            const observer = new IntersectionObserver(
+                entries => {
+                    const entry = entries[0]
+
+                    if (entry.isIntersecting) {
+                        void trackCovers.load(track)
+                        observer.disconnect()
+                    }
+                },
+                {
+                    rootMargin: '300px',
+                },
+            )
+
+            observer.observe(node)
+
+            return () => {
                 observer.disconnect()
-            },
+            }
         }
     }
 
+    function getTrackTags(track: Track): string[] {
+        const tags = (track as Track & { tags?: string[] }).tags
+
+        return Array.isArray(tags) ? tags : []
+    }
+
     function handlePlay(clickedTrack: Track) {
         player.replacePlaylistAndPlay(tracks, clickedTrack.id)
 
@@ -47,15 +68,15 @@
 
 {#snippet trackIndex(index: number, isCurrent: boolean)}
     <div
-        class="w-12 flex justify-center items-center text-sm themed-text-secondary z-10 shrink-0"
+        class="flex justify-center items-center text-sm themed-text-secondary z-10"
     >
         {#if isCurrent && player.playing}
-            <PlayingIndicator/>
+            <PlayingIndicator />
         {:else}
             <span
                 class={isCurrent
                     ? 'font-bold themed-text-accent'
-                    : 'group-hover:text-[rgb(var(--mdui-color-on-surface))]'}
+                    : 'themed-text-secondary'}
             >
                 {index + 1}
             </span>
@@ -65,7 +86,7 @@
 
 {#snippet trackCover(track: Track, cover: string | null)}
     <div
-        use:lazyCover={track}
+        {@attach lazyCover(track)}
         class="w-10 h-10 rounded-md overflow-hidden themed-surface-container shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
     >
         {#if cover}
@@ -86,21 +107,20 @@
 {/snippet}
 
 {#snippet trackTitle(track: Track, cover: string | null, isCurrent: boolean)}
-    <div class="flex-1 flex items-center gap-4 pl-3 overflow-hidden z-10">
+    <div class="flex items-center gap-4 pl-3 overflow-hidden z-10 min-w-0">
         {@render trackCover(track, cover)}
 
         <div class="flex flex-col min-w-0">
             <span
-                class="text-sm font-medium truncate {isCurrent
-                    ? 'themed-text-accent'
-                    : 'themed-text-primary'}"
+                class={[
+                    'text-sm font-medium truncate',
+                    isCurrent ? 'themed-text-accent' : 'themed-text-primary',
+                ]}
             >
                 {track.title}
             </span>
 
-            <span
-                class="text-xs truncate themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] mt-0.5"
-            >
+            <span class="text-xs truncate themed-text-secondary mt-0.5">
                 {track.artist}
             </span>
         </div>
@@ -109,16 +129,32 @@
 
 {#snippet trackAlbum(track: Track)}
     <div
-        class="flex-1 text-sm truncate hidden md:block z-10 themed-text-secondary"
+        class="text-sm truncate hidden md:block z-10 themed-text-secondary min-w-0"
     >
         {track.album}
     </div>
 {/snippet}
 
+{#snippet trackTags(track: Track)}
+    {@const tags = getTrackTags(track)}
+
+    <div class="flex flex-wrap items-center gap-1 z-10 min-w-0">
+        {#if tags.length > 0}
+            {#each tags as tag (tag)}
+                <span
+                    class="themed-tag-chip rounded-full border px-2 py-0.5 text-xs leading-none"
+                >
+                    {tag}
+                </span>
+            {/each}
+        {:else}
+            <span class="block min-h-5"></span>
+        {/if}
+    </div>
+{/snippet}
+
 {#snippet trackDuration(track: Track)}
-    <div
-        class="w-16 text-sm font-mono z-10 themed-text-secondary group-hover:text-[rgb(var(--mdui-color-on-surface))] shrink-0"
-    >
+    <div class="text-sm font-mono z-10 themed-text-secondary text-left">
         {formatDuration(track.duration)}
     </div>
 {/snippet}
@@ -128,33 +164,68 @@
     {@const cover = trackCovers.get(track)}
 
     <mdui-list-item
-        class="group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none
-             active:scale-[0.995] themed-item
-             {isCurrent ? 'themed-item-active' : ''}"
+        class={[
+            'group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none active:scale-[0.995] themed-item',
+            isCurrent && 'themed-item-active',
+        ]}
         ondblclick={() => handlePlay(track)}
         role="button"
         tabindex="0"
     >
         <mdui-ripple></mdui-ripple>
 
-        <div class="flex items-center w-full">
-            {@render trackIndex(index, isCurrent)}
-            {@render trackTitle(track, cover, isCurrent)}
-            {@render trackAlbum(track)}
-            {@render trackDuration(track)}
+        <div
+            class="grid items-center gap-4 w-full"
+            style:grid-template-columns={gridTemplate}
+        >
+            {#if columns.includes('index')}
+                {@render trackIndex(index, isCurrent)}
+            {/if}
+
+            {#if columns.includes('title')}
+                {@render trackTitle(track, cover, isCurrent)}
+            {/if}
+
+            {#if columns.includes('album')}
+                {@render trackAlbum(track)}
+            {/if}
+
+            {#if columns.includes('tags')}
+                {@render trackTags(track)}
+            {/if}
+
+            {#if columns.includes('duration')}
+                {@render trackDuration(track)}
+            {/if}
         </div>
     </mdui-list-item>
 {/snippet}
 
 <mdui-list class="flex flex-col w-full">
     <mdui-list-subheader
-        class="sticky flex pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b *:justify-center *:self-center"
+        class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b themed-surface-container"
+        style:grid-template-columns={gridTemplate}
         noninteractive
     >
-        <div class="w-12 text-center flex">#</div>
-        <div class="flex-1 pl-2 text-left">标题</div>
-        <div class="flex-1 text-left hidden md:block">专辑</div>
-        <div class="w-16">时长</div>
+        {#if columns.includes('index')}
+            <div class="text-center">#</div>
+        {/if}
+
+        {#if columns.includes('title')}
+            <div class="pl-2 text-left">标题</div>
+        {/if}
+
+        {#if columns.includes('album')}
+            <div class="text-left hidden md:block">专辑</div>
+        {/if}
+
+        {#if columns.includes('tags')}
+            <div class="text-left">标签</div>
+        {/if}
+
+        {#if columns.includes('duration')}
+            <div class="text-left">时长</div>
+        {/if}
     </mdui-list-subheader>
 
     <div class="flex flex-col gap-1 mt-2">
@@ -165,15 +236,6 @@
 </mdui-list>
 
 <style>
-    @keyframes bounce {
-        from {
-            height: 4px;
-        }
-        to {
-            height: 14px;
-        }
-    }
-
     .themed-text-primary {
         color: rgb(var(--mdui-color-on-surface));
     }
@@ -186,10 +248,6 @@
         color: rgb(var(--mdui-color-primary));
     }
 
-    /* .themed-border {
-        border-color: rgb(var(--mdui-color-outline-variant));
-    } */
-
     .themed-border-b {
         border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
     }
@@ -201,7 +259,7 @@
     .themed-surface-high {
         background-color: rgb(var(--mdui-color-surface-container-high));
     }
-    
+
     .themed-item {
         background-color: transparent;
         border: 1px solid transparent;
@@ -218,4 +276,10 @@
         background-color: rgb(var(--mdui-color-surface-container));
         border-color: rgb(var(--mdui-color-outline-variant));
     }
+
+    .themed-tag-chip {
+        color: rgb(var(--mdui-color-on-surface-variant));
+        background-color: rgb(var(--mdui-color-surface-container-high));
+        border-color: rgb(var(--mdui-color-outline-variant));
+    }
 </style>
diff --git a/src/lib/features/shell/Appbar.svelte b/src/lib/features/shell/Appbar.svelte
index 6cfcf1f..cc76ca7 100644
--- a/src/lib/features/shell/Appbar.svelte
+++ b/src/lib/features/shell/Appbar.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import SearchBar from '$lib/components/base/SearchBar.svelte'
+  import { globalSearch } from '$lib/state/search.svelte'
   import '@mdui/icons/close--rounded.js'
   import '@mdui/icons/fullscreen--rounded.js'
   import '@mdui/icons/fullscreen-exit--rounded.js'
@@ -23,7 +25,7 @@
 
   function drag(e: PointerEvent) {
     const target = e.target as HTMLElement
-    if (target.closest('div[role="button"]')) {
+    if (target.closest('div[role="button"]') || target.closest('input')) {
       return
     }
     if (e.buttons === 1) {
@@ -45,7 +47,9 @@
   </mdui-top-app-bar-title>
 
   <div class="flex-1 flex items-center justify-center">
-    <div class="max-w-md w-full"></div>
+    <div class="max-w-md w-full px-4">
+      <SearchBar bind:value={globalSearch.query} />
+    </div>
   </div>
 
   <div class="flex items-center pr-6 [-webkit-app-region:no-drag]">
@@ -91,4 +95,4 @@
       </div>
     </div>
   </div>
-</mdui-top-app-bar>
+</mdui-top-app-bar>
\ No newline at end of file
diff --git a/src/lib/state/search.svelte.ts b/src/lib/state/search.svelte.ts
new file mode 100644
index 0000000..1d649cf
--- /dev/null
+++ b/src/lib/state/search.svelte.ts
@@ -0,0 +1,5 @@
+class SearchState {
+  query = $state('')
+}
+
+export const globalSearch = new SearchState()
\ No newline at end of file
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 0ae20df..20a51ca 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -1,32 +1,29 @@
 <script lang="ts">
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
-    import MediaGrid from '$lib/components/media/MediaGrid.svelte'
-    import Filters from '$lib/features/Filters.svelte'
+    import IconButton from '$lib/components/base/IconButton.svelte'
+    import SearchBar from '$lib/components/base/SearchBar.svelte'
+    import TrackList from '$lib/features/TrackList.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
+    import { player } from '$lib/state/player.svelte'
     import type { Album, Track } from '$lib/types'
 
     import 'mdui/components/circular-progress.js'
+    import 'mdui/components/list-item.js'
+    import 'mdui/components/list.js'
 
-    type SortBy = 'title' | 'trackCount'
+    let searchQuery = $state('')
+    let selectedAlbum = $state<Album | null>(null)
+    let windowWidth = $state(1024)
 
-    let query = $state('')
-    let sortBy = $state<SortBy>('title')
+    const isMobile = $derived(windowWidth < 768)
 
     const collator = new Intl.Collator('zh-Hans-CN', {
         numeric: true,
         sensitivity: 'base',
     })
 
-    function createAlbumId(title: string) {
-        return encodeURIComponent(title)
-    }
-
-    function getAlbumTitle(track: Track) {
-        return track.album?.trim() || '未知专辑'
-    }
-
     function buildAlbums(tracks: Track[]): Album[] {
         const albumMap = new Map<
             string,
@@ -39,7 +36,7 @@
         >()
 
         for (const track of tracks) {
-            const title = getAlbumTitle(track)
+            const title = track.album?.trim() || '未知专辑'
             const key = title.toLowerCase()
 
             if (!albumMap.has(key)) {
@@ -52,7 +49,6 @@
             }
 
             const album = albumMap.get(key)!
-
             album.tracks.push(track)
 
             if (!album.cover && track.cover) {
@@ -62,29 +58,22 @@
 
         return Array.from(albumMap.values()).map(album => ({
             ...album,
-            id: createAlbumId(album.title),
+            id: encodeURIComponent(album.title),
             trackCount: album.tracks.length,
         }))
     }
 
-    let albums = $derived.by(() => buildAlbums(musicLibrary.tracks))
-
-    let filteredAlbums = $derived.by(() => {
-        const keyword = query.trim().toLowerCase()
+    const albums = $derived(buildAlbums(musicLibrary.tracks))
 
+    const filteredAlbums = $derived.by(() => {
+        const keyword = searchQuery.trim().toLowerCase()
         const list = keyword
             ? albums.filter(album =>
                   album.title.toLowerCase().includes(keyword),
               )
             : albums
 
-        return [...list].sort((a, b) => {
-            if (sortBy === 'title') {
-                return collator.compare(a.title, b.title)
-            }
-
-            return b.trackCount - a.trackCount
-        })
+        return [...list].sort((a, b) => collator.compare(a.title, b.title))
     })
 
     $effect(() => {
@@ -93,54 +82,137 @@
         }
     })
 
-    let albumItems = $derived(
-        filteredAlbums.map(album => ({
-            id: album.id,
-            title: album.title,
-            subtitle: `${album.trackCount} 首歌曲`,
-            image: trackCovers.get(album.representativeTrack) ?? album.cover,
-            href: `/albums/${album.id}`,
-            shape: 'square' as const,
-        })),
-    )
+    function playAll(tracks: Track[]) {
+        if (tracks.length === 0) return
+        player.replacePlaylistAndPlay(tracks, tracks[0].id)
+    }
 </script>
 
+<svelte:window bind:innerWidth={windowWidth} />
+
 <svelte:head>
     <title>专辑</title>
 </svelte:head>
 
-<header class="pb-5">
-    <Heading eyebrow="Albums" title="专辑">
-        <Button variant="outlined" onclick={() => musicLibrary.scan()}>
-            刷新
-        </Button>
-    </Heading>
-
-    <Filters
-        bind:query
-        bind:sortBy
-        searchPlaceholder="搜索专辑..."
-        sortOptions={[
-            { label: '按专辑名排序', value: 'title' },
-            { label: '按歌曲数排序', value: 'trackCount' },
-        ]}
-    />
-</header>
-
-{#if musicLibrary.isLoading}
-    <div class="flex flex-1 items-center justify-center">
-        <mdui-circular-progress></mdui-circular-progress>
-    </div>
-{:else if musicLibrary.error}
-    <div class="flex flex-1 items-center justify-center text-red-500">
-        {musicLibrary.error}
-    </div>
-{:else}
-    <div class="min-h-0 flex-1 overflow-auto pb-8">
-        <MediaGrid
-            items={albumItems}
-            emptyTitle="没有找到专辑"
-            emptyDescription="尝试刷新媒体库或修改搜索关键词"
-        />
-    </div>
-{/if}
+<div class="flex flex-col h-full overflow-hidden">
+    <header class="pb-4 shrink-0 border-b border-[rgb(var(--mdui-color-outline-variant))]">
+        <Heading eyebrow="Albums" title="专辑" />
+        <div class="mt-2 px-1 max-w-md">
+            <SearchBar bind:value={searchQuery} />
+        </div>
+    </header>
+
+    {#if musicLibrary.isLoading}
+        <div class="flex flex-1 items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else if musicLibrary.error}
+        <div class="flex flex-1 items-center justify-center text-red-500">
+            {musicLibrary.error}
+        </div>
+    {:else if isMobile}
+        <div class="flex-1 overflow-hidden min-h-0 flex flex-col">
+            {#if selectedAlbum === null}
+                <div class="flex-1 overflow-y-auto pb-8">
+                    {#if filteredAlbums.length === 0}
+                        <div class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]">
+                            <span class="text-4xl mb-2">🎵</span>
+                            <span class="text-sm">没有找到专辑</span>
+                        </div>
+                    {:else}
+                        <mdui-list>
+                            {#each filteredAlbums as album (album.id)}
+                                {@const cover = trackCovers.get(album.representativeTrack) ?? album.cover}
+                                <mdui-list-item
+                                    headline={album.title}
+                                    description={`${album.trackCount} 首歌曲`}
+                                    onclick={() => { selectedAlbum = album }}
+                                    onkeydown={(e: KeyboardEvent) =>
+                                        (e.key === 'Enter' || e.key === ' ') && (selectedAlbum = album)}
+                                    role="button"
+                                    tabindex="0"
+                                >
+                                    {#if cover}
+                                        <img src={cover} slot="icon" class="w-10 h-10 rounded object-cover shrink-0" alt="" />
+                                    {:else}
+                                        <div slot="icon" class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0">
+                                            🎵
+                                        </div>
+                                    {/if}
+                                </mdui-list-item>
+                            {/each}
+                        </mdui-list>
+                    {/if}
+                </div>
+            {:else}
+                <div class="flex-1 flex flex-col overflow-hidden min-h-0">
+                    <div class="flex items-center gap-3 py-3 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0">
+                        <IconButton icon="arrow_back--rounded" onclick={() => { selectedAlbum = null }} />
+                        <div class="flex-1 min-w-0">
+                            <h2 class="text-base font-semibold truncate text-[rgb(var(--mdui-color-on-surface))]">{selectedAlbum.title}</h2>
+                            <p class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]">{selectedAlbum.trackCount} 首歌曲</p>
+                        </div>
+                        <Button variant="filled" onclick={() => playAll(selectedAlbum!.tracks)}>播放全部</Button>
+                    </div>
+                    <div class="flex-1 overflow-y-auto pb-8">
+                        <TrackList tracks={selectedAlbum.tracks} />
+                    </div>
+                </div>
+            {/if}
+        </div>
+    {:else}
+        <div class="flex-1 flex overflow-hidden min-h-0">
+            <div class="flex-1 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8">
+                {#if filteredAlbums.length === 0}
+                    <div class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]">
+                        <span class="text-4xl mb-2">🎵</span>
+                        <span class="text-sm">没有找到专辑</span>
+                    </div>
+                {:else}
+                    <mdui-list>
+                        {#each filteredAlbums as album (album.id)}
+                            {@const cover = trackCovers.get(album.representativeTrack) ?? album.cover}
+                            <mdui-list-item
+                                headline={album.title}
+                                description={`${album.trackCount} 首歌曲`}
+                                onclick={() => { selectedAlbum = album }}
+                                onkeydown={(e: KeyboardEvent) =>
+                                    (e.key === 'Enter' || e.key === ' ') && (selectedAlbum = album)}
+                                role="button"
+                                tabindex="0"
+                                active={selectedAlbum?.id === album.id}
+                            >
+                                {#if cover}
+                                    <img src={cover} slot="icon" class="w-10 h-10 rounded object-cover shrink-0" alt="" />
+                                {:else}
+                                    <div slot="icon" class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0">
+                                        🎵
+                                    </div>
+                                {/if}
+                            </mdui-list-item>
+                        {/each}
+                    </mdui-list>
+                {/if}
+            </div>
+            <div class="flex-1 flex flex-col overflow-hidden min-h-0">
+                {#if selectedAlbum === null}
+                    <div class="flex-1 flex flex-col items-center justify-center text-[rgb(var(--mdui-color-on-surface-variant))]">
+                        <span class="text-5xl mb-2">🎵</span>
+                        <span class="text-sm">选择一个专辑以查看歌曲</span>
+                    </div>
+                {:else}
+                    <div class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0">
+                        <div>
+                            <h2 class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]">{selectedAlbum.title}</h2>
+                            <p class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]">{selectedAlbum.trackCount} 首歌曲</p>
+                        </div>
+                        <Button variant="filled" onclick={() => playAll(selectedAlbum!.tracks)}>播放全部</Button>
+                    </div>
+                    <div class="flex-1 overflow-y-auto pb-8">
+                        <TrackList tracks={selectedAlbum.tracks} columns={['index', 'title', 'duration']}/>
+                    </div>
+                {/if}
+            </div>
+        </div>
+    {/if}
+</div>
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index c2c4067..e9d31c7 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -1,24 +1,28 @@
 <script lang="ts">
-    import MediaGrid from '$lib/components/media/MediaGrid.svelte'
+    import Button from '$lib/components/base/Button.svelte'
+    import Heading from '$lib/components/base/Heading.svelte'
+    import IconButton from '$lib/components/base/IconButton.svelte'
+    import SearchBar from '$lib/components/base/SearchBar.svelte'
+    import TrackList from '$lib/features/TrackList.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
+    import { player } from '$lib/state/player.svelte'
     import type { Artist, Track } from '$lib/types'
 
-    import Button from '$lib/components/base/Button.svelte'
-    import Heading from '$lib/components/base/Heading.svelte'
-    import Filters from '$lib/features/Filters.svelte'
-    import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
+    import 'mdui/components/list-item.js'
+    import 'mdui/components/list.js'
 
-    type SortBy = 'name' | 'trackCount' | 'albumCount'
+    let searchQuery = $state('')
+    let selectedArtist = $state<Artist | null>(null)
+    let windowWidth = $state(1024)
 
-    let query = $state('')
-    let sortBy = $state<SortBy>('name')
+    const isMobile = $derived(windowWidth < 768)
 
     const collator = new Intl.Collator('zh-Hans-CN', {
         numeric: true,
         sensitivity: 'base',
     })
-    
+
     function createArtistId(name: string) {
         return encodeURIComponent(name)
     }
@@ -35,7 +39,7 @@
         >()
 
         for (const track of tracks) {
-            const name = track.artist?.trim() || '未知艺术家'
+            const name = track.artist?.trim() || '未知歌手'
             const key = name.toLowerCase()
 
             if (!artistMap.has(key)) {
@@ -48,7 +52,6 @@
             }
 
             const artist = artistMap.get(key)!
-
             artist.tracks.push(track)
 
             if (track.album?.trim()) {
@@ -70,80 +73,215 @@
         }))
     }
 
-    let artists = $derived.by(() => buildArtists(musicLibrary.tracks))
-
-    let filteredArtists = $derived.by(() => {
-        const keyword = query.trim().toLowerCase()
+    const artists = $derived(buildArtists(musicLibrary.tracks))
 
+    const filteredArtists = $derived.by(() => {
+        const keyword = searchQuery.trim().toLowerCase()
         const list = keyword
             ? artists.filter(artist =>
                   artist.name.toLowerCase().includes(keyword),
               )
             : artists
 
-        return [...list].sort((a, b) => {
-            if (sortBy === 'name') {
-                return collator.compare(a.name, b.name)
-            }
-
-            return b[sortBy] - a[sortBy]
-        })
+        return [...list].sort((a, b) => collator.compare(a.name, b.name))
     })
 
-    let artistItems = $derived(
-        filteredArtists.map(artist => ({
-            id: artist.id,
-            title: artist.name,
-            subtitle: `${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`,
-            image: artist.cover,
-            href: `/artists/${artist.id}`,
-            shape: 'circle' as const,
-        })),
-    )
+    function playAll(tracks: Track[]) {
+        if (tracks.length === 0) return
+        player.replacePlaylistAndPlay(tracks, tracks[0].id)
+    }
 </script>
 
+<svelte:window bind:innerWidth={windowWidth} />
+
 <svelte:head>
     <title>艺术家</title>
 </svelte:head>
 
-<header class="pb-5">
-    <Heading eyebrow="artist" title="艺术家">
-        <div class="flex items-center gap-2">
-            <Button
-                variant="outlined"
-                onclick={() => musicLibrary.scan()}
+<div class="flex flex-col h-full overflow-hidden">
+    <header
+        class="pb-4 shrink-0 border-b border-[rgb(var(--mdui-color-outline-variant))]"
+    >
+        <Heading eyebrow="Artist" title="歌手" />
+        <div class="mt-2 px-1 max-w-md">
+            <SearchBar bind:value={searchQuery} />
+        </div>
+    </header>
+
+    {#if musicLibrary.isLoading}
+        <div class="flex flex-1 items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else if musicLibrary.error}
+        <div class="flex flex-1 items-center justify-center text-red-500">
+            {musicLibrary.error}
+        </div>
+    {:else if isMobile}
+        <div class="flex-1 overflow-hidden min-h-0 flex flex-col">
+            {#if selectedArtist === null}
+                <div class="flex-1 overflow-y-auto pb-8">
+                    {#if filteredArtists.length === 0}
+                        <div
+                            class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]"
+                        >
+                            <span class="text-4xl mb-2">👤</span>
+                            <span class="text-sm">没有找到歌手</span>
+                        </div>
+                    {:else}
+                        <mdui-list>
+                            {#each filteredArtists as artist (artist.id)}
+                                <mdui-list-item
+                                    headline={artist.name}
+                                    description={`${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`}
+                                    onclick={() => {
+                                        selectedArtist = artist
+                                    }}
+                                    onkeydown={(e: KeyboardEvent) =>
+                                        (e.key === 'Enter' || e.key === ' ') &&
+                                        (selectedArtist = artist)}
+                                    role="button"
+                                    tabindex="0"
+                                >
+                                    {#if artist.cover}
+                                        <img
+                                            src={artist.cover}
+                                            slot="icon"
+                                            class="w-10 h-10 rounded-full object-cover shrink-0"
+                                            alt=""
+                                        />
+                                    {:else}
+                                        <div
+                                            slot="icon"
+                                            class="w-10 h-10 rounded-full bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0"
+                                        >
+                                            👤
+                                        </div>
+                                    {/if}
+                                </mdui-list-item>
+                            {/each}
+                        </mdui-list>
+                    {/if}
+                </div>
+            {:else}
+                <div class="flex-1 flex flex-col overflow-hidden min-h-0">
+                    <div
+                        class="flex items-center gap-3 py-3 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0"
+                    >
+                        <IconButton
+                            icon="arrow_back--rounded"
+                            onclick={() => {
+                                selectedArtist = null
+                            }}
+                        />
+                        <div class="flex-1 min-w-0">
+                            <h2
+                                class="text-base font-semibold truncate text-[rgb(var(--mdui-color-on-surface))]"
+                            >
+                                {selectedArtist.name}
+                            </h2>
+                            <p
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                {selectedArtist.trackCount} 首歌曲 · {selectedArtist.albumCount}
+                                张专辑
+                            </p>
+                        </div>
+                        <Button
+                            variant="filled"
+                            onclick={() => playAll(selectedArtist!.tracks)}
+                            >播放全部</Button
+                        >
+                    </div>
+                    <div class="flex-1 overflow-y-auto pb-8">
+                        <TrackList tracks={selectedArtist.tracks} />
+                    </div>
+                </div>
+            {/if}
+        </div>
+    {:else}
+        <div class="flex-1 flex overflow-hidden min-h-0">
+            <div
+                class="flex-1 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8"
             >
-                刷新
-            </Button>
+                {#if filteredArtists.length === 0}
+                    <div
+                        class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        <span class="text-4xl mb-2">👤</span>
+                        <span class="text-sm">没有找到歌手</span>
+                    </div>
+                {:else}
+                    <mdui-list>
+                        {#each filteredArtists as artist (artist.id)}
+                            <mdui-list-item
+                                headline={artist.name}
+                                description={`${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`}
+                                onclick={() => {
+                                    selectedArtist = artist
+                                }}
+                                onkeydown={(e: KeyboardEvent) =>
+                                    (e.key === 'Enter' || e.key === ' ') &&
+                                    (selectedArtist = artist)}
+                                role="button"
+                                tabindex="0"
+                                active={selectedArtist?.id === artist.id}
+                            >
+                                {#if artist.cover}
+                                    <img
+                                        src={artist.cover}
+                                        slot="icon"
+                                        class="w-10 h-10 rounded-full object-cover shrink-0"
+                                        alt=""
+                                    />
+                                {:else}
+                                    <div
+                                        slot="icon"
+                                        class="w-10 h-10 rounded-full bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0"
+                                    >
+                                        👤
+                                    </div>
+                                {/if}
+                            </mdui-list-item>
+                        {/each}
+                    </mdui-list>
+                {/if}
+            </div>
+            <div class="flex-1 flex flex-col overflow-hidden min-h-0">
+                {#if selectedArtist === null}
+                    <div
+                        class="flex-1 flex flex-col items-center justify-center text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        <span class="text-5xl mb-2">👤</span>
+                        <span class="text-sm">选择一个歌手以查看歌曲</span>
+                    </div>
+                {:else}
+                    <div
+                        class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0"
+                    >
+                        <div>
+                            <h2
+                                class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+                            >
+                                {selectedArtist.name}
+                            </h2>
+                            <p
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                {selectedArtist.trackCount} 首歌曲 · {selectedArtist.albumCount}
+                                张专辑
+                            </p>
+                        </div>
+                        <Button
+                            variant="filled"
+                            onclick={() => playAll(selectedArtist!.tracks)}
+                            >播放全部</Button
+                        >
+                    </div>
+                    <div class="flex-1 overflow-y-auto pb-8">
+                        <TrackList tracks={selectedArtist.tracks} columns={['index', 'title', 'duration']}/>
+                    </div>
+                {/if}
+            </div>
         </div>
-    </Heading>
-
-    <Filters
-        bind:query
-        bind:sortBy
-        searchPlaceholder="搜索歌手..."
-        sortOptions={[
-            { label: '按名称排序', value: 'name' },
-            { label: '按歌曲数排序', value: 'trackCount' },
-            { label: '按专辑数排序', value: 'albumCount' },
-        ]}
-    />
-</header>
-
-{#if musicLibrary.isLoading}
-    <div class="flex flex-1 items-center justify-center">
-        <mdui-circular-progress></mdui-circular-progress>
-    </div>
-{:else if musicLibrary.error}
-    <div class="flex flex-1 items-center justify-center text-red-500">
-        {musicLibrary.error}
-    </div>
-{:else}
-    <div class="min-h-0 flex-1 overflow-auto pb-8">
-        <MediaGrid
-            items={artistItems}
-            emptyTitle="没有找到歌手"
-            emptyDescription="尝试刷新媒体库或修改搜索关键词"
-        />
-    </div>
-{/if}
+    {/if}
+</div>
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index aa6bd66..2c278a5 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -6,13 +6,16 @@
 
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
-    import Filters from '$lib/features/Filters.svelte'
+    import SearchBar from '$lib/components/base/SearchBar.svelte'
+
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
+    import 'mdui/components/segmented-button-group.js'
+    import 'mdui/components/segmented-button.js'
 
     type SortBy = 'title' | 'artist' | 'album'
 
-    let query = $state('')
+    let searchQuery = $state('')
     let sortBy = $state<SortBy>('title')
 
     const collator = new Intl.Collator('zh-Hans-CN', {
@@ -20,30 +23,32 @@
         sensitivity: 'base',
     })
 
-    let filteredTracks = $derived.by(() => {
-        const keyword = query.trim().toLowerCase()
-
-        const tracks = keyword
-            ? musicLibrary.tracks.filter(track =>
-                  [track.title, track.artist, track.album, track.path]
-                      .filter(Boolean)
-                      .some(value => value.toLowerCase().includes(keyword)),
-              )
-            : musicLibrary.tracks
+    const searchResults = $derived(
+        musicLibrary.tracks.filter(track => 
+            (track.title ?? '').toLowerCase().includes(searchQuery.toLowerCase()) ||
+            (track.artist ?? '').toLowerCase().includes(searchQuery.toLowerCase()) ||
+            (track.album ?? '').toLowerCase().includes(searchQuery.toLowerCase())
+        )
+    )
 
-        return [...tracks].sort((a, b) => {
+    const defaultSortedTracks = $derived.by(() => {
+        return [...musicLibrary.tracks].sort((a, b) => {
             return collator.compare(a[sortBy] ?? '', b[sortBy] ?? '')
         })
     })
 
-    let totalDuration = $derived(
-        musicLibrary.tracks.reduce((sum, track) => sum + track.duration, 0),
-    )
+    const displayTracks = $derived(searchQuery ? searchResults : defaultSortedTracks)
 
     function playAll() {
-        if (filteredTracks.length === 0) return
+        if (displayTracks.length === 0) return
+        player.replacePlaylistAndPlay(displayTracks, displayTracks[0].id)
+    }
 
-        player.replacePlaylistAndPlay(filteredTracks, filteredTracks[0].id)
+    function handleSortChange(event: Event) {
+        const value = (event.currentTarget as HTMLElement & { value: string }).value
+        if (value === 'title' || value === 'artist' || value === 'album') {
+            sortBy = value
+        }
     }
 </script>
 
@@ -51,11 +56,12 @@
     <title>歌曲</title>
 </svelte:head>
 
-<header class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5">
-    <Heading eyebrow="library" title="歌曲">
+<div class="flex flex-col h-full overflow-hidden">
+    <header class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-4 shrink-0">
+        <Heading eyebrow="library" title="歌曲">
             <Button
                 variant="filled"
-                disabled={filteredTracks.length === 0}
+                disabled={displayTracks.length === 0}
                 onclick={playAll}
             >
                 播放全部
@@ -67,37 +73,42 @@
             >
                 刷新
             </Button>
-    </Heading>
-    <Filters
-        bind:query
-        bind:sortBy
-        searchPlaceholder="搜索标题、歌手、专辑..."
-        sortOptions={[
-            { label: '按标题排序', value: 'title' },
-            { label: '按歌手排序', value: 'artist' },
-            { label: '按专辑排序', value: 'album' },
-        ]}
-    />
-</header>
+        </Heading>
+        <div class="flex px-2 justify-end gap-16 items-center">
+            <div class="max-w-md">
+                <SearchBar bind:value={searchQuery} />
+            </div>
+            <div class="flex">
+                <mdui-segmented-button-group
+                    selects="single"
+                    value={sortBy}
+                    onchange={handleSortChange}
+                >
+                    <mdui-segmented-button value="title">标题</mdui-segmented-button>
+                    <mdui-segmented-button value="artist">歌手</mdui-segmented-button>
+                    <mdui-segmented-button value="album">专辑</mdui-segmented-button>
+                </mdui-segmented-button-group>
+            </div>
+        </div>
+    </header>
 
-{#if musicLibrary.isLoading}
-    <div class="flex flex-1 items-center justify-center">
-        <mdui-circular-progress></mdui-circular-progress>
-    </div>
-{:else if musicLibrary.error}
-    <div class="flex flex-1 items-center justify-center text-red-500">
-        {musicLibrary.error}
-    </div>
-{:else if filteredTracks.length === 0}
-    <div
-        class="flex flex-1 flex-col items-center justify-center gap-2 text-[rgb(var(--mdui-color-on-surface-variant))]"
-    >
-        <div class="text-5xl">🎵</div>
-        <div class="text-base font-medium">没有找到歌曲</div>
-        <div class="text-sm">尝试刷新媒体库或修改搜索关键词</div>
-    </div>
-{:else}
-    <div class="min-h-0 flex-1 overflow-auto">
-        <TrackList tracks={filteredTracks as Track[]} />
-    </div>
-{/if}
+    {#if musicLibrary.isLoading}
+        <div class="flex flex-1 items-center justify-center">
+            <mdui-circular-progress></mdui-circular-progress>
+        </div>
+    {:else if musicLibrary.error}
+        <div class="flex flex-1 items-center justify-center text-red-500">
+            {musicLibrary.error}
+        </div>
+    {:else if displayTracks.length === 0}
+        <div class="flex flex-1 flex-col items-center justify-center gap-2 text-[rgb(var(--mdui-color-on-surface-variant))]" >
+            <div class="text-5xl">🎵</div>
+            <div class="text-base font-medium">没有找到歌曲</div>
+            <div class="text-sm">尝试刷新媒体库或修改搜索关键词</div>
+        </div>
+    {:else}
+        <div class="min-h-0 flex-1 overflow-auto pb-8">
+            <TrackList tracks={displayTracks as Track[]} />
+        </div>
+    {/if}
+</div>

From 656413335255e2b454e0ceacd88ae201c53062f5 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 31 May 2026 03:28:34 +0800
Subject: [PATCH 19/39] refactor: implement derived music maps and toggleable
 album grouping

- Add private derived maps (`#albumsMap`/`#artistsMap`) and public getters to MusicLibrary.
- Implement persistent `useAlbumArtistGrouping` state and UI toggle switch.
- Refactor album and artist pages to use ID-based selection and updated filtering.
- Update related types, settings configurations, and UI layout alignments.
---
 src/lib/state/library.svelte.ts  | 138 +++++++++++++++++---
 src/lib/state/settings.svelte.ts |   1 +
 src/lib/types/music.ts           |   4 +-
 src/lib/types/settings.ts        |   1 +
 src/routes/album/+page.svelte    | 216 ++++++++++++++++++++-----------
 src/routes/artists/+page.svelte  |  82 +++---------
 src/routes/library/+page.svelte  |   2 +-
 7 files changed, 287 insertions(+), 157 deletions(-)

diff --git a/src/lib/state/library.svelte.ts b/src/lib/state/library.svelte.ts
index 78c8c01..62b049e 100644
--- a/src/lib/state/library.svelte.ts
+++ b/src/lib/state/library.svelte.ts
@@ -1,28 +1,139 @@
 import { invoke } from '@tauri-apps/api/core'
 import { listen } from '@tauri-apps/api/event'
-import type { Track } from '../types/music'
+import type { Album, Artist, Track } from '../types/music'
 import { settings } from './settings.svelte'
 
 class MusicLibrary {
     tracks = $state<Track[]>([])
     isLoading = $state(false)
     error = $state<string | null>(null)
-
+    useAlbumArtistGrouping = $state(false)
     initialized = false
 
     private refreshPromise: Promise<Track[]> | null = null
+    #albumsMap = $derived.by(() => {
+        const albumMap = new Map<string, Album>()
+        const useAlbumArtistGrouping = this.useAlbumArtistGrouping
+
+        for (const track of this.tracks) {
+            const albumTitle = track.album?.trim() || '未知专辑'
+
+            const albumOwner = track.albumArtist?.trim() || track.artist?.trim() || '未知歌手'
+            const albumKey = useAlbumArtistGrouping
+                ? `${albumOwner}_${albumTitle}`.toLowerCase()
+                : albumTitle.toLowerCase()
+            const id = encodeURIComponent(albumKey)
+
+            if (!albumMap.has(id)) {
+                albumMap.set(id, {
+                    id,
+                    title: albumTitle,
+                    artist: albumOwner,
+                    tracks: [],
+                    cover: track.cover ?? null,
+                    trackCount: 0,
+                    representativeTrack: track,
+                })
+            }
+
+            const album = albumMap.get(id)!
+            album.tracks.push(track)
+            album.trackCount = album.tracks.length
+
+            if (!album.cover && track.cover) {
+                album.cover = track.cover
+            }
+        }
+
+        return albumMap
+    })
+
+    #artistsMap = $derived.by(() => {
+        const artistMap = new Map<
+            string,
+            Artist & {
+                albumKeys: Set<string>
+            }
+        >()
+
+        for (const track of this.tracks) {
+            const artistName = track.artist?.trim() || '未知歌手'
+            const artistKey = artistName.toLowerCase()
+            const artistId = encodeURIComponent(artistKey)
+
+            if (!artistMap.has(artistId)) {
+                artistMap.set(artistId, {
+                    id: artistId,
+                    name: artistName,
+                    cover: track.cover ?? null,
+                    trackCount: 0,
+                    albumCount: 0,
+                    tracks: [],
+                    albumKeys: new Set(),
+                })
+            }
+
+            const artist = artistMap.get(artistId)!
+
+            artist.tracks.push(track)
+            artist.trackCount = artist.tracks.length
+
+            const albumTitle = track.album?.trim() || '未知专辑'
+            const albumKey = albumTitle.toLowerCase()
+
+            artist.albumKeys.add(albumKey)
+            artist.albumCount = artist.albumKeys.size
+
+            if (!artist.cover && track.cover) {
+                artist.cover = track.cover
+            }
+        }
+
+        return new Map(
+            Array.from(artistMap.values()).map(({ albumKeys, ...artist }) => [
+                artist.id,
+                artist,
+            ]),
+        )
+    })
 
     constructor() {
+        this.useAlbumArtistGrouping = settings.data.useAlbumArtistGrouping ?? false
         void this.setupListener()
     }
 
+    get albums(): Album[] {
+        return Array.from(this.#albumsMap.values())
+    }
+
+    get artists(): Artist[] {
+        return Array.from(this.#artistsMap.values())
+    }
+
+    get albumCount(): number {
+        return this.#albumsMap.size
+    }
+
+    get artistCount(): number {
+        return this.#artistsMap.size
+    }
+
+    get trackCount(): number {
+        return this.tracks.length
+    }
+
+    getAlbum(id: string): Album | undefined {
+        return this.#albumsMap.get(id)
+    }
+
+    getArtist(id: string): Artist | undefined {
+        return this.#artistsMap.get(id)
+    }
+
     private async setupListener() {
-        await listen<Track[]>(
-            'library:refreshed',
-            event => {
-                this.tracks = event.payload
-            },
-        )
+        await listen<Track[]>('library:refreshed', event => {
+            this.tracks = event.payload
+        })
     }
 
     async load(options: { force?: boolean } = {}): Promise<Track[]> {
@@ -62,21 +173,16 @@ class MusicLibrary {
             this.isLoading = true
             this.error = null
 
-            const tracks = await invoke<Track[]>(
-                'scan_music_directories',
-                {
-                    dirs: settings.data.libraryDirs,
-                }
-            )
+            const tracks = await invoke<Track[]>('scan_music_directories', {
+                dirs: settings.data.libraryDirs,
+            })
 
             this.tracks = tracks
 
             return tracks
         } catch (err) {
             console.error('扫描媒体库失败:', err)
-
             this.error = String(err)
-
             return this.tracks
         } finally {
             this.isLoading = false
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index 04b0ffe..24cbc00 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -7,6 +7,7 @@ export const DEFAULT_SETTINGS: AppSettings = {
     libraryDirs: [],
     scanOnStartup: false,
     reduceMotion: false,
+    useAlbumArtistGrouping: false,
 }
 
 class SettingsState {
diff --git a/src/lib/types/music.ts b/src/lib/types/music.ts
index 663907c..8881133 100644
--- a/src/lib/types/music.ts
+++ b/src/lib/types/music.ts
@@ -9,6 +9,7 @@ export interface Track {
     cover?: string | null
     path: string
     url?: string
+    tags?: string[]
 }
 
 export interface Playlist {
@@ -31,8 +32,9 @@ export interface Artist {
 export interface Album {
     id: string
     title: string
+    artist: string
     cover?: string | null
-    trackCount: number
     tracks: Track[]
+    trackCount: number
     representativeTrack: Track
 }
\ No newline at end of file
diff --git a/src/lib/types/settings.ts b/src/lib/types/settings.ts
index 88bd643..d9cef76 100644
--- a/src/lib/types/settings.ts
+++ b/src/lib/types/settings.ts
@@ -7,4 +7,5 @@ export interface AppSettings {
     libraryDirs: string[]
     scanOnStartup: boolean
     reduceMotion: boolean
+    useAlbumArtistGrouping: boolean
 }
\ No newline at end of file
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 20a51ca..2f87f18 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -7,69 +7,38 @@
     import { trackCovers } from '$lib/state/covers.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import { player } from '$lib/state/player.svelte'
+    import { settings } from '$lib/state/settings.svelte'
     import type { Album, Track } from '$lib/types'
 
     import 'mdui/components/circular-progress.js'
     import 'mdui/components/list-item.js'
     import 'mdui/components/list.js'
+    import 'mdui/components/switch.js'
 
     let searchQuery = $state('')
-    let selectedAlbum = $state<Album | null>(null)
+    let selectedAlbumId = $state<string | null>(null)
     let windowWidth = $state(1024)
 
     const isMobile = $derived(windowWidth < 768)
+    const selectedAlbum: Album | undefined = $derived(
+        selectedAlbumId === null
+            ? undefined
+            : musicLibrary.getAlbum(selectedAlbumId),
+    )
 
     const collator = new Intl.Collator('zh-Hans-CN', {
         numeric: true,
         sensitivity: 'base',
     })
 
-    function buildAlbums(tracks: Track[]): Album[] {
-        const albumMap = new Map<
-            string,
-            {
-                title: string
-                tracks: Track[]
-                cover?: string | null
-                representativeTrack: Track
-            }
-        >()
-
-        for (const track of tracks) {
-            const title = track.album?.trim() || '未知专辑'
-            const key = title.toLowerCase()
-
-            if (!albumMap.has(key)) {
-                albumMap.set(key, {
-                    title,
-                    tracks: [],
-                    cover: track.cover ?? null,
-                    representativeTrack: track,
-                })
-            }
-
-            const album = albumMap.get(key)!
-            album.tracks.push(track)
-
-            if (!album.cover && track.cover) {
-                album.cover = track.cover
-            }
-        }
-
-        return Array.from(albumMap.values()).map(album => ({
-            ...album,
-            id: encodeURIComponent(album.title),
-            trackCount: album.tracks.length,
-        }))
-    }
-
-    const albums = $derived(buildAlbums(musicLibrary.tracks))
-
     const filteredAlbums = $derived.by(() => {
         const keyword = searchQuery.trim().toLowerCase()
+        const albums = musicLibrary.albums
         const list = keyword
-            ? albums.filter(album =>
-                  album.title.toLowerCase().includes(keyword),
+            ? albums.filter(
+                  album =>
+                      album.title.toLowerCase().includes(keyword) ||
+                      album.artist.toLowerCase().includes(keyword),
               )
             : albums
 
@@ -86,6 +55,20 @@
         if (tracks.length === 0) return
         player.replacePlaylistAndPlay(tracks, tracks[0].id)
     }
+
+    async function handleAlbumArtistGroupingChange(event: Event) {
+        const checked = (
+            event.currentTarget as HTMLElement & { checked: boolean }
+        ).checked
+
+        if (checked === musicLibrary.useAlbumArtistGrouping) return
+
+        musicLibrary.useAlbumArtistGrouping = checked
+        settings.data.useAlbumArtistGrouping = checked
+        selectedAlbumId = null
+
+        await settings.save()
+    }
 </script>
 
 <svelte:window bind:innerWidth={windowWidth} />
@@ -95,10 +78,24 @@
 </svelte:head>
 
 <div class="flex flex-col h-full overflow-hidden">
-    <header class="pb-4 shrink-0 border-b border-[rgb(var(--mdui-color-outline-variant))]">
+    <header
+        class="pb-4 shrink-0 border-b border-[rgb(var(--mdui-color-outline-variant))]"
+    >
         <Heading eyebrow="Albums" title="专辑" />
-        <div class="mt-2 px-1 max-w-md">
-            <SearchBar bind:value={searchQuery} />
+        <div class="flex mt-2 px-1 gap-16 justify-end items-center">
+            <div class="max-w-md">
+                <SearchBar bind:value={searchQuery} />
+            </div>
+
+            <div
+                class="flex items-center gap-2 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+            >
+                <span>按专辑艺术家分组</span>
+                <mdui-switch
+                    checked={musicLibrary.useAlbumArtistGrouping}
+                    onchange={handleAlbumArtistGroupingChange}
+                ></mdui-switch>
+            </div>
         </div>
     </header>
 
@@ -112,30 +109,46 @@
         </div>
     {:else if isMobile}
         <div class="flex-1 overflow-hidden min-h-0 flex flex-col">
-            {#if selectedAlbum === null}
+            {#if selectedAlbum === undefined}
                 <div class="flex-1 overflow-y-auto pb-8">
                     {#if filteredAlbums.length === 0}
-                        <div class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]">
+                        <div
+                            class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]"
+                        >
                             <span class="text-4xl mb-2">🎵</span>
                             <span class="text-sm">没有找到专辑</span>
                         </div>
                     {:else}
                         <mdui-list>
                             {#each filteredAlbums as album (album.id)}
-                                {@const cover = trackCovers.get(album.representativeTrack) ?? album.cover}
+                                {@const cover =
+                                    trackCovers.get(
+                                        album.representativeTrack,
+                                    ) ?? album.cover}
                                 <mdui-list-item
                                     headline={album.title}
                                     description={`${album.trackCount} 首歌曲`}
-                                    onclick={() => { selectedAlbum = album }}
+                                    onclick={() => {
+                                        selectedAlbumId = album.id
+                                    }}
                                     onkeydown={(e: KeyboardEvent) =>
-                                        (e.key === 'Enter' || e.key === ' ') && (selectedAlbum = album)}
+                                        (e.key === 'Enter' || e.key === ' ') &&
+                                        (selectedAlbumId = album.id)}
                                     role="button"
                                     tabindex="0"
                                 >
                                     {#if cover}
-                                        <img src={cover} slot="icon" class="w-10 h-10 rounded object-cover shrink-0" alt="" />
+                                        <img
+                                            src={cover}
+                                            slot="icon"
+                                            class="w-10 h-10 rounded object-cover shrink-0"
+                                            alt=""
+                                        />
                                     {:else}
-                                        <div slot="icon" class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0">
+                                        <div
+                                            slot="icon"
+                                            class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0"
+                                        >
                                             🎵
                                         </div>
                                     {/if}
@@ -146,13 +159,32 @@
                 </div>
             {:else}
                 <div class="flex-1 flex flex-col overflow-hidden min-h-0">
-                    <div class="flex items-center gap-3 py-3 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0">
-                        <IconButton icon="arrow_back--rounded" onclick={() => { selectedAlbum = null }} />
+                    <div
+                        class="flex items-center gap-3 py-3 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0"
+                    >
+                        <IconButton
+                            icon="arrow_back--rounded"
+                            onclick={() => {
+                                selectedAlbumId = null
+                            }}
+                        />
                         <div class="flex-1 min-w-0">
-                            <h2 class="text-base font-semibold truncate text-[rgb(var(--mdui-color-on-surface))]">{selectedAlbum.title}</h2>
-                            <p class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]">{selectedAlbum.trackCount} 首歌曲</p>
+                            <h2
+                                class="text-base font-semibold truncate text-[rgb(var(--mdui-color-on-surface))]"
+                            >
+                                {selectedAlbum.title}
+                            </h2>
+                            <p
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                {selectedAlbum.trackCount} 首歌曲
+                            </p>
                         </div>
-                        <Button variant="filled" onclick={() => playAll(selectedAlbum!.tracks)}>播放全部</Button>
+                        <Button
+                            variant="filled"
+                            onclick={() => playAll(selectedAlbum.tracks)}
+                            >播放全部</Button
+                        >
                     </div>
                     <div class="flex-1 overflow-y-auto pb-8">
                         <TrackList tracks={selectedAlbum.tracks} />
@@ -162,30 +194,47 @@
         </div>
     {:else}
         <div class="flex-1 flex overflow-hidden min-h-0">
-            <div class="flex-1 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8">
+            <div
+                class="flex-2 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8"
+            >
                 {#if filteredAlbums.length === 0}
-                    <div class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]">
+                    <div
+                        class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
                         <span class="text-4xl mb-2">🎵</span>
                         <span class="text-sm">没有找到专辑</span>
                     </div>
                 {:else}
                     <mdui-list>
                         {#each filteredAlbums as album (album.id)}
-                            {@const cover = trackCovers.get(album.representativeTrack) ?? album.cover}
+                            {@const cover =
+                                trackCovers.get(album.representativeTrack) ??
+                                album.cover}
                             <mdui-list-item
                                 headline={album.title}
                                 description={`${album.trackCount} 首歌曲`}
-                                onclick={() => { selectedAlbum = album }}
+                                onclick={() => {
+                                    selectedAlbumId = album.id
+                                }}
                                 onkeydown={(e: KeyboardEvent) =>
-                                    (e.key === 'Enter' || e.key === ' ') && (selectedAlbum = album)}
+                                    (e.key === 'Enter' || e.key === ' ') &&
+                                    (selectedAlbumId = album.id)}
                                 role="button"
                                 tabindex="0"
-                                active={selectedAlbum?.id === album.id}
+                                active={selectedAlbumId === album.id}
                             >
                                 {#if cover}
-                                    <img src={cover} slot="icon" class="w-10 h-10 rounded object-cover shrink-0" alt="" />
+                                    <img
+                                        src={cover}
+                                        slot="icon"
+                                        class="w-10 h-10 rounded object-cover shrink-0"
+                                        alt=""
+                                    />
                                 {:else}
-                                    <div slot="icon" class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0">
+                                    <div
+                                        slot="icon"
+                                        class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0"
+                                    >
                                         🎵
                                     </div>
                                 {/if}
@@ -195,21 +244,40 @@
                 {/if}
             </div>
             <div class="flex-1 flex flex-col overflow-hidden min-h-0">
-                {#if selectedAlbum === null}
-                    <div class="flex-1 flex flex-col items-center justify-center text-[rgb(var(--mdui-color-on-surface-variant))]">
+                {#if selectedAlbum === undefined}
+                    <div
+                        class="flex-1 flex flex-col items-center justify-center text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
                         <span class="text-5xl mb-2">🎵</span>
                         <span class="text-sm">选择一个专辑以查看歌曲</span>
                     </div>
                 {:else}
-                    <div class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0">
+                    <div
+                        class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0"
+                    >
                         <div>
-                            <h2 class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]">{selectedAlbum.title}</h2>
-                            <p class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]">{selectedAlbum.trackCount} 首歌曲</p>
+                            <h2
+                                class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+                            >
+                                {selectedAlbum.title}
+                            </h2>
+                            <p
+                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                            >
+                                {selectedAlbum.trackCount} 首歌曲
+                            </p>
                         </div>
-                        <Button variant="filled" onclick={() => playAll(selectedAlbum!.tracks)}>播放全部</Button>
+                        <Button
+                            variant="filled"
+                            onclick={() => playAll(selectedAlbum.tracks)}
+                            >播放全部</Button
+                        >
                     </div>
                     <div class="flex-1 overflow-y-auto pb-8">
-                        <TrackList tracks={selectedAlbum.tracks} columns={['index', 'title', 'duration']}/>
+                        <TrackList
+                            tracks={selectedAlbum.tracks}
+                            columns={['title', 'duration']}
+                        />
                     </div>
                 {/if}
             </div>
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index e9d31c7..8c1b893 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -13,70 +13,22 @@
     import 'mdui/components/list.js'
 
     let searchQuery = $state('')
-    let selectedArtist = $state<Artist | null>(null)
+    let selectedArtistId = $state<string | null>(null)
     let windowWidth = $state(1024)
 
     const isMobile = $derived(windowWidth < 768)
+    const selectedArtist: Artist | undefined = $derived(
+        selectedArtistId === null ? undefined : musicLibrary.getArtist(selectedArtistId),
+    )
 
     const collator = new Intl.Collator('zh-Hans-CN', {
         numeric: true,
         sensitivity: 'base',
     })
 
-    function createArtistId(name: string) {
-        return encodeURIComponent(name)
-    }
-
-    function buildArtists(tracks: Track[]): Artist[] {
-        const artistMap = new Map<
-            string,
-            {
-                name: string
-                tracks: Track[]
-                albums: Set<string>
-                cover?: string | null
-            }
-        >()
-
-        for (const track of tracks) {
-            const name = track.artist?.trim() || '未知歌手'
-            const key = name.toLowerCase()
-
-            if (!artistMap.has(key)) {
-                artistMap.set(key, {
-                    name,
-                    tracks: [],
-                    albums: new Set(),
-                    cover: track.cover ?? null,
-                })
-            }
-
-            const artist = artistMap.get(key)!
-            artist.tracks.push(track)
-
-            if (track.album?.trim()) {
-                artist.albums.add(track.album.trim())
-            }
-
-            if (!artist.cover && track.cover) {
-                artist.cover = track.cover
-            }
-        }
-
-        return Array.from(artistMap.values()).map(artist => ({
-            id: createArtistId(artist.name),
-            name: artist.name,
-            cover: artist.cover,
-            trackCount: artist.tracks.length,
-            albumCount: artist.albums.size,
-            tracks: artist.tracks,
-        }))
-    }
-
-    const artists = $derived(buildArtists(musicLibrary.tracks))
-
     const filteredArtists = $derived.by(() => {
         const keyword = searchQuery.trim().toLowerCase()
+        const artists = musicLibrary.artists
         const list = keyword
             ? artists.filter(artist =>
                   artist.name.toLowerCase().includes(keyword),
@@ -118,7 +70,7 @@
         </div>
     {:else if isMobile}
         <div class="flex-1 overflow-hidden min-h-0 flex flex-col">
-            {#if selectedArtist === null}
+            {#if selectedArtist === undefined}
                 <div class="flex-1 overflow-y-auto pb-8">
                     {#if filteredArtists.length === 0}
                         <div
@@ -134,11 +86,11 @@
                                     headline={artist.name}
                                     description={`${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`}
                                     onclick={() => {
-                                        selectedArtist = artist
+                                        selectedArtistId = artist.id
                                     }}
                                     onkeydown={(e: KeyboardEvent) =>
                                         (e.key === 'Enter' || e.key === ' ') &&
-                                        (selectedArtist = artist)}
+                                        (selectedArtistId = artist.id)}
                                     role="button"
                                     tabindex="0"
                                 >
@@ -170,7 +122,7 @@
                         <IconButton
                             icon="arrow_back--rounded"
                             onclick={() => {
-                                selectedArtist = null
+                                selectedArtistId = null
                             }}
                         />
                         <div class="flex-1 min-w-0">
@@ -188,7 +140,7 @@
                         </div>
                         <Button
                             variant="filled"
-                            onclick={() => playAll(selectedArtist!.tracks)}
+                            onclick={() => playAll(selectedArtist.tracks)}
                             >播放全部</Button
                         >
                     </div>
@@ -201,7 +153,7 @@
     {:else}
         <div class="flex-1 flex overflow-hidden min-h-0">
             <div
-                class="flex-1 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8"
+                class="flex-2 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8"
             >
                 {#if filteredArtists.length === 0}
                     <div
@@ -217,14 +169,14 @@
                                 headline={artist.name}
                                 description={`${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`}
                                 onclick={() => {
-                                    selectedArtist = artist
+                                    selectedArtistId = artist.id
                                 }}
                                 onkeydown={(e: KeyboardEvent) =>
                                     (e.key === 'Enter' || e.key === ' ') &&
-                                    (selectedArtist = artist)}
+                                    (selectedArtistId = artist.id)}
                                 role="button"
                                 tabindex="0"
-                                active={selectedArtist?.id === artist.id}
+                                active={selectedArtistId === artist.id}
                             >
                                 {#if artist.cover}
                                     <img
@@ -247,7 +199,7 @@
                 {/if}
             </div>
             <div class="flex-1 flex flex-col overflow-hidden min-h-0">
-                {#if selectedArtist === null}
+                {#if selectedArtist === undefined}
                     <div
                         class="flex-1 flex flex-col items-center justify-center text-[rgb(var(--mdui-color-on-surface-variant))]"
                     >
@@ -273,12 +225,12 @@
                         </div>
                         <Button
                             variant="filled"
-                            onclick={() => playAll(selectedArtist!.tracks)}
+                            onclick={() => playAll(selectedArtist.tracks)}
                             >播放全部</Button
                         >
                     </div>
                     <div class="flex-1 overflow-y-auto pb-8">
-                        <TrackList tracks={selectedArtist.tracks} columns={['index', 'title', 'duration']}/>
+                        <TrackList tracks={selectedArtist.tracks} columns={['title', 'duration']}/>
                     </div>
                 {/if}
             </div>
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index 2c278a5..5af8e9f 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -74,7 +74,7 @@
                 刷新
             </Button>
         </Heading>
-        <div class="flex px-2 justify-end gap-16 items-center">
+        <div class="flex px-2 gap-16 justify-end items-center">
             <div class="max-w-md">
                 <SearchBar bind:value={searchQuery} />
             </div>

From d765c6eb8a2daea8f24a0452431ac66b5300aa40 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 31 May 2026 12:09:54 +0800
Subject: [PATCH 20/39] Add media session controls and tray settings

Add resume/pause Tauri commands and expose them to the invoke handler; wire tray menu to include a "settings" item which emits a tray:navigate event to unminimize and focus the main window. Integrate Web Media Session API in the player (action handlers for play/pause/prev/next/seek, metadata, playback and position state), update play/pause/toggle/seek flows to sync media session state and polling, and add a small refactor (onTrackStarted). UI tweaks: make SearchBar accept a placeholder prop, adjust Appbar layout, and listen for the tray:navigate event in +layout.svelte to navigate to the settings route.
---
 src-tauri/src/commands/playback.rs       |  28 ++++
 src-tauri/src/lib.rs                     |  27 ++-
 src/lib/components/base/SearchBar.svelte |   4 +-
 src/lib/features/shell/Appbar.svelte     |   2 +-
 src/lib/state/player.svelte.ts           | 204 +++++++++++++++++++++--
 src/routes/+layout.svelte                |  13 ++
 6 files changed, 254 insertions(+), 24 deletions(-)

diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index c86e95e..aa76444 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -47,6 +47,34 @@ pub async fn play_music(full_path: &str) -> Result<String, String> {
 
     Ok(format!("Playing music: {}", full_path))
 }
+#[command]
+pub async fn resume_music() -> Result<(), String> {
+    let state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
+    if let Some(ref media) = state.media {
+        media.play();
+        Ok(())
+    } else {
+        Err("No media available".into())
+    }
+}
+
+#[command]
+pub async fn pause_music() -> Result<(), String> {
+    let state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
+    if let Some(ref media) = state.media {
+        media.pause();
+        Ok(())
+    } else {
+        Err("No media available".into())
+    }
+}
+
 
 #[command]
 pub async fn toggle_music() -> Result<bool, String> {
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 7ab0700..c4cb30f 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -2,6 +2,7 @@ mod audio;
 mod commands;
 mod metadata;
 mod models;
+
 use tauri::{
     menu::{Menu, MenuItem},
     tray::{MouseButton, TrayIconBuilder, TrayIconEvent},
@@ -12,7 +13,7 @@ use commands::library::{
     execute_scan, get_track_cover, load_music_library, save_music_library, scan_music_directories,
 };
 
-use commands::playback::{current_time, play_music, set_current_time, set_volume, toggle_music};
+use commands::playback::{current_time, play_music, set_current_time, set_volume, resume_music, pause_music, toggle_music};
 
 use commands::recent::{add_recently_played, clear_recently_played, load_recently_played};
 
@@ -36,24 +37,33 @@ pub fn run() {
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_store::Builder::new().build())
         .setup(|app| {
-            let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
-            let menu = Menu::with_items(app, &[&quit_i])?;
+            let settings_item = MenuItem::with_id(app, "settings", "设置", true, None::<&str>)?;
+            let quit_item = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
+            let menu = Menu::with_items(app, &[&settings_item, &quit_item])?;
 
             let _tray = TrayIconBuilder::new()
                 .icon(app.default_window_icon().unwrap().clone())
                 .menu(&menu)
                 .show_menu_on_left_click(false)
                 .on_menu_event(|app: &tauri::AppHandle, event| match event.id.as_ref() {
+                    "settings" => {
+                        if let Some(window) = app.get_webview_window("main") {
+                            let _ = window.emit("tray:navigate", "settings");
+                            let _ = window.unminimize();
+                            let _ = window.show();
+                            let _ = window.set_focus();
+                        }
+                    }
                     "quit" => {
                         app.exit(0);
                     }
                     _ => {}
                 })
-                .on_tray_icon_event(|tray, event| match event {
-                    TrayIconEvent::Click {
+                .on_tray_icon_event(|tray, event| {
+                    if let TrayIconEvent::Click {
                         button: MouseButton::Left,
                         ..
-                    } => {
+                    } = event {
                         let app = tray.app_handle();
                         if let Some(window) = app.get_webview_window("main") {
                             let _ = window.unminimize();
@@ -61,9 +71,6 @@ pub fn run() {
                             let _ = window.set_focus();
                         }
                     }
-                    _ => {
-                        println!("unhandled event {event:?}");
-                    }
                 })
                 .build(app)?;
 
@@ -86,6 +93,8 @@ pub fn run() {
         })
         .invoke_handler(tauri::generate_handler![
             play_music,
+            resume_music,
+            pause_music,
             toggle_music,
             current_time,
             set_current_time,
diff --git a/src/lib/components/base/SearchBar.svelte b/src/lib/components/base/SearchBar.svelte
index 4aeb707..3a4e61a 100644
--- a/src/lib/components/base/SearchBar.svelte
+++ b/src/lib/components/base/SearchBar.svelte
@@ -2,7 +2,7 @@
   import '@mdui/icons/close--rounded.js'
   import '@mdui/icons/search--rounded.js'
 
-  let { value = $bindable('') } = $props()
+  let { value = $bindable(''), placeholder="搜索歌曲、歌手、专辑..." } = $props()
 </script>
 
 <div
@@ -14,7 +14,7 @@
   <mdui-icon-search--rounded class="text-[rgb(var(--mdui-color-on-surface-variant))] text-base shrink-0"></mdui-icon-search--rounded>
   <input
     type="text"
-    placeholder="搜索歌曲、歌手、专辑..."
+    {placeholder}
     bind:value={value}
     class="flex-1 h-full bg-transparent border-none outline-none text-sm text-[rgb(var(--mdui-color-on-surface))] placeholder-[rgb(var(--mdui-color-on-surface-variant))]"
   />
diff --git a/src/lib/features/shell/Appbar.svelte b/src/lib/features/shell/Appbar.svelte
index cc76ca7..581c34a 100644
--- a/src/lib/features/shell/Appbar.svelte
+++ b/src/lib/features/shell/Appbar.svelte
@@ -47,7 +47,7 @@
   </mdui-top-app-bar-title>
 
   <div class="flex-1 flex items-center justify-center">
-    <div class="max-w-md w-full px-4">
+    <div class="max-w-md px-4">
       <SearchBar bind:value={globalSearch.query} />
     </div>
   </div>
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 7177f11..07b7c3e 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -28,7 +28,152 @@ class Player {
     #pollTimer: any = null
     private loadToken = 0
 
-    constructor() {}
+    constructor() {
+        this.setupMediaSession()
+    }
+
+    private setupMediaSession() {
+        if (!('mediaSession' in navigator)) {
+            return
+        }
+
+        navigator.mediaSession.setActionHandler(
+            'play',
+            () => this.resume(),
+        )
+
+        navigator.mediaSession.setActionHandler(
+            'pause',
+            () => this.pause(),
+        )
+
+        navigator.mediaSession.setActionHandler(
+            'previoustrack',
+            () => this.prev(),
+        )
+
+        navigator.mediaSession.setActionHandler(
+            'nexttrack',
+            () => this.next(),
+        )
+
+        navigator.mediaSession.setActionHandler(
+            'seekto',
+            details => {
+                const seekTime = details.seekTime
+                if (seekTime == null) {
+                    return
+                }
+                void this.seek(seekTime)
+            },
+        )
+
+        navigator.mediaSession.setActionHandler(
+            'seekforward',
+            () => {
+                if (!this.currentTrack) {
+                    return
+                }
+                void this.seek(
+                    Math.min(
+                        this.currentTime + 10,
+                        this.currentTrack.duration,
+                    ),
+                )
+            },
+        )
+
+        navigator.mediaSession.setActionHandler(
+            'seekbackward',
+            () => {
+                if (!this.currentTrack) {
+                    return
+                }
+                void this.seek(
+                    Math.max(
+                        this.currentTime - 10,
+                        0,
+                    ),
+                )
+            },
+        )
+    }
+
+    private updateMediaMetadata() {
+        if (
+            !('mediaSession' in navigator) ||
+            !this.currentTrack
+        ) {
+            return
+        }
+
+        navigator.mediaSession.metadata =
+            new MediaMetadata({
+                title: this.currentTrack.title,
+                artist:
+                    this.currentTrack.artist ??
+                    '未知歌手',
+                album:
+                    this.currentTrack.album ??
+                    '未知专辑',
+                artwork: this.buildArtwork(),
+            })
+    }
+
+    private buildArtwork() {
+        const cover = this.currentTrack?.cover
+        if (!cover) {
+            return []
+        }
+        return [
+            {
+                src: cover
+            },
+        ]
+    }
+
+    private updatePlaybackState() {
+        if (!('mediaSession' in navigator)) {
+            return
+        }
+
+        navigator.mediaSession.playbackState =
+            this.playing
+                ? 'playing'
+                : 'paused'
+    }
+
+    private updatePositionState() {
+        const track = this.currentTrack
+        if (
+            !track ||
+            !('mediaSession' in navigator) ||
+            !('setPositionState' in navigator.mediaSession)
+        ) {
+            return
+        }
+
+        navigator.mediaSession.setPositionState({
+            duration: track.duration,
+            playbackRate: this.playing ? 1 : 0,
+            position: this.currentTime,
+        })
+    }
+
+    private syncMediaSession() {
+        this.updateMediaMetadata()
+        this.updatePlaybackState()
+        this.updatePositionState()
+    }
+
+    private clearMediaSession() {
+        if (!('mediaSession' in navigator)) {
+            return
+        }
+
+        navigator.mediaSession.metadata = null
+        navigator.mediaSession.playbackState = 'none'
+    }
 
     get currentTrack(): Track | null {
         if (this.currentIndex >= 0 && this.currentIndex < this.playlist.length) {
@@ -66,6 +211,7 @@ class Player {
             this.currentIndex = -1
             this.playing = false
             this.playbackHistory = []
+            this.clearMediaSession()
             this.stopPolling()
             invoke('toggle_music').catch(console.error)
             return
@@ -126,6 +272,7 @@ class Player {
             this.currentIndex = -1
             this.playing = false
             this.playbackHistory = []
+            this.clearMediaSession()
             this.stopPolling()
             invoke('toggle_music').catch(console.error)
             return
@@ -189,6 +336,15 @@ class Player {
         return this.currentIndex <= 0 ? this.playlist.length - 1 : this.currentIndex - 1
     }
 
+    private storePromise: ReturnType<typeof load> | null = null
+
+    private async getStore() {
+        if (!this.storePromise) {
+            this.storePromise = load(STORE_NAME)
+        }
+        return this.storePromise
+    }
+
     next() {
         if (this.playlist.length === 0) return
         const current = this.currentTrack
@@ -214,25 +370,44 @@ class Player {
         void this.loadAndPlay()
     }
 
-    toggle = async () => {
+    resume = async () => {
         try {
-            const isPlayingNow = await invoke<boolean>('toggle_music')
-            this.playing = isPlayingNow
-            if (this.playing) {
-                this.startPolling()
-            } else {
-                this.stopPolling()
-            }
+            await invoke('resume_music')
+            this.playing = true
+            this.syncMediaSession()
+            this.startPolling()
         } catch (err) {
             console.error(err)
         }
     }
 
+    pause = async () => {
+        try {
+            await invoke('pause_music')
+            this.playing = false
+            this.syncMediaSession()
+            this.stopPolling()
+        } catch (err) {
+            console.error(err)
+        }
+    }
+
+    toggle = async () => {
+        if (this.playing) {
+            await this.pause()
+        } else {
+            await this.resume()
+        }
+    }
+
     seek = async (time: number) => {
         this.stopPolling()
         await invoke('set_current_time', { time })
         this.currentTime = time
-        if (this.playing) this.startPolling()
+        this.updatePositionState()
+        if (this.playing) {
+            this.startPolling()
+        }
     }
 
     async loadState() {
@@ -273,6 +448,12 @@ class Player {
             console.error(err)
         }
     }
+    
+    private onTrackStarted(track: Track) {
+        this.playing = true
+        this.syncMediaSession()
+        recentlyPlayed.add(track)
+    }
 
     private async loadAndPlay() {
         const track = this.currentTrack
@@ -293,8 +474,7 @@ class Player {
                 return
             }
 
-            this.playing = true
-            recentlyPlayed.add(track)
+            this.onTrackStarted(track)
             this.startPolling()
         } catch (err) {
             if (currentToken === this.loadToken) {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index de71a18..07afaa5 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -11,12 +11,25 @@
     import { onMount } from 'svelte'
     import '../app.css'
 
+    import { goto } from '$app/navigation'
+    import { listen } from '@tauri-apps/api/event'
+
     let { children } = $props()
 
     onMount(() => {
         void settings.load()
         void musicLibrary.load()
         void player.loadState()
+
+        const unlisten = listen<string>('tray:navigate', event => {
+            if (event.payload === 'settings') {
+                goto('/settings')
+            }
+        })
+
+        return () => {
+            unlisten.then(fn => fn())
+        }
     })
 
     $effect(() => {

From 7ae427476086b559cf7c0802a6a1f0a7e0fd2f32 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 31 May 2026 12:28:28 +0800
Subject: [PATCH 21/39] Update player.svelte.ts

---
 src/lib/state/player.svelte.ts | 285 ++++++++++++---------------------
 1 file changed, 98 insertions(+), 187 deletions(-)

diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 07b7c3e..72df544 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -5,13 +5,6 @@ import { recentlyPlayed } from "./recent.svelte"
 
 type PlayMode = 'list' | 'single' | 'shuffle'
 
-interface PersistedState {
-    playlist: Track[]
-    currentIndex: number
-    playMode: PlayMode
-    volume: number
-}
-
 const STORE_NAME = "player-state.json"
 
 class Player {
@@ -26,132 +19,59 @@ class Player {
     #volume = $state<number>(80)
     #previousVolume = 80
     #pollTimer: any = null
-    private loadToken = 0
+    #loadToken = 0
+    #storePromise: ReturnType<typeof load> | null = null
 
     constructor() {
-        this.setupMediaSession()
+        this.#setupMediaSession()
     }
 
-    private setupMediaSession() {
-        if (!('mediaSession' in navigator)) {
-            return
-        }
+    #setupMediaSession() {
+        if (!('mediaSession' in navigator)) return
 
-        navigator.mediaSession.setActionHandler(
-            'play',
-            () => this.resume(),
-        )
-
-        navigator.mediaSession.setActionHandler(
-            'pause',
-            () => this.pause(),
-        )
-
-        navigator.mediaSession.setActionHandler(
-            'previoustrack',
-            () => this.prev(),
-        )
-
-        navigator.mediaSession.setActionHandler(
-            'nexttrack',
-            () => this.next(),
-        )
-
-        navigator.mediaSession.setActionHandler(
-            'seekto',
-            details => {
-                const seekTime = details.seekTime
-                if (seekTime == null) {
-                    return
-                }
-                void this.seek(seekTime)
-            },
-        )
-
-        navigator.mediaSession.setActionHandler(
-            'seekforward',
-            () => {
-                if (!this.currentTrack) {
-                    return
-                }
-                void this.seek(
-                    Math.min(
-                        this.currentTime + 10,
-                        this.currentTrack.duration,
-                    ),
-                )
-            },
-        )
-
-        navigator.mediaSession.setActionHandler(
-            'seekbackward',
-            () => {
-                if (!this.currentTrack) {
-                    return
-                }
-                void this.seek(
-                    Math.max(
-                        this.currentTime - 10,
-                        0,
-                    ),
-                )
-            },
-        )
-    }
-
-    private updateMediaMetadata() {
-        if (
-            !('mediaSession' in navigator) ||
-            !this.currentTrack
-        ) {
-            return
-        }
+        navigator.mediaSession.setActionHandler('play', () => this.resume())
+        navigator.mediaSession.setActionHandler('pause', () => this.pause())
+        navigator.mediaSession.setActionHandler('previoustrack', () => this.prev())
+        navigator.mediaSession.setActionHandler('nexttrack', () => this.next())
+        navigator.mediaSession.setActionHandler('seekto', details => {
+            const seekTime = details.seekTime
+            if (seekTime == null) return
+            void this.seek(seekTime)
+        })
+        navigator.mediaSession.setActionHandler('seekforward', () => {
+            if (!this.currentTrack) return
+            void this.seek(Math.min(this.currentTime + 10, this.currentTrack.duration))
+        })
+        navigator.mediaSession.setActionHandler('seekbackward', () => {
+            if (!this.currentTrack) return
+            void this.seek(Math.max(this.currentTime - 10, 0))
+        })
+    }
+
+    #updateMediaMetadata() {
+        if (!('mediaSession' in navigator) || !this.currentTrack) return
 
-        navigator.mediaSession.metadata =
-            new MediaMetadata({
-                title: this.currentTrack.title,
-                artist:
-                    this.currentTrack.artist ??
-                    '未知歌手',
-                album:
-                    this.currentTrack.album ??
-                    '未知专辑',
-                artwork: this.buildArtwork(),
-            })
+        navigator.mediaSession.metadata = new MediaMetadata({
+            title: this.currentTrack.title,
+            artist: this.currentTrack.artist ?? '未知歌手',
+            album: this.currentTrack.album ?? '未知专辑',
+            artwork: this.#buildArtwork(),
+        })
     }
 
-    private buildArtwork() {
+    #buildArtwork() {
         const cover = this.currentTrack?.cover
-        if (!cover) {
-            return []
-        }
-        return [
-            {
-                src: cover
-            },
-        ]
+        return cover ? [{ src: cover }] : []
     }
 
-    private updatePlaybackState() {
-        if (!('mediaSession' in navigator)) {
-            return
-        }
-
-        navigator.mediaSession.playbackState =
-            this.playing
-                ? 'playing'
-                : 'paused'
+    #updatePlaybackState() {
+        if (!('mediaSession' in navigator)) return
+        navigator.mediaSession.playbackState = this.playing ? 'playing' : 'paused'
     }
 
-    private updatePositionState() {
+    #updatePositionState() {
         const track = this.currentTrack
-        if (
-            !track ||
-            !('mediaSession' in navigator) ||
-            !('setPositionState' in navigator.mediaSession)
-        ) {
-            return
-        }
+        if (!track || !('mediaSession' in navigator) || !('setPositionState' in navigator.mediaSession)) return
 
         navigator.mediaSession.setPositionState({
             duration: track.duration,
@@ -160,17 +80,14 @@ class Player {
         })
     }
 
-    private syncMediaSession() {
-        this.updateMediaMetadata()
-        this.updatePlaybackState()
-        this.updatePositionState()
+    #syncMediaSession() {
+        this.#updateMediaMetadata()
+        this.#updatePlaybackState()
+        this.#updatePositionState()
     }
 
-    private clearMediaSession() {
-        if (!('mediaSession' in navigator)) {
-            return
-        }
-
+    #clearMediaSession() {
+        if (!('mediaSession' in navigator)) return
         navigator.mediaSession.metadata = null
         navigator.mediaSession.playbackState = 'none'
     }
@@ -189,7 +106,7 @@ class Player {
             this.#muted = false
         }
         invoke('set_volume', { volume }).catch(console.error)
-        void this.persist()
+        void this.#persist()
     }
 
     get muted() { return this.#muted }
@@ -205,14 +122,21 @@ class Player {
         }
     }
 
+    async #getStore() {
+        if (!this.#storePromise) {
+            this.#storePromise = load(STORE_NAME)
+        }
+        return this.#storePromise
+    }
+
     replacePlaylistAndPlay(tracks: Track[], targetId: string) {
         if (tracks.length === 0) {
             this.playlist = []
             this.currentIndex = -1
             this.playing = false
             this.playbackHistory = []
-            this.clearMediaSession()
-            this.stopPolling()
+            this.#clearMediaSession()
+            this.#stopPolling()
             invoke('toggle_music').catch(console.error)
             return
         }
@@ -224,8 +148,8 @@ class Player {
         this.playbackHistory = []
         this.playlist = nextQueue
         this.currentIndex = nextIndex
-        void this.loadAndPlay()
-        void this.persist()
+        void this.#loadAndPlay()
+        void this.#persist()
     }
 
     appendTrack(track: Track) {
@@ -235,9 +159,7 @@ class Player {
 
     insertNext(track: Track) {
         const existingIndex = this.playlist.findIndex(item => item.id === track.id)
-        if (existingIndex === this.currentIndex && this.currentIndex !== -1) {
-            return
-        }
+        if (existingIndex === this.currentIndex && this.currentIndex !== -1) return
 
         let nextQueue = [...this.playlist]
         let nextIndex = this.currentIndex
@@ -272,8 +194,8 @@ class Player {
             this.currentIndex = -1
             this.playing = false
             this.playbackHistory = []
-            this.clearMediaSession()
-            this.stopPolling()
+            this.#clearMediaSession()
+            this.#stopPolling()
             invoke('toggle_music').catch(console.error)
             return
         }
@@ -282,7 +204,7 @@ class Player {
             const nextIndex = Math.min(removeIndex, nextQueue.length - 1)
             this.playlist = nextQueue
             this.currentIndex = nextIndex
-            void this.loadAndPlay()
+            void this.#loadAndPlay()
             return
         }
 
@@ -297,22 +219,22 @@ class Player {
     playTrackInQueue(index: number) {
         if (index < 0 || index >= this.playlist.length) return
         this.currentIndex = index
-        void this.loadAndPlay()
-        void this.persist()
+        void this.#loadAndPlay()
+        void this.#persist()
     }
 
     cyclePlayMode() {
         const modes: PlayMode[] = ['list', 'single', 'shuffle']
         const currentModeIndex = modes.indexOf(this.playMode)
         this.playMode = modes[(currentModeIndex + 1) % modes.length]
-        void this.persist()
+        void this.#persist()
     }
 
     toggleQueue() {
         this.queueOpen = !this.queueOpen
     }
 
-    private getNextIndex(): number {
+    #getNextIndex(): number {
         if (this.playlist.length <= 1) return 0
         if (this.playMode === 'shuffle') {
             let nextIndex = this.currentIndex
@@ -324,7 +246,7 @@ class Player {
         return this.currentIndex >= this.playlist.length - 1 ? 0 : this.currentIndex + 1
     }
 
-    private getPrevIndex(): number {
+    #getPrevIndex(): number {
         if (this.playlist.length <= 1) return 0
         if (this.playMode === 'shuffle') {
             let prevIndex = this.currentIndex
@@ -336,23 +258,14 @@ class Player {
         return this.currentIndex <= 0 ? this.playlist.length - 1 : this.currentIndex - 1
     }
 
-    private storePromise: ReturnType<typeof load> | null = null
-
-    private async getStore() {
-        if (!this.storePromise) {
-            this.storePromise = load(STORE_NAME)
-        }
-        return this.storePromise
-    }
-
     next() {
         if (this.playlist.length === 0) return
         const current = this.currentTrack
         if (current) {
             this.playbackHistory.push(current.id)
         }
-        this.currentIndex = this.getNextIndex()
-        void this.loadAndPlay()
+        this.currentIndex = this.#getNextIndex()
+        void this.#loadAndPlay()
     }
 
     prev() {
@@ -362,20 +275,20 @@ class Player {
             const index = this.playlist.findIndex(t => t.id === lastId)
             if (index !== -1) {
                 this.currentIndex = index
-                void this.loadAndPlay()
+                void this.#loadAndPlay()
                 return
             }
         }
-        this.currentIndex = this.getPrevIndex()
-        void this.loadAndPlay()
+        this.currentIndex = this.#getPrevIndex()
+        void this.#loadAndPlay()
     }
 
     resume = async () => {
         try {
             await invoke('resume_music')
             this.playing = true
-            this.syncMediaSession()
-            this.startPolling()
+            this.#syncMediaSession()
+            this.#startPolling()
         } catch (err) {
             console.error(err)
         }
@@ -385,8 +298,8 @@ class Player {
         try {
             await invoke('pause_music')
             this.playing = false
-            this.syncMediaSession()
-            this.stopPolling()
+            this.#syncMediaSession()
+            this.#stopPolling()
         } catch (err) {
             console.error(err)
         }
@@ -401,18 +314,18 @@ class Player {
     }
 
     seek = async (time: number) => {
-        this.stopPolling()
+        this.#stopPolling()
         await invoke('set_current_time', { time })
         this.currentTime = time
-        this.updatePositionState()
+        this.#updatePositionState()
         if (this.playing) {
-            this.startPolling()
+            this.#startPolling()
         }
     }
 
     async loadState() {
         try {
-            const store = await load(STORE_NAME)
+            const store = await this.#getStore()
             const playlist = await store.get<Track[]>("playlist")
             const currentIndex = await store.get<number>("currentIndex")
             const playMode = await store.get<PlayMode>("playMode")
@@ -436,9 +349,9 @@ class Player {
         }
     }
 
-    private async persist() {
+    async #persist() {
         try {
-            const store = await load(STORE_NAME)
+            const store = await this.#getStore()
             await store.set("playlist", this.playlist.map(t => ({ ...t, cover: null })))
             await store.set("currentIndex", this.currentIndex)
             await store.set("playMode", this.playMode)
@@ -448,19 +361,19 @@ class Player {
             console.error(err)
         }
     }
-    
-    private onTrackStarted(track: Track) {
+
+    #onTrackStarted(track: Track) {
         this.playing = true
-        this.syncMediaSession()
+        this.#syncMediaSession()
         recentlyPlayed.add(track)
     }
 
-    private async loadAndPlay() {
+    async #loadAndPlay() {
         const track = this.currentTrack
         if (!track) return
 
-        const currentToken = ++this.loadToken
-        this.stopPolling()
+        const currentToken = ++this.#loadToken
+        this.#stopPolling()
 
         try {
             this.currentTime = 0
@@ -470,25 +383,23 @@ class Player {
                 await invoke('play_online_music', { url: track.url, id: track.id })
             }
 
-            if (currentToken !== this.loadToken) {
-                return
-            }
+            if (currentToken !== this.#loadToken) return
 
-            this.onTrackStarted(track)
-            this.startPolling()
+            this.#onTrackStarted(track)
+            this.#startPolling()
         } catch (err) {
-            if (currentToken === this.loadToken) {
+            if (currentToken === this.#loadToken) {
                 this.playing = false
                 console.error(err)
             }
         }
     }
 
-    private startPolling = () => {
-        this.stopPolling()
+    #startPolling = () => {
+        this.#stopPolling()
         this.#pollTimer = setInterval(async () => {
             if (!this.playing) {
-                this.stopPolling()
+                this.#stopPolling()
                 return
             }
             try {
@@ -496,18 +407,18 @@ class Player {
                 if (this.currentTrack && this.currentTime >= this.currentTrack.duration - 0.5) {
                     if (this.playMode === 'single') {
                         this.currentTime = 0
-                        void this.loadAndPlay()
+                        void this.#loadAndPlay()
                     } else {
                         this.next()
                     }
                 }
             } catch (e) {
-                this.stopPolling()
+                this.#stopPolling()
             }
         }, 250)
     }
 
-    private stopPolling = () => {
+    #stopPolling = () => {
         if (this.#pollTimer) {
             clearInterval(this.#pollTimer)
             this.#pollTimer = null
@@ -515,7 +426,7 @@ class Player {
     }
 
     destroy() {
-        this.stopPolling()
+        this.#stopPolling()
     }
 }
 

From a81722c84908eeda85d4befe5ea5cd152ab8d3ba Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 31 May 2026 15:00:36 +0800
Subject: [PATCH 22/39] refactor some styles

---
 src/lib/components/base/Heading.svelte    |  11 +-
 src/lib/components/media/MediaGrid.svelte | 164 +++++++++++++++-------
 src/lib/features/TrackList.svelte         |  10 +-
 src/lib/state/player.svelte.ts            |  29 +++-
 src/routes/album/+page.svelte             | 115 ++++++---------
 src/routes/artists/+page.svelte           | 119 +++++++---------
 src/routes/library/+page.svelte           | 102 +++++++++-----
 src/routes/recent/+page.svelte            |  19 ++-
 8 files changed, 319 insertions(+), 250 deletions(-)

diff --git a/src/lib/components/base/Heading.svelte b/src/lib/components/base/Heading.svelte
index 3614c0e..ac1b195 100644
--- a/src/lib/components/base/Heading.svelte
+++ b/src/lib/components/base/Heading.svelte
@@ -1,22 +1,19 @@
 <script lang="ts">
-    import type { Snippet } from 'svelte'
 
     type PageHeadingProps = {
         eyebrow: string
         title: string
-        children?: Snippet
         class?: string
     }
 
     let {
         eyebrow,
         title,
-        children,
         class: className = '',
     }: PageHeadingProps = $props()
 </script>
 
-<div class="flex justify-between mx-2">
+<div class="mx-2">
     <div>
         <p
             class="text-xs font-semibold uppercase tracking-wider text-[rgb(var(--mdui-color-primary))]"
@@ -30,10 +27,4 @@
             {title}
         </h1>
     </div>
-
-    {#if children}
-        <div class="flex items-center gap-2">
-            {@render children()}
-        </div>
-    {/if}
 </div>
diff --git a/src/lib/components/media/MediaGrid.svelte b/src/lib/components/media/MediaGrid.svelte
index b9f2e68..68e2f92 100644
--- a/src/lib/components/media/MediaGrid.svelte
+++ b/src/lib/components/media/MediaGrid.svelte
@@ -15,69 +15,139 @@
         items,
         emptyTitle = '暂无内容',
         emptyDescription = '这里还没有可以显示的内容',
+        selectedId = null,
+        onselect,
+        onplay,
     }: {
         items: MediaGridItem[]
         emptyTitle?: string
         emptyDescription?: string
+        selectedId?: string | number | null
+        onselect?: (item: MediaGridItem) => void
+        onplay?: (item: MediaGridItem, event: Event) => void
     } = $props()
+
+    function handleSelect(item: MediaGridItem) {
+        onselect?.(item)
+    }
+
+    function handleKeydown(item: MediaGridItem, event: KeyboardEvent) {
+        if (event.key !== 'Enter' && event.key !== ' ') return
+
+        event.preventDefault()
+        handleSelect(item)
+    }
+
+    function handlePlay(item: MediaGridItem, event: Event) {
+        event.preventDefault()
+        event.stopPropagation()
+        onplay?.(item, event)
+    }
+
+    function handlePlayKeydown(item: MediaGridItem, event: KeyboardEvent) {
+        if (event.key !== 'Enter' && event.key !== ' ') return
+
+        handlePlay(item, event)
+    }
 </script>
 
-{#snippet mediaCard(item: MediaGridItem)}
-    <mdui-card
-        href={item.href ?? undefined}
-        class="group"
-        aria-label={item.title}
+{#snippet mediaCardContent(item: MediaGridItem, isSelected: boolean)}
+    <div
+        class="relative mb-3 aspect-square
+               bg-[rgb(var(--mdui-color-surface-container-highest))]
+               {item.shape === 'circle' ? 'rounded-full' : 'rounded-t-xl'}"
     >
-        <div
-            class="relative mb-3 aspect-square overflow
-                       bg-[rgb(var(--mdui-color-surface-container-highest))]
-                       {item.shape === 'circle'
-                ? 'rounded-full'
-                : 'rounded-t-xl'}"
-        >
-            {#if item.image}
-                <img
-                    src={item.image}
-                    alt={item.title}
-                    class="h-full w-full object-cover group-hover:scale-105"
-                    loading="lazy"
-                />
-            {:else}
-                <div
-                    class="flex h-full w-full items-center justify-center text-4xl
-                               text-[rgb(var(--mdui-color-on-surface-variant))]"
-                >
-                    {item.shape === 'circle' ? '👤' : '🎵'}
-                </div>
-            {/if}
+        {#if item.image}
+            <img
+                src={item.image}
+                alt={item.title}
+                class="h-full w-full object-cover transition-transform duration-200 group-hover:scale-105"
+                loading="lazy"
+            />
+        {:else}
+            <div
+                class="flex h-full w-full items-center justify-center text-4xl
+                       text-[rgb(var(--mdui-color-on-surface-variant))]"
+            >
+                {item.shape === 'circle' ? '👤' : '🎵'}
+            </div>
+        {/if}
 
+        {#if onplay}
             <div
-                class="absolute inset-0 flex items-end justify-end p-3 opacity-0
-                           transition-opacity duration-200 group-hover:opacity-100"
+                class="absolute inset-0 flex items-end justify-end p-2 opacity-0
+                       transition-opacity duration-200 group-hover:opacity-100 group-focus-within:opacity-100"
             >
-                <mdui-button-icon variant="filled" icon="play_arrow--rounded"
+                <mdui-button-icon
+                    variant="filled"
+                    icon="play_arrow--rounded"
+                    aria-label={`播放 ${item.title}`}
+                    role="button"
+                    tabindex="0"
+                    onclick={(event: Event) => handlePlay(item, event)}
+                    onkeydown={(event: KeyboardEvent) =>
+                        handlePlayKeydown(item, event)}
                 ></mdui-button-icon>
             </div>
-        </div>
+        {/if}
+    </div>
+
+    <div class="min-w-0 px-2 pb-2">
+        <h2
+            class={[
+                'truncate text-sm font-semibold',
+                isSelected
+                    ? 'text-[rgb(var(--mdui-color-on-secondary-container))]'
+                    : 'text-[rgb(var(--mdui-color-on-surface))]',
+            ]}
+        >
+            {item.title}
+        </h2>
 
-        <div class="min-w-0 px-2">
-            <h2
-                class="truncate text-sm font-semibold
-                           text-[rgb(var(--mdui-color-on-surface))]"
+        {#if item.subtitle}
+            <p
+                class={[
+                    'mt-0 truncate text-xs',
+                    isSelected
+                        ? 'text-[rgb(var(--mdui-color-on-secondary-container))]'
+                        : 'text-[rgb(var(--mdui-color-on-surface-variant))]',
+                ]}
             >
-                {item.title}
-            </h2>
+                {item.subtitle}
+            </p>
+        {/if}
+    </div>
+{/snippet}
 
-            {#if item.subtitle}
-                <p
-                    class="mt-0 truncate text-xs
-                               text-[rgb(var(--mdui-color-on-surface-variant))]"
-                >
-                    {item.subtitle}
-                </p>
-            {/if}
-        </div>
-    </mdui-card>
+{#snippet mediaCard(item: MediaGridItem)}
+    {@const isSelected = selectedId === item.id}
+    {#if onselect}
+        <mdui-card
+            class={[
+                'group cursor-pointer outline-none transition-colors hover:bg-(--mdui-color-secondary-container)/80',
+                isSelected && 'bg-[rgb(var(--mdui-color-secondary-container))]',
+            ]}
+            aria-label={item.title}
+            aria-pressed={isSelected}
+            onclick={() => handleSelect(item)}
+            onkeydown={(event: KeyboardEvent) => handleKeydown(item, event)}
+            role="button"
+            tabindex="0"
+        >
+            {@render mediaCardContent(item, isSelected)}
+        </mdui-card>
+    {:else}
+        <mdui-card
+            href={item.href ?? undefined}
+            class={[
+                'group outline-none transition-colors bg-(--mdui-color-secondary-container)/80',
+                isSelected && 'bg-[rgb(var(--mdui-color-secondary-container))]',
+            ]}
+            aria-label={item.title}
+        >
+            {@render mediaCardContent(item, isSelected)}
+        </mdui-card>
+    {/if}
 {/snippet}
 
 {#if items.length === 0}
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index fe40507..8f8109c 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -15,7 +15,7 @@
     }
 
     const columnWidths: Record<TrackColumn, string> = {
-        index: '48px',
+        index: '24px',
         title: '1fr',
         album: '1fr',
         tags: 'auto',
@@ -87,7 +87,7 @@
 {#snippet trackCover(track: Track, cover: string | null)}
     <div
         {@attach lazyCover(track)}
-        class="w-10 h-10 rounded-md overflow-hidden themed-surface-container shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
+        class="w-10 h-10 rounded-md overflow-hidden shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
     >
         {#if cover}
             <img
@@ -203,7 +203,7 @@
 
 <mdui-list class="flex flex-col w-full">
     <mdui-list-subheader
-        class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b themed-surface-container"
+        class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b"
         style:grid-template-columns={gridTemplate}
         noninteractive
     >
@@ -252,10 +252,6 @@
         border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
     }
 
-    .themed-surface-container {
-        background-color: rgb(var(--mdui-color-surface-container-highest));
-    }
-
     .themed-surface-high {
         background-color: rgb(var(--mdui-color-surface-container-high));
     }
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 72df544..16d51e4 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -21,6 +21,7 @@ class Player {
     #pollTimer: any = null
     #loadToken = 0
     #storePromise: ReturnType<typeof load> | null = null
+    #debounceTimer: any = null
 
     constructor() {
         this.#setupMediaSession()
@@ -106,7 +107,7 @@ class Player {
             this.#muted = false
         }
         invoke('set_volume', { volume }).catch(console.error)
-        void this.#persist()
+        this.#saveDebounced()
     }
 
     get muted() { return this.#muted }
@@ -120,6 +121,7 @@ class Player {
             this.#volume = this.#previousVolume
             invoke('set_volume', { volume: this.#previousVolume }).catch(console.error)
         }
+        this.#saveDebounced()
     }
 
     async #getStore() {
@@ -129,6 +131,13 @@ class Player {
         return this.#storePromise
     }
 
+    #saveDebounced() {
+        if (this.#debounceTimer) clearTimeout(this.#debounceTimer)
+        this.#debounceTimer = setTimeout(() => {
+            void this.#persist()
+        }, 1000)
+    }
+
     replacePlaylistAndPlay(tracks: Track[], targetId: string) {
         if (tracks.length === 0) {
             this.playlist = []
@@ -149,12 +158,13 @@ class Player {
         this.playlist = nextQueue
         this.currentIndex = nextIndex
         void this.#loadAndPlay()
-        void this.#persist()
+        this.#saveDebounced()
     }
 
     appendTrack(track: Track) {
         if (this.playlist.some(t => t.id === track.id)) return
         this.playlist = [...this.playlist, track]
+        this.#saveDebounced()
     }
 
     insertNext(track: Track) {
@@ -174,12 +184,14 @@ class Player {
         if (nextQueue.length === 0 || nextIndex === -1) {
             this.playlist = [track]
             this.currentIndex = 0
+            this.#saveDebounced()
             return
         }
 
         nextQueue.splice(nextIndex + 1, 0, track)
         this.playlist = nextQueue
         this.currentIndex = nextIndex
+        this.#saveDebounced()
     }
 
     removeTrack(id: string) {
@@ -197,6 +209,7 @@ class Player {
             this.#clearMediaSession()
             this.#stopPolling()
             invoke('toggle_music').catch(console.error)
+            this.#saveDebounced()
             return
         }
 
@@ -205,6 +218,7 @@ class Player {
             this.playlist = nextQueue
             this.currentIndex = nextIndex
             void this.#loadAndPlay()
+            this.#saveDebounced()
             return
         }
 
@@ -214,20 +228,21 @@ class Player {
         }
         this.playlist = nextQueue
         this.currentIndex = nextIndex
+        this.#saveDebounced()
     }
 
     playTrackInQueue(index: number) {
         if (index < 0 || index >= this.playlist.length) return
         this.currentIndex = index
         void this.#loadAndPlay()
-        void this.#persist()
+        this.#saveDebounced()
     }
 
     cyclePlayMode() {
         const modes: PlayMode[] = ['list', 'single', 'shuffle']
         const currentModeIndex = modes.indexOf(this.playMode)
         this.playMode = modes[(currentModeIndex + 1) % modes.length]
-        void this.#persist()
+        this.#saveDebounced()
     }
 
     toggleQueue() {
@@ -266,6 +281,7 @@ class Player {
         }
         this.currentIndex = this.#getNextIndex()
         void this.#loadAndPlay()
+        this.#saveDebounced()
     }
 
     prev() {
@@ -276,11 +292,13 @@ class Player {
             if (index !== -1) {
                 this.currentIndex = index
                 void this.#loadAndPlay()
+                this.#saveDebounced()
                 return
             }
         }
         this.currentIndex = this.#getPrevIndex()
         void this.#loadAndPlay()
+        this.#saveDebounced()
     }
 
     resume = async () => {
@@ -427,6 +445,9 @@ class Player {
 
     destroy() {
         this.#stopPolling()
+        if (this.#debounceTimer) {
+            clearTimeout(this.#debounceTimer)
+        }
     }
 }
 
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 2f87f18..fb14763 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
-    import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
     import IconButton from '$lib/components/base/IconButton.svelte'
     import SearchBar from '$lib/components/base/SearchBar.svelte'
+    import MediaGrid, {
+        type MediaGridItem,
+    } from '$lib/components/media/MediaGrid.svelte'
     import TrackList from '$lib/features/TrackList.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
@@ -10,6 +12,8 @@
     import { settings } from '$lib/state/settings.svelte'
     import type { Album, Track } from '$lib/types'
 
+    import '@mdui/icons/arrow-back.js'
+    import '@mdui/icons/play-arrow.js'
     import 'mdui/components/circular-progress.js'
     import 'mdui/components/list-item.js'
     import 'mdui/components/list.js'
@@ -45,6 +49,17 @@
         return [...list].sort((a, b) => collator.compare(a.title, b.title))
     })
 
+    const albumGridItems = $derived(
+        filteredAlbums.map(album => ({
+            id: album.id,
+            title: album.title,
+            subtitle: `${album.trackCount} 首歌曲`,
+            image:
+                trackCovers.get(album.representativeTrack) ?? album.cover,
+            shape: 'square' as const,
+        })),
+    )
+
     $effect(() => {
         for (const album of filteredAlbums) {
             void trackCovers.load(album.representativeTrack)
@@ -56,6 +71,23 @@
         player.replacePlaylistAndPlay(tracks, tracks[0].id)
     }
 
+    function selectAlbumItem(item: MediaGridItem) {
+        const album = musicLibrary.getAlbum(String(item.id))
+        if (album === undefined) return
+
+        selectedAlbumId = album.id
+    }
+
+    function playAlbumItem(item: MediaGridItem, event: Event) {
+        event.preventDefault()
+        event.stopPropagation()
+
+        const album = musicLibrary.getAlbum(String(item.id))
+        if (album === undefined) return
+
+        playAll(album.tracks)
+    }
+
     async function handleAlbumArtistGroupingChange(event: Event) {
         const checked = (
             event.currentTarget as HTMLElement & { checked: boolean }
@@ -180,11 +212,6 @@
                                 {selectedAlbum.trackCount} 首歌曲
                             </p>
                         </div>
-                        <Button
-                            variant="filled"
-                            onclick={() => playAll(selectedAlbum.tracks)}
-                            >播放全部</Button
-                        >
                     </div>
                     <div class="flex-1 overflow-y-auto pb-8">
                         <TrackList tracks={selectedAlbum.tracks} />
@@ -195,53 +222,16 @@
     {:else}
         <div class="flex-1 flex overflow-hidden min-h-0">
             <div
-                class="flex-2 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8"
+                class="flex-2 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8 pr-4"
             >
-                {#if filteredAlbums.length === 0}
-                    <div
-                        class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]"
-                    >
-                        <span class="text-4xl mb-2">🎵</span>
-                        <span class="text-sm">没有找到专辑</span>
-                    </div>
-                {:else}
-                    <mdui-list>
-                        {#each filteredAlbums as album (album.id)}
-                            {@const cover =
-                                trackCovers.get(album.representativeTrack) ??
-                                album.cover}
-                            <mdui-list-item
-                                headline={album.title}
-                                description={`${album.trackCount} 首歌曲`}
-                                onclick={() => {
-                                    selectedAlbumId = album.id
-                                }}
-                                onkeydown={(e: KeyboardEvent) =>
-                                    (e.key === 'Enter' || e.key === ' ') &&
-                                    (selectedAlbumId = album.id)}
-                                role="button"
-                                tabindex="0"
-                                active={selectedAlbumId === album.id}
-                            >
-                                {#if cover}
-                                    <img
-                                        src={cover}
-                                        slot="icon"
-                                        class="w-10 h-10 rounded object-cover shrink-0"
-                                        alt=""
-                                    />
-                                {:else}
-                                    <div
-                                        slot="icon"
-                                        class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0"
-                                    >
-                                        🎵
-                                    </div>
-                                {/if}
-                            </mdui-list-item>
-                        {/each}
-                    </mdui-list>
-                {/if}
+                <MediaGrid
+                    items={albumGridItems}
+                    selectedId={selectedAlbumId}
+                    onselect={selectAlbumItem}
+                    onplay={playAlbumItem}
+                    emptyTitle="没有找到专辑"
+                    emptyDescription="尝试调整搜索关键词"
+                />
             </div>
             <div class="flex-1 flex flex-col overflow-hidden min-h-0">
                 {#if selectedAlbum === undefined}
@@ -252,27 +242,6 @@
                         <span class="text-sm">选择一个专辑以查看歌曲</span>
                     </div>
                 {:else}
-                    <div
-                        class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0"
-                    >
-                        <div>
-                            <h2
-                                class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
-                            >
-                                {selectedAlbum.title}
-                            </h2>
-                            <p
-                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
-                                {selectedAlbum.trackCount} 首歌曲
-                            </p>
-                        </div>
-                        <Button
-                            variant="filled"
-                            onclick={() => playAll(selectedAlbum.tracks)}
-                            >播放全部</Button
-                        >
-                    </div>
                     <div class="flex-1 overflow-y-auto pb-8">
                         <TrackList
                             tracks={selectedAlbum.tracks}
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index 8c1b893..a348b85 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -3,6 +3,9 @@
     import Heading from '$lib/components/base/Heading.svelte'
     import IconButton from '$lib/components/base/IconButton.svelte'
     import SearchBar from '$lib/components/base/SearchBar.svelte'
+    import MediaGrid, {
+        type MediaGridItem,
+    } from '$lib/components/media/MediaGrid.svelte'
     import TrackList from '$lib/features/TrackList.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import { player } from '$lib/state/player.svelte'
@@ -18,7 +21,9 @@
 
     const isMobile = $derived(windowWidth < 768)
     const selectedArtist: Artist | undefined = $derived(
-        selectedArtistId === null ? undefined : musicLibrary.getArtist(selectedArtistId),
+        selectedArtistId === null
+            ? undefined
+            : musicLibrary.getArtist(selectedArtistId),
     )
 
     const collator = new Intl.Collator('zh-Hans-CN', {
@@ -38,10 +43,37 @@
         return [...list].sort((a, b) => collator.compare(a.name, b.name))
     })
 
+    const artistGridItems = $derived(
+        filteredArtists.map(artist => ({
+            id: artist.id,
+            title: artist.name,
+            subtitle: `${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`,
+            image: artist.cover,
+            shape: 'circle' as const,
+        })),
+    )
+
     function playAll(tracks: Track[]) {
         if (tracks.length === 0) return
         player.replacePlaylistAndPlay(tracks, tracks[0].id)
     }
+
+    function selectArtistItem(item: MediaGridItem) {
+        const artist = musicLibrary.getArtist(String(item.id))
+        if (artist === undefined) return
+
+        selectedArtistId = artist.id
+    }
+
+    function playArtistItem(item: MediaGridItem, event: Event) {
+        event.preventDefault()
+        event.stopPropagation()
+
+        const artist = musicLibrary.getArtist(String(item.id))
+        if (artist === undefined) return
+
+        playAll(artist.tracks)
+    }
 </script>
 
 <svelte:window bind:innerWidth={windowWidth} />
@@ -55,8 +87,10 @@
         class="pb-4 shrink-0 border-b border-[rgb(var(--mdui-color-outline-variant))]"
     >
         <Heading eyebrow="Artist" title="歌手" />
-        <div class="mt-2 px-1 max-w-md">
-            <SearchBar bind:value={searchQuery} />
+        <div class="flex mt-2 px-2 pr-16 justify-end items-center">
+            <div class="max-w-md">
+                <SearchBar bind:value={searchQuery} />
+            </div>
         </div>
     </header>
 
@@ -153,50 +187,16 @@
     {:else}
         <div class="flex-1 flex overflow-hidden min-h-0">
             <div
-                class="flex-2 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8"
+                class="flex-2 shrink-0 border-r border-[rgb(var(--mdui-color-outline-variant))] overflow-y-auto pb-8 pr-4"
             >
-                {#if filteredArtists.length === 0}
-                    <div
-                        class="flex flex-col items-center justify-center h-64 text-[rgb(var(--mdui-color-on-surface-variant))]"
-                    >
-                        <span class="text-4xl mb-2">👤</span>
-                        <span class="text-sm">没有找到歌手</span>
-                    </div>
-                {:else}
-                    <mdui-list>
-                        {#each filteredArtists as artist (artist.id)}
-                            <mdui-list-item
-                                headline={artist.name}
-                                description={`${artist.trackCount} 首歌曲 · ${artist.albumCount} 张专辑`}
-                                onclick={() => {
-                                    selectedArtistId = artist.id
-                                }}
-                                onkeydown={(e: KeyboardEvent) =>
-                                    (e.key === 'Enter' || e.key === ' ') &&
-                                    (selectedArtistId = artist.id)}
-                                role="button"
-                                tabindex="0"
-                                active={selectedArtistId === artist.id}
-                            >
-                                {#if artist.cover}
-                                    <img
-                                        src={artist.cover}
-                                        slot="icon"
-                                        class="w-10 h-10 rounded-full object-cover shrink-0"
-                                        alt=""
-                                    />
-                                {:else}
-                                    <div
-                                        slot="icon"
-                                        class="w-10 h-10 rounded-full bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0"
-                                    >
-                                        👤
-                                    </div>
-                                {/if}
-                            </mdui-list-item>
-                        {/each}
-                    </mdui-list>
-                {/if}
+                <MediaGrid
+                    items={artistGridItems}
+                    selectedId={selectedArtistId}
+                    onselect={selectArtistItem}
+                    onplay={playArtistItem}
+                    emptyTitle="没有找到歌手"
+                    emptyDescription="尝试调整搜索关键词"
+                />
             </div>
             <div class="flex-1 flex flex-col overflow-hidden min-h-0">
                 {#if selectedArtist === undefined}
@@ -207,30 +207,11 @@
                         <span class="text-sm">选择一个歌手以查看歌曲</span>
                     </div>
                 {:else}
-                    <div
-                        class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0"
-                    >
-                        <div>
-                            <h2
-                                class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]"
-                            >
-                                {selectedArtist.name}
-                            </h2>
-                            <p
-                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
-                                {selectedArtist.trackCount} 首歌曲 · {selectedArtist.albumCount}
-                                张专辑
-                            </p>
-                        </div>
-                        <Button
-                            variant="filled"
-                            onclick={() => playAll(selectedArtist.tracks)}
-                            >播放全部</Button
-                        >
-                    </div>
                     <div class="flex-1 overflow-y-auto pb-8">
-                        <TrackList tracks={selectedArtist.tracks} columns={['title', 'duration']}/>
+                        <TrackList
+                            tracks={selectedArtist.tracks}
+                            columns={['title', 'duration']}
+                        />
                     </div>
                 {/if}
             </div>
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index 5af8e9f..afe6b7e 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -6,8 +6,11 @@
 
     import Button from '$lib/components/base/Button.svelte'
     import Heading from '$lib/components/base/Heading.svelte'
+    import IconButton from '$lib/components/base/IconButton.svelte'
     import SearchBar from '$lib/components/base/SearchBar.svelte'
 
+    import '@mdui/icons/play-arrow--rounded.js'
+    import '@mdui/icons/refresh--rounded.js'
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
     import 'mdui/components/segmented-button-group.js'
@@ -24,11 +27,18 @@
     })
 
     const searchResults = $derived(
-        musicLibrary.tracks.filter(track => 
-            (track.title ?? '').toLowerCase().includes(searchQuery.toLowerCase()) ||
-            (track.artist ?? '').toLowerCase().includes(searchQuery.toLowerCase()) ||
-            (track.album ?? '').toLowerCase().includes(searchQuery.toLowerCase())
-        )
+        musicLibrary.tracks.filter(
+            track =>
+                (track.title ?? '')
+                    .toLowerCase()
+                    .includes(searchQuery.toLowerCase()) ||
+                (track.artist ?? '')
+                    .toLowerCase()
+                    .includes(searchQuery.toLowerCase()) ||
+                (track.album ?? '')
+                    .toLowerCase()
+                    .includes(searchQuery.toLowerCase()),
+        ),
     )
 
     const defaultSortedTracks = $derived.by(() => {
@@ -37,7 +47,9 @@
         })
     })
 
-    const displayTracks = $derived(searchQuery ? searchResults : defaultSortedTracks)
+    const displayTracks = $derived(
+        searchQuery ? searchResults : defaultSortedTracks,
+    )
 
     function playAll() {
         if (displayTracks.length === 0) return
@@ -45,7 +57,8 @@
     }
 
     function handleSortChange(event: Event) {
-        const value = (event.currentTarget as HTMLElement & { value: string }).value
+        const value = (event.currentTarget as HTMLElement & { value: string })
+            .value
         if (value === 'title' || value === 'artist' || value === 'album') {
             sortBy = value
         }
@@ -57,37 +70,50 @@
 </svelte:head>
 
 <div class="flex flex-col h-full overflow-hidden">
-    <header class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-4 shrink-0">
-        <Heading eyebrow="library" title="歌曲">
-            <Button
-                variant="filled"
-                disabled={displayTracks.length === 0}
-                onclick={playAll}
-            >
-                播放全部
-            </Button>
+    <header
+        class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-4 shrink-0"
+    >
+        <Heading eyebrow="library" title="歌曲" />
+        <div class="flex justify-between">
+            <div class="flex items-center gap-2">
+                <Button
+                    variant="filled"
+                    icon="play_arrow--rounded"
+                    disabled={displayTracks.length === 0}
+                    onclick={playAll}
+                >
+                    播放全部
+                </Button>
 
-            <Button
-                variant="outlined"
-                onclick={() => musicLibrary.scan()}
-            >
-                刷新
-            </Button>
-        </Heading>
-        <div class="flex px-2 gap-16 justify-end items-center">
-            <div class="max-w-md">
-                <SearchBar bind:value={searchQuery} />
-            </div>
-            <div class="flex">
-                <mdui-segmented-button-group
-                    selects="single"
-                    value={sortBy}
-                    onchange={handleSortChange}
+                <IconButton
+                    icon="refresh--rounded"
+                    variant="tonal"
+                    onclick={() => musicLibrary.scan()}
                 >
-                    <mdui-segmented-button value="title">标题</mdui-segmented-button>
-                    <mdui-segmented-button value="artist">歌手</mdui-segmented-button>
-                    <mdui-segmented-button value="album">专辑</mdui-segmented-button>
-                </mdui-segmented-button-group>
+                    刷新
+                </IconButton>
+            </div>
+            <div class="flex px-2 gap-16 justify-end items-center">
+                <div class="max-w-md">
+                    <SearchBar bind:value={searchQuery} />
+                </div>
+                <div class="flex">
+                    <mdui-segmented-button-group
+                        selects="single"
+                        value={sortBy}
+                        onchange={handleSortChange}
+                    >
+                        <mdui-segmented-button value="title"
+                            >标题</mdui-segmented-button
+                        >
+                        <mdui-segmented-button value="artist"
+                            >歌手</mdui-segmented-button
+                        >
+                        <mdui-segmented-button value="album"
+                            >专辑</mdui-segmented-button
+                        >
+                    </mdui-segmented-button-group>
+                </div>
             </div>
         </div>
     </header>
@@ -101,7 +127,9 @@
             {musicLibrary.error}
         </div>
     {:else if displayTracks.length === 0}
-        <div class="flex flex-1 flex-col items-center justify-center gap-2 text-[rgb(var(--mdui-color-on-surface-variant))]" >
+        <div
+            class="flex flex-1 flex-col items-center justify-center gap-2 text-[rgb(var(--mdui-color-on-surface-variant))]"
+        >
             <div class="text-5xl">🎵</div>
             <div class="text-base font-medium">没有找到歌曲</div>
             <div class="text-sm">尝试刷新媒体库或修改搜索关键词</div>
diff --git a/src/routes/recent/+page.svelte b/src/routes/recent/+page.svelte
index c12e543..f3d0d89 100644
--- a/src/routes/recent/+page.svelte
+++ b/src/routes/recent/+page.svelte
@@ -13,13 +13,26 @@
 </svelte:head>
 
 <header class="border-b border-[rgb(var(--mdui-color-outline-variant))] pb-5">
-    <Heading eyebrow="Recent" title="最近播放">
+    <Heading eyebrow="Recent" title="最近播放" />
+    <div class="flex items-center gap-2">
+        <Button
+            variant="filled"
+            icon="play_arrow--rounded"
+            disabled={recentlyPlayed.tracks.length === 0}
+            onclick={() => recentlyPlayed.clear()}
+        >
+            播放全部
+        </Button>
+
         {#if recentlyPlayed.tracks.length > 0}
-            <Button variant="outlined" onclick={() => recentlyPlayed.clear()}>
+            <Button
+                variant="outlined"
+                onclick={() => recentlyPlayed.clear()}
+            >
                 清空
             </Button>
         {/if}
-    </Heading>
+    </div>
 </header>
 
 {#if recentlyPlayed.isLoading}

From 3b3beac938d328e7e40aa0b35de473851a7f1214 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Mon, 1 Jun 2026 01:12:37 +0800
Subject: [PATCH 23/39] Update deps; add shortcuts, config, media controls

- Bump multiple Rust dependencies (src-tauri/Cargo.toml & Cargo.lock) and update lockfile.
- Add backend modules for configuration, menu, media controls and shortcuts (src-tauri/src/commands/*, media_controls.rs, shortcuts.rs, models/config.rs) and integrate changes into audio, playback and lib.
- Add frontend pieces: ShortcutRecorder and ShortcutSettingsPanel components, config store and types, plus updates to Slider, QueueDrawer, TrackList, player state and routes (library, settings).
- These changes introduce persistent config, global shortcut/media control handling and related UI for settings.
---
 src-tauri/Cargo.lock                          | 1974 ++++++++++-------
 src-tauri/Cargo.toml                          |    9 +-
 src-tauri/src/audio.rs                        |   25 +
 src-tauri/src/commands/config.rs              |   63 +
 src-tauri/src/commands/library.rs             |   98 +
 src-tauri/src/commands/menu.rs                |   13 +
 src-tauri/src/commands/mod.rs                 |    2 +
 src-tauri/src/commands/playback.rs            |  773 ++++++-
 src-tauri/src/lib.rs                          |   80 +-
 src-tauri/src/media_controls.rs               |  112 +
 src-tauri/src/models/config.rs                |   64 +
 src-tauri/src/models/mod.rs                   |    2 +
 src-tauri/src/shortcuts.rs                    |  189 ++
 src/lib/components/base/Slider.svelte         |   31 +-
 src/lib/features/QueueDrawer.svelte           |  181 +-
 src/lib/features/TrackList.svelte             |  415 +++-
 .../features/settings/ShortcutRecorder.svelte |  151 ++
 .../settings/ShortcutSettingsPanel.svelte     |   89 +
 src/lib/state/config.svelte.ts                |   64 +
 src/lib/state/player.svelte.ts                |  330 ++-
 src/lib/types/config.ts                       |   12 +
 src/lib/types/index.ts                        |    1 +
 src/routes/library/+page.svelte               |  389 +++-
 src/routes/settings/+page.svelte              |    5 +
 24 files changed, 3937 insertions(+), 1135 deletions(-)
 create mode 100644 src-tauri/src/commands/config.rs
 create mode 100644 src-tauri/src/commands/menu.rs
 create mode 100644 src-tauri/src/media_controls.rs
 create mode 100644 src-tauri/src/models/config.rs
 create mode 100644 src-tauri/src/shortcuts.rs
 create mode 100644 src/lib/features/settings/ShortcutRecorder.svelte
 create mode 100644 src/lib/features/settings/ShortcutSettingsPanel.svelte
 create mode 100644 src/lib/state/config.svelte.ts
 create mode 100644 src/lib/types/config.ts

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index fe547a4..7088ea5 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -45,7 +45,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
 dependencies = [
  "alsa-sys",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "libc",
 ]
@@ -77,9 +77,9 @@ checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "arc-swap"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a07d1f37ff60921c83bdfc7407723bdefe89b44b98a9b772f225c8f9d67141a6"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
 dependencies = [
  "rustversion",
 ]
@@ -188,9 +188,9 @@ dependencies = [
 
 [[package]]
 name = "async-signal"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
+checksum = "52b5aaafa020cf5053a01f2a60e8ff5dccf550f0f77ec54a4e47285ac2bab485"
 dependencies = [
  "async-io",
  "async-lock",
@@ -252,9 +252,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "base64"
@@ -291,13 +291,19 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -331,9 +337,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "8.0.2"
+version = "8.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
+checksum = "8119e4516436f5708bbc474a9d395bf12f1b5395e93a92a56e647ac3388c8610"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -342,19 +348,28 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
 ]
 
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "bumpalo"
-version = "3.20.2"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "byte-slice-cast"
@@ -374,6 +389,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
 version = "1.11.1"
@@ -389,7 +410,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -452,9 +473,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.57"
+version = "1.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
+checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -505,6 +526,36 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "cocoa"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation 0.9.4",
+ "core-graphics 0.22.3",
+ "foreign-types 0.3.2",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa-foundation"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "libc",
+ "objc",
+]
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -524,12 +575,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "cookie"
 version = "0.18.1"
@@ -540,6 +585,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.10.1"
@@ -556,16 +611,40 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
+[[package]]
+name = "core-graphics"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types 0.3.2",
+ "libc",
+]
+
 [[package]]
 name = "core-graphics"
 version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
 dependencies = [
- "bitflags 2.11.0",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
+ "bitflags 2.11.1",
+ "core-foundation 0.10.1",
+ "core-graphics-types 0.2.0",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -575,8 +654,8 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.11.0",
- "core-foundation",
+ "bitflags 2.11.1",
+ "core-foundation 0.10.1",
  "libc",
 ]
 
@@ -586,7 +665,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "libc",
  "objc2-audio-toolbox",
  "objc2-core-audio",
@@ -621,7 +700,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows",
+ "windows 0.62.2",
 ]
 
 [[package]]
@@ -670,7 +749,7 @@ checksum = "416063cb8f815ee27036075e544a778770b577e82348f017d145a704df90f246"
 dependencies = [
  "creek-core",
  "log",
- "symphonia",
+ "symphonia 0.5.5",
 ]
 
 [[package]]
@@ -708,23 +787,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "cssparser"
-version = "0.29.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "matches",
- "phf 0.10.1",
- "proc-macro2",
- "quote",
- "smallvec",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "cssparser"
 version = "0.36.0"
@@ -734,7 +796,7 @@ dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa",
- "phf 0.13.1",
+ "phf",
  "smallvec",
 ]
 
@@ -750,14 +812,20 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.9"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98"
 dependencies = [
- "quote",
- "syn 2.0.117",
+ "ctor-proc-macro",
+ "dtor",
 ]
 
+[[package]]
+name = "ctor-proc-macro"
+version = "0.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"
+
 [[package]]
 name = "darling"
 version = "0.23.0"
@@ -805,26 +873,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
 
 [[package]]
-name = "deranged"
-version = "0.5.8"
+name = "dbus"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+checksum = "b942602992bb7acfd1f51c49811c58a610ef9181b6e66f3e519d79b540a3bf73"
 dependencies = [
- "powerfmt",
- "serde_core",
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "derive_more"
-version = "0.99.20"
+name = "dbus-crossroads"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+checksum = "64bff0bd181fba667660276c6b7ebdc50cff37ce593e7adf9e734f89c8f444e8"
 dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 2.0.117",
+ "dbus",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+dependencies = [
+ "powerfmt",
+ "serde_core",
 ]
 
 [[package]]
@@ -879,13 +954,19 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "dispatch"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+
 [[package]]
 name = "dispatch2"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2",
  "libc",
  "objc2",
@@ -893,9 +974,9 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -932,12 +1013,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89"
 dependencies = [
  "bit-set",
- "cssparser 0.36.0",
+ "cssparser",
  "foldhash 0.2.0",
- "html5ever 0.38.0",
+ "html5ever",
  "precomputed-hash",
- "selectors 0.36.1",
- "tendril 0.5.0",
+ "selectors",
+ "tendril",
 ]
 
 [[package]]
@@ -964,6 +1045,21 @@ dependencies = [
  "dtoa",
 ]
 
+[[package]]
+name = "dtor"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
+
 [[package]]
 name = "dunce"
 version = "1.0.5"
@@ -978,14 +1074,14 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "embed-resource"
-version = "3.0.7"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ec73ddcf6b7f23173d5c3c5a32b5507dc0a734de7730aa14abc5d5e296bb5f"
+checksum = "c31a88c8d26de40ed18fe748c547845aa39de1db3afd958f8cb91579f3644bcb"
 dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 0.9.12+spec-1.1.0",
+ "toml 1.1.2+spec-1.1.0",
  "vswhom",
  "winreg",
 ]
@@ -1088,9 +1184,9 @@ checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fdeflate"
@@ -1162,6 +1258,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1169,7 +1274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -1183,6 +1288,12 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -1198,16 +1309,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.32"
@@ -1293,15 +1394,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "gdk"
 version = "0.18.2"
@@ -1412,14 +1504,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.1.16"
+name = "gethostname"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "rustix",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -1430,7 +1521,7 @@ checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -1496,7 +1587,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -1543,6 +1634,24 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
+[[package]]
+name = "global-hotkey"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c386b0a4a70cb2d39fffd74480f985b6f0bfbcb934b6a6b6b7e630e448f242e"
+dependencies = [
+ "crossbeam-channel",
+ "keyboard-types",
+ "objc2",
+ "objc2-app-kit",
+ "once_cell",
+ "serde",
+ "thiserror 2.0.18",
+ "windows-sys 0.59.0",
+ "x11rb",
+ "xkeysym",
+]
+
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -1623,9 +1732,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
 [[package]]
 name = "heck"
@@ -1668,18 +1777,6 @@ dependencies = [
  "rustfft",
 ]
 
-[[package]]
-name = "html5ever"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.14.1",
- "match_token",
-]
-
 [[package]]
 name = "html5ever"
 version = "0.38.0"
@@ -1687,14 +1784,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"
 dependencies = [
  "log",
- "markup5ever 0.38.0",
+ "markup5ever",
 ]
 
 [[package]]
 name = "http"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
 dependencies = [
  "bytes",
  "itoa",
@@ -1731,9 +1828,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
-version = "1.8.1"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1744,7 +1841,6 @@ dependencies = [
  "httparse",
  "itoa",
  "pin-project-lite",
- "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -1804,17 +1900,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371"
 dependencies = [
  "byteorder",
- "png",
+ "png 0.17.16",
 ]
 
 [[package]]
 name = "icu_collections"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
  "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
@@ -1822,9 +1919,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1835,9 +1932,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -1849,15 +1946,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
  "icu_collections",
  "icu_locale_core",
@@ -1869,15 +1966,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -1913,14 +2010,27 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
 ]
 
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png 0.18.1",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -1934,12 +2044,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
  "serde",
  "serde_core",
 ]
@@ -1959,16 +2069,6 @@ version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
-[[package]]
-name = "iri-string"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -1990,9 +2090,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "javascriptcore-rs"
@@ -2026,7 +2126,7 @@ dependencies = [
  "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "thiserror 1.0.69",
  "walkdir",
@@ -2035,16 +2135,40 @@ dependencies = [
 
 [[package]]
 name = "jni-sys"
-version = "0.3.0"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
 
 [[package]]
 name = "js-sys"
-version = "0.3.91"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
 dependencies = [
+ "cfg-if",
+ "futures-util",
  "once_cell",
  "wasm-bindgen",
 ]
@@ -2077,23 +2201,11 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "serde",
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "kuchikiki"
-version = "0.8.8-speedreader"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
-dependencies = [
- "cssparser 0.29.6",
- "html5ever 0.29.1",
- "indexmap 2.13.0",
- "selectors 0.24.0",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -2132,9 +2244,18 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.183"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
 
 [[package]]
 name = "libloading"
@@ -2148,9 +2269,9 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
+checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
 dependencies = [
  "libc",
 ]
@@ -2163,9 +2284,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "llq"
@@ -2210,15 +2331,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
-
-[[package]]
-name = "mac"
-version = "0.1.1"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
 
 [[package]]
 name = "mach2"
@@ -2230,17 +2345,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "markup5ever"
-version = "0.14.1"
+name = "malloc_buf"
+version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
 dependencies = [
- "log",
- "phf 0.11.3",
- "phf_codegen 0.11.3",
- "string_cache 0.8.9",
- "string_cache_codegen 0.5.4",
- "tendril 0.4.3",
+ "libc",
 ]
 
 [[package]]
@@ -2250,32 +2360,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"
 dependencies = [
  "log",
- "tendril 0.5.0",
+ "tendril",
  "web_atoms",
 ]
 
-[[package]]
-name = "match_token"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 
 [[package]]
 name = "memoffset"
@@ -2304,20 +2397,30 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.1"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
 dependencies = [
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
 [[package]]
 name = "muda"
-version = "0.17.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a"
+checksum = "47a2e3dff89cd322c66647942668faee0a2b1f88ea6cbb4d374b4a8d7e92528c"
 dependencies = [
  "crossbeam-channel",
  "dpi",
@@ -2328,10 +2431,10 @@ dependencies = [
  "objc2-core-foundation",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.18.1",
  "serde",
  "thiserror 2.0.18",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2340,8 +2443,8 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.11.0",
- "jni-sys",
+ "bitflags 2.11.1",
+ "jni-sys 0.3.1",
  "log",
  "ndk-sys",
  "num_enum",
@@ -2361,7 +2464,7 @@ version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.1",
 ]
 
 [[package]]
@@ -2376,12 +2479,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6bcfe410abc339c9f8c226aceebf946bf26e3e2eca738be3fec9e9ee97d54aa"
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "num-complex"
 version = "0.4.6"
@@ -2393,9 +2490,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-derive"
@@ -2458,6 +2555,15 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
 [[package]]
 name = "objc2"
 version = "0.6.4"
@@ -2474,7 +2580,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2",
  "objc2",
  "objc2-core-foundation",
@@ -2487,7 +2593,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "libc",
  "objc2",
  "objc2-core-audio",
@@ -2506,6 +2612,17 @@ dependencies = [
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags 2.11.1",
+ "objc2",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-core-audio"
 version = "0.3.2"
@@ -2525,8 +2642,18 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+dependencies = [
  "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
@@ -2535,7 +2662,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2",
  "dispatch2",
  "libc",
@@ -2548,13 +2675,45 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "dispatch2",
  "objc2",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
 
+[[package]]
+name = "objc2-core-image"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
+dependencies = [
+ "bitflags 2.11.1",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
 [[package]]
 name = "objc2-encode"
 version = "4.1.0"
@@ -2576,7 +2735,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2",
  "libc",
  "objc2",
@@ -2589,7 +2748,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "objc2",
  "objc2-core-foundation",
 ]
@@ -2600,7 +2759,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "objc2",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -2612,9 +2771,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
+ "block2",
  "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
  "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-core-text",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -2624,7 +2802,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2",
  "objc2",
  "objc2-app-kit",
@@ -2649,9 +2827,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "open"
-version = "5.3.3"
+version = "5.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc"
+checksum = "2fbaa89d2ddc8473c78a3adf69eea8cffa28c483b8e02a971ef31527cd0fc92c"
 dependencies = [
  "dunce",
  "is-wsl",
@@ -2747,105 +2925,25 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_macros 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_macros 0.11.3",
- "phf_shared 0.11.3",
-]
-
 [[package]]
 name = "phf"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
- "phf_macros 0.13.1",
- "phf_shared 0.13.1",
+ "phf_macros",
+ "phf_shared",
  "serde",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
 dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared 0.11.3",
- "rand 0.8.5",
+ "phf_generator",
+ "phf_shared",
 ]
 
 [[package]]
@@ -2855,34 +2953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
  "fastrand",
- "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "phf_shared",
 ]
 
 [[package]]
@@ -2891,47 +2962,20 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher 0.3.11",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher 0.3.11",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher 1.0.2",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 dependencies = [
- "siphasher 1.0.2",
+ "siphasher",
 ]
 
 [[package]]
@@ -2940,12 +2984,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
 [[package]]
 name = "piper"
 version = "0.2.5"
@@ -2965,18 +3003,18 @@ checksum = "ad78bf43dcf80e8f950c92b84f938a0fc7590b7f6866fbcbeca781609c115590"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plist"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
+checksum = "092791278e026273c1b65bbdcfbba3a300f2994c896bd01ab01da613c29c46f1"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "quick-xml",
  "serde",
  "time",
@@ -2995,6 +3033,19 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.11.1",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "polling"
 version = "3.11.0"
@@ -3011,9 +3062,9 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
  "zerovec",
 ]
@@ -3024,15 +3075,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
-
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -3084,7 +3126,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.25.5+spec-1.1.0",
+ "toml_edit 0.25.12+spec-1.1.0",
 ]
 
 [[package]]
@@ -3111,12 +3153,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -3126,11 +3162,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "pxfm"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
+
 [[package]]
 name = "quick-xml"
-version = "0.38.4"
+version = "0.39.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
 dependencies = [
  "memchr",
 ]
@@ -3156,87 +3198,6 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.17",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -3258,7 +3219,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -3315,6 +3276,12 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-lite"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.10"
@@ -3323,9 +3290,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "reqwest"
-version = "0.13.2"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
+checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -3381,9 +3348,9 @@ dependencies = [
 
 [[package]]
 name = "rtrb"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7204ed6420f698836b76d4d5c2ec5dec7585fd5c3a788fd1cde855d1de598239"
+checksum = "4ade083ccbb4bf536df69d1f6432cc23deb7acccff86b183f3923a6fd56a1153"
 
 [[package]]
 name = "rtsan-standalone"
@@ -3441,9 +3408,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
 name = "rustc_version"
@@ -3474,7 +3441,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3553,48 +3520,30 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "selectors"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
-dependencies = [
- "bitflags 1.3.2",
- "cssparser 0.29.6",
- "derive_more 0.99.20",
- "fxhash",
- "log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
- "precomputed-hash",
- "servo_arc 0.2.0",
- "smallvec",
-]
-
 [[package]]
 name = "selectors"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
 dependencies = [
- "bitflags 2.11.0",
- "cssparser 0.36.0",
- "derive_more 2.1.1",
+ "bitflags 2.11.1",
+ "cssparser",
+ "derive_more",
  "log",
  "new_debug_unreachable",
- "phf 0.13.1",
- "phf_codegen 0.13.1",
+ "phf",
+ "phf_codegen",
  "precomputed-hash",
  "rustc-hash",
- "servo_arc 0.4.3",
+ "servo_arc",
  "smallvec",
 ]
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 dependencies = [
  "serde",
  "serde_core",
@@ -3655,9 +3604,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "itoa",
  "memchr",
@@ -3688,24 +3637,25 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.4"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.18.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f"
+checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2"
 dependencies = [
  "base64 0.22.1",
+ "bs58",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "schemars 0.9.0",
  "schemars 1.2.1",
  "serde_core",
@@ -3716,9 +3666,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.18.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65"
+checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -3748,16 +3698,6 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "servo_arc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
-dependencies = [
- "nodrop",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "servo_arc"
 version = "0.4.3"
@@ -3780,9 +3720,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "signal-hook-registry"
@@ -3796,21 +3736,15 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
 
 [[package]]
 name = "siphasher"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
 name = "slab"
@@ -3826,9 +3760,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -3882,6 +3816,24 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "souvlaki"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5855c8f31521af07d896b852eaa9eca974ddd3211fc2ae292e58dda8eb129bc8"
+dependencies = [
+ "base64 0.22.1",
+ "block",
+ "cocoa",
+ "core-graphics 0.22.3",
+ "dbus",
+ "dbus-crossroads",
+ "dispatch",
+ "objc",
+ "thiserror 1.0.69",
+ "windows 0.44.0",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -3894,19 +3846,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
 
-[[package]]
-name = "string_cache"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
-dependencies = [
- "new_debug_unreachable",
- "parking_lot",
- "phf_shared 0.11.3",
- "precomputed-hash",
- "serde",
-]
-
 [[package]]
 name = "string_cache"
 version = "0.9.0"
@@ -3915,30 +3854,18 @@ checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
 dependencies = [
  "new_debug_unreachable",
  "parking_lot",
- "phf_shared 0.13.1",
+ "phf_shared",
  "precomputed-hash",
 ]
 
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "string_cache_codegen"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
 dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
 ]
@@ -3967,19 +3894,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5773a4c030a19d9bfaa090f49746ff35c75dfddfa700df7a5939d5e076a57039"
 dependencies = [
  "lazy_static",
- "symphonia-bundle-flac",
- "symphonia-bundle-mp3",
- "symphonia-codec-aac",
- "symphonia-codec-adpcm",
- "symphonia-codec-alac",
- "symphonia-codec-pcm",
- "symphonia-codec-vorbis",
- "symphonia-core",
- "symphonia-format-isomp4",
- "symphonia-format-mkv",
- "symphonia-format-ogg",
- "symphonia-format-riff",
- "symphonia-metadata",
+ "symphonia-bundle-flac 0.5.5",
+ "symphonia-bundle-mp3 0.5.5",
+ "symphonia-codec-aac 0.5.5",
+ "symphonia-codec-adpcm 0.5.5",
+ "symphonia-codec-alac 0.5.5",
+ "symphonia-codec-pcm 0.5.5",
+ "symphonia-codec-vorbis 0.5.5",
+ "symphonia-core 0.5.5",
+ "symphonia-format-isomp4 0.5.5",
+ "symphonia-format-mkv 0.5.5",
+ "symphonia-format-ogg 0.5.5",
+ "symphonia-format-riff 0.5.5",
+ "symphonia-metadata 0.5.5",
+]
+
+[[package]]
+name = "symphonia"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1758d6c853020a7244de03cc3e0185eaea3f58715122422dd3cc7452e6d4c16a"
+dependencies = [
+ "lazy_static",
+ "symphonia-bundle-flac 0.6.0",
+ "symphonia-bundle-mp3 0.6.0",
+ "symphonia-codec-aac 0.6.0",
+ "symphonia-codec-adpcm 0.6.0",
+ "symphonia-codec-alac 0.6.0",
+ "symphonia-codec-pcm 0.6.0",
+ "symphonia-codec-vorbis 0.6.0",
+ "symphonia-core 0.6.0",
+ "symphonia-format-caf",
+ "symphonia-format-isomp4 0.6.0",
+ "symphonia-format-mkv 0.6.0",
+ "symphonia-format-ogg 0.6.0",
+ "symphonia-format-riff 0.6.0",
+ "symphonia-metadata 0.6.0",
 ]
 
 [[package]]
@@ -3989,11 +3939,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c91565e180aea25d9b80a910c546802526ffd0072d0b8974e3ebe59b686c9976"
 dependencies = [
  "log",
- "symphonia-core",
- "symphonia-metadata",
+ "symphonia-core 0.5.5",
+ "symphonia-metadata 0.5.5",
  "symphonia-utils-xiph",
 ]
 
+[[package]]
+name = "symphonia-bundle-flac"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee69ad01236a67260b82fd1ff9790dd75ead29f2f46af145e63b7e72273e0e03"
+dependencies = [
+ "log",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
+ "symphonia-metadata 0.6.0",
+]
+
 [[package]]
 name = "symphonia-bundle-mp3"
 version = "0.5.5"
@@ -4002,8 +3964,19 @@ checksum = "4872dd6bb56bf5eac799e3e957aa1981086c3e613b27e0ac23b176054f7c57ed"
 dependencies = [
  "lazy_static",
  "log",
- "symphonia-core",
- "symphonia-metadata",
+ "symphonia-core 0.5.5",
+ "symphonia-metadata 0.5.5",
+]
+
+[[package]]
+name = "symphonia-bundle-mp3"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350f1f2f2e19ad4dd315db94304d1eb361b29af070681f94e51b8fdaad769546"
+dependencies = [
+ "lazy_static",
+ "log",
+ "symphonia-core 0.6.0",
 ]
 
 [[package]]
@@ -4014,7 +3987,19 @@ checksum = "4c263845aa86881416849c1729a54c7f55164f8b96111dba59de46849e73a790"
 dependencies = [
  "lazy_static",
  "log",
- "symphonia-core",
+ "symphonia-core 0.5.5",
+]
+
+[[package]]
+name = "symphonia-codec-aac"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1979c515a76371b186aad2feff5f23e21cbec775bf95de08bf1e3af92a2ad76"
+dependencies = [
+ "lazy_static",
+ "log",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
 ]
 
 [[package]]
@@ -4024,7 +4009,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dddc50e2bbea4cfe027441eece77c46b9f319748605ab8f3443350129ddd07f"
 dependencies = [
  "log",
- "symphonia-core",
+ "symphonia-core 0.5.5",
+]
+
+[[package]]
+name = "symphonia-codec-adpcm"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebbdfd76d6cc5a601c6292a44357c5b7c82f2cd7cdc0f171421f5c5cff0ea1f"
+dependencies = [
+ "log",
+ "symphonia-core 0.6.0",
 ]
 
 [[package]]
@@ -4034,7 +4029,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8413fa754942ac16a73634c9dfd1500ed5c61430956b33728567f667fdd393ab"
 dependencies = [
  "log",
- "symphonia-core",
+ "symphonia-core 0.5.5",
+]
+
+[[package]]
+name = "symphonia-codec-alac"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a149cbfc7fb5c405d123a273227d31de17138419552112bf1aa7b73e65827b8"
+dependencies = [
+ "log",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
 ]
 
 [[package]]
@@ -4044,7 +4050,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e89d716c01541ad3ebe7c91ce4c8d38a7cf266a3f7b2f090b108fb0cb031d95"
 dependencies = [
  "log",
- "symphonia-core",
+ "symphonia-core 0.5.5",
+]
+
+[[package]]
+name = "symphonia-codec-pcm"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50baee168f0e9dcf6ba7fc06e8b57eb62072a4490cc7cf13af77e72baae5d328"
+dependencies = [
+ "log",
+ "symphonia-core 0.6.0",
 ]
 
 [[package]]
@@ -4054,10 +4070,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f025837c309cd69ffef572750b4a2257b59552c5399a5e49707cc5b1b85d1c73"
 dependencies = [
  "log",
- "symphonia-core",
+ "symphonia-core 0.5.5",
  "symphonia-utils-xiph",
 ]
 
+[[package]]
+name = "symphonia-codec-vorbis"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45b07b4423cd8e0fc472575909a5554b12c2f58e3c190b38c24f042e732fd8de"
+dependencies = [
+ "log",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
+]
+
+[[package]]
+name = "symphonia-common"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8257891ffa7f05e02b58f4761e2abf7e5278c8744fd59e981559e050f86eef55"
+dependencies = [
+ "log",
+ "symphonia-core 0.6.0",
+ "symphonia-metadata 0.6.0",
+]
+
 [[package]]
 name = "symphonia-core"
 version = "0.5.5"
@@ -4071,30 +4109,80 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "symphonia-core"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95ec293b5f288383b72a7bffcade6b2860b642cf66f28b3bd5967349a49938b1"
+dependencies = [
+ "bitflags 2.11.1",
+ "bytemuck",
+ "lazy_static",
+ "log",
+ "num-complex",
+ "rustfft",
+ "smallvec",
+]
+
+[[package]]
+name = "symphonia-format-caf"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde3ca76633d3400ab57195456c09f8a58d775ff5452329f3f212b6efc8622f5"
+dependencies = [
+ "log",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
+]
+
+[[package]]
+name = "symphonia-format-isomp4"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243739585d11f81daf8dac8d9f3d18cc7898f6c09a259675fc364b382c30e0a5"
+dependencies = [
+ "encoding_rs",
+ "log",
+ "symphonia-core 0.5.5",
+ "symphonia-metadata 0.5.5",
+ "symphonia-utils-xiph",
+]
+
 [[package]]
 name = "symphonia-format-isomp4"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d179a01305b3505940135a9f0180d6ef4b487912748fe97554756f120fbd05e"
+dependencies = [
+ "log",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
+ "symphonia-metadata 0.6.0",
+]
+
+[[package]]
+name = "symphonia-format-mkv"
 version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243739585d11f81daf8dac8d9f3d18cc7898f6c09a259675fc364b382c30e0a5"
+checksum = "122d786d2c43a49beb6f397551b4a050d8229eaa54c7ddf9ee4b98899b8742d0"
 dependencies = [
- "encoding_rs",
+ "lazy_static",
  "log",
- "symphonia-core",
- "symphonia-metadata",
+ "symphonia-core 0.5.5",
+ "symphonia-metadata 0.5.5",
  "symphonia-utils-xiph",
 ]
 
 [[package]]
 name = "symphonia-format-mkv"
-version = "0.5.5"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122d786d2c43a49beb6f397551b4a050d8229eaa54c7ddf9ee4b98899b8742d0"
+checksum = "fb17713e134f5ad316c2690fa3104590ccc85842cdbcf82c3cd1a845cb08aa74"
 dependencies = [
  "lazy_static",
  "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
 ]
 
 [[package]]
@@ -4104,11 +4192,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b4955c67c1ed3aa8ae8428d04ca8397fbef6a19b2b051e73b5da8b1435639cb"
 dependencies = [
  "log",
- "symphonia-core",
- "symphonia-metadata",
+ "symphonia-core 0.5.5",
+ "symphonia-metadata 0.5.5",
  "symphonia-utils-xiph",
 ]
 
+[[package]]
+name = "symphonia-format-ogg"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05a67e02b1e4fca1a261ba4fe06910a9357489ad8c36aafdd2960e9c6559433"
+dependencies = [
+ "log",
+ "symphonia-common",
+ "symphonia-core 0.6.0",
+ "symphonia-metadata 0.6.0",
+]
+
 [[package]]
 name = "symphonia-format-riff"
 version = "0.5.5"
@@ -4117,8 +4217,20 @@ checksum = "c2d7c3df0e7d94efb68401d81906eae73c02b40d5ec1a141962c592d0f11a96f"
 dependencies = [
  "extended",
  "log",
- "symphonia-core",
- "symphonia-metadata",
+ "symphonia-core 0.5.5",
+ "symphonia-metadata 0.5.5",
+]
+
+[[package]]
+name = "symphonia-format-riff"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17424452a777666d3eaf09a5c651029b15b6a333812fcc5b5474f2a3f0cff3f0"
+dependencies = [
+ "extended",
+ "log",
+ "symphonia-core 0.6.0",
+ "symphonia-metadata 0.6.0",
 ]
 
 [[package]]
@@ -4130,7 +4242,20 @@ dependencies = [
  "encoding_rs",
  "lazy_static",
  "log",
- "symphonia-core",
+ "symphonia-core 0.5.5",
+]
+
+[[package]]
+name = "symphonia-metadata"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31acf5cd623398a6208e2225d18f4b20f761c55098a796a5247ad516a4a8681"
+dependencies = [
+ "lazy_static",
+ "log",
+ "regex-lite",
+ "smallvec",
+ "symphonia-core 0.6.0",
 ]
 
 [[package]]
@@ -4139,8 +4264,8 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27c85ab799a338446b68eec77abf42e1a6f1bb490656e121c6e27bfbab9f16"
 dependencies = [
- "symphonia-core",
- "symphonia-metadata",
+ "symphonia-core 0.5.5",
+ "symphonia-metadata 0.5.5",
 ]
 
 [[package]]
@@ -4150,7 +4275,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
- "quote",
  "unicode-ident",
 ]
 
@@ -4200,15 +4324,16 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.34.6"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d52c379e63da659a483a958110bbde891695a0ecb53e48cc7786d5eda7bb"
+checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2",
- "core-foundation",
- "core-graphics",
+ "core-foundation 0.10.1",
+ "core-graphics 0.25.0",
  "crossbeam-channel",
+ "dbus",
  "dispatch2",
  "dlopen2",
  "dpi",
@@ -4219,18 +4344,19 @@ dependencies = [
  "libc",
  "log",
  "ndk",
- "ndk-context",
  "ndk-sys",
  "objc2",
  "objc2-app-kit",
  "objc2-foundation",
+ "objc2-ui-kit",
  "once_cell",
  "parking_lot",
+ "percent-encoding",
  "raw-window-handle",
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -4255,9 +4381,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.10.3"
+version = "2.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da77cc00fb9028caf5b5d4650f75e31f1ef3693459dfca7f7e506d1ecef0ba2d"
+checksum = "437404997acf375d85f1177afa7e11bb971f274ed6a7b83a2a3e339015f4cc28"
 dependencies = [
  "anyhow",
  "bytes",
@@ -4270,6 +4396,7 @@ dependencies = [
  "gtk",
  "heck 0.5.0",
  "http",
+ "image",
  "jni",
  "libc",
  "log",
@@ -4301,7 +4428,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -4310,22 +4437,27 @@ version = "0.1.0"
 dependencies = [
  "base64 0.22.1",
  "lofty",
+ "raw-window-handle",
  "serde",
  "serde_json",
+ "souvlaki",
  "tauri",
  "tauri-build",
  "tauri-plugin-dialog",
+ "tauri-plugin-global-shortcut",
  "tauri-plugin-opener",
  "tauri-plugin-store",
+ "tokio",
+ "trash",
  "walkdir",
  "web-audio-api",
 ]
 
 [[package]]
 name = "tauri-build"
-version = "2.5.6"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bbc990d1dbf57a8e1c7fa2327f2a614d8b757805603c1b9ba5c81bade09fd4d"
+checksum = "4aa1f9055fc23919a54e4e125052bed16ed04aef0487086e758fe01a67b451c7"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -4339,22 +4471,21 @@ dependencies = [
  "serde_json",
  "tauri-utils",
  "tauri-winres",
- "toml 0.9.12+spec-1.1.0",
  "walkdir",
 ]
 
 [[package]]
 name = "tauri-codegen"
-version = "2.5.5"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a24476afd977c5d5d169f72425868613d82747916dd29e0a357c84c4bd6d29"
+checksum = "e4a0319528a025a38c4078e7dae2c446f4e63620ddb0659a643ede1cb38f90e9"
 dependencies = [
  "base64 0.22.1",
  "brotli",
  "ico",
  "json-patch",
  "plist",
- "png",
+ "png 0.17.16",
  "proc-macro2",
  "quote",
  "semver",
@@ -4372,9 +4503,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.5.5"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d39b349a98dadaffebb73f0a40dcd1f23c999211e5a2e744403db384d0c33de7"
+checksum = "ae6cb4e3896c21d2f6da5b31251d2faea0153bba56ed0e970f918115dbee4924"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -4386,9 +4517,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin"
-version = "2.5.4"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddde7d51c907b940fb573006cdda9a642d6a7c8153657e88f8a5c3c9290cd4aa"
+checksum = "e126abc9e84e35cdfd01596140a73a1850cdb0df0a23acf0185776c30b469a6e"
 dependencies = [
  "anyhow",
  "glob",
@@ -4397,7 +4528,6 @@ dependencies = [
  "serde",
  "serde_json",
  "tauri-utils",
- "toml 0.9.12+spec-1.1.0",
  "walkdir",
 ]
 
@@ -4439,15 +4569,30 @@ dependencies = [
  "tauri-plugin",
  "tauri-utils",
  "thiserror 2.0.18",
- "toml 1.0.7+spec-1.1.0",
+ "toml 1.1.2+spec-1.1.0",
  "url",
 ]
 
+[[package]]
+name = "tauri-plugin-global-shortcut"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4dd9f4c5136c09cd962da0c86dc4accd4666db2ea591cf16e6597435843bd2b"
+dependencies = [
+ "global-hotkey",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.5.3"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc624469b06f59f5a29f874bbc61a2ed737c0f9c23ef09855a292c389c42e83f"
+checksum = "17e1bea14edce6b793a04e2417e3fd924b9bc4faae83cdee7d714156cceeed29"
 dependencies = [
  "dunce",
  "glob",
@@ -4461,7 +4606,7 @@ dependencies = [
  "tauri-plugin",
  "thiserror 2.0.18",
  "url",
- "windows",
+ "windows 0.61.3",
  "zbus",
 ]
 
@@ -4483,9 +4628,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.10.1"
+version = "2.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2826d79a3297ed08cd6ea7f412644ef58e32969504bc4fbd8d7dbeabc4445ea2"
+checksum = "48222d7116c8807eaa6fe2f372e023fae125084e61e6eca6d70b7961cdf129ef"
 dependencies = [
  "cookie",
  "dpi",
@@ -4503,14 +4648,14 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.10.1"
+version = "2.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e11ea2e6f801d275fdd890d6c9603736012742a1c33b96d0db788c9cdebf7f9e"
+checksum = "b83849ee63ecb27a8e8d0fe51915ca215076914aca43f96db1179f0f415f6cd9"
 dependencies = [
  "gtk",
  "http",
@@ -4528,30 +4673,30 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "wry",
 ]
 
 [[package]]
 name = "tauri-utils"
-version = "2.8.3"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219a1f983a2af3653f75b5747f76733b0da7ff03069c7a41901a5eb3ace4557d"
+checksum = "092379df9a707631978e6c56b1bc2401d387f01e2d4a3c123360d167bbb9aa95"
 dependencies = [
  "anyhow",
  "brotli",
  "cargo_metadata",
  "ctor",
+ "dom_query",
  "dunce",
  "glob",
- "html5ever 0.29.1",
  "http",
  "infer",
  "json-patch",
- "kuchikiki",
  "log",
  "memchr",
- "phf 0.11.3",
+ "phf",
+ "plist",
  "proc-macro2",
  "quote",
  "regex",
@@ -4563,7 +4708,7 @@ dependencies = [
  "serde_with",
  "swift-rs",
  "thiserror 2.0.18",
- "toml 0.9.12+spec-1.1.0",
+ "toml 1.1.2+spec-1.1.0",
  "url",
  "urlpattern",
  "uuid",
@@ -4572,13 +4717,13 @@ dependencies = [
 
 [[package]]
 name = "tauri-winres"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0"
+checksum = "cc65d45c68858bfe420dd29e834b5d15dbecf8a07a8a16cf4d532c7b1f69d4b6"
 dependencies = [
  "dunce",
  "embed-resource",
- "toml 0.9.12+spec-1.1.0",
+ "toml 1.1.2+spec-1.1.0",
 ]
 
 [[package]]
@@ -4594,17 +4739,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "tendril"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
 [[package]]
 name = "tendril"
 version = "0.5.0"
@@ -4688,19 +4822,34 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
 ]
 
+[[package]]
+name = "tinyvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
 [[package]]
 name = "tokio"
-version = "1.50.0"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
  "bytes",
  "libc",
@@ -4713,9 +4862,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4753,9 +4902,9 @@ version = "0.9.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "serde_core",
- "serde_spanned 1.0.4",
+ "serde_spanned 1.1.1",
  "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
  "toml_writer",
@@ -4764,17 +4913,17 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "1.0.7+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd28d57d8a6f6e458bc0b8784f8fdcc4b99a437936056fa122cb234f18656a96"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "serde_core",
- "serde_spanned 1.0.4",
- "toml_datetime 1.0.1+spec-1.1.0",
+ "serde_spanned 1.1.1",
+ "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
  "toml_writer",
- "winnow 1.0.0",
+ "winnow 1.0.3",
 ]
 
 [[package]]
@@ -4797,9 +4946,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.0.1+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
  "serde_core",
 ]
@@ -4810,7 +4959,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "toml_datetime 0.6.3",
  "winnow 0.5.40",
 ]
@@ -4821,7 +4970,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.3",
@@ -4830,30 +4979,30 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.25.5+spec-1.1.0"
+version = "0.25.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
 dependencies = [
- "indexmap 2.13.0",
- "toml_datetime 1.0.1+spec-1.1.0",
+ "indexmap 2.14.0",
+ "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
- "winnow 1.0.0",
+ "winnow 1.0.3",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.10+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 1.0.0",
+ "winnow 1.0.3",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.7+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17aaa1c6e3dc22b1da4b6bba97d066e354c7945cac2f7852d4e4e7ca7a6b56d"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
 name = "tower"
@@ -4872,20 +5021,20 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytes",
  "futures-util",
  "http",
  "http-body",
- "iri-string",
  "pin-project-lite",
  "tower",
  "tower-layer",
  "tower-service",
+ "url",
 ]
 
 [[package]]
@@ -4941,11 +5090,29 @@ dependencies = [
  "strength_reduce",
 ]
 
+[[package]]
+name = "trash"
+version = "5.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7602e0c7d66ec2d92a8c917219fbc7894039efa2063b9064260110828a356f46"
+dependencies = [
+ "chrono",
+ "libc",
+ "log",
+ "objc2",
+ "objc2-foundation",
+ "once_cell",
+ "percent-encoding",
+ "scopeguard",
+ "urlencoding",
+ "windows 0.56.0",
+]
+
 [[package]]
 name = "tray-icon"
-version = "0.21.3"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c"
+checksum = "15edbb0d80583e85ee8df283410038e17314df5cba30da2087a54a85216c0773"
 dependencies = [
  "crossbeam-channel",
  "dirs",
@@ -4957,10 +5124,10 @@ dependencies = [
  "objc2-core-graphics",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.18.1",
  "serde",
  "thiserror 2.0.18",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4977,9 +5144,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
 name = "uds_windows"
@@ -5041,9 +5208,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-xid"
@@ -5064,6 +5231,12 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "urlpattern"
 version = "0.3.0"
@@ -5090,9 +5263,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.22.0"
+version = "1.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
+checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
 dependencies = [
  "getrandom 0.4.2",
  "js-sys",
@@ -5160,12 +5333,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
@@ -5174,11 +5341,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
@@ -5187,14 +5354,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5205,23 +5372,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
 dependencies = [
- "cfg-if",
- "futures-util",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5229,9 +5392,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -5242,9 +5405,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
 dependencies = [
  "unicode-ident",
 ]
@@ -5266,7 +5429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
  "anyhow",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "wasm-encoder",
  "wasmparser",
 ]
@@ -5290,17 +5453,17 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "hashbrown 0.15.5",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "semver",
 ]
 
 [[package]]
 name = "web-audio-api"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84af8a6acf0652c839297eebf360d25e6108c7376085cd446fc59289101110dd"
+checksum = "aae1d42666fbdedf3c4504894e1b615b1a74e158f131cba7a6e0138321b6de1c"
 dependencies = [
  "almost",
  "arc-swap",
@@ -5323,15 +5486,15 @@ dependencies = [
  "realfft",
  "rubato 0.16.2",
  "smallvec",
- "symphonia",
+ "symphonia 0.6.0",
  "vecmath",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.91"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5339,14 +5502,14 @@ dependencies = [
 
 [[package]]
 name = "web_atoms"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a9779e9f04d2ac1ce317aee707aa2f6b773afba7b931222bff6983843b1576"
+checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538"
 dependencies = [
- "phf 0.13.1",
- "phf_codegen 0.13.1",
- "string_cache 0.9.0",
- "string_cache_codegen 0.6.1",
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
 ]
 
 [[package]]
@@ -5401,10 +5564,10 @@ checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
 ]
 
 [[package]]
@@ -5425,7 +5588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
  "thiserror 2.0.18",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
 ]
 
@@ -5475,17 +5638,48 @@ dependencies = [
  "windows-version",
 ]
 
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+dependencies = [
+ "windows-core 0.56.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows"
 version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-collections",
+ "windows-collections 0.2.0",
  "windows-core 0.61.2",
- "windows-future",
+ "windows-future 0.2.1",
  "windows-link 0.1.3",
- "windows-numerics",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections 0.3.2",
+ "windows-core 0.62.2",
+ "windows-future 0.3.2",
+ "windows-numerics 0.3.1",
 ]
 
 [[package]]
@@ -5497,14 +5691,35 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core 0.62.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+dependencies = [
+ "windows-implement 0.56.0",
+ "windows-interface 0.56.0",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
  "windows-link 0.1.3",
  "windows-result 0.3.4",
  "windows-strings 0.4.2",
@@ -5516,8 +5731,8 @@ version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
  "windows-link 0.2.1",
  "windows-result 0.4.1",
  "windows-strings 0.5.1",
@@ -5531,7 +5746,29 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
  "windows-core 0.61.2",
  "windows-link 0.1.3",
- "windows-threading",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -5545,6 +5782,17 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.59.3"
@@ -5578,6 +5826,25 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -5707,6 +5974,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-version"
 version = "0.1.7"
@@ -5868,15 +6144,12 @@ name = "winnow"
 version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
-dependencies = [
- "memchr",
-]
 
 [[package]]
 name = "winnow"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
 dependencies = [
  "memchr",
 ]
@@ -5900,6 +6173,12 @@ dependencies = [
  "wit-bindgen-rust-macro",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
@@ -5919,7 +6198,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "prettyplease",
  "syn 2.0.117",
  "wasm-metadata",
@@ -5949,8 +6228,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.11.0",
- "indexmap 2.13.0",
+ "bitflags 2.11.1",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -5969,7 +6248,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -5981,15 +6260,15 @@ dependencies = [
 
 [[package]]
 name = "writeable"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "wry"
-version = "0.54.4"
+version = "0.55.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a8135d8676225e5744de000d4dff5a082501bf7db6a1c1495034f8c314edbc"
+checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514"
 dependencies = [
  "base64 0.22.1",
  "block2",
@@ -6023,7 +6302,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -6050,11 +6329,34 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "x11rb"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
+dependencies = [
+ "gethostname",
+ "rustix",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
+
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
 [[package]]
 name = "yoke"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -6063,9 +6365,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6075,9 +6377,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.14.0"
+version = "5.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc"
+checksum = "eee682d202a77e4a9f3b2c2bdf48a7b28af5c08c34ddf66f98c93e5e39464285"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -6102,7 +6404,7 @@ dependencies = [
  "uds_windows",
  "uuid",
  "windows-sys 0.61.2",
- "winnow 0.7.15",
+ "winnow 1.0.3",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -6110,9 +6412,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.14.0"
+version = "5.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222"
+checksum = "adf1bd45a81a103745b1757754762a26e8cd01e4532e4d6c8ec431624b80d1d6"
 dependencies = [
  "proc-macro-crate 3.5.0",
  "proc-macro2",
@@ -6125,49 +6427,29 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.3.1"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
+checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d"
 dependencies = [
  "serde",
- "winnow 0.7.15",
+ "winnow 1.0.3",
  "zvariant",
 ]
 
-[[package]]
-name = "zerocopy"
-version = "0.8.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5030500cb2d66bdfbb4ebc9563be6ce7005a4b5d0f26be0c523870fe372ca6"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5f86989a046a79640b9d8867c823349a139367bda96549794fcc3313ce91f4e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6177,9 +6459,9 @@ dependencies = [
 
 [[package]]
 name = "zerotrie"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -6188,9 +6470,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -6199,9 +6481,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6216,23 +6498,23 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
 [[package]]
 name = "zvariant"
-version = "5.10.0"
+version = "5.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b"
+checksum = "a192a0bde63360d77a7523c833d4b4ce6070a927e2c53246e4c540b1a3e27be0"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "winnow 0.7.15",
+ "winnow 1.0.3",
  "zvariant_derive",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.10.0"
+version = "5.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c"
+checksum = "90bc6cde9c01c511074be97f7ccb6c19d0da89e3f8662e812e999dcfd4638737"
 dependencies = [
  "proc-macro-crate 3.5.0",
  "proc-macro2",
@@ -6243,13 +6525,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
+checksum = "1e8535915cfa75547e559d8c68e8139909a4aeee076831e4ef7fc59d8172c4d6"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
  "syn 2.0.117",
- "winnow 0.7.15",
+ "winnow 1.0.3",
 ]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 7686823..7f9fe70 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -18,14 +18,19 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 tauri-build = { version = "2", features = [] }
 
 [dependencies]
-tauri = { version = "2", features = ["tray-icon"] }
+tauri = { version = "2", features = ["tray-icon", "image-png"] }
 tauri-plugin-opener = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-web-audio-api = "1.4.0"
+web-audio-api = "1.5.0"
 lofty = "0.24.0"
 base64 = "0.22.1"
 walkdir = "2.5.0"
 tauri-plugin-dialog = "2"
 tauri-plugin-store = "2"
+trash = "5"
+tokio = { version = "1", features = ["time"] }
+souvlaki = "0.8.3"
+raw-window-handle = "0.6"
+tauri-plugin-global-shortcut = "2"
 
diff --git a/src-tauri/src/audio.rs b/src-tauri/src/audio.rs
index fd8ae86..2182660 100644
--- a/src-tauri/src/audio.rs
+++ b/src-tauri/src/audio.rs
@@ -1,18 +1,36 @@
 use std::sync::{Mutex, OnceLock};
 
+use serde::{Deserialize, Serialize};
 use web_audio_api::context::AudioContext;
 use web_audio_api::node::GainNode;
 use web_audio_api::MediaElement;
 
+use crate::models::Track;
+
 pub fn get_audio_context() -> &'static AudioContext {
     static CONTEXT: OnceLock<AudioContext> = OnceLock::new();
     CONTEXT.get_or_init(|| AudioContext::default())
 }
 
+#[derive(Clone, Copy, Deserialize, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum PlayMode {
+    List,
+    Single,
+    Shuffle,
+}
+
 pub struct AudioState {
     pub media: Option<MediaElement>,
     pub gain_node: Option<GainNode>,
     pub volume: f32,
+    pub current_track_id: Option<String>,
+    pub current_path: Option<String>,
+    pub playing: bool,
+    pub playlist: Vec<Track>,
+    pub current_index: Option<usize>,
+    pub play_mode: PlayMode,
+    pub playback_history: Vec<String>,
 }
 
 pub fn get_audio_state() -> &'static Mutex<AudioState> {
@@ -23,6 +41,13 @@ pub fn get_audio_state() -> &'static Mutex<AudioState> {
             media: None,
             gain_node: None,
             volume: 0.8,
+            current_track_id: None,
+            current_path: None,
+            playing: false,
+            playlist: Vec::new(),
+            current_index: None,
+            play_mode: PlayMode::List,
+            playback_history: Vec::new(),
         })
     })
 }
\ No newline at end of file
diff --git a/src-tauri/src/commands/config.rs b/src-tauri/src/commands/config.rs
new file mode 100644
index 0000000..46cfb5b
--- /dev/null
+++ b/src-tauri/src/commands/config.rs
@@ -0,0 +1,63 @@
+use std::fs;
+use std::path::PathBuf;
+
+use tauri::{command, Manager};
+
+use crate::models::AppConfig;
+
+const CONFIG_FILE: &str = "config.json";
+
+fn config_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|e| e.to_string())?;
+
+    if !app_data_path.exists() {
+        fs::create_dir_all(&app_data_path).map_err(|e| e.to_string())?;
+    }
+
+    Ok(app_data_path.join(CONFIG_FILE))
+}
+
+pub fn load_config_sync(app_handle: &tauri::AppHandle) -> Result<AppConfig, String> {
+    let path = config_path(app_handle)?;
+
+    if !path.exists() {
+        return save_config_sync(app_handle, AppConfig::default());
+    }
+
+    let file = fs::File::open(&path).map_err(|e| e.to_string())?;
+
+    match serde_json::from_reader::<_, AppConfig>(file) {
+        Ok(config) => Ok(config),
+        Err(_) => save_config_sync(app_handle, AppConfig::default()),
+    }
+}
+
+pub fn save_config_sync(
+    app_handle: &tauri::AppHandle,
+    config: AppConfig,
+) -> Result<AppConfig, String> {
+    let path = config_path(app_handle)?;
+    let temp_path = path.with_extension("json.tmp");
+    let json = serde_json::to_string_pretty(&config).map_err(|e| e.to_string())?;
+
+    fs::write(&temp_path, json).map_err(|e| e.to_string())?;
+    fs::rename(&temp_path, &path).map_err(|e| e.to_string())?;
+
+    Ok(config)
+}
+
+#[command]
+pub async fn load_config(app_handle: tauri::AppHandle) -> Result<AppConfig, String> {
+    load_config_sync(&app_handle)
+}
+
+#[command]
+pub async fn save_config(
+    app_handle: tauri::AppHandle,
+    config: AppConfig,
+) -> Result<AppConfig, String> {
+    save_config_sync(&app_handle, config)
+}
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index 56a7188..6185fdb 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -1,6 +1,7 @@
 use std::collections::HashSet;
 use std::fs::{self, File};
 use std::path::Path;
+use std::process::Command;
 
 use base64::{engine::general_purpose, Engine as _};
 use lofty::prelude::*;
@@ -8,6 +9,7 @@ use lofty::probe::Probe;
 use tauri::{command, Manager};
 use walkdir::WalkDir;
 
+use crate::commands::playback::{remove_track_from_backend_queue, PlaybackQueueChangedPayload};
 use crate::commands::settings::load_settings;
 use crate::metadata::parse_single_track;
 use crate::models::settings::AppSettings;
@@ -129,6 +131,102 @@ pub fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
     Ok(cover)
 }
 
+fn validate_audio_path(path: &str) -> Result<&Path, String> {
+    let file_path = Path::new(path);
+
+    if !file_path.exists() {
+        return Err("音频文件不存在".into());
+    }
+
+    if !file_path.is_file() || !is_supported_audio_file(file_path) {
+        return Err(format!("拒绝操作非音频文件: {}", path));
+    }
+
+    Ok(file_path)
+}
+
+#[command]
+pub fn show_in_folder(path: String) -> Result<(), String> {
+    let file_path = Path::new(&path);
+
+    if !file_path.exists() {
+        return Err("文件不存在".into());
+    }
+
+    #[cfg(target_os = "linux")]
+    let parent = file_path
+        .parent()
+        .ok_or_else(|| "无法定位文件所在目录".to_string())?;
+
+    #[cfg(target_os = "windows")]
+    let status = Command::new("explorer.exe")
+        .arg(format!("/select,{}", file_path.display()))
+        .status();
+
+    #[cfg(target_os = "macos")]
+    let status = Command::new("open").arg("-R").arg(file_path).status();
+
+    #[cfg(target_os = "linux")]
+    let status = Command::new("xdg-open").arg(parent).status();
+
+    let status = status.map_err(|e| e.to_string())?;
+
+    if status.success() {
+        Ok(())
+    } else {
+        Err("打开文件所在目录失败".into())
+    }
+}
+
+#[command]
+pub async fn delete_track_file(
+    app_handle: tauri::AppHandle,
+    path: String,
+    track_id: String,
+) -> Result<PlaybackQueueChangedPayload, String> {
+    let file_path = validate_audio_path(&path)?;
+    trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
+    remove_track_from_backend_queue(app_handle, track_id).await
+}
+
+#[command]
+pub fn trash_music_files(paths: Vec<String>) -> Result<(), String> {
+    for path in paths {
+        let file_path = Path::new(&path);
+
+        if !file_path.exists() {
+            continue;
+        }
+
+        if !file_path.is_file() || !is_supported_audio_file(file_path) {
+            return Err(format!("拒绝移至回收站非音频文件: {}", path));
+        }
+
+        trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
+    }
+
+    Ok(())
+}
+
+#[command]
+pub fn delete_music_files(paths: Vec<String>) -> Result<(), String> {
+    for path in paths {
+        let file_path = Path::new(&path);
+
+        if !file_path.exists() {
+            continue;
+        }
+
+        if !file_path.is_file() || !is_supported_audio_file(file_path) {
+            return Err(format!("拒绝删除非音频文件: {}", path));
+        }
+
+        fs::remove_file(file_path).map_err(|e| format!("删除文件失败 {}: {}", path, e))?;
+    }
+
+    Ok(())
+}
+
 #[command]
 pub fn scan_music_directories(
     app_handle: tauri::AppHandle,
diff --git a/src-tauri/src/commands/menu.rs b/src-tauri/src/commands/menu.rs
new file mode 100644
index 0000000..879f3ee
--- /dev/null
+++ b/src-tauri/src/commands/menu.rs
@@ -0,0 +1,13 @@
+use tauri::{command, menu::MenuBuilder, Manager, Window};
+
+#[command]
+pub fn show_context_menu(window: Window) {
+    let handle = window.app_handle();
+    let menu = MenuBuilder::new(handle)
+        .text("quit", "退出程序")
+        .separator()
+        .text("play", "播放")
+        .build()
+        .unwrap();
+    let _ = window.popup_menu(&menu);
+}
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 68a7ac7..710a13a 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -1,4 +1,6 @@
+pub mod config;
 pub mod recent;
 pub mod settings;
 pub mod playback;
 pub mod library;
+pub mod menu;
\ No newline at end of file
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index aa76444..eff3c79 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -1,15 +1,249 @@
 use std::path::Path;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use tauri::command;
+use serde::Serialize;
+use souvlaki::{MediaControlEvent, SeekDirection};
+use tauri::{command, AppHandle, Emitter};
 use web_audio_api::context::BaseAudioContext;
 use web_audio_api::node::AudioNode;
 use web_audio_api::MediaElement;
 
-use crate::audio::{get_audio_context, get_audio_state};
+use crate::audio::{get_audio_context, get_audio_state, PlayMode};
+use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
+use crate::models::Track;
 
-#[command]
-pub async fn play_music(full_path: &str) -> Result<String, String> {
-    let file_path = Path::new(full_path);
+#[derive(Clone)]
+pub struct NativeTrackMetadata {
+    pub title: String,
+    pub album: String,
+    pub artist: String,
+    pub duration: Option<f64>,
+}
+
+#[derive(Clone)]
+pub enum NativePlaybackState {
+    Playing { current_time: f64 },
+    Paused { current_time: f64 },
+    Stopped,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackTrackSnapshot {
+    pub id: Option<String>,
+    pub path: Option<String>,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackStatusSnapshot {
+    pub has_media: bool,
+    pub playing: bool,
+    pub current_time: f64,
+    pub track: Option<PlaybackTrackSnapshot>,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackProgressPayload {
+    pub playing: bool,
+    pub current_time: f64,
+    pub track_id: Option<String>,
+    pub path: Option<String>,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackTrackStartedPayload {
+    pub track: Track,
+    pub index: usize,
+    pub playing: bool,
+    pub current_time: f64,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackQueueChangedPayload {
+    pub playlist: Vec<Track>,
+    pub current_index: Option<usize>,
+    pub play_mode: PlayMode,
+    pub playback_history: Vec<String>,
+}
+
+fn metadata_from_track(track: &Track) -> NativeTrackMetadata {
+    NativeTrackMetadata {
+        title: track.title.clone(),
+        album: track.album.clone(),
+        artist: track.artist.clone(),
+        duration: Some(track.duration),
+    }
+}
+
+fn minimal_track(full_path: String, track_id: Option<String>) -> Track {
+    let title = Path::new(&full_path)
+        .file_stem()
+        .and_then(|value| value.to_str())
+        .unwrap_or("未知歌曲")
+        .to_string();
+
+    Track {
+        id: track_id.unwrap_or_else(|| full_path.clone()),
+        title,
+        artist: "未知歌手".to_string(),
+        album: "未知专辑".to_string(),
+        album_artist: "未知歌手".to_string(),
+        duration: 0.0,
+        sample_rate: None,
+        cover: None,
+        path: full_path,
+    }
+}
+
+fn current_time_from_state() -> f64 {
+    let Ok(state) = get_audio_state().lock() else {
+        return 0.0;
+    };
+
+    if let Some(ref media) = state.media {
+        media.current_time()
+    } else {
+        0.0
+    }
+}
+
+fn status_snapshot() -> Result<PlaybackStatusSnapshot, String> {
+    let mut state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
+    if let Some(ref media) = state.media {
+        let playing = !media.paused();
+        let current_time = media.current_time();
+        let track = PlaybackTrackSnapshot {
+            id: state.current_track_id.clone(),
+            path: state.current_path.clone(),
+        };
+        state.playing = playing;
+
+        return Ok(PlaybackStatusSnapshot {
+            has_media: true,
+            playing,
+            current_time,
+            track: Some(track),
+        });
+    }
+
+    state.playing = false;
+
+    Ok(PlaybackStatusSnapshot {
+        has_media: false,
+        playing: false,
+        current_time: 0.0,
+        track: None,
+    })
+}
+
+fn progress_payload() -> Option<PlaybackProgressPayload> {
+    let Ok(mut state) = get_audio_state().lock() else {
+        return None;
+    };
+
+    let Some(ref media) = state.media else {
+        state.playing = false;
+        return None;
+    };
+
+    let playing = !media.paused();
+    let current_time = media.current_time();
+    let track_id = state.current_track_id.clone();
+    let path = state.current_path.clone();
+    state.playing = playing;
+
+    Some(PlaybackProgressPayload {
+        playing,
+        current_time,
+        track_id,
+        path,
+    })
+}
+
+fn current_track_duration() -> Option<f64> {
+    let Ok(state) = get_audio_state().lock() else {
+        return None;
+    };
+
+    let index = state.current_index?;
+    state.playlist.get(index).map(|track| track.duration)
+}
+
+fn should_advance_track() -> bool {
+    let Some(payload) = progress_payload() else {
+        return false;
+    };
+
+    if !payload.playing {
+        return false;
+    }
+
+    let Some(duration) = current_track_duration() else {
+        return false;
+    };
+
+    duration > 0.0 && payload.current_time >= duration - 0.5
+}
+
+fn emit_track_started(app_handle: &AppHandle, track: Track, index: usize) {
+    let payload = PlaybackTrackStartedPayload {
+        track,
+        index,
+        playing: true,
+        current_time: 0.0,
+    };
+    let _ = app_handle.emit("playback:track-started", payload);
+}
+
+fn emit_progress(app_handle: &AppHandle) {
+    if let Some(payload) = progress_payload() {
+        let state = if payload.playing {
+            NativePlaybackState::Playing {
+                current_time: payload.current_time,
+            }
+        } else {
+            NativePlaybackState::Paused {
+                current_time: payload.current_time,
+            }
+        };
+        update_media_controls_playback(state);
+        let _ = app_handle.emit("playback:progress", payload);
+    }
+}
+
+fn queue_snapshot() -> Result<PlaybackQueueChangedPayload, String> {
+    let state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
+
+    Ok(PlaybackQueueChangedPayload {
+        playlist: state.playlist.clone(),
+        current_index: state.current_index,
+        play_mode: state.play_mode,
+        playback_history: state.playback_history.clone(),
+    })
+}
+
+fn emit_queue_changed(app_handle: &AppHandle) -> Result<PlaybackQueueChangedPayload, String> {
+    let payload = queue_snapshot()?;
+    let _ = app_handle.emit("playback:queue-changed", payload.clone());
+    Ok(payload)
+}
+
+fn sanitize_track(mut track: Track) -> Track {
+    track.cover = None;
+    track
+}
+
+fn play_track_internal(app_handle: &AppHandle, track: Track, index: Option<usize>) -> Result<(), String> {
+    let file_path = Path::new(&track.path);
 
     if !file_path.exists() {
         return Err("音频文件不存在或已被移动".into());
@@ -20,7 +254,6 @@ pub async fn play_music(full_path: &str) -> Result<String, String> {
 
     let context = get_audio_context();
     let src = context.create_media_element_source(&mut media);
-
     let gain_node = context.create_gain();
 
     src.connect(&gain_node);
@@ -29,94 +262,516 @@ pub async fn play_music(full_path: &str) -> Result<String, String> {
     media.set_loop(false);
     media.set_current_time(0.0);
 
-    let mut state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
+    {
+        let mut state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
 
-    gain_node.gain().set_value(state.volume);
+        gain_node.gain().set_value(state.volume);
 
-    if let Some(old_media) = state.media.replace(media) {
-        old_media.pause();
+        if let Some(old_media) = state.media.replace(media) {
+            old_media.pause();
+        }
+
+        state.gain_node = Some(gain_node);
+        state.current_path = Some(track.path.clone());
+        state.current_track_id = Some(track.id.clone());
+        state.playing = true;
+
+        if let Some(next_index) = index {
+            state.current_index = Some(next_index);
+        }
+
+        if let Some(ref media) = state.media {
+            media.play();
+        }
     }
 
-    state.gain_node = Some(gain_node);
+    update_media_controls_metadata(metadata_from_track(&track));
+    update_media_controls_playback(NativePlaybackState::Playing { current_time: 0.0 });
 
-    if let Some(ref media) = state.media {
-        media.play();
+    if let Some(index) = index {
+        emit_track_started(app_handle, track, index);
+    } else {
+        emit_progress(app_handle);
     }
 
-    Ok(format!("Playing music: {}", full_path))
+    Ok(())
 }
-#[command]
-pub async fn resume_music() -> Result<(), String> {
-    let state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
 
-    if let Some(ref media) = state.media {
-        media.play();
-        Ok(())
-    } else {
-        Err("No media available".into())
+fn play_current_index_internal(app_handle: &AppHandle, index: usize) -> Result<(), String> {
+    let track = {
+        let state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+        state
+            .playlist
+            .get(index)
+            .cloned()
+            .ok_or_else(|| "Invalid queue index".to_string())?
+    };
+
+    play_track_internal(app_handle, track, Some(index))
+}
+
+fn next_index_from_state() -> Option<usize> {
+    let state = get_audio_state().lock().ok()?;
+
+    if state.playlist.is_empty() {
+        return None;
+    }
+
+    let current_index = state.current_index.unwrap_or(0);
+
+    match state.play_mode {
+        PlayMode::Single => Some(current_index.min(state.playlist.len() - 1)),
+        PlayMode::List => Some(if current_index >= state.playlist.len() - 1 {
+            0
+        } else {
+            current_index + 1
+        }),
+        PlayMode::Shuffle => {
+            if state.playlist.len() <= 1 {
+                return Some(0);
+            }
+
+            let nanos = SystemTime::now()
+                .duration_since(UNIX_EPOCH)
+                .ok()?
+                .subsec_nanos() as usize;
+            let mut next = nanos % state.playlist.len();
+
+            if next == current_index {
+                next = (next + 1) % state.playlist.len();
+            }
+
+            Some(next)
+        }
     }
 }
 
-#[command]
-pub async fn pause_music() -> Result<(), String> {
-    let state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
+fn previous_index_from_state() -> Option<usize> {
+    let state = get_audio_state().lock().ok()?;
 
-    if let Some(ref media) = state.media {
-        media.pause();
-        Ok(())
+    if state.playlist.is_empty() {
+        return None;
+    }
+
+    if let Some(last_id) = state.playback_history.last() {
+        if let Some(index) = state.playlist.iter().position(|track| &track.id == last_id) {
+            return Some(index);
+        }
+    }
+
+    let current_index = state.current_index.unwrap_or(0);
+
+    Some(if current_index == 0 {
+        state.playlist.len() - 1
     } else {
-        Err("No media available".into())
+        current_index - 1
+    })
+}
+
+fn push_current_to_history() {
+    if let Ok(mut state) = get_audio_state().lock() {
+        if let Some(index) = state.current_index {
+            if let Some(track) = state.playlist.get(index) {
+                let id = track.id.clone();
+                state.playback_history.push(id);
+            }
+        }
     }
 }
 
+fn pop_history_if_matches(index: usize) {
+    if let Ok(mut state) = get_audio_state().lock() {
+        if let Some(track) = state.playlist.get(index) {
+            if state.playback_history.last() == Some(&track.id) {
+                state.playback_history.pop();
+            }
+        }
+    }
+}
 
-#[command]
-pub async fn toggle_music() -> Result<bool, String> {
-    let state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
+pub async fn play_next_internal(app_handle: AppHandle) -> Result<(), String> {
+    push_current_to_history();
+    let index = next_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
+    play_current_index_internal(&app_handle, index)
+}
 
-    if let Some(ref media) = state.media {
-        if media.paused() {
+pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), String> {
+    let index = previous_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
+    pop_history_if_matches(index);
+    play_current_index_internal(&app_handle, index)
+}
+
+pub async fn resume_internal(app_handle: AppHandle) -> Result<(), String> {
+    let current_time = {
+        let mut state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        if let Some(ref media) = state.media {
             media.play();
-            Ok(true)
+            let current_time = media.current_time();
+            state.playing = true;
+            current_time
         } else {
+            return Err("No media available".into());
+        }
+    };
+
+    update_media_controls_playback(NativePlaybackState::Playing { current_time });
+    emit_progress(&app_handle);
+    Ok(())
+}
+
+pub async fn pause_internal(app_handle: AppHandle) -> Result<(), String> {
+    let current_time = {
+        let mut state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        if let Some(ref media) = state.media {
             media.pause();
-            Ok(false)
+            let current_time = media.current_time();
+            state.playing = false;
+            current_time
+        } else {
+            return Err("No media available".into());
+        }
+    };
+
+    update_media_controls_playback(NativePlaybackState::Paused { current_time });
+    emit_progress(&app_handle);
+    Ok(())
+}
+
+pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
+    let playing = {
+        let mut state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        if let Some(ref media) = state.media {
+            if media.paused() {
+                media.play();
+                state.playing = true;
+                true
+            } else {
+                media.pause();
+                state.playing = false;
+                false
+            }
+        } else {
+            return Err("No media available".into());
         }
+    };
+
+    let current_time = current_time_from_state();
+
+    if playing {
+        update_media_controls_playback(NativePlaybackState::Playing { current_time });
     } else {
-        Err("No media available".into())
+        update_media_controls_playback(NativePlaybackState::Paused { current_time });
     }
+
+    emit_progress(&app_handle);
+    Ok(playing)
 }
 
-#[command]
-pub async fn current_time() -> f64 {
-    let Ok(state) = get_audio_state().lock() else {
-        return 0.0;
+pub async fn stop_internal(app_handle: AppHandle) -> Result<(), String> {
+    {
+        let mut state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        if let Some(ref media) = state.media {
+            media.pause();
+            media.set_current_time(0.0);
+        }
+
+        state.playing = false;
+    }
+
+    update_media_controls_playback(NativePlaybackState::Stopped);
+    emit_progress(&app_handle);
+    Ok(())
+}
+
+pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), String> {
+    let playing = {
+        let state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        if let Some(ref media) = state.media {
+            media.set_current_time(time);
+            !media.paused()
+        } else {
+            false
+        }
     };
 
-    if let Some(ref media) = state.media {
-        media.current_time()
+    if playing {
+        update_media_controls_playback(NativePlaybackState::Playing { current_time: time });
     } else {
-        0.0
+        update_media_controls_playback(NativePlaybackState::Paused { current_time: time });
+    }
+
+    emit_progress(&app_handle);
+    Ok(())
+}
+
+pub async fn handle_media_control_event(app_handle: AppHandle, event: MediaControlEvent) {
+    match event {
+        MediaControlEvent::Play => {
+            let _ = resume_internal(app_handle).await;
+        }
+        MediaControlEvent::Pause => {
+            let _ = pause_internal(app_handle).await;
+        }
+        MediaControlEvent::Toggle => {
+            let _ = toggle_internal(app_handle).await;
+        }
+        MediaControlEvent::Next => {
+            let _ = play_next_internal(app_handle).await;
+        }
+        MediaControlEvent::Previous => {
+            let _ = play_previous_internal(app_handle).await;
+        }
+        MediaControlEvent::Stop => {
+            let _ = stop_internal(app_handle).await;
+        }
+        MediaControlEvent::SetPosition(position) => {
+            let _ = seek_internal(app_handle, position.0.as_secs_f64()).await;
+        }
+        MediaControlEvent::Seek(direction) => {
+            let current_time = current_time_from_state();
+            let offset = match direction {
+                SeekDirection::Forward => 10.0,
+                SeekDirection::Backward => -10.0,
+            };
+            let _ = seek_internal(app_handle, (current_time + offset).max(0.0)).await;
+        }
+        MediaControlEvent::SeekBy(direction, duration) => {
+            let current_time = current_time_from_state();
+            let offset = duration.as_secs_f64();
+            let next_time = match direction {
+                SeekDirection::Forward => current_time + offset,
+                SeekDirection::Backward => current_time - offset,
+            };
+            let _ = seek_internal(app_handle, next_time.max(0.0)).await;
+        }
+        _ => {}
     }
 }
 
+pub fn spawn_playback_progress_task(app_handle: AppHandle) {
+    tauri::async_runtime::spawn(async move {
+        loop {
+            emit_progress(&app_handle);
+
+            if should_advance_track() {
+                let _ = play_next_internal(app_handle.clone()).await;
+            }
+
+            tokio::time::sleep(Duration::from_millis(500)).await;
+        }
+    });
+}
+
 #[command]
-pub async fn set_current_time(time: f64) {
-    let Ok(state) = get_audio_state().lock() else {
-        return;
-    };
+pub async fn sync_playback_queue(
+    playlist: Vec<Track>,
+    current_index: Option<usize>,
+    play_mode: PlayMode,
+    playback_history: Vec<String>,
+) -> Result<(), String> {
+    let mut state = get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state")?;
 
-    if let Some(ref media) = state.media {
-        media.set_current_time(time);
+    state.playlist = playlist.into_iter().map(sanitize_track).collect();
+    state.current_index = current_index.filter(|index| *index < state.playlist.len());
+    state.play_mode = play_mode;
+    state.playback_history = playback_history;
+
+    Ok(())
+}
+
+#[command]
+pub async fn remove_track_from_backend_queue(
+    app_handle: AppHandle,
+    track_id: String,
+) -> Result<PlaybackQueueChangedPayload, String> {
+    let mut play_index = None;
+    let mut should_stop = false;
+
+    {
+        let mut state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        let Some(remove_index) = state.playlist.iter().position(|track| track.id == track_id) else {
+            return Ok(PlaybackQueueChangedPayload {
+                playlist: state.playlist.clone(),
+                current_index: state.current_index,
+                play_mode: state.play_mode,
+                playback_history: state.playback_history.clone(),
+            });
+        };
+
+        let was_current = state.current_index == Some(remove_index);
+        state.playlist.remove(remove_index);
+        state.playback_history.retain(|id| id != &track_id);
+
+        if state.playlist.is_empty() {
+            state.current_index = None;
+            should_stop = true;
+        } else if was_current {
+            let next_index = remove_index.min(state.playlist.len() - 1);
+            state.current_index = Some(next_index);
+            play_index = Some(next_index);
+        } else if let Some(current_index) = state.current_index {
+            if remove_index < current_index {
+                state.current_index = Some(current_index - 1);
+            }
+        }
+    }
+
+    let payload = emit_queue_changed(&app_handle)?;
+
+    if should_stop {
+        let _ = stop_internal(app_handle).await;
+    } else if let Some(index) = play_index {
+        let _ = play_current_index_internal(&app_handle, index);
+    }
+
+    Ok(payload)
+}
+
+#[command]
+pub async fn insert_track_as_next(
+    app_handle: AppHandle,
+    track: Track,
+) -> Result<PlaybackQueueChangedPayload, String> {
+    {
+        let mut state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        let track = sanitize_track(track);
+
+        if let Some(existing_index) = state.playlist.iter().position(|item| item.id == track.id) {
+            if state.current_index == Some(existing_index) {
+                return Ok(PlaybackQueueChangedPayload {
+                    playlist: state.playlist.clone(),
+                    current_index: state.current_index,
+                    play_mode: state.play_mode,
+                    playback_history: state.playback_history.clone(),
+                });
+            }
+
+            state.playlist.remove(existing_index);
+
+            if let Some(current_index) = state.current_index {
+                if existing_index < current_index {
+                    state.current_index = Some(current_index - 1);
+                }
+            }
+        }
+
+        if state.playlist.is_empty() || state.current_index.is_none() {
+            state.playlist = vec![track];
+            state.current_index = Some(0);
+        } else {
+            let insert_index = state.current_index.unwrap_or(0) + 1;
+            state.playlist.insert(insert_index, track);
+        }
+    }
+
+    emit_queue_changed(&app_handle)
+}
+
+#[command]
+pub async fn play_queue_track(app_handle: AppHandle, index: usize) -> Result<(), String> {
+    play_current_index_internal(&app_handle, index)
+}
+
+#[command]
+pub async fn play_next_track(app_handle: AppHandle) -> Result<(), String> {
+    play_next_internal(app_handle).await
+}
+
+#[command]
+pub async fn play_previous_track(app_handle: AppHandle) -> Result<(), String> {
+    play_previous_internal(app_handle).await
+}
+
+#[command]
+pub async fn stop_music(app_handle: AppHandle) -> Result<(), String> {
+    stop_internal(app_handle).await
+}
+
+#[command]
+pub async fn play_music(
+    app_handle: AppHandle,
+    full_path: String,
+    track_id: Option<String>,
+) -> Result<String, String> {
+    let track = {
+        let state = get_audio_state()
+            .lock()
+            .map_err(|_| "Failed to lock audio state")?;
+
+        state
+            .playlist
+            .iter()
+            .find(|track| {
+                track_id
+                    .as_ref()
+                    .map(|id| track.id == *id)
+                    .unwrap_or(false)
+                    || track.path == full_path
+            })
+            .cloned()
     }
+    .unwrap_or_else(|| minimal_track(full_path.clone(), track_id));
+
+    play_track_internal(&app_handle, track, None)?;
+
+    Ok(format!("Playing music: {}", full_path))
+}
+
+#[command]
+pub async fn resume_music(app_handle: AppHandle) -> Result<(), String> {
+    resume_internal(app_handle).await
+}
+
+#[command]
+pub async fn pause_music(app_handle: AppHandle) -> Result<(), String> {
+    pause_internal(app_handle).await
+}
+
+#[command]
+pub async fn toggle_music(app_handle: AppHandle) -> Result<bool, String> {
+    toggle_internal(app_handle).await
+}
+
+#[command]
+pub async fn current_time() -> f64 {
+    current_time_from_state()
+}
+
+#[command]
+pub async fn get_current_status() -> Result<PlaybackStatusSnapshot, String> {
+    status_snapshot()
+}
+
+#[command]
+pub async fn set_current_time(app_handle: AppHandle, time: f64) {
+    let _ = seek_internal(app_handle, time).await;
 }
 
 #[command]
@@ -135,4 +790,4 @@ pub async fn set_volume(volume: u8) -> Result<(), String> {
     }
 
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index c4cb30f..ecb8dff 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,24 +1,39 @@
 mod audio;
 mod commands;
+mod media_controls;
 mod metadata;
 mod models;
+mod shortcuts;
 
 use tauri::{
-    menu::{Menu, MenuItem},
+    menu::{Menu, MenuBuilder, MenuItem, SubmenuBuilder},
     tray::{MouseButton, TrayIconBuilder, TrayIconEvent},
     Emitter, Manager,
 };
 
+use commands::config::{load_config, save_config};
 use commands::library::{
-    execute_scan, get_track_cover, load_music_library, save_music_library, scan_music_directories,
+    delete_music_files, delete_track_file, execute_scan, get_track_cover, load_music_library,
+    save_music_library, scan_music_directories, show_in_folder, trash_music_files,
 };
 
-use commands::playback::{current_time, play_music, set_current_time, set_volume, resume_music, pause_music, toggle_music};
+use commands::playback::{
+    current_time, get_current_status, insert_track_as_next, pause_music, play_music, play_next_track,
+    play_previous_track, play_queue_track, remove_track_from_backend_queue, resume_music, set_current_time, set_volume,
+    spawn_playback_progress_task, stop_music, sync_playback_queue, toggle_music,
+};
 
 use commands::recent::{add_recently_played, clear_recently_played, load_recently_played};
 
 use commands::settings::{load_settings, save_settings};
 
+use commands::menu::show_context_menu;
+use media_controls::init_media_controls;
+use shortcuts::{
+    get_shortcuts, handle_shortcut_event, init_shortcuts, reset_shortcuts, update_shortcut,
+    ShortcutRegistry,
+};
+
 pub fn init_startup_scan(app_handle: tauri::AppHandle) {
     tauri::async_runtime::spawn(async move {
         if let Ok(settings) = crate::commands::settings::load_settings(app_handle.clone()).await {
@@ -36,14 +51,29 @@ pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_store::Builder::new().build())
+        .plugin(
+            tauri_plugin_global_shortcut::Builder::new()
+                .with_handler(handle_shortcut_event)
+                .build(),
+        )
+        .manage(ShortcutRegistry::default())
         .setup(|app| {
+            let _ = init_shortcuts(app.handle().clone());
+            let _ = init_media_controls(app.handle().clone());
+            spawn_playback_progress_task(app.handle().clone());
+
             let settings_item = MenuItem::with_id(app, "settings", "设置", true, None::<&str>)?;
-            let quit_item = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
-            let menu = Menu::with_items(app, &[&settings_item, &quit_item])?;
+            let quit_item = MenuItem::with_id(app, "quit", "退出", true, None::<&str>)?;
+            let tray_menu = Menu::with_items(app, &[&settings_item, &quit_item])?;
+            let file_menu = SubmenuBuilder::new(app, "文件")
+                .text("quit", "退出")
+                .build()?;
 
+            let app_menu = MenuBuilder::new(app).items(&[&file_menu]).build()?;
+            app.set_menu(app_menu)?;
             let _tray = TrayIconBuilder::new()
                 .icon(app.default_window_icon().unwrap().clone())
-                .menu(&menu)
+                .menu(&tray_menu)
                 .show_menu_on_left_click(false)
                 .on_menu_event(|app: &tauri::AppHandle, event| match event.id.as_ref() {
                     "settings" => {
@@ -63,7 +93,8 @@ pub fn run() {
                     if let TrayIconEvent::Click {
                         button: MouseButton::Left,
                         ..
-                    } = event {
+                    } = event
+                    {
                         let app = tray.app_handle();
                         if let Some(window) = app.get_webview_window("main") {
                             let _ = window.unminimize();
@@ -89,17 +120,52 @@ pub fn run() {
                     }
                 }
             });
+            app.on_menu_event(move |app_handle: &tauri::AppHandle, event| {
+                match event.id().0.as_str() {
+                    "quit" => {
+                        app_handle.exit(0);
+                    }
+                    "play" => {
+                        let _ = app_handle.emit("menu-play", ());
+                    }
+                    "next" => {
+                        let _ = app_handle.emit("menu-next", ());
+                    }
+                    "delete" => {
+                        let _ = app_handle.emit("menu-delete", ());
+                    }
+                    _ => {}
+                }
+            });
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![
+            show_context_menu,
+            load_config,
+            save_config,
+            get_shortcuts,
+            update_shortcut,
+            reset_shortcuts,
             play_music,
+            play_queue_track,
+            insert_track_as_next,
+            remove_track_from_backend_queue,
+            play_next_track,
+            play_previous_track,
+            stop_music,
+            sync_playback_queue,
             resume_music,
             pause_music,
             toggle_music,
             current_time,
+            get_current_status,
             set_current_time,
             set_volume,
             scan_music_directories,
+            show_in_folder,
+            delete_track_file,
+            delete_music_files,
+            trash_music_files,
             load_music_library,
             get_track_cover,
             load_recently_played,
diff --git a/src-tauri/src/media_controls.rs b/src-tauri/src/media_controls.rs
new file mode 100644
index 0000000..2a498e5
--- /dev/null
+++ b/src-tauri/src/media_controls.rs
@@ -0,0 +1,112 @@
+use std::ffi::c_void;
+use std::sync::mpsc::{self, Sender};
+use std::sync::OnceLock;
+use std::thread;
+use std::time::Duration;
+
+use souvlaki::{MediaControls, MediaMetadata, MediaPlayback, MediaPosition, PlatformConfig};
+use tauri::{AppHandle, Manager, WebviewWindow};
+
+use crate::commands::playback::{
+    handle_media_control_event, NativePlaybackState, NativeTrackMetadata,
+};
+
+#[derive(Clone)]
+enum MediaControlMessage {
+    Metadata(NativeTrackMetadata),
+    Playback(NativePlaybackState),
+}
+
+static MEDIA_CONTROL_SENDER: OnceLock<Sender<MediaControlMessage>> = OnceLock::new();
+
+#[cfg(target_os = "windows")]
+fn window_handle(window: &WebviewWindow) -> Option<isize> {
+    use raw_window_handle::{HasWindowHandle, RawWindowHandle};
+
+    let handle = window.window_handle().ok()?.as_raw();
+
+    match handle {
+        RawWindowHandle::Win32(handle) => Some(handle.hwnd.get()),
+        _ => None,
+    }
+}
+
+#[cfg(not(target_os = "windows"))]
+fn window_handle(_window: &WebviewWindow) -> Option<isize> {
+    None
+}
+
+pub fn init_media_controls(app_handle: AppHandle) -> Result<(), String> {
+    let window = app_handle
+        .get_webview_window("main")
+        .ok_or_else(|| "main window not found".to_string())?;
+
+    let hwnd = window_handle(&window);
+    let (tx, rx) = mpsc::channel::<MediaControlMessage>();
+    let app_for_events = app_handle.clone();
+
+    thread::spawn(move || {
+        let config = PlatformConfig {
+            display_name: "RustEchoMusic",
+            dbus_name: "rust_echo_music",
+            hwnd: hwnd.map(|value| value as *mut c_void),
+        };
+
+        let Ok(mut controls) = MediaControls::new(config) else {
+            return;
+        };
+
+        let _ = controls.attach(move |event| {
+            let app = app_for_events.clone();
+            tauri::async_runtime::spawn(async move {
+                handle_media_control_event(app, event).await;
+            });
+        });
+
+        while let Ok(message) = rx.recv() {
+            match message {
+                MediaControlMessage::Metadata(track) => {
+                    let duration = track.duration.map(Duration::from_secs_f64);
+                    let metadata = MediaMetadata {
+                        title: Some(track.title.as_str()),
+                        album: Some(track.album.as_str()),
+                        artist: Some(track.artist.as_str()),
+                        cover_url: None,
+                        duration,
+                    };
+                    let _ = controls.set_metadata(metadata);
+                }
+                MediaControlMessage::Playback(state) => {
+                    let playback = match state {
+                        NativePlaybackState::Playing { current_time } => MediaPlayback::Playing {
+                            progress: Some(MediaPosition(Duration::from_secs_f64(current_time))),
+                        },
+                        NativePlaybackState::Paused { current_time } => MediaPlayback::Paused {
+                            progress: Some(MediaPosition(Duration::from_secs_f64(current_time))),
+                        },
+                        NativePlaybackState::Stopped => MediaPlayback::Stopped,
+                    };
+                    let _ = controls.set_playback(playback);
+                }
+            }
+        }
+    });
+
+    let _ = MEDIA_CONTROL_SENDER.set(tx);
+
+    Ok(())
+}
+
+fn send(message: MediaControlMessage) {
+    if let Some(sender) = MEDIA_CONTROL_SENDER.get() {
+        let _ = sender.send(message);
+    }
+}
+
+pub fn update_media_controls_metadata(track: NativeTrackMetadata) {
+    send(MediaControlMessage::Metadata(track));
+}
+
+pub fn update_media_controls_playback(state: NativePlaybackState) {
+    send(MediaControlMessage::Playback(state));
+}
diff --git a/src-tauri/src/models/config.rs b/src-tauri/src/models/config.rs
new file mode 100644
index 0000000..31cc9f3
--- /dev/null
+++ b/src-tauri/src/models/config.rs
@@ -0,0 +1,64 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ShortcutAction {
+    PlayPause,
+    Stop,
+    Previous,
+    Next,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ShortcutConfig {
+    pub play_pause: String,
+    pub stop: String,
+    pub previous: String,
+    pub next: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AppConfig {
+    pub shortcuts: ShortcutConfig,
+}
+
+impl Default for ShortcutConfig {
+    fn default() -> Self {
+        Self {
+            play_pause: "CommandOrControl+Alt+Space".to_string(),
+            stop: "CommandOrControl+Alt+S".to_string(),
+            previous: "CommandOrControl+Alt+ArrowLeft".to_string(),
+            next: "CommandOrControl+Alt+ArrowRight".to_string(),
+        }
+    }
+}
+
+impl Default for AppConfig {
+    fn default() -> Self {
+        Self {
+            shortcuts: ShortcutConfig::default(),
+        }
+    }
+}
+
+impl ShortcutConfig {
+    pub fn set(&mut self, action: ShortcutAction, shortcut: String) {
+        match action {
+            ShortcutAction::PlayPause => self.play_pause = shortcut,
+            ShortcutAction::Stop => self.stop = shortcut,
+            ShortcutAction::Previous => self.previous = shortcut,
+            ShortcutAction::Next => self.next = shortcut,
+        }
+    }
+
+    pub fn entries(&self) -> [(ShortcutAction, &str); 4] {
+        [
+            (ShortcutAction::PlayPause, &self.play_pause),
+            (ShortcutAction::Stop, &self.stop),
+            (ShortcutAction::Previous, &self.previous),
+            (ShortcutAction::Next, &self.next),
+        ]
+    }
+}
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
index db7612e..7a2ab3b 100644
--- a/src-tauri/src/models/mod.rs
+++ b/src-tauri/src/models/mod.rs
@@ -1,4 +1,6 @@
+pub mod config;
 pub mod settings;
 pub mod track;
 
+pub use config::{AppConfig, ShortcutAction, ShortcutConfig};
 pub use track::{generate_track_id, Track};
\ No newline at end of file
diff --git a/src-tauri/src/shortcuts.rs b/src-tauri/src/shortcuts.rs
new file mode 100644
index 0000000..18875fe
--- /dev/null
+++ b/src-tauri/src/shortcuts.rs
@@ -0,0 +1,189 @@
+use std::collections::{HashMap, HashSet};
+use std::str::FromStr;
+use std::sync::Mutex;
+
+use tauri::{AppHandle, Manager, State};
+use tauri_plugin_global_shortcut::{GlobalShortcutExt, Shortcut, ShortcutEvent, ShortcutState};
+
+use crate::commands::config::{load_config_sync, save_config_sync};
+use crate::commands::playback::{
+    play_next_internal, play_previous_internal, stop_internal, toggle_internal,
+};
+use crate::models::{AppConfig, ShortcutAction, ShortcutConfig};
+
+pub struct ShortcutRegistry {
+    shortcuts: Mutex<HashMap<ShortcutAction, String>>,
+}
+
+impl Default for ShortcutRegistry {
+    fn default() -> Self {
+        Self {
+            shortcuts: Mutex::new(HashMap::new()),
+        }
+    }
+}
+
+fn parse_shortcut(shortcut: &str) -> Result<Shortcut, String> {
+    Shortcut::from_str(shortcut).map_err(|e| e.to_string())
+}
+
+fn shortcut_entries(config: &ShortcutConfig) -> [(ShortcutAction, &str); 4] {
+    config.entries()
+}
+
+fn ensure_unique(config: &ShortcutConfig) -> Result<(), String> {
+    let mut seen = HashSet::new();
+
+    for (_, shortcut) in shortcut_entries(config) {
+        if !seen.insert(shortcut.to_string()) {
+            return Err("快捷键冲突".to_string());
+        }
+    }
+
+    Ok(())
+}
+
+fn register_config(app_handle: &AppHandle, config: &ShortcutConfig) -> Result<(), String> {
+    ensure_unique(config)?;
+
+    for (_, shortcut) in shortcut_entries(config) {
+        parse_shortcut(shortcut)?;
+        app_handle
+            .global_shortcut()
+            .register(shortcut)
+            .map_err(|e| e.to_string())?;
+    }
+
+    Ok(())
+}
+
+fn unregister_config(app_handle: &AppHandle, shortcuts: &HashMap<ShortcutAction, String>) {
+    for shortcut in shortcuts.values() {
+        let _ = app_handle.global_shortcut().unregister(shortcut.as_str());
+    }
+}
+
+fn set_registry(state: &ShortcutRegistry, config: &ShortcutConfig) -> Result<(), String> {
+    let mut shortcuts = state.shortcuts.lock().map_err(|_| "快捷键状态锁定失败")?;
+    shortcuts.clear();
+
+    for (action, shortcut) in shortcut_entries(config) {
+        shortcuts.insert(action, shortcut.to_string());
+    }
+
+    Ok(())
+}
+
+pub fn init_shortcuts(app_handle: AppHandle) -> Result<(), String> {
+    let config = load_config_sync(&app_handle)?;
+    register_config(&app_handle, &config.shortcuts)?;
+    let state = app_handle.state::<ShortcutRegistry>();
+    set_registry(state.inner(), &config.shortcuts)
+}
+
+pub fn handle_shortcut_event(app_handle: &AppHandle, shortcut: &Shortcut, event: ShortcutEvent) {
+    if event.state != ShortcutState::Pressed {
+        return;
+    }
+
+    let shortcut_string = shortcut.into_string();
+    let state = app_handle.state::<ShortcutRegistry>();
+    let Ok(shortcuts) = state.shortcuts.lock() else {
+        return;
+    };
+
+    let action = shortcuts
+        .iter()
+        .find_map(|(action, value)| (value == &shortcut_string).then_some(*action));
+
+    let Some(action) = action else {
+        return;
+    };
+
+    let app = app_handle.clone();
+
+    tauri::async_runtime::spawn(async move {
+        match action {
+            ShortcutAction::PlayPause => {
+                let _ = toggle_internal(app).await;
+            }
+            ShortcutAction::Stop => {
+                let _ = stop_internal(app).await;
+            }
+            ShortcutAction::Previous => {
+                let _ = play_previous_internal(app).await;
+            }
+            ShortcutAction::Next => {
+                let _ = play_next_internal(app).await;
+            }
+        }
+    });
+}
+
+#[tauri::command]
+pub async fn get_shortcuts(app_handle: AppHandle) -> Result<AppConfig, String> {
+    load_config_sync(&app_handle)
+}
+
+#[tauri::command]
+pub async fn update_shortcut(
+    app_handle: AppHandle,
+    state: State<'_, ShortcutRegistry>,
+    action: ShortcutAction,
+    shortcut: String,
+) -> Result<AppConfig, String> {
+    parse_shortcut(&shortcut)?;
+
+    let mut config = load_config_sync(&app_handle)?;
+    config.shortcuts.set(action, shortcut.clone());
+    ensure_unique(&config.shortcuts)?;
+
+    let previous = state
+        .shortcuts
+        .lock()
+        .map_err(|_| "快捷键状态锁定失败")?
+        .clone();
+
+    unregister_config(&app_handle, &previous);
+
+    if let Err(err) = register_config(&app_handle, &config.shortcuts) {
+        let _ = register_config(&app_handle, &config_from_map(&previous).shortcuts);
+        return Err(err);
+    }
+
+    set_registry(state.inner(), &config.shortcuts)?;
+    save_config_sync(&app_handle, config)
+}
+
+#[tauri::command]
+pub async fn reset_shortcuts(
+    app_handle: AppHandle,
+    state: State<'_, ShortcutRegistry>,
+) -> Result<AppConfig, String> {
+    let config = AppConfig::default();
+    let previous = state
+        .shortcuts
+        .lock()
+        .map_err(|_| "快捷键状态锁定失败")?
+        .clone();
+
+    unregister_config(&app_handle, &previous);
+
+    if let Err(err) = register_config(&app_handle, &config.shortcuts) {
+        let _ = register_config(&app_handle, &config_from_map(&previous).shortcuts);
+        return Err(err);
+    }
+
+    set_registry(state.inner(), &config.shortcuts)?;
+    save_config_sync(&app_handle, config)
+}
+
+fn config_from_map(map: &HashMap<ShortcutAction, String>) -> AppConfig {
+    let mut shortcuts = ShortcutConfig::default();
+
+    for (action, shortcut) in map {
+        shortcuts.set(*action, shortcut.clone());
+    }
+
+    AppConfig { shortcuts }
+}
diff --git a/src/lib/components/base/Slider.svelte b/src/lib/components/base/Slider.svelte
index a521c6c..e4760da 100644
--- a/src/lib/components/base/Slider.svelte
+++ b/src/lib/components/base/Slider.svelte
@@ -114,6 +114,10 @@
     </div>
 
     <div class="divider" style="--progress: {progressRaw};"></div>
+    
+    <div class="label" class:active={startMove}>
+        {Math.round(value)}
+    </div>
 </div>
 
 <style>
@@ -122,7 +126,6 @@
         width: calc(1px * var(--width));
         --thumbHeight: 18;
         position: relative;
-        contain: paint;
         height: calc(var(--thumbHeight) * 1px);
     }
 
@@ -177,6 +180,7 @@
     }
 
     .divider {
+        anchor-name: --slider-thumb;
         position: absolute;
         box-sizing: border-box;
         top: 50%;
@@ -189,5 +193,30 @@
         height: calc(var(--thumbHeight) * 1px);
         pointer-events: none;
         transition: all 0s ease;
+        z-index: 2;
+    }
+
+    .label {
+        position: absolute;
+        position-anchor: --slider-thumb;
+        margin-bottom: 12px;
+        bottom: anchor(top);
+        left: anchor(center);
+        transform: translate(-50%, 4px) scale(0);
+        transform-origin: bottom center;
+        background-color: rgb(var(--mdui-color-primary));
+        color: rgb(var(--mdui-color-on-primary));
+        font-size: 11px;
+        font-weight: 500;
+        line-height: 16px;
+        padding: 4px 8px;
+        border-radius: 100px;
+        white-space: nowrap;
+        transition: transform 150ms cubic-bezier(0.2, 0, 0, 1);
+        z-index: 3;
+    }
+
+    .label.active {
+        transform: translate(-50%, 0) scale(1);
     }
 </style>
\ No newline at end of file
diff --git a/src/lib/features/QueueDrawer.svelte b/src/lib/features/QueueDrawer.svelte
index 3a8f6bb..8634565 100644
--- a/src/lib/features/QueueDrawer.svelte
+++ b/src/lib/features/QueueDrawer.svelte
@@ -1,126 +1,107 @@
 <script lang="ts">
     import IconButton from '$lib/components/base/IconButton.svelte'
-    import PlayingIndicator from '$lib/components/base/PlayingIndicator.svelte'
-    import { trackCovers } from '$lib/state/covers.svelte'
     import { player } from '$lib/state/player.svelte'
-    import { formatDuration } from '$lib/utils'
-    import '@mdui/icons/equalizer--rounded.js'
-    import '@mdui/icons/play-arrow--rounded.js'
+    import type { Track } from '$lib/types'
+    import TrackList from './TrackList.svelte'
 
-    function handlePlay(index: number) {
+    function handlePlay(_track: Track, index: number) {
         player.playTrackInQueue(index)
     }
 
-    function handleRemove(id: string, e: Event) {
-        e.stopPropagation()
-        player.removeTrack(id)
+    function handleRemove(track: Track, _index: number) {
+        player.removeTrack(track.id)
     }
 
-    function lazyCover(node: HTMLImageElement, track: any) {
-        let currentTrack = track
-        const observer = new IntersectionObserver(
-            entries => {
-                const entry = entries[0]
-                if (entry.isIntersecting) {
-                    trackCovers.load(currentTrack).then(cover => {
-                        if (cover) {
-                            node.src = cover
-                        }
-                    })
-                    observer.disconnect()
-                }
-            },
-            { rootMargin: '100px' }
-        )
-        observer.observe(node)
-        return {
-            update(nextTrack: any) {
-                currentTrack = nextTrack
-            },
-            destroy() {
-                observer.disconnect()
-            }
-        }
+    function handleClearQueue() {
+        if (player.playlist.length === 0) return
+        player.clearQueue()
     }
 </script>
 
+<!-- 这里必须写成数组形式，否则需要去掉<style>标签，因为svelte在有<style>标签的时候会将class中的&解析为&amp;导致tailwindcss 标签无法正常解析 -->
 <mdui-navigation-drawer
     open={player.queueOpen}
     placement="right"
     modal
     close-on-overlay-click
     close-on-esc
-    onclose={() => { player.queueOpen = false }}
-    class="mt-32 h-[calc(100vh-var(--spacing)*(24+14+20))] [&::part(panel)]:mt-20 [&::part(overlay)]:bg-transparent"
+    onclose={() => {
+        player.queueOpen = false
+    }}
+    class={[
+        'mt-32',
+        'h-[calc(100vh-var(--spacing)*(24+14+20))]',
+        '[&::part(panel)]:mt-20',
+        '[&::part(overlay)]:bg-transparent',
+    ]}
 >
-    <div class="flex items-center justify-between p-4 border-b border-[rgb(var(--mdui-color-outline-variant))]">
-        <div class="flex items-center gap-2">
-            <span class="text-lg font-semibold text-[rgb(var(--mdui-color-on-surface))]">播放队列</span>
-            <span class="px-2 py-0.5 text-xs rounded-full bg-[rgb(var(--mdui-color-secondary-container))] text-[rgb(var(--mdui-color-on-secondary-container))] font-medium">
-                {player.playlist.length}
-            </span>
+    <div class="flex h-full min-h-0 flex-col bg-(--mdui-color-surface)">
+        <div
+            class="sticky top-0 z-10 flex items-center justify-between bg-(--mdui-color-surface) p-4 themed-border-b"
+        >
+            <div class="flex items-center gap-2">
+                <span class="text-lg font-semibold themed-text-primary">
+                    播放队列
+                </span>
+                <span
+                    class="border rounded-full px-2 py-0.5 text-xs font-medium themed-tag-chip"
+                >
+                    {player.playlist.length}
+                </span>
+            </div>
+            <div class="flex items-center gap-1">
+                <IconButton
+                    icon="delete_sweep--rounded"
+                    disabled={player.playlist.length === 0}
+                    onclick={handleClearQueue}
+                />
+                <IconButton
+                    icon="close--rounded"
+                    onclick={() => {
+                        player.queueOpen = false
+                    }}
+                />
+            </div>
         </div>
-        <IconButton icon="close--rounded" onclick={() => { player.queueOpen = false }} />
-    </div>
 
-    <div class="flex-1 overflow-y-auto p-2 space-y-1">
-        {#if player.playlist.length === 0}
-            <div class="flex flex-col items-center justify-center h-64 text-center p-6 text-[rgb(var(--mdui-color-on-surface-variant))]">
-                <span class="text-4xl mb-2">🎵</span>
-                <p class="text-sm">队列为空</p>
-            </div>
-        {:else}
-            {#each player.playlist as track, index (track.id)}
-                {@const isCurrent = player.currentIndex === index}
+        <div class="min-h-0 flex-1 overflow-y-auto p-2">
+            {#if player.playlist.length === 0}
                 <div
-                    role="button"
-                    tabindex="0"
-                    ondblclick={() => handlePlay(index)}
-                    onkeydown={(e) => { if (e.key === 'Enter' || e.key === ' ') handlePlay(index) }}
-                    class="group flex items-center gap-3 p-2.5 rounded-lg cursor-pointer transition-all duration-200 select-none outline-none
-                           {isCurrent 
-                               ? 'bg-[rgb(var(--mdui-color-secondary-container))] text-[rgb(var(--mdui-color-on-secondary-container))] border border-[rgb(var(--mdui-color-outline-variant))]' 
-                               : 'hover:bg-[rgb(var(--mdui-color-surface-container-high))] text-[rgb(var(--mdui-color-on-surface))] border border-transparent'}"
+                    class="flex h-64 flex-col items-center justify-center p-6 text-center themed-text-secondary"
                 >
-                    <div class="relative w-10 h-10 rounded overflow-hidden bg-[rgb(var(--mdui-color-surface-container-highest))] shrink-0 flex items-center justify-center">
-                        <img
-                            use:lazyCover={track}
-                            src={trackCovers.get(track) || '/default_cover.png'}
-                            alt="cover"
-                            class="w-full h-full object-cover"
-                        />
-                        {#if isCurrent}
-                            <div class="absolute inset-0 bg-black/40 flex items-center justify-center text-[rgb(var(--mdui-color-inverse-primary-light))] text-lg">
-                                {#if player.playing}
-                                    <PlayingIndicator color="rgb(var(--mdui-color-inverse-primary-light))"/>
-                                {:else}
-                                    <mdui-icon-play-arrow--rounded></mdui-icon-play-arrow--rounded>
-                                {/if}
-                            </div>
-                        {/if}
-                    </div>
-
-                    <div class="flex-1 min-w-0">
-                        <div class="text-sm font-medium truncate {isCurrent ? 'text-[rgb(var(--mdui-color-primary))] font-semibold' : ''}">
-                            {track.title}
-                        </div>
-                        <div class="text-xs truncate text-[rgb(var(--mdui-color-on-surface-variant))] mt-0.5">
-                            {track.artist}
-                        </div>
-                    </div>
-
-                    <div class="flex items-center gap-1.5 shrink-0">
-                        <span class="text-xs font-mono text-[rgb(var(--mdui-color-on-surface-variant))]">
-                            {formatDuration(track.duration)}
-                        </span>
-                        <IconButton
-                            icon="close--rounded"
-                            class="opacity-0 group-hover:opacity-100 transition-opacity duration-200 text-xs text-[rgb(var(--mdui-color-on-surface-variant))] hover:text-red-500"
-                            onclick={(e: MouseEvent) => handleRemove(track.id, e)}
-                        />
-                    </div>
+                    <span class="text-4xl mb-2">🎵</span>
+                    <p class="text-sm">队列为空</p>
                 </div>
-            {/each}
-        {/if}
+            {:else}
+                <TrackList
+                    tracks={player.playlist}
+                    columns={['title', 'duration']}
+                    currentTrackIndex={player.currentIndex}
+                    hideHeader
+                    ondblclicktrack={handlePlay}
+                    onremovetrack={handleRemove}
+                />
+            {/if}
+        </div>
     </div>
 </mdui-navigation-drawer>
+
+<style>
+    .themed-text-primary {
+        color: rgb(var(--mdui-color-on-surface));
+    }
+
+    .themed-text-secondary {
+        color: rgb(var(--mdui-color-on-surface-variant));
+    }
+
+    .themed-border-b {
+        border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
+    }
+
+    .themed-tag-chip {
+        color: rgb(var(--mdui-color-on-surface-variant));
+        background-color: rgb(var(--mdui-color-surface-container-high));
+        border-color: rgb(var(--mdui-color-outline-variant));
+    }
+</style>
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 8f8109c..eaf7242 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
+    import IconButton from '$lib/components/base/IconButton.svelte'
     import PlayingIndicator from '$lib/components/base/PlayingIndicator.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
     import { player } from '$lib/state/player.svelte'
     import type { Track } from '$lib/types'
     import { formatDuration } from '$lib/utils'
+    import '@mdui/icons/play-arrow--rounded.js'
+    import 'mdui/components/checkbox.js'
     import 'mdui/components/list-item.js'
     import 'mdui/components/list.js'
 
@@ -12,6 +15,30 @@
     interface Props {
         tracks: Track[]
         columns?: TrackColumn[]
+        selectable?: boolean
+        selectedIds?: string[]
+        currentTrackIndex?: number
+        hideHeader?: boolean
+        ontoggletrack?: (track: Track, checked: boolean) => void
+        ondblclicktrack?: (track: Track, index: number) => void
+        onremovetrack?: (track: Track, index: number) => void
+        onplaytrack?: (track: Track, index: number) => void | Promise<void>
+        oninsertnexttrack?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>
+        onshowtrackfolder?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>
+        onremovetrackfromlist?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>
+        ondeletetrackfile?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>
     }
 
     const columnWidths: Record<TrackColumn, string> = {
@@ -22,11 +49,36 @@
         duration: '60px',
     }
 
-    let { tracks, columns = ['index', 'title', 'album', 'duration'] }: Props =
-        $props()
+    let {
+        tracks,
+        columns = ['index', 'title', 'album', 'duration'],
+        selectable = false,
+        selectedIds = [],
+        currentTrackIndex,
+        hideHeader = false,
+        ontoggletrack,
+        ondblclicktrack,
+        onremovetrack,
+        onplaytrack,
+        oninsertnexttrack,
+        onshowtrackfolder,
+        onremovetrackfromlist,
+        ondeletetrackfile,
+    }: Props = $props()
+
+    let contextMenuTrack = $state<Track | null>(null)
+    let contextMenuIndex = $state(-1)
+    let contextMenuX = $state(0)
+    let contextMenuY = $state(0)
+    let contextMenuOpen = $state(false)
 
     let gridTemplate = $derived(
-        columns.map(column => columnWidths[column]).join(' '),
+        [
+            selectable ? '48px' : null,
+            ...columns.map(column => columnWidths[column]),
+        ]
+            .filter(Boolean)
+            .join(' '),
     )
 
     function lazyCover(track: Track) {
@@ -59,13 +111,130 @@
         return Array.isArray(tags) ? tags : []
     }
 
-    function handlePlay(clickedTrack: Track) {
-        player.replacePlaylistAndPlay(tracks, clickedTrack.id)
+    function isCheckboxEventTarget(target: EventTarget | null) {
+        return (
+            target instanceof Element &&
+            Boolean(target.closest('mdui-checkbox'))
+        )
+    }
+
+    function isTrackSelected(track: Track) {
+        return selectedIds.includes(track.id)
+    }
+
+    function setTrackSelected(track: Track, checked: boolean) {
+        ontoggletrack?.(track, checked)
+    }
+
+    function toggleTrackSelected(track: Track) {
+        setTrackSelected(track, !isTrackSelected(track))
+    }
+
+    function handleTrackToggle(event: Event, track: Track) {
+        event.stopPropagation()
+
+        const target = event.currentTarget as HTMLElement & { checked: boolean }
+        setTrackSelected(track, target.checked)
+    }
+
+    function handleTrackClick(event: MouseEvent, track: Track) {
+        if (!selectable || isCheckboxEventTarget(event.target)) return
+
+        toggleTrackSelected(track)
+    }
+
+    function handleTrackDoubleClick(
+        event: MouseEvent,
+        clickedTrack: Track,
+        index: number,
+    ) {
+        if (selectable || isCheckboxEventTarget(event.target)) return
+
+        if (ondblclicktrack) {
+            ondblclicktrack(clickedTrack, index)
+        } else {
+            player.replacePlaylistAndPlay(tracks, clickedTrack.id)
+        }
 
         void trackCovers.load(clickedTrack)
     }
+
+    function playTrack(track: Track, index: number) {
+        if (onplaytrack) {
+            return onplaytrack(track, index)
+        }
+
+        player.replacePlaylistAndPlay(tracks, track.id)
+        void trackCovers.load(track)
+    }
+
+    function openTrackContextMenu(
+        event: MouseEvent,
+        track: Track,
+        index: number,
+    ) {
+        event.preventDefault()
+        event.stopPropagation()
+        contextMenuTrack = track
+        contextMenuIndex = index
+        contextMenuX = event.clientX
+        contextMenuY = event.clientY
+        contextMenuOpen = true
+    }
+
+    function closeContextMenu() {
+        contextMenuOpen = false
+        contextMenuTrack = null
+        contextMenuIndex = -1
+    }
+
+    async function handleContextMenuAction(
+        action?: (track: Track, index: number) => void | Promise<void>,
+    ) {
+        const track = contextMenuTrack
+        const index = contextMenuIndex
+
+        if (!track || index < 0) {
+            closeContextMenu()
+            return
+        }
+
+        closeContextMenu()
+        await action?.(track, index)
+    }
+
+    function handleWindowClick() {
+        if (contextMenuOpen) {
+            closeContextMenu()
+        }
+    }
+
+    function handleWindowKeydown(event: KeyboardEvent) {
+        if (event.key === 'Escape' && contextMenuOpen) {
+            closeContextMenu()
+        }
+    }
+
+    function handleTrackKeydown(
+        event: KeyboardEvent,
+        track: Track,
+        index: number,
+    ) {
+        if (isCheckboxEventTarget(event.target)) return
+
+        if (event.key === 'Enter' || event.key === ' ') {
+            event.preventDefault()
+            if (selectable) {
+                toggleTrackSelected(track)
+            } else {
+                void playTrack(track, index)
+            }
+        }
+    }
 </script>
 
+<svelte:window onclick={handleWindowClick} onkeydown={handleWindowKeydown} />
+
 {#snippet trackIndex(index: number, isCurrent: boolean)}
     <div
         class="flex justify-center items-center text-sm themed-text-secondary z-10"
@@ -84,10 +253,10 @@
     </div>
 {/snippet}
 
-{#snippet trackCover(track: Track, cover: string | null)}
+{#snippet trackCover(track: Track, cover: string | null, isCurrent: boolean)}
     <div
         {@attach lazyCover(track)}
-        class="w-10 h-10 rounded-md overflow-hidden shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
+        class="relative w-10 h-10 rounded-md overflow-hidden shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
     >
         {#if cover}
             <img
@@ -103,12 +272,28 @@
                 🎵
             </div>
         {/if}
+
+        {#if !columns.includes('index') && isCurrent}
+            <div
+                class="absolute inset-0 flex items-center justify-center bg-black/40 text-lg text-(--mdui-color-inverse-primary-light) z-20"
+            >
+                {#if player.playing}
+                    <PlayingIndicator
+                        color="rgb(var(--mdui-color-inverse-primary-light))"
+                    />
+                {:else}
+                    <mdui-icon-play-arrow--rounded
+                        class="text-[rgb(var(--mdui-color-inverse-primary-light))]"
+                    ></mdui-icon-play-arrow--rounded>
+                {/if}
+            </div>
+        {/if}
     </div>
 {/snippet}
 
 {#snippet trackTitle(track: Track, cover: string | null, isCurrent: boolean)}
     <div class="flex items-center gap-4 pl-3 overflow-hidden z-10 min-w-0">
-        {@render trackCover(track, cover)}
+        {@render trackCover(track, cover, isCurrent)}
 
         <div class="flex flex-col min-w-0">
             <span
@@ -153,88 +338,188 @@
     </div>
 {/snippet}
 
-{#snippet trackDuration(track: Track)}
-    <div class="text-sm font-mono z-10 themed-text-secondary text-left">
-        {formatDuration(track.duration)}
+{#snippet trackDuration(track: Track, index: number)}
+    <div class="flex items-center justify-between gap-2 z-10 w-full min-w-0">
+        <div class="text-sm font-mono themed-text-secondary text-left">
+            {formatDuration(track.duration)}
+        </div>
+        {#if onremovetrack}
+            <IconButton
+                icon="close--rounded"
+                class="text-xs themed-text-secondary opacity-0 transition-opacity duration-200 hover:text-red-500 group-hover:opacity-100"
+                onclick={(e: MouseEvent) => {
+                    e.stopPropagation()
+                    onremovetrack?.(track, index)
+                }}
+            />
+        {/if}
     </div>
 {/snippet}
 
-{#snippet trackItem(track: Track, index: number)}
-    {@const isCurrent = player.currentTrack?.id === track.id}
-    {@const cover = trackCovers.get(track)}
-
-    <mdui-list-item
-        class={[
-            'group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none active:scale-[0.995] themed-item',
-            isCurrent && 'themed-item-active',
-        ]}
-        ondblclick={() => handlePlay(track)}
-        role="button"
-        tabindex="0"
-    >
-        <mdui-ripple></mdui-ripple>
-
-        <div
-            class="grid items-center gap-4 w-full"
+<mdui-list class="flex flex-col w-full" role="list">
+    {#if !hideHeader}
+        <mdui-list-subheader
+            class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b"
             style:grid-template-columns={gridTemplate}
+            noninteractive
         >
+            {#if selectable}
+                <div></div>
+            {/if}
+
             {#if columns.includes('index')}
-                {@render trackIndex(index, isCurrent)}
+                <div class="text-center">#</div>
             {/if}
 
             {#if columns.includes('title')}
-                {@render trackTitle(track, cover, isCurrent)}
+                <div class="pl-2 text-left">标题</div>
             {/if}
 
             {#if columns.includes('album')}
-                {@render trackAlbum(track)}
+                <div class="text-left hidden md:block">专辑</div>
             {/if}
 
             {#if columns.includes('tags')}
-                {@render trackTags(track)}
+                <div class="text-left">标签</div>
             {/if}
 
             {#if columns.includes('duration')}
-                {@render trackDuration(track)}
+                <div class="text-left">时长</div>
             {/if}
-        </div>
-    </mdui-list-item>
-{/snippet}
-
-<mdui-list class="flex flex-col w-full">
-    <mdui-list-subheader
-        class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b"
-        style:grid-template-columns={gridTemplate}
-        noninteractive
-    >
-        {#if columns.includes('index')}
-            <div class="text-center">#</div>
-        {/if}
-
-        {#if columns.includes('title')}
-            <div class="pl-2 text-left">标题</div>
-        {/if}
-
-        {#if columns.includes('album')}
-            <div class="text-left hidden md:block">专辑</div>
-        {/if}
-
-        {#if columns.includes('tags')}
-            <div class="text-left">标签</div>
-        {/if}
-
-        {#if columns.includes('duration')}
-            <div class="text-left">时长</div>
-        {/if}
-    </mdui-list-subheader>
+        </mdui-list-subheader>
+    {/if}
 
     <div class="flex flex-col gap-1 mt-2">
-        {#each tracks as track, index (track.path)}
-            {@render trackItem(track, index)}
+        {#each tracks as track, index (track.id || index)}
+            {@const isCurrent =
+                currentTrackIndex !== undefined
+                    ? currentTrackIndex === index
+                    : player.currentTrack?.id === track.id}
+            {@const cover = trackCovers.get(track)}
+
+            <mdui-list-item
+                class={[
+                    'group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none active:scale-[0.995] themed-item',
+                    isCurrent && 'themed-item-active',
+                ]}
+                onclick={(event: MouseEvent) => handleTrackClick(event, track)}
+                ondblclick={(event: MouseEvent) =>
+                    handleTrackDoubleClick(event, track, index)}
+                oncontextmenu={(event: MouseEvent) =>
+                    openTrackContextMenu(event, track, index)}
+                onkeydown={(event: KeyboardEvent) =>
+                    handleTrackKeydown(event, track, index)}
+                role="button"
+                tabindex="0"
+            >
+                <mdui-ripple></mdui-ripple>
+
+                <div
+                    class="grid items-center gap-4 w-full"
+                    style:grid-template-columns={gridTemplate}
+                >
+                    {#if selectable}
+                        <div class="flex justify-center items-center z-10">
+                            <mdui-checkbox
+                                checked={selectedIds.includes(track.id)}
+                                onchange={(event: Event) =>
+                                    handleTrackToggle(event, track)}
+                            ></mdui-checkbox>
+                        </div>
+                    {/if}
+
+                    {#if columns.includes('index')}
+                        {@render trackIndex(index, isCurrent)}
+                    {/if}
+
+                    {#if columns.includes('title')}
+                        {@render trackTitle(track, cover, isCurrent)}
+                    {/if}
+
+                    {#if columns.includes('album')}
+                        {@render trackAlbum(track)}
+                    {/if}
+
+                    {#if columns.includes('tags')}
+                        {@render trackTags(track)}
+                    {/if}
+
+                    {#if columns.includes('duration')}
+                        {@render trackDuration(track, index)}
+                    {/if}
+                </div>
+            </mdui-list-item>
         {/each}
     </div>
 </mdui-list>
 
+{#if contextMenuOpen && contextMenuTrack}
+    <div
+        class="fixed z-50 min-w-44 overflow-hidden rounded-xl bg-[rgb(var(--mdui-color-surface-container-high))] py-1 text-sm text-[rgb(var(--mdui-color-on-surface))] shadow-xl"
+        style:left={`${contextMenuX}px`}
+        style:top={`${contextMenuY}px`}
+        role="menu"
+        tabindex="-1"
+        oncontextmenu={(event: MouseEvent) => event.preventDefault()}
+    >
+        <div
+            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void handleContextMenuAction(playTrack)}
+            onkeydown={(e: KeyboardEvent) =>
+                (e.key === 'Enter' || e.key === ' ') &&
+                void handleContextMenuAction(playTrack)}
+        >
+            播放
+        </div>
+        <div
+            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void handleContextMenuAction(oninsertnexttrack)}
+            onkeydown={(e: KeyboardEvent) =>
+                (e.key === 'Enter' || e.key === ' ') &&
+                void handleContextMenuAction(oninsertnexttrack)}
+        >
+            下一首播放
+        </div>
+        <div
+            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void handleContextMenuAction(onshowtrackfolder)}
+            onkeydown={(e: KeyboardEvent) =>
+                (e.key === 'Enter' || e.key === ' ') &&
+                void handleContextMenuAction(onshowtrackfolder)}
+        >
+            打开文件所在目录
+        </div>
+        <div
+            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void handleContextMenuAction(onremovetrackfromlist)}
+            onkeydown={(e: KeyboardEvent) =>
+                (e.key === 'Enter' || e.key === ' ') &&
+                void handleContextMenuAction(onremovetrackfromlist)}
+        >
+            从当前列表移除
+        </div>
+        <div
+            class="flex w-full px-4 py-2 text-left text-[rgb(var(--mdui-color-error))] transition-colors hover:bg-[rgb(var(--mdui-color-error-container))]"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void handleContextMenuAction(ondeletetrackfile)}
+            onkeydown={(e: KeyboardEvent) =>
+                (e.key === 'Enter' || e.key === ' ') &&
+                void handleContextMenuAction(ondeletetrackfile)}
+        >
+            删除文件
+        </div>
+    </div>
+{/if}
+
 <style>
     .themed-text-primary {
         color: rgb(var(--mdui-color-on-surface));
diff --git a/src/lib/features/settings/ShortcutRecorder.svelte b/src/lib/features/settings/ShortcutRecorder.svelte
new file mode 100644
index 0000000..0418daf
--- /dev/null
+++ b/src/lib/features/settings/ShortcutRecorder.svelte
@@ -0,0 +1,151 @@
+<script lang="ts">
+    type ShortcutRecorderProps = {
+        value: string
+        disabled?: boolean
+        onrecord?: (shortcut: string) => void | Promise<void>
+    }
+
+    let {
+        value,
+        disabled = false,
+        onrecord,
+    }: ShortcutRecorderProps = $props()
+
+    let isRecording = $state(false)
+    let isSaving = $state(false)
+
+    const modifierKeys = new Set([
+        'Alt',
+        'AltGraph',
+        'Control',
+        'Meta',
+        'Shift',
+    ])
+
+    function startRecording() {
+        if (disabled || isSaving) {
+            return
+        }
+
+        isRecording = true
+    }
+
+    function stopRecording() {
+        isRecording = false
+    }
+
+    function normalizeMainKey(key: string, code: string) {
+        if (key === ' ') {
+            return 'Space'
+        }
+
+        if (key.length === 1) {
+            return key.toUpperCase()
+        }
+
+        if (key === 'Esc') {
+            return 'Escape'
+        }
+
+        if (key === 'Spacebar') {
+            return 'Space'
+        }
+
+        if (key.startsWith('Arrow')) {
+            return key
+        }
+
+        if (/^Key[A-Z]$/.test(code)) {
+            return code.slice(3)
+        }
+
+        if (/^Digit\d$/.test(code)) {
+            return code.slice(5)
+        }
+
+        return key
+    }
+
+    function shortcutFromEvent(event: KeyboardEvent) {
+        const mainKey = normalizeMainKey(event.key, event.code)
+
+        if (modifierKeys.has(mainKey)) {
+            return null
+        }
+
+        const parts: string[] = []
+
+        if (event.ctrlKey || event.metaKey) {
+            parts.push('CommandOrControl')
+        }
+
+        if (event.altKey) {
+            parts.push('Alt')
+        }
+
+        if (event.shiftKey) {
+            parts.push('Shift')
+        }
+
+        if (parts.length === 0) {
+            return null
+        }
+
+        parts.push(mainKey)
+
+        return parts.join('+')
+    }
+
+    async function handleKeydown(event: KeyboardEvent) {
+        if (!isRecording) {
+            return
+        }
+
+        event.preventDefault()
+        event.stopPropagation()
+
+        if (event.key === 'Escape') {
+            stopRecording()
+            return
+        }
+
+        const shortcut = shortcutFromEvent(event)
+
+        if (!shortcut) {
+            return
+        }
+
+        isSaving = true
+
+        try {
+            await onrecord?.(shortcut)
+            stopRecording()
+        } finally {
+            isSaving = false
+        }
+    }
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
+
+<button
+    type="button"
+    class={[
+        'inline-flex min-w-48 items-center justify-center rounded-full border px-4 py-2 text-sm font-medium transition-colors',
+        'border-[rgb(var(--mdui-color-outline-variant))] bg-[rgb(var(--mdui-color-surface-container-high))] text-[rgb(var(--mdui-color-on-surface))]',
+        'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[rgb(var(--mdui-color-primary))] focus-visible:ring-offset-2 focus-visible:ring-offset-[rgb(var(--mdui-color-surface-container))]',
+        isRecording && 'border-[rgb(var(--mdui-color-primary))] bg-[rgb(var(--mdui-color-primary-container))] text-[rgb(var(--mdui-color-on-primary-container))]',
+        (disabled || isSaving) && 'cursor-not-allowed opacity-60',
+        !disabled && !isSaving && 'hover:bg-[rgb(var(--mdui-color-surface-container-highest))]',
+    ]}
+    disabled={disabled || isSaving}
+    aria-pressed={isRecording}
+    onclick={startRecording}
+    onfocus={startRecording}
+>
+    {#if isRecording}
+        按下快捷键...
+    {:else}
+        {value}
+    {/if}
+</button>
diff --git a/src/lib/features/settings/ShortcutSettingsPanel.svelte b/src/lib/features/settings/ShortcutSettingsPanel.svelte
new file mode 100644
index 0000000..6f43a0a
--- /dev/null
+++ b/src/lib/features/settings/ShortcutSettingsPanel.svelte
@@ -0,0 +1,89 @@
+<script lang="ts">
+    import { onMount } from 'svelte'
+    import Button from '$lib/components/base/Button.svelte'
+    import { config } from '$lib/state/config.svelte'
+    import type { ShortcutAction } from '$lib/types'
+    import SettingsListItem from './SettingsListItem.svelte'
+    import ShortcutRecorder from './ShortcutRecorder.svelte'
+
+    type ShortcutRow = {
+        action: ShortcutAction
+        title: string
+        description: string
+    }
+
+    const rows: ShortcutRow[] = [
+        {
+            action: 'playPause',
+            title: '播放/暂停',
+            description: '控制当前播放状态',
+        },
+        {
+            action: 'stop',
+            title: '停止',
+            description: '停止播放并重置进度',
+        },
+        {
+            action: 'previous',
+            title: '上一首',
+            description: '切换到上一首歌曲',
+        },
+        {
+            action: 'next',
+            title: '下一首',
+            description: '切换到下一首歌曲',
+        },
+    ]
+
+    let updatingAction = $state<ShortcutAction | null>(null)
+    let isResetting = $state(false)
+    let isBusy = $derived(config.isLoading || updatingAction !== null || isResetting)
+
+    onMount(() => {
+        void config.load()
+    })
+
+    async function handleRecord(action: ShortcutAction, shortcut: string) {
+        updatingAction = action
+
+        try {
+            await config.updateShortcut(action, shortcut)
+        } finally {
+            updatingAction = null
+        }
+    }
+
+    async function handleReset() {
+        isResetting = true
+
+        try {
+            await config.reset()
+        } finally {
+            isResetting = false
+        }
+    }
+</script>
+
+<div class="grid gap-3">
+    {#each rows as row (row.action)}
+        <SettingsListItem title={row.title} description={row.description}>
+            <ShortcutRecorder
+                value={config.data.shortcuts[row.action]}
+                disabled={isBusy}
+                onrecord={shortcut => handleRecord(row.action, shortcut)}
+            />
+        </SettingsListItem>
+    {/each}
+
+    <div class="flex justify-end">
+        <Button variant="tonal" disabled={isBusy} onclick={handleReset}>
+            重置快捷键
+        </Button>
+    </div>
+
+    {#if config.error}
+        <div class="text-sm text-red-500">
+            {config.error}
+        </div>
+    {/if}
+</div>
diff --git a/src/lib/state/config.svelte.ts b/src/lib/state/config.svelte.ts
new file mode 100644
index 0000000..888d806
--- /dev/null
+++ b/src/lib/state/config.svelte.ts
@@ -0,0 +1,64 @@
+import { invoke } from '@tauri-apps/api/core'
+import type { AppConfig, ShortcutAction } from '$lib/types'
+
+export const DEFAULT_CONFIG: AppConfig = {
+    shortcuts: {
+        playPause: 'CommandOrControl+Alt+Space',
+        stop: 'CommandOrControl+Alt+S',
+        previous: 'CommandOrControl+Alt+ArrowLeft',
+        next: 'CommandOrControl+Alt+ArrowRight',
+    },
+}
+
+class ConfigState {
+    data = $state<AppConfig>({ ...DEFAULT_CONFIG })
+    isLoading = $state(false)
+    error = $state<string | null>(null)
+
+    async load(): Promise<AppConfig> {
+        this.isLoading = true
+        this.error = null
+
+        try {
+            this.data = await invoke<AppConfig>('get_shortcuts')
+            return this.data
+        } catch (error) {
+            console.error('加载快捷键配置失败:', error)
+            this.error = String(error)
+            return this.data
+        } finally {
+            this.isLoading = false
+        }
+    }
+
+    async updateShortcut(action: ShortcutAction, shortcut: string): Promise<AppConfig> {
+        this.error = null
+
+        try {
+            this.data = await invoke<AppConfig>('update_shortcut', {
+                action,
+                shortcut,
+            })
+            return this.data
+        } catch (error) {
+            console.error('更新快捷键失败:', error)
+            this.error = String(error)
+            throw error
+        }
+    }
+
+    async reset(): Promise<AppConfig> {
+        this.error = null
+
+        try {
+            this.data = await invoke<AppConfig>('reset_shortcuts')
+            return this.data
+        } catch (error) {
+            console.error('重置快捷键失败:', error)
+            this.error = String(error)
+            throw error
+        }
+    }
+}
+
+export const config = new ConfigState()
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 16d51e4..bb33533 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -1,10 +1,46 @@
 import { invoke } from "@tauri-apps/api/core"
+import { listen, type UnlistenFn } from "@tauri-apps/api/event"
 import { load } from "@tauri-apps/plugin-store"
 import type { Track } from "../types/music"
 import { recentlyPlayed } from "./recent.svelte"
 
 type PlayMode = 'list' | 'single' | 'shuffle'
 
+type PlaybackTrackSnapshot = {
+    id?: string | null
+    path?: string | null
+}
+
+type PlaybackStatusSnapshot = {
+    hasMedia: boolean
+    playing: boolean
+    currentTime: number
+    track: PlaybackTrackSnapshot | null
+}
+
+type PlaybackProgressPayload = {
+    playing: boolean
+    currentTime: number
+    trackId?: string | null
+    path?: string | null
+}
+
+type PlaybackTrackStartedPayload = {
+    track: Track
+    index: number
+    playing: boolean
+    currentTime: number
+}
+
+export type PlaybackQueueChangedPayload = {
+    playlist: Track[]
+    currentIndex: number | null
+    playMode: PlayMode
+    playbackHistory: string[]
+}
+
+type BackendQueueTrack = Omit<Track, 'cover'>
+
 const STORE_NAME = "player-state.json"
 
 class Player {
@@ -22,13 +58,17 @@ class Player {
     #loadToken = 0
     #storePromise: ReturnType<typeof load> | null = null
     #debounceTimer: any = null
+    #progressUnlisten: UnlistenFn | null = null
+    #trackStartedUnlisten: UnlistenFn | null = null
+    #queueChangedUnlisten: UnlistenFn | null = null
 
     constructor() {
         this.#setupMediaSession()
     }
 
     #setupMediaSession() {
-        if (!('mediaSession' in navigator)) return
+        if (typeof navigator === 'undefined' || !('mediaSession' in navigator)) return
+        if (typeof window !== 'undefined' && '__TAURI_INTERNALS__' in window) return
 
         navigator.mediaSession.setActionHandler('play', () => this.resume())
         navigator.mediaSession.setActionHandler('pause', () => this.pause())
@@ -50,7 +90,7 @@ class Player {
     }
 
     #updateMediaMetadata() {
-        if (!('mediaSession' in navigator) || !this.currentTrack) return
+        if (typeof navigator === 'undefined' || !('mediaSession' in navigator) || !this.currentTrack) return
 
         navigator.mediaSession.metadata = new MediaMetadata({
             title: this.currentTrack.title,
@@ -66,17 +106,17 @@ class Player {
     }
 
     #updatePlaybackState() {
-        if (!('mediaSession' in navigator)) return
+        if (typeof navigator === 'undefined' || !('mediaSession' in navigator)) return
         navigator.mediaSession.playbackState = this.playing ? 'playing' : 'paused'
     }
 
     #updatePositionState() {
         const track = this.currentTrack
-        if (!track || !('mediaSession' in navigator) || !('setPositionState' in navigator.mediaSession)) return
+        if (!track || typeof navigator === 'undefined' || !('mediaSession' in navigator) || !('setPositionState' in navigator.mediaSession)) return
 
         navigator.mediaSession.setPositionState({
             duration: track.duration,
-            playbackRate: this.playing ? 1 : 0,
+            playbackRate: 1,
             position: this.currentTime,
         })
     }
@@ -88,7 +128,7 @@ class Player {
     }
 
     #clearMediaSession() {
-        if (!('mediaSession' in navigator)) return
+        if (typeof navigator === 'undefined' || !('mediaSession' in navigator)) return
         navigator.mediaSession.metadata = null
         navigator.mediaSession.playbackState = 'none'
     }
@@ -138,15 +178,48 @@ class Player {
         }, 1000)
     }
 
+    #stripCoverData(track: Track): BackendQueueTrack {
+        return Object.fromEntries(
+            Object.entries(track).filter(([key]) => key !== 'cover'),
+        ) as BackendQueueTrack
+    }
+
+    async #syncBackendQueue() {
+        await invoke('sync_playback_queue', {
+            playlist: this.playlist.map(track => this.#stripCoverData(track)),
+            currentIndex: this.currentIndex >= 0 ? this.currentIndex : null,
+            playMode: this.playMode,
+            playbackHistory: [...this.playbackHistory],
+        })
+    }
+
+    #applyBackendQueue(payload: PlaybackQueueChangedPayload) {
+        this.playlist = payload.playlist
+        this.currentIndex = payload.currentIndex ?? -1
+        this.playMode = payload.playMode
+        this.playbackHistory = payload.playbackHistory
+        this.#syncMediaSession()
+        this.#saveDebounced()
+    }
+
+    #playBackendQueueTrack(index: number) {
+        this.#loadToken++
+        this.#stopPolling()
+        this.currentTime = 0
+        this.playing = true
+        this.#syncMediaSession()
+        void this.#syncBackendQueue()
+            .then(() => invoke('play_queue_track', { index }))
+            .catch(err => {
+                this.playing = false
+                this.#syncMediaSession()
+                console.error(err)
+            })
+    }
+
     replacePlaylistAndPlay(tracks: Track[], targetId: string) {
         if (tracks.length === 0) {
-            this.playlist = []
-            this.currentIndex = -1
-            this.playing = false
-            this.playbackHistory = []
-            this.#clearMediaSession()
-            this.#stopPolling()
-            invoke('toggle_music').catch(console.error)
+            this.clearQueue()
             return
         }
 
@@ -157,13 +230,40 @@ class Player {
         this.playbackHistory = []
         this.playlist = nextQueue
         this.currentIndex = nextIndex
-        void this.#loadAndPlay()
+        this.#playBackendQueueTrack(nextIndex)
         this.#saveDebounced()
     }
 
     appendTrack(track: Track) {
-        if (this.playlist.some(t => t.id === track.id)) return
-        this.playlist = [...this.playlist, track]
+        this.insertNext(track)
+    }
+
+    insertTracksNext(tracks: Track[]) {
+        const uniqueTracks = tracks.filter(
+            (track, index, list) =>
+                list.findIndex(item => item.id === track.id) === index,
+        )
+
+        if (uniqueTracks.length === 0) return
+
+        if (this.playlist.length === 0 || this.currentIndex === -1) {
+            this.playlist = uniqueTracks
+            this.currentIndex = 0
+            void this.#syncBackendQueue().catch(console.error)
+            this.#saveDebounced()
+            return
+        }
+
+        const insertTracks = uniqueTracks.filter(
+            track => !this.playlist.some(item => item.id === track.id),
+        )
+
+        if (insertTracks.length === 0) return
+
+        const nextQueue = [...this.playlist]
+        nextQueue.splice(this.currentIndex + 1, 0, ...insertTracks)
+        this.playlist = nextQueue
+        void this.#syncBackendQueue().catch(console.error)
         this.#saveDebounced()
     }
 
@@ -184,6 +284,7 @@ class Player {
         if (nextQueue.length === 0 || nextIndex === -1) {
             this.playlist = [track]
             this.currentIndex = 0
+            void this.#syncBackendQueue().catch(console.error)
             this.#saveDebounced()
             return
         }
@@ -191,9 +292,20 @@ class Player {
         nextQueue.splice(nextIndex + 1, 0, track)
         this.playlist = nextQueue
         this.currentIndex = nextIndex
+        void this.#syncBackendQueue().catch(console.error)
         this.#saveDebounced()
     }
 
+    async insertTrackAsNext(track: Track) {
+        const payload = await invoke<PlaybackQueueChangedPayload>('insert_track_as_next', { track })
+        this.#applyBackendQueue(payload)
+    }
+
+    async removeTrackFromBackendQueue(trackId: string) {
+        const payload = await invoke<PlaybackQueueChangedPayload>('remove_track_from_backend_queue', { trackId })
+        this.#applyBackendQueue(payload)
+    }
+
     removeTrack(id: string) {
         const removeIndex = this.playlist.findIndex(t => t.id === id)
         if (removeIndex === -1) return
@@ -205,10 +317,12 @@ class Player {
             this.playlist = []
             this.currentIndex = -1
             this.playing = false
+            this.currentTime = 0
             this.playbackHistory = []
             this.#clearMediaSession()
             this.#stopPolling()
-            invoke('toggle_music').catch(console.error)
+            void this.#syncBackendQueue().catch(console.error)
+            invoke('stop_music').catch(console.error)
             this.#saveDebounced()
             return
         }
@@ -217,7 +331,7 @@ class Player {
             const nextIndex = Math.min(removeIndex, nextQueue.length - 1)
             this.playlist = nextQueue
             this.currentIndex = nextIndex
-            void this.#loadAndPlay()
+            this.#playBackendQueueTrack(nextIndex)
             this.#saveDebounced()
             return
         }
@@ -228,13 +342,14 @@ class Player {
         }
         this.playlist = nextQueue
         this.currentIndex = nextIndex
+        void this.#syncBackendQueue().catch(console.error)
         this.#saveDebounced()
     }
 
     playTrackInQueue(index: number) {
         if (index < 0 || index >= this.playlist.length) return
         this.currentIndex = index
-        void this.#loadAndPlay()
+        this.#playBackendQueueTrack(index)
         this.#saveDebounced()
     }
 
@@ -242,6 +357,7 @@ class Player {
         const modes: PlayMode[] = ['list', 'single', 'shuffle']
         const currentModeIndex = modes.indexOf(this.playMode)
         this.playMode = modes[(currentModeIndex + 1) % modes.length]
+        void this.#syncBackendQueue().catch(console.error)
         this.#saveDebounced()
     }
 
@@ -249,6 +365,19 @@ class Player {
         this.queueOpen = !this.queueOpen
     }
 
+    clearQueue() {
+        this.playlist = []
+        this.currentIndex = -1
+        this.playing = false
+        this.currentTime = 0
+        this.playbackHistory = []
+        this.#clearMediaSession()
+        this.#stopPolling()
+        void this.#syncBackendQueue().catch(console.error)
+        invoke('stop_music').catch(console.error)
+        this.#saveDebounced()
+    }
+
     #getNextIndex(): number {
         if (this.playlist.length <= 1) return 0
         if (this.playMode === 'shuffle') {
@@ -261,43 +390,24 @@ class Player {
         return this.currentIndex >= this.playlist.length - 1 ? 0 : this.currentIndex + 1
     }
 
-    #getPrevIndex(): number {
-        if (this.playlist.length <= 1) return 0
-        if (this.playMode === 'shuffle') {
-            let prevIndex = this.currentIndex
-            while (prevIndex === this.currentIndex) {
-                prevIndex = Math.floor(Math.random() * this.playlist.length)
-            }
-            return prevIndex
-        }
-        return this.currentIndex <= 0 ? this.playlist.length - 1 : this.currentIndex - 1
-    }
-
     next() {
         if (this.playlist.length === 0) return
         const current = this.currentTrack
         if (current) {
             this.playbackHistory.push(current.id)
         }
-        this.currentIndex = this.#getNextIndex()
-        void this.#loadAndPlay()
+        void this.#syncBackendQueue()
+            .then(() => invoke('play_next_track'))
+            .catch(console.error)
         this.#saveDebounced()
     }
 
     prev() {
         if (this.playlist.length === 0) return
+        void invoke('play_previous_track').catch(console.error)
         if (this.playbackHistory.length > 0) {
-            const lastId = this.playbackHistory.pop()
-            const index = this.playlist.findIndex(t => t.id === lastId)
-            if (index !== -1) {
-                this.currentIndex = index
-                void this.#loadAndPlay()
-                this.#saveDebounced()
-                return
-            }
+            this.playbackHistory.pop()
         }
-        this.currentIndex = this.#getPrevIndex()
-        void this.#loadAndPlay()
         this.#saveDebounced()
     }
 
@@ -355,6 +465,9 @@ class Player {
             if (typeof currentIndex === "number" && currentIndex >= 0) {
                 this.currentIndex = currentIndex
             }
+            if (this.playlist.length > 0 && this.currentIndex >= this.playlist.length) {
+                this.currentIndex = this.playlist.length - 1
+            }
             if (playMode) {
                 this.playMode = playMode
             }
@@ -362,11 +475,125 @@ class Player {
                 this.#volume = volume
                 invoke('set_volume', { volume }).catch(console.error)
             }
+
+            await this.#syncBackendQueue()
+            await this.#setupPlaybackListeners()
+            const status = await invoke<PlaybackStatusSnapshot>('get_current_status')
+            this.#applyBackendStatus(status)
         } catch (err) {
             console.error(err)
         }
     }
 
+    #findTrackIndexByIdentity(id?: string | null, path?: string | null) {
+        if (id) {
+            const index = this.playlist.findIndex(track => track.id === id)
+            if (index !== -1) return index
+        }
+
+        if (path) {
+            return this.playlist.findIndex(track => track.path === path)
+        }
+
+        return -1
+    }
+
+    #applyBackendStatus(status: PlaybackStatusSnapshot) {
+        if (!status.hasMedia || !status.track) {
+            this.playing = false
+            this.currentTime = 0
+            this.#stopPolling()
+            this.#syncMediaSession()
+            return
+        }
+
+        const index = this.#findTrackIndexByIdentity(status.track.id, status.track.path)
+        if (index !== -1) {
+            this.currentIndex = index
+        }
+
+        this.currentTime = status.currentTime
+        this.playing = status.playing
+        this.#syncMediaSession()
+
+        if (this.playing) {
+            this.#startPolling()
+        } else {
+            this.#stopPolling()
+        }
+    }
+
+    #handleBackendProgress(payload: PlaybackProgressPayload) {
+        const index = this.#findTrackIndexByIdentity(payload.trackId, payload.path)
+        if (index !== -1) {
+            this.currentIndex = index
+        }
+
+        this.currentTime = payload.currentTime
+        this.playing = payload.playing
+        this.#syncMediaSession()
+
+        if (this.currentTrack && this.currentTime >= this.currentTrack.duration - 0.5) {
+            this.#handleTrackEnded()
+        }
+    }
+
+    #handleTrackStarted(payload: PlaybackTrackStartedPayload) {
+        if (payload.index >= 0 && payload.index < this.playlist.length) {
+            this.currentIndex = payload.index
+        } else {
+            const index = this.#findTrackIndexByIdentity(payload.track.id, payload.track.path)
+            if (index !== -1) {
+                this.currentIndex = index
+            }
+        }
+
+        this.currentTime = payload.currentTime
+        this.playing = payload.playing
+        this.#syncMediaSession()
+
+        const track = this.currentTrack ?? payload.track
+        recentlyPlayed.add(track)
+
+        if (this.playing) {
+            this.#startPolling()
+        } else {
+            this.#stopPolling()
+        }
+
+        this.#saveDebounced()
+    }
+
+    async #setupPlaybackListeners() {
+        if (!this.#progressUnlisten) {
+            this.#progressUnlisten = await listen<PlaybackProgressPayload>('playback:progress', event => {
+                this.#handleBackendProgress(event.payload)
+            })
+        }
+
+        if (!this.#trackStartedUnlisten) {
+            this.#trackStartedUnlisten = await listen<PlaybackTrackStartedPayload>('playback:track-started', event => {
+                this.#handleTrackStarted(event.payload)
+            })
+        }
+
+        if (!this.#queueChangedUnlisten) {
+            this.#queueChangedUnlisten = await listen<PlaybackQueueChangedPayload>('playback:queue-changed', event => {
+                this.#applyBackendQueue(event.payload)
+            })
+        }
+    }
+
+    #handleTrackEnded() {
+        if (!this.currentTrack) return
+        if (this.playMode === 'single') {
+            this.currentTime = 0
+            this.#playBackendQueueTrack(this.currentIndex)
+        } else {
+            this.next()
+        }
+    }
+
     async #persist() {
         try {
             const store = await this.#getStore()
@@ -396,7 +623,7 @@ class Player {
         try {
             this.currentTime = 0
             if (track.path) {
-                await invoke('play_music', { fullPath: track.path })
+                await invoke('play_music', { fullPath: track.path, trackId: track.id })
             } else {
                 await invoke('play_online_music', { url: track.url, id: track.id })
             }
@@ -423,12 +650,7 @@ class Player {
             try {
                 this.currentTime = await invoke<number>('current_time')
                 if (this.currentTrack && this.currentTime >= this.currentTrack.duration - 0.5) {
-                    if (this.playMode === 'single') {
-                        this.currentTime = 0
-                        void this.#loadAndPlay()
-                    } else {
-                        this.next()
-                    }
+                    this.#handleTrackEnded()
                 }
             } catch (e) {
                 this.#stopPolling()
@@ -445,10 +667,16 @@ class Player {
 
     destroy() {
         this.#stopPolling()
+        this.#progressUnlisten?.()
+        this.#progressUnlisten = null
+        this.#trackStartedUnlisten?.()
+        this.#trackStartedUnlisten = null
+        this.#queueChangedUnlisten?.()
+        this.#queueChangedUnlisten = null
         if (this.#debounceTimer) {
             clearTimeout(this.#debounceTimer)
         }
     }
 }
 
-export const player = new Player()
\ No newline at end of file
+export const player = new Player()
diff --git a/src/lib/types/config.ts b/src/lib/types/config.ts
new file mode 100644
index 0000000..972a846
--- /dev/null
+++ b/src/lib/types/config.ts
@@ -0,0 +1,12 @@
+export type ShortcutAction = 'playPause' | 'stop' | 'previous' | 'next'
+
+export interface ShortcutConfig {
+    playPause: string
+    stop: string
+    previous: string
+    next: string
+}
+
+export interface AppConfig {
+    shortcuts: ShortcutConfig
+}
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index 7f20cfa..e37fefc 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -1,3 +1,4 @@
+export type { AppConfig, ShortcutAction, ShortcutConfig } from './config'
 export type {
     AppExtension,
     ExtensionCommand,
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index afe6b7e..9ce1fb8 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -8,18 +8,42 @@
     import Heading from '$lib/components/base/Heading.svelte'
     import IconButton from '$lib/components/base/IconButton.svelte'
     import SearchBar from '$lib/components/base/SearchBar.svelte'
+    import SettingsListItem from '$lib/features/settings/SettingsListItem.svelte'
+    import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
+    import { settings } from '$lib/state/settings.svelte'
+    import {
+        importMusicDirectory,
+        removeMusicDirectory,
+    } from '$lib/utils/library'
+    import { invoke } from '@tauri-apps/api/core'
 
+    import '@mdui/icons/arrow-back--rounded.js'
+    import '@mdui/icons/checklist-rtl--outlined.js'
+    import '@mdui/icons/delete--rounded.js'
+    import '@mdui/icons/delete-forever--rounded.js'
+    import '@mdui/icons/delete-outline--rounded.js'
+    import '@mdui/icons/folder--outlined.js'
     import '@mdui/icons/play-arrow--rounded.js'
+    import '@mdui/icons/playlist-add--outlined.js'
+    import '@mdui/icons/playlist-play--rounded.js'
     import '@mdui/icons/refresh--rounded.js'
     import 'mdui/components/button.js'
     import 'mdui/components/circular-progress.js'
+    import 'mdui/components/dialog.js'
     import 'mdui/components/segmented-button-group.js'
     import 'mdui/components/segmented-button.js'
+    import 'mdui/components/snackbar.js'
+    import 'mdui/components/switch.js'
 
     type SortBy = 'title' | 'artist' | 'album'
 
     let searchQuery = $state('')
     let sortBy = $state<SortBy>('title')
+    let isBatchMode = $state(false)
+    let selectedTrackIds = $state<string[]>([])
+    let isLibraryDialogOpen = $state(false)
+    let isAddAllSnackbarOpen = $state(false)
+    let isDeleteConfirmDialogOpen = $state(false)
 
     const collator = new Intl.Collator('zh-Hans-CN', {
         numeric: true,
@@ -51,11 +75,125 @@
         searchQuery ? searchResults : defaultSortedTracks,
     )
 
+    const selectedTracks = $derived(
+        displayTracks.filter(track => selectedTrackIds.includes(track.id)),
+    )
+
+    function appendTracksToPlaylist(tracks: Track[]) {
+        player.insertTracksNext(tracks)
+    }
+
+    function addAllToPlaylist() {
+        appendTracksToPlaylist(displayTracks)
+        isAddAllSnackbarOpen = true
+    }
+
+    function closeBatchMode() {
+        selectedTrackIds = []
+        isBatchMode = false
+        isDeleteConfirmDialogOpen = false
+    }
+
+    function toggleBatchMode() {
+        if (isBatchMode) {
+            closeBatchMode()
+            return
+        }
+
+        isBatchMode = true
+    }
+
+    function toggleTrackSelection(track: Track, checked: boolean) {
+        if (checked) {
+            if (!selectedTrackIds.includes(track.id)) {
+                selectedTrackIds = [...selectedTrackIds, track.id]
+            }
+
+            return
+        }
+
+        selectedTrackIds = selectedTrackIds.filter(id => id !== track.id)
+    }
+
+    function addSelectedToPlaylist() {
+        appendTracksToPlaylist(selectedTracks)
+    }
+
+    function getSelectedTrackPaths() {
+        return selectedTracks.map(track => track.path).filter(Boolean)
+    }
+
+    function removeSelectedFromCurrentList() {
+        const selectedIds = new Set(selectedTrackIds)
+        musicLibrary.tracks = musicLibrary.tracks.filter(
+            track => !selectedIds.has(track.id),
+        )
+        closeBatchMode()
+    }
+
+    async function moveSelectedToTrash() {
+        const paths = getSelectedTrackPaths()
+
+        try {
+            await invoke('trash_music_files', { paths })
+            await musicLibrary.scan()
+            closeBatchMode()
+        } catch (err) {
+            console.error('移至回收站失败:', err)
+            musicLibrary.error = String(err)
+        }
+    }
+
+    async function deleteSelectedFromDisk() {
+        const paths = getSelectedTrackPaths()
+
+        try {
+            await invoke('delete_music_files', { paths })
+            await musicLibrary.scan()
+            closeBatchMode()
+        } catch (err) {
+            console.error('删除本地音乐文件失败:', err)
+            musicLibrary.error = String(err)
+        }
+    }
+
+    function handleSwitchChange(event: Event, key: 'scanOnStartup') {
+        const target = event.currentTarget as HTMLElement & {
+            checked: boolean
+        }
+
+        settings.update({
+            [key]: target.checked,
+        })
+    }
+
     function playAll() {
         if (displayTracks.length === 0) return
         player.replacePlaylistAndPlay(displayTracks, displayTracks[0].id)
     }
 
+    function playContextTrack(track: Track) {
+        player.replacePlaylistAndPlay(displayTracks, track.id)
+    }
+
+    async function insertContextTrackNext(track: Track) {
+        await player.insertTrackAsNext(track)
+    }
+
+    async function showContextTrackFolder(track: Track) {
+        await invoke('show_in_folder', { path: track.path })
+    }
+
+    async function removeContextTrackFromList(track: Track) {
+        musicLibrary.tracks = musicLibrary.tracks.filter(item => item.id !== track.id)
+        await player.removeTrackFromBackendQueue(track.id)
+    }
+
+    async function deleteContextTrackFile(track: Track) {
+        await invoke('delete_track_file', { path: track.path, trackId: track.id })
+        await musicLibrary.scan()
+    }
+
     function handleSortChange(event: Event) {
         const value = (event.currentTarget as HTMLElement & { value: string })
             .value
@@ -89,9 +227,34 @@
                     icon="refresh--rounded"
                     variant="tonal"
                     onclick={() => musicLibrary.scan()}
-                >
-                    刷新
-                </IconButton>
+                />
+
+                <mdui-tooltip content="添加全部至播放列表">
+                    <IconButton
+                        variant="tonal"
+                        icon="playlist_add--outlined"
+                        disabled={displayTracks.length === 0}
+                        onclick={addAllToPlaylist}
+                    />
+                </mdui-tooltip>
+
+                <mdui-tooltip content="批量操作">
+                    <IconButton
+                        variant={isBatchMode ? 'filled' : 'tonal'}
+                        icon="checklist_rtl--outlined"
+                        onclick={toggleBatchMode}
+                    />
+                </mdui-tooltip>
+
+                <mdui-tooltip content="管理媒体文件夹">
+                    <IconButton
+                        variant="tonal"
+                        icon="folder--outlined"
+                        onclick={() => {
+                            isLibraryDialogOpen = true
+                        }}
+                    />
+                </mdui-tooltip>
             </div>
             <div class="flex px-2 gap-16 justify-end items-center">
                 <div class="max-w-md">
@@ -116,6 +279,69 @@
                 </div>
             </div>
         </div>
+
+        {#if isBatchMode}
+            <div
+                class="mt-4 flex flex-wrap items-center justify-between gap-3 rounded-2xl bg-[rgb(var(--mdui-color-surface-container-high))] px-4 py-3"
+            >
+                <div
+                    class="text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+                >
+                    已选择 {selectedTrackIds.length} 首歌曲
+                </div>
+
+                <div class="flex flex-wrap items-center gap-2">
+                    <Button
+                        variant="tonal"
+                        icon="playlist_add--rounded"
+                        disabled={selectedTrackIds.length === 0}
+                        onclick={addSelectedToPlaylist}
+                    >
+                        添加到播放列表
+                    </Button>
+
+                    <Button
+                        variant="tonal"
+                        icon="delete_outline--rounded"
+                        disabled={selectedTrackIds.length === 0}
+                        onclick={removeSelectedFromCurrentList}
+                    >
+                        从当前列表移除
+                    </Button>
+
+                    <Button
+                        variant="tonal"
+                        icon="delete--rounded"
+                        disabled={selectedTrackIds.length === 0}
+                        onclick={() => {
+                            isDeleteConfirmDialogOpen = true
+                        }}
+                    >
+                        移至回收站
+                    </Button>
+
+                    <Button
+                        variant="text"
+                        icon="delete_forever--rounded"
+                        disabled={selectedTrackIds.length === 0}
+                        onclick={() => {
+                            isDeleteConfirmDialogOpen = true
+                        }}
+                        class="bg-[rgb(var(--mdui-color-error-container))] text-[rgb(var(--mdui-color-on-error-container))] [[disabled]]:bg-[rgba(var(--mdui-color-on-surface))]/12 [[disabled]]:text-[rgba(var(--mdui-color-on-surface))]/38"
+                    >
+                        从磁盘删除
+                    </Button>
+
+                    <Button
+                        variant="text"
+                        icon="arrow_back--rounded"
+                        onclick={closeBatchMode}
+                    >
+                        返回/退出
+                    </Button>
+                </div>
+            </div>
+        {/if}
     </header>
 
     {#if musicLibrary.isLoading}
@@ -136,7 +362,162 @@
         </div>
     {:else}
         <div class="min-h-0 flex-1 overflow-auto pb-8">
-            <TrackList tracks={displayTracks as Track[]} />
+            <TrackList
+                tracks={displayTracks as Track[]}
+                selectable={isBatchMode}
+                selectedIds={selectedTrackIds}
+                ontoggletrack={toggleTrackSelection}
+                onplaytrack={playContextTrack}
+                oninsertnexttrack={insertContextTrackNext}
+                onshowtrackfolder={showContextTrackFolder}
+                onremovetrackfromlist={removeContextTrackFromList}
+                ondeletetrackfile={deleteContextTrackFile}
+            />
         </div>
     {/if}
 </div>
+
+<mdui-dialog
+    open={isLibraryDialogOpen}
+    close-on-overlay-click
+    close-on-esc
+    onclose={() => {
+        isLibraryDialogOpen = false
+    }}
+>
+    <div
+        class="grid max-h-[min(480px,calc(100vh-6rem))] w-100 grid-rows-[auto_auto_minmax(0,1fr)_auto] gap-6 overflow-hidden p-1"
+    >
+        <div class="w-full">
+            <div
+                class="text-xl font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+            >
+                管理媒体文件夹
+            </div>
+            <div
+                class="mt-1 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+            >
+                配置音乐媒体库扫描目录和启动行为
+            </div>
+        </div>
+
+        <SettingsRow title="启动时扫描" description="应用启动时自动刷新媒体库">
+            <mdui-switch
+                checked={settings.data?.scanOnStartup}
+                onchange={(event: Event) =>
+                    handleSwitchChange(event, 'scanOnStartup')}
+            ></mdui-switch>
+        </SettingsRow>
+
+        <div class="grid min-h-0 gap-3">
+            <div>
+                <div class="text-sm font-medium">媒体库目录</div>
+                <div
+                    class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                >
+                    管理应用扫描音乐文件的本地文件夹
+                </div>
+            </div>
+
+            <div class="flex">
+                <Button variant="tonal" onclick={importMusicDirectory}>
+                    添加本地文件夹
+                </Button>
+            </div>
+
+            {#if settings.data?.libraryDirs?.length > 0}
+                <div class="grid max-h-72 gap-2 overflow-y-auto pr-1 mt-2">
+                    {#each settings.data.libraryDirs as dir (dir)}
+                        <SettingsListItem title={dir}>
+                            <Button
+                                variant="text"
+                                onclick={() => removeMusicDirectory(dir)}
+                            >
+                                <span class="text-red-500">移除</span>
+                            </Button>
+                        </SettingsListItem>
+                    {/each}
+                </div>
+            {:else}
+                <div
+                    class="rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-4 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+                >
+                    暂未添加媒体库目录，应用将无法扫描到任何歌曲。
+                </div>
+            {/if}
+        </div>
+
+        <div class="flex justify-end">
+            <Button
+                variant="tonal"
+                onclick={() => {
+                    isLibraryDialogOpen = false
+                }}
+            >
+                关闭
+            </Button>
+        </div>
+    </div>
+</mdui-dialog>
+
+<mdui-dialog
+    open={isDeleteConfirmDialogOpen}
+    close-on-overlay-click
+    close-on-esc
+    onclose={() => {
+        isDeleteConfirmDialogOpen = false
+    }}
+>
+    <div class="grid w-[min(480px,calc(100vw-3rem))] gap-5 p-1">
+        <div>
+            <div
+                class="text-xl font-semibold text-[rgb(var(--mdui-color-on-surface))]"
+            >
+                确认删除所选歌曲
+            </div>
+            <div
+                class="mt-2 text-sm leading-6 text-[rgb(var(--mdui-color-on-surface-variant))]"
+            >
+                将对已选择的 {selectedTrackIds.length} 首歌曲执行删除操作。移至回收站后通常可以恢复；从磁盘中删除将永久移除文件且无法撤销。
+            </div>
+        </div>
+
+        <div class="flex flex-wrap justify-end gap-2">
+            <Button
+                variant="text"
+                onclick={() => {
+                    isDeleteConfirmDialogOpen = false
+                }}
+            >
+                取消
+            </Button>
+
+            <Button
+                variant="filled"
+                icon="delete--rounded"
+                onclick={moveSelectedToTrash}
+            >
+                移至回收站
+            </Button>
+
+            <Button
+                variant="filled"
+                icon="delete_forever--rounded"
+                class="bg-[rgb(var(--mdui-color-error-container))] text-[rgb(var(--mdui-color-on-error-container))] [[disabled]]:bg-[rgba(var(--mdui-color-on-surface))]/12 [[disabled]]:text-[rgba(var(--mdui-color-on-surface))]/38"
+                onclick={deleteSelectedFromDisk}
+            >
+                从磁盘中删除
+            </Button>
+        </div>
+    </div>
+</mdui-dialog>
+
+<mdui-snackbar
+    open={isAddAllSnackbarOpen}
+    auto-close-delay="1000"
+    onclose={() => {
+        isAddAllSnackbarOpen = false
+    }}
+>
+    成功添加至播放列表
+</mdui-snackbar>
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index f33ff70..652ce59 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -5,6 +5,7 @@
     import SettingsListItem from '$lib/features/settings/SettingsListItem.svelte'
     import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
     import SettingsSection from '$lib/features/settings/SettingsSection.svelte'
+    import ShortcutSettingsPanel from '$lib/features/settings/ShortcutSettingsPanel.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import type { ThemeMode } from '$lib/types'
     import { importMusicDirectory, removeMusicDirectory } from '$lib/utils/library'
@@ -88,6 +89,10 @@
             </SettingsRow>
         </SettingsSection>
 
+        <SettingsSection title="快捷键">
+            <ShortcutSettingsPanel />
+        </SettingsSection>
+
         <SettingsSection title="媒体库">
             <SettingsRow
                 title="启动时扫描"

From f8c20e1b1b9b5a8aeca1e38b11b7a8071299e382 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Tue, 2 Jun 2026 03:07:19 +0800
Subject: [PATCH 24/39] Add Tauri backend services, SQLite repos

feat: introduce full Tauri backend layer and upgrade dependencies

- Add database migration script (0001_initial.sql) and database manager
- Implement SQLite repositories and services for playback, playlist, recent, settings, track, and migration
- Implement playback queue, event handling, data models, and application state
- Add new Tauri command modules for playlists and tracks, and refactor existing command files
- Remove obsolete configuration and shortcut-related files
- Update Cargo.toml and Cargo.lock with Rust workspace metadata changes
- Upgrade frontend dependencies in package.json and pnpm-lock.yaml including Tailwind, Tauri API/CLI, Svelte, and Vite
---
 package.json                                  |  18 +-
 pnpm-lock.yaml                                | 688 ++++++++---------
 src-tauri/Cargo.lock                          | 580 +++++++++++++--
 src-tauri/Cargo.toml                          |   7 +-
 src-tauri/migrations/0001_initial.sql         |  55 ++
 src-tauri/src/audio.rs                        |   6 +-
 src-tauri/src/commands/config.rs              |  63 --
 src-tauri/src/commands/library.rs             | 109 +--
 src-tauri/src/commands/mod.rs                 |   9 +-
 src-tauri/src/commands/playback.rs            | 698 ++----------------
 src-tauri/src/commands/playlists.rs           | 136 ++++
 src-tauri/src/commands/recent.rs              |  98 +--
 src-tauri/src/commands/settings.rs            |  72 +-
 src-tauri/src/commands/tracks.rs              |  95 +++
 src-tauri/src/db/manager.rs                   |  57 ++
 src-tauri/src/db/mod.rs                       |   3 +
 src-tauri/src/errors/app_error.rs             |  55 ++
 src-tauri/src/errors/mod.rs                   |   3 +
 src-tauri/src/lib.rs                          | 150 ++--
 src-tauri/src/media_controls.rs               |  14 +-
 src-tauri/src/metadata.rs                     |  35 +-
 src-tauri/src/models/config.rs                |  64 --
 src-tauri/src/models/mod.rs                   |  10 +-
 src-tauri/src/models/playback.rs              | 121 +++
 src-tauri/src/models/playlist.rs              |  49 ++
 src-tauri/src/models/recent.rs                |   8 +
 src-tauri/src/models/settings.rs              |  58 +-
 src-tauri/src/models/track.rs                 |  77 +-
 src-tauri/src/repositories/mod.rs             |   1 +
 src-tauri/src/repositories/sqlite/mod.rs      |   9 +
 .../sqlite/playlist_repository.rs             | 160 ++++
 .../repositories/sqlite/recent_repository.rs  | 107 +++
 .../sqlite/settings_repository.rs             |  48 ++
 .../repositories/sqlite/track_repository.rs   | 191 +++++
 src-tauri/src/services/migration_service.rs   | 181 +++++
 src-tauri/src/services/mod.rs                 |  12 +
 src-tauri/src/services/playback_events.rs     |  71 ++
 src-tauri/src/services/playback_queue.rs      |  88 +++
 src-tauri/src/services/playback_service.rs    | 292 ++++++++
 src-tauri/src/services/playlist_service.rs    |  59 ++
 src-tauri/src/services/recent_service.rs      |  37 +
 src-tauri/src/services/settings_service.rs    |  66 ++
 src-tauri/src/services/track_service.rs       |  55 ++
 src-tauri/src/shortcuts.rs                    | 189 -----
 src-tauri/src/state/app_state.rs              |  27 +
 src-tauri/src/state/mod.rs                    |   4 +
 src-tauri/src/state/playback_state.rs         | 122 +++
 src/lib/features/PlayerBar.svelte             |  27 +-
 src/lib/features/QueueDrawer.svelte           |   1 -
 src/lib/features/TrackList.svelte             |  48 +-
 .../features/settings/ShortcutRecorder.svelte | 151 ----
 .../settings/ShortcutSettingsPanel.svelte     |  89 ---
 src/lib/features/shell/NavRail.svelte         |   8 +-
 src/lib/state/config.svelte.ts                |  64 --
 src/lib/state/library.svelte.ts               |  17 +-
 src/lib/state/player.svelte.ts                |  58 +-
 src/lib/state/recent.svelte.ts                |  29 +-
 src/lib/state/settings.svelte.ts              |   8 +-
 src/lib/types/config.ts                       |  12 -
 src/lib/types/index.ts                        |   1 -
 src/lib/types/music.ts                        |  23 +-
 src/lib/types/settings.ts                     |   3 +-
 src/lib/utils/library.ts                      |   4 +-
 src/routes/library/+page.svelte               |  10 +-
 src/routes/settings/+page.svelte              |   9 +-
 65 files changed, 3446 insertions(+), 2173 deletions(-)
 create mode 100644 src-tauri/migrations/0001_initial.sql
 delete mode 100644 src-tauri/src/commands/config.rs
 create mode 100644 src-tauri/src/commands/playlists.rs
 create mode 100644 src-tauri/src/commands/tracks.rs
 create mode 100644 src-tauri/src/db/manager.rs
 create mode 100644 src-tauri/src/db/mod.rs
 create mode 100644 src-tauri/src/errors/app_error.rs
 create mode 100644 src-tauri/src/errors/mod.rs
 delete mode 100644 src-tauri/src/models/config.rs
 create mode 100644 src-tauri/src/models/playback.rs
 create mode 100644 src-tauri/src/models/playlist.rs
 create mode 100644 src-tauri/src/models/recent.rs
 create mode 100644 src-tauri/src/repositories/mod.rs
 create mode 100644 src-tauri/src/repositories/sqlite/mod.rs
 create mode 100644 src-tauri/src/repositories/sqlite/playlist_repository.rs
 create mode 100644 src-tauri/src/repositories/sqlite/recent_repository.rs
 create mode 100644 src-tauri/src/repositories/sqlite/settings_repository.rs
 create mode 100644 src-tauri/src/repositories/sqlite/track_repository.rs
 create mode 100644 src-tauri/src/services/migration_service.rs
 create mode 100644 src-tauri/src/services/mod.rs
 create mode 100644 src-tauri/src/services/playback_events.rs
 create mode 100644 src-tauri/src/services/playback_queue.rs
 create mode 100644 src-tauri/src/services/playback_service.rs
 create mode 100644 src-tauri/src/services/playlist_service.rs
 create mode 100644 src-tauri/src/services/recent_service.rs
 create mode 100644 src-tauri/src/services/settings_service.rs
 create mode 100644 src-tauri/src/services/track_service.rs
 delete mode 100644 src-tauri/src/shortcuts.rs
 create mode 100644 src-tauri/src/state/app_state.rs
 create mode 100644 src-tauri/src/state/mod.rs
 create mode 100644 src-tauri/src/state/playback_state.rs
 delete mode 100644 src/lib/features/settings/ShortcutRecorder.svelte
 delete mode 100644 src/lib/features/settings/ShortcutSettingsPanel.svelte
 delete mode 100644 src/lib/state/config.svelte.ts
 delete mode 100644 src/lib/types/config.ts

diff --git a/package.json b/package.json
index e00494d..d9d27fa 100644
--- a/package.json
+++ b/package.json
@@ -14,24 +14,24 @@
   "license": "MIT",
   "dependencies": {
     "@mdui/icons": "^1.0.3",
-    "@tailwindcss/vite": "^4.2.2",
-    "@tauri-apps/api": "^2.10.1",
+    "@tailwindcss/vite": "^4.3.0",
+    "@tauri-apps/api": "^2.11.0",
     "@tauri-apps/plugin-dialog": "~2.7.1",
-    "@tauri-apps/plugin-opener": "^2.5.3",
+    "@tauri-apps/plugin-opener": "^2.5.4",
     "@tauri-apps/plugin-store": "^2.4.3",
     "material-symbols": "^0.43.0",
     "mdui": "^2.1.4",
-    "tailwindcss": "^4.2.2"
+    "tailwindcss": "^4.3.0"
   },
   "devDependencies": {
     "@sveltejs/adapter-static": "^3.0.10",
-    "@sveltejs/kit": "^2.55.0",
+    "@sveltejs/kit": "^2.61.1",
     "@sveltejs/vite-plugin-svelte": "^5.1.1",
-    "@tauri-apps/cli": "^2.10.1",
-    "svelte": "^5.55.1",
-    "svelte-check": "^4.4.5",
+    "@tauri-apps/cli": "^2.11.2",
+    "svelte": "^5.56.0",
+    "svelte-check": "^4.4.8",
     "typescript": "~5.6.3",
-    "vite": "^6.4.1"
+    "vite": "^6.4.2"
   },
   "packageManager": "pnpm@11.2.2+sha512.36e6621fad506178936455e70247b8808ef4ec25797a9f437a93281a020484e2607f6a469a22e982987c3dbb8866e3071514ab10a4a1749e06edcd1ec118436f"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60ed583..6e792dd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,17 +12,17 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       '@tailwindcss/vite':
-        specifier: ^4.2.2
-        version: 4.2.2(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+        specifier: ^4.3.0
+        version: 4.3.0(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
       '@tauri-apps/api':
-        specifier: ^2.10.1
-        version: 2.10.1
+        specifier: ^2.11.0
+        version: 2.11.0
       '@tauri-apps/plugin-dialog':
         specifier: ~2.7.1
         version: 2.7.1
       '@tauri-apps/plugin-opener':
-        specifier: ^2.5.3
-        version: 2.5.3
+        specifier: ^2.5.4
+        version: 2.5.4
       '@tauri-apps/plugin-store':
         specifier: ^2.4.3
         version: 2.4.3
@@ -33,33 +33,33 @@ importers:
         specifier: ^2.1.4
         version: 2.1.4
       tailwindcss:
-        specifier: ^4.2.2
-        version: 4.2.2
+        specifier: ^4.3.0
+        version: 4.3.0
     devDependencies:
       '@sveltejs/adapter-static':
         specifier: ^3.0.10
-        version: 3.0.10(@sveltejs/kit@2.55.0(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))(svelte@5.55.1)(typescript@5.6.3)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))
+        version: 3.0.10(@sveltejs/kit@2.61.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))(svelte@5.56.0)(typescript@5.6.3)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))
       '@sveltejs/kit':
-        specifier: ^2.55.0
-        version: 2.55.0(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))(svelte@5.55.1)(typescript@5.6.3)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+        specifier: ^2.61.1
+        version: 2.61.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))(svelte@5.56.0)(typescript@5.6.3)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
       '@sveltejs/vite-plugin-svelte':
         specifier: ^5.1.1
-        version: 5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+        version: 5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
       '@tauri-apps/cli':
-        specifier: ^2.10.1
-        version: 2.10.1
+        specifier: ^2.11.2
+        version: 2.11.2
       svelte:
-        specifier: ^5.55.1
-        version: 5.55.1
+        specifier: ^5.56.0
+        version: 5.56.0
       svelte-check:
-        specifier: ^4.4.5
-        version: 4.4.5(picomatch@4.0.4)(svelte@5.55.1)(typescript@5.6.3)
+        specifier: ^4.4.8
+        version: 4.4.8(picomatch@4.0.4)(svelte@5.56.0)(typescript@5.6.3)
       typescript:
         specifier: ~5.6.3
         version: 5.6.3
       vite:
-        specifier: ^6.4.1
-        version: 6.4.1(jiti@2.6.1)(lightningcss@1.32.0)
+        specifier: ^6.4.2
+        version: 6.4.2(jiti@2.7.0)(lightningcss@1.32.0)
 
 packages:
 
@@ -238,8 +238,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@lit-labs/ssr-dom-shim@1.5.1':
-    resolution: {integrity: sha512-Aou5UdlSpr5whQe8AA/bZG0jMj96CoJIWbGfZ91qieWu5AWUMKw8VR/pAkQkJYvBNhmCcWnZlyyk5oze8JIqYA==}
+  '@lit-labs/ssr-dom-shim@1.6.0':
+    resolution: {integrity: sha512-VHb0ALPMTlgKjM6yIxxoQNnpKyUKLD04VzeQdsiXkMqkvYlAHxq9glGLmgbb889/1GsohSOAjvQYoiBppXFqrQ==}
 
   '@lit/localize@0.12.2':
     resolution: {integrity: sha512-Qv9kvgJKDq/JVSwXOxuWvQnnOBysHA99ti9im9a4fImCmx+fto+XXcUYQbjZHqiueEEc4V20PcRDPO+1g/6seQ==}
@@ -262,149 +262,149 @@ packages:
   '@polka/url@1.0.0-next.29':
     resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
 
-  '@rollup/rollup-android-arm-eabi@4.60.1':
-    resolution: {integrity: sha512-d6FinEBLdIiK+1uACUttJKfgZREXrF0Qc2SmLII7W2AD8FfiZ9Wjd+rD/iRuf5s5dWrr1GgwXCvPqOuDquOowA==}
+  '@rollup/rollup-android-arm-eabi@4.60.4':
+    resolution: {integrity: sha512-F5QXMSiFebS9hKZj02XhWLLnRpJ3B3AROP0tWbFBSj+6kCbg5m9j5JoHKd4mmSVy5mS/IMQloYgYxCuJC0fxEQ==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.60.1':
-    resolution: {integrity: sha512-YjG/EwIDvvYI1YvYbHvDz/BYHtkY4ygUIXHnTdLhG+hKIQFBiosfWiACWortsKPKU/+dUwQQCKQM3qrDe8c9BA==}
+  '@rollup/rollup-android-arm64@4.60.4':
+    resolution: {integrity: sha512-GxxTKApUpzRhof7poWvCJHRF51C67u1R7D6DiluBE8wKU1u5GWE8t+v81JvJYtbawoBFX1hLv5Ei4eVjkWokaw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.60.1':
-    resolution: {integrity: sha512-mjCpF7GmkRtSJwon+Rq1N8+pI+8l7w5g9Z3vWj4T7abguC4Czwi3Yu/pFaLvA3TTeMVjnu3ctigusqWUfjZzvw==}
+  '@rollup/rollup-darwin-arm64@4.60.4':
+    resolution: {integrity: sha512-tua0TaJxMOB1R0V0RS1jFZ/RpURFDJIOR2A6jWwQeawuFyS4gBW+rntLRaQd0EQ4bd6Vp44Z2rXW+YYDBsj6IA==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.60.1':
-    resolution: {integrity: sha512-haZ7hJ1JT4e9hqkoT9R/19XW2QKqjfJVv+i5AGg57S+nLk9lQnJ1F/eZloRO3o9Scy9CM3wQ9l+dkXtcBgN5Ew==}
+  '@rollup/rollup-darwin-x64@4.60.4':
+    resolution: {integrity: sha512-CSKq7MsP+5PFIcydhAiR1K0UhEI1A2jWXVKHPCBZ151yOutENwvnPocgVHkivu2kviURtCEB6zUQw0vs8RrhMg==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.60.1':
-    resolution: {integrity: sha512-czw90wpQq3ZsAVBlinZjAYTKduOjTywlG7fEeWKUA7oCmpA8xdTkxZZlwNJKWqILlq0wehoZcJYfBvOyhPTQ6w==}
+  '@rollup/rollup-freebsd-arm64@4.60.4':
+    resolution: {integrity: sha512-+O8OkVdyvXMtJEciu2wS/pzm1IxntEEQx3z5TAVy4l32G0etZn+RsA48ARRrFm6Ri8fvqPQfgrvNxSjKAbnd3g==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.60.1':
-    resolution: {integrity: sha512-KVB2rqsxTHuBtfOeySEyzEOB7ltlB/ux38iu2rBQzkjbwRVlkhAGIEDiiYnO2kFOkJp+Z7pUXKyrRRFuFUKt+g==}
+  '@rollup/rollup-freebsd-x64@4.60.4':
+    resolution: {integrity: sha512-Iw3oMskH3AfNuhU0MSN7vNbdi4me/NiYo2azqPz/Le16zHSa+3RRmliCMWWQmh4lcndccU40xcJuTYJZxNo/lw==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.60.1':
-    resolution: {integrity: sha512-L+34Qqil+v5uC0zEubW7uByo78WOCIrBvci69E7sFASRl0X7b/MB6Cqd1lky/CtcSVTydWa2WZwFuWexjS5o6g==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.60.4':
+    resolution: {integrity: sha512-EIPRXTVQpHyF8WOo219AD2yEltPehLTcTMz2fn6JsatLYSzQf00hj3rulF+yauOlF9/FtM2WpkT/hJh/KJFGhA==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.60.1':
-    resolution: {integrity: sha512-n83O8rt4v34hgFzlkb1ycniJh7IR5RCIqt6mz1VRJD6pmhRi0CXdmfnLu9dIUS6buzh60IvACM842Ffb3xd6Gg==}
+  '@rollup/rollup-linux-arm-musleabihf@4.60.4':
+    resolution: {integrity: sha512-J3Yh9PzzF1Ovah2At+lHiGQdsYgArxBbXv/zHfSyaiFQEqvNv7DcW98pCrmdjCZBrqBiKrKKe2V+aaSGWuBe/w==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-arm64-gnu@4.60.1':
-    resolution: {integrity: sha512-Nql7sTeAzhTAja3QXeAI48+/+GjBJ+QmAH13snn0AJSNL50JsDqotyudHyMbO2RbJkskbMbFJfIJKWA6R1LCJQ==}
+  '@rollup/rollup-linux-arm64-gnu@4.60.4':
+    resolution: {integrity: sha512-BFDEZMYfUvLn37ONE1yMBojPxnMlTFsdyNoqncT0qFq1mAfllL+ATMMJd8TeuVMiX84s1KbcxcZbXInmcO2mRg==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm64-musl@4.60.1':
-    resolution: {integrity: sha512-+pUymDhd0ys9GcKZPPWlFiZ67sTWV5UU6zOJat02M1+PiuSGDziyRuI/pPue3hoUwm2uGfxdL+trT6Z9rxnlMA==}
+  '@rollup/rollup-linux-arm64-musl@4.60.4':
+    resolution: {integrity: sha512-pc9EYOSlOgdQ2uPl1o9PF6/kLSgaUosia7gOuS8mB69IxJvlclko1MECXysjs5ryez1/5zjYqx3+xYU0TU6R1A==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-loong64-gnu@4.60.1':
-    resolution: {integrity: sha512-VSvgvQeIcsEvY4bKDHEDWcpW4Yw7BtlKG1GUT4FzBUlEKQK0rWHYBqQt6Fm2taXS+1bXvJT6kICu5ZwqKCnvlQ==}
+  '@rollup/rollup-linux-loong64-gnu@4.60.4':
+    resolution: {integrity: sha512-NxnomyxYerDh5n4iLrNa+sH+Z+U4BMEE46V2PgQ/hoB909i8gV1M5wPojWg9fk1jWpO3IQnOs20K4wyZuFLEFQ==}
     cpu: [loong64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-loong64-musl@4.60.1':
-    resolution: {integrity: sha512-4LqhUomJqwe641gsPp6xLfhqWMbQV04KtPp7/dIp0nzPxAkNY1AbwL5W0MQpcalLYk07vaW9Kp1PBhdpZYYcEw==}
+  '@rollup/rollup-linux-loong64-musl@4.60.4':
+    resolution: {integrity: sha512-nbJnQ8a3z1mtmrwImCYhc6BGpThAyYVRQxw9uKSKG4wR6aAYno9sVjJ0zaZcW9BPJX1GbrDPf+SvdWjgTuDmnw==}
     cpu: [loong64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.60.1':
-    resolution: {integrity: sha512-tLQQ9aPvkBxOc/EUT6j3pyeMD6Hb8QF2BTBnCQWP/uu1lhc9AIrIjKnLYMEroIz/JvtGYgI9dF3AxHZNaEH0rw==}
+  '@rollup/rollup-linux-ppc64-gnu@4.60.4':
+    resolution: {integrity: sha512-2EU6acNrQLd8tYvo/LXW535wupT3m6fo7HKo6lr7ktQoItxTyOL1ZCR/GfGCuXl2vR+zmfI6eRXkSemafv+iVg==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-ppc64-musl@4.60.1':
-    resolution: {integrity: sha512-RMxFhJwc9fSXP6PqmAz4cbv3kAyvD1etJFjTx4ONqFP9DkTkXsAMU4v3Vyc5BgzC+anz7nS/9tp4obsKfqkDHg==}
+  '@rollup/rollup-linux-ppc64-musl@4.60.4':
+    resolution: {integrity: sha512-WeBtoMuaMxiiIrO2IYP3xs6GMWkJP2C0EoT8beTLkUPmzV1i/UcOSVw1d5r9KBODtHKilG5yFxsGRnBbK3wJ4A==}
     cpu: [ppc64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.60.1':
-    resolution: {integrity: sha512-QKgFl+Yc1eEk6MmOBfRHYF6lTxiiiV3/z/BRrbSiW2I7AFTXoBFvdMEyglohPj//2mZS4hDOqeB0H1ACh3sBbg==}
+  '@rollup/rollup-linux-riscv64-gnu@4.60.4':
+    resolution: {integrity: sha512-FJHFfqpKUI3A10WrWKiFbBZ7yVbGT4q4B5o1qKFFojqpaYoh9LrQgqWCmmcxQzVSXYtyB5bzkXrYzlHTs21MYA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-riscv64-musl@4.60.1':
-    resolution: {integrity: sha512-RAjXjP/8c6ZtzatZcA1RaQr6O1TRhzC+adn8YZDnChliZHviqIjmvFwHcxi4JKPSDAt6Uhf/7vqcBzQJy0PDJg==}
+  '@rollup/rollup-linux-riscv64-musl@4.60.4':
+    resolution: {integrity: sha512-mcEl6CUT5IAUmQf1m9FYSmVqCJlpQ8r8eyftFUHG8i9OhY7BkBXSUdnLH5DOf0wCOjcP9v/QO93zpmF1SptCCw==}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-s390x-gnu@4.60.1':
-    resolution: {integrity: sha512-wcuocpaOlaL1COBYiA89O6yfjlp3RwKDeTIA0hM7OpmhR1Bjo9j31G1uQVpDlTvwxGn2nQs65fBFL5UFd76FcQ==}
+  '@rollup/rollup-linux-s390x-gnu@4.60.4':
+    resolution: {integrity: sha512-ynt3JxVd2w2buzoKDWIyiV1pJW93xlQic1THVLXilz429oijRpSHivZAgp65KBu+cMcgf1eVVjdnTLvPxgCuoQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-gnu@4.60.1':
-    resolution: {integrity: sha512-77PpsFQUCOiZR9+LQEFg9GClyfkNXj1MP6wRnzYs0EeWbPcHs02AXu4xuUbM1zhwn3wqaizle3AEYg5aeoohhg==}
+  '@rollup/rollup-linux-x64-gnu@4.60.4':
+    resolution: {integrity: sha512-Boiz5+MsaROEWDf+GGEwF8VMHGhlUoQMtIPjOgA5fv4osupqTVnJteQNKJwUcnUog2G55jYXH7KZFFiJe0TEzQ==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-musl@4.60.1':
-    resolution: {integrity: sha512-5cIATbk5vynAjqqmyBjlciMJl1+R/CwX9oLk/EyiFXDWd95KpHdrOJT//rnUl4cUcskrd0jCCw3wpZnhIHdD9w==}
+  '@rollup/rollup-linux-x64-musl@4.60.4':
+    resolution: {integrity: sha512-+qfSY27qIrFfI/Hom04KYFw3GKZSGU4lXus51wsb5EuySfFlWRwjkKWoE9emgRw/ukoT4Udsj4W/+xxG8VbPKg==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-openbsd-x64@4.60.1':
-    resolution: {integrity: sha512-cl0w09WsCi17mcmWqqglez9Gk8isgeWvoUZ3WiJFYSR3zjBQc2J5/ihSjpl+VLjPqjQ/1hJRcqBfLjssREQILw==}
+  '@rollup/rollup-openbsd-x64@4.60.4':
+    resolution: {integrity: sha512-VpTfOPHgVXEBeeR8hZ2O0F3aSso+JDWqTWmTmzcQKted54IAdUVbxE+j/MVxUsKa8L20HJhv3vUezVPoquqWjA==}
     cpu: [x64]
     os: [openbsd]
 
-  '@rollup/rollup-openharmony-arm64@4.60.1':
-    resolution: {integrity: sha512-4Cv23ZrONRbNtbZa37mLSueXUCtN7MXccChtKpUnQNgF010rjrjfHx3QxkS2PI7LqGT5xXyYs1a7LbzAwT0iCA==}
+  '@rollup/rollup-openharmony-arm64@4.60.4':
+    resolution: {integrity: sha512-IPOsh5aRYuLv/nkU51X10Bf75Bsf6+gZdx1X+QP5QM6lIJFHHqbHLG0uJn/hWthzo13UAc2umiUorqZy3axoZg==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.60.1':
-    resolution: {integrity: sha512-i1okWYkA4FJICtr7KpYzFpRTHgy5jdDbZiWfvny21iIKky5YExiDXP+zbXzm3dUcFpkEeYNHgQ5fuG236JPq0g==}
+  '@rollup/rollup-win32-arm64-msvc@4.60.4':
+    resolution: {integrity: sha512-4QzE9E81OohJ/HKzHhsqU+zcYYojVOXlFMs1DdyMT6qXl/niOH7AVElmmEdUNHHS/oRkc++d5k6Vy85zFs0DEw==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.60.1':
-    resolution: {integrity: sha512-u09m3CuwLzShA0EYKMNiFgcjjzwqtUMLmuCJLeZWjjOYA3IT2Di09KaxGBTP9xVztWyIWjVdsB2E9goMjZvTQg==}
+  '@rollup/rollup-win32-ia32-msvc@4.60.4':
+    resolution: {integrity: sha512-zTPgT1YuHHcd+Tmx7h8aml0FWFVelV5N54oHow9SLj+GfoDy/huQ+UV396N/C7KpMDMiPspRktzM1/0r1usYEA==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-gnu@4.60.1':
-    resolution: {integrity: sha512-k+600V9Zl1CM7eZxJgMyTUzmrmhB/0XZnF4pRypKAlAgxmedUA+1v9R+XOFv56W4SlHEzfeMtzujLJD22Uz5zg==}
+  '@rollup/rollup-win32-x64-gnu@4.60.4':
+    resolution: {integrity: sha512-DRS4G7mi9lJxqEDezIkKCaUIKCrLUUDCUaCsTPCi/rtqaC6D/jjwslMQyiDU50Ka0JKpeXeRBFBAXwArY52vBw==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.60.1':
-    resolution: {integrity: sha512-lWMnixq/QzxyhTV6NjQJ4SFo1J6PvOX8vUx5Wb4bBPsEb+8xZ89Bz6kOXpfXj9ak9AHTQVQzlgzBEc1SyM27xQ==}
+  '@rollup/rollup-win32-x64-msvc@4.60.4':
+    resolution: {integrity: sha512-QVTUovf40zgTqlFVrKA1uXMVvU2QWEFWfAH8Wdc48IxLvrJMQVMBRjuQyUpzZCDkakImib9eVazbWlC6ksWtJw==}
     cpu: [x64]
     os: [win32]
 
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@sveltejs/acorn-typescript@1.0.9':
-    resolution: {integrity: sha512-lVJX6qEgs/4DOcRTpo56tmKzVPtoWAaVbL4hfO7t7NVwl9AAXzQR6cihesW1BmNMPl+bK6dreu2sOKBP2Q9CIA==}
+  '@sveltejs/acorn-typescript@1.0.10':
+    resolution: {integrity: sha512-4WfKk68eTih+MiJD4fSbxN7E8kVBmTMPWHUPYjvl2N0rMs53YLTT8/YjKU5Dtnz5LqDjl7LEw4U7lXR2W3J5WA==}
     peerDependencies:
       acorn: ^8.9.0
 
@@ -413,15 +413,15 @@ packages:
     peerDependencies:
       '@sveltejs/kit': ^2.0.0
 
-  '@sveltejs/kit@2.55.0':
-    resolution: {integrity: sha512-MdFRjevVxmAknf2NbaUkDF16jSIzXMWd4Nfah0Qp8TtQVoSp3bV4jKt8mX7z7qTUTWvgSaxtR0EG5WJf53gcuA==}
+  '@sveltejs/kit@2.61.1':
+    resolution: {integrity: sha512-Ny8s1SR1TyQS2hD2Rvw0XKzU2Nw1eUF52dTb6T2bdcgz7wSC+Nyb5IwjWYlR4b2dvbbR5NJDiQwHg3rnNseghg==}
     engines: {node: '>=18.13'}
     hasBin: true
     peerDependencies:
       '@opentelemetry/api': ^1.0.0
       '@sveltejs/vite-plugin-svelte': ^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0
       svelte: ^4.0.0 || ^5.0.0-next.0
-      typescript: ^5.3.3
+      typescript: ^5.3.3 || ^6.0.0
       vite: ^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0
     peerDependenciesMeta:
       '@opentelemetry/api':
@@ -444,69 +444,69 @@ packages:
       svelte: ^5.0.0
       vite: ^6.0.0
 
-  '@tailwindcss/node@4.2.2':
-    resolution: {integrity: sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==}
+  '@tailwindcss/node@4.3.0':
+    resolution: {integrity: sha512-aFb4gUhFOgdh9AXo4IzBEOzBkkAxm9VigwDJnMIYv3lcfXCJVesNfbEaBl4BNgVRyid92AmdviqwBUBRKSeY3g==}
 
-  '@tailwindcss/oxide-android-arm64@4.2.2':
-    resolution: {integrity: sha512-dXGR1n+P3B6748jZO/SvHZq7qBOqqzQ+yFrXpoOWWALWndF9MoSKAT3Q0fYgAzYzGhxNYOoysRvYlpixRBBoDg==}
+  '@tailwindcss/oxide-android-arm64@4.3.0':
+    resolution: {integrity: sha512-TJPiq67tKlLuObP6RkwvVGDoxCMBVtDgKkLfa/uyj7/FyxvQwHS+UOnVrXXgbEsfUaMgiVvC4KbJnRr26ho4Ng==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [android]
 
-  '@tailwindcss/oxide-darwin-arm64@4.2.2':
-    resolution: {integrity: sha512-iq9Qjr6knfMpZHj55/37ouZeykwbDqF21gPFtfnhCCKGDcPI/21FKC9XdMO/XyBM7qKORx6UIhGgg6jLl7BZlg==}
+  '@tailwindcss/oxide-darwin-arm64@4.3.0':
+    resolution: {integrity: sha512-oMN/WZRb+SO37BmUElEgeEWuU8E/HXRkiODxJxLe1UTHVXLrdVSgfaJV7pSlhRGMSOiXLuxTIjfsF3wYvz8cgQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tailwindcss/oxide-darwin-x64@4.2.2':
-    resolution: {integrity: sha512-BlR+2c3nzc8f2G639LpL89YY4bdcIdUmiOOkv2GQv4/4M0vJlpXEa0JXNHhCHU7VWOKWT/CjqHdTP8aUuDJkuw==}
+  '@tailwindcss/oxide-darwin-x64@4.3.0':
+    resolution: {integrity: sha512-N6CUmu4a6bKVADfw77p+iw6Yd9Q3OBhe0veaDX+QazfuVYlQsHfDgxBrsjQ/IW+zywL8mTrNd0SdJT/zgtvMdA==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [darwin]
 
-  '@tailwindcss/oxide-freebsd-x64@4.2.2':
-    resolution: {integrity: sha512-YUqUgrGMSu2CDO82hzlQ5qSb5xmx3RUrke/QgnoEx7KvmRJHQuZHZmZTLSuuHwFf0DJPybFMXMYf+WJdxHy/nQ==}
+  '@tailwindcss/oxide-freebsd-x64@4.3.0':
+    resolution: {integrity: sha512-zDL5hBkQdH5C6MpqbK3gQAgP80tsMwSI26vjOzjJtNCMUo0lFgOItzHKBIupOZNQxt3ouPH7RPhvNhiTfCe5CQ==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [freebsd]
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.2':
-    resolution: {integrity: sha512-FPdhvsW6g06T9BWT0qTwiVZYE2WIFo2dY5aCSpjG/S/u1tby+wXoslXS0kl3/KXnULlLr1E3NPRRw0g7t2kgaQ==}
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.0':
+    resolution: {integrity: sha512-R06HdNi7A7OEoMsf6d4tjZ71RCWnZQPHj2mnotSFURjNLdBC+cIgXQ7l81CqeoiQftjf6OOblxXMInMgN2VzMA==}
     engines: {node: '>= 20'}
     cpu: [arm]
     os: [linux]
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.2.2':
-    resolution: {integrity: sha512-4og1V+ftEPXGttOO7eCmW7VICmzzJWgMx+QXAJRAhjrSjumCwWqMfkDrNu1LXEQzNAwz28NCUpucgQPrR4S2yw==}
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.0':
+    resolution: {integrity: sha512-qTJHELX8jetjhRQHCLilkVLmybpzNQAtaI/gaoVoidn/ufbNDbAo8KlK2J+yPoc8wQxvDxCmh/5lr8nC1+lTbg==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.2.2':
-    resolution: {integrity: sha512-oCfG/mS+/+XRlwNjnsNLVwnMWYH7tn/kYPsNPh+JSOMlnt93mYNCKHYzylRhI51X+TbR+ufNhhKKzm6QkqX8ag==}
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.0':
+    resolution: {integrity: sha512-Z6sukiQsngnWO+l39X4pPbiWT81IC+PLKF+PHxIlyZbGNb9MODfYlXEVlFvej5BOZInWX01kVyzeLvHsXhfczQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.2.2':
-    resolution: {integrity: sha512-rTAGAkDgqbXHNp/xW0iugLVmX62wOp2PoE39BTCGKjv3Iocf6AFbRP/wZT/kuCxC9QBh9Pu8XPkv/zCZB2mcMg==}
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.0':
+    resolution: {integrity: sha512-DRNdQRpSGzRGfARVuVkxvM8Q12nh19l4BF/G7zGA1oe+9wcC6saFBHTISrpIcKzhiXtSrlSrluCfvMuledoCTQ==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@tailwindcss/oxide-linux-x64-musl@4.2.2':
-    resolution: {integrity: sha512-XW3t3qwbIwiSyRCggeO2zxe3KWaEbM0/kW9e8+0XpBgyKU4ATYzcVSMKteZJ1iukJ3HgHBjbg9P5YPRCVUxlnQ==}
+  '@tailwindcss/oxide-linux-x64-musl@4.3.0':
+    resolution: {integrity: sha512-Z0IADbDo8bh6I7h2IQMx601AdXBLfFpEdUotft86evd/8ZPflZe9COPO8Q1vw+pfLWIUo9zN/JGZvwuAJqduqg==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@tailwindcss/oxide-wasm32-wasi@4.2.2':
-    resolution: {integrity: sha512-eKSztKsmEsn1O5lJ4ZAfyn41NfG7vzCg496YiGtMDV86jz1q/irhms5O0VrY6ZwTUkFy/EKG3RfWgxSI3VbZ8Q==}
+  '@tailwindcss/oxide-wasm32-wasi@4.3.0':
+    resolution: {integrity: sha512-HNZGOUxEmElksYR7S6sC5jTeNGpobAsy9u7Gu0AskJ8/20FR9GqebUyB+HBcU/ax6BHuiuJi+Oda4B+YX6H1yA==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
     bundledDependencies:
@@ -517,114 +517,111 @@ packages:
       - '@emnapi/wasi-threads'
       - tslib
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.2.2':
-    resolution: {integrity: sha512-qPmaQM4iKu5mxpsrWZMOZRgZv1tOZpUm+zdhhQP0VhJfyGGO3aUKdbh3gDZc/dPLQwW4eSqWGrrcWNBZWUWaXQ==}
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.0':
+    resolution: {integrity: sha512-Pe+RPVTi1T+qymuuRpcdvwSVZjnll/f7n8gBxMMh3xLTctMDKqpdfGimbMyioqtLhUYZxdJ9wGNhV7MKHvgZsQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [win32]
 
-  '@tailwindcss/oxide-win32-x64-msvc@4.2.2':
-    resolution: {integrity: sha512-1T/37VvI7WyH66b+vqHj/cLwnCxt7Qt3WFu5Q8hk65aOvlwAhs7rAp1VkulBJw/N4tMirXjVnylTR72uI0HGcA==}
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.0':
+    resolution: {integrity: sha512-Mvrf2kXW/yeW/OTezZlCGOirXRcUuLIBx/5Y12BaPM7wJoryG6dfS/NJL8aBPqtTEx/Vm4T4vKzFUcKDT+TKUA==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [win32]
 
-  '@tailwindcss/oxide@4.2.2':
-    resolution: {integrity: sha512-qEUA07+E5kehxYp9BVMpq9E8vnJuBHfJEC0vPC5e7iL/hw7HR61aDKoVoKzrG+QKp56vhNZe4qwkRmMC0zDLvg==}
+  '@tailwindcss/oxide@4.3.0':
+    resolution: {integrity: sha512-F7HZGBeN9I0/AuuJS5PwcD8xayx5ri5GhjYUDBEVYUkexyA/giwbDNjRVrxSezE3T250OU2K/wp/ltWx3UOefg==}
     engines: {node: '>= 20'}
 
-  '@tailwindcss/vite@4.2.2':
-    resolution: {integrity: sha512-mEiF5HO1QqCLXoNEfXVA1Tzo+cYsrqV7w9Juj2wdUFyW07JRenqMG225MvPwr3ZD9N1bFQj46X7r33iHxLUW0w==}
+  '@tailwindcss/vite@4.3.0':
+    resolution: {integrity: sha512-t6J3OrB5Fc0ExuhohouH0fWUGMYL6PTLhW+E7zIk/pdbnJARZDCwjBznFnkh5ynRnIRSI4YjtTH0t6USjJISrw==}
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7 || ^8
 
-  '@tauri-apps/api@2.10.1':
-    resolution: {integrity: sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw==}
-
   '@tauri-apps/api@2.11.0':
     resolution: {integrity: sha512-7CinYODhky9lmO23xHnUFv0Xt43fbtWMyxZcLcRBlFkcgXKuEirBvHpmtJ89YMhyeGcq20Wuc47Fa4XjyniywA==}
 
-  '@tauri-apps/cli-darwin-arm64@2.10.1':
-    resolution: {integrity: sha512-Z2OjCXiZ+fbYZy7PmP3WRnOpM9+Fy+oonKDEmUE6MwN4IGaYqgceTjwHucc/kEEYZos5GICve35f7ZiizgqEnQ==}
+  '@tauri-apps/cli-darwin-arm64@2.11.2':
+    resolution: {integrity: sha512-+4UZzLt+eOAEQCwgd+TqKgyUJMrvx+BgdXLLaqJYmPqzP+nE6YZr/hY6CWLYGQb8jFn99jEkmC6uA3tNvamA1w==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tauri-apps/cli-darwin-x64@2.10.1':
-    resolution: {integrity: sha512-V/irQVvjPMGOTQqNj55PnQPVuH4VJP8vZCN7ajnj+ZS8Kom1tEM2hR3qbbIRoS3dBKs5mbG8yg1WC+97dq17Pw==}
+  '@tauri-apps/cli-darwin-x64@2.11.2':
+    resolution: {integrity: sha512-VjYYtZUPqDMLutSfJEyxFE3Bz+DPi7c8wC3imckgvciLDZLq4qwKJxBicg0BXGhXjJsl8vKWgWRFNMPELQ+Xyg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.10.1':
-    resolution: {integrity: sha512-Hyzwsb4VnCWKGfTw+wSt15Z2pLw2f0JdFBfq2vHBOBhvg7oi6uhKiF87hmbXOBXUZaGkyRDkCHsdzJcIfoJC2w==}
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.11.2':
+    resolution: {integrity: sha512-yMemD6f4i95AQriS8EazyOFzbE34yjnP16i3IOzpHGQvBoy2DjypFMFBq0NtPuITURv/cOGguRtHR5d79/9CSA==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.10.1':
-    resolution: {integrity: sha512-OyOYs2t5GkBIvyWjA1+h4CZxTcdz1OZPCWAPz5DYEfB0cnWHERTnQ/SLayQzncrT0kwRoSfSz9KxenkyJoTelA==}
+  '@tauri-apps/cli-linux-arm64-gnu@2.11.2':
+    resolution: {integrity: sha512-cgI91D2wL8GSgoWwZXDqt+DwnuZCP2/bz03QAE4TrhgAKIsrB4hX26W/H1EONPUUNkqrsgeCD0wU6pcNjV/5kw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-arm64-musl@2.10.1':
-    resolution: {integrity: sha512-MIj78PDDGjkg3NqGptDOGgfXks7SYJwhiMh8SBoZS+vfdz7yP5jN18bNaLnDhsVIPARcAhE1TlsZe/8Yxo2zqg==}
+  '@tauri-apps/cli-linux-arm64-musl@2.11.2':
+    resolution: {integrity: sha512-X1rm0BERqAAggtYTESSgXrS3sz4Sb/OiPiz54UqISlXW+GkR3vNIGnsy/lejNmoXGVqri3Q53BCfQiclOIyRPw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-linux-riscv64-gnu@2.10.1':
-    resolution: {integrity: sha512-X0lvOVUg8PCVaoEtEAnpxmnkwlE1gcMDTqfhbefICKDnOTJ5Est3qL0SrWxizDackIOKBcvtpejrSiVpuJI1kw==}
+  '@tauri-apps/cli-linux-riscv64-gnu@2.11.2':
+    resolution: {integrity: sha512-usbMLJbT3KtkOrBMDVeGYNM35aTHXx38SJSzTMSqqjeUIOQ+iVPjb2yAGNAE+KqmBbAx4FOFIyMeKXx2M/JKGQ==}
     engines: {node: '>= 10'}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-x64-gnu@2.10.1':
-    resolution: {integrity: sha512-2/12bEzsJS9fAKybxgicCDFxYD1WEI9kO+tlDwX5znWG2GwMBaiWcmhGlZ8fi+DMe9CXlcVarMTYc0L3REIRxw==}
+  '@tauri-apps/cli-linux-x64-gnu@2.11.2':
+    resolution: {integrity: sha512-Ru4gwJKPG0ctVGchRGpRup4Y4lW2SSfFnrbQcyHhCliKy4g8Qz97TrUgCur4CbWyAgKxvGh3SjrkA0LDYzDGiw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-x64-musl@2.10.1':
-    resolution: {integrity: sha512-Y8J0ZzswPz50UcGOFuXGEMrxbjwKSPgXftx5qnkuMs2rmwQB5ssvLb6tn54wDSYxe7S6vlLob9vt0VKuNOaCIQ==}
+  '@tauri-apps/cli-linux-x64-musl@2.11.2':
+    resolution: {integrity: sha512-eUm7T6clN1MMmNSRQ9gaWsQdyehQx2Gmn5hht/QUlqZQI/qcP2OJK5dnaxqwFzCr2HdsEo9ydxaqcS1oJzMvUw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.10.1':
-    resolution: {integrity: sha512-iSt5B86jHYAPJa/IlYw++SXtFPGnWtFJriHn7X0NFBVunF6zu9+/zOn8OgqIWSl8RgzhLGXQEEtGBdR4wzpVgg==}
+  '@tauri-apps/cli-win32-arm64-msvc@2.11.2':
+    resolution: {integrity: sha512-HeeZW80jU+gVTOEX4X/hC6NVSAdDVXajwP5fxIZ/3z9WvUC7qrudX2GMTilYq6Dg0e0sk0XgsAJD1hZ5wPBXUA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.10.1':
-    resolution: {integrity: sha512-gXyxgEzsFegmnWywYU5pEBURkcFN/Oo45EAwvZrHMh+zUSEAvO5E8TXsgPADYm31d1u7OQU3O3HsYfVBf2moHw==}
+  '@tauri-apps/cli-win32-ia32-msvc@2.11.2':
+    resolution: {integrity: sha512-YhjQNZcXfbkCLyazSv1nPnJ9iRFE1wm6kc51FDbU10/Dk09io+6PAGMLjkxnX2GdM0qMnDmTjstY8mTDVvtKeA==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
 
-  '@tauri-apps/cli-win32-x64-msvc@2.10.1':
-    resolution: {integrity: sha512-6Cn7YpPFwzChy0ERz6djKEmUehWrYlM+xTaNzGPgZocw3BD7OfwfWHKVWxXzdjEW2KfKkHddfdxK1XXTYqBRLg==}
+  '@tauri-apps/cli-win32-x64-msvc@2.11.2':
+    resolution: {integrity: sha512-d2JchlFIpZevZVReyqhQOekJmb1UH3rhZ5VX6sH3ty9ETE0TKQavpihvoScUXfKKpW6HZC0MrFGRU0ZtD+w3gA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@tauri-apps/cli@2.10.1':
-    resolution: {integrity: sha512-jQNGF/5quwORdZSSLtTluyKQ+o6SMa/AUICfhf4egCGFdMHqWssApVgYSbg+jmrZoc8e1DscNvjTnXtlHLS11g==}
+  '@tauri-apps/cli@2.11.2':
+    resolution: {integrity: sha512-bk3HemqvGRoy+5D/dVMUQHKMYLglD0jVnMm/0iGMH6ufZ+p8r14m6BpIixwij3PBvZdvORUp1YifTD8QxVZ1Nw==}
     engines: {node: '>= 10'}
     hasBin: true
 
   '@tauri-apps/plugin-dialog@2.7.1':
     resolution: {integrity: sha512-OK1UBXYt+ojcmxMktzzuyonYIFta8CmAASpX+CA+DTGK24KlHjhYI6x2iOJ/TjZF4N7/ACK1oFmEOjIY9IhzOQ==}
 
-  '@tauri-apps/plugin-opener@2.5.3':
-    resolution: {integrity: sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ==}
+  '@tauri-apps/plugin-opener@2.5.4':
+    resolution: {integrity: sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ==}
 
   '@tauri-apps/plugin-store@2.4.3':
     resolution: {integrity: sha512-9LWPj9yMphRi9czEtUv87XHbl1b6xgd9EXpPrUnq6nG7+nbtoF84d4Kwz9xhAv/Hf30sr58pq7EOlyI936y8qw==}
@@ -635,13 +632,12 @@ packages:
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
+  '@types/estree@1.0.9':
+    resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
+
   '@types/trusted-types@2.0.7':
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
-  '@typescript-eslint/types@8.57.2':
-    resolution: {integrity: sha512-/iZM6FnM4tnx9csuTxspMW4BOSegshwX5oBDznJ7S4WggL7Vczz5d2W11ecc4vRrQMQHXRSxzrCsyG5EsPPTbA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   acorn@8.16.0:
     resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
     engines: {node: '>=0.4.0'}
@@ -687,11 +683,11 @@ packages:
     resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
 
-  devalue@5.6.4:
-    resolution: {integrity: sha512-Gp6rDldRsFh/7XuouDbxMH3Mx8GMCcgzIb1pDTvNyn8pZGQ22u+Wa+lGV9dQCltFQ7uVw0MhRyb8XDskNFOReA==}
+  devalue@5.8.1:
+    resolution: {integrity: sha512-4CXDYRBGqN+57wVJkuXBYmpAVUSg3L6JAQa/DFqm238G73E1wuyc/JhGQJzN7vUf/CMphYau2zXbfWzDR5aTEw==}
 
-  enhanced-resolve@5.20.1:
-    resolution: {integrity: sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==}
+  enhanced-resolve@5.22.1:
+    resolution: {integrity: sha512-6QEuw3zoX1SJQc7b87aBXke/no+mG2bTBgw29gWMQonLmpEkWoCAVkl+M49e48AZlWzxiDzDZzYdp6kobcyLww==}
     engines: {node: '>=10.13.0'}
 
   esbuild@0.25.12:
@@ -702,8 +698,13 @@ packages:
   esm-env@1.2.2:
     resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==}
 
-  esrap@2.2.4:
-    resolution: {integrity: sha512-suICpxAmZ9A8bzJjEl/+rLJiDKC0X4gYWUxT6URAWBLvlXmtbZd5ySMu/N2ZGEtMCAmflUDPSehrP9BQcsGcSg==}
+  esrap@2.2.9:
+    resolution: {integrity: sha512-4KijP+NxCWthMCUC3qHbE6n4vCjqgJS1uAYKhuT/GWfFTf1Qyive2TgOjep+gzbSzRfnNyaN/UU9YmdOt8Eg0A==}
+    peerDependencies:
+      '@typescript-eslint/types': ^8.2.0
+    peerDependenciesMeta:
+      '@typescript-eslint/types':
+        optional: true
 
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
@@ -728,8 +729,8 @@ packages:
   is-reference@3.0.3:
     resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==}
 
-  jiti@2.6.1:
-    resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
+  jiti@2.7.0:
+    resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==}
     hasBin: true
 
   kleur@4.1.5:
@@ -813,11 +814,11 @@ packages:
   lit-element@4.2.2:
     resolution: {integrity: sha512-aFKhNToWxoyhkNDmWZwEva2SlQia+jfG0fjIWV//YeTaWrVnOxD89dPKfigCUspXFmjzOEUQpOkejH5Ly6sG0w==}
 
-  lit-html@3.3.2:
-    resolution: {integrity: sha512-Qy9hU88zcmaxBXcc10ZpdK7cOLXvXpRoBxERdtqV9QOrfpMZZ6pSYP91LhpPtap3sFMUiL7Tw2RImbe0Al2/kw==}
+  lit-html@3.3.3:
+    resolution: {integrity: sha512-el8M6jK2o3RXBnrSHX3ZKrsN8zEV63pSExTO1wYJz7QndGYZ8353e2a5PPX+qHe2aGayfnchQmkAojaWAREOIA==}
 
-  lit@3.3.2:
-    resolution: {integrity: sha512-NF9zbsP79l4ao2SNrH3NkfmFgN/hBYSQo90saIVI1o5GpjAdCPVstVzO1MrLOakHoEhYkrtRjPK6Ob521aoYWQ==}
+  lit@3.3.3:
+    resolution: {integrity: sha512-fycuvZg/hkpozL00lm1pEJH5nN/lr9ZXd6mJI2HSN4+Bzc+LDNdEApJ6HFbPkdFNHLvOplIIuJvxkS4XUxqirw==}
 
   locate-character@3.0.0:
     resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==}
@@ -842,8 +843,8 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  nanoid@3.3.11:
-    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
+  nanoid@3.3.12:
+    resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -854,16 +855,16 @@ packages:
     resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
     engines: {node: '>=12'}
 
-  postcss@8.5.8:
-    resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==}
+  postcss@8.5.15:
+    resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==}
     engines: {node: ^10 || ^12 || >=14}
 
   readdirp@4.1.2:
     resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
     engines: {node: '>= 14.18.0'}
 
-  rollup@4.60.1:
-    resolution: {integrity: sha512-VmtB2rFU/GroZ4oL8+ZqXgSA38O6GR8KSIvWmEFv63pQ0G6KaBH9s07PO8XTXP4vI+3UJUEypOfjkGfmSBBR0w==}
+  rollup@4.60.4:
+    resolution: {integrity: sha512-WHeFSbZYsPu3+bLoNRUuAO+wavNlocOPf3wSHTP7hcFKVnJeWsYlCDbr3mTS14FCizf9ccIxXA8sGL8zKeQN3g==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -885,27 +886,27 @@ packages:
   ssr-window@5.0.1:
     resolution: {integrity: sha512-WVXlhQsm54HC+FnJfEbccEgNF7mKXtnFUB8Xn7rx2dsWHOlBdqezdX88Vjh6pVGaa0ZvL+PoSu7rEcBuNmxt6g==}
 
-  svelte-check@4.4.5:
-    resolution: {integrity: sha512-1bSwIRCvvmSHrlK52fOlZmVtUZgil43jNL/2H18pRpa+eQjzGt6e3zayxhp1S7GajPFKNM/2PMCG+DZFHlG9fw==}
+  svelte-check@4.4.8:
+    resolution: {integrity: sha512-67adfgBox5eNSNIvIIwgFizKGdcRrGpiMoNO2obHcYuLz7iTa8Xgm/NGU3ntMFnNm8K1grFOIG6HhMLX/vcN8w==}
     engines: {node: '>= 18.0.0'}
     hasBin: true
     peerDependencies:
       svelte: ^4.0.0 || ^5.0.0-next.0
       typescript: '>=5.0.0'
 
-  svelte@5.55.1:
-    resolution: {integrity: sha512-QjvU7EFemf6mRzdMGlAFttMWtAAVXrax61SZYHdkD6yoVGQ89VeyKfZD4H1JrV1WLmJBxWhFch9H6ig/87VGjw==}
+  svelte@5.56.0:
+    resolution: {integrity: sha512-kTXr26t1bchFp28ROrb957LtbujpBmBDibmqMGziVpUs7awBi96TGgX6SovrA8BNoEUDVRK2Fb9FkeYlGspoVg==}
     engines: {node: '>=18'}
 
-  tailwindcss@4.2.2:
-    resolution: {integrity: sha512-KWBIxs1Xb6NoLdMVqhbhgwZf2PGBpPEiwOqgI4pFIYbNTfBXiKYyWoTsXgBQ9WFg/OlhnvHaY+AEpW7wSmFo2Q==}
+  tailwindcss@4.3.0:
+    resolution: {integrity: sha512-y6nxMGB1nMW9R6k96e5gdIFzcfL/gTJRNaqGes1YvkLnPVXzWgbqFF2yLC0T8G774n24cx3Pe8XrKoniCOAH+Q==}
 
-  tapable@2.3.2:
-    resolution: {integrity: sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==}
+  tapable@2.3.3:
+    resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}
     engines: {node: '>=6'}
 
-  tinyglobby@0.2.15:
-    resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
+  tinyglobby@0.2.17:
+    resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
     engines: {node: '>=12.0.0'}
 
   totalist@3.0.1:
@@ -920,8 +921,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  vite@6.4.1:
-    resolution: {integrity: sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==}
+  vite@6.4.2:
+    resolution: {integrity: sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
     peerDependencies:
@@ -960,10 +961,10 @@ packages:
       yaml:
         optional: true
 
-  vitefu@1.1.2:
-    resolution: {integrity: sha512-zpKATdUbzbsycPFBN71nS2uzBUQiVnFoOrr2rvqv34S1lcAgMKKkjWleLGeiJlZ8lwCXvtWaRn7R3ZC16SYRuw==}
+  vitefu@1.1.3:
+    resolution: {integrity: sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==}
     peerDependencies:
-      vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-beta.0
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
       vite:
         optional: true
@@ -1072,22 +1073,22 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@lit-labs/ssr-dom-shim@1.5.1': {}
+  '@lit-labs/ssr-dom-shim@1.6.0': {}
 
   '@lit/localize@0.12.2':
     dependencies:
-      lit: 3.3.2
+      lit: 3.3.3
 
   '@lit/reactive-element@2.1.2':
     dependencies:
-      '@lit-labs/ssr-dom-shim': 1.5.1
+      '@lit-labs/ssr-dom-shim': 1.6.0
 
   '@material/material-color-utilities@0.3.0': {}
 
   '@mdui/icons@1.0.3':
     dependencies:
       '@mdui/shared': 1.0.8
-      lit: 3.3.2
+      lit: 3.3.3
       tslib: 2.8.1
 
   '@mdui/jq@3.0.3':
@@ -1099,265 +1100,263 @@ snapshots:
     dependencies:
       '@lit/reactive-element': 2.1.2
       '@mdui/jq': 3.0.3
-      lit: 3.3.2
+      lit: 3.3.3
       ssr-window: 5.0.1
       tslib: 2.8.1
 
   '@polka/url@1.0.0-next.29': {}
 
-  '@rollup/rollup-android-arm-eabi@4.60.1':
+  '@rollup/rollup-android-arm-eabi@4.60.4':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.60.1':
+  '@rollup/rollup-android-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.60.1':
+  '@rollup/rollup-darwin-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.60.1':
+  '@rollup/rollup-darwin-x64@4.60.4':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.60.1':
+  '@rollup/rollup-freebsd-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.60.1':
+  '@rollup/rollup-freebsd-x64@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.60.1':
+  '@rollup/rollup-linux-arm-gnueabihf@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.60.1':
+  '@rollup/rollup-linux-arm-musleabihf@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.60.1':
+  '@rollup/rollup-linux-arm64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.60.1':
+  '@rollup/rollup-linux-arm64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.60.1':
+  '@rollup/rollup-linux-loong64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-loong64-musl@4.60.1':
+  '@rollup/rollup-linux-loong64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.60.1':
+  '@rollup/rollup-linux-ppc64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-musl@4.60.1':
+  '@rollup/rollup-linux-ppc64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.60.1':
+  '@rollup/rollup-linux-riscv64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.60.1':
+  '@rollup/rollup-linux-riscv64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.60.1':
+  '@rollup/rollup-linux-s390x-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.60.1':
+  '@rollup/rollup-linux-x64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.60.1':
+  '@rollup/rollup-linux-x64-musl@4.60.4':
     optional: true
 
-  '@rollup/rollup-openbsd-x64@4.60.1':
+  '@rollup/rollup-openbsd-x64@4.60.4':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.60.1':
+  '@rollup/rollup-openharmony-arm64@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.60.1':
+  '@rollup/rollup-win32-arm64-msvc@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.60.1':
+  '@rollup/rollup-win32-ia32-msvc@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-gnu@4.60.1':
+  '@rollup/rollup-win32-x64-gnu@4.60.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.60.1':
+  '@rollup/rollup-win32-x64-msvc@4.60.4':
     optional: true
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@sveltejs/acorn-typescript@1.0.9(acorn@8.16.0)':
+  '@sveltejs/acorn-typescript@1.0.10(acorn@8.16.0)':
     dependencies:
       acorn: 8.16.0
 
-  '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.55.0(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))(svelte@5.55.1)(typescript@5.6.3)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))':
+  '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.61.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))(svelte@5.56.0)(typescript@5.6.3)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))':
     dependencies:
-      '@sveltejs/kit': 2.55.0(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))(svelte@5.55.1)(typescript@5.6.3)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+      '@sveltejs/kit': 2.61.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))(svelte@5.56.0)(typescript@5.6.3)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
 
-  '@sveltejs/kit@2.55.0(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))(svelte@5.55.1)(typescript@5.6.3)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))':
+  '@sveltejs/kit@2.61.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))(svelte@5.56.0)(typescript@5.6.3)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))':
     dependencies:
       '@standard-schema/spec': 1.1.0
-      '@sveltejs/acorn-typescript': 1.0.9(acorn@8.16.0)
-      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+      '@sveltejs/acorn-typescript': 1.0.10(acorn@8.16.0)
+      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
       '@types/cookie': 0.6.0
       acorn: 8.16.0
       cookie: 0.6.0
-      devalue: 5.6.4
+      devalue: 5.8.1
       esm-env: 1.2.2
       kleur: 4.1.5
       magic-string: 0.30.21
       mrmime: 2.0.1
       set-cookie-parser: 3.1.0
       sirv: 3.0.2
-      svelte: 5.55.1
-      vite: 6.4.1(jiti@2.6.1)(lightningcss@1.32.0)
+      svelte: 5.56.0
+      vite: 6.4.2(jiti@2.7.0)(lightningcss@1.32.0)
     optionalDependencies:
       typescript: 5.6.3
 
-  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))':
+  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
       debug: 4.4.3
-      svelte: 5.55.1
-      vite: 6.4.1(jiti@2.6.1)(lightningcss@1.32.0)
+      svelte: 5.56.0
+      vite: 6.4.2(jiti@2.7.0)(lightningcss@1.32.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))':
+  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)))(svelte@5.55.1)(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)))(svelte@5.56.0)(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
       debug: 4.4.3
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.21
-      svelte: 5.55.1
-      vite: 6.4.1(jiti@2.6.1)(lightningcss@1.32.0)
-      vitefu: 1.1.2(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))
+      svelte: 5.56.0
+      vite: 6.4.2(jiti@2.7.0)(lightningcss@1.32.0)
+      vitefu: 1.1.3(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
     transitivePeerDependencies:
       - supports-color
 
-  '@tailwindcss/node@4.2.2':
+  '@tailwindcss/node@4.3.0':
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      enhanced-resolve: 5.20.1
-      jiti: 2.6.1
+      enhanced-resolve: 5.22.1
+      jiti: 2.7.0
       lightningcss: 1.32.0
       magic-string: 0.30.21
       source-map-js: 1.2.1
-      tailwindcss: 4.2.2
+      tailwindcss: 4.3.0
 
-  '@tailwindcss/oxide-android-arm64@4.2.2':
+  '@tailwindcss/oxide-android-arm64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-darwin-arm64@4.2.2':
+  '@tailwindcss/oxide-darwin-arm64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-darwin-x64@4.2.2':
+  '@tailwindcss/oxide-darwin-x64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-freebsd-x64@4.2.2':
+  '@tailwindcss/oxide-freebsd-x64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.2':
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.2.2':
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.2.2':
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.2.2':
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-musl@4.2.2':
+  '@tailwindcss/oxide-linux-x64-musl@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-wasm32-wasi@4.2.2':
+  '@tailwindcss/oxide-wasm32-wasi@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.2.2':
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-win32-x64-msvc@4.2.2':
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide@4.2.2':
+  '@tailwindcss/oxide@4.3.0':
     optionalDependencies:
-      '@tailwindcss/oxide-android-arm64': 4.2.2
-      '@tailwindcss/oxide-darwin-arm64': 4.2.2
-      '@tailwindcss/oxide-darwin-x64': 4.2.2
-      '@tailwindcss/oxide-freebsd-x64': 4.2.2
-      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.2
-      '@tailwindcss/oxide-linux-arm64-gnu': 4.2.2
-      '@tailwindcss/oxide-linux-arm64-musl': 4.2.2
-      '@tailwindcss/oxide-linux-x64-gnu': 4.2.2
-      '@tailwindcss/oxide-linux-x64-musl': 4.2.2
-      '@tailwindcss/oxide-wasm32-wasi': 4.2.2
-      '@tailwindcss/oxide-win32-arm64-msvc': 4.2.2
-      '@tailwindcss/oxide-win32-x64-msvc': 4.2.2
-
-  '@tailwindcss/vite@4.2.2(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0))':
+      '@tailwindcss/oxide-android-arm64': 4.3.0
+      '@tailwindcss/oxide-darwin-arm64': 4.3.0
+      '@tailwindcss/oxide-darwin-x64': 4.3.0
+      '@tailwindcss/oxide-freebsd-x64': 4.3.0
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.3.0
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.3.0
+      '@tailwindcss/oxide-linux-arm64-musl': 4.3.0
+      '@tailwindcss/oxide-linux-x64-gnu': 4.3.0
+      '@tailwindcss/oxide-linux-x64-musl': 4.3.0
+      '@tailwindcss/oxide-wasm32-wasi': 4.3.0
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.3.0
+      '@tailwindcss/oxide-win32-x64-msvc': 4.3.0
+
+  '@tailwindcss/vite@4.3.0(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))':
     dependencies:
-      '@tailwindcss/node': 4.2.2
-      '@tailwindcss/oxide': 4.2.2
-      tailwindcss: 4.2.2
-      vite: 6.4.1(jiti@2.6.1)(lightningcss@1.32.0)
-
-  '@tauri-apps/api@2.10.1': {}
+      '@tailwindcss/node': 4.3.0
+      '@tailwindcss/oxide': 4.3.0
+      tailwindcss: 4.3.0
+      vite: 6.4.2(jiti@2.7.0)(lightningcss@1.32.0)
 
   '@tauri-apps/api@2.11.0': {}
 
-  '@tauri-apps/cli-darwin-arm64@2.10.1':
+  '@tauri-apps/cli-darwin-arm64@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-darwin-x64@2.10.1':
+  '@tauri-apps/cli-darwin-x64@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.10.1':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.10.1':
+  '@tauri-apps/cli-linux-arm64-gnu@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-musl@2.10.1':
+  '@tauri-apps/cli-linux-arm64-musl@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-linux-riscv64-gnu@2.10.1':
+  '@tauri-apps/cli-linux-riscv64-gnu@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-gnu@2.10.1':
+  '@tauri-apps/cli-linux-x64-gnu@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-musl@2.10.1':
+  '@tauri-apps/cli-linux-x64-musl@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.10.1':
+  '@tauri-apps/cli-win32-arm64-msvc@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.10.1':
+  '@tauri-apps/cli-win32-ia32-msvc@2.11.2':
     optional: true
 
-  '@tauri-apps/cli-win32-x64-msvc@2.10.1':
+  '@tauri-apps/cli-win32-x64-msvc@2.11.2':
     optional: true
 
-  '@tauri-apps/cli@2.10.1':
+  '@tauri-apps/cli@2.11.2':
     optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 2.10.1
-      '@tauri-apps/cli-darwin-x64': 2.10.1
-      '@tauri-apps/cli-linux-arm-gnueabihf': 2.10.1
-      '@tauri-apps/cli-linux-arm64-gnu': 2.10.1
-      '@tauri-apps/cli-linux-arm64-musl': 2.10.1
-      '@tauri-apps/cli-linux-riscv64-gnu': 2.10.1
-      '@tauri-apps/cli-linux-x64-gnu': 2.10.1
-      '@tauri-apps/cli-linux-x64-musl': 2.10.1
-      '@tauri-apps/cli-win32-arm64-msvc': 2.10.1
-      '@tauri-apps/cli-win32-ia32-msvc': 2.10.1
-      '@tauri-apps/cli-win32-x64-msvc': 2.10.1
+      '@tauri-apps/cli-darwin-arm64': 2.11.2
+      '@tauri-apps/cli-darwin-x64': 2.11.2
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.11.2
+      '@tauri-apps/cli-linux-arm64-gnu': 2.11.2
+      '@tauri-apps/cli-linux-arm64-musl': 2.11.2
+      '@tauri-apps/cli-linux-riscv64-gnu': 2.11.2
+      '@tauri-apps/cli-linux-x64-gnu': 2.11.2
+      '@tauri-apps/cli-linux-x64-musl': 2.11.2
+      '@tauri-apps/cli-win32-arm64-msvc': 2.11.2
+      '@tauri-apps/cli-win32-ia32-msvc': 2.11.2
+      '@tauri-apps/cli-win32-x64-msvc': 2.11.2
 
   '@tauri-apps/plugin-dialog@2.7.1':
     dependencies:
       '@tauri-apps/api': 2.11.0
 
-  '@tauri-apps/plugin-opener@2.5.3':
+  '@tauri-apps/plugin-opener@2.5.4':
     dependencies:
-      '@tauri-apps/api': 2.10.1
+      '@tauri-apps/api': 2.11.0
 
   '@tauri-apps/plugin-store@2.4.3':
     dependencies:
@@ -1367,9 +1366,9 @@ snapshots:
 
   '@types/estree@1.0.8': {}
 
-  '@types/trusted-types@2.0.7': {}
+  '@types/estree@1.0.9': {}
 
-  '@typescript-eslint/types@8.57.2': {}
+  '@types/trusted-types@2.0.7': {}
 
   acorn@8.16.0: {}
 
@@ -1395,12 +1394,12 @@ snapshots:
 
   detect-libc@2.1.2: {}
 
-  devalue@5.6.4: {}
+  devalue@5.8.1: {}
 
-  enhanced-resolve@5.20.1:
+  enhanced-resolve@5.22.1:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.3.2
+      tapable: 2.3.3
 
   esbuild@0.25.12:
     optionalDependencies:
@@ -1433,10 +1432,9 @@ snapshots:
 
   esm-env@1.2.2: {}
 
-  esrap@2.2.4:
+  esrap@2.2.9:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
-      '@typescript-eslint/types': 8.57.2
 
   fdir@6.5.0(picomatch@4.0.4):
     optionalDependencies:
@@ -1451,9 +1449,9 @@ snapshots:
 
   is-reference@3.0.3:
     dependencies:
-      '@types/estree': 1.0.8
+      '@types/estree': 1.0.9
 
-  jiti@2.6.1: {}
+  jiti@2.7.0: {}
 
   kleur@4.1.5: {}
 
@@ -1508,19 +1506,19 @@ snapshots:
 
   lit-element@4.2.2:
     dependencies:
-      '@lit-labs/ssr-dom-shim': 1.5.1
+      '@lit-labs/ssr-dom-shim': 1.6.0
       '@lit/reactive-element': 2.1.2
-      lit-html: 3.3.2
+      lit-html: 3.3.3
 
-  lit-html@3.3.2:
+  lit-html@3.3.3:
     dependencies:
       '@types/trusted-types': 2.0.7
 
-  lit@3.3.2:
+  lit@3.3.3:
     dependencies:
       '@lit/reactive-element': 2.1.2
       lit-element: 4.2.2
-      lit-html: 3.3.2
+      lit-html: 3.3.3
 
   locate-character@3.0.0: {}
 
@@ -1540,7 +1538,7 @@ snapshots:
       '@mdui/shared': 1.0.8
       classcat: 5.0.5
       is-promise: 4.0.0
-      lit: 3.3.2
+      lit: 3.3.3
       ssr-window: 5.0.1
       tslib: 2.8.1
 
@@ -1550,49 +1548,49 @@ snapshots:
 
   ms@2.1.3: {}
 
-  nanoid@3.3.11: {}
+  nanoid@3.3.12: {}
 
   picocolors@1.1.1: {}
 
   picomatch@4.0.4: {}
 
-  postcss@8.5.8:
+  postcss@8.5.15:
     dependencies:
-      nanoid: 3.3.11
+      nanoid: 3.3.12
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
   readdirp@4.1.2: {}
 
-  rollup@4.60.1:
+  rollup@4.60.4:
     dependencies:
       '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.60.1
-      '@rollup/rollup-android-arm64': 4.60.1
-      '@rollup/rollup-darwin-arm64': 4.60.1
-      '@rollup/rollup-darwin-x64': 4.60.1
-      '@rollup/rollup-freebsd-arm64': 4.60.1
-      '@rollup/rollup-freebsd-x64': 4.60.1
-      '@rollup/rollup-linux-arm-gnueabihf': 4.60.1
-      '@rollup/rollup-linux-arm-musleabihf': 4.60.1
-      '@rollup/rollup-linux-arm64-gnu': 4.60.1
-      '@rollup/rollup-linux-arm64-musl': 4.60.1
-      '@rollup/rollup-linux-loong64-gnu': 4.60.1
-      '@rollup/rollup-linux-loong64-musl': 4.60.1
-      '@rollup/rollup-linux-ppc64-gnu': 4.60.1
-      '@rollup/rollup-linux-ppc64-musl': 4.60.1
-      '@rollup/rollup-linux-riscv64-gnu': 4.60.1
-      '@rollup/rollup-linux-riscv64-musl': 4.60.1
-      '@rollup/rollup-linux-s390x-gnu': 4.60.1
-      '@rollup/rollup-linux-x64-gnu': 4.60.1
-      '@rollup/rollup-linux-x64-musl': 4.60.1
-      '@rollup/rollup-openbsd-x64': 4.60.1
-      '@rollup/rollup-openharmony-arm64': 4.60.1
-      '@rollup/rollup-win32-arm64-msvc': 4.60.1
-      '@rollup/rollup-win32-ia32-msvc': 4.60.1
-      '@rollup/rollup-win32-x64-gnu': 4.60.1
-      '@rollup/rollup-win32-x64-msvc': 4.60.1
+      '@rollup/rollup-android-arm-eabi': 4.60.4
+      '@rollup/rollup-android-arm64': 4.60.4
+      '@rollup/rollup-darwin-arm64': 4.60.4
+      '@rollup/rollup-darwin-x64': 4.60.4
+      '@rollup/rollup-freebsd-arm64': 4.60.4
+      '@rollup/rollup-freebsd-x64': 4.60.4
+      '@rollup/rollup-linux-arm-gnueabihf': 4.60.4
+      '@rollup/rollup-linux-arm-musleabihf': 4.60.4
+      '@rollup/rollup-linux-arm64-gnu': 4.60.4
+      '@rollup/rollup-linux-arm64-musl': 4.60.4
+      '@rollup/rollup-linux-loong64-gnu': 4.60.4
+      '@rollup/rollup-linux-loong64-musl': 4.60.4
+      '@rollup/rollup-linux-ppc64-gnu': 4.60.4
+      '@rollup/rollup-linux-ppc64-musl': 4.60.4
+      '@rollup/rollup-linux-riscv64-gnu': 4.60.4
+      '@rollup/rollup-linux-riscv64-musl': 4.60.4
+      '@rollup/rollup-linux-s390x-gnu': 4.60.4
+      '@rollup/rollup-linux-x64-gnu': 4.60.4
+      '@rollup/rollup-linux-x64-musl': 4.60.4
+      '@rollup/rollup-openbsd-x64': 4.60.4
+      '@rollup/rollup-openharmony-arm64': 4.60.4
+      '@rollup/rollup-win32-arm64-msvc': 4.60.4
+      '@rollup/rollup-win32-ia32-msvc': 4.60.4
+      '@rollup/rollup-win32-x64-gnu': 4.60.4
+      '@rollup/rollup-win32-x64-msvc': 4.60.4
       fsevents: 2.3.3
 
   sade@1.8.1:
@@ -1611,42 +1609,44 @@ snapshots:
 
   ssr-window@5.0.1: {}
 
-  svelte-check@4.4.5(picomatch@4.0.4)(svelte@5.55.1)(typescript@5.6.3):
+  svelte-check@4.4.8(picomatch@4.0.4)(svelte@5.56.0)(typescript@5.6.3):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       chokidar: 4.0.3
       fdir: 6.5.0(picomatch@4.0.4)
       picocolors: 1.1.1
       sade: 1.8.1
-      svelte: 5.55.1
+      svelte: 5.56.0
       typescript: 5.6.3
     transitivePeerDependencies:
       - picomatch
 
-  svelte@5.55.1:
+  svelte@5.56.0:
     dependencies:
       '@jridgewell/remapping': 2.3.5
       '@jridgewell/sourcemap-codec': 1.5.5
-      '@sveltejs/acorn-typescript': 1.0.9(acorn@8.16.0)
-      '@types/estree': 1.0.8
+      '@sveltejs/acorn-typescript': 1.0.10(acorn@8.16.0)
+      '@types/estree': 1.0.9
       '@types/trusted-types': 2.0.7
       acorn: 8.16.0
       aria-query: 5.3.1
       axobject-query: 4.1.0
       clsx: 2.1.1
-      devalue: 5.6.4
+      devalue: 5.8.1
       esm-env: 1.2.2
-      esrap: 2.2.4
+      esrap: 2.2.9
       is-reference: 3.0.3
       locate-character: 3.0.0
       magic-string: 0.30.21
       zimmerframe: 1.1.4
+    transitivePeerDependencies:
+      - '@typescript-eslint/types'
 
-  tailwindcss@4.2.2: {}
+  tailwindcss@4.3.0: {}
 
-  tapable@2.3.2: {}
+  tapable@2.3.3: {}
 
-  tinyglobby@0.2.15:
+  tinyglobby@0.2.17:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
@@ -1657,21 +1657,21 @@ snapshots:
 
   typescript@5.6.3: {}
 
-  vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0):
+  vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0):
     dependencies:
       esbuild: 0.25.12
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
-      postcss: 8.5.8
-      rollup: 4.60.1
-      tinyglobby: 0.2.15
+      postcss: 8.5.15
+      rollup: 4.60.4
+      tinyglobby: 0.2.17
     optionalDependencies:
       fsevents: 2.3.3
-      jiti: 2.6.1
+      jiti: 2.7.0
       lightningcss: 1.32.0
 
-  vitefu@1.1.2(vite@6.4.1(jiti@2.6.1)(lightningcss@1.32.0)):
+  vitefu@1.1.3(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0)):
     optionalDependencies:
-      vite: 6.4.1(jiti@2.6.1)(lightningcss@1.32.0)
+      vite: 6.4.2(jiti@2.7.0)(lightningcss@1.32.0)
 
   zimmerframe@1.1.4: {}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 7088ea5..77b0eb1 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -32,6 +32,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
 [[package]]
 name = "almost"
 version = "0.2.0"
@@ -244,6 +250,15 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -313,6 +328,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
+dependencies = [
+ "hybrid-array",
+]
+
 [[package]]
 name = "block2"
 version = "0.6.2"
@@ -514,6 +538,17 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.44"
@@ -526,6 +561,12 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "cmov"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
+
 [[package]]
 name = "cocoa"
 version = "0.24.1"
@@ -712,6 +753,30 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -771,6 +836,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -787,6 +861,15 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
+dependencies = [
+ "hybrid-array",
+]
+
 [[package]]
 name = "cssparser"
 version = "0.36.0"
@@ -826,6 +909,15 @@ version = "0.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"
 
+[[package]]
+name = "ctutils"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+dependencies = [
+ "cmov",
+]
+
 [[package]]
 name = "darling"
 version = "0.23.0"
@@ -929,8 +1021,19 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer",
- "crypto-common",
+ "block-buffer 0.10.4",
+ "crypto-common 0.1.7",
+]
+
+[[package]]
+name = "digest"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
+dependencies = [
+ "block-buffer 0.12.0",
+ "crypto-common 0.2.2",
+ "ctutils",
 ]
 
 [[package]]
@@ -1021,6 +1124,12 @@ dependencies = [
  "tendril",
 ]
 
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
 [[package]]
 name = "dpi"
 version = "0.1.2"
@@ -1072,6 +1181,15 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
+[[package]]
+name = "either"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "embed-resource"
 version = "3.0.9"
@@ -1155,6 +1273,16 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "etcetera"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "event-listener"
 version = "5.4.1"
@@ -1240,6 +1368,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28a80e3145d8ad11ba0995949bbcf48b9df2be62772b3d351ef017dff6ecb853"
 
+[[package]]
+name = "flume"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "spin",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1336,6 +1475,17 @@ dependencies = [
  "futures-util",
 ]
 
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.32"
@@ -1503,16 +1653,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
-dependencies = [
- "rustix",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -1545,6 +1685,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi 6.0.0",
+ "rand_core",
  "wasip2",
  "wasip3",
 ]
@@ -1634,24 +1775,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
-[[package]]
-name = "global-hotkey"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c386b0a4a70cb2d39fffd74480f985b6f0bfbcb934b6a6b6b7e630e448f242e"
-dependencies = [
- "crossbeam-channel",
- "keyboard-types",
- "objc2",
- "objc2-app-kit",
- "once_cell",
- "serde",
- "thiserror 2.0.18",
- "windows-sys 0.59.0",
- "x11rb",
- "xkeysym",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -1730,12 +1853,32 @@ dependencies = [
  "foldhash 0.1.5",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
+[[package]]
+name = "hashlink"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea0b22561a9c04a7cb1a302c013e0259cd3b4bb619f145b32f72b8b4bcbed230"
+dependencies = [
+ "hashbrown 0.16.1",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -1760,6 +1903,24 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hkdf"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
+dependencies = [
+ "digest 0.11.3",
+]
+
 [[package]]
 name = "hound"
 version = "3.5.1"
@@ -1826,6 +1987,15 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
+[[package]]
+name = "hybrid-array"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da"
+dependencies = [
+ "typenum",
+]
+
 [[package]]
 name = "hyper"
 version = "1.10.1"
@@ -2276,6 +2446,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "libsqlite3-sys"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -2364,6 +2545,16 @@ dependencies = [
  "web_atoms",
 ]
 
+[[package]]
+name = "md-5"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98"
+dependencies = [
+ "cfg-if",
+ "digest 0.11.3",
+]
+
 [[package]]
 name = "memchr"
 version = "2.8.1"
@@ -3198,6 +3389,23 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -3707,6 +3915,17 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.3",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -3714,8 +3933,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures",
- "digest",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.3",
 ]
 
 [[package]]
@@ -3757,6 +3987,9 @@ name = "smallvec"
 version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "socket2"
@@ -3834,6 +4067,186 @@ dependencies = [
  "windows 0.44.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "378620ccc25c62c89d8be1c819e76a88d59bdcc3304733330788948e619bfd71"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b44e85bf579a8eeb4ceaa77a3a523baf2bf0e9bac7e40f405d537b5d2d5ccb"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "cfg-if",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashbrown 0.16.1",
+ "hashlink",
+ "indexmap 2.14.0",
+ "log",
+ "memchr",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "smallvec",
+ "thiserror 2.0.18",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd2b84f2bc39a5705ef27ec785a11c934a41bbd4a24941e257927cddc26b60bf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb8d96de5fdc85a5c4ec813432b523ec637e80ba98f046555f75f7908ddac7c3"
+dependencies = [
+ "cfg-if",
+ "dotenvy",
+ "either",
+ "heck 0.5.0",
+ "hex",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "sqlx-core",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+ "syn 2.0.117",
+ "thiserror 2.0.18",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-mysql"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90b8020fe17c5f2c245bfa2505d7ef59c5604839527c740266ad2214acebea27"
+dependencies = [
+ "bitflags 2.11.1",
+ "byteorder",
+ "bytes",
+ "crc",
+ "digest 0.11.3",
+ "dotenvy",
+ "either",
+ "futures-core",
+ "futures-util",
+ "generic-array",
+ "log",
+ "percent-encoding",
+ "serde",
+ "sha1",
+ "sha2 0.11.0",
+ "sqlx-core",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87a2bdd6e83f6b3ea525ca9fee568030508b58355a43d0b2c1674d5f79dcd65e"
+dependencies = [
+ "atoi",
+ "base64 0.22.1",
+ "bitflags 2.11.1",
+ "byteorder",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "rand",
+ "serde",
+ "serde_json",
+ "sha2 0.11.0",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror 2.0.18",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488e99c397a62007e4229aec669a179816339afc6d2620ca6fa420dbee2e982c"
+dependencies = [
+ "atoi",
+ "flume",
+ "form_urlencoded",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "sqlx-core",
+ "thiserror 2.0.18",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -3870,6 +4283,17 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -4435,19 +4859,18 @@ dependencies = [
 name = "tauri-app"
 version = "0.1.0"
 dependencies = [
+ "async-trait",
  "base64 0.22.1",
  "lofty",
- "raw-window-handle",
  "serde",
  "serde_json",
  "souvlaki",
+ "sqlx",
  "tauri",
  "tauri-build",
  "tauri-plugin-dialog",
- "tauri-plugin-global-shortcut",
  "tauri-plugin-opener",
  "tauri-plugin-store",
- "tokio",
  "trash",
  "walkdir",
  "web-audio-api",
@@ -4491,7 +4914,7 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "sha2",
+ "sha2 0.10.9",
  "syn 2.0.117",
  "tauri-utils",
  "thiserror 2.0.18",
@@ -4573,21 +4996,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "tauri-plugin-global-shortcut"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4dd9f4c5136c09cd962da0c86dc4accd4666db2ea591cf16e6597435843bd2b"
-dependencies = [
- "global-hotkey",
- "log",
- "serde",
- "serde_json",
- "tauri",
- "tauri-plugin",
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "tauri-plugin-opener"
 version = "2.5.4"
@@ -4871,6 +5279,17 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.18"
@@ -5055,6 +5474,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -5200,12 +5620,33 @@ dependencies = [
  "unic-common",
 ]
 
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
+[[package]]
+name = "unicode-normalization"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.13.2"
@@ -5273,6 +5714,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "vecmath"
 version = "1.0.0"
@@ -5592,6 +6039,12 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "whoami"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "998767ef88740d1f5b0682a9c53c24431453923962269c2db68ee43788c5a40d"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -6294,7 +6747,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "raw-window-handle",
- "sha2",
+ "sha2 0.10.9",
  "soup3",
  "tao-macros",
  "thiserror 2.0.18",
@@ -6329,29 +6782,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "x11rb"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
-dependencies = [
- "gethostname",
- "rustix",
- "x11rb-protocol",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
-
-[[package]]
-name = "xkeysym"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
-
 [[package]]
 name = "yoke"
 version = "0.8.2"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 7f9fe70..145e422 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -28,9 +28,8 @@ base64 = "0.22.1"
 walkdir = "2.5.0"
 tauri-plugin-dialog = "2"
 tauri-plugin-store = "2"
-trash = "5"
-tokio = { version = "1", features = ["time"] }
+trash = "5.2.6"
 souvlaki = "0.8.3"
-raw-window-handle = "0.6"
-tauri-plugin-global-shortcut = "2"
+sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "macros", "migrate"] }
+async-trait = "0.1"
 
diff --git a/src-tauri/migrations/0001_initial.sql b/src-tauri/migrations/0001_initial.sql
new file mode 100644
index 0000000..923e76a
--- /dev/null
+++ b/src-tauri/migrations/0001_initial.sql
@@ -0,0 +1,55 @@
+CREATE TABLE tracks (
+    id INTEGER PRIMARY KEY,
+    title TEXT NOT NULL,
+    artist TEXT,
+    album TEXT,
+    duration INTEGER NOT NULL,
+    path TEXT NOT NULL UNIQUE,
+    cover TEXT,
+    file_size INTEGER,
+    play_count INTEGER DEFAULT 0,
+    last_played_at TEXT,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+);
+
+CREATE TABLE playlists (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    created_at TEXT NOT NULL
+);
+
+CREATE TABLE playlist_tracks (
+    id INTEGER PRIMARY KEY,
+    playlist_id INTEGER NOT NULL,
+    track_id INTEGER NOT NULL,
+    position INTEGER NOT NULL,
+    FOREIGN KEY (playlist_id) REFERENCES playlists(id) ON DELETE CASCADE,
+    FOREIGN KEY (track_id) REFERENCES tracks(id) ON DELETE CASCADE,
+    UNIQUE (playlist_id, track_id),
+    UNIQUE (playlist_id, position)
+);
+
+CREATE TABLE recent_played (
+    track_id INTEGER PRIMARY KEY,
+    played_at TEXT NOT NULL,
+    FOREIGN KEY (track_id) REFERENCES tracks(id) ON DELETE CASCADE
+);
+
+CREATE TABLE settings (
+    id INTEGER PRIMARY KEY CHECK (id = 1),
+    theme TEXT NOT NULL,
+    volume INTEGER NOT NULL,
+    scan_on_startup INTEGER NOT NULL,
+    reduce_motion INTEGER NOT NULL,
+    library_dirs TEXT NOT NULL,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+);
+
+CREATE INDEX idx_tracks_title ON tracks(title);
+CREATE INDEX idx_tracks_artist ON tracks(artist);
+CREATE INDEX idx_tracks_album ON tracks(album);
+CREATE INDEX idx_playlist_tracks_playlist_id ON playlist_tracks(playlist_id);
+CREATE INDEX idx_playlist_tracks_track_id ON playlist_tracks(track_id);
+CREATE INDEX idx_recent_played_played_at ON recent_played(played_at);
diff --git a/src-tauri/src/audio.rs b/src-tauri/src/audio.rs
index 2182660..d0e21b5 100644
--- a/src-tauri/src/audio.rs
+++ b/src-tauri/src/audio.rs
@@ -24,13 +24,13 @@ pub struct AudioState {
     pub media: Option<MediaElement>,
     pub gain_node: Option<GainNode>,
     pub volume: f32,
-    pub current_track_id: Option<String>,
+    pub current_track_id: Option<i64>,
     pub current_path: Option<String>,
     pub playing: bool,
     pub playlist: Vec<Track>,
     pub current_index: Option<usize>,
     pub play_mode: PlayMode,
-    pub playback_history: Vec<String>,
+    pub playback_history: Vec<i64>,
 }
 
 pub fn get_audio_state() -> &'static Mutex<AudioState> {
@@ -50,4 +50,4 @@ pub fn get_audio_state() -> &'static Mutex<AudioState> {
             playback_history: Vec::new(),
         })
     })
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/commands/config.rs b/src-tauri/src/commands/config.rs
deleted file mode 100644
index 46cfb5b..0000000
--- a/src-tauri/src/commands/config.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use std::fs;
-use std::path::PathBuf;
-
-use tauri::{command, Manager};
-
-use crate::models::AppConfig;
-
-const CONFIG_FILE: &str = "config.json";
-
-fn config_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| e.to_string())?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path).map_err(|e| e.to_string())?;
-    }
-
-    Ok(app_data_path.join(CONFIG_FILE))
-}
-
-pub fn load_config_sync(app_handle: &tauri::AppHandle) -> Result<AppConfig, String> {
-    let path = config_path(app_handle)?;
-
-    if !path.exists() {
-        return save_config_sync(app_handle, AppConfig::default());
-    }
-
-    let file = fs::File::open(&path).map_err(|e| e.to_string())?;
-
-    match serde_json::from_reader::<_, AppConfig>(file) {
-        Ok(config) => Ok(config),
-        Err(_) => save_config_sync(app_handle, AppConfig::default()),
-    }
-}
-
-pub fn save_config_sync(
-    app_handle: &tauri::AppHandle,
-    config: AppConfig,
-) -> Result<AppConfig, String> {
-    let path = config_path(app_handle)?;
-    let temp_path = path.with_extension("json.tmp");
-    let json = serde_json::to_string_pretty(&config).map_err(|e| e.to_string())?;
-
-    fs::write(&temp_path, json).map_err(|e| e.to_string())?;
-    fs::rename(&temp_path, &path).map_err(|e| e.to_string())?;
-
-    Ok(config)
-}
-
-#[command]
-pub async fn load_config(app_handle: tauri::AppHandle) -> Result<AppConfig, String> {
-    load_config_sync(&app_handle)
-}
-
-#[command]
-pub async fn save_config(
-    app_handle: tauri::AppHandle,
-    config: AppConfig,
-) -> Result<AppConfig, String> {
-    save_config_sync(&app_handle, config)
-}
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index 6185fdb..658a9f9 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -1,32 +1,30 @@
 use std::collections::HashSet;
-use std::fs::{self, File};
+use std::fs;
 use std::path::Path;
 use std::process::Command;
 
 use base64::{engine::general_purpose, Engine as _};
 use lofty::prelude::*;
 use lofty::probe::Probe;
-use tauri::{command, Manager};
+use tauri::{command, State};
 use walkdir::WalkDir;
 
-use crate::commands::playback::{remove_track_from_backend_queue, PlaybackQueueChangedPayload};
-use crate::commands::settings::load_settings;
+use crate::commands::playback::remove_track_from_backend_queue;
 use crate::metadata::parse_single_track;
-use crate::models::settings::AppSettings;
-use crate::models::Track;
+use crate::models::playback::PlaybackQueueChangedPayload;
+use crate::models::{NewTrack, Track};
+use crate::state::AppState;
 
 const SUPPORTED_EXT: [&str; 5] = ["mp3", "flac", "m4a", "wav", "ogg"];
 
 fn is_supported_audio_file(path: &Path) -> bool {
     path.extension()
         .and_then(|ext| ext.to_str())
-        .map(|ext| {
-            SUPPORTED_EXT.contains(&ext.to_lowercase().as_str())
-        })
+        .map(|ext| SUPPORTED_EXT.contains(&ext.to_lowercase().as_str()))
         .unwrap_or(false)
 }
 
-fn scan_single_directory(dir: &str) -> Result<Vec<Track>, String> {
+fn scan_single_directory(dir: &str) -> Result<Vec<NewTrack>, String> {
     let root_path = Path::new(dir);
 
     if !root_path.exists() || !root_path.is_dir() {
@@ -55,12 +53,12 @@ fn scan_single_directory(dir: &str) -> Result<Vec<Track>, String> {
     Ok(tracks)
 }
 
-fn dedupe_tracks(tracks: &mut Vec<Track>) {
+fn dedupe_new_tracks(tracks: &mut Vec<NewTrack>) {
     let mut seen = HashSet::new();
     tracks.retain(|track| seen.insert(track.path.clone()));
 }
 
-pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<Track>, String> {
+pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<NewTrack>, String> {
     let mut all_tracks = Vec::new();
 
     for dir in dirs {
@@ -69,34 +67,18 @@ pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<Track>, String> {
         }
     }
 
-    dedupe_tracks(&mut all_tracks);
+    dedupe_new_tracks(&mut all_tracks);
     Ok(all_tracks)
 }
 
-pub fn save_music_library(
-    app_handle: &tauri::AppHandle,
-    library: &[Track],
-) -> Result<(), String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| e.to_string())?;
+async fn upsert_scanned_tracks(state: &AppState, tracks: Vec<NewTrack>) -> Result<Vec<Track>, String> {
+    let mut saved = Vec::with_capacity(tracks.len());
 
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path)
-            .map_err(|e| format!("创建数据目录失败: {}", e))?;
+    for track in tracks {
+        saved.push(state.tracks.upsert_track(track).await?);
     }
 
-    let json_file_path = app_data_path.join("library.json");
-    let temp_file_path = app_data_path.join("library.json.tmp");
-
-    let json_str = serde_json::to_string_pretty(library)
-        .map_err(|e| e.to_string())?;
-
-    fs::write(&temp_file_path, json_str).map_err(|e| e.to_string())?;
-    fs::rename(temp_file_path, json_file_path).map_err(|e| e.to_string())?;
-
-    Ok(())
+    Ok(saved)
 }
 
 #[command]
@@ -182,7 +164,7 @@ pub fn show_in_folder(path: String) -> Result<(), String> {
 pub async fn delete_track_file(
     app_handle: tauri::AppHandle,
     path: String,
-    track_id: String,
+    track_id: i64,
 ) -> Result<PlaybackQueueChangedPayload, String> {
     let file_path = validate_audio_path(&path)?;
     trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
@@ -190,7 +172,7 @@ pub async fn delete_track_file(
 }
 
 #[command]
-pub fn trash_music_files(paths: Vec<String>) -> Result<(), String> {
+pub fn trash_track_files(paths: Vec<String>) -> Result<(), String> {
     for path in paths {
         let file_path = Path::new(&path);
 
@@ -209,7 +191,7 @@ pub fn trash_music_files(paths: Vec<String>) -> Result<(), String> {
 }
 
 #[command]
-pub fn delete_music_files(paths: Vec<String>) -> Result<(), String> {
+pub fn delete_track_files(paths: Vec<String>) -> Result<(), String> {
     for path in paths {
         let file_path = Path::new(&path);
 
@@ -228,56 +210,35 @@ pub fn delete_music_files(paths: Vec<String>) -> Result<(), String> {
 }
 
 #[command]
-pub fn scan_music_directories(
-    app_handle: tauri::AppHandle,
+pub async fn scan_track_directories(
+    state: State<'_, AppState>,
     dirs: Vec<String>,
 ) -> Result<Vec<Track>, String> {
-    let tracks = execute_scan(dirs)?;
-    save_music_library(&app_handle, &tracks)?;
+    let scanned = execute_scan(dirs)?;
+    let tracks = upsert_scanned_tracks(&state, scanned).await?;
     Ok(tracks)
 }
 
 #[command]
-pub async fn load_music_library(
-    app_handle: tauri::AppHandle,
+pub async fn load_track_library(
+    state: State<'_, AppState>,
 ) -> Result<Vec<Track>, String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| e.to_string())?;
-
-    let json_file_path = app_data_path.join("library.json");
+    let tracks = state.tracks.list_tracks().await?;
 
-    if !json_file_path.exists() {
-        return rebuild_and_get_library(&app_handle).await;
+    if tracks.is_empty() {
+        return rebuild_and_get_library(&state).await;
     }
 
-    let file = File::open(&json_file_path).map_err(|e| e.to_string())?;
-
-    match serde_json::from_reader::<_, Vec<Track>>(file) {
-        Ok(library) => Ok(library),
-        Err(_) => {
-            let _ = fs::remove_file(&json_file_path);
-            rebuild_and_get_library(&app_handle).await
-        }
-    }
+    Ok(tracks)
 }
 
 async fn rebuild_and_get_library(
-    app_handle: &tauri::AppHandle,
+    state: &AppState,
 ) -> Result<Vec<Track>, String> {
-    let settings: AppSettings = load_settings(app_handle.clone()).await?;
-
-    let tracks = tauri::async_runtime::spawn_blocking({
-        let handle = app_handle.clone();
-        move || {
-            let res = execute_scan(settings.library_dirs)?;
-            save_music_library(&handle, &res)?;
-            Ok::<Vec<Track>, String>(res)
-        }
-    })
-    .await
-    .map_err(|e| e.to_string())??;
-
+    let settings = state.settings.get_settings().await.map_err(|error| error.to_string())?;
+    let scanned = tauri::async_runtime::spawn_blocking(move || execute_scan(settings.library_dirs))
+        .await
+        .map_err(|e| e.to_string())??;
+    let tracks = upsert_scanned_tracks(state, scanned).await?;
     Ok(tracks)
 }
\ No newline at end of file
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 710a13a..6f5d7d7 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -1,6 +1,7 @@
-pub mod config;
+pub mod library;
+pub mod menu;
+pub mod playback;
+pub mod playlists;
 pub mod recent;
 pub mod settings;
-pub mod playback;
-pub mod library;
-pub mod menu;
\ No newline at end of file
+pub mod tracks;
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index eff3c79..93146fb 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -1,584 +1,26 @@
-use std::path::Path;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use serde::Serialize;
-use souvlaki::{MediaControlEvent, SeekDirection};
-use tauri::{command, AppHandle, Emitter};
-use web_audio_api::context::BaseAudioContext;
-use web_audio_api::node::AudioNode;
-use web_audio_api::MediaElement;
-
-use crate::audio::{get_audio_context, get_audio_state, PlayMode};
-use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
-use crate::models::Track;
-
-#[derive(Clone)]
-pub struct NativeTrackMetadata {
-    pub title: String,
-    pub album: String,
-    pub artist: String,
-    pub duration: Option<f64>,
-}
-
-#[derive(Clone)]
-pub enum NativePlaybackState {
-    Playing { current_time: f64 },
-    Paused { current_time: f64 },
-    Stopped,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackTrackSnapshot {
-    pub id: Option<String>,
-    pub path: Option<String>,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackStatusSnapshot {
-    pub has_media: bool,
-    pub playing: bool,
-    pub current_time: f64,
-    pub track: Option<PlaybackTrackSnapshot>,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackProgressPayload {
-    pub playing: bool,
-    pub current_time: f64,
-    pub track_id: Option<String>,
-    pub path: Option<String>,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackTrackStartedPayload {
-    pub track: Track,
-    pub index: usize,
-    pub playing: bool,
-    pub current_time: f64,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackQueueChangedPayload {
-    pub playlist: Vec<Track>,
-    pub current_index: Option<usize>,
-    pub play_mode: PlayMode,
-    pub playback_history: Vec<String>,
-}
-
-fn metadata_from_track(track: &Track) -> NativeTrackMetadata {
-    NativeTrackMetadata {
-        title: track.title.clone(),
-        album: track.album.clone(),
-        artist: track.artist.clone(),
-        duration: Some(track.duration),
-    }
-}
-
-fn minimal_track(full_path: String, track_id: Option<String>) -> Track {
-    let title = Path::new(&full_path)
-        .file_stem()
-        .and_then(|value| value.to_str())
-        .unwrap_or("未知歌曲")
-        .to_string();
-
-    Track {
-        id: track_id.unwrap_or_else(|| full_path.clone()),
-        title,
-        artist: "未知歌手".to_string(),
-        album: "未知专辑".to_string(),
-        album_artist: "未知歌手".to_string(),
-        duration: 0.0,
-        sample_rate: None,
-        cover: None,
-        path: full_path,
-    }
-}
-
-fn current_time_from_state() -> f64 {
-    let Ok(state) = get_audio_state().lock() else {
-        return 0.0;
-    };
-
-    if let Some(ref media) = state.media {
-        media.current_time()
-    } else {
-        0.0
-    }
-}
-
-fn status_snapshot() -> Result<PlaybackStatusSnapshot, String> {
-    let mut state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
-
-    if let Some(ref media) = state.media {
-        let playing = !media.paused();
-        let current_time = media.current_time();
-        let track = PlaybackTrackSnapshot {
-            id: state.current_track_id.clone(),
-            path: state.current_path.clone(),
-        };
-        state.playing = playing;
-
-        return Ok(PlaybackStatusSnapshot {
-            has_media: true,
-            playing,
-            current_time,
-            track: Some(track),
-        });
-    }
-
-    state.playing = false;
-
-    Ok(PlaybackStatusSnapshot {
-        has_media: false,
-        playing: false,
-        current_time: 0.0,
-        track: None,
-    })
-}
-
-fn progress_payload() -> Option<PlaybackProgressPayload> {
-    let Ok(mut state) = get_audio_state().lock() else {
-        return None;
-    };
-
-    let Some(ref media) = state.media else {
-        state.playing = false;
-        return None;
-    };
-
-    let playing = !media.paused();
-    let current_time = media.current_time();
-    let track_id = state.current_track_id.clone();
-    let path = state.current_path.clone();
-    state.playing = playing;
-
-    Some(PlaybackProgressPayload {
-        playing,
-        current_time,
-        track_id,
-        path,
-    })
-}
-
-fn current_track_duration() -> Option<f64> {
-    let Ok(state) = get_audio_state().lock() else {
-        return None;
-    };
-
-    let index = state.current_index?;
-    state.playlist.get(index).map(|track| track.duration)
-}
-
-fn should_advance_track() -> bool {
-    let Some(payload) = progress_payload() else {
-        return false;
-    };
-
-    if !payload.playing {
-        return false;
-    }
-
-    let Some(duration) = current_track_duration() else {
-        return false;
-    };
-
-    duration > 0.0 && payload.current_time >= duration - 0.5
-}
-
-fn emit_track_started(app_handle: &AppHandle, track: Track, index: usize) {
-    let payload = PlaybackTrackStartedPayload {
-        track,
-        index,
-        playing: true,
-        current_time: 0.0,
-    };
-    let _ = app_handle.emit("playback:track-started", payload);
-}
-
-fn emit_progress(app_handle: &AppHandle) {
-    if let Some(payload) = progress_payload() {
-        let state = if payload.playing {
-            NativePlaybackState::Playing {
-                current_time: payload.current_time,
-            }
-        } else {
-            NativePlaybackState::Paused {
-                current_time: payload.current_time,
-            }
-        };
-        update_media_controls_playback(state);
-        let _ = app_handle.emit("playback:progress", payload);
-    }
-}
-
-fn queue_snapshot() -> Result<PlaybackQueueChangedPayload, String> {
-    let state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
-
-    Ok(PlaybackQueueChangedPayload {
-        playlist: state.playlist.clone(),
-        current_index: state.current_index,
-        play_mode: state.play_mode,
-        playback_history: state.playback_history.clone(),
-    })
-}
-
-fn emit_queue_changed(app_handle: &AppHandle) -> Result<PlaybackQueueChangedPayload, String> {
-    let payload = queue_snapshot()?;
-    let _ = app_handle.emit("playback:queue-changed", payload.clone());
-    Ok(payload)
-}
-
-fn sanitize_track(mut track: Track) -> Track {
-    track.cover = None;
-    track
-}
-
-fn play_track_internal(app_handle: &AppHandle, track: Track, index: Option<usize>) -> Result<(), String> {
-    let file_path = Path::new(&track.path);
-
-    if !file_path.exists() {
-        return Err("音频文件不存在或已被移动".into());
-    }
-
-    let mut media = MediaElement::new(file_path)
-        .map_err(|e| format!("Failed to create media element: {}", e))?;
-
-    let context = get_audio_context();
-    let src = context.create_media_element_source(&mut media);
-    let gain_node = context.create_gain();
-
-    src.connect(&gain_node);
-    gain_node.connect(&context.destination());
-
-    media.set_loop(false);
-    media.set_current_time(0.0);
-
-    {
-        let mut state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
-        gain_node.gain().set_value(state.volume);
-
-        if let Some(old_media) = state.media.replace(media) {
-            old_media.pause();
-        }
-
-        state.gain_node = Some(gain_node);
-        state.current_path = Some(track.path.clone());
-        state.current_track_id = Some(track.id.clone());
-        state.playing = true;
-
-        if let Some(next_index) = index {
-            state.current_index = Some(next_index);
-        }
-
-        if let Some(ref media) = state.media {
-            media.play();
-        }
-    }
-
-    update_media_controls_metadata(metadata_from_track(&track));
-    update_media_controls_playback(NativePlaybackState::Playing { current_time: 0.0 });
-
-    if let Some(index) = index {
-        emit_track_started(app_handle, track, index);
-    } else {
-        emit_progress(app_handle);
-    }
-
-    Ok(())
-}
-
-fn play_current_index_internal(app_handle: &AppHandle, index: usize) -> Result<(), String> {
-    let track = {
-        let state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-        state
-            .playlist
-            .get(index)
-            .cloned()
-            .ok_or_else(|| "Invalid queue index".to_string())?
-    };
-
-    play_track_internal(app_handle, track, Some(index))
-}
-
-fn next_index_from_state() -> Option<usize> {
-    let state = get_audio_state().lock().ok()?;
-
-    if state.playlist.is_empty() {
-        return None;
-    }
-
-    let current_index = state.current_index.unwrap_or(0);
-
-    match state.play_mode {
-        PlayMode::Single => Some(current_index.min(state.playlist.len() - 1)),
-        PlayMode::List => Some(if current_index >= state.playlist.len() - 1 {
-            0
-        } else {
-            current_index + 1
-        }),
-        PlayMode::Shuffle => {
-            if state.playlist.len() <= 1 {
-                return Some(0);
-            }
+use tauri::{command, AppHandle};
 
-            let nanos = SystemTime::now()
-                .duration_since(UNIX_EPOCH)
-                .ok()?
-                .subsec_nanos() as usize;
-            let mut next = nanos % state.playlist.len();
-
-            if next == current_index {
-                next = (next + 1) % state.playlist.len();
-            }
-
-            Some(next)
-        }
-    }
-}
-
-fn previous_index_from_state() -> Option<usize> {
-    let state = get_audio_state().lock().ok()?;
-
-    if state.playlist.is_empty() {
-        return None;
-    }
-
-    if let Some(last_id) = state.playback_history.last() {
-        if let Some(index) = state.playlist.iter().position(|track| &track.id == last_id) {
-            return Some(index);
-        }
-    }
-
-    let current_index = state.current_index.unwrap_or(0);
-
-    Some(if current_index == 0 {
-        state.playlist.len() - 1
-    } else {
-        current_index - 1
-    })
-}
-
-fn push_current_to_history() {
-    if let Ok(mut state) = get_audio_state().lock() {
-        if let Some(index) = state.current_index {
-            if let Some(track) = state.playlist.get(index) {
-                let id = track.id.clone();
-                state.playback_history.push(id);
-            }
-        }
-    }
-}
-
-fn pop_history_if_matches(index: usize) {
-    if let Ok(mut state) = get_audio_state().lock() {
-        if let Some(track) = state.playlist.get(index) {
-            if state.playback_history.last() == Some(&track.id) {
-                state.playback_history.pop();
-            }
-        }
-    }
-}
-
-pub async fn play_next_internal(app_handle: AppHandle) -> Result<(), String> {
-    push_current_to_history();
-    let index = next_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
-    play_current_index_internal(&app_handle, index)
-}
-
-pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), String> {
-    let index = previous_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
-    pop_history_if_matches(index);
-    play_current_index_internal(&app_handle, index)
-}
-
-pub async fn resume_internal(app_handle: AppHandle) -> Result<(), String> {
-    let current_time = {
-        let mut state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
-        if let Some(ref media) = state.media {
-            media.play();
-            let current_time = media.current_time();
-            state.playing = true;
-            current_time
-        } else {
-            return Err("No media available".into());
-        }
-    };
-
-    update_media_controls_playback(NativePlaybackState::Playing { current_time });
-    emit_progress(&app_handle);
-    Ok(())
-}
-
-pub async fn pause_internal(app_handle: AppHandle) -> Result<(), String> {
-    let current_time = {
-        let mut state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
-        if let Some(ref media) = state.media {
-            media.pause();
-            let current_time = media.current_time();
-            state.playing = false;
-            current_time
-        } else {
-            return Err("No media available".into());
-        }
-    };
-
-    update_media_controls_playback(NativePlaybackState::Paused { current_time });
-    emit_progress(&app_handle);
-    Ok(())
-}
-
-pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
-    let playing = {
-        let mut state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
-        if let Some(ref media) = state.media {
-            if media.paused() {
-                media.play();
-                state.playing = true;
-                true
-            } else {
-                media.pause();
-                state.playing = false;
-                false
-            }
-        } else {
-            return Err("No media available".into());
-        }
-    };
-
-    let current_time = current_time_from_state();
-
-    if playing {
-        update_media_controls_playback(NativePlaybackState::Playing { current_time });
-    } else {
-        update_media_controls_playback(NativePlaybackState::Paused { current_time });
-    }
-
-    emit_progress(&app_handle);
-    Ok(playing)
-}
-
-pub async fn stop_internal(app_handle: AppHandle) -> Result<(), String> {
-    {
-        let mut state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
-        if let Some(ref media) = state.media {
-            media.pause();
-            media.set_current_time(0.0);
-        }
-
-        state.playing = false;
-    }
-
-    update_media_controls_playback(NativePlaybackState::Stopped);
-    emit_progress(&app_handle);
-    Ok(())
-}
-
-pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), String> {
-    let playing = {
-        let state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
-        if let Some(ref media) = state.media {
-            media.set_current_time(time);
-            !media.paused()
-        } else {
-            false
-        }
-    };
-
-    if playing {
-        update_media_controls_playback(NativePlaybackState::Playing { current_time: time });
-    } else {
-        update_media_controls_playback(NativePlaybackState::Paused { current_time: time });
-    }
-
-    emit_progress(&app_handle);
-    Ok(())
-}
-
-pub async fn handle_media_control_event(app_handle: AppHandle, event: MediaControlEvent) {
-    match event {
-        MediaControlEvent::Play => {
-            let _ = resume_internal(app_handle).await;
-        }
-        MediaControlEvent::Pause => {
-            let _ = pause_internal(app_handle).await;
-        }
-        MediaControlEvent::Toggle => {
-            let _ = toggle_internal(app_handle).await;
-        }
-        MediaControlEvent::Next => {
-            let _ = play_next_internal(app_handle).await;
-        }
-        MediaControlEvent::Previous => {
-            let _ = play_previous_internal(app_handle).await;
-        }
-        MediaControlEvent::Stop => {
-            let _ = stop_internal(app_handle).await;
-        }
-        MediaControlEvent::SetPosition(position) => {
-            let _ = seek_internal(app_handle, position.0.as_secs_f64()).await;
-        }
-        MediaControlEvent::Seek(direction) => {
-            let current_time = current_time_from_state();
-            let offset = match direction {
-                SeekDirection::Forward => 10.0,
-                SeekDirection::Backward => -10.0,
-            };
-            let _ = seek_internal(app_handle, (current_time + offset).max(0.0)).await;
-        }
-        MediaControlEvent::SeekBy(direction, duration) => {
-            let current_time = current_time_from_state();
-            let offset = duration.as_secs_f64();
-            let next_time = match direction {
-                SeekDirection::Forward => current_time + offset,
-                SeekDirection::Backward => current_time - offset,
-            };
-            let _ = seek_internal(app_handle, next_time.max(0.0)).await;
-        }
-        _ => {}
-    }
-}
-
-pub fn spawn_playback_progress_task(app_handle: AppHandle) {
-    tauri::async_runtime::spawn(async move {
-        loop {
-            emit_progress(&app_handle);
+use crate::audio::PlayMode;
+use crate::models::playback::{
+    PlaybackQueueChangedPayload, PlaybackStatusSnapshot,
+};
+use crate::models::Track;
+use crate::services::playback_events::{
+    emit_queue_changed, queue_payload_from_state, status_snapshot,
+};
+use crate::services::playback_service::{
+    handle_media_control_event_internal, load_track_for_playback, pause_internal,
+    play_current_index_internal, play_next_internal, play_previous_internal, play_track_internal,
+    resume_internal, seek_internal, stop_internal, toggle_internal,
+};
+use crate::state::playback_state::{
+    current_time_from_state, sanitize_track, with_audio_state,
+};
 
-            if should_advance_track() {
-                let _ = play_next_internal(app_handle.clone()).await;
-            }
+pub use crate::services::playback_service::spawn_playback_progress_task;
 
-            tokio::time::sleep(Duration::from_millis(500)).await;
-        }
-    });
+pub async fn handle_media_control_event(app_handle: AppHandle, event: souvlaki::MediaControlEvent) {
+    handle_media_control_event_internal(app_handle, event).await;
 }
 
 #[command]
@@ -586,40 +28,29 @@ pub async fn sync_playback_queue(
     playlist: Vec<Track>,
     current_index: Option<usize>,
     play_mode: PlayMode,
-    playback_history: Vec<String>,
+    playback_history: Vec<i64>,
 ) -> Result<(), String> {
-    let mut state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
-
-    state.playlist = playlist.into_iter().map(sanitize_track).collect();
-    state.current_index = current_index.filter(|index| *index < state.playlist.len());
-    state.play_mode = play_mode;
-    state.playback_history = playback_history;
-
-    Ok(())
+    with_audio_state(|state| {
+        state.playlist = playlist.into_iter().map(sanitize_track).collect();
+        state.current_index = current_index.filter(|index| *index < state.playlist.len());
+        state.play_mode = play_mode;
+        state.playback_history = playback_history;
+    })
 }
 
 #[command]
 pub async fn remove_track_from_backend_queue(
     app_handle: AppHandle,
-    track_id: String,
+    track_id: i64,
 ) -> Result<PlaybackQueueChangedPayload, String> {
     let mut play_index = None;
     let mut should_stop = false;
 
     {
-        let mut state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
+        let mut state = crate::state::playback_state::lock_audio_state()?;
 
         let Some(remove_index) = state.playlist.iter().position(|track| track.id == track_id) else {
-            return Ok(PlaybackQueueChangedPayload {
-                playlist: state.playlist.clone(),
-                current_index: state.current_index,
-                play_mode: state.play_mode,
-                playback_history: state.playback_history.clone(),
-            });
+            return Ok(queue_payload_from_state(&state));
         };
 
         let was_current = state.current_index == Some(remove_index);
@@ -657,20 +88,12 @@ pub async fn insert_track_as_next(
     track: Track,
 ) -> Result<PlaybackQueueChangedPayload, String> {
     {
-        let mut state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
+        let mut state = crate::state::playback_state::lock_audio_state()?;
         let track = sanitize_track(track);
 
         if let Some(existing_index) = state.playlist.iter().position(|item| item.id == track.id) {
             if state.current_index == Some(existing_index) {
-                return Ok(PlaybackQueueChangedPayload {
-                    playlist: state.playlist.clone(),
-                    current_index: state.current_index,
-                    play_mode: state.play_mode,
-                    playback_history: state.playback_history.clone(),
-                });
+                return Ok(queue_payload_from_state(&state));
             }
 
             state.playlist.remove(existing_index);
@@ -710,52 +133,33 @@ pub async fn play_previous_track(app_handle: AppHandle) -> Result<(), String> {
 }
 
 #[command]
-pub async fn stop_music(app_handle: AppHandle) -> Result<(), String> {
+pub async fn stop_track(app_handle: AppHandle) -> Result<(), String> {
     stop_internal(app_handle).await
 }
 
 #[command]
-pub async fn play_music(
+pub async fn play_track(
     app_handle: AppHandle,
     full_path: String,
-    track_id: Option<String>,
+    track_id: Option<i64>,
 ) -> Result<String, String> {
-    let track = {
-        let state = get_audio_state()
-            .lock()
-            .map_err(|_| "Failed to lock audio state")?;
-
-        state
-            .playlist
-            .iter()
-            .find(|track| {
-                track_id
-                    .as_ref()
-                    .map(|id| track.id == *id)
-                    .unwrap_or(false)
-                    || track.path == full_path
-            })
-            .cloned()
-    }
-    .unwrap_or_else(|| minimal_track(full_path.clone(), track_id));
-
+    let track = load_track_for_playback(&full_path, track_id);
     play_track_internal(&app_handle, track, None)?;
-
-    Ok(format!("Playing music: {}", full_path))
+    Ok(format!("Playing track: {}", full_path))
 }
 
 #[command]
-pub async fn resume_music(app_handle: AppHandle) -> Result<(), String> {
+pub async fn resume_track(app_handle: AppHandle) -> Result<(), String> {
     resume_internal(app_handle).await
 }
 
 #[command]
-pub async fn pause_music(app_handle: AppHandle) -> Result<(), String> {
+pub async fn pause_track(app_handle: AppHandle) -> Result<(), String> {
     pause_internal(app_handle).await
 }
 
 #[command]
-pub async fn toggle_music(app_handle: AppHandle) -> Result<bool, String> {
+pub async fn toggle_track(app_handle: AppHandle) -> Result<bool, String> {
     toggle_internal(app_handle).await
 }
 
@@ -766,7 +170,7 @@ pub async fn current_time() -> f64 {
 
 #[command]
 pub async fn get_current_status() -> Result<PlaybackStatusSnapshot, String> {
-    status_snapshot()
+    status_snapshot().map(|s| s.status_payload())
 }
 
 #[command]
@@ -776,18 +180,14 @@ pub async fn set_current_time(app_handle: AppHandle, time: f64) {
 
 #[command]
 pub async fn set_volume(volume: u8) -> Result<(), String> {
-    let mut state = get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state")?;
+    with_audio_state(|state| {
+        let volume = volume as f32 / 100.0;
+        let safe_volume = volume.clamp(0.0, 1.0);
 
-    let volume = volume as f32 / 100.0;
-    let safe_volume = volume.clamp(0.0, 1.0);
+        state.volume = safe_volume;
 
-    state.volume = safe_volume;
-
-    if let Some(ref gain_node) = state.gain_node {
-        gain_node.gain().set_value(safe_volume);
-    }
-
-    Ok(())
+        if let Some(ref gain_node) = state.gain_node {
+            gain_node.gain().set_value(safe_volume);
+        }
+    })
 }
diff --git a/src-tauri/src/commands/playlists.rs b/src-tauri/src/commands/playlists.rs
new file mode 100644
index 0000000..8e678f1
--- /dev/null
+++ b/src-tauri/src/commands/playlists.rs
@@ -0,0 +1,136 @@
+use tauri::{State, command};
+
+use crate::errors::AppError;
+use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
+use crate::state::AppState;
+
+#[command]
+pub async fn create_playlist(
+    state: State<'_, AppState>,
+    playlist: NewPlaylist,
+) -> Result<Playlist, AppError> {
+    state
+        .playlists
+        .create_playlist(playlist)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn rename_playlist(
+    state: State<'_, AppState>,
+    playlist: RenamePlaylist,
+) -> Result<Playlist, AppError> {
+    state
+        .playlists
+        .rename_playlist(playlist)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn delete_playlist(
+    state: State<'_, AppState>,
+    id: i64,
+) -> Result<(), AppError> {
+    state
+        .playlists
+        .delete_playlist(id)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn get_playlist(
+    state: State<'_, AppState>,
+    id: i64,
+) -> Result<Option<Playlist>, AppError> {
+    state
+        .playlists
+        .get_playlist(id)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn list_playlists(state: State<'_, AppState>) -> Result<Vec<Playlist>, AppError> {
+    state
+        .playlists
+        .list_playlists()
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn list_playlists_with_tracks(
+    state: State<'_, AppState>,
+) -> Result<Vec<PlaylistWithTracks>, AppError> {
+    state
+        .playlists
+        .list_playlists_with_tracks()
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn get_playlist_with_tracks(
+    state: State<'_, AppState>,
+    id: i64,
+) -> Result<Option<PlaylistWithTracks>, AppError> {
+    state
+        .playlists
+        .get_playlist_with_tracks(id)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn add_track_to_playlist(
+    state: State<'_, AppState>,
+    track: AddPlaylistTrack,
+) -> Result<PlaylistTrack, AppError> {
+    state
+        .playlists
+        .add_track(track)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn remove_track_from_playlist(
+    state: State<'_, AppState>,
+    playlist_id: i64,
+    track_id: i64,
+) -> Result<(), AppError> {
+    state
+        .playlists
+        .remove_track(playlist_id, track_id)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn clear_playlist_tracks(
+    state: State<'_, AppState>,
+    playlist_id: i64,
+) -> Result<(), AppError> {
+    state
+        .playlists
+        .clear_tracks(playlist_id)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn reorder_playlist_track(
+    state: State<'_, AppState>,
+    playlist_id: i64,
+    track_id: i64,
+    position: i64,
+) -> Result<(), AppError> {
+    state
+        .playlists
+        .reorder_track(playlist_id, track_id, position)
+        .await
+        .map_err(AppError::Command)
+}
diff --git a/src-tauri/src/commands/recent.rs b/src-tauri/src/commands/recent.rs
index 3d9a9f2..2989de5 100644
--- a/src-tauri/src/commands/recent.rs
+++ b/src-tauri/src/commands/recent.rs
@@ -1,84 +1,36 @@
-use crate::models::Track;
+use tauri::{command, State};
 
-use std::fs::{self, File};
-use tauri::{command, Manager};
-
-const RECENTLY_PLAYED_FILE: &str = "recently_played.json";
-const MAX_RECENTLY_PLAYED: usize = 100;
-
-fn recently_played_path(app_handle: &tauri::AppHandle) -> Result<std::path::PathBuf, String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path).map_err(|e| format!("创建数据目录失败: {}", e))?;
-    }
-
-    Ok(app_data_path.join(RECENTLY_PLAYED_FILE))
-}
-
-pub fn read_recently_played(app_handle: &tauri::AppHandle) -> Result<Vec<Track>, String> {
-    let file_path = recently_played_path(app_handle)?;
-
-    if !file_path.exists() {
-        return Ok(Vec::new());
-    }
-
-    let file = File::open(&file_path).map_err(|e| format!("无法打开最近播放文件: {}", e))?;
-
-    serde_json::from_reader::<_, Vec<Track>>(file)
-        .map_err(|e| format!("无法解析最近播放文件: {}", e))
-}
-
-pub fn save_recently_played(app_handle: &tauri::AppHandle, tracks: &[Track]) -> Result<(), String> {
-    let file_path = recently_played_path(app_handle)?;
-    let temp_file_path = file_path.with_extension("json.tmp");
-
-    let json =
-        serde_json::to_string_pretty(tracks).map_err(|e| format!("序列化最近播放失败: {}", e))?;
-
-    std::fs::write(&temp_file_path, json)
-        .map_err(|e| format!("写入最近播放临时文件失败: {}", e))?;
-
-    std::fs::rename(temp_file_path, file_path).map_err(|e| format!("保存最近播放失败: {}", e))?;
-
-    Ok(())
-}
+use crate::errors::AppError;
+use crate::models::RecentPlayedWithTrack;
+use crate::state::AppState;
 
 #[command]
-pub async fn load_recently_played(app_handle: tauri::AppHandle) -> Result<Vec<Track>, String> {
-    read_recently_played(&app_handle)
+pub async fn load_recently_played(
+    state: State<'_, AppState>,
+    limit: i64,
+    offset: i64,
+) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
+    state
+        .recent
+        .load(limit, offset)
+        .await
+        .map_err(AppError::Command)
 }
 
 #[command]
 pub async fn add_recently_played(
-    app_handle: tauri::AppHandle,
-    track: Track,
-) -> Result<Vec<Track>, String> {
-    let mut list = read_recently_played(&app_handle).unwrap_or_default();
-
-    let mut track = track;
-
-    // 不要把 base64 封面写入 recently_played.json，否则文件会越来越大
-    track.cover = None;
-
-    // 去重：同一路径只保留一条，并把新的放到最前面
-    list.retain(|item| item.path != track.path);
-    list.insert(0, track);
-
-    if list.len() > MAX_RECENTLY_PLAYED {
-        list.truncate(MAX_RECENTLY_PLAYED);
-    }
-
-    save_recently_played(&app_handle, &list)?;
-
-    Ok(list)
+    state: State<'_, AppState>,
+    track_id: i64,
+    played_at: String,
+) -> Result<(), AppError> {
+    state
+        .recent
+        .add(track_id, played_at)
+        .await
+        .map_err(AppError::Command)
 }
 
 #[command]
-pub async fn clear_recently_played(app_handle: tauri::AppHandle) -> Result<(), String> {
-    save_recently_played(&app_handle, &[])?;
-    Ok(())
+pub async fn clear_recently_played(state: State<'_, AppState>) -> Result<(), AppError> {
+    state.recent.clear().await.map_err(AppError::Command)
 }
diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs
index b10de62..5203893 100644
--- a/src-tauri/src/commands/settings.rs
+++ b/src-tauri/src/commands/settings.rs
@@ -1,63 +1,31 @@
-use std::fs;
-use std::fs::File;
-use std::path::PathBuf;
+use tauri::{State, command};
 
-use tauri::{command, Manager};
+use crate::errors::AppError;
+use crate::models::AppSettings;
+use crate::state::AppState;
 
-use crate::models::settings::AppSettings;
-
-const SETTINGS_FILE: &str = "settings.json";
-
-fn settings_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, String> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(|e| format!("无法获取应用数据目录: {}", e))?;
-
-    if !app_data_path.exists() {
-        fs::create_dir_all(&app_data_path)
-            .map_err(|e| format!("创建应用数据目录失败: {}", e))?;
-    }
-
-    Ok(app_data_path.join(SETTINGS_FILE))
+#[command]
+pub async fn get_settings(state: State<'_, AppState>) -> Result<AppSettings, AppError> {
+    state.settings.get_settings().await
 }
 
 #[command]
-pub async fn load_settings(app_handle: tauri::AppHandle) -> Result<AppSettings, String> {
-    let path = settings_path(&app_handle)?;
-
-    if !path.exists() {
-        let settings = AppSettings::default();
-        save_settings(app_handle, settings.clone()).await?;
-        return Ok(settings);
-    }
-
-    let file = File::open(&path).map_err(|e| format!("无法打开设置文件: {}", e))?;
+pub async fn update_settings(
+    state: State<'_, AppState>,
+    settings: AppSettings,
+) -> Result<AppSettings, AppError> {
+    state.settings.update_settings(settings).await
+}
 
-    match serde_json::from_reader::<_, AppSettings>(file) {
-        Ok(settings) => Ok(settings),
-        Err(_) => {
-            let settings = AppSettings::default();
-            save_settings(app_handle, settings.clone()).await?;
-            Ok(settings)
-        }
-    }
+#[command]
+pub async fn load_settings(state: State<'_, AppState>) -> Result<AppSettings, AppError> {
+    state.settings.get_settings().await
 }
 
 #[command]
 pub async fn save_settings(
-    app_handle: tauri::AppHandle,
+    state: State<'_, AppState>,
     settings: AppSettings,
-) -> Result<AppSettings, String> {
-    let path = settings_path(&app_handle)?;
-    let temp_path = path.with_extension("json.tmp");
-
-    let json = serde_json::to_string_pretty(&settings)
-        .map_err(|e| format!("序列化设置失败: {}", e))?;
-
-    fs::write(&temp_path, json).map_err(|e| format!("写入设置临时文件失败: {}", e))?;
-
-    fs::rename(temp_path, path).map_err(|e| format!("保存设置失败: {}", e))?;
-
-    Ok(settings)
-}
\ No newline at end of file
+) -> Result<AppSettings, AppError> {
+    state.settings.update_settings(settings).await
+}
diff --git a/src-tauri/src/commands/tracks.rs b/src-tauri/src/commands/tracks.rs
new file mode 100644
index 0000000..b425b62
--- /dev/null
+++ b/src-tauri/src/commands/tracks.rs
@@ -0,0 +1,95 @@
+use tauri::{State, command};
+
+use crate::errors::AppError;
+use crate::models::{NewTrack, Track, TrackSearchQuery, UpdateTrack};
+use crate::state::AppState;
+
+#[command]
+pub async fn create_track(
+    state: State<'_, AppState>,
+    track: NewTrack,
+) -> Result<Track, AppError> {
+    state.tracks.create_track(track).await.map_err(AppError::Command)
+}
+
+#[command]
+pub async fn upsert_track(
+    state: State<'_, AppState>,
+    track: NewTrack,
+) -> Result<Track, AppError> {
+    state.tracks.upsert_track(track).await.map_err(AppError::Command)
+}
+
+#[command]
+pub async fn update_track(
+    state: State<'_, AppState>,
+    track: UpdateTrack,
+) -> Result<Track, AppError> {
+    state.tracks.update_track(track).await.map_err(AppError::Command)
+}
+
+#[command]
+pub async fn delete_track(
+    state: State<'_, AppState>,
+    id: i64,
+) -> Result<(), AppError> {
+    state.tracks.delete_track(id).await.map_err(AppError::Command)
+}
+
+#[command]
+pub async fn delete_track_by_path(
+    state: State<'_, AppState>,
+    path: String,
+) -> Result<(), AppError> {
+    state
+        .tracks
+        .delete_track_by_path(&path)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn get_track(
+    state: State<'_, AppState>,
+    id: i64,
+) -> Result<Option<Track>, AppError> {
+    state.tracks.get_track(id).await.map_err(AppError::Command)
+}
+
+#[command]
+pub async fn get_track_by_path(
+    state: State<'_, AppState>,
+    path: String,
+) -> Result<Option<Track>, AppError> {
+    state
+        .tracks
+        .get_track_by_path(&path)
+        .await
+        .map_err(AppError::Command)
+}
+
+#[command]
+pub async fn list_tracks(state: State<'_, AppState>) -> Result<Vec<Track>, AppError> {
+    state.tracks.list_tracks().await.map_err(AppError::Command)
+}
+
+#[command]
+pub async fn search_tracks(
+    state: State<'_, AppState>,
+    query: TrackSearchQuery,
+) -> Result<Vec<Track>, AppError> {
+    state.tracks.search_tracks(query).await.map_err(AppError::Command)
+}
+
+#[command]
+pub async fn mark_track_played(
+    state: State<'_, AppState>,
+    id: i64,
+    played_at: String,
+) -> Result<(), AppError> {
+    state
+        .tracks
+        .mark_track_played(id, played_at)
+        .await
+        .map_err(AppError::Command)
+}
diff --git a/src-tauri/src/db/manager.rs b/src-tauri/src/db/manager.rs
new file mode 100644
index 0000000..20a75d4
--- /dev/null
+++ b/src-tauri/src/db/manager.rs
@@ -0,0 +1,57 @@
+use std::fs;
+use std::path::PathBuf;
+
+use sqlx::sqlite::{SqliteConnectOptions, SqliteJournalMode, SqlitePoolOptions, SqliteSynchronous};
+use sqlx::{ConnectOptions, SqlitePool};
+use tauri::Manager;
+
+#[derive(Clone)]
+pub struct DatabaseManager {
+    pool: SqlitePool,
+}
+
+impl DatabaseManager {
+    pub async fn new(app_handle: &tauri::AppHandle) -> Result<Self, String> {
+        let database_path = database_path(app_handle)?;
+
+        if let Some(parent) = database_path.parent() {
+            if !parent.exists() {
+                fs::create_dir_all(parent).map_err(|error| error.to_string())?;
+            }
+        }
+
+        let options = SqliteConnectOptions::new()
+            .filename(&database_path)
+            .create_if_missing(true)
+            .journal_mode(SqliteJournalMode::Wal)
+            .synchronous(SqliteSynchronous::Normal)
+            .foreign_keys(true)
+            .disable_statement_logging();
+
+        let pool = SqlitePoolOptions::new()
+            .max_connections(5)
+            .connect_with(options)
+            .await
+            .map_err(|error| error.to_string())?;
+
+        sqlx::migrate!("./migrations")
+            .run(&pool)
+            .await
+            .map_err(|error| error.to_string())?;
+
+        Ok(Self { pool })
+    }
+
+    pub fn pool(&self) -> &SqlitePool {
+        &self.pool
+    }
+}
+
+fn database_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, String> {
+    let app_data_path = app_handle
+        .path()
+        .app_data_dir()
+        .map_err(|error| error.to_string())?;
+
+    Ok(app_data_path.join("music.sqlite"))
+}
diff --git a/src-tauri/src/db/mod.rs b/src-tauri/src/db/mod.rs
new file mode 100644
index 0000000..ac04603
--- /dev/null
+++ b/src-tauri/src/db/mod.rs
@@ -0,0 +1,3 @@
+pub mod manager;
+
+pub use manager::DatabaseManager;
diff --git a/src-tauri/src/errors/app_error.rs b/src-tauri/src/errors/app_error.rs
new file mode 100644
index 0000000..99ed5f2
--- /dev/null
+++ b/src-tauri/src/errors/app_error.rs
@@ -0,0 +1,55 @@
+use serde::Serialize;
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase", tag = "kind", content = "message")]
+pub enum AppError {
+    Database(String),
+    Io(String),
+    Migration(String),
+    Service(String),
+    Command(String),
+}
+
+impl std::fmt::Display for AppError {
+    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            AppError::Database(message)
+            | AppError::Io(message)
+            | AppError::Migration(message)
+            | AppError::Service(message)
+            | AppError::Command(message) => formatter.write_str(message),
+        }
+    }
+}
+
+impl std::error::Error for AppError {}
+
+impl From<sqlx::Error> for AppError {
+    fn from(error: sqlx::Error) -> Self {
+        AppError::Database(error.to_string())
+    }
+}
+
+impl From<sqlx::migrate::MigrateError> for AppError {
+    fn from(error: sqlx::migrate::MigrateError) -> Self {
+        AppError::Migration(error.to_string())
+    }
+}
+
+impl From<std::io::Error> for AppError {
+    fn from(error: std::io::Error) -> Self {
+        AppError::Io(error.to_string())
+    }
+}
+
+impl From<String> for AppError {
+    fn from(error: String) -> Self {
+        AppError::Service(error)
+    }
+}
+
+impl From<&str> for AppError {
+    fn from(error: &str) -> Self {
+        AppError::Service(error.to_string())
+    }
+}
diff --git a/src-tauri/src/errors/mod.rs b/src-tauri/src/errors/mod.rs
new file mode 100644
index 0000000..eaeaca9
--- /dev/null
+++ b/src-tauri/src/errors/mod.rs
@@ -0,0 +1,3 @@
+pub mod app_error;
+
+pub use app_error::AppError;
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index ecb8dff..2e9ca54 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1,9 +1,15 @@
 mod audio;
 mod commands;
+mod db;
+mod errors;
 mod media_controls;
 mod metadata;
 mod models;
-mod shortcuts;
+mod repositories;
+mod services;
+mod state;
+
+use std::sync::Arc;
 
 use tauri::{
     menu::{Menu, MenuBuilder, MenuItem, SubmenuBuilder},
@@ -11,54 +17,71 @@ use tauri::{
     Emitter, Manager,
 };
 
-use commands::config::{load_config, save_config};
 use commands::library::{
-    delete_music_files, delete_track_file, execute_scan, get_track_cover, load_music_library,
-    save_music_library, scan_music_directories, show_in_folder, trash_music_files,
+    delete_track_file, delete_track_files, get_track_cover, load_track_library,
+    scan_track_directories, show_in_folder, trash_track_files,
 };
 
 use commands::playback::{
-    current_time, get_current_status, insert_track_as_next, pause_music, play_music, play_next_track,
-    play_previous_track, play_queue_track, remove_track_from_backend_queue, resume_music, set_current_time, set_volume,
-    spawn_playback_progress_task, stop_music, sync_playback_queue, toggle_music,
+    current_time, get_current_status, insert_track_as_next, pause_track, play_next_track,
+    play_previous_track, play_queue_track, play_track, remove_track_from_backend_queue,
+    resume_track, set_current_time, set_volume, spawn_playback_progress_task, stop_track,
+    sync_playback_queue, toggle_track,
 };
 
 use commands::recent::{add_recently_played, clear_recently_played, load_recently_played};
 
-use commands::settings::{load_settings, save_settings};
+use commands::settings::{get_settings, load_settings, save_settings, update_settings};
 
 use commands::menu::show_context_menu;
+use commands::playlists::{
+    add_track_to_playlist, clear_playlist_tracks, create_playlist, delete_playlist, get_playlist,
+    get_playlist_with_tracks, list_playlists, list_playlists_with_tracks,
+    remove_track_from_playlist, rename_playlist, reorder_playlist_track,
+};
+use commands::tracks::{
+    create_track, delete_track, delete_track_by_path, get_track, get_track_by_path, list_tracks,
+    mark_track_played, search_tracks, update_track, upsert_track,
+};
+use db::DatabaseManager;
 use media_controls::init_media_controls;
-use shortcuts::{
-    get_shortcuts, handle_shortcut_event, init_shortcuts, reset_shortcuts, update_shortcut,
-    ShortcutRegistry,
+use repositories::sqlite::{
+    SqlitePlaylistRepository, SqliteRecentRepository, SqliteSettingsRepository, SqliteTrackRepository,
 };
+use services::{PlaylistService, RecentService, SettingsService, TrackService};
+use state::AppState;
 
-pub fn init_startup_scan(app_handle: tauri::AppHandle) {
-    tauri::async_runtime::spawn(async move {
-        if let Ok(settings) = crate::commands::settings::load_settings(app_handle.clone()).await {
-            if settings.scan_on_startup {
-                if let Ok(tracks) = crate::commands::library::execute_scan(settings.library_dirs) {
-                    let _ = crate::commands::library::save_music_library(&app_handle, &tracks);
-                }
-            }
-        }
-    });
-}
+pub fn init_startup_scan(_app_handle: tauri::AppHandle) {}
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_store::Builder::new().build())
-        .plugin(
-            tauri_plugin_global_shortcut::Builder::new()
-                .with_handler(handle_shortcut_event)
-                .build(),
-        )
-        .manage(ShortcutRegistry::default())
         .setup(|app| {
-            let _ = init_shortcuts(app.handle().clone());
+            let app_handle = app.handle().clone();
+            let database = tauri::async_runtime::block_on(DatabaseManager::new(&app_handle))
+                .map_err(|error| std::io::Error::new(std::io::ErrorKind::Other, error))?;
+            let pool = database.pool().clone();
+            let track_repository = Arc::new(SqliteTrackRepository::new(pool.clone()));
+            let playlist_repository = Arc::new(SqlitePlaylistRepository::new(pool.clone()));
+            let setting_repository = Arc::new(SqliteSettingsRepository::new(pool.clone()));
+            let recent_repository = Arc::new(SqliteRecentRepository::new(pool));
+
+            let setting_service = Arc::new(SettingsService::new(setting_repository));
+            tauri::async_runtime::block_on(setting_service.get_settings()).map_err(|error| {
+                std::io::Error::new(std::io::ErrorKind::Other, error.to_string())
+            })?;
+
+            let app_state = AppState::new(
+                Arc::new(TrackService::new(track_repository)),
+                Arc::new(PlaylistService::new(playlist_repository)),
+                setting_service,
+                Arc::new(RecentService::new(recent_repository)),
+            );
+
+            app.manage(app_state);
+
             let _ = init_media_controls(app.handle().clone());
             spawn_playback_progress_task(app.handle().clone());
 
@@ -107,16 +130,21 @@ pub fn run() {
 
             let handle = app.handle().clone();
             tauri::async_runtime::spawn(async move {
-                if let Ok(settings) = load_settings(handle.clone()).await {
-                    if settings.scan_on_startup {
-                        let _ = tauri::async_runtime::spawn_blocking(move || {
-                            if let Ok(tracks) = execute_scan(settings.library_dirs) {
-                                if save_music_library(&handle, &tracks).is_ok() {
-                                    let _ = handle.emit("library:refreshed", tracks);
+                if let Some(state) = handle.try_state::<AppState>() {
+                    if let Ok(settings) = state.settings.get_settings().await {
+                        if settings.scan_on_startup {
+                            if let Ok(scanned) =
+                                crate::commands::library::execute_scan(settings.library_dirs)
+                            {
+                                let mut tracks = Vec::with_capacity(scanned.len());
+                                for track in scanned {
+                                    if let Ok(saved) = state.tracks.upsert_track(track).await {
+                                        tracks.push(saved);
+                                    }
                                 }
+                                let _ = handle.emit("library:refreshed", tracks);
                             }
-                        })
-                        .await;
+                        }
                     }
                 }
             });
@@ -141,38 +169,56 @@ pub fn run() {
         })
         .invoke_handler(tauri::generate_handler![
             show_context_menu,
-            load_config,
-            save_config,
-            get_shortcuts,
-            update_shortcut,
-            reset_shortcuts,
-            play_music,
+            create_track,
+            upsert_track,
+            update_track,
+            delete_track,
+            delete_track_by_path,
+            get_track,
+            get_track_by_path,
+            list_tracks,
+            search_tracks,
+            mark_track_played,
+            create_playlist,
+            rename_playlist,
+            delete_playlist,
+            get_playlist,
+            list_playlists,
+            list_playlists_with_tracks,
+            get_playlist_with_tracks,
+            add_track_to_playlist,
+            remove_track_from_playlist,
+            clear_playlist_tracks,
+            reorder_playlist_track,
+            play_track,
             play_queue_track,
             insert_track_as_next,
             remove_track_from_backend_queue,
             play_next_track,
             play_previous_track,
-            stop_music,
+            stop_track,
             sync_playback_queue,
-            resume_music,
-            pause_music,
-            toggle_music,
+            resume_track,
+            pause_track,
+            toggle_track,
             current_time,
             get_current_status,
             set_current_time,
             set_volume,
-            scan_music_directories,
+            scan_track_directories,
             show_in_folder,
             delete_track_file,
-            delete_music_files,
-            trash_music_files,
-            load_music_library,
+            delete_track_files,
+            trash_track_files,
+            load_track_library,
             get_track_cover,
             load_recently_played,
             add_recently_played,
             clear_recently_played,
-            save_settings,
+            get_settings,
+            update_settings,
             load_settings,
+            save_settings,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/media_controls.rs b/src-tauri/src/media_controls.rs
index 2a498e5..d041449 100644
--- a/src-tauri/src/media_controls.rs
+++ b/src-tauri/src/media_controls.rs
@@ -7,9 +7,8 @@ use std::time::Duration;
 use souvlaki::{MediaControls, MediaMetadata, MediaPlayback, MediaPosition, PlatformConfig};
 use tauri::{AppHandle, Manager, WebviewWindow};
 
-use crate::commands::playback::{
-    handle_media_control_event, NativePlaybackState, NativeTrackMetadata,
-};
+use crate::commands::playback::handle_media_control_event;
+use crate::models::playback::{NativePlaybackState, NativeTrackMetadata};
 
 #[derive(Clone)]
 enum MediaControlMessage {
@@ -21,14 +20,7 @@ static MEDIA_CONTROL_SENDER: OnceLock<Sender<MediaControlMessage>> = OnceLock::n
 
 #[cfg(target_os = "windows")]
 fn window_handle(window: &WebviewWindow) -> Option<isize> {
-    use raw_window_handle::{HasWindowHandle, RawWindowHandle};
-
-    let handle = window.window_handle().ok()?.as_raw();
-
-    match handle {
-        RawWindowHandle::Win32(handle) => Some(handle.hwnd.get()),
-        _ => None,
-    }
+    window.hwnd().ok().map(|handle| handle.0 as isize)
 }
 
 #[cfg(not(target_os = "windows"))]
diff --git a/src-tauri/src/metadata.rs b/src-tauri/src/metadata.rs
index 3501b7d..f4960ae 100644
--- a/src-tauri/src/metadata.rs
+++ b/src-tauri/src/metadata.rs
@@ -1,12 +1,12 @@
+use std::fs;
 use std::path::Path;
 
 use lofty::prelude::*;
 use lofty::probe::Probe;
-use lofty::tag::ItemKey;
 
-use crate::models::{generate_track_id, Track};
+use crate::models::NewTrack;
 
-pub fn parse_single_track(file_path: &Path) -> Option<Track> {
+pub fn parse_single_track(file_path: &Path) -> Option<NewTrack> {
     let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
 
     let tag = tagged_file
@@ -27,34 +27,27 @@ pub fn parse_single_track(file_path: &Path) -> Option<Track> {
     let artist = tag
         .and_then(|t| t.artist())
         .map(|s| s.to_string())
-        .unwrap_or_else(|| "Unknown Artist".to_string());
+        .or_else(|| Some("Unknown Artist".to_string()));
 
     let album = tag
         .and_then(|t| t.album())
         .map(|s| s.to_string())
-        .unwrap_or_else(|| "Unknown Album".to_string());
-
-    let album_artist = tag
-        .and_then(|t| {
-            t.get_string(ItemKey::AlbumArtist)
-                .or_else(|| t.get_string(ItemKey::AlbumArtists))
-        })
-        .map(|s| s.to_string())
-        .unwrap_or_default();
+        .or_else(|| Some("Unknown Album".to_string()));
 
     let props = tagged_file.properties();
-    let duration = props.duration().as_secs_f64();
-    let sample_rate = props.sample_rate();
+    let duration = (props.duration().as_secs_f64() * 1000.0).round() as i64;
+    let path = file_path.to_string_lossy().into_owned();
+    let file_size = fs::metadata(file_path)
+        .ok()
+        .and_then(|metadata| i64::try_from(metadata.len()).ok());
 
-    Some(Track {
-        id: generate_track_id(&file_path.to_string_lossy()),
+    Some(NewTrack {
         title,
         artist,
         album,
-        album_artist,
         duration,
-        sample_rate,
+        path,
         cover: None,
-        path: file_path.to_string_lossy().into_owned(),
+        file_size,
     })
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/models/config.rs b/src-tauri/src/models/config.rs
deleted file mode 100644
index 31cc9f3..0000000
--- a/src-tauri/src/models/config.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ShortcutAction {
-    PlayPause,
-    Stop,
-    Previous,
-    Next,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ShortcutConfig {
-    pub play_pause: String,
-    pub stop: String,
-    pub previous: String,
-    pub next: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AppConfig {
-    pub shortcuts: ShortcutConfig,
-}
-
-impl Default for ShortcutConfig {
-    fn default() -> Self {
-        Self {
-            play_pause: "CommandOrControl+Alt+Space".to_string(),
-            stop: "CommandOrControl+Alt+S".to_string(),
-            previous: "CommandOrControl+Alt+ArrowLeft".to_string(),
-            next: "CommandOrControl+Alt+ArrowRight".to_string(),
-        }
-    }
-}
-
-impl Default for AppConfig {
-    fn default() -> Self {
-        Self {
-            shortcuts: ShortcutConfig::default(),
-        }
-    }
-}
-
-impl ShortcutConfig {
-    pub fn set(&mut self, action: ShortcutAction, shortcut: String) {
-        match action {
-            ShortcutAction::PlayPause => self.play_pause = shortcut,
-            ShortcutAction::Stop => self.stop = shortcut,
-            ShortcutAction::Previous => self.previous = shortcut,
-            ShortcutAction::Next => self.next = shortcut,
-        }
-    }
-
-    pub fn entries(&self) -> [(ShortcutAction, &str); 4] {
-        [
-            (ShortcutAction::PlayPause, &self.play_pause),
-            (ShortcutAction::Stop, &self.stop),
-            (ShortcutAction::Previous, &self.previous),
-            (ShortcutAction::Next, &self.next),
-        ]
-    }
-}
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
index 7a2ab3b..4b02214 100644
--- a/src-tauri/src/models/mod.rs
+++ b/src-tauri/src/models/mod.rs
@@ -1,6 +1,10 @@
-pub mod config;
+pub mod playback;
+pub mod playlist;
 pub mod settings;
 pub mod track;
+pub mod recent;
 
-pub use config::{AppConfig, ShortcutAction, ShortcutConfig};
-pub use track::{generate_track_id, Track};
\ No newline at end of file
+pub use playlist::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
+pub use settings::{AppSettings, SettingRow, ThemeMode};
+pub use track::{NewTrack, SortDirection, Track, TrackSearchQuery, TrackSortBy, UpdateTrack};
+pub use recent::RecentPlayedWithTrack;
\ No newline at end of file
diff --git a/src-tauri/src/models/playback.rs b/src-tauri/src/models/playback.rs
new file mode 100644
index 0000000..9ae4614
--- /dev/null
+++ b/src-tauri/src/models/playback.rs
@@ -0,0 +1,121 @@
+use serde::Serialize;
+
+use crate::audio::PlayMode;
+use crate::models::Track;
+
+#[derive(Clone)]
+pub struct NativeTrackMetadata {
+    pub title: String,
+    pub album: String,
+    pub artist: String,
+    pub duration: Option<f64>,
+}
+
+#[derive(Clone)]
+pub enum NativePlaybackState {
+    Playing { current_time: f64 },
+    Paused { current_time: f64 },
+    Stopped,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackTrackSnapshot {
+    pub id: Option<i64>,
+    pub path: Option<String>,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackStatusSnapshot {
+    pub has_media: bool,
+    pub playing: bool,
+    pub current_time: f64,
+    pub track: Option<PlaybackTrackSnapshot>,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackProgressPayload {
+    pub playing: bool,
+    pub current_time: f64,
+    pub track_id: Option<i64>,
+    pub path: Option<String>,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackTrackStartedPayload {
+    pub track: Track,
+    pub index: usize,
+    pub playing: bool,
+    pub current_time: f64,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackQueueChangedPayload {
+    pub playlist: Vec<Track>,
+    pub current_index: Option<usize>,
+    pub play_mode: PlayMode,
+    pub playback_history: Vec<i64>,
+}
+
+#[derive(Clone)]
+pub struct PlaybackTrackInfo {
+    pub id: Option<i64>,
+    pub path: Option<String>,
+}
+
+#[derive(Clone)]
+pub struct PlaybackStateSnapshot {
+    pub has_media: bool,
+    pub playing: bool,
+    pub current_time: f64,
+    pub track: Option<PlaybackTrackInfo>,
+}
+
+impl From<PlaybackTrackInfo> for PlaybackTrackSnapshot {
+    fn from(value: PlaybackTrackInfo) -> Self {
+        Self {
+            id: value.id,
+            path: value.path,
+        }
+    }
+}
+
+impl PlaybackStateSnapshot {
+    pub fn status_payload(self) -> PlaybackStatusSnapshot {
+        PlaybackStatusSnapshot {
+            has_media: self.has_media,
+            playing: self.playing,
+            current_time: self.current_time,
+            track: self.track.map(Into::into),
+        }
+    }
+
+    pub fn progress_payload(&self) -> Option<PlaybackProgressPayload> {
+        let track = self.track.as_ref()?;
+
+        Some(PlaybackProgressPayload {
+            playing: self.playing,
+            current_time: self.current_time,
+            track_id: track.id,
+            path: track.path.clone(),
+        })
+    }
+
+    pub fn native_playback_state(&self) -> NativePlaybackState {
+        if !self.has_media {
+            NativePlaybackState::Stopped
+        } else if self.playing {
+            NativePlaybackState::Playing {
+                current_time: self.current_time,
+            }
+        } else {
+            NativePlaybackState::Paused {
+                current_time: self.current_time,
+            }
+        }
+    }
+}
diff --git a/src-tauri/src/models/playlist.rs b/src-tauri/src/models/playlist.rs
new file mode 100644
index 0000000..2692373
--- /dev/null
+++ b/src-tauri/src/models/playlist.rs
@@ -0,0 +1,49 @@
+use serde::{Deserialize, Serialize};
+use sqlx::FromRow;
+
+use super::track::Track;
+
+#[derive(Clone, Debug, Deserialize, FromRow, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Playlist {
+    pub id: i64,
+    pub name: String,
+    pub created_at: String,
+}
+
+#[derive(Clone, Debug, Deserialize, FromRow, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaylistTrack {
+    pub id: i64,
+    pub playlist_id: i64,
+    pub track_id: i64,
+    pub position: i64,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaylistWithTracks {
+    pub playlist: Playlist,
+    pub tracks: Vec<Track>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct NewPlaylist {
+    pub name: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RenamePlaylist {
+    pub id: i64,
+    pub name: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AddPlaylistTrack {
+    pub playlist_id: i64,
+    pub track_id: i64,
+    pub position: Option<i64>,
+}
diff --git a/src-tauri/src/models/recent.rs b/src-tauri/src/models/recent.rs
new file mode 100644
index 0000000..d9cea18
--- /dev/null
+++ b/src-tauri/src/models/recent.rs
@@ -0,0 +1,8 @@
+use crate::models::Track;
+
+#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RecentPlayedWithTrack {
+    pub track: Track,
+    pub played_at: String,
+}
\ No newline at end of file
diff --git a/src-tauri/src/models/settings.rs b/src-tauri/src/models/settings.rs
index 85ccab1..1970c88 100644
--- a/src-tauri/src/models/settings.rs
+++ b/src-tauri/src/models/settings.rs
@@ -1,4 +1,7 @@
+#![allow(dead_code)]
+
 use serde::{Deserialize, Serialize};
+use sqlx::FromRow;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -8,14 +11,7 @@ pub struct AppSettings {
     pub library_dirs: Vec<String>,
     pub scan_on_startup: bool,
     pub reduce_motion: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ThemeMode {
-    Auto,
-    Light,
-    Dark,
+    pub use_album_artist_grouping: bool,
 }
 
 impl Default for AppSettings {
@@ -26,6 +22,50 @@ impl Default for AppSettings {
             library_dirs: Vec::new(),
             scan_on_startup: false,
             reduce_motion: false,
+            use_album_artist_grouping: false,
         }
     }
-}
\ No newline at end of file
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ThemeMode {
+    Auto,
+    Light,
+    Dark,
+}
+
+impl ThemeMode {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            ThemeMode::Auto => "auto",
+            ThemeMode::Light => "light",
+            ThemeMode::Dark => "dark",
+        }
+    }
+}
+
+impl TryFrom<String> for ThemeMode {
+    type Error = String;
+
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        match value.as_str() {
+            "auto" => Ok(ThemeMode::Auto),
+            "light" => Ok(ThemeMode::Light),
+            "dark" => Ok(ThemeMode::Dark),
+            _ => Err(format!("无效主题: {}", value)),
+        }
+    }
+}
+
+#[derive(Clone, Debug, FromRow)]
+pub struct SettingRow {
+    pub id: i64,
+    pub theme: String,
+    pub volume: i64,
+    pub scan_on_startup: i64,
+    pub reduce_motion: i64,
+    pub library_dirs: String,
+    pub created_at: String,
+    pub updated_at: String,
+}
diff --git a/src-tauri/src/models/track.rs b/src-tauri/src/models/track.rs
index 8c3ef54..d771da4 100644
--- a/src-tauri/src/models/track.rs
+++ b/src-tauri/src/models/track.rs
@@ -1,23 +1,74 @@
-use std::hash::{Hash, Hasher};
-
 use serde::{Deserialize, Serialize};
+use sqlx::FromRow;
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Clone, Debug, Deserialize, FromRow, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Track {
-    pub id: String,
+    pub id: i64,
+    pub title: String,
+    pub artist: Option<String>,
+    pub album: Option<String>,
+    pub duration: i64,
+    pub path: String,
+    pub cover: Option<String>,
+    pub file_size: Option<i64>,
+    pub play_count: i64,
+    pub last_played_at: Option<String>,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct NewTrack {
     pub title: String,
-    pub artist: String,
-    pub album: String,
-    pub album_artist: String,
-    pub duration: f64,
-    pub sample_rate: Option<u32>,
+    pub artist: Option<String>,
+    pub album: Option<String>,
+    pub duration: i64,
+    pub path: String,
     pub cover: Option<String>,
+    pub file_size: Option<i64>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateTrack {
+    pub id: i64,
+    pub title: String,
+    pub artist: Option<String>,
+    pub album: Option<String>,
+    pub duration: i64,
     pub path: String,
+    pub cover: Option<String>,
+    pub file_size: Option<i64>,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub enum TrackSortBy {
+    Title,
+    Artist,
+    Album,
+    Duration,
+    CreatedAt,
+    UpdatedAt,
+    PlayCount,
+    LastPlayedAt,
 }
 
-pub fn generate_track_id(path: &str) -> String {
-    let mut hasher = std::collections::hash_map::DefaultHasher::new();
-    path.hash(&mut hasher);
-    format!("{:x}", hasher.finish())
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub enum SortDirection {
+    Asc,
+    Desc,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TrackSearchQuery {
+    pub keyword: Option<String>,
+    pub sort_by: Option<TrackSortBy>,
+    pub sort_direction: Option<SortDirection>,
+    pub limit: Option<i64>,
+    pub offset: Option<i64>,
 }
diff --git a/src-tauri/src/repositories/mod.rs b/src-tauri/src/repositories/mod.rs
new file mode 100644
index 0000000..78f2d8f
--- /dev/null
+++ b/src-tauri/src/repositories/mod.rs
@@ -0,0 +1 @@
+pub mod sqlite;
\ No newline at end of file
diff --git a/src-tauri/src/repositories/sqlite/mod.rs b/src-tauri/src/repositories/sqlite/mod.rs
new file mode 100644
index 0000000..2230893
--- /dev/null
+++ b/src-tauri/src/repositories/sqlite/mod.rs
@@ -0,0 +1,9 @@
+pub mod playlist_repository;
+pub mod recent_repository;
+pub mod settings_repository;
+pub mod track_repository;
+
+pub use playlist_repository::SqlitePlaylistRepository;
+pub use recent_repository::SqliteRecentRepository;
+pub use settings_repository::SqliteSettingsRepository;
+pub use track_repository::SqliteTrackRepository;
diff --git a/src-tauri/src/repositories/sqlite/playlist_repository.rs b/src-tauri/src/repositories/sqlite/playlist_repository.rs
new file mode 100644
index 0000000..c1d49c8
--- /dev/null
+++ b/src-tauri/src/repositories/sqlite/playlist_repository.rs
@@ -0,0 +1,160 @@
+use sqlx::SqlitePool;
+
+use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist, Track};
+
+#[derive(Clone)]
+pub struct SqlitePlaylistRepository {
+    pool: SqlitePool,
+}
+
+impl SqlitePlaylistRepository {
+    pub fn new(pool: SqlitePool) -> Self {
+        Self { pool }
+    }
+
+    pub async fn create(&self, playlist: NewPlaylist) -> Result<Playlist, String> {
+        sqlx::query_as::<_, Playlist>(
+            "INSERT INTO playlists (name, created_at)
+             VALUES (?1, datetime('now'))
+             RETURNING id, name, created_at",
+        )
+        .bind(playlist.name)
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn rename(&self, playlist: RenamePlaylist) -> Result<Playlist, String> {
+        sqlx::query_as::<_, Playlist>(
+            "UPDATE playlists SET name = ?1 WHERE id = ?2 RETURNING id, name, created_at",
+        )
+        .bind(playlist.name)
+        .bind(playlist.id)
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn delete(&self, id: i64) -> Result<(), String> {
+        sqlx::query("DELETE FROM playlists WHERE id = ?1")
+            .bind(id)
+            .execute(&self.pool)
+            .await
+            .map(|_| ())
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn find_by_id(&self, id: i64) -> Result<Option<Playlist>, String> {
+        sqlx::query_as::<_, Playlist>("SELECT id, name, created_at FROM playlists WHERE id = ?1")
+            .bind(id)
+            .fetch_optional(&self.pool)
+            .await
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn list_all(&self) -> Result<Vec<Playlist>, String> {
+        sqlx::query_as::<_, Playlist>(
+            "SELECT id, name, created_at FROM playlists ORDER BY created_at DESC, id DESC",
+        )
+        .fetch_all(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn list_with_tracks(&self) -> Result<Vec<PlaylistWithTracks>, String> {
+        let playlists = self.list_all().await?;
+        let mut result = Vec::with_capacity(playlists.len());
+
+        for playlist in playlists {
+            let tracks = tracks_for_playlist(&self.pool, playlist.id).await?;
+            result.push(PlaylistWithTracks { playlist, tracks });
+        }
+
+        Ok(result)
+    }
+
+    pub async fn get_with_tracks(&self, id: i64) -> Result<Option<PlaylistWithTracks>, String> {
+        let Some(playlist) = self.find_by_id(id).await? else {
+            return Ok(None);
+        };
+
+        let tracks = tracks_for_playlist(&self.pool, playlist.id).await?;
+        Ok(Some(PlaylistWithTracks { playlist, tracks }))
+    }
+
+    pub async fn add_track(&self, track: AddPlaylistTrack) -> Result<PlaylistTrack, String> {
+        let position = match track.position {
+            Some(position) => position,
+            None => next_position(&self.pool, track.playlist_id).await?,
+        };
+
+        sqlx::query_as::<_, PlaylistTrack>(
+            "INSERT INTO playlist_tracks (playlist_id, track_id, position)
+             VALUES (?1, ?2, ?3)
+             ON CONFLICT(playlist_id, track_id) DO UPDATE SET position = excluded.position
+             RETURNING id, playlist_id, track_id, position",
+        )
+        .bind(track.playlist_id)
+        .bind(track.track_id)
+        .bind(position)
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn remove_track(&self, playlist_id: i64, track_id: i64) -> Result<(), String> {
+        sqlx::query("DELETE FROM playlist_tracks WHERE playlist_id = ?1 AND track_id = ?2")
+            .bind(playlist_id)
+            .bind(track_id)
+            .execute(&self.pool)
+            .await
+            .map(|_| ())
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn clear_tracks(&self, playlist_id: i64) -> Result<(), String> {
+        sqlx::query("DELETE FROM playlist_tracks WHERE playlist_id = ?1")
+            .bind(playlist_id)
+            .execute(&self.pool)
+            .await
+            .map(|_| ())
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), String> {
+        sqlx::query("UPDATE playlist_tracks SET position = ?1 WHERE playlist_id = ?2 AND track_id = ?3")
+            .bind(position)
+            .bind(playlist_id)
+            .bind(track_id)
+            .execute(&self.pool)
+            .await
+            .map(|_| ())
+            .map_err(|e| e.to_string())
+    }
+}
+
+async fn next_position(pool: &SqlitePool, playlist_id: i64) -> Result<i64, String> {
+    let value: (i64,) = sqlx::query_as(
+        "SELECT coalesce(max(position), -1) + 1 FROM playlist_tracks WHERE playlist_id = ?1",
+    )
+    .bind(playlist_id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| e.to_string())?;
+
+    Ok(value.0)
+}
+
+async fn tracks_for_playlist(pool: &SqlitePool, playlist_id: i64) -> Result<Vec<Track>, String> {
+    sqlx::query_as::<_, Track>(
+        "SELECT t.id, t.title, t.artist, t.album, t.duration, t.path, t.cover, t.file_size, t.play_count, t.last_played_at, t.created_at, t.updated_at
+         FROM tracks t
+         INNER JOIN playlist_tracks pt ON pt.track_id = t.id
+         WHERE pt.playlist_id = ?1
+         ORDER BY pt.position ASC, pt.id ASC",
+    )
+    .bind(playlist_id)
+    .fetch_all(pool)
+    .await
+    .map_err(|e| e.to_string())
+}
\ No newline at end of file
diff --git a/src-tauri/src/repositories/sqlite/recent_repository.rs b/src-tauri/src/repositories/sqlite/recent_repository.rs
new file mode 100644
index 0000000..7fe7c1c
--- /dev/null
+++ b/src-tauri/src/repositories/sqlite/recent_repository.rs
@@ -0,0 +1,107 @@
+use sqlx::SqlitePool;
+
+use crate::models::{RecentPlayedWithTrack, Track};
+
+#[derive(Clone)]
+pub struct SqliteRecentRepository {
+    pool: SqlitePool,
+}
+
+impl SqliteRecentRepository {
+    pub fn new(pool: SqlitePool) -> Self {
+        Self { pool }
+    }
+
+    pub async fn list_with_tracks(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, String> {
+        let rows = sqlx::query_as::<_, RecentRow>(
+            "SELECT t.id, t.title, t.artist, t.album, t.duration, t.path, t.cover, t.file_size, t.play_count, t.last_played_at, t.created_at, t.updated_at, r.played_at
+             FROM recent_played r
+             INNER JOIN tracks t ON t.id = r.track_id
+             ORDER BY r.played_at DESC
+             LIMIT ?1 OFFSET ?2",
+        )
+        .bind(limit)
+        .bind(offset)
+        .fetch_all(&self.pool)
+        .await
+        .map_err(|e| e.to_string())?;
+
+        Ok(rows.into_iter().map(|row| RecentPlayedWithTrack {
+            track: Track {
+                id: row.id,
+                title: row.title,
+                artist: row.artist,
+                album: row.album,
+                duration: row.duration,
+                path: row.path,
+                cover: row.cover,
+                file_size: row.file_size,
+                play_count: row.play_count,
+                last_played_at: row.last_played_at,
+                created_at: row.created_at,
+                updated_at: row.updated_at,
+            },
+            played_at: row.played_at,
+        }).collect())
+    }
+
+    pub async fn upsert(&self, track_id: i64, played_at: String) -> Result<(), String> {
+        sqlx::query(
+            "INSERT INTO recent_played (track_id, played_at)
+             VALUES (?1, ?2)
+             ON CONFLICT(track_id) DO UPDATE SET played_at = excluded.played_at",
+        )
+        .bind(track_id)
+        .bind(played_at)
+        .execute(&self.pool)
+        .await
+        .map(|_| ())
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn clear(&self) -> Result<(), String> {
+        sqlx::query("DELETE FROM recent_played")
+            .execute(&self.pool)
+            .await
+            .map(|_| ())
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn count(&self) -> Result<i64, String> {
+        let row: (i64,) = sqlx::query_as("SELECT count(*) FROM recent_played")
+            .fetch_one(&self.pool)
+            .await
+            .map_err(|e| e.to_string())?;
+        Ok(row.0)
+    }
+
+    pub async fn remove_oldest(&self, keep: i64) -> Result<(), String> {
+        sqlx::query(
+            "DELETE FROM recent_played WHERE track_id NOT IN (
+                SELECT track_id FROM recent_played ORDER BY played_at DESC LIMIT ?1
+             )",
+        )
+        .bind(keep)
+        .execute(&self.pool)
+        .await
+        .map(|_| ())
+        .map_err(|e| e.to_string())
+    }
+}
+
+#[derive(sqlx::FromRow)]
+struct RecentRow {
+    id: i64,
+    title: String,
+    artist: Option<String>,
+    album: Option<String>,
+    duration: i64,
+    path: String,
+    cover: Option<String>,
+    file_size: Option<i64>,
+    play_count: i64,
+    last_played_at: Option<String>,
+    created_at: String,
+    updated_at: String,
+    played_at: String,
+}
\ No newline at end of file
diff --git a/src-tauri/src/repositories/sqlite/settings_repository.rs b/src-tauri/src/repositories/sqlite/settings_repository.rs
new file mode 100644
index 0000000..82aa5b2
--- /dev/null
+++ b/src-tauri/src/repositories/sqlite/settings_repository.rs
@@ -0,0 +1,48 @@
+use sqlx::SqlitePool;
+
+use crate::errors::AppError;
+use crate::models::SettingRow;
+
+#[derive(Clone)]
+pub struct SqliteSettingsRepository {
+    pool: SqlitePool,
+}
+
+impl SqliteSettingsRepository {
+    pub fn new(pool: SqlitePool) -> Self {
+        Self { pool }
+    }
+
+    pub async fn get(&self) -> Result<Option<SettingRow>, AppError> {
+        sqlx::query_as::<_, SettingRow>(
+            "SELECT id, theme, volume, scan_on_startup, reduce_motion, library_dirs, created_at, updated_at FROM settings WHERE id = 1",
+        )
+        .fetch_optional(&self.pool)
+        .await
+        .map_err(AppError::from)
+    }
+
+    pub async fn update(&self, row: SettingRow) -> Result<(), AppError> {
+        sqlx::query(
+            "INSERT INTO settings (id, theme, volume, scan_on_startup, reduce_motion, library_dirs, created_at, updated_at)
+             VALUES (1, ?1, ?2, ?3, ?4, ?5, coalesce(nullif(?6, ''), datetime('now')), datetime('now'))
+             ON CONFLICT(id) DO UPDATE SET
+                theme = excluded.theme,
+                volume = excluded.volume,
+                scan_on_startup = excluded.scan_on_startup,
+                reduce_motion = excluded.reduce_motion,
+                library_dirs = excluded.library_dirs,
+                updated_at = datetime('now')",
+        )
+        .bind(row.theme)
+        .bind(row.volume)
+        .bind(row.scan_on_startup)
+        .bind(row.reduce_motion)
+        .bind(row.library_dirs)
+        .bind(row.created_at)
+        .execute(&self.pool)
+        .await
+        .map(|_| ())
+        .map_err(AppError::from)
+    }
+}
diff --git a/src-tauri/src/repositories/sqlite/track_repository.rs b/src-tauri/src/repositories/sqlite/track_repository.rs
new file mode 100644
index 0000000..b291352
--- /dev/null
+++ b/src-tauri/src/repositories/sqlite/track_repository.rs
@@ -0,0 +1,191 @@
+use sqlx::{QueryBuilder, Sqlite, SqlitePool};
+
+use crate::models::{NewTrack, SortDirection, Track, TrackSearchQuery, TrackSortBy, UpdateTrack};
+
+#[derive(Clone)]
+pub struct SqliteTrackRepository {
+    pool: SqlitePool,
+}
+
+impl SqliteTrackRepository {
+    pub fn new(pool: SqlitePool) -> Self {
+        Self { pool }
+    }
+    
+    pub async fn create(&self, track: NewTrack) -> Result<Track, String> {
+        sqlx::query_as::<_, Track>(
+            "INSERT INTO tracks (title, artist, album, duration, path, cover, file_size, created_at, updated_at)
+             VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, datetime('now'), datetime('now'))
+             RETURNING id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at",
+        )
+        .bind(track.title)
+        .bind(track.artist)
+        .bind(track.album)
+        .bind(track.duration)
+        .bind(track.path)
+        .bind(track.cover)
+        .bind(track.file_size)
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn upsert_by_path(&self, track: NewTrack) -> Result<Track, String> {
+        sqlx::query_as::<_, Track>(
+            "INSERT INTO tracks (title, artist, album, duration, path, cover, file_size, created_at, updated_at)
+             VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, datetime('now'), datetime('now'))
+             ON CONFLICT(path) DO UPDATE SET
+                title = excluded.title,
+                artist = excluded.artist,
+                album = excluded.album,
+                duration = excluded.duration,
+                cover = excluded.cover,
+                file_size = excluded.file_size,
+                updated_at = datetime('now')
+             RETURNING id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at",
+        )
+        .bind(track.title)
+        .bind(track.artist)
+        .bind(track.album)
+        .bind(track.duration)
+        .bind(track.path)
+        .bind(track.cover)
+        .bind(track.file_size)
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn update(&self, track: UpdateTrack) -> Result<Track, String> {
+        sqlx::query_as::<_, Track>(
+            "UPDATE tracks SET
+                title = ?1,
+                artist = ?2,
+                album = ?3,
+                duration = ?4,
+                path = ?5,
+                cover = ?6,
+                file_size = ?7,
+                updated_at = datetime('now')
+             WHERE id = ?8
+             RETURNING id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at",
+        )
+        .bind(track.title)
+        .bind(track.artist)
+        .bind(track.album)
+        .bind(track.duration)
+        .bind(track.path)
+        .bind(track.cover)
+        .bind(track.file_size)
+        .bind(track.id)
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn delete(&self, id: i64) -> Result<(), String> {
+        sqlx::query("DELETE FROM tracks WHERE id = ?1")
+            .bind(id)
+            .execute(&self.pool)
+            .await
+            .map(|_| ())
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn delete_by_path(&self, path: &str) -> Result<(), String> {
+        sqlx::query("DELETE FROM tracks WHERE path = ?1")
+            .bind(path)
+            .execute(&self.pool)
+            .await
+            .map(|_| ())
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn find_by_id(&self, id: i64) -> Result<Option<Track>, String> {
+        sqlx::query_as::<_, Track>(
+            "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
+             FROM tracks WHERE id = ?1",
+        )
+        .bind(id)
+        .fetch_optional(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn find_by_path(&self, path: &str) -> Result<Option<Track>, String> {
+        sqlx::query_as::<_, Track>(
+            "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
+             FROM tracks WHERE path = ?1",
+        )
+        .bind(path)
+        .fetch_optional(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn list_all(&self) -> Result<Vec<Track>, String> {
+        sqlx::query_as::<_, Track>(
+            "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
+             FROM tracks ORDER BY title COLLATE NOCASE ASC",
+        )
+        .fetch_all(&self.pool)
+        .await
+        .map_err(|e| e.to_string())
+    }
+
+    pub async fn search(&self, query: TrackSearchQuery) -> Result<Vec<Track>, String> {
+        let mut builder = QueryBuilder::<Sqlite>::new(
+            "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at FROM tracks",
+        );
+
+        if let Some(keyword) = query.keyword.as_ref().map(|value| value.trim()).filter(|value| !value.is_empty()) {
+            let pattern = format!("%{}%", keyword.to_lowercase());
+            builder.push(" WHERE lower(title) LIKE ");
+            builder.push_bind(pattern.clone());
+            builder.push(" OR lower(coalesce(artist, '')) LIKE ");
+            builder.push_bind(pattern.clone());
+            builder.push(" OR lower(coalesce(album, '')) LIKE ");
+            builder.push_bind(pattern);
+        }
+
+        builder.push(" ORDER BY ");
+        match query.sort_by.unwrap_or(TrackSortBy::Title) {
+            TrackSortBy::Title => builder.push("title COLLATE NOCASE"),
+            TrackSortBy::Artist => builder.push("artist COLLATE NOCASE"),
+            TrackSortBy::Album => builder.push("album COLLATE NOCASE"),
+            TrackSortBy::Duration => builder.push("duration"),
+            TrackSortBy::CreatedAt => builder.push("created_at"),
+            TrackSortBy::UpdatedAt => builder.push("updated_at"),
+            TrackSortBy::PlayCount => builder.push("play_count"),
+            TrackSortBy::LastPlayedAt => builder.push("last_played_at"),
+        };
+
+        match query.sort_direction.unwrap_or(SortDirection::Asc) {
+            SortDirection::Asc => builder.push(" ASC"),
+            SortDirection::Desc => builder.push(" DESC"),
+        };
+
+        builder.push(" LIMIT ");
+        builder.push_bind(query.limit.unwrap_or(100).clamp(1, 500));
+        builder.push(" OFFSET ");
+        builder.push_bind(query.offset.unwrap_or(0).max(0));
+
+        builder
+            .build_query_as::<Track>()
+            .fetch_all(&self.pool)
+            .await
+            .map_err(|e| e.to_string())
+    }
+
+    pub async fn increment_play_count(&self, id: i64, played_at: String) -> Result<(), String> {
+        sqlx::query(
+            "UPDATE tracks SET play_count = play_count + 1, last_played_at = ?1, updated_at = datetime('now') WHERE id = ?2",
+        )
+        .bind(played_at)
+        .bind(id)
+        .execute(&self.pool)
+        .await
+        .map(|_| ())
+        .map_err(|e| e.to_string())
+    }
+}
diff --git a/src-tauri/src/services/migration_service.rs b/src-tauri/src/services/migration_service.rs
new file mode 100644
index 0000000..36fcaba
--- /dev/null
+++ b/src-tauri/src/services/migration_service.rs
@@ -0,0 +1,181 @@
+use std::fs;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use serde::Deserialize;
+use tauri::Manager;
+
+use crate::models::{AddPlaylistTrack, NewPlaylist, NewTrack};
+use crate::repositories::sqlite::playlist_repository::SqlitePlaylistRepository;
+use crate::repositories::sqlite::track_repository::SqliteTrackRepository;
+
+#[derive(Clone)]
+pub struct MigrationService {
+    tracks: Arc<SqliteTrackRepository>,
+    playlists: Arc<SqlitePlaylistRepository>,
+}
+
+impl MigrationService {
+    pub fn new(tracks: Arc<SqliteTrackRepository>, playlists: Arc<SqlitePlaylistRepository>) -> Self {
+        Self { tracks, playlists }
+    }
+
+    pub async fn import_legacy_json_if_needed(
+        &self,
+        app_handle: &tauri::AppHandle,
+    ) -> Result<(), String> {
+        let app_data_path = app_handle
+            .path()
+            .app_data_dir()
+            .map_err(|error| error.to_string())?;
+
+        if !app_data_path.exists() {
+            return Ok(());
+        }
+
+        self.import_track_files(&app_data_path).await?;
+        self.import_playlist_file(&app_data_path).await?;
+        self.import_recent_files(&app_data_path).await?;
+
+        Ok(())
+    }
+
+    async fn import_track_files(&self, app_data_path: &PathBuf) -> Result<(), String> {
+        for name in ["tracks.json", "library.json"] {
+            let path = app_data_path.join(name);
+            if !path.exists() || backup_path(&path).exists() {
+                continue;
+            }
+
+            let tracks = read_json::<Vec<LegacyTrack>>(&path)?;
+
+            for track in tracks {
+                self.tracks
+                    .upsert_by_path(legacy_track_to_new_track(track))
+                    .await?;
+            }
+
+            backup_file(&path)?;
+        }
+
+        Ok(())
+    }
+
+    async fn import_recent_files(&self, app_data_path: &PathBuf) -> Result<(), String> {
+        for name in ["recent.json", "recently_played.json"] {
+            let path = app_data_path.join(name);
+            if !path.exists() || backup_path(&path).exists() {
+                continue;
+            }
+
+            let tracks = read_json::<Vec<LegacyTrack>>(&path)?;
+
+            for track in tracks {
+                let _saved = self
+                    .tracks
+                    .upsert_by_path(legacy_track_to_new_track(track))
+                    .await?;
+            }
+
+            backup_file(&path)?;
+        }
+
+        Ok(())
+    }
+
+    async fn import_playlist_file(&self, app_data_path: &PathBuf) -> Result<(), String> {
+        let path = app_data_path.join("playlist.json");
+        if !path.exists() || backup_path(&path).exists() {
+            return Ok(());
+        }
+
+        let playlists = read_json::<Vec<LegacyPlaylist>>(&path)?;
+
+        for legacy in playlists {
+            let playlist = self
+                .playlists
+                .create(NewPlaylist {
+                    name: legacy.name.unwrap_or_else(|| "未命名歌单".to_string()),
+                })
+                .await?;
+
+            for (position, track) in legacy.tracks.into_iter().enumerate() {
+                let saved = self
+                    .tracks
+                    .upsert_by_path(legacy_track_to_new_track(track))
+                    .await?;
+                self.playlists
+                    .add_track(AddPlaylistTrack {
+                        playlist_id: playlist.id,
+                        track_id: saved.id,
+                        position: Some(position as i64),
+                    })
+                    .await?;
+            }
+        }
+
+        backup_file(&path)
+    }
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct LegacyTrack {
+    title: String,
+    artist: String,
+    album: String,
+    duration: f64,
+    cover: Option<String>,
+    path: String,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct LegacyPlaylist {
+    name: Option<String>,
+    #[serde(default)]
+    tracks: Vec<LegacyTrack>,
+}
+
+fn read_json<T>(path: &PathBuf) -> Result<T, String>
+where
+    T: for<'de> Deserialize<'de>,
+{
+    let file = fs::File::open(path).map_err(|error| error.to_string())?;
+    serde_json::from_reader(file).map_err(|error| error.to_string())
+}
+
+fn legacy_track_to_new_track(track: LegacyTrack) -> NewTrack {
+    let file_size = fs::metadata(&track.path)
+        .ok()
+        .and_then(|metadata| i64::try_from(metadata.len()).ok());
+
+    NewTrack {
+        title: empty_to_unknown(track.title, "未知歌曲"),
+        artist: Some(empty_to_unknown(track.artist, "未知歌手")),
+        album: Some(empty_to_unknown(track.album, "未知专辑")),
+        duration: (track.duration * 1000.0).round().max(0.0) as i64,
+        path: track.path,
+        cover: track.cover,
+        file_size,
+    }
+}
+
+fn empty_to_unknown(value: String, fallback: &str) -> String {
+    let value = value.trim().to_string();
+    if value.is_empty() {
+        fallback.to_string()
+    } else {
+        value
+    }
+}
+
+fn backup_path(path: &PathBuf) -> PathBuf {
+    let mut value = path.clone();
+    value.set_extension("json.bak");
+    value
+}
+
+fn backup_file(path: &PathBuf) -> Result<(), String> {
+    fs::rename(path, backup_path(path)).map_err(|error| error.to_string())
+}
\ No newline at end of file
diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs
new file mode 100644
index 0000000..261c8f1
--- /dev/null
+++ b/src-tauri/src/services/mod.rs
@@ -0,0 +1,12 @@
+pub mod playback_events;
+pub mod playback_queue;
+pub mod playback_service;
+pub mod playlist_service;
+pub mod recent_service;
+pub mod settings_service;
+pub mod track_service;
+
+pub use playlist_service::PlaylistService;
+pub use recent_service::RecentService;
+pub use settings_service::SettingsService;
+pub use track_service::TrackService;
diff --git a/src-tauri/src/services/playback_events.rs b/src-tauri/src/services/playback_events.rs
new file mode 100644
index 0000000..3ec8446
--- /dev/null
+++ b/src-tauri/src/services/playback_events.rs
@@ -0,0 +1,71 @@
+use tauri::{AppHandle, Emitter};
+
+use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
+use crate::models::playback::{
+    NativePlaybackState, PlaybackStateSnapshot,
+    PlaybackQueueChangedPayload, PlaybackTrackStartedPayload,
+};
+use crate::models::Track;
+use crate::state::playback_state::current_playback_snapshot;
+
+pub fn status_snapshot() -> Result<PlaybackStateSnapshot, String> {
+    current_playback_snapshot()
+}
+
+pub fn queue_payload_from_state(
+    state: &crate::audio::AudioState,
+) -> PlaybackQueueChangedPayload {
+    PlaybackQueueChangedPayload {
+        playlist: state.playlist.clone(),
+        current_index: state.current_index,
+        play_mode: state.play_mode,
+        playback_history: state.playback_history.clone(),
+    }
+}
+
+pub fn queue_snapshot() -> Result<PlaybackQueueChangedPayload, String> {
+    crate::state::playback_state::with_audio_state(|state| queue_payload_from_state(state))
+}
+
+pub fn emit_queue_changed(
+    app_handle: &AppHandle,
+) -> Result<PlaybackQueueChangedPayload, String> {
+    let payload = queue_snapshot()?;
+    let _ = app_handle.emit("playback:queue-changed", payload.clone());
+    Ok(payload)
+}
+
+pub fn emit_track_started(app_handle: &AppHandle, track: Track, index: usize) {
+    let payload = PlaybackTrackStartedPayload {
+        track,
+        index,
+        playing: true,
+        current_time: 0.0,
+    };
+    let _ = app_handle.emit("playback:track-started", payload);
+}
+
+pub fn sync_playback_snapshot(
+    app_handle: &AppHandle,
+    snapshot: PlaybackStateSnapshot,
+) {
+    if let Some(payload) = snapshot.progress_payload() {
+        update_media_controls_playback(snapshot.native_playback_state());
+        let _ = app_handle.emit("playback:progress", payload);
+    }
+}
+
+pub fn sync_playback_state(app_handle: &AppHandle, state: NativePlaybackState) {
+    update_media_controls_playback(state);
+    emit_progress(app_handle);
+}
+
+pub fn emit_progress(app_handle: &AppHandle) {
+    if let Ok(snapshot) = current_playback_snapshot() {
+        sync_playback_snapshot(app_handle, snapshot);
+    }
+}
+
+pub fn notify_track_metadata(track: &Track) {
+    update_media_controls_metadata(crate::state::playback_state::metadata_from_track(track));
+}
diff --git a/src-tauri/src/services/playback_queue.rs b/src-tauri/src/services/playback_queue.rs
new file mode 100644
index 0000000..0e2e37d
--- /dev/null
+++ b/src-tauri/src/services/playback_queue.rs
@@ -0,0 +1,88 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use crate::audio::PlayMode;
+use crate::state::playback_state::with_audio_state;
+
+pub fn next_index_from_state() -> Option<usize> {
+    let state = crate::audio::get_audio_state().lock().ok()?;
+
+    if state.playlist.is_empty() {
+        return None;
+    }
+
+    let current_index = state.current_index.unwrap_or(0);
+
+    match state.play_mode {
+        PlayMode::Single => Some(current_index.min(state.playlist.len() - 1)),
+        PlayMode::List => Some(if current_index >= state.playlist.len() - 1 {
+            0
+        } else {
+            current_index + 1
+        }),
+        PlayMode::Shuffle => {
+            if state.playlist.len() <= 1 {
+                return Some(0);
+            }
+
+            let nanos = SystemTime::now()
+                .duration_since(UNIX_EPOCH)
+                .ok()?
+                .subsec_nanos() as usize;
+            let mut next = nanos % state.playlist.len();
+
+            if next == current_index {
+                next = (next + 1) % state.playlist.len();
+            }
+
+            Some(next)
+        }
+    }
+}
+
+pub fn previous_index_from_state() -> Option<usize> {
+    let state = crate::audio::get_audio_state().lock().ok()?;
+
+    if state.playlist.is_empty() {
+        return None;
+    }
+
+    if let Some(last_id) = state.playback_history.last() {
+        if let Some(index) = state.playlist.iter().position(|track| &track.id == last_id) {
+            return Some(index);
+        }
+    }
+
+    let current_index = state.current_index.unwrap_or(0);
+
+    Some(if current_index == 0 {
+        state.playlist.len() - 1
+    } else {
+        current_index - 1
+    })
+}
+
+pub fn push_current_to_history() {
+    if let Ok(mut state) = crate::audio::get_audio_state().lock() {
+        if let Some(index) = state.current_index {
+            if let Some(track) = state.playlist.get(index) {
+                let id = track.id;
+                state.playback_history.push(id);
+            }
+        }
+    }
+}
+
+pub fn pop_history_if_matches(index: usize) {
+    if let Ok(mut state) = crate::audio::get_audio_state().lock() {
+        if let Some(track) = state.playlist.get(index) {
+            if state.playback_history.last() == Some(&track.id) {
+                state.playback_history.pop();
+            }
+        }
+    }
+}
+
+pub fn get_track_from_queue(index: usize) -> Result<crate::models::Track, String> {
+    with_audio_state(|state| state.playlist.get(index).cloned())?
+        .ok_or_else(|| "Invalid queue index".to_string())
+}
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
new file mode 100644
index 0000000..120e82e
--- /dev/null
+++ b/src-tauri/src/services/playback_service.rs
@@ -0,0 +1,292 @@
+use std::path::Path;
+
+use souvlaki::{MediaControlEvent, SeekDirection};
+use tauri::AppHandle;
+use web_audio_api::context::BaseAudioContext;
+use web_audio_api::node::AudioNode;
+use web_audio_api::MediaElement;
+
+use crate::audio::get_audio_context;
+use crate::models::playback::NativePlaybackState;
+use crate::models::Track;
+use crate::services::playback_events::{
+    emit_progress, emit_track_started, notify_track_metadata, sync_playback_state,
+};
+use crate::services::playback_queue::{
+    get_track_from_queue, next_index_from_state, pop_history_if_matches,
+    previous_index_from_state, push_current_to_history,
+};
+use crate::state::playback_state::{
+    current_time_from_state, lock_audio_state, minimal_track, with_audio_state, with_media,
+};
+
+pub fn play_track_internal(
+    app_handle: &AppHandle,
+    track: Track,
+    index: Option<usize>,
+) -> Result<(), String> {
+    let file_path = Path::new(&track.path);
+
+    if !file_path.exists() {
+        return Err("音频文件不存在或已被移动".into());
+    }
+
+    let mut media = MediaElement::new(file_path)
+        .map_err(|e| format!("Failed to create media element: {}", e))?;
+
+    let context = get_audio_context();
+    let src = context.create_media_element_source(&mut media);
+    let gain_node = context.create_gain();
+
+    src.connect(&gain_node);
+    gain_node.connect(&context.destination());
+
+    media.set_loop(false);
+    media.set_current_time(0.0);
+
+    {
+        let mut state = lock_audio_state()?;
+
+        gain_node.gain().set_value(state.volume);
+
+        if let Some(old_media) = state.media.replace(media) {
+            old_media.pause();
+        }
+
+        state.gain_node = Some(gain_node);
+        state.current_path = Some(track.path.clone());
+        state.current_track_id = (track.id > 0).then_some(track.id);
+        state.playing = true;
+
+        if let Some(next_index) = index {
+            state.current_index = Some(next_index);
+        }
+
+        let _ = with_media(&mut state, MediaElement::play);
+    }
+
+    notify_track_metadata(&track);
+
+    crate::media_controls::update_media_controls_playback(NativePlaybackState::Playing {
+        current_time: 0.0,
+    });
+
+    if let Some(index) = index {
+        emit_track_started(app_handle, track, index);
+    } else {
+        emit_progress(app_handle);
+    }
+
+    Ok(())
+}
+
+pub fn play_current_index_internal(
+    app_handle: &AppHandle,
+    index: usize,
+) -> Result<(), String> {
+    let track = get_track_from_queue(index)?;
+    play_track_internal(app_handle, track, Some(index))
+}
+
+pub async fn play_next_internal(app_handle: AppHandle) -> Result<(), String> {
+    push_current_to_history();
+    let index = next_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
+    play_current_index_internal(&app_handle, index)
+}
+
+pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), String> {
+    let index = previous_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
+    pop_history_if_matches(index);
+    play_current_index_internal(&app_handle, index)
+}
+
+pub async fn resume_internal(app_handle: AppHandle) -> Result<(), String> {
+    let current_time = with_audio_state(|state| {
+        let current_time = with_media(state, |media| {
+            media.play();
+            media.current_time()
+        });
+
+        if current_time.is_some() {
+            state.playing = true;
+        }
+
+        current_time
+    })?
+    .ok_or_else(|| "No media available".to_string())?;
+
+    sync_playback_state(&app_handle, NativePlaybackState::Playing { current_time });
+    Ok(())
+}
+
+pub async fn pause_internal(app_handle: AppHandle) -> Result<(), String> {
+    let current_time = with_audio_state(|state| {
+        let current_time = with_media(state, |media| {
+            media.pause();
+            media.current_time()
+        });
+
+        if current_time.is_some() {
+            state.playing = false;
+        }
+
+        current_time
+    })?
+    .ok_or_else(|| "No media available".to_string())?;
+
+    sync_playback_state(&app_handle, NativePlaybackState::Paused { current_time });
+    Ok(())
+}
+
+pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
+    let (playing, current_time) = with_audio_state(|state| {
+        let result = with_media(state, |media| {
+            if media.paused() {
+                media.play();
+                (true, media.current_time())
+            } else {
+                media.pause();
+                (false, media.current_time())
+            }
+        });
+
+        if let Some((playing, _)) = result {
+            state.playing = playing;
+        }
+
+        result
+    })?
+    .ok_or_else(|| "No media available".to_string())?;
+
+    let state = if playing {
+        NativePlaybackState::Playing { current_time }
+    } else {
+        NativePlaybackState::Paused { current_time }
+    };
+
+    sync_playback_state(&app_handle, state);
+    Ok(playing)
+}
+
+pub async fn stop_internal(app_handle: AppHandle) -> Result<(), String> {
+    with_audio_state(|state| {
+        let _ = with_media(state, |media| {
+            media.pause();
+            media.set_current_time(0.0);
+        });
+
+        state.playing = false;
+    })?;
+
+    sync_playback_state(&app_handle, NativePlaybackState::Stopped);
+    Ok(())
+}
+
+pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), String> {
+    let playing = with_audio_state(|state| {
+        let playing = with_media(state, |media| {
+            media.set_current_time(time);
+            !media.paused()
+        })
+        .unwrap_or(false);
+
+        state.playing = playing;
+        playing
+    })?;
+
+    let state = if playing {
+        NativePlaybackState::Playing { current_time: time }
+    } else {
+        NativePlaybackState::Paused { current_time: time }
+    };
+
+    sync_playback_state(&app_handle, state);
+    Ok(())
+}
+
+pub fn find_track_in_queue(full_path: &str, track_id: Option<i64>) -> Option<Track> {
+    with_audio_state(|state| {
+        state
+            .playlist
+            .iter()
+            .find(|track| {
+                track_id
+                    .as_ref()
+                    .map(|id| track.id == *id)
+                    .unwrap_or(false)
+                    || track.path == full_path
+            })
+            .cloned()
+    })
+    .ok()
+    .flatten()
+}
+
+pub fn load_track_for_playback(full_path: &str, track_id: Option<i64>) -> Track {
+    find_track_in_queue(full_path, track_id)
+        .unwrap_or_else(|| minimal_track(full_path.to_string()))
+}
+
+pub fn spawn_playback_progress_task(app_handle: AppHandle) {
+    std::thread::spawn(move || {
+        loop {
+            emit_progress(&app_handle);
+
+            if crate::state::playback_state::should_advance_track() {
+                let local_handle = app_handle.clone();
+                tauri::async_runtime::block_on(async move {
+                    let _ = play_next_internal(local_handle).await;
+                });
+            }
+
+            std::thread::sleep(std::time::Duration::from_millis(500));
+        }
+    });
+}
+
+pub async fn handle_media_control_event_internal(
+    app_handle: AppHandle,
+    event: MediaControlEvent,
+) {
+    match event {
+        MediaControlEvent::Play => {
+            let _ = resume_internal(app_handle).await;
+        }
+        MediaControlEvent::Pause => {
+            let _ = pause_internal(app_handle).await;
+        }
+        MediaControlEvent::Toggle => {
+            let _ = toggle_internal(app_handle).await;
+        }
+        MediaControlEvent::Next => {
+            let _ = play_next_internal(app_handle).await;
+        }
+        MediaControlEvent::Previous => {
+            let _ = play_previous_internal(app_handle).await;
+        }
+        MediaControlEvent::Stop => {
+            let _ = stop_internal(app_handle).await;
+        }
+        MediaControlEvent::SetPosition(position) => {
+            let _ = seek_internal(app_handle, position.0.as_secs_f64()).await;
+        }
+        MediaControlEvent::Seek(direction) => {
+            let current_time = current_time_from_state();
+            let offset = match direction {
+                SeekDirection::Forward => 10.0,
+                SeekDirection::Backward => -10.0,
+            };
+            let _ = seek_internal(app_handle, (current_time + offset).max(0.0)).await;
+        }
+        MediaControlEvent::SeekBy(direction, duration) => {
+            let current_time = current_time_from_state();
+            let offset = duration.as_secs_f64();
+            let next_time = match direction {
+                SeekDirection::Forward => current_time + offset,
+                SeekDirection::Backward => current_time - offset,
+            };
+            let _ = seek_internal(app_handle, next_time.max(0.0)).await;
+        }
+        _ => {}
+    }
+}
diff --git a/src-tauri/src/services/playlist_service.rs b/src-tauri/src/services/playlist_service.rs
new file mode 100644
index 0000000..1f856b7
--- /dev/null
+++ b/src-tauri/src/services/playlist_service.rs
@@ -0,0 +1,59 @@
+use std::sync::Arc;
+
+use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
+use crate::repositories::sqlite::playlist_repository::SqlitePlaylistRepository;
+
+#[derive(Clone)]
+pub struct PlaylistService {
+    playlists: Arc<SqlitePlaylistRepository>,
+}
+
+impl PlaylistService {
+    pub fn new(playlists: Arc<SqlitePlaylistRepository>) -> Self {
+        Self { playlists }
+    }
+
+    pub async fn create_playlist(&self, playlist: NewPlaylist) -> Result<Playlist, String> {
+        self.playlists.create(playlist).await
+    }
+
+    pub async fn rename_playlist(&self, playlist: RenamePlaylist) -> Result<Playlist, String> {
+        self.playlists.rename(playlist).await
+    }
+
+    pub async fn delete_playlist(&self, id: i64) -> Result<(), String> {
+        self.playlists.delete(id).await
+    }
+
+    pub async fn get_playlist(&self, id: i64) -> Result<Option<Playlist>, String> {
+        self.playlists.find_by_id(id).await
+    }
+
+    pub async fn list_playlists(&self) -> Result<Vec<Playlist>, String> {
+        self.playlists.list_all().await
+    }
+
+    pub async fn list_playlists_with_tracks(&self) -> Result<Vec<PlaylistWithTracks>, String> {
+        self.playlists.list_with_tracks().await
+    }
+
+    pub async fn get_playlist_with_tracks(&self, id: i64) -> Result<Option<PlaylistWithTracks>, String> {
+        self.playlists.get_with_tracks(id).await
+    }
+
+    pub async fn add_track(&self, track: AddPlaylistTrack) -> Result<PlaylistTrack, String> {
+        self.playlists.add_track(track).await
+    }
+
+    pub async fn remove_track(&self, playlist_id: i64, track_id: i64) -> Result<(), String> {
+        self.playlists.remove_track(playlist_id, track_id).await
+    }
+
+    pub async fn clear_tracks(&self, playlist_id: i64) -> Result<(), String> {
+        self.playlists.clear_tracks(playlist_id).await
+    }
+
+    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), String> {
+        self.playlists.reorder_track(playlist_id, track_id, position).await
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/services/recent_service.rs b/src-tauri/src/services/recent_service.rs
new file mode 100644
index 0000000..6b9de69
--- /dev/null
+++ b/src-tauri/src/services/recent_service.rs
@@ -0,0 +1,37 @@
+use std::sync::Arc;
+
+use crate::models::RecentPlayedWithTrack;
+use crate::repositories::sqlite::recent_repository::{SqliteRecentRepository};
+
+const MAX_RECENT_RECORDS: i64 = 100;
+
+#[derive(Clone)]
+pub struct RecentService {
+    recent: Arc<SqliteRecentRepository>,
+}
+
+impl RecentService {
+    pub fn new(recent: Arc<SqliteRecentRepository>) -> Self {
+        Self { recent }
+    }
+
+    pub async fn load(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, String> {
+        self.recent.list_with_tracks(limit, offset).await
+    }
+
+    pub async fn add(&self, track_id: i64, played_at: String) -> Result<(), String> {
+        self.recent.upsert(track_id, played_at).await?;
+
+        let count = self.recent.count().await?;
+
+        if count > MAX_RECENT_RECORDS {
+            self.recent.remove_oldest(MAX_RECENT_RECORDS).await?;
+        }
+
+        Ok(())
+    }
+
+    pub async fn clear(&self) -> Result<(), String> {
+        self.recent.clear().await
+    }
+}
diff --git a/src-tauri/src/services/settings_service.rs b/src-tauri/src/services/settings_service.rs
new file mode 100644
index 0000000..4a942cb
--- /dev/null
+++ b/src-tauri/src/services/settings_service.rs
@@ -0,0 +1,66 @@
+use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use crate::errors::AppError;
+use crate::models::{AppSettings, SettingRow, ThemeMode};
+use crate::repositories::sqlite::settings_repository::SqliteSettingsRepository;
+
+#[derive(Clone)]
+pub struct SettingsService {
+    settings: Arc<SqliteSettingsRepository>,
+}
+
+impl SettingsService {
+    pub fn new(settings: Arc<SqliteSettingsRepository>) -> Self {
+        Self { settings }
+    }
+
+    pub async fn get_settings(&self) -> Result<AppSettings, AppError> {
+        if let Some(row) = self.settings.get().await? {
+            return row_to_settings(row);
+        }
+
+        let settings = AppSettings::default();
+        self.update_settings(settings.clone()).await?;
+        Ok(settings)
+    }
+
+    pub async fn update_settings(&self, settings: AppSettings) -> Result<AppSettings, AppError> {
+        let row = settings_to_row(settings.clone())?;
+        self.settings.update(row).await?;
+        Ok(settings)
+    }
+}
+
+fn row_to_settings(row: SettingRow) -> Result<AppSettings, AppError> {
+    Ok(AppSettings {
+        theme: ThemeMode::try_from(row.theme).map_err(AppError::Service)?,
+        volume: row.volume.clamp(0, 100) as u8,
+        scan_on_startup: row.scan_on_startup != 0,
+        reduce_motion: row.reduce_motion != 0,
+        library_dirs: serde_json::from_str(&row.library_dirs)
+            .map_err(|error| AppError::Service(error.to_string()))?,
+        use_album_artist_grouping: false,
+    })
+}
+
+fn settings_to_row(settings: AppSettings) -> Result<SettingRow, AppError> {
+    Ok(SettingRow {
+        id: 1,
+        theme: settings.theme.as_str().to_string(),
+        volume: settings.volume as i64,
+        scan_on_startup: i64::from(settings.scan_on_startup),
+        reduce_motion: i64::from(settings.reduce_motion),
+        library_dirs: serde_json::to_string(&settings.library_dirs)
+            .map_err(|error| AppError::Service(error.to_string()))?,
+        created_at: now_string(),
+        updated_at: now_string(),
+    })
+}
+
+fn now_string() -> String {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|value| value.as_secs().to_string())
+        .unwrap_or_else(|_| "0".to_string())
+}
\ No newline at end of file
diff --git a/src-tauri/src/services/track_service.rs b/src-tauri/src/services/track_service.rs
new file mode 100644
index 0000000..419e402
--- /dev/null
+++ b/src-tauri/src/services/track_service.rs
@@ -0,0 +1,55 @@
+use std::sync::Arc;
+
+use crate::models::{NewTrack, Track, TrackSearchQuery, UpdateTrack};
+use crate::repositories::sqlite::track_repository::SqliteTrackRepository;
+
+#[derive(Clone)]
+pub struct TrackService {
+    tracks: Arc<SqliteTrackRepository>,
+}
+
+impl TrackService {
+    pub fn new(tracks: Arc<SqliteTrackRepository>) -> Self {
+        Self { tracks }
+    }
+
+    pub async fn create_track(&self, track: NewTrack) -> Result<Track, String> {
+        self.tracks.create(track).await
+    }
+
+    pub async fn upsert_track(&self, track: NewTrack) -> Result<Track, String> {
+        self.tracks.upsert_by_path(track).await
+    }
+
+    pub async fn update_track(&self, track: UpdateTrack) -> Result<Track, String> {
+        self.tracks.update(track).await
+    }
+
+    pub async fn delete_track(&self, id: i64) -> Result<(), String> {
+        self.tracks.delete(id).await
+    }
+
+    pub async fn delete_track_by_path(&self, path: &str) -> Result<(), String> {
+        self.tracks.delete_by_path(path).await
+    }
+
+    pub async fn get_track(&self, id: i64) -> Result<Option<Track>, String> {
+        self.tracks.find_by_id(id).await
+    }
+
+    pub async fn get_track_by_path(&self, path: &str) -> Result<Option<Track>, String> {
+        self.tracks.find_by_path(path).await
+    }
+
+    pub async fn list_tracks(&self) -> Result<Vec<Track>, String> {
+        self.tracks.list_all().await
+    }
+
+    pub async fn search_tracks(&self, query: TrackSearchQuery) -> Result<Vec<Track>, String> {
+        self.tracks.search(query).await
+    }
+
+    pub async fn mark_track_played(&self, id: i64, played_at: String) -> Result<(), String> {
+        self.tracks.increment_play_count(id, played_at).await
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/shortcuts.rs b/src-tauri/src/shortcuts.rs
deleted file mode 100644
index 18875fe..0000000
--- a/src-tauri/src/shortcuts.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::str::FromStr;
-use std::sync::Mutex;
-
-use tauri::{AppHandle, Manager, State};
-use tauri_plugin_global_shortcut::{GlobalShortcutExt, Shortcut, ShortcutEvent, ShortcutState};
-
-use crate::commands::config::{load_config_sync, save_config_sync};
-use crate::commands::playback::{
-    play_next_internal, play_previous_internal, stop_internal, toggle_internal,
-};
-use crate::models::{AppConfig, ShortcutAction, ShortcutConfig};
-
-pub struct ShortcutRegistry {
-    shortcuts: Mutex<HashMap<ShortcutAction, String>>,
-}
-
-impl Default for ShortcutRegistry {
-    fn default() -> Self {
-        Self {
-            shortcuts: Mutex::new(HashMap::new()),
-        }
-    }
-}
-
-fn parse_shortcut(shortcut: &str) -> Result<Shortcut, String> {
-    Shortcut::from_str(shortcut).map_err(|e| e.to_string())
-}
-
-fn shortcut_entries(config: &ShortcutConfig) -> [(ShortcutAction, &str); 4] {
-    config.entries()
-}
-
-fn ensure_unique(config: &ShortcutConfig) -> Result<(), String> {
-    let mut seen = HashSet::new();
-
-    for (_, shortcut) in shortcut_entries(config) {
-        if !seen.insert(shortcut.to_string()) {
-            return Err("快捷键冲突".to_string());
-        }
-    }
-
-    Ok(())
-}
-
-fn register_config(app_handle: &AppHandle, config: &ShortcutConfig) -> Result<(), String> {
-    ensure_unique(config)?;
-
-    for (_, shortcut) in shortcut_entries(config) {
-        parse_shortcut(shortcut)?;
-        app_handle
-            .global_shortcut()
-            .register(shortcut)
-            .map_err(|e| e.to_string())?;
-    }
-
-    Ok(())
-}
-
-fn unregister_config(app_handle: &AppHandle, shortcuts: &HashMap<ShortcutAction, String>) {
-    for shortcut in shortcuts.values() {
-        let _ = app_handle.global_shortcut().unregister(shortcut.as_str());
-    }
-}
-
-fn set_registry(state: &ShortcutRegistry, config: &ShortcutConfig) -> Result<(), String> {
-    let mut shortcuts = state.shortcuts.lock().map_err(|_| "快捷键状态锁定失败")?;
-    shortcuts.clear();
-
-    for (action, shortcut) in shortcut_entries(config) {
-        shortcuts.insert(action, shortcut.to_string());
-    }
-
-    Ok(())
-}
-
-pub fn init_shortcuts(app_handle: AppHandle) -> Result<(), String> {
-    let config = load_config_sync(&app_handle)?;
-    register_config(&app_handle, &config.shortcuts)?;
-    let state = app_handle.state::<ShortcutRegistry>();
-    set_registry(state.inner(), &config.shortcuts)
-}
-
-pub fn handle_shortcut_event(app_handle: &AppHandle, shortcut: &Shortcut, event: ShortcutEvent) {
-    if event.state != ShortcutState::Pressed {
-        return;
-    }
-
-    let shortcut_string = shortcut.into_string();
-    let state = app_handle.state::<ShortcutRegistry>();
-    let Ok(shortcuts) = state.shortcuts.lock() else {
-        return;
-    };
-
-    let action = shortcuts
-        .iter()
-        .find_map(|(action, value)| (value == &shortcut_string).then_some(*action));
-
-    let Some(action) = action else {
-        return;
-    };
-
-    let app = app_handle.clone();
-
-    tauri::async_runtime::spawn(async move {
-        match action {
-            ShortcutAction::PlayPause => {
-                let _ = toggle_internal(app).await;
-            }
-            ShortcutAction::Stop => {
-                let _ = stop_internal(app).await;
-            }
-            ShortcutAction::Previous => {
-                let _ = play_previous_internal(app).await;
-            }
-            ShortcutAction::Next => {
-                let _ = play_next_internal(app).await;
-            }
-        }
-    });
-}
-
-#[tauri::command]
-pub async fn get_shortcuts(app_handle: AppHandle) -> Result<AppConfig, String> {
-    load_config_sync(&app_handle)
-}
-
-#[tauri::command]
-pub async fn update_shortcut(
-    app_handle: AppHandle,
-    state: State<'_, ShortcutRegistry>,
-    action: ShortcutAction,
-    shortcut: String,
-) -> Result<AppConfig, String> {
-    parse_shortcut(&shortcut)?;
-
-    let mut config = load_config_sync(&app_handle)?;
-    config.shortcuts.set(action, shortcut.clone());
-    ensure_unique(&config.shortcuts)?;
-
-    let previous = state
-        .shortcuts
-        .lock()
-        .map_err(|_| "快捷键状态锁定失败")?
-        .clone();
-
-    unregister_config(&app_handle, &previous);
-
-    if let Err(err) = register_config(&app_handle, &config.shortcuts) {
-        let _ = register_config(&app_handle, &config_from_map(&previous).shortcuts);
-        return Err(err);
-    }
-
-    set_registry(state.inner(), &config.shortcuts)?;
-    save_config_sync(&app_handle, config)
-}
-
-#[tauri::command]
-pub async fn reset_shortcuts(
-    app_handle: AppHandle,
-    state: State<'_, ShortcutRegistry>,
-) -> Result<AppConfig, String> {
-    let config = AppConfig::default();
-    let previous = state
-        .shortcuts
-        .lock()
-        .map_err(|_| "快捷键状态锁定失败")?
-        .clone();
-
-    unregister_config(&app_handle, &previous);
-
-    if let Err(err) = register_config(&app_handle, &config.shortcuts) {
-        let _ = register_config(&app_handle, &config_from_map(&previous).shortcuts);
-        return Err(err);
-    }
-
-    set_registry(state.inner(), &config.shortcuts)?;
-    save_config_sync(&app_handle, config)
-}
-
-fn config_from_map(map: &HashMap<ShortcutAction, String>) -> AppConfig {
-    let mut shortcuts = ShortcutConfig::default();
-
-    for (action, shortcut) in map {
-        shortcuts.set(*action, shortcut.clone());
-    }
-
-    AppConfig { shortcuts }
-}
diff --git a/src-tauri/src/state/app_state.rs b/src-tauri/src/state/app_state.rs
new file mode 100644
index 0000000..6b48411
--- /dev/null
+++ b/src-tauri/src/state/app_state.rs
@@ -0,0 +1,27 @@
+use std::sync::Arc;
+
+use crate::services::{PlaylistService, RecentService, SettingsService, TrackService};
+
+#[derive(Clone)]
+pub struct AppState {
+    pub tracks: Arc<TrackService>,
+    pub playlists: Arc<PlaylistService>,
+    pub settings: Arc<SettingsService>,
+    pub recent: Arc<RecentService>,
+}
+
+impl AppState {
+    pub fn new(
+        tracks: Arc<TrackService>,
+        playlists: Arc<PlaylistService>,
+        settings: Arc<SettingsService>,
+        recent: Arc<RecentService>,
+    ) -> Self {
+        Self {
+            tracks,
+            playlists,
+            settings,
+            recent,
+        }
+    }
+}
diff --git a/src-tauri/src/state/mod.rs b/src-tauri/src/state/mod.rs
new file mode 100644
index 0000000..21772f9
--- /dev/null
+++ b/src-tauri/src/state/mod.rs
@@ -0,0 +1,4 @@
+pub mod app_state;
+pub mod playback_state;
+
+pub use app_state::AppState;
diff --git a/src-tauri/src/state/playback_state.rs b/src-tauri/src/state/playback_state.rs
new file mode 100644
index 0000000..dd019bb
--- /dev/null
+++ b/src-tauri/src/state/playback_state.rs
@@ -0,0 +1,122 @@
+use std::path::Path;
+use std::sync::MutexGuard;
+
+use web_audio_api::MediaElement;
+
+use crate::audio::{get_audio_state, AudioState};
+use crate::models::playback::{
+    NativeTrackMetadata, PlaybackStateSnapshot, PlaybackTrackInfo,
+};
+use crate::models::Track;
+
+pub fn lock_audio_state() -> Result<MutexGuard<'static, AudioState>, String> {
+    get_audio_state()
+        .lock()
+        .map_err(|_| "Failed to lock audio state".to_string())
+}
+
+pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, String> {
+    let mut state = lock_audio_state()?;
+    Ok(f(&mut state))
+}
+
+pub fn with_media<T>(state: &mut AudioState, f: impl FnOnce(&MediaElement) -> T) -> Option<T> {
+    state.media.as_ref().map(f)
+}
+
+pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
+    PlaybackTrackInfo {
+        id: state.current_track_id,
+        path: state.current_path.clone(),
+    }
+}
+
+pub fn current_playback_state(state: &mut AudioState) -> PlaybackStateSnapshot {
+    let Some(media) = state.media.as_ref() else {
+        state.playing = false;
+        return PlaybackStateSnapshot {
+            has_media: false,
+            playing: false,
+            current_time: 0.0,
+            track: None,
+        };
+    };
+
+    let playing = !media.paused();
+    let current_time = media.current_time();
+    state.playing = playing;
+
+    PlaybackStateSnapshot {
+        has_media: true,
+        playing,
+        current_time,
+        track: Some(playback_track_info(state)),
+    }
+}
+
+pub fn current_playback_snapshot() -> Result<PlaybackStateSnapshot, String> {
+    with_audio_state(current_playback_state)
+}
+
+pub fn current_time_from_state() -> f64 {
+    current_playback_snapshot()
+        .map(|state| state.current_time)
+        .unwrap_or(0.0)
+}
+
+pub fn current_track_duration(state: &AudioState) -> Option<f64> {
+    let index = state.current_index?;
+    state.playlist.get(index).map(|track| track.duration as f64 / 1000.0)
+}
+
+pub fn should_advance_track() -> bool {
+    let Ok((snapshot, duration)) = with_audio_state(|state| {
+        let snapshot = current_playback_state(state);
+        let duration = current_track_duration(state);
+        (snapshot, duration)
+    }) else {
+        return false;
+    };
+
+    snapshot.playing
+        && duration
+            .map(|duration| duration > 0.0 && snapshot.current_time >= duration - 0.5)
+            .unwrap_or(false)
+}
+
+pub fn metadata_from_track(track: &Track) -> NativeTrackMetadata {
+    NativeTrackMetadata {
+        title: track.title.clone(),
+        album: track.album.clone().unwrap_or_else(|| "未知专辑".to_string()),
+        artist: track.artist.clone().unwrap_or_else(|| "未知歌手".to_string()),
+        duration: Some(track.duration as f64 / 1000.0),
+    }
+}
+
+pub fn minimal_track(full_path: String) -> Track {
+    let title = Path::new(&full_path)
+        .file_stem()
+        .and_then(|value| value.to_str())
+        .unwrap_or("未知歌曲")
+        .to_string();
+
+    Track {
+        id: 0,
+        title,
+        artist: Some("未知歌手".to_string()),
+        album: Some("未知专辑".to_string()),
+        duration: 0,
+        path: full_path,
+        cover: None,
+        file_size: None,
+        play_count: 0,
+        last_played_at: None,
+        created_at: String::new(),
+        updated_at: String::new(),
+    }
+}
+
+pub fn sanitize_track(mut track: Track) -> Track {
+    track.cover = None;
+    track
+}
diff --git a/src/lib/features/PlayerBar.svelte b/src/lib/features/PlayerBar.svelte
index 2c59012..e9988b0 100644
--- a/src/lib/features/PlayerBar.svelte
+++ b/src/lib/features/PlayerBar.svelte
@@ -1,7 +1,5 @@
 <script lang="ts">
-    // Mdui 的 M2 Slider,用于播放进度
     import MduiSlider from '$lib/components/base/MduiSlider.svelte'
-    // M3 自定义 Slider
     import IconButton from '$lib/components/base/IconButton.svelte'
     import Slider from '$lib/components/base/Slider.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
@@ -9,8 +7,10 @@
     import { formatTime } from '$lib/utils'
 
     let slider = $state<MduiSlider | null>(null)
-    let currentCover = $state<string | null>(null)
 
+    let currentCover = $derived(
+        player.currentTrack?.cover ?? trackCovers.get(player.currentTrack),
+    )
     let volumeIcon = $derived(getVolumeIcon(player.volume, player.muted))
     let playModeIcon = $derived.by(() => {
         if (player.playMode === 'single') return 'repeat_one--rounded'
@@ -30,23 +30,6 @@
 
         player.seek(Number(target.value))
     }
-
-    $effect(() => {
-        const track = player.currentTrack
-
-        if (!track) {
-            currentCover = null
-            return
-        }
-
-        currentCover = trackCovers.get(track)
-
-        trackCovers.load(track).then(cover => {
-            if (player.currentTrack?.path === track.path) {
-                currentCover = cover
-            }
-        })
-    })
 </script>
 
 {#snippet progressArea()}
@@ -62,12 +45,12 @@
                 bind:value={player.currentTime}
                 bind:this={slider}
                 oninput={handleSeekInput}
-                duration={player.currentTrack?.duration ?? 0}
+                duration={(player.currentTrack?.duration ?? 0) / 1000}
             />
         </div>
 
         <span class="text-xs tabular-nums text-black min-w-10">
-            {formatTime(player.currentTrack?.duration ?? 0)}
+            {formatTime((player.currentTrack?.duration ?? 0) / 1000)}
         </span>
     </div>
 {/snippet}
diff --git a/src/lib/features/QueueDrawer.svelte b/src/lib/features/QueueDrawer.svelte
index 8634565..8ae36d1 100644
--- a/src/lib/features/QueueDrawer.svelte
+++ b/src/lib/features/QueueDrawer.svelte
@@ -18,7 +18,6 @@
     }
 </script>
 
-<!-- 这里必须写成数组形式，否则需要去掉<style>标签，因为svelte在有<style>标签的时候会将class中的&解析为&amp;导致tailwindcss 标签无法正常解析 -->
 <mdui-navigation-drawer
     open={player.queueOpen}
     placement="right"
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index eaf7242..135fda7 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -10,13 +10,13 @@
     import 'mdui/components/list-item.js'
     import 'mdui/components/list.js'
 
-    type TrackColumn = 'index' | 'title' | 'album' | 'tags' | 'duration'
+    type TrackColumn = 'index' | 'title' | 'album' | 'duration'
 
     interface Props {
         tracks: Track[]
         columns?: TrackColumn[]
         selectable?: boolean
-        selectedIds?: string[]
+        selectedIds?: number[]
         currentTrackIndex?: number
         hideHeader?: boolean
         ontoggletrack?: (track: Track, checked: boolean) => void
@@ -45,7 +45,6 @@
         index: '24px',
         title: '1fr',
         album: '1fr',
-        tags: 'auto',
         duration: '60px',
     }
 
@@ -105,12 +104,6 @@
         }
     }
 
-    function getTrackTags(track: Track): string[] {
-        const tags = (track as Track & { tags?: string[] }).tags
-
-        return Array.isArray(tags) ? tags : []
-    }
-
     function isCheckboxEventTarget(target: EventTarget | null) {
         return (
             target instanceof Element &&
@@ -306,7 +299,7 @@
             </span>
 
             <span class="text-xs truncate themed-text-secondary mt-0.5">
-                {track.artist}
+                {track.artist ?? '未知歌手'}
             </span>
         </div>
     </div>
@@ -316,32 +309,14 @@
     <div
         class="text-sm truncate hidden md:block z-10 themed-text-secondary min-w-0"
     >
-        {track.album}
-    </div>
-{/snippet}
-
-{#snippet trackTags(track: Track)}
-    {@const tags = getTrackTags(track)}
-
-    <div class="flex flex-wrap items-center gap-1 z-10 min-w-0">
-        {#if tags.length > 0}
-            {#each tags as tag (tag)}
-                <span
-                    class="themed-tag-chip rounded-full border px-2 py-0.5 text-xs leading-none"
-                >
-                    {tag}
-                </span>
-            {/each}
-        {:else}
-            <span class="block min-h-5"></span>
-        {/if}
+        {track.album ?? '未知专辑'}
     </div>
 {/snippet}
 
 {#snippet trackDuration(track: Track, index: number)}
     <div class="flex items-center justify-between gap-2 z-10 w-full min-w-0">
         <div class="text-sm font-mono themed-text-secondary text-left">
-            {formatDuration(track.duration)}
+            {formatDuration(track.duration / 1000)}
         </div>
         {#if onremovetrack}
             <IconButton
@@ -379,9 +354,6 @@
                 <div class="text-left hidden md:block">专辑</div>
             {/if}
 
-            {#if columns.includes('tags')}
-                <div class="text-left">标签</div>
-            {/if}
 
             {#if columns.includes('duration')}
                 <div class="text-left">时长</div>
@@ -390,7 +362,7 @@
     {/if}
 
     <div class="flex flex-col gap-1 mt-2">
-        {#each tracks as track, index (track.id || index)}
+        {#each tracks as track, index (track.id)}
             {@const isCurrent =
                 currentTrackIndex !== undefined
                     ? currentTrackIndex === index
@@ -440,9 +412,6 @@
                         {@render trackAlbum(track)}
                     {/if}
 
-                    {#if columns.includes('tags')}
-                        {@render trackTags(track)}
-                    {/if}
 
                     {#if columns.includes('duration')}
                         {@render trackDuration(track, index)}
@@ -558,9 +527,4 @@
         border-color: rgb(var(--mdui-color-outline-variant));
     }
 
-    .themed-tag-chip {
-        color: rgb(var(--mdui-color-on-surface-variant));
-        background-color: rgb(var(--mdui-color-surface-container-high));
-        border-color: rgb(var(--mdui-color-outline-variant));
-    }
 </style>
diff --git a/src/lib/features/settings/ShortcutRecorder.svelte b/src/lib/features/settings/ShortcutRecorder.svelte
deleted file mode 100644
index 0418daf..0000000
--- a/src/lib/features/settings/ShortcutRecorder.svelte
+++ /dev/null
@@ -1,151 +0,0 @@
-<script lang="ts">
-    type ShortcutRecorderProps = {
-        value: string
-        disabled?: boolean
-        onrecord?: (shortcut: string) => void | Promise<void>
-    }
-
-    let {
-        value,
-        disabled = false,
-        onrecord,
-    }: ShortcutRecorderProps = $props()
-
-    let isRecording = $state(false)
-    let isSaving = $state(false)
-
-    const modifierKeys = new Set([
-        'Alt',
-        'AltGraph',
-        'Control',
-        'Meta',
-        'Shift',
-    ])
-
-    function startRecording() {
-        if (disabled || isSaving) {
-            return
-        }
-
-        isRecording = true
-    }
-
-    function stopRecording() {
-        isRecording = false
-    }
-
-    function normalizeMainKey(key: string, code: string) {
-        if (key === ' ') {
-            return 'Space'
-        }
-
-        if (key.length === 1) {
-            return key.toUpperCase()
-        }
-
-        if (key === 'Esc') {
-            return 'Escape'
-        }
-
-        if (key === 'Spacebar') {
-            return 'Space'
-        }
-
-        if (key.startsWith('Arrow')) {
-            return key
-        }
-
-        if (/^Key[A-Z]$/.test(code)) {
-            return code.slice(3)
-        }
-
-        if (/^Digit\d$/.test(code)) {
-            return code.slice(5)
-        }
-
-        return key
-    }
-
-    function shortcutFromEvent(event: KeyboardEvent) {
-        const mainKey = normalizeMainKey(event.key, event.code)
-
-        if (modifierKeys.has(mainKey)) {
-            return null
-        }
-
-        const parts: string[] = []
-
-        if (event.ctrlKey || event.metaKey) {
-            parts.push('CommandOrControl')
-        }
-
-        if (event.altKey) {
-            parts.push('Alt')
-        }
-
-        if (event.shiftKey) {
-            parts.push('Shift')
-        }
-
-        if (parts.length === 0) {
-            return null
-        }
-
-        parts.push(mainKey)
-
-        return parts.join('+')
-    }
-
-    async function handleKeydown(event: KeyboardEvent) {
-        if (!isRecording) {
-            return
-        }
-
-        event.preventDefault()
-        event.stopPropagation()
-
-        if (event.key === 'Escape') {
-            stopRecording()
-            return
-        }
-
-        const shortcut = shortcutFromEvent(event)
-
-        if (!shortcut) {
-            return
-        }
-
-        isSaving = true
-
-        try {
-            await onrecord?.(shortcut)
-            stopRecording()
-        } finally {
-            isSaving = false
-        }
-    }
-</script>
-
-<svelte:window onkeydown={handleKeydown} />
-
-<button
-    type="button"
-    class={[
-        'inline-flex min-w-48 items-center justify-center rounded-full border px-4 py-2 text-sm font-medium transition-colors',
-        'border-[rgb(var(--mdui-color-outline-variant))] bg-[rgb(var(--mdui-color-surface-container-high))] text-[rgb(var(--mdui-color-on-surface))]',
-        'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[rgb(var(--mdui-color-primary))] focus-visible:ring-offset-2 focus-visible:ring-offset-[rgb(var(--mdui-color-surface-container))]',
-        isRecording && 'border-[rgb(var(--mdui-color-primary))] bg-[rgb(var(--mdui-color-primary-container))] text-[rgb(var(--mdui-color-on-primary-container))]',
-        (disabled || isSaving) && 'cursor-not-allowed opacity-60',
-        !disabled && !isSaving && 'hover:bg-[rgb(var(--mdui-color-surface-container-highest))]',
-    ]}
-    disabled={disabled || isSaving}
-    aria-pressed={isRecording}
-    onclick={startRecording}
-    onfocus={startRecording}
->
-    {#if isRecording}
-        按下快捷键...
-    {:else}
-        {value}
-    {/if}
-</button>
diff --git a/src/lib/features/settings/ShortcutSettingsPanel.svelte b/src/lib/features/settings/ShortcutSettingsPanel.svelte
deleted file mode 100644
index 6f43a0a..0000000
--- a/src/lib/features/settings/ShortcutSettingsPanel.svelte
+++ /dev/null
@@ -1,89 +0,0 @@
-<script lang="ts">
-    import { onMount } from 'svelte'
-    import Button from '$lib/components/base/Button.svelte'
-    import { config } from '$lib/state/config.svelte'
-    import type { ShortcutAction } from '$lib/types'
-    import SettingsListItem from './SettingsListItem.svelte'
-    import ShortcutRecorder from './ShortcutRecorder.svelte'
-
-    type ShortcutRow = {
-        action: ShortcutAction
-        title: string
-        description: string
-    }
-
-    const rows: ShortcutRow[] = [
-        {
-            action: 'playPause',
-            title: '播放/暂停',
-            description: '控制当前播放状态',
-        },
-        {
-            action: 'stop',
-            title: '停止',
-            description: '停止播放并重置进度',
-        },
-        {
-            action: 'previous',
-            title: '上一首',
-            description: '切换到上一首歌曲',
-        },
-        {
-            action: 'next',
-            title: '下一首',
-            description: '切换到下一首歌曲',
-        },
-    ]
-
-    let updatingAction = $state<ShortcutAction | null>(null)
-    let isResetting = $state(false)
-    let isBusy = $derived(config.isLoading || updatingAction !== null || isResetting)
-
-    onMount(() => {
-        void config.load()
-    })
-
-    async function handleRecord(action: ShortcutAction, shortcut: string) {
-        updatingAction = action
-
-        try {
-            await config.updateShortcut(action, shortcut)
-        } finally {
-            updatingAction = null
-        }
-    }
-
-    async function handleReset() {
-        isResetting = true
-
-        try {
-            await config.reset()
-        } finally {
-            isResetting = false
-        }
-    }
-</script>
-
-<div class="grid gap-3">
-    {#each rows as row (row.action)}
-        <SettingsListItem title={row.title} description={row.description}>
-            <ShortcutRecorder
-                value={config.data.shortcuts[row.action]}
-                disabled={isBusy}
-                onrecord={shortcut => handleRecord(row.action, shortcut)}
-            />
-        </SettingsListItem>
-    {/each}
-
-    <div class="flex justify-end">
-        <Button variant="tonal" disabled={isBusy} onclick={handleReset}>
-            重置快捷键
-        </Button>
-    </div>
-
-    {#if config.error}
-        <div class="text-sm text-red-500">
-            {config.error}
-        </div>
-    {/if}
-</div>
diff --git a/src/lib/features/shell/NavRail.svelte b/src/lib/features/shell/NavRail.svelte
index b051f36..2b8824d 100644
--- a/src/lib/features/shell/NavRail.svelte
+++ b/src/lib/features/shell/NavRail.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { page } from '$app/state'
 
-    import { importMusicDirectory } from '$lib/utils/library'
+    import { scanDirectory } from '$lib/utils/library'
 
     import 'mdui/components/navigation-rail-item.js'
     import 'mdui/components/navigation-rail.js'
@@ -55,17 +55,17 @@
         lowered
         icon="playlist_add--rounded"
         slot="top"
-        onclick={importMusicDirectory}
+        onclick={scanDirectory}
         onkeydown={(e: KeyboardEvent) => {
             if (e.key === 'Enter' || e.key === ' ') {
-                importMusicDirectory()
+                scanDirectory()
             }
         }}
         role="button"
         tabindex="0"
     ></mdui-fab>
 
-    {#each navItems as item}
+    {#each navItems as item (item.href)}
         <mdui-navigation-rail-item
             value={item.href}
             href={item.href}
diff --git a/src/lib/state/config.svelte.ts b/src/lib/state/config.svelte.ts
deleted file mode 100644
index 888d806..0000000
--- a/src/lib/state/config.svelte.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-import type { AppConfig, ShortcutAction } from '$lib/types'
-
-export const DEFAULT_CONFIG: AppConfig = {
-    shortcuts: {
-        playPause: 'CommandOrControl+Alt+Space',
-        stop: 'CommandOrControl+Alt+S',
-        previous: 'CommandOrControl+Alt+ArrowLeft',
-        next: 'CommandOrControl+Alt+ArrowRight',
-    },
-}
-
-class ConfigState {
-    data = $state<AppConfig>({ ...DEFAULT_CONFIG })
-    isLoading = $state(false)
-    error = $state<string | null>(null)
-
-    async load(): Promise<AppConfig> {
-        this.isLoading = true
-        this.error = null
-
-        try {
-            this.data = await invoke<AppConfig>('get_shortcuts')
-            return this.data
-        } catch (error) {
-            console.error('加载快捷键配置失败:', error)
-            this.error = String(error)
-            return this.data
-        } finally {
-            this.isLoading = false
-        }
-    }
-
-    async updateShortcut(action: ShortcutAction, shortcut: string): Promise<AppConfig> {
-        this.error = null
-
-        try {
-            this.data = await invoke<AppConfig>('update_shortcut', {
-                action,
-                shortcut,
-            })
-            return this.data
-        } catch (error) {
-            console.error('更新快捷键失败:', error)
-            this.error = String(error)
-            throw error
-        }
-    }
-
-    async reset(): Promise<AppConfig> {
-        this.error = null
-
-        try {
-            this.data = await invoke<AppConfig>('reset_shortcuts')
-            return this.data
-        } catch (error) {
-            console.error('重置快捷键失败:', error)
-            this.error = String(error)
-            throw error
-        }
-    }
-}
-
-export const config = new ConfigState()
diff --git a/src/lib/state/library.svelte.ts b/src/lib/state/library.svelte.ts
index 62b049e..cc666f1 100644
--- a/src/lib/state/library.svelte.ts
+++ b/src/lib/state/library.svelte.ts
@@ -1,5 +1,6 @@
 import { invoke } from '@tauri-apps/api/core'
 import { listen } from '@tauri-apps/api/event'
+import { SvelteMap } from 'svelte/reactivity'
 import type { Album, Artist, Track } from '../types/music'
 import { settings } from './settings.svelte'
 
@@ -12,15 +13,15 @@ class MusicLibrary {
 
     private refreshPromise: Promise<Track[]> | null = null
     #albumsMap = $derived.by(() => {
-        const albumMap = new Map<string, Album>()
+        const albumMap = new SvelteMap<string, Album>()
         const useAlbumArtistGrouping = this.useAlbumArtistGrouping
 
         for (const track of this.tracks) {
             const albumTitle = track.album?.trim() || '未知专辑'
 
-            const albumOwner = track.albumArtist?.trim() || track.artist?.trim() || '未知歌手'
+            const artistName = track.artist?.trim() || '未知歌手'
             const albumKey = useAlbumArtistGrouping
-                ? `${albumOwner}_${albumTitle}`.toLowerCase()
+                ? `${artistName}_${albumTitle}`.toLowerCase()
                 : albumTitle.toLowerCase()
             const id = encodeURIComponent(albumKey)
 
@@ -28,7 +29,7 @@ class MusicLibrary {
                 albumMap.set(id, {
                     id,
                     title: albumTitle,
-                    artist: albumOwner,
+                    artist: artistName,
                     tracks: [],
                     cover: track.cover ?? null,
                     trackCount: 0,
@@ -49,7 +50,7 @@ class MusicLibrary {
     })
 
     #artistsMap = $derived.by(() => {
-        const artistMap = new Map<
+        const artistMap = new SvelteMap<
             string,
             Artist & {
                 albumKeys: Set<string>
@@ -89,7 +90,7 @@ class MusicLibrary {
             }
         }
 
-        return new Map(
+        return new SvelteMap(
             Array.from(artistMap.values()).map(({ albumKeys, ...artist }) => [
                 artist.id,
                 artist,
@@ -152,7 +153,7 @@ class MusicLibrary {
 
         this.refreshPromise = (async () => {
             try {
-                const tracks = await invoke<Track[]>('load_music_library')
+                const tracks = await invoke<Track[]>('load_track_library')
                 this.tracks = tracks
                 return tracks
             } catch (err) {
@@ -173,7 +174,7 @@ class MusicLibrary {
             this.isLoading = true
             this.error = null
 
-            const tracks = await invoke<Track[]>('scan_music_directories', {
+            const tracks = await invoke<Track[]>('scan_track_directories', {
                 dirs: settings.data.libraryDirs,
             })
 
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index bb33533..bfc5b94 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -7,7 +7,7 @@ import { recentlyPlayed } from "./recent.svelte"
 type PlayMode = 'list' | 'single' | 'shuffle'
 
 type PlaybackTrackSnapshot = {
-    id?: string | null
+    id?: number | null
     path?: string | null
 }
 
@@ -21,7 +21,7 @@ type PlaybackStatusSnapshot = {
 type PlaybackProgressPayload = {
     playing: boolean
     currentTime: number
-    trackId?: string | null
+    trackId?: number | null
     path?: string | null
 }
 
@@ -36,7 +36,7 @@ export type PlaybackQueueChangedPayload = {
     playlist: Track[]
     currentIndex: number | null
     playMode: PlayMode
-    playbackHistory: string[]
+    playbackHistory: number[]
 }
 
 type BackendQueueTrack = Omit<Track, 'cover'>
@@ -50,7 +50,7 @@ class Player {
     currentTime = $state<number>(0)
     playMode = $state<PlayMode>('list')
     queueOpen = $state<boolean>(false)
-    playbackHistory: string[] = []
+    playbackHistory: number[] = []
     #muted = $state<boolean>(false)
     #volume = $state<number>(80)
     #previousVolume = 80
@@ -81,7 +81,7 @@ class Player {
         })
         navigator.mediaSession.setActionHandler('seekforward', () => {
             if (!this.currentTrack) return
-            void this.seek(Math.min(this.currentTime + 10, this.currentTrack.duration))
+            void this.seek(Math.min(this.currentTime + 10, this.#trackDurationSeconds(this.currentTrack)))
         })
         navigator.mediaSession.setActionHandler('seekbackward', () => {
             if (!this.currentTrack) return
@@ -105,6 +105,19 @@ class Player {
         return cover ? [{ src: cover }] : []
     }
 
+    #trackDurationSeconds(track: Track): number {
+        return track.duration / 1000
+    }
+
+    #isPersistedTrack(track: unknown): track is Track {
+        return (
+            typeof track === 'object' &&
+            track !== null &&
+            typeof (track as Track).id === 'number' &&
+            typeof (track as Track).path === 'string'
+        )
+    }
+
     #updatePlaybackState() {
         if (typeof navigator === 'undefined' || !('mediaSession' in navigator)) return
         navigator.mediaSession.playbackState = this.playing ? 'playing' : 'paused'
@@ -115,7 +128,7 @@ class Player {
         if (!track || typeof navigator === 'undefined' || !('mediaSession' in navigator) || !('setPositionState' in navigator.mediaSession)) return
 
         navigator.mediaSession.setPositionState({
-            duration: track.duration,
+            duration: this.#trackDurationSeconds(track),
             playbackRate: 1,
             position: this.currentTime,
         })
@@ -217,7 +230,7 @@ class Player {
             })
     }
 
-    replacePlaylistAndPlay(tracks: Track[], targetId: string) {
+    replacePlaylistAndPlay(tracks: Track[], targetId: number) {
         if (tracks.length === 0) {
             this.clearQueue()
             return
@@ -301,12 +314,12 @@ class Player {
         this.#applyBackendQueue(payload)
     }
 
-    async removeTrackFromBackendQueue(trackId: string) {
+    async removeTrackFromBackendQueue(trackId: number) {
         const payload = await invoke<PlaybackQueueChangedPayload>('remove_track_from_backend_queue', { trackId })
         this.#applyBackendQueue(payload)
     }
 
-    removeTrack(id: string) {
+    removeTrack(id: number) {
         const removeIndex = this.playlist.findIndex(t => t.id === id)
         if (removeIndex === -1) return
 
@@ -322,7 +335,7 @@ class Player {
             this.#clearMediaSession()
             this.#stopPolling()
             void this.#syncBackendQueue().catch(console.error)
-            invoke('stop_music').catch(console.error)
+            invoke('stop_track').catch(console.error)
             this.#saveDebounced()
             return
         }
@@ -374,7 +387,7 @@ class Player {
         this.#clearMediaSession()
         this.#stopPolling()
         void this.#syncBackendQueue().catch(console.error)
-        invoke('stop_music').catch(console.error)
+        invoke('stop_track').catch(console.error)
         this.#saveDebounced()
     }
 
@@ -413,7 +426,7 @@ class Player {
 
     resume = async () => {
         try {
-            await invoke('resume_music')
+            await invoke('resume_track')
             this.playing = true
             this.#syncMediaSession()
             this.#startPolling()
@@ -424,7 +437,7 @@ class Player {
 
     pause = async () => {
         try {
-            await invoke('pause_music')
+            await invoke('pause_track')
             this.playing = false
             this.#syncMediaSession()
             this.#stopPolling()
@@ -460,11 +473,14 @@ class Player {
             const volume = await store.get<number>("volume")
 
             if (playlist && playlist.length > 0) {
-                this.playlist = playlist
+                this.playlist = playlist.filter(this.#isPersistedTrack)
             }
             if (typeof currentIndex === "number" && currentIndex >= 0) {
                 this.currentIndex = currentIndex
             }
+            if (this.playlist.length === 0) {
+                this.currentIndex = -1
+            }
             if (this.playlist.length > 0 && this.currentIndex >= this.playlist.length) {
                 this.currentIndex = this.playlist.length - 1
             }
@@ -485,8 +501,8 @@ class Player {
         }
     }
 
-    #findTrackIndexByIdentity(id?: string | null, path?: string | null) {
-        if (id) {
+    #findTrackIndexByIdentity(id?: number | null, path?: string | null) {
+        if (typeof id === 'number') {
             const index = this.playlist.findIndex(track => track.id === id)
             if (index !== -1) return index
         }
@@ -533,7 +549,7 @@ class Player {
         this.playing = payload.playing
         this.#syncMediaSession()
 
-        if (this.currentTrack && this.currentTime >= this.currentTrack.duration - 0.5) {
+        if (this.currentTrack && this.currentTime >= this.#trackDurationSeconds(this.currentTrack) - 0.5) {
             this.#handleTrackEnded()
         }
     }
@@ -622,11 +638,7 @@ class Player {
 
         try {
             this.currentTime = 0
-            if (track.path) {
-                await invoke('play_music', { fullPath: track.path, trackId: track.id })
-            } else {
-                await invoke('play_online_music', { url: track.url, id: track.id })
-            }
+            await invoke('play_track', { fullPath: track.path, trackId: track.id })
 
             if (currentToken !== this.#loadToken) return
 
@@ -649,7 +661,7 @@ class Player {
             }
             try {
                 this.currentTime = await invoke<number>('current_time')
-                if (this.currentTrack && this.currentTime >= this.currentTrack.duration - 0.5) {
+                if (this.currentTrack && this.currentTime >= this.#trackDurationSeconds(this.currentTrack) - 0.5) {
                     this.#handleTrackEnded()
                 }
             } catch (e) {
diff --git a/src/lib/state/recent.svelte.ts b/src/lib/state/recent.svelte.ts
index a95d396..b22be99 100644
--- a/src/lib/state/recent.svelte.ts
+++ b/src/lib/state/recent.svelte.ts
@@ -1,7 +1,11 @@
-
 import { invoke } from '@tauri-apps/api/core'
 import type { Track } from '../types/music'
 
+type RecentPlayedTrack = {
+    track: Track
+    playedAt: string
+}
+
 class RecentlyPlayed {
     tracks = $state<Track[]>([])
     isLoading = $state(false)
@@ -17,12 +21,16 @@ class RecentlyPlayed {
         this.isLoading = true
         this.error = null
 
-        this.loadPromise = invoke<Track[]>('load_recently_played')
-            .then((tracks) => {
+        this.loadPromise = invoke<RecentPlayedTrack[]>('load_recently_played', {
+            limit: 100,
+            offset: 0,
+        })
+            .then(records => {
+                const tracks = records.map(record => record.track)
                 this.tracks = tracks
                 return tracks
             })
-            .catch((err) => {
+            .catch(err => {
                 console.error('加载最近播放失败:', err)
                 this.error = String(err)
                 return this.tracks
@@ -38,22 +46,21 @@ class RecentlyPlayed {
     async add(track: Track): Promise<Track[]> {
         const safeTrack: Track = {
             ...track,
-            cover: null
+            cover: null,
         }
 
-        // 先立即更新前端状态，让 UI 马上变化
         this.tracks = [
             safeTrack,
-            ...this.tracks.filter((item) => item.path !== safeTrack.path)
+            ...this.tracks.filter(item => item.id !== safeTrack.id),
         ].slice(0, 100)
 
         try {
-            const tracks = await invoke<Track[]>('add_recently_played', {
-                track: safeTrack
+            await invoke('add_recently_played', {
+                trackId: safeTrack.id,
+                playedAt: new Date().toISOString(),
             })
 
-            this.tracks = tracks
-            return tracks
+            return this.tracks
         } catch (err) {
             console.error('写入最近播放失败:', err)
             this.error = String(err)
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index 24cbc00..d9ba1f8 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -25,7 +25,7 @@ class SettingsState {
             this.data = await invoke<AppSettings>('load_settings')
             return this.data
         } catch (error) {
-            console.error('加载设置失败:', error)
+            console.error(error)
             this.error = String(error)
             return this.data
         } finally {
@@ -38,7 +38,6 @@ class SettingsState {
             ...this.data,
             ...patch,
         }
-
         this.scheduleSave()
     }
 
@@ -49,10 +48,9 @@ class SettingsState {
             this.data = await invoke<AppSettings>('save_settings', {
                 settings: this.data,
             })
-
             return this.data
         } catch (error) {
-            console.error('保存设置失败:', error)
+            console.error(error)
             this.error = String(error)
             return this.data
         }
@@ -86,4 +84,4 @@ class SettingsState {
     }
 }
 
-export const settings = new SettingsState()
\ No newline at end of file
+export const settings = new SettingsState()
diff --git a/src/lib/types/config.ts b/src/lib/types/config.ts
deleted file mode 100644
index 972a846..0000000
--- a/src/lib/types/config.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export type ShortcutAction = 'playPause' | 'stop' | 'previous' | 'next'
-
-export interface ShortcutConfig {
-    playPause: string
-    stop: string
-    previous: string
-    next: string
-}
-
-export interface AppConfig {
-    shortcuts: ShortcutConfig
-}
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index e37fefc..7f20cfa 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -1,4 +1,3 @@
-export type { AppConfig, ShortcutAction, ShortcutConfig } from './config'
 export type {
     AppExtension,
     ExtensionCommand,
diff --git a/src/lib/types/music.ts b/src/lib/types/music.ts
index 8881133..6102b8f 100644
--- a/src/lib/types/music.ts
+++ b/src/lib/types/music.ts
@@ -1,15 +1,16 @@
 export interface Track {
-    id: string
+    id: number
     title: string
-    artist: string
-    album: string
-    albumArtist: string
+    artist: string | null
+    album: string | null
     duration: number
-    sampleRate?: number | null
-    cover?: string | null
     path: string
-    url?: string
-    tags?: string[]
+    cover: string | null
+    fileSize: number | null
+    playCount: number
+    lastPlayedAt: string | null
+    createdAt: string
+    updatedAt: string
 }
 
 export interface Playlist {
@@ -18,22 +19,20 @@ export interface Playlist {
   cover: string
 }
 
-
 export interface Artist {
     id: string
     name: string
-    cover?: string | null
+    cover: string | null
     trackCount: number
     albumCount: number
     tracks: Track[]
 }
 
-
 export interface Album {
     id: string
     title: string
     artist: string
-    cover?: string | null
+    cover: string | null
     tracks: Track[]
     trackCount: number
     representativeTrack: Track
diff --git a/src/lib/types/settings.ts b/src/lib/types/settings.ts
index d9cef76..9bdcdbe 100644
--- a/src/lib/types/settings.ts
+++ b/src/lib/types/settings.ts
@@ -1,4 +1,3 @@
-
 export type ThemeMode = 'auto' | 'light' | 'dark'
 
 export interface AppSettings {
@@ -8,4 +7,4 @@ export interface AppSettings {
     scanOnStartup: boolean
     reduceMotion: boolean
     useAlbumArtistGrouping: boolean
-}
\ No newline at end of file
+}
diff --git a/src/lib/utils/library.ts b/src/lib/utils/library.ts
index 047dd30..d18c3e1 100644
--- a/src/lib/utils/library.ts
+++ b/src/lib/utils/library.ts
@@ -2,7 +2,7 @@ import { musicLibrary } from '$lib/state/library.svelte'
 import { settings } from '$lib/state/settings.svelte'
 import { open } from '@tauri-apps/plugin-dialog'
 
-export async function importMusicDirectory() {
+export async function scanDirectory() {
     try {
         const selected = await open({
             directory: true,
@@ -16,7 +16,7 @@ export async function importMusicDirectory() {
 
         await musicLibrary.scan()
     } catch (err) {
-        console.error('导入音乐媒体库目录失败:', err)
+        console.error('扫描音乐媒体库目录失败:', err)
     }
 }
 
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index 9ce1fb8..f8180d3 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -12,7 +12,7 @@
     import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import {
-        importMusicDirectory,
+        scanDirectory,
         removeMusicDirectory,
     } from '$lib/utils/library'
     import { invoke } from '@tauri-apps/api/core'
@@ -40,7 +40,7 @@
     let searchQuery = $state('')
     let sortBy = $state<SortBy>('title')
     let isBatchMode = $state(false)
-    let selectedTrackIds = $state<string[]>([])
+    let selectedTrackIds = $state<number[]>([])
     let isLibraryDialogOpen = $state(false)
     let isAddAllSnackbarOpen = $state(false)
     let isDeleteConfirmDialogOpen = $state(false)
@@ -135,7 +135,7 @@
         const paths = getSelectedTrackPaths()
 
         try {
-            await invoke('trash_music_files', { paths })
+            await invoke('trash_track_files', { paths })
             await musicLibrary.scan()
             closeBatchMode()
         } catch (err) {
@@ -148,7 +148,7 @@
         const paths = getSelectedTrackPaths()
 
         try {
-            await invoke('delete_music_files', { paths })
+            await invoke('delete_track_files', { paths })
             await musicLibrary.scan()
             closeBatchMode()
         } catch (err) {
@@ -420,7 +420,7 @@
             </div>
 
             <div class="flex">
-                <Button variant="tonal" onclick={importMusicDirectory}>
+                <Button variant="tonal" onclick={scanDirectory}>
                     添加本地文件夹
                 </Button>
             </div>
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 652ce59..e80260e 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -5,10 +5,9 @@
     import SettingsListItem from '$lib/features/settings/SettingsListItem.svelte'
     import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
     import SettingsSection from '$lib/features/settings/SettingsSection.svelte'
-    import ShortcutSettingsPanel from '$lib/features/settings/ShortcutSettingsPanel.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import type { ThemeMode } from '$lib/types'
-    import { importMusicDirectory, removeMusicDirectory } from '$lib/utils/library'
+    import { scanDirectory, removeMusicDirectory } from '$lib/utils/library'
     import { onMount } from 'svelte'
 
     import { setTheme } from '@tauri-apps/api/app'
@@ -89,10 +88,6 @@
             </SettingsRow>
         </SettingsSection>
 
-        <SettingsSection title="快捷键">
-            <ShortcutSettingsPanel />
-        </SettingsSection>
-
         <SettingsSection title="媒体库">
             <SettingsRow
                 title="启动时扫描"
@@ -115,7 +110,7 @@
                 </div>
 
                 <div class="flex">
-                    <Button variant="tonal" onclick={importMusicDirectory}>
+                    <Button variant="tonal" onclick={scanDirectory}>
                         添加本地文件夹
                     </Button>
                 </div>

From 3f77fde02eaa36039213b7e61321ac8e7dde99d9 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Wed, 3 Jun 2026 13:54:25 +0800
Subject: [PATCH 25/39] refactor(audio): refactor audio & playback queue, add
 queue model

- Split and refactor audio internals: extracted AudioGraph and AudioState into src-tauri/src/audio/{graph,state}.rs and introduced audio::mod with helpers.
- Replaced the previous global AudioState layout with a state that embeds a PlaybackQueue model.
- Added a comprehensive PlaybackQueue type (sync/insert/remove/next/previous/shuffle/history) and moved queue logic into it.
- Updated commands and services to use the new queue API (new playback_queue commands, playback_service refactor, playback_events emit payloads as PlaybackQueue) and adjusted state/locking usage.
- Updated frontend types and components to use player.queue instead of legacy playlist/currentIndex.
- Added rand dependency for shuffle behavior and removed several now-obsolete files.
- Minor UI/formatting tweaks applied.
---
 src-tauri/Cargo.lock                        |   1 +
 src-tauri/Cargo.toml                        |   1 +
 src-tauri/src/audio.rs                      |  53 --
 src-tauri/src/audio/graph.rs                |  16 +
 src-tauri/src/audio/mod.rs                  |  21 +
 src-tauri/src/audio/state.rs                |  46 ++
 src-tauri/src/commands/library.rs           |   8 +-
 src-tauri/src/commands/mod.rs               |   1 +
 src-tauri/src/commands/playback.rs          | 122 ++---
 src-tauri/src/commands/playback_queue.rs    |  58 ++
 src-tauri/src/lib.rs                        |  21 +-
 src-tauri/src/models/mod.rs                 |   4 +-
 src-tauri/src/models/playback.rs            |  10 -
 src-tauri/src/models/playback_queue.rs      | 297 +++++++++++
 src-tauri/src/models/settings.rs            |   2 -
 src-tauri/src/services/migration_service.rs | 181 -------
 src-tauri/src/services/mod.rs               |   1 -
 src-tauri/src/services/playback_events.rs   |  31 +-
 src-tauri/src/services/playback_queue.rs    |  88 ----
 src-tauri/src/services/playback_service.rs  | 228 ++++----
 src-tauri/src/state/playback_state.rs       |  29 +-
 src/lib/components/base/IconButton.svelte   |  16 +-
 src/lib/features/PlayerBar.svelte           |   6 +-
 src/lib/features/QueueDrawer.svelte         |  12 +-
 src/lib/features/TrackList.svelte           |   9 +-
 src/lib/state/player.svelte.ts              | 552 ++++----------------
 src/lib/types/index.ts                      |   1 +
 src/lib/types/music.ts                      |   9 +
 src/lib/types/playback.ts                   |  31 ++
 29 files changed, 796 insertions(+), 1059 deletions(-)
 delete mode 100644 src-tauri/src/audio.rs
 create mode 100644 src-tauri/src/audio/graph.rs
 create mode 100644 src-tauri/src/audio/mod.rs
 create mode 100644 src-tauri/src/audio/state.rs
 create mode 100644 src-tauri/src/commands/playback_queue.rs
 create mode 100644 src-tauri/src/models/playback_queue.rs
 delete mode 100644 src-tauri/src/services/migration_service.rs
 delete mode 100644 src-tauri/src/services/playback_queue.rs
 create mode 100644 src/lib/types/playback.ts

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 77b0eb1..da1a0a4 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4862,6 +4862,7 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "lofty",
+ "rand",
  "serde",
  "serde_json",
  "souvlaki",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 145e422..8cac7dc 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -32,4 +32,5 @@ trash = "5.2.6"
 souvlaki = "0.8.3"
 sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "macros", "migrate"] }
 async-trait = "0.1"
+rand = "0.10.1"
 
diff --git a/src-tauri/src/audio.rs b/src-tauri/src/audio.rs
deleted file mode 100644
index d0e21b5..0000000
--- a/src-tauri/src/audio.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::sync::{Mutex, OnceLock};
-
-use serde::{Deserialize, Serialize};
-use web_audio_api::context::AudioContext;
-use web_audio_api::node::GainNode;
-use web_audio_api::MediaElement;
-
-use crate::models::Track;
-
-pub fn get_audio_context() -> &'static AudioContext {
-    static CONTEXT: OnceLock<AudioContext> = OnceLock::new();
-    CONTEXT.get_or_init(|| AudioContext::default())
-}
-
-#[derive(Clone, Copy, Deserialize, Serialize)]
-#[serde(rename_all = "lowercase")]
-pub enum PlayMode {
-    List,
-    Single,
-    Shuffle,
-}
-
-pub struct AudioState {
-    pub media: Option<MediaElement>,
-    pub gain_node: Option<GainNode>,
-    pub volume: f32,
-    pub current_track_id: Option<i64>,
-    pub current_path: Option<String>,
-    pub playing: bool,
-    pub playlist: Vec<Track>,
-    pub current_index: Option<usize>,
-    pub play_mode: PlayMode,
-    pub playback_history: Vec<i64>,
-}
-
-pub fn get_audio_state() -> &'static Mutex<AudioState> {
-    static STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
-
-    STATE.get_or_init(|| {
-        Mutex::new(AudioState {
-            media: None,
-            gain_node: None,
-            volume: 0.8,
-            current_track_id: None,
-            current_path: None,
-            playing: false,
-            playlist: Vec::new(),
-            current_index: None,
-            play_mode: PlayMode::List,
-            playback_history: Vec::new(),
-        })
-    })
-}
diff --git a/src-tauri/src/audio/graph.rs b/src-tauri/src/audio/graph.rs
new file mode 100644
index 0000000..4471ff0
--- /dev/null
+++ b/src-tauri/src/audio/graph.rs
@@ -0,0 +1,16 @@
+use web_audio_api::{MediaElement, node::{AudioNode, GainNode, MediaElementAudioSourceNode, StereoPannerNode}};
+pub struct AudioGraph {
+    pub media: MediaElement,
+    pub src: MediaElementAudioSourceNode,
+    pub gain: GainNode,
+    pub panner: StereoPannerNode,
+}
+
+impl AudioGraph {
+    pub fn destroy(self) {
+        let _ = self.panner.disconnect();
+        let _ = self.gain.disconnect();
+        let _ = self.src.disconnect();
+        self.media.pause();
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/audio/mod.rs b/src-tauri/src/audio/mod.rs
new file mode 100644
index 0000000..eec73bc
--- /dev/null
+++ b/src-tauri/src/audio/mod.rs
@@ -0,0 +1,21 @@
+pub mod graph;
+pub mod state;
+
+pub use graph::AudioGraph;
+pub use state::{AudioState, init_audio_state, lock_audio_state};
+use web_audio_api::{MediaElement, context::AudioContext};
+
+pub fn get_audio_context() -> AudioContext {
+    AudioContext::default()
+}
+
+pub fn with_media<F, R>(state: &mut AudioState, f: F) -> Result<R, String>
+where
+    F: FnOnce(&mut MediaElement) -> R,
+{
+    if let Some(ref mut graph) = state.graph {
+        Ok(f(&mut graph.media))
+    } else {
+        Err("Audio graph is missing".into())
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/audio/state.rs b/src-tauri/src/audio/state.rs
new file mode 100644
index 0000000..e9eb5e5
--- /dev/null
+++ b/src-tauri/src/audio/state.rs
@@ -0,0 +1,46 @@
+use std::sync::{Mutex, MutexGuard, OnceLock};
+use crate::audio::graph::AudioGraph;
+use crate::models::PlaybackQueue;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub enum PlayMode {
+    ListLoop,
+    SingleLoop,
+    Shuffle,
+}
+
+pub struct AudioState {
+    pub graph: Option<AudioGraph>,
+    pub volume: f32,
+    pub pan: f32,
+    pub playing: bool,
+    pub current_track_id: Option<i64>,
+    pub current_path: Option<String>,
+    pub playback_queue: PlaybackQueue,
+    pub play_mode: PlayMode,
+}
+
+static AUDIO_STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
+
+pub fn init_audio_state(queue: PlaybackQueue) {
+    AUDIO_STATE.get_or_init(|| {
+        Mutex::new(AudioState {
+            graph: None,
+            volume: 1.0,
+            pan: 0.0,
+            playing: false,
+            current_track_id: None,
+            current_path: None,
+            playback_queue: queue,
+            play_mode: PlayMode::ListLoop,
+        })
+    });
+}
+
+pub fn lock_audio_state() -> Result<MutexGuard<'static, AudioState>, String> {
+    AUDIO_STATE
+        .get()
+        .ok_or_else(|| "Audio state not initialized".to_string())?
+        .lock()
+        .map_err(|_| "Failed to lock audio state".to_string())
+}
\ No newline at end of file
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index 658a9f9..bca8e4a 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -11,8 +11,7 @@ use walkdir::WalkDir;
 
 use crate::commands::playback::remove_track_from_backend_queue;
 use crate::metadata::parse_single_track;
-use crate::models::playback::PlaybackQueueChangedPayload;
-use crate::models::{NewTrack, Track};
+use crate::models::{NewTrack, PlaybackQueue, Track};
 use crate::state::AppState;
 
 const SUPPORTED_EXT: [&str; 5] = ["mp3", "flac", "m4a", "wav", "ogg"];
@@ -165,9 +164,10 @@ pub async fn delete_track_file(
     app_handle: tauri::AppHandle,
     path: String,
     track_id: i64,
-) -> Result<PlaybackQueueChangedPayload, String> {
+) -> Result<PlaybackQueue, String> {
     let file_path = validate_audio_path(&path)?;
-    trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
+    trash::delete(file_path)
+        .map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
     remove_track_from_backend_queue(app_handle, track_id).await
 }
 
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 6f5d7d7..6fde0aa 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -5,3 +5,4 @@ pub mod playlists;
 pub mod recent;
 pub mod settings;
 pub mod tracks;
+pub mod playback_queue;
\ No newline at end of file
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index 93146fb..322bc2f 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -1,20 +1,15 @@
 use tauri::{command, AppHandle};
-
-use crate::audio::PlayMode;
-use crate::models::playback::{
-    PlaybackQueueChangedPayload, PlaybackStatusSnapshot,
-};
-use crate::models::Track;
-use crate::services::playback_events::{
-    emit_queue_changed, queue_payload_from_state, status_snapshot,
-};
+use crate::audio::state::PlayMode;
+use crate::models::playback::PlaybackStatusSnapshot;
+use crate::models::{PlaybackQueue, Track};
+use crate::services::playback_events::{emit_queue_changed, status_snapshot};
 use crate::services::playback_service::{
     handle_media_control_event_internal, load_track_for_playback, pause_internal,
     play_current_index_internal, play_next_internal, play_previous_internal, play_track_internal,
     resume_internal, seek_internal, stop_internal, toggle_internal,
 };
 use crate::state::playback_state::{
-    current_time_from_state, sanitize_track, with_audio_state,
+    current_time_from_state, lock_audio_state, sanitize_track, with_audio_state,
 };
 
 pub use crate::services::playback_service::spawn_playback_progress_task;
@@ -28,54 +23,39 @@ pub async fn sync_playback_queue(
     playlist: Vec<Track>,
     current_index: Option<usize>,
     play_mode: PlayMode,
-    playback_history: Vec<i64>,
+    history: Vec<i64>,
 ) -> Result<(), String> {
-    with_audio_state(|state| {
-        state.playlist = playlist.into_iter().map(sanitize_track).collect();
-        state.current_index = current_index.filter(|index| *index < state.playlist.len());
-        state.play_mode = play_mode;
-        state.playback_history = playback_history;
-    })
+    let mut state = lock_audio_state()?;
+    state.play_mode = play_mode;
+    state.playback_queue.sync(
+        playlist.into_iter().map(sanitize_track).collect(),
+        current_index,
+        play_mode,
+        history,
+    );
+    Ok(())
 }
 
 #[command]
 pub async fn remove_track_from_backend_queue(
     app_handle: AppHandle,
     track_id: i64,
-) -> Result<PlaybackQueueChangedPayload, String> {
-    let mut play_index = None;
-    let mut should_stop = false;
-
-    {
-        let mut state = crate::state::playback_state::lock_audio_state()?;
-
-        let Some(remove_index) = state.playlist.iter().position(|track| track.id == track_id) else {
-            return Ok(queue_payload_from_state(&state));
-        };
-
-        let was_current = state.current_index == Some(remove_index);
-        state.playlist.remove(remove_index);
-        state.playback_history.retain(|id| id != &track_id);
-
-        if state.playlist.is_empty() {
-            state.current_index = None;
-            should_stop = true;
-        } else if was_current {
-            let next_index = remove_index.min(state.playlist.len() - 1);
-            state.current_index = Some(next_index);
-            play_index = Some(next_index);
-        } else if let Some(current_index) = state.current_index {
-            if remove_index < current_index {
-                state.current_index = Some(current_index - 1);
-            }
+) -> Result<PlaybackQueue, String> {
+    let result = {
+        let mut state = lock_audio_state()?;
+
+        if !state.playback_queue.contains_track(track_id) {
+            return Ok(state.playback_queue.payload());
         }
-    }
+
+        state.playback_queue.remove_track(track_id)
+    };
 
     let payload = emit_queue_changed(&app_handle)?;
 
-    if should_stop {
+    if result.should_stop {
         let _ = stop_internal(app_handle).await;
-    } else if let Some(index) = play_index {
+    } else if let Some(index) = result.play_index {
         let _ = play_current_index_internal(&app_handle, index);
     }
 
@@ -86,33 +66,10 @@ pub async fn remove_track_from_backend_queue(
 pub async fn insert_track_as_next(
     app_handle: AppHandle,
     track: Track,
-) -> Result<PlaybackQueueChangedPayload, String> {
-    {
-        let mut state = crate::state::playback_state::lock_audio_state()?;
-        let track = sanitize_track(track);
-
-        if let Some(existing_index) = state.playlist.iter().position(|item| item.id == track.id) {
-            if state.current_index == Some(existing_index) {
-                return Ok(queue_payload_from_state(&state));
-            }
-
-            state.playlist.remove(existing_index);
-
-            if let Some(current_index) = state.current_index {
-                if existing_index < current_index {
-                    state.current_index = Some(current_index - 1);
-                }
-            }
-        }
-
-        if state.playlist.is_empty() || state.current_index.is_none() {
-            state.playlist = vec![track];
-            state.current_index = Some(0);
-        } else {
-            let insert_index = state.current_index.unwrap_or(0) + 1;
-            state.playlist.insert(insert_index, track);
-        }
-    }
+) -> Result<PlaybackQueue, String> {
+    with_audio_state(|state| {
+        state.playback_queue.insert_next(track);
+    })?;
 
     emit_queue_changed(&app_handle)
 }
@@ -180,14 +137,15 @@ pub async fn set_current_time(app_handle: AppHandle, time: f64) {
 
 #[command]
 pub async fn set_volume(volume: u8) -> Result<(), String> {
-    with_audio_state(|state| {
-        let volume = volume as f32 / 100.0;
-        let safe_volume = volume.clamp(0.0, 1.0);
+    let mut state = lock_audio_state()?;
+    let volume_f32 = volume as f32 / 100.0;
+    let safe_volume = volume_f32.clamp(0.0, 1.0);
 
-        state.volume = safe_volume;
+    state.volume = safe_volume;
 
-        if let Some(ref gain_node) = state.gain_node {
-            gain_node.gain().set_value(safe_volume);
-        }
-    })
-}
+    if let Some(ref graph) = state.graph {
+        graph.gain.gain().set_value(safe_volume);
+    }
+
+    Ok(())
+}
\ No newline at end of file
diff --git a/src-tauri/src/commands/playback_queue.rs b/src-tauri/src/commands/playback_queue.rs
new file mode 100644
index 0000000..08821a7
--- /dev/null
+++ b/src-tauri/src/commands/playback_queue.rs
@@ -0,0 +1,58 @@
+use tauri::{command, AppHandle};
+use crate::audio::state::PlayMode;
+use crate::models::{PlaybackQueue, Track};
+use crate::services::playback_events::{emit_queue_changed, queue_snapshot};
+use crate::services::playback_service::{play_current_index_internal, stop_internal};
+use crate::state::playback_state::{lock_audio_state, with_audio_state};
+
+#[command]
+pub fn get_playback_queue() -> Result<PlaybackQueue, String> {
+    with_audio_state(|state| state.playback_queue.clone())
+}
+
+#[command]
+pub async fn clear_queue(app: AppHandle) -> Result<PlaybackQueue, String> {
+    {
+        let mut state = lock_audio_state()?;
+        state.playback_queue.clear();
+    }
+    stop_internal(app.clone()).await?;
+    emit_queue_changed(&app)?;
+    queue_snapshot()
+}
+
+#[command]
+pub fn set_play_mode(app: AppHandle, mode: PlayMode) -> Result<PlaybackQueue, String> {
+    {
+        let mut state = lock_audio_state()?;
+        state.play_mode = mode;
+        state.playback_queue.play_mode = mode;
+    }
+    emit_queue_changed(&app)?;
+    queue_snapshot()
+}
+
+#[command]
+pub fn insert_tracks_as_next(app: AppHandle, tracks: Vec<Track>) -> Result<PlaybackQueue, String> {
+    {
+        let mut state = lock_audio_state()?;
+        state.playback_queue.insert_tracks_next(tracks);
+    }
+    emit_queue_changed(&app)?;
+    queue_snapshot()
+}
+
+#[command]
+pub async fn replace_playlist_and_play(
+    app: AppHandle,
+    tracks: Vec<Track>,
+    target_id: i64,
+) -> Result<(), String> {
+    let play_index = {
+        let mut state = lock_audio_state()?;
+        state.playback_queue.replace_playlist(tracks, target_id)?
+    };
+    emit_queue_changed(&app)?;
+    play_current_index_internal(&app, play_index)?;
+    Ok(())
+}
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 2e9ca54..1a04047 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -19,7 +19,7 @@ use tauri::{
 
 use commands::library::{
     delete_track_file, delete_track_files, get_track_cover, load_track_library,
-    scan_track_directories, show_in_folder, trash_track_files,
+    scan_track_directories, show_in_folder, trash_track_files, execute_scan
 };
 
 use commands::playback::{
@@ -46,11 +46,19 @@ use commands::tracks::{
 use db::DatabaseManager;
 use media_controls::init_media_controls;
 use repositories::sqlite::{
-    SqlitePlaylistRepository, SqliteRecentRepository, SqliteSettingsRepository, SqliteTrackRepository,
+    SqlitePlaylistRepository, SqliteRecentRepository, SqliteSettingsRepository,
+    SqliteTrackRepository,
 };
 use services::{PlaylistService, RecentService, SettingsService, TrackService};
 use state::AppState;
 
+use commands::playback_queue::{
+    clear_queue, get_playback_queue, insert_tracks_as_next, replace_playlist_and_play,
+    set_play_mode,
+};
+
+use audio::init_audio_state;
+
 pub fn init_startup_scan(_app_handle: tauri::AppHandle) {}
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -82,6 +90,8 @@ pub fn run() {
 
             app.manage(app_state);
 
+            init_audio_state(models::PlaybackQueue::default());
+
             let _ = init_media_controls(app.handle().clone());
             spawn_playback_progress_task(app.handle().clone());
 
@@ -134,7 +144,7 @@ pub fn run() {
                     if let Ok(settings) = state.settings.get_settings().await {
                         if settings.scan_on_startup {
                             if let Ok(scanned) =
-                                crate::commands::library::execute_scan(settings.library_dirs)
+                                execute_scan(settings.library_dirs)
                             {
                                 let mut tracks = Vec::with_capacity(scanned.len());
                                 for track in scanned {
@@ -219,6 +229,11 @@ pub fn run() {
             update_settings,
             load_settings,
             save_settings,
+            get_playback_queue,
+            replace_playlist_and_play,
+            insert_tracks_as_next,
+            set_play_mode,
+            clear_queue,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
index 4b02214..435d9d2 100644
--- a/src-tauri/src/models/mod.rs
+++ b/src-tauri/src/models/mod.rs
@@ -3,8 +3,10 @@ pub mod playlist;
 pub mod settings;
 pub mod track;
 pub mod recent;
+pub mod playback_queue;
 
 pub use playlist::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
 pub use settings::{AppSettings, SettingRow, ThemeMode};
 pub use track::{NewTrack, SortDirection, Track, TrackSearchQuery, TrackSortBy, UpdateTrack};
-pub use recent::RecentPlayedWithTrack;
\ No newline at end of file
+pub use recent::RecentPlayedWithTrack;
+pub use playback_queue::PlaybackQueue;
\ No newline at end of file
diff --git a/src-tauri/src/models/playback.rs b/src-tauri/src/models/playback.rs
index 9ae4614..18d6c26 100644
--- a/src-tauri/src/models/playback.rs
+++ b/src-tauri/src/models/playback.rs
@@ -1,6 +1,5 @@
 use serde::Serialize;
 
-use crate::audio::PlayMode;
 use crate::models::Track;
 
 #[derive(Clone)]
@@ -52,15 +51,6 @@ pub struct PlaybackTrackStartedPayload {
     pub current_time: f64,
 }
 
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackQueueChangedPayload {
-    pub playlist: Vec<Track>,
-    pub current_index: Option<usize>,
-    pub play_mode: PlayMode,
-    pub playback_history: Vec<i64>,
-}
-
 #[derive(Clone)]
 pub struct PlaybackTrackInfo {
     pub id: Option<i64>,
diff --git a/src-tauri/src/models/playback_queue.rs b/src-tauri/src/models/playback_queue.rs
new file mode 100644
index 0000000..c1c55bf
--- /dev/null
+++ b/src-tauri/src/models/playback_queue.rs
@@ -0,0 +1,297 @@
+use rand::RngExt;
+use serde::{Deserialize, Serialize};
+
+use crate::audio::state::PlayMode;
+use crate::models::Track;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackQueue {
+    pub tracks: Vec<Track>,
+    pub current_index: Option<usize>,
+    pub play_mode: PlayMode,
+    pub history: Vec<i64>,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct QueueRemoveResult {
+    pub play_index: Option<usize>,
+    pub should_stop: bool,
+}
+
+impl Default for PlaybackQueue {
+    fn default() -> Self {
+        Self {
+            tracks: Vec::new(),
+            current_index: None,
+            play_mode: PlayMode::ListLoop,
+            history: Vec::new(),
+        }
+    }
+}
+
+impl PlaybackQueue {
+    pub fn sync(
+        &mut self,
+        tracks: Vec<Track>,
+        current_index: Option<usize>,
+        play_mode: PlayMode,
+        history: Vec<i64>,
+    ) {
+        self.tracks = tracks;
+        self.current_index = current_index.filter(|i| *i < self.tracks.len());
+        self.play_mode = play_mode;
+        self.history = history;
+    }
+
+    pub fn clear(&mut self) {
+        self.tracks.clear();
+        self.current_index = None;
+        self.history.clear();
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.tracks.is_empty()
+    }
+
+    pub fn len(&self) -> usize {
+        self.tracks.len()
+    }
+
+    pub fn current_index(&self) -> Option<usize> {
+        self.current_index
+    }
+
+    pub fn set_current_index(&mut self, index: Option<usize>) {
+        self.current_index = index.filter(|i| *i < self.tracks.len());
+    }
+
+    pub fn set_play_mode(&mut self, mode: PlayMode) {
+        self.play_mode = mode;
+    }
+
+    pub fn current_track(&self) -> Option<&Track> {
+        self.current_index.and_then(|i| self.tracks.get(i))
+    }
+
+    pub fn current_track_cloned(&self) -> Option<Track> {
+        self.current_track().cloned()
+    }
+
+    pub fn track(&self, index: usize) -> Option<&Track> {
+        self.tracks.get(index)
+    }
+
+    pub fn require_track(
+        &self,
+        index: usize,
+    ) -> Result<Track, String> {
+        self.tracks
+            .get(index)
+            .cloned()
+            .ok_or_else(|| "Invalid queue index".to_string())
+    }
+
+    pub fn contains_track(
+        &self,
+        track_id: i64,
+    ) -> bool {
+        self.tracks.iter().any(|t| t.id == track_id)
+    }
+
+    pub fn find_track(
+        &self,
+        track_id: i64,
+    ) -> Option<&Track> {
+        self.tracks.iter().find(|t| t.id == track_id)
+    }
+
+    pub fn remove_track(
+        &mut self,
+        track_id: i64,
+    ) -> QueueRemoveResult {
+        let Some(remove_index) =
+            self.tracks.iter().position(|track| track.id == track_id)
+        else {
+            return QueueRemoveResult {
+                play_index: None,
+                should_stop: false,
+            };
+        };
+
+        let was_current = self.current_index == Some(remove_index);
+
+        self.tracks.remove(remove_index);
+        self.history.retain(|id| *id != track_id);
+
+        if self.tracks.is_empty() {
+            self.current_index = None;
+
+            return QueueRemoveResult {
+                play_index: None,
+                should_stop: true,
+            };
+        }
+
+        if was_current {
+            let next_index = remove_index.min(self.tracks.len() - 1);
+
+            self.current_index = Some(next_index);
+
+            return QueueRemoveResult {
+                play_index: Some(next_index),
+                should_stop: false,
+            };
+        }
+
+        if let Some(current_index) = self.current_index {
+            if remove_index < current_index {
+                self.current_index = Some(current_index - 1);
+            }
+        }
+
+        QueueRemoveResult {
+            play_index: None,
+            should_stop: false,
+        }
+    }
+
+    pub fn insert_next(
+        &mut self,
+        mut track: Track,
+    ) {
+        track.cover = None;
+
+        if let Some(existing_index) =
+            self.tracks.iter().position(|item| item.id == track.id)
+        {
+            if self.current_index == Some(existing_index) {
+                return;
+            }
+
+            self.tracks.remove(existing_index);
+
+            if let Some(current_index) = self.current_index {
+                if existing_index < current_index {
+                    self.current_index = Some(current_index - 1);
+                }
+            }
+        }
+
+        if self.tracks.is_empty() || self.current_index.is_none() {
+            self.tracks.push(track);
+            self.current_index = Some(0);
+            return;
+        }
+
+        let insert_index = self.current_index.unwrap() + 1;
+
+        self.tracks.insert(insert_index, track);
+    }
+
+    pub fn insert_tracks_next(
+        &mut self,
+        tracks: Vec<Track>,
+    ) {
+        for track in tracks {
+            self.insert_next(track);
+        }
+    }
+
+    pub fn replace_playlist(
+        &mut self,
+        tracks: Vec<Track>,
+        target_id: i64,
+    ) -> Result<usize, String> {
+        self.tracks = tracks;
+        self.history.clear();
+        let index = self
+            .tracks
+            .iter()
+            .position(|t| t.id == target_id)
+            .unwrap_or(0);
+        self.current_index = Some(index);
+        Ok(index)
+    }
+
+    pub fn next_index(&self) -> Option<usize> {
+        if self.tracks.is_empty() {
+            return None;
+        }
+
+        let current = self.current_index.unwrap_or(0);
+
+        match self.play_mode {
+            PlayMode::SingleLoop => Some(current),
+
+            PlayMode::ListLoop => {
+                Some((current + 1) % self.tracks.len())
+            }
+
+            PlayMode::Shuffle => {
+                if self.tracks.len() <= 1 {
+                    return Some(0);
+                }
+
+                let mut rng = rand::rng();
+
+                loop {
+                    let next = rng.random_range(0..self.tracks.len());
+
+                    if next != current {
+                        return Some(next);
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn previous_index(&self) -> Option<usize> {
+        if self.tracks.is_empty() {
+            return None;
+        }
+
+        if let Some(last_id) = self.history.last() {
+            if let Some(index) =
+                self.tracks.iter().position(|track| track.id == *last_id)
+            {
+                return Some(index);
+            }
+        }
+
+        let current = self.current_index.unwrap_or(0);
+
+        Some(if current == 0 {
+            self.tracks.len() - 1
+        } else {
+            current - 1
+        })
+    }
+
+    pub fn move_next(&mut self) -> Option<usize> {
+        if let Some(track) = self.current_track() {
+            if self.history.last() != Some(&track.id) {
+                self.history.push(track.id);
+            }
+        }
+
+        self.next_index()
+    }
+
+    pub fn move_previous(&mut self) -> Option<usize> {
+        let index = self.previous_index()?;
+
+        if let Some(track) = self.tracks.get(index) {
+            if self.history.last() == Some(&track.id) {
+                self.history.pop();
+            }
+        }
+
+        Some(index)
+    }
+
+    pub fn payload(&self) -> Self {
+        self.clone()
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/models/settings.rs b/src-tauri/src/models/settings.rs
index 1970c88..57ac6ae 100644
--- a/src-tauri/src/models/settings.rs
+++ b/src-tauri/src/models/settings.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use serde::{Deserialize, Serialize};
 use sqlx::FromRow;
 
diff --git a/src-tauri/src/services/migration_service.rs b/src-tauri/src/services/migration_service.rs
deleted file mode 100644
index 36fcaba..0000000
--- a/src-tauri/src/services/migration_service.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use std::fs;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use serde::Deserialize;
-use tauri::Manager;
-
-use crate::models::{AddPlaylistTrack, NewPlaylist, NewTrack};
-use crate::repositories::sqlite::playlist_repository::SqlitePlaylistRepository;
-use crate::repositories::sqlite::track_repository::SqliteTrackRepository;
-
-#[derive(Clone)]
-pub struct MigrationService {
-    tracks: Arc<SqliteTrackRepository>,
-    playlists: Arc<SqlitePlaylistRepository>,
-}
-
-impl MigrationService {
-    pub fn new(tracks: Arc<SqliteTrackRepository>, playlists: Arc<SqlitePlaylistRepository>) -> Self {
-        Self { tracks, playlists }
-    }
-
-    pub async fn import_legacy_json_if_needed(
-        &self,
-        app_handle: &tauri::AppHandle,
-    ) -> Result<(), String> {
-        let app_data_path = app_handle
-            .path()
-            .app_data_dir()
-            .map_err(|error| error.to_string())?;
-
-        if !app_data_path.exists() {
-            return Ok(());
-        }
-
-        self.import_track_files(&app_data_path).await?;
-        self.import_playlist_file(&app_data_path).await?;
-        self.import_recent_files(&app_data_path).await?;
-
-        Ok(())
-    }
-
-    async fn import_track_files(&self, app_data_path: &PathBuf) -> Result<(), String> {
-        for name in ["tracks.json", "library.json"] {
-            let path = app_data_path.join(name);
-            if !path.exists() || backup_path(&path).exists() {
-                continue;
-            }
-
-            let tracks = read_json::<Vec<LegacyTrack>>(&path)?;
-
-            for track in tracks {
-                self.tracks
-                    .upsert_by_path(legacy_track_to_new_track(track))
-                    .await?;
-            }
-
-            backup_file(&path)?;
-        }
-
-        Ok(())
-    }
-
-    async fn import_recent_files(&self, app_data_path: &PathBuf) -> Result<(), String> {
-        for name in ["recent.json", "recently_played.json"] {
-            let path = app_data_path.join(name);
-            if !path.exists() || backup_path(&path).exists() {
-                continue;
-            }
-
-            let tracks = read_json::<Vec<LegacyTrack>>(&path)?;
-
-            for track in tracks {
-                let _saved = self
-                    .tracks
-                    .upsert_by_path(legacy_track_to_new_track(track))
-                    .await?;
-            }
-
-            backup_file(&path)?;
-        }
-
-        Ok(())
-    }
-
-    async fn import_playlist_file(&self, app_data_path: &PathBuf) -> Result<(), String> {
-        let path = app_data_path.join("playlist.json");
-        if !path.exists() || backup_path(&path).exists() {
-            return Ok(());
-        }
-
-        let playlists = read_json::<Vec<LegacyPlaylist>>(&path)?;
-
-        for legacy in playlists {
-            let playlist = self
-                .playlists
-                .create(NewPlaylist {
-                    name: legacy.name.unwrap_or_else(|| "未命名歌单".to_string()),
-                })
-                .await?;
-
-            for (position, track) in legacy.tracks.into_iter().enumerate() {
-                let saved = self
-                    .tracks
-                    .upsert_by_path(legacy_track_to_new_track(track))
-                    .await?;
-                self.playlists
-                    .add_track(AddPlaylistTrack {
-                        playlist_id: playlist.id,
-                        track_id: saved.id,
-                        position: Some(position as i64),
-                    })
-                    .await?;
-            }
-        }
-
-        backup_file(&path)
-    }
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct LegacyTrack {
-    title: String,
-    artist: String,
-    album: String,
-    duration: f64,
-    cover: Option<String>,
-    path: String,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct LegacyPlaylist {
-    name: Option<String>,
-    #[serde(default)]
-    tracks: Vec<LegacyTrack>,
-}
-
-fn read_json<T>(path: &PathBuf) -> Result<T, String>
-where
-    T: for<'de> Deserialize<'de>,
-{
-    let file = fs::File::open(path).map_err(|error| error.to_string())?;
-    serde_json::from_reader(file).map_err(|error| error.to_string())
-}
-
-fn legacy_track_to_new_track(track: LegacyTrack) -> NewTrack {
-    let file_size = fs::metadata(&track.path)
-        .ok()
-        .and_then(|metadata| i64::try_from(metadata.len()).ok());
-
-    NewTrack {
-        title: empty_to_unknown(track.title, "未知歌曲"),
-        artist: Some(empty_to_unknown(track.artist, "未知歌手")),
-        album: Some(empty_to_unknown(track.album, "未知专辑")),
-        duration: (track.duration * 1000.0).round().max(0.0) as i64,
-        path: track.path,
-        cover: track.cover,
-        file_size,
-    }
-}
-
-fn empty_to_unknown(value: String, fallback: &str) -> String {
-    let value = value.trim().to_string();
-    if value.is_empty() {
-        fallback.to_string()
-    } else {
-        value
-    }
-}
-
-fn backup_path(path: &PathBuf) -> PathBuf {
-    let mut value = path.clone();
-    value.set_extension("json.bak");
-    value
-}
-
-fn backup_file(path: &PathBuf) -> Result<(), String> {
-    fs::rename(path, backup_path(path)).map_err(|error| error.to_string())
-}
\ No newline at end of file
diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs
index 261c8f1..33676d0 100644
--- a/src-tauri/src/services/mod.rs
+++ b/src-tauri/src/services/mod.rs
@@ -1,5 +1,4 @@
 pub mod playback_events;
-pub mod playback_queue;
 pub mod playback_service;
 pub mod playlist_service;
 pub mod recent_service;
diff --git a/src-tauri/src/services/playback_events.rs b/src-tauri/src/services/playback_events.rs
index 3ec8446..23070fd 100644
--- a/src-tauri/src/services/playback_events.rs
+++ b/src-tauri/src/services/playback_events.rs
@@ -2,36 +2,29 @@ use tauri::{AppHandle, Emitter};
 
 use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
 use crate::models::playback::{
-    NativePlaybackState, PlaybackStateSnapshot,
-    PlaybackQueueChangedPayload, PlaybackTrackStartedPayload,
+    NativePlaybackState, PlaybackStateSnapshot, PlaybackTrackStartedPayload,
 };
-use crate::models::Track;
-use crate::state::playback_state::current_playback_snapshot;
+use crate::models::{PlaybackQueue, Track};
+use crate::state::playback_state::{current_playback_snapshot, with_audio_state};
 
 pub fn status_snapshot() -> Result<PlaybackStateSnapshot, String> {
     current_playback_snapshot()
 }
 
-pub fn queue_payload_from_state(
-    state: &crate::audio::AudioState,
-) -> PlaybackQueueChangedPayload {
-    PlaybackQueueChangedPayload {
-        playlist: state.playlist.clone(),
-        current_index: state.current_index,
-        play_mode: state.play_mode,
-        playback_history: state.playback_history.clone(),
-    }
-}
-
-pub fn queue_snapshot() -> Result<PlaybackQueueChangedPayload, String> {
-    crate::state::playback_state::with_audio_state(|state| queue_payload_from_state(state))
+pub fn queue_snapshot() -> Result<PlaybackQueue, String> {
+    with_audio_state(|state| state.playback_queue.clone())
 }
 
 pub fn emit_queue_changed(
     app_handle: &AppHandle,
-) -> Result<PlaybackQueueChangedPayload, String> {
+) -> Result<PlaybackQueue, String> {
     let payload = queue_snapshot()?;
-    let _ = app_handle.emit("playback:queue-changed", payload.clone());
+
+    let _ = app_handle.emit(
+        "playback:queue-changed",
+        payload.clone(),
+    );
+
     Ok(payload)
 }
 
diff --git a/src-tauri/src/services/playback_queue.rs b/src-tauri/src/services/playback_queue.rs
deleted file mode 100644
index 0e2e37d..0000000
--- a/src-tauri/src/services/playback_queue.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use std::time::{SystemTime, UNIX_EPOCH};
-
-use crate::audio::PlayMode;
-use crate::state::playback_state::with_audio_state;
-
-pub fn next_index_from_state() -> Option<usize> {
-    let state = crate::audio::get_audio_state().lock().ok()?;
-
-    if state.playlist.is_empty() {
-        return None;
-    }
-
-    let current_index = state.current_index.unwrap_or(0);
-
-    match state.play_mode {
-        PlayMode::Single => Some(current_index.min(state.playlist.len() - 1)),
-        PlayMode::List => Some(if current_index >= state.playlist.len() - 1 {
-            0
-        } else {
-            current_index + 1
-        }),
-        PlayMode::Shuffle => {
-            if state.playlist.len() <= 1 {
-                return Some(0);
-            }
-
-            let nanos = SystemTime::now()
-                .duration_since(UNIX_EPOCH)
-                .ok()?
-                .subsec_nanos() as usize;
-            let mut next = nanos % state.playlist.len();
-
-            if next == current_index {
-                next = (next + 1) % state.playlist.len();
-            }
-
-            Some(next)
-        }
-    }
-}
-
-pub fn previous_index_from_state() -> Option<usize> {
-    let state = crate::audio::get_audio_state().lock().ok()?;
-
-    if state.playlist.is_empty() {
-        return None;
-    }
-
-    if let Some(last_id) = state.playback_history.last() {
-        if let Some(index) = state.playlist.iter().position(|track| &track.id == last_id) {
-            return Some(index);
-        }
-    }
-
-    let current_index = state.current_index.unwrap_or(0);
-
-    Some(if current_index == 0 {
-        state.playlist.len() - 1
-    } else {
-        current_index - 1
-    })
-}
-
-pub fn push_current_to_history() {
-    if let Ok(mut state) = crate::audio::get_audio_state().lock() {
-        if let Some(index) = state.current_index {
-            if let Some(track) = state.playlist.get(index) {
-                let id = track.id;
-                state.playback_history.push(id);
-            }
-        }
-    }
-}
-
-pub fn pop_history_if_matches(index: usize) {
-    if let Ok(mut state) = crate::audio::get_audio_state().lock() {
-        if let Some(track) = state.playlist.get(index) {
-            if state.playback_history.last() == Some(&track.id) {
-                state.playback_history.pop();
-            }
-        }
-    }
-}
-
-pub fn get_track_from_queue(index: usize) -> Result<crate::models::Track, String> {
-    with_audio_state(|state| state.playlist.get(index).cloned())?
-        .ok_or_else(|| "Invalid queue index".to_string())
-}
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index 120e82e..87a81e8 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -1,24 +1,16 @@
-use std::path::Path;
-
-use souvlaki::{MediaControlEvent, SeekDirection};
-use tauri::AppHandle;
-use web_audio_api::context::BaseAudioContext;
-use web_audio_api::node::AudioNode;
-use web_audio_api::MediaElement;
-
-use crate::audio::get_audio_context;
+use crate::audio::{get_audio_context, lock_audio_state, AudioGraph};
+use crate::media_controls::update_media_controls_playback;
 use crate::models::playback::NativePlaybackState;
 use crate::models::Track;
 use crate::services::playback_events::{
     emit_progress, emit_track_started, notify_track_metadata, sync_playback_state,
 };
-use crate::services::playback_queue::{
-    get_track_from_queue, next_index_from_state, pop_history_if_matches,
-    previous_index_from_state, push_current_to_history,
-};
-use crate::state::playback_state::{
-    current_time_from_state, lock_audio_state, minimal_track, with_audio_state, with_media,
-};
+use crate::state::playback_state::{current_time_from_state, minimal_track, with_audio_state};
+use souvlaki::{MediaControlEvent, SeekDirection};
+use std::path::Path;
+use tauri::AppHandle;
+use web_audio_api::context::BaseAudioContext;
+use web_audio_api::node::AudioNode;
 
 pub fn play_track_internal(
     app_handle: &AppHandle,
@@ -31,89 +23,101 @@ pub fn play_track_internal(
         return Err("音频文件不存在或已被移动".into());
     }
 
-    let mut media = MediaElement::new(file_path)
+    let context = get_audio_context();
+    let _ = context.resume();
+
+    let mut state = lock_audio_state()?;
+
+    if let Some(old_graph) = state.graph.take() {
+        old_graph.media.pause();
+        old_graph.destroy();
+    }
+
+    let mut media = web_audio_api::MediaElement::new(file_path)
         .map_err(|e| format!("Failed to create media element: {}", e))?;
 
-    let context = get_audio_context();
     let src = context.create_media_element_source(&mut media);
-    let gain_node = context.create_gain();
+    let gain = context.create_gain();
+    let panner = context.create_stereo_panner();
 
-    src.connect(&gain_node);
-    gain_node.connect(&context.destination());
+    src.connect(&gain);
+    gain.connect(&panner);
+    panner.connect(&context.destination());
 
     media.set_loop(false);
     media.set_current_time(0.0);
+    gain.gain().set_value(state.volume);
+    panner.pan().set_value(state.pan);
+
+    let graph = AudioGraph {
+        media,
+        src,
+        gain,
+        panner,
+    };
 
-    {
-        let mut state = lock_audio_state()?;
+    state.graph = Some(graph);
+    state.current_path = Some(track.path.clone());
+    state.current_track_id = Some(track.id);
+
+    if let Some(next_index) = index {
+        state.playback_queue.current_index = Some(next_index);
+    }
 
-        gain_node.gain().set_value(state.volume);
+    let play_result = state.graph.as_mut().map(|g| g.media.play());
 
-        if let Some(old_media) = state.media.replace(media) {
-            old_media.pause();
+    if play_result.is_none() {
+        state.playing = false;
+        if let Some(failed_graph) = state.graph.take() {
+            failed_graph.destroy();
         }
+        return Err("Playback failed to start because audio graph is missing".into());
+    }
 
-        state.gain_node = Some(gain_node);
-        state.current_path = Some(track.path.clone());
-        state.current_track_id = (track.id > 0).then_some(track.id);
-        state.playing = true;
+    state.playing = true;
 
-        if let Some(next_index) = index {
-            state.current_index = Some(next_index);
-        }
+    let target_index = index.or(state.playback_queue.current_index).unwrap_or(0);
 
-        let _ = with_media(&mut state, MediaElement::play);
-    }
+    drop(state);
 
     notify_track_metadata(&track);
 
-    crate::media_controls::update_media_controls_playback(NativePlaybackState::Playing {
-        current_time: 0.0,
-    });
+    update_media_controls_playback(NativePlaybackState::Playing { current_time: 0.0 });
 
-    if let Some(index) = index {
-        emit_track_started(app_handle, track, index);
-    } else {
-        emit_progress(app_handle);
-    }
+    emit_track_started(app_handle, track, target_index);
 
     Ok(())
 }
 
-pub fn play_current_index_internal(
-    app_handle: &AppHandle,
-    index: usize,
-) -> Result<(), String> {
-    let track = get_track_from_queue(index)?;
+pub fn play_current_index_internal(app_handle: &AppHandle, index: usize) -> Result<(), String> {
+    let track = with_audio_state(|state| state.playback_queue.require_track(index))??;
     play_track_internal(app_handle, track, Some(index))
 }
 
 pub async fn play_next_internal(app_handle: AppHandle) -> Result<(), String> {
-    push_current_to_history();
-    let index = next_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
+    let index = with_audio_state(|state| state.playback_queue.move_next())?
+        .ok_or_else(|| "Queue is empty".to_string())?;
+
     play_current_index_internal(&app_handle, index)
 }
 
 pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), String> {
-    let index = previous_index_from_state().ok_or_else(|| "Queue is empty".to_string())?;
-    pop_history_if_matches(index);
+    let index = with_audio_state(|state| state.playback_queue.move_previous())?
+        .ok_or_else(|| "Queue is empty".to_string())?;
+
     play_current_index_internal(&app_handle, index)
 }
 
 pub async fn resume_internal(app_handle: AppHandle) -> Result<(), String> {
     let current_time = with_audio_state(|state| {
-        let current_time = with_media(state, |media| {
-            media.play();
-            media.current_time()
-        });
-
-        if current_time.is_some() {
+        if let Some(ref mut graph) = state.graph {
+            graph.media.play();
             state.playing = true;
+            Ok(graph.media.current_time())
+        } else {
+            Err("No media available".to_string())
         }
-
-        current_time
-    })?
-    .ok_or_else(|| "No media available".to_string())?;
+    })??;
 
     sync_playback_state(&app_handle, NativePlaybackState::Playing { current_time });
     Ok(())
@@ -121,18 +125,14 @@ pub async fn resume_internal(app_handle: AppHandle) -> Result<(), String> {
 
 pub async fn pause_internal(app_handle: AppHandle) -> Result<(), String> {
     let current_time = with_audio_state(|state| {
-        let current_time = with_media(state, |media| {
-            media.pause();
-            media.current_time()
-        });
-
-        if current_time.is_some() {
+        if let Some(ref mut graph) = state.graph {
+            graph.media.pause();
             state.playing = false;
+            Ok(graph.media.current_time())
+        } else {
+            Err("No media available".to_string())
         }
-
-        current_time
-    })?
-    .ok_or_else(|| "No media available".to_string())?;
+    })??;
 
     sync_playback_state(&app_handle, NativePlaybackState::Paused { current_time });
     Ok(())
@@ -140,23 +140,20 @@ pub async fn pause_internal(app_handle: AppHandle) -> Result<(), String> {
 
 pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
     let (playing, current_time) = with_audio_state(|state| {
-        let result = with_media(state, |media| {
-            if media.paused() {
-                media.play();
-                (true, media.current_time())
+        if let Some(ref mut graph) = state.graph {
+            let playing = if graph.media.paused() {
+                graph.media.play();
+                true
             } else {
-                media.pause();
-                (false, media.current_time())
-            }
-        });
-
-        if let Some((playing, _)) = result {
+                graph.media.pause();
+                false
+            };
             state.playing = playing;
+            Ok((playing, graph.media.current_time()))
+        } else {
+            Err("No media available".to_string())
         }
-
-        result
-    })?
-    .ok_or_else(|| "No media available".to_string())?;
+    })??;
 
     let state = if playing {
         NativePlaybackState::Playing { current_time }
@@ -170,11 +167,10 @@ pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
 
 pub async fn stop_internal(app_handle: AppHandle) -> Result<(), String> {
     with_audio_state(|state| {
-        let _ = with_media(state, |media| {
-            media.pause();
-            media.set_current_time(0.0);
-        });
-
+        if let Some(ref mut graph) = state.graph {
+            graph.media.pause();
+            graph.media.set_current_time(0.0);
+        }
         state.playing = false;
     })?;
 
@@ -184,12 +180,12 @@ pub async fn stop_internal(app_handle: AppHandle) -> Result<(), String> {
 
 pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), String> {
     let playing = with_audio_state(|state| {
-        let playing = with_media(state, |media| {
-            media.set_current_time(time);
-            !media.paused()
-        })
-        .unwrap_or(false);
-
+        let playing = if let Some(ref mut graph) = state.graph {
+            graph.media.set_current_time(time);
+            !graph.media.paused()
+        } else {
+            false
+        };
         state.playing = playing;
         playing
     })?;
@@ -207,13 +203,11 @@ pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), Strin
 pub fn find_track_in_queue(full_path: &str, track_id: Option<i64>) -> Option<Track> {
     with_audio_state(|state| {
         state
-            .playlist
+            .playback_queue
+            .tracks
             .iter()
             .find(|track| {
-                track_id
-                    .as_ref()
-                    .map(|id| track.id == *id)
-                    .unwrap_or(false)
+                track_id.as_ref().map(|id| track.id == *id).unwrap_or(false)
                     || track.path == full_path
             })
             .cloned()
@@ -223,31 +217,25 @@ pub fn find_track_in_queue(full_path: &str, track_id: Option<i64>) -> Option<Tra
 }
 
 pub fn load_track_for_playback(full_path: &str, track_id: Option<i64>) -> Track {
-    find_track_in_queue(full_path, track_id)
-        .unwrap_or_else(|| minimal_track(full_path.to_string()))
+    find_track_in_queue(full_path, track_id).unwrap_or_else(|| minimal_track(full_path.to_string()))
 }
 
 pub fn spawn_playback_progress_task(app_handle: AppHandle) {
-    std::thread::spawn(move || {
-        loop {
-            emit_progress(&app_handle);
-
-            if crate::state::playback_state::should_advance_track() {
-                let local_handle = app_handle.clone();
-                tauri::async_runtime::block_on(async move {
-                    let _ = play_next_internal(local_handle).await;
-                });
-            }
-
-            std::thread::sleep(std::time::Duration::from_millis(500));
+    std::thread::spawn(move || loop {
+        emit_progress(&app_handle);
+
+        if crate::state::playback_state::should_advance_track() {
+            let local_handle = app_handle.clone();
+            tauri::async_runtime::block_on(async move {
+                let _ = play_next_internal(local_handle).await;
+            });
         }
+
+        std::thread::sleep(std::time::Duration::from_millis(500));
     });
 }
 
-pub async fn handle_media_control_event_internal(
-    app_handle: AppHandle,
-    event: MediaControlEvent,
-) {
+pub async fn handle_media_control_event_internal(app_handle: AppHandle, event: MediaControlEvent) {
     match event {
         MediaControlEvent::Play => {
             let _ = resume_internal(app_handle).await;
diff --git a/src-tauri/src/state/playback_state.rs b/src-tauri/src/state/playback_state.rs
index dd019bb..4b8ab13 100644
--- a/src-tauri/src/state/playback_state.rs
+++ b/src-tauri/src/state/playback_state.rs
@@ -1,29 +1,16 @@
 use std::path::Path;
-use std::sync::MutexGuard;
-
-use web_audio_api::MediaElement;
-
-use crate::audio::{get_audio_state, AudioState};
+pub use crate::audio::lock_audio_state;
+use crate::audio::AudioState;
 use crate::models::playback::{
     NativeTrackMetadata, PlaybackStateSnapshot, PlaybackTrackInfo,
 };
 use crate::models::Track;
 
-pub fn lock_audio_state() -> Result<MutexGuard<'static, AudioState>, String> {
-    get_audio_state()
-        .lock()
-        .map_err(|_| "Failed to lock audio state".to_string())
-}
-
 pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, String> {
     let mut state = lock_audio_state()?;
     Ok(f(&mut state))
 }
 
-pub fn with_media<T>(state: &mut AudioState, f: impl FnOnce(&MediaElement) -> T) -> Option<T> {
-    state.media.as_ref().map(f)
-}
-
 pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
     PlaybackTrackInfo {
         id: state.current_track_id,
@@ -32,7 +19,7 @@ pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
 }
 
 pub fn current_playback_state(state: &mut AudioState) -> PlaybackStateSnapshot {
-    let Some(media) = state.media.as_ref() else {
+    let Some(ref graph) = state.graph else {
         state.playing = false;
         return PlaybackStateSnapshot {
             has_media: false,
@@ -42,8 +29,8 @@ pub fn current_playback_state(state: &mut AudioState) -> PlaybackStateSnapshot {
         };
     };
 
-    let playing = !media.paused();
-    let current_time = media.current_time();
+    let playing = !graph.media.paused();
+    let current_time = graph.media.current_time();
     state.playing = playing;
 
     PlaybackStateSnapshot {
@@ -65,8 +52,8 @@ pub fn current_time_from_state() -> f64 {
 }
 
 pub fn current_track_duration(state: &AudioState) -> Option<f64> {
-    let index = state.current_index?;
-    state.playlist.get(index).map(|track| track.duration as f64 / 1000.0)
+    let index = state.playback_queue.current_index?;
+    state.playback_queue.tracks.get(index).map(|track| track.duration as f64 / 1000.0)
 }
 
 pub fn should_advance_track() -> bool {
@@ -119,4 +106,4 @@ pub fn minimal_track(full_path: String) -> Track {
 pub fn sanitize_track(mut track: Track) -> Track {
     track.cover = None;
     track
-}
+}
\ No newline at end of file
diff --git a/src/lib/components/base/IconButton.svelte b/src/lib/components/base/IconButton.svelte
index fd9f7f4..bc094df 100644
--- a/src/lib/components/base/IconButton.svelte
+++ b/src/lib/components/base/IconButton.svelte
@@ -1,12 +1,18 @@
 <script lang="ts">
-    const { onclick = () => {}, ...props } = $props()
+    const {
+        onclick = () => {},
+        ...props
+    } = $props()
 </script>
 
 <mdui-button-icon
-    onclick={() => onclick()}
-    onkeydown={(e: KeyboardEvent) =>
-        (e.key === 'Enter' || e.key === ' ') && onclick()}
+    onclick={(event: MouseEvent) => onclick(event)}
+    onkeydown={(event: KeyboardEvent) => {
+        if (event.key === 'Enter' || event.key === ' ') {
+            onclick(event)
+        }
+    }}
     role="button"
     tabindex="0"
     {...props}
-></mdui-button-icon>
+></mdui-button-icon>
\ No newline at end of file
diff --git a/src/lib/features/PlayerBar.svelte b/src/lib/features/PlayerBar.svelte
index e9988b0..e8a6359 100644
--- a/src/lib/features/PlayerBar.svelte
+++ b/src/lib/features/PlayerBar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import MduiSlider from '$lib/components/base/MduiSlider.svelte'
     import IconButton from '$lib/components/base/IconButton.svelte'
+    import MduiSlider from '$lib/components/base/MduiSlider.svelte'
     import Slider from '$lib/components/base/Slider.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
     import { player } from '$lib/state/player.svelte'
@@ -13,8 +13,8 @@
     )
     let volumeIcon = $derived(getVolumeIcon(player.volume, player.muted))
     let playModeIcon = $derived.by(() => {
-        if (player.playMode === 'single') return 'repeat_one--rounded'
-        if (player.playMode === 'shuffle') return 'shuffle--rounded'
+        if (player.queue.playMode === 'single') return 'repeat_one--rounded'
+        if (player.queue.playMode === 'shuffle') return 'shuffle--rounded'
         return 'repeat--rounded'
     })
 
diff --git a/src/lib/features/QueueDrawer.svelte b/src/lib/features/QueueDrawer.svelte
index 8ae36d1..bab704f 100644
--- a/src/lib/features/QueueDrawer.svelte
+++ b/src/lib/features/QueueDrawer.svelte
@@ -13,7 +13,7 @@
     }
 
     function handleClearQueue() {
-        if (player.playlist.length === 0) return
+        if (player.queue.tracks.length === 0) return
         player.clearQueue()
     }
 </script>
@@ -45,13 +45,13 @@
                 <span
                     class="border rounded-full px-2 py-0.5 text-xs font-medium themed-tag-chip"
                 >
-                    {player.playlist.length}
+                    {player.queue.tracks.length}
                 </span>
             </div>
             <div class="flex items-center gap-1">
                 <IconButton
                     icon="delete_sweep--rounded"
-                    disabled={player.playlist.length === 0}
+                    disabled={player.queue.tracks.length === 0}
                     onclick={handleClearQueue}
                 />
                 <IconButton
@@ -64,7 +64,7 @@
         </div>
 
         <div class="min-h-0 flex-1 overflow-y-auto p-2">
-            {#if player.playlist.length === 0}
+            {#if player.queue.tracks.length === 0}
                 <div
                     class="flex h-64 flex-col items-center justify-center p-6 text-center themed-text-secondary"
                 >
@@ -73,9 +73,9 @@
                 </div>
             {:else}
                 <TrackList
-                    tracks={player.playlist}
+                    tracks={player.queue.tracks}
                     columns={['title', 'duration']}
-                    currentTrackIndex={player.currentIndex}
+                    currentTrackId={player.currentTrack?.id}
                     hideHeader
                     ondblclicktrack={handlePlay}
                     onremovetrack={handleRemove}
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 135fda7..1a4667b 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -17,7 +17,7 @@
         columns?: TrackColumn[]
         selectable?: boolean
         selectedIds?: number[]
-        currentTrackIndex?: number
+        currentTrackId?: number
         hideHeader?: boolean
         ontoggletrack?: (track: Track, checked: boolean) => void
         ondblclicktrack?: (track: Track, index: number) => void
@@ -53,7 +53,6 @@
         columns = ['index', 'title', 'album', 'duration'],
         selectable = false,
         selectedIds = [],
-        currentTrackIndex,
         hideHeader = false,
         ontoggletrack,
         ondblclicktrack,
@@ -322,7 +321,7 @@
             <IconButton
                 icon="close--rounded"
                 class="text-xs themed-text-secondary opacity-0 transition-opacity duration-200 hover:text-red-500 group-hover:opacity-100"
-                onclick={(e: MouseEvent) => {
+                onclick={(e: Event) => {
                     e.stopPropagation()
                     onremovetrack?.(track, index)
                 }}
@@ -364,9 +363,7 @@
     <div class="flex flex-col gap-1 mt-2">
         {#each tracks as track, index (track.id)}
             {@const isCurrent =
-                currentTrackIndex !== undefined
-                    ? currentTrackIndex === index
-                    : player.currentTrack?.id === track.id}
+                player.currentTrack?.id === track.id}
             {@const cover = trackCovers.get(track)}
 
             <mdui-list-item
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index bfc5b94..4209d62 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -1,63 +1,23 @@
+import type { PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackStartedPayload, PlayMode } from "$lib/types"
 import { invoke } from "@tauri-apps/api/core"
 import { listen, type UnlistenFn } from "@tauri-apps/api/event"
-import { load } from "@tauri-apps/plugin-store"
-import type { Track } from "../types/music"
+import type { PlaybackQueue, Track } from "../types/music"
 import { recentlyPlayed } from "./recent.svelte"
 
-type PlayMode = 'list' | 'single' | 'shuffle'
-
-type PlaybackTrackSnapshot = {
-    id?: number | null
-    path?: string | null
-}
-
-type PlaybackStatusSnapshot = {
-    hasMedia: boolean
-    playing: boolean
-    currentTime: number
-    track: PlaybackTrackSnapshot | null
-}
-
-type PlaybackProgressPayload = {
-    playing: boolean
-    currentTime: number
-    trackId?: number | null
-    path?: string | null
-}
-
-type PlaybackTrackStartedPayload = {
-    track: Track
-    index: number
-    playing: boolean
-    currentTime: number
-}
-
-export type PlaybackQueueChangedPayload = {
-    playlist: Track[]
-    currentIndex: number | null
-    playMode: PlayMode
-    playbackHistory: number[]
-}
-
-type BackendQueueTrack = Omit<Track, 'cover'>
-
-const STORE_NAME = "player-state.json"
-
 class Player {
-    playlist = $state<Track[]>([])
-    currentIndex = $state<number>(-1)
-    playing = $state<boolean>(false)
-    currentTime = $state<number>(0)
-    playMode = $state<PlayMode>('list')
-    queueOpen = $state<boolean>(false)
-    playbackHistory: number[] = []
+    queue = $state<PlaybackQueue>({
+        tracks: [],
+        currentIndex: null,
+        playMode: 'list',
+        history: []
+    })
+
+    playing = $state(false)
+    currentTime = $state(0)
+    queueOpen = $state(false)
     #muted = $state<boolean>(false)
     #volume = $state<number>(80)
     #previousVolume = 80
-    #pollTimer: any = null
-    #loadToken = 0
-    #storePromise: ReturnType<typeof load> | null = null
-    #debounceTimer: any = null
     #progressUnlisten: UnlistenFn | null = null
     #trackStartedUnlisten: UnlistenFn | null = null
     #queueChangedUnlisten: UnlistenFn | null = null
@@ -109,15 +69,6 @@ class Player {
         return track.duration / 1000
     }
 
-    #isPersistedTrack(track: unknown): track is Track {
-        return (
-            typeof track === 'object' &&
-            track !== null &&
-            typeof (track as Track).id === 'number' &&
-            typeof (track as Track).path === 'string'
-        )
-    }
-
     #updatePlaybackState() {
         if (typeof navigator === 'undefined' || !('mediaSession' in navigator)) return
         navigator.mediaSession.playbackState = this.playing ? 'playing' : 'paused'
@@ -146,11 +97,18 @@ class Player {
         navigator.mediaSession.playbackState = 'none'
     }
 
-    get currentTrack(): Track | null {
-        if (this.currentIndex >= 0 && this.currentIndex < this.playlist.length) {
-            return this.playlist[this.currentIndex]
+    get currentTrack(): Track | undefined {
+        const index = this.queue.currentIndex
+
+        if (
+            index === null ||
+            index < 0 ||
+            index >= this.queue.tracks.length
+        ) {
+            return undefined
         }
-        return null
+
+        return this.queue.tracks[index]
     }
 
     get volume() { return this.#volume }
@@ -160,7 +118,6 @@ class Player {
             this.#muted = false
         }
         invoke('set_volume', { volume }).catch(console.error)
-        this.#saveDebounced()
     }
 
     get muted() { return this.#muted }
@@ -174,254 +131,94 @@ class Player {
             this.#volume = this.#previousVolume
             invoke('set_volume', { volume: this.#previousVolume }).catch(console.error)
         }
-        this.#saveDebounced()
-    }
-
-    async #getStore() {
-        if (!this.#storePromise) {
-            this.#storePromise = load(STORE_NAME)
-        }
-        return this.#storePromise
-    }
-
-    #saveDebounced() {
-        if (this.#debounceTimer) clearTimeout(this.#debounceTimer)
-        this.#debounceTimer = setTimeout(() => {
-            void this.#persist()
-        }, 1000)
-    }
-
-    #stripCoverData(track: Track): BackendQueueTrack {
-        return Object.fromEntries(
-            Object.entries(track).filter(([key]) => key !== 'cover'),
-        ) as BackendQueueTrack
     }
 
-    async #syncBackendQueue() {
-        await invoke('sync_playback_queue', {
-            playlist: this.playlist.map(track => this.#stripCoverData(track)),
-            currentIndex: this.currentIndex >= 0 ? this.currentIndex : null,
-            playMode: this.playMode,
-            playbackHistory: [...this.playbackHistory],
-        })
-    }
-
-    #applyBackendQueue(payload: PlaybackQueueChangedPayload) {
-        this.playlist = payload.playlist
-        this.currentIndex = payload.currentIndex ?? -1
-        this.playMode = payload.playMode
-        this.playbackHistory = payload.playbackHistory
-        this.#syncMediaSession()
-        this.#saveDebounced()
-    }
-
-    #playBackendQueueTrack(index: number) {
-        this.#loadToken++
-        this.#stopPolling()
-        this.currentTime = 0
-        this.playing = true
-        this.#syncMediaSession()
-        void this.#syncBackendQueue()
-            .then(() => invoke('play_queue_track', { index }))
-            .catch(err => {
-                this.playing = false
-                this.#syncMediaSession()
-                console.error(err)
-            })
-    }
-
-    replacePlaylistAndPlay(tracks: Track[], targetId: number) {
-        if (tracks.length === 0) {
-            this.clearQueue()
-            return
-        }
-
-        const nextQueue = [...tracks]
-        const index = nextQueue.findIndex(t => t.id === targetId)
-        const nextIndex = index !== -1 ? index : 0
 
-        this.playbackHistory = []
-        this.playlist = nextQueue
-        this.currentIndex = nextIndex
-        this.#playBackendQueueTrack(nextIndex)
-        this.#saveDebounced()
+    #applyBackendQueue(queue: PlaybackQueue) {
+        this.queue = queue
     }
 
-    appendTrack(track: Track) {
-        this.insertNext(track)
-    }
-
-    insertTracksNext(tracks: Track[]) {
-        const uniqueTracks = tracks.filter(
-            (track, index, list) =>
-                list.findIndex(item => item.id === track.id) === index,
-        )
-
-        if (uniqueTracks.length === 0) return
-
-        if (this.playlist.length === 0 || this.currentIndex === -1) {
-            this.playlist = uniqueTracks
-            this.currentIndex = 0
-            void this.#syncBackendQueue().catch(console.error)
-            this.#saveDebounced()
-            return
-        }
-
-        const insertTracks = uniqueTracks.filter(
-            track => !this.playlist.some(item => item.id === track.id),
+    async replacePlaylistAndPlay(
+        tracks: Track[],
+        targetId: number
+    ) {
+        await invoke(
+            'replace_playlist_and_play',
+            {
+                tracks,
+                targetId
+            }
         )
-
-        if (insertTracks.length === 0) return
-
-        const nextQueue = [...this.playlist]
-        nextQueue.splice(this.currentIndex + 1, 0, ...insertTracks)
-        this.playlist = nextQueue
-        void this.#syncBackendQueue().catch(console.error)
-        this.#saveDebounced()
     }
 
-    insertNext(track: Track) {
-        const existingIndex = this.playlist.findIndex(item => item.id === track.id)
-        if (existingIndex === this.currentIndex && this.currentIndex !== -1) return
-
-        let nextQueue = [...this.playlist]
-        let nextIndex = this.currentIndex
-
-        if (existingIndex !== -1) {
-            nextQueue.splice(existingIndex, 1)
-            if (existingIndex < nextIndex) {
-                nextIndex--
-            }
-        }
-
-        if (nextQueue.length === 0 || nextIndex === -1) {
-            this.playlist = [track]
-            this.currentIndex = 0
-            void this.#syncBackendQueue().catch(console.error)
-            this.#saveDebounced()
-            return
-        }
+    async insertTracksNext(tracks: Track[]) {
+        const payload = await invoke<PlaybackQueue>(
+            'insert_tracks_as_next',
+            { tracks }
+        )
 
-        nextQueue.splice(nextIndex + 1, 0, track)
-        this.playlist = nextQueue
-        this.currentIndex = nextIndex
-        void this.#syncBackendQueue().catch(console.error)
-        this.#saveDebounced()
+        this.#applyBackendQueue(payload)
     }
 
     async insertTrackAsNext(track: Track) {
-        const payload = await invoke<PlaybackQueueChangedPayload>('insert_track_as_next', { track })
+        const payload = await invoke<PlaybackQueue>('insert_track_as_next', { track })
         this.#applyBackendQueue(payload)
     }
 
-    async removeTrackFromBackendQueue(trackId: number) {
-        const payload = await invoke<PlaybackQueueChangedPayload>('remove_track_from_backend_queue', { trackId })
+    async removeTrack(trackId: number) {
+        const payload = await invoke<PlaybackQueue>(
+            'remove_track_from_backend_queue',
+            { trackId }
+        )
+
         this.#applyBackendQueue(payload)
     }
 
-    removeTrack(id: number) {
-        const removeIndex = this.playlist.findIndex(t => t.id === id)
-        if (removeIndex === -1) return
-
-        const isCurrent = removeIndex === this.currentIndex
-        const nextQueue = this.playlist.filter(t => t.id !== id)
+    async playTrackInQueue(index: number) {
+        await invoke(
+            'play_queue_track',
+            { index }
+        )
+    }
 
-        if (nextQueue.length === 0) {
-            this.playlist = []
-            this.currentIndex = -1
-            this.playing = false
-            this.currentTime = 0
-            this.playbackHistory = []
-            this.#clearMediaSession()
-            this.#stopPolling()
-            void this.#syncBackendQueue().catch(console.error)
-            invoke('stop_track').catch(console.error)
-            this.#saveDebounced()
-            return
-        }
+    async cyclePlayMode() {
+        const modes: PlayMode[] = [
+            'list',
+            'single',
+            'shuffle'
+        ]
 
-        if (isCurrent) {
-            const nextIndex = Math.min(removeIndex, nextQueue.length - 1)
-            this.playlist = nextQueue
-            this.currentIndex = nextIndex
-            this.#playBackendQueueTrack(nextIndex)
-            this.#saveDebounced()
-            return
-        }
+        const index = modes.indexOf(
+            this.queue.playMode
+        )
 
-        let nextIndex = this.currentIndex
-        if (removeIndex < nextIndex) {
-            nextIndex--
-        }
-        this.playlist = nextQueue
-        this.currentIndex = nextIndex
-        void this.#syncBackendQueue().catch(console.error)
-        this.#saveDebounced()
-    }
+        const mode =
+            modes[(index + 1) % modes.length]
 
-    playTrackInQueue(index: number) {
-        if (index < 0 || index >= this.playlist.length) return
-        this.currentIndex = index
-        this.#playBackendQueueTrack(index)
-        this.#saveDebounced()
-    }
+        const queue = await invoke<PlaybackQueue>(
+            'set_play_mode',
+            { mode }
+        )
 
-    cyclePlayMode() {
-        const modes: PlayMode[] = ['list', 'single', 'shuffle']
-        const currentModeIndex = modes.indexOf(this.playMode)
-        this.playMode = modes[(currentModeIndex + 1) % modes.length]
-        void this.#syncBackendQueue().catch(console.error)
-        this.#saveDebounced()
+        this.#applyBackendQueue(queue)
     }
 
     toggleQueue() {
         this.queueOpen = !this.queueOpen
     }
 
-    clearQueue() {
-        this.playlist = []
-        this.currentIndex = -1
-        this.playing = false
-        this.currentTime = 0
-        this.playbackHistory = []
-        this.#clearMediaSession()
-        this.#stopPolling()
-        void this.#syncBackendQueue().catch(console.error)
-        invoke('stop_track').catch(console.error)
-        this.#saveDebounced()
-    }
-
-    #getNextIndex(): number {
-        if (this.playlist.length <= 1) return 0
-        if (this.playMode === 'shuffle') {
-            let nextIndex = this.currentIndex
-            while (nextIndex === this.currentIndex) {
-                nextIndex = Math.floor(Math.random() * this.playlist.length)
-            }
-            return nextIndex
-        }
-        return this.currentIndex >= this.playlist.length - 1 ? 0 : this.currentIndex + 1
+    async clearQueue() {
+        const queue = await invoke<PlaybackQueue>('clear_queue')
+
+        this.#applyBackendQueue(queue)
     }
 
-    next() {
-        if (this.playlist.length === 0) return
-        const current = this.currentTrack
-        if (current) {
-            this.playbackHistory.push(current.id)
-        }
-        void this.#syncBackendQueue()
-            .then(() => invoke('play_next_track'))
-            .catch(console.error)
-        this.#saveDebounced()
+    async next() {
+        await invoke('play_next_track')
     }
 
-    prev() {
-        if (this.playlist.length === 0) return
-        void invoke('play_previous_track').catch(console.error)
-        if (this.playbackHistory.length > 0) {
-            this.playbackHistory.pop()
-        }
-        this.#saveDebounced()
+    async prev() {
+        await invoke('play_previous_track')
     }
 
     resume = async () => {
@@ -429,7 +226,6 @@ class Player {
             await invoke('resume_track')
             this.playing = true
             this.#syncMediaSession()
-            this.#startPolling()
         } catch (err) {
             console.error(err)
         }
@@ -440,7 +236,6 @@ class Player {
             await invoke('pause_track')
             this.playing = false
             this.#syncMediaSession()
-            this.#stopPolling()
         } catch (err) {
             console.error(err)
         }
@@ -455,129 +250,59 @@ class Player {
     }
 
     seek = async (time: number) => {
-        this.#stopPolling()
         await invoke('set_current_time', { time })
         this.currentTime = time
         this.#updatePositionState()
-        if (this.playing) {
-            this.#startPolling()
-        }
     }
 
     async loadState() {
-        try {
-            const store = await this.#getStore()
-            const playlist = await store.get<Track[]>("playlist")
-            const currentIndex = await store.get<number>("currentIndex")
-            const playMode = await store.get<PlayMode>("playMode")
-            const volume = await store.get<number>("volume")
-
-            if (playlist && playlist.length > 0) {
-                this.playlist = playlist.filter(this.#isPersistedTrack)
-            }
-            if (typeof currentIndex === "number" && currentIndex >= 0) {
-                this.currentIndex = currentIndex
-            }
-            if (this.playlist.length === 0) {
-                this.currentIndex = -1
-            }
-            if (this.playlist.length > 0 && this.currentIndex >= this.playlist.length) {
-                this.currentIndex = this.playlist.length - 1
-            }
-            if (playMode) {
-                this.playMode = playMode
-            }
-            if (typeof volume === "number") {
-                this.#volume = volume
-                invoke('set_volume', { volume }).catch(console.error)
-            }
+        await this.#setupPlaybackListeners()
 
-            await this.#syncBackendQueue()
-            await this.#setupPlaybackListeners()
-            const status = await invoke<PlaybackStatusSnapshot>('get_current_status')
-            this.#applyBackendStatus(status)
-        } catch (err) {
-            console.error(err)
-        }
-    }
+        const queue =
+            await invoke<PlaybackQueue>(
+                'get_playback_queue'
+            )
 
-    #findTrackIndexByIdentity(id?: number | null, path?: string | null) {
-        if (typeof id === 'number') {
-            const index = this.playlist.findIndex(track => track.id === id)
-            if (index !== -1) return index
-        }
+        this.#applyBackendQueue(queue)
 
-        if (path) {
-            return this.playlist.findIndex(track => track.path === path)
-        }
+        const status =
+            await invoke<PlaybackStatusSnapshot>(
+                'get_current_status'
+            )
 
-        return -1
+        this.#applyBackendStatus(status)
     }
 
     #applyBackendStatus(status: PlaybackStatusSnapshot) {
         if (!status.hasMedia || !status.track) {
             this.playing = false
             this.currentTime = 0
-            this.#stopPolling()
             this.#syncMediaSession()
             return
         }
 
-        const index = this.#findTrackIndexByIdentity(status.track.id, status.track.path)
-        if (index !== -1) {
-            this.currentIndex = index
-        }
-
         this.currentTime = status.currentTime
         this.playing = status.playing
         this.#syncMediaSession()
-
-        if (this.playing) {
-            this.#startPolling()
-        } else {
-            this.#stopPolling()
-        }
     }
 
     #handleBackendProgress(payload: PlaybackProgressPayload) {
-        const index = this.#findTrackIndexByIdentity(payload.trackId, payload.path)
-        if (index !== -1) {
-            this.currentIndex = index
-        }
+        this.currentTime =
+            payload.currentTime
 
-        this.currentTime = payload.currentTime
-        this.playing = payload.playing
-        this.#syncMediaSession()
+        this.playing =
+            payload.playing
 
-        if (this.currentTrack && this.currentTime >= this.#trackDurationSeconds(this.currentTrack) - 0.5) {
-            this.#handleTrackEnded()
-        }
+        this.#syncMediaSession()
     }
 
     #handleTrackStarted(payload: PlaybackTrackStartedPayload) {
-        if (payload.index >= 0 && payload.index < this.playlist.length) {
-            this.currentIndex = payload.index
-        } else {
-            const index = this.#findTrackIndexByIdentity(payload.track.id, payload.track.path)
-            if (index !== -1) {
-                this.currentIndex = index
-            }
-        }
-
         this.currentTime = payload.currentTime
         this.playing = payload.playing
+        this.queue = { ...this.queue, currentIndex: payload.index }
         this.#syncMediaSession()
 
-        const track = this.currentTrack ?? payload.track
-        recentlyPlayed.add(track)
-
-        if (this.playing) {
-            this.#startPolling()
-        } else {
-            this.#stopPolling()
-        }
-
-        this.#saveDebounced()
+        recentlyPlayed.add(payload.track)
     }
 
     async #setupPlaybackListeners() {
@@ -594,101 +319,20 @@ class Player {
         }
 
         if (!this.#queueChangedUnlisten) {
-            this.#queueChangedUnlisten = await listen<PlaybackQueueChangedPayload>('playback:queue-changed', event => {
+            this.#queueChangedUnlisten = await listen<PlaybackQueue>('playback:queue-changed', event => {
                 this.#applyBackendQueue(event.payload)
             })
         }
     }
 
-    #handleTrackEnded() {
-        if (!this.currentTrack) return
-        if (this.playMode === 'single') {
-            this.currentTime = 0
-            this.#playBackendQueueTrack(this.currentIndex)
-        } else {
-            this.next()
-        }
-    }
-
-    async #persist() {
-        try {
-            const store = await this.#getStore()
-            await store.set("playlist", this.playlist.map(t => ({ ...t, cover: null })))
-            await store.set("currentIndex", this.currentIndex)
-            await store.set("playMode", this.playMode)
-            await store.set("volume", this.#volume)
-            await store.save()
-        } catch (err) {
-            console.error(err)
-        }
-    }
-
-    #onTrackStarted(track: Track) {
-        this.playing = true
-        this.#syncMediaSession()
-        recentlyPlayed.add(track)
-    }
-
-    async #loadAndPlay() {
-        const track = this.currentTrack
-        if (!track) return
-
-        const currentToken = ++this.#loadToken
-        this.#stopPolling()
-
-        try {
-            this.currentTime = 0
-            await invoke('play_track', { fullPath: track.path, trackId: track.id })
-
-            if (currentToken !== this.#loadToken) return
-
-            this.#onTrackStarted(track)
-            this.#startPolling()
-        } catch (err) {
-            if (currentToken === this.#loadToken) {
-                this.playing = false
-                console.error(err)
-            }
-        }
-    }
-
-    #startPolling = () => {
-        this.#stopPolling()
-        this.#pollTimer = setInterval(async () => {
-            if (!this.playing) {
-                this.#stopPolling()
-                return
-            }
-            try {
-                this.currentTime = await invoke<number>('current_time')
-                if (this.currentTrack && this.currentTime >= this.#trackDurationSeconds(this.currentTrack) - 0.5) {
-                    this.#handleTrackEnded()
-                }
-            } catch (e) {
-                this.#stopPolling()
-            }
-        }, 250)
-    }
-
-    #stopPolling = () => {
-        if (this.#pollTimer) {
-            clearInterval(this.#pollTimer)
-            this.#pollTimer = null
-        }
-    }
-
     destroy() {
-        this.#stopPolling()
         this.#progressUnlisten?.()
         this.#progressUnlisten = null
         this.#trackStartedUnlisten?.()
         this.#trackStartedUnlisten = null
         this.#queueChangedUnlisten?.()
         this.#queueChangedUnlisten = null
-        if (this.#debounceTimer) {
-            clearTimeout(this.#debounceTimer)
-        }
     }
 }
 
-export const player = new Player()
+export const player = new Player()
\ No newline at end of file
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index 7f20cfa..3bd7581 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -4,4 +4,5 @@ export type {
     ExtensionNavItem
 } from './extension'
 export type { Album, Artist, Playlist, Track } from './music'
+export type { BackendQueueTrack, PlayMode, PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackSnapshot, PlaybackTrackStartedPayload } from './playback'
 export type { AppSettings, ThemeMode } from './settings'
diff --git a/src/lib/types/music.ts b/src/lib/types/music.ts
index 6102b8f..4d32fc6 100644
--- a/src/lib/types/music.ts
+++ b/src/lib/types/music.ts
@@ -1,3 +1,5 @@
+import type { PlayMode } from "./playback"
+
 export interface Track {
     id: number
     title: string
@@ -36,4 +38,11 @@ export interface Album {
     tracks: Track[]
     trackCount: number
     representativeTrack: Track
+}
+
+export interface PlaybackQueue {
+    tracks: Track[]
+    currentIndex: number | null
+    playMode: PlayMode
+    history: number[]
 }
\ No newline at end of file
diff --git a/src/lib/types/playback.ts b/src/lib/types/playback.ts
new file mode 100644
index 0000000..fd216d4
--- /dev/null
+++ b/src/lib/types/playback.ts
@@ -0,0 +1,31 @@
+import type { Track } from "./music"
+
+export type PlayMode = 'list' | 'single' | 'shuffle'
+
+export type PlaybackTrackSnapshot = {
+    id?: number | null
+    path?: string | null
+}
+
+export type PlaybackStatusSnapshot = {
+    hasMedia: boolean
+    playing: boolean
+    currentTime: number
+    track: PlaybackTrackSnapshot | null
+}
+
+export type PlaybackProgressPayload = {
+    playing: boolean
+    currentTime: number
+    trackId?: number | null
+    path?: string | null
+}
+
+export type PlaybackTrackStartedPayload = {
+    track: Track
+    index: number
+    playing: boolean
+    currentTime: number
+}
+
+export type BackendQueueTrack = Omit<Track, 'cover'>
\ No newline at end of file

From 0dbb3f07c4e32ce0f9650d411f07f46e9113f747 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Wed, 3 Jun 2026 20:15:22 +0800
Subject: [PATCH 26/39] refactor: replace String error type with AppError
 across commands and core logic

- Update all `#[command]` functions to return `Result<_, AppError>` instead of `Result<_, String>`
- Refactor internal playback, file operation, and directory scanning utilities to use `AppError`
- Simplify error propagation by leveraging the `?` operator with existing `From` trait implementations
- Unify the error response structure sent to the frontend for consistent error handling
---
 src-tauri/src/audio/state.rs                  |  7 +--
 src-tauri/src/commands/library.rs             | 43 ++++++++--------
 src-tauri/src/commands/playback.rs            | 50 +++++++++++--------
 src-tauri/src/commands/playback_queue.rs      | 11 ++--
 src-tauri/src/commands/playlists.rs           | 11 ----
 src-tauri/src/commands/recent.rs              |  4 +-
 src-tauri/src/commands/tracks.rs              | 17 +++----
 src-tauri/src/db/manager.rs                   | 14 +++---
 src-tauri/src/errors/app_error.rs             | 12 ++++-
 src-tauri/src/lib.rs                          |  4 +-
 .../sqlite/playlist_repository.rs             | 49 +++++++++---------
 .../repositories/sqlite/recent_repository.rs  | 21 ++++----
 .../repositories/sqlite/track_repository.rs   | 41 +++++++--------
 src-tauri/src/services/playback_events.rs     | 11 ++--
 src-tauri/src/services/playback_service.rs    | 29 +++++------
 src-tauri/src/services/playlist_service.rs    | 23 +++++----
 src-tauri/src/services/recent_service.rs      |  7 +--
 src-tauri/src/services/track_service.rs       | 21 ++++----
 src-tauri/src/state/playback_state.rs         |  5 +-
 src/lib/state/player.svelte.ts                |  4 +-
 src/routes/library/+page.svelte               |  6 +--
 21 files changed, 203 insertions(+), 187 deletions(-)

diff --git a/src-tauri/src/audio/state.rs b/src-tauri/src/audio/state.rs
index e9eb5e5..338d9d4 100644
--- a/src-tauri/src/audio/state.rs
+++ b/src-tauri/src/audio/state.rs
@@ -1,5 +1,6 @@
 use std::sync::{Mutex, MutexGuard, OnceLock};
 use crate::audio::graph::AudioGraph;
+use crate::errors::AppError;
 use crate::models::PlaybackQueue;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
@@ -37,10 +38,10 @@ pub fn init_audio_state(queue: PlaybackQueue) {
     });
 }
 
-pub fn lock_audio_state() -> Result<MutexGuard<'static, AudioState>, String> {
+pub fn lock_audio_state() -> Result<MutexGuard<'static, AudioState>, AppError> {
     AUDIO_STATE
         .get()
-        .ok_or_else(|| "Audio state not initialized".to_string())?
+        .ok_or_else(|| AppError::from("Audio state not initialized"))?
         .lock()
-        .map_err(|_| "Failed to lock audio state".to_string())
+        .map_err(|_| AppError::from("Failed to lock audio state"))
 }
\ No newline at end of file
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index bca8e4a..9399bb0 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -9,7 +9,8 @@ use lofty::probe::Probe;
 use tauri::{command, State};
 use walkdir::WalkDir;
 
-use crate::commands::playback::remove_track_from_backend_queue;
+use crate::commands::playback::remove_track_from_queue;
+use crate::errors::AppError;
 use crate::metadata::parse_single_track;
 use crate::models::{NewTrack, PlaybackQueue, Track};
 use crate::state::AppState;
@@ -22,12 +23,11 @@ fn is_supported_audio_file(path: &Path) -> bool {
         .map(|ext| SUPPORTED_EXT.contains(&ext.to_lowercase().as_str()))
         .unwrap_or(false)
 }
-
-fn scan_single_directory(dir: &str) -> Result<Vec<NewTrack>, String> {
+fn scan_single_directory(dir: &str) -> Result<Vec<NewTrack>, AppError> {
     let root_path = Path::new(dir);
 
     if !root_path.exists() || !root_path.is_dir() {
-        return Err(format!("无效目录: {}", dir));
+        return Err(format!("无效目录: {}", dir).into());
     }
 
     let mut tracks = Vec::new();
@@ -57,7 +57,7 @@ fn dedupe_new_tracks(tracks: &mut Vec<NewTrack>) {
     tracks.retain(|track| seen.insert(track.path.clone()));
 }
 
-pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<NewTrack>, String> {
+pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<NewTrack>, AppError> {
     let mut all_tracks = Vec::new();
 
     for dir in dirs {
@@ -70,7 +70,7 @@ pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<NewTrack>, String> {
     Ok(all_tracks)
 }
 
-async fn upsert_scanned_tracks(state: &AppState, tracks: Vec<NewTrack>) -> Result<Vec<Track>, String> {
+async fn upsert_scanned_tracks(state: &AppState, tracks: Vec<NewTrack>) -> Result<Vec<Track>, AppError> {
     let mut saved = Vec::with_capacity(tracks.len());
 
     for track in tracks {
@@ -81,7 +81,7 @@ async fn upsert_scanned_tracks(state: &AppState, tracks: Vec<NewTrack>) -> Resul
 }
 
 #[command]
-pub fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
+pub fn get_track_cover(full_path: String) -> Result<Option<String>, AppError> {
     let file_path = Path::new(&full_path);
 
     if !file_path.exists() {
@@ -112,7 +112,7 @@ pub fn get_track_cover(full_path: String) -> Result<Option<String>, String> {
     Ok(cover)
 }
 
-fn validate_audio_path(path: &str) -> Result<&Path, String> {
+fn validate_audio_path(path: &str) -> Result<&Path, AppError> {
     let file_path = Path::new(path);
 
     if !file_path.exists() {
@@ -120,14 +120,14 @@ fn validate_audio_path(path: &str) -> Result<&Path, String> {
     }
 
     if !file_path.is_file() || !is_supported_audio_file(file_path) {
-        return Err(format!("拒绝操作非音频文件: {}", path));
+        return Err(format!("拒绝操作非音频文件: {}", path).into());
     }
 
     Ok(file_path)
 }
 
 #[command]
-pub fn show_in_folder(path: String) -> Result<(), String> {
+pub fn show_in_folder(path: String) -> Result<(), AppError> {
     let file_path = Path::new(&path);
 
     if !file_path.exists() {
@@ -137,7 +137,7 @@ pub fn show_in_folder(path: String) -> Result<(), String> {
     #[cfg(target_os = "linux")]
     let parent = file_path
         .parent()
-        .ok_or_else(|| "无法定位文件所在目录".to_string())?;
+        .ok_or_else(|| AppError::from("无法定位文件所在目录"))?;
 
     #[cfg(target_os = "windows")]
     let status = Command::new("explorer.exe")
@@ -150,7 +150,7 @@ pub fn show_in_folder(path: String) -> Result<(), String> {
     #[cfg(target_os = "linux")]
     let status = Command::new("xdg-open").arg(parent).status();
 
-    let status = status.map_err(|e| e.to_string())?;
+    let status = status?;
 
     if status.success() {
         Ok(())
@@ -164,15 +164,16 @@ pub async fn delete_track_file(
     app_handle: tauri::AppHandle,
     path: String,
     track_id: i64,
-) -> Result<PlaybackQueue, String> {
+) -> Result<PlaybackQueue, AppError> {
     let file_path = validate_audio_path(&path)?;
     trash::delete(file_path)
         .map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
-    remove_track_from_backend_queue(app_handle, track_id).await
+    let queue = remove_track_from_queue(app_handle, track_id).await?;
+    Ok(queue)
 }
 
 #[command]
-pub fn trash_track_files(paths: Vec<String>) -> Result<(), String> {
+pub fn trash_track_files(paths: Vec<String>) -> Result<(), AppError> {
     for path in paths {
         let file_path = Path::new(&path);
 
@@ -181,7 +182,7 @@ pub fn trash_track_files(paths: Vec<String>) -> Result<(), String> {
         }
 
         if !file_path.is_file() || !is_supported_audio_file(file_path) {
-            return Err(format!("拒绝移至回收站非音频文件: {}", path));
+            return Err(format!("拒绝移至回收站非音频文件: {}", path).into());
         }
 
         trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
@@ -191,7 +192,7 @@ pub fn trash_track_files(paths: Vec<String>) -> Result<(), String> {
 }
 
 #[command]
-pub fn delete_track_files(paths: Vec<String>) -> Result<(), String> {
+pub fn delete_track_files(paths: Vec<String>) -> Result<(), AppError> {
     for path in paths {
         let file_path = Path::new(&path);
 
@@ -200,7 +201,7 @@ pub fn delete_track_files(paths: Vec<String>) -> Result<(), String> {
         }
 
         if !file_path.is_file() || !is_supported_audio_file(file_path) {
-            return Err(format!("拒绝删除非音频文件: {}", path));
+            return Err(format!("拒绝删除非音频文件: {}", path).into());
         }
 
         fs::remove_file(file_path).map_err(|e| format!("删除文件失败 {}: {}", path, e))?;
@@ -213,7 +214,7 @@ pub fn delete_track_files(paths: Vec<String>) -> Result<(), String> {
 pub async fn scan_track_directories(
     state: State<'_, AppState>,
     dirs: Vec<String>,
-) -> Result<Vec<Track>, String> {
+) -> Result<Vec<Track>, AppError> {
     let scanned = execute_scan(dirs)?;
     let tracks = upsert_scanned_tracks(&state, scanned).await?;
     Ok(tracks)
@@ -222,7 +223,7 @@ pub async fn scan_track_directories(
 #[command]
 pub async fn load_track_library(
     state: State<'_, AppState>,
-) -> Result<Vec<Track>, String> {
+) -> Result<Vec<Track>, AppError> {
     let tracks = state.tracks.list_tracks().await?;
 
     if tracks.is_empty() {
@@ -234,7 +235,7 @@ pub async fn load_track_library(
 
 async fn rebuild_and_get_library(
     state: &AppState,
-) -> Result<Vec<Track>, String> {
+) -> Result<Vec<Track>, AppError> {
     let settings = state.settings.get_settings().await.map_err(|error| error.to_string())?;
     let scanned = tauri::async_runtime::spawn_blocking(move || execute_scan(settings.library_dirs))
         .await
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index 322bc2f..6e62933 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -1,5 +1,6 @@
 use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
+use crate::errors::AppError;
 use crate::models::playback::PlaybackStatusSnapshot;
 use crate::models::{PlaybackQueue, Track};
 use crate::services::playback_events::{emit_queue_changed, status_snapshot};
@@ -24,7 +25,7 @@ pub async fn sync_playback_queue(
     current_index: Option<usize>,
     play_mode: PlayMode,
     history: Vec<i64>,
-) -> Result<(), String> {
+) -> Result<(), AppError> {
     let mut state = lock_audio_state()?;
     state.play_mode = play_mode;
     state.playback_queue.sync(
@@ -37,10 +38,10 @@ pub async fn sync_playback_queue(
 }
 
 #[command]
-pub async fn remove_track_from_backend_queue(
+pub async fn remove_track_from_queue(
     app_handle: AppHandle,
     track_id: i64,
-) -> Result<PlaybackQueue, String> {
+) -> Result<PlaybackQueue, AppError> {
     let result = {
         let mut state = lock_audio_state()?;
 
@@ -66,7 +67,7 @@ pub async fn remove_track_from_backend_queue(
 pub async fn insert_track_as_next(
     app_handle: AppHandle,
     track: Track,
-) -> Result<PlaybackQueue, String> {
+) -> Result<PlaybackQueue, AppError> {
     with_audio_state(|state| {
         state.playback_queue.insert_next(track);
     })?;
@@ -75,23 +76,27 @@ pub async fn insert_track_as_next(
 }
 
 #[command]
-pub async fn play_queue_track(app_handle: AppHandle, index: usize) -> Result<(), String> {
-    play_current_index_internal(&app_handle, index)
+pub async fn play_queue_track(app_handle: AppHandle, index: usize) -> Result<(), AppError> {
+    play_current_index_internal(&app_handle, index)?;
+    Ok(())
 }
 
 #[command]
-pub async fn play_next_track(app_handle: AppHandle) -> Result<(), String> {
-    play_next_internal(app_handle).await
+pub async fn play_next_track(app_handle: AppHandle) -> Result<(), AppError> {
+    play_next_internal(app_handle).await?;
+    Ok(())
 }
 
 #[command]
-pub async fn play_previous_track(app_handle: AppHandle) -> Result<(), String> {
-    play_previous_internal(app_handle).await
+pub async fn play_previous_track(app_handle: AppHandle) -> Result<(), AppError> {
+    play_previous_internal(app_handle).await?;
+    Ok(())
 }
 
 #[command]
-pub async fn stop_track(app_handle: AppHandle) -> Result<(), String> {
-    stop_internal(app_handle).await
+pub async fn stop_track(app_handle: AppHandle) -> Result<(), AppError> {
+    stop_internal(app_handle).await?;
+    Ok(())
 }
 
 #[command]
@@ -99,25 +104,28 @@ pub async fn play_track(
     app_handle: AppHandle,
     full_path: String,
     track_id: Option<i64>,
-) -> Result<String, String> {
+) -> Result<String, AppError> {
     let track = load_track_for_playback(&full_path, track_id);
     play_track_internal(&app_handle, track, None)?;
     Ok(format!("Playing track: {}", full_path))
 }
 
 #[command]
-pub async fn resume_track(app_handle: AppHandle) -> Result<(), String> {
-    resume_internal(app_handle).await
+pub async fn resume_track(app_handle: AppHandle) -> Result<(), AppError> {
+    resume_internal(app_handle).await?;
+    Ok(())
 }
 
 #[command]
-pub async fn pause_track(app_handle: AppHandle) -> Result<(), String> {
-    pause_internal(app_handle).await
+pub async fn pause_track(app_handle: AppHandle) -> Result<(), AppError> {
+    pause_internal(app_handle).await?;
+    Ok(())
 }
 
 #[command]
-pub async fn toggle_track(app_handle: AppHandle) -> Result<bool, String> {
-    toggle_internal(app_handle).await
+pub async fn toggle_track(app_handle: AppHandle) -> Result<bool, AppError> {
+    let status = toggle_internal(app_handle).await?;
+    Ok(status)
 }
 
 #[command]
@@ -126,7 +134,7 @@ pub async fn current_time() -> f64 {
 }
 
 #[command]
-pub async fn get_current_status() -> Result<PlaybackStatusSnapshot, String> {
+pub async fn get_current_status() -> Result<PlaybackStatusSnapshot, AppError> {
     status_snapshot().map(|s| s.status_payload())
 }
 
@@ -136,7 +144,7 @@ pub async fn set_current_time(app_handle: AppHandle, time: f64) {
 }
 
 #[command]
-pub async fn set_volume(volume: u8) -> Result<(), String> {
+pub async fn set_volume(volume: u8) -> Result<(), AppError> {
     let mut state = lock_audio_state()?;
     let volume_f32 = volume as f32 / 100.0;
     let safe_volume = volume_f32.clamp(0.0, 1.0);
diff --git a/src-tauri/src/commands/playback_queue.rs b/src-tauri/src/commands/playback_queue.rs
index 08821a7..c099fc4 100644
--- a/src-tauri/src/commands/playback_queue.rs
+++ b/src-tauri/src/commands/playback_queue.rs
@@ -1,17 +1,18 @@
 use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
+use crate::errors::AppError;
 use crate::models::{PlaybackQueue, Track};
 use crate::services::playback_events::{emit_queue_changed, queue_snapshot};
 use crate::services::playback_service::{play_current_index_internal, stop_internal};
 use crate::state::playback_state::{lock_audio_state, with_audio_state};
 
 #[command]
-pub fn get_playback_queue() -> Result<PlaybackQueue, String> {
+pub fn get_playback_queue() -> Result<PlaybackQueue, AppError> {
     with_audio_state(|state| state.playback_queue.clone())
 }
 
 #[command]
-pub async fn clear_queue(app: AppHandle) -> Result<PlaybackQueue, String> {
+pub async fn clear_queue(app: AppHandle) -> Result<PlaybackQueue, AppError> {
     {
         let mut state = lock_audio_state()?;
         state.playback_queue.clear();
@@ -22,7 +23,7 @@ pub async fn clear_queue(app: AppHandle) -> Result<PlaybackQueue, String> {
 }
 
 #[command]
-pub fn set_play_mode(app: AppHandle, mode: PlayMode) -> Result<PlaybackQueue, String> {
+pub fn set_play_mode(app: AppHandle, mode: PlayMode) -> Result<PlaybackQueue, AppError> {
     {
         let mut state = lock_audio_state()?;
         state.play_mode = mode;
@@ -33,7 +34,7 @@ pub fn set_play_mode(app: AppHandle, mode: PlayMode) -> Result<PlaybackQueue, St
 }
 
 #[command]
-pub fn insert_tracks_as_next(app: AppHandle, tracks: Vec<Track>) -> Result<PlaybackQueue, String> {
+pub fn insert_tracks_as_next(app: AppHandle, tracks: Vec<Track>) -> Result<PlaybackQueue, AppError> {
     {
         let mut state = lock_audio_state()?;
         state.playback_queue.insert_tracks_next(tracks);
@@ -47,7 +48,7 @@ pub async fn replace_playlist_and_play(
     app: AppHandle,
     tracks: Vec<Track>,
     target_id: i64,
-) -> Result<(), String> {
+) -> Result<(), AppError> {
     let play_index = {
         let mut state = lock_audio_state()?;
         state.playback_queue.replace_playlist(tracks, target_id)?
diff --git a/src-tauri/src/commands/playlists.rs b/src-tauri/src/commands/playlists.rs
index 8e678f1..3133fea 100644
--- a/src-tauri/src/commands/playlists.rs
+++ b/src-tauri/src/commands/playlists.rs
@@ -13,7 +13,6 @@ pub async fn create_playlist(
         .playlists
         .create_playlist(playlist)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -25,7 +24,6 @@ pub async fn rename_playlist(
         .playlists
         .rename_playlist(playlist)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -37,7 +35,6 @@ pub async fn delete_playlist(
         .playlists
         .delete_playlist(id)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -49,7 +46,6 @@ pub async fn get_playlist(
         .playlists
         .get_playlist(id)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -58,7 +54,6 @@ pub async fn list_playlists(state: State<'_, AppState>) -> Result<Vec<Playlist>,
         .playlists
         .list_playlists()
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -69,7 +64,6 @@ pub async fn list_playlists_with_tracks(
         .playlists
         .list_playlists_with_tracks()
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -81,7 +75,6 @@ pub async fn get_playlist_with_tracks(
         .playlists
         .get_playlist_with_tracks(id)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -93,7 +86,6 @@ pub async fn add_track_to_playlist(
         .playlists
         .add_track(track)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -106,7 +98,6 @@ pub async fn remove_track_from_playlist(
         .playlists
         .remove_track(playlist_id, track_id)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -118,7 +109,6 @@ pub async fn clear_playlist_tracks(
         .playlists
         .clear_tracks(playlist_id)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -132,5 +122,4 @@ pub async fn reorder_playlist_track(
         .playlists
         .reorder_track(playlist_id, track_id, position)
         .await
-        .map_err(AppError::Command)
 }
diff --git a/src-tauri/src/commands/recent.rs b/src-tauri/src/commands/recent.rs
index 2989de5..7b4b122 100644
--- a/src-tauri/src/commands/recent.rs
+++ b/src-tauri/src/commands/recent.rs
@@ -14,7 +14,6 @@ pub async fn load_recently_played(
         .recent
         .load(limit, offset)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -27,10 +26,9 @@ pub async fn add_recently_played(
         .recent
         .add(track_id, played_at)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
 pub async fn clear_recently_played(state: State<'_, AppState>) -> Result<(), AppError> {
-    state.recent.clear().await.map_err(AppError::Command)
+    state.recent.clear().await
 }
diff --git a/src-tauri/src/commands/tracks.rs b/src-tauri/src/commands/tracks.rs
index b425b62..aabb56b 100644
--- a/src-tauri/src/commands/tracks.rs
+++ b/src-tauri/src/commands/tracks.rs
@@ -9,7 +9,7 @@ pub async fn create_track(
     state: State<'_, AppState>,
     track: NewTrack,
 ) -> Result<Track, AppError> {
-    state.tracks.create_track(track).await.map_err(AppError::Command)
+    state.tracks.create_track(track).await
 }
 
 #[command]
@@ -17,7 +17,7 @@ pub async fn upsert_track(
     state: State<'_, AppState>,
     track: NewTrack,
 ) -> Result<Track, AppError> {
-    state.tracks.upsert_track(track).await.map_err(AppError::Command)
+    state.tracks.upsert_track(track).await
 }
 
 #[command]
@@ -25,7 +25,7 @@ pub async fn update_track(
     state: State<'_, AppState>,
     track: UpdateTrack,
 ) -> Result<Track, AppError> {
-    state.tracks.update_track(track).await.map_err(AppError::Command)
+    state.tracks.update_track(track).await
 }
 
 #[command]
@@ -33,7 +33,7 @@ pub async fn delete_track(
     state: State<'_, AppState>,
     id: i64,
 ) -> Result<(), AppError> {
-    state.tracks.delete_track(id).await.map_err(AppError::Command)
+    state.tracks.delete_track(id).await
 }
 
 #[command]
@@ -45,7 +45,6 @@ pub async fn delete_track_by_path(
         .tracks
         .delete_track_by_path(&path)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
@@ -53,7 +52,7 @@ pub async fn get_track(
     state: State<'_, AppState>,
     id: i64,
 ) -> Result<Option<Track>, AppError> {
-    state.tracks.get_track(id).await.map_err(AppError::Command)
+    state.tracks.get_track(id).await
 }
 
 #[command]
@@ -65,12 +64,11 @@ pub async fn get_track_by_path(
         .tracks
         .get_track_by_path(&path)
         .await
-        .map_err(AppError::Command)
 }
 
 #[command]
 pub async fn list_tracks(state: State<'_, AppState>) -> Result<Vec<Track>, AppError> {
-    state.tracks.list_tracks().await.map_err(AppError::Command)
+    state.tracks.list_tracks().await
 }
 
 #[command]
@@ -78,7 +76,7 @@ pub async fn search_tracks(
     state: State<'_, AppState>,
     query: TrackSearchQuery,
 ) -> Result<Vec<Track>, AppError> {
-    state.tracks.search_tracks(query).await.map_err(AppError::Command)
+    state.tracks.search_tracks(query).await
 }
 
 #[command]
@@ -91,5 +89,4 @@ pub async fn mark_track_played(
         .tracks
         .mark_track_played(id, played_at)
         .await
-        .map_err(AppError::Command)
 }
diff --git a/src-tauri/src/db/manager.rs b/src-tauri/src/db/manager.rs
index 20a75d4..9c327f7 100644
--- a/src-tauri/src/db/manager.rs
+++ b/src-tauri/src/db/manager.rs
@@ -5,18 +5,20 @@ use sqlx::sqlite::{SqliteConnectOptions, SqliteJournalMode, SqlitePoolOptions, S
 use sqlx::{ConnectOptions, SqlitePool};
 use tauri::Manager;
 
+use crate::errors::AppError;
+
 #[derive(Clone)]
 pub struct DatabaseManager {
     pool: SqlitePool,
 }
 
 impl DatabaseManager {
-    pub async fn new(app_handle: &tauri::AppHandle) -> Result<Self, String> {
+    pub async fn new(app_handle: &tauri::AppHandle) -> Result<Self, AppError> {
         let database_path = database_path(app_handle)?;
 
         if let Some(parent) = database_path.parent() {
             if !parent.exists() {
-                fs::create_dir_all(parent).map_err(|error| error.to_string())?;
+                fs::create_dir_all(parent).map_err(AppError::from)?;
             }
         }
 
@@ -32,12 +34,12 @@ impl DatabaseManager {
             .max_connections(5)
             .connect_with(options)
             .await
-            .map_err(|error| error.to_string())?;
+            .map_err(AppError::from)?;
 
         sqlx::migrate!("./migrations")
             .run(&pool)
             .await
-            .map_err(|error| error.to_string())?;
+            .map_err(AppError::from)?;
 
         Ok(Self { pool })
     }
@@ -47,11 +49,11 @@ impl DatabaseManager {
     }
 }
 
-fn database_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, String> {
+fn database_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, AppError> {
     let app_data_path = app_handle
         .path()
         .app_data_dir()
-        .map_err(|error| error.to_string())?;
+        .map_err(AppError::from)?;
 
     Ok(app_data_path.join("music.sqlite"))
 }
diff --git a/src-tauri/src/errors/app_error.rs b/src-tauri/src/errors/app_error.rs
index 99ed5f2..172fb6f 100644
--- a/src-tauri/src/errors/app_error.rs
+++ b/src-tauri/src/errors/app_error.rs
@@ -8,6 +8,8 @@ pub enum AppError {
     Migration(String),
     Service(String),
     Command(String),
+    Platform(String),
+    Domain(String),
 }
 
 impl std::fmt::Display for AppError {
@@ -17,7 +19,9 @@ impl std::fmt::Display for AppError {
             | AppError::Io(message)
             | AppError::Migration(message)
             | AppError::Service(message)
-            | AppError::Command(message) => formatter.write_str(message),
+            | AppError::Command(message)
+            | AppError::Platform(message)
+            | AppError::Domain(message) => formatter.write_str(message),
         }
     }
 }
@@ -53,3 +57,9 @@ impl From<&str> for AppError {
         AppError::Service(error.to_string())
     }
 }
+
+impl From<tauri::Error> for AppError {
+    fn from(error: tauri::Error) -> Self {
+        AppError::Platform(error.to_string())
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 1a04047..ad6ba1a 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -24,7 +24,7 @@ use commands::library::{
 
 use commands::playback::{
     current_time, get_current_status, insert_track_as_next, pause_track, play_next_track,
-    play_previous_track, play_queue_track, play_track, remove_track_from_backend_queue,
+    play_previous_track, play_queue_track, play_track, remove_track_from_queue,
     resume_track, set_current_time, set_volume, spawn_playback_progress_task, stop_track,
     sync_playback_queue, toggle_track,
 };
@@ -203,7 +203,7 @@ pub fn run() {
             play_track,
             play_queue_track,
             insert_track_as_next,
-            remove_track_from_backend_queue,
+            remove_track_from_queue,
             play_next_track,
             play_previous_track,
             stop_track,
diff --git a/src-tauri/src/repositories/sqlite/playlist_repository.rs b/src-tauri/src/repositories/sqlite/playlist_repository.rs
index c1d49c8..b705148 100644
--- a/src-tauri/src/repositories/sqlite/playlist_repository.rs
+++ b/src-tauri/src/repositories/sqlite/playlist_repository.rs
@@ -1,5 +1,6 @@
 use sqlx::SqlitePool;
 
+use crate::errors::AppError;
 use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist, Track};
 
 #[derive(Clone)]
@@ -12,7 +13,7 @@ impl SqlitePlaylistRepository {
         Self { pool }
     }
 
-    pub async fn create(&self, playlist: NewPlaylist) -> Result<Playlist, String> {
+    pub async fn create(&self, playlist: NewPlaylist) -> Result<Playlist, AppError> {
         sqlx::query_as::<_, Playlist>(
             "INSERT INTO playlists (name, created_at)
              VALUES (?1, datetime('now'))
@@ -21,10 +22,10 @@ impl SqlitePlaylistRepository {
         .bind(playlist.name)
         .fetch_one(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn rename(&self, playlist: RenamePlaylist) -> Result<Playlist, String> {
+    pub async fn rename(&self, playlist: RenamePlaylist) -> Result<Playlist, AppError> {
         sqlx::query_as::<_, Playlist>(
             "UPDATE playlists SET name = ?1 WHERE id = ?2 RETURNING id, name, created_at",
         )
@@ -32,36 +33,36 @@ impl SqlitePlaylistRepository {
         .bind(playlist.id)
         .fetch_one(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn delete(&self, id: i64) -> Result<(), String> {
+    pub async fn delete(&self, id: i64) -> Result<(), AppError> {
         sqlx::query("DELETE FROM playlists WHERE id = ?1")
             .bind(id)
             .execute(&self.pool)
             .await
             .map(|_| ())
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn find_by_id(&self, id: i64) -> Result<Option<Playlist>, String> {
+    pub async fn find_by_id(&self, id: i64) -> Result<Option<Playlist>, AppError> {
         sqlx::query_as::<_, Playlist>("SELECT id, name, created_at FROM playlists WHERE id = ?1")
             .bind(id)
             .fetch_optional(&self.pool)
             .await
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn list_all(&self) -> Result<Vec<Playlist>, String> {
+    pub async fn list_all(&self) -> Result<Vec<Playlist>, AppError> {
         sqlx::query_as::<_, Playlist>(
             "SELECT id, name, created_at FROM playlists ORDER BY created_at DESC, id DESC",
         )
         .fetch_all(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn list_with_tracks(&self) -> Result<Vec<PlaylistWithTracks>, String> {
+    pub async fn list_with_tracks(&self) -> Result<Vec<PlaylistWithTracks>, AppError> {
         let playlists = self.list_all().await?;
         let mut result = Vec::with_capacity(playlists.len());
 
@@ -73,7 +74,7 @@ impl SqlitePlaylistRepository {
         Ok(result)
     }
 
-    pub async fn get_with_tracks(&self, id: i64) -> Result<Option<PlaylistWithTracks>, String> {
+    pub async fn get_with_tracks(&self, id: i64) -> Result<Option<PlaylistWithTracks>, AppError> {
         let Some(playlist) = self.find_by_id(id).await? else {
             return Ok(None);
         };
@@ -82,7 +83,7 @@ impl SqlitePlaylistRepository {
         Ok(Some(PlaylistWithTracks { playlist, tracks }))
     }
 
-    pub async fn add_track(&self, track: AddPlaylistTrack) -> Result<PlaylistTrack, String> {
+    pub async fn add_track(&self, track: AddPlaylistTrack) -> Result<PlaylistTrack, AppError> {
         let position = match track.position {
             Some(position) => position,
             None => next_position(&self.pool, track.playlist_id).await?,
@@ -99,29 +100,29 @@ impl SqlitePlaylistRepository {
         .bind(position)
         .fetch_one(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn remove_track(&self, playlist_id: i64, track_id: i64) -> Result<(), String> {
+    pub async fn remove_track(&self, playlist_id: i64, track_id: i64) -> Result<(), AppError> {
         sqlx::query("DELETE FROM playlist_tracks WHERE playlist_id = ?1 AND track_id = ?2")
             .bind(playlist_id)
             .bind(track_id)
             .execute(&self.pool)
             .await
             .map(|_| ())
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn clear_tracks(&self, playlist_id: i64) -> Result<(), String> {
+    pub async fn clear_tracks(&self, playlist_id: i64) -> Result<(), AppError> {
         sqlx::query("DELETE FROM playlist_tracks WHERE playlist_id = ?1")
             .bind(playlist_id)
             .execute(&self.pool)
             .await
             .map(|_| ())
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), String> {
+    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), AppError> {
         sqlx::query("UPDATE playlist_tracks SET position = ?1 WHERE playlist_id = ?2 AND track_id = ?3")
             .bind(position)
             .bind(playlist_id)
@@ -129,23 +130,23 @@ impl SqlitePlaylistRepository {
             .execute(&self.pool)
             .await
             .map(|_| ())
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 }
 
-async fn next_position(pool: &SqlitePool, playlist_id: i64) -> Result<i64, String> {
+async fn next_position(pool: &SqlitePool, playlist_id: i64) -> Result<i64, AppError> {
     let value: (i64,) = sqlx::query_as(
         "SELECT coalesce(max(position), -1) + 1 FROM playlist_tracks WHERE playlist_id = ?1",
     )
     .bind(playlist_id)
     .fetch_one(pool)
     .await
-    .map_err(|e| e.to_string())?;
+    .map_err(AppError::from)?;
 
     Ok(value.0)
 }
 
-async fn tracks_for_playlist(pool: &SqlitePool, playlist_id: i64) -> Result<Vec<Track>, String> {
+async fn tracks_for_playlist(pool: &SqlitePool, playlist_id: i64) -> Result<Vec<Track>, AppError> {
     sqlx::query_as::<_, Track>(
         "SELECT t.id, t.title, t.artist, t.album, t.duration, t.path, t.cover, t.file_size, t.play_count, t.last_played_at, t.created_at, t.updated_at
          FROM tracks t
@@ -156,5 +157,5 @@ async fn tracks_for_playlist(pool: &SqlitePool, playlist_id: i64) -> Result<Vec<
     .bind(playlist_id)
     .fetch_all(pool)
     .await
-    .map_err(|e| e.to_string())
+    .map_err(AppError::from)
 }
\ No newline at end of file
diff --git a/src-tauri/src/repositories/sqlite/recent_repository.rs b/src-tauri/src/repositories/sqlite/recent_repository.rs
index 7fe7c1c..33b58bd 100644
--- a/src-tauri/src/repositories/sqlite/recent_repository.rs
+++ b/src-tauri/src/repositories/sqlite/recent_repository.rs
@@ -1,5 +1,6 @@
 use sqlx::SqlitePool;
 
+use crate::errors::AppError;
 use crate::models::{RecentPlayedWithTrack, Track};
 
 #[derive(Clone)]
@@ -12,7 +13,7 @@ impl SqliteRecentRepository {
         Self { pool }
     }
 
-    pub async fn list_with_tracks(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, String> {
+    pub async fn list_with_tracks(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
         let rows = sqlx::query_as::<_, RecentRow>(
             "SELECT t.id, t.title, t.artist, t.album, t.duration, t.path, t.cover, t.file_size, t.play_count, t.last_played_at, t.created_at, t.updated_at, r.played_at
              FROM recent_played r
@@ -24,7 +25,7 @@ impl SqliteRecentRepository {
         .bind(offset)
         .fetch_all(&self.pool)
         .await
-        .map_err(|e| e.to_string())?;
+        .map_err(AppError::from)?;
 
         Ok(rows.into_iter().map(|row| RecentPlayedWithTrack {
             track: Track {
@@ -45,7 +46,7 @@ impl SqliteRecentRepository {
         }).collect())
     }
 
-    pub async fn upsert(&self, track_id: i64, played_at: String) -> Result<(), String> {
+    pub async fn upsert(&self, track_id: i64, played_at: String) -> Result<(), AppError> {
         sqlx::query(
             "INSERT INTO recent_played (track_id, played_at)
              VALUES (?1, ?2)
@@ -56,26 +57,26 @@ impl SqliteRecentRepository {
         .execute(&self.pool)
         .await
         .map(|_| ())
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn clear(&self) -> Result<(), String> {
+    pub async fn clear(&self) -> Result<(), AppError> {
         sqlx::query("DELETE FROM recent_played")
             .execute(&self.pool)
             .await
             .map(|_| ())
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn count(&self) -> Result<i64, String> {
+    pub async fn count(&self) -> Result<i64, AppError> {
         let row: (i64,) = sqlx::query_as("SELECT count(*) FROM recent_played")
             .fetch_one(&self.pool)
             .await
-            .map_err(|e| e.to_string())?;
+            .map_err(AppError::from)?;
         Ok(row.0)
     }
 
-    pub async fn remove_oldest(&self, keep: i64) -> Result<(), String> {
+    pub async fn remove_oldest(&self, keep: i64) -> Result<(), AppError> {
         sqlx::query(
             "DELETE FROM recent_played WHERE track_id NOT IN (
                 SELECT track_id FROM recent_played ORDER BY played_at DESC LIMIT ?1
@@ -85,7 +86,7 @@ impl SqliteRecentRepository {
         .execute(&self.pool)
         .await
         .map(|_| ())
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 }
 
diff --git a/src-tauri/src/repositories/sqlite/track_repository.rs b/src-tauri/src/repositories/sqlite/track_repository.rs
index b291352..4d3ac4a 100644
--- a/src-tauri/src/repositories/sqlite/track_repository.rs
+++ b/src-tauri/src/repositories/sqlite/track_repository.rs
@@ -1,5 +1,6 @@
 use sqlx::{QueryBuilder, Sqlite, SqlitePool};
 
+use crate::errors::AppError;
 use crate::models::{NewTrack, SortDirection, Track, TrackSearchQuery, TrackSortBy, UpdateTrack};
 
 #[derive(Clone)]
@@ -12,7 +13,7 @@ impl SqliteTrackRepository {
         Self { pool }
     }
     
-    pub async fn create(&self, track: NewTrack) -> Result<Track, String> {
+    pub async fn create(&self, track: NewTrack) -> Result<Track, AppError> {
         sqlx::query_as::<_, Track>(
             "INSERT INTO tracks (title, artist, album, duration, path, cover, file_size, created_at, updated_at)
              VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, datetime('now'), datetime('now'))
@@ -27,10 +28,10 @@ impl SqliteTrackRepository {
         .bind(track.file_size)
         .fetch_one(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn upsert_by_path(&self, track: NewTrack) -> Result<Track, String> {
+    pub async fn upsert_by_path(&self, track: NewTrack) -> Result<Track, AppError> {
         sqlx::query_as::<_, Track>(
             "INSERT INTO tracks (title, artist, album, duration, path, cover, file_size, created_at, updated_at)
              VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, datetime('now'), datetime('now'))
@@ -53,10 +54,10 @@ impl SqliteTrackRepository {
         .bind(track.file_size)
         .fetch_one(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn update(&self, track: UpdateTrack) -> Result<Track, String> {
+    pub async fn update(&self, track: UpdateTrack) -> Result<Track, AppError> {
         sqlx::query_as::<_, Track>(
             "UPDATE tracks SET
                 title = ?1,
@@ -80,28 +81,28 @@ impl SqliteTrackRepository {
         .bind(track.id)
         .fetch_one(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn delete(&self, id: i64) -> Result<(), String> {
+    pub async fn delete(&self, id: i64) -> Result<(), AppError> {
         sqlx::query("DELETE FROM tracks WHERE id = ?1")
             .bind(id)
             .execute(&self.pool)
             .await
             .map(|_| ())
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn delete_by_path(&self, path: &str) -> Result<(), String> {
+    pub async fn delete_by_path(&self, path: &str) -> Result<(), AppError> {
         sqlx::query("DELETE FROM tracks WHERE path = ?1")
             .bind(path)
             .execute(&self.pool)
             .await
             .map(|_| ())
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn find_by_id(&self, id: i64) -> Result<Option<Track>, String> {
+    pub async fn find_by_id(&self, id: i64) -> Result<Option<Track>, AppError> {
         sqlx::query_as::<_, Track>(
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
              FROM tracks WHERE id = ?1",
@@ -109,10 +110,10 @@ impl SqliteTrackRepository {
         .bind(id)
         .fetch_optional(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn find_by_path(&self, path: &str) -> Result<Option<Track>, String> {
+    pub async fn find_by_path(&self, path: &str) -> Result<Option<Track>, AppError> {
         sqlx::query_as::<_, Track>(
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
              FROM tracks WHERE path = ?1",
@@ -120,20 +121,20 @@ impl SqliteTrackRepository {
         .bind(path)
         .fetch_optional(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn list_all(&self) -> Result<Vec<Track>, String> {
+    pub async fn list_all(&self) -> Result<Vec<Track>, AppError> {
         sqlx::query_as::<_, Track>(
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
              FROM tracks ORDER BY title COLLATE NOCASE ASC",
         )
         .fetch_all(&self.pool)
         .await
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 
-    pub async fn search(&self, query: TrackSearchQuery) -> Result<Vec<Track>, String> {
+    pub async fn search(&self, query: TrackSearchQuery) -> Result<Vec<Track>, AppError> {
         let mut builder = QueryBuilder::<Sqlite>::new(
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at FROM tracks",
         );
@@ -174,10 +175,10 @@ impl SqliteTrackRepository {
             .build_query_as::<Track>()
             .fetch_all(&self.pool)
             .await
-            .map_err(|e| e.to_string())
+            .map_err(AppError::from)
     }
 
-    pub async fn increment_play_count(&self, id: i64, played_at: String) -> Result<(), String> {
+    pub async fn increment_play_count(&self, id: i64, played_at: String) -> Result<(), AppError> {
         sqlx::query(
             "UPDATE tracks SET play_count = play_count + 1, last_played_at = ?1, updated_at = datetime('now') WHERE id = ?2",
         )
@@ -186,6 +187,6 @@ impl SqliteTrackRepository {
         .execute(&self.pool)
         .await
         .map(|_| ())
-        .map_err(|e| e.to_string())
+        .map_err(AppError::from)
     }
 }
diff --git a/src-tauri/src/services/playback_events.rs b/src-tauri/src/services/playback_events.rs
index 23070fd..8b5bdee 100644
--- a/src-tauri/src/services/playback_events.rs
+++ b/src-tauri/src/services/playback_events.rs
@@ -1,5 +1,6 @@
 use tauri::{AppHandle, Emitter};
 
+use crate::errors::AppError;
 use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
 use crate::models::playback::{
     NativePlaybackState, PlaybackStateSnapshot, PlaybackTrackStartedPayload,
@@ -7,17 +8,17 @@ use crate::models::playback::{
 use crate::models::{PlaybackQueue, Track};
 use crate::state::playback_state::{current_playback_snapshot, with_audio_state};
 
-pub fn status_snapshot() -> Result<PlaybackStateSnapshot, String> {
-    current_playback_snapshot()
+pub fn status_snapshot() -> Result<PlaybackStateSnapshot, AppError> {
+    Ok(current_playback_snapshot()?)
 }
 
-pub fn queue_snapshot() -> Result<PlaybackQueue, String> {
-    with_audio_state(|state| state.playback_queue.clone())
+pub fn queue_snapshot() -> Result<PlaybackQueue, AppError> {
+    Ok(with_audio_state(|state| state.playback_queue.clone())?)
 }
 
 pub fn emit_queue_changed(
     app_handle: &AppHandle,
-) -> Result<PlaybackQueue, String> {
+) -> Result<PlaybackQueue, AppError> {
     let payload = queue_snapshot()?;
 
     let _ = app_handle.emit(
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index 87a81e8..b013f83 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -1,4 +1,5 @@
 use crate::audio::{get_audio_context, lock_audio_state, AudioGraph};
+use crate::errors::AppError;
 use crate::media_controls::update_media_controls_playback;
 use crate::models::playback::NativePlaybackState;
 use crate::models::Track;
@@ -16,7 +17,7 @@ pub fn play_track_internal(
     app_handle: &AppHandle,
     track: Track,
     index: Option<usize>,
-) -> Result<(), String> {
+) -> Result<(), AppError> {
     let file_path = Path::new(&track.path);
 
     if !file_path.exists() {
@@ -89,33 +90,33 @@ pub fn play_track_internal(
     Ok(())
 }
 
-pub fn play_current_index_internal(app_handle: &AppHandle, index: usize) -> Result<(), String> {
+pub fn play_current_index_internal(app_handle: &AppHandle, index: usize) -> Result<(), AppError> {
     let track = with_audio_state(|state| state.playback_queue.require_track(index))??;
     play_track_internal(app_handle, track, Some(index))
 }
 
-pub async fn play_next_internal(app_handle: AppHandle) -> Result<(), String> {
+pub async fn play_next_internal(app_handle: AppHandle) -> Result<(), AppError> {
     let index = with_audio_state(|state| state.playback_queue.move_next())?
-        .ok_or_else(|| "Queue is empty".to_string())?;
+        .ok_or_else(|| AppError::from("Queue is empty"))?;
 
     play_current_index_internal(&app_handle, index)
 }
 
-pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), String> {
+pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), AppError> {
     let index = with_audio_state(|state| state.playback_queue.move_previous())?
-        .ok_or_else(|| "Queue is empty".to_string())?;
+        .ok_or_else(|| AppError::from("Queue is empty"))?;
 
     play_current_index_internal(&app_handle, index)
 }
 
-pub async fn resume_internal(app_handle: AppHandle) -> Result<(), String> {
+pub async fn resume_internal(app_handle: AppHandle) -> Result<(), AppError> {
     let current_time = with_audio_state(|state| {
         if let Some(ref mut graph) = state.graph {
             graph.media.play();
             state.playing = true;
             Ok(graph.media.current_time())
         } else {
-            Err("No media available".to_string())
+            Err(AppError::from("No media available"))
         }
     })??;
 
@@ -123,14 +124,14 @@ pub async fn resume_internal(app_handle: AppHandle) -> Result<(), String> {
     Ok(())
 }
 
-pub async fn pause_internal(app_handle: AppHandle) -> Result<(), String> {
+pub async fn pause_internal(app_handle: AppHandle) -> Result<(), AppError> {
     let current_time = with_audio_state(|state| {
         if let Some(ref mut graph) = state.graph {
             graph.media.pause();
             state.playing = false;
             Ok(graph.media.current_time())
         } else {
-            Err("No media available".to_string())
+            Err(AppError::from("No media available"))
         }
     })??;
 
@@ -138,7 +139,7 @@ pub async fn pause_internal(app_handle: AppHandle) -> Result<(), String> {
     Ok(())
 }
 
-pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
+pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, AppError> {
     let (playing, current_time) = with_audio_state(|state| {
         if let Some(ref mut graph) = state.graph {
             let playing = if graph.media.paused() {
@@ -151,7 +152,7 @@ pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
             state.playing = playing;
             Ok((playing, graph.media.current_time()))
         } else {
-            Err("No media available".to_string())
+            Err(AppError::from("No media available"))
         }
     })??;
 
@@ -165,7 +166,7 @@ pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, String> {
     Ok(playing)
 }
 
-pub async fn stop_internal(app_handle: AppHandle) -> Result<(), String> {
+pub async fn stop_internal(app_handle: AppHandle) -> Result<(), AppError> {
     with_audio_state(|state| {
         if let Some(ref mut graph) = state.graph {
             graph.media.pause();
@@ -178,7 +179,7 @@ pub async fn stop_internal(app_handle: AppHandle) -> Result<(), String> {
     Ok(())
 }
 
-pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), String> {
+pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), AppError> {
     let playing = with_audio_state(|state| {
         let playing = if let Some(ref mut graph) = state.graph {
             graph.media.set_current_time(time);
diff --git a/src-tauri/src/services/playlist_service.rs b/src-tauri/src/services/playlist_service.rs
index 1f856b7..35c576f 100644
--- a/src-tauri/src/services/playlist_service.rs
+++ b/src-tauri/src/services/playlist_service.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use crate::errors::AppError;
 use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
 use crate::repositories::sqlite::playlist_repository::SqlitePlaylistRepository;
 
@@ -13,47 +14,47 @@ impl PlaylistService {
         Self { playlists }
     }
 
-    pub async fn create_playlist(&self, playlist: NewPlaylist) -> Result<Playlist, String> {
+    pub async fn create_playlist(&self, playlist: NewPlaylist) -> Result<Playlist, AppError> {
         self.playlists.create(playlist).await
     }
 
-    pub async fn rename_playlist(&self, playlist: RenamePlaylist) -> Result<Playlist, String> {
+    pub async fn rename_playlist(&self, playlist: RenamePlaylist) -> Result<Playlist, AppError> {
         self.playlists.rename(playlist).await
     }
 
-    pub async fn delete_playlist(&self, id: i64) -> Result<(), String> {
+    pub async fn delete_playlist(&self, id: i64) -> Result<(), AppError> {
         self.playlists.delete(id).await
     }
 
-    pub async fn get_playlist(&self, id: i64) -> Result<Option<Playlist>, String> {
+    pub async fn get_playlist(&self, id: i64) -> Result<Option<Playlist>, AppError> {
         self.playlists.find_by_id(id).await
     }
 
-    pub async fn list_playlists(&self) -> Result<Vec<Playlist>, String> {
+    pub async fn list_playlists(&self) -> Result<Vec<Playlist>, AppError> {
         self.playlists.list_all().await
     }
 
-    pub async fn list_playlists_with_tracks(&self) -> Result<Vec<PlaylistWithTracks>, String> {
+    pub async fn list_playlists_with_tracks(&self) -> Result<Vec<PlaylistWithTracks>, AppError> {
         self.playlists.list_with_tracks().await
     }
 
-    pub async fn get_playlist_with_tracks(&self, id: i64) -> Result<Option<PlaylistWithTracks>, String> {
+    pub async fn get_playlist_with_tracks(&self, id: i64) -> Result<Option<PlaylistWithTracks>, AppError> {
         self.playlists.get_with_tracks(id).await
     }
 
-    pub async fn add_track(&self, track: AddPlaylistTrack) -> Result<PlaylistTrack, String> {
+    pub async fn add_track(&self, track: AddPlaylistTrack) -> Result<PlaylistTrack, AppError> {
         self.playlists.add_track(track).await
     }
 
-    pub async fn remove_track(&self, playlist_id: i64, track_id: i64) -> Result<(), String> {
+    pub async fn remove_track(&self, playlist_id: i64, track_id: i64) -> Result<(), AppError> {
         self.playlists.remove_track(playlist_id, track_id).await
     }
 
-    pub async fn clear_tracks(&self, playlist_id: i64) -> Result<(), String> {
+    pub async fn clear_tracks(&self, playlist_id: i64) -> Result<(), AppError> {
         self.playlists.clear_tracks(playlist_id).await
     }
 
-    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), String> {
+    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), AppError> {
         self.playlists.reorder_track(playlist_id, track_id, position).await
     }
 }
\ No newline at end of file
diff --git a/src-tauri/src/services/recent_service.rs b/src-tauri/src/services/recent_service.rs
index 6b9de69..5fca5be 100644
--- a/src-tauri/src/services/recent_service.rs
+++ b/src-tauri/src/services/recent_service.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use crate::errors::AppError;
 use crate::models::RecentPlayedWithTrack;
 use crate::repositories::sqlite::recent_repository::{SqliteRecentRepository};
 
@@ -15,11 +16,11 @@ impl RecentService {
         Self { recent }
     }
 
-    pub async fn load(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, String> {
+    pub async fn load(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
         self.recent.list_with_tracks(limit, offset).await
     }
 
-    pub async fn add(&self, track_id: i64, played_at: String) -> Result<(), String> {
+    pub async fn add(&self, track_id: i64, played_at: String) -> Result<(), AppError> {
         self.recent.upsert(track_id, played_at).await?;
 
         let count = self.recent.count().await?;
@@ -31,7 +32,7 @@ impl RecentService {
         Ok(())
     }
 
-    pub async fn clear(&self) -> Result<(), String> {
+    pub async fn clear(&self) -> Result<(), AppError> {
         self.recent.clear().await
     }
 }
diff --git a/src-tauri/src/services/track_service.rs b/src-tauri/src/services/track_service.rs
index 419e402..c456518 100644
--- a/src-tauri/src/services/track_service.rs
+++ b/src-tauri/src/services/track_service.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use crate::errors::AppError;
 use crate::models::{NewTrack, Track, TrackSearchQuery, UpdateTrack};
 use crate::repositories::sqlite::track_repository::SqliteTrackRepository;
 
@@ -13,43 +14,43 @@ impl TrackService {
         Self { tracks }
     }
 
-    pub async fn create_track(&self, track: NewTrack) -> Result<Track, String> {
+    pub async fn create_track(&self, track: NewTrack) -> Result<Track, AppError> {
         self.tracks.create(track).await
     }
 
-    pub async fn upsert_track(&self, track: NewTrack) -> Result<Track, String> {
+    pub async fn upsert_track(&self, track: NewTrack) -> Result<Track, AppError> {
         self.tracks.upsert_by_path(track).await
     }
 
-    pub async fn update_track(&self, track: UpdateTrack) -> Result<Track, String> {
+    pub async fn update_track(&self, track: UpdateTrack) -> Result<Track, AppError> {
         self.tracks.update(track).await
     }
 
-    pub async fn delete_track(&self, id: i64) -> Result<(), String> {
+    pub async fn delete_track(&self, id: i64) -> Result<(), AppError> {
         self.tracks.delete(id).await
     }
 
-    pub async fn delete_track_by_path(&self, path: &str) -> Result<(), String> {
+    pub async fn delete_track_by_path(&self, path: &str) -> Result<(), AppError> {
         self.tracks.delete_by_path(path).await
     }
 
-    pub async fn get_track(&self, id: i64) -> Result<Option<Track>, String> {
+    pub async fn get_track(&self, id: i64) -> Result<Option<Track>, AppError> {
         self.tracks.find_by_id(id).await
     }
 
-    pub async fn get_track_by_path(&self, path: &str) -> Result<Option<Track>, String> {
+    pub async fn get_track_by_path(&self, path: &str) -> Result<Option<Track>, AppError> {
         self.tracks.find_by_path(path).await
     }
 
-    pub async fn list_tracks(&self) -> Result<Vec<Track>, String> {
+    pub async fn list_tracks(&self) -> Result<Vec<Track>, AppError> {
         self.tracks.list_all().await
     }
 
-    pub async fn search_tracks(&self, query: TrackSearchQuery) -> Result<Vec<Track>, String> {
+    pub async fn search_tracks(&self, query: TrackSearchQuery) -> Result<Vec<Track>, AppError> {
         self.tracks.search(query).await
     }
 
-    pub async fn mark_track_played(&self, id: i64, played_at: String) -> Result<(), String> {
+    pub async fn mark_track_played(&self, id: i64, played_at: String) -> Result<(), AppError> {
         self.tracks.increment_play_count(id, played_at).await
     }
 }
\ No newline at end of file
diff --git a/src-tauri/src/state/playback_state.rs b/src-tauri/src/state/playback_state.rs
index 4b8ab13..16dacbf 100644
--- a/src-tauri/src/state/playback_state.rs
+++ b/src-tauri/src/state/playback_state.rs
@@ -1,12 +1,13 @@
 use std::path::Path;
 pub use crate::audio::lock_audio_state;
 use crate::audio::AudioState;
+use crate::errors::AppError;
 use crate::models::playback::{
     NativeTrackMetadata, PlaybackStateSnapshot, PlaybackTrackInfo,
 };
 use crate::models::Track;
 
-pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, String> {
+pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, AppError> {
     let mut state = lock_audio_state()?;
     Ok(f(&mut state))
 }
@@ -41,7 +42,7 @@ pub fn current_playback_state(state: &mut AudioState) -> PlaybackStateSnapshot {
     }
 }
 
-pub fn current_playback_snapshot() -> Result<PlaybackStateSnapshot, String> {
+pub fn current_playback_snapshot() -> Result<PlaybackStateSnapshot, AppError> {
     with_audio_state(current_playback_state)
 }
 
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 4209d62..63f948f 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -151,7 +151,7 @@ class Player {
         )
     }
 
-    async insertTracksNext(tracks: Track[]) {
+    async insertTracksAsNext(tracks: Track[]) {
         const payload = await invoke<PlaybackQueue>(
             'insert_tracks_as_next',
             { tracks }
@@ -167,7 +167,7 @@ class Player {
 
     async removeTrack(trackId: number) {
         const payload = await invoke<PlaybackQueue>(
-            'remove_track_from_backend_queue',
+            'remove_track_from_queue',
             { trackId }
         )
 
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index f8180d3..4e215ff 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -12,8 +12,8 @@
     import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import {
-        scanDirectory,
         removeMusicDirectory,
+        scanDirectory,
     } from '$lib/utils/library'
     import { invoke } from '@tauri-apps/api/core'
 
@@ -80,7 +80,7 @@
     )
 
     function appendTracksToPlaylist(tracks: Track[]) {
-        player.insertTracksNext(tracks)
+        player.insertTracksAsNext(tracks)
     }
 
     function addAllToPlaylist() {
@@ -186,7 +186,7 @@
 
     async function removeContextTrackFromList(track: Track) {
         musicLibrary.tracks = musicLibrary.tracks.filter(item => item.id !== track.id)
-        await player.removeTrackFromBackendQueue(track.id)
+        await player.removeTrack(track.id)
     }
 
     async function deleteContextTrackFile(track: Track) {

From 6c91cc25bb899ef30d3646586e73f118bba81b6f Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Wed, 3 Jun 2026 23:08:18 +0800
Subject: [PATCH 27/39] eat: Add an AudioEngine trait and a WebAudioEngine
 implementation

- Replace legacy AudioGraph with trait-based AudioEngine and boxed engine storage in AudioState.
- Introduce central event system (AppPayload, emit_event helpers) replacing playback_events module.
- Refactor playback services to interact directly with engine methods (play, pause, seek).
- Update command signatures to unit returns and move to event-driven state updates.
- Standardize data models: rename PlaybackStateSnapshot to PlaybackStatusSnapshot and PlaybackTrackSnapshot to PlaybackTrackInfo.
- Update frontend to consume unified global-app-event channel and streamline player state logic.
- Perform widespread cleanup of unused modules and legacy code."
---
 src-tauri/src/audio/engine.rs              |  11 ++
 src-tauri/src/audio/graph.rs               |  16 --
 src-tauri/src/audio/mod.rs                 |  19 +-
 src-tauri/src/audio/state.rs               |  19 +-
 src-tauri/src/audio/web_audio.rs           |  84 +++++++++
 src-tauri/src/commands/library.rs          |  11 +-
 src-tauri/src/commands/playback.rs         |  41 +++--
 src-tauri/src/commands/playback_queue.rs   |  15 +-
 src-tauri/src/commands/settings.rs         |  22 ++-
 src-tauri/src/events.rs                    |  66 +++++++
 src-tauri/src/lib.rs                       |  15 +-
 src-tauri/src/media_controls.rs            |  20 +-
 src-tauri/src/models/playback.rs           |  52 +-----
 src-tauri/src/services/mod.rs              |   1 -
 src-tauri/src/services/playback_events.rs  |  65 -------
 src-tauri/src/services/playback_service.rs | 154 +++++-----------
 src-tauri/src/state/playback_state.rs      |  44 ++---
 src/lib/state/player.svelte.ts             | 205 ++++++---------------
 src/lib/state/settings.svelte.ts           |  22 ++-
 src/lib/types/events.ts                    |  10 +
 src/lib/types/index.ts                     |   3 +-
 src/lib/types/playback.ts                  |   4 +-
 src/routes/+layout.svelte                  |  20 +-
 23 files changed, 425 insertions(+), 494 deletions(-)
 create mode 100644 src-tauri/src/audio/engine.rs
 delete mode 100644 src-tauri/src/audio/graph.rs
 create mode 100644 src-tauri/src/audio/web_audio.rs
 create mode 100644 src-tauri/src/events.rs
 delete mode 100644 src-tauri/src/services/playback_events.rs
 create mode 100644 src/lib/types/events.ts

diff --git a/src-tauri/src/audio/engine.rs b/src-tauri/src/audio/engine.rs
new file mode 100644
index 0000000..4392224
--- /dev/null
+++ b/src-tauri/src/audio/engine.rs
@@ -0,0 +1,11 @@
+use crate::errors::AppError;
+
+pub trait AudioEngine: Send {
+    fn play(&mut self) -> Result<(), AppError>;
+    fn pause(&mut self);
+    fn seek(&mut self, time: f64);
+    fn set_volume(&self, volume: f32);
+    fn set_pan(&self, pan: f32);
+    fn current_time(&self) -> f64;
+    fn paused(&self) -> bool;
+}
\ No newline at end of file
diff --git a/src-tauri/src/audio/graph.rs b/src-tauri/src/audio/graph.rs
deleted file mode 100644
index 4471ff0..0000000
--- a/src-tauri/src/audio/graph.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use web_audio_api::{MediaElement, node::{AudioNode, GainNode, MediaElementAudioSourceNode, StereoPannerNode}};
-pub struct AudioGraph {
-    pub media: MediaElement,
-    pub src: MediaElementAudioSourceNode,
-    pub gain: GainNode,
-    pub panner: StereoPannerNode,
-}
-
-impl AudioGraph {
-    pub fn destroy(self) {
-        let _ = self.panner.disconnect();
-        let _ = self.gain.disconnect();
-        let _ = self.src.disconnect();
-        self.media.pause();
-    }
-}
\ No newline at end of file
diff --git a/src-tauri/src/audio/mod.rs b/src-tauri/src/audio/mod.rs
index eec73bc..57fd9e4 100644
--- a/src-tauri/src/audio/mod.rs
+++ b/src-tauri/src/audio/mod.rs
@@ -1,21 +1,12 @@
-pub mod graph;
+pub mod engine;
+pub mod web_audio;
 pub mod state;
 
-pub use graph::AudioGraph;
+pub use engine::AudioEngine;
+pub use web_audio::WebAudioEngine;
 pub use state::{AudioState, init_audio_state, lock_audio_state};
-use web_audio_api::{MediaElement, context::AudioContext};
+use web_audio_api::context::AudioContext;
 
 pub fn get_audio_context() -> AudioContext {
     AudioContext::default()
-}
-
-pub fn with_media<F, R>(state: &mut AudioState, f: F) -> Result<R, String>
-where
-    F: FnOnce(&mut MediaElement) -> R,
-{
-    if let Some(ref mut graph) = state.graph {
-        Ok(f(&mut graph.media))
-    } else {
-        Err("Audio graph is missing".into())
-    }
 }
\ No newline at end of file
diff --git a/src-tauri/src/audio/state.rs b/src-tauri/src/audio/state.rs
index 338d9d4..5e286b3 100644
--- a/src-tauri/src/audio/state.rs
+++ b/src-tauri/src/audio/state.rs
@@ -1,5 +1,5 @@
 use std::sync::{Mutex, MutexGuard, OnceLock};
-use crate::audio::graph::AudioGraph;
+use crate::audio::engine::AudioEngine;
 use crate::errors::AppError;
 use crate::models::PlaybackQueue;
 
@@ -11,7 +11,7 @@ pub enum PlayMode {
 }
 
 pub struct AudioState {
-    pub graph: Option<AudioGraph>,
+    pub engine: Option<Box<dyn AudioEngine + Send>>,
     pub volume: f32,
     pub pan: f32,
     pub playing: bool,
@@ -21,12 +21,25 @@ pub struct AudioState {
     pub play_mode: PlayMode,
 }
 
+impl AudioState {
+    pub fn with_engine<F, R>(&mut self, f: F) -> Result<R, AppError>
+    where
+        F: FnOnce(&mut Box<dyn AudioEngine + Send>) -> R,
+    {
+        if let Some(ref mut engine) = self.engine {
+            Ok(f(engine))
+        } else {
+            Err(AppError::from("Audio engine is missing"))
+        }
+    }
+}
+
 static AUDIO_STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
 
 pub fn init_audio_state(queue: PlaybackQueue) {
     AUDIO_STATE.get_or_init(|| {
         Mutex::new(AudioState {
-            graph: None,
+            engine: None,
             volume: 1.0,
             pan: 0.0,
             playing: false,
diff --git a/src-tauri/src/audio/web_audio.rs b/src-tauri/src/audio/web_audio.rs
new file mode 100644
index 0000000..c23ee7e
--- /dev/null
+++ b/src-tauri/src/audio/web_audio.rs
@@ -0,0 +1,84 @@
+use std::path::Path;
+use web_audio_api::{
+    MediaElement, context::BaseAudioContext, node::{AudioNode, GainNode, MediaElementAudioSourceNode, StereoPannerNode}
+};
+use crate::errors::AppError;
+use crate::audio::engine::AudioEngine;
+use crate::audio::get_audio_context;
+
+pub struct WebAudioEngine {
+    media: MediaElement,
+    src: MediaElementAudioSourceNode,
+    gain: GainNode,
+    panner: StereoPannerNode,
+}
+
+impl WebAudioEngine {
+    pub fn new(file_path: &Path, volume: f32, pan: f32) -> Result<Self, AppError> {
+        let context = get_audio_context();
+        let _ = context.resume();
+
+        let mut media = web_audio_api::MediaElement::new(file_path)
+            .map_err(|e| format!("Failed to create media element: {}", e))?;
+
+        let src = context.create_media_element_source(&mut media);
+        let gain = context.create_gain();
+        let panner = context.create_stereo_panner();
+
+        src.connect(&gain);
+        gain.connect(&panner);
+        panner.connect(&context.destination());
+
+        media.set_loop(false);
+        media.set_current_time(0.0);
+        gain.gain().set_value(volume);
+        panner.pan().set_value(pan);
+
+        Ok(WebAudioEngine {
+            media,
+            src,
+            gain,
+            panner,
+        })
+    }
+}
+
+impl AudioEngine for WebAudioEngine {
+    fn play(&mut self) -> Result<(), AppError> {
+        self.media.play();
+        Ok(())
+    }
+
+    fn pause(&mut self) {
+        self.media.pause();
+    }
+
+    fn seek(&mut self, time: f64) {
+        self.media.set_current_time(time);
+    }
+
+    fn set_volume(&self, volume: f32) {
+        self.gain.gain().set_value(volume);
+    }
+
+    fn set_pan(&self, pan: f32) {
+        self.panner.pan().set_value(pan);
+    }
+
+    fn current_time(&self) -> f64 {
+        self.media.current_time()
+    }
+
+    fn paused(&self) -> bool {
+        self.media.paused()
+    }
+}
+
+impl Drop for WebAudioEngine {
+    fn drop(&mut self) {
+        let _ = self.panner.disconnect();
+        let _ = self.gain.disconnect();
+        let _ = self.src.disconnect();
+        self.media.pause();
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index 9399bb0..a71b449 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -12,7 +12,7 @@ use walkdir::WalkDir;
 use crate::commands::playback::remove_track_from_queue;
 use crate::errors::AppError;
 use crate::metadata::parse_single_track;
-use crate::models::{NewTrack, PlaybackQueue, Track};
+use crate::models::{NewTrack, Track};
 use crate::state::AppState;
 
 const SUPPORTED_EXT: [&str; 5] = ["mp3", "flac", "m4a", "wav", "ogg"];
@@ -164,12 +164,15 @@ pub async fn delete_track_file(
     app_handle: tauri::AppHandle,
     path: String,
     track_id: i64,
-) -> Result<PlaybackQueue, AppError> {
+) -> Result<(), AppError> {
+    // 1. 验证并删除物理文件
     let file_path = validate_audio_path(&path)?;
     trash::delete(file_path)
         .map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
-    let queue = remove_track_from_queue(app_handle, track_id).await?;
-    Ok(queue)
+
+    remove_track_from_queue(app_handle, track_id).await?;
+
+    Ok(())
 }
 
 #[command]
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index 6e62933..7672565 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -2,15 +2,15 @@ use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
 use crate::errors::AppError;
 use crate::models::playback::PlaybackStatusSnapshot;
-use crate::models::{PlaybackQueue, Track};
-use crate::services::playback_events::{emit_queue_changed, status_snapshot};
+use crate::models::Track;
+use crate::events::emit_queue_changed;
 use crate::services::playback_service::{
     handle_media_control_event_internal, load_track_for_playback, pause_internal,
     play_current_index_internal, play_next_internal, play_previous_internal, play_track_internal,
     resume_internal, seek_internal, stop_internal, toggle_internal,
 };
 use crate::state::playback_state::{
-    current_time_from_state, lock_audio_state, sanitize_track, with_audio_state,
+    current_playback_snapshot, current_time_from_state, lock_audio_state, sanitize_track, with_audio_state
 };
 
 pub use crate::services::playback_service::spawn_playback_progress_task;
@@ -41,38 +41,36 @@ pub async fn sync_playback_queue(
 pub async fn remove_track_from_queue(
     app_handle: AppHandle,
     track_id: i64,
-) -> Result<PlaybackQueue, AppError> {
+) -> Result<(), AppError> {
     let result = {
         let mut state = lock_audio_state()?;
-
+        
         if !state.playback_queue.contains_track(track_id) {
-            return Ok(state.playback_queue.payload());
+            return Ok(());
         }
-
         state.playback_queue.remove_track(track_id)
     };
 
-    let payload = emit_queue_changed(&app_handle)?;
-
     if result.should_stop {
-        let _ = stop_internal(app_handle).await;
+        stop_internal(app_handle.clone()).await?;
     } else if let Some(index) = result.play_index {
-        let _ = play_current_index_internal(&app_handle, index);
+        play_current_index_internal(&app_handle, index)?;
     }
 
-    Ok(payload)
+    emit_queue_changed(&app_handle)?;
+    
+    Ok(())
 }
 
 #[command]
 pub async fn insert_track_as_next(
-    app_handle: AppHandle,
+    _app_handle: AppHandle,
     track: Track,
-) -> Result<PlaybackQueue, AppError> {
+) -> Result<(), AppError> {
     with_audio_state(|state| {
         state.playback_queue.insert_next(track);
     })?;
-
-    emit_queue_changed(&app_handle)
+    Ok(())
 }
 
 #[command]
@@ -135,7 +133,7 @@ pub async fn current_time() -> f64 {
 
 #[command]
 pub async fn get_current_status() -> Result<PlaybackStatusSnapshot, AppError> {
-    status_snapshot().map(|s| s.status_payload())
+    current_playback_snapshot()
 }
 
 #[command]
@@ -144,16 +142,19 @@ pub async fn set_current_time(app_handle: AppHandle, time: f64) {
 }
 
 #[command]
-pub async fn set_volume(volume: u8) -> Result<(), AppError> {
+pub async fn set_volume(app_handle: tauri::AppHandle, volume: f32) -> Result<(), AppError> {
     let mut state = lock_audio_state()?;
     let volume_f32 = volume as f32 / 100.0;
     let safe_volume = volume_f32.clamp(0.0, 1.0);
 
     state.volume = safe_volume;
 
-    if let Some(ref graph) = state.graph {
-        graph.gain.gain().set_value(safe_volume);
+    if let Some(ref engine) = state.engine {
+        engine.set_volume(safe_volume);
     }
 
+    crate::events::emit_event(&app_handle, crate::events::AppPayload::VolumeChanged(safe_volume))
+        .map_err(|e| AppError::from(e.to_string()))?;
+
     Ok(())
 }
\ No newline at end of file
diff --git a/src-tauri/src/commands/playback_queue.rs b/src-tauri/src/commands/playback_queue.rs
index c099fc4..a42a823 100644
--- a/src-tauri/src/commands/playback_queue.rs
+++ b/src-tauri/src/commands/playback_queue.rs
@@ -2,7 +2,7 @@ use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
 use crate::errors::AppError;
 use crate::models::{PlaybackQueue, Track};
-use crate::services::playback_events::{emit_queue_changed, queue_snapshot};
+use crate::events::emit_queue_changed;
 use crate::services::playback_service::{play_current_index_internal, stop_internal};
 use crate::state::playback_state::{lock_audio_state, with_audio_state};
 
@@ -12,35 +12,36 @@ pub fn get_playback_queue() -> Result<PlaybackQueue, AppError> {
 }
 
 #[command]
-pub async fn clear_queue(app: AppHandle) -> Result<PlaybackQueue, AppError> {
+pub async fn clear_queue(app: AppHandle) -> Result<(), AppError> {
     {
         let mut state = lock_audio_state()?;
         state.playback_queue.clear();
     }
+    
     stop_internal(app.clone()).await?;
     emit_queue_changed(&app)?;
-    queue_snapshot()
+    Ok(())
 }
 
 #[command]
-pub fn set_play_mode(app: AppHandle, mode: PlayMode) -> Result<PlaybackQueue, AppError> {
+pub fn set_play_mode(app: AppHandle, mode: PlayMode) -> Result<(), AppError> {
     {
         let mut state = lock_audio_state()?;
         state.play_mode = mode;
         state.playback_queue.play_mode = mode;
     }
     emit_queue_changed(&app)?;
-    queue_snapshot()
+    Ok(())
 }
 
 #[command]
-pub fn insert_tracks_as_next(app: AppHandle, tracks: Vec<Track>) -> Result<PlaybackQueue, AppError> {
+pub fn insert_tracks_as_next(app: AppHandle, tracks: Vec<Track>) -> Result<(), AppError> {
     {
         let mut state = lock_audio_state()?;
         state.playback_queue.insert_tracks_next(tracks);
     }
     emit_queue_changed(&app)?;
-    queue_snapshot()
+    Ok(())
 }
 
 #[command]
diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs
index 5203893..a7079c3 100644
--- a/src-tauri/src/commands/settings.rs
+++ b/src-tauri/src/commands/settings.rs
@@ -1,8 +1,8 @@
-use tauri::{State, command};
-
+use tauri::{State, command, AppHandle};
 use crate::errors::AppError;
 use crate::models::AppSettings;
 use crate::state::AppState;
+use crate::events::{emit_event, AppPayload};
 
 #[command]
 pub async fn get_settings(state: State<'_, AppState>) -> Result<AppSettings, AppError> {
@@ -11,10 +11,16 @@ pub async fn get_settings(state: State<'_, AppState>) -> Result<AppSettings, App
 
 #[command]
 pub async fn update_settings(
+    app_handle: AppHandle,
     state: State<'_, AppState>,
     settings: AppSettings,
 ) -> Result<AppSettings, AppError> {
-    state.settings.update_settings(settings).await
+    let updated_settings = state.settings.update_settings(settings).await?;
+    
+    emit_event(&app_handle, AppPayload::SettingsChanged(updated_settings.clone()))
+        .map_err(|e| AppError::from(e.to_string()))?;
+        
+    Ok(updated_settings)
 }
 
 #[command]
@@ -24,8 +30,14 @@ pub async fn load_settings(state: State<'_, AppState>) -> Result<AppSettings, Ap
 
 #[command]
 pub async fn save_settings(
+    app_handle: AppHandle,
     state: State<'_, AppState>,
     settings: AppSettings,
 ) -> Result<AppSettings, AppError> {
-    state.settings.update_settings(settings).await
-}
+    let updated_settings = state.settings.update_settings(settings).await?;
+    
+    emit_event(&app_handle, AppPayload::SettingsChanged(updated_settings.clone()))
+        .map_err(|e| AppError::from(e.to_string()))?;
+        
+    Ok(updated_settings)
+}
\ No newline at end of file
diff --git a/src-tauri/src/events.rs b/src-tauri/src/events.rs
new file mode 100644
index 0000000..c872d17
--- /dev/null
+++ b/src-tauri/src/events.rs
@@ -0,0 +1,66 @@
+use tauri::Emitter;
+
+use crate::errors::AppError;
+use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
+use crate::models::{AppSettings, PlaybackQueue, Track};
+use crate::state::playback_state::{current_playback_snapshot, metadata_from_track, with_audio_state};
+
+#[derive(Clone, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackStatePayload {
+    pub playing: bool,
+    pub current_time: f64,
+}
+
+#[derive(Clone, serde::Serialize)]
+#[serde(tag = "type", content = "payload")]
+pub enum AppPayload {
+    VolumeChanged(f32),
+    SettingsChanged(AppSettings),
+    TrackStarted { track: Track, index: usize },
+    PlaybackProgress { current_time: f64 },
+    QueueChanged(PlaybackQueue),
+    PlaybackStateChanged(PlaybackStatePayload),
+}
+
+pub fn emit_event(app_handle: &tauri::AppHandle, payload: AppPayload) -> Result<(), AppError> {
+    app_handle
+        .emit("global-app-event", payload)
+        .map_err(|e| AppError::from(e.to_string()))
+}
+
+pub fn emit_queue_changed(app_handle: &tauri::AppHandle) -> Result<(), AppError> {
+    let queue = with_audio_state(|state| state.playback_queue.clone())?;
+    emit_event(app_handle, AppPayload::QueueChanged(queue))
+}
+
+pub fn emit_track_started(
+    app_handle: &tauri::AppHandle,
+    track: Track,
+    index: usize,
+) -> Result<(), AppError> {
+    update_media_controls_metadata(metadata_from_track(&track));
+    emit_event(app_handle, AppPayload::TrackStarted { track, index })
+}
+
+pub fn sync_playback_state(
+    app_handle: &tauri::AppHandle,
+    playing: bool,
+    current_time: f64,
+) -> Result<(), AppError> {
+    let payload = PlaybackStatePayload { playing, current_time };
+    update_media_controls_playback(payload.clone());
+    emit_event(app_handle, AppPayload::PlaybackStateChanged(payload))
+}
+
+pub fn emit_progress(app_handle: &tauri::AppHandle) -> Result<(), AppError> {
+    if let Ok(snapshot) = current_playback_snapshot() {
+        emit_event(
+            app_handle,
+            AppPayload::PlaybackProgress {
+                current_time: snapshot.current_time,
+            },
+        )?;
+    }
+    Ok(())
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index ad6ba1a..771d170 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -8,6 +8,7 @@ mod models;
 mod repositories;
 mod services;
 mod state;
+mod events;
 
 use std::sync::Arc;
 
@@ -28,6 +29,7 @@ use commands::playback::{
     resume_track, set_current_time, set_volume, spawn_playback_progress_task, stop_track,
     sync_playback_queue, toggle_track,
 };
+use services::playback_service::{play_next_internal, toggle_internal};
 
 use commands::recent::{add_recently_played, clear_recently_played, load_recently_played};
 
@@ -164,13 +166,16 @@ pub fn run() {
                         app_handle.exit(0);
                     }
                     "play" => {
-                        let _ = app_handle.emit("menu-play", ());
+                        let handle = app_handle.clone();
+                        tauri::async_runtime::spawn(async move {
+                            let _ = toggle_internal(handle).await;
+                        });
                     }
                     "next" => {
-                        let _ = app_handle.emit("menu-next", ());
-                    }
-                    "delete" => {
-                        let _ = app_handle.emit("menu-delete", ());
+                        let handle = app_handle.clone();
+                        tauri::async_runtime::spawn(async move {
+                            let _ = play_next_internal(handle).await;
+                        });
                     }
                     _ => {}
                 }
diff --git a/src-tauri/src/media_controls.rs b/src-tauri/src/media_controls.rs
index d041449..c7e98ba 100644
--- a/src-tauri/src/media_controls.rs
+++ b/src-tauri/src/media_controls.rs
@@ -8,12 +8,13 @@ use souvlaki::{MediaControls, MediaMetadata, MediaPlayback, MediaPosition, Platf
 use tauri::{AppHandle, Manager, WebviewWindow};
 
 use crate::commands::playback::handle_media_control_event;
-use crate::models::playback::{NativePlaybackState, NativeTrackMetadata};
+use crate::events::PlaybackStatePayload;
+use crate::models::playback::NativeTrackMetadata;
 
 #[derive(Clone)]
 enum MediaControlMessage {
     Metadata(NativeTrackMetadata),
-    Playback(NativePlaybackState),
+    Playback(PlaybackStatePayload),
 }
 
 static MEDIA_CONTROL_SENDER: OnceLock<Sender<MediaControlMessage>> = OnceLock::new();
@@ -69,14 +70,11 @@ pub fn init_media_controls(app_handle: AppHandle) -> Result<(), String> {
                     let _ = controls.set_metadata(metadata);
                 }
                 MediaControlMessage::Playback(state) => {
-                    let playback = match state {
-                        NativePlaybackState::Playing { current_time } => MediaPlayback::Playing {
-                            progress: Some(MediaPosition(Duration::from_secs_f64(current_time))),
-                        },
-                        NativePlaybackState::Paused { current_time } => MediaPlayback::Paused {
-                            progress: Some(MediaPosition(Duration::from_secs_f64(current_time))),
-                        },
-                        NativePlaybackState::Stopped => MediaPlayback::Stopped,
+                    let progress = Some(MediaPosition(Duration::from_secs_f64(state.current_time)));
+                    let playback = if state.playing {
+                        MediaPlayback::Playing { progress }
+                    } else {
+                        MediaPlayback::Paused { progress }
                     };
                     let _ = controls.set_playback(playback);
                 }
@@ -99,6 +97,6 @@ pub fn update_media_controls_metadata(track: NativeTrackMetadata) {
     send(MediaControlMessage::Metadata(track));
 }
 
-pub fn update_media_controls_playback(state: NativePlaybackState) {
+pub fn update_media_controls_playback(state: PlaybackStatePayload) {
     send(MediaControlMessage::Playback(state));
 }
diff --git a/src-tauri/src/models/playback.rs b/src-tauri/src/models/playback.rs
index 18d6c26..6ff4ce1 100644
--- a/src-tauri/src/models/playback.rs
+++ b/src-tauri/src/models/playback.rs
@@ -10,27 +10,13 @@ pub struct NativeTrackMetadata {
     pub duration: Option<f64>,
 }
 
-#[derive(Clone)]
-pub enum NativePlaybackState {
-    Playing { current_time: f64 },
-    Paused { current_time: f64 },
-    Stopped,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackTrackSnapshot {
-    pub id: Option<i64>,
-    pub path: Option<String>,
-}
-
 #[derive(Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PlaybackStatusSnapshot {
     pub has_media: bool,
     pub playing: bool,
     pub current_time: f64,
-    pub track: Option<PlaybackTrackSnapshot>,
+    pub track: Option<PlaybackTrackInfo>,
 }
 
 #[derive(Clone, Serialize)]
@@ -51,30 +37,14 @@ pub struct PlaybackTrackStartedPayload {
     pub current_time: f64,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct PlaybackTrackInfo {
     pub id: Option<i64>,
     pub path: Option<String>,
 }
 
-#[derive(Clone)]
-pub struct PlaybackStateSnapshot {
-    pub has_media: bool,
-    pub playing: bool,
-    pub current_time: f64,
-    pub track: Option<PlaybackTrackInfo>,
-}
-
-impl From<PlaybackTrackInfo> for PlaybackTrackSnapshot {
-    fn from(value: PlaybackTrackInfo) -> Self {
-        Self {
-            id: value.id,
-            path: value.path,
-        }
-    }
-}
-
-impl PlaybackStateSnapshot {
+impl PlaybackStatusSnapshot {
     pub fn status_payload(self) -> PlaybackStatusSnapshot {
         PlaybackStatusSnapshot {
             has_media: self.has_media,
@@ -94,18 +64,4 @@ impl PlaybackStateSnapshot {
             path: track.path.clone(),
         })
     }
-
-    pub fn native_playback_state(&self) -> NativePlaybackState {
-        if !self.has_media {
-            NativePlaybackState::Stopped
-        } else if self.playing {
-            NativePlaybackState::Playing {
-                current_time: self.current_time,
-            }
-        } else {
-            NativePlaybackState::Paused {
-                current_time: self.current_time,
-            }
-        }
-    }
 }
diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs
index 33676d0..3e1bfe4 100644
--- a/src-tauri/src/services/mod.rs
+++ b/src-tauri/src/services/mod.rs
@@ -1,4 +1,3 @@
-pub mod playback_events;
 pub mod playback_service;
 pub mod playlist_service;
 pub mod recent_service;
diff --git a/src-tauri/src/services/playback_events.rs b/src-tauri/src/services/playback_events.rs
deleted file mode 100644
index 8b5bdee..0000000
--- a/src-tauri/src/services/playback_events.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use tauri::{AppHandle, Emitter};
-
-use crate::errors::AppError;
-use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
-use crate::models::playback::{
-    NativePlaybackState, PlaybackStateSnapshot, PlaybackTrackStartedPayload,
-};
-use crate::models::{PlaybackQueue, Track};
-use crate::state::playback_state::{current_playback_snapshot, with_audio_state};
-
-pub fn status_snapshot() -> Result<PlaybackStateSnapshot, AppError> {
-    Ok(current_playback_snapshot()?)
-}
-
-pub fn queue_snapshot() -> Result<PlaybackQueue, AppError> {
-    Ok(with_audio_state(|state| state.playback_queue.clone())?)
-}
-
-pub fn emit_queue_changed(
-    app_handle: &AppHandle,
-) -> Result<PlaybackQueue, AppError> {
-    let payload = queue_snapshot()?;
-
-    let _ = app_handle.emit(
-        "playback:queue-changed",
-        payload.clone(),
-    );
-
-    Ok(payload)
-}
-
-pub fn emit_track_started(app_handle: &AppHandle, track: Track, index: usize) {
-    let payload = PlaybackTrackStartedPayload {
-        track,
-        index,
-        playing: true,
-        current_time: 0.0,
-    };
-    let _ = app_handle.emit("playback:track-started", payload);
-}
-
-pub fn sync_playback_snapshot(
-    app_handle: &AppHandle,
-    snapshot: PlaybackStateSnapshot,
-) {
-    if let Some(payload) = snapshot.progress_payload() {
-        update_media_controls_playback(snapshot.native_playback_state());
-        let _ = app_handle.emit("playback:progress", payload);
-    }
-}
-
-pub fn sync_playback_state(app_handle: &AppHandle, state: NativePlaybackState) {
-    update_media_controls_playback(state);
-    emit_progress(app_handle);
-}
-
-pub fn emit_progress(app_handle: &AppHandle) {
-    if let Ok(snapshot) = current_playback_snapshot() {
-        sync_playback_snapshot(app_handle, snapshot);
-    }
-}
-
-pub fn notify_track_metadata(track: &Track) {
-    update_media_controls_metadata(crate::state::playback_state::metadata_from_track(track));
-}
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index b013f83..212760c 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -1,20 +1,14 @@
-use crate::audio::{get_audio_context, lock_audio_state, AudioGraph};
+use crate::audio::{AudioEngine, WebAudioEngine, lock_audio_state};
 use crate::errors::AppError;
-use crate::media_controls::update_media_controls_playback;
-use crate::models::playback::NativePlaybackState;
+use crate::events::{emit_progress, emit_track_started, sync_playback_state};
 use crate::models::Track;
-use crate::services::playback_events::{
-    emit_progress, emit_track_started, notify_track_metadata, sync_playback_state,
-};
 use crate::state::playback_state::{current_time_from_state, minimal_track, with_audio_state};
 use souvlaki::{MediaControlEvent, SeekDirection};
 use std::path::Path;
 use tauri::AppHandle;
-use web_audio_api::context::BaseAudioContext;
-use web_audio_api::node::AudioNode;
 
 pub fn play_track_internal(
-    app_handle: &AppHandle,
+    app_handle: &tauri::AppHandle,
     track: Track,
     index: Option<usize>,
 ) -> Result<(), AppError> {
@@ -24,40 +18,14 @@ pub fn play_track_internal(
         return Err("音频文件不存在或已被移动".into());
     }
 
-    let context = get_audio_context();
-    let _ = context.resume();
-
     let mut state = lock_audio_state()?;
 
-    if let Some(old_graph) = state.graph.take() {
-        old_graph.media.pause();
-        old_graph.destroy();
-    }
-
-    let mut media = web_audio_api::MediaElement::new(file_path)
-        .map_err(|e| format!("Failed to create media element: {}", e))?;
-
-    let src = context.create_media_element_source(&mut media);
-    let gain = context.create_gain();
-    let panner = context.create_stereo_panner();
-
-    src.connect(&gain);
-    gain.connect(&panner);
-    panner.connect(&context.destination());
-
-    media.set_loop(false);
-    media.set_current_time(0.0);
-    gain.gain().set_value(state.volume);
-    panner.pan().set_value(state.pan);
+    state.engine = None;
 
-    let graph = AudioGraph {
-        media,
-        src,
-        gain,
-        panner,
-    };
+    let mut engine = WebAudioEngine::new(file_path, state.volume, state.pan)?;
+    engine.play()?;
 
-    state.graph = Some(graph);
+    state.engine = Some(Box::new(engine));
     state.current_path = Some(track.path.clone());
     state.current_track_id = Some(track.id);
 
@@ -65,27 +33,13 @@ pub fn play_track_internal(
         state.playback_queue.current_index = Some(next_index);
     }
 
-    let play_result = state.graph.as_mut().map(|g| g.media.play());
-
-    if play_result.is_none() {
-        state.playing = false;
-        if let Some(failed_graph) = state.graph.take() {
-            failed_graph.destroy();
-        }
-        return Err("Playback failed to start because audio graph is missing".into());
-    }
-
     state.playing = true;
 
     let target_index = index.or(state.playback_queue.current_index).unwrap_or(0);
 
     drop(state);
 
-    notify_track_metadata(&track);
-
-    update_media_controls_playback(NativePlaybackState::Playing { current_time: 0.0 });
-
-    emit_track_started(app_handle, track, target_index);
+    emit_track_started(app_handle, track, target_index)?;
 
     Ok(())
 }
@@ -111,93 +65,73 @@ pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), AppErro
 
 pub async fn resume_internal(app_handle: AppHandle) -> Result<(), AppError> {
     let current_time = with_audio_state(|state| {
-        if let Some(ref mut graph) = state.graph {
-            graph.media.play();
+        let res = state.with_engine(|engine| {
+            engine.play()?;
+            Ok(engine.current_time())
+        }).and_then(|inner| inner);
+
+        if res.is_ok() {
             state.playing = true;
-            Ok(graph.media.current_time())
-        } else {
-            Err(AppError::from("No media available"))
         }
+        res
     })??;
 
-    sync_playback_state(&app_handle, NativePlaybackState::Playing { current_time });
+    sync_playback_state(&app_handle, true, current_time)?;
     Ok(())
 }
 
 pub async fn pause_internal(app_handle: AppHandle) -> Result<(), AppError> {
     let current_time = with_audio_state(|state| {
-        if let Some(ref mut graph) = state.graph {
-            graph.media.pause();
-            state.playing = false;
-            Ok(graph.media.current_time())
-        } else {
-            Err(AppError::from("No media available"))
-        }
+        let res = state.with_engine(|engine| {
+            engine.pause();
+            engine.current_time()
+        });
+        if res.is_ok() { state.playing = false; }
+        res
     })??;
 
-    sync_playback_state(&app_handle, NativePlaybackState::Paused { current_time });
+    sync_playback_state(&app_handle, false, current_time)?;
     Ok(())
 }
 
 pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, AppError> {
     let (playing, current_time) = with_audio_state(|state| {
-        if let Some(ref mut graph) = state.graph {
-            let playing = if graph.media.paused() {
-                graph.media.play();
-                true
-            } else {
-                graph.media.pause();
-                false
-            };
-            state.playing = playing;
-            Ok((playing, graph.media.current_time()))
-        } else {
-            Err(AppError::from("No media available"))
-        }
+        let res = state.with_engine(|engine| {
+            if engine.paused() { engine.play()?; Ok((true, engine.current_time())) }
+            else { engine.pause(); Ok((false, engine.current_time())) }
+        }).and_then(|i| i);
+        if let Ok((p, _)) = res { state.playing = p; }
+        res
     })??;
 
-    let state = if playing {
-        NativePlaybackState::Playing { current_time }
-    } else {
-        NativePlaybackState::Paused { current_time }
-    };
-
-    sync_playback_state(&app_handle, state);
+    sync_playback_state(&app_handle, playing, current_time)?;
     Ok(playing)
 }
 
 pub async fn stop_internal(app_handle: AppHandle) -> Result<(), AppError> {
     with_audio_state(|state| {
-        if let Some(ref mut graph) = state.graph {
-            graph.media.pause();
-            graph.media.set_current_time(0.0);
-        }
+        let _ = state.with_engine(|engine| {
+            engine.pause();
+            engine.seek(0.0);
+        });
         state.playing = false;
     })?;
 
-    sync_playback_state(&app_handle, NativePlaybackState::Stopped);
+    sync_playback_state(&app_handle, false, 0.0)?;
     Ok(())
 }
 
 pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), AppError> {
     let playing = with_audio_state(|state| {
-        let playing = if let Some(ref mut graph) = state.graph {
-            graph.media.set_current_time(time);
-            !graph.media.paused()
-        } else {
-            false
-        };
-        state.playing = playing;
-        playing
-    })?;
-
-    let state = if playing {
-        NativePlaybackState::Playing { current_time: time }
-    } else {
-        NativePlaybackState::Paused { current_time: time }
-    };
+        let res = state.with_engine(|engine| {
+            engine.seek(time);
+            !engine.paused()
+        });
+        if let Ok(p) = res { state.playing = p; }
+        res
+    })??;
 
-    sync_playback_state(&app_handle, state);
+    sync_playback_state(&app_handle, playing, time)?;
     Ok(())
 }
 
@@ -223,7 +157,7 @@ pub fn load_track_for_playback(full_path: &str, track_id: Option<i64>) -> Track
 
 pub fn spawn_playback_progress_task(app_handle: AppHandle) {
     std::thread::spawn(move || loop {
-        emit_progress(&app_handle);
+        let _ = emit_progress(&app_handle);
 
         if crate::state::playback_state::should_advance_track() {
             let local_handle = app_handle.clone();
diff --git a/src-tauri/src/state/playback_state.rs b/src-tauri/src/state/playback_state.rs
index 16dacbf..0af43c9 100644
--- a/src-tauri/src/state/playback_state.rs
+++ b/src-tauri/src/state/playback_state.rs
@@ -3,7 +3,7 @@ pub use crate::audio::lock_audio_state;
 use crate::audio::AudioState;
 use crate::errors::AppError;
 use crate::models::playback::{
-    NativeTrackMetadata, PlaybackStateSnapshot, PlaybackTrackInfo,
+    NativeTrackMetadata, PlaybackStatusSnapshot, PlaybackTrackInfo
 };
 use crate::models::Track;
 
@@ -19,30 +19,30 @@ pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
     }
 }
 
-pub fn current_playback_state(state: &mut AudioState) -> PlaybackStateSnapshot {
-    let Some(ref graph) = state.graph else {
-        state.playing = false;
-        return PlaybackStateSnapshot {
-            has_media: false,
-            playing: false,
-            current_time: 0.0,
-            track: None,
-        };
-    };
-
-    let playing = !graph.media.paused();
-    let current_time = graph.media.current_time();
-    state.playing = playing;
-
-    PlaybackStateSnapshot {
-        has_media: true,
-        playing,
-        current_time,
-        track: Some(playback_track_info(state)),
+pub fn current_playback_state(state: &mut AudioState) -> PlaybackStatusSnapshot {
+    match state.with_engine(|engine| (!engine.paused(), engine.current_time())) {
+        Ok((playing, current_time)) => {
+            state.playing = playing;
+            PlaybackStatusSnapshot {
+                has_media: true,
+                playing,
+                current_time,
+                track: Some(playback_track_info(state)),
+            }
+        }
+        Err(_) => {
+            state.playing = false;
+            PlaybackStatusSnapshot {
+                has_media: false,
+                playing: false,
+                current_time: 0.0,
+                track: None,
+            }
+        }
     }
 }
 
-pub fn current_playback_snapshot() -> Result<PlaybackStateSnapshot, AppError> {
+pub fn current_playback_snapshot() -> Result<PlaybackStatusSnapshot, AppError> {
     with_audio_state(current_playback_state)
 }
 
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 63f948f..9d34448 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -1,4 +1,4 @@
-import type { PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackStartedPayload, PlayMode } from "$lib/types"
+import type { GlobalAppEvent, PlaybackStatusSnapshot, PlayMode } from "$lib/types"
 import { invoke } from "@tauri-apps/api/core"
 import { listen, type UnlistenFn } from "@tauri-apps/api/event"
 import type { PlaybackQueue, Track } from "../types/music"
@@ -18,9 +18,7 @@ class Player {
     #muted = $state<boolean>(false)
     #volume = $state<number>(80)
     #previousVolume = 80
-    #progressUnlisten: UnlistenFn | null = null
-    #trackStartedUnlisten: UnlistenFn | null = null
-    #queueChangedUnlisten: UnlistenFn | null = null
+    #globalUnlisten: UnlistenFn | null = null
 
     constructor() {
         this.#setupMediaSession()
@@ -99,36 +97,23 @@ class Player {
 
     get currentTrack(): Track | undefined {
         const index = this.queue.currentIndex
-
-        if (
-            index === null ||
-            index < 0 ||
-            index >= this.queue.tracks.length
-        ) {
+        if (index === null || index < 0 || index >= this.queue.tracks.length) {
             return undefined
         }
-
         return this.queue.tracks[index]
     }
 
     get volume() { return this.#volume }
     set volume(volume: number) {
-        this.#volume = volume
-        if (volume > 0) {
-            this.#muted = false
-        }
         invoke('set_volume', { volume }).catch(console.error)
     }
 
     get muted() { return this.#muted }
     set muted(value: boolean) {
-        this.#muted = value
         if (value) {
             this.#previousVolume = this.#volume
-            this.#volume = 0
             invoke('set_volume', { volume: 0 }).catch(console.error)
         } else {
-            this.#volume = this.#previousVolume
             invoke('set_volume', { volume: this.#previousVolume }).catch(console.error)
         }
     }
@@ -138,79 +123,35 @@ class Player {
         this.queue = queue
     }
 
-    async replacePlaylistAndPlay(
-        tracks: Track[],
-        targetId: number
-    ) {
-        await invoke(
-            'replace_playlist_and_play',
-            {
-                tracks,
-                targetId
-            }
-        )
+    async replacePlaylistAndPlay(tracks: Track[], targetId: number) {
+        await invoke('replace_playlist_and_play', { tracks, targetId })
     }
 
     async insertTracksAsNext(tracks: Track[]) {
-        const payload = await invoke<PlaybackQueue>(
-            'insert_tracks_as_next',
-            { tracks }
-        )
-
-        this.#applyBackendQueue(payload)
+        await invoke('insert_tracks_as_next', { tracks })
     }
 
     async insertTrackAsNext(track: Track) {
-        const payload = await invoke<PlaybackQueue>('insert_track_as_next', { track })
-        this.#applyBackendQueue(payload)
+        await invoke('insert_track_as_next', { track })
     }
 
     async removeTrack(trackId: number) {
-        const payload = await invoke<PlaybackQueue>(
-            'remove_track_from_queue',
-            { trackId }
-        )
-
-        this.#applyBackendQueue(payload)
+        await invoke('remove_track_from_queue', { trackId })
     }
 
     async playTrackInQueue(index: number) {
-        await invoke(
-            'play_queue_track',
-            { index }
-        )
+        await invoke('play_queue_track', { index })
     }
 
     async cyclePlayMode() {
-        const modes: PlayMode[] = [
-            'list',
-            'single',
-            'shuffle'
-        ]
-
-        const index = modes.indexOf(
-            this.queue.playMode
-        )
-
-        const mode =
-            modes[(index + 1) % modes.length]
-
-        const queue = await invoke<PlaybackQueue>(
-            'set_play_mode',
-            { mode }
-        )
-
-        this.#applyBackendQueue(queue)
-    }
-
-    toggleQueue() {
-        this.queueOpen = !this.queueOpen
+        const modes: PlayMode[] = ['list', 'single', 'shuffle']
+        const index = modes.indexOf(this.queue.playMode)
+        const mode = modes[(index + 1) % modes.length]
+        await invoke('set_play_mode', { mode })
     }
 
     async clearQueue() {
-        const queue = await invoke<PlaybackQueue>('clear_queue')
-
-        this.#applyBackendQueue(queue)
+        await invoke('clear_queue')
     }
 
     async next() {
@@ -224,8 +165,6 @@ class Player {
     resume = async () => {
         try {
             await invoke('resume_track')
-            this.playing = true
-            this.#syncMediaSession()
         } catch (err) {
             console.error(err)
         }
@@ -234,8 +173,6 @@ class Player {
     pause = async () => {
         try {
             await invoke('pause_track')
-            this.playing = false
-            this.#syncMediaSession()
         } catch (err) {
             console.error(err)
         }
@@ -251,87 +188,67 @@ class Player {
 
     seek = async (time: number) => {
         await invoke('set_current_time', { time })
-        this.currentTime = time
-        this.#updatePositionState()
+    }
+
+    toggleQueue() {
+        this.queueOpen = !this.queueOpen
     }
 
     async loadState() {
         await this.#setupPlaybackListeners()
 
-        const queue =
-            await invoke<PlaybackQueue>(
-                'get_playback_queue'
-            )
-
-        this.#applyBackendQueue(queue)
-
-        const status =
-            await invoke<PlaybackStatusSnapshot>(
-                'get_current_status'
-            )
-
-        this.#applyBackendStatus(status)
-    }
-
-    #applyBackendStatus(status: PlaybackStatusSnapshot) {
-        if (!status.hasMedia || !status.track) {
-            this.playing = false
-            this.currentTime = 0
-            this.#syncMediaSession()
-            return
-        }
+        const queue = await invoke<PlaybackQueue>('get_playback_queue')
+        this.queue = queue
 
-        this.currentTime = status.currentTime
+        const status = await invoke<PlaybackStatusSnapshot>('get_current_status')
         this.playing = status.playing
+        this.currentTime = status.currentTime
         this.#syncMediaSession()
     }
 
-    #handleBackendProgress(payload: PlaybackProgressPayload) {
-        this.currentTime =
-            payload.currentTime
-
-        this.playing =
-            payload.playing
-
-        this.#syncMediaSession()
-    }
-
-    #handleTrackStarted(payload: PlaybackTrackStartedPayload) {
-        this.currentTime = payload.currentTime
-        this.playing = payload.playing
-        this.queue = { ...this.queue, currentIndex: payload.index }
-        this.#syncMediaSession()
-
-        recentlyPlayed.add(payload.track)
-    }
-
     async #setupPlaybackListeners() {
-        if (!this.#progressUnlisten) {
-            this.#progressUnlisten = await listen<PlaybackProgressPayload>('playback:progress', event => {
-                this.#handleBackendProgress(event.payload)
-            })
-        }
-
-        if (!this.#trackStartedUnlisten) {
-            this.#trackStartedUnlisten = await listen<PlaybackTrackStartedPayload>('playback:track-started', event => {
-                this.#handleTrackStarted(event.payload)
-            })
-        }
-
-        if (!this.#queueChangedUnlisten) {
-            this.#queueChangedUnlisten = await listen<PlaybackQueue>('playback:queue-changed', event => {
-                this.#applyBackendQueue(event.payload)
-            })
-        }
+        if (this.#globalUnlisten) return
+
+        this.#globalUnlisten = await listen<GlobalAppEvent>('global-app-event', event => {
+            const { type, payload } = event.payload
+
+            switch (type) {
+                case 'PlaybackProgress':
+                    this.currentTime = payload.current_time
+                    this.#updatePositionState()
+                    break
+
+                case 'TrackStarted':
+                    this.currentTime = 0
+                    this.playing = true
+                    this.queue = { ...this.queue, currentIndex: payload.index }
+                    this.#syncMediaSession()
+                    recentlyPlayed.add(payload.track)
+                    break
+
+                case 'VolumeChanged':
+                    this.#volume = Math.round(payload * 100)
+                    this.#muted = this.#volume === 0
+                    break
+
+                case 'QueueChanged':
+                    this.queue = payload
+                    break
+
+                case 'PlaybackStateChanged':
+                    this.playing = payload.playing
+                    this.currentTime = payload.currentTime
+                    this.#syncMediaSession()
+                    break
+            }
+        })
     }
 
     destroy() {
-        this.#progressUnlisten?.()
-        this.#progressUnlisten = null
-        this.#trackStartedUnlisten?.()
-        this.#trackStartedUnlisten = null
-        this.#queueChangedUnlisten?.()
-        this.#queueChangedUnlisten = null
+        if (this.#globalUnlisten) {
+            this.#globalUnlisten()
+            this.#globalUnlisten = null
+        }
     }
 }
 
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index d9ba1f8..e8bf611 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -33,36 +33,38 @@ class SettingsState {
         }
     }
 
+    updateLocalState(newSettings: AppSettings) {
+        this.data = newSettings
+    }
+
     update(patch: Partial<AppSettings>) {
-        this.data = {
+        const nextSettings = {
             ...this.data,
             ...patch,
         }
-        this.scheduleSave()
+        this.scheduleSave(nextSettings)
     }
 
-    async save(): Promise<AppSettings> {
+    async save(targetSettings: AppSettings): Promise<void> {
         this.error = null
 
         try {
-            this.data = await invoke<AppSettings>('save_settings', {
-                settings: this.data,
+            await invoke<AppSettings>('save_settings', {
+                settings: targetSettings,
             })
-            return this.data
         } catch (error) {
             console.error(error)
             this.error = String(error)
-            return this.data
         }
     }
 
-    scheduleSave() {
+    scheduleSave(targetSettings: AppSettings) {
         if (this.#saveTimer) {
             clearTimeout(this.#saveTimer)
         }
 
         this.#saveTimer = setTimeout(() => {
-            void this.save()
+            void this.save(targetSettings)
         }, 300)
     }
 
@@ -84,4 +86,4 @@ class SettingsState {
     }
 }
 
-export const settings = new SettingsState()
+export const settings = new SettingsState()
\ No newline at end of file
diff --git a/src/lib/types/events.ts b/src/lib/types/events.ts
new file mode 100644
index 0000000..8ed496f
--- /dev/null
+++ b/src/lib/types/events.ts
@@ -0,0 +1,10 @@
+import type { PlaybackQueue, Track } from "./music"
+import type { AppSettings } from "./settings"
+
+export type GlobalAppEvent =
+    | { type: 'VolumeChanged'; payload: number }
+    | { type: 'SettingsChanged'; payload: AppSettings }
+    | { type: 'TrackStarted'; payload: { track: Track; index: number } }
+    | { type: 'PlaybackProgress'; payload: { current_time: number } }
+    | { type: 'QueueChanged'; payload: PlaybackQueue }
+    | { type: 'PlaybackStateChanged'; payload: { playing: boolean; currentTime: number } }
\ No newline at end of file
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index 3bd7581..dde6c71 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -1,8 +1,9 @@
+export type { GlobalAppEvent } from './events'
 export type {
     AppExtension,
     ExtensionCommand,
     ExtensionNavItem
 } from './extension'
 export type { Album, Artist, Playlist, Track } from './music'
-export type { BackendQueueTrack, PlayMode, PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackSnapshot, PlaybackTrackStartedPayload } from './playback'
+export type { BackendQueueTrack, PlayMode, PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackInfo, PlaybackTrackStartedPayload } from './playback'
 export type { AppSettings, ThemeMode } from './settings'
diff --git a/src/lib/types/playback.ts b/src/lib/types/playback.ts
index fd216d4..0314a17 100644
--- a/src/lib/types/playback.ts
+++ b/src/lib/types/playback.ts
@@ -2,7 +2,7 @@ import type { Track } from "./music"
 
 export type PlayMode = 'list' | 'single' | 'shuffle'
 
-export type PlaybackTrackSnapshot = {
+export type PlaybackTrackInfo = {
     id?: number | null
     path?: string | null
 }
@@ -11,7 +11,7 @@ export type PlaybackStatusSnapshot = {
     hasMedia: boolean
     playing: boolean
     currentTime: number
-    track: PlaybackTrackSnapshot | null
+    track: PlaybackTrackInfo | null
 }
 
 export type PlaybackProgressPayload = {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 07afaa5..cb66f1b 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,7 +3,6 @@
     import QueueDrawer from '$lib/features/QueueDrawer.svelte'
     import Appbar from '$lib/features/shell/Appbar.svelte'
     import NavRail from '$lib/features/shell/NavRail.svelte'
-    import { musicLibrary } from '$lib/state/library.svelte'
     import { player } from '$lib/state/player.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import 'mdui'
@@ -16,19 +15,28 @@
 
     let { children } = $props()
 
-    onMount(() => {
+onMount(() => {
         void settings.load()
-        void musicLibrary.load()
         void player.loadState()
 
-        const unlisten = listen<string>('tray:navigate', event => {
+        const trayUnlistenPromise = listen<string>('tray:navigate', event => {
             if (event.payload === 'settings') {
-                goto('/settings')
+                void goto('/settings')
+            }
+        })
+
+        const globalEventUnlistenPromise = listen<{ type: string; payload: any }>('global-app-event', event => {
+            const { type, payload } = event.payload
+            
+            if (type === 'SettingsChanged') {
+                settings.updateLocalState(payload)
             }
         })
 
         return () => {
-            unlisten.then(fn => fn())
+            void trayUnlistenPromise.then(unlisten => unlisten())
+            void globalEventUnlistenPromise.then(unlisten => unlisten())
+            player.destroy()
         }
     })
 

From 1fd3fcfea00f462b3c037351b36567e0d7c56d48 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Fri, 5 Jun 2026 21:31:10 +0800
Subject: [PATCH 28/39] Refactor playback, events, repos and async I/O

- Introduce an EventBus and typed AppEvent payloads
- Remove the old events module and replace direct emit_* calls with EventBus::emit
- Refactor playback logic into a PlaybackService (methods for play/resume/pause/next/previous/toggle/seek)
- Add a media_control_service to handle system media events
- Make playback queue changes (versioning, insert_next behavior) and sanitize queue operations
- Convert many repository DB calls to use ? and return Result (fixing awaits and error propagation)
- Add tokio dependency and migrate file/dir operations and delete_track_files to async tokio fs
- Update lib startup to initialize services, handle async scan on startup, and wire tray/menu events to the new services
- Misc: adjust models/playback types, move media control handling, and export/consume PlaybackService across commands
---
 src-tauri/Cargo.lock                          |   1 +
 src-tauri/Cargo.toml                          |   1 +
 src-tauri/src/audio/state.rs                  |   9 +-
 src-tauri/src/commands/library.rs             |   8 +-
 src-tauri/src/commands/playback.rs            |  86 ++--
 src-tauri/src/commands/playback_queue.rs      |  28 +-
 src-tauri/src/commands/settings.rs            |  12 +-
 src-tauri/src/db/manager.rs                   |   8 +-
 src-tauri/src/events.rs                       |  66 ---
 src-tauri/src/events/bus.rs                   |  23 +
 src-tauri/src/events/mod.rs                   |   5 +
 src-tauri/src/events/payloads.rs              |  43 ++
 src-tauri/src/lib.rs                          |  77 ++--
 src-tauri/src/models/playback.rs              |  38 +-
 src-tauri/src/models/playback_queue.rs        |  38 +-
 .../sqlite/playlist_repository.rs             |  75 ++--
 .../repositories/sqlite/recent_repository.rs  |  27 +-
 .../sqlite/settings_repository.rs             |  13 +-
 .../repositories/sqlite/track_repository.rs   |  69 +--
 .../src/services/media_control_service.rs     |  50 +++
 src-tauri/src/services/mod.rs                 |   1 +
 src-tauri/src/services/playback_service.rs    | 412 ++++++++++--------
 src-tauri/src/state/playback_state.rs         |  23 +-
 src/lib/components/base/MduiSlider.svelte     |  12 +-
 src/lib/features/PlayerBar.svelte             |  45 +-
 src/lib/features/TrackList.svelte             |  43 +-
 src/lib/state/covers.svelte.ts                |   6 -
 src/lib/state/library.svelte.ts               |  37 +-
 src/lib/state/player.svelte.ts                | 117 +++--
 src/lib/state/recent.svelte.ts                |  11 +-
 src/lib/types/events.ts                       |   9 +-
 src/lib/types/index.ts                        |   2 +-
 src/lib/types/music.ts                        |   1 +
 src/lib/types/playback.ts                     |  17 +-
 src/routes/+layout.svelte                     |   9 +-
 src/routes/album/+page.svelte                 |  13 +-
 36 files changed, 801 insertions(+), 634 deletions(-)
 delete mode 100644 src-tauri/src/events.rs
 create mode 100644 src-tauri/src/events/bus.rs
 create mode 100644 src-tauri/src/events/mod.rs
 create mode 100644 src-tauri/src/events/payloads.rs
 create mode 100644 src-tauri/src/services/media_control_service.rs

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index da1a0a4..41aea51 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4872,6 +4872,7 @@ dependencies = [
  "tauri-plugin-dialog",
  "tauri-plugin-opener",
  "tauri-plugin-store",
+ "tokio",
  "trash",
  "walkdir",
  "web-audio-api",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 8cac7dc..1450a21 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -33,4 +33,5 @@ souvlaki = "0.8.3"
 sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "macros", "migrate"] }
 async-trait = "0.1"
 rand = "0.10.1"
+tokio = { version = "1.52.3", features = ["fs"] }
 
diff --git a/src-tauri/src/audio/state.rs b/src-tauri/src/audio/state.rs
index 5e286b3..c3ad44e 100644
--- a/src-tauri/src/audio/state.rs
+++ b/src-tauri/src/audio/state.rs
@@ -18,7 +18,6 @@ pub struct AudioState {
     pub current_track_id: Option<i64>,
     pub current_path: Option<String>,
     pub playback_queue: PlaybackQueue,
-    pub play_mode: PlayMode,
 }
 
 impl AudioState {
@@ -32,6 +31,13 @@ impl AudioState {
             Err(AppError::from("Audio engine is missing"))
         }
     }
+    
+    pub fn play_mode(&self) -> PlayMode {
+        self.playback_queue.play_mode
+    }
+    pub fn set_play_mode(&mut self, mode: PlayMode) {
+        self.playback_queue.play_mode = mode;
+    }
 }
 
 static AUDIO_STATE: OnceLock<Mutex<AudioState>> = OnceLock::new();
@@ -46,7 +52,6 @@ pub fn init_audio_state(queue: PlaybackQueue) {
             current_track_id: None,
             current_path: None,
             playback_queue: queue,
-            play_mode: PlayMode::ListLoop,
         })
     });
 }
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index a71b449..c88ae47 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -1,5 +1,4 @@
 use std::collections::HashSet;
-use std::fs;
 use std::path::Path;
 use std::process::Command;
 
@@ -23,6 +22,7 @@ fn is_supported_audio_file(path: &Path) -> bool {
         .map(|ext| SUPPORTED_EXT.contains(&ext.to_lowercase().as_str()))
         .unwrap_or(false)
 }
+
 fn scan_single_directory(dir: &str) -> Result<Vec<NewTrack>, AppError> {
     let root_path = Path::new(dir);
 
@@ -195,7 +195,7 @@ pub fn trash_track_files(paths: Vec<String>) -> Result<(), AppError> {
 }
 
 #[command]
-pub fn delete_track_files(paths: Vec<String>) -> Result<(), AppError> {
+pub async fn delete_track_files(paths: Vec<String>) -> Result<(), AppError> {
     for path in paths {
         let file_path = Path::new(&path);
 
@@ -207,7 +207,9 @@ pub fn delete_track_files(paths: Vec<String>) -> Result<(), AppError> {
             return Err(format!("拒绝删除非音频文件: {}", path).into());
         }
 
-        fs::remove_file(file_path).map_err(|e| format!("删除文件失败 {}: {}", path, e))?;
+    tokio::fs::remove_file(file_path)
+        .await
+        .map_err(|e| format!("删除文件失败 {}: {}", path, e))?;
     }
 
     Ok(())
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index 7672565..421ba07 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -1,39 +1,37 @@
 use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
 use crate::errors::AppError;
+use crate::events::{AppEvent, EventBus};
 use crate::models::playback::PlaybackStatusSnapshot;
 use crate::models::Track;
-use crate::events::emit_queue_changed;
-use crate::services::playback_service::{
-    handle_media_control_event_internal, load_track_for_playback, pause_internal,
-    play_current_index_internal, play_next_internal, play_previous_internal, play_track_internal,
-    resume_internal, seek_internal, stop_internal, toggle_internal,
-};
+use crate::services::playback_service::PlaybackService;
 use crate::state::playback_state::{
     current_playback_snapshot, current_time_from_state, lock_audio_state, sanitize_track, with_audio_state
 };
 
-pub use crate::services::playback_service::spawn_playback_progress_task;
-
-pub async fn handle_media_control_event(app_handle: AppHandle, event: souvlaki::MediaControlEvent) {
-    handle_media_control_event_internal(app_handle, event).await;
-}
+pub use crate::services::media_control_service::handle_media_control_event;
 
 #[command]
 pub async fn sync_playback_queue(
+    app_handle: AppHandle,
     playlist: Vec<Track>,
     current_index: Option<usize>,
     play_mode: PlayMode,
     history: Vec<i64>,
 ) -> Result<(), AppError> {
-    let mut state = lock_audio_state()?;
-    state.play_mode = play_mode;
-    state.playback_queue.sync(
-        playlist.into_iter().map(sanitize_track).collect(),
-        current_index,
-        play_mode,
-        history,
-    );
+    {
+        let mut state = lock_audio_state()?;
+
+        state.playback_queue.sync(
+            playlist.into_iter().map(sanitize_track).collect(),
+            current_index,
+            play_mode,
+            history,
+        );
+    }
+
+    PlaybackService::emit_queue_changed(&app_handle)?;
+
     Ok(())
 }
 
@@ -42,24 +40,7 @@ pub async fn remove_track_from_queue(
     app_handle: AppHandle,
     track_id: i64,
 ) -> Result<(), AppError> {
-    let result = {
-        let mut state = lock_audio_state()?;
-        
-        if !state.playback_queue.contains_track(track_id) {
-            return Ok(());
-        }
-        state.playback_queue.remove_track(track_id)
-    };
-
-    if result.should_stop {
-        stop_internal(app_handle.clone()).await?;
-    } else if let Some(index) = result.play_index {
-        play_current_index_internal(&app_handle, index)?;
-    }
-
-    emit_queue_changed(&app_handle)?;
-    
-    Ok(())
+    PlaybackService::new(app_handle).remove_track_from_queue(track_id).await
 }
 
 #[command]
@@ -75,25 +56,25 @@ pub async fn insert_track_as_next(
 
 #[command]
 pub async fn play_queue_track(app_handle: AppHandle, index: usize) -> Result<(), AppError> {
-    play_current_index_internal(&app_handle, index)?;
+    PlaybackService::new(app_handle).play_queue_index(index)?;
     Ok(())
 }
 
 #[command]
 pub async fn play_next_track(app_handle: AppHandle) -> Result<(), AppError> {
-    play_next_internal(app_handle).await?;
+    PlaybackService::new(app_handle).next().await?;
     Ok(())
 }
 
 #[command]
 pub async fn play_previous_track(app_handle: AppHandle) -> Result<(), AppError> {
-    play_previous_internal(app_handle).await?;
+    PlaybackService::new(app_handle).previous().await?;
     Ok(())
 }
 
 #[command]
 pub async fn stop_track(app_handle: AppHandle) -> Result<(), AppError> {
-    stop_internal(app_handle).await?;
+    PlaybackService::new(app_handle).stop().await?;
     Ok(())
 }
 
@@ -103,26 +84,27 @@ pub async fn play_track(
     full_path: String,
     track_id: Option<i64>,
 ) -> Result<String, AppError> {
-    let track = load_track_for_playback(&full_path, track_id);
-    play_track_internal(&app_handle, track, None)?;
+    let service = PlaybackService::new(app_handle);
+    let track = service.load_track_for_playback(&full_path, track_id);
+    service.play_track(track, None)?;
     Ok(format!("Playing track: {}", full_path))
 }
 
 #[command]
 pub async fn resume_track(app_handle: AppHandle) -> Result<(), AppError> {
-    resume_internal(app_handle).await?;
+    PlaybackService::new(app_handle).resume().await?;
     Ok(())
 }
 
 #[command]
 pub async fn pause_track(app_handle: AppHandle) -> Result<(), AppError> {
-    pause_internal(app_handle).await?;
+    PlaybackService::new(app_handle).pause().await?;
     Ok(())
 }
 
 #[command]
 pub async fn toggle_track(app_handle: AppHandle) -> Result<bool, AppError> {
-    let status = toggle_internal(app_handle).await?;
+    let status = PlaybackService::new(app_handle).toggle().await?;
     Ok(status)
 }
 
@@ -137,15 +119,14 @@ pub async fn get_current_status() -> Result<PlaybackStatusSnapshot, AppError> {
 }
 
 #[command]
-pub async fn set_current_time(app_handle: AppHandle, time: f64) {
-    let _ = seek_internal(app_handle, time).await;
+pub async fn set_current_time(app_handle: AppHandle, time: f64) -> Result<(), AppError> {
+    PlaybackService::new(app_handle).seek(time).await
 }
 
 #[command]
 pub async fn set_volume(app_handle: tauri::AppHandle, volume: f32) -> Result<(), AppError> {
     let mut state = lock_audio_state()?;
-    let volume_f32 = volume as f32 / 100.0;
-    let safe_volume = volume_f32.clamp(0.0, 1.0);
+    let safe_volume = (volume/ 100.0).clamp(0.0, 1.0);
 
     state.volume = safe_volume;
 
@@ -153,8 +134,7 @@ pub async fn set_volume(app_handle: tauri::AppHandle, volume: f32) -> Result<(),
         engine.set_volume(safe_volume);
     }
 
-    crate::events::emit_event(&app_handle, crate::events::AppPayload::VolumeChanged(safe_volume))
-        .map_err(|e| AppError::from(e.to_string()))?;
+    EventBus::emit(&app_handle, AppEvent::VolumeChanged(safe_volume))?;
 
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/commands/playback_queue.rs b/src-tauri/src/commands/playback_queue.rs
index a42a823..a645443 100644
--- a/src-tauri/src/commands/playback_queue.rs
+++ b/src-tauri/src/commands/playback_queue.rs
@@ -2,8 +2,7 @@ use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
 use crate::errors::AppError;
 use crate::models::{PlaybackQueue, Track};
-use crate::events::emit_queue_changed;
-use crate::services::playback_service::{play_current_index_internal, stop_internal};
+use crate::services::playback_service::PlaybackService;
 use crate::state::playback_state::{lock_audio_state, with_audio_state};
 
 #[command]
@@ -12,41 +11,40 @@ pub fn get_playback_queue() -> Result<PlaybackQueue, AppError> {
 }
 
 #[command]
-pub async fn clear_queue(app: AppHandle) -> Result<(), AppError> {
+pub async fn clear_queue(app_handle: AppHandle) -> Result<(), AppError> {
     {
         let mut state = lock_audio_state()?;
         state.playback_queue.clear();
     }
-    
-    stop_internal(app.clone()).await?;
-    emit_queue_changed(&app)?;
+
+    PlaybackService::new(app_handle.clone()).stop().await?;
+    PlaybackService::emit_queue_changed(&app_handle)?;
     Ok(())
 }
 
 #[command]
-pub fn set_play_mode(app: AppHandle, mode: PlayMode) -> Result<(), AppError> {
+pub fn set_play_mode(app_handle: AppHandle, mode: PlayMode) -> Result<(), AppError> {
     {
         let mut state = lock_audio_state()?;
-        state.play_mode = mode;
         state.playback_queue.play_mode = mode;
     }
-    emit_queue_changed(&app)?;
+    PlaybackService::emit_queue_changed(&app_handle)?;
     Ok(())
 }
 
 #[command]
-pub fn insert_tracks_as_next(app: AppHandle, tracks: Vec<Track>) -> Result<(), AppError> {
+pub fn insert_tracks_as_next(app_handle: AppHandle, tracks: Vec<Track>) -> Result<(), AppError> {
     {
         let mut state = lock_audio_state()?;
-        state.playback_queue.insert_tracks_next(tracks);
+        state.playback_queue.insert_tracks_as_next(tracks);
     }
-    emit_queue_changed(&app)?;
+    PlaybackService::emit_queue_changed(&app_handle)?;
     Ok(())
 }
 
 #[command]
 pub async fn replace_playlist_and_play(
-    app: AppHandle,
+    app_handle: AppHandle,
     tracks: Vec<Track>,
     target_id: i64,
 ) -> Result<(), AppError> {
@@ -54,7 +52,7 @@ pub async fn replace_playlist_and_play(
         let mut state = lock_audio_state()?;
         state.playback_queue.replace_playlist(tracks, target_id)?
     };
-    emit_queue_changed(&app)?;
-    play_current_index_internal(&app, play_index)?;
+    PlaybackService::emit_queue_changed(&app_handle)?;
+    PlaybackService::new(app_handle).play_queue_index(play_index)?;
     Ok(())
 }
\ No newline at end of file
diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs
index a7079c3..c5544b3 100644
--- a/src-tauri/src/commands/settings.rs
+++ b/src-tauri/src/commands/settings.rs
@@ -1,8 +1,8 @@
 use tauri::{State, command, AppHandle};
 use crate::errors::AppError;
+use crate::events::{AppEvent, EventBus};
 use crate::models::AppSettings;
 use crate::state::AppState;
-use crate::events::{emit_event, AppPayload};
 
 #[command]
 pub async fn get_settings(state: State<'_, AppState>) -> Result<AppSettings, AppError> {
@@ -17,9 +17,8 @@ pub async fn update_settings(
 ) -> Result<AppSettings, AppError> {
     let updated_settings = state.settings.update_settings(settings).await?;
     
-    emit_event(&app_handle, AppPayload::SettingsChanged(updated_settings.clone()))
-        .map_err(|e| AppError::from(e.to_string()))?;
-        
+    EventBus::emit(&app_handle, AppEvent::SettingsChanged(updated_settings.clone()))?;
+    
     Ok(updated_settings)
 }
 
@@ -36,8 +35,7 @@ pub async fn save_settings(
 ) -> Result<AppSettings, AppError> {
     let updated_settings = state.settings.update_settings(settings).await?;
     
-    emit_event(&app_handle, AppPayload::SettingsChanged(updated_settings.clone()))
-        .map_err(|e| AppError::from(e.to_string()))?;
-        
+    EventBus::emit(&app_handle, AppEvent::SettingsChanged(updated_settings.clone()))?;
+    
     Ok(updated_settings)
 }
\ No newline at end of file
diff --git a/src-tauri/src/db/manager.rs b/src-tauri/src/db/manager.rs
index 9c327f7..dfa4a46 100644
--- a/src-tauri/src/db/manager.rs
+++ b/src-tauri/src/db/manager.rs
@@ -1,4 +1,3 @@
-use std::fs;
 use std::path::PathBuf;
 
 use sqlx::sqlite::{SqliteConnectOptions, SqliteJournalMode, SqlitePoolOptions, SqliteSynchronous};
@@ -17,8 +16,9 @@ impl DatabaseManager {
         let database_path = database_path(app_handle)?;
 
         if let Some(parent) = database_path.parent() {
-            if !parent.exists() {
-                fs::create_dir_all(parent).map_err(AppError::from)?;
+            let exists = tokio::fs::try_exists(parent).await.unwrap_or(false);
+            if !exists {
+                tokio::fs::create_dir_all(parent).await.map_err(AppError::from)?;
             }
         }
 
@@ -56,4 +56,4 @@ fn database_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, AppError> {
         .map_err(AppError::from)?;
 
     Ok(app_data_path.join("music.sqlite"))
-}
+}
\ No newline at end of file
diff --git a/src-tauri/src/events.rs b/src-tauri/src/events.rs
deleted file mode 100644
index c872d17..0000000
--- a/src-tauri/src/events.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use tauri::Emitter;
-
-use crate::errors::AppError;
-use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
-use crate::models::{AppSettings, PlaybackQueue, Track};
-use crate::state::playback_state::{current_playback_snapshot, metadata_from_track, with_audio_state};
-
-#[derive(Clone, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackStatePayload {
-    pub playing: bool,
-    pub current_time: f64,
-}
-
-#[derive(Clone, serde::Serialize)]
-#[serde(tag = "type", content = "payload")]
-pub enum AppPayload {
-    VolumeChanged(f32),
-    SettingsChanged(AppSettings),
-    TrackStarted { track: Track, index: usize },
-    PlaybackProgress { current_time: f64 },
-    QueueChanged(PlaybackQueue),
-    PlaybackStateChanged(PlaybackStatePayload),
-}
-
-pub fn emit_event(app_handle: &tauri::AppHandle, payload: AppPayload) -> Result<(), AppError> {
-    app_handle
-        .emit("global-app-event", payload)
-        .map_err(|e| AppError::from(e.to_string()))
-}
-
-pub fn emit_queue_changed(app_handle: &tauri::AppHandle) -> Result<(), AppError> {
-    let queue = with_audio_state(|state| state.playback_queue.clone())?;
-    emit_event(app_handle, AppPayload::QueueChanged(queue))
-}
-
-pub fn emit_track_started(
-    app_handle: &tauri::AppHandle,
-    track: Track,
-    index: usize,
-) -> Result<(), AppError> {
-    update_media_controls_metadata(metadata_from_track(&track));
-    emit_event(app_handle, AppPayload::TrackStarted { track, index })
-}
-
-pub fn sync_playback_state(
-    app_handle: &tauri::AppHandle,
-    playing: bool,
-    current_time: f64,
-) -> Result<(), AppError> {
-    let payload = PlaybackStatePayload { playing, current_time };
-    update_media_controls_playback(payload.clone());
-    emit_event(app_handle, AppPayload::PlaybackStateChanged(payload))
-}
-
-pub fn emit_progress(app_handle: &tauri::AppHandle) -> Result<(), AppError> {
-    if let Ok(snapshot) = current_playback_snapshot() {
-        emit_event(
-            app_handle,
-            AppPayload::PlaybackProgress {
-                current_time: snapshot.current_time,
-            },
-        )?;
-    }
-    Ok(())
-}
diff --git a/src-tauri/src/events/bus.rs b/src-tauri/src/events/bus.rs
new file mode 100644
index 0000000..4036c25
--- /dev/null
+++ b/src-tauri/src/events/bus.rs
@@ -0,0 +1,23 @@
+use tauri::{
+    AppHandle,
+    Emitter,
+};
+
+use crate::{
+    errors::AppError,
+    events::payloads::AppEvent,
+};
+
+pub struct EventBus;
+
+impl EventBus {
+    pub const CHANNEL: &'static str = "global-app-event";
+
+    pub fn emit(
+        app_handle: &AppHandle,
+        event: AppEvent,
+    ) -> Result<(), AppError> {
+        app_handle.emit(Self::CHANNEL, event)?;
+        Ok(())
+    }
+}
\ No newline at end of file
diff --git a/src-tauri/src/events/mod.rs b/src-tauri/src/events/mod.rs
new file mode 100644
index 0000000..1acf885
--- /dev/null
+++ b/src-tauri/src/events/mod.rs
@@ -0,0 +1,5 @@
+pub mod bus;
+pub mod payloads;
+
+pub use bus::*;
+pub use payloads::*;
\ No newline at end of file
diff --git a/src-tauri/src/events/payloads.rs b/src-tauri/src/events/payloads.rs
new file mode 100644
index 0000000..886fba3
--- /dev/null
+++ b/src-tauri/src/events/payloads.rs
@@ -0,0 +1,43 @@
+use serde::Serialize;
+
+use crate::models::{
+    AppSettings,
+    PlaybackQueue,
+    Track,
+};
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackStatePayload {
+    pub playing: bool,
+    pub current_time: f64,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaybackProgressPayload {
+    pub current_time: f64,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TrackStartedPayload {
+    pub track: Track,
+    pub index: usize,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(tag = "type", content = "payload")]
+pub enum AppEvent {
+    VolumeChanged(f32),
+
+    SettingsChanged(AppSettings),
+
+    QueueChanged(PlaybackQueue),
+
+    PlaybackStateChanged(PlaybackStatePayload),
+
+    PlaybackProgress(PlaybackProgressPayload),
+
+    TrackStarted(TrackStartedPayload),
+}
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 771d170..6c0eb46 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -19,17 +19,17 @@ use tauri::{
 };
 
 use commands::library::{
-    delete_track_file, delete_track_files, get_track_cover, load_track_library,
-    scan_track_directories, show_in_folder, trash_track_files, execute_scan
+    delete_track_file, delete_track_files, execute_scan, get_track_cover, load_track_library,
+    scan_track_directories, show_in_folder, trash_track_files,
 };
 
 use commands::playback::{
     current_time, get_current_status, insert_track_as_next, pause_track, play_next_track,
-    play_previous_track, play_queue_track, play_track, remove_track_from_queue,
-    resume_track, set_current_time, set_volume, spawn_playback_progress_task, stop_track,
-    sync_playback_queue, toggle_track,
+    play_previous_track, play_queue_track, play_track, remove_track_from_queue, resume_track,
+    set_current_time, set_volume, stop_track, sync_playback_queue,
+    toggle_track,
 };
-use services::playback_service::{play_next_internal, toggle_internal};
+use services::playback_service::PlaybackService;
 
 use commands::recent::{add_recently_played, clear_recently_played, load_recently_played};
 
@@ -61,6 +61,8 @@ use commands::playback_queue::{
 
 use audio::init_audio_state;
 
+use crate::errors::AppError;
+
 pub fn init_startup_scan(_app_handle: tauri::AppHandle) {}
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -70,24 +72,27 @@ pub fn run() {
         .plugin(tauri_plugin_store::Builder::new().build())
         .setup(|app| {
             let app_handle = app.handle().clone();
-            let database = tauri::async_runtime::block_on(DatabaseManager::new(&app_handle))
-                .map_err(|error| std::io::Error::new(std::io::ErrorKind::Other, error))?;
+
+            let database = tauri::async_runtime::block_on(DatabaseManager::new(&app_handle))?;
             let pool = database.pool().clone();
+
             let track_repository = Arc::new(SqliteTrackRepository::new(pool.clone()));
             let playlist_repository = Arc::new(SqlitePlaylistRepository::new(pool.clone()));
             let setting_repository = Arc::new(SqliteSettingsRepository::new(pool.clone()));
             let recent_repository = Arc::new(SqliteRecentRepository::new(pool));
 
             let setting_service = Arc::new(SettingsService::new(setting_repository));
-            tauri::async_runtime::block_on(setting_service.get_settings()).map_err(|error| {
-                std::io::Error::new(std::io::ErrorKind::Other, error.to_string())
-            })?;
+            tauri::async_runtime::block_on(setting_service.get_settings())?;
+
+            let track_service = Arc::new(TrackService::new(track_repository));
+            let playlist_service = Arc::new(PlaylistService::new(playlist_repository));
+            let recent_service = Arc::new(RecentService::new(recent_repository));
 
             let app_state = AppState::new(
-                Arc::new(TrackService::new(track_repository)),
-                Arc::new(PlaylistService::new(playlist_repository)),
+                track_service,
+                playlist_service,
                 setting_service,
-                Arc::new(RecentService::new(recent_repository)),
+                recent_service,
             );
 
             app.manage(app_state);
@@ -95,7 +100,7 @@ pub fn run() {
             init_audio_state(models::PlaybackQueue::default());
 
             let _ = init_media_controls(app.handle().clone());
-            spawn_playback_progress_task(app.handle().clone());
+            PlaybackService::spawn_playback_progress_task(app.handle().clone());
 
             let settings_item = MenuItem::with_id(app, "settings", "设置", true, None::<&str>)?;
             let quit_item = MenuItem::with_id(app, "quit", "退出", true, None::<&str>)?;
@@ -106,13 +111,18 @@ pub fn run() {
 
             let app_menu = MenuBuilder::new(app).items(&[&file_menu]).build()?;
             app.set_menu(app_menu)?;
+
+            let icon = app.default_window_icon()
+                .cloned()
+                .ok_or_else(|| AppError::from("Application default window icon is missing"))?;
+
             let _tray = TrayIconBuilder::new()
-                .icon(app.default_window_icon().unwrap().clone())
+                .icon(icon)
                 .menu(&tray_menu)
                 .show_menu_on_left_click(false)
-                .on_menu_event(|app: &tauri::AppHandle, event| match event.id.as_ref() {
+                .on_menu_event(|app_handle: &tauri::AppHandle, event| match event.id.as_ref() {
                     "settings" => {
-                        if let Some(window) = app.get_webview_window("main") {
+                        if let Some(window) = app_handle.get_webview_window("main") {
                             let _ = window.emit("tray:navigate", "settings");
                             let _ = window.unminimize();
                             let _ = window.show();
@@ -120,7 +130,7 @@ pub fn run() {
                         }
                     }
                     "quit" => {
-                        app.exit(0);
+                        app_handle.exit(0);
                     }
                     _ => {}
                 })
@@ -142,12 +152,17 @@ pub fn run() {
 
             let handle = app.handle().clone();
             tauri::async_runtime::spawn(async move {
-                if let Some(state) = handle.try_state::<AppState>() {
-                    if let Ok(settings) = state.settings.get_settings().await {
-                        if settings.scan_on_startup {
-                            if let Ok(scanned) =
-                                execute_scan(settings.library_dirs)
-                            {
+                let state = handle.state::<AppState>();
+                if let Ok(settings) = state.settings.get_settings().await {
+                    if settings.scan_on_startup {
+                        let library_dirs = settings.library_dirs;
+                        let scanned_result = tauri::async_runtime::spawn_blocking(move || {
+                            execute_scan(library_dirs)
+                        })
+                        .await;
+
+                        match scanned_result {
+                            Ok(Ok(scanned)) => {
                                 let mut tracks = Vec::with_capacity(scanned.len());
                                 for track in scanned {
                                     if let Ok(saved) = state.tracks.upsert_track(track).await {
@@ -156,10 +171,17 @@ pub fn run() {
                                 }
                                 let _ = handle.emit("library:refreshed", tracks);
                             }
+                            Ok(Err(error)) => {
+                                eprintln!("{}", error);
+                            }
+                            Err(error) => {
+                                eprintln!("{}", error);
+                            }
                         }
                     }
                 }
             });
+
             app.on_menu_event(move |app_handle: &tauri::AppHandle, event| {
                 match event.id().0.as_str() {
                     "quit" => {
@@ -168,18 +190,19 @@ pub fn run() {
                     "play" => {
                         let handle = app_handle.clone();
                         tauri::async_runtime::spawn(async move {
-                            let _ = toggle_internal(handle).await;
+                            let _ = PlaybackService::new(handle).toggle().await;
                         });
                     }
                     "next" => {
                         let handle = app_handle.clone();
                         tauri::async_runtime::spawn(async move {
-                            let _ = play_next_internal(handle).await;
+                            let _ = PlaybackService::new(handle).next().await;
                         });
                     }
                     _ => {}
                 }
             });
+
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![
diff --git a/src-tauri/src/models/playback.rs b/src-tauri/src/models/playback.rs
index 6ff4ce1..ded6ed5 100644
--- a/src-tauri/src/models/playback.rs
+++ b/src-tauri/src/models/playback.rs
@@ -13,19 +13,8 @@ pub struct NativeTrackMetadata {
 #[derive(Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PlaybackStatusSnapshot {
-    pub has_media: bool,
     pub playing: bool,
     pub current_time: f64,
-    pub track: Option<PlaybackTrackInfo>,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PlaybackProgressPayload {
-    pub playing: bool,
-    pub current_time: f64,
-    pub track_id: Option<i64>,
-    pub path: Option<String>,
 }
 
 #[derive(Clone, Serialize)]
@@ -33,8 +22,7 @@ pub struct PlaybackProgressPayload {
 pub struct PlaybackTrackStartedPayload {
     pub track: Track,
     pub index: usize,
-    pub playing: bool,
-    pub current_time: f64,
+    pub version: u64,
 }
 
 #[derive(Clone, Serialize)]
@@ -42,26 +30,4 @@ pub struct PlaybackTrackStartedPayload {
 pub struct PlaybackTrackInfo {
     pub id: Option<i64>,
     pub path: Option<String>,
-}
-
-impl PlaybackStatusSnapshot {
-    pub fn status_payload(self) -> PlaybackStatusSnapshot {
-        PlaybackStatusSnapshot {
-            has_media: self.has_media,
-            playing: self.playing,
-            current_time: self.current_time,
-            track: self.track.map(Into::into),
-        }
-    }
-
-    pub fn progress_payload(&self) -> Option<PlaybackProgressPayload> {
-        let track = self.track.as_ref()?;
-
-        Some(PlaybackProgressPayload {
-            playing: self.playing,
-            current_time: self.current_time,
-            track_id: track.id,
-            path: track.path.clone(),
-        })
-    }
-}
+}
\ No newline at end of file
diff --git a/src-tauri/src/models/playback_queue.rs b/src-tauri/src/models/playback_queue.rs
index c1c55bf..f531f13 100644
--- a/src-tauri/src/models/playback_queue.rs
+++ b/src-tauri/src/models/playback_queue.rs
@@ -11,6 +11,7 @@ pub struct PlaybackQueue {
     pub current_index: Option<usize>,
     pub play_mode: PlayMode,
     pub history: Vec<i64>,
+    pub version: u64,
 }
 
 #[derive(Debug, Serialize)]
@@ -27,6 +28,7 @@ impl Default for PlaybackQueue {
             current_index: None,
             play_mode: PlayMode::ListLoop,
             history: Vec::new(),
+            version: 0
         }
     }
 }
@@ -43,6 +45,7 @@ impl PlaybackQueue {
         self.current_index = current_index.filter(|i| *i < self.tracks.len());
         self.play_mode = play_mode;
         self.history = history;
+        self.version += 1;
     }
 
     pub fn clear(&mut self) {
@@ -106,19 +109,9 @@ impl PlaybackQueue {
     ) -> Option<&Track> {
         self.tracks.iter().find(|t| t.id == track_id)
     }
-
-    pub fn remove_track(
-        &mut self,
-        track_id: i64,
-    ) -> QueueRemoveResult {
-        let Some(remove_index) =
-            self.tracks.iter().position(|track| track.id == track_id)
-        else {
-            return QueueRemoveResult {
-                play_index: None,
-                should_stop: false,
-            };
-        };
+    
+    pub fn remove_track(&mut self, track_id: i64) -> Option<QueueRemoveResult> {
+        let remove_index = self.tracks.iter().position(|track| track.id == track_id)?;
 
         let was_current = self.current_index == Some(remove_index);
 
@@ -127,22 +120,19 @@ impl PlaybackQueue {
 
         if self.tracks.is_empty() {
             self.current_index = None;
-
-            return QueueRemoveResult {
+            return Some(QueueRemoveResult {
                 play_index: None,
                 should_stop: true,
-            };
+            });
         }
 
         if was_current {
             let next_index = remove_index.min(self.tracks.len() - 1);
-
             self.current_index = Some(next_index);
-
-            return QueueRemoveResult {
+            return Some(QueueRemoveResult {
                 play_index: Some(next_index),
                 should_stop: false,
-            };
+            });
         }
 
         if let Some(current_index) = self.current_index {
@@ -151,10 +141,10 @@ impl PlaybackQueue {
             }
         }
 
-        QueueRemoveResult {
+        Some(QueueRemoveResult {
             play_index: None,
             should_stop: false,
-        }
+        })
     }
 
     pub fn insert_next(
@@ -190,11 +180,11 @@ impl PlaybackQueue {
         self.tracks.insert(insert_index, track);
     }
 
-    pub fn insert_tracks_next(
+    pub fn insert_tracks_as_next(
         &mut self,
         tracks: Vec<Track>,
     ) {
-        for track in tracks {
+        for track in tracks.into_iter().rev() {
             self.insert_next(track);
         }
     }
diff --git a/src-tauri/src/repositories/sqlite/playlist_repository.rs b/src-tauri/src/repositories/sqlite/playlist_repository.rs
index b705148..e2af51e 100644
--- a/src-tauri/src/repositories/sqlite/playlist_repository.rs
+++ b/src-tauri/src/repositories/sqlite/playlist_repository.rs
@@ -14,52 +14,56 @@ impl SqlitePlaylistRepository {
     }
 
     pub async fn create(&self, playlist: NewPlaylist) -> Result<Playlist, AppError> {
-        sqlx::query_as::<_, Playlist>(
+        let res = sqlx::query_as::<_, Playlist>(
             "INSERT INTO playlists (name, created_at)
              VALUES (?1, datetime('now'))
              RETURNING id, name, created_at",
         )
         .bind(playlist.name)
         .fetch_one(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn rename(&self, playlist: RenamePlaylist) -> Result<Playlist, AppError> {
-        sqlx::query_as::<_, Playlist>(
+        let res = sqlx::query_as::<_, Playlist>(
             "UPDATE playlists SET name = ?1 WHERE id = ?2 RETURNING id, name, created_at",
         )
         .bind(playlist.name)
         .bind(playlist.id)
         .fetch_one(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn delete(&self, id: i64) -> Result<(), AppError> {
         sqlx::query("DELETE FROM playlists WHERE id = ?1")
             .bind(id)
             .execute(&self.pool)
-            .await
-            .map(|_| ())
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(())
     }
 
     pub async fn find_by_id(&self, id: i64) -> Result<Option<Playlist>, AppError> {
-        sqlx::query_as::<_, Playlist>("SELECT id, name, created_at FROM playlists WHERE id = ?1")
+        let res = sqlx::query_as::<_, Playlist>("SELECT id, name, created_at FROM playlists WHERE id = ?1")
             .bind(id)
             .fetch_optional(&self.pool)
-            .await
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(res)
     }
 
     pub async fn list_all(&self) -> Result<Vec<Playlist>, AppError> {
-        sqlx::query_as::<_, Playlist>(
+        let rows = sqlx::query_as::<_, Playlist>(
             "SELECT id, name, created_at FROM playlists ORDER BY created_at DESC, id DESC",
         )
         .fetch_all(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(rows)
     }
 
     pub async fn list_with_tracks(&self) -> Result<Vec<PlaylistWithTracks>, AppError> {
@@ -89,7 +93,7 @@ impl SqlitePlaylistRepository {
             None => next_position(&self.pool, track.playlist_id).await?,
         };
 
-        sqlx::query_as::<_, PlaylistTrack>(
+        let res = sqlx::query_as::<_, PlaylistTrack>(
             "INSERT INTO playlist_tracks (playlist_id, track_id, position)
              VALUES (?1, ?2, ?3)
              ON CONFLICT(playlist_id, track_id) DO UPDATE SET position = excluded.position
@@ -99,8 +103,9 @@ impl SqlitePlaylistRepository {
         .bind(track.track_id)
         .bind(position)
         .fetch_one(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn remove_track(&self, playlist_id: i64, track_id: i64) -> Result<(), AppError> {
@@ -108,18 +113,18 @@ impl SqlitePlaylistRepository {
             .bind(playlist_id)
             .bind(track_id)
             .execute(&self.pool)
-            .await
-            .map(|_| ())
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(())
     }
 
     pub async fn clear_tracks(&self, playlist_id: i64) -> Result<(), AppError> {
         sqlx::query("DELETE FROM playlist_tracks WHERE playlist_id = ?1")
             .bind(playlist_id)
             .execute(&self.pool)
-            .await
-            .map(|_| ())
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(())
     }
 
     pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), AppError> {
@@ -128,26 +133,25 @@ impl SqlitePlaylistRepository {
             .bind(playlist_id)
             .bind(track_id)
             .execute(&self.pool)
-            .await
-            .map(|_| ())
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(())
     }
 }
 
 async fn next_position(pool: &SqlitePool, playlist_id: i64) -> Result<i64, AppError> {
-    let value: (i64,) = sqlx::query_as(
+    let row: (i64,) = sqlx::query_as(
         "SELECT coalesce(max(position), -1) + 1 FROM playlist_tracks WHERE playlist_id = ?1",
     )
     .bind(playlist_id)
     .fetch_one(pool)
-    .await
-    .map_err(AppError::from)?;
+    .await?;
 
-    Ok(value.0)
+    Ok(row.0)
 }
 
 async fn tracks_for_playlist(pool: &SqlitePool, playlist_id: i64) -> Result<Vec<Track>, AppError> {
-    sqlx::query_as::<_, Track>(
+    let rows = sqlx::query_as::<_, Track>(
         "SELECT t.id, t.title, t.artist, t.album, t.duration, t.path, t.cover, t.file_size, t.play_count, t.last_played_at, t.created_at, t.updated_at
          FROM tracks t
          INNER JOIN playlist_tracks pt ON pt.track_id = t.id
@@ -156,6 +160,7 @@ async fn tracks_for_playlist(pool: &SqlitePool, playlist_id: i64) -> Result<Vec<
     )
     .bind(playlist_id)
     .fetch_all(pool)
-    .await
-    .map_err(AppError::from)
-}
\ No newline at end of file
+    .await?;
+
+    Ok(rows)
+}
diff --git a/src-tauri/src/repositories/sqlite/recent_repository.rs b/src-tauri/src/repositories/sqlite/recent_repository.rs
index 33b58bd..cf8c7c0 100644
--- a/src-tauri/src/repositories/sqlite/recent_repository.rs
+++ b/src-tauri/src/repositories/sqlite/recent_repository.rs
@@ -24,8 +24,7 @@ impl SqliteRecentRepository {
         .bind(limit)
         .bind(offset)
         .fetch_all(&self.pool)
-        .await
-        .map_err(AppError::from)?;
+        .await?;
 
         Ok(rows.into_iter().map(|row| RecentPlayedWithTrack {
             track: Track {
@@ -55,24 +54,24 @@ impl SqliteRecentRepository {
         .bind(track_id)
         .bind(played_at)
         .execute(&self.pool)
-        .await
-        .map(|_| ())
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(())
     }
 
     pub async fn clear(&self) -> Result<(), AppError> {
         sqlx::query("DELETE FROM recent_played")
             .execute(&self.pool)
-            .await
-            .map(|_| ())
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(())
     }
 
     pub async fn count(&self) -> Result<i64, AppError> {
         let row: (i64,) = sqlx::query_as("SELECT count(*) FROM recent_played")
             .fetch_one(&self.pool)
-            .await
-            .map_err(AppError::from)?;
+            .await?;
+
         Ok(row.0)
     }
 
@@ -84,9 +83,9 @@ impl SqliteRecentRepository {
         )
         .bind(keep)
         .execute(&self.pool)
-        .await
-        .map(|_| ())
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(())
     }
 }
 
@@ -105,4 +104,4 @@ struct RecentRow {
     created_at: String,
     updated_at: String,
     played_at: String,
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/repositories/sqlite/settings_repository.rs b/src-tauri/src/repositories/sqlite/settings_repository.rs
index 82aa5b2..ff96aca 100644
--- a/src-tauri/src/repositories/sqlite/settings_repository.rs
+++ b/src-tauri/src/repositories/sqlite/settings_repository.rs
@@ -14,12 +14,13 @@ impl SqliteSettingsRepository {
     }
 
     pub async fn get(&self) -> Result<Option<SettingRow>, AppError> {
-        sqlx::query_as::<_, SettingRow>(
+        let res = sqlx::query_as::<_, SettingRow>(
             "SELECT id, theme, volume, scan_on_startup, reduce_motion, library_dirs, created_at, updated_at FROM settings WHERE id = 1",
         )
         .fetch_optional(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn update(&self, row: SettingRow) -> Result<(), AppError> {
@@ -41,8 +42,8 @@ impl SqliteSettingsRepository {
         .bind(row.library_dirs)
         .bind(row.created_at)
         .execute(&self.pool)
-        .await
-        .map(|_| ())
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(())
     }
 }
diff --git a/src-tauri/src/repositories/sqlite/track_repository.rs b/src-tauri/src/repositories/sqlite/track_repository.rs
index 4d3ac4a..26fc5eb 100644
--- a/src-tauri/src/repositories/sqlite/track_repository.rs
+++ b/src-tauri/src/repositories/sqlite/track_repository.rs
@@ -12,9 +12,9 @@ impl SqliteTrackRepository {
     pub fn new(pool: SqlitePool) -> Self {
         Self { pool }
     }
-    
+
     pub async fn create(&self, track: NewTrack) -> Result<Track, AppError> {
-        sqlx::query_as::<_, Track>(
+        let res = sqlx::query_as::<_, Track>(
             "INSERT INTO tracks (title, artist, album, duration, path, cover, file_size, created_at, updated_at)
              VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, datetime('now'), datetime('now'))
              RETURNING id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at",
@@ -27,12 +27,13 @@ impl SqliteTrackRepository {
         .bind(track.cover)
         .bind(track.file_size)
         .fetch_one(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn upsert_by_path(&self, track: NewTrack) -> Result<Track, AppError> {
-        sqlx::query_as::<_, Track>(
+        let res = sqlx::query_as::<_, Track>(
             "INSERT INTO tracks (title, artist, album, duration, path, cover, file_size, created_at, updated_at)
              VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, datetime('now'), datetime('now'))
              ON CONFLICT(path) DO UPDATE SET
@@ -53,12 +54,13 @@ impl SqliteTrackRepository {
         .bind(track.cover)
         .bind(track.file_size)
         .fetch_one(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn update(&self, track: UpdateTrack) -> Result<Track, AppError> {
-        sqlx::query_as::<_, Track>(
+        let res = sqlx::query_as::<_, Track>(
             "UPDATE tracks SET
                 title = ?1,
                 artist = ?2,
@@ -80,58 +82,62 @@ impl SqliteTrackRepository {
         .bind(track.file_size)
         .bind(track.id)
         .fetch_one(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn delete(&self, id: i64) -> Result<(), AppError> {
         sqlx::query("DELETE FROM tracks WHERE id = ?1")
             .bind(id)
             .execute(&self.pool)
-            .await
-            .map(|_| ())
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(())
     }
 
     pub async fn delete_by_path(&self, path: &str) -> Result<(), AppError> {
         sqlx::query("DELETE FROM tracks WHERE path = ?1")
             .bind(path)
             .execute(&self.pool)
-            .await
-            .map(|_| ())
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(())
     }
 
     pub async fn find_by_id(&self, id: i64) -> Result<Option<Track>, AppError> {
-        sqlx::query_as::<_, Track>(
+        let res = sqlx::query_as::<_, Track>(
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
              FROM tracks WHERE id = ?1",
         )
         .bind(id)
         .fetch_optional(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn find_by_path(&self, path: &str) -> Result<Option<Track>, AppError> {
-        sqlx::query_as::<_, Track>(
+        let res = sqlx::query_as::<_, Track>(
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
              FROM tracks WHERE path = ?1",
         )
         .bind(path)
         .fetch_optional(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(res)
     }
 
     pub async fn list_all(&self) -> Result<Vec<Track>, AppError> {
-        sqlx::query_as::<_, Track>(
+        let rows = sqlx::query_as::<_, Track>(
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at
              FROM tracks ORDER BY title COLLATE NOCASE ASC",
         )
         .fetch_all(&self.pool)
-        .await
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(rows)
     }
 
     pub async fn search(&self, query: TrackSearchQuery) -> Result<Vec<Track>, AppError> {
@@ -171,11 +177,12 @@ impl SqliteTrackRepository {
         builder.push(" OFFSET ");
         builder.push_bind(query.offset.unwrap_or(0).max(0));
 
-        builder
+        let rows = builder
             .build_query_as::<Track>()
             .fetch_all(&self.pool)
-            .await
-            .map_err(AppError::from)
+            .await?;
+
+        Ok(rows)
     }
 
     pub async fn increment_play_count(&self, id: i64, played_at: String) -> Result<(), AppError> {
@@ -185,8 +192,8 @@ impl SqliteTrackRepository {
         .bind(played_at)
         .bind(id)
         .execute(&self.pool)
-        .await
-        .map(|_| ())
-        .map_err(AppError::from)
+        .await?;
+
+        Ok(())
     }
 }
diff --git a/src-tauri/src/services/media_control_service.rs b/src-tauri/src/services/media_control_service.rs
new file mode 100644
index 0000000..e1db4dc
--- /dev/null
+++ b/src-tauri/src/services/media_control_service.rs
@@ -0,0 +1,50 @@
+use crate::services::playback_service::PlaybackService;
+use crate::state::playback_state::current_time_from_state;
+use souvlaki::{MediaControlEvent, SeekDirection};
+use tauri::AppHandle;
+
+pub async fn handle_media_control_event(app_handle: AppHandle, event: MediaControlEvent) {
+    let service = PlaybackService::new(app_handle);
+
+    match event {
+        MediaControlEvent::Play => {
+            let _ = service.resume().await;
+        }
+        MediaControlEvent::Pause => {
+            let _ = service.pause().await;
+        }
+        MediaControlEvent::Toggle => {
+            let _ = service.toggle().await;
+        }
+        MediaControlEvent::Next => {
+            let _ = service.next().await;
+        }
+        MediaControlEvent::Previous => {
+            let _ = service.previous().await;
+        }
+        MediaControlEvent::Stop => {
+            let _ = service.stop().await;
+        }
+        MediaControlEvent::SetPosition(position) => {
+            let _ = service.seek(position.0.as_secs_f64()).await;
+        }
+        MediaControlEvent::Seek(direction) => {
+            let current_time = current_time_from_state();
+            let offset = match direction {
+                SeekDirection::Forward => 10.0,
+                SeekDirection::Backward => -10.0,
+            };
+            let _ = service.seek((current_time + offset).max(0.0)).await;
+        }
+        MediaControlEvent::SeekBy(direction, duration) => {
+            let current_time = current_time_from_state();
+            let offset = duration.as_secs_f64();
+            let next_time = match direction {
+                SeekDirection::Forward => current_time + offset,
+                SeekDirection::Backward => current_time - offset,
+            };
+            let _ = service.seek(next_time.max(0.0)).await;
+        }
+        _ => {}
+    }
+}
diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs
index 3e1bfe4..e43d44b 100644
--- a/src-tauri/src/services/mod.rs
+++ b/src-tauri/src/services/mod.rs
@@ -1,3 +1,4 @@
+pub mod media_control_service;
 pub mod playback_service;
 pub mod playlist_service;
 pub mod recent_service;
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index 212760c..938f1dd 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -1,215 +1,281 @@
-use crate::audio::{AudioEngine, WebAudioEngine, lock_audio_state};
+use crate::audio::{lock_audio_state, AudioEngine, WebAudioEngine};
 use crate::errors::AppError;
-use crate::events::{emit_progress, emit_track_started, sync_playback_state};
+use crate::events::{AppEvent, EventBus, PlaybackProgressPayload, PlaybackStatePayload, TrackStartedPayload};
+use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
 use crate::models::Track;
-use crate::state::playback_state::{current_time_from_state, minimal_track, with_audio_state};
-use souvlaki::{MediaControlEvent, SeekDirection};
+use crate::state::playback_state::{current_playback_snapshot, metadata_from_track, minimal_track, should_advance_track, with_audio_state};
 use std::path::Path;
+use std::time::Duration;
 use tauri::AppHandle;
 
-pub fn play_track_internal(
-    app_handle: &tauri::AppHandle,
-    track: Track,
-    index: Option<usize>,
-) -> Result<(), AppError> {
-    let file_path = Path::new(&track.path);
+pub struct PlaybackService {
+    app_handle: AppHandle,
+}
 
-    if !file_path.exists() {
-        return Err("音频文件不存在或已被移动".into());
+impl PlaybackService {
+    pub fn new(app_handle: AppHandle) -> Self {
+        Self { app_handle }
     }
 
-    let mut state = lock_audio_state()?;
+    pub fn play_track(&self, track: Track, index: Option<usize>) -> Result<(), AppError> {
+        let file_path = Path::new(&track.path);
+
+        if !file_path.exists() {
+            return Err("音频文件不存在或已被移动".into());
+        }
+
+        let mut state = lock_audio_state()?;
+
+        let volume = state.volume;
+        let pan = state.pan;
+        state.engine = None;
+
+        let mut engine = match WebAudioEngine::new(file_path, volume, pan) {
+            Ok(eng) => eng,
+            Err(e) => {
+                state.current_path = None;
+                state.current_track_id = None;
+                state.playing = false;
+                return Err(e);
+            }
+        };
+
+        if let Err(e) = engine.play() {
+            state.current_path = None;
+            state.current_track_id = None;
+            state.playing = false;
+            return Err(e);
+        }
+
+        state.engine = Some(Box::new(engine));
+        state.current_path = Some(track.path.clone());
+        state.current_track_id = Some(track.id);
+
+        if let Some(next_index) = index {
+            state.playback_queue.current_index = Some(next_index);
+        }
 
-    state.engine = None;
+        state.playing = true;
+        let target_index = index.or(state.playback_queue.current_index).unwrap_or(0);
 
-    let mut engine = WebAudioEngine::new(file_path, state.volume, state.pan)?;
-    engine.play()?;
+        drop(state);
 
-    state.engine = Some(Box::new(engine));
-    state.current_path = Some(track.path.clone());
-    state.current_track_id = Some(track.id);
+        Self::emit_track_started(&self.app_handle, track, target_index)?;
 
-    if let Some(next_index) = index {
-        state.playback_queue.current_index = Some(next_index);
+        Ok(())
     }
 
-    state.playing = true;
+    pub fn play_queue_index(&self, index: usize) -> Result<(), AppError> {
+        let track = with_audio_state(|state| state.playback_queue.require_track(index))??;
+        self.play_track(track, Some(index))
+    }
 
-    let target_index = index.or(state.playback_queue.current_index).unwrap_or(0);
+    pub async fn next(&self) -> Result<(), AppError> {
+        let (track, index) = with_audio_state(|state| {
+            let index = state.playback_queue.move_next()
+                .ok_or_else(|| AppError::from("Queue is empty"))?;
+            
+            let track = state.playback_queue.require_track(index)?;
+            
+            Ok::<(Track, usize), AppError>((track, index))
+        })??;
+
+        self.play_track(track, Some(index))
+    }
 
-    drop(state);
+    pub async fn previous(&self) -> Result<(), AppError> {
+        let (track, index) = with_audio_state(|state| {
+            let index = state.playback_queue.move_previous()
+                .ok_or_else(|| AppError::from("Queue is empty"))?;
+            
+            let track = state.playback_queue.require_track(index)?;
+            
+            Ok::<(Track, usize), AppError>((track, index))
+        })??;
+
+        self.play_track(track, Some(index))
+    }
 
-    emit_track_started(app_handle, track, target_index)?;
+    pub async fn resume(&self) -> Result<(), AppError> {
+        let current_time = with_audio_state(|state| {
+            let res = state
+                .with_engine(|engine| {
+                    engine.play()?;
+                    Ok(engine.current_time())
+                })
+                .and_then(|inner| inner);
+
+            if res.is_ok() {
+                state.playing = true;
+            }
+            res
+        })??;
+
+        Self::sync_playback_state(&self.app_handle, true, current_time)?;
+        Ok(())
+    }
 
-    Ok(())
-}
+    pub async fn pause(&self) -> Result<(), AppError> {
+        let current_time = with_audio_state(|state| {
+            let res = state.with_engine(|engine| {
+                engine.pause();
+                engine.current_time()
+            });
+            if res.is_ok() {
+                state.playing = false;
+            }
+            res
+        })??;
+
+        Self::sync_playback_state(&self.app_handle, false, current_time)?;
+        Ok(())
+    }
 
-pub fn play_current_index_internal(app_handle: &AppHandle, index: usize) -> Result<(), AppError> {
-    let track = with_audio_state(|state| state.playback_queue.require_track(index))??;
-    play_track_internal(app_handle, track, Some(index))
-}
+    pub async fn toggle(&self) -> Result<bool, AppError> {
+        let (playing, current_time) = with_audio_state(|state| {
+            let res = state
+                .with_engine(|engine| {
+                    if engine.paused() {
+                        engine.play()?;
+                        Ok((true, engine.current_time()))
+                    } else {
+                        engine.pause();
+                        Ok((false, engine.current_time()))
+                    }
+                })
+                .and_then(|i| i);
+            if let Ok((p, _)) = res {
+                state.playing = p;
+            }
+            res
+        })??;
+
+        Self::sync_playback_state(&self.app_handle, playing, current_time)?;
+        Ok(playing)
+    }
 
-pub async fn play_next_internal(app_handle: AppHandle) -> Result<(), AppError> {
-    let index = with_audio_state(|state| state.playback_queue.move_next())?
-        .ok_or_else(|| AppError::from("Queue is empty"))?;
+    pub async fn stop(&self) -> Result<(), AppError> {
+        with_audio_state(|state| {
+            let _ = state.with_engine(|engine| {
+                engine.pause();
+                engine.seek(0.0);
+            });
+            state.playing = false;
+        })?;
 
-    play_current_index_internal(&app_handle, index)
-}
+        Self::sync_playback_state(&self.app_handle, false, 0.0)?;
+        Ok(())
+    }
 
-pub async fn play_previous_internal(app_handle: AppHandle) -> Result<(), AppError> {
-    let index = with_audio_state(|state| state.playback_queue.move_previous())?
-        .ok_or_else(|| AppError::from("Queue is empty"))?;
+    pub async fn seek(&self, time: f64) -> Result<(), AppError> {
+        let playing = with_audio_state(|state| {
+            let res = state.with_engine(|engine| {
+                engine.seek(time);
+                !engine.paused()
+            });
+            if let Ok(p) = res {
+                state.playing = p;
+            }
+            res
+        })??;
+
+        Self::sync_playback_state(&self.app_handle, playing, time)?;
+        Ok(())
+    }
 
-    play_current_index_internal(&app_handle, index)
-}
+    pub fn load_track_for_playback(&self, full_path: &str, track_id: Option<i64>) -> Track {
+        with_audio_state(|state| {
+            state
+                .playback_queue
+                .tracks
+                .iter()
+                .find(|track| {
+                    track_id.as_ref().map(|id| track.id == *id).unwrap_or(false)
+                        || track.path == full_path
+                })
+                .cloned()
+        })
+        .ok()
+        .flatten()
+        .unwrap_or_else(|| minimal_track(full_path.to_string()))
+    }
 
-pub async fn resume_internal(app_handle: AppHandle) -> Result<(), AppError> {
-    let current_time = with_audio_state(|state| {
-        let res = state.with_engine(|engine| {
-            engine.play()?;
-            Ok(engine.current_time())
-        }).and_then(|inner| inner);
+    pub fn emit_track_started(app_handle: &AppHandle, track: Track, index: usize) -> Result<(), AppError> {
+        update_media_controls_metadata(metadata_from_track(&track));
 
-        if res.is_ok() {
-            state.playing = true;
-        }
-        res
-    })??;
+        EventBus::emit(
+            app_handle,
+            AppEvent::TrackStarted(TrackStartedPayload { track, index }),
+        )
+    }
 
-    sync_playback_state(&app_handle, true, current_time)?;
-    Ok(())
-}
+    pub fn sync_playback_state(
+        app_handle: &AppHandle,
+        playing: bool,
+        current_time: f64,
+    ) -> Result<(), AppError> {
+        let payload = PlaybackStatePayload {
+            playing,
+            current_time,
+        };
 
-pub async fn pause_internal(app_handle: AppHandle) -> Result<(), AppError> {
-    let current_time = with_audio_state(|state| {
-        let res = state.with_engine(|engine| {
-            engine.pause();
-            engine.current_time()
-        });
-        if res.is_ok() { state.playing = false; }
-        res
-    })??;
+        update_media_controls_playback(payload.clone());
 
-    sync_playback_state(&app_handle, false, current_time)?;
-    Ok(())
-}
+        EventBus::emit(app_handle, AppEvent::PlaybackStateChanged(payload))
+    }
 
-pub async fn toggle_internal(app_handle: AppHandle) -> Result<bool, AppError> {
-    let (playing, current_time) = with_audio_state(|state| {
-        let res = state.with_engine(|engine| {
-            if engine.paused() { engine.play()?; Ok((true, engine.current_time())) }
-            else { engine.pause(); Ok((false, engine.current_time())) }
-        }).and_then(|i| i);
-        if let Ok((p, _)) = res { state.playing = p; }
-        res
-    })??;
-
-    sync_playback_state(&app_handle, playing, current_time)?;
-    Ok(playing)
-}
+    pub fn emit_progress(app_handle: &AppHandle) -> Result<(), AppError> {
+        if let Ok(snapshot) = current_playback_snapshot() {
+            EventBus::emit(
+                app_handle,
+                AppEvent::PlaybackProgress(PlaybackProgressPayload {
+                    current_time: snapshot.current_time,
+                }),
+            )?;
+        }
+        Ok(())
+    }
 
-pub async fn stop_internal(app_handle: AppHandle) -> Result<(), AppError> {
-    with_audio_state(|state| {
-        let _ = state.with_engine(|engine| {
-            engine.pause();
-            engine.seek(0.0);
-        });
-        state.playing = false;
-    })?;
+    pub fn spawn_playback_progress_task(app_handle: AppHandle) {
+        tauri::async_runtime::spawn(async move {
+            let mut interval = tokio::time::interval(Duration::from_millis(500));
 
-    sync_playback_state(&app_handle, false, 0.0)?;
-    Ok(())
-}
+            loop {
+                interval.tick().await;
+
+                let _ = Self::emit_progress(&app_handle);
 
-pub async fn seek_internal(app_handle: AppHandle, time: f64) -> Result<(), AppError> {
-    let playing = with_audio_state(|state| {
-        let res = state.with_engine(|engine| {
-            engine.seek(time);
-            !engine.paused()
+                if should_advance_track() {
+                    let _ = PlaybackService::new(app_handle.clone()).next();
+                }
+            }
         });
-        if let Ok(p) = res { state.playing = p; }
-        res
-    })??;
+    }
 
-    sync_playback_state(&app_handle, playing, time)?;
-    Ok(())
-}
+    pub(crate) async fn remove_track_from_queue(&self, track_id: i64) -> Result<(), AppError> {
+        let result = {
+            let mut state = lock_audio_state()?;
+            state.playback_queue.remove_track(track_id)
+        };
 
-pub fn find_track_in_queue(full_path: &str, track_id: Option<i64>) -> Option<Track> {
-    with_audio_state(|state| {
-        state
-            .playback_queue
-            .tracks
-            .iter()
-            .find(|track| {
-                track_id.as_ref().map(|id| track.id == *id).unwrap_or(false)
-                    || track.path == full_path
-            })
-            .cloned()
-    })
-    .ok()
-    .flatten()
-}
+        let Some(remove_result) = result else {
+            return Ok(());
+        };
 
-pub fn load_track_for_playback(full_path: &str, track_id: Option<i64>) -> Track {
-    find_track_in_queue(full_path, track_id).unwrap_or_else(|| minimal_track(full_path.to_string()))
-}
+        if remove_result.should_stop {
+            self.stop().await?;
+        } else if let Some(index) = remove_result.play_index {
+            self.play_queue_index(index)?;
+        }
 
-pub fn spawn_playback_progress_task(app_handle: AppHandle) {
-    std::thread::spawn(move || loop {
-        let _ = emit_progress(&app_handle);
+        Self::emit_queue_changed(&self.app_handle)?;
 
-        if crate::state::playback_state::should_advance_track() {
-            let local_handle = app_handle.clone();
-            tauri::async_runtime::block_on(async move {
-                let _ = play_next_internal(local_handle).await;
-            });
-        }
+        Ok(())
+    }
 
-        std::thread::sleep(std::time::Duration::from_millis(500));
-    });
-}
+    pub(crate) fn emit_queue_changed(app_handle: &tauri::AppHandle) -> Result<(), AppError> {
+        let queue = with_audio_state(|state| state.playback_queue.clone())?;
 
-pub async fn handle_media_control_event_internal(app_handle: AppHandle, event: MediaControlEvent) {
-    match event {
-        MediaControlEvent::Play => {
-            let _ = resume_internal(app_handle).await;
-        }
-        MediaControlEvent::Pause => {
-            let _ = pause_internal(app_handle).await;
-        }
-        MediaControlEvent::Toggle => {
-            let _ = toggle_internal(app_handle).await;
-        }
-        MediaControlEvent::Next => {
-            let _ = play_next_internal(app_handle).await;
-        }
-        MediaControlEvent::Previous => {
-            let _ = play_previous_internal(app_handle).await;
-        }
-        MediaControlEvent::Stop => {
-            let _ = stop_internal(app_handle).await;
-        }
-        MediaControlEvent::SetPosition(position) => {
-            let _ = seek_internal(app_handle, position.0.as_secs_f64()).await;
-        }
-        MediaControlEvent::Seek(direction) => {
-            let current_time = current_time_from_state();
-            let offset = match direction {
-                SeekDirection::Forward => 10.0,
-                SeekDirection::Backward => -10.0,
-            };
-            let _ = seek_internal(app_handle, (current_time + offset).max(0.0)).await;
-        }
-        MediaControlEvent::SeekBy(direction, duration) => {
-            let current_time = current_time_from_state();
-            let offset = duration.as_secs_f64();
-            let next_time = match direction {
-                SeekDirection::Forward => current_time + offset,
-                SeekDirection::Backward => current_time - offset,
-            };
-            let _ = seek_internal(app_handle, next_time.max(0.0)).await;
-        }
-        _ => {}
+        EventBus::emit(app_handle, AppEvent::QueueChanged(queue))
     }
 }
diff --git a/src-tauri/src/state/playback_state.rs b/src-tauri/src/state/playback_state.rs
index 0af43c9..d534e02 100644
--- a/src-tauri/src/state/playback_state.rs
+++ b/src-tauri/src/state/playback_state.rs
@@ -8,8 +8,12 @@ use crate::models::playback::{
 use crate::models::Track;
 
 pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, AppError> {
-    let mut state = lock_audio_state()?;
-    Ok(f(&mut state))
+    let value = {
+        let mut state = lock_audio_state()?;
+        f(&mut state)
+    };
+    
+    Ok(value)
 }
 
 pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
@@ -19,24 +23,27 @@ pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
     }
 }
 
-pub fn current_playback_state(state: &mut AudioState) -> PlaybackStatusSnapshot {
-    match state.with_engine(|engine| (!engine.paused(), engine.current_time())) {
+pub fn current_playback_state(
+    state: &mut AudioState,
+) -> PlaybackStatusSnapshot {
+    match state.with_engine(|engine| {
+        (!engine.paused(), engine.current_time())
+    }) {
         Ok((playing, current_time)) => {
             state.playing = playing;
+
             PlaybackStatusSnapshot {
-                has_media: true,
                 playing,
                 current_time,
-                track: Some(playback_track_info(state)),
             }
         }
+
         Err(_) => {
             state.playing = false;
+
             PlaybackStatusSnapshot {
-                has_media: false,
                 playing: false,
                 current_time: 0.0,
-                track: None,
             }
         }
     }
diff --git a/src/lib/components/base/MduiSlider.svelte b/src/lib/components/base/MduiSlider.svelte
index c70e732..673e1bd 100644
--- a/src/lib/components/base/MduiSlider.svelte
+++ b/src/lib/components/base/MduiSlider.svelte
@@ -1,27 +1,32 @@
 <script lang="ts">
+    import type { Slider } from 'mdui'
     import { onMount } from 'svelte'
 
-    type MduiSliderElement = HTMLElement & {
+    type MduiSliderElement = Slider & {
         value: number | string
         shadowRoot: ShadowRoot | null
     }
 
     type SliderProps = {
+        nolabel?: boolean
         value?: number
         classList?: string
         class?: string
         duration?: number
+        el?: Slider | null,
         oninput?: (event: Event) => void
         onchange?: (event: Event) => void
     }
 
     let {
+        nolabel = false,
         value = $bindable(0),
         classList = '',
         class: className = '',
         oninput,
         onchange,
-        duration = 0
+        duration = 0,
+        el = $bindable(null)
     }: SliderProps = $props()
 
     let sliderRef = $state<MduiSliderElement | null>(null)
@@ -93,7 +98,8 @@
 </script>
 
 <mdui-slider
-    nolabel
+    bind:this={el}
+    {nolabel}
     max={duration}
     value={value}
     class={`${classList} ${className}`}
diff --git a/src/lib/features/PlayerBar.svelte b/src/lib/features/PlayerBar.svelte
index e8a6359..7e9da43 100644
--- a/src/lib/features/PlayerBar.svelte
+++ b/src/lib/features/PlayerBar.svelte
@@ -5,16 +5,25 @@
     import { trackCovers } from '$lib/state/covers.svelte'
     import { player } from '$lib/state/player.svelte'
     import { formatTime } from '$lib/utils'
+    import type { Slider as MduiSliderElement } from 'mdui'
 
-    let slider = $state<MduiSlider | null>(null)
+    let slider = $state<MduiSliderElement | null>(null)
+    $effect(() => {
+        if (slider) {
+            slider.labelFormatter = (value: number) => formatTime(value)
+        }
+    })
+    
+    let isDragging = $state(false)
+    let localProgress = $state(0)
 
     let currentCover = $derived(
         player.currentTrack?.cover ?? trackCovers.get(player.currentTrack),
     )
     let volumeIcon = $derived(getVolumeIcon(player.volume, player.muted))
     let playModeIcon = $derived.by(() => {
-        if (player.queue.playMode === 'single') return 'repeat_one--rounded'
-        if (player.queue.playMode === 'shuffle') return 'shuffle--rounded'
+        if (player.queue.playMode === 'SingleLoop') return 'repeat_one--rounded'
+        if (player.queue.playMode === 'Shuffle') return 'shuffle--rounded'
         return 'repeat--rounded'
     })
 
@@ -23,12 +32,23 @@
         if (volume === 0) return 'volume_mute--rounded'
         return volume > 50 ? 'volume_up--rounded' : 'volume_down--rounded'
     }
-    function handleSeekInput(e: Event): void {
-        const target = e.currentTarget as HTMLElement & {
-            value: number | string
-        }
 
-        player.seek(Number(target.value))
+    function handleSliderInput(e: Event): void {
+        const target = e.currentTarget as HTMLElement & { value: number | string }
+        
+        isDragging = true
+        
+        localProgress = Number(target.value)
+    }
+
+    async function handleSliderChange(e: Event): Promise<void> {
+        const target = e.currentTarget as HTMLElement & { value: number | string }
+        const finalValue = Number(target.value)
+
+        player.currentTime = finalValue
+        await player.seek(finalValue)
+
+        isDragging = false
     }
 </script>
 
@@ -40,12 +60,13 @@
             {formatTime(player.currentTime)}
         </span>
 
-        <div class="flex-1">
+        <div class="flex-1 z-9999!">
             <MduiSlider
-                bind:value={player.currentTime}
-                bind:this={slider}
-                oninput={handleSeekInput}
+                bind:el={slider}
+                value={isDragging ? localProgress : player.currentTime}
                 duration={(player.currentTrack?.duration ?? 0) / 1000}
+                oninput={handleSliderInput}
+                onchange={handleSliderChange}
             />
         </div>
 
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
index 1a4667b..c01ff23 100644
--- a/src/lib/features/TrackList.svelte
+++ b/src/lib/features/TrackList.svelte
@@ -78,15 +78,16 @@
             .filter(Boolean)
             .join(' '),
     )
-
     function lazyCover(track: Track) {
         return (node: HTMLElement) => {
+            const load = () => {
+                void trackCovers.load(track)
+            }
+
             const observer = new IntersectionObserver(
                 entries => {
-                    const entry = entries[0]
-
-                    if (entry.isIntersecting) {
-                        void trackCovers.load(track)
+                    if (entries[0].isIntersecting) {
+                        load()
                         observer.disconnect()
                     }
                 },
@@ -95,7 +96,15 @@
                 },
             )
 
-            observer.observe(node)
+            const rect = node.getBoundingClientRect()
+            const isVisible =
+                rect.top < window.innerHeight + 300 && rect.bottom > -300
+
+            if (isVisible) {
+                load()
+            } else {
+                observer.observe(node)
+            }
 
             return () => {
                 observer.disconnect()
@@ -228,9 +237,7 @@
 <svelte:window onclick={handleWindowClick} onkeydown={handleWindowKeydown} />
 
 {#snippet trackIndex(index: number, isCurrent: boolean)}
-    <div
-        class="flex justify-center items-center text-sm themed-text-secondary z-10"
-    >
+    <div class="flex justify-center items-center text-sm themed-text-secondary">
         {#if isCurrent && player.playing}
             <PlayingIndicator />
         {:else}
@@ -267,7 +274,7 @@
 
         {#if !columns.includes('index') && isCurrent}
             <div
-                class="absolute inset-0 flex items-center justify-center bg-black/40 text-lg text-(--mdui-color-inverse-primary-light) z-20"
+                class="absolute inset-0 flex items-center justify-center bg-black/40 text-lg text-(--mdui-color-inverse-primary-light)"
             >
                 {#if player.playing}
                     <PlayingIndicator
@@ -284,7 +291,7 @@
 {/snippet}
 
 {#snippet trackTitle(track: Track, cover: string | null, isCurrent: boolean)}
-    <div class="flex items-center gap-4 pl-3 overflow-hidden z-10 min-w-0">
+    <div class="flex items-center gap-4 pl-3 overflow-hidden min-w-0">
         {@render trackCover(track, cover, isCurrent)}
 
         <div class="flex flex-col min-w-0">
@@ -305,15 +312,13 @@
 {/snippet}
 
 {#snippet trackAlbum(track: Track)}
-    <div
-        class="text-sm truncate hidden md:block z-10 themed-text-secondary min-w-0"
-    >
+    <div class="text-sm truncate hidden md:block themed-text-secondary min-w-0">
         {track.album ?? '未知专辑'}
     </div>
 {/snippet}
 
 {#snippet trackDuration(track: Track, index: number)}
-    <div class="flex items-center justify-between gap-2 z-10 w-full min-w-0">
+    <div class="flex items-center justify-between gap-2 w-full min-w-0">
         <div class="text-sm font-mono themed-text-secondary text-left">
             {formatDuration(track.duration / 1000)}
         </div>
@@ -353,7 +358,6 @@
                 <div class="text-left hidden md:block">专辑</div>
             {/if}
 
-
             {#if columns.includes('duration')}
                 <div class="text-left">时长</div>
             {/if}
@@ -362,8 +366,7 @@
 
     <div class="flex flex-col gap-1 mt-2">
         {#each tracks as track, index (track.id)}
-            {@const isCurrent =
-                player.currentTrack?.id === track.id}
+            {@const isCurrent = player.currentTrack?.id === track.id}
             {@const cover = trackCovers.get(track)}
 
             <mdui-list-item
@@ -388,7 +391,7 @@
                     style:grid-template-columns={gridTemplate}
                 >
                     {#if selectable}
-                        <div class="flex justify-center items-center z-10">
+                        <div class="flex justify-center items-center">
                             <mdui-checkbox
                                 checked={selectedIds.includes(track.id)}
                                 onchange={(event: Event) =>
@@ -409,7 +412,6 @@
                         {@render trackAlbum(track)}
                     {/if}
 
-
                     {#if columns.includes('duration')}
                         {@render trackDuration(track, index)}
                     {/if}
@@ -523,5 +525,4 @@
         background-color: rgb(var(--mdui-color-surface-container));
         border-color: rgb(var(--mdui-color-outline-variant));
     }
-
 </style>
diff --git a/src/lib/state/covers.svelte.ts b/src/lib/state/covers.svelte.ts
index 635d815..d5c61f2 100644
--- a/src/lib/state/covers.svelte.ts
+++ b/src/lib/state/covers.svelte.ts
@@ -1,11 +1,8 @@
-
 import { invoke } from '@tauri-apps/api/core'
 import type { Track } from '../types/music'
 
 class TrackCovers {
     covers = $state<Record<string, string | null>>({})
-    loading = $state<Record<string, boolean>>({})
-
     private promises = new Map<string, Promise<string | null>>()
 
     async load(track: Track | null | undefined): Promise<string | null> {
@@ -19,8 +16,6 @@ class TrackCovers {
             return await this.promises.get(track.path)!
         }
 
-        this.loading[track.path] = true
-
         const promise = invoke<string | null>('get_track_cover', {
             fullPath: track.path
         })
@@ -34,7 +29,6 @@ class TrackCovers {
                 return null
             })
             .finally(() => {
-                this.loading[track.path] = false
                 this.promises.delete(track.path)
             })
 
diff --git a/src/lib/state/library.svelte.ts b/src/lib/state/library.svelte.ts
index cc666f1..a0a9211 100644
--- a/src/lib/state/library.svelte.ts
+++ b/src/lib/state/library.svelte.ts
@@ -1,5 +1,5 @@
 import { invoke } from '@tauri-apps/api/core'
-import { listen } from '@tauri-apps/api/event'
+import { listen, type UnlistenFn } from '@tauri-apps/api/event'
 import { SvelteMap } from 'svelte/reactivity'
 import type { Album, Artist, Track } from '../types/music'
 import { settings } from './settings.svelte'
@@ -8,10 +8,15 @@ class MusicLibrary {
     tracks = $state<Track[]>([])
     isLoading = $state(false)
     error = $state<string | null>(null)
-    useAlbumArtistGrouping = $state(false)
     initialized = false
 
-    private refreshPromise: Promise<Track[]> | null = null
+    get useAlbumArtistGrouping() {
+        return settings.data.useAlbumArtistGrouping ?? false
+    }
+
+    #unlisten: UnlistenFn | null = null
+    
+    #refreshPromise: Promise<Track[]> | null = null
     #albumsMap = $derived.by(() => {
         const albumMap = new SvelteMap<string, Album>()
         const useAlbumArtistGrouping = this.useAlbumArtistGrouping
@@ -99,8 +104,7 @@ class MusicLibrary {
     })
 
     constructor() {
-        this.useAlbumArtistGrouping = settings.data.useAlbumArtistGrouping ?? false
-        void this.setupListener()
+        void this.#setupListener()
     }
 
     get albums(): Album[] {
@@ -131,8 +135,10 @@ class MusicLibrary {
         return this.#artistsMap.get(id)
     }
 
-    private async setupListener() {
-        await listen<Track[]>('library:refreshed', event => {
+    async #setupListener() {
+        if (this.#unlisten) return
+        
+        this.#unlisten = await listen<Track[]>('library:refreshed', event => {
             this.tracks = event.payload
         })
     }
@@ -140,8 +146,8 @@ class MusicLibrary {
     async load(options: { force?: boolean } = {}): Promise<Track[]> {
         const { force = false } = options
 
-        if (this.refreshPromise) {
-            return this.refreshPromise
+        if (this.#refreshPromise) {
+            return this.#refreshPromise
         }
 
         if (!force && this.tracks.length > 0) {
@@ -151,7 +157,7 @@ class MusicLibrary {
         this.isLoading = true
         this.error = null
 
-        this.refreshPromise = (async () => {
+        this.#refreshPromise = (async () => {
             try {
                 const tracks = await invoke<Track[]>('load_track_library')
                 this.tracks = tracks
@@ -162,11 +168,11 @@ class MusicLibrary {
                 return this.tracks
             } finally {
                 this.isLoading = false
-                this.refreshPromise = null
+                this.#refreshPromise = null
             }
         })()
 
-        return this.refreshPromise
+        return this.#refreshPromise
     }
 
     async scan(): Promise<Track[]> {
@@ -189,6 +195,13 @@ class MusicLibrary {
             this.isLoading = false
         }
     }
+    
+    destroy() {
+        if (this.#unlisten) {
+            this.#unlisten()
+            this.#unlisten = null
+        }
+    }
 }
 
 export const musicLibrary = new MusicLibrary()
\ No newline at end of file
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 9d34448..d06bf21 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -5,11 +5,12 @@ import type { PlaybackQueue, Track } from "../types/music"
 import { recentlyPlayed } from "./recent.svelte"
 
 class Player {
-    queue = $state<PlaybackQueue>({
+    queue = $state<PlaybackQueue & { version: number }>({
         tracks: [],
         currentIndex: null,
-        playMode: 'list',
-        history: []
+        playMode: 'ListLoop',
+        history: [],
+        version: 0
     })
 
     playing = $state(false)
@@ -19,6 +20,8 @@ class Player {
     #volume = $state<number>(80)
     #previousVolume = 80
     #globalUnlisten: UnlistenFn | null = null
+    #isInitialized = false
+    #eventBuffer: GlobalAppEvent[] = []
 
     constructor() {
         this.#setupMediaSession()
@@ -112,17 +115,13 @@ class Player {
     set muted(value: boolean) {
         if (value) {
             this.#previousVolume = this.#volume
+            this.#muted = value
             invoke('set_volume', { volume: 0 }).catch(console.error)
         } else {
             invoke('set_volume', { volume: this.#previousVolume }).catch(console.error)
         }
     }
 
-
-    #applyBackendQueue(queue: PlaybackQueue) {
-        this.queue = queue
-    }
-
     async replacePlaylistAndPlay(tracks: Track[], targetId: number) {
         await invoke('replace_playlist_and_play', { tracks, targetId })
     }
@@ -144,7 +143,7 @@ class Player {
     }
 
     async cyclePlayMode() {
-        const modes: PlayMode[] = ['list', 'single', 'shuffle']
+        const modes: PlayMode[] = ['ListLoop', 'SingleLoop', 'Shuffle']
         const index = modes.indexOf(this.queue.playMode)
         const mode = modes[(index + 1) % modes.length]
         await invoke('set_play_mode', { mode })
@@ -197,53 +196,81 @@ class Player {
     async loadState() {
         await this.#setupPlaybackListeners()
 
-        const queue = await invoke<PlaybackQueue>('get_playback_queue')
-        this.queue = queue
+        try {
+            const queue = await invoke<PlaybackQueue & { version: number }>('get_playback_queue')
+            if (queue.version >= this.queue.version) {
+                this.queue = queue
+            }
 
-        const status = await invoke<PlaybackStatusSnapshot>('get_current_status')
-        this.playing = status.playing
-        this.currentTime = status.currentTime
-        this.#syncMediaSession()
+            const status = await invoke<PlaybackStatusSnapshot>('get_current_status')
+            this.playing = status.playing
+            this.currentTime = status.currentTime
+            this.#syncMediaSession()
+        } catch (err) {
+            console.error(err)
+        } finally {
+            this.#isInitialized = true
+            this.#flushEventBuffer()
+        }
+    }
+
+    #flushEventBuffer() {
+        while (this.#eventBuffer.length > 0) {
+            const event = this.#eventBuffer.shift()
+            if (event) {
+                this.#handleGlobalEvent(event)
+            }
+        }
     }
 
     async #setupPlaybackListeners() {
         if (this.#globalUnlisten) return
 
         this.#globalUnlisten = await listen<GlobalAppEvent>('global-app-event', event => {
-            const { type, payload } = event.payload
-
-            switch (type) {
-                case 'PlaybackProgress':
-                    this.currentTime = payload.current_time
-                    this.#updatePositionState()
-                    break
-
-                case 'TrackStarted':
-                    this.currentTime = 0
-                    this.playing = true
-                    this.queue = { ...this.queue, currentIndex: payload.index }
-                    this.#syncMediaSession()
-                    recentlyPlayed.add(payload.track)
-                    break
-
-                case 'VolumeChanged':
-                    this.#volume = Math.round(payload * 100)
-                    this.#muted = this.#volume === 0
-                    break
-
-                case 'QueueChanged':
-                    this.queue = payload
-                    break
-
-                case 'PlaybackStateChanged':
-                    this.playing = payload.playing
-                    this.currentTime = payload.currentTime
-                    this.#syncMediaSession()
-                    break
+            if (!this.#isInitialized) {
+                this.#eventBuffer.push(event.payload)
+                return
             }
+            this.#handleGlobalEvent(event.payload)
         })
     }
 
+    #handleGlobalEvent(payload: GlobalAppEvent) {
+        const { type, payload: data } = payload
+
+        switch (type) {
+            case 'PlaybackProgress':
+                this.currentTime = data.currentTime
+                this.#updatePositionState()
+                break
+
+            case 'TrackStarted':
+                this.currentTime = 0
+                this.playing = true
+                this.queue = { ...this.queue, currentIndex: data.index }
+                this.#syncMediaSession()
+                recentlyPlayed.add(data.track)
+                break
+
+            case 'VolumeChanged':
+                this.#volume = Math.round(data * 100)
+                this.#muted = this.#volume === 0
+                break
+
+            case 'QueueChanged':
+                if (data.version >= this.queue.version) {
+                    this.queue = data
+                }
+                break
+
+            case 'PlaybackStateChanged':
+                this.playing = data.playing
+                this.currentTime = data.currentTime
+                this.#syncMediaSession()
+                break
+        }
+    }
+
     destroy() {
         if (this.#globalUnlisten) {
             this.#globalUnlisten()
diff --git a/src/lib/state/recent.svelte.ts b/src/lib/state/recent.svelte.ts
index b22be99..e3ae147 100644
--- a/src/lib/state/recent.svelte.ts
+++ b/src/lib/state/recent.svelte.ts
@@ -44,19 +44,14 @@ class RecentlyPlayed {
     }
 
     async add(track: Track): Promise<Track[]> {
-        const safeTrack: Track = {
-            ...track,
-            cover: null,
-        }
-
         this.tracks = [
-            safeTrack,
-            ...this.tracks.filter(item => item.id !== safeTrack.id),
+            track,
+            ...this.tracks.filter(item => item.id !== track.id),
         ].slice(0, 100)
 
         try {
             await invoke('add_recently_played', {
-                trackId: safeTrack.id,
+                trackId: track.id,
                 playedAt: new Date().toISOString(),
             })
 
diff --git a/src/lib/types/events.ts b/src/lib/types/events.ts
index 8ed496f..fbbd103 100644
--- a/src/lib/types/events.ts
+++ b/src/lib/types/events.ts
@@ -1,10 +1,11 @@
-import type { PlaybackQueue, Track } from "./music"
+import type { PlaybackQueue } from "./music"
+import type { PlaybackProgressPayload, PlaybackStatePayload, PlaybackTrackStartedPayload } from "./playback"
 import type { AppSettings } from "./settings"
 
 export type GlobalAppEvent =
     | { type: 'VolumeChanged'; payload: number }
     | { type: 'SettingsChanged'; payload: AppSettings }
-    | { type: 'TrackStarted'; payload: { track: Track; index: number } }
-    | { type: 'PlaybackProgress'; payload: { current_time: number } }
+    | { type: 'TrackStarted'; payload: PlaybackTrackStartedPayload }
+    | { type: 'PlaybackProgress'; payload: PlaybackProgressPayload }
     | { type: 'QueueChanged'; payload: PlaybackQueue }
-    | { type: 'PlaybackStateChanged'; payload: { playing: boolean; currentTime: number } }
\ No newline at end of file
+    | { type: 'PlaybackStateChanged'; payload: PlaybackStatePayload }
\ No newline at end of file
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index dde6c71..42a3176 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -5,5 +5,5 @@ export type {
     ExtensionNavItem
 } from './extension'
 export type { Album, Artist, Playlist, Track } from './music'
-export type { BackendQueueTrack, PlayMode, PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackInfo, PlaybackTrackStartedPayload } from './playback'
+export type { BackendQueueTrack, PlayMode, PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackInfo } from './playback'
 export type { AppSettings, ThemeMode } from './settings'
diff --git a/src/lib/types/music.ts b/src/lib/types/music.ts
index 4d32fc6..3c29537 100644
--- a/src/lib/types/music.ts
+++ b/src/lib/types/music.ts
@@ -45,4 +45,5 @@ export interface PlaybackQueue {
     currentIndex: number | null
     playMode: PlayMode
     history: number[]
+    version: number
 }
\ No newline at end of file
diff --git a/src/lib/types/playback.ts b/src/lib/types/playback.ts
index 0314a17..77d8f96 100644
--- a/src/lib/types/playback.ts
+++ b/src/lib/types/playback.ts
@@ -1,10 +1,10 @@
 import type { Track } from "./music"
 
-export type PlayMode = 'list' | 'single' | 'shuffle'
+export type PlayMode = 'ListLoop' | 'SingleLoop' | 'Shuffle'
 
 export type PlaybackTrackInfo = {
-    id?: number | null
-    path?: string | null
+    id: number | null
+    path: string | null
 }
 
 export type PlaybackStatusSnapshot = {
@@ -15,17 +15,20 @@ export type PlaybackStatusSnapshot = {
 }
 
 export type PlaybackProgressPayload = {
+    currentTime: number
+}
+
+export type PlaybackStatePayload = {
     playing: boolean
     currentTime: number
-    trackId?: number | null
-    path?: string | null
+    trackId: number | null
+    path: string | null
 }
 
 export type PlaybackTrackStartedPayload = {
     track: Track
     index: number
-    playing: boolean
-    currentTime: number
+    version: number
 }
 
 export type BackendQueueTrack = Omit<Track, 'cover'>
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index cb66f1b..679cf3b 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -15,7 +15,7 @@
 
     let { children } = $props()
 
-onMount(() => {
+    onMount(() => {
         void settings.load()
         void player.loadState()
 
@@ -25,9 +25,12 @@ onMount(() => {
             }
         })
 
-        const globalEventUnlistenPromise = listen<{ type: string; payload: any }>('global-app-event', event => {
+        const globalEventUnlistenPromise = listen<{
+            type: string
+            payload: any
+        }>('global-app-event', event => {
             const { type, payload } = event.payload
-            
+
             if (type === 'SettingsChanged') {
                 settings.updateLocalState(payload)
             }
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index fb14763..5b9a9af 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -54,8 +54,7 @@
             id: album.id,
             title: album.title,
             subtitle: `${album.trackCount} 首歌曲`,
-            image:
-                trackCovers.get(album.representativeTrack) ?? album.cover,
+            image: trackCovers.get(album.representativeTrack) ?? album.cover,
             shape: 'square' as const,
         })),
     )
@@ -89,17 +88,15 @@
     }
 
     async function handleAlbumArtistGroupingChange(event: Event) {
-        const checked = (
-            event.currentTarget as HTMLElement & { checked: boolean }
-        ).checked
+        const checked = (event.currentTarget as HTMLInputElement).checked
 
-        if (checked === musicLibrary.useAlbumArtistGrouping) return
+        if (checked === settings.data.useAlbumArtistGrouping) return
 
-        musicLibrary.useAlbumArtistGrouping = checked
         settings.data.useAlbumArtistGrouping = checked
+        musicLibrary.useAlbumArtistGrouping = checked
         selectedAlbumId = null
 
-        await settings.save()
+        await settings.save($state.snapshot(settings.data))
     }
 </script>
 

From 2a79e69a9aa7b2f2ef760efe36f3c835ad242ddc Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Fri, 5 Jun 2026 21:42:30 +0800
Subject: [PATCH 29/39] bugs fix

---
 src-tauri/src/services/playback_service.rs | 2 +-
 src/lib/state/player.svelte.ts             | 3 ++-
 src/lib/types/playback.ts                  | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index 938f1dd..2cfdb15 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -246,7 +246,7 @@ impl PlaybackService {
                 let _ = Self::emit_progress(&app_handle);
 
                 if should_advance_track() {
-                    let _ = PlaybackService::new(app_handle.clone()).next();
+                    let _ = PlaybackService::new(app_handle.clone()).next().await;
                 }
             }
         });
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index d06bf21..ff2ba4c 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -115,9 +115,10 @@ class Player {
     set muted(value: boolean) {
         if (value) {
             this.#previousVolume = this.#volume
-            this.#muted = value
+            this.#muted = true
             invoke('set_volume', { volume: 0 }).catch(console.error)
         } else {
+            this.#muted = false
             invoke('set_volume', { volume: this.#previousVolume }).catch(console.error)
         }
     }
diff --git a/src/lib/types/playback.ts b/src/lib/types/playback.ts
index 77d8f96..07db865 100644
--- a/src/lib/types/playback.ts
+++ b/src/lib/types/playback.ts
@@ -21,8 +21,6 @@ export type PlaybackProgressPayload = {
 export type PlaybackStatePayload = {
     playing: boolean
     currentTime: number
-    trackId: number | null
-    path: string | null
 }
 
 export type PlaybackTrackStartedPayload = {

From f8b0aa6f65083888975cdc84e0f9f2f6fe44ba4a Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sat, 6 Jun 2026 00:17:02 +0800
Subject: [PATCH 30/39] Add plugin system

Introduce a plugin architecture: add services/plugin module (context, events, loader, manager, manifest, registry, traits) to discover, validate and manage plugins.
---
 src-tauri/src/errors/app_error.rs         |   4 +-
 src-tauri/src/lib.rs                      |   4 +
 src-tauri/src/services/mod.rs             |   1 +
 src-tauri/src/services/plugin/context.rs  |  12 +++
 src-tauri/src/services/plugin/events.rs   |  30 ++++++
 src-tauri/src/services/plugin/loader.rs   |  72 ++++++++++++++
 src-tauri/src/services/plugin/manager.rs  | 110 ++++++++++++++++++++++
 src-tauri/src/services/plugin/manifest.rs |  42 +++++++++
 src-tauri/src/services/plugin/mod.rs      |  14 +++
 src-tauri/src/services/plugin/registry.rs |  60 ++++++++++++
 src-tauri/src/services/plugin/traits.rs   |  11 +++
 src-tauri/src/state/app_state.rs          |   4 +
 12 files changed, 363 insertions(+), 1 deletion(-)
 create mode 100644 src-tauri/src/services/plugin/context.rs
 create mode 100644 src-tauri/src/services/plugin/events.rs
 create mode 100644 src-tauri/src/services/plugin/loader.rs
 create mode 100644 src-tauri/src/services/plugin/manager.rs
 create mode 100644 src-tauri/src/services/plugin/manifest.rs
 create mode 100644 src-tauri/src/services/plugin/mod.rs
 create mode 100644 src-tauri/src/services/plugin/registry.rs
 create mode 100644 src-tauri/src/services/plugin/traits.rs

diff --git a/src-tauri/src/errors/app_error.rs b/src-tauri/src/errors/app_error.rs
index 172fb6f..93562d6 100644
--- a/src-tauri/src/errors/app_error.rs
+++ b/src-tauri/src/errors/app_error.rs
@@ -10,6 +10,7 @@ pub enum AppError {
     Command(String),
     Platform(String),
     Domain(String),
+    Plugin(String),
 }
 
 impl std::fmt::Display for AppError {
@@ -21,7 +22,8 @@ impl std::fmt::Display for AppError {
             | AppError::Service(message)
             | AppError::Command(message)
             | AppError::Platform(message)
-            | AppError::Domain(message) => formatter.write_str(message),
+            | AppError::Domain(message)
+            | AppError::Plugin(message) => formatter.write_str(message),
         }
     }
 }
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 6c0eb46..8aaf4bb 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -52,6 +52,7 @@ use repositories::sqlite::{
     SqliteTrackRepository,
 };
 use services::{PlaylistService, RecentService, SettingsService, TrackService};
+use services::plugin::PluginManager;
 use state::AppState;
 
 use commands::playback_queue::{
@@ -88,11 +89,14 @@ pub fn run() {
             let playlist_service = Arc::new(PlaylistService::new(playlist_repository));
             let recent_service = Arc::new(RecentService::new(recent_repository));
 
+            let plugin_manager = Arc::new(PluginManager::new(app.handle().clone()));
+
             let app_state = AppState::new(
                 track_service,
                 playlist_service,
                 setting_service,
                 recent_service,
+                plugin_manager,
             );
 
             app.manage(app_state);
diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs
index e43d44b..89ac128 100644
--- a/src-tauri/src/services/mod.rs
+++ b/src-tauri/src/services/mod.rs
@@ -1,6 +1,7 @@
 pub mod media_control_service;
 pub mod playback_service;
 pub mod playlist_service;
+pub mod plugin;
 pub mod recent_service;
 pub mod settings_service;
 pub mod track_service;
diff --git a/src-tauri/src/services/plugin/context.rs b/src-tauri/src/services/plugin/context.rs
new file mode 100644
index 0000000..f004e14
--- /dev/null
+++ b/src-tauri/src/services/plugin/context.rs
@@ -0,0 +1,12 @@
+use tauri::AppHandle;
+
+#[derive(Clone)]
+pub struct PluginContext {
+    pub app_handle: AppHandle,
+}
+
+impl PluginContext {
+    pub fn new(app_handle: AppHandle) -> Self {
+        Self { app_handle }
+    }
+}
diff --git a/src-tauri/src/services/plugin/events.rs b/src-tauri/src/services/plugin/events.rs
new file mode 100644
index 0000000..45b1d9e
--- /dev/null
+++ b/src-tauri/src/services/plugin/events.rs
@@ -0,0 +1,30 @@
+use serde::Serialize;
+
+use crate::events::AppEvent;
+use crate::models::Track;
+
+#[derive(Debug, Clone, Serialize)]
+pub enum PluginEvent {
+    Startup,
+    TrackChanged { track: Track, index: usize },
+    PlaybackStateChanged { playing: bool, current_time: f64 },
+    QueueChanged,
+    SettingsChanged,
+}
+
+pub fn bridge_app_event(app_event: &AppEvent) -> Option<PluginEvent> {
+    match app_event {
+        AppEvent::TrackStarted(payload) => Some(PluginEvent::TrackChanged {
+            track: payload.track.clone(),
+            index: payload.index,
+        }),
+        AppEvent::PlaybackStateChanged(payload) => Some(PluginEvent::PlaybackStateChanged {
+            playing: payload.playing,
+            current_time: payload.current_time,
+        }),
+        AppEvent::QueueChanged(_) => Some(PluginEvent::QueueChanged),
+        AppEvent::SettingsChanged(_) => Some(PluginEvent::SettingsChanged),
+        AppEvent::VolumeChanged(_) => None,
+        AppEvent::PlaybackProgress(_) => None,
+    }
+}
diff --git a/src-tauri/src/services/plugin/loader.rs b/src-tauri/src/services/plugin/loader.rs
new file mode 100644
index 0000000..d052ceb
--- /dev/null
+++ b/src-tauri/src/services/plugin/loader.rs
@@ -0,0 +1,72 @@
+use std::path::Path;
+
+use crate::errors::AppError;
+use crate::services::plugin::manifest::PluginManifest;
+
+pub fn scan_manifests(dir: &Path) -> Result<Vec<PluginManifest>, AppError> {
+    let mut manifests = Vec::new();
+
+    if !dir.exists() {
+        return Ok(manifests);
+    }
+
+    let entries = std::fs::read_dir(dir).map_err(|e| {
+        AppError::Io(format!("Failed to read plugins directory '{}': {}", dir.display(), e))
+    })?;
+
+    for entry in entries {
+        let entry = entry.map_err(|e| {
+            AppError::Io(format!("Failed to read directory entry: {}", e))
+        })?;
+
+        let path = entry.path();
+
+        if !path.is_dir() {
+            continue;
+        }
+
+        let manifest_path = path.join("plugin.json");
+
+        if !manifest_path.exists() {
+            continue;
+        }
+
+        let content = std::fs::read_to_string(&manifest_path).map_err(|e| {
+            AppError::Io(format!(
+                "Failed to read manifest '{}': {}",
+                manifest_path.display(),
+                e
+            ))
+        })?;
+
+        let manifest: PluginManifest = serde_json::from_str(&content).map_err(|e| {
+            AppError::Service(format!(
+                "Failed to parse manifest '{}': {}",
+                manifest_path.display(),
+                e
+            ))
+        })?;
+
+        validate_manifest(&manifest)?;
+
+        manifests.push(manifest);
+    }
+
+    Ok(manifests)
+}
+
+fn validate_manifest(manifest: &PluginManifest) -> Result<(), AppError> {
+    if manifest.id.is_empty() {
+        return Err(AppError::Plugin("Manifest 'id' cannot be empty".into()));
+    }
+    if manifest.name.is_empty() {
+        return Err(AppError::Plugin("Manifest 'name' cannot be empty".into()));
+    }
+    if manifest.version.is_empty() {
+        return Err(AppError::Plugin("Manifest 'version' cannot be empty".into()));
+    }
+    if manifest.entry.is_empty() {
+        return Err(AppError::Plugin("Manifest 'entry' cannot be empty".into()));
+    }
+    Ok(())
+}
diff --git a/src-tauri/src/services/plugin/manager.rs b/src-tauri/src/services/plugin/manager.rs
new file mode 100644
index 0000000..3f3ae7d
--- /dev/null
+++ b/src-tauri/src/services/plugin/manager.rs
@@ -0,0 +1,110 @@
+use std::path::Path;
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::events::AppEvent;
+use crate::services::plugin::context::PluginContext;
+use crate::services::plugin::events::{PluginEvent, bridge_app_event};
+use crate::services::plugin::loader;
+use crate::services::plugin::manifest::ActivationEvent;
+use crate::services::plugin::registry::PluginRegistry;
+use crate::services::plugin::traits::Plugin;
+use tauri::AppHandle;
+
+pub struct PluginManager {
+    registry: Arc<PluginRegistry>,
+    context: PluginContext,
+}
+
+impl PluginManager {
+    pub fn new(app_handle: AppHandle) -> Self {
+        Self {
+            registry: Arc::new(PluginRegistry::new()),
+            context: PluginContext::new(app_handle),
+        }
+    }
+
+    pub fn registry(&self) -> &Arc<PluginRegistry> {
+        &self.registry
+    }
+
+    pub fn load_plugins(&self, dir: &Path) -> Result<Vec<String>, AppError> {
+        let manifests = loader::scan_manifests(dir)?;
+        let mut loaded_ids = Vec::new();
+
+        for manifest in manifests {
+            loaded_ids.push(manifest.id.clone());
+            eprintln!(
+                "[Plugin] Discovered: {} v{} ({})",
+                manifest.display_name, manifest.version, manifest.id
+            );
+        }
+
+        Ok(loaded_ids)
+    }
+
+    pub fn enable_plugin(&self, plugin: Arc<dyn Plugin>) -> Result<(), AppError> {
+        let id = plugin.manifest().id.clone();
+        plugin.activate(&self.context)?;
+        self.registry.register(plugin).map_err(AppError::from)?;
+        eprintln!("[Plugin] Activated: {}", id);
+        Ok(())
+    }
+
+    pub fn disable_plugin(&self, id: &str) -> Result<(), AppError> {
+        let plugin = self
+            .registry
+            .get(id)
+            .ok_or_else(|| AppError::Plugin(format!("Plugin '{}' not found", id)))?;
+
+        plugin.deactivate()?;
+        self.registry.unregister(id);
+        eprintln!("[Plugin] Deactivated: {}", id);
+        Ok(())
+    }
+
+    pub fn reload_plugin(&self, plugin: Arc<dyn Plugin>) -> Result<(), AppError> {
+        let id = plugin.manifest().id.clone();
+
+        if self.registry.contains(&id) {
+            self.disable_plugin(&id)?;
+        }
+
+        self.enable_plugin(plugin)
+    }
+
+    pub fn get_plugin(&self, id: &str) -> Option<Arc<dyn Plugin>> {
+        self.registry.get(id)
+    }
+
+    pub fn get_active_plugins(&self) -> Vec<Arc<dyn Plugin>> {
+        self.registry.list()
+    }
+
+    pub fn dispatch_event(&self, app_event: &AppEvent) {
+        let plugin_event = match bridge_app_event(app_event) {
+            Some(event) => event,
+            None => return,
+        };
+
+        let required_activation = match &plugin_event {
+            PluginEvent::Startup => ActivationEvent::OnStartup,
+            PluginEvent::TrackChanged { .. } => ActivationEvent::OnTrackChanged,
+            PluginEvent::PlaybackStateChanged { .. } => ActivationEvent::OnPlaybackStateChanged,
+            PluginEvent::QueueChanged => ActivationEvent::OnQueueChanged,
+            PluginEvent::SettingsChanged => ActivationEvent::OnSettingsChanged,
+        };
+
+        for plugin in self.registry.list() {
+            let manifest = plugin.manifest();
+
+            if manifest.activation_events.contains(&required_activation) {
+                let id = &manifest.id;
+                if let Err(e) = plugin.activate(&self.context) {
+                    eprintln!("[Plugin] Error dispatching event to '{}': {}", id, e);
+                }
+
+            }
+        }
+    }
+}
diff --git a/src-tauri/src/services/plugin/manifest.rs b/src-tauri/src/services/plugin/manifest.rs
new file mode 100644
index 0000000..2f28ceb
--- /dev/null
+++ b/src-tauri/src/services/plugin/manifest.rs
@@ -0,0 +1,42 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub enum PluginPermission {
+    PlayerRead,
+    PlayerControl,
+    QueueRead,
+    QueueWrite,
+    LibraryRead,
+    SettingsRead,
+    SettingsWrite,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub enum ActivationEvent {
+    OnStartup,
+    OnTrackChanged,
+    OnPlaybackStateChanged,
+    OnQueueChanged,
+    OnSettingsChanged,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct PluginContribution {}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PluginManifest {
+    pub id: String,
+    pub name: String,
+    pub display_name: String,
+    pub version: String,
+    pub author: String,
+    pub description: String,
+    pub entry: String,
+    pub min_app_version: String,
+    pub permissions: Vec<PluginPermission>,
+    pub activation_events: Vec<ActivationEvent>,
+    pub contributes: PluginContribution,
+}
diff --git a/src-tauri/src/services/plugin/mod.rs b/src-tauri/src/services/plugin/mod.rs
new file mode 100644
index 0000000..ff41210
--- /dev/null
+++ b/src-tauri/src/services/plugin/mod.rs
@@ -0,0 +1,14 @@
+pub mod manifest;
+pub mod traits;
+pub mod context;
+pub mod registry;
+pub mod loader;
+pub mod events;
+pub mod manager;
+
+pub use context::PluginContext;
+pub use events::PluginEvent;
+pub use manifest::{ActivationEvent, PluginContribution, PluginManifest, PluginPermission};
+pub use manager::PluginManager;
+pub use registry::PluginRegistry;
+pub use traits::Plugin;
diff --git a/src-tauri/src/services/plugin/registry.rs b/src-tauri/src/services/plugin/registry.rs
new file mode 100644
index 0000000..5852994
--- /dev/null
+++ b/src-tauri/src/services/plugin/registry.rs
@@ -0,0 +1,60 @@
+use std::collections::HashMap;
+use std::sync::{Arc, RwLock};
+
+use crate::services::plugin::traits::Plugin;
+
+pub struct PluginRegistry {
+    plugins: RwLock<HashMap<String, Arc<dyn Plugin>>>,
+}
+
+impl PluginRegistry {
+    pub fn new() -> Self {
+        Self {
+            plugins: RwLock::new(HashMap::new()),
+        }
+    }
+
+    pub fn register(&self, plugin: Arc<dyn Plugin>) -> Result<(), String> {
+        let id = plugin.manifest().id.clone();
+        let mut plugins = self.plugins.write().map_err(|e| e.to_string())?;
+        if plugins.contains_key(&id) {
+            return Err(format!("Plugin '{}' is already registered", id));
+        }
+        plugins.insert(id, plugin);
+        Ok(())
+    }
+
+    pub fn unregister(&self, id: &str) -> Option<Arc<dyn Plugin>> {
+        let mut plugins = self.plugins.write().ok()?;
+        plugins.remove(id)
+    }
+
+    pub fn get(&self, id: &str) -> Option<Arc<dyn Plugin>> {
+        let plugins = self.plugins.read().ok()?;
+        plugins.get(id).cloned()
+    }
+
+    pub fn contains(&self, id: &str) -> bool {
+        let plugins = match self.plugins.read() {
+            Ok(guard) => guard,
+            Err(_) => return false,
+        };
+        plugins.contains_key(id)
+    }
+
+    pub fn list(&self) -> Vec<Arc<dyn Plugin>> {
+        let plugins = match self.plugins.read() {
+            Ok(guard) => guard,
+            Err(_) => return Vec::new(),
+        };
+        plugins.values().cloned().collect()
+    }
+
+    pub fn count(&self) -> usize {
+        let plugins = match self.plugins.read() {
+            Ok(guard) => guard,
+            Err(_) => return 0,
+        };
+        plugins.len()
+    }
+}
diff --git a/src-tauri/src/services/plugin/traits.rs b/src-tauri/src/services/plugin/traits.rs
new file mode 100644
index 0000000..4a1bc1f
--- /dev/null
+++ b/src-tauri/src/services/plugin/traits.rs
@@ -0,0 +1,11 @@
+use crate::errors::AppError;
+use crate::services::plugin::context::PluginContext;
+use crate::services::plugin::manifest::PluginManifest;
+
+pub trait Plugin: Send + Sync {
+    fn manifest(&self) -> &PluginManifest;
+
+    fn activate(&self, ctx: &PluginContext) -> Result<(), AppError>;
+
+    fn deactivate(&self) -> Result<(), AppError>;
+}
diff --git a/src-tauri/src/state/app_state.rs b/src-tauri/src/state/app_state.rs
index 6b48411..341b7cd 100644
--- a/src-tauri/src/state/app_state.rs
+++ b/src-tauri/src/state/app_state.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use crate::services::plugin::PluginManager;
 use crate::services::{PlaylistService, RecentService, SettingsService, TrackService};
 
 #[derive(Clone)]
@@ -8,6 +9,7 @@ pub struct AppState {
     pub playlists: Arc<PlaylistService>,
     pub settings: Arc<SettingsService>,
     pub recent: Arc<RecentService>,
+    pub plugins: Arc<PluginManager>,
 }
 
 impl AppState {
@@ -16,12 +18,14 @@ impl AppState {
         playlists: Arc<PlaylistService>,
         settings: Arc<SettingsService>,
         recent: Arc<RecentService>,
+        plugins: Arc<PluginManager>,
     ) -> Self {
         Self {
             tracks,
             playlists,
             settings,
             recent,
+            plugins,
         }
     }
 }

From a343b6f25bf5ac168b314ff6f63d79b7118b1296 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Sun, 7 Jun 2026 14:06:41 +0800
Subject: [PATCH 31/39] Complete plugin system and a lyrics plugin

---
 src-tauri/Cargo.lock                          |   1 -
 src-tauri/Cargo.toml                          |   1 -
 src-tauri/src/commands/mod.rs                 |   3 +-
 src-tauri/src/commands/plugin_extensions.rs   |  66 ++
 src-tauri/src/errors/app_error.rs             |  18 +-
 src-tauri/src/events/bus.rs                   |   9 +-
 src-tauri/src/events/payloads.rs              |  16 +
 src-tauri/src/lib.rs                          |  49 +-
 src-tauri/src/plugins/lyrics/cache.rs         |  54 ++
 src-tauri/src/plugins/lyrics/manifest.rs      |  74 ++
 src-tauri/src/plugins/lyrics/mod.rs           |   7 +
 src-tauri/src/plugins/lyrics/models.rs        |  33 +
 src-tauri/src/plugins/lyrics/plugin.rs        | 247 +++++++
 src-tauri/src/plugins/lyrics/service.rs       |  94 +++
 src-tauri/src/plugins/mod.rs                  |   1 +
 src-tauri/src/services/playback_service.rs    |  19 +-
 .../plugin/adapters/library_adapter.rs        |  46 ++
 src-tauri/src/services/plugin/adapters/mod.rs |  11 +
 .../plugin/adapters/player_adapter.rs         |  64 ++
 .../adapters/plugin_settings_adapter.rs       |  27 +
 .../services/plugin/adapters/queue_adapter.rs |  48 ++
 .../plugin/adapters/settings_adapter.rs       |  51 ++
 src-tauri/src/services/plugin/api/library.rs  |   8 +
 src-tauri/src/services/plugin/api/mod.rs      |  11 +
 src-tauri/src/services/plugin/api/player.rs   |   9 +
 .../services/plugin/api/plugin_settings.rs    |   7 +
 src-tauri/src/services/plugin/api/queue.rs    |   7 +
 src-tauri/src/services/plugin/api/settings.rs |   6 +
 .../services/plugin/capability/capability.rs  |   8 +
 .../src/services/plugin/capability/mod.rs     |   7 +
 .../plugin/capability/permission_checker.rs   |  30 +
 .../plugin/capability/plugin_capability.rs    |  40 ++
 src-tauri/src/services/plugin/context.rs      |  45 +-
 .../services/plugin/contributes/command.rs    |   8 +
 .../src/services/plugin/contributes/menu.rs   |  15 +
 .../src/services/plugin/contributes/mod.rs    |   7 +
 .../services/plugin/contributes/sidebar.rs    |   9 +
 src-tauri/src/services/plugin/events.rs       |  21 +-
 .../plugin/extension/command_extension.rs     |  13 +
 .../plugin/extension/menu_extension.rs        |  15 +
 .../src/services/plugin/extension/mod.rs      |  11 +
 .../src/services/plugin/extension/registry.rs |  93 +++
 .../plugin/extension/sidebar_extension.rs     |  14 +
 .../src/services/plugin/extension/state.rs    |   7 +
 src-tauri/src/services/plugin/loader.rs       | 112 ++--
 src-tauri/src/services/plugin/manager.rs      | 633 ++++++++++++++++--
 src-tauri/src/services/plugin/manifest.rs     |  30 +-
 src-tauri/src/services/plugin/mod.rs          |  34 +-
 src-tauri/src/services/plugin/model/errors.rs |  16 +
 src-tauri/src/services/plugin/model/mod.rs    |   5 +
 .../services/plugin/model/plugin_identity.rs  |  51 ++
 src-tauri/src/services/plugin/permissions.rs  |  14 +
 .../plugin/registry/command_registry.rs       |  42 ++
 src-tauri/src/services/plugin/registry/mod.rs |   5 +
 .../plugin/registry/plugin_registry.rs        |  55 ++
 .../plugin/runtime/context_factory.rs         |  78 +++
 src-tauri/src/services/plugin/runtime/mod.rs  |   7 +
 .../plugin/runtime/runtime_instance.rs        |  24 +
 .../src/services/plugin/runtime/state.rs      |  13 +
 src-tauri/src/services/plugin/settings/mod.rs |   7 +
 .../services/plugin/settings/persistence.rs   |  96 +++
 .../plugin/settings/plugin_settings.rs        |  35 +
 .../plugin/settings/settings_registry.rs      | 110 +++
 src-tauri/src/services/plugin/traits.rs       |  40 ++
 src/lib/features/LyricsPanel.svelte           |  83 +++
 src/lib/features/PlayerBar.svelte             |  16 +
 src/lib/features/QueueDrawer.svelte           |   1 +
 src/lib/features/shell/NavRail.svelte         |   6 +
 src/lib/state/lyrics.svelte.ts                |  39 ++
 src/lib/state/player.svelte.ts                |   5 +
 src/lib/state/plugins.svelte.ts               |  83 +++
 src/lib/state/settings.svelte.ts              |   4 +
 src/lib/types/events.ts                       |   4 +-
 src/lib/types/index.ts                        |  10 +-
 src/lib/types/lyrics.ts                       |   9 +
 src/lib/types/plugin.ts                       |  40 ++
 src/lib/types/settings.ts                     |   6 +
 src/routes/+layout.svelte                     |   7 +
 src/routes/plugins/+page.svelte               |  86 +++
 src/routes/plugins/detail/+page.svelte        | 158 +++++
 src/routes/settings/+page.svelte              | 119 +++-
 81 files changed, 3259 insertions(+), 154 deletions(-)
 create mode 100644 src-tauri/src/commands/plugin_extensions.rs
 create mode 100644 src-tauri/src/plugins/lyrics/cache.rs
 create mode 100644 src-tauri/src/plugins/lyrics/manifest.rs
 create mode 100644 src-tauri/src/plugins/lyrics/mod.rs
 create mode 100644 src-tauri/src/plugins/lyrics/models.rs
 create mode 100644 src-tauri/src/plugins/lyrics/plugin.rs
 create mode 100644 src-tauri/src/plugins/lyrics/service.rs
 create mode 100644 src-tauri/src/plugins/mod.rs
 create mode 100644 src-tauri/src/services/plugin/adapters/library_adapter.rs
 create mode 100644 src-tauri/src/services/plugin/adapters/mod.rs
 create mode 100644 src-tauri/src/services/plugin/adapters/player_adapter.rs
 create mode 100644 src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
 create mode 100644 src-tauri/src/services/plugin/adapters/queue_adapter.rs
 create mode 100644 src-tauri/src/services/plugin/adapters/settings_adapter.rs
 create mode 100644 src-tauri/src/services/plugin/api/library.rs
 create mode 100644 src-tauri/src/services/plugin/api/mod.rs
 create mode 100644 src-tauri/src/services/plugin/api/player.rs
 create mode 100644 src-tauri/src/services/plugin/api/plugin_settings.rs
 create mode 100644 src-tauri/src/services/plugin/api/queue.rs
 create mode 100644 src-tauri/src/services/plugin/api/settings.rs
 create mode 100644 src-tauri/src/services/plugin/capability/capability.rs
 create mode 100644 src-tauri/src/services/plugin/capability/mod.rs
 create mode 100644 src-tauri/src/services/plugin/capability/permission_checker.rs
 create mode 100644 src-tauri/src/services/plugin/capability/plugin_capability.rs
 create mode 100644 src-tauri/src/services/plugin/contributes/command.rs
 create mode 100644 src-tauri/src/services/plugin/contributes/menu.rs
 create mode 100644 src-tauri/src/services/plugin/contributes/mod.rs
 create mode 100644 src-tauri/src/services/plugin/contributes/sidebar.rs
 create mode 100644 src-tauri/src/services/plugin/extension/command_extension.rs
 create mode 100644 src-tauri/src/services/plugin/extension/menu_extension.rs
 create mode 100644 src-tauri/src/services/plugin/extension/mod.rs
 create mode 100644 src-tauri/src/services/plugin/extension/registry.rs
 create mode 100644 src-tauri/src/services/plugin/extension/sidebar_extension.rs
 create mode 100644 src-tauri/src/services/plugin/extension/state.rs
 create mode 100644 src-tauri/src/services/plugin/model/errors.rs
 create mode 100644 src-tauri/src/services/plugin/model/mod.rs
 create mode 100644 src-tauri/src/services/plugin/model/plugin_identity.rs
 create mode 100644 src-tauri/src/services/plugin/permissions.rs
 create mode 100644 src-tauri/src/services/plugin/registry/command_registry.rs
 create mode 100644 src-tauri/src/services/plugin/registry/mod.rs
 create mode 100644 src-tauri/src/services/plugin/registry/plugin_registry.rs
 create mode 100644 src-tauri/src/services/plugin/runtime/context_factory.rs
 create mode 100644 src-tauri/src/services/plugin/runtime/mod.rs
 create mode 100644 src-tauri/src/services/plugin/runtime/runtime_instance.rs
 create mode 100644 src-tauri/src/services/plugin/runtime/state.rs
 create mode 100644 src-tauri/src/services/plugin/settings/mod.rs
 create mode 100644 src-tauri/src/services/plugin/settings/persistence.rs
 create mode 100644 src-tauri/src/services/plugin/settings/plugin_settings.rs
 create mode 100644 src-tauri/src/services/plugin/settings/settings_registry.rs
 create mode 100644 src/lib/features/LyricsPanel.svelte
 create mode 100644 src/lib/state/lyrics.svelte.ts
 create mode 100644 src/lib/state/plugins.svelte.ts
 create mode 100644 src/lib/types/lyrics.ts
 create mode 100644 src/lib/types/plugin.ts
 create mode 100644 src/routes/plugins/+page.svelte
 create mode 100644 src/routes/plugins/detail/+page.svelte

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 41aea51..385f32b 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4859,7 +4859,6 @@ dependencies = [
 name = "tauri-app"
 version = "0.1.0"
 dependencies = [
- "async-trait",
  "base64 0.22.1",
  "lofty",
  "rand",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 1450a21..fb617ef 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -31,7 +31,6 @@ tauri-plugin-store = "2"
 trash = "5.2.6"
 souvlaki = "0.8.3"
 sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "macros", "migrate"] }
-async-trait = "0.1"
 rand = "0.10.1"
 tokio = { version = "1.52.3", features = ["fs"] }
 
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 6fde0aa..4efdf9d 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -1,8 +1,9 @@
 pub mod library;
 pub mod menu;
 pub mod playback;
+pub mod playback_queue;
 pub mod playlists;
+pub mod plugin_extensions;
 pub mod recent;
 pub mod settings;
 pub mod tracks;
-pub mod playback_queue;
\ No newline at end of file
diff --git a/src-tauri/src/commands/plugin_extensions.rs b/src-tauri/src/commands/plugin_extensions.rs
new file mode 100644
index 0000000..92493ec
--- /dev/null
+++ b/src-tauri/src/commands/plugin_extensions.rs
@@ -0,0 +1,66 @@
+use std::sync::Arc;
+
+use tauri::{command, State};
+
+use crate::errors::AppError;
+use crate::services::plugin::contributes::menu::MenuLocation;
+use crate::services::plugin::extension::menu_extension::MenuExtension;
+use crate::services::plugin::extension::sidebar_extension::SidebarExtension;
+use crate::services::plugin::manager::PluginManager;
+use crate::services::plugin::settings::plugin_settings::{PluginSettingMeta, SettingValue};
+
+#[command]
+pub async fn get_menu_extensions(
+    location: MenuLocation,
+    manager: State<'_, Arc<PluginManager>>,
+) -> Result<Vec<MenuExtension>, AppError> {
+    Ok(manager.menu_extensions(location))
+}
+
+#[command]
+pub async fn get_sidebar_extensions(
+    manager: State<'_, Arc<PluginManager>>,
+) -> Result<Vec<SidebarExtension>, AppError> {
+    Ok(manager.sidebar_extensions())
+}
+
+#[command]
+pub async fn get_all_sidebar_extensions(
+    manager: State<'_, Arc<PluginManager>>,
+) -> Result<Vec<SidebarExtension>, AppError> {
+    Ok(manager.all_sidebar_extensions())
+}
+
+#[command]
+pub async fn get_plugin_settings(
+    plugin_id: String,
+    manager: State<'_, Arc<PluginManager>>,
+) -> Result<Vec<PluginSettingMeta>, AppError> {
+    Ok(manager.get_plugin_settings(&plugin_id))
+}
+
+#[command]
+pub async fn update_plugin_setting(
+    plugin_id: String,
+    key: String,
+    value: SettingValue,
+    manager: State<'_, Arc<PluginManager>>,
+) -> Result<(), AppError> {
+    manager.update_plugin_setting(&plugin_id, &key, value)
+}
+
+#[command]
+pub async fn enable_plugin_command(
+    plugin_id: String,
+    manager: State<'_, Arc<PluginManager>>,
+) -> Result<(), AppError> {
+    manager.enable_plugin(&plugin_id)
+}
+
+#[command]
+pub async fn disable_plugin_command(
+    plugin_id: String,
+    manager: State<'_, Arc<PluginManager>>,
+) -> Result<(), AppError> {
+    manager.disable_plugin(&plugin_id)
+}
diff --git a/src-tauri/src/errors/app_error.rs b/src-tauri/src/errors/app_error.rs
index 93562d6..f0a9915 100644
--- a/src-tauri/src/errors/app_error.rs
+++ b/src-tauri/src/errors/app_error.rs
@@ -1,5 +1,7 @@
 use serde::Serialize;
 
+use crate::services::plugin::permissions::PluginPermission;
+
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase", tag = "kind", content = "message")]
 pub enum AppError {
@@ -11,6 +13,10 @@ pub enum AppError {
     Platform(String),
     Domain(String),
     Plugin(String),
+    PluginPermissionDenied {
+        plugin_id: String,
+        permission: PluginPermission,
+    },
 }
 
 impl std::fmt::Display for AppError {
@@ -24,6 +30,16 @@ impl std::fmt::Display for AppError {
             | AppError::Platform(message)
             | AppError::Domain(message)
             | AppError::Plugin(message) => formatter.write_str(message),
+            AppError::PluginPermissionDenied {
+                plugin_id,
+                permission,
+            } => {
+                write!(
+                    formatter,
+                    "Plugin '{}' denied permission {:?}",
+                    plugin_id, permission
+                )
+            }
         }
     }
 }
@@ -64,4 +80,4 @@ impl From<tauri::Error> for AppError {
     fn from(error: tauri::Error) -> Self {
         AppError::Platform(error.to_string())
     }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/events/bus.rs b/src-tauri/src/events/bus.rs
index 4036c25..f31055d 100644
--- a/src-tauri/src/events/bus.rs
+++ b/src-tauri/src/events/bus.rs
@@ -5,7 +5,7 @@ use tauri::{
 
 use crate::{
     errors::AppError,
-    events::payloads::AppEvent,
+    events::payloads::{AppEvent, LyricsLoadedPayload},
 };
 
 pub struct EventBus;
@@ -20,4 +20,11 @@ impl EventBus {
         app_handle.emit(Self::CHANNEL, event)?;
         Ok(())
     }
+
+    pub fn emit_lyrics_loaded(
+        app_handle: &AppHandle,
+        payload: LyricsLoadedPayload,
+    ) -> Result<(), AppError> {
+        Self::emit(app_handle, AppEvent::LyricsLoaded(payload))
+    }
 }
\ No newline at end of file
diff --git a/src-tauri/src/events/payloads.rs b/src-tauri/src/events/payloads.rs
index 886fba3..e56ef31 100644
--- a/src-tauri/src/events/payloads.rs
+++ b/src-tauri/src/events/payloads.rs
@@ -26,6 +26,20 @@ pub struct TrackStartedPayload {
     pub index: usize,
 }
 
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LyricLinePayload {
+    pub timestamp_ms: u64,
+    pub text: String,
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LyricsLoadedPayload {
+    pub song_id: i64,
+    pub lines: Vec<LyricLinePayload>,
+}
+
 #[derive(Clone, Serialize)]
 #[serde(tag = "type", content = "payload")]
 pub enum AppEvent {
@@ -40,4 +54,6 @@ pub enum AppEvent {
     PlaybackProgress(PlaybackProgressPayload),
 
     TrackStarted(TrackStartedPayload),
+
+    LyricsLoaded(LyricsLoadedPayload),
 }
\ No newline at end of file
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 8aaf4bb..892dec2 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -5,6 +5,7 @@ mod errors;
 mod media_controls;
 mod metadata;
 mod models;
+mod plugins;
 mod repositories;
 mod services;
 mod state;
@@ -53,6 +54,11 @@ use repositories::sqlite::{
 };
 use services::{PlaylistService, RecentService, SettingsService, TrackService};
 use services::plugin::PluginManager;
+use services::plugin::capability::CapabilityRegistry;
+use services::plugin::capability::permission_checker::PermissionChecker;
+use services::plugin::runtime::context_factory::PluginContextFactory;
+use services::plugin::settings::persistence::JsonPluginStorage;
+use services::plugin::settings::settings_registry::SettingsRegistry;
 use state::AppState;
 
 use commands::playback_queue::{
@@ -60,6 +66,11 @@ use commands::playback_queue::{
     set_play_mode,
 };
 
+use commands::plugin_extensions::{
+    get_menu_extensions, get_sidebar_extensions, get_all_sidebar_extensions, get_plugin_settings,
+    update_plugin_setting, enable_plugin_command, disable_plugin_command,
+};
+
 use audio::init_audio_state;
 
 use crate::errors::AppError;
@@ -89,17 +100,44 @@ pub fn run() {
             let playlist_service = Arc::new(PlaylistService::new(playlist_repository));
             let recent_service = Arc::new(RecentService::new(recent_repository));
 
-            let plugin_manager = Arc::new(PluginManager::new(app.handle().clone()));
+            let capability_registry = Arc::new(CapabilityRegistry::new());
+            let permission_checker = Arc::new(PermissionChecker::new(Arc::clone(&capability_registry)));
+            let settings_registry = Arc::new(SettingsRegistry::new());
+
+            let app_data_dir = app_handle
+                .path()
+                .app_data_dir()
+                .unwrap_or_else(|_| std::path::PathBuf::from("."));
+            let storage = Arc::new(JsonPluginStorage::new(app_data_dir));
+
+            let context_factory = PluginContextFactory::new(
+                app_handle.clone(),
+                permission_checker,
+                Arc::new(PlaybackService::new(app.handle().clone())),
+                track_service.clone(),
+                setting_service.clone(),
+                Arc::clone(&settings_registry),
+            );
+
+            let plugin_manager = Arc::new(PluginManager::new(
+                context_factory,
+                capability_registry,
+                settings_registry,
+                storage,
+            ));
+            plugin_manager.load_persisted_state();
+            plugin_manager.load_builtin_plugins();
 
             let app_state = AppState::new(
                 track_service,
                 playlist_service,
                 setting_service,
                 recent_service,
-                plugin_manager,
+                plugin_manager.clone(),
             );
 
             app.manage(app_state);
+            app.manage(plugin_manager);
 
             init_audio_state(models::PlaybackQueue::default());
 
@@ -266,6 +304,13 @@ pub fn run() {
             insert_tracks_as_next,
             set_play_mode,
             clear_queue,
+            get_menu_extensions,
+            get_sidebar_extensions,
+            get_all_sidebar_extensions,
+            get_plugin_settings,
+            update_plugin_setting,
+            enable_plugin_command,
+            disable_plugin_command,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/plugins/lyrics/cache.rs b/src-tauri/src/plugins/lyrics/cache.rs
new file mode 100644
index 0000000..31244cc
--- /dev/null
+++ b/src-tauri/src/plugins/lyrics/cache.rs
@@ -0,0 +1,54 @@
+use std::path::PathBuf;
+
+use super::models::LyricDocument;
+
+pub struct LyricsCacheService {
+    cache_dir: PathBuf,
+}
+
+impl LyricsCacheService {
+    pub fn new(cache_dir: PathBuf) -> Self {
+        Self { cache_dir }
+    }
+
+    pub fn init(&self) -> Result<(), String> {
+        std::fs::create_dir_all(&self.cache_dir)
+            .map_err(|e| format!("Failed to create lyrics cache dir: {}", e))
+    }
+
+    fn cache_path(&self, song_id: i64) -> PathBuf {
+        self.cache_dir.join(format!("{}.json", song_id))
+    }
+
+    pub fn save(&self, song_id: i64, document: &LyricDocument) -> Result<(), String> {
+        let content = serde_json::to_string_pretty(document)
+            .map_err(|e| format!("Failed to serialize lyrics: {}", e))?;
+        std::fs::write(self.cache_path(song_id), content)
+            .map_err(|e| format!("Failed to write lyrics cache: {}", e))
+    }
+
+    pub fn load(&self, song_id: i64) -> Option<LyricDocument> {
+        let path = self.cache_path(song_id);
+        if !path.exists() {
+            return None;
+        }
+        let content = std::fs::read_to_string(path).ok()?;
+        serde_json::from_str(&content).ok()
+    }
+
+    pub fn exists(&self, song_id: i64) -> bool {
+        self.cache_path(song_id).exists()
+    }
+
+    pub fn clear(&self) -> Result<(), String> {
+        if !self.cache_dir.exists() {
+            return Ok(());
+        }
+        let entries = std::fs::read_dir(&self.cache_dir)
+            .map_err(|e| format!("Failed to read cache dir: {}", e))?;
+        for entry in entries.flatten() {
+            let _ = std::fs::remove_file(entry.path());
+        }
+        Ok(())
+    }
+}
diff --git a/src-tauri/src/plugins/lyrics/manifest.rs b/src-tauri/src/plugins/lyrics/manifest.rs
new file mode 100644
index 0000000..a852297
--- /dev/null
+++ b/src-tauri/src/plugins/lyrics/manifest.rs
@@ -0,0 +1,74 @@
+use crate::services::plugin::contributes::command::CommandContribution;
+use crate::services::plugin::contributes::sidebar::SidebarContribution;
+use crate::services::plugin::manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
+use crate::services::plugin::permissions::PluginPermission;
+use crate::services::plugin::settings::plugin_settings::SettingValue;
+
+pub fn build_lyrics_manifest() -> PluginManifest {
+    PluginManifest {
+        id: "builtin/lyrics".into(),
+        name: "lyrics".into(),
+        display_name: "Lyrics".into(),
+        version: "1.0.0".into(),
+        author: "RustEchoMusic".into(),
+        description: "Lyrics search, load, cache and sync display".into(),
+        entry: "lyrics".into(),
+        min_app_version: "0.1.0".into(),
+        permissions: vec![PluginPermission::PlayerRead, PluginPermission::LibraryRead],
+        activation_events: vec![
+            ActivationEvent::OnStartup,
+            ActivationEvent::OnTrackChanged,
+            ActivationEvent::OnCommand("lyrics.search".into()),
+            ActivationEvent::OnCommand("lyrics.load".into()),
+            ActivationEvent::OnCommand("lyrics.clear_cache".into()),
+        ],
+        contributes: PluginContribution {
+            commands: vec![
+                CommandContribution {
+                    id: "lyrics.search".into(),
+                    title: "搜索歌词".into(),
+                    category: None,
+                },
+                CommandContribution {
+                    id: "lyrics.load".into(),
+                    title: "加载歌词".into(),
+                    category: None,
+                },
+                CommandContribution {
+                    id: "lyrics.clear_cache".into(),
+                    title: "清除歌词缓存".into(),
+                    category: None,
+                },
+            ],
+            menus: vec![],
+            sidebars: vec![SidebarContribution {
+                id: "lyrics".into(),
+                title: "歌词".into(),
+                icon: "lyrics".into(),
+                route: "/lyrics".into(),
+            }],
+        },
+        settings: vec![
+            SettingDefinition {
+                key: "provider".into(),
+                title: "歌词来源".into(),
+                default_value: SettingValue::Text("local".into()),
+            },
+            SettingDefinition {
+                key: "auto_search".into(),
+                title: "自动搜索歌词".into(),
+                default_value: SettingValue::Bool(true),
+            },
+            SettingDefinition {
+                key: "auto_scroll".into(),
+                title: "自动滚动".into(),
+                default_value: SettingValue::Bool(true),
+            },
+            SettingDefinition {
+                key: "cache_enabled".into(),
+                title: "启用缓存".into(),
+                default_value: SettingValue::Bool(true),
+            },
+        ],
+    }
+}
diff --git a/src-tauri/src/plugins/lyrics/mod.rs b/src-tauri/src/plugins/lyrics/mod.rs
new file mode 100644
index 0000000..4bcd5c1
--- /dev/null
+++ b/src-tauri/src/plugins/lyrics/mod.rs
@@ -0,0 +1,7 @@
+pub mod cache;
+pub mod manifest;
+pub mod models;
+pub mod plugin;
+pub mod service;
+
+pub use plugin::{LyricsPlugin, LyricsPluginFactory};
diff --git a/src-tauri/src/plugins/lyrics/models.rs b/src-tauri/src/plugins/lyrics/models.rs
new file mode 100644
index 0000000..45fb537
--- /dev/null
+++ b/src-tauri/src/plugins/lyrics/models.rs
@@ -0,0 +1,33 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct LyricLine {
+    pub timestamp_ms: u64,
+    pub text: String,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct LyricDocument {
+    pub song_id: i64,
+    pub lines: Vec<LyricLine>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct LyricsSearchResult {
+    pub song_id: i64,
+    pub title: String,
+    pub artist: String,
+    pub source: String,
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct LyricLinePayload {
+    pub timestamp_ms: u64,
+    pub text: String,
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct LyricsLoadedPayload {
+    pub song_id: i64,
+    pub lines: Vec<LyricLinePayload>,
+}
diff --git a/src-tauri/src/plugins/lyrics/plugin.rs b/src-tauri/src/plugins/lyrics/plugin.rs
new file mode 100644
index 0000000..b360ed6
--- /dev/null
+++ b/src-tauri/src/plugins/lyrics/plugin.rs
@@ -0,0 +1,247 @@
+use std::sync::{Arc, LazyLock, RwLock};
+
+use crate::errors::AppError;
+use crate::events::{EventBus, LyricsLoadedPayload, LyricLinePayload};
+use crate::services::plugin::context::PluginContext;
+use crate::services::plugin::events::PluginEvent;
+use crate::services::plugin::manifest::PluginManifest;
+use crate::services::plugin::settings::plugin_settings::SettingValue;
+use crate::services::plugin::traits::{CommandArgs, Plugin, PluginFactory};
+use tauri::Manager;
+
+use super::cache::LyricsCacheService;
+use super::manifest::build_lyrics_manifest;
+use super::models::LyricDocument;
+use super::service::LyricsService;
+
+pub struct LyricsPlugin {
+    cache: RwLock<Option<LyricsCacheService>>,
+    current_song_id: RwLock<Option<i64>>,
+    current_lyrics: RwLock<Option<LyricDocument>>,
+}
+
+impl LyricsPlugin {
+    pub fn new() -> Self {
+        Self {
+            cache: RwLock::new(None),
+            current_song_id: RwLock::new(None),
+            current_lyrics: RwLock::new(None),
+        }
+    }
+
+    fn get_bool_setting(ctx: &PluginContext, key: &str) -> bool {
+        ctx.plugin_settings
+            .get_setting(key)
+            .and_then(|v| match v {
+                SettingValue::Bool(b) => Some(b),
+                _ => None,
+            })
+            .unwrap_or(true)
+    }
+
+    fn init_cache(&self, ctx: &PluginContext) {
+        let mut cache_lock = match self.cache.write() {
+            Ok(guard) => guard,
+            Err(_) => return,
+        };
+        if cache_lock.is_some() {
+            return;
+        }
+        let app_data = ctx
+            .app_handle
+            .path()
+            .app_data_dir()
+            .unwrap_or_else(|_| std::path::PathBuf::from("."));
+        let cache_dir = app_data.join("plugins").join("lyrics").join("cache");
+        let svc = LyricsCacheService::new(cache_dir);
+        let _ = svc.init();
+        *cache_lock = Some(svc);
+    }
+
+    fn handle_track_changed(
+        &self,
+        track_id: i64,
+        title: &str,
+        artist: &str,
+        file_path: &str,
+        ctx: &PluginContext,
+    ) {
+        {
+            let mut current = match self.current_song_id.write() {
+                Ok(guard) => guard,
+                Err(_) => return,
+            };
+            if *current == Some(track_id) {
+                return;
+            }
+            *current = Some(track_id);
+        }
+
+        let auto_search = Self::get_bool_setting(ctx, "auto_search");
+        if !auto_search {
+            return;
+        }
+
+        let cache_guard = match self.cache.read() {
+            Ok(guard) => guard,
+            Err(_) => return,
+        };
+        let cache = match cache_guard.as_ref() {
+            Some(c) => c,
+            None => return,
+        };
+
+        let path = std::path::Path::new(file_path);
+        if let Some(doc) = LyricsService::load_or_fetch(cache, track_id, path) {
+            self.emit_lyrics_loaded(ctx, &doc);
+            if let Ok(mut lyrics) = self.current_lyrics.write() {
+                *lyrics = Some(doc);
+            }
+        }
+    }
+
+    fn emit_lyrics_loaded(&self, ctx: &PluginContext, doc: &LyricDocument) {
+        let payload = LyricsLoadedPayload {
+            song_id: doc.song_id,
+            lines: doc
+                .lines
+                .iter()
+                .map(|l| LyricLinePayload {
+                    timestamp_ms: l.timestamp_ms,
+                    text: l.text.clone(),
+                })
+                .collect(),
+        };
+        let _ = EventBus::emit_lyrics_loaded(&ctx.app_handle, payload);
+    }
+
+    fn cmd_search(&self, title: &str, artist: &str) -> Result<(), AppError> {
+        println!(
+            "[Lyrics] search request '{} - {}' (local file only, use lyrics.load with track_id)",
+            title, artist
+        );
+        Ok(())
+    }
+
+    fn cmd_load(&self, song_id: i64, ctx: &PluginContext) -> Result<(), AppError> {
+        let path = match ctx.library.get_track_path(song_id) {
+            Ok(Some(p)) => p,
+            _ => {
+                return Err(AppError::Plugin(format!(
+                    "Track path not found for song_id: {}",
+                    song_id
+                )));
+            }
+        };
+
+        let cache_guard = self.cache.read().map_err(|e| AppError::Plugin(e.to_string()))?;
+        let cache = cache_guard.as_ref().ok_or_else(|| AppError::Plugin("Cache not initialized".into()))?;
+
+        if let Some(doc) = LyricsService::load_or_fetch(cache, song_id, &path) {
+            self.emit_lyrics_loaded(ctx, &doc);
+            if let Ok(mut lyrics) = self.current_lyrics.write() {
+                *lyrics = Some(doc);
+            }
+            return Ok(());
+        }
+
+        Err(AppError::Plugin(format!(
+            "No lyrics found for song_id: {}",
+            song_id
+        )))
+    }
+}
+
+impl Plugin for LyricsPlugin {
+    fn manifest(&self) -> &PluginManifest {
+        static MANIFEST: LazyLock<PluginManifest> = LazyLock::new(build_lyrics_manifest);
+        &MANIFEST
+    }
+
+    fn activate(&self, ctx: &PluginContext) -> Result<(), AppError> {
+        self.init_cache(ctx);
+        Ok(())
+    }
+
+    fn deactivate(&self) -> Result<(), AppError> {
+        if let Ok(mut lyrics) = self.current_lyrics.write() {
+            *lyrics = None;
+        }
+        if let Ok(mut song_id) = self.current_song_id.write() {
+            *song_id = None;
+        }
+        Ok(())
+    }
+
+    fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), AppError> {
+        match event {
+            PluginEvent::TrackChanged { track, .. } => {
+                self.handle_track_changed(
+                    track.id,
+                    &track.title,
+                    track.artist.as_deref().unwrap_or(""),
+                    &track.path,
+                    ctx,
+                );
+            }
+            PluginEvent::Startup => {
+                println!("[Lyrics] Plugin started");
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    fn execute_command(
+        &self,
+        command_id: &str,
+        args: &CommandArgs,
+        ctx: &PluginContext,
+    ) -> Result<(), AppError> {
+        match command_id {
+            "lyrics.search" => {
+                if let CommandArgs::LyricsSearch { title, artist } = args {
+                    self.cmd_search(title, artist)
+                } else {
+                    Err(AppError::Plugin(
+                        "lyrics.search requires LyricsSearch args".into(),
+                    ))
+                }
+            }
+            "lyrics.load" => {
+                if let CommandArgs::TrackId(song_id) = args {
+                    self.cmd_load(*song_id, ctx)
+                } else {
+                    Err(AppError::Plugin("lyrics.load requires TrackId".into()))
+                }
+            }
+            "lyrics.clear_cache" => {
+                if let Ok(cache_guard) = self.cache.read() {
+                    if let Some(ref cache) = *cache_guard {
+                        cache
+                            .clear()
+                            .map_err(|e| AppError::Plugin(e.to_string()))?;
+                    }
+                }
+                println!("[Lyrics] Cache cleared");
+                Ok(())
+            }
+            _ => Err(AppError::Plugin(format!(
+                "Unknown command: {}",
+                command_id
+            ))),
+        }
+    }
+}
+
+pub struct LyricsPluginFactory;
+
+impl PluginFactory for LyricsPluginFactory {
+    fn manifest(&self) -> PluginManifest {
+        build_lyrics_manifest()
+    }
+
+    fn create(&self) -> Arc<dyn Plugin> {
+        Arc::new(LyricsPlugin::new())
+    }
+}
diff --git a/src-tauri/src/plugins/lyrics/service.rs b/src-tauri/src/plugins/lyrics/service.rs
new file mode 100644
index 0000000..760c7d1
--- /dev/null
+++ b/src-tauri/src/plugins/lyrics/service.rs
@@ -0,0 +1,94 @@
+use std::path::Path;
+
+use lofty::prelude::*;
+use lofty::probe::Probe;
+use lofty::tag::ItemKey;
+
+use super::cache::LyricsCacheService;
+use super::models::{LyricDocument, LyricLine};
+
+pub struct LyricsService;
+
+impl LyricsService {
+    pub fn read_from_file(file_path: &Path, song_id: i64) -> Option<LyricDocument> {
+        let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
+        let tag = tagged_file
+            .primary_tag()
+            .or_else(|| tagged_file.first_tag())?;
+
+        let lyrics_text = tag
+            .get_items(ItemKey::Lyrics)
+            .next()
+            .or_else(|| tag.get_items(ItemKey::UnsyncLyrics).next())
+            .and_then(|item| item.value().text())?;
+
+        let lines = Self::parse_lrc(lyrics_text);
+
+        if lines.is_empty() {
+            return None;
+        }
+
+        Some(LyricDocument {
+            song_id,
+            lines,
+        })
+    }
+
+    pub fn load_or_fetch(
+        cache: &LyricsCacheService,
+        song_id: i64,
+        file_path: &Path,
+    ) -> Option<LyricDocument> {
+        if let Some(doc) = cache.load(song_id) {
+            return Some(doc);
+        }
+
+        let doc = Self::read_from_file(file_path, song_id)?;
+
+        let _ = cache.save(song_id, &doc);
+
+        Some(doc)
+    }
+
+    pub fn parse_lrc(content: &str) -> Vec<LyricLine> {
+        let mut lines = Vec::new();
+        for line in content.lines() {
+            let trimmed = line.trim();
+            if trimmed.is_empty() {
+                continue;
+            }
+            if let Some(parsed) = Self::parse_lrc_line(trimmed) {
+                lines.push(parsed);
+            }
+        }
+        lines.sort_by(|a, b| a.timestamp_ms.cmp(&b.timestamp_ms));
+        lines
+    }
+
+    fn parse_lrc_line(line: &str) -> Option<LyricLine> {
+        if !line.starts_with('[') {
+            return None;
+        }
+        let close = line.find(']')?;
+        let tag = &line[1..close];
+        let text = line[close + 1..].trim().to_string();
+
+        let timestamp_ms = Self::parse_lrc_timestamp(tag)?;
+        Some(LyricLine { timestamp_ms, text })
+    }
+
+    fn parse_lrc_timestamp(tag: &str) -> Option<u64> {
+        let parts: Vec<&str> = tag.split(':').collect();
+        if parts.len() != 2 {
+            return None;
+        }
+        let minutes: u64 = parts[0].parse().ok()?;
+        let sec_parts: Vec<&str> = parts[1].split('.').collect();
+        if sec_parts.len() != 2 {
+            return None;
+        }
+        let seconds: u64 = sec_parts[0].parse().ok()?;
+        let centiseconds: u64 = sec_parts[1].parse().ok()?;
+        Some(minutes * 60_000 + seconds * 1_000 + centiseconds * 10)
+    }
+}
diff --git a/src-tauri/src/plugins/mod.rs b/src-tauri/src/plugins/mod.rs
new file mode 100644
index 0000000..03b7098
--- /dev/null
+++ b/src-tauri/src/plugins/mod.rs
@@ -0,0 +1 @@
+pub mod lyrics;
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index 2cfdb15..72047ba 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -3,10 +3,19 @@ use crate::errors::AppError;
 use crate::events::{AppEvent, EventBus, PlaybackProgressPayload, PlaybackStatePayload, TrackStartedPayload};
 use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
 use crate::models::Track;
+use crate::state::app_state::AppState;
 use crate::state::playback_state::{current_playback_snapshot, metadata_from_track, minimal_track, should_advance_track, with_audio_state};
 use std::path::Path;
 use std::time::Duration;
-use tauri::AppHandle;
+use tauri::{AppHandle, Manager};
+
+fn emit_and_dispatch(app_handle: &AppHandle, event: AppEvent) -> Result<(), AppError> {
+    EventBus::emit(app_handle, event.clone())?;
+    if let Some(state) = app_handle.try_state::<AppState>() {
+        state.plugins.dispatch_event(&event);
+    }
+    Ok(())
+}
 
 pub struct PlaybackService {
     app_handle: AppHandle,
@@ -203,7 +212,7 @@ impl PlaybackService {
     pub fn emit_track_started(app_handle: &AppHandle, track: Track, index: usize) -> Result<(), AppError> {
         update_media_controls_metadata(metadata_from_track(&track));
 
-        EventBus::emit(
+        emit_and_dispatch(
             app_handle,
             AppEvent::TrackStarted(TrackStartedPayload { track, index }),
         )
@@ -221,12 +230,12 @@ impl PlaybackService {
 
         update_media_controls_playback(payload.clone());
 
-        EventBus::emit(app_handle, AppEvent::PlaybackStateChanged(payload))
+        emit_and_dispatch(app_handle, AppEvent::PlaybackStateChanged(payload))
     }
 
     pub fn emit_progress(app_handle: &AppHandle) -> Result<(), AppError> {
         if let Ok(snapshot) = current_playback_snapshot() {
-            EventBus::emit(
+            emit_and_dispatch(
                 app_handle,
                 AppEvent::PlaybackProgress(PlaybackProgressPayload {
                     current_time: snapshot.current_time,
@@ -276,6 +285,6 @@ impl PlaybackService {
     pub(crate) fn emit_queue_changed(app_handle: &tauri::AppHandle) -> Result<(), AppError> {
         let queue = with_audio_state(|state| state.playback_queue.clone())?;
 
-        EventBus::emit(app_handle, AppEvent::QueueChanged(queue))
+        emit_and_dispatch(app_handle, AppEvent::QueueChanged(queue))
     }
 }
diff --git a/src-tauri/src/services/plugin/adapters/library_adapter.rs b/src-tauri/src/services/plugin/adapters/library_adapter.rs
new file mode 100644
index 0000000..f00ca60
--- /dev/null
+++ b/src-tauri/src/services/plugin/adapters/library_adapter.rs
@@ -0,0 +1,46 @@
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::services::plugin::api::library::LibraryApi;
+use crate::services::plugin::capability::permission_checker::PermissionChecker;
+use crate::services::plugin::permissions::PluginPermission;
+use crate::services::track_service::TrackService;
+
+pub struct LibraryAdapter {
+    plugin_id: String,
+    checker: Arc<PermissionChecker>,
+    track_service: Arc<TrackService>,
+}
+
+impl LibraryAdapter {
+    pub fn new(
+        plugin_id: String,
+        checker: Arc<PermissionChecker>,
+        track_service: Arc<TrackService>,
+    ) -> Self {
+        Self {
+            plugin_id,
+            checker,
+            track_service,
+        }
+    }
+}
+
+impl LibraryApi for LibraryAdapter {
+    fn get_track_path(&self, track_id: i64) -> Result<Option<PathBuf>, AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::LibraryRead)?;
+        let track = tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.track_service.get_track(track_id))
+        })?;
+        Ok(track.map(|t| PathBuf::from(t.path)))
+    }
+
+    fn exists(&self, track_id: i64) -> Result<bool, AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::LibraryRead)?;
+        let track = tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.track_service.get_track(track_id))
+        })?;
+        Ok(track.is_some())
+    }
+}
diff --git a/src-tauri/src/services/plugin/adapters/mod.rs b/src-tauri/src/services/plugin/adapters/mod.rs
new file mode 100644
index 0000000..0569052
--- /dev/null
+++ b/src-tauri/src/services/plugin/adapters/mod.rs
@@ -0,0 +1,11 @@
+pub mod library_adapter;
+pub mod player_adapter;
+pub mod plugin_settings_adapter;
+pub mod queue_adapter;
+pub mod settings_adapter;
+
+pub use library_adapter::LibraryAdapter;
+pub use player_adapter::PlayerAdapter;
+pub use plugin_settings_adapter::PluginSettingsAdapter;
+pub use queue_adapter::QueueAdapter;
+pub use settings_adapter::SettingsAdapter;
diff --git a/src-tauri/src/services/plugin/adapters/player_adapter.rs b/src-tauri/src/services/plugin/adapters/player_adapter.rs
new file mode 100644
index 0000000..0f49044
--- /dev/null
+++ b/src-tauri/src/services/plugin/adapters/player_adapter.rs
@@ -0,0 +1,64 @@
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::services::playback_service::PlaybackService;
+use crate::services::plugin::api::player::PlayerApi;
+use crate::services::plugin::capability::permission_checker::PermissionChecker;
+use crate::services::plugin::permissions::PluginPermission;
+use crate::state::playback_state::with_audio_state;
+
+pub struct PlayerAdapter {
+    plugin_id: String,
+    checker: Arc<PermissionChecker>,
+    playback_service: Arc<PlaybackService>,
+}
+
+impl PlayerAdapter {
+    pub fn new(
+        plugin_id: String,
+        checker: Arc<PermissionChecker>,
+        playback_service: Arc<PlaybackService>,
+    ) -> Self {
+        Self {
+            plugin_id,
+            checker,
+            playback_service,
+        }
+    }
+}
+
+impl PlayerApi for PlayerAdapter {
+    fn play(&self) -> Result<(), AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.playback_service.resume())
+        })?;
+        Ok(())
+    }
+
+    fn pause(&self) -> Result<(), AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.playback_service.pause())
+        })
+    }
+
+    fn next(&self) -> Result<(), AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.playback_service.next())
+        })
+    }
+
+    fn previous(&self) -> Result<(), AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.playback_service.previous())
+        })
+    }
+
+    fn current_track_id(&self) -> Result<Option<i64>, AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerRead)?;
+        with_audio_state(|state| state.current_track_id)
+    }
+}
diff --git a/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs b/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
new file mode 100644
index 0000000..015989b
--- /dev/null
+++ b/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
@@ -0,0 +1,27 @@
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::services::plugin::api::plugin_settings::PluginSettingsApi;
+use crate::services::plugin::settings::plugin_settings::SettingValue;
+use crate::services::plugin::settings::settings_registry::SettingsRegistry;
+
+pub struct PluginSettingsAdapter {
+    plugin_id: String,
+    registry: Arc<SettingsRegistry>,
+}
+
+impl PluginSettingsAdapter {
+    pub fn new(plugin_id: String, registry: Arc<SettingsRegistry>) -> Self {
+        Self { plugin_id, registry }
+    }
+}
+
+impl PluginSettingsApi for PluginSettingsAdapter {
+    fn get_setting(&self, key: &str) -> Option<SettingValue> {
+        self.registry.get_setting(&self.plugin_id, key)
+    }
+
+    fn set_setting(&self, key: &str, value: SettingValue) -> Result<(), AppError> {
+        self.registry.update_setting(&self.plugin_id, key, value)
+    }
+}
diff --git a/src-tauri/src/services/plugin/adapters/queue_adapter.rs b/src-tauri/src/services/plugin/adapters/queue_adapter.rs
new file mode 100644
index 0000000..26de876
--- /dev/null
+++ b/src-tauri/src/services/plugin/adapters/queue_adapter.rs
@@ -0,0 +1,48 @@
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::services::plugin::api::queue::QueueApi;
+use crate::services::plugin::capability::permission_checker::PermissionChecker;
+use crate::services::plugin::permissions::PluginPermission;
+use crate::state::playback_state::with_audio_state;
+
+pub struct QueueAdapter {
+    plugin_id: String,
+    checker: Arc<PermissionChecker>,
+}
+
+impl QueueAdapter {
+    pub fn new(plugin_id: String, checker: Arc<PermissionChecker>) -> Self {
+        Self { plugin_id, checker }
+    }
+}
+
+impl QueueApi for QueueAdapter {
+    fn current_queue(&self) -> Result<Vec<i64>, AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::QueueRead)?;
+        with_audio_state(|state| {
+            state
+                .playback_queue
+                .tracks
+                .iter()
+                .map(|t| t.id)
+                .collect()
+        })
+    }
+
+    fn remove_track(&self, track_id: i64) -> Result<(), AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::QueueWrite)?;
+        with_audio_state(|state| {
+            state.playback_queue.remove_track(track_id);
+        })?;
+        Ok(())
+    }
+
+    fn clear(&self) -> Result<(), AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::QueueWrite)?;
+        with_audio_state(|state| {
+            state.playback_queue.clear();
+        })?;
+        Ok(())
+    }
+}
diff --git a/src-tauri/src/services/plugin/adapters/settings_adapter.rs b/src-tauri/src/services/plugin/adapters/settings_adapter.rs
new file mode 100644
index 0000000..6618b62
--- /dev/null
+++ b/src-tauri/src/services/plugin/adapters/settings_adapter.rs
@@ -0,0 +1,51 @@
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::models::ThemeMode;
+use crate::services::plugin::api::settings::SettingsApi;
+use crate::services::plugin::capability::permission_checker::PermissionChecker;
+use crate::services::plugin::permissions::PluginPermission;
+use crate::services::settings_service::SettingsService;
+
+pub struct SettingsAdapter {
+    plugin_id: String,
+    checker: Arc<PermissionChecker>,
+    settings_service: Arc<SettingsService>,
+}
+
+impl SettingsAdapter {
+    pub fn new(
+        plugin_id: String,
+        checker: Arc<PermissionChecker>,
+        settings_service: Arc<SettingsService>,
+    ) -> Self {
+        Self {
+            plugin_id,
+            checker,
+            settings_service,
+        }
+    }
+}
+
+impl SettingsApi for SettingsAdapter {
+    fn theme(&self) -> Result<String, AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::SettingsRead)?;
+        let settings = tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.settings_service.get_settings())
+        })?;
+        Ok(settings.theme.as_str().to_string())
+    }
+
+    fn set_theme(&self, theme: String) -> Result<(), AppError> {
+        self.checker.require(&self.plugin_id, PluginPermission::SettingsWrite)?;
+        let theme_mode = ThemeMode::try_from(theme).map_err(AppError::Service)?;
+        let mut settings = tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.settings_service.get_settings())
+        })?;
+        settings.theme = theme_mode;
+        tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current().block_on(self.settings_service.update_settings(settings))
+        })?;
+        Ok(())
+    }
+}
diff --git a/src-tauri/src/services/plugin/api/library.rs b/src-tauri/src/services/plugin/api/library.rs
new file mode 100644
index 0000000..7dab30d
--- /dev/null
+++ b/src-tauri/src/services/plugin/api/library.rs
@@ -0,0 +1,8 @@
+use std::path::PathBuf;
+
+use crate::errors::AppError;
+
+pub trait LibraryApi: Send + Sync {
+    fn get_track_path(&self, track_id: i64) -> Result<Option<PathBuf>, AppError>;
+    fn exists(&self, track_id: i64) -> Result<bool, AppError>;
+}
diff --git a/src-tauri/src/services/plugin/api/mod.rs b/src-tauri/src/services/plugin/api/mod.rs
new file mode 100644
index 0000000..baa04e6
--- /dev/null
+++ b/src-tauri/src/services/plugin/api/mod.rs
@@ -0,0 +1,11 @@
+pub mod library;
+pub mod player;
+pub mod plugin_settings;
+pub mod queue;
+pub mod settings;
+
+pub use library::LibraryApi;
+pub use player::PlayerApi;
+pub use plugin_settings::PluginSettingsApi;
+pub use queue::QueueApi;
+pub use settings::SettingsApi;
diff --git a/src-tauri/src/services/plugin/api/player.rs b/src-tauri/src/services/plugin/api/player.rs
new file mode 100644
index 0000000..8447f89
--- /dev/null
+++ b/src-tauri/src/services/plugin/api/player.rs
@@ -0,0 +1,9 @@
+use crate::errors::AppError;
+
+pub trait PlayerApi: Send + Sync {
+    fn play(&self) -> Result<(), AppError>;
+    fn pause(&self) -> Result<(), AppError>;
+    fn next(&self) -> Result<(), AppError>;
+    fn previous(&self) -> Result<(), AppError>;
+    fn current_track_id(&self) -> Result<Option<i64>, AppError>;
+}
diff --git a/src-tauri/src/services/plugin/api/plugin_settings.rs b/src-tauri/src/services/plugin/api/plugin_settings.rs
new file mode 100644
index 0000000..cbe86ea
--- /dev/null
+++ b/src-tauri/src/services/plugin/api/plugin_settings.rs
@@ -0,0 +1,7 @@
+use crate::errors::AppError;
+use crate::services::plugin::settings::plugin_settings::SettingValue;
+
+pub trait PluginSettingsApi: Send + Sync {
+    fn get_setting(&self, key: &str) -> Option<SettingValue>;
+    fn set_setting(&self, key: &str, value: SettingValue) -> Result<(), AppError>;
+}
diff --git a/src-tauri/src/services/plugin/api/queue.rs b/src-tauri/src/services/plugin/api/queue.rs
new file mode 100644
index 0000000..1c6fe0f
--- /dev/null
+++ b/src-tauri/src/services/plugin/api/queue.rs
@@ -0,0 +1,7 @@
+use crate::errors::AppError;
+
+pub trait QueueApi: Send + Sync {
+    fn current_queue(&self) -> Result<Vec<i64>, AppError>;
+    fn remove_track(&self, track_id: i64) -> Result<(), AppError>;
+    fn clear(&self) -> Result<(), AppError>;
+}
diff --git a/src-tauri/src/services/plugin/api/settings.rs b/src-tauri/src/services/plugin/api/settings.rs
new file mode 100644
index 0000000..679b13f
--- /dev/null
+++ b/src-tauri/src/services/plugin/api/settings.rs
@@ -0,0 +1,6 @@
+use crate::errors::AppError;
+
+pub trait SettingsApi: Send + Sync {
+    fn theme(&self) -> Result<String, AppError>;
+    fn set_theme(&self, theme: String) -> Result<(), AppError>;
+}
diff --git a/src-tauri/src/services/plugin/capability/capability.rs b/src-tauri/src/services/plugin/capability/capability.rs
new file mode 100644
index 0000000..167fe8c
--- /dev/null
+++ b/src-tauri/src/services/plugin/capability/capability.rs
@@ -0,0 +1,8 @@
+use std::collections::HashSet;
+
+use crate::services::plugin::permissions::PluginPermission;
+
+pub struct PluginCapability {
+    pub plugin_id: String,
+    pub permissions: HashSet<PluginPermission>,
+}
diff --git a/src-tauri/src/services/plugin/capability/mod.rs b/src-tauri/src/services/plugin/capability/mod.rs
new file mode 100644
index 0000000..a7b47bd
--- /dev/null
+++ b/src-tauri/src/services/plugin/capability/mod.rs
@@ -0,0 +1,7 @@
+pub mod capability;
+pub mod permission_checker;
+pub mod plugin_capability;
+
+pub use capability::PluginCapability;
+pub use permission_checker::PermissionChecker;
+pub use plugin_capability::CapabilityRegistry;
diff --git a/src-tauri/src/services/plugin/capability/permission_checker.rs b/src-tauri/src/services/plugin/capability/permission_checker.rs
new file mode 100644
index 0000000..080b65d
--- /dev/null
+++ b/src-tauri/src/services/plugin/capability/permission_checker.rs
@@ -0,0 +1,30 @@
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::services::plugin::capability::plugin_capability::CapabilityRegistry;
+use crate::services::plugin::permissions::PluginPermission;
+
+pub struct PermissionChecker {
+    capability_registry: Arc<CapabilityRegistry>,
+}
+
+impl PermissionChecker {
+    pub fn new(capability_registry: Arc<CapabilityRegistry>) -> Self {
+        Self { capability_registry }
+    }
+
+    pub fn require(
+        &self,
+        plugin_id: &str,
+        permission: PluginPermission,
+    ) -> Result<(), AppError> {
+        if self.capability_registry.has_permission(plugin_id, permission) {
+            Ok(())
+        } else {
+            Err(AppError::PluginPermissionDenied {
+                plugin_id: plugin_id.to_string(),
+                permission,
+            })
+        }
+    }
+}
diff --git a/src-tauri/src/services/plugin/capability/plugin_capability.rs b/src-tauri/src/services/plugin/capability/plugin_capability.rs
new file mode 100644
index 0000000..770060a
--- /dev/null
+++ b/src-tauri/src/services/plugin/capability/plugin_capability.rs
@@ -0,0 +1,40 @@
+use std::collections::HashMap;
+use std::sync::{Arc, RwLock};
+
+use crate::services::plugin::capability::capability::PluginCapability;
+
+pub struct CapabilityRegistry {
+    capabilities: RwLock<HashMap<String, Arc<PluginCapability>>>,
+}
+
+impl CapabilityRegistry {
+    pub fn new() -> Self {
+        Self {
+            capabilities: RwLock::new(HashMap::new()),
+        }
+    }
+
+    pub fn register(&self, capability: Arc<PluginCapability>) {
+        let plugin_id = capability.plugin_id.clone();
+        if let Ok(mut lock) = self.capabilities.write() {
+            lock.insert(plugin_id, capability);
+        }
+    }
+
+    pub fn remove(&self, plugin_id: &str) {
+        if let Ok(mut lock) = self.capabilities.write() {
+            lock.remove(plugin_id);
+        }
+    }
+
+    pub fn has_permission(&self, plugin_id: &str, permission: crate::services::plugin::permissions::PluginPermission) -> bool {
+        let lock = match self.capabilities.read() {
+            Ok(guard) => guard,
+            Err(_) => return false,
+        };
+
+        lock.get(plugin_id)
+            .map(|cap| cap.permissions.contains(&permission))
+            .unwrap_or(false)
+    }
+}
diff --git a/src-tauri/src/services/plugin/context.rs b/src-tauri/src/services/plugin/context.rs
index f004e14..575b497 100644
--- a/src-tauri/src/services/plugin/context.rs
+++ b/src-tauri/src/services/plugin/context.rs
@@ -1,12 +1,51 @@
+use std::sync::Arc;
+
 use tauri::AppHandle;
 
-#[derive(Clone)]
+use crate::services::plugin::api::{LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi};
+
 pub struct PluginContext {
+    pub plugin_id: String,
     pub app_handle: AppHandle,
+    pub player: Arc<dyn PlayerApi>,
+    pub library: Arc<dyn LibraryApi>,
+    pub queue: Arc<dyn QueueApi>,
+    pub settings: Arc<dyn SettingsApi>,
+    pub plugin_settings: Arc<dyn PluginSettingsApi>,
+}
+
+impl Clone for PluginContext {
+    fn clone(&self) -> Self {
+        Self {
+            plugin_id: self.plugin_id.clone(),
+            app_handle: self.app_handle.clone(),
+            player: Arc::clone(&self.player),
+            library: Arc::clone(&self.library),
+            queue: Arc::clone(&self.queue),
+            settings: Arc::clone(&self.settings),
+            plugin_settings: Arc::clone(&self.plugin_settings),
+        }
+    }
 }
 
 impl PluginContext {
-    pub fn new(app_handle: AppHandle) -> Self {
-        Self { app_handle }
+    pub fn new(
+        plugin_id: String,
+        app_handle: AppHandle,
+        player: Arc<dyn PlayerApi>,
+        library: Arc<dyn LibraryApi>,
+        queue: Arc<dyn QueueApi>,
+        settings: Arc<dyn SettingsApi>,
+        plugin_settings: Arc<dyn PluginSettingsApi>,
+    ) -> Self {
+        Self {
+            plugin_id,
+            app_handle,
+            player,
+            library,
+            queue,
+            settings,
+            plugin_settings,
+        }
     }
 }
diff --git a/src-tauri/src/services/plugin/contributes/command.rs b/src-tauri/src/services/plugin/contributes/command.rs
new file mode 100644
index 0000000..c6088a9
--- /dev/null
+++ b/src-tauri/src/services/plugin/contributes/command.rs
@@ -0,0 +1,8 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CommandContribution {
+    pub id: String,
+    pub title: String,
+    pub category: Option<String>,
+}
diff --git a/src-tauri/src/services/plugin/contributes/menu.rs b/src-tauri/src/services/plugin/contributes/menu.rs
new file mode 100644
index 0000000..10206b2
--- /dev/null
+++ b/src-tauri/src/services/plugin/contributes/menu.rs
@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub enum MenuLocation {
+    TrackContextMenu,
+    SidebarActions,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MenuContribution {
+    pub command: String,
+    pub title: String,
+    pub location: MenuLocation,
+    pub group: Option<String>,
+}
diff --git a/src-tauri/src/services/plugin/contributes/mod.rs b/src-tauri/src/services/plugin/contributes/mod.rs
new file mode 100644
index 0000000..a350242
--- /dev/null
+++ b/src-tauri/src/services/plugin/contributes/mod.rs
@@ -0,0 +1,7 @@
+pub mod command;
+pub mod menu;
+pub mod sidebar;
+
+pub use command::CommandContribution;
+pub use menu::{MenuContribution, MenuLocation};
+pub use sidebar::SidebarContribution;
diff --git a/src-tauri/src/services/plugin/contributes/sidebar.rs b/src-tauri/src/services/plugin/contributes/sidebar.rs
new file mode 100644
index 0000000..3c42748
--- /dev/null
+++ b/src-tauri/src/services/plugin/contributes/sidebar.rs
@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SidebarContribution {
+    pub id: String,
+    pub title: String,
+    pub icon: String,
+    pub route: String,
+}
diff --git a/src-tauri/src/services/plugin/events.rs b/src-tauri/src/services/plugin/events.rs
index 45b1d9e..15f582e 100644
--- a/src-tauri/src/services/plugin/events.rs
+++ b/src-tauri/src/services/plugin/events.rs
@@ -1,6 +1,5 @@
 use serde::Serialize;
 
-use crate::events::AppEvent;
 use crate::models::Track;
 
 #[derive(Debug, Clone, Serialize)]
@@ -10,21 +9,11 @@ pub enum PluginEvent {
     PlaybackStateChanged { playing: bool, current_time: f64 },
     QueueChanged,
     SettingsChanged,
+    LyricsLoaded { song_id: i64, lines: Vec<LyricLineEvent> },
 }
 
-pub fn bridge_app_event(app_event: &AppEvent) -> Option<PluginEvent> {
-    match app_event {
-        AppEvent::TrackStarted(payload) => Some(PluginEvent::TrackChanged {
-            track: payload.track.clone(),
-            index: payload.index,
-        }),
-        AppEvent::PlaybackStateChanged(payload) => Some(PluginEvent::PlaybackStateChanged {
-            playing: payload.playing,
-            current_time: payload.current_time,
-        }),
-        AppEvent::QueueChanged(_) => Some(PluginEvent::QueueChanged),
-        AppEvent::SettingsChanged(_) => Some(PluginEvent::SettingsChanged),
-        AppEvent::VolumeChanged(_) => None,
-        AppEvent::PlaybackProgress(_) => None,
-    }
+#[derive(Debug, Clone, Serialize)]
+pub struct LyricLineEvent {
+    pub timestamp_ms: u64,
+    pub text: String,
 }
diff --git a/src-tauri/src/services/plugin/extension/command_extension.rs b/src-tauri/src/services/plugin/extension/command_extension.rs
new file mode 100644
index 0000000..12b0d58
--- /dev/null
+++ b/src-tauri/src/services/plugin/extension/command_extension.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+use crate::services::plugin::extension::state::ExtensionState;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CommandExtension {
+    pub id: String,
+    pub plugin_id: String,
+    pub title: String,
+    pub category: Option<String>,
+    pub state: ExtensionState,
+}
diff --git a/src-tauri/src/services/plugin/extension/menu_extension.rs b/src-tauri/src/services/plugin/extension/menu_extension.rs
new file mode 100644
index 0000000..378ea4d
--- /dev/null
+++ b/src-tauri/src/services/plugin/extension/menu_extension.rs
@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+use crate::services::plugin::contributes::menu::MenuLocation;
+use crate::services::plugin::extension::state::ExtensionState;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MenuExtension {
+    pub id: String,
+    pub plugin_id: String,
+    pub command: String,
+    pub location: MenuLocation,
+    pub group: Option<String>,
+    pub state: ExtensionState,
+}
diff --git a/src-tauri/src/services/plugin/extension/mod.rs b/src-tauri/src/services/plugin/extension/mod.rs
new file mode 100644
index 0000000..26cf816
--- /dev/null
+++ b/src-tauri/src/services/plugin/extension/mod.rs
@@ -0,0 +1,11 @@
+pub mod command_extension;
+pub mod menu_extension;
+pub mod registry;
+pub mod sidebar_extension;
+pub mod state;
+
+pub use command_extension::CommandExtension;
+pub use menu_extension::MenuExtension;
+pub use registry::ExtensionRegistry;
+pub use sidebar_extension::SidebarExtension;
+pub use state::ExtensionState;
diff --git a/src-tauri/src/services/plugin/extension/registry.rs b/src-tauri/src/services/plugin/extension/registry.rs
new file mode 100644
index 0000000..6b89897
--- /dev/null
+++ b/src-tauri/src/services/plugin/extension/registry.rs
@@ -0,0 +1,93 @@
+use std::collections::HashMap;
+use std::sync::{Arc, RwLock};
+
+use crate::services::plugin::contributes::menu::MenuLocation;
+use crate::services::plugin::extension::command_extension::CommandExtension;
+use crate::services::plugin::extension::menu_extension::MenuExtension;
+use crate::services::plugin::extension::sidebar_extension::SidebarExtension;
+use crate::services::plugin::extension::state::ExtensionState;
+
+pub struct ExtensionRegistry {
+    menus: RwLock<HashMap<String, Arc<MenuExtension>>>,
+    sidebars: RwLock<HashMap<String, Arc<SidebarExtension>>>,
+    commands: RwLock<HashMap<String, Arc<CommandExtension>>>,
+}
+
+impl ExtensionRegistry {
+    pub fn new() -> Self {
+        Self {
+            menus: RwLock::new(HashMap::new()),
+            sidebars: RwLock::new(HashMap::new()),
+            commands: RwLock::new(HashMap::new()),
+        }
+    }
+
+    pub fn register_menu(&self, extension: Arc<MenuExtension>) {
+        let key = format!("{}.{}", extension.plugin_id, extension.id);
+        if let Ok(mut lock) = self.menus.write() {
+            lock.insert(key, extension);
+        }
+    }
+
+    pub fn register_sidebar(&self, extension: Arc<SidebarExtension>) {
+        let key = format!("{}.{}", extension.plugin_id, extension.id);
+        if let Ok(mut lock) = self.sidebars.write() {
+            lock.insert(key, extension);
+        }
+    }
+
+    pub fn register_command(&self, extension: Arc<CommandExtension>) {
+        let key = format!("{}.{}", extension.plugin_id, extension.id);
+        if let Ok(mut lock) = self.commands.write() {
+            lock.insert(key, extension);
+        }
+    }
+
+    pub fn unregister_plugin(&self, plugin_id: &str) {
+        if let Ok(mut lock) = self.menus.write() {
+            lock.retain(|_, v| v.plugin_id != plugin_id);
+        }
+        if let Ok(mut lock) = self.sidebars.write() {
+            lock.retain(|_, v| v.plugin_id != plugin_id);
+        }
+        if let Ok(mut lock) = self.commands.write() {
+            lock.retain(|_, v| v.plugin_id != plugin_id);
+        }
+    }
+
+    pub fn menu_extensions(&self, location: MenuLocation) -> Vec<MenuExtension> {
+        let lock = match self.menus.read() {
+            Ok(guard) => guard,
+            Err(_) => return Vec::new(),
+        };
+
+        lock.values()
+            .filter(|ext| ext.location == location && ext.state == ExtensionState::Enabled)
+            .map(|ext| (**ext).clone())
+            .collect()
+    }
+
+    pub fn sidebar_extensions(&self) -> Vec<SidebarExtension> {
+        let lock = match self.sidebars.read() {
+            Ok(guard) => guard,
+            Err(_) => return Vec::new(),
+        };
+
+        lock.values()
+            .filter(|ext| ext.state == ExtensionState::Enabled)
+            .map(|ext| (**ext).clone())
+            .collect()
+    }
+
+    pub fn command_extensions(&self) -> Vec<CommandExtension> {
+        let lock = match self.commands.read() {
+            Ok(guard) => guard,
+            Err(_) => return Vec::new(),
+        };
+
+        lock.values()
+            .filter(|ext| ext.state == ExtensionState::Enabled)
+            .map(|ext| (**ext).clone())
+            .collect()
+    }
+}
diff --git a/src-tauri/src/services/plugin/extension/sidebar_extension.rs b/src-tauri/src/services/plugin/extension/sidebar_extension.rs
new file mode 100644
index 0000000..0a1cd47
--- /dev/null
+++ b/src-tauri/src/services/plugin/extension/sidebar_extension.rs
@@ -0,0 +1,14 @@
+use serde::{Deserialize, Serialize};
+
+use crate::services::plugin::extension::state::ExtensionState;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SidebarExtension {
+    pub id: String,
+    pub plugin_id: String,
+    pub title: String,
+    pub icon: String,
+    pub route: String,
+    pub state: ExtensionState,
+}
diff --git a/src-tauri/src/services/plugin/extension/state.rs b/src-tauri/src/services/plugin/extension/state.rs
new file mode 100644
index 0000000..4345198
--- /dev/null
+++ b/src-tauri/src/services/plugin/extension/state.rs
@@ -0,0 +1,7 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub enum ExtensionState {
+    Enabled,
+    Disabled,
+}
diff --git a/src-tauri/src/services/plugin/loader.rs b/src-tauri/src/services/plugin/loader.rs
index d052ceb..7814663 100644
--- a/src-tauri/src/services/plugin/loader.rs
+++ b/src-tauri/src/services/plugin/loader.rs
@@ -1,72 +1,84 @@
 use std::path::Path;
+use std::sync::Arc;
 
 use crate::errors::AppError;
+use crate::plugins::lyrics::LyricsPluginFactory;
 use crate::services::plugin::manifest::PluginManifest;
+use crate::services::plugin::traits::PluginFactory;
 
-pub fn scan_manifests(dir: &Path) -> Result<Vec<PluginManifest>, AppError> {
-    let mut manifests = Vec::new();
+pub struct PluginLoader;
 
-    if !dir.exists() {
-        return Ok(manifests);
+impl PluginLoader {
+    pub fn load_builtin_factories() -> Vec<Arc<dyn PluginFactory>> {
+        vec![
+            Arc::new(LyricsPluginFactory),
+        ]
     }
 
-    let entries = std::fs::read_dir(dir).map_err(|e| {
-        AppError::Io(format!("Failed to read plugins directory '{}': {}", dir.display(), e))
-    })?;
-
-    for entry in entries {
-        let entry = entry.map_err(|e| {
-            AppError::Io(format!("Failed to read directory entry: {}", e))
-        })?;
-
-        let path = entry.path();
-
-        if !path.is_dir() {
-            continue;
-        }
-
-        let manifest_path = path.join("plugin.json");
-
-        if !manifest_path.exists() {
-            continue;
+    pub fn scan_manifests_from_dir(dir: &Path) -> Result<Vec<PluginManifest>, AppError> {
+        if !dir.exists() {
+            return Ok(Vec::new());
         }
 
-        let content = std::fs::read_to_string(&manifest_path).map_err(|e| {
+        let entries = std::fs::read_dir(dir).map_err(|e| {
             AppError::Io(format!(
-                "Failed to read manifest '{}': {}",
-                manifest_path.display(),
+                "Failed to read plugins directory '{}': {}",
+                dir.display(),
                 e
             ))
         })?;
 
-        let manifest: PluginManifest = serde_json::from_str(&content).map_err(|e| {
-            AppError::Service(format!(
-                "Failed to parse manifest '{}': {}",
-                manifest_path.display(),
-                e
-            ))
-        })?;
+        let mut manifests = Vec::new();
 
-        validate_manifest(&manifest)?;
+        for entry in entries {
+            let entry = entry.map_err(|e| AppError::Io(format!("Failed to read entry: {}", e)))?;
+            let path = entry.path();
 
-        manifests.push(manifest);
-    }
+            if !path.is_dir() {
+                continue;
+            }
 
-    Ok(manifests)
-}
+            let manifest_path = path.join("plugin.json");
+            if !manifest_path.exists() {
+                continue;
+            }
 
-fn validate_manifest(manifest: &PluginManifest) -> Result<(), AppError> {
-    if manifest.id.is_empty() {
-        return Err(AppError::Plugin("Manifest 'id' cannot be empty".into()));
-    }
-    if manifest.name.is_empty() {
-        return Err(AppError::Plugin("Manifest 'name' cannot be empty".into()));
-    }
-    if manifest.version.is_empty() {
-        return Err(AppError::Plugin("Manifest 'version' cannot be empty".into()));
+            let content = std::fs::read_to_string(&manifest_path).map_err(|e| {
+                AppError::Io(format!(
+                    "Failed to read '{}': {}",
+                    manifest_path.display(),
+                    e
+                ))
+            })?;
+
+            let manifest: PluginManifest = serde_json::from_str(&content).map_err(|e| {
+                AppError::Plugin(format!(
+                    "Failed to parse '{}': {}",
+                    manifest_path.display(),
+                    e
+                ))
+            })?;
+
+            Self::validate_manifest(&manifest)?;
+            manifests.push(manifest);
+        }
+
+        Ok(manifests)
     }
-    if manifest.entry.is_empty() {
-        return Err(AppError::Plugin("Manifest 'entry' cannot be empty".into()));
+
+    fn validate_manifest(manifest: &PluginManifest) -> Result<(), AppError> {
+        if manifest.id.is_empty() {
+            return Err(AppError::Plugin("Manifest 'id' cannot be empty".into()));
+        }
+        if manifest.name.is_empty() {
+            return Err(AppError::Plugin("Manifest 'name' cannot be empty".into()));
+        }
+        if manifest.version.is_empty() {
+            return Err(AppError::Plugin("Manifest 'version' cannot be empty".into()));
+        }
+        if manifest.entry.is_empty() {
+            return Err(AppError::Plugin("Manifest 'entry' cannot be empty".into()));
+        }
+        Ok(())
     }
-    Ok(())
 }
diff --git a/src-tauri/src/services/plugin/manager.rs b/src-tauri/src/services/plugin/manager.rs
index 3f3ae7d..b343429 100644
--- a/src-tauri/src/services/plugin/manager.rs
+++ b/src-tauri/src/services/plugin/manager.rs
@@ -1,26 +1,59 @@
-use std::path::Path;
-use std::sync::Arc;
+use std::collections::{HashMap, HashSet};
+use std::sync::{Arc, RwLock};
 
 use crate::errors::AppError;
 use crate::events::AppEvent;
-use crate::services::plugin::context::PluginContext;
-use crate::services::plugin::events::{PluginEvent, bridge_app_event};
-use crate::services::plugin::loader;
+use crate::services::plugin::capability::capability::PluginCapability;
+use crate::services::plugin::capability::plugin_capability::CapabilityRegistry;
+use crate::services::plugin::contributes::menu::{MenuContribution, MenuLocation};
+use crate::services::plugin::events::PluginEvent;
+use crate::services::plugin::extension::command_extension::CommandExtension;
+use crate::services::plugin::extension::menu_extension::MenuExtension;
+use crate::services::plugin::extension::registry::ExtensionRegistry;
+use crate::services::plugin::extension::sidebar_extension::SidebarExtension;
+use crate::services::plugin::extension::state::ExtensionState;
+use crate::services::plugin::loader::PluginLoader;
 use crate::services::plugin::manifest::ActivationEvent;
-use crate::services::plugin::registry::PluginRegistry;
-use crate::services::plugin::traits::Plugin;
-use tauri::AppHandle;
+use crate::services::plugin::permissions::PluginPermission;
+use crate::services::plugin::registry::command_registry::CommandRegistry;
+use crate::services::plugin::registry::plugin_registry::PluginRegistry;
+use crate::services::plugin::runtime::context_factory::PluginContextFactory;
+use crate::services::plugin::runtime::runtime_instance::RuntimePluginInstance;
+use crate::services::plugin::runtime::state::{PluginLifecycleState, PluginState};
+use crate::services::plugin::settings::persistence::PluginStorage;
+use crate::services::plugin::settings::plugin_settings::SettingValue;
+use crate::services::plugin::settings::settings_registry::SettingsRegistry;
+use crate::services::plugin::traits::{CommandArgs, Plugin, PluginFactory};
 
 pub struct PluginManager {
     registry: Arc<PluginRegistry>,
-    context: PluginContext,
+    command_registry: Arc<CommandRegistry>,
+    extension_registry: Arc<ExtensionRegistry>,
+    capability_registry: Arc<CapabilityRegistry>,
+    settings_registry: Arc<SettingsRegistry>,
+    storage: Arc<dyn PluginStorage>,
+    context_factory: PluginContextFactory,
+    instances: RwLock<HashMap<String, RuntimePluginInstance>>,
+    lifecycle_states: RwLock<HashMap<String, PluginLifecycleState>>,
 }
 
 impl PluginManager {
-    pub fn new(app_handle: AppHandle) -> Self {
+    pub fn new(
+        context_factory: PluginContextFactory,
+        capability_registry: Arc<CapabilityRegistry>,
+        settings_registry: Arc<SettingsRegistry>,
+        storage: Arc<dyn PluginStorage>,
+    ) -> Self {
         Self {
             registry: Arc::new(PluginRegistry::new()),
-            context: PluginContext::new(app_handle),
+            command_registry: Arc::new(CommandRegistry::new()),
+            extension_registry: Arc::new(ExtensionRegistry::new()),
+            capability_registry,
+            settings_registry,
+            storage,
+            context_factory,
+            instances: RwLock::new(HashMap::new()),
+            lifecycle_states: RwLock::new(HashMap::new()),
         }
     }
 
@@ -28,61 +61,433 @@ impl PluginManager {
         &self.registry
     }
 
-    pub fn load_plugins(&self, dir: &Path) -> Result<Vec<String>, AppError> {
-        let manifests = loader::scan_manifests(dir)?;
-        let mut loaded_ids = Vec::new();
+    pub fn command_registry(&self) -> &Arc<CommandRegistry> {
+        &self.command_registry
+    }
+
+    pub fn extension_registry(&self) -> &Arc<ExtensionRegistry> {
+        &self.extension_registry
+    }
+
+    pub fn capability_registry(&self) -> &Arc<CapabilityRegistry> {
+        &self.capability_registry
+    }
+
+    pub fn settings_registry(&self) -> &Arc<SettingsRegistry> {
+        &self.settings_registry
+    }
+
+    pub fn load_persisted_state(&self) {
+        match self.storage.load_config() {
+            Ok((states, settings)) => {
+                if let Ok(mut lock) = self.lifecycle_states.write() {
+                    *lock = states;
+                }
+                self.settings_registry.load_all(settings);
+            }
+            Err(e) => {
+                eprintln!("[PluginManager] Failed to load persisted state: {}", e);
+            }
+        }
+    }
+
+    pub fn persist_state(&self) {
+        let states = match self.lifecycle_states.read() {
+            Ok(guard) => guard.clone(),
+            Err(_) => return,
+        };
+        let settings = self.settings_registry.dump_all();
+        if let Err(e) = self.storage.save_config(&states, &settings) {
+            eprintln!("[PluginManager] Failed to persist state: {}", e);
+        }
+    }
+
+    pub fn load_builtin_plugins(&self) {
+        let factories = PluginLoader::load_builtin_factories();
+        for factory in factories {
+            self.register_static_plugin(factory);
+        }
+    }
+
+    pub fn register_static_plugin(&self, factory: Arc<dyn PluginFactory>) {
+        let manifest = factory.manifest();
+        let plugin_id = manifest.id.clone();
+
+        let mut defaults = HashMap::new();
+        for def in &manifest.settings {
+            defaults.insert(def.key.clone(), def.default_value.clone());
+        }
+        if !defaults.is_empty() {
+            self.settings_registry.register_defaults(&plugin_id, defaults);
+        }
+
+        for cmd in &manifest.contributes.commands {
+            self.command_registry
+                .register_command(cmd.id.clone(), plugin_id.clone());
+
+            self.extension_registry.register_command(Arc::new(CommandExtension {
+                id: cmd.id.clone(),
+                plugin_id: plugin_id.clone(),
+                title: cmd.title.clone(),
+                category: cmd.category.clone(),
+                state: ExtensionState::Enabled,
+            }));
+        }
+
+        for menu in &manifest.contributes.menus {
+            self.extension_registry.register_menu(Arc::new(MenuExtension {
+                id: menu.command.clone(),
+                plugin_id: plugin_id.clone(),
+                command: menu.command.clone(),
+                location: menu.location.clone(),
+                group: menu.group.clone(),
+                state: ExtensionState::Enabled,
+            }));
+        }
+
+        for sidebar in &manifest.contributes.sidebars {
+            self.extension_registry.register_sidebar(Arc::new(SidebarExtension {
+                id: sidebar.id.clone(),
+                plugin_id: plugin_id.clone(),
+                title: sidebar.title.clone(),
+                icon: sidebar.icon.clone(),
+                route: sidebar.route.clone(),
+                state: ExtensionState::Enabled,
+            }));
+        }
+
+        let permissions: HashSet<PluginPermission> =
+            manifest.permissions.iter().cloned().collect();
+
+        self.capability_registry.register(Arc::new(PluginCapability {
+            plugin_id: plugin_id.clone(),
+            permissions,
+        }));
+
+        self.registry.register_factory(plugin_id.clone(), factory);
 
-        for manifest in manifests {
-            loaded_ids.push(manifest.id.clone());
-            eprintln!(
-                "[Plugin] Discovered: {} v{} ({})",
-                manifest.display_name, manifest.version, manifest.id
-            );
+        let lifecycle = {
+            let states = match self.lifecycle_states.read() {
+                Ok(guard) => guard,
+                Err(_) => return,
+            };
+            states
+                .get(&plugin_id)
+                .cloned()
+                .unwrap_or(PluginLifecycleState::Enabled)
+        };
+
+        if lifecycle == PluginLifecycleState::Enabled {
+            if let Ok(mut instances) = self.instances.write() {
+                instances.insert(plugin_id, RuntimePluginInstance::Registered);
+            }
         }
+    }
 
-        Ok(loaded_ids)
+    pub fn enable_plugin(&self, plugin_id: &str) -> Result<(), AppError> {
+        {
+            let mut states = self
+                .lifecycle_states
+                .write()
+                .map_err(|e| AppError::Plugin(e.to_string()))?;
+            states.insert(plugin_id.to_string(), PluginLifecycleState::Enabled);
+        }
+
+        {
+            let mut instances = self
+                .instances
+                .write()
+                .map_err(|e| AppError::Plugin(e.to_string()))?;
+
+            if !instances.contains_key(plugin_id) {
+                if self.registry.contains(plugin_id) {
+                    instances
+                        .insert(plugin_id.to_string(), RuntimePluginInstance::Registered);
+                }
+            }
+        }
+
+        self.persist_state();
+        Ok(())
     }
 
-    pub fn enable_plugin(&self, plugin: Arc<dyn Plugin>) -> Result<(), AppError> {
-        let id = plugin.manifest().id.clone();
-        plugin.activate(&self.context)?;
-        self.registry.register(plugin).map_err(AppError::from)?;
-        eprintln!("[Plugin] Activated: {}", id);
+    pub fn disable_plugin(&self, plugin_id: &str) -> Result<(), AppError> {
+        if !self.registry.contains(plugin_id) {
+            return Err(AppError::Plugin(format!(
+                "Plugin '{}' is not registered",
+                plugin_id
+            )));
+        }
+
+        if self.plugin_state(plugin_id) == PluginLifecycleState::Disabled {
+            return Ok(());
+        }
+
+        {
+            let mut states = self
+                .lifecycle_states
+                .write()
+                .map_err(|e| AppError::Plugin(e.to_string()))?;
+            states.insert(plugin_id.to_string(), PluginLifecycleState::Disabled);
+        }
+
+        {
+            let mut instances = self
+                .instances
+                .write()
+                .map_err(|e| AppError::Plugin(e.to_string()))?;
+
+            if let Some(RuntimePluginInstance::Active(plugin)) = instances.remove(plugin_id) {
+                let _ = plugin.deactivate();
+            }
+        }
+
+        self.persist_state();
         Ok(())
     }
 
-    pub fn disable_plugin(&self, id: &str) -> Result<(), AppError> {
-        let plugin = self
+    pub fn plugin_state(&self, plugin_id: &str) -> PluginLifecycleState {
+        let states = match self.lifecycle_states.read() {
+            Ok(guard) => guard,
+            Err(_) => return PluginLifecycleState::Enabled,
+        };
+        states
+            .get(plugin_id)
+            .cloned()
+            .unwrap_or(PluginLifecycleState::Enabled)
+    }
+
+    fn is_plugin_enabled(&self, plugin_id: &str) -> bool {
+        self.plugin_state(plugin_id) == PluginLifecycleState::Enabled
+    }
+
+    pub fn execute_plugin_command(
+        &self,
+        command_id: &str,
+        args: CommandArgs,
+    ) -> Result<(), AppError> {
+        let plugin_id = self
+            .command_registry
+            .find_plugin(command_id)
+            .ok_or_else(|| {
+                AppError::Plugin(format!(
+                    "No plugin registered for command '{}'",
+                    command_id
+                ))
+            })?;
+
+        if !self.is_plugin_enabled(&plugin_id) {
+            return Err(AppError::Plugin(format!(
+                "Plugin '{}' is disabled",
+                plugin_id
+            )));
+        }
+
+        let plugin = self.ensure_active(&plugin_id)?;
+        let ctx = self.context_factory.create_context(&plugin_id);
+        plugin.execute_command(command_id, &args, &ctx)
+    }
+
+    fn ensure_active(&self, plugin_id: &str) -> Result<Arc<dyn Plugin>, AppError> {
+        {
+            let instances = self
+                .instances
+                .read()
+                .map_err(|e| AppError::Plugin(e.to_string()))?;
+
+            match instances.get(plugin_id) {
+                Some(RuntimePluginInstance::Active(plugin)) => {
+                    return Ok(Arc::clone(plugin));
+                }
+                Some(RuntimePluginInstance::Activating) => {
+                    return Err(AppError::Plugin(format!(
+                        "Plugin '{}' is currently activating",
+                        plugin_id
+                    )));
+                }
+                Some(RuntimePluginInstance::Deactivating(_)) => {
+                    return Err(AppError::Plugin(format!(
+                        "Plugin '{}' is currently deactivating",
+                        plugin_id
+                    )));
+                }
+                Some(RuntimePluginInstance::Disabled) => {
+                    return Err(AppError::Plugin(format!(
+                        "Plugin '{}' is disabled",
+                        plugin_id
+                    )));
+                }
+                Some(RuntimePluginInstance::Registered) => {}
+                None => {
+                    return Err(AppError::Plugin(format!(
+                        "Plugin '{}' is not registered",
+                        plugin_id
+                    )));
+                }
+            }
+        }
+
+        self.activate_instance(plugin_id)
+    }
+
+    fn activate_instance(&self, plugin_id: &str) -> Result<Arc<dyn Plugin>, AppError> {
+        {
+            let mut instances = self
+                .instances
+                .write()
+                .map_err(|e| AppError::Plugin(e.to_string()))?;
+
+            match instances.get(plugin_id) {
+                Some(RuntimePluginInstance::Registered) => {
+                    instances.insert(
+                        plugin_id.to_string(),
+                        RuntimePluginInstance::Activating,
+                    );
+                }
+                _ => {
+                    return Err(AppError::Plugin(format!(
+                        "Plugin '{}' cannot be activated from its current state",
+                        plugin_id
+                    )));
+                }
+            }
+        }
+
+        let factory = self
             .registry
-            .get(id)
-            .ok_or_else(|| AppError::Plugin(format!("Plugin '{}' not found", id)))?;
+            .get_factory(plugin_id)
+            .ok_or_else(|| {
+                AppError::Plugin(format!("No factory for plugin '{}'", plugin_id))
+            })?;
+
+        let plugin = factory.create();
+        let ctx = self.context_factory.create_context(plugin_id);
+
+        match plugin.activate(&ctx) {
+            Ok(()) => {
+                let mut instances = self
+                    .instances
+                    .write()
+                    .map_err(|e| AppError::Plugin(e.to_string()))?;
 
-        plugin.deactivate()?;
-        self.registry.unregister(id);
-        eprintln!("[Plugin] Deactivated: {}", id);
+                instances.insert(
+                    plugin_id.to_string(),
+                    RuntimePluginInstance::Active(Arc::clone(&plugin)),
+                );
+
+                Ok(plugin)
+            }
+            Err(e) => {
+                let mut instances = self
+                    .instances
+                    .write()
+                    .map_err(|e| AppError::Plugin(e.to_string()))?;
+
+                instances.insert(
+                    plugin_id.to_string(),
+                    RuntimePluginInstance::Registered,
+                );
+
+                Err(e)
+            }
+        }
+    }
+
+    pub fn activate_plugin(&self, plugin_id: &str) -> Result<(), AppError> {
+        self.ensure_active(plugin_id)?;
         Ok(())
     }
 
-    pub fn reload_plugin(&self, plugin: Arc<dyn Plugin>) -> Result<(), AppError> {
-        let id = plugin.manifest().id.clone();
+    pub fn deactivate_plugin(&self, plugin_id: &str) -> Result<(), AppError> {
+        let plugin = {
+            let mut instances = self
+                .instances
+                .write()
+                .map_err(|e| AppError::Plugin(e.to_string()))?;
 
-        if self.registry.contains(&id) {
-            self.disable_plugin(&id)?;
+            match instances.remove(plugin_id) {
+                Some(RuntimePluginInstance::Active(p)) => {
+                    instances.insert(
+                        plugin_id.to_string(),
+                        RuntimePluginInstance::Deactivating(Arc::clone(&p)),
+                    );
+                    p
+                }
+                other => {
+                    if let Some(original) = other {
+                        instances.insert(plugin_id.to_string(), original);
+                    }
+                    return Err(AppError::Plugin(format!(
+                        "Plugin '{}' is not in Active state",
+                        plugin_id
+                    )));
+                }
+            }
+        };
+
+        let result = plugin.deactivate();
+
+        let mut instances = self
+            .instances
+            .write()
+            .map_err(|e| AppError::Plugin(e.to_string()))?;
+
+        match result {
+            Ok(()) => {
+                instances.insert(
+                    plugin_id.to_string(),
+                    RuntimePluginInstance::Registered,
+                );
+            }
+            Err(e) => {
+                instances.insert(
+                    plugin_id.to_string(),
+                    RuntimePluginInstance::Active(plugin),
+                );
+                return Err(e);
+            }
         }
 
-        self.enable_plugin(plugin)
+        Ok(())
     }
 
-    pub fn get_plugin(&self, id: &str) -> Option<Arc<dyn Plugin>> {
-        self.registry.get(id)
+    pub fn get_active_plugin(&self, id: &str) -> Option<Arc<dyn Plugin>> {
+        let instances = self.instances.read().ok()?;
+        match instances.get(id)? {
+            RuntimePluginInstance::Active(p) => Some(Arc::clone(p)),
+            _ => None,
+        }
     }
 
-    pub fn get_active_plugins(&self) -> Vec<Arc<dyn Plugin>> {
-        self.registry.list()
+    pub fn list_active_plugins(&self) -> Vec<(String, Arc<dyn Plugin>)> {
+        let instances = match self.instances.read() {
+            Ok(guard) => guard,
+            Err(_) => return Vec::new(),
+        };
+
+        instances
+            .iter()
+            .filter_map(|(id, inst)| match inst {
+                RuntimePluginInstance::Active(p) => Some((id.clone(), Arc::clone(p))),
+                _ => None,
+            })
+            .collect()
+    }
+
+    pub fn active_count(&self) -> usize {
+        self.instances
+            .read()
+            .ok()
+            .map(|l| {
+                l.values()
+                    .filter(|i| matches!(i, RuntimePluginInstance::Active(_)))
+                    .count()
+            })
+            .unwrap_or(0)
     }
 
     pub fn dispatch_event(&self, app_event: &AppEvent) {
-        let plugin_event = match bridge_app_event(app_event) {
+        let plugin_event = match Self::bridge_app_event(app_event) {
             Some(event) => event,
             None => return,
         };
@@ -90,21 +495,149 @@ impl PluginManager {
         let required_activation = match &plugin_event {
             PluginEvent::Startup => ActivationEvent::OnStartup,
             PluginEvent::TrackChanged { .. } => ActivationEvent::OnTrackChanged,
-            PluginEvent::PlaybackStateChanged { .. } => ActivationEvent::OnPlaybackStateChanged,
+            PluginEvent::PlaybackStateChanged { .. } => {
+                ActivationEvent::OnPlaybackStateChanged
+            }
             PluginEvent::QueueChanged => ActivationEvent::OnQueueChanged,
             PluginEvent::SettingsChanged => ActivationEvent::OnSettingsChanged,
+            PluginEvent::LyricsLoaded { .. } => return,
         };
 
-        for plugin in self.registry.list() {
-            let manifest = plugin.manifest();
+        let pending_activation: Vec<String> = {
+            let instances = match self.instances.read() {
+                Ok(guard) => guard,
+                Err(_) => return,
+            };
+
+            instances
+                .iter()
+                .filter(|(id, inst)| {
+                    self.is_plugin_enabled(id)
+                        && matches!(inst, RuntimePluginInstance::Registered)
+                })
+                .filter_map(|(id, _)| {
+                    let factory = self.registry.get_factory(id)?;
+                    let manifest = factory.manifest();
+                    if manifest.activation_events.contains(&required_activation) {
+                        Some(id.clone())
+                    } else {
+                        None
+                    }
+                })
+                .collect()
+        };
 
-            if manifest.activation_events.contains(&required_activation) {
-                let id = &manifest.id;
-                if let Err(e) = plugin.activate(&self.context) {
-                    eprintln!("[Plugin] Error dispatching event to '{}': {}", id, e);
+        for plugin_id in &pending_activation {
+            let _ = self.ensure_active(plugin_id);
+        }
+
+        let instances = match self.instances.read() {
+            Ok(guard) => guard,
+            Err(_) => return,
+        };
+
+        for (plugin_id, instance) in instances.iter() {
+            if !self.is_plugin_enabled(plugin_id) {
+                continue;
+            }
+
+            if let RuntimePluginInstance::Active(plugin) = instance {
+                let manifest = plugin.manifest();
+                if manifest.activation_events.contains(&required_activation) {
+                    let ctx = self.context_factory.create_context(plugin_id);
+                    let _ = plugin.on_event(&plugin_event, &ctx);
                 }
+            }
+        }
+    }
 
+    pub fn bridge_app_event(app_event: &AppEvent) -> Option<PluginEvent> {
+        match app_event {
+            AppEvent::TrackStarted(payload) => Some(PluginEvent::TrackChanged {
+                track: payload.track.clone(),
+                index: payload.index,
+            }),
+            AppEvent::PlaybackStateChanged(payload) => {
+                Some(PluginEvent::PlaybackStateChanged {
+                    playing: payload.playing,
+                    current_time: payload.current_time,
+                })
             }
+            AppEvent::QueueChanged(_) => Some(PluginEvent::QueueChanged),
+            AppEvent::SettingsChanged(_) => Some(PluginEvent::SettingsChanged),
+            AppEvent::VolumeChanged(_) => None,
+            AppEvent::PlaybackProgress(_) => None,
+            AppEvent::LyricsLoaded(_) => None,
         }
     }
+
+    pub fn menu_extensions(&self, location: MenuLocation) -> Vec<MenuExtension> {
+        self.extension_registry
+            .menu_extensions(location)
+            .into_iter()
+            .filter(|ext| self.is_plugin_enabled(&ext.plugin_id))
+            .collect()
+    }
+
+    pub fn sidebar_extensions(&self) -> Vec<SidebarExtension> {
+        self.extension_registry
+            .sidebar_extensions()
+            .into_iter()
+            .filter(|ext| self.is_plugin_enabled(&ext.plugin_id))
+            .collect()
+    }
+
+    pub fn all_sidebar_extensions(&self) -> Vec<SidebarExtension> {
+        self.extension_registry
+            .sidebar_extensions()
+            .into_iter()
+            .map(|mut ext| {
+                if !self.is_plugin_enabled(&ext.plugin_id) {
+                    ext.state = ExtensionState::Disabled;
+                }
+                ext
+            })
+            .collect()
+    }
+
+    pub fn get_plugin_settings(
+        &self,
+        plugin_id: &str,
+    ) -> Vec<crate::services::plugin::settings::plugin_settings::PluginSettingMeta> {
+        let definitions = self
+            .registry
+            .get_factory(plugin_id)
+            .map(|f| f.manifest().settings)
+            .unwrap_or_default();
+
+        let current = self.settings_registry.get_all(plugin_id);
+
+        definitions
+            .into_iter()
+            .map(|def| {
+                let value = current
+                    .get(&def.key)
+                    .cloned()
+                    .unwrap_or_else(|| def.default_value.clone());
+                crate::services::plugin::settings::plugin_settings::PluginSettingMeta {
+                    key: def.key,
+                    title: def.title,
+                    value,
+                    default_value: def.default_value,
+                }
+            })
+            .collect()
+    }
+
+    pub fn update_plugin_setting(
+        &self,
+        plugin_id: &str,
+        key: &str,
+        value: SettingValue,
+    ) -> Result<(), AppError> {
+        self.settings_registry
+            .update_setting(plugin_id, key, value)?;
+        self.persist_state();
+        Ok(())
+    }
 }
diff --git a/src-tauri/src/services/plugin/manifest.rs b/src-tauri/src/services/plugin/manifest.rs
index 2f28ceb..f067ae5 100644
--- a/src-tauri/src/services/plugin/manifest.rs
+++ b/src-tauri/src/services/plugin/manifest.rs
@@ -1,16 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub enum PluginPermission {
-    PlayerRead,
-    PlayerControl,
-    QueueRead,
-    QueueWrite,
-    LibraryRead,
-    SettingsRead,
-    SettingsWrite,
-}
+use crate::services::plugin::contributes::{CommandContribution, MenuContribution, SidebarContribution};
+use crate::services::plugin::permissions::PluginPermission;
+use crate::services::plugin::settings::plugin_settings::SettingValue;
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
@@ -20,10 +12,22 @@ pub enum ActivationEvent {
     OnPlaybackStateChanged,
     OnQueueChanged,
     OnSettingsChanged,
+    OnCommand(String),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
-pub struct PluginContribution {}
+pub struct PluginContribution {
+    pub commands: Vec<CommandContribution>,
+    pub menus: Vec<MenuContribution>,
+    pub sidebars: Vec<SidebarContribution>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SettingDefinition {
+    pub key: String,
+    pub title: String,
+    pub default_value: SettingValue,
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -39,4 +43,6 @@ pub struct PluginManifest {
     pub permissions: Vec<PluginPermission>,
     pub activation_events: Vec<ActivationEvent>,
     pub contributes: PluginContribution,
+    #[serde(default)]
+    pub settings: Vec<SettingDefinition>,
 }
diff --git a/src-tauri/src/services/plugin/mod.rs b/src-tauri/src/services/plugin/mod.rs
index ff41210..219b0f9 100644
--- a/src-tauri/src/services/plugin/mod.rs
+++ b/src-tauri/src/services/plugin/mod.rs
@@ -1,14 +1,34 @@
-pub mod manifest;
-pub mod traits;
+pub mod adapters;
+pub mod api;
+pub mod capability;
+pub mod contributes;
 pub mod context;
-pub mod registry;
-pub mod loader;
 pub mod events;
+pub mod extension;
+pub mod loader;
+pub mod manifest;
 pub mod manager;
+pub mod model;
+pub mod permissions;
+pub mod registry;
+pub mod runtime;
+pub mod settings;
+pub mod traits;
 
+pub use api::{LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi};
+pub use capability::{CapabilityRegistry, PermissionChecker, PluginCapability};
 pub use context::PluginContext;
 pub use events::PluginEvent;
-pub use manifest::{ActivationEvent, PluginContribution, PluginManifest, PluginPermission};
+pub use extension::{
+    CommandExtension, ExtensionRegistry, ExtensionState, MenuExtension, SidebarExtension,
+};
+pub use loader::PluginLoader;
+pub use manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
 pub use manager::PluginManager;
-pub use registry::PluginRegistry;
-pub use traits::Plugin;
+pub use model::{ModelError, PluginIdentity};
+pub use permissions::PluginPermission;
+pub use runtime::{PluginContextFactory, PluginLifecycleState, PluginState, RuntimePluginInstance};
+pub use settings::{
+    PluginSetting, PluginSettingMeta, PluginSettings, PluginStorage, SettingValue, SettingsRegistry,
+};
+pub use traits::{CommandArgs, Plugin, PluginFactory};
diff --git a/src-tauri/src/services/plugin/model/errors.rs b/src-tauri/src/services/plugin/model/errors.rs
new file mode 100644
index 0000000..430ff06
--- /dev/null
+++ b/src-tauri/src/services/plugin/model/errors.rs
@@ -0,0 +1,16 @@
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub enum ModelError {
+    InvalidIdentityFormat(String),
+    InvalidVersionFormat(String),
+}
+
+impl std::fmt::Display for ModelError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ModelError::InvalidIdentityFormat(s) => write!(f, "Invalid plugin identity: {}", s),
+            ModelError::InvalidVersionFormat(s) => write!(f, "Invalid version format: {}", s),
+        }
+    }
+}
+
+impl std::error::Error for ModelError {}
diff --git a/src-tauri/src/services/plugin/model/mod.rs b/src-tauri/src/services/plugin/model/mod.rs
new file mode 100644
index 0000000..cb4354a
--- /dev/null
+++ b/src-tauri/src/services/plugin/model/mod.rs
@@ -0,0 +1,5 @@
+pub mod errors;
+pub mod plugin_identity;
+
+pub use errors::ModelError;
+pub use plugin_identity::PluginIdentity;
diff --git a/src-tauri/src/services/plugin/model/plugin_identity.rs b/src-tauri/src/services/plugin/model/plugin_identity.rs
new file mode 100644
index 0000000..76720d8
--- /dev/null
+++ b/src-tauri/src/services/plugin/model/plugin_identity.rs
@@ -0,0 +1,51 @@
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, serde::Serialize, serde::Deserialize)]
+pub struct PluginIdentity {
+    pub namespace: Option<String>,
+    pub name: String,
+}
+
+impl PluginIdentity {
+    pub fn bare(name: &str) -> Self {
+        Self {
+            namespace: None,
+            name: name.to_string(),
+        }
+    }
+}
+
+impl std::fmt::Display for PluginIdentity {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if let Some(ref ns) = self.namespace {
+            write!(f, "{}/{}", ns, self.name)
+        } else {
+            write!(f, "{}", self.name)
+        }
+    }
+}
+
+impl std::str::FromStr for PluginIdentity {
+    type Err = super::errors::ModelError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let parts: Vec<&str> = s.split('/').collect();
+        if parts.len() == 2 {
+            if parts[0].is_empty() || parts[1].is_empty() {
+                return Err(super::errors::ModelError::InvalidIdentityFormat(s.to_string()));
+            }
+            Ok(Self {
+                namespace: Some(parts[0].to_string()),
+                name: parts[1].to_string(),
+            })
+        } else if parts.len() == 1 {
+            if parts[0].is_empty() {
+                return Err(super::errors::ModelError::InvalidIdentityFormat(s.to_string()));
+            }
+            Ok(Self {
+                namespace: None,
+                name: parts[0].to_string(),
+            })
+        } else {
+            Err(super::errors::ModelError::InvalidIdentityFormat(s.to_string()))
+        }
+    }
+}
diff --git a/src-tauri/src/services/plugin/permissions.rs b/src-tauri/src/services/plugin/permissions.rs
new file mode 100644
index 0000000..106b249
--- /dev/null
+++ b/src-tauri/src/services/plugin/permissions.rs
@@ -0,0 +1,14 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
+#[serde(rename_all = "camelCase")]
+pub enum PluginPermission {
+    PlayerRead,
+    PlayerControl,
+    QueueRead,
+    QueueWrite,
+    LibraryRead,
+    LibraryWrite,
+    SettingsRead,
+    SettingsWrite,
+}
diff --git a/src-tauri/src/services/plugin/registry/command_registry.rs b/src-tauri/src/services/plugin/registry/command_registry.rs
new file mode 100644
index 0000000..b824964
--- /dev/null
+++ b/src-tauri/src/services/plugin/registry/command_registry.rs
@@ -0,0 +1,42 @@
+use std::collections::HashMap;
+use std::sync::RwLock;
+
+/// Maps command ids to their owning plugin ids.
+///
+/// Populated during factory registration, consulted during
+/// `execute_plugin_command` dispatch.
+pub struct CommandRegistry {
+    commands: RwLock<HashMap<String, String>>,
+}
+
+impl CommandRegistry {
+    pub fn new() -> Self {
+        Self {
+            commands: RwLock::new(HashMap::new()),
+        }
+    }
+
+    pub fn register_command(&self, command_id: String, plugin_id: String) {
+        if let Ok(mut lock) = self.commands.write() {
+            lock.insert(command_id, plugin_id);
+        }
+    }
+
+    pub fn find_plugin(&self, command_id: &str) -> Option<String> {
+        self.commands.read().ok()?.get(command_id).cloned()
+    }
+
+    pub fn unregister_plugin(&self, plugin_id: &str) {
+        if let Ok(mut lock) = self.commands.write() {
+            lock.retain(|_, v| v != plugin_id);
+        }
+    }
+
+    pub fn count(&self) -> usize {
+        self.commands
+            .read()
+            .ok()
+            .map(|l| l.len())
+            .unwrap_or(0)
+    }
+}
diff --git a/src-tauri/src/services/plugin/registry/mod.rs b/src-tauri/src/services/plugin/registry/mod.rs
new file mode 100644
index 0000000..65f6fa0
--- /dev/null
+++ b/src-tauri/src/services/plugin/registry/mod.rs
@@ -0,0 +1,5 @@
+pub mod command_registry;
+pub mod plugin_registry;
+
+pub use command_registry::CommandRegistry;
+pub use plugin_registry::PluginRegistry;
diff --git a/src-tauri/src/services/plugin/registry/plugin_registry.rs b/src-tauri/src/services/plugin/registry/plugin_registry.rs
new file mode 100644
index 0000000..fa75c39
--- /dev/null
+++ b/src-tauri/src/services/plugin/registry/plugin_registry.rs
@@ -0,0 +1,55 @@
+use std::collections::HashMap;
+use std::sync::{Arc, RwLock};
+
+use crate::services::plugin::traits::PluginFactory;
+
+/// Static factory store.
+///
+/// Holds `PluginFactory` instances keyed by plugin id.
+/// Does **not** hold live plugin instances — that is the
+/// `PluginManager`'s responsibility.
+pub struct PluginRegistry {
+    factories: RwLock<HashMap<String, Arc<dyn PluginFactory>>>,
+}
+
+impl PluginRegistry {
+    pub fn new() -> Self {
+        Self {
+            factories: RwLock::new(HashMap::new()),
+        }
+    }
+
+    pub fn register_factory(&self, id: String, factory: Arc<dyn PluginFactory>) {
+        if let Ok(mut lock) = self.factories.write() {
+            lock.insert(id, factory);
+        }
+    }
+
+    pub fn get_factory(&self, id: &str) -> Option<Arc<dyn PluginFactory>> {
+        self.factories.read().ok()?.get(id).cloned()
+    }
+
+    pub fn list_factories(&self) -> Vec<Arc<dyn PluginFactory>> {
+        self.factories
+            .read()
+            .ok()
+            .map(|l| l.values().cloned().collect())
+            .unwrap_or_default()
+    }
+
+    pub fn contains(&self, id: &str) -> bool {
+        self.factories
+            .read()
+            .ok()
+            .map(|l| l.contains_key(id))
+            .unwrap_or(false)
+    }
+
+    pub fn count(&self) -> usize {
+        self.factories
+            .read()
+            .ok()
+            .map(|l| l.len())
+            .unwrap_or(0)
+    }
+}
diff --git a/src-tauri/src/services/plugin/runtime/context_factory.rs b/src-tauri/src/services/plugin/runtime/context_factory.rs
new file mode 100644
index 0000000..0552454
--- /dev/null
+++ b/src-tauri/src/services/plugin/runtime/context_factory.rs
@@ -0,0 +1,78 @@
+use std::sync::Arc;
+
+use tauri::AppHandle;
+
+use crate::services::playback_service::PlaybackService;
+use crate::services::plugin::adapters::{
+    LibraryAdapter, PlayerAdapter, PluginSettingsAdapter, QueueAdapter, SettingsAdapter,
+};
+use crate::services::plugin::capability::permission_checker::PermissionChecker;
+use crate::services::plugin::context::PluginContext;
+use crate::services::plugin::settings::settings_registry::SettingsRegistry;
+use crate::services::settings_service::SettingsService;
+use crate::services::track_service::TrackService;
+
+pub struct PluginContextFactory {
+    app_handle: AppHandle,
+    checker: Arc<PermissionChecker>,
+    playback_service: Arc<PlaybackService>,
+    track_service: Arc<TrackService>,
+    settings_service: Arc<SettingsService>,
+    settings_registry: Arc<SettingsRegistry>,
+}
+
+impl PluginContextFactory {
+    pub fn new(
+        app_handle: AppHandle,
+        checker: Arc<PermissionChecker>,
+        playback_service: Arc<PlaybackService>,
+        track_service: Arc<TrackService>,
+        settings_service: Arc<SettingsService>,
+        settings_registry: Arc<SettingsRegistry>,
+    ) -> Self {
+        Self {
+            app_handle,
+            checker,
+            playback_service,
+            track_service,
+            settings_service,
+            settings_registry,
+        }
+    }
+
+    pub fn create_context(&self, plugin_id: &str) -> PluginContext {
+        let player = Arc::new(PlayerAdapter::new(
+            plugin_id.to_string(),
+            Arc::clone(&self.checker),
+            Arc::clone(&self.playback_service),
+        ));
+        let library = Arc::new(LibraryAdapter::new(
+            plugin_id.to_string(),
+            Arc::clone(&self.checker),
+            Arc::clone(&self.track_service),
+        ));
+        let queue = Arc::new(QueueAdapter::new(
+            plugin_id.to_string(),
+            Arc::clone(&self.checker),
+        ));
+        let settings = Arc::new(SettingsAdapter::new(
+            plugin_id.to_string(),
+            Arc::clone(&self.checker),
+            Arc::clone(&self.settings_service),
+        ));
+        let plugin_settings = Arc::new(PluginSettingsAdapter::new(
+            plugin_id.to_string(),
+            Arc::clone(&self.settings_registry),
+        ));
+
+        PluginContext::new(
+            plugin_id.to_string(),
+            self.app_handle.clone(),
+            player,
+            library,
+            queue,
+            settings,
+            plugin_settings,
+        )
+    }
+}
diff --git a/src-tauri/src/services/plugin/runtime/mod.rs b/src-tauri/src/services/plugin/runtime/mod.rs
new file mode 100644
index 0000000..c413d12
--- /dev/null
+++ b/src-tauri/src/services/plugin/runtime/mod.rs
@@ -0,0 +1,7 @@
+pub mod context_factory;
+pub mod runtime_instance;
+pub mod state;
+
+pub use context_factory::PluginContextFactory;
+pub use runtime_instance::RuntimePluginInstance;
+pub use state::{PluginLifecycleState, PluginState};
diff --git a/src-tauri/src/services/plugin/runtime/runtime_instance.rs b/src-tauri/src/services/plugin/runtime/runtime_instance.rs
new file mode 100644
index 0000000..16c1807
--- /dev/null
+++ b/src-tauri/src/services/plugin/runtime/runtime_instance.rs
@@ -0,0 +1,24 @@
+use std::sync::Arc;
+
+use crate::services::plugin::traits::Plugin;
+
+pub enum RuntimePluginInstance {
+    Registered,
+    Activating,
+    Active(Arc<dyn Plugin>),
+    Deactivating(Arc<dyn Plugin>),
+    Disabled,
+}
+
+impl RuntimePluginInstance {
+    pub fn plugin(&self) -> Option<&Arc<dyn Plugin>> {
+        match self {
+            Self::Active(p) | Self::Deactivating(p) => Some(p),
+            _ => None,
+        }
+    }
+
+    pub fn is_active(&self) -> bool {
+        matches!(self, Self::Active(_))
+    }
+}
diff --git a/src-tauri/src/services/plugin/runtime/state.rs b/src-tauri/src/services/plugin/runtime/state.rs
new file mode 100644
index 0000000..d47b292
--- /dev/null
+++ b/src-tauri/src/services/plugin/runtime/state.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PluginLifecycleState {
+    Enabled,
+    Disabled,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct PluginState {
+    pub plugin_id: String,
+    pub state: PluginLifecycleState,
+}
diff --git a/src-tauri/src/services/plugin/settings/mod.rs b/src-tauri/src/services/plugin/settings/mod.rs
new file mode 100644
index 0000000..f7f2ebd
--- /dev/null
+++ b/src-tauri/src/services/plugin/settings/mod.rs
@@ -0,0 +1,7 @@
+pub mod persistence;
+pub mod plugin_settings;
+pub mod settings_registry;
+
+pub use persistence::{JsonPluginStorage, PluginStorage};
+pub use plugin_settings::{PluginSetting, PluginSettingMeta, PluginSettings, SettingValue};
+pub use settings_registry::SettingsRegistry;
diff --git a/src-tauri/src/services/plugin/settings/persistence.rs b/src-tauri/src/services/plugin/settings/persistence.rs
new file mode 100644
index 0000000..634438b
--- /dev/null
+++ b/src-tauri/src/services/plugin/settings/persistence.rs
@@ -0,0 +1,96 @@
+use std::collections::HashMap;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::errors::AppError;
+use crate::services::plugin::runtime::state::PluginLifecycleState;
+use crate::services::plugin::settings::plugin_settings::PluginSettings;
+
+pub trait PluginStorage: Send + Sync {
+    fn load_config(
+        &self,
+    ) -> Result<
+        (
+            HashMap<String, PluginLifecycleState>,
+            HashMap<String, PluginSettings>,
+        ),
+        AppError,
+    >;
+    fn save_config(
+        &self,
+        states: &HashMap<String, PluginLifecycleState>,
+        settings: &HashMap<String, PluginSettings>,
+    ) -> Result<(), AppError>;
+}
+
+#[derive(Clone, serde::Serialize, serde::Deserialize)]
+struct PluginConfigFile {
+    states: HashMap<String, PluginLifecycleState>,
+    settings: HashMap<String, PluginSettings>,
+}
+
+pub struct JsonPluginStorage {
+    path: PathBuf,
+}
+
+impl JsonPluginStorage {
+    pub fn new(app_data_dir: PathBuf) -> Self {
+        let dir = app_data_dir.join("plugins");
+        Self {
+            path: dir.join("plugins.config.json"),
+        }
+    }
+}
+
+impl PluginStorage for JsonPluginStorage {
+    fn load_config(
+        &self,
+    ) -> Result<
+        (
+            HashMap<String, PluginLifecycleState>,
+            HashMap<String, PluginSettings>,
+        ),
+        AppError,
+    > {
+        if !self.path.exists() {
+            return Ok((HashMap::new(), HashMap::new()));
+        }
+
+        let content = std::fs::read_to_string(&self.path).map_err(|e| {
+            AppError::Io(format!("Failed to read plugin config: {}", e))
+        })?;
+
+        let file: PluginConfigFile = serde_json::from_str(&content).map_err(|e| {
+            AppError::Plugin(format!("Failed to parse plugin config: {}", e))
+        })?;
+
+        Ok((file.states, file.settings))
+    }
+
+    fn save_config(
+        &self,
+        states: &HashMap<String, PluginLifecycleState>,
+        settings: &HashMap<String, PluginSettings>,
+    ) -> Result<(), AppError> {
+        if let Some(parent) = self.path.parent() {
+            std::fs::create_dir_all(parent).map_err(|e| {
+                AppError::Io(format!("Failed to create plugin config directory: {}", e))
+            })?;
+        }
+
+        let file = PluginConfigFile {
+            states: states.clone(),
+            settings: settings.clone(),
+        };
+
+        let content = serde_json::to_string_pretty(&file).map_err(|e| {
+            AppError::Plugin(format!("Failed to serialize plugin config: {}", e))
+        })?;
+
+        std::fs::write(&self.path, content).map_err(|e| {
+            AppError::Io(format!("Failed to write plugin config: {}", e))
+        })?;
+
+        Ok(())
+    }
+}
diff --git a/src-tauri/src/services/plugin/settings/plugin_settings.rs b/src-tauri/src/services/plugin/settings/plugin_settings.rs
new file mode 100644
index 0000000..3c68adf
--- /dev/null
+++ b/src-tauri/src/services/plugin/settings/plugin_settings.rs
@@ -0,0 +1,35 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "type", content = "value")]
+pub enum SettingValue {
+    Bool(bool),
+    Integer(i64),
+    Float(f64),
+    Text(String),
+    List(Vec<String>),
+    Json(serde_json::Value),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct PluginSetting {
+    pub key: String,
+    pub value: SettingValue,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PluginSettingMeta {
+    pub key: String,
+    pub title: String,
+    pub value: SettingValue,
+    pub default_value: SettingValue,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct PluginSettings {
+    pub plugin_id: String,
+    pub settings: HashMap<String, SettingValue>,
+}
diff --git a/src-tauri/src/services/plugin/settings/settings_registry.rs b/src-tauri/src/services/plugin/settings/settings_registry.rs
new file mode 100644
index 0000000..40ececa
--- /dev/null
+++ b/src-tauri/src/services/plugin/settings/settings_registry.rs
@@ -0,0 +1,110 @@
+use std::collections::HashMap;
+use std::sync::{Arc, RwLock};
+
+use crate::errors::AppError;
+use crate::services::plugin::settings::plugin_settings::{PluginSetting, PluginSettings, SettingValue};
+
+pub struct SettingsRegistry {
+    settings: RwLock<HashMap<String, PluginSettings>>,
+}
+
+impl SettingsRegistry {
+    pub fn new() -> Self {
+        Self {
+            settings: RwLock::new(HashMap::new()),
+        }
+    }
+
+    pub fn register_defaults(&self, plugin_id: &str, defaults: HashMap<String, SettingValue>) {
+        let mut lock = match self.settings.write() {
+            Ok(guard) => guard,
+            Err(_) => return,
+        };
+
+        let entry = lock
+            .entry(plugin_id.to_string())
+            .or_insert_with(|| PluginSettings {
+                plugin_id: plugin_id.to_string(),
+                settings: HashMap::new(),
+            });
+
+        for (key, value) in defaults {
+            entry.settings.entry(key).or_insert(value);
+        }
+    }
+
+    pub fn get_setting(&self, plugin_id: &str, key: &str) -> Option<SettingValue> {
+        let lock = self.settings.read().ok()?;
+        lock.get(plugin_id)?
+            .settings
+            .get(key)
+            .cloned()
+    }
+
+    pub fn get_all(&self, plugin_id: &str) -> HashMap<String, SettingValue> {
+        let lock = match self.settings.read() {
+            Ok(guard) => guard,
+            Err(_) => return HashMap::new(),
+        };
+        lock.get(plugin_id)
+            .map(|ps| ps.settings.clone())
+            .unwrap_or_default()
+    }
+
+    pub fn update_setting(
+        &self,
+        plugin_id: &str,
+        key: &str,
+        value: SettingValue,
+    ) -> Result<(), AppError> {
+        let mut lock = self
+            .settings
+            .write()
+            .map_err(|e| AppError::Plugin(e.to_string()))?;
+
+        let entry = lock
+            .entry(plugin_id.to_string())
+            .or_insert_with(|| PluginSettings {
+                plugin_id: plugin_id.to_string(),
+                settings: HashMap::new(),
+            });
+
+        entry.settings.insert(key.to_string(), value);
+        Ok(())
+    }
+
+    pub fn dump_all(&self) -> HashMap<String, PluginSettings> {
+        let lock = match self.settings.read() {
+            Ok(guard) => guard,
+            Err(_) => return HashMap::new(),
+        };
+        lock.clone()
+    }
+
+    pub fn load_all(&self, data: HashMap<String, PluginSettings>) {
+        let mut lock = match self.settings.write() {
+            Ok(guard) => guard,
+            Err(_) => return,
+        };
+        *lock = data;
+    }
+
+    pub fn to_vec(&self, plugin_id: &str) -> Vec<PluginSetting> {
+        let lock = match self.settings.read() {
+            Ok(guard) => guard,
+            Err(_) => return Vec::new(),
+        };
+
+        lock.get(plugin_id)
+            .map(|ps| {
+                ps.settings
+                    .iter()
+                    .map(|(key, value)| PluginSetting {
+                        key: key.clone(),
+                        value: value.clone(),
+                    })
+                    .collect()
+            })
+            .unwrap_or_default()
+    }
+}
diff --git a/src-tauri/src/services/plugin/traits.rs b/src-tauri/src/services/plugin/traits.rs
index 4a1bc1f..6d09365 100644
--- a/src-tauri/src/services/plugin/traits.rs
+++ b/src-tauri/src/services/plugin/traits.rs
@@ -1,11 +1,51 @@
+use std::sync::Arc;
+
 use crate::errors::AppError;
 use crate::services::plugin::context::PluginContext;
+use crate::services::plugin::events::PluginEvent;
 use crate::services::plugin::manifest::PluginManifest;
 
+/// Strongly-typed command argument carrier.
+///
+/// Every variant maps to a concrete domain primitive so that
+/// command handlers can `match` without downcasting.
+#[derive(Debug, Clone)]
+pub enum CommandArgs {
+    None,
+    TrackId(i64),
+    TrackIds(Vec<i64>),
+    RawPayload(String),
+    LyricsSearch { title: String, artist: String },
+}
+
+/// Runtime contract every plugin must fulfil.
+///
+/// Implementations are stored behind `Arc` and must be `Send + Sync`.
+/// Interior mutability is the plugin's own responsibility
+/// (`Mutex`, `RwLock`, atomics, etc.).
 pub trait Plugin: Send + Sync {
     fn manifest(&self) -> &PluginManifest;
 
     fn activate(&self, ctx: &PluginContext) -> Result<(), AppError>;
 
     fn deactivate(&self) -> Result<(), AppError>;
+
+    fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), AppError>;
+
+    fn execute_command(
+        &self,
+        command_id: &str,
+        args: &CommandArgs,
+        ctx: &PluginContext,
+    ) -> Result<(), AppError>;
+}
+
+/// Stateless construction blueprint for a plugin.
+///
+/// The registry stores factories — never live instances.
+/// The manager calls `create()` on first demand (lazy activation).
+pub trait PluginFactory: Send + Sync {
+    fn manifest(&self) -> PluginManifest;
+
+    fn create(&self) -> Arc<dyn Plugin>;
 }
diff --git a/src/lib/features/LyricsPanel.svelte b/src/lib/features/LyricsPanel.svelte
new file mode 100644
index 0000000..58c7313
--- /dev/null
+++ b/src/lib/features/LyricsPanel.svelte
@@ -0,0 +1,83 @@
+<script lang="ts">
+    import { lyrics } from '$lib/state/lyrics.svelte'
+    import { player } from '$lib/state/player.svelte'
+    import { tick } from 'svelte'
+
+    let containerEl = $state<HTMLDivElement | null>(null)
+
+    $effect(() => {
+        if (lyrics.currentLineIndex >= 0 && containerEl) {
+            void tick().then(() => {
+                const lineEl = containerEl?.querySelector(
+                    '[data-active="true"]',
+                )
+                if (lineEl) {
+                    lineEl.scrollIntoView({
+                        behavior: 'smooth',
+                        block: 'center',
+                    })
+                }
+            })
+        }
+    })
+
+    $effect(() => {
+        lyrics.updateCurrentTime(player.currentTime * 1000)
+    })
+
+    $effect(() => {
+        if (
+            player.currentTrack &&
+            lyrics.currentLyrics?.songId !== player.currentTrack.id
+        ) {
+            lyrics.clear()
+        }
+    })
+</script>
+
+{#if lyrics.isOpen}
+    <div
+        class="flex h-full flex-col overflow-hidden rounded-2xl bg-[rgb(var(--mdui-color-surface-container))] p-4"
+    >
+        <div class="mb-3 flex items-center justify-between">
+            <span
+                class="text-sm font-medium text-[rgb(var(--mdui-color-on-surface))]"
+            >
+                歌词
+            </span>
+            <button
+                type="button"
+                class="flex h-6 w-6 items-center justify-center rounded-full hover:bg-[rgb(var(--mdui-color-surface-container-high))]"
+                onclick={() => lyrics.toggle()}
+            >
+                <span class="material-symbols-rounded text-sm">close</span>
+            </button>
+        </div>
+
+        <div bind:this={containerEl} class="flex-1 overflow-y-auto">
+            {#if lyrics.currentLyrics && lyrics.currentLyrics.lines.length > 0}
+                <div class="flex flex-col gap-2 py-4">
+                    {#each lyrics.currentLyrics.lines as line, i (line.timestampMs + i)}
+                        <div
+                            class={[
+                                'text-center text-sm transition-all duration-300',
+                                i === lyrics.currentLineIndex
+                                    ? 'font-bold text-[rgb(var(--mdui-color-primary))]'
+                                    : 'text-[rgb(var(--mdui-color-on-surface-variant))] opacity-50',
+                            ]}
+                            data-active={i === lyrics.currentLineIndex}
+                        >
+                            {line.text || '···'}
+                        </div>
+                    {/each}
+                </div>
+            {:else}
+                <div
+                    class="flex h-full items-center justify-center text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+                >
+                    暂无歌词
+                </div>
+            {/if}
+        </div>
+    </div>
+{/if}
diff --git a/src/lib/features/PlayerBar.svelte b/src/lib/features/PlayerBar.svelte
index 7e9da43..2f228c5 100644
--- a/src/lib/features/PlayerBar.svelte
+++ b/src/lib/features/PlayerBar.svelte
@@ -3,7 +3,9 @@
     import MduiSlider from '$lib/components/base/MduiSlider.svelte'
     import Slider from '$lib/components/base/Slider.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
+    import { lyrics } from '$lib/state/lyrics.svelte'
     import { player } from '$lib/state/player.svelte'
+    import { pluginState } from '$lib/state/plugins.svelte'
     import { formatTime } from '$lib/utils'
     import type { Slider as MduiSliderElement } from 'mdui'
 
@@ -27,6 +29,12 @@
         return 'repeat--rounded'
     })
 
+    let lyricsPluginEnabled = $derived(
+        pluginState.sidebarExtensions.some(
+            (e) => e.pluginId === 'builtin/lyrics' && e.state === 'Enabled',
+        ),
+    )
+
     function getVolumeIcon(volume: number, muted: boolean) {
         if (muted) return 'volume_off--rounded'
         if (volume === 0) return 'volume_mute--rounded'
@@ -121,6 +129,14 @@
             class="opacity-70 hover:opacity-100"
         />
 
+        {#if lyricsPluginEnabled}
+            <IconButton
+                icon={lyrics.isOpen ? 'lyrics' : 'lyrics--outlined'}
+                onclick={() => lyrics.toggle()}
+                class={lyrics.isOpen ? 'text-[rgb(var(--mdui-color-primary))]' : 'opacity-70 hover:opacity-100'}
+            />
+        {/if}
+
         <IconButton
             icon="playlist_play--rounded"
             onclick={() => player.toggleQueue()}
diff --git a/src/lib/features/QueueDrawer.svelte b/src/lib/features/QueueDrawer.svelte
index bab704f..9239eea 100644
--- a/src/lib/features/QueueDrawer.svelte
+++ b/src/lib/features/QueueDrawer.svelte
@@ -93,6 +93,7 @@
     .themed-text-secondary {
         color: rgb(var(--mdui-color-on-surface-variant));
     }
+    
 
     .themed-border-b {
         border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
diff --git a/src/lib/features/shell/NavRail.svelte b/src/lib/features/shell/NavRail.svelte
index 2b8824d..c9f4be4 100644
--- a/src/lib/features/shell/NavRail.svelte
+++ b/src/lib/features/shell/NavRail.svelte
@@ -34,6 +34,12 @@
             href: '/artists',
             icon: 'person--outlined',
         },
+        {
+            label: 'Plugins',
+            href: '/plugins',
+            icon: 'extension--outlined',
+            slot: 'bottom',
+        },
         {
             label: 'Settings',
             href: '/settings',
diff --git a/src/lib/state/lyrics.svelte.ts b/src/lib/state/lyrics.svelte.ts
new file mode 100644
index 0000000..38935b3
--- /dev/null
+++ b/src/lib/state/lyrics.svelte.ts
@@ -0,0 +1,39 @@
+import type { LyricDocument, LyricLine } from '$lib/types/lyrics'
+
+class LyricsState {
+    currentLyrics = $state<LyricDocument | null>(null)
+    currentLineIndex = $state<number>(-1)
+    isOpen = $state(false)
+
+    handleLyricsLoaded(songId: number, lines: LyricLine[]) {
+        this.currentLyrics = { songId, lines }
+        this.currentLineIndex = -1
+    }
+
+    updateCurrentTime(currentTimeMs: number) {
+        if (!this.currentLyrics || this.currentLyrics.lines.length === 0) {
+            this.currentLineIndex = -1
+            return
+        }
+
+        let idx = -1
+        for (let i = this.currentLyrics.lines.length - 1; i >= 0; i--) {
+            if (this.currentLyrics.lines[i].timestampMs <= currentTimeMs) {
+                idx = i
+                break
+            }
+        }
+        this.currentLineIndex = idx
+    }
+
+    clear() {
+        this.currentLyrics = null
+        this.currentLineIndex = -1
+    }
+
+    toggle() {
+        this.isOpen = !this.isOpen
+    }
+}
+
+export const lyrics = new LyricsState()
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index ff2ba4c..154b933 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -2,6 +2,7 @@ import type { GlobalAppEvent, PlaybackStatusSnapshot, PlayMode } from "$lib/type
 import { invoke } from "@tauri-apps/api/core"
 import { listen, type UnlistenFn } from "@tauri-apps/api/event"
 import type { PlaybackQueue, Track } from "../types/music"
+import { lyrics } from "./lyrics.svelte"
 import { recentlyPlayed } from "./recent.svelte"
 
 class Player {
@@ -269,6 +270,10 @@ class Player {
                 this.currentTime = data.currentTime
                 this.#syncMediaSession()
                 break
+
+            case 'LyricsLoaded':
+                lyrics.handleLyricsLoaded(data.songId, data.lines)
+                break
         }
     }
 
diff --git a/src/lib/state/plugins.svelte.ts b/src/lib/state/plugins.svelte.ts
new file mode 100644
index 0000000..270da23
--- /dev/null
+++ b/src/lib/state/plugins.svelte.ts
@@ -0,0 +1,83 @@
+import { invoke } from '@tauri-apps/api/core'
+import type {
+    MenuExtension,
+    PluginSetting,
+    SettingValue,
+    SidebarExtension,
+} from '$lib/types/plugin'
+
+class PluginState {
+    sidebarExtensions = $state<SidebarExtension[]>([])
+    isLoading = $state(false)
+    error = $state<string | null>(null)
+
+    async loadSidebarExtensions() {
+        this.isLoading = true
+        this.error = null
+        try {
+            this.sidebarExtensions = await invoke<SidebarExtension[]>(
+                'get_all_sidebar_extensions',
+            )
+        } catch (err) {
+            console.error(err)
+            this.error = String(err)
+        } finally {
+            this.isLoading = false
+        }
+    }
+
+    async getMenuExtensions(location: string): Promise<MenuExtension[]> {
+        try {
+            return await invoke<MenuExtension[]>('get_menu_extensions', {
+                location,
+            })
+        } catch (err) {
+            console.error(err)
+            return []
+        }
+    }
+
+    async getPluginSettings(pluginId: string): Promise<PluginSetting[]> {
+        try {
+            return await invoke<PluginSetting[]>('get_plugin_settings', {
+                pluginId,
+            })
+        } catch (err) {
+            console.error(err)
+            return []
+        }
+    }
+
+    async updatePluginSetting(
+        pluginId: string,
+        key: string,
+        value: SettingValue,
+    ) {
+        try {
+            await invoke('update_plugin_setting', { pluginId, key, value })
+        } catch (err) {
+            console.error(err)
+            this.error = String(err)
+        }
+    }
+
+    async enablePlugin(pluginId: string) {
+        try {
+            await invoke('enable_plugin_command', { pluginId })
+        } catch (err) {
+            console.error(err)
+            this.error = String(err)
+        }
+    }
+
+    async disablePlugin(pluginId: string) {
+        try {
+            await invoke('disable_plugin_command', { pluginId })
+        } catch (err) {
+            console.error(err)
+            this.error = String(err)
+        }
+    }
+}
+
+export const pluginState = new PluginState()
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index e8bf611..cff5561 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -8,6 +8,10 @@ export const DEFAULT_SETTINGS: AppSettings = {
     scanOnStartup: false,
     reduceMotion: false,
     useAlbumArtistGrouping: false,
+    pluginDirs: [],
+    pluginDevMode: false,
+    pluginScanOnStartup: true,
+    pluginLogLevel: 'warn',
 }
 
 class SettingsState {
diff --git a/src/lib/types/events.ts b/src/lib/types/events.ts
index fbbd103..a1dbe26 100644
--- a/src/lib/types/events.ts
+++ b/src/lib/types/events.ts
@@ -1,4 +1,5 @@
 import type { PlaybackQueue } from "./music"
+import type { LyricLine } from "./lyrics"
 import type { PlaybackProgressPayload, PlaybackStatePayload, PlaybackTrackStartedPayload } from "./playback"
 import type { AppSettings } from "./settings"
 
@@ -8,4 +9,5 @@ export type GlobalAppEvent =
     | { type: 'TrackStarted'; payload: PlaybackTrackStartedPayload }
     | { type: 'PlaybackProgress'; payload: PlaybackProgressPayload }
     | { type: 'QueueChanged'; payload: PlaybackQueue }
-    | { type: 'PlaybackStateChanged'; payload: PlaybackStatePayload }
\ No newline at end of file
+    | { type: 'PlaybackStateChanged'; payload: PlaybackStatePayload }
+    | { type: 'LyricsLoaded'; payload: { songId: number; lines: LyricLine[] } }
\ No newline at end of file
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index 42a3176..c28b762 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -4,6 +4,14 @@ export type {
     ExtensionCommand,
     ExtensionNavItem
 } from './extension'
+export type { LyricDocument, LyricLine } from './lyrics'
 export type { Album, Artist, Playlist, Track } from './music'
 export type { BackendQueueTrack, PlayMode, PlaybackProgressPayload, PlaybackStatusSnapshot, PlaybackTrackInfo } from './playback'
-export type { AppSettings, ThemeMode } from './settings'
+export type {
+    MenuExtension,
+    PluginInfo,
+    PluginSetting,
+    SettingValue,
+    SidebarExtension,
+} from './plugin'
+export type { AppSettings, PluginLogLevel, ThemeMode } from './settings'
diff --git a/src/lib/types/lyrics.ts b/src/lib/types/lyrics.ts
new file mode 100644
index 0000000..9e32a01
--- /dev/null
+++ b/src/lib/types/lyrics.ts
@@ -0,0 +1,9 @@
+export interface LyricLine {
+    timestampMs: number
+    text: string
+}
+
+export interface LyricDocument {
+    songId: number
+    lines: LyricLine[]
+}
diff --git a/src/lib/types/plugin.ts b/src/lib/types/plugin.ts
new file mode 100644
index 0000000..746e565
--- /dev/null
+++ b/src/lib/types/plugin.ts
@@ -0,0 +1,40 @@
+export type SettingValue =
+    | { type: 'Bool'; value: boolean }
+    | { type: 'Integer'; value: number }
+    | { type: 'Float'; value: number }
+    | { type: 'Text'; value: string }
+    | { type: 'List'; value: string[] }
+    | { type: 'Json'; value: unknown }
+
+export interface PluginSetting {
+    key: string
+    title: string
+    value: SettingValue
+    defaultValue: SettingValue
+}
+
+export interface SidebarExtension {
+    id: string
+    pluginId: string
+    title: string
+    icon: string
+    route: string
+    state: 'Enabled' | 'Disabled'
+}
+
+export interface MenuExtension {
+    id: string
+    pluginId: string
+    command: string
+    location: string
+    group: string | null
+    state: 'Enabled' | 'Disabled'
+}
+
+export interface PluginInfo {
+    id: string
+    displayName: string
+    icon: string
+    route: string
+    state: 'Enabled' | 'Disabled'
+}
diff --git a/src/lib/types/settings.ts b/src/lib/types/settings.ts
index 9bdcdbe..8500233 100644
--- a/src/lib/types/settings.ts
+++ b/src/lib/types/settings.ts
@@ -1,5 +1,7 @@
 export type ThemeMode = 'auto' | 'light' | 'dark'
 
+export type PluginLogLevel = 'off' | 'error' | 'warn' | 'info' | 'debug'
+
 export interface AppSettings {
     theme: ThemeMode
     volume: number
@@ -7,4 +9,8 @@ export interface AppSettings {
     scanOnStartup: boolean
     reduceMotion: boolean
     useAlbumArtistGrouping: boolean
+    pluginDirs: string[]
+    pluginDevMode: boolean
+    pluginScanOnStartup: boolean
+    pluginLogLevel: PluginLogLevel
 }
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 679cf3b..c1a509b 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
     import PlayerBar from '$lib/features/PlayerBar.svelte'
     import QueueDrawer from '$lib/features/QueueDrawer.svelte'
+    import LyricsPanel from '$lib/features/LyricsPanel.svelte'
     import Appbar from '$lib/features/shell/Appbar.svelte'
     import NavRail from '$lib/features/shell/NavRail.svelte'
     import { player } from '$lib/state/player.svelte'
+    import { pluginState } from '$lib/state/plugins.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import 'mdui'
     import 'mdui/mdui.css'
@@ -18,6 +20,7 @@
     onMount(() => {
         void settings.load()
         void player.loadState()
+        void pluginState.loadSidebarExtensions()
 
         const trayUnlistenPromise = listen<string>('tray:navigate', event => {
             if (event.payload === 'settings') {
@@ -64,6 +67,10 @@
 
 <QueueDrawer />
 
+<div class="fixed bottom-24 right-4 z-50 w-80 h-96">
+    <LyricsPanel />
+</div>
+
 <style lang="postcss">
     @reference "tailwindcss";
     @layer base {
diff --git a/src/routes/plugins/+page.svelte b/src/routes/plugins/+page.svelte
new file mode 100644
index 0000000..b62c354
--- /dev/null
+++ b/src/routes/plugins/+page.svelte
@@ -0,0 +1,86 @@
+<script lang="ts">
+    import Heading from '$lib/components/base/Heading.svelte'
+    import { pluginState } from '$lib/state/plugins.svelte'
+    import 'mdui/components/circular-progress.js'
+    import { onMount } from 'svelte'
+
+    onMount(() => {
+        void pluginState.loadSidebarExtensions()
+    })
+
+    function handlePluginClick(pluginId: string) {
+        if (!pluginId) return
+        window.location.href = `/plugins/detail?id=${encodeURIComponent(pluginId)}`
+    }
+</script>
+
+<svelte:head>
+    <title>插件</title>
+</svelte:head>
+
+<section class="flex h-full min-h-0 flex-col gap-6 overflow-auto pb-10">
+    <Heading eyebrow="Plugins" title="插件" />
+
+    <div
+        class="flex flex-1 items-center justify-center"
+        class:hidden={!pluginState.isLoading}
+    >
+        <mdui-circular-progress></mdui-circular-progress>
+    </div>
+
+    <div class="grid gap-4" class:hidden={pluginState.isLoading}>
+        {#if pluginState.sidebarExtensions.length === 0}
+            <div
+                class="rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-8 text-center text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+            >
+                暂无已注册的插件扩展。
+            </div>
+        {:else}
+            {#each pluginState.sidebarExtensions as ext (ext.id)}
+                <button
+                    type="button"
+                    class="flex items-center gap-4 rounded-2xl bg-[rgb(var(--mdui-color-surface-container))] p-5 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-high))]"
+                    onclick={() => handlePluginClick(ext.pluginId)}
+                    onkeydown={(e: KeyboardEvent) => {
+                        if (e.key === 'Enter' || e.key === ' ') {
+                            handlePluginClick(ext.pluginId)
+                        }
+                    }}
+                >
+                    <div
+                        class="flex h-12 w-12 items-center justify-center rounded-xl bg-[rgb(var(--mdui-color-primary-container))] text-[rgb(var(--mdui-color-on-primary-container))]"
+                    >
+                        <span class="material-symbols-rounded text-2xl">
+                            {ext.icon}
+                        </span>
+                    </div>
+                    <div class="flex flex-1 flex-col gap-1">
+                        <div class="text-sm font-medium">
+                            {ext.title}
+                        </div>
+                        <div
+                            class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                        >
+                            {ext.pluginId}
+                        </div>
+                    </div>
+                    <div
+                        class="rounded-full px-2 py-0.5 text-xs font-medium"
+                        class:bg-green-100={ext.state === 'Enabled'}
+                        class:text-green-700={ext.state === 'Enabled'}
+                        class:bg-gray-100={ext.state === 'Disabled'}
+                        class:text-gray-500={ext.state === 'Disabled'}
+                    >
+                        {ext.state === 'Enabled' ? '已启用' : '已禁用'}
+                    </div>
+                </button>
+            {/each}
+        {/if}
+
+        {#if pluginState.error}
+            <div class="text-sm text-red-500">
+                {pluginState.error}
+            </div>
+        {/if}
+    </div>
+</section>
diff --git a/src/routes/plugins/detail/+page.svelte b/src/routes/plugins/detail/+page.svelte
new file mode 100644
index 0000000..2225646
--- /dev/null
+++ b/src/routes/plugins/detail/+page.svelte
@@ -0,0 +1,158 @@
+<script lang="ts">
+    import { page } from '$app/state'
+    import Heading from '$lib/components/base/Heading.svelte'
+    import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
+    import SettingsSection from '$lib/features/settings/SettingsSection.svelte'
+    import { pluginState } from '$lib/state/plugins.svelte'
+    import type { PluginSetting, SettingValue } from '$lib/types/plugin'
+    import 'mdui/components/circular-progress.js'
+    import 'mdui/components/switch.js'
+    import 'mdui/components/text-field.js'
+    import { onMount } from 'svelte'
+
+    const pluginId = $derived(page.url.searchParams.get('id') ?? '')
+
+    let settings = $state<PluginSetting[]>([])
+    let isLoading = $state(true)
+
+    const sidebarEntry = $derived(
+        pluginState.sidebarExtensions.find((e) => e.pluginId === pluginId),
+    )
+
+    async function loadPluginData() {
+        if (!pluginId) return
+        isLoading = true
+        settings = await pluginState.getPluginSettings(pluginId)
+        isLoading = false
+    }
+
+    onMount(async () => {
+        await pluginState.loadSidebarExtensions()
+        await loadPluginData()
+    })
+
+    function getBoolValue(val: SettingValue): boolean {
+        if (val.type === 'Bool') return val.value
+        return false
+    }
+
+    function getStringValue(val: SettingValue): string {
+        if (val.type === 'Text') return val.value
+        if (val.type === 'Integer') return String(val.value)
+        if (val.type === 'Float') return String(val.value)
+        return ''
+    }
+
+    async function handleSettingBoolChange(key: string, checked: boolean) {
+        if (!pluginId) return
+        await pluginState.updatePluginSetting(pluginId, key, {
+            type: 'Bool',
+            value: checked,
+        })
+        await loadPluginData()
+    }
+
+    async function handleSettingTextChange(key: string, value: string) {
+        if (!pluginId) return
+        await pluginState.updatePluginSetting(pluginId, key, {
+            type: 'Text',
+            value,
+        })
+        await loadPluginData()
+    }
+
+    async function togglePlugin() {
+        if (!pluginId) return
+        if (sidebarEntry?.state === 'Enabled') {
+            await pluginState.disablePlugin(pluginId)
+        } else {
+            await pluginState.enablePlugin(pluginId)
+        }
+        await pluginState.loadSidebarExtensions()
+        await loadPluginData()
+    }
+</script>
+
+<svelte:head>
+    <title>插件 - {sidebarEntry?.title ?? pluginId}</title>
+</svelte:head>
+
+<section class="flex h-full min-h-0 flex-col gap-6 overflow-auto pb-10">
+    <div class="flex items-center gap-4">
+        <a
+            href="/plugins"
+            class="flex h-10 w-10 items-center justify-center rounded-full hover:bg-[rgb(var(--mdui-color-surface-container))]"
+        >
+            <span class="material-symbols-rounded">arrow_back</span>
+        </a>
+        <Heading
+            eyebrow="Plugin"
+            title={sidebarEntry?.title ?? pluginId ?? '插件'}
+        />
+    </div>
+
+    <div
+        class="flex flex-1 items-center justify-center"
+        class:hidden={!isLoading}
+    >
+        <mdui-circular-progress></mdui-circular-progress>
+    </div>
+
+    <div class="grid gap-6" class:hidden={isLoading}>
+        <SettingsSection title="基本信息">
+            <SettingsRow title="插件 ID" description="唯一标识符">
+                <span
+                    class="font-mono text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+                >
+                    {pluginId}
+                </span>
+            </SettingsRow>
+
+            <SettingsRow title="状态" description="启用或禁用此插件">
+                <mdui-switch
+                    checked={sidebarEntry?.state === 'Enabled'}
+                    onchange={() => togglePlugin()}
+                ></mdui-switch>
+            </SettingsRow>
+        </SettingsSection>
+
+        {#if settings.length > 0}
+            <SettingsSection title="插件设置">
+                {#each settings as setting (setting.key)}
+                    <SettingsRow title={setting.title} description={setting.key}>
+                        {#if setting.value.type === 'Bool'}
+                            <mdui-switch
+                                checked={getBoolValue(setting.value)}
+                                onchange={(e: Event) => {
+                                    const target =
+                                        e.currentTarget as HTMLInputElement
+                                    handleSettingBoolChange(
+                                        setting.key,
+                                        target.checked,
+                                    )
+                                }}
+                            ></mdui-switch>
+                        {:else}
+                            <mdui-text-field
+                                value={getStringValue(setting.value)}
+                                onkeydown={(e: KeyboardEvent) => {
+                                    if (e.key === 'Enter') {
+                                        const target =
+                                            e.currentTarget as HTMLInputElement
+                                        handleSettingTextChange(
+                                            setting.key,
+                                            target.value,
+                                        )
+                                    }
+                                }}
+                                role="textbox"
+                                tabindex="0"
+                                style="width: 200px;"
+                            ></mdui-text-field>
+                        {/if}
+                    </SettingsRow>
+                {/each}
+            </SettingsSection>
+        {/if}
+    </div>
+</section>
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index e80260e..8efa2af 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -6,7 +6,7 @@
     import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
     import SettingsSection from '$lib/features/settings/SettingsSection.svelte'
     import { settings } from '$lib/state/settings.svelte'
-    import type { ThemeMode } from '$lib/types'
+    import type { ThemeMode, PluginLogLevel } from '$lib/types'
     import { scanDirectory, removeMusicDirectory } from '$lib/utils/library'
     import { onMount } from 'svelte'
 
@@ -21,13 +21,21 @@
         { label: '深色模式', value: 'dark' },
     ]
 
+    const logLevelOptions: { label: string; value: PluginLogLevel }[] = [
+        { label: '关闭', value: 'off' },
+        { label: '错误', value: 'error' },
+        { label: '警告', value: 'warn' },
+        { label: '信息', value: 'info' },
+        { label: '调试', value: 'debug' },
+    ]
+
     onMount(() => {
         void settings.load()
     })
 
     function handleSwitchChange(
         event: Event,
-        key: 'scanOnStartup' | 'reduceMotion',
+        key: 'scanOnStartup' | 'reduceMotion' | 'pluginScanOnStartup' | 'pluginDevMode',
     ) {
         const target = event.currentTarget as HTMLElement & {
             checked: boolean
@@ -139,6 +147,113 @@
             </div>
         </SettingsSection>
 
+        <SettingsSection title="插件">
+            <SettingsRow
+                title="启动时扫描插件"
+                description="应用启动时自动发现并加载插件"
+            >
+                <mdui-switch
+                    checked={settings.data?.pluginScanOnStartup}
+                    onchange={(event: Event) =>
+                        handleSwitchChange(event, 'pluginScanOnStartup')}
+                ></mdui-switch>
+            </SettingsRow>
+
+            <SettingsRow
+                title="开发者模式"
+                description="启用插件开发调试功能"
+            >
+                <mdui-switch
+                    checked={settings.data?.pluginDevMode}
+                    onchange={(event: Event) =>
+                        handleSwitchChange(event, 'pluginDevMode')}
+                ></mdui-switch>
+            </SettingsRow>
+
+            <SettingsRow
+                title="插件日志级别"
+                description="设置插件系统的日志输出级别"
+            >
+                <div class="w-48">
+                    <Select
+                        value={settings.data?.pluginLogLevel}
+                        options={logLevelOptions}
+                        onchange={value =>
+                            settings.update({
+                                pluginLogLevel: value as PluginLogLevel,
+                            })}
+                    />
+                </div>
+            </SettingsRow>
+
+            <div class="grid gap-3">
+                <div>
+                    <div class="text-sm font-medium">插件目录</div>
+                    <div
+                        class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        管理应用扫描插件的本地文件夹
+                    </div>
+                </div>
+
+                <div class="flex">
+                    <Button
+                        variant="tonal"
+                        onclick={async () => {
+                            const { open } = await import(
+                                '@tauri-apps/plugin-dialog'
+                            )
+                            const selected = await open({
+                                directory: true,
+                                multiple: false,
+                            })
+                            if (
+                                selected &&
+                                typeof selected === 'string' &&
+                                !settings.data?.pluginDirs?.includes(selected)
+                            ) {
+                                settings.update({
+                                    pluginDirs: [
+                                        ...(settings.data?.pluginDirs ?? []),
+                                        selected,
+                                    ],
+                                })
+                            }
+                        }}
+                    >
+                        添加插件目录
+                    </Button>
+                </div>
+
+                {#if settings.data?.pluginDirs?.length > 0}
+                    <div class="grid gap-2 mt-2">
+                        {#each settings.data.pluginDirs as dir (dir)}
+                            <SettingsListItem title={dir}>
+                                <Button
+                                    variant="text"
+                                    onclick={() =>
+                                        settings.update({
+                                            pluginDirs:
+                                                settings.data.pluginDirs.filter(
+                                                    (d) => d !== dir,
+                                                ),
+                                        })}
+                                >
+                                    <span class="text-red-500">移除</span>
+                                </Button>
+                            </SettingsListItem>
+                        {/each}
+                    </div>
+                {:else}
+                    <div
+                        class="rounded-2xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] p-4 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
+                    >
+                        暂未添加插件目录。
+                    </div>
+                {/if}
+            </div>
+        </SettingsSection>
+
         {#if settings.error}
             <div class="text-sm text-red-500">
                 {settings.error}

From bdb6a1e64ab78c1401d819c1664ead872d460a63 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Mon, 8 Jun 2026 00:43:55 +0800
Subject: [PATCH 32/39] remove version

---
 src-tauri/src/plugins/lyrics/models.rs    | 12 ----
 src-tauri/src/plugins/lyrics/plugin.rs    | 83 +++++++++++------------
 src-tauri/src/plugins/lyrics/service.rs   | 35 +++++++---
 src-tauri/src/services/plugin/registry.rs | 60 ----------------
 src/lib/state/player.svelte.ts            | 13 ++--
 src/lib/types/playback.ts                 |  1 -
 6 files changed, 72 insertions(+), 132 deletions(-)
 delete mode 100644 src-tauri/src/services/plugin/registry.rs

diff --git a/src-tauri/src/plugins/lyrics/models.rs b/src-tauri/src/plugins/lyrics/models.rs
index 45fb537..4cca026 100644
--- a/src-tauri/src/plugins/lyrics/models.rs
+++ b/src-tauri/src/plugins/lyrics/models.rs
@@ -19,15 +19,3 @@ pub struct LyricsSearchResult {
     pub artist: String,
     pub source: String,
 }
-
-#[derive(Clone, Debug, Serialize)]
-pub struct LyricLinePayload {
-    pub timestamp_ms: u64,
-    pub text: String,
-}
-
-#[derive(Clone, Debug, Serialize)]
-pub struct LyricsLoadedPayload {
-    pub song_id: i64,
-    pub lines: Vec<LyricLinePayload>,
-}
diff --git a/src-tauri/src/plugins/lyrics/plugin.rs b/src-tauri/src/plugins/lyrics/plugin.rs
index b360ed6..3024aa6 100644
--- a/src-tauri/src/plugins/lyrics/plugin.rs
+++ b/src-tauri/src/plugins/lyrics/plugin.rs
@@ -14,18 +14,24 @@ use super::manifest::build_lyrics_manifest;
 use super::models::LyricDocument;
 use super::service::LyricsService;
 
+struct LyricsState {
+    song_id: Option<i64>,
+    lyrics: Option<LyricDocument>,
+}
+
 pub struct LyricsPlugin {
     cache: RwLock<Option<LyricsCacheService>>,
-    current_song_id: RwLock<Option<i64>>,
-    current_lyrics: RwLock<Option<LyricDocument>>,
+    state: RwLock<LyricsState>,
 }
 
 impl LyricsPlugin {
     pub fn new() -> Self {
         Self {
             cache: RwLock::new(None),
-            current_song_id: RwLock::new(None),
-            current_lyrics: RwLock::new(None),
+            state: RwLock::new(LyricsState {
+                song_id: None,
+                lyrics: None,
+            }),
         }
     }
 
@@ -54,27 +60,28 @@ impl LyricsPlugin {
             .unwrap_or_else(|_| std::path::PathBuf::from("."));
         let cache_dir = app_data.join("plugins").join("lyrics").join("cache");
         let svc = LyricsCacheService::new(cache_dir);
-        let _ = svc.init();
+        if let Err(e) = svc.init() {
+            eprintln!("[Lyrics] Failed to init cache: {}", e);
+        }
         *cache_lock = Some(svc);
     }
 
     fn handle_track_changed(
         &self,
         track_id: i64,
-        title: &str,
-        artist: &str,
         file_path: &str,
         ctx: &PluginContext,
     ) {
         {
-            let mut current = match self.current_song_id.write() {
+            let mut state = match self.state.write() {
                 Ok(guard) => guard,
                 Err(_) => return,
             };
-            if *current == Some(track_id) {
+            if state.song_id == Some(track_id) {
                 return;
             }
-            *current = Some(track_id);
+            state.song_id = Some(track_id);
+            state.lyrics = None;
         }
 
         let auto_search = Self::get_bool_setting(ctx, "auto_search");
@@ -94,8 +101,10 @@ impl LyricsPlugin {
         let path = std::path::Path::new(file_path);
         if let Some(doc) = LyricsService::load_or_fetch(cache, track_id, path) {
             self.emit_lyrics_loaded(ctx, &doc);
-            if let Ok(mut lyrics) = self.current_lyrics.write() {
-                *lyrics = Some(doc);
+            if let Ok(mut state) = self.state.write() {
+                if state.song_id == Some(track_id) {
+                    state.lyrics = Some(doc);
+                }
             }
         }
     }
@@ -112,15 +121,9 @@ impl LyricsPlugin {
                 })
                 .collect(),
         };
-        let _ = EventBus::emit_lyrics_loaded(&ctx.app_handle, payload);
-    }
-
-    fn cmd_search(&self, title: &str, artist: &str) -> Result<(), AppError> {
-        println!(
-            "[Lyrics] search request '{} - {}' (local file only, use lyrics.load with track_id)",
-            title, artist
-        );
-        Ok(())
+        if let Err(e) = EventBus::emit_lyrics_loaded(&ctx.app_handle, payload) {
+            eprintln!("[Lyrics] Failed to emit LyricsLoaded: {}", e);
+        }
     }
 
     fn cmd_load(&self, song_id: i64, ctx: &PluginContext) -> Result<(), AppError> {
@@ -134,13 +137,19 @@ impl LyricsPlugin {
             }
         };
 
-        let cache_guard = self.cache.read().map_err(|e| AppError::Plugin(e.to_string()))?;
-        let cache = cache_guard.as_ref().ok_or_else(|| AppError::Plugin("Cache not initialized".into()))?;
+        let cache_guard = self
+            .cache
+            .read()
+            .map_err(|e| AppError::Plugin(e.to_string()))?;
+        let cache = cache_guard
+            .as_ref()
+            .ok_or_else(|| AppError::Plugin("Cache not initialized".into()))?;
 
         if let Some(doc) = LyricsService::load_or_fetch(cache, song_id, &path) {
             self.emit_lyrics_loaded(ctx, &doc);
-            if let Ok(mut lyrics) = self.current_lyrics.write() {
-                *lyrics = Some(doc);
+            if let Ok(mut state) = self.state.write() {
+                state.song_id = Some(song_id);
+                state.lyrics = Some(doc);
             }
             return Ok(());
         }
@@ -164,11 +173,9 @@ impl Plugin for LyricsPlugin {
     }
 
     fn deactivate(&self) -> Result<(), AppError> {
-        if let Ok(mut lyrics) = self.current_lyrics.write() {
-            *lyrics = None;
-        }
-        if let Ok(mut song_id) = self.current_song_id.write() {
-            *song_id = None;
+        if let Ok(mut state) = self.state.write() {
+            state.song_id = None;
+            state.lyrics = None;
         }
         Ok(())
     }
@@ -176,17 +183,9 @@ impl Plugin for LyricsPlugin {
     fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), AppError> {
         match event {
             PluginEvent::TrackChanged { track, .. } => {
-                self.handle_track_changed(
-                    track.id,
-                    &track.title,
-                    track.artist.as_deref().unwrap_or(""),
-                    &track.path,
-                    ctx,
-                );
-            }
-            PluginEvent::Startup => {
-                println!("[Lyrics] Plugin started");
+                self.handle_track_changed(track.id, &track.path, ctx);
             }
+            PluginEvent::Startup => {}
             _ => {}
         }
         Ok(())
@@ -201,7 +200,8 @@ impl Plugin for LyricsPlugin {
         match command_id {
             "lyrics.search" => {
                 if let CommandArgs::LyricsSearch { title, artist } = args {
-                    self.cmd_search(title, artist)
+                    println!("[Lyrics] search '{} - {}' (local only)", title, artist);
+                    Ok(())
                 } else {
                     Err(AppError::Plugin(
                         "lyrics.search requires LyricsSearch args".into(),
@@ -223,7 +223,6 @@ impl Plugin for LyricsPlugin {
                             .map_err(|e| AppError::Plugin(e.to_string()))?;
                     }
                 }
-                println!("[Lyrics] Cache cleared");
                 Ok(())
             }
             _ => Err(AppError::Plugin(format!(
diff --git a/src-tauri/src/plugins/lyrics/service.rs b/src-tauri/src/plugins/lyrics/service.rs
index 760c7d1..950b8cd 100644
--- a/src-tauri/src/plugins/lyrics/service.rs
+++ b/src-tauri/src/plugins/lyrics/service.rs
@@ -45,7 +45,9 @@ impl LyricsService {
 
         let doc = Self::read_from_file(file_path, song_id)?;
 
-        let _ = cache.save(song_id, &doc);
+        if let Err(e) = cache.save(song_id, &doc) {
+            eprintln!("[Lyrics] Failed to cache lyrics for song {}: {}", song_id, e);
+        }
 
         Some(doc)
     }
@@ -79,16 +81,33 @@ impl LyricsService {
 
     fn parse_lrc_timestamp(tag: &str) -> Option<u64> {
         let parts: Vec<&str> = tag.split(':').collect();
-        if parts.len() != 2 {
-            return None;
-        }
-        let minutes: u64 = parts[0].parse().ok()?;
-        let sec_parts: Vec<&str> = parts[1].split('.').collect();
+
+        let (hours, minutes, sec_str) = match parts.len() {
+            2 => (0u64, parts[0].parse::<u64>().ok()?, parts[1]),
+            3 => (
+                parts[0].parse::<u64>().ok()?,
+                parts[1].parse::<u64>().ok()?,
+                parts[2],
+            ),
+            _ => return None,
+        };
+
+        let sec_parts: Vec<&str> = sec_str.split('.').collect();
         if sec_parts.len() != 2 {
             return None;
         }
+
         let seconds: u64 = sec_parts[0].parse().ok()?;
-        let centiseconds: u64 = sec_parts[1].parse().ok()?;
-        Some(minutes * 60_000 + seconds * 1_000 + centiseconds * 10)
+        let frac_str = sec_parts[1];
+        let frac_value: u64 = frac_str.parse().ok()?;
+
+        let milliseconds = match frac_str.len() {
+            1 => frac_value * 100,
+            2 => frac_value * 10,
+            3 => frac_value,
+            _ => frac_value,
+        };
+
+        Some(hours * 3_600_000 + minutes * 60_000 + seconds * 1_000 + milliseconds)
     }
 }
diff --git a/src-tauri/src/services/plugin/registry.rs b/src-tauri/src/services/plugin/registry.rs
deleted file mode 100644
index 5852994..0000000
--- a/src-tauri/src/services/plugin/registry.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
-
-use crate::services::plugin::traits::Plugin;
-
-pub struct PluginRegistry {
-    plugins: RwLock<HashMap<String, Arc<dyn Plugin>>>,
-}
-
-impl PluginRegistry {
-    pub fn new() -> Self {
-        Self {
-            plugins: RwLock::new(HashMap::new()),
-        }
-    }
-
-    pub fn register(&self, plugin: Arc<dyn Plugin>) -> Result<(), String> {
-        let id = plugin.manifest().id.clone();
-        let mut plugins = self.plugins.write().map_err(|e| e.to_string())?;
-        if plugins.contains_key(&id) {
-            return Err(format!("Plugin '{}' is already registered", id));
-        }
-        plugins.insert(id, plugin);
-        Ok(())
-    }
-
-    pub fn unregister(&self, id: &str) -> Option<Arc<dyn Plugin>> {
-        let mut plugins = self.plugins.write().ok()?;
-        plugins.remove(id)
-    }
-
-    pub fn get(&self, id: &str) -> Option<Arc<dyn Plugin>> {
-        let plugins = self.plugins.read().ok()?;
-        plugins.get(id).cloned()
-    }
-
-    pub fn contains(&self, id: &str) -> bool {
-        let plugins = match self.plugins.read() {
-            Ok(guard) => guard,
-            Err(_) => return false,
-        };
-        plugins.contains_key(id)
-    }
-
-    pub fn list(&self) -> Vec<Arc<dyn Plugin>> {
-        let plugins = match self.plugins.read() {
-            Ok(guard) => guard,
-            Err(_) => return Vec::new(),
-        };
-        plugins.values().cloned().collect()
-    }
-
-    pub fn count(&self) -> usize {
-        let plugins = match self.plugins.read() {
-            Ok(guard) => guard,
-            Err(_) => return 0,
-        };
-        plugins.len()
-    }
-}
diff --git a/src/lib/state/player.svelte.ts b/src/lib/state/player.svelte.ts
index 154b933..9177537 100644
--- a/src/lib/state/player.svelte.ts
+++ b/src/lib/state/player.svelte.ts
@@ -6,12 +6,11 @@ import { lyrics } from "./lyrics.svelte"
 import { recentlyPlayed } from "./recent.svelte"
 
 class Player {
-    queue = $state<PlaybackQueue & { version: number }>({
+    queue = $state<PlaybackQueue>({
         tracks: [],
         currentIndex: null,
         playMode: 'ListLoop',
         history: [],
-        version: 0
     })
 
     playing = $state(false)
@@ -199,10 +198,8 @@ class Player {
         await this.#setupPlaybackListeners()
 
         try {
-            const queue = await invoke<PlaybackQueue & { version: number }>('get_playback_queue')
-            if (queue.version >= this.queue.version) {
-                this.queue = queue
-            }
+            const queue = await invoke<PlaybackQueue>('get_playback_queue')
+            this.queue = queue
 
             const status = await invoke<PlaybackStatusSnapshot>('get_current_status')
             this.playing = status.playing
@@ -260,9 +257,7 @@ class Player {
                 break
 
             case 'QueueChanged':
-                if (data.version >= this.queue.version) {
-                    this.queue = data
-                }
+                this.queue = data
                 break
 
             case 'PlaybackStateChanged':
diff --git a/src/lib/types/playback.ts b/src/lib/types/playback.ts
index 07db865..8c27a8d 100644
--- a/src/lib/types/playback.ts
+++ b/src/lib/types/playback.ts
@@ -26,7 +26,6 @@ export type PlaybackStatePayload = {
 export type PlaybackTrackStartedPayload = {
     track: Track
     index: number
-    version: number
 }
 
 export type BackendQueueTrack = Omit<Track, 'cover'>
\ No newline at end of file

From b271dff28bb35f0301dfd215526f6e112886ba80 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Mon, 8 Jun 2026 19:07:13 +0800
Subject: [PATCH 33/39] Add plugin settings, migration and code cleanup

- Backend: Implement path canonicalization and boundary validation for track file deletions
- Queue: Trigger emit_queue_changed on next-play insertion to fix frontend stale drawer state
- Settings: Apply optimistic UI updates in local state to prevent synchronization desync
- Assets: Remove redundant material-symbols fonts and consolidate icon strategy onto mdui
---
 package.json                                  |   1 -
 pnpm-lock.yaml                                |   8 --
 src-tauri/migrations/0002_extend_settings.sql |   5 +
 src-tauri/src/audio/engine.rs                 |   2 +-
 src-tauri/src/audio/mod.rs                    |   6 +-
 src-tauri/src/audio/state.rs                  |   6 +-
 src-tauri/src/audio/web_audio.rs              |  12 +-
 src-tauri/src/commands/library.rs             |  45 ++++---
 src-tauri/src/commands/playback.rs            |  22 ++--
 src-tauri/src/commands/playback_queue.rs      |   4 +-
 src-tauri/src/commands/playlists.rs           |  61 +++-------
 src-tauri/src/commands/recent.rs              |  10 +-
 src-tauri/src/commands/settings.rs            |  22 ++--
 src-tauri/src/commands/tracks.rs              |  37 ++----
 src-tauri/src/db/manager.rs                   |  11 +-
 src-tauri/src/events/bus.rs                   |  12 +-
 src-tauri/src/events/mod.rs                   |   2 +-
 src-tauri/src/events/payloads.rs              |   8 +-
 src-tauri/src/lib.rs                          |  49 ++++----
 src-tauri/src/models/mod.rs                   |  14 ++-
 src-tauri/src/models/playback.rs              |   3 +-
 src-tauri/src/models/playback_queue.rs        |  44 ++-----
 src-tauri/src/models/recent.rs                |   2 +-
 src-tauri/src/models/settings.rs              |  52 +++++++-
 src-tauri/src/plugins/lyrics/manifest.rs      |   6 +-
 src-tauri/src/plugins/lyrics/plugin.rs        |  18 +--
 src-tauri/src/plugins/lyrics/service.rs       |  10 +-
 src-tauri/src/repositories/mod.rs             |   2 +-
 .../sqlite/playlist_repository.rs             |  36 ++++--
 .../repositories/sqlite/recent_repository.rs  |  43 ++++---
 .../sqlite/settings_repository.rs             |  59 ++++++++-
 .../repositories/sqlite/track_repository.rs   |   7 +-
 src-tauri/src/services/playback_service.rs    |  31 +++--
 src-tauri/src/services/playlist_service.rs    |  22 +++-
 .../plugin/adapters/library_adapter.rs        |   6 +-
 .../plugin/adapters/player_adapter.rs         |  15 ++-
 .../adapters/plugin_settings_adapter.rs       |   5 +-
 .../services/plugin/adapters/queue_adapter.rs |  18 ++-
 .../plugin/adapters/settings_adapter.rs       |   9 +-
 .../plugin/capability/permission_checker.rs   |  15 +--
 .../plugin/capability/plugin_capability.rs    |   6 +-
 src-tauri/src/services/plugin/context.rs      |   4 +-
 src-tauri/src/services/plugin/events.rs       |  15 ++-
 src-tauri/src/services/plugin/loader.rs       |   7 +-
 src-tauri/src/services/plugin/manager.rs      | 113 ++++++++----------
 src-tauri/src/services/plugin/manifest.rs     |   6 +-
 src-tauri/src/services/plugin/mod.rs          |   6 +-
 src-tauri/src/services/plugin/model/errors.rs |   2 -
 .../services/plugin/model/plugin_identity.rs  |  16 ++-
 .../plugin/registry/command_registry.rs       |   6 +-
 .../plugin/registry/plugin_registry.rs        |   6 +-
 .../services/plugin/settings/persistence.rs   |  20 ++--
 .../plugin/settings/settings_registry.rs      |   9 +-
 src-tauri/src/services/recent_service.rs      |   8 +-
 src-tauri/src/services/settings_service.rs    |  18 ++-
 src-tauri/src/services/track_service.rs       |   2 +-
 src-tauri/src/state/playback_state.rs         |  34 +++---
 src/app.css                                   |   1 -
 src/lib/features/LyricsPanel.svelte           |  10 +-
 src/lib/features/shell/Appbar.svelte          |   2 +-
 src/lib/state/settings.svelte.ts              |   6 +-
 src/lib/types/music.ts                        |   1 -
 src/routes/album/+page.svelte                 |   9 +-
 src/routes/plugins/+page.svelte               |   4 +-
 src/routes/plugins/detail/+page.svelte        |   3 +-
 65 files changed, 558 insertions(+), 496 deletions(-)
 create mode 100644 src-tauri/migrations/0002_extend_settings.sql

diff --git a/package.json b/package.json
index d9d27fa..2ad79ea 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
     "@tauri-apps/plugin-dialog": "~2.7.1",
     "@tauri-apps/plugin-opener": "^2.5.4",
     "@tauri-apps/plugin-store": "^2.4.3",
-    "material-symbols": "^0.43.0",
     "mdui": "^2.1.4",
     "tailwindcss": "^4.3.0"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6e792dd..fc60806 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,9 +26,6 @@ importers:
       '@tauri-apps/plugin-store':
         specifier: ^2.4.3
         version: 2.4.3
-      material-symbols:
-        specifier: ^0.43.0
-        version: 0.43.0
       mdui:
         specifier: ^2.1.4
         version: 2.1.4
@@ -826,9 +823,6 @@ packages:
   magic-string@0.30.21:
     resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
-  material-symbols@0.43.0:
-    resolution: {integrity: sha512-40zgnHCv6d+Nx/9WQ6vhZitQoqtntgZNXN1YJGyn1NJRQLoB7lWWD8vpu/i68nKtZs8OxHyMudBEkS2mrUHiqQ==}
-
   mdui@2.1.4:
     resolution: {integrity: sha512-QtK5xia5HXtVO7yH30QjwvvNruw5JdrJL1MEc1k6S/ZfsbHOj6BxxdYjrdv2HiN5ikkGqt5CIbZdFyq6shaZyw==}
 
@@ -1526,8 +1520,6 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  material-symbols@0.43.0: {}
-
   mdui@2.1.4:
     dependencies:
       '@floating-ui/utils': 0.2.11
diff --git a/src-tauri/migrations/0002_extend_settings.sql b/src-tauri/migrations/0002_extend_settings.sql
new file mode 100644
index 0000000..6cc93a1
--- /dev/null
+++ b/src-tauri/migrations/0002_extend_settings.sql
@@ -0,0 +1,5 @@
+ALTER TABLE settings ADD COLUMN use_album_artist_grouping INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE settings ADD COLUMN plugin_dirs TEXT NOT NULL DEFAULT '[]';
+ALTER TABLE settings ADD COLUMN plugin_dev_mode INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE settings ADD COLUMN plugin_scan_on_startup INTEGER NOT NULL DEFAULT 1;
+ALTER TABLE settings ADD COLUMN plugin_log_level TEXT NOT NULL DEFAULT 'warn';
diff --git a/src-tauri/src/audio/engine.rs b/src-tauri/src/audio/engine.rs
index 4392224..c6137c9 100644
--- a/src-tauri/src/audio/engine.rs
+++ b/src-tauri/src/audio/engine.rs
@@ -8,4 +8,4 @@ pub trait AudioEngine: Send {
     fn set_pan(&self, pan: f32);
     fn current_time(&self) -> f64;
     fn paused(&self) -> bool;
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/audio/mod.rs b/src-tauri/src/audio/mod.rs
index 57fd9e4..d833d70 100644
--- a/src-tauri/src/audio/mod.rs
+++ b/src-tauri/src/audio/mod.rs
@@ -1,12 +1,12 @@
 pub mod engine;
-pub mod web_audio;
 pub mod state;
+pub mod web_audio;
 
 pub use engine::AudioEngine;
+pub use state::{init_audio_state, lock_audio_state, AudioState};
 pub use web_audio::WebAudioEngine;
-pub use state::{AudioState, init_audio_state, lock_audio_state};
 use web_audio_api::context::AudioContext;
 
 pub fn get_audio_context() -> AudioContext {
     AudioContext::default()
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/audio/state.rs b/src-tauri/src/audio/state.rs
index c3ad44e..0a3567c 100644
--- a/src-tauri/src/audio/state.rs
+++ b/src-tauri/src/audio/state.rs
@@ -1,7 +1,7 @@
-use std::sync::{Mutex, MutexGuard, OnceLock};
 use crate::audio::engine::AudioEngine;
 use crate::errors::AppError;
 use crate::models::PlaybackQueue;
+use std::sync::{Mutex, MutexGuard, OnceLock};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum PlayMode {
@@ -31,7 +31,7 @@ impl AudioState {
             Err(AppError::from("Audio engine is missing"))
         }
     }
-    
+
     pub fn play_mode(&self) -> PlayMode {
         self.playback_queue.play_mode
     }
@@ -62,4 +62,4 @@ pub fn lock_audio_state() -> Result<MutexGuard<'static, AudioState>, AppError> {
         .ok_or_else(|| AppError::from("Audio state not initialized"))?
         .lock()
         .map_err(|_| AppError::from("Failed to lock audio state"))
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/audio/web_audio.rs b/src-tauri/src/audio/web_audio.rs
index c23ee7e..e838457 100644
--- a/src-tauri/src/audio/web_audio.rs
+++ b/src-tauri/src/audio/web_audio.rs
@@ -1,10 +1,12 @@
+use crate::audio::engine::AudioEngine;
+use crate::audio::get_audio_context;
+use crate::errors::AppError;
 use std::path::Path;
 use web_audio_api::{
-    MediaElement, context::BaseAudioContext, node::{AudioNode, GainNode, MediaElementAudioSourceNode, StereoPannerNode}
+    context::BaseAudioContext,
+    node::{AudioNode, GainNode, MediaElementAudioSourceNode, StereoPannerNode},
+    MediaElement,
 };
-use crate::errors::AppError;
-use crate::audio::engine::AudioEngine;
-use crate::audio::get_audio_context;
 
 pub struct WebAudioEngine {
     media: MediaElement,
@@ -81,4 +83,4 @@ impl Drop for WebAudioEngine {
         let _ = self.src.disconnect();
         self.media.pause();
     }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index c88ae47..d108f79 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -70,7 +70,10 @@ pub fn execute_scan(dirs: Vec<String>) -> Result<Vec<NewTrack>, AppError> {
     Ok(all_tracks)
 }
 
-async fn upsert_scanned_tracks(state: &AppState, tracks: Vec<NewTrack>) -> Result<Vec<Track>, AppError> {
+async fn upsert_scanned_tracks(
+    state: &AppState,
+    tracks: Vec<NewTrack>,
+) -> Result<Vec<Track>, AppError> {
     let mut saved = Vec::with_capacity(tracks.len());
 
     for track in tracks {
@@ -97,17 +100,12 @@ pub fn get_track_cover(full_path: String) -> Result<Option<String>, AppError> {
         .primary_tag()
         .or_else(|| tagged_file.first_tag());
 
-    let cover = tag
-        .and_then(|t| t.pictures().first())
-        .map(|pic| {
-            let b64_encoded = general_purpose::STANDARD.encode(pic.data());
-            let mime_type = pic
-                .mime_type()
-                .map(|m| m.as_str())
-                .unwrap_or("image/jpeg");
+    let cover = tag.and_then(|t| t.pictures().first()).map(|pic| {
+        let b64_encoded = general_purpose::STANDARD.encode(pic.data());
+        let mime_type = pic.mime_type().map(|m| m.as_str()).unwrap_or("image/jpeg");
 
-            format!("data:{};base64,{}", mime_type, b64_encoded)
-        });
+        format!("data:{};base64,{}", mime_type, b64_encoded)
+    });
 
     Ok(cover)
 }
@@ -167,8 +165,7 @@ pub async fn delete_track_file(
 ) -> Result<(), AppError> {
     // 1. 验证并删除物理文件
     let file_path = validate_audio_path(&path)?;
-    trash::delete(file_path)
-        .map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
+    trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
 
     remove_track_from_queue(app_handle, track_id).await?;
 
@@ -207,9 +204,9 @@ pub async fn delete_track_files(paths: Vec<String>) -> Result<(), AppError> {
             return Err(format!("拒绝删除非音频文件: {}", path).into());
         }
 
-    tokio::fs::remove_file(file_path)
-        .await
-        .map_err(|e| format!("删除文件失败 {}: {}", path, e))?;
+        tokio::fs::remove_file(file_path)
+            .await
+            .map_err(|e| format!("删除文件失败 {}: {}", path, e))?;
     }
 
     Ok(())
@@ -226,9 +223,7 @@ pub async fn scan_track_directories(
 }
 
 #[command]
-pub async fn load_track_library(
-    state: State<'_, AppState>,
-) -> Result<Vec<Track>, AppError> {
+pub async fn load_track_library(state: State<'_, AppState>) -> Result<Vec<Track>, AppError> {
     let tracks = state.tracks.list_tracks().await?;
 
     if tracks.is_empty() {
@@ -238,13 +233,15 @@ pub async fn load_track_library(
     Ok(tracks)
 }
 
-async fn rebuild_and_get_library(
-    state: &AppState,
-) -> Result<Vec<Track>, AppError> {
-    let settings = state.settings.get_settings().await.map_err(|error| error.to_string())?;
+async fn rebuild_and_get_library(state: &AppState) -> Result<Vec<Track>, AppError> {
+    let settings = state
+        .settings
+        .get_settings()
+        .await
+        .map_err(|error| error.to_string())?;
     let scanned = tauri::async_runtime::spawn_blocking(move || execute_scan(settings.library_dirs))
         .await
         .map_err(|e| e.to_string())??;
     let tracks = upsert_scanned_tracks(state, scanned).await?;
     Ok(tracks)
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index 421ba07..c110157 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -1,4 +1,3 @@
-use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
 use crate::errors::AppError;
 use crate::events::{AppEvent, EventBus};
@@ -6,8 +5,10 @@ use crate::models::playback::PlaybackStatusSnapshot;
 use crate::models::Track;
 use crate::services::playback_service::PlaybackService;
 use crate::state::playback_state::{
-    current_playback_snapshot, current_time_from_state, lock_audio_state, sanitize_track, with_audio_state
+    current_playback_snapshot, current_time_from_state, lock_audio_state, sanitize_track,
+    with_audio_state,
 };
+use tauri::{command, AppHandle};
 
 pub use crate::services::media_control_service::handle_media_control_event;
 
@@ -36,21 +37,18 @@ pub async fn sync_playback_queue(
 }
 
 #[command]
-pub async fn remove_track_from_queue(
-    app_handle: AppHandle,
-    track_id: i64,
-) -> Result<(), AppError> {
-    PlaybackService::new(app_handle).remove_track_from_queue(track_id).await
+pub async fn remove_track_from_queue(app_handle: AppHandle, track_id: i64) -> Result<(), AppError> {
+    PlaybackService::new(app_handle)
+        .remove_track_from_queue(track_id)
+        .await
 }
 
 #[command]
-pub async fn insert_track_as_next(
-    _app_handle: AppHandle,
-    track: Track,
-) -> Result<(), AppError> {
+pub async fn insert_track_as_next(app_handle: AppHandle, track: Track) -> Result<(), AppError> {
     with_audio_state(|state| {
         state.playback_queue.insert_next(track);
     })?;
+    PlaybackService::emit_queue_changed(&app_handle)?;
     Ok(())
 }
 
@@ -126,7 +124,7 @@ pub async fn set_current_time(app_handle: AppHandle, time: f64) -> Result<(), Ap
 #[command]
 pub async fn set_volume(app_handle: tauri::AppHandle, volume: f32) -> Result<(), AppError> {
     let mut state = lock_audio_state()?;
-    let safe_volume = (volume/ 100.0).clamp(0.0, 1.0);
+    let safe_volume = (volume / 100.0).clamp(0.0, 1.0);
 
     state.volume = safe_volume;
 
diff --git a/src-tauri/src/commands/playback_queue.rs b/src-tauri/src/commands/playback_queue.rs
index a645443..3ab2a5f 100644
--- a/src-tauri/src/commands/playback_queue.rs
+++ b/src-tauri/src/commands/playback_queue.rs
@@ -1,9 +1,9 @@
-use tauri::{command, AppHandle};
 use crate::audio::state::PlayMode;
 use crate::errors::AppError;
 use crate::models::{PlaybackQueue, Track};
 use crate::services::playback_service::PlaybackService;
 use crate::state::playback_state::{lock_audio_state, with_audio_state};
+use tauri::{command, AppHandle};
 
 #[command]
 pub fn get_playback_queue() -> Result<PlaybackQueue, AppError> {
@@ -55,4 +55,4 @@ pub async fn replace_playlist_and_play(
     PlaybackService::emit_queue_changed(&app_handle)?;
     PlaybackService::new(app_handle).play_queue_index(play_index)?;
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/commands/playlists.rs b/src-tauri/src/commands/playlists.rs
index 3133fea..7d72d8b 100644
--- a/src-tauri/src/commands/playlists.rs
+++ b/src-tauri/src/commands/playlists.rs
@@ -1,7 +1,9 @@
-use tauri::{State, command};
+use tauri::{command, State};
 
 use crate::errors::AppError;
-use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
+use crate::models::{
+    AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist,
+};
 use crate::state::AppState;
 
 #[command]
@@ -9,10 +11,7 @@ pub async fn create_playlist(
     state: State<'_, AppState>,
     playlist: NewPlaylist,
 ) -> Result<Playlist, AppError> {
-    state
-        .playlists
-        .create_playlist(playlist)
-        .await
+    state.playlists.create_playlist(playlist).await
 }
 
 #[command]
@@ -20,21 +19,12 @@ pub async fn rename_playlist(
     state: State<'_, AppState>,
     playlist: RenamePlaylist,
 ) -> Result<Playlist, AppError> {
-    state
-        .playlists
-        .rename_playlist(playlist)
-        .await
+    state.playlists.rename_playlist(playlist).await
 }
 
 #[command]
-pub async fn delete_playlist(
-    state: State<'_, AppState>,
-    id: i64,
-) -> Result<(), AppError> {
-    state
-        .playlists
-        .delete_playlist(id)
-        .await
+pub async fn delete_playlist(state: State<'_, AppState>, id: i64) -> Result<(), AppError> {
+    state.playlists.delete_playlist(id).await
 }
 
 #[command]
@@ -42,28 +32,19 @@ pub async fn get_playlist(
     state: State<'_, AppState>,
     id: i64,
 ) -> Result<Option<Playlist>, AppError> {
-    state
-        .playlists
-        .get_playlist(id)
-        .await
+    state.playlists.get_playlist(id).await
 }
 
 #[command]
 pub async fn list_playlists(state: State<'_, AppState>) -> Result<Vec<Playlist>, AppError> {
-    state
-        .playlists
-        .list_playlists()
-        .await
+    state.playlists.list_playlists().await
 }
 
 #[command]
 pub async fn list_playlists_with_tracks(
     state: State<'_, AppState>,
 ) -> Result<Vec<PlaylistWithTracks>, AppError> {
-    state
-        .playlists
-        .list_playlists_with_tracks()
-        .await
+    state.playlists.list_playlists_with_tracks().await
 }
 
 #[command]
@@ -71,10 +52,7 @@ pub async fn get_playlist_with_tracks(
     state: State<'_, AppState>,
     id: i64,
 ) -> Result<Option<PlaylistWithTracks>, AppError> {
-    state
-        .playlists
-        .get_playlist_with_tracks(id)
-        .await
+    state.playlists.get_playlist_with_tracks(id).await
 }
 
 #[command]
@@ -82,10 +60,7 @@ pub async fn add_track_to_playlist(
     state: State<'_, AppState>,
     track: AddPlaylistTrack,
 ) -> Result<PlaylistTrack, AppError> {
-    state
-        .playlists
-        .add_track(track)
-        .await
+    state.playlists.add_track(track).await
 }
 
 #[command]
@@ -94,10 +69,7 @@ pub async fn remove_track_from_playlist(
     playlist_id: i64,
     track_id: i64,
 ) -> Result<(), AppError> {
-    state
-        .playlists
-        .remove_track(playlist_id, track_id)
-        .await
+    state.playlists.remove_track(playlist_id, track_id).await
 }
 
 #[command]
@@ -105,10 +77,7 @@ pub async fn clear_playlist_tracks(
     state: State<'_, AppState>,
     playlist_id: i64,
 ) -> Result<(), AppError> {
-    state
-        .playlists
-        .clear_tracks(playlist_id)
-        .await
+    state.playlists.clear_tracks(playlist_id).await
 }
 
 #[command]
diff --git a/src-tauri/src/commands/recent.rs b/src-tauri/src/commands/recent.rs
index 7b4b122..343a14c 100644
--- a/src-tauri/src/commands/recent.rs
+++ b/src-tauri/src/commands/recent.rs
@@ -10,10 +10,7 @@ pub async fn load_recently_played(
     limit: i64,
     offset: i64,
 ) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
-    state
-        .recent
-        .load(limit, offset)
-        .await
+    state.recent.load(limit, offset).await
 }
 
 #[command]
@@ -22,10 +19,7 @@ pub async fn add_recently_played(
     track_id: i64,
     played_at: String,
 ) -> Result<(), AppError> {
-    state
-        .recent
-        .add(track_id, played_at)
-        .await
+    state.recent.add(track_id, played_at).await
 }
 
 #[command]
diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs
index c5544b3..9a43fd1 100644
--- a/src-tauri/src/commands/settings.rs
+++ b/src-tauri/src/commands/settings.rs
@@ -1,8 +1,8 @@
-use tauri::{State, command, AppHandle};
 use crate::errors::AppError;
 use crate::events::{AppEvent, EventBus};
 use crate::models::AppSettings;
 use crate::state::AppState;
+use tauri::{command, AppHandle, State};
 
 #[command]
 pub async fn get_settings(state: State<'_, AppState>) -> Result<AppSettings, AppError> {
@@ -16,9 +16,12 @@ pub async fn update_settings(
     settings: AppSettings,
 ) -> Result<AppSettings, AppError> {
     let updated_settings = state.settings.update_settings(settings).await?;
-    
-    EventBus::emit(&app_handle, AppEvent::SettingsChanged(updated_settings.clone()))?;
-    
+
+    EventBus::emit(
+        &app_handle,
+        AppEvent::SettingsChanged(updated_settings.clone()),
+    )?;
+
     Ok(updated_settings)
 }
 
@@ -34,8 +37,11 @@ pub async fn save_settings(
     settings: AppSettings,
 ) -> Result<AppSettings, AppError> {
     let updated_settings = state.settings.update_settings(settings).await?;
-    
-    EventBus::emit(&app_handle, AppEvent::SettingsChanged(updated_settings.clone()))?;
-    
+
+    EventBus::emit(
+        &app_handle,
+        AppEvent::SettingsChanged(updated_settings.clone()),
+    )?;
+
     Ok(updated_settings)
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/commands/tracks.rs b/src-tauri/src/commands/tracks.rs
index aabb56b..0d35e5b 100644
--- a/src-tauri/src/commands/tracks.rs
+++ b/src-tauri/src/commands/tracks.rs
@@ -1,22 +1,16 @@
-use tauri::{State, command};
+use tauri::{command, State};
 
 use crate::errors::AppError;
 use crate::models::{NewTrack, Track, TrackSearchQuery, UpdateTrack};
 use crate::state::AppState;
 
 #[command]
-pub async fn create_track(
-    state: State<'_, AppState>,
-    track: NewTrack,
-) -> Result<Track, AppError> {
+pub async fn create_track(state: State<'_, AppState>, track: NewTrack) -> Result<Track, AppError> {
     state.tracks.create_track(track).await
 }
 
 #[command]
-pub async fn upsert_track(
-    state: State<'_, AppState>,
-    track: NewTrack,
-) -> Result<Track, AppError> {
+pub async fn upsert_track(state: State<'_, AppState>, track: NewTrack) -> Result<Track, AppError> {
     state.tracks.upsert_track(track).await
 }
 
@@ -29,10 +23,7 @@ pub async fn update_track(
 }
 
 #[command]
-pub async fn delete_track(
-    state: State<'_, AppState>,
-    id: i64,
-) -> Result<(), AppError> {
+pub async fn delete_track(state: State<'_, AppState>, id: i64) -> Result<(), AppError> {
     state.tracks.delete_track(id).await
 }
 
@@ -41,17 +32,11 @@ pub async fn delete_track_by_path(
     state: State<'_, AppState>,
     path: String,
 ) -> Result<(), AppError> {
-    state
-        .tracks
-        .delete_track_by_path(&path)
-        .await
+    state.tracks.delete_track_by_path(&path).await
 }
 
 #[command]
-pub async fn get_track(
-    state: State<'_, AppState>,
-    id: i64,
-) -> Result<Option<Track>, AppError> {
+pub async fn get_track(state: State<'_, AppState>, id: i64) -> Result<Option<Track>, AppError> {
     state.tracks.get_track(id).await
 }
 
@@ -60,10 +45,7 @@ pub async fn get_track_by_path(
     state: State<'_, AppState>,
     path: String,
 ) -> Result<Option<Track>, AppError> {
-    state
-        .tracks
-        .get_track_by_path(&path)
-        .await
+    state.tracks.get_track_by_path(&path).await
 }
 
 #[command]
@@ -85,8 +67,5 @@ pub async fn mark_track_played(
     id: i64,
     played_at: String,
 ) -> Result<(), AppError> {
-    state
-        .tracks
-        .mark_track_played(id, played_at)
-        .await
+    state.tracks.mark_track_played(id, played_at).await
 }
diff --git a/src-tauri/src/db/manager.rs b/src-tauri/src/db/manager.rs
index dfa4a46..bc64f8a 100644
--- a/src-tauri/src/db/manager.rs
+++ b/src-tauri/src/db/manager.rs
@@ -18,7 +18,9 @@ impl DatabaseManager {
         if let Some(parent) = database_path.parent() {
             let exists = tokio::fs::try_exists(parent).await.unwrap_or(false);
             if !exists {
-                tokio::fs::create_dir_all(parent).await.map_err(AppError::from)?;
+                tokio::fs::create_dir_all(parent)
+                    .await
+                    .map_err(AppError::from)?;
             }
         }
 
@@ -50,10 +52,7 @@ impl DatabaseManager {
 }
 
 fn database_path(app_handle: &tauri::AppHandle) -> Result<PathBuf, AppError> {
-    let app_data_path = app_handle
-        .path()
-        .app_data_dir()
-        .map_err(AppError::from)?;
+    let app_data_path = app_handle.path().app_data_dir().map_err(AppError::from)?;
 
     Ok(app_data_path.join("music.sqlite"))
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/events/bus.rs b/src-tauri/src/events/bus.rs
index f31055d..599e3f0 100644
--- a/src-tauri/src/events/bus.rs
+++ b/src-tauri/src/events/bus.rs
@@ -1,7 +1,4 @@
-use tauri::{
-    AppHandle,
-    Emitter,
-};
+use tauri::{AppHandle, Emitter};
 
 use crate::{
     errors::AppError,
@@ -13,10 +10,7 @@ pub struct EventBus;
 impl EventBus {
     pub const CHANNEL: &'static str = "global-app-event";
 
-    pub fn emit(
-        app_handle: &AppHandle,
-        event: AppEvent,
-    ) -> Result<(), AppError> {
+    pub fn emit(app_handle: &AppHandle, event: AppEvent) -> Result<(), AppError> {
         app_handle.emit(Self::CHANNEL, event)?;
         Ok(())
     }
@@ -27,4 +21,4 @@ impl EventBus {
     ) -> Result<(), AppError> {
         Self::emit(app_handle, AppEvent::LyricsLoaded(payload))
     }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/events/mod.rs b/src-tauri/src/events/mod.rs
index 1acf885..125b679 100644
--- a/src-tauri/src/events/mod.rs
+++ b/src-tauri/src/events/mod.rs
@@ -2,4 +2,4 @@ pub mod bus;
 pub mod payloads;
 
 pub use bus::*;
-pub use payloads::*;
\ No newline at end of file
+pub use payloads::*;
diff --git a/src-tauri/src/events/payloads.rs b/src-tauri/src/events/payloads.rs
index e56ef31..e699c54 100644
--- a/src-tauri/src/events/payloads.rs
+++ b/src-tauri/src/events/payloads.rs
@@ -1,10 +1,6 @@
 use serde::Serialize;
 
-use crate::models::{
-    AppSettings,
-    PlaybackQueue,
-    Track,
-};
+use crate::models::{AppSettings, PlaybackQueue, Track};
 
 #[derive(Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -56,4 +52,4 @@ pub enum AppEvent {
     TrackStarted(TrackStartedPayload),
 
     LyricsLoaded(LyricsLoadedPayload),
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 892dec2..307047b 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -2,6 +2,7 @@ mod audio;
 mod commands;
 mod db;
 mod errors;
+mod events;
 mod media_controls;
 mod metadata;
 mod models;
@@ -9,7 +10,6 @@ mod plugins;
 mod repositories;
 mod services;
 mod state;
-mod events;
 
 use std::sync::Arc;
 
@@ -27,8 +27,7 @@ use commands::library::{
 use commands::playback::{
     current_time, get_current_status, insert_track_as_next, pause_track, play_next_track,
     play_previous_track, play_queue_track, play_track, remove_track_from_queue, resume_track,
-    set_current_time, set_volume, stop_track, sync_playback_queue,
-    toggle_track,
+    set_current_time, set_volume, stop_track, sync_playback_queue, toggle_track,
 };
 use services::playback_service::PlaybackService;
 
@@ -52,13 +51,13 @@ use repositories::sqlite::{
     SqlitePlaylistRepository, SqliteRecentRepository, SqliteSettingsRepository,
     SqliteTrackRepository,
 };
-use services::{PlaylistService, RecentService, SettingsService, TrackService};
-use services::plugin::PluginManager;
-use services::plugin::capability::CapabilityRegistry;
 use services::plugin::capability::permission_checker::PermissionChecker;
+use services::plugin::capability::CapabilityRegistry;
 use services::plugin::runtime::context_factory::PluginContextFactory;
 use services::plugin::settings::persistence::JsonPluginStorage;
 use services::plugin::settings::settings_registry::SettingsRegistry;
+use services::plugin::PluginManager;
+use services::{PlaylistService, RecentService, SettingsService, TrackService};
 use state::AppState;
 
 use commands::playback_queue::{
@@ -67,8 +66,8 @@ use commands::playback_queue::{
 };
 
 use commands::plugin_extensions::{
-    get_menu_extensions, get_sidebar_extensions, get_all_sidebar_extensions, get_plugin_settings,
-    update_plugin_setting, enable_plugin_command, disable_plugin_command,
+    disable_plugin_command, enable_plugin_command, get_all_sidebar_extensions, get_menu_extensions,
+    get_plugin_settings, get_sidebar_extensions, update_plugin_setting,
 };
 
 use audio::init_audio_state;
@@ -101,7 +100,8 @@ pub fn run() {
             let recent_service = Arc::new(RecentService::new(recent_repository));
 
             let capability_registry = Arc::new(CapabilityRegistry::new());
-            let permission_checker = Arc::new(PermissionChecker::new(Arc::clone(&capability_registry)));
+            let permission_checker =
+                Arc::new(PermissionChecker::new(Arc::clone(&capability_registry)));
             let settings_registry = Arc::new(SettingsRegistry::new());
 
             let app_data_dir = app_handle
@@ -154,7 +154,8 @@ pub fn run() {
             let app_menu = MenuBuilder::new(app).items(&[&file_menu]).build()?;
             app.set_menu(app_menu)?;
 
-            let icon = app.default_window_icon()
+            let icon = app
+                .default_window_icon()
                 .cloned()
                 .ok_or_else(|| AppError::from("Application default window icon is missing"))?;
 
@@ -162,20 +163,22 @@ pub fn run() {
                 .icon(icon)
                 .menu(&tray_menu)
                 .show_menu_on_left_click(false)
-                .on_menu_event(|app_handle: &tauri::AppHandle, event| match event.id.as_ref() {
-                    "settings" => {
-                        if let Some(window) = app_handle.get_webview_window("main") {
-                            let _ = window.emit("tray:navigate", "settings");
-                            let _ = window.unminimize();
-                            let _ = window.show();
-                            let _ = window.set_focus();
+                .on_menu_event(
+                    |app_handle: &tauri::AppHandle, event| match event.id.as_ref() {
+                        "settings" => {
+                            if let Some(window) = app_handle.get_webview_window("main") {
+                                let _ = window.emit("tray:navigate", "settings");
+                                let _ = window.unminimize();
+                                let _ = window.show();
+                                let _ = window.set_focus();
+                            }
                         }
-                    }
-                    "quit" => {
-                        app_handle.exit(0);
-                    }
-                    _ => {}
-                })
+                        "quit" => {
+                            app_handle.exit(0);
+                        }
+                        _ => {}
+                    },
+                )
                 .on_tray_icon_event(|tray, event| {
                     if let TrayIconEvent::Click {
                         button: MouseButton::Left,
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
index 435d9d2..b4d7a0f 100644
--- a/src-tauri/src/models/mod.rs
+++ b/src-tauri/src/models/mod.rs
@@ -1,12 +1,14 @@
 pub mod playback;
+pub mod playback_queue;
 pub mod playlist;
+pub mod recent;
 pub mod settings;
 pub mod track;
-pub mod recent;
-pub mod playback_queue;
 
-pub use playlist::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
-pub use settings::{AppSettings, SettingRow, ThemeMode};
-pub use track::{NewTrack, SortDirection, Track, TrackSearchQuery, TrackSortBy, UpdateTrack};
+pub use playback_queue::PlaybackQueue;
+pub use playlist::{
+    AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist,
+};
 pub use recent::RecentPlayedWithTrack;
-pub use playback_queue::PlaybackQueue;
\ No newline at end of file
+pub use settings::{AppSettings, PluginLogLevel, SettingRow, ThemeMode};
+pub use track::{NewTrack, SortDirection, Track, TrackSearchQuery, TrackSortBy, UpdateTrack};
diff --git a/src-tauri/src/models/playback.rs b/src-tauri/src/models/playback.rs
index ded6ed5..2a5664d 100644
--- a/src-tauri/src/models/playback.rs
+++ b/src-tauri/src/models/playback.rs
@@ -22,7 +22,6 @@ pub struct PlaybackStatusSnapshot {
 pub struct PlaybackTrackStartedPayload {
     pub track: Track,
     pub index: usize,
-    pub version: u64,
 }
 
 #[derive(Clone, Serialize)]
@@ -30,4 +29,4 @@ pub struct PlaybackTrackStartedPayload {
 pub struct PlaybackTrackInfo {
     pub id: Option<i64>,
     pub path: Option<String>,
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/models/playback_queue.rs b/src-tauri/src/models/playback_queue.rs
index f531f13..4509d07 100644
--- a/src-tauri/src/models/playback_queue.rs
+++ b/src-tauri/src/models/playback_queue.rs
@@ -11,7 +11,6 @@ pub struct PlaybackQueue {
     pub current_index: Option<usize>,
     pub play_mode: PlayMode,
     pub history: Vec<i64>,
-    pub version: u64,
 }
 
 #[derive(Debug, Serialize)]
@@ -28,7 +27,6 @@ impl Default for PlaybackQueue {
             current_index: None,
             play_mode: PlayMode::ListLoop,
             history: Vec::new(),
-            version: 0
         }
     }
 }
@@ -45,7 +43,6 @@ impl PlaybackQueue {
         self.current_index = current_index.filter(|i| *i < self.tracks.len());
         self.play_mode = play_mode;
         self.history = history;
-        self.version += 1;
     }
 
     pub fn clear(&mut self) {
@@ -86,30 +83,21 @@ impl PlaybackQueue {
         self.tracks.get(index)
     }
 
-    pub fn require_track(
-        &self,
-        index: usize,
-    ) -> Result<Track, String> {
+    pub fn require_track(&self, index: usize) -> Result<Track, String> {
         self.tracks
             .get(index)
             .cloned()
             .ok_or_else(|| "Invalid queue index".to_string())
     }
 
-    pub fn contains_track(
-        &self,
-        track_id: i64,
-    ) -> bool {
+    pub fn contains_track(&self, track_id: i64) -> bool {
         self.tracks.iter().any(|t| t.id == track_id)
     }
 
-    pub fn find_track(
-        &self,
-        track_id: i64,
-    ) -> Option<&Track> {
+    pub fn find_track(&self, track_id: i64) -> Option<&Track> {
         self.tracks.iter().find(|t| t.id == track_id)
     }
-    
+
     pub fn remove_track(&mut self, track_id: i64) -> Option<QueueRemoveResult> {
         let remove_index = self.tracks.iter().position(|track| track.id == track_id)?;
 
@@ -147,15 +135,10 @@ impl PlaybackQueue {
         })
     }
 
-    pub fn insert_next(
-        &mut self,
-        mut track: Track,
-    ) {
+    pub fn insert_next(&mut self, mut track: Track) {
         track.cover = None;
 
-        if let Some(existing_index) =
-            self.tracks.iter().position(|item| item.id == track.id)
-        {
+        if let Some(existing_index) = self.tracks.iter().position(|item| item.id == track.id) {
             if self.current_index == Some(existing_index) {
                 return;
             }
@@ -180,10 +163,7 @@ impl PlaybackQueue {
         self.tracks.insert(insert_index, track);
     }
 
-    pub fn insert_tracks_as_next(
-        &mut self,
-        tracks: Vec<Track>,
-    ) {
+    pub fn insert_tracks_as_next(&mut self, tracks: Vec<Track>) {
         for track in tracks.into_iter().rev() {
             self.insert_next(track);
         }
@@ -215,9 +195,7 @@ impl PlaybackQueue {
         match self.play_mode {
             PlayMode::SingleLoop => Some(current),
 
-            PlayMode::ListLoop => {
-                Some((current + 1) % self.tracks.len())
-            }
+            PlayMode::ListLoop => Some((current + 1) % self.tracks.len()),
 
             PlayMode::Shuffle => {
                 if self.tracks.len() <= 1 {
@@ -243,9 +221,7 @@ impl PlaybackQueue {
         }
 
         if let Some(last_id) = self.history.last() {
-            if let Some(index) =
-                self.tracks.iter().position(|track| track.id == *last_id)
-            {
+            if let Some(index) = self.tracks.iter().position(|track| track.id == *last_id) {
                 return Some(index);
             }
         }
@@ -284,4 +260,4 @@ impl PlaybackQueue {
     pub fn payload(&self) -> Self {
         self.clone()
     }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/models/recent.rs b/src-tauri/src/models/recent.rs
index d9cea18..8105007 100644
--- a/src-tauri/src/models/recent.rs
+++ b/src-tauri/src/models/recent.rs
@@ -5,4 +5,4 @@ use crate::models::Track;
 pub struct RecentPlayedWithTrack {
     pub track: Track,
     pub played_at: String,
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/models/settings.rs b/src-tauri/src/models/settings.rs
index 57ac6ae..7373041 100644
--- a/src-tauri/src/models/settings.rs
+++ b/src-tauri/src/models/settings.rs
@@ -10,6 +10,10 @@ pub struct AppSettings {
     pub scan_on_startup: bool,
     pub reduce_motion: bool,
     pub use_album_artist_grouping: bool,
+    pub plugin_dirs: Vec<String>,
+    pub plugin_dev_mode: bool,
+    pub plugin_scan_on_startup: bool,
+    pub plugin_log_level: PluginLogLevel,
 }
 
 impl Default for AppSettings {
@@ -21,6 +25,10 @@ impl Default for AppSettings {
             scan_on_startup: false,
             reduce_motion: false,
             use_album_artist_grouping: false,
+            plugin_dirs: Vec::new(),
+            plugin_dev_mode: false,
+            plugin_scan_on_startup: true,
+            plugin_log_level: PluginLogLevel::Warn,
         }
     }
 }
@@ -46,7 +54,7 @@ impl ThemeMode {
 impl TryFrom<String> for ThemeMode {
     type Error = String;
 
-    fn try_from(value: String) -> Result<Self, Self::Error> {
+    fn try_from(value: String) -> Result<Self, <Self as TryFrom<String>>::Error> {
         match value.as_str() {
             "auto" => Ok(ThemeMode::Auto),
             "light" => Ok(ThemeMode::Light),
@@ -56,6 +64,43 @@ impl TryFrom<String> for ThemeMode {
     }
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum PluginLogLevel {
+    Off,
+    Error,
+    Warn,
+    Info,
+    Debug,
+}
+
+impl PluginLogLevel {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            PluginLogLevel::Off => "off",
+            PluginLogLevel::Error => "error",
+            PluginLogLevel::Warn => "warn",
+            PluginLogLevel::Info => "info",
+            PluginLogLevel::Debug => "debug",
+        }
+    }
+}
+
+impl TryFrom<String> for PluginLogLevel {
+    type Error = String;
+
+    fn try_from(value: String) -> Result<Self, <Self as TryFrom<String>>::Error> {
+        match value.as_str() {
+            "off" => Ok(PluginLogLevel::Off),
+            "error" => Ok(PluginLogLevel::Error),
+            "warn" => Ok(PluginLogLevel::Warn),
+            "info" => Ok(PluginLogLevel::Info),
+            "debug" => Ok(PluginLogLevel::Debug),
+            _ => Err(format!("无效插件日志级别: {}", value)),
+        }
+    }
+}
+
 #[derive(Clone, Debug, FromRow)]
 pub struct SettingRow {
     pub id: i64,
@@ -64,6 +109,11 @@ pub struct SettingRow {
     pub scan_on_startup: i64,
     pub reduce_motion: i64,
     pub library_dirs: String,
+    pub use_album_artist_grouping: i64,
+    pub plugin_dirs: String,
+    pub plugin_dev_mode: i64,
+    pub plugin_scan_on_startup: i64,
+    pub plugin_log_level: String,
     pub created_at: String,
     pub updated_at: String,
 }
diff --git a/src-tauri/src/plugins/lyrics/manifest.rs b/src-tauri/src/plugins/lyrics/manifest.rs
index a852297..ac8dbb5 100644
--- a/src-tauri/src/plugins/lyrics/manifest.rs
+++ b/src-tauri/src/plugins/lyrics/manifest.rs
@@ -1,6 +1,8 @@
 use crate::services::plugin::contributes::command::CommandContribution;
 use crate::services::plugin::contributes::sidebar::SidebarContribution;
-use crate::services::plugin::manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
+use crate::services::plugin::manifest::{
+    ActivationEvent, PluginContribution, PluginManifest, SettingDefinition,
+};
 use crate::services::plugin::permissions::PluginPermission;
 use crate::services::plugin::settings::plugin_settings::SettingValue;
 
@@ -9,11 +11,9 @@ pub fn build_lyrics_manifest() -> PluginManifest {
         id: "builtin/lyrics".into(),
         name: "lyrics".into(),
         display_name: "Lyrics".into(),
-        version: "1.0.0".into(),
         author: "RustEchoMusic".into(),
         description: "Lyrics search, load, cache and sync display".into(),
         entry: "lyrics".into(),
-        min_app_version: "0.1.0".into(),
         permissions: vec![PluginPermission::PlayerRead, PluginPermission::LibraryRead],
         activation_events: vec![
             ActivationEvent::OnStartup,
diff --git a/src-tauri/src/plugins/lyrics/plugin.rs b/src-tauri/src/plugins/lyrics/plugin.rs
index 3024aa6..a970708 100644
--- a/src-tauri/src/plugins/lyrics/plugin.rs
+++ b/src-tauri/src/plugins/lyrics/plugin.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, LazyLock, RwLock};
 
 use crate::errors::AppError;
-use crate::events::{EventBus, LyricsLoadedPayload, LyricLinePayload};
+use crate::events::{EventBus, LyricLinePayload, LyricsLoadedPayload};
 use crate::services::plugin::context::PluginContext;
 use crate::services::plugin::events::PluginEvent;
 use crate::services::plugin::manifest::PluginManifest;
@@ -66,12 +66,7 @@ impl LyricsPlugin {
         *cache_lock = Some(svc);
     }
 
-    fn handle_track_changed(
-        &self,
-        track_id: i64,
-        file_path: &str,
-        ctx: &PluginContext,
-    ) {
+    fn handle_track_changed(&self, track_id: i64, file_path: &str, ctx: &PluginContext) {
         {
             let mut state = match self.state.write() {
                 Ok(guard) => guard,
@@ -218,17 +213,12 @@ impl Plugin for LyricsPlugin {
             "lyrics.clear_cache" => {
                 if let Ok(cache_guard) = self.cache.read() {
                     if let Some(ref cache) = *cache_guard {
-                        cache
-                            .clear()
-                            .map_err(|e| AppError::Plugin(e.to_string()))?;
+                        cache.clear().map_err(|e| AppError::Plugin(e.to_string()))?;
                     }
                 }
                 Ok(())
             }
-            _ => Err(AppError::Plugin(format!(
-                "Unknown command: {}",
-                command_id
-            ))),
+            _ => Err(AppError::Plugin(format!("Unknown command: {}", command_id))),
         }
     }
 }
diff --git a/src-tauri/src/plugins/lyrics/service.rs b/src-tauri/src/plugins/lyrics/service.rs
index 950b8cd..659de51 100644
--- a/src-tauri/src/plugins/lyrics/service.rs
+++ b/src-tauri/src/plugins/lyrics/service.rs
@@ -28,10 +28,7 @@ impl LyricsService {
             return None;
         }
 
-        Some(LyricDocument {
-            song_id,
-            lines,
-        })
+        Some(LyricDocument { song_id, lines })
     }
 
     pub fn load_or_fetch(
@@ -46,7 +43,10 @@ impl LyricsService {
         let doc = Self::read_from_file(file_path, song_id)?;
 
         if let Err(e) = cache.save(song_id, &doc) {
-            eprintln!("[Lyrics] Failed to cache lyrics for song {}: {}", song_id, e);
+            eprintln!(
+                "[Lyrics] Failed to cache lyrics for song {}: {}",
+                song_id, e
+            );
         }
 
         Some(doc)
diff --git a/src-tauri/src/repositories/mod.rs b/src-tauri/src/repositories/mod.rs
index 78f2d8f..6b1c108 100644
--- a/src-tauri/src/repositories/mod.rs
+++ b/src-tauri/src/repositories/mod.rs
@@ -1 +1 @@
-pub mod sqlite;
\ No newline at end of file
+pub mod sqlite;
diff --git a/src-tauri/src/repositories/sqlite/playlist_repository.rs b/src-tauri/src/repositories/sqlite/playlist_repository.rs
index e2af51e..d6d9791 100644
--- a/src-tauri/src/repositories/sqlite/playlist_repository.rs
+++ b/src-tauri/src/repositories/sqlite/playlist_repository.rs
@@ -1,7 +1,10 @@
 use sqlx::SqlitePool;
 
 use crate::errors::AppError;
-use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist, Track};
+use crate::models::{
+    AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist,
+    Track,
+};
 
 #[derive(Clone)]
 pub struct SqlitePlaylistRepository {
@@ -48,10 +51,12 @@ impl SqlitePlaylistRepository {
     }
 
     pub async fn find_by_id(&self, id: i64) -> Result<Option<Playlist>, AppError> {
-        let res = sqlx::query_as::<_, Playlist>("SELECT id, name, created_at FROM playlists WHERE id = ?1")
-            .bind(id)
-            .fetch_optional(&self.pool)
-            .await?;
+        let res = sqlx::query_as::<_, Playlist>(
+            "SELECT id, name, created_at FROM playlists WHERE id = ?1",
+        )
+        .bind(id)
+        .fetch_optional(&self.pool)
+        .await?;
 
         Ok(res)
     }
@@ -127,13 +132,20 @@ impl SqlitePlaylistRepository {
         Ok(())
     }
 
-    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), AppError> {
-        sqlx::query("UPDATE playlist_tracks SET position = ?1 WHERE playlist_id = ?2 AND track_id = ?3")
-            .bind(position)
-            .bind(playlist_id)
-            .bind(track_id)
-            .execute(&self.pool)
-            .await?;
+    pub async fn reorder_track(
+        &self,
+        playlist_id: i64,
+        track_id: i64,
+        position: i64,
+    ) -> Result<(), AppError> {
+        sqlx::query(
+            "UPDATE playlist_tracks SET position = ?1 WHERE playlist_id = ?2 AND track_id = ?3",
+        )
+        .bind(position)
+        .bind(playlist_id)
+        .bind(track_id)
+        .execute(&self.pool)
+        .await?;
 
         Ok(())
     }
diff --git a/src-tauri/src/repositories/sqlite/recent_repository.rs b/src-tauri/src/repositories/sqlite/recent_repository.rs
index cf8c7c0..0941ff4 100644
--- a/src-tauri/src/repositories/sqlite/recent_repository.rs
+++ b/src-tauri/src/repositories/sqlite/recent_repository.rs
@@ -13,7 +13,11 @@ impl SqliteRecentRepository {
         Self { pool }
     }
 
-    pub async fn list_with_tracks(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
+    pub async fn list_with_tracks(
+        &self,
+        limit: i64,
+        offset: i64,
+    ) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
         let rows = sqlx::query_as::<_, RecentRow>(
             "SELECT t.id, t.title, t.artist, t.album, t.duration, t.path, t.cover, t.file_size, t.play_count, t.last_played_at, t.created_at, t.updated_at, r.played_at
              FROM recent_played r
@@ -26,23 +30,26 @@ impl SqliteRecentRepository {
         .fetch_all(&self.pool)
         .await?;
 
-        Ok(rows.into_iter().map(|row| RecentPlayedWithTrack {
-            track: Track {
-                id: row.id,
-                title: row.title,
-                artist: row.artist,
-                album: row.album,
-                duration: row.duration,
-                path: row.path,
-                cover: row.cover,
-                file_size: row.file_size,
-                play_count: row.play_count,
-                last_played_at: row.last_played_at,
-                created_at: row.created_at,
-                updated_at: row.updated_at,
-            },
-            played_at: row.played_at,
-        }).collect())
+        Ok(rows
+            .into_iter()
+            .map(|row| RecentPlayedWithTrack {
+                track: Track {
+                    id: row.id,
+                    title: row.title,
+                    artist: row.artist,
+                    album: row.album,
+                    duration: row.duration,
+                    path: row.path,
+                    cover: row.cover,
+                    file_size: row.file_size,
+                    play_count: row.play_count,
+                    last_played_at: row.last_played_at,
+                    created_at: row.created_at,
+                    updated_at: row.updated_at,
+                },
+                played_at: row.played_at,
+            })
+            .collect())
     }
 
     pub async fn upsert(&self, track_id: i64, played_at: String) -> Result<(), AppError> {
diff --git a/src-tauri/src/repositories/sqlite/settings_repository.rs b/src-tauri/src/repositories/sqlite/settings_repository.rs
index ff96aca..f1651f8 100644
--- a/src-tauri/src/repositories/sqlite/settings_repository.rs
+++ b/src-tauri/src/repositories/sqlite/settings_repository.rs
@@ -15,7 +15,22 @@ impl SqliteSettingsRepository {
 
     pub async fn get(&self) -> Result<Option<SettingRow>, AppError> {
         let res = sqlx::query_as::<_, SettingRow>(
-            "SELECT id, theme, volume, scan_on_startup, reduce_motion, library_dirs, created_at, updated_at FROM settings WHERE id = 1",
+            "SELECT
+                id,
+                theme,
+                volume,
+                scan_on_startup,
+                reduce_motion,
+                library_dirs,
+                use_album_artist_grouping,
+                plugin_dirs,
+                plugin_dev_mode,
+                plugin_scan_on_startup,
+                plugin_log_level,
+                created_at,
+                updated_at
+             FROM settings
+             WHERE id = 1",
         )
         .fetch_optional(&self.pool)
         .await?;
@@ -25,14 +40,47 @@ impl SqliteSettingsRepository {
 
     pub async fn update(&self, row: SettingRow) -> Result<(), AppError> {
         sqlx::query(
-            "INSERT INTO settings (id, theme, volume, scan_on_startup, reduce_motion, library_dirs, created_at, updated_at)
-             VALUES (1, ?1, ?2, ?3, ?4, ?5, coalesce(nullif(?6, ''), datetime('now')), datetime('now'))
+            "INSERT INTO settings (
+                id,
+                theme,
+                volume,
+                scan_on_startup,
+                reduce_motion,
+                library_dirs,
+                use_album_artist_grouping,
+                plugin_dirs,
+                plugin_dev_mode,
+                plugin_scan_on_startup,
+                plugin_log_level,
+                created_at,
+                updated_at
+             )
+             VALUES (
+                1,
+                ?1,
+                ?2,
+                ?3,
+                ?4,
+                ?5,
+                ?6,
+                ?7,
+                ?8,
+                ?9,
+                ?10,
+                coalesce(nullif(?11, ''), datetime('now')),
+                datetime('now')
+             )
              ON CONFLICT(id) DO UPDATE SET
                 theme = excluded.theme,
                 volume = excluded.volume,
                 scan_on_startup = excluded.scan_on_startup,
                 reduce_motion = excluded.reduce_motion,
                 library_dirs = excluded.library_dirs,
+                use_album_artist_grouping = excluded.use_album_artist_grouping,
+                plugin_dirs = excluded.plugin_dirs,
+                plugin_dev_mode = excluded.plugin_dev_mode,
+                plugin_scan_on_startup = excluded.plugin_scan_on_startup,
+                plugin_log_level = excluded.plugin_log_level,
                 updated_at = datetime('now')",
         )
         .bind(row.theme)
@@ -40,6 +88,11 @@ impl SqliteSettingsRepository {
         .bind(row.scan_on_startup)
         .bind(row.reduce_motion)
         .bind(row.library_dirs)
+        .bind(row.use_album_artist_grouping)
+        .bind(row.plugin_dirs)
+        .bind(row.plugin_dev_mode)
+        .bind(row.plugin_scan_on_startup)
+        .bind(row.plugin_log_level)
         .bind(row.created_at)
         .execute(&self.pool)
         .await?;
diff --git a/src-tauri/src/repositories/sqlite/track_repository.rs b/src-tauri/src/repositories/sqlite/track_repository.rs
index 26fc5eb..ea896f2 100644
--- a/src-tauri/src/repositories/sqlite/track_repository.rs
+++ b/src-tauri/src/repositories/sqlite/track_repository.rs
@@ -145,7 +145,12 @@ impl SqliteTrackRepository {
             "SELECT id, title, artist, album, duration, path, cover, file_size, play_count, last_played_at, created_at, updated_at FROM tracks",
         );
 
-        if let Some(keyword) = query.keyword.as_ref().map(|value| value.trim()).filter(|value| !value.is_empty()) {
+        if let Some(keyword) = query
+            .keyword
+            .as_ref()
+            .map(|value| value.trim())
+            .filter(|value| !value.is_empty())
+        {
             let pattern = format!("%{}%", keyword.to_lowercase());
             builder.push(" WHERE lower(title) LIKE ");
             builder.push_bind(pattern.clone());
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index 72047ba..1bfea35 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -1,10 +1,15 @@
 use crate::audio::{lock_audio_state, AudioEngine, WebAudioEngine};
 use crate::errors::AppError;
-use crate::events::{AppEvent, EventBus, PlaybackProgressPayload, PlaybackStatePayload, TrackStartedPayload};
+use crate::events::{
+    AppEvent, EventBus, PlaybackProgressPayload, PlaybackStatePayload, TrackStartedPayload,
+};
 use crate::media_controls::{update_media_controls_metadata, update_media_controls_playback};
 use crate::models::Track;
 use crate::state::app_state::AppState;
-use crate::state::playback_state::{current_playback_snapshot, metadata_from_track, minimal_track, should_advance_track, with_audio_state};
+use crate::state::playback_state::{
+    current_playback_snapshot, metadata_from_track, minimal_track, should_advance_track,
+    with_audio_state,
+};
 use std::path::Path;
 use std::time::Duration;
 use tauri::{AppHandle, Manager};
@@ -81,11 +86,13 @@ impl PlaybackService {
 
     pub async fn next(&self) -> Result<(), AppError> {
         let (track, index) = with_audio_state(|state| {
-            let index = state.playback_queue.move_next()
+            let index = state
+                .playback_queue
+                .move_next()
                 .ok_or_else(|| AppError::from("Queue is empty"))?;
-            
+
             let track = state.playback_queue.require_track(index)?;
-            
+
             Ok::<(Track, usize), AppError>((track, index))
         })??;
 
@@ -94,11 +101,13 @@ impl PlaybackService {
 
     pub async fn previous(&self) -> Result<(), AppError> {
         let (track, index) = with_audio_state(|state| {
-            let index = state.playback_queue.move_previous()
+            let index = state
+                .playback_queue
+                .move_previous()
                 .ok_or_else(|| AppError::from("Queue is empty"))?;
-            
+
             let track = state.playback_queue.require_track(index)?;
-            
+
             Ok::<(Track, usize), AppError>((track, index))
         })??;
 
@@ -209,7 +218,11 @@ impl PlaybackService {
         .unwrap_or_else(|| minimal_track(full_path.to_string()))
     }
 
-    pub fn emit_track_started(app_handle: &AppHandle, track: Track, index: usize) -> Result<(), AppError> {
+    pub fn emit_track_started(
+        app_handle: &AppHandle,
+        track: Track,
+        index: usize,
+    ) -> Result<(), AppError> {
         update_media_controls_metadata(metadata_from_track(&track));
 
         emit_and_dispatch(
diff --git a/src-tauri/src/services/playlist_service.rs b/src-tauri/src/services/playlist_service.rs
index 35c576f..8a640f8 100644
--- a/src-tauri/src/services/playlist_service.rs
+++ b/src-tauri/src/services/playlist_service.rs
@@ -1,7 +1,9 @@
 use std::sync::Arc;
 
 use crate::errors::AppError;
-use crate::models::{AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist};
+use crate::models::{
+    AddPlaylistTrack, NewPlaylist, Playlist, PlaylistTrack, PlaylistWithTracks, RenamePlaylist,
+};
 use crate::repositories::sqlite::playlist_repository::SqlitePlaylistRepository;
 
 #[derive(Clone)]
@@ -38,7 +40,10 @@ impl PlaylistService {
         self.playlists.list_with_tracks().await
     }
 
-    pub async fn get_playlist_with_tracks(&self, id: i64) -> Result<Option<PlaylistWithTracks>, AppError> {
+    pub async fn get_playlist_with_tracks(
+        &self,
+        id: i64,
+    ) -> Result<Option<PlaylistWithTracks>, AppError> {
         self.playlists.get_with_tracks(id).await
     }
 
@@ -54,7 +59,14 @@ impl PlaylistService {
         self.playlists.clear_tracks(playlist_id).await
     }
 
-    pub async fn reorder_track(&self, playlist_id: i64, track_id: i64, position: i64) -> Result<(), AppError> {
-        self.playlists.reorder_track(playlist_id, track_id, position).await
+    pub async fn reorder_track(
+        &self,
+        playlist_id: i64,
+        track_id: i64,
+        position: i64,
+    ) -> Result<(), AppError> {
+        self.playlists
+            .reorder_track(playlist_id, track_id, position)
+            .await
     }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/services/plugin/adapters/library_adapter.rs b/src-tauri/src/services/plugin/adapters/library_adapter.rs
index f00ca60..bf9828a 100644
--- a/src-tauri/src/services/plugin/adapters/library_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/library_adapter.rs
@@ -29,7 +29,8 @@ impl LibraryAdapter {
 
 impl LibraryApi for LibraryAdapter {
     fn get_track_path(&self, track_id: i64) -> Result<Option<PathBuf>, AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::LibraryRead)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::LibraryRead)?;
         let track = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.track_service.get_track(track_id))
         })?;
@@ -37,7 +38,8 @@ impl LibraryApi for LibraryAdapter {
     }
 
     fn exists(&self, track_id: i64) -> Result<bool, AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::LibraryRead)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::LibraryRead)?;
         let track = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.track_service.get_track(track_id))
         })?;
diff --git a/src-tauri/src/services/plugin/adapters/player_adapter.rs b/src-tauri/src/services/plugin/adapters/player_adapter.rs
index 0f49044..0b36f93 100644
--- a/src-tauri/src/services/plugin/adapters/player_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/player_adapter.rs
@@ -29,7 +29,8 @@ impl PlayerAdapter {
 
 impl PlayerApi for PlayerAdapter {
     fn play(&self) -> Result<(), AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.resume())
         })?;
@@ -37,28 +38,32 @@ impl PlayerApi for PlayerAdapter {
     }
 
     fn pause(&self) -> Result<(), AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.pause())
         })
     }
 
     fn next(&self) -> Result<(), AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.next())
         })
     }
 
     fn previous(&self) -> Result<(), AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.previous())
         })
     }
 
     fn current_track_id(&self) -> Result<Option<i64>, AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::PlayerRead)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::PlayerRead)?;
         with_audio_state(|state| state.current_track_id)
     }
 }
diff --git a/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs b/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
index 015989b..9e67267 100644
--- a/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
@@ -12,7 +12,10 @@ pub struct PluginSettingsAdapter {
 
 impl PluginSettingsAdapter {
     pub fn new(plugin_id: String, registry: Arc<SettingsRegistry>) -> Self {
-        Self { plugin_id, registry }
+        Self {
+            plugin_id,
+            registry,
+        }
     }
 }
 
diff --git a/src-tauri/src/services/plugin/adapters/queue_adapter.rs b/src-tauri/src/services/plugin/adapters/queue_adapter.rs
index 26de876..07e046c 100644
--- a/src-tauri/src/services/plugin/adapters/queue_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/queue_adapter.rs
@@ -19,19 +19,14 @@ impl QueueAdapter {
 
 impl QueueApi for QueueAdapter {
     fn current_queue(&self) -> Result<Vec<i64>, AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::QueueRead)?;
-        with_audio_state(|state| {
-            state
-                .playback_queue
-                .tracks
-                .iter()
-                .map(|t| t.id)
-                .collect()
-        })
+        self.checker
+            .require(&self.plugin_id, PluginPermission::QueueRead)?;
+        with_audio_state(|state| state.playback_queue.tracks.iter().map(|t| t.id).collect())
     }
 
     fn remove_track(&self, track_id: i64) -> Result<(), AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::QueueWrite)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::QueueWrite)?;
         with_audio_state(|state| {
             state.playback_queue.remove_track(track_id);
         })?;
@@ -39,7 +34,8 @@ impl QueueApi for QueueAdapter {
     }
 
     fn clear(&self) -> Result<(), AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::QueueWrite)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::QueueWrite)?;
         with_audio_state(|state| {
             state.playback_queue.clear();
         })?;
diff --git a/src-tauri/src/services/plugin/adapters/settings_adapter.rs b/src-tauri/src/services/plugin/adapters/settings_adapter.rs
index 6618b62..c5a2e96 100644
--- a/src-tauri/src/services/plugin/adapters/settings_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/settings_adapter.rs
@@ -29,7 +29,8 @@ impl SettingsAdapter {
 
 impl SettingsApi for SettingsAdapter {
     fn theme(&self) -> Result<String, AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::SettingsRead)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::SettingsRead)?;
         let settings = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.settings_service.get_settings())
         })?;
@@ -37,14 +38,16 @@ impl SettingsApi for SettingsAdapter {
     }
 
     fn set_theme(&self, theme: String) -> Result<(), AppError> {
-        self.checker.require(&self.plugin_id, PluginPermission::SettingsWrite)?;
+        self.checker
+            .require(&self.plugin_id, PluginPermission::SettingsWrite)?;
         let theme_mode = ThemeMode::try_from(theme).map_err(AppError::Service)?;
         let mut settings = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.settings_service.get_settings())
         })?;
         settings.theme = theme_mode;
         tokio::task::block_in_place(|| {
-            tokio::runtime::Handle::current().block_on(self.settings_service.update_settings(settings))
+            tokio::runtime::Handle::current()
+                .block_on(self.settings_service.update_settings(settings))
         })?;
         Ok(())
     }
diff --git a/src-tauri/src/services/plugin/capability/permission_checker.rs b/src-tauri/src/services/plugin/capability/permission_checker.rs
index 080b65d..2ae9a77 100644
--- a/src-tauri/src/services/plugin/capability/permission_checker.rs
+++ b/src-tauri/src/services/plugin/capability/permission_checker.rs
@@ -10,15 +10,16 @@ pub struct PermissionChecker {
 
 impl PermissionChecker {
     pub fn new(capability_registry: Arc<CapabilityRegistry>) -> Self {
-        Self { capability_registry }
+        Self {
+            capability_registry,
+        }
     }
 
-    pub fn require(
-        &self,
-        plugin_id: &str,
-        permission: PluginPermission,
-    ) -> Result<(), AppError> {
-        if self.capability_registry.has_permission(plugin_id, permission) {
+    pub fn require(&self, plugin_id: &str, permission: PluginPermission) -> Result<(), AppError> {
+        if self
+            .capability_registry
+            .has_permission(plugin_id, permission)
+        {
             Ok(())
         } else {
             Err(AppError::PluginPermissionDenied {
diff --git a/src-tauri/src/services/plugin/capability/plugin_capability.rs b/src-tauri/src/services/plugin/capability/plugin_capability.rs
index 770060a..4faa6f1 100644
--- a/src-tauri/src/services/plugin/capability/plugin_capability.rs
+++ b/src-tauri/src/services/plugin/capability/plugin_capability.rs
@@ -27,7 +27,11 @@ impl CapabilityRegistry {
         }
     }
 
-    pub fn has_permission(&self, plugin_id: &str, permission: crate::services::plugin::permissions::PluginPermission) -> bool {
+    pub fn has_permission(
+        &self,
+        plugin_id: &str,
+        permission: crate::services::plugin::permissions::PluginPermission,
+    ) -> bool {
         let lock = match self.capabilities.read() {
             Ok(guard) => guard,
             Err(_) => return false,
diff --git a/src-tauri/src/services/plugin/context.rs b/src-tauri/src/services/plugin/context.rs
index 575b497..4498571 100644
--- a/src-tauri/src/services/plugin/context.rs
+++ b/src-tauri/src/services/plugin/context.rs
@@ -2,7 +2,9 @@ use std::sync::Arc;
 
 use tauri::AppHandle;
 
-use crate::services::plugin::api::{LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi};
+use crate::services::plugin::api::{
+    LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi,
+};
 
 pub struct PluginContext {
     pub plugin_id: String,
diff --git a/src-tauri/src/services/plugin/events.rs b/src-tauri/src/services/plugin/events.rs
index 15f582e..0e0b5a6 100644
--- a/src-tauri/src/services/plugin/events.rs
+++ b/src-tauri/src/services/plugin/events.rs
@@ -5,11 +5,20 @@ use crate::models::Track;
 #[derive(Debug, Clone, Serialize)]
 pub enum PluginEvent {
     Startup,
-    TrackChanged { track: Track, index: usize },
-    PlaybackStateChanged { playing: bool, current_time: f64 },
+    TrackChanged {
+        track: Track,
+        index: usize,
+    },
+    PlaybackStateChanged {
+        playing: bool,
+        current_time: f64,
+    },
     QueueChanged,
     SettingsChanged,
-    LyricsLoaded { song_id: i64, lines: Vec<LyricLineEvent> },
+    LyricsLoaded {
+        song_id: i64,
+        lines: Vec<LyricLineEvent>,
+    },
 }
 
 #[derive(Debug, Clone, Serialize)]
diff --git a/src-tauri/src/services/plugin/loader.rs b/src-tauri/src/services/plugin/loader.rs
index 7814663..4f06eb7 100644
--- a/src-tauri/src/services/plugin/loader.rs
+++ b/src-tauri/src/services/plugin/loader.rs
@@ -10,9 +10,7 @@ pub struct PluginLoader;
 
 impl PluginLoader {
     pub fn load_builtin_factories() -> Vec<Arc<dyn PluginFactory>> {
-        vec![
-            Arc::new(LyricsPluginFactory),
-        ]
+        vec![Arc::new(LyricsPluginFactory)]
     }
 
     pub fn scan_manifests_from_dir(dir: &Path) -> Result<Vec<PluginManifest>, AppError> {
@@ -73,9 +71,6 @@ impl PluginLoader {
         if manifest.name.is_empty() {
             return Err(AppError::Plugin("Manifest 'name' cannot be empty".into()));
         }
-        if manifest.version.is_empty() {
-            return Err(AppError::Plugin("Manifest 'version' cannot be empty".into()));
-        }
         if manifest.entry.is_empty() {
             return Err(AppError::Plugin("Manifest 'entry' cannot be empty".into()));
         }
diff --git a/src-tauri/src/services/plugin/manager.rs b/src-tauri/src/services/plugin/manager.rs
index b343429..9c7fbb4 100644
--- a/src-tauri/src/services/plugin/manager.rs
+++ b/src-tauri/src/services/plugin/manager.rs
@@ -118,51 +118,55 @@ impl PluginManager {
             defaults.insert(def.key.clone(), def.default_value.clone());
         }
         if !defaults.is_empty() {
-            self.settings_registry.register_defaults(&plugin_id, defaults);
+            self.settings_registry
+                .register_defaults(&plugin_id, defaults);
         }
 
         for cmd in &manifest.contributes.commands {
             self.command_registry
                 .register_command(cmd.id.clone(), plugin_id.clone());
 
-            self.extension_registry.register_command(Arc::new(CommandExtension {
-                id: cmd.id.clone(),
-                plugin_id: plugin_id.clone(),
-                title: cmd.title.clone(),
-                category: cmd.category.clone(),
-                state: ExtensionState::Enabled,
-            }));
+            self.extension_registry
+                .register_command(Arc::new(CommandExtension {
+                    id: cmd.id.clone(),
+                    plugin_id: plugin_id.clone(),
+                    title: cmd.title.clone(),
+                    category: cmd.category.clone(),
+                    state: ExtensionState::Enabled,
+                }));
         }
 
         for menu in &manifest.contributes.menus {
-            self.extension_registry.register_menu(Arc::new(MenuExtension {
-                id: menu.command.clone(),
-                plugin_id: plugin_id.clone(),
-                command: menu.command.clone(),
-                location: menu.location.clone(),
-                group: menu.group.clone(),
-                state: ExtensionState::Enabled,
-            }));
+            self.extension_registry
+                .register_menu(Arc::new(MenuExtension {
+                    id: menu.command.clone(),
+                    plugin_id: plugin_id.clone(),
+                    command: menu.command.clone(),
+                    location: menu.location.clone(),
+                    group: menu.group.clone(),
+                    state: ExtensionState::Enabled,
+                }));
         }
 
         for sidebar in &manifest.contributes.sidebars {
-            self.extension_registry.register_sidebar(Arc::new(SidebarExtension {
-                id: sidebar.id.clone(),
-                plugin_id: plugin_id.clone(),
-                title: sidebar.title.clone(),
-                icon: sidebar.icon.clone(),
-                route: sidebar.route.clone(),
-                state: ExtensionState::Enabled,
-            }));
+            self.extension_registry
+                .register_sidebar(Arc::new(SidebarExtension {
+                    id: sidebar.id.clone(),
+                    plugin_id: plugin_id.clone(),
+                    title: sidebar.title.clone(),
+                    icon: sidebar.icon.clone(),
+                    route: sidebar.route.clone(),
+                    state: ExtensionState::Enabled,
+                }));
         }
 
-        let permissions: HashSet<PluginPermission> =
-            manifest.permissions.iter().cloned().collect();
+        let permissions: HashSet<PluginPermission> = manifest.permissions.iter().cloned().collect();
 
-        self.capability_registry.register(Arc::new(PluginCapability {
-            plugin_id: plugin_id.clone(),
-            permissions,
-        }));
+        self.capability_registry
+            .register(Arc::new(PluginCapability {
+                plugin_id: plugin_id.clone(),
+                permissions,
+            }));
 
         self.registry.register_factory(plugin_id.clone(), factory);
 
@@ -201,8 +205,7 @@ impl PluginManager {
 
             if !instances.contains_key(plugin_id) {
                 if self.registry.contains(plugin_id) {
-                    instances
-                        .insert(plugin_id.to_string(), RuntimePluginInstance::Registered);
+                    instances.insert(plugin_id.to_string(), RuntimePluginInstance::Registered);
                 }
             }
         }
@@ -270,10 +273,7 @@ impl PluginManager {
             .command_registry
             .find_plugin(command_id)
             .ok_or_else(|| {
-                AppError::Plugin(format!(
-                    "No plugin registered for command '{}'",
-                    command_id
-                ))
+                AppError::Plugin(format!("No plugin registered for command '{}'", command_id))
             })?;
 
         if !self.is_plugin_enabled(&plugin_id) {
@@ -339,10 +339,7 @@ impl PluginManager {
 
             match instances.get(plugin_id) {
                 Some(RuntimePluginInstance::Registered) => {
-                    instances.insert(
-                        plugin_id.to_string(),
-                        RuntimePluginInstance::Activating,
-                    );
+                    instances.insert(plugin_id.to_string(), RuntimePluginInstance::Activating);
                 }
                 _ => {
                     return Err(AppError::Plugin(format!(
@@ -356,9 +353,7 @@ impl PluginManager {
         let factory = self
             .registry
             .get_factory(plugin_id)
-            .ok_or_else(|| {
-                AppError::Plugin(format!("No factory for plugin '{}'", plugin_id))
-            })?;
+            .ok_or_else(|| AppError::Plugin(format!("No factory for plugin '{}'", plugin_id)))?;
 
         let plugin = factory.create();
         let ctx = self.context_factory.create_context(plugin_id);
@@ -383,10 +378,7 @@ impl PluginManager {
                     .write()
                     .map_err(|e| AppError::Plugin(e.to_string()))?;
 
-                instances.insert(
-                    plugin_id.to_string(),
-                    RuntimePluginInstance::Registered,
-                );
+                instances.insert(plugin_id.to_string(), RuntimePluginInstance::Registered);
 
                 Err(e)
             }
@@ -434,16 +426,10 @@ impl PluginManager {
 
         match result {
             Ok(()) => {
-                instances.insert(
-                    plugin_id.to_string(),
-                    RuntimePluginInstance::Registered,
-                );
+                instances.insert(plugin_id.to_string(), RuntimePluginInstance::Registered);
             }
             Err(e) => {
-                instances.insert(
-                    plugin_id.to_string(),
-                    RuntimePluginInstance::Active(plugin),
-                );
+                instances.insert(plugin_id.to_string(), RuntimePluginInstance::Active(plugin));
                 return Err(e);
             }
         }
@@ -495,9 +481,7 @@ impl PluginManager {
         let required_activation = match &plugin_event {
             PluginEvent::Startup => ActivationEvent::OnStartup,
             PluginEvent::TrackChanged { .. } => ActivationEvent::OnTrackChanged,
-            PluginEvent::PlaybackStateChanged { .. } => {
-                ActivationEvent::OnPlaybackStateChanged
-            }
+            PluginEvent::PlaybackStateChanged { .. } => ActivationEvent::OnPlaybackStateChanged,
             PluginEvent::QueueChanged => ActivationEvent::OnQueueChanged,
             PluginEvent::SettingsChanged => ActivationEvent::OnSettingsChanged,
             PluginEvent::LyricsLoaded { .. } => return,
@@ -512,8 +496,7 @@ impl PluginManager {
             instances
                 .iter()
                 .filter(|(id, inst)| {
-                    self.is_plugin_enabled(id)
-                        && matches!(inst, RuntimePluginInstance::Registered)
+                    self.is_plugin_enabled(id) && matches!(inst, RuntimePluginInstance::Registered)
                 })
                 .filter_map(|(id, _)| {
                     let factory = self.registry.get_factory(id)?;
@@ -557,12 +540,10 @@ impl PluginManager {
                 track: payload.track.clone(),
                 index: payload.index,
             }),
-            AppEvent::PlaybackStateChanged(payload) => {
-                Some(PluginEvent::PlaybackStateChanged {
-                    playing: payload.playing,
-                    current_time: payload.current_time,
-                })
-            }
+            AppEvent::PlaybackStateChanged(payload) => Some(PluginEvent::PlaybackStateChanged {
+                playing: payload.playing,
+                current_time: payload.current_time,
+            }),
             AppEvent::QueueChanged(_) => Some(PluginEvent::QueueChanged),
             AppEvent::SettingsChanged(_) => Some(PluginEvent::SettingsChanged),
             AppEvent::VolumeChanged(_) => None,
diff --git a/src-tauri/src/services/plugin/manifest.rs b/src-tauri/src/services/plugin/manifest.rs
index f067ae5..227f2db 100644
--- a/src-tauri/src/services/plugin/manifest.rs
+++ b/src-tauri/src/services/plugin/manifest.rs
@@ -1,6 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-use crate::services::plugin::contributes::{CommandContribution, MenuContribution, SidebarContribution};
+use crate::services::plugin::contributes::{
+    CommandContribution, MenuContribution, SidebarContribution,
+};
 use crate::services::plugin::permissions::PluginPermission;
 use crate::services::plugin::settings::plugin_settings::SettingValue;
 
@@ -35,11 +37,9 @@ pub struct PluginManifest {
     pub id: String,
     pub name: String,
     pub display_name: String,
-    pub version: String,
     pub author: String,
     pub description: String,
     pub entry: String,
-    pub min_app_version: String,
     pub permissions: Vec<PluginPermission>,
     pub activation_events: Vec<ActivationEvent>,
     pub contributes: PluginContribution,
diff --git a/src-tauri/src/services/plugin/mod.rs b/src-tauri/src/services/plugin/mod.rs
index 219b0f9..9468255 100644
--- a/src-tauri/src/services/plugin/mod.rs
+++ b/src-tauri/src/services/plugin/mod.rs
@@ -1,13 +1,13 @@
 pub mod adapters;
 pub mod api;
 pub mod capability;
-pub mod contributes;
 pub mod context;
+pub mod contributes;
 pub mod events;
 pub mod extension;
 pub mod loader;
-pub mod manifest;
 pub mod manager;
+pub mod manifest;
 pub mod model;
 pub mod permissions;
 pub mod registry;
@@ -23,8 +23,8 @@ pub use extension::{
     CommandExtension, ExtensionRegistry, ExtensionState, MenuExtension, SidebarExtension,
 };
 pub use loader::PluginLoader;
-pub use manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
 pub use manager::PluginManager;
+pub use manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
 pub use model::{ModelError, PluginIdentity};
 pub use permissions::PluginPermission;
 pub use runtime::{PluginContextFactory, PluginLifecycleState, PluginState, RuntimePluginInstance};
diff --git a/src-tauri/src/services/plugin/model/errors.rs b/src-tauri/src/services/plugin/model/errors.rs
index 430ff06..5add865 100644
--- a/src-tauri/src/services/plugin/model/errors.rs
+++ b/src-tauri/src/services/plugin/model/errors.rs
@@ -1,14 +1,12 @@
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum ModelError {
     InvalidIdentityFormat(String),
-    InvalidVersionFormat(String),
 }
 
 impl std::fmt::Display for ModelError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             ModelError::InvalidIdentityFormat(s) => write!(f, "Invalid plugin identity: {}", s),
-            ModelError::InvalidVersionFormat(s) => write!(f, "Invalid version format: {}", s),
         }
     }
 }
diff --git a/src-tauri/src/services/plugin/model/plugin_identity.rs b/src-tauri/src/services/plugin/model/plugin_identity.rs
index 76720d8..c8a3639 100644
--- a/src-tauri/src/services/plugin/model/plugin_identity.rs
+++ b/src-tauri/src/services/plugin/model/plugin_identity.rs
@@ -1,4 +1,6 @@
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, serde::Serialize, serde::Deserialize)]
+#[derive(
+    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, serde::Serialize, serde::Deserialize,
+)]
 pub struct PluginIdentity {
     pub namespace: Option<String>,
     pub name: String,
@@ -30,7 +32,9 @@ impl std::str::FromStr for PluginIdentity {
         let parts: Vec<&str> = s.split('/').collect();
         if parts.len() == 2 {
             if parts[0].is_empty() || parts[1].is_empty() {
-                return Err(super::errors::ModelError::InvalidIdentityFormat(s.to_string()));
+                return Err(super::errors::ModelError::InvalidIdentityFormat(
+                    s.to_string(),
+                ));
             }
             Ok(Self {
                 namespace: Some(parts[0].to_string()),
@@ -38,14 +42,18 @@ impl std::str::FromStr for PluginIdentity {
             })
         } else if parts.len() == 1 {
             if parts[0].is_empty() {
-                return Err(super::errors::ModelError::InvalidIdentityFormat(s.to_string()));
+                return Err(super::errors::ModelError::InvalidIdentityFormat(
+                    s.to_string(),
+                ));
             }
             Ok(Self {
                 namespace: None,
                 name: parts[0].to_string(),
             })
         } else {
-            Err(super::errors::ModelError::InvalidIdentityFormat(s.to_string()))
+            Err(super::errors::ModelError::InvalidIdentityFormat(
+                s.to_string(),
+            ))
         }
     }
 }
diff --git a/src-tauri/src/services/plugin/registry/command_registry.rs b/src-tauri/src/services/plugin/registry/command_registry.rs
index b824964..b05d710 100644
--- a/src-tauri/src/services/plugin/registry/command_registry.rs
+++ b/src-tauri/src/services/plugin/registry/command_registry.rs
@@ -33,10 +33,6 @@ impl CommandRegistry {
     }
 
     pub fn count(&self) -> usize {
-        self.commands
-            .read()
-            .ok()
-            .map(|l| l.len())
-            .unwrap_or(0)
+        self.commands.read().ok().map(|l| l.len()).unwrap_or(0)
     }
 }
diff --git a/src-tauri/src/services/plugin/registry/plugin_registry.rs b/src-tauri/src/services/plugin/registry/plugin_registry.rs
index fa75c39..6c56eb5 100644
--- a/src-tauri/src/services/plugin/registry/plugin_registry.rs
+++ b/src-tauri/src/services/plugin/registry/plugin_registry.rs
@@ -46,10 +46,6 @@ impl PluginRegistry {
     }
 
     pub fn count(&self) -> usize {
-        self.factories
-            .read()
-            .ok()
-            .map(|l| l.len())
-            .unwrap_or(0)
+        self.factories.read().ok().map(|l| l.len()).unwrap_or(0)
     }
 }
diff --git a/src-tauri/src/services/plugin/settings/persistence.rs b/src-tauri/src/services/plugin/settings/persistence.rs
index 634438b..182d6e6 100644
--- a/src-tauri/src/services/plugin/settings/persistence.rs
+++ b/src-tauri/src/services/plugin/settings/persistence.rs
@@ -56,13 +56,11 @@ impl PluginStorage for JsonPluginStorage {
             return Ok((HashMap::new(), HashMap::new()));
         }
 
-        let content = std::fs::read_to_string(&self.path).map_err(|e| {
-            AppError::Io(format!("Failed to read plugin config: {}", e))
-        })?;
+        let content = std::fs::read_to_string(&self.path)
+            .map_err(|e| AppError::Io(format!("Failed to read plugin config: {}", e)))?;
 
-        let file: PluginConfigFile = serde_json::from_str(&content).map_err(|e| {
-            AppError::Plugin(format!("Failed to parse plugin config: {}", e))
-        })?;
+        let file: PluginConfigFile = serde_json::from_str(&content)
+            .map_err(|e| AppError::Plugin(format!("Failed to parse plugin config: {}", e)))?;
 
         Ok((file.states, file.settings))
     }
@@ -83,13 +81,11 @@ impl PluginStorage for JsonPluginStorage {
             settings: settings.clone(),
         };
 
-        let content = serde_json::to_string_pretty(&file).map_err(|e| {
-            AppError::Plugin(format!("Failed to serialize plugin config: {}", e))
-        })?;
+        let content = serde_json::to_string_pretty(&file)
+            .map_err(|e| AppError::Plugin(format!("Failed to serialize plugin config: {}", e)))?;
 
-        std::fs::write(&self.path, content).map_err(|e| {
-            AppError::Io(format!("Failed to write plugin config: {}", e))
-        })?;
+        std::fs::write(&self.path, content)
+            .map_err(|e| AppError::Io(format!("Failed to write plugin config: {}", e)))?;
 
         Ok(())
     }
diff --git a/src-tauri/src/services/plugin/settings/settings_registry.rs b/src-tauri/src/services/plugin/settings/settings_registry.rs
index 40ececa..e49058a 100644
--- a/src-tauri/src/services/plugin/settings/settings_registry.rs
+++ b/src-tauri/src/services/plugin/settings/settings_registry.rs
@@ -2,7 +2,9 @@ use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 
 use crate::errors::AppError;
-use crate::services::plugin::settings::plugin_settings::{PluginSetting, PluginSettings, SettingValue};
+use crate::services::plugin::settings::plugin_settings::{
+    PluginSetting, PluginSettings, SettingValue,
+};
 
 pub struct SettingsRegistry {
     settings: RwLock<HashMap<String, PluginSettings>>,
@@ -35,10 +37,7 @@ impl SettingsRegistry {
 
     pub fn get_setting(&self, plugin_id: &str, key: &str) -> Option<SettingValue> {
         let lock = self.settings.read().ok()?;
-        lock.get(plugin_id)?
-            .settings
-            .get(key)
-            .cloned()
+        lock.get(plugin_id)?.settings.get(key).cloned()
     }
 
     pub fn get_all(&self, plugin_id: &str) -> HashMap<String, SettingValue> {
diff --git a/src-tauri/src/services/recent_service.rs b/src-tauri/src/services/recent_service.rs
index 5fca5be..d57914b 100644
--- a/src-tauri/src/services/recent_service.rs
+++ b/src-tauri/src/services/recent_service.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use crate::errors::AppError;
 use crate::models::RecentPlayedWithTrack;
-use crate::repositories::sqlite::recent_repository::{SqliteRecentRepository};
+use crate::repositories::sqlite::recent_repository::SqliteRecentRepository;
 
 const MAX_RECENT_RECORDS: i64 = 100;
 
@@ -16,7 +16,11 @@ impl RecentService {
         Self { recent }
     }
 
-    pub async fn load(&self, limit: i64, offset: i64) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
+    pub async fn load(
+        &self,
+        limit: i64,
+        offset: i64,
+    ) -> Result<Vec<RecentPlayedWithTrack>, AppError> {
         self.recent.list_with_tracks(limit, offset).await
     }
 
diff --git a/src-tauri/src/services/settings_service.rs b/src-tauri/src/services/settings_service.rs
index 4a942cb..d2ca0b0 100644
--- a/src-tauri/src/services/settings_service.rs
+++ b/src-tauri/src/services/settings_service.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use crate::errors::AppError;
-use crate::models::{AppSettings, SettingRow, ThemeMode};
+use crate::models::{AppSettings, PluginLogLevel, SettingRow, ThemeMode};
 use crate::repositories::sqlite::settings_repository::SqliteSettingsRepository;
 
 #[derive(Clone)]
@@ -40,7 +40,13 @@ fn row_to_settings(row: SettingRow) -> Result<AppSettings, AppError> {
         reduce_motion: row.reduce_motion != 0,
         library_dirs: serde_json::from_str(&row.library_dirs)
             .map_err(|error| AppError::Service(error.to_string()))?,
-        use_album_artist_grouping: false,
+        use_album_artist_grouping: row.use_album_artist_grouping != 0,
+        plugin_dirs: serde_json::from_str(&row.plugin_dirs)
+            .map_err(|error| AppError::Service(error.to_string()))?,
+        plugin_dev_mode: row.plugin_dev_mode != 0,
+        plugin_scan_on_startup: row.plugin_scan_on_startup != 0,
+        plugin_log_level: PluginLogLevel::try_from(row.plugin_log_level)
+            .map_err(AppError::Service)?,
     })
 }
 
@@ -53,6 +59,12 @@ fn settings_to_row(settings: AppSettings) -> Result<SettingRow, AppError> {
         reduce_motion: i64::from(settings.reduce_motion),
         library_dirs: serde_json::to_string(&settings.library_dirs)
             .map_err(|error| AppError::Service(error.to_string()))?,
+        use_album_artist_grouping: i64::from(settings.use_album_artist_grouping),
+        plugin_dirs: serde_json::to_string(&settings.plugin_dirs)
+            .map_err(|error| AppError::Service(error.to_string()))?,
+        plugin_dev_mode: i64::from(settings.plugin_dev_mode),
+        plugin_scan_on_startup: i64::from(settings.plugin_scan_on_startup),
+        plugin_log_level: settings.plugin_log_level.as_str().to_string(),
         created_at: now_string(),
         updated_at: now_string(),
     })
@@ -63,4 +75,4 @@ fn now_string() -> String {
         .duration_since(UNIX_EPOCH)
         .map(|value| value.as_secs().to_string())
         .unwrap_or_else(|_| "0".to_string())
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/services/track_service.rs b/src-tauri/src/services/track_service.rs
index c456518..934e0ae 100644
--- a/src-tauri/src/services/track_service.rs
+++ b/src-tauri/src/services/track_service.rs
@@ -53,4 +53,4 @@ impl TrackService {
     pub async fn mark_track_played(&self, id: i64, played_at: String) -> Result<(), AppError> {
         self.tracks.increment_play_count(id, played_at).await
     }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/state/playback_state.rs b/src-tauri/src/state/playback_state.rs
index d534e02..00ad0a7 100644
--- a/src-tauri/src/state/playback_state.rs
+++ b/src-tauri/src/state/playback_state.rs
@@ -1,18 +1,16 @@
-use std::path::Path;
 pub use crate::audio::lock_audio_state;
 use crate::audio::AudioState;
 use crate::errors::AppError;
-use crate::models::playback::{
-    NativeTrackMetadata, PlaybackStatusSnapshot, PlaybackTrackInfo
-};
+use crate::models::playback::{NativeTrackMetadata, PlaybackStatusSnapshot, PlaybackTrackInfo};
 use crate::models::Track;
+use std::path::Path;
 
 pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, AppError> {
     let value = {
         let mut state = lock_audio_state()?;
         f(&mut state)
     };
-    
+
     Ok(value)
 }
 
@@ -23,12 +21,8 @@ pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
     }
 }
 
-pub fn current_playback_state(
-    state: &mut AudioState,
-) -> PlaybackStatusSnapshot {
-    match state.with_engine(|engine| {
-        (!engine.paused(), engine.current_time())
-    }) {
+pub fn current_playback_state(state: &mut AudioState) -> PlaybackStatusSnapshot {
+    match state.with_engine(|engine| (!engine.paused(), engine.current_time())) {
         Ok((playing, current_time)) => {
             state.playing = playing;
 
@@ -61,7 +55,11 @@ pub fn current_time_from_state() -> f64 {
 
 pub fn current_track_duration(state: &AudioState) -> Option<f64> {
     let index = state.playback_queue.current_index?;
-    state.playback_queue.tracks.get(index).map(|track| track.duration as f64 / 1000.0)
+    state
+        .playback_queue
+        .tracks
+        .get(index)
+        .map(|track| track.duration as f64 / 1000.0)
 }
 
 pub fn should_advance_track() -> bool {
@@ -82,8 +80,14 @@ pub fn should_advance_track() -> bool {
 pub fn metadata_from_track(track: &Track) -> NativeTrackMetadata {
     NativeTrackMetadata {
         title: track.title.clone(),
-        album: track.album.clone().unwrap_or_else(|| "未知专辑".to_string()),
-        artist: track.artist.clone().unwrap_or_else(|| "未知歌手".to_string()),
+        album: track
+            .album
+            .clone()
+            .unwrap_or_else(|| "未知专辑".to_string()),
+        artist: track
+            .artist
+            .clone()
+            .unwrap_or_else(|| "未知歌手".to_string()),
         duration: Some(track.duration as f64 / 1000.0),
     }
 }
@@ -114,4 +118,4 @@ pub fn minimal_track(full_path: String) -> Track {
 pub fn sanitize_track(mut track: Track) -> Track {
     track.cover = None;
     track
-}
\ No newline at end of file
+}
diff --git a/src/app.css b/src/app.css
index c6a14df..b857282 100644
--- a/src/app.css
+++ b/src/app.css
@@ -3,7 +3,6 @@
 @import "tailwindcss/theme.css" layer(theme);
 /* @import "tailwindcss/preflight.css" layer(base); */
 @import "tailwindcss/utilities.css" layer(utilities);
-@import 'material-symbols';
 
 @layer base {
   
diff --git a/src/lib/features/LyricsPanel.svelte b/src/lib/features/LyricsPanel.svelte
index 58c7313..7c3f5c1 100644
--- a/src/lib/features/LyricsPanel.svelte
+++ b/src/lib/features/LyricsPanel.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import IconButton from '$lib/components/base/IconButton.svelte'
     import { lyrics } from '$lib/state/lyrics.svelte'
     import { player } from '$lib/state/player.svelte'
     import { tick } from 'svelte'
@@ -45,13 +46,10 @@
             >
                 歌词
             </span>
-            <button
-                type="button"
-                class="flex h-6 w-6 items-center justify-center rounded-full hover:bg-[rgb(var(--mdui-color-surface-container-high))]"
+            <IconButton 
+                icon="close--rounded"
                 onclick={() => lyrics.toggle()}
-            >
-                <span class="material-symbols-rounded text-sm">close</span>
-            </button>
+            />
         </div>
 
         <div bind:this={containerEl} class="flex-1 overflow-y-auto">
diff --git a/src/lib/features/shell/Appbar.svelte b/src/lib/features/shell/Appbar.svelte
index 581c34a..6c2477d 100644
--- a/src/lib/features/shell/Appbar.svelte
+++ b/src/lib/features/shell/Appbar.svelte
@@ -55,7 +55,7 @@
   <div class="flex items-center pr-6 [-webkit-app-region:no-drag]">
     <div class="flex gap-1 bg-(--controlWhite) rounded-lg p-1">
       <div
-        class="flex items-center justify-center w-8 h-8 rounded cursor-pointer bg-transparent hover:bg-(--fade) active:bg-(--controlBlackAcrylic) font-[material-symbols-rounded] text-lg"
+        class="flex items-center justify-center w-8 h-8 rounded cursor-pointer bg-transparent hover:bg-(--fade) active:bg-(--controlBlackAcrylic) text-lg"
         onclick={min}
         onkeydown={e => {
           if (e.key === 'Enter' || e.key === ' ') min()
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index cff5561..6d619d9 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -46,6 +46,7 @@ class SettingsState {
             ...this.data,
             ...patch,
         }
+        this.data = nextSettings
         this.scheduleSave(nextSettings)
     }
 
@@ -53,9 +54,10 @@ class SettingsState {
         this.error = null
 
         try {
-            await invoke<AppSettings>('save_settings', {
+            const savedSettings = await invoke<AppSettings>('save_settings', {
                 settings: targetSettings,
             })
+            this.data = savedSettings
         } catch (error) {
             console.error(error)
             this.error = String(error)
@@ -90,4 +92,4 @@ class SettingsState {
     }
 }
 
-export const settings = new SettingsState()
\ No newline at end of file
+export const settings = new SettingsState()
diff --git a/src/lib/types/music.ts b/src/lib/types/music.ts
index 3c29537..4d32fc6 100644
--- a/src/lib/types/music.ts
+++ b/src/lib/types/music.ts
@@ -45,5 +45,4 @@ export interface PlaybackQueue {
     currentIndex: number | null
     playMode: PlayMode
     history: number[]
-    version: number
 }
\ No newline at end of file
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 5b9a9af..2396547 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -87,16 +87,15 @@
         playAll(album.tracks)
     }
 
-    async function handleAlbumArtistGroupingChange(event: Event) {
+    function handleAlbumArtistGroupingChange(event: Event) {
         const checked = (event.currentTarget as HTMLInputElement).checked
 
         if (checked === settings.data.useAlbumArtistGrouping) return
 
-        settings.data.useAlbumArtistGrouping = checked
-        musicLibrary.useAlbumArtistGrouping = checked
+        settings.update({
+            useAlbumArtistGrouping: checked,
+        })
         selectedAlbumId = null
-
-        await settings.save($state.snapshot(settings.data))
     }
 </script>
 
diff --git a/src/routes/plugins/+page.svelte b/src/routes/plugins/+page.svelte
index b62c354..9375c3e 100644
--- a/src/routes/plugins/+page.svelte
+++ b/src/routes/plugins/+page.svelte
@@ -50,9 +50,7 @@
                     <div
                         class="flex h-12 w-12 items-center justify-center rounded-xl bg-[rgb(var(--mdui-color-primary-container))] text-[rgb(var(--mdui-color-on-primary-container))]"
                     >
-                        <span class="material-symbols-rounded text-2xl">
-                            {ext.icon}
-                        </span>
+                        <mdui-icon name="extension--rounded"></mdui-icon>
                     </div>
                     <div class="flex flex-1 flex-col gap-1">
                         <div class="text-sm font-medium">
diff --git a/src/routes/plugins/detail/+page.svelte b/src/routes/plugins/detail/+page.svelte
index 2225646..2610222 100644
--- a/src/routes/plugins/detail/+page.svelte
+++ b/src/routes/plugins/detail/+page.svelte
@@ -82,8 +82,9 @@
         <a
             href="/plugins"
             class="flex h-10 w-10 items-center justify-center rounded-full hover:bg-[rgb(var(--mdui-color-surface-container))]"
+            title="plugins"
         >
-            <span class="material-symbols-rounded">arrow_back</span>
+            <mdui-icon name="arrow_back"></mdui-icon>
         </a>
         <Heading
             eyebrow="Plugin"

From 84298a6976f7d83cf0c49244cff3cf634ba95e2b Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Mon, 8 Jun 2026 20:56:35 +0800
Subject: [PATCH 34/39] rename project title

---
 package.json              |   4 +-
 src-tauri/Cargo.lock      | 154 +++++++++++++++++++-------------------
 src-tauri/Cargo.toml      |  14 +---
 src-tauri/src/main.rs     |   2 +-
 src-tauri/tauri.conf.json |  10 +--
 src/app.html              |   2 +-
 static/svelte.svg         |   1 -
 static/tauri.svg          |   6 --
 static/vite.svg           |   1 -
 9 files changed, 90 insertions(+), 104 deletions(-)
 delete mode 100644 static/svelte.svg
 delete mode 100644 static/tauri.svg
 delete mode 100644 static/vite.svg

diff --git a/package.json b/package.json
index 2ad79ea..22c352b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "tauri-app",
+  "name": "rust-echo-music",
   "version": "0.1.0",
-  "description": "",
+  "description": "A desktop music player built with Rust and Tauri",
   "type": "module",
   "scripts": {
     "dev": "vite dev",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 385f32b..efa0b7a 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -51,7 +51,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
 dependencies = [
  "alsa-sys",
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "cfg-if",
  "libc",
 ]
@@ -306,9 +306,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.11.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
  "serde_core",
 ]
@@ -434,7 +434,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -551,9 +551,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "num-traits",
@@ -671,7 +671,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "core-foundation 0.10.1",
  "core-graphics-types 0.2.0",
  "foreign-types 0.5.0",
@@ -695,7 +695,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -706,7 +706,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "libc",
  "objc2-audio-toolbox",
  "objc2-core-audio",
@@ -853,9 +853,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
  "typenum",
@@ -1022,7 +1022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
- "crypto-common 0.1.7",
+ "crypto-common 0.1.6",
 ]
 
 [[package]]
@@ -1069,7 +1069,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "block2",
  "libc",
  "objc2",
@@ -1645,9 +1645,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
  "typenum",
  "version_check",
@@ -1728,7 +1728,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -1872,9 +1872,9 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
 [[package]]
 name = "hashlink"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0b22561a9c04a7cb1a302c013e0259cd3b4bb619f145b32f72b8b4bcbed230"
+checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
 dependencies = [
  "hashbrown 0.16.1",
 ]
@@ -2371,7 +2371,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "serde",
  "unicode-segmentation",
 ]
@@ -2448,9 +2448,9 @@ dependencies = [
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.30.1"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
+checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2512,9 +2512,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.30"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
 [[package]]
 name = "mach2"
@@ -2634,7 +2634,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys",
@@ -2771,7 +2771,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "block2",
  "objc2",
  "objc2-core-foundation",
@@ -2784,7 +2784,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "libc",
  "objc2",
  "objc2-core-audio",
@@ -2809,7 +2809,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "objc2",
  "objc2-foundation",
 ]
@@ -2833,7 +2833,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "objc2",
 ]
 
@@ -2853,7 +2853,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "block2",
  "dispatch2",
  "libc",
@@ -2866,7 +2866,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "dispatch2",
  "objc2",
  "objc2-core-foundation",
@@ -2899,7 +2899,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "objc2",
  "objc2-core-foundation",
  "objc2-core-graphics",
@@ -2926,7 +2926,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "block2",
  "libc",
  "objc2",
@@ -2939,7 +2939,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "objc2",
  "objc2-core-foundation",
 ]
@@ -2950,7 +2950,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "objc2",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -2962,7 +2962,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "block2",
  "objc2",
  "objc2-cloud-kit",
@@ -2993,7 +2993,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "block2",
  "objc2",
  "objc2-app-kit",
@@ -3230,7 +3230,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -3427,7 +3427,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
@@ -3614,6 +3614,28 @@ dependencies = [
  "realfft",
 ]
 
+[[package]]
+name = "rust-echo-music"
+version = "0.1.0"
+dependencies = [
+ "base64 0.22.1",
+ "lofty",
+ "rand",
+ "serde",
+ "serde_json",
+ "souvlaki",
+ "sqlx",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-dialog",
+ "tauri-plugin-opener",
+ "tauri-plugin-store",
+ "tokio",
+ "trash",
+ "walkdir",
+ "web-audio-api",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -3649,7 +3671,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3734,7 +3756,7 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "cssparser",
  "derive_more",
  "log",
@@ -3854,9 +3876,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.20.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
 dependencies = [
  "base64 0.22.1",
  "bs58",
@@ -3874,9 +3896,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.20.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -4168,7 +4190,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90b8020fe17c5f2c245bfa2505d7ef59c5604839527c740266ad2214acebea27"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "byteorder",
  "bytes",
  "crc",
@@ -4196,7 +4218,7 @@ checksum = "87a2bdd6e83f6b3ea525ca9fee568030508b58355a43d0b2c1674d5f79dcd65e"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "byteorder",
  "crc",
  "dotenvy",
@@ -4539,7 +4561,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95ec293b5f288383b72a7bffcade6b2860b642cf66f28b3bd5967349a49938b1"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "bytemuck",
  "lazy_static",
  "log",
@@ -4752,7 +4774,7 @@ version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "block2",
  "core-foundation 0.10.1",
  "core-graphics 0.25.0",
@@ -4855,28 +4877,6 @@ dependencies = [
  "windows 0.61.3",
 ]
 
-[[package]]
-name = "tauri-app"
-version = "0.1.0"
-dependencies = [
- "base64 0.22.1",
- "lofty",
- "rand",
- "serde",
- "serde_json",
- "souvlaki",
- "sqlx",
- "tauri",
- "tauri-build",
- "tauri-plugin-dialog",
- "tauri-plugin-opener",
- "tauri-plugin-store",
- "tokio",
- "trash",
- "walkdir",
- "web-audio-api",
-]
-
 [[package]]
 name = "tauri-build"
 version = "2.6.2"
@@ -5445,7 +5445,7 @@ version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "bytes",
  "futures-util",
  "http",
@@ -5650,9 +5650,9 @@ checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.13.2"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
 
 [[package]]
 name = "unicode-xid"
@@ -5901,7 +5901,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "hashbrown 0.15.5",
  "indexmap 2.14.0",
  "semver",
@@ -6682,7 +6682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.11.1",
+ "bitflags 2.13.0",
  "indexmap 2.14.0",
  "log",
  "serde",
@@ -6785,9 +6785,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index fb617ef..e34302c 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,17 +1,12 @@
 [package]
-name = "tauri-app"
+name = "rust-echo-music"
 version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
+description = "A desktop music player built with Rust and Tauri"
+authors = ["RustEchoMusic"]
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
-# The `_lib` suffix may seem redundant but it is necessary
-# to make the lib name unique and wouldn't conflict with the bin name.
-# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
-name = "tauri_app_lib"
+name = "rust_echo_music_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
@@ -33,4 +28,3 @@ souvlaki = "0.8.3"
 sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "macros", "migrate"] }
 rand = "0.10.1"
 tokio = { version = "1.52.3", features = ["fs"] }
-
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 2abccd9..4a233fd 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -2,5 +2,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
-    tauri_app_lib::run()
+    rust_echo_music_lib::run()
 }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index f3fcfe9..2a3d2ca 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "tauri-app",
+  "productName": "Rust Echo Music",
   "version": "0.1.0",
   "identifier": "com.rustechomusic.app",
   "build": {
@@ -12,19 +12,19 @@
   "app": {
     "windows": [
       {
-        "title": "tauri-app",
+        "title": "Rust Echo Music",
         "decorations": false,
         "width": 1200,
         "height": 900
       }
     ],
     "security": {
-      "csp": null
+      "csp": "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; img-src 'self' data: asset: https://asset.localhost; connect-src 'self' ipc: http://ipc.localhost"
     }
   },
   "bundle": {
     "active": true,
-    "targets": "all",
+    "targets": ["nsis", "msi", "dmg", "appimage"],
     "icon": [
       "icons/32x32.png",
       "icons/128x128.png",
@@ -36,4 +36,4 @@
       "../static/**/*"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/app.html b/src/app.html
index 89a6390..6afa1ad 100644
--- a/src/app.html
+++ b/src/app.html
@@ -6,7 +6,7 @@
   <link rel="icon" href="%sveltekit.assets%/favicon.png" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>Tauri + SvelteKit + Typescript App</title>
+  <title>Rust Echo Music</title>
   <!-- Filled -->
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
 
diff --git a/static/svelte.svg b/static/svelte.svg
deleted file mode 100644
index c5e0848..0000000
--- a/static/svelte.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="26.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 308"><path fill="#FF3E00" d="M239.682 40.707C211.113-.182 154.69-12.301 113.895 13.69L42.247 59.356a82.198 82.198 0 0 0-37.135 55.056a86.566 86.566 0 0 0 8.536 55.576a82.425 82.425 0 0 0-12.296 30.719a87.596 87.596 0 0 0 14.964 66.244c28.574 40.893 84.997 53.007 125.787 27.016l71.648-45.664a82.182 82.182 0 0 0 37.135-55.057a86.601 86.601 0 0 0-8.53-55.577a82.409 82.409 0 0 0 12.29-30.718a87.573 87.573 0 0 0-14.963-66.244"></path><path fill="#FFF" d="M106.889 270.841c-23.102 6.007-47.497-3.036-61.103-22.648a52.685 52.685 0 0 1-9.003-39.85a49.978 49.978 0 0 1 1.713-6.693l1.35-4.115l3.671 2.697a92.447 92.447 0 0 0 28.036 14.007l2.663.808l-.245 2.659a16.067 16.067 0 0 0 2.89 10.656a17.143 17.143 0 0 0 18.397 6.828a15.786 15.786 0 0 0 4.403-1.935l71.67-45.672a14.922 14.922 0 0 0 6.734-9.977a15.923 15.923 0 0 0-2.713-12.011a17.156 17.156 0 0 0-18.404-6.832a15.78 15.78 0 0 0-4.396 1.933l-27.35 17.434a52.298 52.298 0 0 1-14.553 6.391c-23.101 6.007-47.497-3.036-61.101-22.649a52.681 52.681 0 0 1-9.004-39.849a49.428 49.428 0 0 1 22.34-33.114l71.664-45.677a52.218 52.218 0 0 1 14.563-6.398c23.101-6.007 47.497 3.036 61.101 22.648a52.685 52.685 0 0 1 9.004 39.85a50.559 50.559 0 0 1-1.713 6.692l-1.35 4.116l-3.67-2.693a92.373 92.373 0 0 0-28.037-14.013l-2.664-.809l.246-2.658a16.099 16.099 0 0 0-2.89-10.656a17.143 17.143 0 0 0-18.398-6.828a15.786 15.786 0 0 0-4.402 1.935l-71.67 45.674a14.898 14.898 0 0 0-6.73 9.975a15.9 15.9 0 0 0 2.709 12.012a17.156 17.156 0 0 0 18.404 6.832a15.841 15.841 0 0 0 4.402-1.935l27.345-17.427a52.147 52.147 0 0 1 14.552-6.397c23.101-6.006 47.497 3.037 61.102 22.65a52.681 52.681 0 0 1 9.003 39.848a49.453 49.453 0 0 1-22.34 33.12l-71.664 45.673a52.218 52.218 0 0 1-14.563 6.398"></path></svg>
\ No newline at end of file
diff --git a/static/tauri.svg b/static/tauri.svg
deleted file mode 100644
index 31b62c9..0000000
--- a/static/tauri.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="206" height="231" viewBox="0 0 206 231" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M143.143 84C143.143 96.1503 133.293 106 121.143 106C108.992 106 99.1426 96.1503 99.1426 84C99.1426 71.8497 108.992 62 121.143 62C133.293 62 143.143 71.8497 143.143 84Z" fill="#FFC131"/>
-<ellipse cx="84.1426" cy="147" rx="22" ry="22" transform="rotate(180 84.1426 147)" fill="#24C8DB"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M166.738 154.548C157.86 160.286 148.023 164.269 137.757 166.341C139.858 160.282 141 153.774 141 147C141 144.543 140.85 142.121 140.558 139.743C144.975 138.204 149.215 136.139 153.183 133.575C162.73 127.404 170.292 118.608 174.961 108.244C179.63 97.8797 181.207 86.3876 179.502 75.1487C177.798 63.9098 172.884 53.4021 165.352 44.8883C157.82 36.3744 147.99 30.2165 137.042 27.1546C126.095 24.0926 114.496 24.2568 103.64 27.6274C92.7839 30.998 83.1319 37.4317 75.8437 46.1553C74.9102 47.2727 74.0206 48.4216 73.176 49.5993C61.9292 50.8488 51.0363 54.0318 40.9629 58.9556C44.2417 48.4586 49.5653 38.6591 56.679 30.1442C67.0505 17.7298 80.7861 8.57426 96.2354 3.77762C111.685 -1.01901 128.19 -1.25267 143.769 3.10474C159.348 7.46215 173.337 16.2252 184.056 28.3411C194.775 40.457 201.767 55.4101 204.193 71.404C206.619 87.3978 204.374 103.752 197.73 118.501C191.086 133.25 180.324 145.767 166.738 154.548ZM41.9631 74.275L62.5557 76.8042C63.0459 72.813 63.9401 68.9018 65.2138 65.1274C57.0465 67.0016 49.2088 70.087 41.9631 74.275Z" fill="#FFC131"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4045 76.4519C47.3493 70.6709 57.2677 66.6712 67.6171 64.6132C65.2774 70.9669 64 77.8343 64 85.0001C64 87.1434 64.1143 89.26 64.3371 91.3442C60.0093 92.8732 55.8533 94.9092 51.9599 97.4256C42.4128 103.596 34.8505 112.392 30.1816 122.756C25.5126 133.12 23.9357 144.612 25.6403 155.851C27.3449 167.09 32.2584 177.598 39.7906 186.112C47.3227 194.626 57.153 200.784 68.1003 203.846C79.0476 206.907 90.6462 206.743 101.502 203.373C112.359 200.002 122.011 193.568 129.299 184.845C130.237 183.722 131.131 182.567 131.979 181.383C143.235 180.114 154.132 176.91 164.205 171.962C160.929 182.49 155.596 192.319 148.464 200.856C138.092 213.27 124.357 222.426 108.907 227.222C93.458 232.019 76.9524 232.253 61.3736 227.895C45.7948 223.538 31.8055 214.775 21.0867 202.659C10.3679 190.543 3.37557 175.59 0.949823 159.596C-1.47592 143.602 0.768139 127.248 7.41237 112.499C14.0566 97.7497 24.8183 85.2327 38.4045 76.4519ZM163.062 156.711L163.062 156.711C162.954 156.773 162.846 156.835 162.738 156.897C162.846 156.835 162.954 156.773 163.062 156.711Z" fill="#24C8DB"/>
-</svg>
diff --git a/static/vite.svg b/static/vite.svg
deleted file mode 100644
index e7b8dfb..0000000
--- a/static/vite.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file

From 129ccfbbd906fb1e5bb2cb6a23d59ed89ee48e5e Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Fri, 12 Jun 2026 00:45:04 +0800
Subject: [PATCH 35/39] update

---
 plugins/lyrics/plugin.json   | 38 ++++++++++++++++++++++++++++++++++++
 plugins/plugin.template.json | 20 +++++++++++++++++++
 src-tauri/src/events/bus.rs  | 34 ++++++++++++++++++++++++++++----
 3 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 plugins/lyrics/plugin.json
 create mode 100644 plugins/plugin.template.json

diff --git a/plugins/lyrics/plugin.json b/plugins/lyrics/plugin.json
new file mode 100644
index 0000000..6351401
--- /dev/null
+++ b/plugins/lyrics/plugin.json
@@ -0,0 +1,38 @@
+{
+    "id": "builtin/lyrics",
+    "name": "lyrics",
+    "displayName": "Lyrics",
+    "version": "1.0.0",
+    "author": "RustEchoMusic",
+    "description": "Lyrics search, load, cache and sync display",
+    "entry": "lyrics",
+    "minAppVersion": "0.1.0",
+    "permissions": [
+        "playerRead",
+        "libraryRead"
+    ],
+    "activationEvents": [
+        "OnStartup",
+        "OnTrackChanged",
+        {"OnCommand": "lyrics.search"},
+        {"OnCommand": "lyrics.load"},
+        {"OnCommand": "lyrics.clearCache"}
+    ],
+    "contributes": {
+        "commands": [
+            { "id": "lyrics.search", "title": "搜索歌词" },
+            { "id": "lyrics.load", "title": "加载歌词" },
+            { "id": "lyrics.clearCache", "title": "清除歌词缓存" }
+        ],
+        "menus": [],
+        "sidebars": [
+            { "id": "lyrics", "title": "歌词", "icon": "lyrics", "route": "/lyrics" }
+        ]
+    },
+    "settings": [
+        { "key": "provider", "title": "歌词来源", "defaultValue": { "type": "Text", "value": "local" } },
+        { "key": "auto_search", "title": "自动搜索歌词", "defaultValue": { "type": "Bool", "value": true } },
+        { "key": "auto_scroll", "title": "自动滚动", "defaultValue": { "type": "Bool", "value": true } },
+        { "key": "cache_enabled", "title": "启用缓存", "defaultValue": { "type": "Bool", "value": true } }
+    ]
+}
diff --git a/plugins/plugin.template.json b/plugins/plugin.template.json
new file mode 100644
index 0000000..3a5c18c
--- /dev/null
+++ b/plugins/plugin.template.json
@@ -0,0 +1,20 @@
+{
+    "id": "",
+    "name": "",
+    "displayName": "",
+    "version": "1.0.0",
+    "author": "",
+    "description": "",
+    "entry": "",
+    "minAppVersion": "0.1.0",
+    "permissions": [],
+    "activationEvents": [
+        "onStartup"
+    ],
+    "contributes": {
+        "commands": [],
+        "menus": [],
+        "sidebars": []
+    },
+    "settings": []
+}
diff --git a/src-tauri/src/events/bus.rs b/src-tauri/src/events/bus.rs
index 599e3f0..cd42476 100644
--- a/src-tauri/src/events/bus.rs
+++ b/src-tauri/src/events/bus.rs
@@ -1,24 +1,50 @@
+use std::sync::{LazyLock, RwLock};
+
 use tauri::{AppHandle, Emitter};
 
-use crate::{
-    errors::AppError,
-    events::payloads::{AppEvent, LyricsLoadedPayload},
-};
+use crate::errors::AppError;
+use crate::events::payloads::{AppEvent, LyricsLoadedPayload};
+
+pub type EventListener = Box<dyn Fn(&AppEvent) + Send + Sync>;
+
+static LISTENERS: LazyLock<RwLock<Vec<EventListener>>> =
+    LazyLock::new(|| RwLock::new(Vec::new()));
 
 pub struct EventBus;
 
 impl EventBus {
     pub const CHANNEL: &'static str = "global-app-event";
 
+    pub fn subscribe(listener: EventListener) {
+        if let Ok(mut lock) = LISTENERS.write() {
+            lock.push(listener);
+        }
+    }
+
     pub fn emit(app_handle: &AppHandle, event: AppEvent) -> Result<(), AppError> {
+        Self::notify_local(&event);
         app_handle.emit(Self::CHANNEL, event)?;
         Ok(())
     }
 
+    pub fn emit_local_only(event: &AppEvent) {
+        Self::notify_local(event);
+    }
+
     pub fn emit_lyrics_loaded(
         app_handle: &AppHandle,
         payload: LyricsLoadedPayload,
     ) -> Result<(), AppError> {
         Self::emit(app_handle, AppEvent::LyricsLoaded(payload))
     }
+
+    fn notify_local(event: &AppEvent) {
+        let listeners = match LISTENERS.read() {
+            Ok(lock) => lock,
+            Err(_) => return,
+        };
+        for listener in listeners.iter() {
+            listener(event);
+        }
+    }
 }

From d7604c6313a566a3572a467d84e2ef3151ed9ad0 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Fri, 12 Jun 2026 01:23:56 +0800
Subject: [PATCH 36/39] change lyrics to crate

---
 src-tauri/Cargo.lock                          |  20 ++
 src-tauri/Cargo.toml                          |   5 +
 src-tauri/crates/lyrics-plugin/Cargo.toml     |  11 +
 .../lyrics-plugin/src}/cache.rs               |   0
 src-tauri/crates/lyrics-plugin/src/lib.rs     | 246 ++++++++++++++++++
 .../lyrics-plugin/src}/models.rs              |   0
 .../lyrics-plugin/src}/service.rs             |   0
 src-tauri/crates/plugin-sdk/Cargo.toml        |   9 +
 src-tauri/crates/plugin-sdk/src/api.rs        |  32 +++
 src-tauri/crates/plugin-sdk/src/context.rs    |  53 ++++
 .../crates/plugin-sdk/src/contributes.rs      |  30 +++
 src-tauri/crates/plugin-sdk/src/errors.rs     |  43 +++
 src-tauri/crates/plugin-sdk/src/events.rs     |  34 +++
 src-tauri/crates/plugin-sdk/src/lib.rs        |  20 ++
 .../plugin-sdk/src}/manifest.rs               |  10 +-
 .../plugin-sdk/src/model.rs}                  |  36 +--
 .../plugin-sdk/src}/permissions.rs            |   0
 .../plugin-sdk/src/settings.rs}               |   2 +
 src-tauri/crates/plugin-sdk/src/traits.rs     |  33 +++
 src-tauri/src/commands/plugin_extensions.rs   |   4 +-
 src-tauri/src/errors/app_error.rs             |  15 +-
 src-tauri/src/lib.rs                          |   1 -
 src-tauri/src/plugins/lyrics/manifest.rs      |  74 ------
 src-tauri/src/plugins/lyrics/mod.rs           |   7 -
 src-tauri/src/plugins/lyrics/plugin.rs        | 236 -----------------
 src-tauri/src/plugins/mod.rs                  |   1 -
 .../plugin/adapters/library_adapter.rs        |  43 +--
 .../plugin/adapters/player_adapter.rs         |  58 +++--
 .../adapters/plugin_settings_adapter.rs       |  14 +-
 .../services/plugin/adapters/queue_adapter.rs |  42 +--
 .../plugin/adapters/settings_adapter.rs       |  50 ++--
 src-tauri/src/services/plugin/api/library.rs  |   8 -
 src-tauri/src/services/plugin/api/mod.rs      |  11 -
 src-tauri/src/services/plugin/api/player.rs   |   9 -
 .../services/plugin/api/plugin_settings.rs    |   7 -
 src-tauri/src/services/plugin/api/queue.rs    |   7 -
 src-tauri/src/services/plugin/api/settings.rs |   6 -
 .../services/plugin/capability/capability.rs  |   2 +-
 .../plugin/capability/permission_checker.rs   |   2 +-
 .../plugin/capability/plugin_capability.rs    |   2 +-
 src-tauri/src/services/plugin/context.rs      |  53 ----
 .../services/plugin/contributes/command.rs    |   8 -
 .../src/services/plugin/contributes/menu.rs   |  15 --
 .../src/services/plugin/contributes/mod.rs    |   7 -
 .../services/plugin/contributes/sidebar.rs    |   9 -
 src-tauri/src/services/plugin/events.rs       |  28 --
 .../plugin/extension/menu_extension.rs        |   2 +-
 .../src/services/plugin/extension/registry.rs |   2 +-
 src-tauri/src/services/plugin/loader.rs       |   7 +-
 src-tauri/src/services/plugin/manager.rs      |  31 ++-
 src-tauri/src/services/plugin/mod.rs          |  30 +--
 src-tauri/src/services/plugin/model/errors.rs |  14 -
 src-tauri/src/services/plugin/model/mod.rs    |   5 -
 .../plugin/registry/plugin_registry.rs        |   2 +-
 .../plugin/runtime/context_factory.rs         |  17 +-
 .../plugin/runtime/runtime_instance.rs        |   2 +-
 src-tauri/src/services/plugin/sdk_adapters.rs |  51 ++++
 src-tauri/src/services/plugin/settings/mod.rs |   2 -
 .../services/plugin/settings/persistence.rs   |   2 +-
 .../plugin/settings/settings_registry.rs      |  23 +-
 src-tauri/src/services/plugin/traits.rs       |  51 ----
 61 files changed, 779 insertions(+), 765 deletions(-)
 create mode 100644 src-tauri/crates/lyrics-plugin/Cargo.toml
 rename src-tauri/{src/plugins/lyrics => crates/lyrics-plugin/src}/cache.rs (100%)
 create mode 100644 src-tauri/crates/lyrics-plugin/src/lib.rs
 rename src-tauri/{src/plugins/lyrics => crates/lyrics-plugin/src}/models.rs (100%)
 rename src-tauri/{src/plugins/lyrics => crates/lyrics-plugin/src}/service.rs (100%)
 create mode 100644 src-tauri/crates/plugin-sdk/Cargo.toml
 create mode 100644 src-tauri/crates/plugin-sdk/src/api.rs
 create mode 100644 src-tauri/crates/plugin-sdk/src/context.rs
 create mode 100644 src-tauri/crates/plugin-sdk/src/contributes.rs
 create mode 100644 src-tauri/crates/plugin-sdk/src/errors.rs
 create mode 100644 src-tauri/crates/plugin-sdk/src/events.rs
 create mode 100644 src-tauri/crates/plugin-sdk/src/lib.rs
 rename src-tauri/{src/services/plugin => crates/plugin-sdk/src}/manifest.rs (82%)
 rename src-tauri/{src/services/plugin/model/plugin_identity.rs => crates/plugin-sdk/src/model.rs} (52%)
 rename src-tauri/{src/services/plugin => crates/plugin-sdk/src}/permissions.rs (100%)
 rename src-tauri/{src/services/plugin/settings/plugin_settings.rs => crates/plugin-sdk/src/settings.rs} (93%)
 create mode 100644 src-tauri/crates/plugin-sdk/src/traits.rs
 delete mode 100644 src-tauri/src/plugins/lyrics/manifest.rs
 delete mode 100644 src-tauri/src/plugins/lyrics/mod.rs
 delete mode 100644 src-tauri/src/plugins/lyrics/plugin.rs
 delete mode 100644 src-tauri/src/plugins/mod.rs
 delete mode 100644 src-tauri/src/services/plugin/api/library.rs
 delete mode 100644 src-tauri/src/services/plugin/api/mod.rs
 delete mode 100644 src-tauri/src/services/plugin/api/player.rs
 delete mode 100644 src-tauri/src/services/plugin/api/plugin_settings.rs
 delete mode 100644 src-tauri/src/services/plugin/api/queue.rs
 delete mode 100644 src-tauri/src/services/plugin/api/settings.rs
 delete mode 100644 src-tauri/src/services/plugin/context.rs
 delete mode 100644 src-tauri/src/services/plugin/contributes/command.rs
 delete mode 100644 src-tauri/src/services/plugin/contributes/menu.rs
 delete mode 100644 src-tauri/src/services/plugin/contributes/mod.rs
 delete mode 100644 src-tauri/src/services/plugin/contributes/sidebar.rs
 delete mode 100644 src-tauri/src/services/plugin/events.rs
 delete mode 100644 src-tauri/src/services/plugin/model/errors.rs
 delete mode 100644 src-tauri/src/services/plugin/model/mod.rs
 create mode 100644 src-tauri/src/services/plugin/sdk_adapters.rs
 delete mode 100644 src-tauri/src/services/plugin/traits.rs

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index efa0b7a..f62d973 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2516,6 +2516,16 @@ version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
+[[package]]
+name = "lyrics-plugin"
+version = "0.1.0"
+dependencies = [
+ "lofty",
+ "plugin-sdk",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "mach2"
 version = "0.5.0"
@@ -3211,6 +3221,14 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "plugin-sdk"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "png"
 version = "0.17.16"
@@ -3620,6 +3638,8 @@ version = "0.1.0"
 dependencies = [
  "base64 0.22.1",
  "lofty",
+ "lyrics-plugin",
+ "plugin-sdk",
  "rand",
  "serde",
  "serde_json",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index e34302c..f2a7c91 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,3 +1,6 @@
+[workspace]
+members = [".", "crates/plugin-sdk", "crates/lyrics-plugin"]
+
 [package]
 name = "rust-echo-music"
 version = "0.1.0"
@@ -28,3 +31,5 @@ souvlaki = "0.8.3"
 sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "macros", "migrate"] }
 rand = "0.10.1"
 tokio = { version = "1.52.3", features = ["fs"] }
+plugin-sdk = { path = "crates/plugin-sdk" }
+lyrics-plugin = { path = "crates/lyrics-plugin" }
diff --git a/src-tauri/crates/lyrics-plugin/Cargo.toml b/src-tauri/crates/lyrics-plugin/Cargo.toml
new file mode 100644
index 0000000..a354368
--- /dev/null
+++ b/src-tauri/crates/lyrics-plugin/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "lyrics-plugin"
+version = "0.1.0"
+edition = "2021"
+description = "Lyrics plugin for Rust Echo Music"
+
+[dependencies]
+plugin-sdk = { path = "../plugin-sdk" }
+lofty = "0.24.0"
+serde_json = "1"
+serde = { version = "1", features = ["derive"] }
diff --git a/src-tauri/src/plugins/lyrics/cache.rs b/src-tauri/crates/lyrics-plugin/src/cache.rs
similarity index 100%
rename from src-tauri/src/plugins/lyrics/cache.rs
rename to src-tauri/crates/lyrics-plugin/src/cache.rs
diff --git a/src-tauri/crates/lyrics-plugin/src/lib.rs b/src-tauri/crates/lyrics-plugin/src/lib.rs
new file mode 100644
index 0000000..25990cb
--- /dev/null
+++ b/src-tauri/crates/lyrics-plugin/src/lib.rs
@@ -0,0 +1,246 @@
+use std::sync::{Arc, LazyLock, RwLock};
+
+use plugin_sdk::context::PluginContext;
+use plugin_sdk::contributes::{CommandContribution, SidebarContribution};
+use plugin_sdk::errors::PluginError;
+use plugin_sdk::events::{LyricsLoadedEvent, PluginEvent};
+use plugin_sdk::manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
+use plugin_sdk::permissions::PluginPermission;
+use plugin_sdk::settings::SettingValue;
+use plugin_sdk::traits::{CommandArgs, Plugin, PluginFactory};
+
+mod cache;
+mod models;
+mod service;
+
+use cache::LyricsCacheService;
+use models::LyricDocument;
+use service::LyricsService;
+
+struct LyricsState {
+    song_id: Option<i64>,
+    lyrics: Option<LyricDocument>,
+}
+
+pub struct LyricsPlugin {
+    cache: RwLock<Option<LyricsCacheService>>,
+    state: RwLock<LyricsState>,
+}
+
+fn build_manifest() -> PluginManifest {
+    PluginManifest {
+        id: "builtin/lyrics".into(),
+        name: "lyrics".into(),
+        display_name: "Lyrics".into(),
+        version: "1.0.0".into(),
+        author: "RustEchoMusic".into(),
+        description: "Lyrics search, load, cache and sync display".into(),
+        entry: "lyrics".into(),
+        min_app_version: "0.1.0".into(),
+        permissions: vec![PluginPermission::PlayerRead, PluginPermission::LibraryRead],
+        activation_events: vec![
+            ActivationEvent::OnStartup,
+            ActivationEvent::OnTrackChanged,
+            ActivationEvent::OnCommand("lyrics.search".into()),
+            ActivationEvent::OnCommand("lyrics.load".into()),
+            ActivationEvent::OnCommand("lyrics.clear_cache".into()),
+        ],
+        contributes: PluginContribution {
+            commands: vec![
+                CommandContribution { id: "lyrics.search".into(), title: "搜索歌词".into(), category: None },
+                CommandContribution { id: "lyrics.load".into(), title: "加载歌词".into(), category: None },
+                CommandContribution { id: "lyrics.clear_cache".into(), title: "清除歌词缓存".into(), category: None },
+            ],
+            menus: vec![],
+            sidebars: vec![SidebarContribution {
+                id: "lyrics".into(),
+                title: "歌词".into(),
+                icon: "lyrics".into(),
+                route: "/lyrics".into(),
+            }],
+        },
+        settings: vec![
+            SettingDefinition { key: "provider".into(), title: "歌词来源".into(), default_value: SettingValue::Text("local".into()) },
+            SettingDefinition { key: "auto_search".into(), title: "自动搜索歌词".into(), default_value: SettingValue::Bool(true) },
+            SettingDefinition { key: "auto_scroll".into(), title: "自动滚动".into(), default_value: SettingValue::Bool(true) },
+            SettingDefinition { key: "cache_enabled".into(), title: "启用缓存".into(), default_value: SettingValue::Bool(true) },
+        ],
+    }
+}
+
+impl LyricsPlugin {
+    pub fn new() -> Self {
+        Self {
+            cache: RwLock::new(None),
+            state: RwLock::new(LyricsState { song_id: None, lyrics: None }),
+        }
+    }
+
+    fn get_bool_setting(ctx: &PluginContext, key: &str) -> bool {
+        ctx.plugin_settings
+            .get_setting(key)
+            .and_then(|v| match v {
+                SettingValue::Bool(b) => Some(b),
+                _ => None,
+            })
+            .unwrap_or(true)
+    }
+
+    fn init_cache(&self, ctx: &PluginContext) {
+        let mut cache_lock = match self.cache.write() {
+            Ok(guard) => guard,
+            Err(_) => return,
+        };
+        if cache_lock.is_some() {
+            return;
+        }
+        let cache_dir = match ctx.cache_dir() {
+            Ok(dir) => dir,
+            Err(_) => return,
+        };
+        let svc = LyricsCacheService::new(cache_dir);
+        if let Err(e) = svc.init() {
+            eprintln!("[Lyrics] Failed to init cache: {}", e);
+        }
+        *cache_lock = Some(svc);
+    }
+
+    fn handle_track_changed(&self, track_id: i64, file_path: &str, ctx: &PluginContext) {
+        {
+            let mut state = match self.state.write() {
+                Ok(guard) => guard,
+                Err(_) => return,
+            };
+            if state.song_id == Some(track_id) {
+                return;
+            }
+            state.song_id = Some(track_id);
+            state.lyrics = None;
+        }
+
+        let auto_search = Self::get_bool_setting(ctx, "auto_search");
+        if !auto_search {
+            return;
+        }
+
+        let cache_guard = match self.cache.read() {
+            Ok(guard) => guard,
+            Err(_) => return,
+        };
+        let cache = match cache_guard.as_ref() {
+            Some(c) => c,
+            None => return,
+        };
+
+        let path = std::path::Path::new(file_path);
+        if let Some(doc) = LyricsService::load_or_fetch(cache, track_id, path) {
+            let event = LyricsLoadedEvent {
+                song_id: doc.song_id,
+                timestamp_ms_list: doc.lines.iter().map(|l| l.timestamp_ms).collect(),
+                text_list: doc.lines.iter().map(|l| l.text.clone()).collect(),
+            };
+            if let Err(e) = ctx.emit_lyrics_loaded(event) {
+                eprintln!("[Lyrics] Failed to emit lyrics: {}", e);
+            }
+            if let Ok(mut state) = self.state.write() {
+                if state.song_id == Some(track_id) {
+                    state.lyrics = Some(doc);
+                }
+            }
+        }
+    }
+}
+
+impl Plugin for LyricsPlugin {
+    fn manifest(&self) -> &PluginManifest {
+        static MANIFEST: LazyLock<PluginManifest> = LazyLock::new(build_manifest);
+        &MANIFEST
+    }
+
+    fn activate(&self, ctx: &PluginContext) -> Result<(), PluginError> {
+        self.init_cache(ctx);
+        Ok(())
+    }
+
+    fn deactivate(&self) -> Result<(), PluginError> {
+        if let Ok(mut state) = self.state.write() {
+            state.song_id = None;
+            state.lyrics = None;
+        }
+        Ok(())
+    }
+
+    fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), PluginError> {
+        if let PluginEvent::TrackChanged { track, .. } = event {
+            self.handle_track_changed(track.id, &track.path, ctx);
+        }
+        Ok(())
+    }
+
+    fn execute_command(
+        &self,
+        command_id: &str,
+        args: &CommandArgs,
+        ctx: &PluginContext,
+    ) -> Result<(), PluginError> {
+        match command_id {
+            "lyrics.search" => {
+                if let CommandArgs::LyricsSearch { title, artist } = args {
+                    println!("[Lyrics] search '{} - {}' (local only)", title, artist);
+                    Ok(())
+                } else {
+                    Err(PluginError::Plugin("lyrics.search requires LyricsSearch args".into()))
+                }
+            }
+            "lyrics.load" => {
+                if let CommandArgs::TrackId(song_id) = args {
+                    let path = ctx.library.get_track_path(*song_id)?
+                        .ok_or_else(|| PluginError::Plugin(format!("Track path not found: {}", song_id)))?;
+
+                    let cache_guard = self.cache.read().map_err(|e| PluginError::Plugin(e.to_string()))?;
+                    let cache = cache_guard.as_ref()
+                        .ok_or_else(|| PluginError::Plugin("Cache not initialized".into()))?;
+
+                    if let Some(doc) = LyricsService::load_or_fetch(cache, *song_id, &path) {
+                        let event = LyricsLoadedEvent {
+                            song_id: doc.song_id,
+                            timestamp_ms_list: doc.lines.iter().map(|l| l.timestamp_ms).collect(),
+                            text_list: doc.lines.iter().map(|l| l.text.clone()).collect(),
+                        };
+                        ctx.emit_lyrics_loaded(event)?;
+                        if let Ok(mut state) = self.state.write() {
+                            state.song_id = Some(*song_id);
+                            state.lyrics = Some(doc);
+                        }
+                        return Ok(());
+                    }
+
+                    Err(PluginError::Plugin(format!("No lyrics found for song_id: {}", song_id)))
+                } else {
+                    Err(PluginError::Plugin("lyrics.load requires TrackId".into()))
+                }
+            }
+            "lyrics.clear_cache" => {
+                if let Ok(cache_guard) = self.cache.read() {
+                    if let Some(ref cache) = *cache_guard {
+                        cache.clear().map_err(|e| PluginError::Plugin(e.to_string()))?;
+                    }
+                }
+                Ok(())
+            }
+            _ => Err(PluginError::Plugin(format!("Unknown command: {}", command_id))),
+        }
+    }
+}
+
+pub struct LyricsPluginFactory;
+
+impl PluginFactory for LyricsPluginFactory {
+    fn manifest(&self) -> PluginManifest {
+        build_manifest()
+    }
+
+    fn create(&self) -> Arc<dyn Plugin> {
+        Arc::new(LyricsPlugin::new())
+    }
+}
diff --git a/src-tauri/src/plugins/lyrics/models.rs b/src-tauri/crates/lyrics-plugin/src/models.rs
similarity index 100%
rename from src-tauri/src/plugins/lyrics/models.rs
rename to src-tauri/crates/lyrics-plugin/src/models.rs
diff --git a/src-tauri/src/plugins/lyrics/service.rs b/src-tauri/crates/lyrics-plugin/src/service.rs
similarity index 100%
rename from src-tauri/src/plugins/lyrics/service.rs
rename to src-tauri/crates/lyrics-plugin/src/service.rs
diff --git a/src-tauri/crates/plugin-sdk/Cargo.toml b/src-tauri/crates/plugin-sdk/Cargo.toml
new file mode 100644
index 0000000..7d87273
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "plugin-sdk"
+version = "0.1.0"
+edition = "2021"
+description = "Plugin SDK for Rust Echo Music"
+
+[dependencies]
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
diff --git a/src-tauri/crates/plugin-sdk/src/api.rs b/src-tauri/crates/plugin-sdk/src/api.rs
new file mode 100644
index 0000000..7d6c893
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/src/api.rs
@@ -0,0 +1,32 @@
+use std::path::PathBuf;
+
+use crate::errors::PluginError;
+
+pub trait PlayerApi: Send + Sync {
+    fn play(&self) -> Result<(), PluginError>;
+    fn pause(&self) -> Result<(), PluginError>;
+    fn next(&self) -> Result<(), PluginError>;
+    fn previous(&self) -> Result<(), PluginError>;
+    fn current_track_id(&self) -> Result<Option<i64>, PluginError>;
+}
+
+pub trait LibraryApi: Send + Sync {
+    fn get_track_path(&self, track_id: i64) -> Result<Option<PathBuf>, PluginError>;
+    fn exists(&self, track_id: i64) -> Result<bool, PluginError>;
+}
+
+pub trait QueueApi: Send + Sync {
+    fn current_queue(&self) -> Result<Vec<i64>, PluginError>;
+    fn remove_track(&self, track_id: i64) -> Result<(), PluginError>;
+    fn clear(&self) -> Result<(), PluginError>;
+}
+
+pub trait SettingsApi: Send + Sync {
+    fn theme(&self) -> Result<String, PluginError>;
+    fn set_theme(&self, theme: String) -> Result<(), PluginError>;
+}
+
+pub trait PluginSettingsApi: Send + Sync {
+    fn get_setting(&self, key: &str) -> Option<crate::settings::SettingValue>;
+    fn set_setting(&self, key: &str, value: crate::settings::SettingValue) -> Result<(), PluginError>;
+}
diff --git a/src-tauri/crates/plugin-sdk/src/context.rs b/src-tauri/crates/plugin-sdk/src/context.rs
new file mode 100644
index 0000000..d42c6bf
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/src/context.rs
@@ -0,0 +1,53 @@
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::api::{LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi};
+use crate::errors::PluginError;
+use crate::events::LyricsLoadedEvent;
+
+pub trait HostContext: Send + Sync {
+    fn plugin_id(&self) -> &str;
+    fn cache_dir(&self) -> Result<PathBuf, PluginError>;
+    fn emit_lyrics_loaded(&self, event: LyricsLoadedEvent) -> Result<(), PluginError>;
+}
+
+pub struct PluginContext {
+    pub host: Arc<dyn HostContext>,
+    pub player: Arc<dyn PlayerApi>,
+    pub library: Arc<dyn LibraryApi>,
+    pub queue: Arc<dyn QueueApi>,
+    pub settings: Arc<dyn SettingsApi>,
+    pub plugin_settings: Arc<dyn PluginSettingsApi>,
+}
+
+impl PluginContext {
+    pub fn new(
+        host: Arc<dyn HostContext>,
+        player: Arc<dyn PlayerApi>,
+        library: Arc<dyn LibraryApi>,
+        queue: Arc<dyn QueueApi>,
+        settings: Arc<dyn SettingsApi>,
+        plugin_settings: Arc<dyn PluginSettingsApi>,
+    ) -> Self {
+        Self {
+            host,
+            player,
+            library,
+            queue,
+            settings,
+            plugin_settings,
+        }
+    }
+
+    pub fn plugin_id(&self) -> &str {
+        self.host.plugin_id()
+    }
+
+    pub fn cache_dir(&self) -> Result<PathBuf, PluginError> {
+        self.host.cache_dir()
+    }
+
+    pub fn emit_lyrics_loaded(&self, event: LyricsLoadedEvent) -> Result<(), PluginError> {
+        self.host.emit_lyrics_loaded(event)
+    }
+}
diff --git a/src-tauri/crates/plugin-sdk/src/contributes.rs b/src-tauri/crates/plugin-sdk/src/contributes.rs
new file mode 100644
index 0000000..2c700a8
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/src/contributes.rs
@@ -0,0 +1,30 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct CommandContribution {
+    pub id: String,
+    pub title: String,
+    pub category: Option<String>,
+}
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
+pub enum MenuLocation {
+    TrackContextMenu,
+    SidebarActions,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct MenuContribution {
+    pub command: String,
+    pub title: String,
+    pub location: MenuLocation,
+    pub group: Option<String>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SidebarContribution {
+    pub id: String,
+    pub title: String,
+    pub icon: String,
+    pub route: String,
+}
diff --git a/src-tauri/crates/plugin-sdk/src/errors.rs b/src-tauri/crates/plugin-sdk/src/errors.rs
new file mode 100644
index 0000000..766f67c
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/src/errors.rs
@@ -0,0 +1,43 @@
+use crate::permissions::PluginPermission;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum PluginError {
+    Plugin(String),
+    PermissionDenied {
+        plugin_id: String,
+        permission: PluginPermission,
+    },
+    Io(String),
+}
+
+impl std::fmt::Display for PluginError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            PluginError::Plugin(msg) => write!(f, "Plugin error: {}", msg),
+            PluginError::PermissionDenied { plugin_id, permission } => {
+                write!(f, "Plugin '{}' denied permission {:?}", plugin_id, permission)
+            }
+            PluginError::Io(msg) => write!(f, "Plugin IO error: {}", msg),
+        }
+    }
+}
+
+impl std::error::Error for PluginError {}
+
+impl From<std::io::Error> for PluginError {
+    fn from(e: std::io::Error) -> Self {
+        PluginError::Io(e.to_string())
+    }
+}
+
+impl From<String> for PluginError {
+    fn from(s: String) -> Self {
+        PluginError::Plugin(s)
+    }
+}
+
+impl From<&str> for PluginError {
+    fn from(s: &str) -> Self {
+        PluginError::Plugin(s.to_string())
+    }
+}
diff --git a/src-tauri/crates/plugin-sdk/src/events.rs b/src-tauri/crates/plugin-sdk/src/events.rs
new file mode 100644
index 0000000..bdfa260
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/src/events.rs
@@ -0,0 +1,34 @@
+use serde::Serialize;
+
+#[derive(Clone, Debug, Serialize)]
+pub struct TrackSnapshot {
+    pub id: i64,
+    pub title: String,
+    pub artist: Option<String>,
+    pub album: Option<String>,
+    pub duration: i64,
+    pub path: String,
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct LyricsLoadedEvent {
+    pub song_id: i64,
+    pub timestamp_ms_list: Vec<u64>,
+    pub text_list: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub enum PluginEvent {
+    Startup,
+    TrackChanged {
+        track: TrackSnapshot,
+        index: usize,
+    },
+    PlaybackStateChanged {
+        playing: bool,
+        current_time: f64,
+    },
+    QueueChanged,
+    SettingsChanged,
+    LyricsLoaded(LyricsLoadedEvent),
+}
diff --git a/src-tauri/crates/plugin-sdk/src/lib.rs b/src-tauri/crates/plugin-sdk/src/lib.rs
new file mode 100644
index 0000000..ce0af81
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/src/lib.rs
@@ -0,0 +1,20 @@
+pub mod api;
+pub mod contributes;
+pub mod context;
+pub mod errors;
+pub mod events;
+pub mod manifest;
+pub mod model;
+pub mod permissions;
+pub mod settings;
+pub mod traits;
+
+pub use api::{LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi};
+pub use context::{HostContext, PluginContext};
+pub use errors::PluginError;
+pub use events::{LyricsLoadedEvent, PluginEvent, TrackSnapshot};
+pub use manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
+pub use model::PluginIdentity;
+pub use permissions::PluginPermission;
+pub use settings::{PluginSetting, PluginSettingMeta, PluginSettings, SettingValue};
+pub use traits::{CommandArgs, Plugin, PluginFactory};
diff --git a/src-tauri/src/services/plugin/manifest.rs b/src-tauri/crates/plugin-sdk/src/manifest.rs
similarity index 82%
rename from src-tauri/src/services/plugin/manifest.rs
rename to src-tauri/crates/plugin-sdk/src/manifest.rs
index 227f2db..2619cb0 100644
--- a/src-tauri/src/services/plugin/manifest.rs
+++ b/src-tauri/crates/plugin-sdk/src/manifest.rs
@@ -1,10 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-use crate::services::plugin::contributes::{
-    CommandContribution, MenuContribution, SidebarContribution,
-};
-use crate::services::plugin::permissions::PluginPermission;
-use crate::services::plugin::settings::plugin_settings::SettingValue;
+use crate::contributes::{CommandContribution, MenuContribution, SidebarContribution};
+use crate::permissions::PluginPermission;
+use crate::settings::SettingValue;
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
@@ -37,9 +35,11 @@ pub struct PluginManifest {
     pub id: String,
     pub name: String,
     pub display_name: String,
+    pub version: String,
     pub author: String,
     pub description: String,
     pub entry: String,
+    pub min_app_version: String,
     pub permissions: Vec<PluginPermission>,
     pub activation_events: Vec<ActivationEvent>,
     pub contributes: PluginContribution,
diff --git a/src-tauri/src/services/plugin/model/plugin_identity.rs b/src-tauri/crates/plugin-sdk/src/model.rs
similarity index 52%
rename from src-tauri/src/services/plugin/model/plugin_identity.rs
rename to src-tauri/crates/plugin-sdk/src/model.rs
index c8a3639..58509ee 100644
--- a/src-tauri/src/services/plugin/model/plugin_identity.rs
+++ b/src-tauri/crates/plugin-sdk/src/model.rs
@@ -1,6 +1,8 @@
-#[derive(
-    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, serde::Serialize, serde::Deserialize,
-)]
+use serde::{Deserialize, Serialize};
+
+use crate::errors::PluginError;
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Serialize, Deserialize)]
 pub struct PluginIdentity {
     pub namespace: Option<String>,
     pub name: String,
@@ -26,34 +28,20 @@ impl std::fmt::Display for PluginIdentity {
 }
 
 impl std::str::FromStr for PluginIdentity {
-    type Err = super::errors::ModelError;
+    type Err = crate::errors::PluginError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let parts: Vec<&str> = s.split('/').collect();
-        if parts.len() == 2 {
-            if parts[0].is_empty() || parts[1].is_empty() {
-                return Err(super::errors::ModelError::InvalidIdentityFormat(
-                    s.to_string(),
-                ));
-            }
-            Ok(Self {
+        match parts.len() {
+            2 if !parts[0].is_empty() && !parts[1].is_empty() => Ok(Self {
                 namespace: Some(parts[0].to_string()),
                 name: parts[1].to_string(),
-            })
-        } else if parts.len() == 1 {
-            if parts[0].is_empty() {
-                return Err(super::errors::ModelError::InvalidIdentityFormat(
-                    s.to_string(),
-                ));
-            }
-            Ok(Self {
+            }),
+            1 if !parts[0].is_empty() => Ok(Self {
                 namespace: None,
                 name: parts[0].to_string(),
-            })
-        } else {
-            Err(super::errors::ModelError::InvalidIdentityFormat(
-                s.to_string(),
-            ))
+            }),
+            _ => Err(PluginError::Plugin(format!("Invalid identity: {}", s))),
         }
     }
 }
diff --git a/src-tauri/src/services/plugin/permissions.rs b/src-tauri/crates/plugin-sdk/src/permissions.rs
similarity index 100%
rename from src-tauri/src/services/plugin/permissions.rs
rename to src-tauri/crates/plugin-sdk/src/permissions.rs
diff --git a/src-tauri/src/services/plugin/settings/plugin_settings.rs b/src-tauri/crates/plugin-sdk/src/settings.rs
similarity index 93%
rename from src-tauri/src/services/plugin/settings/plugin_settings.rs
rename to src-tauri/crates/plugin-sdk/src/settings.rs
index 3c68adf..d809003 100644
--- a/src-tauri/src/services/plugin/settings/plugin_settings.rs
+++ b/src-tauri/crates/plugin-sdk/src/settings.rs
@@ -16,7 +16,9 @@ pub enum SettingValue {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct PluginSetting {
     pub key: String,
+    pub title: String,
     pub value: SettingValue,
+    pub default_value: SettingValue,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
diff --git a/src-tauri/crates/plugin-sdk/src/traits.rs b/src-tauri/crates/plugin-sdk/src/traits.rs
new file mode 100644
index 0000000..3d20252
--- /dev/null
+++ b/src-tauri/crates/plugin-sdk/src/traits.rs
@@ -0,0 +1,33 @@
+use std::sync::Arc;
+
+use crate::context::PluginContext;
+use crate::errors::PluginError;
+use crate::events::PluginEvent;
+use crate::manifest::PluginManifest;
+
+#[derive(Debug, Clone)]
+pub enum CommandArgs {
+    None,
+    TrackId(i64),
+    TrackIds(Vec<i64>),
+    RawPayload(String),
+    LyricsSearch { title: String, artist: String },
+}
+
+pub trait Plugin: Send + Sync {
+    fn manifest(&self) -> &PluginManifest;
+    fn activate(&self, ctx: &PluginContext) -> Result<(), PluginError>;
+    fn deactivate(&self) -> Result<(), PluginError>;
+    fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), PluginError>;
+    fn execute_command(
+        &self,
+        command_id: &str,
+        args: &CommandArgs,
+        ctx: &PluginContext,
+    ) -> Result<(), PluginError>;
+}
+
+pub trait PluginFactory: Send + Sync {
+    fn manifest(&self) -> PluginManifest;
+    fn create(&self) -> Arc<dyn Plugin>;
+}
diff --git a/src-tauri/src/commands/plugin_extensions.rs b/src-tauri/src/commands/plugin_extensions.rs
index 92493ec..fa7d036 100644
--- a/src-tauri/src/commands/plugin_extensions.rs
+++ b/src-tauri/src/commands/plugin_extensions.rs
@@ -3,11 +3,11 @@ use std::sync::Arc;
 use tauri::{command, State};
 
 use crate::errors::AppError;
-use crate::services::plugin::contributes::menu::MenuLocation;
+use plugin_sdk::contributes::MenuLocation;
 use crate::services::plugin::extension::menu_extension::MenuExtension;
 use crate::services::plugin::extension::sidebar_extension::SidebarExtension;
 use crate::services::plugin::manager::PluginManager;
-use crate::services::plugin::settings::plugin_settings::{PluginSettingMeta, SettingValue};
+use plugin_sdk::settings::{PluginSettingMeta, SettingValue};
 
 #[command]
 pub async fn get_menu_extensions(
diff --git a/src-tauri/src/errors/app_error.rs b/src-tauri/src/errors/app_error.rs
index f0a9915..da6a493 100644
--- a/src-tauri/src/errors/app_error.rs
+++ b/src-tauri/src/errors/app_error.rs
@@ -1,6 +1,7 @@
 use serde::Serialize;
 
-use crate::services::plugin::permissions::PluginPermission;
+use plugin_sdk::permissions::PluginPermission;
+use plugin_sdk::errors::PluginError;
 
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase", tag = "kind", content = "message")]
@@ -81,3 +82,15 @@ impl From<tauri::Error> for AppError {
         AppError::Platform(error.to_string())
     }
 }
+
+impl From<PluginError> for AppError {
+    fn from(error: PluginError) -> Self {
+        match error {
+            PluginError::Plugin(msg) => AppError::Plugin(msg),
+            PluginError::PermissionDenied { plugin_id, permission } => {
+                AppError::PluginPermissionDenied { plugin_id, permission }
+            }
+            PluginError::Io(msg) => AppError::Io(msg),
+        }
+    }
+}
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 307047b..b3b5362 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -6,7 +6,6 @@ mod events;
 mod media_controls;
 mod metadata;
 mod models;
-mod plugins;
 mod repositories;
 mod services;
 mod state;
diff --git a/src-tauri/src/plugins/lyrics/manifest.rs b/src-tauri/src/plugins/lyrics/manifest.rs
deleted file mode 100644
index ac8dbb5..0000000
--- a/src-tauri/src/plugins/lyrics/manifest.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use crate::services::plugin::contributes::command::CommandContribution;
-use crate::services::plugin::contributes::sidebar::SidebarContribution;
-use crate::services::plugin::manifest::{
-    ActivationEvent, PluginContribution, PluginManifest, SettingDefinition,
-};
-use crate::services::plugin::permissions::PluginPermission;
-use crate::services::plugin::settings::plugin_settings::SettingValue;
-
-pub fn build_lyrics_manifest() -> PluginManifest {
-    PluginManifest {
-        id: "builtin/lyrics".into(),
-        name: "lyrics".into(),
-        display_name: "Lyrics".into(),
-        author: "RustEchoMusic".into(),
-        description: "Lyrics search, load, cache and sync display".into(),
-        entry: "lyrics".into(),
-        permissions: vec![PluginPermission::PlayerRead, PluginPermission::LibraryRead],
-        activation_events: vec![
-            ActivationEvent::OnStartup,
-            ActivationEvent::OnTrackChanged,
-            ActivationEvent::OnCommand("lyrics.search".into()),
-            ActivationEvent::OnCommand("lyrics.load".into()),
-            ActivationEvent::OnCommand("lyrics.clear_cache".into()),
-        ],
-        contributes: PluginContribution {
-            commands: vec![
-                CommandContribution {
-                    id: "lyrics.search".into(),
-                    title: "搜索歌词".into(),
-                    category: None,
-                },
-                CommandContribution {
-                    id: "lyrics.load".into(),
-                    title: "加载歌词".into(),
-                    category: None,
-                },
-                CommandContribution {
-                    id: "lyrics.clear_cache".into(),
-                    title: "清除歌词缓存".into(),
-                    category: None,
-                },
-            ],
-            menus: vec![],
-            sidebars: vec![SidebarContribution {
-                id: "lyrics".into(),
-                title: "歌词".into(),
-                icon: "lyrics".into(),
-                route: "/lyrics".into(),
-            }],
-        },
-        settings: vec![
-            SettingDefinition {
-                key: "provider".into(),
-                title: "歌词来源".into(),
-                default_value: SettingValue::Text("local".into()),
-            },
-            SettingDefinition {
-                key: "auto_search".into(),
-                title: "自动搜索歌词".into(),
-                default_value: SettingValue::Bool(true),
-            },
-            SettingDefinition {
-                key: "auto_scroll".into(),
-                title: "自动滚动".into(),
-                default_value: SettingValue::Bool(true),
-            },
-            SettingDefinition {
-                key: "cache_enabled".into(),
-                title: "启用缓存".into(),
-                default_value: SettingValue::Bool(true),
-            },
-        ],
-    }
-}
diff --git a/src-tauri/src/plugins/lyrics/mod.rs b/src-tauri/src/plugins/lyrics/mod.rs
deleted file mode 100644
index 4bcd5c1..0000000
--- a/src-tauri/src/plugins/lyrics/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod cache;
-pub mod manifest;
-pub mod models;
-pub mod plugin;
-pub mod service;
-
-pub use plugin::{LyricsPlugin, LyricsPluginFactory};
diff --git a/src-tauri/src/plugins/lyrics/plugin.rs b/src-tauri/src/plugins/lyrics/plugin.rs
deleted file mode 100644
index a970708..0000000
--- a/src-tauri/src/plugins/lyrics/plugin.rs
+++ /dev/null
@@ -1,236 +0,0 @@
-use std::sync::{Arc, LazyLock, RwLock};
-
-use crate::errors::AppError;
-use crate::events::{EventBus, LyricLinePayload, LyricsLoadedPayload};
-use crate::services::plugin::context::PluginContext;
-use crate::services::plugin::events::PluginEvent;
-use crate::services::plugin::manifest::PluginManifest;
-use crate::services::plugin::settings::plugin_settings::SettingValue;
-use crate::services::plugin::traits::{CommandArgs, Plugin, PluginFactory};
-use tauri::Manager;
-
-use super::cache::LyricsCacheService;
-use super::manifest::build_lyrics_manifest;
-use super::models::LyricDocument;
-use super::service::LyricsService;
-
-struct LyricsState {
-    song_id: Option<i64>,
-    lyrics: Option<LyricDocument>,
-}
-
-pub struct LyricsPlugin {
-    cache: RwLock<Option<LyricsCacheService>>,
-    state: RwLock<LyricsState>,
-}
-
-impl LyricsPlugin {
-    pub fn new() -> Self {
-        Self {
-            cache: RwLock::new(None),
-            state: RwLock::new(LyricsState {
-                song_id: None,
-                lyrics: None,
-            }),
-        }
-    }
-
-    fn get_bool_setting(ctx: &PluginContext, key: &str) -> bool {
-        ctx.plugin_settings
-            .get_setting(key)
-            .and_then(|v| match v {
-                SettingValue::Bool(b) => Some(b),
-                _ => None,
-            })
-            .unwrap_or(true)
-    }
-
-    fn init_cache(&self, ctx: &PluginContext) {
-        let mut cache_lock = match self.cache.write() {
-            Ok(guard) => guard,
-            Err(_) => return,
-        };
-        if cache_lock.is_some() {
-            return;
-        }
-        let app_data = ctx
-            .app_handle
-            .path()
-            .app_data_dir()
-            .unwrap_or_else(|_| std::path::PathBuf::from("."));
-        let cache_dir = app_data.join("plugins").join("lyrics").join("cache");
-        let svc = LyricsCacheService::new(cache_dir);
-        if let Err(e) = svc.init() {
-            eprintln!("[Lyrics] Failed to init cache: {}", e);
-        }
-        *cache_lock = Some(svc);
-    }
-
-    fn handle_track_changed(&self, track_id: i64, file_path: &str, ctx: &PluginContext) {
-        {
-            let mut state = match self.state.write() {
-                Ok(guard) => guard,
-                Err(_) => return,
-            };
-            if state.song_id == Some(track_id) {
-                return;
-            }
-            state.song_id = Some(track_id);
-            state.lyrics = None;
-        }
-
-        let auto_search = Self::get_bool_setting(ctx, "auto_search");
-        if !auto_search {
-            return;
-        }
-
-        let cache_guard = match self.cache.read() {
-            Ok(guard) => guard,
-            Err(_) => return,
-        };
-        let cache = match cache_guard.as_ref() {
-            Some(c) => c,
-            None => return,
-        };
-
-        let path = std::path::Path::new(file_path);
-        if let Some(doc) = LyricsService::load_or_fetch(cache, track_id, path) {
-            self.emit_lyrics_loaded(ctx, &doc);
-            if let Ok(mut state) = self.state.write() {
-                if state.song_id == Some(track_id) {
-                    state.lyrics = Some(doc);
-                }
-            }
-        }
-    }
-
-    fn emit_lyrics_loaded(&self, ctx: &PluginContext, doc: &LyricDocument) {
-        let payload = LyricsLoadedPayload {
-            song_id: doc.song_id,
-            lines: doc
-                .lines
-                .iter()
-                .map(|l| LyricLinePayload {
-                    timestamp_ms: l.timestamp_ms,
-                    text: l.text.clone(),
-                })
-                .collect(),
-        };
-        if let Err(e) = EventBus::emit_lyrics_loaded(&ctx.app_handle, payload) {
-            eprintln!("[Lyrics] Failed to emit LyricsLoaded: {}", e);
-        }
-    }
-
-    fn cmd_load(&self, song_id: i64, ctx: &PluginContext) -> Result<(), AppError> {
-        let path = match ctx.library.get_track_path(song_id) {
-            Ok(Some(p)) => p,
-            _ => {
-                return Err(AppError::Plugin(format!(
-                    "Track path not found for song_id: {}",
-                    song_id
-                )));
-            }
-        };
-
-        let cache_guard = self
-            .cache
-            .read()
-            .map_err(|e| AppError::Plugin(e.to_string()))?;
-        let cache = cache_guard
-            .as_ref()
-            .ok_or_else(|| AppError::Plugin("Cache not initialized".into()))?;
-
-        if let Some(doc) = LyricsService::load_or_fetch(cache, song_id, &path) {
-            self.emit_lyrics_loaded(ctx, &doc);
-            if let Ok(mut state) = self.state.write() {
-                state.song_id = Some(song_id);
-                state.lyrics = Some(doc);
-            }
-            return Ok(());
-        }
-
-        Err(AppError::Plugin(format!(
-            "No lyrics found for song_id: {}",
-            song_id
-        )))
-    }
-}
-
-impl Plugin for LyricsPlugin {
-    fn manifest(&self) -> &PluginManifest {
-        static MANIFEST: LazyLock<PluginManifest> = LazyLock::new(build_lyrics_manifest);
-        &MANIFEST
-    }
-
-    fn activate(&self, ctx: &PluginContext) -> Result<(), AppError> {
-        self.init_cache(ctx);
-        Ok(())
-    }
-
-    fn deactivate(&self) -> Result<(), AppError> {
-        if let Ok(mut state) = self.state.write() {
-            state.song_id = None;
-            state.lyrics = None;
-        }
-        Ok(())
-    }
-
-    fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), AppError> {
-        match event {
-            PluginEvent::TrackChanged { track, .. } => {
-                self.handle_track_changed(track.id, &track.path, ctx);
-            }
-            PluginEvent::Startup => {}
-            _ => {}
-        }
-        Ok(())
-    }
-
-    fn execute_command(
-        &self,
-        command_id: &str,
-        args: &CommandArgs,
-        ctx: &PluginContext,
-    ) -> Result<(), AppError> {
-        match command_id {
-            "lyrics.search" => {
-                if let CommandArgs::LyricsSearch { title, artist } = args {
-                    println!("[Lyrics] search '{} - {}' (local only)", title, artist);
-                    Ok(())
-                } else {
-                    Err(AppError::Plugin(
-                        "lyrics.search requires LyricsSearch args".into(),
-                    ))
-                }
-            }
-            "lyrics.load" => {
-                if let CommandArgs::TrackId(song_id) = args {
-                    self.cmd_load(*song_id, ctx)
-                } else {
-                    Err(AppError::Plugin("lyrics.load requires TrackId".into()))
-                }
-            }
-            "lyrics.clear_cache" => {
-                if let Ok(cache_guard) = self.cache.read() {
-                    if let Some(ref cache) = *cache_guard {
-                        cache.clear().map_err(|e| AppError::Plugin(e.to_string()))?;
-                    }
-                }
-                Ok(())
-            }
-            _ => Err(AppError::Plugin(format!("Unknown command: {}", command_id))),
-        }
-    }
-}
-
-pub struct LyricsPluginFactory;
-
-impl PluginFactory for LyricsPluginFactory {
-    fn manifest(&self) -> PluginManifest {
-        build_lyrics_manifest()
-    }
-
-    fn create(&self) -> Arc<dyn Plugin> {
-        Arc::new(LyricsPlugin::new())
-    }
-}
diff --git a/src-tauri/src/plugins/mod.rs b/src-tauri/src/plugins/mod.rs
deleted file mode 100644
index 03b7098..0000000
--- a/src-tauri/src/plugins/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod lyrics;
diff --git a/src-tauri/src/services/plugin/adapters/library_adapter.rs b/src-tauri/src/services/plugin/adapters/library_adapter.rs
index bf9828a..6c6b8fe 100644
--- a/src-tauri/src/services/plugin/adapters/library_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/library_adapter.rs
@@ -1,12 +1,23 @@
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use crate::errors::AppError;
-use crate::services::plugin::api::library::LibraryApi;
+use plugin_sdk::api::LibraryApi;
+use plugin_sdk::errors::PluginError;
+use plugin_sdk::permissions::PluginPermission;
 use crate::services::plugin::capability::permission_checker::PermissionChecker;
-use crate::services::plugin::permissions::PluginPermission;
 use crate::services::track_service::TrackService;
 
+fn sdk_err(e: crate::errors::AppError) -> PluginError {
+    match e {
+        crate::errors::AppError::Plugin(msg) => PluginError::Plugin(msg),
+        crate::errors::AppError::PluginPermissionDenied { plugin_id, permission } => {
+            PluginError::PermissionDenied { plugin_id, permission }
+        }
+        crate::errors::AppError::Io(msg) => PluginError::Io(msg),
+        other => PluginError::Plugin(other.to_string()),
+    }
+}
+
 pub struct LibraryAdapter {
     plugin_id: String,
     checker: Arc<PermissionChecker>,
@@ -14,35 +25,25 @@ pub struct LibraryAdapter {
 }
 
 impl LibraryAdapter {
-    pub fn new(
-        plugin_id: String,
-        checker: Arc<PermissionChecker>,
-        track_service: Arc<TrackService>,
-    ) -> Self {
-        Self {
-            plugin_id,
-            checker,
-            track_service,
-        }
+    pub fn new(plugin_id: String, checker: Arc<PermissionChecker>, track_service: Arc<TrackService>) -> Self {
+        Self { plugin_id, checker, track_service }
     }
 }
 
 impl LibraryApi for LibraryAdapter {
-    fn get_track_path(&self, track_id: i64) -> Result<Option<PathBuf>, AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::LibraryRead)?;
+    fn get_track_path(&self, track_id: i64) -> Result<Option<PathBuf>, PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::LibraryRead).map_err(sdk_err)?;
         let track = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.track_service.get_track(track_id))
-        })?;
+        }).map_err(sdk_err)?;
         Ok(track.map(|t| PathBuf::from(t.path)))
     }
 
-    fn exists(&self, track_id: i64) -> Result<bool, AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::LibraryRead)?;
+    fn exists(&self, track_id: i64) -> Result<bool, PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::LibraryRead).map_err(sdk_err)?;
         let track = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.track_service.get_track(track_id))
-        })?;
+        }).map_err(sdk_err)?;
         Ok(track.is_some())
     }
 }
diff --git a/src-tauri/src/services/plugin/adapters/player_adapter.rs b/src-tauri/src/services/plugin/adapters/player_adapter.rs
index 0b36f93..4b5688a 100644
--- a/src-tauri/src/services/plugin/adapters/player_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/player_adapter.rs
@@ -1,12 +1,23 @@
 use std::sync::Arc;
 
-use crate::errors::AppError;
 use crate::services::playback_service::PlaybackService;
-use crate::services::plugin::api::player::PlayerApi;
+use plugin_sdk::api::PlayerApi;
+use plugin_sdk::errors::PluginError;
+use plugin_sdk::permissions::PluginPermission;
 use crate::services::plugin::capability::permission_checker::PermissionChecker;
-use crate::services::plugin::permissions::PluginPermission;
 use crate::state::playback_state::with_audio_state;
 
+fn sdk_err(e: crate::errors::AppError) -> PluginError {
+    match e {
+        crate::errors::AppError::Plugin(msg) => PluginError::Plugin(msg),
+        crate::errors::AppError::PluginPermissionDenied { plugin_id, permission } => {
+            PluginError::PermissionDenied { plugin_id, permission }
+        }
+        crate::errors::AppError::Io(msg) => PluginError::Io(msg),
+        other => PluginError::Plugin(other.to_string()),
+    }
+}
+
 pub struct PlayerAdapter {
     plugin_id: String,
     checker: Arc<PermissionChecker>,
@@ -19,51 +30,42 @@ impl PlayerAdapter {
         checker: Arc<PermissionChecker>,
         playback_service: Arc<PlaybackService>,
     ) -> Self {
-        Self {
-            plugin_id,
-            checker,
-            playback_service,
-        }
+        Self { plugin_id, checker, playback_service }
     }
 }
 
 impl PlayerApi for PlayerAdapter {
-    fn play(&self) -> Result<(), AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
+    fn play(&self) -> Result<(), PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl).map_err(sdk_err)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.resume())
-        })?;
+        }).map_err(sdk_err)?;
         Ok(())
     }
 
-    fn pause(&self) -> Result<(), AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
+    fn pause(&self) -> Result<(), PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl).map_err(sdk_err)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.pause())
-        })
+        }).map_err(sdk_err)
     }
 
-    fn next(&self) -> Result<(), AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
+    fn next(&self) -> Result<(), PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl).map_err(sdk_err)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.next())
-        })
+        }).map_err(sdk_err)
     }
 
-    fn previous(&self) -> Result<(), AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::PlayerControl)?;
+    fn previous(&self) -> Result<(), PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerControl).map_err(sdk_err)?;
         tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.playback_service.previous())
-        })
+        }).map_err(sdk_err)
     }
 
-    fn current_track_id(&self) -> Result<Option<i64>, AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::PlayerRead)?;
-        with_audio_state(|state| state.current_track_id)
+    fn current_track_id(&self) -> Result<Option<i64>, PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::PlayerRead).map_err(sdk_err)?;
+        with_audio_state(|state| state.current_track_id).map_err(sdk_err)
     }
 }
diff --git a/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs b/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
index 9e67267..6107e88 100644
--- a/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/plugin_settings_adapter.rs
@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use crate::errors::AppError;
-use crate::services::plugin::api::plugin_settings::PluginSettingsApi;
-use crate::services::plugin::settings::plugin_settings::SettingValue;
+use plugin_sdk::api::PluginSettingsApi;
+use plugin_sdk::errors::PluginError;
+use plugin_sdk::settings::SettingValue;
 use crate::services::plugin::settings::settings_registry::SettingsRegistry;
 
 pub struct PluginSettingsAdapter {
@@ -12,10 +12,7 @@ pub struct PluginSettingsAdapter {
 
 impl PluginSettingsAdapter {
     pub fn new(plugin_id: String, registry: Arc<SettingsRegistry>) -> Self {
-        Self {
-            plugin_id,
-            registry,
-        }
+        Self { plugin_id, registry }
     }
 }
 
@@ -24,7 +21,8 @@ impl PluginSettingsApi for PluginSettingsAdapter {
         self.registry.get_setting(&self.plugin_id, key)
     }
 
-    fn set_setting(&self, key: &str, value: SettingValue) -> Result<(), AppError> {
+    fn set_setting(&self, key: &str, value: SettingValue) -> Result<(), PluginError> {
         self.registry.update_setting(&self.plugin_id, key, value)
+            .map_err(|e| PluginError::Plugin(e.to_string()))
     }
 }
diff --git a/src-tauri/src/services/plugin/adapters/queue_adapter.rs b/src-tauri/src/services/plugin/adapters/queue_adapter.rs
index 07e046c..cb8d30c 100644
--- a/src-tauri/src/services/plugin/adapters/queue_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/queue_adapter.rs
@@ -1,11 +1,22 @@
 use std::sync::Arc;
 
-use crate::errors::AppError;
-use crate::services::plugin::api::queue::QueueApi;
+use plugin_sdk::api::QueueApi;
+use plugin_sdk::errors::PluginError;
+use plugin_sdk::permissions::PluginPermission;
 use crate::services::plugin::capability::permission_checker::PermissionChecker;
-use crate::services::plugin::permissions::PluginPermission;
 use crate::state::playback_state::with_audio_state;
 
+fn sdk_err(e: crate::errors::AppError) -> PluginError {
+    match e {
+        crate::errors::AppError::Plugin(msg) => PluginError::Plugin(msg),
+        crate::errors::AppError::PluginPermissionDenied { plugin_id, permission } => {
+            PluginError::PermissionDenied { plugin_id, permission }
+        }
+        crate::errors::AppError::Io(msg) => PluginError::Io(msg),
+        other => PluginError::Plugin(other.to_string()),
+    }
+}
+
 pub struct QueueAdapter {
     plugin_id: String,
     checker: Arc<PermissionChecker>,
@@ -18,27 +29,20 @@ impl QueueAdapter {
 }
 
 impl QueueApi for QueueAdapter {
-    fn current_queue(&self) -> Result<Vec<i64>, AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::QueueRead)?;
-        with_audio_state(|state| state.playback_queue.tracks.iter().map(|t| t.id).collect())
+    fn current_queue(&self) -> Result<Vec<i64>, PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::QueueRead).map_err(sdk_err)?;
+        with_audio_state(|state| state.playback_queue.tracks.iter().map(|t| t.id).collect()).map_err(sdk_err)
     }
 
-    fn remove_track(&self, track_id: i64) -> Result<(), AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::QueueWrite)?;
-        with_audio_state(|state| {
-            state.playback_queue.remove_track(track_id);
-        })?;
+    fn remove_track(&self, track_id: i64) -> Result<(), PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::QueueWrite).map_err(sdk_err)?;
+        with_audio_state(|state| { state.playback_queue.remove_track(track_id); }).map_err(sdk_err)?;
         Ok(())
     }
 
-    fn clear(&self) -> Result<(), AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::QueueWrite)?;
-        with_audio_state(|state| {
-            state.playback_queue.clear();
-        })?;
+    fn clear(&self) -> Result<(), PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::QueueWrite).map_err(sdk_err)?;
+        with_audio_state(|state| { state.playback_queue.clear(); }).map_err(sdk_err)?;
         Ok(())
     }
 }
diff --git a/src-tauri/src/services/plugin/adapters/settings_adapter.rs b/src-tauri/src/services/plugin/adapters/settings_adapter.rs
index c5a2e96..6dbd565 100644
--- a/src-tauri/src/services/plugin/adapters/settings_adapter.rs
+++ b/src-tauri/src/services/plugin/adapters/settings_adapter.rs
@@ -1,12 +1,23 @@
 use std::sync::Arc;
 
-use crate::errors::AppError;
 use crate::models::ThemeMode;
-use crate::services::plugin::api::settings::SettingsApi;
+use plugin_sdk::api::SettingsApi;
+use plugin_sdk::errors::PluginError;
+use plugin_sdk::permissions::PluginPermission;
 use crate::services::plugin::capability::permission_checker::PermissionChecker;
-use crate::services::plugin::permissions::PluginPermission;
 use crate::services::settings_service::SettingsService;
 
+fn sdk_err(e: crate::errors::AppError) -> PluginError {
+    match e {
+        crate::errors::AppError::Plugin(msg) => PluginError::Plugin(msg),
+        crate::errors::AppError::PluginPermissionDenied { plugin_id, permission } => {
+            PluginError::PermissionDenied { plugin_id, permission }
+        }
+        crate::errors::AppError::Io(msg) => PluginError::Io(msg),
+        other => PluginError::Plugin(other.to_string()),
+    }
+}
+
 pub struct SettingsAdapter {
     plugin_id: String,
     checker: Arc<PermissionChecker>,
@@ -14,41 +25,30 @@ pub struct SettingsAdapter {
 }
 
 impl SettingsAdapter {
-    pub fn new(
-        plugin_id: String,
-        checker: Arc<PermissionChecker>,
-        settings_service: Arc<SettingsService>,
-    ) -> Self {
-        Self {
-            plugin_id,
-            checker,
-            settings_service,
-        }
+    pub fn new(plugin_id: String, checker: Arc<PermissionChecker>, settings_service: Arc<SettingsService>) -> Self {
+        Self { plugin_id, checker, settings_service }
     }
 }
 
 impl SettingsApi for SettingsAdapter {
-    fn theme(&self) -> Result<String, AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::SettingsRead)?;
+    fn theme(&self) -> Result<String, PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::SettingsRead).map_err(sdk_err)?;
         let settings = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.settings_service.get_settings())
-        })?;
+        }).map_err(sdk_err)?;
         Ok(settings.theme.as_str().to_string())
     }
 
-    fn set_theme(&self, theme: String) -> Result<(), AppError> {
-        self.checker
-            .require(&self.plugin_id, PluginPermission::SettingsWrite)?;
-        let theme_mode = ThemeMode::try_from(theme).map_err(AppError::Service)?;
+    fn set_theme(&self, theme: String) -> Result<(), PluginError> {
+        self.checker.require(&self.plugin_id, PluginPermission::SettingsWrite).map_err(sdk_err)?;
+        let theme_mode = ThemeMode::try_from(theme).map_err(|e| PluginError::Plugin(e.to_string()))?;
         let mut settings = tokio::task::block_in_place(|| {
             tokio::runtime::Handle::current().block_on(self.settings_service.get_settings())
-        })?;
+        }).map_err(sdk_err)?;
         settings.theme = theme_mode;
         tokio::task::block_in_place(|| {
-            tokio::runtime::Handle::current()
-                .block_on(self.settings_service.update_settings(settings))
-        })?;
+            tokio::runtime::Handle::current().block_on(self.settings_service.update_settings(settings))
+        }).map_err(sdk_err)?;
         Ok(())
     }
 }
diff --git a/src-tauri/src/services/plugin/api/library.rs b/src-tauri/src/services/plugin/api/library.rs
deleted file mode 100644
index 7dab30d..0000000
--- a/src-tauri/src/services/plugin/api/library.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use std::path::PathBuf;
-
-use crate::errors::AppError;
-
-pub trait LibraryApi: Send + Sync {
-    fn get_track_path(&self, track_id: i64) -> Result<Option<PathBuf>, AppError>;
-    fn exists(&self, track_id: i64) -> Result<bool, AppError>;
-}
diff --git a/src-tauri/src/services/plugin/api/mod.rs b/src-tauri/src/services/plugin/api/mod.rs
deleted file mode 100644
index baa04e6..0000000
--- a/src-tauri/src/services/plugin/api/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod library;
-pub mod player;
-pub mod plugin_settings;
-pub mod queue;
-pub mod settings;
-
-pub use library::LibraryApi;
-pub use player::PlayerApi;
-pub use plugin_settings::PluginSettingsApi;
-pub use queue::QueueApi;
-pub use settings::SettingsApi;
diff --git a/src-tauri/src/services/plugin/api/player.rs b/src-tauri/src/services/plugin/api/player.rs
deleted file mode 100644
index 8447f89..0000000
--- a/src-tauri/src/services/plugin/api/player.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use crate::errors::AppError;
-
-pub trait PlayerApi: Send + Sync {
-    fn play(&self) -> Result<(), AppError>;
-    fn pause(&self) -> Result<(), AppError>;
-    fn next(&self) -> Result<(), AppError>;
-    fn previous(&self) -> Result<(), AppError>;
-    fn current_track_id(&self) -> Result<Option<i64>, AppError>;
-}
diff --git a/src-tauri/src/services/plugin/api/plugin_settings.rs b/src-tauri/src/services/plugin/api/plugin_settings.rs
deleted file mode 100644
index cbe86ea..0000000
--- a/src-tauri/src/services/plugin/api/plugin_settings.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use crate::errors::AppError;
-use crate::services::plugin::settings::plugin_settings::SettingValue;
-
-pub trait PluginSettingsApi: Send + Sync {
-    fn get_setting(&self, key: &str) -> Option<SettingValue>;
-    fn set_setting(&self, key: &str, value: SettingValue) -> Result<(), AppError>;
-}
diff --git a/src-tauri/src/services/plugin/api/queue.rs b/src-tauri/src/services/plugin/api/queue.rs
deleted file mode 100644
index 1c6fe0f..0000000
--- a/src-tauri/src/services/plugin/api/queue.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use crate::errors::AppError;
-
-pub trait QueueApi: Send + Sync {
-    fn current_queue(&self) -> Result<Vec<i64>, AppError>;
-    fn remove_track(&self, track_id: i64) -> Result<(), AppError>;
-    fn clear(&self) -> Result<(), AppError>;
-}
diff --git a/src-tauri/src/services/plugin/api/settings.rs b/src-tauri/src/services/plugin/api/settings.rs
deleted file mode 100644
index 679b13f..0000000
--- a/src-tauri/src/services/plugin/api/settings.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use crate::errors::AppError;
-
-pub trait SettingsApi: Send + Sync {
-    fn theme(&self) -> Result<String, AppError>;
-    fn set_theme(&self, theme: String) -> Result<(), AppError>;
-}
diff --git a/src-tauri/src/services/plugin/capability/capability.rs b/src-tauri/src/services/plugin/capability/capability.rs
index 167fe8c..c2fd4d0 100644
--- a/src-tauri/src/services/plugin/capability/capability.rs
+++ b/src-tauri/src/services/plugin/capability/capability.rs
@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use crate::services::plugin::permissions::PluginPermission;
+use plugin_sdk::permissions::PluginPermission;
 
 pub struct PluginCapability {
     pub plugin_id: String,
diff --git a/src-tauri/src/services/plugin/capability/permission_checker.rs b/src-tauri/src/services/plugin/capability/permission_checker.rs
index 2ae9a77..1b99258 100644
--- a/src-tauri/src/services/plugin/capability/permission_checker.rs
+++ b/src-tauri/src/services/plugin/capability/permission_checker.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use crate::errors::AppError;
 use crate::services::plugin::capability::plugin_capability::CapabilityRegistry;
-use crate::services::plugin::permissions::PluginPermission;
+use plugin_sdk::permissions::PluginPermission;
 
 pub struct PermissionChecker {
     capability_registry: Arc<CapabilityRegistry>,
diff --git a/src-tauri/src/services/plugin/capability/plugin_capability.rs b/src-tauri/src/services/plugin/capability/plugin_capability.rs
index 4faa6f1..0e48701 100644
--- a/src-tauri/src/services/plugin/capability/plugin_capability.rs
+++ b/src-tauri/src/services/plugin/capability/plugin_capability.rs
@@ -30,7 +30,7 @@ impl CapabilityRegistry {
     pub fn has_permission(
         &self,
         plugin_id: &str,
-        permission: crate::services::plugin::permissions::PluginPermission,
+        permission: plugin_sdk::permissions::PluginPermission,
     ) -> bool {
         let lock = match self.capabilities.read() {
             Ok(guard) => guard,
diff --git a/src-tauri/src/services/plugin/context.rs b/src-tauri/src/services/plugin/context.rs
deleted file mode 100644
index 4498571..0000000
--- a/src-tauri/src/services/plugin/context.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::sync::Arc;
-
-use tauri::AppHandle;
-
-use crate::services::plugin::api::{
-    LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi,
-};
-
-pub struct PluginContext {
-    pub plugin_id: String,
-    pub app_handle: AppHandle,
-    pub player: Arc<dyn PlayerApi>,
-    pub library: Arc<dyn LibraryApi>,
-    pub queue: Arc<dyn QueueApi>,
-    pub settings: Arc<dyn SettingsApi>,
-    pub plugin_settings: Arc<dyn PluginSettingsApi>,
-}
-
-impl Clone for PluginContext {
-    fn clone(&self) -> Self {
-        Self {
-            plugin_id: self.plugin_id.clone(),
-            app_handle: self.app_handle.clone(),
-            player: Arc::clone(&self.player),
-            library: Arc::clone(&self.library),
-            queue: Arc::clone(&self.queue),
-            settings: Arc::clone(&self.settings),
-            plugin_settings: Arc::clone(&self.plugin_settings),
-        }
-    }
-}
-
-impl PluginContext {
-    pub fn new(
-        plugin_id: String,
-        app_handle: AppHandle,
-        player: Arc<dyn PlayerApi>,
-        library: Arc<dyn LibraryApi>,
-        queue: Arc<dyn QueueApi>,
-        settings: Arc<dyn SettingsApi>,
-        plugin_settings: Arc<dyn PluginSettingsApi>,
-    ) -> Self {
-        Self {
-            plugin_id,
-            app_handle,
-            player,
-            library,
-            queue,
-            settings,
-            plugin_settings,
-        }
-    }
-}
diff --git a/src-tauri/src/services/plugin/contributes/command.rs b/src-tauri/src/services/plugin/contributes/command.rs
deleted file mode 100644
index c6088a9..0000000
--- a/src-tauri/src/services/plugin/contributes/command.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CommandContribution {
-    pub id: String,
-    pub title: String,
-    pub category: Option<String>,
-}
diff --git a/src-tauri/src/services/plugin/contributes/menu.rs b/src-tauri/src/services/plugin/contributes/menu.rs
deleted file mode 100644
index 10206b2..0000000
--- a/src-tauri/src/services/plugin/contributes/menu.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub enum MenuLocation {
-    TrackContextMenu,
-    SidebarActions,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct MenuContribution {
-    pub command: String,
-    pub title: String,
-    pub location: MenuLocation,
-    pub group: Option<String>,
-}
diff --git a/src-tauri/src/services/plugin/contributes/mod.rs b/src-tauri/src/services/plugin/contributes/mod.rs
deleted file mode 100644
index a350242..0000000
--- a/src-tauri/src/services/plugin/contributes/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod command;
-pub mod menu;
-pub mod sidebar;
-
-pub use command::CommandContribution;
-pub use menu::{MenuContribution, MenuLocation};
-pub use sidebar::SidebarContribution;
diff --git a/src-tauri/src/services/plugin/contributes/sidebar.rs b/src-tauri/src/services/plugin/contributes/sidebar.rs
deleted file mode 100644
index 3c42748..0000000
--- a/src-tauri/src/services/plugin/contributes/sidebar.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SidebarContribution {
-    pub id: String,
-    pub title: String,
-    pub icon: String,
-    pub route: String,
-}
diff --git a/src-tauri/src/services/plugin/events.rs b/src-tauri/src/services/plugin/events.rs
deleted file mode 100644
index 0e0b5a6..0000000
--- a/src-tauri/src/services/plugin/events.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use serde::Serialize;
-
-use crate::models::Track;
-
-#[derive(Debug, Clone, Serialize)]
-pub enum PluginEvent {
-    Startup,
-    TrackChanged {
-        track: Track,
-        index: usize,
-    },
-    PlaybackStateChanged {
-        playing: bool,
-        current_time: f64,
-    },
-    QueueChanged,
-    SettingsChanged,
-    LyricsLoaded {
-        song_id: i64,
-        lines: Vec<LyricLineEvent>,
-    },
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct LyricLineEvent {
-    pub timestamp_ms: u64,
-    pub text: String,
-}
diff --git a/src-tauri/src/services/plugin/extension/menu_extension.rs b/src-tauri/src/services/plugin/extension/menu_extension.rs
index 378ea4d..9d89f1d 100644
--- a/src-tauri/src/services/plugin/extension/menu_extension.rs
+++ b/src-tauri/src/services/plugin/extension/menu_extension.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::services::plugin::contributes::menu::MenuLocation;
+use plugin_sdk::contributes::MenuLocation;
 use crate::services::plugin::extension::state::ExtensionState;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
diff --git a/src-tauri/src/services/plugin/extension/registry.rs b/src-tauri/src/services/plugin/extension/registry.rs
index 6b89897..a576399 100644
--- a/src-tauri/src/services/plugin/extension/registry.rs
+++ b/src-tauri/src/services/plugin/extension/registry.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 
-use crate::services::plugin::contributes::menu::MenuLocation;
+use plugin_sdk::contributes::MenuLocation;
 use crate::services::plugin::extension::command_extension::CommandExtension;
 use crate::services::plugin::extension::menu_extension::MenuExtension;
 use crate::services::plugin::extension::sidebar_extension::SidebarExtension;
diff --git a/src-tauri/src/services/plugin/loader.rs b/src-tauri/src/services/plugin/loader.rs
index 4f06eb7..4a8ae81 100644
--- a/src-tauri/src/services/plugin/loader.rs
+++ b/src-tauri/src/services/plugin/loader.rs
@@ -2,9 +2,10 @@ use std::path::Path;
 use std::sync::Arc;
 
 use crate::errors::AppError;
-use crate::plugins::lyrics::LyricsPluginFactory;
-use crate::services::plugin::manifest::PluginManifest;
-use crate::services::plugin::traits::PluginFactory;
+use plugin_sdk::manifest::PluginManifest;
+use plugin_sdk::traits::PluginFactory;
+
+use lyrics_plugin::LyricsPluginFactory;
 
 pub struct PluginLoader;
 
diff --git a/src-tauri/src/services/plugin/manager.rs b/src-tauri/src/services/plugin/manager.rs
index 9c7fbb4..af78231 100644
--- a/src-tauri/src/services/plugin/manager.rs
+++ b/src-tauri/src/services/plugin/manager.rs
@@ -5,25 +5,25 @@ use crate::errors::AppError;
 use crate::events::AppEvent;
 use crate::services::plugin::capability::capability::PluginCapability;
 use crate::services::plugin::capability::plugin_capability::CapabilityRegistry;
-use crate::services::plugin::contributes::menu::{MenuContribution, MenuLocation};
-use crate::services::plugin::events::PluginEvent;
+use plugin_sdk::contributes::{MenuContribution, MenuLocation};
+use plugin_sdk::events::PluginEvent;
 use crate::services::plugin::extension::command_extension::CommandExtension;
 use crate::services::plugin::extension::menu_extension::MenuExtension;
 use crate::services::plugin::extension::registry::ExtensionRegistry;
 use crate::services::plugin::extension::sidebar_extension::SidebarExtension;
 use crate::services::plugin::extension::state::ExtensionState;
 use crate::services::plugin::loader::PluginLoader;
-use crate::services::plugin::manifest::ActivationEvent;
-use crate::services::plugin::permissions::PluginPermission;
+use plugin_sdk::manifest::ActivationEvent;
+use plugin_sdk::permissions::PluginPermission;
 use crate::services::plugin::registry::command_registry::CommandRegistry;
 use crate::services::plugin::registry::plugin_registry::PluginRegistry;
 use crate::services::plugin::runtime::context_factory::PluginContextFactory;
 use crate::services::plugin::runtime::runtime_instance::RuntimePluginInstance;
 use crate::services::plugin::runtime::state::{PluginLifecycleState, PluginState};
 use crate::services::plugin::settings::persistence::PluginStorage;
-use crate::services::plugin::settings::plugin_settings::SettingValue;
+use plugin_sdk::settings::SettingValue;
 use crate::services::plugin::settings::settings_registry::SettingsRegistry;
-use crate::services::plugin::traits::{CommandArgs, Plugin, PluginFactory};
+use plugin_sdk::traits::{CommandArgs, Plugin, PluginFactory};
 
 pub struct PluginManager {
     registry: Arc<PluginRegistry>,
@@ -285,7 +285,7 @@ impl PluginManager {
 
         let plugin = self.ensure_active(&plugin_id)?;
         let ctx = self.context_factory.create_context(&plugin_id);
-        plugin.execute_command(command_id, &args, &ctx)
+        plugin.execute_command(command_id, &args, &ctx).map_err(|e| e.into())
     }
 
     fn ensure_active(&self, plugin_id: &str) -> Result<Arc<dyn Plugin>, AppError> {
@@ -380,7 +380,7 @@ impl PluginManager {
 
                 instances.insert(plugin_id.to_string(), RuntimePluginInstance::Registered);
 
-                Err(e)
+                Err(e.into())
             }
         }
     }
@@ -430,7 +430,7 @@ impl PluginManager {
             }
             Err(e) => {
                 instances.insert(plugin_id.to_string(), RuntimePluginInstance::Active(plugin));
-                return Err(e);
+                return Err(e.into());
             }
         }
 
@@ -537,7 +537,14 @@ impl PluginManager {
     pub fn bridge_app_event(app_event: &AppEvent) -> Option<PluginEvent> {
         match app_event {
             AppEvent::TrackStarted(payload) => Some(PluginEvent::TrackChanged {
-                track: payload.track.clone(),
+                track: plugin_sdk::events::TrackSnapshot {
+                    id: payload.track.id,
+                    title: payload.track.title.clone(),
+                    artist: payload.track.artist.clone(),
+                    album: payload.track.album.clone(),
+                    duration: payload.track.duration,
+                    path: payload.track.path.clone(),
+                },
                 index: payload.index,
             }),
             AppEvent::PlaybackStateChanged(payload) => Some(PluginEvent::PlaybackStateChanged {
@@ -584,7 +591,7 @@ impl PluginManager {
     pub fn get_plugin_settings(
         &self,
         plugin_id: &str,
-    ) -> Vec<crate::services::plugin::settings::plugin_settings::PluginSettingMeta> {
+    ) -> Vec<plugin_sdk::settings::PluginSettingMeta> {
         let definitions = self
             .registry
             .get_factory(plugin_id)
@@ -600,7 +607,7 @@ impl PluginManager {
                     .get(&def.key)
                     .cloned()
                     .unwrap_or_else(|| def.default_value.clone());
-                crate::services::plugin::settings::plugin_settings::PluginSettingMeta {
+                plugin_sdk::settings::PluginSettingMeta {
                     key: def.key,
                     title: def.title,
                     value,
diff --git a/src-tauri/src/services/plugin/mod.rs b/src-tauri/src/services/plugin/mod.rs
index 9468255..cb54ad0 100644
--- a/src-tauri/src/services/plugin/mod.rs
+++ b/src-tauri/src/services/plugin/mod.rs
@@ -1,34 +1,28 @@
 pub mod adapters;
-pub mod api;
 pub mod capability;
-pub mod context;
-pub mod contributes;
-pub mod events;
 pub mod extension;
 pub mod loader;
 pub mod manager;
-pub mod manifest;
-pub mod model;
-pub mod permissions;
 pub mod registry;
 pub mod runtime;
+pub mod sdk_adapters;
 pub mod settings;
-pub mod traits;
 
-pub use api::{LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi};
 pub use capability::{CapabilityRegistry, PermissionChecker, PluginCapability};
-pub use context::PluginContext;
-pub use events::PluginEvent;
 pub use extension::{
     CommandExtension, ExtensionRegistry, ExtensionState, MenuExtension, SidebarExtension,
 };
 pub use loader::PluginLoader;
 pub use manager::PluginManager;
-pub use manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
-pub use model::{ModelError, PluginIdentity};
-pub use permissions::PluginPermission;
 pub use runtime::{PluginContextFactory, PluginLifecycleState, PluginState, RuntimePluginInstance};
-pub use settings::{
-    PluginSetting, PluginSettingMeta, PluginSettings, PluginStorage, SettingValue, SettingsRegistry,
-};
-pub use traits::{CommandArgs, Plugin, PluginFactory};
+pub use settings::{PluginStorage, SettingsRegistry};
+
+pub use plugin_sdk::api::{LibraryApi, PlayerApi, PluginSettingsApi, QueueApi, SettingsApi};
+pub use plugin_sdk::context::{HostContext, PluginContext};
+pub use plugin_sdk::errors::PluginError;
+pub use plugin_sdk::events::PluginEvent;
+pub use plugin_sdk::manifest::{ActivationEvent, PluginContribution, PluginManifest, SettingDefinition};
+pub use plugin_sdk::model::PluginIdentity;
+pub use plugin_sdk::permissions::PluginPermission;
+pub use plugin_sdk::settings::{PluginSetting, PluginSettingMeta, PluginSettings, SettingValue};
+pub use plugin_sdk::traits::{CommandArgs, Plugin, PluginFactory};
diff --git a/src-tauri/src/services/plugin/model/errors.rs b/src-tauri/src/services/plugin/model/errors.rs
deleted file mode 100644
index 5add865..0000000
--- a/src-tauri/src/services/plugin/model/errors.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-pub enum ModelError {
-    InvalidIdentityFormat(String),
-}
-
-impl std::fmt::Display for ModelError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ModelError::InvalidIdentityFormat(s) => write!(f, "Invalid plugin identity: {}", s),
-        }
-    }
-}
-
-impl std::error::Error for ModelError {}
diff --git a/src-tauri/src/services/plugin/model/mod.rs b/src-tauri/src/services/plugin/model/mod.rs
deleted file mode 100644
index cb4354a..0000000
--- a/src-tauri/src/services/plugin/model/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod errors;
-pub mod plugin_identity;
-
-pub use errors::ModelError;
-pub use plugin_identity::PluginIdentity;
diff --git a/src-tauri/src/services/plugin/registry/plugin_registry.rs b/src-tauri/src/services/plugin/registry/plugin_registry.rs
index 6c56eb5..bed6b82 100644
--- a/src-tauri/src/services/plugin/registry/plugin_registry.rs
+++ b/src-tauri/src/services/plugin/registry/plugin_registry.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 
-use crate::services::plugin::traits::PluginFactory;
+use plugin_sdk::traits::PluginFactory;
 
 /// Static factory store.
 ///
diff --git a/src-tauri/src/services/plugin/runtime/context_factory.rs b/src-tauri/src/services/plugin/runtime/context_factory.rs
index 0552454..7618ca0 100644
--- a/src-tauri/src/services/plugin/runtime/context_factory.rs
+++ b/src-tauri/src/services/plugin/runtime/context_factory.rs
@@ -2,12 +2,13 @@ use std::sync::Arc;
 
 use tauri::AppHandle;
 
+use plugin_sdk::context::PluginContext;
 use crate::services::playback_service::PlaybackService;
 use crate::services::plugin::adapters::{
     LibraryAdapter, PlayerAdapter, PluginSettingsAdapter, QueueAdapter, SettingsAdapter,
 };
 use crate::services::plugin::capability::permission_checker::PermissionChecker;
-use crate::services::plugin::context::PluginContext;
+use crate::services::plugin::sdk_adapters::SdkHostContext;
 use crate::services::plugin::settings::settings_registry::SettingsRegistry;
 use crate::services::settings_service::SettingsService;
 use crate::services::track_service::TrackService;
@@ -41,6 +42,10 @@ impl PluginContextFactory {
     }
 
     pub fn create_context(&self, plugin_id: &str) -> PluginContext {
+        let host = Arc::new(SdkHostContext::new(
+            plugin_id.to_string(),
+            self.app_handle.clone(),
+        ));
         let player = Arc::new(PlayerAdapter::new(
             plugin_id.to_string(),
             Arc::clone(&self.checker),
@@ -65,14 +70,6 @@ impl PluginContextFactory {
             Arc::clone(&self.settings_registry),
         ));
 
-        PluginContext::new(
-            plugin_id.to_string(),
-            self.app_handle.clone(),
-            player,
-            library,
-            queue,
-            settings,
-            plugin_settings,
-        )
+        PluginContext::new(host, player, library, queue, settings, plugin_settings)
     }
 }
diff --git a/src-tauri/src/services/plugin/runtime/runtime_instance.rs b/src-tauri/src/services/plugin/runtime/runtime_instance.rs
index 16c1807..ad5d99a 100644
--- a/src-tauri/src/services/plugin/runtime/runtime_instance.rs
+++ b/src-tauri/src/services/plugin/runtime/runtime_instance.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::services::plugin::traits::Plugin;
+use plugin_sdk::traits::Plugin;
 
 pub enum RuntimePluginInstance {
     Registered,
diff --git a/src-tauri/src/services/plugin/sdk_adapters.rs b/src-tauri/src/services/plugin/sdk_adapters.rs
new file mode 100644
index 0000000..6586053
--- /dev/null
+++ b/src-tauri/src/services/plugin/sdk_adapters.rs
@@ -0,0 +1,51 @@
+use std::path::PathBuf;
+
+use plugin_sdk::context::HostContext;
+use plugin_sdk::errors::PluginError;
+use plugin_sdk::events::LyricsLoadedEvent;
+
+use crate::events::{EventBus, LyricLinePayload, LyricsLoadedPayload};
+use tauri::{AppHandle, Emitter, Manager};
+
+pub struct SdkHostContext {
+    plugin_id: String,
+    app_handle: AppHandle,
+}
+
+impl SdkHostContext {
+    pub fn new(plugin_id: String, app_handle: AppHandle) -> Self {
+        Self { plugin_id, app_handle }
+    }
+}
+
+impl HostContext for SdkHostContext {
+    fn plugin_id(&self) -> &str {
+        &self.plugin_id
+    }
+
+    fn cache_dir(&self) -> Result<PathBuf, PluginError> {
+        let app_data = self
+            .app_handle
+            .path()
+            .app_data_dir()
+            .map_err(|e| PluginError::Io(e.to_string()))?;
+        Ok(app_data.join("plugins").join(&self.plugin_id).join("cache"))
+    }
+
+    fn emit_lyrics_loaded(&self, event: LyricsLoadedEvent) -> Result<(), PluginError> {
+        let payload = LyricsLoadedPayload {
+            song_id: event.song_id,
+            lines: event
+                .timestamp_ms_list
+                .into_iter()
+                .zip(event.text_list.into_iter())
+                .map(|(ts, text)| LyricLinePayload {
+                    timestamp_ms: ts,
+                    text,
+                })
+                .collect(),
+        };
+        EventBus::emit_lyrics_loaded(&self.app_handle, payload)
+            .map_err(|e| PluginError::Plugin(e.to_string()))
+    }
+}
diff --git a/src-tauri/src/services/plugin/settings/mod.rs b/src-tauri/src/services/plugin/settings/mod.rs
index f7f2ebd..e408d17 100644
--- a/src-tauri/src/services/plugin/settings/mod.rs
+++ b/src-tauri/src/services/plugin/settings/mod.rs
@@ -1,7 +1,5 @@
 pub mod persistence;
-pub mod plugin_settings;
 pub mod settings_registry;
 
 pub use persistence::{JsonPluginStorage, PluginStorage};
-pub use plugin_settings::{PluginSetting, PluginSettingMeta, PluginSettings, SettingValue};
 pub use settings_registry::SettingsRegistry;
diff --git a/src-tauri/src/services/plugin/settings/persistence.rs b/src-tauri/src/services/plugin/settings/persistence.rs
index 182d6e6..674382a 100644
--- a/src-tauri/src/services/plugin/settings/persistence.rs
+++ b/src-tauri/src/services/plugin/settings/persistence.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use crate::errors::AppError;
 use crate::services::plugin::runtime::state::PluginLifecycleState;
-use crate::services::plugin::settings::plugin_settings::PluginSettings;
+use plugin_sdk::settings::PluginSettings;
 
 pub trait PluginStorage: Send + Sync {
     fn load_config(
diff --git a/src-tauri/src/services/plugin/settings/settings_registry.rs b/src-tauri/src/services/plugin/settings/settings_registry.rs
index e49058a..f9b580b 100644
--- a/src-tauri/src/services/plugin/settings/settings_registry.rs
+++ b/src-tauri/src/services/plugin/settings/settings_registry.rs
@@ -2,9 +2,7 @@ use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 
 use crate::errors::AppError;
-use crate::services::plugin::settings::plugin_settings::{
-    PluginSetting, PluginSettings, SettingValue,
-};
+use plugin_sdk::settings::{PluginSettings, SettingValue};
 
 pub struct SettingsRegistry {
     settings: RwLock<HashMap<String, PluginSettings>>,
@@ -87,23 +85,4 @@ impl SettingsRegistry {
         };
         *lock = data;
     }
-
-    pub fn to_vec(&self, plugin_id: &str) -> Vec<PluginSetting> {
-        let lock = match self.settings.read() {
-            Ok(guard) => guard,
-            Err(_) => return Vec::new(),
-        };
-
-        lock.get(plugin_id)
-            .map(|ps| {
-                ps.settings
-                    .iter()
-                    .map(|(key, value)| PluginSetting {
-                        key: key.clone(),
-                        value: value.clone(),
-                    })
-                    .collect()
-            })
-            .unwrap_or_default()
-    }
 }
diff --git a/src-tauri/src/services/plugin/traits.rs b/src-tauri/src/services/plugin/traits.rs
deleted file mode 100644
index 6d09365..0000000
--- a/src-tauri/src/services/plugin/traits.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::sync::Arc;
-
-use crate::errors::AppError;
-use crate::services::plugin::context::PluginContext;
-use crate::services::plugin::events::PluginEvent;
-use crate::services::plugin::manifest::PluginManifest;
-
-/// Strongly-typed command argument carrier.
-///
-/// Every variant maps to a concrete domain primitive so that
-/// command handlers can `match` without downcasting.
-#[derive(Debug, Clone)]
-pub enum CommandArgs {
-    None,
-    TrackId(i64),
-    TrackIds(Vec<i64>),
-    RawPayload(String),
-    LyricsSearch { title: String, artist: String },
-}
-
-/// Runtime contract every plugin must fulfil.
-///
-/// Implementations are stored behind `Arc` and must be `Send + Sync`.
-/// Interior mutability is the plugin's own responsibility
-/// (`Mutex`, `RwLock`, atomics, etc.).
-pub trait Plugin: Send + Sync {
-    fn manifest(&self) -> &PluginManifest;
-
-    fn activate(&self, ctx: &PluginContext) -> Result<(), AppError>;
-
-    fn deactivate(&self) -> Result<(), AppError>;
-
-    fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), AppError>;
-
-    fn execute_command(
-        &self,
-        command_id: &str,
-        args: &CommandArgs,
-        ctx: &PluginContext,
-    ) -> Result<(), AppError>;
-}
-
-/// Stateless construction blueprint for a plugin.
-///
-/// The registry stores factories — never live instances.
-/// The manager calls `create()` on first demand (lazy activation).
-pub trait PluginFactory: Send + Sync {
-    fn manifest(&self) -> PluginManifest;
-
-    fn create(&self) -> Arc<dyn Plugin>;
-}

From 86dfdd75fd6de3de9d9344c8a0c76b9c7f06673b Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Thu, 18 Jun 2026 15:47:45 +0800
Subject: [PATCH 37/39] Delete path from struct and interface

---
 src-tauri/crates/lyrics-plugin/src/lib.rs  |  5 +-
 src-tauri/crates/plugin-sdk/src/events.rs  |  1 -
 src-tauri/src/audio/state.rs               |  2 -
 src-tauri/src/commands/library.rs          | 60 ++++++++++++++-------
 src-tauri/src/commands/playback.rs         |  9 ++--
 src-tauri/src/models/playback.rs           |  1 -
 src-tauri/src/services/playback_service.rs | 23 +-------
 src-tauri/src/services/plugin/manager.rs   |  1 -
 src-tauri/src/state/playback_state.rs      | 33 +-----------
 src/lib/state/covers.svelte.ts             | 32 ++++++------
 src/lib/state/recent.svelte.ts             |  4 ++
 src/lib/state/settings.svelte.ts           |  6 +++
 src/lib/types/music.ts                     |  1 -
 src/routes/+layout.svelte                  | 20 +++++++
 src/routes/+layout.ts                      | 14 -----
 src/routes/album/+page.svelte              | 61 +++++-----------------
 src/routes/library/+page.svelte            | 33 ++++++++----
 src/routes/settings/+page.svelte           |  5 --
 18 files changed, 132 insertions(+), 179 deletions(-)

diff --git a/src-tauri/crates/lyrics-plugin/src/lib.rs b/src-tauri/crates/lyrics-plugin/src/lib.rs
index 25990cb..cead38e 100644
--- a/src-tauri/crates/lyrics-plugin/src/lib.rs
+++ b/src-tauri/crates/lyrics-plugin/src/lib.rs
@@ -172,7 +172,10 @@ impl Plugin for LyricsPlugin {
 
     fn on_event(&self, event: &PluginEvent, ctx: &PluginContext) -> Result<(), PluginError> {
         if let PluginEvent::TrackChanged { track, .. } = event {
-            self.handle_track_changed(track.id, &track.path, ctx);
+            let path = ctx.library.get_track_path(track.id)?;
+            if let Some(path) = path {
+                self.handle_track_changed(track.id, &path.to_string_lossy(), ctx);
+            }
         }
         Ok(())
     }
diff --git a/src-tauri/crates/plugin-sdk/src/events.rs b/src-tauri/crates/plugin-sdk/src/events.rs
index bdfa260..77878ac 100644
--- a/src-tauri/crates/plugin-sdk/src/events.rs
+++ b/src-tauri/crates/plugin-sdk/src/events.rs
@@ -7,7 +7,6 @@ pub struct TrackSnapshot {
     pub artist: Option<String>,
     pub album: Option<String>,
     pub duration: i64,
-    pub path: String,
 }
 
 #[derive(Clone, Debug, Serialize)]
diff --git a/src-tauri/src/audio/state.rs b/src-tauri/src/audio/state.rs
index 0a3567c..b1b5b4c 100644
--- a/src-tauri/src/audio/state.rs
+++ b/src-tauri/src/audio/state.rs
@@ -16,7 +16,6 @@ pub struct AudioState {
     pub pan: f32,
     pub playing: bool,
     pub current_track_id: Option<i64>,
-    pub current_path: Option<String>,
     pub playback_queue: PlaybackQueue,
 }
 
@@ -50,7 +49,6 @@ pub fn init_audio_state(queue: PlaybackQueue) {
             pan: 0.0,
             playing: false,
             current_track_id: None,
-            current_path: None,
             playback_queue: queue,
         })
     });
diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index d108f79..d975f2c 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -84,8 +84,14 @@ async fn upsert_scanned_tracks(
 }
 
 #[command]
-pub fn get_track_cover(full_path: String) -> Result<Option<String>, AppError> {
-    let file_path = Path::new(&full_path);
+pub async fn get_track_cover(track_id: i64, state: State<'_, AppState>) -> Result<Option<String>, AppError> {
+    let track = state.tracks.get_track(track_id).await?;
+    let track = match track {
+        Some(t) => t,
+        None => return Err("曲目不存在".into()),
+    };
+
+    let file_path = Path::new(&track.path);
 
     if !file_path.exists() {
         return Err("音频文件不存在".into());
@@ -125,8 +131,10 @@ fn validate_audio_path(path: &str) -> Result<&Path, AppError> {
 }
 
 #[command]
-pub fn show_in_folder(path: String) -> Result<(), AppError> {
-    let file_path = Path::new(&path);
+pub async fn show_in_folder(track_id: i64, state: State<'_, AppState>) -> Result<(), AppError> {
+    let track = state.tracks.get_track(track_id).await?;
+    let track = track.ok_or_else(|| AppError::from("曲目不存在"))?;
+    let file_path = Path::new(&track.path);
 
     if !file_path.exists() {
         return Err("文件不存在".into());
@@ -160,12 +168,14 @@ pub fn show_in_folder(path: String) -> Result<(), AppError> {
 #[command]
 pub async fn delete_track_file(
     app_handle: tauri::AppHandle,
-    path: String,
     track_id: i64,
+    state: State<'_, AppState>,
 ) -> Result<(), AppError> {
-    // 1. 验证并删除物理文件
-    let file_path = validate_audio_path(&path)?;
-    trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
+    let track = state.tracks.get_track(track_id).await?;
+    let track = track.ok_or_else(|| AppError::from("曲目不存在"))?;
+
+    let file_path = validate_audio_path(&track.path)?;
+    trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", track.path, e))?;
 
     remove_track_from_queue(app_handle, track_id).await?;
 
@@ -173,40 +183,50 @@ pub async fn delete_track_file(
 }
 
 #[command]
-pub fn trash_track_files(paths: Vec<String>) -> Result<(), AppError> {
-    for path in paths {
-        let file_path = Path::new(&path);
-
+pub async fn trash_track_files(track_ids: Vec<i64>, state: State<'_, AppState>) -> Result<(), AppError> {
+    for track_id in track_ids {
+        let track = state.tracks.get_track(track_id).await?;
+        let track = match track {
+            Some(t) => t,
+            None => continue,
+        };
+
+        let file_path = Path::new(&track.path);
         if !file_path.exists() {
             continue;
         }
 
         if !file_path.is_file() || !is_supported_audio_file(file_path) {
-            return Err(format!("拒绝移至回收站非音频文件: {}", path).into());
+            return Err(format!("拒绝移至回收站非音频文件: {}", track.path).into());
         }
 
-        trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", path, e))?;
+        trash::delete(file_path).map_err(|e| format!("移至回收站失败 {}: {}", track.path, e))?;
     }
 
     Ok(())
 }
 
 #[command]
-pub async fn delete_track_files(paths: Vec<String>) -> Result<(), AppError> {
-    for path in paths {
-        let file_path = Path::new(&path);
-
+pub async fn delete_track_files(track_ids: Vec<i64>, state: State<'_, AppState>) -> Result<(), AppError> {
+    for track_id in track_ids {
+        let track = state.tracks.get_track(track_id).await?;
+        let track = match track {
+            Some(t) => t,
+            None => continue,
+        };
+
+        let file_path = Path::new(&track.path);
         if !file_path.exists() {
             continue;
         }
 
         if !file_path.is_file() || !is_supported_audio_file(file_path) {
-            return Err(format!("拒绝删除非音频文件: {}", path).into());
+            return Err(format!("拒绝删除非音频文件: {}", track.path).into());
         }
 
         tokio::fs::remove_file(file_path)
             .await
-            .map_err(|e| format!("删除文件失败 {}: {}", path, e))?;
+            .map_err(|e| format!("删除文件失败 {}: {}", track.path, e))?;
     }
 
     Ok(())
diff --git a/src-tauri/src/commands/playback.rs b/src-tauri/src/commands/playback.rs
index c110157..cb7d886 100644
--- a/src-tauri/src/commands/playback.rs
+++ b/src-tauri/src/commands/playback.rs
@@ -79,13 +79,14 @@ pub async fn stop_track(app_handle: AppHandle) -> Result<(), AppError> {
 #[command]
 pub async fn play_track(
     app_handle: AppHandle,
-    full_path: String,
-    track_id: Option<i64>,
+    track_id: i64,
+    state: tauri::State<'_, crate::state::AppState>,
 ) -> Result<String, AppError> {
+    let track = state.tracks.get_track(track_id).await?;
+    let track = track.ok_or_else(|| AppError::from("曲目不存在"))?;
     let service = PlaybackService::new(app_handle);
-    let track = service.load_track_for_playback(&full_path, track_id);
     service.play_track(track, None)?;
-    Ok(format!("Playing track: {}", full_path))
+    Ok(format!("Playing track: {}", track_id))
 }
 
 #[command]
diff --git a/src-tauri/src/models/playback.rs b/src-tauri/src/models/playback.rs
index 2a5664d..b7be620 100644
--- a/src-tauri/src/models/playback.rs
+++ b/src-tauri/src/models/playback.rs
@@ -28,5 +28,4 @@ pub struct PlaybackTrackStartedPayload {
 #[serde(rename_all = "camelCase")]
 pub struct PlaybackTrackInfo {
     pub id: Option<i64>,
-    pub path: Option<String>,
 }
diff --git a/src-tauri/src/services/playback_service.rs b/src-tauri/src/services/playback_service.rs
index 1bfea35..c10c7a2 100644
--- a/src-tauri/src/services/playback_service.rs
+++ b/src-tauri/src/services/playback_service.rs
@@ -7,8 +7,7 @@ use crate::media_controls::{update_media_controls_metadata, update_media_control
 use crate::models::Track;
 use crate::state::app_state::AppState;
 use crate::state::playback_state::{
-    current_playback_snapshot, metadata_from_track, minimal_track, should_advance_track,
-    with_audio_state,
+    current_playback_snapshot, metadata_from_track, should_advance_track, with_audio_state,
 };
 use std::path::Path;
 use std::time::Duration;
@@ -47,7 +46,6 @@ impl PlaybackService {
         let mut engine = match WebAudioEngine::new(file_path, volume, pan) {
             Ok(eng) => eng,
             Err(e) => {
-                state.current_path = None;
                 state.current_track_id = None;
                 state.playing = false;
                 return Err(e);
@@ -55,14 +53,12 @@ impl PlaybackService {
         };
 
         if let Err(e) = engine.play() {
-            state.current_path = None;
             state.current_track_id = None;
             state.playing = false;
             return Err(e);
         }
 
         state.engine = Some(Box::new(engine));
-        state.current_path = Some(track.path.clone());
         state.current_track_id = Some(track.id);
 
         if let Some(next_index) = index {
@@ -201,23 +197,6 @@ impl PlaybackService {
         Ok(())
     }
 
-    pub fn load_track_for_playback(&self, full_path: &str, track_id: Option<i64>) -> Track {
-        with_audio_state(|state| {
-            state
-                .playback_queue
-                .tracks
-                .iter()
-                .find(|track| {
-                    track_id.as_ref().map(|id| track.id == *id).unwrap_or(false)
-                        || track.path == full_path
-                })
-                .cloned()
-        })
-        .ok()
-        .flatten()
-        .unwrap_or_else(|| minimal_track(full_path.to_string()))
-    }
-
     pub fn emit_track_started(
         app_handle: &AppHandle,
         track: Track,
diff --git a/src-tauri/src/services/plugin/manager.rs b/src-tauri/src/services/plugin/manager.rs
index af78231..4739518 100644
--- a/src-tauri/src/services/plugin/manager.rs
+++ b/src-tauri/src/services/plugin/manager.rs
@@ -543,7 +543,6 @@ impl PluginManager {
                     artist: payload.track.artist.clone(),
                     album: payload.track.album.clone(),
                     duration: payload.track.duration,
-                    path: payload.track.path.clone(),
                 },
                 index: payload.index,
             }),
diff --git a/src-tauri/src/state/playback_state.rs b/src-tauri/src/state/playback_state.rs
index 00ad0a7..7dbcdcd 100644
--- a/src-tauri/src/state/playback_state.rs
+++ b/src-tauri/src/state/playback_state.rs
@@ -1,9 +1,8 @@
 pub use crate::audio::lock_audio_state;
 use crate::audio::AudioState;
 use crate::errors::AppError;
-use crate::models::playback::{NativeTrackMetadata, PlaybackStatusSnapshot, PlaybackTrackInfo};
+use crate::models::playback::{NativeTrackMetadata, PlaybackStatusSnapshot};
 use crate::models::Track;
-use std::path::Path;
 
 pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, AppError> {
     let value = {
@@ -14,13 +13,6 @@ pub fn with_audio_state<T>(f: impl FnOnce(&mut AudioState) -> T) -> Result<T, Ap
     Ok(value)
 }
 
-pub fn playback_track_info(state: &AudioState) -> PlaybackTrackInfo {
-    PlaybackTrackInfo {
-        id: state.current_track_id,
-        path: state.current_path.clone(),
-    }
-}
-
 pub fn current_playback_state(state: &mut AudioState) -> PlaybackStatusSnapshot {
     match state.with_engine(|engine| (!engine.paused(), engine.current_time())) {
         Ok((playing, current_time)) => {
@@ -92,29 +84,6 @@ pub fn metadata_from_track(track: &Track) -> NativeTrackMetadata {
     }
 }
 
-pub fn minimal_track(full_path: String) -> Track {
-    let title = Path::new(&full_path)
-        .file_stem()
-        .and_then(|value| value.to_str())
-        .unwrap_or("未知歌曲")
-        .to_string();
-
-    Track {
-        id: 0,
-        title,
-        artist: Some("未知歌手".to_string()),
-        album: Some("未知专辑".to_string()),
-        duration: 0,
-        path: full_path,
-        cover: None,
-        file_size: None,
-        play_count: 0,
-        last_played_at: None,
-        created_at: String::new(),
-        updated_at: String::new(),
-    }
-}
-
 pub fn sanitize_track(mut track: Track) -> Track {
     track.cover = None;
     track
diff --git a/src/lib/state/covers.svelte.ts b/src/lib/state/covers.svelte.ts
index d5c61f2..857c629 100644
--- a/src/lib/state/covers.svelte.ts
+++ b/src/lib/state/covers.svelte.ts
@@ -3,44 +3,42 @@ import type { Track } from '../types/music'
 
 class TrackCovers {
     covers = $state<Record<string, string | null>>({})
-    private promises = new Map<string, Promise<string | null>>()
+    private promises = new Map<number, Promise<string | null>>()
 
     async load(track: Track | null | undefined): Promise<string | null> {
-        if (!track?.path) return null
+        if (!track) return null
 
-        if (this.covers[track.path] !== undefined) {
-            return this.covers[track.path]
+        if (this.covers[track.id] !== undefined) {
+            return this.covers[track.id]
         }
 
-        if (this.promises.has(track.path)) {
-            return await this.promises.get(track.path)!
+        if (this.promises.has(track.id)) {
+            return await this.promises.get(track.id)!
         }
 
-        const promise = invoke<string | null>('get_track_cover', {
-            fullPath: track.path
-        })
+        const promise = invoke<string | null>('get_track_cover', { trackId: track.id })
             .then((cover) => {
-                this.covers[track.path] = cover
+                this.covers[track.id] = cover
                 return cover
             })
             .catch((err) => {
-                console.error('加载封面失败:', track.path, err)
-                this.covers[track.path] = null
+                console.error('加载封面失败:', track.id, err)
+                this.covers[track.id] = null
                 return null
             })
             .finally(() => {
-                this.promises.delete(track.path)
+                this.promises.delete(track.id)
             })
 
-        this.promises.set(track.path, promise)
+        this.promises.set(track.id, promise)
 
         return await promise
     }
 
     get(track: Track | null | undefined): string | null {
-        if (!track?.path) return null
-        return this.covers[track.path] ?? null
+        if (!track) return null
+        return this.covers[track.id] ?? null
     }
 }
 
-export const trackCovers = new TrackCovers()
\ No newline at end of file
+export const trackCovers = new TrackCovers()
diff --git a/src/lib/state/recent.svelte.ts b/src/lib/state/recent.svelte.ts
index e3ae147..a93fbc5 100644
--- a/src/lib/state/recent.svelte.ts
+++ b/src/lib/state/recent.svelte.ts
@@ -18,6 +18,10 @@ class RecentlyPlayed {
             return this.loadPromise
         }
 
+        if (this.tracks.length > 0) {
+            return this.tracks
+        }
+
         this.isLoading = true
         this.error = null
 
diff --git a/src/lib/state/settings.svelte.ts b/src/lib/state/settings.svelte.ts
index 6d619d9..c79a6c3 100644
--- a/src/lib/state/settings.svelte.ts
+++ b/src/lib/state/settings.svelte.ts
@@ -20,8 +20,14 @@ class SettingsState {
     error = $state<string | null>(null)
 
     #saveTimer: ReturnType<typeof setTimeout> | null = null
+    #loaded = false
 
     async load(): Promise<AppSettings> {
+        if (this.#loaded) {
+            return this.data
+        }
+
+        this.#loaded = true
         this.isLoading = true
         this.error = null
 
diff --git a/src/lib/types/music.ts b/src/lib/types/music.ts
index 4d32fc6..6da8bb3 100644
--- a/src/lib/types/music.ts
+++ b/src/lib/types/music.ts
@@ -6,7 +6,6 @@ export interface Track {
     artist: string | null
     album: string | null
     duration: number
-    path: string
     cover: string | null
     fileSize: number | null
     playCount: number
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index c1a509b..00a5550 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -4,8 +4,11 @@
     import LyricsPanel from '$lib/features/LyricsPanel.svelte'
     import Appbar from '$lib/features/shell/Appbar.svelte'
     import NavRail from '$lib/features/shell/NavRail.svelte'
+    import { musicLibrary } from '$lib/state/library.svelte'
+    import { trackCovers } from '$lib/state/covers.svelte'
     import { player } from '$lib/state/player.svelte'
     import { pluginState } from '$lib/state/plugins.svelte'
+    import { recentlyPlayed } from '$lib/state/recent.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import 'mdui'
     import 'mdui/mdui.css'
@@ -21,6 +24,23 @@
         void settings.load()
         void player.loadState()
         void pluginState.loadSidebarExtensions()
+        void recentlyPlayed.load()
+        void musicLibrary.load().then(tracks => {
+            if (!tracks || tracks.length === 0) return
+            const BATCH = 10
+            const DELAY = 50
+            let i = 0
+            const loadNext = () => {
+                const batch = tracks.slice(i, i + BATCH)
+                if (batch.length === 0) return
+                for (const track of batch) {
+                    void trackCovers.load(track)
+                }
+                i += BATCH
+                setTimeout(loadNext, DELAY)
+            }
+            loadNext()
+        })
 
         const trayUnlistenPromise = listen<string>('tray:navigate', event => {
             if (event.payload === 'settings') {
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 02086ed..1b04546 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -3,19 +3,5 @@
 // See: https://svelte.dev/docs/kit/single-page-apps
 // See: https://v2.tauri.app/start/frontend/sveltekit/ for more info
 
-import { musicLibrary } from '$lib/state/library.svelte'
-import { recentlyPlayed } from '$lib/state/recent.svelte'
-import { settings } from '$lib/state/settings.svelte'
-
 export const prerender = true
 export const ssr = false
-export async function load() {
-    await settings.load()
-
-    await Promise.all([
-        recentlyPlayed.load(),
-        musicLibrary.load(),
-    ])
-
-    return {}
-}
\ No newline at end of file
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 2396547..8df5be8 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -46,7 +46,7 @@
               )
             : albums
 
-        return [...list].sort((a, b) => collator.compare(a.title, b.title))
+        return list.toSorted((a, b) => collator.compare(a.title, b.title))
     })
 
     const albumGridItems = $derived(
@@ -56,15 +56,12 @@
             subtitle: `${album.trackCount} 首歌曲`,
             image: trackCovers.get(album.representativeTrack) ?? album.cover,
             shape: 'square' as const,
+            onvisible: () => {
+                void trackCovers.load(album.representativeTrack)
+            },
         })),
     )
 
-    $effect(() => {
-        for (const album of filteredAlbums) {
-            void trackCovers.load(album.representativeTrack)
-        }
-    })
-
     function playAll(tracks: Track[]) {
         if (tracks.length === 0) return
         player.replacePlaylistAndPlay(tracks, tracks[0].id)
@@ -73,28 +70,21 @@
     function selectAlbumItem(item: MediaGridItem) {
         const album = musicLibrary.getAlbum(String(item.id))
         if (album === undefined) return
-
         selectedAlbumId = album.id
     }
 
     function playAlbumItem(item: MediaGridItem, event: Event) {
         event.preventDefault()
         event.stopPropagation()
-
         const album = musicLibrary.getAlbum(String(item.id))
         if (album === undefined) return
-
         playAll(album.tracks)
     }
 
     function handleAlbumArtistGroupingChange(event: Event) {
         const checked = (event.currentTarget as HTMLInputElement).checked
-
         if (checked === settings.data.useAlbumArtistGrouping) return
-
-        settings.update({
-            useAlbumArtistGrouping: checked,
-        })
+        settings.update({ useAlbumArtistGrouping: checked })
         selectedAlbumId = null
     }
 </script>
@@ -149,16 +139,11 @@
                     {:else}
                         <mdui-list>
                             {#each filteredAlbums as album (album.id)}
-                                {@const cover =
-                                    trackCovers.get(
-                                        album.representativeTrack,
-                                    ) ?? album.cover}
+                                {@const cover = trackCovers.get(album.representativeTrack) ?? album.cover}
                                 <mdui-list-item
                                     headline={album.title}
                                     description={`${album.trackCount} 首歌曲`}
-                                    onclick={() => {
-                                        selectedAlbumId = album.id
-                                    }}
+                                    onclick={() => { selectedAlbumId = album.id }}
                                     onkeydown={(e: KeyboardEvent) =>
                                         (e.key === 'Enter' || e.key === ' ') &&
                                         (selectedAlbumId = album.id)}
@@ -166,17 +151,9 @@
                                     tabindex="0"
                                 >
                                     {#if cover}
-                                        <img
-                                            src={cover}
-                                            slot="icon"
-                                            class="w-10 h-10 rounded object-cover shrink-0"
-                                            alt=""
-                                        />
+                                        <img src={cover} slot="icon" class="w-10 h-10 rounded object-cover shrink-0" alt="" />
                                     {:else}
-                                        <div
-                                            slot="icon"
-                                            class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0"
-                                        >
+                                        <div slot="icon" class="w-10 h-10 rounded bg-[rgb(var(--mdui-color-surface-container-highest))] flex items-center justify-center text-lg shrink-0">
                                             🎵
                                         </div>
                                     {/if}
@@ -187,24 +164,16 @@
                 </div>
             {:else}
                 <div class="flex-1 flex flex-col overflow-hidden min-h-0">
-                    <div
-                        class="flex items-center gap-3 py-3 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0"
-                    >
+                    <div class="flex items-center gap-3 py-3 border-b border-[rgb(var(--mdui-color-outline-variant))] shrink-0">
                         <IconButton
                             icon="arrow_back--rounded"
-                            onclick={() => {
-                                selectedAlbumId = null
-                            }}
+                            onclick={() => { selectedAlbumId = null }}
                         />
                         <div class="flex-1 min-w-0">
-                            <h2
-                                class="text-base font-semibold truncate text-[rgb(var(--mdui-color-on-surface))]"
-                            >
+                            <h2 class="text-base font-semibold truncate text-[rgb(var(--mdui-color-on-surface))]">
                                 {selectedAlbum.title}
                             </h2>
-                            <p
-                                class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]"
-                            >
+                            <p class="text-xs text-[rgb(var(--mdui-color-on-surface-variant))]">
                                 {selectedAlbum.trackCount} 首歌曲
                             </p>
                         </div>
@@ -231,9 +200,7 @@
             </div>
             <div class="flex-1 flex flex-col overflow-hidden min-h-0">
                 {#if selectedAlbum === undefined}
-                    <div
-                        class="flex-1 flex flex-col items-center justify-center text-[rgb(var(--mdui-color-on-surface-variant))]"
-                    >
+                    <div class="flex-1 flex flex-col items-center justify-center text-[rgb(var(--mdui-color-on-surface-variant))]">
                         <span class="text-5xl mb-2">🎵</span>
                         <span class="text-sm">选择一个专辑以查看歌曲</span>
                     </div>
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index 4e215ff..7f5ff10 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -65,10 +65,21 @@
         ),
     )
 
+    let sortedCache: Track[] = []
+    let lastSortBy: SortBy = 'title'
+    let lastTrackLength = 0
+
     const defaultSortedTracks = $derived.by(() => {
-        return [...musicLibrary.tracks].sort((a, b) => {
-            return collator.compare(a[sortBy] ?? '', b[sortBy] ?? '')
-        })
+        const tracks = musicLibrary.tracks
+        if (sortBy === lastSortBy && tracks.length === lastTrackLength && sortedCache.length > 0) {
+            return sortedCache
+        }
+        sortedCache = tracks.toSorted((a, b) =>
+            collator.compare(a[sortBy] ?? '', b[sortBy] ?? ''),
+        )
+        lastSortBy = sortBy
+        lastTrackLength = tracks.length
+        return sortedCache
     })
 
     const displayTracks = $derived(
@@ -119,8 +130,8 @@
         appendTracksToPlaylist(selectedTracks)
     }
 
-    function getSelectedTrackPaths() {
-        return selectedTracks.map(track => track.path).filter(Boolean)
+    function getSelectedTrackIds() {
+        return selectedTracks.map(track => track.id)
     }
 
     function removeSelectedFromCurrentList() {
@@ -132,10 +143,10 @@
     }
 
     async function moveSelectedToTrash() {
-        const paths = getSelectedTrackPaths()
+        const trackIds = getSelectedTrackIds()
 
         try {
-            await invoke('trash_track_files', { paths })
+            await invoke('trash_track_files', { trackIds })
             await musicLibrary.scan()
             closeBatchMode()
         } catch (err) {
@@ -145,10 +156,10 @@
     }
 
     async function deleteSelectedFromDisk() {
-        const paths = getSelectedTrackPaths()
+        const trackIds = getSelectedTrackIds()
 
         try {
-            await invoke('delete_track_files', { paths })
+            await invoke('delete_track_files', { trackIds })
             await musicLibrary.scan()
             closeBatchMode()
         } catch (err) {
@@ -181,7 +192,7 @@
     }
 
     async function showContextTrackFolder(track: Track) {
-        await invoke('show_in_folder', { path: track.path })
+        await invoke('show_in_folder', { trackId: track.id })
     }
 
     async function removeContextTrackFromList(track: Track) {
@@ -190,7 +201,7 @@
     }
 
     async function deleteContextTrackFile(track: Track) {
-        await invoke('delete_track_file', { path: track.path, trackId: track.id })
+        await invoke('delete_track_file', { trackId: track.id })
         await musicLibrary.scan()
     }
 
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 8efa2af..0d27130 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -8,7 +8,6 @@
     import { settings } from '$lib/state/settings.svelte'
     import type { ThemeMode, PluginLogLevel } from '$lib/types'
     import { scanDirectory, removeMusicDirectory } from '$lib/utils/library'
-    import { onMount } from 'svelte'
 
     import { setTheme } from '@tauri-apps/api/app'
     import 'mdui/components/circular-progress.js'
@@ -29,10 +28,6 @@
         { label: '调试', value: 'debug' },
     ]
 
-    onMount(() => {
-        void settings.load()
-    })
-
     function handleSwitchChange(
         event: Event,
         key: 'scanOnStartup' | 'reduceMotion' | 'pluginScanOnStartup' | 'pluginDevMode',

From 015b5ef8f7927c65e5b01fab243566619ab1a103 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Thu, 18 Jun 2026 19:19:52 +0800
Subject: [PATCH 38/39] update

---
 src-tauri/src/commands/library.rs             |  11 +-
 .../repositories/sqlite/track_repository.rs   |  70 +++
 src-tauri/src/services/track_service.rs       |   8 +
 src/lib/features/QueueDrawer.svelte           |   2 +-
 src/lib/features/TrackList.svelte             | 528 ------------------
 .../track-list/TrackContextMenu.svelte        | 139 +++++
 src/lib/features/track-list/TrackList.svelte  | 196 +++++++
 .../features/track-list/TrackListRow.svelte   | 308 ++++++++++
 src/routes/album/+page.svelte                 |   2 +-
 src/routes/artists/+page.svelte               |   2 +-
 src/routes/library/+page.svelte               |   2 +-
 src/routes/recent/+page.svelte                |   2 +-
 12 files changed, 730 insertions(+), 540 deletions(-)
 delete mode 100644 src/lib/features/TrackList.svelte
 create mode 100644 src/lib/features/track-list/TrackContextMenu.svelte
 create mode 100644 src/lib/features/track-list/TrackList.svelte
 create mode 100644 src/lib/features/track-list/TrackListRow.svelte

diff --git a/src-tauri/src/commands/library.rs b/src-tauri/src/commands/library.rs
index d975f2c..9c11524 100644
--- a/src-tauri/src/commands/library.rs
+++ b/src-tauri/src/commands/library.rs
@@ -74,13 +74,10 @@ async fn upsert_scanned_tracks(
     state: &AppState,
     tracks: Vec<NewTrack>,
 ) -> Result<Vec<Track>, AppError> {
-    let mut saved = Vec::with_capacity(tracks.len());
-
-    for track in tracks {
-        saved.push(state.tracks.upsert_track(track).await?);
-    }
-
-    Ok(saved)
+    state
+        .tracks
+        .upsert_tracks(tracks)
+        .await
 }
 
 #[command]
diff --git a/src-tauri/src/repositories/sqlite/track_repository.rs b/src-tauri/src/repositories/sqlite/track_repository.rs
index ea896f2..564aafb 100644
--- a/src-tauri/src/repositories/sqlite/track_repository.rs
+++ b/src-tauri/src/repositories/sqlite/track_repository.rs
@@ -59,6 +59,76 @@ impl SqliteTrackRepository {
         Ok(res)
     }
 
+    pub async fn upsert_tracks(&self, tracks: Vec<NewTrack>) -> Result<Vec<Track>, AppError> {
+        let mut tx = self.pool.begin().await?;
+
+        let mut saved = Vec::with_capacity(tracks.len());
+
+        for track in tracks {
+            let res = sqlx::query_as::<_, Track>(
+                "
+                INSERT INTO tracks (
+                    title,
+                    artist,
+                    album,
+                    duration,
+                    path,
+                    cover,
+                    file_size,
+                    created_at,
+                    updated_at
+                )
+                VALUES (
+                    ?1, ?2, ?3,
+                    ?4, ?5, ?6,
+                    ?7,
+                    datetime('now'),
+                    datetime('now')
+                )
+
+                ON CONFLICT(path)
+                DO UPDATE SET
+                    title=excluded.title,
+                    artist=excluded.artist,
+                    album=excluded.album,
+                    duration=excluded.duration,
+                    cover=excluded.cover,
+                    file_size=excluded.file_size,
+                    updated_at=datetime('now')
+
+                RETURNING
+                    id,
+                    title,
+                    artist,
+                    album,
+                    duration,
+                    path,
+                    cover,
+                    file_size,
+                    play_count,
+                    last_played_at,
+                    created_at,
+                    updated_at
+                ",
+            )
+            .bind(track.title)
+            .bind(track.artist)
+            .bind(track.album)
+            .bind(track.duration)
+            .bind(track.path)
+            .bind(track.cover)
+            .bind(track.file_size)
+            .fetch_one(&mut *tx)
+            .await?;
+
+            saved.push(res);
+        }
+
+        tx.commit().await?;
+
+        Ok(saved)
+    }
+
     pub async fn update(&self, track: UpdateTrack) -> Result<Track, AppError> {
         let res = sqlx::query_as::<_, Track>(
             "UPDATE tracks SET
diff --git a/src-tauri/src/services/track_service.rs b/src-tauri/src/services/track_service.rs
index 934e0ae..997ae9f 100644
--- a/src-tauri/src/services/track_service.rs
+++ b/src-tauri/src/services/track_service.rs
@@ -22,6 +22,14 @@ impl TrackService {
         self.tracks.upsert_by_path(track).await
     }
 
+    pub async fn upsert_tracks(&self, tracks: Vec<NewTrack>) -> Result<Vec<Track>, AppError> {
+        let mut saved = Vec::with_capacity(tracks.len());
+        for track in tracks {
+            saved.push(self.tracks.upsert_by_path(track).await?);
+        }
+        Ok(saved)
+    }
+
     pub async fn update_track(&self, track: UpdateTrack) -> Result<Track, AppError> {
         self.tracks.update(track).await
     }
diff --git a/src/lib/features/QueueDrawer.svelte b/src/lib/features/QueueDrawer.svelte
index 9239eea..fde4644 100644
--- a/src/lib/features/QueueDrawer.svelte
+++ b/src/lib/features/QueueDrawer.svelte
@@ -2,7 +2,7 @@
     import IconButton from '$lib/components/base/IconButton.svelte'
     import { player } from '$lib/state/player.svelte'
     import type { Track } from '$lib/types'
-    import TrackList from './TrackList.svelte'
+    import TrackList from './track-list/TrackList.svelte'
 
     function handlePlay(_track: Track, index: number) {
         player.playTrackInQueue(index)
diff --git a/src/lib/features/TrackList.svelte b/src/lib/features/TrackList.svelte
deleted file mode 100644
index c01ff23..0000000
--- a/src/lib/features/TrackList.svelte
+++ /dev/null
@@ -1,528 +0,0 @@
-<script lang="ts">
-    import IconButton from '$lib/components/base/IconButton.svelte'
-    import PlayingIndicator from '$lib/components/base/PlayingIndicator.svelte'
-    import { trackCovers } from '$lib/state/covers.svelte'
-    import { player } from '$lib/state/player.svelte'
-    import type { Track } from '$lib/types'
-    import { formatDuration } from '$lib/utils'
-    import '@mdui/icons/play-arrow--rounded.js'
-    import 'mdui/components/checkbox.js'
-    import 'mdui/components/list-item.js'
-    import 'mdui/components/list.js'
-
-    type TrackColumn = 'index' | 'title' | 'album' | 'duration'
-
-    interface Props {
-        tracks: Track[]
-        columns?: TrackColumn[]
-        selectable?: boolean
-        selectedIds?: number[]
-        currentTrackId?: number
-        hideHeader?: boolean
-        ontoggletrack?: (track: Track, checked: boolean) => void
-        ondblclicktrack?: (track: Track, index: number) => void
-        onremovetrack?: (track: Track, index: number) => void
-        onplaytrack?: (track: Track, index: number) => void | Promise<void>
-        oninsertnexttrack?: (
-            track: Track,
-            index: number,
-        ) => void | Promise<void>
-        onshowtrackfolder?: (
-            track: Track,
-            index: number,
-        ) => void | Promise<void>
-        onremovetrackfromlist?: (
-            track: Track,
-            index: number,
-        ) => void | Promise<void>
-        ondeletetrackfile?: (
-            track: Track,
-            index: number,
-        ) => void | Promise<void>
-    }
-
-    const columnWidths: Record<TrackColumn, string> = {
-        index: '24px',
-        title: '1fr',
-        album: '1fr',
-        duration: '60px',
-    }
-
-    let {
-        tracks,
-        columns = ['index', 'title', 'album', 'duration'],
-        selectable = false,
-        selectedIds = [],
-        hideHeader = false,
-        ontoggletrack,
-        ondblclicktrack,
-        onremovetrack,
-        onplaytrack,
-        oninsertnexttrack,
-        onshowtrackfolder,
-        onremovetrackfromlist,
-        ondeletetrackfile,
-    }: Props = $props()
-
-    let contextMenuTrack = $state<Track | null>(null)
-    let contextMenuIndex = $state(-1)
-    let contextMenuX = $state(0)
-    let contextMenuY = $state(0)
-    let contextMenuOpen = $state(false)
-
-    let gridTemplate = $derived(
-        [
-            selectable ? '48px' : null,
-            ...columns.map(column => columnWidths[column]),
-        ]
-            .filter(Boolean)
-            .join(' '),
-    )
-    function lazyCover(track: Track) {
-        return (node: HTMLElement) => {
-            const load = () => {
-                void trackCovers.load(track)
-            }
-
-            const observer = new IntersectionObserver(
-                entries => {
-                    if (entries[0].isIntersecting) {
-                        load()
-                        observer.disconnect()
-                    }
-                },
-                {
-                    rootMargin: '300px',
-                },
-            )
-
-            const rect = node.getBoundingClientRect()
-            const isVisible =
-                rect.top < window.innerHeight + 300 && rect.bottom > -300
-
-            if (isVisible) {
-                load()
-            } else {
-                observer.observe(node)
-            }
-
-            return () => {
-                observer.disconnect()
-            }
-        }
-    }
-
-    function isCheckboxEventTarget(target: EventTarget | null) {
-        return (
-            target instanceof Element &&
-            Boolean(target.closest('mdui-checkbox'))
-        )
-    }
-
-    function isTrackSelected(track: Track) {
-        return selectedIds.includes(track.id)
-    }
-
-    function setTrackSelected(track: Track, checked: boolean) {
-        ontoggletrack?.(track, checked)
-    }
-
-    function toggleTrackSelected(track: Track) {
-        setTrackSelected(track, !isTrackSelected(track))
-    }
-
-    function handleTrackToggle(event: Event, track: Track) {
-        event.stopPropagation()
-
-        const target = event.currentTarget as HTMLElement & { checked: boolean }
-        setTrackSelected(track, target.checked)
-    }
-
-    function handleTrackClick(event: MouseEvent, track: Track) {
-        if (!selectable || isCheckboxEventTarget(event.target)) return
-
-        toggleTrackSelected(track)
-    }
-
-    function handleTrackDoubleClick(
-        event: MouseEvent,
-        clickedTrack: Track,
-        index: number,
-    ) {
-        if (selectable || isCheckboxEventTarget(event.target)) return
-
-        if (ondblclicktrack) {
-            ondblclicktrack(clickedTrack, index)
-        } else {
-            player.replacePlaylistAndPlay(tracks, clickedTrack.id)
-        }
-
-        void trackCovers.load(clickedTrack)
-    }
-
-    function playTrack(track: Track, index: number) {
-        if (onplaytrack) {
-            return onplaytrack(track, index)
-        }
-
-        player.replacePlaylistAndPlay(tracks, track.id)
-        void trackCovers.load(track)
-    }
-
-    function openTrackContextMenu(
-        event: MouseEvent,
-        track: Track,
-        index: number,
-    ) {
-        event.preventDefault()
-        event.stopPropagation()
-        contextMenuTrack = track
-        contextMenuIndex = index
-        contextMenuX = event.clientX
-        contextMenuY = event.clientY
-        contextMenuOpen = true
-    }
-
-    function closeContextMenu() {
-        contextMenuOpen = false
-        contextMenuTrack = null
-        contextMenuIndex = -1
-    }
-
-    async function handleContextMenuAction(
-        action?: (track: Track, index: number) => void | Promise<void>,
-    ) {
-        const track = contextMenuTrack
-        const index = contextMenuIndex
-
-        if (!track || index < 0) {
-            closeContextMenu()
-            return
-        }
-
-        closeContextMenu()
-        await action?.(track, index)
-    }
-
-    function handleWindowClick() {
-        if (contextMenuOpen) {
-            closeContextMenu()
-        }
-    }
-
-    function handleWindowKeydown(event: KeyboardEvent) {
-        if (event.key === 'Escape' && contextMenuOpen) {
-            closeContextMenu()
-        }
-    }
-
-    function handleTrackKeydown(
-        event: KeyboardEvent,
-        track: Track,
-        index: number,
-    ) {
-        if (isCheckboxEventTarget(event.target)) return
-
-        if (event.key === 'Enter' || event.key === ' ') {
-            event.preventDefault()
-            if (selectable) {
-                toggleTrackSelected(track)
-            } else {
-                void playTrack(track, index)
-            }
-        }
-    }
-</script>
-
-<svelte:window onclick={handleWindowClick} onkeydown={handleWindowKeydown} />
-
-{#snippet trackIndex(index: number, isCurrent: boolean)}
-    <div class="flex justify-center items-center text-sm themed-text-secondary">
-        {#if isCurrent && player.playing}
-            <PlayingIndicator />
-        {:else}
-            <span
-                class={isCurrent
-                    ? 'font-bold themed-text-accent'
-                    : 'themed-text-secondary'}
-            >
-                {index + 1}
-            </span>
-        {/if}
-    </div>
-{/snippet}
-
-{#snippet trackCover(track: Track, cover: string | null, isCurrent: boolean)}
-    <div
-        {@attach lazyCover(track)}
-        class="relative w-10 h-10 rounded-md overflow-hidden shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
-    >
-        {#if cover}
-            <img
-                src={cover}
-                alt="cover"
-                class="w-full h-full object-cover"
-                loading="lazy"
-            />
-        {:else}
-            <div
-                class="w-full h-full flex items-center justify-center text-base themed-surface-high"
-            >
-                🎵
-            </div>
-        {/if}
-
-        {#if !columns.includes('index') && isCurrent}
-            <div
-                class="absolute inset-0 flex items-center justify-center bg-black/40 text-lg text-(--mdui-color-inverse-primary-light)"
-            >
-                {#if player.playing}
-                    <PlayingIndicator
-                        color="rgb(var(--mdui-color-inverse-primary-light))"
-                    />
-                {:else}
-                    <mdui-icon-play-arrow--rounded
-                        class="text-[rgb(var(--mdui-color-inverse-primary-light))]"
-                    ></mdui-icon-play-arrow--rounded>
-                {/if}
-            </div>
-        {/if}
-    </div>
-{/snippet}
-
-{#snippet trackTitle(track: Track, cover: string | null, isCurrent: boolean)}
-    <div class="flex items-center gap-4 pl-3 overflow-hidden min-w-0">
-        {@render trackCover(track, cover, isCurrent)}
-
-        <div class="flex flex-col min-w-0">
-            <span
-                class={[
-                    'text-sm font-medium truncate',
-                    isCurrent ? 'themed-text-accent' : 'themed-text-primary',
-                ]}
-            >
-                {track.title}
-            </span>
-
-            <span class="text-xs truncate themed-text-secondary mt-0.5">
-                {track.artist ?? '未知歌手'}
-            </span>
-        </div>
-    </div>
-{/snippet}
-
-{#snippet trackAlbum(track: Track)}
-    <div class="text-sm truncate hidden md:block themed-text-secondary min-w-0">
-        {track.album ?? '未知专辑'}
-    </div>
-{/snippet}
-
-{#snippet trackDuration(track: Track, index: number)}
-    <div class="flex items-center justify-between gap-2 w-full min-w-0">
-        <div class="text-sm font-mono themed-text-secondary text-left">
-            {formatDuration(track.duration / 1000)}
-        </div>
-        {#if onremovetrack}
-            <IconButton
-                icon="close--rounded"
-                class="text-xs themed-text-secondary opacity-0 transition-opacity duration-200 hover:text-red-500 group-hover:opacity-100"
-                onclick={(e: Event) => {
-                    e.stopPropagation()
-                    onremovetrack?.(track, index)
-                }}
-            />
-        {/if}
-    </div>
-{/snippet}
-
-<mdui-list class="flex flex-col w-full" role="list">
-    {#if !hideHeader}
-        <mdui-list-subheader
-            class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b"
-            style:grid-template-columns={gridTemplate}
-            noninteractive
-        >
-            {#if selectable}
-                <div></div>
-            {/if}
-
-            {#if columns.includes('index')}
-                <div class="text-center">#</div>
-            {/if}
-
-            {#if columns.includes('title')}
-                <div class="pl-2 text-left">标题</div>
-            {/if}
-
-            {#if columns.includes('album')}
-                <div class="text-left hidden md:block">专辑</div>
-            {/if}
-
-            {#if columns.includes('duration')}
-                <div class="text-left">时长</div>
-            {/if}
-        </mdui-list-subheader>
-    {/if}
-
-    <div class="flex flex-col gap-1 mt-2">
-        {#each tracks as track, index (track.id)}
-            {@const isCurrent = player.currentTrack?.id === track.id}
-            {@const cover = trackCovers.get(track)}
-
-            <mdui-list-item
-                class={[
-                    'group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none active:scale-[0.995] themed-item',
-                    isCurrent && 'themed-item-active',
-                ]}
-                onclick={(event: MouseEvent) => handleTrackClick(event, track)}
-                ondblclick={(event: MouseEvent) =>
-                    handleTrackDoubleClick(event, track, index)}
-                oncontextmenu={(event: MouseEvent) =>
-                    openTrackContextMenu(event, track, index)}
-                onkeydown={(event: KeyboardEvent) =>
-                    handleTrackKeydown(event, track, index)}
-                role="button"
-                tabindex="0"
-            >
-                <mdui-ripple></mdui-ripple>
-
-                <div
-                    class="grid items-center gap-4 w-full"
-                    style:grid-template-columns={gridTemplate}
-                >
-                    {#if selectable}
-                        <div class="flex justify-center items-center">
-                            <mdui-checkbox
-                                checked={selectedIds.includes(track.id)}
-                                onchange={(event: Event) =>
-                                    handleTrackToggle(event, track)}
-                            ></mdui-checkbox>
-                        </div>
-                    {/if}
-
-                    {#if columns.includes('index')}
-                        {@render trackIndex(index, isCurrent)}
-                    {/if}
-
-                    {#if columns.includes('title')}
-                        {@render trackTitle(track, cover, isCurrent)}
-                    {/if}
-
-                    {#if columns.includes('album')}
-                        {@render trackAlbum(track)}
-                    {/if}
-
-                    {#if columns.includes('duration')}
-                        {@render trackDuration(track, index)}
-                    {/if}
-                </div>
-            </mdui-list-item>
-        {/each}
-    </div>
-</mdui-list>
-
-{#if contextMenuOpen && contextMenuTrack}
-    <div
-        class="fixed z-50 min-w-44 overflow-hidden rounded-xl bg-[rgb(var(--mdui-color-surface-container-high))] py-1 text-sm text-[rgb(var(--mdui-color-on-surface))] shadow-xl"
-        style:left={`${contextMenuX}px`}
-        style:top={`${contextMenuY}px`}
-        role="menu"
-        tabindex="-1"
-        oncontextmenu={(event: MouseEvent) => event.preventDefault()}
-    >
-        <div
-            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
-            role="menuitem"
-            tabindex="0"
-            onclick={() => void handleContextMenuAction(playTrack)}
-            onkeydown={(e: KeyboardEvent) =>
-                (e.key === 'Enter' || e.key === ' ') &&
-                void handleContextMenuAction(playTrack)}
-        >
-            播放
-        </div>
-        <div
-            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
-            role="menuitem"
-            tabindex="0"
-            onclick={() => void handleContextMenuAction(oninsertnexttrack)}
-            onkeydown={(e: KeyboardEvent) =>
-                (e.key === 'Enter' || e.key === ' ') &&
-                void handleContextMenuAction(oninsertnexttrack)}
-        >
-            下一首播放
-        </div>
-        <div
-            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
-            role="menuitem"
-            tabindex="0"
-            onclick={() => void handleContextMenuAction(onshowtrackfolder)}
-            onkeydown={(e: KeyboardEvent) =>
-                (e.key === 'Enter' || e.key === ' ') &&
-                void handleContextMenuAction(onshowtrackfolder)}
-        >
-            打开文件所在目录
-        </div>
-        <div
-            class="flex w-full px-4 py-2 text-left transition-colors hover:bg-[rgb(var(--mdui-color-surface-container-highest))]"
-            role="menuitem"
-            tabindex="0"
-            onclick={() => void handleContextMenuAction(onremovetrackfromlist)}
-            onkeydown={(e: KeyboardEvent) =>
-                (e.key === 'Enter' || e.key === ' ') &&
-                void handleContextMenuAction(onremovetrackfromlist)}
-        >
-            从当前列表移除
-        </div>
-        <div
-            class="flex w-full px-4 py-2 text-left text-[rgb(var(--mdui-color-error))] transition-colors hover:bg-[rgb(var(--mdui-color-error-container))]"
-            role="menuitem"
-            tabindex="0"
-            onclick={() => void handleContextMenuAction(ondeletetrackfile)}
-            onkeydown={(e: KeyboardEvent) =>
-                (e.key === 'Enter' || e.key === ' ') &&
-                void handleContextMenuAction(ondeletetrackfile)}
-        >
-            删除文件
-        </div>
-    </div>
-{/if}
-
-<style>
-    .themed-text-primary {
-        color: rgb(var(--mdui-color-on-surface));
-    }
-
-    .themed-text-secondary {
-        color: rgb(var(--mdui-color-on-surface-variant));
-    }
-
-    .themed-text-accent {
-        color: rgb(var(--mdui-color-primary));
-    }
-
-    .themed-border-b {
-        border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
-    }
-
-    .themed-surface-high {
-        background-color: rgb(var(--mdui-color-surface-container-high));
-    }
-
-    .themed-item {
-        background-color: transparent;
-        border: 1px solid transparent;
-    }
-
-    .themed-item:hover {
-        background-color: rgb(var(--mdui-color-surface-container));
-        box-shadow:
-            0 4px 6px -1px rgba(0, 0, 0, 0.1),
-            0 2px 4px -1px rgba(0, 0, 0, 0.06);
-    }
-
-    .themed-item-active {
-        background-color: rgb(var(--mdui-color-surface-container));
-        border-color: rgb(var(--mdui-color-outline-variant));
-    }
-</style>
diff --git a/src/lib/features/track-list/TrackContextMenu.svelte b/src/lib/features/track-list/TrackContextMenu.svelte
new file mode 100644
index 0000000..9bc0678
--- /dev/null
+++ b/src/lib/features/track-list/TrackContextMenu.svelte
@@ -0,0 +1,139 @@
+<script lang="ts">
+    import type { Track } from "$lib/types"
+
+    interface Props {
+        open: boolean
+        track: Track | null
+        index: number
+
+        x: number
+        y: number
+
+        onclose: () => void
+        onplay?: (track: Track, index: number) => void | Promise<void>
+        oninsertnext?: (track: Track, index: number) => void | Promise<void>
+        onshowfolder?: (track: Track, index: number) => void | Promise<void>
+        onremovefromlist?: (track: Track, index: number) => void | Promise<void>
+        ondelete?: (track: Track, index: number) => void | Promise<void>
+    }
+
+    let {
+        open,
+        track,
+        index,
+        x,
+        y,
+        onclose,
+        onplay,
+        oninsertnext,
+        onshowfolder,
+        onremovefromlist,
+        ondelete,
+    }: Props = $props()
+
+    async function execute(
+        action?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>,
+    ) {
+        const clickedTrack = track
+        const clickedIndex = index
+
+        onclose()
+
+        if (!clickedTrack || clickedIndex < 0) {
+            return
+        }
+
+        await action?.(
+            clickedTrack,
+            clickedIndex,
+        )
+    }
+
+    function handleKey(
+        event: KeyboardEvent,
+        action?: (track: Track, index: number) => void | Promise<void>,
+    ) {
+        if (event.key === "Enter" || event.key === " ") {
+            void execute(action)
+        }
+    }
+</script>
+
+{#if open && track}
+    <div
+        class="fixed z-50 min-w-44 overflow-hidden rounded-xl bg-[rgb(var(--mdui-color-surface-container-high))] py-1 text-sm text-[rgb(var(--mdui-color-on-surface))] shadow-xl"
+        style:left={`${x}px`}
+        style:top={`${y}px`}
+        role="menu"
+        tabindex="-1"
+        oncontextmenu={(e) => e.preventDefault()}
+    >
+        <div
+            class="menu-item"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void execute(onplay)}
+            onkeydown={(e) => handleKey(e, onplay)}
+        >
+            播放
+        </div>
+
+        <div
+            class="menu-item"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void execute(oninsertnext)}
+            onkeydown={(e) => handleKey(e, oninsertnext)}
+        >
+            下一首播放
+        </div>
+
+        <div
+            class="menu-item"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void execute(onshowfolder)}
+            onkeydown={(e) => handleKey(e, onshowfolder)}
+        >
+            打开文件所在目录
+        </div>
+
+        <div
+            class="menu-item"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void execute(onremovefromlist)}
+            onkeydown={(e) => handleKey(e, onremovefromlist)}
+        >
+            从当前列表移除
+        </div>
+
+        <div
+            class="menu-item danger"
+            role="menuitem"
+            tabindex="0"
+            onclick={() => void execute(ondelete)}
+            onkeydown={(e) => handleKey(e, ondelete)}
+        >
+            删除文件
+        </div>
+    </div>
+{/if}
+
+<style>
+    .menu-item {
+        padding: 8px 16px;
+        cursor: pointer;
+    }
+
+    .menu-item:hover {
+        background: rgb(var(--mdui-color-surface-container-highest));
+    }
+
+    .danger {
+        color: rgb(var(--mdui-color-error));
+    }
+</style>
diff --git a/src/lib/features/track-list/TrackList.svelte b/src/lib/features/track-list/TrackList.svelte
new file mode 100644
index 0000000..00c287d
--- /dev/null
+++ b/src/lib/features/track-list/TrackList.svelte
@@ -0,0 +1,196 @@
+<script lang="ts">
+    import { player } from "$lib/state/player.svelte";
+    import type { Track } from "$lib/types";
+    import TrackContextMenu from "./TrackContextMenu.svelte";
+    import TrackListRow from "./TrackListRow.svelte";
+    import "mdui/components/list.js";
+
+    type TrackColumn = "index" | "title" | "album" | "duration";
+
+    interface Props {
+        tracks: Track[];
+        columns?: TrackColumn[];
+        selectable?: boolean;
+        selectedIds?: number[];
+        currentTrackId?: number;
+        hideHeader?: boolean;
+        ontoggletrack?: (track: Track, checked: boolean) => void;
+        ondblclicktrack?: (track: Track, index: number) => void;
+        onremovetrack?: (track: Track, index: number) => void;
+        onplaytrack?: (track: Track, index: number) => void | Promise<void>;
+        oninsertnexttrack?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>;
+        onshowtrackfolder?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>;
+        onremovetrackfromlist?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>;
+        ondeletetrackfile?: (
+            track: Track,
+            index: number,
+        ) => void | Promise<void>;
+    }
+
+    const columnWidths: Record<TrackColumn, string> = {
+        index: "24px",
+        title: "1fr",
+        album: "1fr",
+        duration: "60px",
+    };
+
+    let {
+        tracks,
+        columns = ["index", "title", "album", "duration"],
+        selectable = false,
+        selectedIds = [],
+        hideHeader = false,
+        ontoggletrack,
+        ondblclicktrack,
+        onremovetrack,
+        onplaytrack,
+        oninsertnexttrack,
+        onshowtrackfolder,
+        onremovetrackfromlist,
+        ondeletetrackfile,
+    }: Props = $props();
+
+    let contextMenuTrack = $state<Track | null>(null);
+    let contextMenuIndex = $state(-1);
+    let contextMenuX = $state(0);
+    let contextMenuY = $state(0);
+    let contextMenuOpen = $state(false);
+    let currentTrackId = $derived(player.currentTrack?.id);
+    let gridTemplate = $derived(
+        [
+            selectable ? "48px" : null,
+            ...columns.map((column) => columnWidths[column]),
+        ]
+            .filter(Boolean)
+            .join(" "),
+    );
+
+    function isTrackSelected(track: Track) {
+        return selectedIds.includes(track.id);
+    }
+
+    function setTrackSelected(track: Track, checked: boolean) {
+        ontoggletrack?.(track, checked);
+    }
+
+    function playTrack(track: Track, index: number) {
+        if (onplaytrack) {
+            return onplaytrack(track, index);
+        }
+
+        return undefined;
+    }
+
+    function openTrackContextMenu(e: MouseEvent, track: Track, index: number) {
+        e.preventDefault();
+        e.stopPropagation();
+        contextMenuTrack = track;
+        contextMenuIndex = index;
+        contextMenuX = e.clientX;
+        contextMenuY = e.clientY;
+        contextMenuOpen = true;
+    }
+
+    function closeContextMenu() {
+        contextMenuOpen = false;
+        contextMenuTrack = null;
+        contextMenuIndex = -1;
+    }
+
+    function handleWindowClick() {
+        if (contextMenuOpen) {
+            closeContextMenu();
+        }
+    }
+
+    function handleWindowKeydown(event: KeyboardEvent) {
+        if (event.key === "Escape" && contextMenuOpen) {
+            closeContextMenu();
+        }
+    }
+</script>
+
+<svelte:window onclick={handleWindowClick} onkeydown={handleWindowKeydown} />
+
+<mdui-list class="flex flex-col w-full" role="list">
+    {#if !hideHeader}
+        <mdui-list-subheader
+            class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b"
+            style:grid-template-columns={gridTemplate}
+            noninteractive
+        >
+            {#if selectable}
+                <div></div>
+            {/if}
+
+            {#if columns.includes("index")}
+                <div class="text-center">#</div>
+            {/if}
+
+            {#if columns.includes("title")}
+                <div class="pl-2 text-left">标题</div>
+            {/if}
+
+            {#if columns.includes("album")}
+                <div class="text-left hidden md:block">专辑</div>
+            {/if}
+
+            {#if columns.includes("duration")}
+                <div class="text-left">时长</div>
+            {/if}
+        </mdui-list-subheader>
+    {/if}
+
+    <div class="flex flex-col gap-1 mt-2">
+        {#each tracks as track, index (track.id)}
+            <TrackListRow
+                {track}
+                {index}
+                {columns}
+                {selectable}
+                selected={isTrackSelected(track)}
+                isCurrent={currentTrackId === track.id}
+                playing={player.playing}
+                {gridTemplate}
+                ontoggle={(checked) => setTrackSelected(track, checked)}
+                {ondblclicktrack}
+                {onremovetrack}
+                onplay={() => playTrack(track, index)}
+                oncontextmenu={(e) => openTrackContextMenu(e, track, index)}
+            />
+        {/each}
+    </div>
+</mdui-list>
+
+<TrackContextMenu
+    open={contextMenuOpen}
+    track={contextMenuTrack}
+    index={contextMenuIndex}
+    x={contextMenuX}
+    y={contextMenuY}
+    onclose={closeContextMenu}
+    onplay={playTrack}
+    oninsertnext={oninsertnexttrack}
+    onshowfolder={onshowtrackfolder}
+    onremovefromlist={onremovetrackfromlist}
+    ondelete={ondeletetrackfile}
+/>
+
+<style>
+    .themed-text-secondary {
+        color: rgb(var(--mdui-color-on-surface-variant));
+    }
+
+    .themed-border-b {
+        border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
+    }
+</style>
diff --git a/src/lib/features/track-list/TrackListRow.svelte b/src/lib/features/track-list/TrackListRow.svelte
new file mode 100644
index 0000000..7a9d1c5
--- /dev/null
+++ b/src/lib/features/track-list/TrackListRow.svelte
@@ -0,0 +1,308 @@
+<script lang="ts">
+    import IconButton from "$lib/components/base/IconButton.svelte";
+    import PlayingIndicator from "$lib/components/base/PlayingIndicator.svelte";
+    import { trackCovers } from "$lib/state/covers.svelte";
+    import type { Track } from "$lib/types";
+    import { formatDuration } from "$lib/utils";
+    import "@mdui/icons/play-arrow--rounded.js";
+    import "mdui/components/checkbox.js";
+    import "mdui/components/list-item.js";
+
+    type TrackColumn = "index" | "title" | "album" | "duration";
+
+    interface Props {
+        track: Track;
+        index: number;
+        columns?: TrackColumn[];
+        selectable?: boolean;
+        selected?: boolean;
+        isCurrent?: boolean;
+        playing?: boolean;
+        ontoggle?: (checked: boolean) => void;
+        ondblclicktrack?: (track: Track, index: number) => void;
+        onplay?: () => void | Promise<void>;
+        onremovetrack?: (track: Track, index: number) => void;
+        oncontextmenu?: (e: MouseEvent) => void;
+        gridTemplate: string;
+    }
+
+    let {
+        track,
+        index,
+        columns = ["index", "title", "album", "duration"],
+        selectable = false,
+        selected = false,
+        isCurrent = false,
+        playing = false,
+        ontoggle: ontoggletrack,
+        ondblclicktrack,
+        onplay,
+        onremovetrack,
+        oncontextmenu,
+        gridTemplate,
+    }: Props = $props();
+
+    const cover = $derived(trackCovers.get(track));
+
+    function isCheckboxEventTarget(target: EventTarget | null) {
+        return (
+            target instanceof Element &&
+            Boolean(target.closest("mdui-checkbox"))
+        );
+    }
+
+    function lazyCover(track: Track) {
+        return (node: HTMLElement) => {
+            const load = () => {
+                void trackCovers.load(track);
+            };
+
+            const observer = new IntersectionObserver(
+                (entries) => {
+                    if (entries[0].isIntersecting) {
+                        load();
+                        observer.disconnect();
+                    }
+                },
+                {
+                    rootMargin: "300px",
+                },
+            );
+
+            const rect = node.getBoundingClientRect();
+            const isVisible =
+                rect.top < window.innerHeight + 300 && rect.bottom > -300;
+
+            if (isVisible) {
+                load();
+            } else {
+                observer.observe(node);
+            }
+
+            return () => {
+                observer.disconnect();
+            };
+        };
+    }
+
+    function handleTrackToggle(e: Event) {
+        e.stopPropagation();
+        const target = e.currentTarget as HTMLElement & {
+            checked: boolean;
+        };
+        ontoggletrack?.(target.checked);
+    }
+
+    function handleTrackClick(e: MouseEvent) {
+        if (!selectable || isCheckboxEventTarget(e.target)) return;
+        ontoggletrack?.(!selected);
+    }
+
+    function handleTrackDoubleClick(e: MouseEvent) {
+        if (selectable || isCheckboxEventTarget(e.target)) return;
+
+        if (ondblclicktrack) {
+            ondblclicktrack(track, index);
+        } else {
+            void onplay?.();
+        }
+
+        void trackCovers.load(track);
+    }
+
+    function handleTrackKeydown(e: KeyboardEvent) {
+        if (isCheckboxEventTarget(e.target)) return;
+
+        if (e.key === "Enter" || e.key === " ") {
+            e.preventDefault();
+            if (selectable) {
+                ontoggletrack?.(!selected);
+            } else {
+                void onplay?.();
+            }
+        }
+    }
+
+    function openContextMenu(e: MouseEvent) {
+        e.preventDefault();
+        e.stopPropagation();
+        oncontextmenu?.(e);
+    }
+</script>
+
+{#snippet trackIndexCell()}
+    <div class="flex justify-center items-center text-sm themed-text-secondary">
+        {#if isCurrent && playing}
+            <PlayingIndicator />
+        {:else}
+            <span
+                class={isCurrent
+                    ? "font-bold themed-text-accent"
+                    : "themed-text-secondary"}
+            >
+                {index + 1}
+            </span>
+        {/if}
+    </div>
+{/snippet}
+
+{#snippet trackCoverCell(cover: string | null)}
+    <div
+        {@attach lazyCover(track)}
+        class="relative w-10 h-10 rounded-md overflow-hidden shrink-0 transition-transform duration-100! group-hover:scale-105 group-hover:shadow-md"
+    >
+        {#if cover}
+            <img
+                src={cover}
+                alt="cover"
+                class="w-full h-full object-cover"
+                loading="lazy"
+            />
+        {:else}
+            <div
+                class="w-full h-full flex items-center justify-center text-base themed-surface-high"
+            >
+                🎵
+            </div>
+        {/if}
+
+        {#if !columns.includes("index") && isCurrent}
+            <div
+                class="absolute inset-0 flex items-center justify-center bg-black/40 text-lg text-(--mdui-color-inverse-primary-light)"
+            >
+                {#if playing}
+                    <PlayingIndicator
+                        color="rgb(var(--mdui-color-inverse-primary-light))"
+                    />
+                {:else}
+                    <mdui-icon-play-arrow--rounded
+                        class="text-[rgb(var(--mdui-color-inverse-primary-light))]"
+                    ></mdui-icon-play-arrow--rounded>
+                {/if}
+            </div>
+        {/if}
+    </div>
+{/snippet}
+
+{#snippet trackTitleCell(cover: string | null)}
+    <div class="flex items-center gap-4 pl-3 overflow-hidden min-w-0">
+        {@render trackCoverCell(cover)}
+
+        <div class="flex flex-col min-w-0">
+            <span
+                class={[
+                    "text-sm font-medium truncate",
+                    isCurrent ? "themed-text-accent" : "themed-text-primary",
+                ]}
+            >
+                {track.title}
+            </span>
+
+            <span class="text-xs truncate themed-text-secondary mt-0.5">
+                {track.artist ?? "未知歌手"}
+            </span>
+        </div>
+    </div>
+{/snippet}
+
+{#snippet trackAlbumCell()}
+    <div class="text-sm truncate hidden md:block themed-text-secondary min-w-0">
+        {track.album ?? "未知专辑"}
+    </div>
+{/snippet}
+
+{#snippet trackDurationCell()}
+    <div class="flex items-center justify-between gap-2 w-full min-w-0">
+        <div class="text-sm font-mono themed-text-secondary text-left">
+            {formatDuration(track.duration / 1000)}
+        </div>
+        {#if onremovetrack}
+            <IconButton
+                icon="close--rounded"
+                class="text-xs themed-text-secondary opacity-0 transition-opacity duration-200 hover:text-red-500 group-hover:opacity-100"
+                onclick={(e: Event) => {
+                    e.stopPropagation();
+                    onremovetrack?.(track, index);
+                }}
+            />
+        {/if}
+    </div>
+{/snippet}
+
+<mdui-list-item
+    class={[
+        "group w-full rounded-xl transition-all duration-200 text-left overflow-hidden outline-none active:scale-[0.995] themed-item",
+        isCurrent && "themed-item-active",
+    ]}
+    onclick={handleTrackClick}
+    ondblclick={handleTrackDoubleClick}
+    oncontextmenu={openContextMenu}
+    onkeydown={handleTrackKeydown}
+    role="button"
+    tabindex="0"
+>
+    <mdui-ripple></mdui-ripple>
+
+    <div
+        class="grid items-center gap-4 w-full"
+        style:grid-template-columns={gridTemplate}
+    >
+        {#if selectable}
+            <div class="flex justify-center items-center">
+                <mdui-checkbox checked={selected} onchange={handleTrackToggle}
+                ></mdui-checkbox>
+            </div>
+        {/if}
+
+        {#if columns.includes("index")}
+            {@render trackIndexCell()}
+        {/if}
+
+        {#if columns.includes("title")}
+            {@render trackTitleCell(cover)}
+        {/if}
+
+        {#if columns.includes("album")}
+            {@render trackAlbumCell()}
+        {/if}
+
+        {#if columns.includes("duration")}
+            {@render trackDurationCell()}
+        {/if}
+    </div>
+</mdui-list-item>
+
+<style>
+    .themed-text-primary {
+        color: rgb(var(--mdui-color-on-surface));
+    }
+
+    .themed-text-secondary {
+        color: rgb(var(--mdui-color-on-surface-variant));
+    }
+
+    .themed-text-accent {
+        color: rgb(var(--mdui-color-primary));
+    }
+
+    .themed-surface-high {
+        background-color: rgb(var(--mdui-color-surface-container-high));
+    }
+
+    .themed-item {
+        background-color: transparent;
+        border: 1px solid transparent;
+    }
+
+    .themed-item:hover {
+        background-color: rgb(var(--mdui-color-surface-container));
+        box-shadow:
+            0 4px 6px -1px rgba(0, 0, 0, 0.1),
+            0 2px 4px -1px rgba(0, 0, 0, 0.06);
+    }
+
+    .themed-item-active {
+        background-color: rgb(var(--mdui-color-surface-container));
+        border-color: rgb(var(--mdui-color-outline-variant));
+    }
+</style>
diff --git a/src/routes/album/+page.svelte b/src/routes/album/+page.svelte
index 8df5be8..4de94be 100644
--- a/src/routes/album/+page.svelte
+++ b/src/routes/album/+page.svelte
@@ -5,7 +5,7 @@
     import MediaGrid, {
         type MediaGridItem,
     } from '$lib/components/media/MediaGrid.svelte'
-    import TrackList from '$lib/features/TrackList.svelte'
+    import TrackList from '$lib/features/track-list/TrackList.svelte'
     import { trackCovers } from '$lib/state/covers.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import { player } from '$lib/state/player.svelte'
diff --git a/src/routes/artists/+page.svelte b/src/routes/artists/+page.svelte
index a348b85..35153dd 100644
--- a/src/routes/artists/+page.svelte
+++ b/src/routes/artists/+page.svelte
@@ -6,7 +6,7 @@
     import MediaGrid, {
         type MediaGridItem,
     } from '$lib/components/media/MediaGrid.svelte'
-    import TrackList from '$lib/features/TrackList.svelte'
+    import TrackList from '$lib/features/track-list/TrackList.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import { player } from '$lib/state/player.svelte'
     import type { Artist, Track } from '$lib/types'
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index 7f5ff10..3843233 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import TrackList from '$lib/features/TrackList.svelte'
+    import TrackList from '$lib/features/track-list/TrackList.svelte'
     import { musicLibrary } from '$lib/state/library.svelte'
     import { player } from '$lib/state/player.svelte'
     import type { Track } from '$lib/types'
diff --git a/src/routes/recent/+page.svelte b/src/routes/recent/+page.svelte
index f3d0d89..dbddb63 100644
--- a/src/routes/recent/+page.svelte
+++ b/src/routes/recent/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import TrackList from '$lib/features/TrackList.svelte'
+    import TrackList from '$lib/features/track-list/TrackList.svelte'
     import { recentlyPlayed } from '$lib/state/recent.svelte'
 
     import Button from '$lib/components/base/Button.svelte'

From f58b78cf48c117ad5e9c06604c45175509d3ac10 Mon Sep 17 00:00:00 2001
From: kino <1491037864@qq.com>
Date: Thu, 18 Jun 2026 21:45:27 +0800
Subject: [PATCH 39/39] Add @tanstack/svelte-virtual

---
 package.json                                 |   1 +
 pnpm-lock.yaml                               |  18 +++
 src/lib/components/media/MediaGrid.svelte    | 115 +++++++++++++------
 src/lib/features/track-list/TrackList.svelte |  67 ++++++++---
 src/routes/library/+page.svelte              |   6 +-
 5 files changed, 154 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index 22c352b..da3f08e 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   "dependencies": {
     "@mdui/icons": "^1.0.3",
     "@tailwindcss/vite": "^4.3.0",
+    "@tanstack/svelte-virtual": "^3.13.29",
     "@tauri-apps/api": "^2.11.0",
     "@tauri-apps/plugin-dialog": "~2.7.1",
     "@tauri-apps/plugin-opener": "^2.5.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fc60806..c3d18bb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       '@tailwindcss/vite':
         specifier: ^4.3.0
         version: 4.3.0(vite@6.4.2(jiti@2.7.0)(lightningcss@1.32.0))
+      '@tanstack/svelte-virtual':
+        specifier: ^3.13.29
+        version: 3.13.29(svelte@5.56.0)
       '@tauri-apps/api':
         specifier: ^2.11.0
         version: 2.11.0
@@ -535,6 +538,14 @@ packages:
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7 || ^8
 
+  '@tanstack/svelte-virtual@3.13.29':
+    resolution: {integrity: sha512-9JWVzGK7JN72Fli9xKftpjUcDolOOtH4z/oefs13Xp3C2NGkJUqMjclKGJ4vS3k2EdlLKH0/tj25J7gTYFV2ZA==}
+    peerDependencies:
+      svelte: ^3.48.0 || ^4.0.0 || ^5.0.0
+
+  '@tanstack/virtual-core@3.17.1':
+    resolution: {integrity: sha512-VZyW2Uiml5tmBZwPGrSD3Sz73OxzljQMCmzYHsUTPEuTsERf5xwa+uWb01xEzkz3ZSYTjj8NEb/mKHvgKxyZdA==}
+
   '@tauri-apps/api@2.11.0':
     resolution: {integrity: sha512-7CinYODhky9lmO23xHnUFv0Xt43fbtWMyxZcLcRBlFkcgXKuEirBvHpmtJ89YMhyeGcq20Wuc47Fa4XjyniywA==}
 
@@ -1295,6 +1306,13 @@ snapshots:
       tailwindcss: 4.3.0
       vite: 6.4.2(jiti@2.7.0)(lightningcss@1.32.0)
 
+  '@tanstack/svelte-virtual@3.13.29(svelte@5.56.0)':
+    dependencies:
+      '@tanstack/virtual-core': 3.17.1
+      svelte: 5.56.0
+
+  '@tanstack/virtual-core@3.17.1': {}
+
   '@tauri-apps/api@2.11.0': {}
 
   '@tauri-apps/cli-darwin-arm64@2.11.2':
diff --git a/src/lib/components/media/MediaGrid.svelte b/src/lib/components/media/MediaGrid.svelte
index 68e2f92..4baca99 100644
--- a/src/lib/components/media/MediaGrid.svelte
+++ b/src/lib/components/media/MediaGrid.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import { createVirtualizer } from '@tanstack/svelte-virtual'
+    import { untrack } from 'svelte'
     import 'mdui/components/button-icon.js'
     import 'mdui/components/card.js'
 
@@ -27,13 +29,56 @@
         onplay?: (item: MediaGridItem, event: Event) => void
     } = $props()
 
+    let scrollContainer = $state<HTMLElement | null>(null)
+    let containerWidth = $state(0)
+
+    let columns = $derived.by(() => {
+        const width = containerWidth || 800
+        if (width >= 1280) return 8
+        if (width >= 1024) return 7
+        if (width >= 768) return 6
+        if (width >= 640) return 5
+        return 4
+    })
+
+    let rowCount = $derived(Math.ceil(items.length / columns))
+
+    let rowHeight = $derived.by(() => {
+        if (!containerWidth || !columns) return 250
+        const gap = 16
+        const colWidth = (containerWidth - gap * (columns - 1)) / columns
+        return colWidth + 72
+    })
+
+    const virtualizer = createVirtualizer({
+        count: rowCount,
+        getScrollElement: () => scrollContainer,
+        estimateSize: () => rowHeight,
+        overscan: 3,
+    })
+
+    $effect(() => {
+        const count = rowCount
+        const element = scrollContainer
+        const size = rowHeight
+
+        untrack(() => {
+            $virtualizer.setOptions({
+                count,
+                getScrollElement: () => element,
+                estimateSize: () => size,
+                overscan: 3,
+            })
+            $virtualizer.measure()
+        })
+    })
+
     function handleSelect(item: MediaGridItem) {
         onselect?.(item)
     }
 
     function handleKeydown(item: MediaGridItem, event: KeyboardEvent) {
         if (event.key !== 'Enter' && event.key !== ' ') return
-
         event.preventDefault()
         handleSelect(item)
     }
@@ -46,16 +91,13 @@
 
     function handlePlayKeydown(item: MediaGridItem, event: KeyboardEvent) {
         if (event.key !== 'Enter' && event.key !== ' ') return
-
         handlePlay(item, event)
     }
 </script>
 
 {#snippet mediaCardContent(item: MediaGridItem, isSelected: boolean)}
     <div
-        class="relative mb-3 aspect-square
-               bg-[rgb(var(--mdui-color-surface-container-highest))]
-               {item.shape === 'circle' ? 'rounded-full' : 'rounded-t-xl'}"
+        class="relative mb-3 aspect-square bg-[rgb(var(--mdui-color-surface-container-highest))] {item.shape === 'circle' ? 'rounded-full' : 'rounded-t-xl'}"
     >
         {#if item.image}
             <img
@@ -66,17 +108,19 @@
             />
         {:else}
             <div
-                class="flex h-full w-full items-center justify-center text-4xl
-                       text-[rgb(var(--mdui-color-on-surface-variant))]"
+                class="flex h-full w-full items-center justify-center text-4xl text-[rgb(var(--mdui-color-on-surface-variant))]"
             >
-                {item.shape === 'circle' ? '👤' : '🎵'}
+                {#if item.shape === 'circle'}
+                    👤
+                {:else}
+                    🎵
+                {/if}
             </div>
         {/if}
 
         {#if onplay}
             <div
-                class="absolute inset-0 flex items-end justify-end p-2 opacity-0
-                       transition-opacity duration-200 group-hover:opacity-100 group-focus-within:opacity-100"
+                class="absolute inset-0 flex items-end justify-end p-2 opacity-0 transition-opacity duration-200 group-hover:opacity-100 group-focus-within:opacity-100"
             >
                 <mdui-button-icon
                     variant="filled"
@@ -85,8 +129,7 @@
                     role="button"
                     tabindex="0"
                     onclick={(event: Event) => handlePlay(item, event)}
-                    onkeydown={(event: KeyboardEvent) =>
-                        handlePlayKeydown(item, event)}
+                    onkeydown={(event: KeyboardEvent) => handlePlayKeydown(item, event)}
                 ></mdui-button-icon>
             </div>
         {/if}
@@ -96,9 +139,7 @@
         <h2
             class={[
                 'truncate text-sm font-semibold',
-                isSelected
-                    ? 'text-[rgb(var(--mdui-color-on-secondary-container))]'
-                    : 'text-[rgb(var(--mdui-color-on-surface))]',
+                isSelected ? 'text-[rgb(var(--mdui-color-on-secondary-container))]' : 'text-[rgb(var(--mdui-color-on-surface))]',
             ]}
         >
             {item.title}
@@ -108,9 +149,7 @@
             <p
                 class={[
                     'mt-0 truncate text-xs',
-                    isSelected
-                        ? 'text-[rgb(var(--mdui-color-on-secondary-container))]'
-                        : 'text-[rgb(var(--mdui-color-on-surface-variant))]',
+                    isSelected ? 'text-[rgb(var(--mdui-color-on-secondary-container))]' : 'text-[rgb(var(--mdui-color-on-surface-variant))]',
                 ]}
             >
                 {item.subtitle}
@@ -152,30 +191,36 @@
 
 {#if items.length === 0}
     <div
-        class="flex min-h-60 flex-col items-center justify-center rounded-3xl
-               border border-dashed border-[rgb(var(--mdui-color-outline-variant))]
-               text-center"
+        class="flex min-h-60 flex-col items-center justify-center rounded-3xl border border-dashed border-[rgb(var(--mdui-color-outline-variant))] text-center"
     >
         <div class="text-5xl">🎧</div>
         <div class="mt-3 text-base font-medium">{emptyTitle}</div>
-        <div
-            class="mt-1 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]"
-        >
+        <div class="mt-1 text-sm text-[rgb(var(--mdui-color-on-surface-variant))]">
             {emptyDescription}
         </div>
     </div>
 {:else}
-    <section>
-        <div
-            class="grid grid-cols-2 gap-4
-                   sm:grid-cols-3
-                   md:grid-cols-4
-                   lg:grid-cols-5
-                   xl:grid-cols-6"
-        >
-            {#each items as item (item.id)}
-                {@render mediaCard(item)}
+    <section 
+        bind:this={scrollContainer} 
+        bind:clientWidth={containerWidth}
+        class="h-full w-full overflow-y-scroll overflow-x-hidden"
+    >
+        <div style="height: {$virtualizer.getTotalSize()}px; position: relative; width: 100%;">
+            {#each $virtualizer.getVirtualItems() as row (row.index)}
+                {@const startIndex = row.index * columns}
+                {@const rowItems = items.slice(startIndex, startIndex + columns)}
+                
+                <div
+                    style="position: absolute; top: 0; left: 0; width: 100%; transform: translateY({row.start}px);"
+                    class="grid gap-4"
+                    style:grid-template-columns="repeat({columns}, minmax(0, 1fr))"
+                    data-index={row.index}
+                >
+                    {#each rowItems as item (item.id)}
+                        {@render mediaCard(item)}
+                    {/each}
+                </div>
             {/each}
         </div>
     </section>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/src/lib/features/track-list/TrackList.svelte b/src/lib/features/track-list/TrackList.svelte
index 00c287d..758a495 100644
--- a/src/lib/features/track-list/TrackList.svelte
+++ b/src/lib/features/track-list/TrackList.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
-    import { player } from "$lib/state/player.svelte";
-    import type { Track } from "$lib/types";
-    import TrackContextMenu from "./TrackContextMenu.svelte";
-    import TrackListRow from "./TrackListRow.svelte";
-    import "mdui/components/list.js";
+    import { player } from "$lib/state/player.svelte"
+    import type { Track } from "$lib/types"
+    import { createVirtualizer } from "@tanstack/svelte-virtual"
+    import "mdui/components/list.js"
+    import { get } from "svelte/store"
+    import TrackContextMenu from "./TrackContextMenu.svelte"
+    import TrackListRow from "./TrackListRow.svelte"
 
     type TrackColumn = "index" | "title" | "album" | "duration";
 
@@ -74,6 +76,27 @@
             .join(" "),
     );
 
+    // 虚拟列表相关
+    let scrollElement = $state<HTMLDivElement | null>(null);
+
+    const virtualizer = createVirtualizer({
+        count: tracks.length,
+        getScrollElement: () => scrollElement,
+        estimateSize: () => 52, // 根据 TrackListRow 实际高度调整（行高 + 间距）
+        overscan: 5,
+        getItemKey: (index) => tracks[index]?.id ?? index,
+    });
+
+    // 当 tracks 变化时更新虚拟列表配置
+    $effect(() => {
+        const len = tracks.length;
+        const v = get(virtualizer);
+        v.setOptions({
+            count: len,
+            getItemKey: (index) => tracks[index]?.id ?? index,
+        });
+    });
+
     function isTrackSelected(track: Track) {
         return selectedIds.includes(track.id);
     }
@@ -86,7 +109,6 @@
         if (onplaytrack) {
             return onplaytrack(track, index);
         }
-
         return undefined;
     }
 
@@ -121,10 +143,11 @@
 
 <svelte:window onclick={handleWindowClick} onkeydown={handleWindowKeydown} />
 
-<mdui-list class="flex flex-col w-full" role="list">
+<!-- 注意：确保 TrackList 的父容器有明确高度，否则 h-full 不会生效 -->
+<mdui-list class="flex flex-col w-full h-full" role="list">
     {#if !hideHeader}
         <mdui-list-subheader
-            class="sticky grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b"
+            class="sticky top-0 grid items-center gap-4 w-full pl-4 pr-6 text-xs uppercase tracking-wider font-semibold themed-text-secondary themed-border-b shrink-0"
             style:grid-template-columns={gridTemplate}
             noninteractive
         >
@@ -150,11 +173,23 @@
         </mdui-list-subheader>
     {/if}
 
-    <div class="flex flex-col gap-1 mt-2">
-        {#each tracks as track, index (track.id)}
+    <!-- 滚动容器 -->
+    <div
+        bind:this={scrollElement}
+        class="flex-1 overflow-auto min-h-0"
+    >
+        <!-- 内容占位容器，高度为所有行的总高度 -->
+        <div
+            style="position: relative; height: {$virtualizer.getTotalSize()}px;"
+        >
+    {#each $virtualizer.getVirtualItems() as virtualItem (virtualItem.key)}
+        {@const track = tracks[virtualItem.index]}
+        <div
+            style="position: absolute; top: 0; left: 0; width: 100%; transform: translateY({virtualItem.start}px);"
+        >
             <TrackListRow
                 {track}
-                {index}
+                index={virtualItem.index}
                 {columns}
                 {selectable}
                 selected={isTrackSelected(track)}
@@ -164,10 +199,12 @@
                 ontoggle={(checked) => setTrackSelected(track, checked)}
                 {ondblclicktrack}
                 {onremovetrack}
-                onplay={() => playTrack(track, index)}
-                oncontextmenu={(e) => openTrackContextMenu(e, track, index)}
+                onplay={() => playTrack(track, virtualItem.index)}
+                oncontextmenu={(e) => openTrackContextMenu(e, track, virtualItem.index)}
             />
-        {/each}
+        </div>
+    {/each}
+        </div>
     </div>
 </mdui-list>
 
@@ -193,4 +230,4 @@
     .themed-border-b {
         border-bottom: 1px solid rgb(var(--mdui-color-outline-variant));
     }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/routes/library/+page.svelte b/src/routes/library/+page.svelte
index 3843233..3d55da1 100644
--- a/src/routes/library/+page.svelte
+++ b/src/routes/library/+page.svelte
@@ -12,8 +12,8 @@
     import SettingsRow from '$lib/features/settings/SettingsRow.svelte'
     import { settings } from '$lib/state/settings.svelte'
     import {
-        removeMusicDirectory,
-        scanDirectory,
+      removeMusicDirectory,
+      scanDirectory,
     } from '$lib/utils/library'
     import { invoke } from '@tauri-apps/api/core'
 
@@ -372,7 +372,7 @@
             <div class="text-sm">尝试刷新媒体库或修改搜索关键词</div>
         </div>
     {:else}
-        <div class="min-h-0 flex-1 overflow-auto pb-8">
+        <div class="min-h-0 flex-1 overflow-auto">
             <TrackList
                 tracks={displayTracks as Track[]}
                 selectable={isBatchMode}