diff --git a/xiaomusic/static/iwebplayer/iwebplayer.html b/xiaomusic/static/iwebplayer/iwebplayer.html
index dd2767c..d0a896f 100644
--- a/xiaomusic/static/iwebplayer/iwebplayer.html
+++ b/xiaomusic/static/iwebplayer/iwebplayer.html
@@ -59,7 +59,6 @@
       transform: translate3d(0,0,0);
       -webkit-transform: translate3d(0,0,0);
     }
-
     .header-logo-group {
       display: flex;
       align-items: center;
@@ -103,7 +102,6 @@
       justify-content: flex-end;
       min-width: 0;
     }
-
     .custom-select {
       position: relative;
       display: flex;
@@ -171,7 +169,7 @@
       to { opacity: 1; transform: translateY(0); }
     }
     .select-option {
-      padding: 10px 15px;
+      padding: 12px 15px;
       font-size: 15px;
       border-bottom: 1px solid var(--bg-color);
       cursor: pointer;
@@ -187,7 +185,6 @@
       font-weight: bold;
       background: var(--bg-color);
     }
-
     .playing-eq {
       display: inline-flex;
       align-items: flex-end;
@@ -239,10 +236,9 @@
         box-shadow: 0 12px 30px rgba(0, 0, 0, 0.6), 0 4px 12px rgba(0, 0, 0, 0.3);
       }
     }
-
-    .inline-delete-btn {
-      background: #fee2e2;
-      color: #ef4444;
+    .inline-save-btn {
+      background: rgba(236, 72, 153, 0.1);
+      color: var(--primary);
       border: none;
       border-radius: 8px;
       flex-shrink: 0;
@@ -252,19 +248,19 @@
       align-items: center;
       justify-content: center;
       cursor: pointer;
-      transition: background 0.2s;
+      transition: background 0.2s, transform 0.1s, opacity 0.2s;
     }
     @media (prefers-color-scheme: dark) {
-      .inline-delete-btn { background: rgba(239, 68, 68, 0.2); }
+      .inline-save-btn { background: rgba(236, 72, 153, 0.15); }
     }
-    .inline-delete-btn:active {
+    .inline-save-btn:active {
       opacity: 0.8;
+      transform: scale(0.95);
     }
-    .inline-delete-btn.show {
+    .inline-save-btn.show {
       display: flex;
       animation: fadeIn 0.2s;
     }
-
     .playlist-container-search { flex: 0 0 auto !important; max-width: 160px; }
     .search-inline-wrap {
       display: none;
@@ -292,7 +288,54 @@
       min-width: 0;
       height: 100%;
     }
-
+    .search-history-list {
+      display: none;
+      position: absolute;
+      top: 100%;
+      left: 0;
+      right: 0;
+      margin-top: 6px;
+      background: var(--card-bg);
+      border: 1px solid var(--border);
+      border-radius: 8px;
+      box-shadow: 0 4px 15px rgba(0,0,0,0.1);
+      list-style: none;
+      max-height: 40vh;
+      overflow-y: auto;
+      z-index: 200;
+    }
+    .search-history-list.show {
+      display: block;
+      animation: fadeIn 0.15s ease-out;
+    }
+    .history-item {
+      padding: 12px 15px;
+      font-size: 14px;
+      border-bottom: 1px solid var(--bg-color);
+      cursor: pointer;
+      color: var(--text-main);
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+    .history-item:last-child {
+      border-bottom: none;
+    }
+    .history-item:active {
+      background-color: var(--bg-color);
+    }
+    .history-clear-btn {
+      text-align: center;
+      color: var(--text-sub);
+      font-size: 13px;
+      padding: 12px;
+      cursor: pointer;
+      border-top: 1px solid var(--border);
+      transition: color 0.2s;
+    }
+    .history-clear-btn:active {
+      color: var(--primary);
+    }
     .search-actions {
       display: flex;
       gap: 14px;
@@ -323,7 +366,6 @@
       color: var(--primary);
       background: rgba(236, 72, 153, 0.1);
     }
-
     #playlist-container { position: static !important; }
     #playlist-opts {
       top: 40px !important;
@@ -341,8 +383,7 @@
       padding: 10px;
       max-width: 800px;
       margin: 0 auto;
-      background-color: #e5e7eb;
-      min-height: 100vh;
+      background-color: transparent;
     }
     .song-item {
       background: var(--card-bg);
@@ -368,6 +409,85 @@
       text-overflow: ellipsis;
       overflow: hidden;
     }
+    .song-platform-tag {
+      font-size: 11px;
+      color: var(--primary);
+      background: rgba(236, 72, 153, 0.08);
+      padding: 2px 6px;
+      border-radius: 6px;
+      margin-left: 8px;
+      flex-shrink: 0;
+      white-space: nowrap;
+      font-weight: 600;
+    }
+    @media (prefers-color-scheme: dark) {
+      .song-platform-tag { background: rgba(236, 72, 153, 0.15); }
+    }
+    .song-item.menu-open {
+      background-color: rgba(236, 72, 153, 0.08);
+      border-color: rgba(236, 72, 153, 0.3);
+      z-index: 50;
+    }
+    @media (prefers-color-scheme: dark) {
+      .song-item.menu-open { background-color: rgba(236, 72, 153, 0.15); border-color: rgba(236, 72, 153, 0.4); }
+    }
+    .song-more-btn {
+      position: relative;
+      color: var(--text-sub);
+      padding: 2px;
+      margin-left: 8px;
+      cursor: pointer;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: background 0.2s, color 0.2s;
+    }
+    .song-more-btn::after {
+      content: '';
+      position: absolute;
+      top: -15px;
+      bottom: -15px;
+      left: -10px;
+      right: -10px;
+    }
+    .song-more-btn:active { background: var(--border); color: var(--text-main); }
+    .song-more-menu {
+      display: none;
+      position: absolute;
+      right: 46px;
+      top: 36px;
+      background: var(--card-bg);
+      border: 1px solid var(--border);
+      border-radius: 10px;
+      box-shadow: 0 6px 20px rgba(0,0,0,0.12);
+      z-index: 20;
+      list-style: none;
+      min-width: 90px;
+      overflow: hidden;
+    }
+    .song-more-menu.show {
+      display: block;
+      animation: fadeIn 0.15s ease-out;
+    }
+    .song-more-menu-item {
+      padding: 12px 15px;
+      font-size: 15px;
+      border-bottom: 1px solid var(--bg-color);
+      color: var(--text-main);
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+    }
+    .song-more-menu-item:last-child { border-bottom: none; }
+    .song-more-menu-item:active { background-color: var(--bg-color); }
+    .song-more-menu-item.disabled {
+      color: var(--text-sub);
+      opacity: 0.4;
+    }
+    .song-more-menu-item svg {
+      pointer-events: none;
+    }
     .song-fav-icon { margin-left: 10px; display: flex; align-items: center; }
     .song-delete-icon {
       margin-left: 10px;
@@ -383,11 +503,10 @@
       text-align: center;
       padding: 20px;
       color: var(--text-sub);
-      background-color: #e5e7eb;
-      min-height: 100vh;
+      background-color: transparent;
     }
     @media (prefers-color-scheme: dark) {
-      #loading, .playlist { background-color: #000000; }
+      #loading, .playlist { background-color: transparent; }
     }
 
     /* ==========================================
@@ -458,7 +577,6 @@
       transition: width 0.3s linear;
     }
     .progress-container.remote-mode .progress-thumb { display: none; }
-
     .player-container {
       max-width: 800px;
       width: 100%;
@@ -474,7 +592,6 @@
       opacity: 0.8;
       font-variant-numeric: tabular-nums;
     }
-
     .now-playing-info {
       display: flex;
       align-items: center;
@@ -517,7 +634,6 @@
       width: 100%;
       text-align: center;
     }
-
     .controls {
       display: flex;
       justify-content: space-between;
@@ -553,7 +669,6 @@
     }
     .btn.mode-btn, .btn.vol-btn { opacity: 0.8; }
     .btn:active { opacity: 0.5; }
-
     .volume-wrapper { position: relative; }
     .volume-popup {
       position: absolute;
@@ -632,7 +747,6 @@
       border-radius: 3px;
       opacity: 0.4;
     }
-
     .fp-cover-wrapper {
       flex: 1;
       display: flex;
@@ -659,7 +773,6 @@
       50% { transform: scale(1.05); }
       100% { transform: scale(1); }
     }
-
     .mini-cover {
       width: 35px;
       height: 35px;
@@ -681,7 +794,6 @@
     }
     .mini-cover.spinning img { animation-play-state: running; }
     @keyframes rotate-cover { 100% { transform: rotate(360deg); } }
-
     .fp-lyrics-wrapper {
       height: 28vh;
       width: 100%;
@@ -736,7 +848,6 @@
     }
     .about-modal-backdrop.show { display: flex; animation: about-fade-in 0.15s ease-out; }
     @keyframes about-fade-in { from { opacity: 0 } to { opacity: 1 } }
-
     .about-modal {
       width: min(520px, 92vw);
       background: var(--card-bg);
@@ -793,7 +904,6 @@
     .about-footer { padding: 12px 18px 18px 18px; display: flex; justify-content: flex-end; gap: 8px; }
     .about-primary { background: var(--primary); color: #fff; border: none; border-radius: 10px; padding: 10px 16px; font-size: 14px; cursor: pointer; }
     .about-primary:active { opacity: 0.8; }
-
     .modal-input-group {
       display: flex;
       align-items: center;
@@ -827,7 +937,6 @@
     .about-secondary:active { background: var(--bg-color); }
     .about-danger { background: #ef4444; color: #fff; border: none; border-radius: 10px; padding: 10px 16px; font-size: 14px; cursor: pointer; transition: opacity 0.2s; }
     .about-danger:active { opacity: 0.8; }
-
     .toast-message {
       position: fixed;
       bottom: calc(var(--player-height) + env(safe-area-inset-bottom) + 80px);
@@ -838,7 +947,7 @@
       padding: 10px 20px;
       border-radius: 20px;
       font-size: 14px;
-      z-index: 1000;
+      z-index: 999999;
       opacity: 0;
       pointer-events: none;
       transition: opacity 0.3s ease-in-out;
@@ -869,7 +978,19 @@
     .mf-plugin-status.enabled { background: rgba(0, 123, 255, 0.1); color: #007bff; }
     .mf-plugin-status.disabled { background: rgba(239, 68, 68, 0.1); color: #ef4444; }
     .mf-plugin-actions { display: flex; gap: 6px; }
-    .mf-btn-sm { padding: 6px 12px; font-size: 12px; border-radius: 6px; cursor: pointer; transition: opacity 0.2s; }
+    .mf-btn-sm {
+      height: 30px;
+      padding: 0 12px;
+      font-size: 12px;
+      border-radius: 6px;
+      cursor: pointer;
+      transition: opacity 0.2s;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: 500;
+      white-space: nowrap;
+    }
     .mf-btn-sm:active { opacity: 0.7; }
     .mf-btn-blue { background: #007bff; color: #fff; border: none; }
     .mf-btn-red { background: #ef4444; color: #fff; border: none; }
@@ -877,7 +998,99 @@
     @keyframes spin-hourglass { 100% { transform: rotate(180deg); } }
 
     /* ==========================================
-       9. 宽屏适配
+       9. 沉浸式歌单编辑面板
+       ========================================== */
+    .edit-pl-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 18px;
+      border-bottom: 1px solid var(--border);
+      transition: background 0.2s;
+      min-height: 52px;
+    }
+    .edit-pl-name-wrap {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      min-width: 0;
+      font-size: 16px;
+      color: var(--text-main);
+      font-weight: 500;
+    }
+    .edit-pl-name-text {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .edit-pl-actions {
+      display: flex;
+      gap: 8px;
+      flex-shrink: 0;
+      align-items: center;
+    }
+    .edit-pl-icon-btn {
+      width: 28px;
+      height: 28px;
+      border-radius: 6px;
+      border: none;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      transition: opacity 0.2s;
+    }
+    .edit-pl-icon-btn:active { opacity: 0.7; }
+    .edit-pl-icon-btn.rename { background: #007bff; color: #fff; }
+    .edit-pl-icon-btn.delete { background: #6b7280; color: #fff; }
+    .edit-pl-inline-input {
+      flex: 1;
+      height: 30px;
+      padding: 0 10px;
+      border: 1px solid var(--primary);
+      border-radius: 6px;
+      font-size: 14px;
+      outline: none;
+      color: var(--text-main);
+      background: var(--bg-color);
+      min-width: 0;
+      margin-right: 10px;
+    }
+    .edit-pl-text-btn {
+      height: 30px;
+      padding: 0 12px;
+      border-radius: 6px;
+      font-size: 12px;
+      font-weight: 500;
+      cursor: pointer;
+      border: none;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: opacity 0.2s;
+      white-space: nowrap;
+    }
+    .edit-pl-text-btn:active { opacity: 0.7; }
+    .edit-pl-cancel { background: var(--card-bg); color: var(--text-main); border: 1px solid var(--border); }
+    .edit-pl-cancel:active { background: var(--bg-color); }
+    .edit-pl-confirm-rename { background: #007bff; color: #fff; border: none; }
+    .edit-pl-confirm-delete { background: #6b7280; color: #fff; border: none; }
+    #edit-pl-create-btn {
+      padding: 0 14px;
+      height: 34px;
+      font-size: 13px;
+      border-radius: 8px;
+    }
+    .edit-pl-delete-warn {
+      font-size: 14px;
+      color: #ef4444;
+      font-weight: bold;
+      margin-right: auto;
+    }
+
+    /* ==========================================
+       10. 宽屏适配
        ========================================== */
     @media (min-width: 600px) {
       html { background-color: #e5e7eb; overflow-y: scroll; scrollbar-gutter: stable; }
@@ -910,7 +1123,10 @@
             <line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line>
           </svg>
         </div>
-        <ul class="select-options" id="settings-opts" style="left: 0; right: auto; min-width: 140px;">
+        <ul class="select-options" id="settings-opts" style="left: 0; right: auto; min-width: 100px;">
+          <li class="select-option" id="setting-voice-cmd">
+             <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right:6px; vertical-align:-2px;"><path d="M12 1a3 3 0 0 0-3 3v8a3 3 0 0 0 6 0V4a3 3 0 0 0-3-3z"></path><path d="M19 10v2a7 7 0 0 1-14 0v-2"></path><line x1="12" y1="19" x2="12" y2="23"></line><line x1="8" y1="23" x2="16" y2="23"></line></svg> 定时口令
+          </li>
           <li class="select-option" id="setting-refresh">
              <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" style="margin-right:6px; vertical-align:-2px;"><polyline points="23 4 23 10 17 10"></polyline><polyline points="1 20 1 14 7 14"></polyline><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"></path></svg> 刷新曲库
           </li>
@@ -920,8 +1136,11 @@
           <li class="select-option" id="setting-musicfree">
              <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right:6px; vertical-align:-2px;"><path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"></path><polyline points="3.27 6.96 12 12.01 20.73 6.96"></polyline><line x1="12" y1="22.08" x2="12" y2="12"></line></svg> 插件管理
           </li>
+          <li class="select-option" id="setting-batch-import">
+             <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right:6px; vertical-align:-2px;"><path d="m21.64 3.68-1.25-1.25a1.92 1.92 0 0 0-2.71 0L4.54 15.57a1.92 1.92 0 0 0 0 2.71l1.25 1.25a1.92 1.92 0 0 0 2.71 0L21.64 6.39a1.92 1.92 0 0 0 0-2.71z"></path><path d="m14 7 3 3"></path><path d="M5 6v4"></path><path d="M19 14v4"></path><path d="M10 2v2"></path><path d="M7 8H3"></path><path d="M21 16h-4"></path><path d="M11 3H9"></path></svg> 批量导入
+          </li>
           <li class="select-option" id="setting-download">
-             <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right:6px; vertical-align:-2px;"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg> 歌曲下载
+             <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right:6px; vertical-align:-2px;"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg> 下载设置
           </li>
           <li class="select-option" id="setting-config">
              <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" style="margin-right:6px; vertical-align:-2px;"><circle cx="12" cy="12" r="3"></circle><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path></svg> 后台配置
@@ -942,6 +1161,14 @@
     </div>
 
     <div class="header-controls">
+      <div id="header-voice-disabled-icon" style="display: none; margin-right: -8px; margin-left: -8px; padding: 10px; cursor: pointer; flex-shrink: 0; transition: all 0.3s ease;" title="定时口令状态">
+        <svg id="header-voice-on" viewBox="0 0 24 24" width="15" height="15" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="pointer-events: none;">
+          <path d="M12 1a3 3 0 0 0-3 3v8a3 3 0 0 0 6 0V4a3 3 0 0 0-3-3z"></path><path d="M19 10v2a7 7 0 0 1-14 0v-2"></path><line x1="12" y1="19" x2="12" y2="23"></line><line x1="8" y1="23" x2="16" y2="23"></line>
+        </svg>
+        <svg id="header-voice-off" style="display: none; pointer-events: none;" viewBox="0 0 24 24" width="15" height="15" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round">
+          <line x1="1" y1="1" x2="23" y2="23"></line><path d="M9 9v3a3 3 0 0 0 5.12 2.12M15 9.34V4a3 3 0 0 0-5.94-.6"></path><path d="M17 16.95A7 7 0 0 1 5 12v-2m14 0v2a7 7 0 0 1-.11 1.23"></path><line x1="12" y1="19" x2="12" y2="23"></line><line x1="8" y1="23" x2="16" y2="23"></line>
+        </svg>
+      </div>
       <div class="custom-select" id="device-container">
         <div class="select-value" id="device-val">本机</div>
         <ul class="select-options" id="device-opts"></ul>
@@ -950,24 +1177,19 @@
   </div>
 
   <div class="playlist-row" id="playlist-row" style="flex-direction: column; align-items: stretch; gap: 8px;">
-
     <div style="display: flex; align-items: center; width: 100%; gap: 10px;">
       <div style="display: flex; flex: 1; align-items: center; background: var(--card-bg); border: 1px solid var(--border); border-radius: 8px; height: 40px; box-sizing: border-box; min-width: 0; transition: all 0.2s;">
-
         <div class="custom-select" id="playlist-container" style="flex: 1; min-width: 0; transition: all 0.2s; height: 100%;">
           <div class="select-value" id="playlist-val" style="display: flex; align-items: center; width: 100%; border: none; background-color: transparent; height: 100%; box-shadow: none; padding: 0 24px 0 12px; margin: 0; line-height: normal; background-position: right 10px center;">加载中</div>
           <ul class="select-options" id="playlist-opts" style="width: 100%;"></ul>
         </div>
-
         <div class="search-inline-wrap" id="search-inline-wrap" style="background: transparent; border: none; padding: 0; height: 100%; flex: 1;">
           <div style="width: 1px; height: 14px; background: var(--border); margin: 0 4px; flex-shrink: 0;"></div>
           <input type="text" id="search-input" placeholder="搜歌名..." autocomplete="off" style="padding: 0 8px; flex: 1; height: 100%;">
           <div class="search-actions" style="margin-right: 8px;">
             <button class="search-icon-btn" id="search-clear" title="清除"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg></button>
-            <button class="search-icon-btn" id="search-save" title="保存搜索结果"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"></path><polyline points="17 21 17 13 7 13 7 21"></polyline><polyline points="7 3 7 8 15 8"></polyline></svg></button>
           </div>
         </div>
-
         <div class="search-inline-wrap" id="mf-plugin-row" style="background: transparent; border: none; padding: 0; height: 100%; flex: 1;">
           <div style="width: 1px; height: 14px; background: var(--border); margin: 0 4px; flex-shrink: 0;"></div>
           <div class="custom-select" id="engine-container" style="flex: 0 0 auto; height: 100%;">
@@ -983,20 +1205,24 @@
             <ul class="select-options" id="mf-plugin-opts" style="min-width: 120px; right: 0;"></ul>
           </div>
         </div>
-
       </div>
-
-      <button class="inline-delete-btn" id="inline-delete-btn" title="删除自建歌单">
-        <svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path><line x1="10" y1="11" x2="10" y2="17"></line><line x1="14" y1="11" x2="14" y2="17"></line></svg>
+      <button class="inline-save-btn" id="search-save" title="批量加入歌单">
+        <svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12A9 9 0 1 0 12 21"></path><circle cx="12" cy="12" r="3"></circle><path d="M12 7a5 5 0 0 0-5 5"></path><line x1="19" y1="16" x2="19" y2="22"></line><line x1="16" y1="19" x2="22" y2="19"></line></svg>
       </button>
     </div>
 
-    <div class="search-inline-wrap" id="mf-search-wrap" style="flex: 0 0 36px; min-height: 36px; align-items: center; background: var(--card-bg); border: 1px solid var(--border); border-radius: 8px; height: 36px; padding: 0; box-sizing: border-box; width: 100%; box-shadow: 0 2px 5px rgba(0,0,0,0.02);">
-      <input type="text" id="mf-search-input" placeholder="输入歌手或歌曲，搜全网资源..." autocomplete="off" style="flex: 1; border: none; outline: none; background: transparent; padding: 0 12px; font-size: 14px; color: var(--text-main); height: 100%; margin: 0; line-height: normal;">
-      <div class="search-actions" style="margin-right: 8px; display: flex; gap: 12px; align-items: center;">
-        <button class="search-icon-btn" id="mf-search-clear" title="清除"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg></button>
-        <button class="search-icon-btn show" id="mf-search-btn" title="搜索" style="color: var(--primary); background: rgba(236, 72, 153, 0.1);"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg></button>
+    <div class="search-inline-wrap" id="mf-search-wrap" style="flex: 0 0 36px; min-height: 36px; align-items: center; background: transparent; border: none; height: 36px; padding: 0; box-sizing: border-box; width: 100%; gap: 10px;">
+      <div id="mf-search-input-wrap" style="flex: 1; display: flex; align-items: center; background: var(--card-bg); border: 1px solid var(--border); border-radius: 8px; height: 100%; box-shadow: 0 2px 5px rgba(0,0,0,0.02); position: relative;">
+        <input type="text" id="mf-search-input" placeholder="输入歌手或歌曲，搜全网资源..." autocomplete="off" style="flex: 1; border: none; outline: none; background: transparent; padding: 0 12px; font-size: 14px; color: var(--text-main); height: 100%; margin: 0; line-height: normal;">
+        <div class="search-actions" style="margin-right: 8px; display: flex; gap: 12px; align-items: center;">
+          <button class="search-icon-btn" id="mf-search-clear" title="清除"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg></button>
+          <button class="search-icon-btn show" id="mf-search-btn" title="搜索" style="color: var(--primary); background: rgba(236, 72, 153, 0.1);"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line></svg></button>
+        </div>
+        <ul class="search-history-list" id="mf-search-history-list"></ul>
       </div>
+      <button class="inline-save-btn" id="mf-search-save" title="批量加入歌单">
+        <svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12A9 9 0 1 0 12 21"></path><circle cx="12" cy="12" r="3"></circle><path d="M12 7a5 5 0 0 0-5 5"></path><line x1="19" y1="16" x2="19" y2="22"></line><line x1="16" y1="19" x2="22" y2="19"></line></svg>
+      </button>
     </div>
   </div>
 
@@ -1129,45 +1355,61 @@
     </div>
   </div>
 
-  <div class="about-modal-backdrop" id="save-modal-backdrop" aria-hidden="true">
+  <div class="about-modal-backdrop" id="remove-song-modal-backdrop" aria-hidden="true">
     <div class="about-modal" role="dialog" aria-modal="true">
-      <button class="about-close" id="save-modal-close" aria-label="关闭">×</button>
+      <button class="about-close" id="remove-song-close" aria-label="关闭">×</button>
       <div class="about-header">
         <div class="about-title-wrap">
-          <h2 style="font-size: 18px; font-weight: 800; margin-top: 4px;">💾 保存歌单</h2>
+          <h2 style="font-size: 18px; font-weight: 800; margin-top: 4px; display: flex; align-items: center; gap: 6px;">
+            <svg viewBox="0 0 24 24" width="20" height="20" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg> 移出歌曲
+          </h2>
         </div>
       </div>
       <div class="about-body">
-        <p>请输入要保存的歌单名称：</p>
-        <div class="modal-input-group">
-          <span style="display:flex; align-items:center; opacity:0.6; padding-left:12px;">
-            <svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><circle cx="12" cy="12" r="3"></circle></svg>
-          </span>
-          <input type="text" id="save-modal-input" placeholder="例如：林俊杰" autocomplete="off">
-        </div>
+        <p style="font-size: 15px; font-weight: 500;">确定要将 <span id="remove-song-name" style="color: var(--primary); font-weight: bold;"></span> 移出当前列表吗？</p>
+        <p style="font-size: 13px; color: var(--text-sub); margin-top: 10px;">💡 仅从当前列表中移除，不会删除真实的本地音乐文件。</p>
+        <label style="display: flex; align-items: center; gap: 8px; margin-top: 18px; font-size: 13px; color: var(--text-sub); cursor: pointer; user-select: none;">
+          <input type="checkbox" id="remove-song-dont-ask" style="width: 16px; height: 16px; accent-color: var(--primary);">
+          刷新页面前不再提示，直接移出。
+        </label>
       </div>
       <div class="about-footer">
-        <button class="about-secondary" id="save-modal-cancel">取消</button>
-        <button class="about-primary" id="save-modal-confirm">确定保存</button>
+        <button class="about-secondary" id="remove-song-cancel">取消</button>
+        <button class="about-danger" id="remove-song-confirm">确定移出</button>
       </div>
     </div>
   </div>
 
-  <div class="about-modal-backdrop" id="del-modal-backdrop" aria-hidden="true">
+  <div class="about-modal-backdrop" id="add-song-modal-backdrop" aria-hidden="true">
     <div class="about-modal" role="dialog" aria-modal="true">
-      <button class="about-close" id="del-modal-close" aria-label="关闭">×</button>
+      <button class="about-close" id="add-song-close" aria-label="关闭">×</button>
       <div class="about-header">
         <div class="about-title-wrap">
-          <h2 style="font-size: 18px; font-weight: 800; margin-top: 4px;">🗑️ 彻底删除</h2>
+          <h2 style="font-size: 18px; font-weight: 800; margin-top: 4px; display: flex; align-items: center; gap: 6px;">
+            <svg viewBox="0 0 24 24" width="20" height="20" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><circle cx="12" cy="12" r="3"></circle><path d="M12 6a6 6 0 0 0-6 6"></path></svg> 加入歌单
+          </h2>
         </div>
       </div>
       <div class="about-body">
-        <p id="del-modal-text" style="font-size: 15px; font-weight: 500;">确定要删除该歌单吗？</p>
-        <p style="font-size: 13px; color: var(--text-sub); margin-top: 10px;">仅删除歌单分类，歌曲文件不会被删除。</p>
+        <p style="font-size: 14px; font-weight: 500; margin-bottom: 12px;">将 <span id="add-song-name" style="color: var(--primary); font-weight: bold;"></span> 加入到：</p>
+
+        <div style="display: flex; gap: 8px; margin-bottom: 16px;">
+          <input type="text" id="add-new-playlist-input" placeholder="输入新歌单名称..." autocomplete="off" style="flex: 1; padding: 8px 12px; border: 1px solid var(--border); border-radius: 8px; outline: none; background: var(--bg-color); color: var(--text-main); font-size: 14px;">
+          <button class="about-primary" id="add-new-playlist-btn" style="padding: 8px 14px; border-radius: 8px; flex-shrink: 0;">创建并加入</button>
+        </div>
+
+        <div style="font-size: 14px; font-weight: 500; color: var(--text-main); margin-bottom: 8px;">或选择已有自定义歌单：</div>
+        <ul id="add-song-playlist-list" style="list-style: none; padding: 0; margin: 0; max-height: 200px; overflow-y: auto; border: 1px solid var(--border); border-radius: 8px; background: var(--bg-color);">
+        </ul>
+
+        <label style="display: flex; align-items: center; gap: 8px; margin-top: 16px; font-size: 13px; color: var(--text-sub); cursor: pointer; user-select: none;">
+          <input type="checkbox" id="add-song-dont-ask" style="width: 16px; height: 16px; accent-color: var(--primary);">
+          刷新页面前不再提示，默认加入选择的歌单。
+        </label>
       </div>
       <div class="about-footer">
-        <button class="about-secondary" id="del-modal-cancel">手滑了</button>
-        <button class="about-danger" id="del-modal-confirm">确定删除</button>
+        <button class="about-secondary" id="add-song-cancel">取消</button>
+        <button class="about-primary" id="add-song-confirm">确定加入</button>
       </div>
     </div>
   </div>
@@ -1183,10 +1425,10 @@
       <div class="about-body" style="flex: 1; overflow-y: auto; padding-bottom: 20px;">
         <div style="font-size: 13px; font-weight: bold; margin-bottom: 8px;">插件网址</div>
         <div style="display: flex; gap: 8px; margin-bottom: 20px; align-items: center;">
-          <div class="modal-input-group" style="margin-top: 0; flex: 1;">
-            <input type="text" id="mf-source-input" placeholder="输入插件网址URL..." autocomplete="off" style="padding: 6px 10px; font-size: 13px;">
+          <div class="modal-input-group" style="margin-top: 0; flex: 1; height: 30px; border-radius: 6px;">
+            <input type="text" id="mf-source-input" placeholder="输入插件网址URL..." autocomplete="off" style="padding: 0 10px; font-size: 13px; height: 100%;">
           </div>
-          <button class="mf-btn-sm mf-btn-blue" id="mf-source-refresh" style="white-space: nowrap; flex-shrink: 0;">拉取</button>
+          <button class="mf-btn-sm mf-btn-blue" id="mf-source-refresh">拉取</button>
         </div>
         <div style="font-size: 13px; font-weight: bold; margin-bottom: 8px;">本地插件</div>
         <div id="mf-local-plugins" style="display: flex; flex-direction: column;">
@@ -1194,7 +1436,26 @@
         </div>
       </div>
       <div class="about-footer" style="flex-shrink: 0; border-top: 1px solid var(--border);">
-        <button class="about-secondary" id="mf-plugin-local-upload">本地上传 .js</button>
+        <button class="mf-btn-sm" id="mf-plugin-local-upload" style="background: transparent; color: var(--text-main); border: 1px solid var(--border);">本地上传 .js</button>
+      </div>
+    </div>
+  </div>
+
+  <div class="about-modal-backdrop" id="edit-playlist-backdrop" aria-hidden="true">
+    <div class="about-modal" role="dialog" aria-modal="true" style="height: 60vh; display: flex; flex-direction: column;">
+      <button class="about-close" id="edit-playlist-close" aria-label="关闭">×</button>
+      <div class="about-header" style="flex-shrink: 0; padding-bottom: 15px; border-bottom: 1px solid var(--border);">
+        <div class="about-title-wrap">
+          <h2 style="font-size: 18px; font-weight: 800; margin-top: 4px;">编辑自定义歌单</h2>
+        </div>
+      </div>
+      <div class="about-body" style="flex: 1; padding: 0; display: flex; flex-direction: column; overflow: hidden;">
+        <div style="flex-shrink: 0; padding: 15px 18px; border-bottom: 1px solid var(--border); background: var(--bg-color); display: flex; align-items: center; gap: 10px;">
+          <input type="text" id="edit-pl-new-input" placeholder="输入新歌单名称..." autocomplete="off" style="flex: 1; padding: 10px 14px; border: 1px solid var(--border); border-radius: 10px; outline: none; background: var(--card-bg); color: var(--text-main); font-size: 16px;">
+          <button class="about-primary" id="edit-pl-create-btn" style="border-radius: 8px; white-space: nowrap; font-weight: bold;">创建歌单</button>
+        </div>
+        <ul id="edit-playlist-list" style="flex: 1; overflow-y: auto; list-style: none; margin: 0; padding: 0; padding-bottom: 20px; overscroll-behavior: contain;">
+        </ul>
       </div>
     </div>
   </div>
@@ -1203,9 +1464,8 @@
     /* ==========================================
      * 1. 核心配置与全局状态
      * ========================================== */
-    const APP_VERSION = 'v0.9.5';
+    const APP_VERSION = 'v1.1';
     const APP_LOGO = document.getElementById('app-logo')?.content || '';
-    const MSG_SEARCH_LOCAL_ONLY = "🚫 搜索仅支持本机播放，请保存后推送音箱";
     const API = {
       list: '/musiclist',
       info: '/musicinfo?musictag=true&name=',
@@ -1219,9 +1479,7 @@
       cmdStatus: '/cmdstatus'
     };
 
-    // 现代架构：直接使用明确的代理路径，去除旧版本冗余探测
     const workingProxyPath = '/proxy/music';
-
     const defaultCover = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Cdefs%3E%3ClinearGradient id='grad' x1='0%25' y1='0%25' x2='100%25' y2='100%25'%3E%3Cstop offset='0%25' stop-color='%23ec4899' /%3E%3Cstop offset='100%25' stop-color='%238b5cf6' /%3E%3C/linearGradient%3E%3C/defs%3E%3Ccircle cx='50' cy='50' r='50' fill='%231f2937' /%3E%3Ccircle cx='50' cy='50' r='40' fill='none' stroke='%23374151' stroke-width='1' /%3E%3Ccircle cx='50' cy='50' r='30' fill='none' stroke='%23374151' stroke-width='1' /%3E%3Ccircle cx='50' cy='50' r='20' fill='url(%23grad)' /%3E%3Ccircle cx='50' cy='50' r='5' fill='%23111827' /%3E%3Cpath d='M50 15 A35 35 0 0 1 85 50' fill='none' stroke='%23ffffff' stroke-width='2' stroke-linecap='round' opacity='0.3' /%3E%3C/svg%3E";
     const eqHtml = `<div class="playing-eq"><span class="eq-bar"></span><span class="eq-bar"></span><span class="eq-bar"></span></div>`;
     const modeNames = ["单曲循环", "全部循环", "随机播放"];
@@ -1244,7 +1502,9 @@
     let favoriteList = [];
     let onlineMusicItems = [];
     let currentIndex = -1;
+    let activeSongMenuIndex = -1;
     let currentSongName = "";
+
     let isPlaying = false;
     let currentPlaylist = "";
     let playMode = parseInt(localStorage.getItem('local_play_mode')) || 1;
@@ -1269,6 +1529,15 @@
     let lyricStartOffset = 0;
     let parsedLyrics = [];
 
+    window.skipRemoveConfirm = false;
+    window.pendingRemoveIndex = -1;
+    window.pendingRemoveSongName = "";
+    window.skipAddConfirm = false;
+    window.lastAddedPlaylist = "";
+    window.pendingAddIndex = -1;
+    window.pendingAddSongName = "";
+    window.tempSelectedPlaylist = "";
+
     /* ==========================================
      * 2. DOM 元素获取
      * ========================================== */
@@ -1287,9 +1556,10 @@
     const settingRefreshBtn = document.getElementById('setting-refresh');
     const settingConfigBtn = document.getElementById('setting-config');
     const settingCreatePlaylistBtn = document.getElementById('setting-create-playlist');
-    const settingDownloadBtn = document.getElementById('setting-download'); // 💡 新增的下载按钮
+    const settingDownloadBtn = document.getElementById('setting-download');
     const settingVersionBtn = document.getElementById('setting-version');
     const settingMfBtn = document.getElementById('setting-musicfree');
+    const settingBatchImportBtn = document.getElementById('setting-batch-import');
 
     const btnMode = document.getElementById('btn-mode');
     const iconLoopAll = document.getElementById('icon-loop-all');
@@ -1329,11 +1599,25 @@
     const devClose = document.getElementById('dev-close');
     const devOk = document.getElementById('dev-ok');
 
+    const removeSongModal = document.getElementById('remove-song-modal-backdrop');
+    const removeSongDontAsk = document.getElementById('remove-song-dont-ask');
+    const addSongModal = document.getElementById('add-song-modal-backdrop');
+    const addSongDontAsk = document.getElementById('add-song-dont-ask');
+    const newPlaylistInput = document.getElementById('add-new-playlist-input');
+    const mfPluginModal = document.getElementById('mf-plugin-backdrop');
+
+    const searchInput = document.getElementById('search-input');
+    const searchClear = document.getElementById('search-clear');
+    const mfSearchInput = document.getElementById('mf-search-input');
+    const mfSearchClear = document.getElementById('mf-search-clear');
+    const searchSaveBtn = document.getElementById('search-save');
+    const mfSearchSaveBtn = document.getElementById('mf-search-save');
+
     document.getElementById('setting-version-label').textContent = APP_VERSION;
     document.getElementById('about-version-label').textContent = APP_VERSION;
 
     /* ==========================================
-     * 3. UI 基础渲染与控制工具
+     * 3. 基础渲染与 UI 控制工具
      * ========================================== */
     function setHeadIcon(rel, href, extra = {}) {
       let link = document.querySelector(`link[rel="${rel}"]`);
@@ -1372,14 +1656,15 @@
     function formatPlaylistText(name, count) {
       let icon = SVG_ICONS.folder;
       let displayName = name;
+
       if (name === '所有歌曲') icon = SVG_ICONS.music;
       else if (name === '所有电台') icon = SVG_ICONS.radio;
-      // 图标映射在线资源
       else if (name === '在线资源') icon = SVG_ICONS.globe;
       else if (name === '收藏') icon = SVG_ICONS.heart;
-      else if (name === '搜索') icon = SVG_ICONS.search;
+      else if (name === '本地搜索') { icon = SVG_ICONS.search; displayName = '曲库搜索'; }
       else if (name === '下载') icon = SVG_ICONS.download;
-      else if (name === '最近新增') icon = SVG_ICONS.recent;
+      else if (name === '最近新增') { icon = SVG_ICONS.recent; displayName = '本地新增'; }
+      else if (name === '_online_iwebplayer_search') { icon = SVG_ICONS.disc; displayName = '在线资源临时推送歌单'; }
       else if (name === '其他') icon = SVG_ICONS.folder;
       else if (name.startsWith('🎵')) {
         icon = SVG_ICONS.disc;
@@ -1411,6 +1696,36 @@
       }
     }
 
+    function updateVoiceCmdIconUI() {
+      const iconContainer = document.getElementById('header-voice-disabled-icon');
+      const iconOn = document.getElementById('header-voice-on');
+      const iconOff = document.getElementById('header-voice-off');
+      if (!iconContainer || !iconOn || !iconOff) return;
+
+      if (currentDid !== "") {
+        iconContainer.style.display = 'flex';
+        iconContainer.style.alignItems = 'center';
+        // 启用时：显示正常麦克风，使用主色调
+        if (window.isVoiceCmdEnabled) {
+          iconOn.style.display = 'block';
+          iconOff.style.display = 'none';
+
+          iconContainer.style.color = 'var(--text-main)';
+          iconContainer.style.opacity = '0.9';
+          iconContainer.title = 'XiaoMusic 语音口令已开启';
+        } else {
+          // 禁用时：显示带斜杠的麦克风，变灰并变淡
+          iconOn.style.display = 'none';
+          iconOff.style.display = 'block';
+
+          iconContainer.style.color = 'var(--text-sub)';
+          iconContainer.style.opacity = '0.7';
+          iconContainer.title = 'XiaoMusic 语音口令已屏蔽';
+        }
+      } else {
+        iconContainer.style.display = 'none';
+      }
+    }
     function updateVolumeDeviceUI() {
       if (currentDid === "" && isIOS) {
         btnVolume.style.opacity = '0.3';
@@ -1468,11 +1783,7 @@
     }
 
     function updatePushBtnState() {
-      if (currentDid !== "" && currentPlaylist === '搜索') {
-        btnPlay.classList.add('disabled-push');
-      } else {
-        btnPlay.classList.remove('disabled-push');
-      }
+      btnPlay.classList.remove('disabled-push');
     }
 
     function updateNpTitleUI(text, checkFav = true) {
@@ -1496,7 +1807,10 @@
         document.getElementById('song-' + currentIndex)?.classList.remove('playing');
       }
       currentIndex = index;
-      currentSongName = songList[currentIndex];
+
+      const rawItem = songList[currentIndex];
+      currentSongName = window.getSongNameObj(rawItem);
+
       const currentEl = document.getElementById('song-' + currentIndex);
       if (currentEl) {
         currentEl.classList.add('playing');
@@ -1531,35 +1845,41 @@
       }
     }
 
-    // 统一下游UI显隐控制器
+    function closeAllSongMenus() {
+        if (activeSongMenuIndex !== -1) {
+            const oldMenu = document.getElementById('song-menu-' + activeSongMenuIndex);
+            if (oldMenu) oldMenu.classList.remove('show');
+            const oldSong = document.getElementById('song-' + activeSongMenuIndex);
+            if (oldSong) oldSong.classList.remove('menu-open');
+            activeSongMenuIndex = -1;
+        }
+    }
+
     function updateSearchUI(playlistName) {
       const searchWrap = document.getElementById('search-inline-wrap');
       const mfSearchWrap = document.getElementById('mf-search-wrap');
       const mfPluginRow = document.getElementById('mf-plugin-row');
       const plContainer = document.getElementById('playlist-container');
-      const inlineDelBtn = document.getElementById('inline-delete-btn');
 
-      if (playlistName === '搜索') {
+      if (playlistName !== '本地搜索' && searchSaveBtn) {
+          searchSaveBtn.classList.remove('show');
+      }
+
+      if (playlistName === '本地搜索') {
         if (searchWrap) searchWrap.classList.add('show');
         if (mfSearchWrap) mfSearchWrap.classList.remove('show');
         if (mfPluginRow) mfPluginRow.classList.remove('show');
         if (plContainer) plContainer.classList.add('playlist-container-search');
-        if (inlineDelBtn) inlineDelBtn.classList.remove('show');
 
-        // 恢复本地搜索词
         const savedSearch = localStorage.getItem('local_search_keyword') || '';
-        const searchInput = document.getElementById('search-input');
         if (searchInput) searchInput.value = savedSearch;
-        const searchClear = document.getElementById('search-clear');
         if (savedSearch && searchClear) searchClear.classList.add('show');
 
       } else if (playlistName === '在线资源') {
         if (searchWrap) searchWrap.classList.remove('show');
         if (mfPluginRow) mfPluginRow.classList.add('show');
         if (plContainer) plContainer.classList.add('playlist-container-search');
-        if (inlineDelBtn) inlineDelBtn.classList.remove('show');
 
-        // 状态嗅探：获取当前选中的引擎
         const currentEngine = document.getElementById('engine-val') ? document.getElementById('engine-val').dataset.value : 'MusicFree';
         const mfPluginContainer = document.getElementById('mf-plugin-container');
         const mfPluginVal = document.getElementById('mf-plugin-val');
@@ -1570,62 +1890,66 @@
                 mfPluginContainer.style.opacity = '0.4';
                 mfPluginContainer.style.pointerEvents = 'none';
             }
-            if (mfPluginVal) mfPluginVal.textContent = '暂不可用';
+            if (mfPluginVal) mfPluginVal.textContent = '努力开发中...';
         } else {
             if (mfSearchWrap) mfSearchWrap.classList.add('show');
             if (mfPluginContainer) {
                 mfPluginContainer.style.opacity = '1';
                 mfPluginContainer.style.pointerEvents = 'auto';
             }
+
+            if (mfSearchSaveBtn) mfSearchSaveBtn.classList.toggle('show', songList && songList.length > 0);
+
             const savedPlugin = localStorage.getItem('mf_selected_plugin') || 'all';
             if (mfPluginVal) mfPluginVal.textContent = savedPlugin === 'all' ? '所有插件' : savedPlugin;
 
             const savedMfKeyword = localStorage.getItem('mf_search_keyword') || '';
-            const mfSearchInput = document.getElementById('mf-search-input');
-            const mfSearchClear = document.getElementById('mf-search-clear');
             if (mfSearchInput) mfSearchInput.value = savedMfKeyword;
             if (mfSearchClear && savedMfKeyword) mfSearchClear.classList.add('show');
 
-            // 严谨控制：只有在真正需要时才触发重搜
-            if (savedMfKeyword && onlineMusicItems.length === 0) {
-              setTimeout(() => {
-                const mfSearchBtn = document.getElementById('mf-search-btn');
-                if (mfSearchBtn) mfSearchBtn.click();
-              }, 400);
-            } else if (!savedMfKeyword && onlineMusicItems.length === 0) {
-              // 终极兜底：如果没有搜索词，且当前是在控制小爱音箱时，才拉出音箱底层的历史歌单显示！
-              if (currentDid !== "" && allPlaylists['_online_musicfree'] && allPlaylists['_online_musicfree'].length > 0) {
-                  // 绝佳架构：只让界面的画笔临时指向历史歌单，绝不污染全局数据！
-                  songList = allPlaylists['_online_musicfree'];
+            if (savedMfKeyword) {
+              if (onlineMusicItems && onlineMusicItems.length > 0) {
+                  songList = [...onlineMusicItems];
                   renderPlaylist();
                   const text = formatPlaylistText('在线资源', songList.length);
-                  const plVal = document.getElementById('playlist-val');
-                  if (plVal) plVal.innerHTML = text;
+                  if (playlistVal) playlistVal.innerHTML = text;
+                  const mfOpt = document.querySelector('#playlist-opts .select-option[data-key="在线资源"]');
+                  if (mfOpt) mfOpt.innerHTML = text;
+              } else {
+                  songList = [];
+                  renderPlaylist();
+                  setTimeout(() => {
+                      const mfSearchBtn = document.getElementById('mf-search-btn');
+                      if (mfSearchBtn) mfSearchBtn.click();
+                  }, 400);
+              }
+            } else {
+              if (currentDid !== "" && allPlaylists['_online_iwebplayer_search'] && allPlaylists['_online_iwebplayer_search'].length > 0) {
+                  songList = allPlaylists['_online_iwebplayer_search'];
+                  renderPlaylist();
+                  const text = formatPlaylistText('在线资源', songList.length);
+                  if (playlistVal) playlistVal.innerHTML = text;
                   const mfOpt = document.querySelector('#playlist-opts .select-option[data-key="在线资源"]');
                   if (mfOpt) mfOpt.innerHTML = text;
 
-                  // 顺手把正在播放的歌标上红框
                   if (currentSongName !== "") {
                       const safeCurrent = cleanStr(currentSongName);
                       const matchIdx = songList.findIndex(song => cleanStr(song) === safeCurrent);
                       if (matchIdx !== -1) {
                           currentIndex = matchIdx;
-                          const playingEl = document.getElementById('song-' + currentIndex);
-                          if (playingEl) playingEl.classList.add('playing');
+                          document.getElementById('song-' + currentIndex)?.classList.add('playing');
                           setTimeout(() => scrollToCurrentSong('smooth'), 100);
                       }
                   }
               } else {
-                  // 本机模式，或者底层没历史：将画笔指回真实的空数据，重置计数器
-                  songList = allPlaylists['在线资源'] || [];
-                  const text = formatPlaylistText('在线资源', songList.length);
-                  const plVal = document.getElementById('playlist-val');
-                  if (plVal) plVal.innerHTML = text;
+                  songList = [];
+                  renderPlaylist();
+                  const text = formatPlaylistText('在线资源', 0);
+                  if (playlistVal) playlistVal.innerHTML = text;
                   const mfOpt = document.querySelector('#playlist-opts .select-option[data-key="在线资源"]');
                   if (mfOpt) mfOpt.innerHTML = text;
 
-                  const plEl = document.getElementById('playlist');
-                  if (plEl) plEl.innerHTML = '<div style="text-align: center; padding: 40px; color: var(--text-sub); font-size: 14px;">暂无在线资源，请输入歌曲全网搜索</div>';
+                  if (playlistEl) playlistEl.innerHTML = '<div style="text-align: center; padding: 40px; color: var(--text-sub); font-size: 14px;">暂无搜索结果，请输入歌曲全网搜索</div>';
               }
             }
         }
@@ -1634,9 +1958,6 @@
         if (mfSearchWrap) mfSearchWrap.classList.remove('show');
         if (mfPluginRow) mfPluginRow.classList.remove('show');
         if (plContainer) plContainer.classList.remove('playlist-container-search');
-        if (inlineDelBtn) {
-            playlistName.startsWith('🎵') ? inlineDelBtn.classList.add('show') : inlineDelBtn.classList.remove('show');
-        }
       }
     }
 
@@ -1669,6 +1990,18 @@
         updateMediaSession(currentSongName, document.getElementById('fp-cover').src);
       }
 
+      fetch('/playlistupdatemusic', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ name: '收藏', music_list: favoriteList })
+      })
+      .then(res => res.json())
+      .then(data => {
+          if (data.ret === "OK") {
+              fetch('/api/music/refreshlist', { method: 'POST', body: JSON.stringify({}) }).catch(()=>{});
+          }
+      }).catch(()=>{});
+
       const allDids = Array.from(document.querySelectorAll('#device-opts .select-option'))
                            .map(opt => opt.dataset.did)
                            .filter(d => d && d !== "");
@@ -1785,33 +2118,46 @@
           if (data.ret === "OK") {
             updateDeviceStatusUI(activeDeviceLi, rawName, data.is_playing ? 'playing' : 'normal');
 
-            // 如果底层传过来的是 _online_musicfree，强行重定向为 在线资源
             let backendPlaylist = data.cur_playlist;
-            if (backendPlaylist === '_online_musicfree') {
+            if (backendPlaylist === '_online_iwebplayer_search') {
                 backendPlaylist = '在线资源';
+            } else if (backendPlaylist === '_local_iwebplayer_search') {
+                backendPlaylist = '本地搜索';
+            } else if (backendPlaylist && backendPlaylist.startsWith('_online_mf_')) {
+                backendPlaylist = backendPlaylist.replace('_online_mf_', '');
+            } else if (backendPlaylist && backendPlaylist.startsWith('_online_lx_')) {
+                backendPlaylist = backendPlaylist.replace('_online_lx_', '');
             }
 
-            if (!hasSyncedPlaylistOnce && backendPlaylist && backendPlaylist !== currentPlaylist && allPlaylists[backendPlaylist]) {
+            const isValidBackendPlaylist = backendPlaylist && Array.from(document.querySelectorAll('#playlist-opts .select-option')).some(opt => opt.dataset.key === backendPlaylist);
+            if (!hasSyncedPlaylistOnce && isValidBackendPlaylist) {
               currentPlaylist = backendPlaylist;
-              songList = allPlaylists[currentPlaylist];
-              playlistVal.innerHTML = formatPlaylistText(currentPlaylist, songList.length);
+
               document.querySelectorAll('#playlist-opts .select-option').forEach(el => {
                 el.classList.remove('active');
                 if (el.dataset.key === currentPlaylist) el.classList.add('active');
               });
 
-              // 统一调用司令部
               updateSearchUI(currentPlaylist);
 
+              if (currentPlaylist === '本地搜索') {
+                  if (searchInput) performLocalSearch(searchInput.value);
+              } else if (currentPlaylist !== '在线资源') {
+                  songList = window.getMergedSongList(currentPlaylist);
+                  renderPlaylist();
+              }
+
+              const text = formatPlaylistText(currentPlaylist, songList.length);
+              playlistVal.innerHTML = text;
+              const activeOpt = document.querySelector('#playlist-opts .select-option.active');
+              if (activeOpt) activeOpt.innerHTML = text;
+
               updatePushBtnState();
-              renderPlaylist();
               hasSyncedPlaylistOnce = true;
             }
 
             const safeCurMusic = cleanStr(data.cur_music);
             const safeCurrentSongName = cleanStr(currentSongName);
-
-            // 如果之前列表为空没加红框（currentIndex === -1），但现在搜索数据回来了（能在列表里找到了），也要触发高亮定位！
             const isInListNow = songList.findIndex(song => cleanStr(song) === safeCurMusic) !== -1;
 
             if (data.cur_music && (safeCurMusic !== safeCurrentSongName || (currentIndex === -1 && isInListNow))) {
@@ -1819,16 +2165,13 @@
               if (timeSinceCmd > 5000) {
                  const idx = songList.findIndex(song => cleanStr(song) === safeCurMusic);
                  if (idx !== -1) {
-                     // 情况 A：匹配到了，执行完美定位、高亮、刮削
                      playSong(idx, false);
                  } else {
-                     // 情况 B：匹配不到就算了！但要把底部播放条的名字更新一下，免得它显示“暂无播放”
                      currentSongName = data.cur_music;
                      updateNpTitleUI(currentSongName);
                      fpCover.src = defaultCover;
                      miniCoverImg.src = defaultCover;
                      fpLyricsContainer.innerHTML = '<div class="no-lyrics">已在设备端播放</div>';
-                     // 取消列表中旧的高亮
                      if (currentIndex !== -1) {
                          document.getElementById('song-' + currentIndex)?.classList.remove('playing');
                          currentIndex = -1;
@@ -1894,7 +2237,8 @@
      * ========================================== */
     function cleanStr(str) {
       if (!str) return "";
-      return str.replace(/[\(（].*?[\)）]/g, '').replace(/\s+/g, '').toLowerCase().trim();
+      str = window.getSongNameObj(str);
+      return String(str).replace(/[\(（].*?[\)）]/g, '').replace(/\s+/g, '').toLowerCase().trim();
     }
 
     function parseArtists(str) {
@@ -2037,13 +2381,31 @@
 
       if (currentDid !== "" && autoPlay) {
         window.lastRemoteCmdTime = Date.now();
-        if (currentPlaylist === '搜索') {
-          sendRemoteCmd(`播放 ${targetSongName}`);
+        if (currentPlaylist === '本地搜索') {
+          const keyword = (document.getElementById('search-input').value || '').trim();
+          if (!keyword) {
+              sendRemoteCmd(`播放列表_local_iwebplayer_search|${targetSongName}`);
+          } else {
+              allPlaylists['_local_iwebplayer_search'] = [...songList];
+              showToast("⏳ 正在同步搜索结果至音箱...");
+              fetch('/playlistupdatemusic', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ name: '_local_iwebplayer_search', music_list: songList })
+              }).then(res => {
+                  sendRemoteCmd(`播放列表_local_iwebplayer_search|${targetSongName}`);
+                  fetch('/api/music/refreshlist', { method: 'POST', body: JSON.stringify({}) }).catch(()=>{});
+              }).catch(e => {
+                  sendRemoteCmd(`播放列表_local_iwebplayer_search|${targetSongName}`);
+              });
+          }
         } else if (currentPlaylist === '在线资源' && (!onlineMusicItems || onlineMusicItems.length === 0 || !onlineMusicItems[index])) {
-          // 探测到是 fallback 模式：列表不为空但在抓取池里没数据，说明当前显示的是音箱历史歌单！直接指挥底层 _online_musicfree
-          sendRemoteCmd(`播放列表_online_musicfree|${targetSongName}`);
+          sendRemoteCmd(`播放列表_online_iwebplayer_search|${targetSongName}`);
         } else if (currentPlaylist !== '在线资源') {
-          sendRemoteCmd(`播放列表${currentPlaylist}|${targetSongName}`);
+          const rawItem = songList[index];
+          const isOnlineObj = typeof rawItem === 'object' && rawItem !== null;
+          const actualPlaylistName = isOnlineObj ? (rawItem._sourcePlaylist || ('_online_mf_' + currentPlaylist)) : currentPlaylist;
+          sendRemoteCmd(`播放列表${actualPlaylistName}|${targetSongName}`);
         }
       }
 
@@ -2053,46 +2415,90 @@
         let scrapeTitle = "";
         let scrapeArtist = "";
 
-        // 在线资源播放分支
-        if (currentPlaylist === '在线资源') {
-          const rawItem = onlineMusicItems[index];
+        const currentRawItem = songList[index];
+        const isOnlineObj = typeof currentRawItem === 'object' && currentRawItem !== null && !currentRawItem._isSavedOnlineStr;
 
-          if (rawItem) {
-            scrapeTitle = rawItem.title || "";
-            scrapeArtist = rawItem.artist || "";
+        if (currentPlaylist === '在线资源' || isOnlineObj) {
+          let targetItem = currentRawItem;
+
+          if (targetItem && targetItem.url && typeof targetItem.url === 'string' && targetItem.url.includes('plugin-url?data=')) {
+              try {
+                  const b64Data = targetItem.url.split('plugin-url?data=')[1];
+                  const binStr = window.atob(b64Data);
+                  const bytes = new Uint8Array(binStr.length);
+                  for (let i = 0; i < binStr.length; i++) bytes[i] = binStr.charCodeAt(i);
+                  targetItem = JSON.parse(new TextDecoder('utf-8').decode(bytes));
+              } catch (e) {
+                  console.error("还原原始插件数据失败:", e);
+              }
+          }
+
+          if (targetItem) {
+            scrapeTitle = targetItem.title || "";
+            scrapeArtist = targetItem.artist || "";
           }
 
           if (currentDid !== "") {
-              if (autoPlay && rawItem) {
+              if (autoPlay && targetItem) {
                   window.lastRemoteCmdTime = Date.now();
-                  showToast("🎵 正在解析音源并推送给小爱同学...");
-                  fetch('/api/device/pushList', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                      playlistName: '_online_musicfree',
-                      did: currentDid,
-                      songList: onlineMusicItems.slice(index)
-                    })
-                  })
-                  .then(res => res.json())
-                  .then(data => {
-                    if (!data.success) showToast("❌ 推送失败：" + data.error);
-                  })
-                  .catch(err => {
-                    showToast("❌ 网络请求失败");
-                  });
+                  if (currentPlaylist === '在线资源') {
+                      showToast("🎵 正在解析音源并推送给小爱同学...");
+                      fetch('/api/device/pushList', {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({
+                          playlistName: '_online_iwebplayer_search',
+                          did: currentDid,
+                          songList: songList.slice(index)
+                        })
+                      })
+                      .then(res => res.json())
+                      .then(data => {
+                        if (!data.success) {
+                            showToast("❌ 推送失败：" + data.error);
+                        } else {
+                            // 推送成功后，等待 1 秒让后端处理完成，重新拉取数据更新下拉框
+                            setTimeout(async () => {
+                                if (typeof reloadGlobalData === 'function') {
+                                    await reloadGlobalData();
+                                    if (typeof initPlaylistDropdown === 'function') {
+                                        initPlaylistDropdown();
+                                    }
+                                }
+                            }, 1000);
+                        }
+                      }).catch(err => { showToast("❌ 网络请求失败"); });
+                  }
               }
               updateNpTitleUI(currentSongName);
           } else {
-              if (rawItem) {
-                  const resSource = await fetch('/api/play/getMediaSource', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(rawItem)
-                  });
-                  const sourceData = await resSource.json();
-                  if (currentDid === "" && sourceData.url) {
+              if (targetItem) {
+                  const fetchSourceData = async () => {
+                      try {
+                          const resSource = await fetch('/api/play/getMediaSource', {
+                            method: 'POST',
+                            headers: { 'Content-Type': 'application/json' },
+                            body: JSON.stringify(targetItem)
+                          });
+                          return await resSource.json();
+                      } catch(e) {
+                          return { url: null };
+                      }
+                  };
+
+                  let sourceData = await fetchSourceData();
+
+                  // 第一次获取失败，等待 1 秒后自动重试
+                  if ((!sourceData || !sourceData.url) && currentDid === "") {
+                      showToast("⚠️ 获取链接失败，1秒后自动重试...");
+                      await new Promise(resolve => setTimeout(resolve, 1000));
+                      if (targetSongName !== currentSongName) return; // 拦截：等待期间用户已切歌
+                      sourceData = await fetchSourceData();
+                  }
+
+                  if (targetSongName !== currentSongName) return; // 二次确认
+
+                  if (currentDid === "" && sourceData && sourceData.url) {
                     localState.playlist = currentPlaylist;
                     localState.songName = currentSongName;
                     localStorage.setItem('local_state', JSON.stringify(localState));
@@ -2115,19 +2521,28 @@
                       const playPromise = audioEl.play();
                       if (playPromise !== undefined) playPromise.catch(error => {});
                     }
-                  } else {
-                    showToast("⚠️ 获取音频链接失败，可能是音源已失效");
+                  } else if (currentDid === "") {
+                    // 第二次依然失败，自动切换下一首
+                    showToast("⚠️ 音源已失效，自动跳过该歌曲");
+                    updatePlayButtonUI(false);
+                    setTimeout(() => {
+                        // 确保跳过前，用户没有手动去点别的歌
+                        if (targetSongName === currentSongName) {
+                            const btnNext = document.getElementById('btn-next');
+                            if (btnNext) btnNext.click();
+                        }
+                    }, 1000);
                   }
               }
           }
 
-          if (rawItem && rawItem.artwork) finalCover = rawItem.artwork;
-          if (rawItem) {
+          if (targetItem && targetItem.artwork) finalCover = targetItem.artwork;
+          if (targetItem) {
               try {
                   const resLyric = await fetch('/api/play/getLyric', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(rawItem)
+                    body: JSON.stringify(targetItem)
                   });
                   const lyricData = await resLyric.json();
                   if (lyricData.success && lyricData.rawLrc) {
@@ -2170,7 +2585,6 @@
           if (info.tags && info.tags.artist) scrapeArtist = info.tags.artist;
         }
 
-        /* 开始统一下游刮削！ */
         let currentRenderedCover = null;
         let currentRenderedLrc = null;
         const applyUI = () => {
@@ -2266,9 +2680,442 @@
     }
 
     /* ==========================================
-     * 7. 渲染初始化引擎 (Dropdowns, Lists)
+     * 7. 全局业务逻辑 (Add, Remove, Plugins)
      * ========================================== */
+    window.getSongNameObj = function(rawItem) {
+        if (typeof rawItem === 'string') return rawItem;
+        if (rawItem && rawItem._isSavedOnlineStr) return rawItem.name;
+        if (rawItem && rawItem.title) return `${rawItem.title}-${rawItem.artist}`;
+        if (rawItem && rawItem.name) return rawItem.name;
+        return String(rawItem);
+    };
 
+    window.getMergedSongList = function(baseName) {
+        if (baseName === '在线资源' || baseName === '本地搜索') return allPlaylists[baseName] || [];
+        let merged = [];
+        const mfName = '_online_mf_' + baseName;
+        const lxName = '_online_lx_' + baseName;
+
+        const wrap = (item, source) => {
+            if (typeof item === 'string') return { _isSavedOnlineStr: true, name: item, _sourcePlaylist: source };
+            return { ...item, _sourcePlaylist: source };
+        };
+
+        if (allPlaylists[mfName]) merged = merged.concat(allPlaylists[mfName].map(i => wrap(i, mfName)));
+        if (allPlaylists[lxName]) merged = merged.concat(allPlaylists[lxName].map(i => wrap(i, lxName)));
+        if (allPlaylists[baseName]) merged = merged.concat(allPlaylists[baseName]);
+
+        return merged;
+    };
+
+    window.showDevModal = function(featureName, customHtml) {
+        const pEl = document.querySelector('#dev-backdrop .about-body p');
+        if (pEl) {
+            if (customHtml) {
+                pEl.innerHTML = customHtml;
+            } else {
+                pEl.innerHTML = `<strong id="dev-modal-feature-name">${featureName}</strong> 功能正在开发中。`;
+            }
+        }
+        devBackdrop.classList.add('show');
+        devBackdrop.setAttribute('aria-hidden', 'false');
+        document.body.style.overflow = 'hidden';
+    };
+
+    window.executeRemoveSong = async function(index, songName) {
+        if (currentPlaylist === '收藏') {
+            if (favoriteList.includes(songName)) toggleFavorite(songName, index);
+        } else {
+            const rawItem = songList[index];
+            const isOnlineObj = typeof rawItem === 'object' && rawItem !== null;
+            const actualPlaylistName = isOnlineObj ? (rawItem._sourcePlaylist || ('_online_mf_' + currentPlaylist)) : currentPlaylist;
+
+            if (allPlaylists[actualPlaylistName] && allPlaylists[actualPlaylistName] !== songList) {
+                const realIndex = allPlaylists[actualPlaylistName].findIndex(item => window.getSongNameObj(item) === window.getSongNameObj(rawItem));
+                if (realIndex !== -1) allPlaylists[actualPlaylistName].splice(realIndex, 1);
+            }
+
+            // 如果是在线资源，必须同步将备份缓存里的该歌曲铲除，防止切歌单后“死而复生”
+            if (currentPlaylist === '在线资源') {
+                const targetNameObj = window.getSongNameObj(rawItem);
+                const oIdx = onlineMusicItems.findIndex(item => window.getSongNameObj(item) === targetNameObj);
+                if (oIdx !== -1) onlineMusicItems.splice(oIdx, 1);
+            }
+
+            songList.splice(index, 1);
+            const shortName = songName.split('-')[0].trim();
+            showToast(`🗑️ 已将 ${shortName} 移出歌单`);
+
+            const text = formatPlaylistText(currentPlaylist, songList.length);
+            if (playlistVal) playlistVal.innerHTML = text;
+            const opt = document.querySelector(`#playlist-opts .select-option[data-key="${currentPlaylist}"]`);
+            if (opt) opt.innerHTML = text;
+
+            renderPlaylist();
+
+            if (currentPlaylist === '本地搜索' || currentPlaylist === '在线资源') {
+                if (currentPlaylist === '本地搜索') {
+                    if (searchSaveBtn) searchSaveBtn.classList.toggle('show', songList.length > 0);
+                } else if (currentPlaylist === '在线资源') {
+                    if (mfSearchSaveBtn) mfSearchSaveBtn.classList.toggle('show', songList.length > 0);
+                }
+            } else {
+                if (isOnlineObj) {
+                    try {
+                        const settingRes = await fetch(API.setting);
+                        const settingData = await settingRes.json();
+                        if (settingData.music_list_json) {
+                            const musicArr = JSON.parse(settingData.music_list_json);
+                            const plIndex = musicArr.findIndex(pl => pl.name === actualPlaylistName);
+                            if (plIndex !== -1) {
+                                const targetNameObj = window.getSongNameObj(rawItem);
+                                musicArr[plIndex].musics = musicArr[plIndex].musics.filter(m => window.getSongNameObj(m) !== targetNameObj);
+                                if (musicArr[plIndex].musics.length === 0) {
+                                    musicArr.splice(plIndex, 1);
+                                }
+                                await fetch('/savesetting', {
+                                    method: 'POST',
+                                    headers: {'Content-Type': 'application/json'},
+                                    body: JSON.stringify({ music_list_json: JSON.stringify(musicArr) })
+                                });
+                            }
+                        }
+                    } catch (e) {
+                        console.error("线上歌单同步失败:", e);
+                    }
+                } else if (actualPlaylistName.startsWith('🎵')) {
+                    try {
+                        const remainingCount = allPlaylists[actualPlaylistName] ? allPlaylists[actualPlaylistName].length : 0;
+                        if (remainingCount === 0) {
+                            await fetch('/playlistdel', {
+                                method: 'POST',
+                                headers: { 'Content-Type': 'application/json' },
+                                body: JSON.stringify({ name: actualPlaylistName })
+                            });
+                        } else {
+                            await fetch('/playlistupdatemusic', {
+                                method: 'POST',
+                                headers: { 'Content-Type': 'application/json' },
+                                body: JSON.stringify({ name: actualPlaylistName, music_list: allPlaylists[actualPlaylistName] })
+                            });
+                        }
+                    } catch (e) {
+                        console.error("本地歌单同步失败:", e);
+                    }
+                }
+            }
+
+            if (currentPlaylist.startsWith('🎵')) {
+                const totalRemaining = window.getMergedSongList ? window.getMergedSongList(currentPlaylist).length : 0;
+                if (totalRemaining === 0) {
+                    showToast("🗑️ 歌单已清空，自动返回...");
+                    if (typeof reloadGlobalData === 'function') await reloadGlobalData();
+                    currentPlaylist = "所有歌曲";
+                    localState.playlist = "所有歌曲";
+                    localStorage.setItem('local_state', JSON.stringify(localState));
+                    if (typeof initPlaylistDropdown === 'function') initPlaylistDropdown();
+                    if (typeof updateSearchUI === 'function') updateSearchUI(currentPlaylist);
+                    songList = window.getMergedSongList(currentPlaylist);
+                    renderPlaylist();
+                    const newText = formatPlaylistText(currentPlaylist, songList.length);
+                    if (playlistVal) playlistVal.innerHTML = newText;
+                    const activeOpt = document.querySelector('#playlist-opts .select-option.active');
+                    if (activeOpt) activeOpt.innerHTML = newText;
+                }
+            }
+        }
+    };
+
+    window.executeAddSong = async function(index, songName, targetPlaylist) {
+        const rawItem = songList[index];
+        const isFreshOnlineJson = typeof rawItem === 'object' && rawItem !== null && !rawItem._isSavedOnlineStr;
+
+        if (!isFreshOnlineJson) {
+            let isNewPlaylist = !allPlaylists[targetPlaylist];
+            if (isNewPlaylist) allPlaylists[targetPlaylist] = [];
+
+            if (!allPlaylists[targetPlaylist].includes(songName)) {
+                allPlaylists[targetPlaylist].push(songName);
+            }
+
+            showToast(`⏳ 正在加入 ${targetPlaylist.replace(/^🎵\s*/, '')}...`);
+            try {
+                const res = await fetch('/playlistupdatemusic', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ name: targetPlaylist, music_list: allPlaylists[targetPlaylist] })
+                });
+                const data = await res.json();
+                if (data.ret === "OK") {
+                    showToast(`🎉 已成功加入到 ${targetPlaylist.replace(/^🎵\s*/, '')}`);
+                    if (typeof reloadGlobalData === 'function') await reloadGlobalData();
+                    if (isNewPlaylist && typeof initPlaylistDropdown === 'function') {
+                        initPlaylistDropdown();
+                    } else {
+                        const newText = formatPlaylistText(targetPlaylist, window.getMergedSongList(targetPlaylist).length);
+                        const opt = document.querySelector(`#playlist-opts .select-option[data-key="${targetPlaylist}"]`);
+                        if (opt) opt.innerHTML = newText;
+
+                        if (currentPlaylist === targetPlaylist) {
+                            if (playlistVal) playlistVal.innerHTML = newText;
+                            songList = window.getMergedSongList(targetPlaylist);
+                            renderPlaylist();
+                        }
+                    }
+                } else {
+                    showToast("❌ 保存失败：" + data.ret);
+                }
+            } catch(e) { showToast("❌ 网络异常"); }
+
+        } else {
+            const currentEngine = document.getElementById('engine-val')?.dataset.value || 'MusicFree';
+            const prefix = currentEngine === 'MusicFree' ? '_online_mf_' : '_online_lx_';
+            const hiddenListName = prefix + targetPlaylist;
+
+            showToast(`⏳ 正在同步线上资源至后台...`);
+
+            try {
+                const settingRes = await fetch(API.setting);
+                const settingData = await settingRes.json();
+                let musicArr = [];
+                if (settingData.music_list_json) {
+                    musicArr = JSON.parse(settingData.music_list_json);
+                }
+
+                let plIndex = musicArr.findIndex(pl => pl.name === hiddenListName);
+
+                const jsonStr = JSON.stringify(rawItem);
+                const utf8Bytes = new TextEncoder().encode(jsonStr);
+                const binStr = Array.from(utf8Bytes).map(b => String.fromCharCode(b)).join('');
+                const b64Data = window.btoa(binStr);
+                const selfUrl = "self:///api/proxy/plugin-url?data=" + b64Data;
+
+                const songNameStr = window.getSongNameObj(rawItem);
+                const wrappedSong = {
+                    name: songNameStr,
+                    url: selfUrl,
+                    type: "music",
+                    tags: rawItem
+                };
+
+                let isNewPlaylist = false;
+                if (plIndex !== -1) {
+                    const isExist = musicArr[plIndex].musics.some(m => window.getSongNameObj(m) === songNameStr);
+                    if (!isExist) musicArr[plIndex].musics.push(wrappedSong);
+                } else {
+                    isNewPlaylist = true;
+                    musicArr.push({ name: hiddenListName, musics: [wrappedSong] });
+                }
+
+                const saveRes = await fetch('/savesetting', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ music_list_json: JSON.stringify(musicArr) })
+                });
+                const saveData = await saveRes.json();
+
+                if (saveData === "save success" || saveData === "success" || saveData.ret === "OK") {
+                    showToast(`🎉 已成功加入到 ${targetPlaylist.replace(/^🎵\s*/, '')}！`);
+                    if (typeof reloadGlobalData === 'function') await reloadGlobalData();
+                    const isUINewPlaylist = !document.querySelector(`#playlist-opts .select-option[data-key="${targetPlaylist}"]`);
+
+                    if (isUINewPlaylist && typeof initPlaylistDropdown === 'function') {
+                        initPlaylistDropdown();
+                    } else {
+                        const newText = formatPlaylistText(targetPlaylist, window.getMergedSongList(targetPlaylist).length);
+                        const opt = document.querySelector(`#playlist-opts .select-option[data-key="${targetPlaylist}"]`);
+                        if (opt) opt.innerHTML = newText;
+
+                        if (currentPlaylist === targetPlaylist) {
+                            if (playlistVal) playlistVal.innerHTML = newText;
+                            songList = window.getMergedSongList(targetPlaylist);
+                            renderPlaylist();
+                        }
+                    }
+                } else {
+                    showToast("❌ 线上保存失败：" + (saveData.error || "未知错误"));
+                }
+            } catch (e) {
+                showToast("❌ 网络请求失败");
+                console.error(e);
+            }
+        }
+    };
+
+    window.executeBulkAdd = async function(targetPlaylist) {
+        if (!songList || songList.length === 0) return;
+        showToast(`⏳ 正在批量加入 ${songList.length} 首歌到 ${targetPlaylist.replace(/^🎵\s*/, '')}...`, true);
+
+        const localSongs = [];
+        const onlineSongs = [];
+
+        songList.forEach(rawItem => {
+            const isFreshOnlineJson = typeof rawItem === 'object' && rawItem !== null && !rawItem._isSavedOnlineStr;
+            if (isFreshOnlineJson) onlineSongs.push(rawItem);
+            else localSongs.push(window.getSongNameObj(rawItem));
+        });
+
+        let isNewPlaylist = !document.querySelector(`#playlist-opts .select-option[data-key="${targetPlaylist}"]`);
+        let isSuccess = true;
+
+        if (localSongs.length > 0) {
+            if (!allPlaylists[targetPlaylist]) {
+                allPlaylists[targetPlaylist] = [];
+            }
+            localSongs.forEach(songName => {
+                if (!allPlaylists[targetPlaylist].includes(songName)) allPlaylists[targetPlaylist].push(songName);
+            });
+            try {
+                const res = await fetch('/playlistupdatemusic', {
+                    method: 'POST', headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ name: targetPlaylist, music_list: allPlaylists[targetPlaylist] })
+                });
+                const data = await res.json();
+                if (data.ret !== "OK") isSuccess = false;
+            } catch(e) { isSuccess = false; }
+        }
+
+        if (onlineSongs.length > 0) {
+            const currentEngine = document.getElementById('engine-val')?.dataset.value || 'MusicFree';
+            const prefix = currentEngine === 'MusicFree' ? '_online_mf_' : '_online_lx_';
+            const hiddenListName = prefix + targetPlaylist;
+
+            try {
+                const settingRes = await fetch(API.setting + '?t=' + Date.now());
+                const settingData = await settingRes.json();
+                let musicArr = JSON.parse(settingData.music_list_json || '[]');
+
+                let plIndex = musicArr.findIndex(pl => pl.name === hiddenListName);
+                if (plIndex === -1) {
+                    musicArr.push({ name: hiddenListName, musics: [] });
+                    plIndex = musicArr.length - 1;
+                }
+
+                onlineSongs.forEach(rawItem => {
+                    const jsonStr = JSON.stringify(rawItem);
+                    const utf8Bytes = new TextEncoder().encode(jsonStr);
+                    const binStr = Array.from(utf8Bytes).map(b => String.fromCharCode(b)).join('');
+                    const b64Data = window.btoa(binStr);
+                    const selfUrl = "self:///api/proxy/plugin-url?data=" + b64Data;
+                    const songNameStr = window.getSongNameObj(rawItem);
+
+                    const wrappedSong = { name: songNameStr, url: selfUrl, type: "music", tags: rawItem };
+                    const isExist = musicArr[plIndex].musics.some(m => window.getSongNameObj(m) === songNameStr);
+                    if (!isExist) musicArr[plIndex].musics.push(wrappedSong);
+                });
+
+                const saveRes = await fetch('/savesetting', {
+                    method: 'POST', headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ music_list_json: JSON.stringify(musicArr) })
+                });
+                const saveData = await saveRes.json();
+                if (saveData !== "save success" && saveData !== "success" && saveData.ret !== "OK") isSuccess = false;
+            } catch (e) { isSuccess = false; }
+        }
+
+        if (isSuccess) {
+            showToast(`🎉 批量加入成功！`);
+            if (typeof reloadGlobalData === 'function') await reloadGlobalData();
+            if (isNewPlaylist && typeof initPlaylistDropdown === 'function') {
+                initPlaylistDropdown();
+            } else {
+                const newText = formatPlaylistText(targetPlaylist, window.getMergedSongList(targetPlaylist).length);
+                const opt = document.querySelector(`#playlist-opts .select-option[data-key="${targetPlaylist}"]`);
+                if (opt) opt.innerHTML = newText;
+                if (currentPlaylist === targetPlaylist) {
+                    if (playlistVal) playlistVal.innerHTML = newText;
+                    songList = window.getMergedSongList(targetPlaylist);
+                    renderPlaylist();
+                }
+            }
+        } else {
+            showToast("⚠️ 部分歌曲加入失败，请检查网络状态");
+        }
+    };
+
+    window.toggleMfPlugin = async (name, enable, btnElement) => {
+        const originalText = btnElement.innerText;
+        btnElement.disabled = true;
+        btnElement.style.opacity = '0.5';
+        btnElement.innerText = '请稍候...';
+        showToast(`⏳ 正在${enable ? '启用' : '禁用'} ${name}...`, true);
+        try {
+            const res = await fetch(`/api/js-plugins/${name}/${enable ? 'enable' : 'disable'}`, { method: 'PUT' });
+            const data = await res.json();
+            if (data.success) {
+                showToast(`✅ ${name} 已${enable ? '启用' : '禁用'}`);
+                renderMfPluginManager();
+                loadMFPlugins();
+            } else {
+              btnElement.disabled = false;
+              btnElement.style.opacity = '1';
+              btnElement.innerText = originalText;
+              showToast("❌ 操作失败：" + data.error);
+            }
+        } catch(e) {
+          btnElement.disabled = false;
+          btnElement.style.opacity = '1';
+          btnElement.innerText = originalText;
+          showToast("❌ 网络错误");
+        }
+    };
+
+    window.pinMfPlugin = async (name, btnElement) => {
+        const originalText = btnElement.innerText;
+        btnElement.disabled = true;
+        btnElement.style.opacity = '0.5';
+        btnElement.innerText = '置顶中...';
+        showToast(`⏳ 正在置顶 ${name}...`, true);
+        try {
+            let res = await fetch(`/api/js-plugins/${name}/disable`, { method: 'PUT' });
+            let data = await res.json();
+            if (!data.success) throw new Error(data.error || "禁用阶段失败");
+
+            res = await fetch(`/api/js-plugins/${name}/enable`, { method: 'PUT' });
+            data = await res.json();
+            if (!data.success) throw new Error(data.error || "启用阶段失败");
+
+            showToast(`✅ ${name} 已成功置顶！`);
+            renderMfPluginManager();
+            loadMFPlugins();
+        } catch(e) {
+          btnElement.disabled = false;
+          btnElement.style.opacity = '1';
+          btnElement.innerText = originalText;
+          showToast("❌ 置顶失败：" + e.message);
+        }
+    };
+
+    window.uninstallMfPlugin = async (name, btnElement) => {
+        if (!confirm(`彻底删除插件 "${name}" 吗？此操作不可恢复。`)) return;
+        const originalText = btnElement.innerText;
+        btnElement.disabled = true;
+        btnElement.style.opacity = '0.5';
+        btnElement.innerText = '删除中...';
+        try {
+            const res = await fetch(`/api/js-plugins/${name}/uninstall`, { method: 'DELETE' });
+            const data = await res.json();
+            if (data.success) {
+              showToast("🗑️ 插件已彻底删除");
+              renderMfPluginManager();
+              loadMFPlugins();
+            } else {
+              btnElement.disabled = false;
+              btnElement.style.opacity = '1';
+              btnElement.innerText = originalText;
+              showToast("❌ 删除失败：" + data.error);
+            }
+        } catch(e) {
+          btnElement.disabled = false;
+          btnElement.style.opacity = '1';
+          btnElement.innerText = originalText;
+          showToast("❌ 网络错误");
+        }
+    };
+
+    /* ==========================================
+     * 8. 渲染初始化引擎 (Dropdowns, Lists)
+     * ========================================== */
     async function loadMFPlugins() {
       try {
         const response = await fetch('/api/js-plugins?enabled_only=true');
@@ -2302,6 +3149,12 @@
               optsUl.classList.remove('show');
               optsUl.querySelectorAll('.select-option').forEach(el => el.classList.remove('active'));
               li.classList.add('active');
+
+              const mfSearchInput = document.getElementById('mf-search-input');
+              const mfSearchBtn = document.getElementById('mf-search-btn');
+              if (mfSearchInput && mfSearchInput.value.trim() !== '' && mfSearchBtn) {
+                  mfSearchBtn.click();
+              }
             });
             optsUl.appendChild(li);
           };
@@ -2319,20 +3172,26 @@
     function performLocalSearch(keyword) {
       keyword = keyword.trim().toLowerCase();
       if (!keyword) {
-        allPlaylists['搜索'] = [];
+        if (currentDid !== "" && allPlaylists['_local_iwebplayer_search'] && allPlaylists['_local_iwebplayer_search'].length > 0) {
+            songList = allPlaylists['_local_iwebplayer_search'];
+        } else {
+            allPlaylists['本地搜索'] = [];
+            songList = [];
+        }
       } else {
         const allSongs = allPlaylists['所有歌曲'] || [];
-        allPlaylists['搜索'] = allSongs.filter(song => song.toLowerCase().includes(keyword));
+        allPlaylists['本地搜索'] = allSongs.filter(song => song.toLowerCase().includes(keyword));
+        songList = allPlaylists['本地搜索'];
       }
-      if (currentPlaylist === '搜索') {
-        songList = allPlaylists['搜索'];
+
+      if (currentPlaylist === '本地搜索') {
         renderPlaylist();
-        const text = formatPlaylistText('搜索', songList.length);
-        playlistVal.innerHTML = text;
-        const searchOpt = document.querySelector('#playlist-opts .select-option[data-key="搜索"]');
+        const text = formatPlaylistText('本地搜索', songList.length);
+        if (playlistVal) playlistVal.innerHTML = text;
+        const searchOpt = document.querySelector('#playlist-opts .select-option[data-key="本地搜索"]');
         if (searchOpt) searchOpt.innerHTML = text;
       }
-      document.getElementById('search-save').classList.toggle('show', allPlaylists['搜索'].length > 0);
+      if (searchSaveBtn) searchSaveBtn.classList.toggle('show', (!keyword ? false : (allPlaylists['本地搜索']||[]).length > 0));
     }
 
     function initDeviceDropdown(devicesMap) {
@@ -2361,6 +3220,12 @@
           updatePlayButtonUI(isPlaying);
           updateVolumeDeviceUI();
           updatePushBtnState();
+          if (typeof updateVoiceCmdIconUI === 'function') updateVoiceCmdIconUI();
+
+          if (currentPlaylist === '本地搜索') {
+              if (searchInput) performLocalSearch(searchInput.value);
+          }
+
           deviceVal.innerHTML = li.innerHTML;
           li.classList.contains('device-offline') ? deviceVal.classList.add('device-offline') : deviceVal.classList.remove('device-offline');
           deviceOpts.classList.remove('show');
@@ -2380,6 +3245,11 @@
             }).catch(()=>{});
             await updateDevicePresence();
             startRemotePolling();
+
+            if (currentPlaylist === '本地搜索') {
+                if (searchInput) performLocalSearch(searchInput.value);
+            }
+
             try {
               const res = await fetch(API.getVolume + currentDid);
               const data = await res.json();
@@ -2403,21 +3273,27 @@
             deviceVal.innerHTML = "本机";
             deviceVal.classList.remove('device-offline');
 
-            if (localState.playlist && allPlaylists[localState.playlist]) {
+            const isValidPlaylist = localState.playlist && Array.from(document.querySelectorAll('#playlist-opts .select-option')).some(opt => opt.dataset.key === localState.playlist);
+            if (isValidPlaylist) {
               currentPlaylist = localState.playlist;
-              songList = allPlaylists[currentPlaylist];
-              playlistVal.innerHTML = formatPlaylistText(currentPlaylist, songList.length);
               document.querySelectorAll('#playlist-opts .select-option').forEach(opt => {
                 opt.classList.remove('active');
                 if (opt.dataset.key === currentPlaylist) opt.classList.add('active');
               });
 
-              // 统一调用司令部
               updateSearchUI(currentPlaylist);
 
-              renderPlaylist();
+              if (currentPlaylist === '本地搜索') {
+                  if (searchInput) performLocalSearch(searchInput.value);
+              } else if (currentPlaylist !== '在线资源') {
+                  songList = window.getMergedSongList(currentPlaylist);
+                  renderPlaylist();
+              }
+
+              playlistVal.innerHTML = formatPlaylistText(currentPlaylist, songList.length);
+
               if (localState.songName) {
-                const idx = songList.indexOf(localState.songName);
+                const idx = songList.findIndex(item => window.getSongNameObj(item) === localState.songName);
                 if (idx !== -1) playSong(idx, false, localCurrentTime);
               }
             } else {
@@ -2435,8 +3311,19 @@
 
     function initPlaylistDropdown() {
       playlistOpts.innerHTML = '';
-      let defaultKey = '';
-      for (const key in allPlaylists) {
+
+      const uniqueBaseNames = new Set();
+      Object.keys(allPlaylists).forEach(k => {
+          if (k === '全部' || k === '_local_iwebplayer_search') return;
+          if (k.startsWith('_online_mf_')) uniqueBaseNames.add(k.replace('_online_mf_', ''));
+          else if (k.startsWith('_online_lx_')) uniqueBaseNames.add(k.replace('_online_lx_', ''));
+          else uniqueBaseNames.add(k);
+      });
+      const allCleanKeys = Array.from(uniqueBaseNames);
+
+      let defaultKey = (currentPlaylist && allCleanKeys.includes(currentPlaylist)) ? currentPlaylist : '';
+
+      for (const key of allCleanKeys) {
         if (!defaultKey && key === '所有歌曲') defaultKey = key;
       }
       if (!defaultKey && Object.keys(allPlaylists).length > 0) {
@@ -2447,7 +3334,8 @@
         const li = document.createElement('li');
         li.className = 'select-option';
         li.dataset.key = key;
-        li.innerHTML = formatPlaylistText(key, allPlaylists[key].length);
+
+        li.innerHTML = formatPlaylistText(key, window.getMergedSongList(key).length);
 
         li.addEventListener('click', (e) => {
           e.stopPropagation();
@@ -2455,49 +3343,84 @@
           playlistVal.innerHTML = li.innerHTML;
           playlistOpts.classList.remove('show');
           updatePushBtnState();
-          if (currentDid !== "" && currentPlaylist === '搜索') showToast(MSG_SEARCH_LOCAL_ONLY);
+
           playlistOpts.querySelectorAll('.select-option').forEach(el => el.classList.remove('active'));
           li.classList.add('active');
 
-          if (key === '搜索') {
-            const savedKeyword = localStorage.getItem('local_search_keyword') || '';
-            if (typeof performLocalSearch === 'function') performLocalSearch(savedKeyword);
-            li.innerHTML = formatPlaylistText('搜索', allPlaylists['搜索'].length);
-          } else if (key === '在线资源') {
-            li.innerHTML = formatPlaylistText('在线资源', allPlaylists['在线资源'].length);
-          }
+          if (key === '收藏') showToast("💡 提示：长按任意歌曲可 加入/移出 收藏");
 
           updateSearchUI(key);
 
-          if (key === '收藏') showToast("💡 提示：长按任意歌曲可 加入/移出 收藏");
-          songList = allPlaylists[key] || [];
+          if (key === '本地搜索') {
+            const savedKeyword = localStorage.getItem('local_search_keyword') || '';
+            if (typeof performLocalSearch === 'function') performLocalSearch(savedKeyword);
+          } else if (key !== '在线资源') {
+            songList = window.getMergedSongList(key);
+            renderPlaylist();
+          }
+
+          li.innerHTML = formatPlaylistText(key, songList.length);
           playlistVal.innerHTML = li.innerHTML;
-          renderPlaylist();
           window.scrollTo({ top: 0, behavior: 'smooth' });
         });
         playlistOpts.appendChild(li);
       };
 
-      const predefinedOrder = ['在线资源', '所有歌曲', '所有电台', '收藏', '搜索', '下载', '最近新增'];
-      const hiddenPlaylists = ['全部', '_online_musicfree'];
+      const predefinedOrder = ['在线资源', '本地搜索', '所有电台', '所有歌曲', '最近新增', '收藏', '下载'];
+      const hiddenPlaylists = ['全部', '_local_iwebplayer_search'];
 
-      if (!allPlaylists['其他'] || allPlaylists['其他'].length === 0) hiddenPlaylists.push('其他');
-      if (!allPlaylists['下载'] || allPlaylists['下载'].length === 0) hiddenPlaylists.push('下载');
+      if (window.getMergedSongList('其他').length === 0) hiddenPlaylists.push('其他');
+      if (window.getMergedSongList('下载').length === 0) hiddenPlaylists.push('下载');
+      if (window.getMergedSongList('所有电台').length === 0) hiddenPlaylists.push('所有电台');
 
-      if (!allPlaylists['所有电台'] || allPlaylists['所有电台'].length === 0) hiddenPlaylists.push('所有电台');
+      const systemKeys = predefinedOrder.filter(k => allCleanKeys.includes(k) && !hiddenPlaylists.includes(k));
+      const customKeys = [];
+      const localFolderKeys = [];
 
-      const allKeys = Object.keys(allPlaylists).filter(k => !hiddenPlaylists.includes(k));
-      const customKeys = allKeys.filter(k => !predefinedOrder.includes(k)).sort((a, b) => a.localeCompare(b, 'zh-CN'));
-      const sortedKeys = [...predefinedOrder.filter(k => allKeys.includes(k)), ...customKeys];
+      allCleanKeys.forEach(k => {
+          if (predefinedOrder.includes(k) || hiddenPlaylists.includes(k)) return;
+          if (k === '_online_iwebplayer_search' || k.startsWith('🎵') || (window.customPlaylistNames && window.customPlaylistNames.includes(k))) {
+              customKeys.push(k);
+          } else {
+              localFolderKeys.push(k);
+          }
+      });
 
-      sortedKeys.forEach(key => createOpt(key));
+      customKeys.sort((a, b) => {
+          const nameA = a === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : a.replace(/^🎵\s*/, '');
+          const nameB = b === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : b.replace(/^🎵\s*/, '');
+          return nameA.localeCompare(nameB, 'zh-CN');
+      });
+      localFolderKeys.sort((a, b) => a.localeCompare(b, 'zh-CN'));
+
+      systemKeys.forEach(key => createOpt(key));
+
+      if (customKeys.length > 0) {
+          if (systemKeys.length > 0) {
+              if (playlistOpts.lastElementChild) playlistOpts.lastElementChild.style.borderBottom = 'none';
+              const sep = document.createElement('li');
+              sep.style.cssText = 'height: 1px; background: var(--border); margin: 6px 16px; cursor: default; box-sizing: content-box;';
+              playlistOpts.appendChild(sep);
+          }
+          customKeys.forEach(key => createOpt(key));
+      }
+
+      if (localFolderKeys.length > 0) {
+          if (systemKeys.length > 0 || customKeys.length > 0) {
+              if (playlistOpts.lastElementChild) playlistOpts.lastElementChild.style.borderBottom = 'none';
+              const sep = document.createElement('li');
+              sep.style.cssText = 'height: 1px; background: var(--border); margin: 6px 16px; cursor: default; box-sizing: content-box;';
+              playlistOpts.appendChild(sep);
+          }
+          localFolderKeys.forEach(key => createOpt(key));
+      }
 
       if (defaultKey) {
         currentPlaylist = defaultKey;
-        playlistVal.innerHTML = formatPlaylistText(defaultKey, allPlaylists[defaultKey].length);
+        playlistVal.innerHTML = formatPlaylistText(defaultKey, window.getMergedSongList(defaultKey).length);
         const firstOpt = Array.from(playlistOpts.children).find(li => li.dataset.key === defaultKey);
         if(firstOpt) firstOpt.classList.add('active');
-        songList = allPlaylists[defaultKey] || [];
+        songList = window.getMergedSongList(defaultKey);
         playlistContainer.style.display = 'block';
       }
     }
@@ -2505,23 +3428,98 @@
     function renderPlaylist() {
       playlistEl.innerHTML = '';
       let isCurrentSongInNewList = false;
+      closeAllSongMenus();
 
-      songList.forEach((songName, index) => {
+      if (songList.length === 0) {
+        if (currentPlaylist === '在线资源') {
+          playlistEl.innerHTML = '<div style="text-align: center; padding: 40px; color: var(--text-sub); font-size: 14px;">暂无在线资源，请输入歌曲全网搜索</div>';
+        } else if (currentPlaylist === '本地搜索') {
+          playlistEl.innerHTML = '<div style="text-align: center; padding: 40px; color: var(--text-sub); font-size: 14px;">暂无搜索结果</div>';
+        } else if (currentPlaylist !== '') {
+          playlistEl.innerHTML = '<div style="text-align: center; padding: 40px; color: var(--text-sub); font-size: 14px;">列表为空</div>';
+        }
+        currentIndex = -1;
+        return;
+      }
+
+      songList.forEach((rawItem, index) => {
+        const isOnlineObj = typeof rawItem === 'object' && rawItem !== null;
+        const songName = window.getSongNameObj(rawItem);
+        const onlineSvg = isOnlineObj ? `<svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" style="margin-right: 6px; vertical-align: -2px; color: var(--primary); opacity: 0.8;" title="在线资源"><circle cx="12" cy="12" r="10"></circle><line x1="2" y1="12" x2="22" y2="12"></line><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"></path></svg>` : '';
         const li = document.createElement('li');
         li.className = 'song-item';
         li.id = 'song-' + index;
+        li.style.position = 'relative';
+
         if (songName === currentSongName) {
           li.classList.add('playing');
           currentIndex = index;
           isCurrentSongInNewList = true;
         }
 
-        let deleteHtml = '';
-        if (currentPlaylist === '搜索') {
-          deleteHtml = `<div class="song-delete-icon" id="del-${index}" title="从搜索结果中移除"><svg viewBox="0 0 24 24" width="18" height="18" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg></div>`;
+        const isCustom = currentPlaylist.startsWith('🎵');
+        let menuItems = [];
+
+        if (currentPlaylist === '在线资源') {
+            menuItems = ['加入', '移出', '下载', '信息'];
+        } else if (currentPlaylist === '本地搜索') {
+            menuItems = ['加入', '移出', '下载', '信息'];
+        } else if (currentPlaylist === '收藏') {
+            menuItems = ['加入', '下载', '信息'];
+        } else if (isCustom) {
+            menuItems = ['加入', '移出', '下载', '信息'];
+        } else {
+            menuItems = ['加入', '下载', '信息'];
+        }
+        const MENU_ICONS = {
+            '移出': `<svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right: 10px; opacity: 0.75;"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg>`,
+            '加入': `<svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right: 10px; opacity: 0.75;"><circle cx="12" cy="12" r="10"></circle><circle cx="12" cy="12" r="3"></circle><path d="M12 6a6 6 0 0 0-6 6"></path></svg>`,
+            '下载': `<svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right: 10px; opacity: 0.75;"><path d="M8 17l4 4 4-4"></path><line x1="12" y1="12" x2="12" y2="21"></line><path d="M20.88 18.09A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.29"></path></svg>`,
+            '信息': `<svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round" style="margin-right: 10px; opacity: 0.75;"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="16" x2="12" y2="12"></line><line x1="12" y1="8" x2="12.01" y2="8"></line></svg>`
+        };
+
+        let menuHtml = `<ul class="song-more-menu" id="song-menu-${index}">`;
+        menuItems.forEach(item => {
+            const isDisabled = (item === '下载' || item === '信息');
+            const iconHtml = MENU_ICONS[item] || '';
+            menuHtml += `<li class="song-more-menu-item ${isDisabled ? 'disabled' : ''}" data-action="${item}" onclick="void(0)">${iconHtml}${item}</li>`;
+        });
+        menuHtml += `</ul>`;
+
+        const moreBtnHtml = `
+          <div class="song-more-btn" id="more-btn-${index}" title="更多操作">
+            <svg viewBox="0 0 24 24" width="18" height="18" fill="currentColor" stroke="none">
+              <circle cx="12" cy="5" r="2"></circle>
+              <circle cx="12" cy="12" r="2"></circle>
+              <circle cx="12" cy="19" r="2"></circle>
+            </svg>
+          </div>
+        `;
+
+        let platformStr = isOnlineObj ? (rawItem.platform || (rawItem.tags && rawItem.tags.platform) || '') : '';
+
+        if (!platformStr && isOnlineObj && rawItem.url && typeof rawItem.url === 'string' && rawItem.url.includes('plugin-url?data=')) {
+            try {
+                const b64Data = rawItem.url.split('plugin-url?data=')[1];
+                const binStr = window.atob(b64Data);
+                const bytes = new Uint8Array(binStr.length);
+                for (let i = 0; i < binStr.length; i++) bytes[i] = binStr.charCodeAt(i);
+                const decodedItem = JSON.parse(new TextDecoder('utf-8').decode(bytes));
+                platformStr = decodedItem.platform || '';
+            } catch (e) {}
         }
 
-        li.innerHTML = `<div class="song-info"><div class="song-name">${songName}</div></div><div class="song-fav-icon" id="fav-${index}" style="display: ${favoriteList.includes(songName) ? 'block' : 'none'};"><svg viewBox="0 0 24 24" width="18" height="18" fill="var(--primary)" color="var(--primary)"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg></div>${deleteHtml}`;
+        const platformHtml = platformStr ? `<div class="song-platform-tag">${platformStr}</div>` : '';
+
+        li.innerHTML = `
+          <div class="song-info"><div class="song-name">${onlineSvg}${songName}</div></div>
+          ${platformHtml}
+          <div class="song-fav-icon" id="fav-${index}" style="display: ${favoriteList.includes(songName) ? 'block' : 'none'};">
+            <svg viewBox="0 0 24 24" width="18" height="18" fill="var(--primary)" color="var(--primary)"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>
+          </div>
+          ${moreBtnHtml}
+          ${menuHtml}
+        `;
 
         let pressTimer;
         let isLongPress = false;
@@ -2529,6 +3527,7 @@
         let touchHandled = false;
 
         const startPress = (e) => {
+          if (e.target.closest('.song-more-btn') || e.target.closest('.song-more-menu')) return;
           if (e.type.startsWith('touch')) touchHandled = true;
           if (e.type === 'mousedown' && touchHandled) return;
           if (e.type === 'mousedown' && e.button !== 0) return;
@@ -2536,7 +3535,13 @@
           startY = e.touches ? e.touches[0].clientY : e.clientY;
           pressTimer = setTimeout(() => {
             isLongPress = true;
-            toggleFavorite(songName, index);
+            if (isOnlineObj) {
+                if (typeof window.showDevModal === 'function') {
+                    window.showDevModal('在线歌曲收藏', '<strong>在线歌曲收藏</strong> 将下载到 XiaoMusic 服务器。<br><br>功能还在开发中。');
+                }
+            } else {
+                toggleFavorite(songName, index);
+            }
           }, 500);
         };
         const cancelPress = () => {
@@ -2564,29 +3569,148 @@
             isLongPress = false;
             return;
           }
-          if (currentDid !== "" && currentPlaylist === '搜索') {
-            showToast(MSG_SEARCH_LOCAL_ONLY);
+          if (activeSongMenuIndex !== -1) {
+            e.preventDefault();
+            e.stopPropagation();
+            closeAllSongMenus();
             return;
           }
           playSong(index);
         });
 
-        const delBtn = li.querySelector(`#del-${index}`);
-        if (delBtn) {
-          const stopEvent = (e) => e.stopPropagation();
-          delBtn.addEventListener('mousedown', stopEvent);
-          delBtn.addEventListener('touchstart', stopEvent, {passive: true});
-          delBtn.addEventListener('click', (e) => {
+        const moreBtn = li.querySelector(`#more-btn-${index}`);
+        const currentMenu = li.querySelector(`#song-menu-${index}`);
+        moreBtn.addEventListener('click', (e) => {
             e.stopPropagation();
-            songList.splice(index, 1);
-            const text = formatPlaylistText('搜索', songList.length);
-            playlistVal.innerHTML = text;
-            const searchOpt = document.querySelector('#playlist-opts .select-option[data-key="搜索"]');
-            if (searchOpt) searchOpt.innerHTML = text;
-            document.getElementById('search-save').classList.toggle('show', songList.length > 0);
-            renderPlaylist();
-          });
-        }
+            if (activeSongMenuIndex === index) {
+                closeAllSongMenus();
+            } else {
+                closeAllSongMenus();
+                activeSongMenuIndex = index;
+                li.classList.add('menu-open');
+
+                const rect = moreBtn.getBoundingClientRect();
+                const spaceBelow = window.innerHeight - rect.bottom;
+
+                if (spaceBelow < 400) {
+                    currentMenu.style.top = 'auto';
+                    currentMenu.style.bottom = '40px';
+                    currentMenu.style.boxShadow = '0 -6px 20px rgba(0,0,0,0.12)';
+                } else {
+                    currentMenu.style.top = '36px';
+                    currentMenu.style.bottom = 'auto';
+                    currentMenu.style.boxShadow = '0 6px 20px rgba(0,0,0,0.12)';
+                }
+
+                currentMenu.classList.add('show');
+            }
+        });
+
+        const menuEls = li.querySelectorAll(`#song-menu-${index} .song-more-menu-item`);
+        menuEls.forEach(menuEl => {
+            menuEl.addEventListener('click', (e) => {
+                e.stopPropagation();
+                const action = menuEl.dataset.action;
+
+                if (menuEl.classList.contains('disabled')) {
+                    showToast("努力开发中 🚀");
+                    closeAllSongMenus();
+                    return;
+                }
+
+                if (action === '加入') {
+                    if (window.skipAddConfirm && window.lastAddedPlaylist) {
+                        if (typeof window.executeAddSong === 'function') {
+                            window.executeAddSong(index, songName, window.lastAddedPlaylist);
+                        }
+                    } else {
+                        window.pendingAddIndex = index;
+                        window.pendingAddSongName = songName;
+                        const nameSpan = document.getElementById('add-song-name');
+                        if (nameSpan) nameSpan.textContent = songName;
+
+                        const listEl = document.getElementById('add-song-playlist-list');
+                        if (listEl) {
+                            listEl.innerHTML = '';
+                            const customKeysSet = new Set();
+                            Object.keys(allPlaylists).forEach(key => {
+                                let baseName = key;
+                                if (key.startsWith('_online_mf_')) baseName = key.replace('_online_mf_', '');
+                                else if (key.startsWith('_online_lx_')) baseName = key.replace('_online_lx_', '');
+
+                                const isSystem = ['收藏', '在线资源', '本地搜索', '所有歌曲', '最近新增', '下载', '所有电台', '全部', '_local_iwebplayer_search', '其他'];
+                                if (!isSystem.includes(baseName)) {
+                                    if (baseName === '_online_iwebplayer_search' || baseName.startsWith('🎵') || (window.customPlaylistNames && window.customPlaylistNames.includes(baseName))) {
+                                        customKeysSet.add(baseName);
+                                    }
+                                }
+                            });
+
+                            const customKeys = Array.from(customKeysSet).sort((a, b) => {
+                                const nameA = a === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : a.replace(/^🎵\s*/, '');
+                                const nameB = b === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : b.replace(/^🎵\s*/, '');
+                                return nameA.localeCompare(nameB, 'zh-CN');
+                            });
+
+                            if (customKeys.length === 0) {
+                                listEl.innerHTML = '<li style="padding: 12px; text-align: center; color: var(--text-sub);">暂无自定义歌单，请在上方创建</li>';
+                            } else {
+                                customKeys.forEach(k => {
+                                    const li = document.createElement('li');
+                                    li.style.cssText = 'padding: 12px 16px; border-bottom: 1px solid var(--border); cursor: pointer; color: var(--text-main); font-size: 14px; display: flex; align-items: center; gap: 10px; transition: background 0.2s;';
+
+                                    let displayName = k.replace(/^🎵\s*/, '');
+                                    if (k === '_online_iwebplayer_search') displayName = '在线资源临时推送歌单';
+                                    const songCount = window.getMergedSongList ? window.getMergedSongList(k).length : 0;
+
+                                    li.innerHTML = `<input type="radio" name="add_target_pl" style="pointer-events: none; margin: 0; width: 16px; height: 16px; accent-color: var(--primary);"> <span>${displayName} <span style="opacity: 0.6; font-size: 12px; margin-left: 2px;">(${songCount})</span></span>`;
+                                    li.onmousedown = () => { li.style.backgroundColor = 'var(--border)'; };
+                                    li.onclick = () => {
+                                        Array.from(listEl.children).forEach(el => {
+                                            el.style.backgroundColor = 'transparent';
+                                            el.style.fontWeight = 'normal';
+                                            const radio = el.querySelector('input[type="radio"]');
+                                            if (radio) radio.checked = false;
+                                        });
+                                        li.style.backgroundColor = 'var(--card-bg)';
+                                        li.style.fontWeight = 'bold';
+
+                                        const myRadio = li.querySelector('input[type="radio"]');
+                                        if (myRadio) myRadio.checked = true;
+
+                                        window.tempSelectedPlaylist = k;
+                                    };
+                                    listEl.appendChild(li);
+                                });
+                            }
+                        }
+
+                        if (addSongModal) {
+                            addSongModal.classList.add('show');
+                            addSongModal.setAttribute('aria-hidden', 'false');
+                            document.body.style.overflow = 'hidden';
+                        }
+                    }
+                } else if (action === '移出') {
+                  if (window.skipRemoveConfirm) {
+                      if (typeof window.executeRemoveSong === 'function') window.executeRemoveSong(index, songName);
+                  } else {
+                      window.pendingRemoveIndex = index;
+                      window.pendingRemoveSongName = songName;
+                      const nameSpan = document.getElementById('remove-song-name');
+                      if (nameSpan) nameSpan.textContent = songName;
+
+                      if (removeSongModal) {
+                          removeSongModal.classList.add('show');
+                          removeSongModal.setAttribute('aria-hidden', 'false');
+                          document.body.style.overflow = 'hidden';
+                      }
+                  }
+              }
+              closeAllSongMenus();
+            });
+        });
+
         playlistEl.appendChild(li);
       });
       if (!isCurrentSongInNewList) currentIndex = -1;
@@ -2633,9 +3757,8 @@
         }
     }
 
-
     /* ==========================================
-     * 8. 交互事件总线管理
+     * 9. 交互事件总线管理
      * ========================================== */
     function bindAllEvents() {
         document.addEventListener('visibilitychange', () => {
@@ -2654,6 +3777,9 @@
             if (exceptId !== 'settings-opts' && settingsOpts) settingsOpts.classList.remove('show');
             if (exceptId !== 'mf-plugin-opts' && mfOpts) mfOpts.classList.remove('show');
             if (exceptId !== 'engine-opts' && engineOpts) engineOpts.classList.remove('show');
+
+            const historyList = document.getElementById('mf-search-history-list');
+            if (historyList) historyList.classList.remove('show');
         };
 
         deviceVal.addEventListener('click', (e) => {
@@ -2686,7 +3812,7 @@
               if (selectedEngine === 'LXServer') {
                 mfPluginContainer.style.opacity = '0.4';
                 mfPluginContainer.style.pointerEvents = 'none';
-                mfPluginVal.textContent = '暂不可用';
+                mfPluginVal.textContent = '努力开发中...';
                 if (mfSearchWrap) mfSearchWrap.classList.remove('show');
               } else {
                 mfPluginContainer.style.opacity = '1';
@@ -2726,8 +3852,57 @@
           if (!volumePopup.contains(e.target) && e.target !== btnVolume && !btnVolume.contains(e.target)) volumePopup.classList.remove('show');
           if (mfOpts && !e.target.closest('#mf-plugin-container')) mfOpts.classList.remove('show');
           if (engineOpts && !e.target.closest('#engine-container')) engineOpts.classList.remove('show');
+
+          const historyList = document.getElementById('mf-search-history-list');
+          if (historyList && !e.target.closest('#mf-search-input-wrap')) historyList.classList.remove('show');
+
+          if (!e.target.closest('.song-more-btn') && !e.target.closest('.song-more-menu')) {
+              if (typeof closeAllSongMenus === 'function') closeAllSongMenus();
+          }
         });
 
+        const settingVoiceCmdBtn = document.getElementById('setting-voice-cmd');
+        if (settingVoiceCmdBtn) {
+            settingVoiceCmdBtn.addEventListener('click', (e) => {
+                e.stopPropagation();
+                if (settingsOpts) settingsOpts.classList.remove('show');
+                showDevModal('定时口令配置');
+            });
+        }
+
+        const topVoiceIconBtn = document.getElementById('header-voice-disabled-icon');
+        if (topVoiceIconBtn) {
+            topVoiceIconBtn.addEventListener('click', async (e) => {
+                e.stopPropagation();
+                // 切换状态取反
+                const newState = !window.isVoiceCmdEnabled;
+                showToast(`⏳ 正在${newState ? '开启' : '屏蔽'} XiaoMusic 语音口令...`);
+
+                try {
+                    // 1. 发送修改请求
+                    await fetch('/api/system/modifiysetting', {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({ enable_pull_ask: newState })
+                    });
+
+                    // 2. 重新拉取 getsetting 确保状态真的变了
+                    const settingRes = await fetch(API.setting + '?t=' + Date.now());
+                    const settingData = await settingRes.json();
+
+                    // 3. 更新全局变量
+                    window.isVoiceCmdEnabled = settingData.enable_pull_ask !== false;
+
+                    // 4. 刷新图标 UI
+                    if (typeof updateVoiceCmdIconUI === 'function') updateVoiceCmdIconUI();
+
+                    showToast(window.isVoiceCmdEnabled ? `✅ XiaoMusic 语音口令已开启` : `✅ XiaoMusic 语音口令已屏蔽`);
+                } catch (error) {
+                    showToast("❌ 设置失败，请检查网络");
+                }
+            });
+        }
+
         if (settingRefreshBtn) {
           settingRefreshBtn.addEventListener('click', (e) => {
             e.stopPropagation();
@@ -2795,7 +3970,6 @@
         });
 
         btnPlay.addEventListener('click', () => {
-          if (currentDid !== "" && currentPlaylist === '搜索') { showToast(MSG_SEARCH_LOCAL_ONLY); return; }
           if (songList.length === 0) return;
           if (currentIndex === -1) { playSong(0); return; }
           if (currentDid !== "") {
@@ -2815,7 +3989,6 @@
         });
 
         btnPrev.addEventListener('click', () => {
-          if (currentDid !== "" && currentPlaylist === '搜索') { showToast(MSG_SEARCH_LOCAL_ONLY); return; }
           if (songList.length === 0) return;
           let nextIdx;
           if (playMode === 2 && songList.length > 1) {
@@ -2827,7 +4000,6 @@
         });
 
         btnNext.addEventListener('click', () => {
-          if (currentDid !== "" && currentPlaylist === '搜索') { showToast(MSG_SEARCH_LOCAL_ONLY); return; }
           if (songList.length === 0) return;
           let nextIdx;
           if (playMode === 2 && songList.length > 1) {
@@ -2864,7 +4036,6 @@
           }
         });
 
-        // 进度条拖拽控制
         function getPercentage(e) {
           const rect = progressBg.getBoundingClientRect();
           let clientX = e.clientX;
@@ -2898,7 +4069,6 @@
         document.addEventListener('touchmove', handleDragMove, { passive: false });
         document.addEventListener('touchend', handleDragEnd);
 
-        // 歌词全屏面板拖拽与切换
         function getLyricsOffset() {
           const m = /translateY\(-?(\d+(?:\.\d+)?)px\)/.exec(fpLyricsContainer.style.transform || '');
           return m ? parseFloat(m[1]) : 0;
@@ -2962,7 +4132,6 @@
         lyricsWrapper.addEventListener('touchmove',  onLyricsDragMove,  { passive: false });
         lyricsWrapper.addEventListener('touchend',   onLyricsDragEnd);
 
-        // 弹窗控制逻辑
         function closeAbout() {
           aboutBackdrop.classList.remove('show');
           aboutBackdrop.setAttribute('aria-hidden', 'true');
@@ -2993,30 +4162,226 @@
         if (devOk) devOk.addEventListener('click', closeDevModal);
         if (devBackdrop) devBackdrop.addEventListener('click', (e) => { if (e.target === devBackdrop) closeDevModal(); });
 
-        // 💡 提取出一个通用的“开发中”弹窗显示函数
-        function showDevModal(featureName) {
-            const nameEl = document.getElementById('dev-modal-feature-name');
-            if (nameEl) nameEl.textContent = featureName; // 动态替换文字
-            devBackdrop.classList.add('show');
-            devBackdrop.setAttribute('aria-hidden', 'false');
-            document.body.style.overflow = 'hidden';
-        }
+        const editPlBackdrop = document.getElementById('edit-playlist-backdrop');
+        const editPlList = document.getElementById('edit-playlist-list');
+        const editPlNewInput = document.getElementById('edit-pl-new-input');
+
+        const closeEditPlaylistModal = () => {
+            if (editPlBackdrop) {
+                editPlBackdrop.classList.remove('show');
+                editPlBackdrop.setAttribute('aria-hidden', 'true');
+                document.body.style.overflow = '';
+            }
+        };
+
+        document.getElementById('edit-playlist-close')?.addEventListener('click', closeEditPlaylistModal);
+        editPlBackdrop?.addEventListener('click', (e) => { if (e.target === editPlBackdrop) closeEditPlaylistModal(); });
+
+        const renderEditPlaylistItems = () => {
+            if (!editPlList) return;
+            editPlList.innerHTML = '';
+
+            const customKeysSet = new Set();
+            Object.keys(allPlaylists).forEach(key => {
+                let baseName = key;
+                if (key.startsWith('_online_mf_')) baseName = key.replace('_online_mf_', '');
+                else if (key.startsWith('_online_lx_')) baseName = key.replace('_online_lx_', '');
+
+                const isSystem = ['收藏', '在线资源', '本地搜索', '所有歌曲', '最近新增', '下载', '所有电台', '全部', '_local_iwebplayer_search', '其他'];
+                if (!isSystem.includes(baseName)) {
+                    if (baseName === '_online_iwebplayer_search' || baseName.startsWith('🎵') || (window.customPlaylistNames && window.customPlaylistNames.includes(baseName))) {
+                        customKeysSet.add(baseName);
+                    }
+                }
+            });
+
+            const customKeys = Array.from(customKeysSet).sort((a, b) => {
+                const nameA = a === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : a.replace(/^🎵\s*/, '');
+                const nameB = b === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : b.replace(/^🎵\s*/, '');
+                return nameA.localeCompare(nameB, 'zh-CN');
+            });
+
+            if (customKeys.length === 0) {
+                editPlList.innerHTML = '<li style="padding: 30px; text-align: center; color: var(--text-sub); font-size: 15px;">暂无自定义歌单</li>';
+                return;
+            }
+
+            customKeys.forEach(k => {
+                const li = document.createElement('li');
+                li.className = 'edit-pl-item';
+                let displayName = k.replace(/^🎵\s*/, '');
+                if (k === '_online_iwebplayer_search') displayName = '在线资源临时推送歌单';
+                const songCount = window.getMergedSongList ? window.getMergedSongList(k).length : 0;
+
+                const defaultHtml = `
+                  <div class="edit-pl-name-wrap">
+                    <svg viewBox="0 0 24 24" width="18" height="18" stroke="currentColor" stroke-width="2" fill="none"><circle cx="12" cy="12" r="10"></circle><circle cx="12" cy="12" r="3"></circle><path d="M12 6a6 6 0 0 0-6 6"></path></svg>
+                    <span class="edit-pl-name-text">${displayName} <span style="opacity: 0.6; font-size: 14px; font-weight: normal; margin-left: 2px;">(${songCount})</span></span>
+                  </div>
+                  <div class="edit-pl-actions">
+                    <button class="edit-pl-icon-btn rename" title="重命名"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg></button>
+                    <button class="edit-pl-icon-btn delete" title="删除"><svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg></button>
+                  </div>
+                `;
+                li.innerHTML = defaultHtml;
+
+                li.querySelector('.rename').addEventListener('click', () => {
+                    li.style.backgroundColor = 'var(--bg-color)';
+                    li.innerHTML = `
+                      <input type="text" class="edit-pl-inline-input" value="${displayName}">
+                      <div class="edit-pl-actions">
+                        <button class="edit-pl-text-btn edit-pl-cancel">取消</button>
+                        <button class="edit-pl-text-btn edit-pl-confirm-rename">保存</button>
+                      </div>
+                    `;
+                    const inputEl = li.querySelector('.edit-pl-inline-input');
+                    inputEl.focus();
+                    inputEl.select();
+
+                    li.querySelector('.edit-pl-cancel').addEventListener('click', renderEditPlaylistItems);
+
+                    li.querySelector('.edit-pl-confirm-rename').addEventListener('click', async () => {
+                        const newName = inputEl.value.trim();
+                        if (!newName || newName === displayName) { renderEditPlaylistItems(); return; }
+
+                        const finalOldName = k;
+                        const finalNewName = '🎵 ' + newName;
+                        showToast("⏳ 正在重命名...");
+
+                        try {
+                            // 只有普通歌单才调用物理重命名接口
+                            if (finalOldName !== '_online_iwebplayer_search') {
+                                await fetch('/playlistupdatename', {
+                                    method: 'POST', headers: { 'Content-Type': 'application/json' },
+                                    body: JSON.stringify({ oldname: finalOldName, newname: finalNewName })
+                                });
+                            }
+
+                            const settingRes = await fetch(API.setting + '?t=' + Date.now());
+                            const settingData = await settingRes.json();
+                            if (settingData.music_list_json) {
+                                let musicArr = JSON.parse(settingData.music_list_json);
+                                let changed = false;
+                                musicArr.forEach(pl => {
+                                    // 如果是临时歌单，直接在 JSON 里转正为 mf 格式保存
+                                    if (pl.name === '_online_iwebplayer_search' && finalOldName === '_online_iwebplayer_search') {
+                                        pl.name = '_online_mf_' + finalNewName;
+                                        changed = true;
+                                    }
+                                    if (pl.name === '_online_mf_' + finalOldName) { pl.name = '_online_mf_' + finalNewName; changed = true; }
+                                    if (pl.name === '_online_lx_' + finalOldName) { pl.name = '_online_lx_' + finalNewName; changed = true; }
+                                });
+                                if (changed) {
+                                    await fetch('/savesetting', {
+                                        method: 'POST', headers: {'Content-Type': 'application/json'},
+                                        body: JSON.stringify({ music_list_json: JSON.stringify(musicArr) })
+                                    });
+                                }
+                            }
+
+                            showToast("🎉 重命名成功！");
+                            if (currentPlaylist === finalOldName) currentPlaylist = finalNewName;
+                            await reloadGlobalData();
+                            initPlaylistDropdown();
+                            renderEditPlaylistItems();
+                        } catch (e) { showToast("❌ 网络异常"); renderEditPlaylistItems(); }
+                    });
+                });
+
+                li.querySelector('.delete').addEventListener('click', () => {
+                    li.style.backgroundColor = 'rgba(239,68,68,0.05)';
+                    li.innerHTML = `
+                      <span class="edit-pl-delete-warn">确定删除该歌单？</span>
+                      <div class="edit-pl-actions">
+                        <button class="edit-pl-text-btn edit-pl-cancel">取消</button>
+                        <button class="edit-pl-text-btn edit-pl-confirm-delete">删除</button>
+                      </div>
+                    `;
+
+                    li.querySelector('.edit-pl-cancel').addEventListener('click', renderEditPlaylistItems);
+
+                    li.querySelector('.edit-pl-confirm-delete').addEventListener('click', async () => {
+                        showToast("⏳ 正在彻底删除...");
+                        try {
+                            // 临时歌单绝不调用 playlistdel 物理删除接口
+                            if (k !== '_online_iwebplayer_search') {
+                                await fetch('/playlistdel', {
+                                    method: 'POST', headers: { 'Content-Type': 'application/json' },
+                                    body: JSON.stringify({ name: k })
+                                });
+                            }
+
+                            const settingRes = await fetch(API.setting + '?t=' + Date.now());
+                            const settingData = await settingRes.json();
+                            if (settingData.music_list_json) {
+                                let musicArr = JSON.parse(settingData.music_list_json);
+                                const initialLen = musicArr.length;
+                                // 过滤时，把自身 k 也作为条件加入过滤名单（针对临时歌单）
+                                musicArr = musicArr.filter(pl => pl.name !== k && pl.name !== '_online_mf_' + k && pl.name !== '_online_lx_' + k);
+                                if (musicArr.length !== initialLen) {
+                                    await fetch('/savesetting', {
+                                        method: 'POST', headers: {'Content-Type': 'application/json'},
+                                        body: JSON.stringify({ music_list_json: JSON.stringify(musicArr) })
+                                    });
+                                }
+                            }
+
+                            showToast("🗑️ 歌单已删除！");
+                            if (currentPlaylist === k) {
+                                currentPlaylist = "所有歌曲";
+                                updateSearchUI(currentPlaylist);
+                            }
+                            await reloadGlobalData();
+                            initPlaylistDropdown();
+                            renderEditPlaylistItems();
+                        } catch (e) { showToast("❌ 删除异常"); renderEditPlaylistItems(); }
+                    });
+                });
+
+                editPlList.appendChild(li);
+            });
+        };
+
+        window.renderEditPlaylistItems = renderEditPlaylistItems;
+
+        document.getElementById('edit-pl-create-btn')?.addEventListener('click', async () => {
+            const inputVal = editPlNewInput.value.trim();
+            if (!inputVal) { showToast("歌单名称不能为空哦"); return; }
+            const newListName = '🎵 ' + inputVal;
+
+            showToast("⏳ 正在创建...");
+            try {
+                const res = await fetch('/playlistadd', {
+                    method: 'POST', headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ name: newListName })
+                });
+                const data = await res.json();
+                if (data.ret === "OK" || data === "success") {
+                    showToast("🎉 创建成功！");
+                    editPlNewInput.value = '';
+                    await reloadGlobalData();
+                    initPlaylistDropdown();
+                    renderEditPlaylistItems();
+                } else {
+                    showToast("❌ 创建失败：" + (data.ret || "未知错误"));
+                }
+            } catch(e) { showToast("❌ 网络异常"); }
+        });
 
         if (settingCreatePlaylistBtn) {
           settingCreatePlaylistBtn.addEventListener('click', async (e) => {
             e.stopPropagation();
             if (settingsOpts) settingsOpts.classList.remove('show');
-            try {
-              const res = await fetch('iwebplayer_playlist.html', { method: 'HEAD' });
-              if (res.ok) window.open('iwebplayer_playlist.html', '_blank');
-              else showDevModal('自定义歌单');
-            } catch (err) {
-              showDevModal('自定义歌单');
+            const editPlBackdrop = document.getElementById('edit-playlist-backdrop');
+            if (editPlBackdrop) {
+              editPlBackdrop.classList.add('show');
+              editPlBackdrop.setAttribute('aria-hidden', 'false');
+              document.body.style.overflow = 'hidden';
+              if (typeof renderEditPlaylistItems === 'function') renderEditPlaylistItems();
             }
           });
         }
 
-        // 💡 新增的“歌曲下载”点击事件
         if (settingDownloadBtn) {
             settingDownloadBtn.addEventListener('click', (e) => {
                 e.stopPropagation();
@@ -3025,29 +4390,79 @@
             });
         }
 
-        const saveModal = document.getElementById('save-modal-backdrop');
-        const saveInput = document.getElementById('save-modal-input');
-        const delModal = document.getElementById('del-modal-backdrop');
-
-        function closeSaveModal() {
-          saveModal.classList.remove('show');
-          saveModal.setAttribute('aria-hidden', 'true');
-          document.body.style.overflow = '';
-        }
-        function closeDelModal() {
-          delModal.classList.remove('show');
-          delModal.setAttribute('aria-hidden', 'true');
-          document.body.style.overflow = '';
+        if (settingBatchImportBtn) {
+            settingBatchImportBtn.addEventListener('click', (e) => {
+                e.stopPropagation();
+                if (settingsOpts) settingsOpts.classList.remove('show');
+                showDevModal('批量导入');
+            });
         }
 
-        document.getElementById('save-modal-close').addEventListener('click', closeSaveModal);
-        document.getElementById('save-modal-cancel').addEventListener('click', closeSaveModal);
-        document.getElementById('del-modal-close').addEventListener('click', closeDelModal);
-        document.getElementById('del-modal-cancel').addEventListener('click', closeDelModal);
-        saveModal.addEventListener('click', (e) => { if (e.target === saveModal) closeSaveModal(); });
-        delModal.addEventListener('click', (e) => { if (e.target === delModal) closeDelModal(); });
+        function closeRemoveSongModal() {
+            removeSongModal.classList.remove('show');
+            removeSongModal.setAttribute('aria-hidden', 'true');
+            document.body.style.overflow = '';
+        }
+
+        document.getElementById('remove-song-close')?.addEventListener('click', closeRemoveSongModal);
+        document.getElementById('remove-song-cancel')?.addEventListener('click', closeRemoveSongModal);
+        removeSongModal?.addEventListener('click', (e) => { if (e.target === removeSongModal) closeRemoveSongModal(); });
+
+        document.getElementById('remove-song-confirm')?.addEventListener('click', () => {
+            if (removeSongDontAsk && removeSongDontAsk.checked) {
+                window.skipRemoveConfirm = true;
+            }
+            closeRemoveSongModal();
+            if (window.pendingRemoveIndex !== -1) {
+                window.executeRemoveSong(window.pendingRemoveIndex, window.pendingRemoveSongName);
+                window.pendingRemoveIndex = -1;
+            }
+        });
+
+        function closeAddSongModal() {
+            addSongModal.classList.remove('show');
+            addSongModal.setAttribute('aria-hidden', 'true');
+            if (newPlaylistInput) newPlaylistInput.value = '';
+            window.tempSelectedPlaylist = "";
+            window.pendingBulkAdd = false;
+            document.body.style.overflow = '';
+        }
+
+        document.getElementById('add-song-close')?.addEventListener('click', closeAddSongModal);
+        document.getElementById('add-song-cancel')?.addEventListener('click', closeAddSongModal);
+        addSongModal?.addEventListener('click', (e) => { if (e.target === addSongModal) closeAddSongModal(); });
+
+        document.getElementById('add-song-confirm')?.addEventListener('click', () => {
+            if (!window.tempSelectedPlaylist) { showToast("请先在上方选择一个目标歌单哦"); return; }
+            const finalTarget = window.tempSelectedPlaylist;
+
+            if (addSongDontAsk && addSongDontAsk.checked) {
+                window.skipAddConfirm = true;
+                window.lastAddedPlaylist = finalTarget;
+            }
+            const isBulk = window.pendingBulkAdd;
+            closeAddSongModal();
+
+            if (isBulk) window.executeBulkAdd(finalTarget);
+            else if (window.pendingAddIndex !== -1) window.executeAddSong(window.pendingAddIndex, window.pendingAddSongName, finalTarget);
+        });
+
+        document.getElementById('add-new-playlist-btn')?.addEventListener('click', () => {
+            const inputVal = newPlaylistInput.value.trim();
+            if (!inputVal) { showToast("歌单名称不能为空哦"); return; }
+            const newListName = '🎵 ' + inputVal;
+
+            if (addSongDontAsk && addSongDontAsk.checked) {
+                window.skipAddConfirm = true;
+                window.lastAddedPlaylist = newListName;
+            }
+            const isBulk = window.pendingBulkAdd;
+            closeAddSongModal();
+
+            if (isBulk) window.executeBulkAdd(newListName);
+            else if (window.pendingAddIndex !== -1) window.executeAddSong(window.pendingAddIndex, window.pendingAddSongName, newListName);
+        });
 
-        const mfPluginModal = document.getElementById('mf-plugin-backdrop');
         function closeMfPluginModal() {
           mfPluginModal.classList.remove('show');
           mfPluginModal.setAttribute('aria-hidden', 'true');
@@ -3057,7 +4472,6 @@
         document.getElementById('mf-plugin-close').addEventListener('click', closeMfPluginModal);
         mfPluginModal.addEventListener('click', (e) => { if (e.target === mfPluginModal) closeMfPluginModal(); });
 
-        const settingMfBtn = document.getElementById('setting-musicfree');
         if (settingMfBtn) {
             settingMfBtn.addEventListener('click', (e) => {
                 e.stopPropagation();
@@ -3069,9 +4483,6 @@
             });
         }
 
-        // 搜索框事件绑定
-        const searchInput = document.getElementById('search-input');
-        const searchClear = document.getElementById('search-clear');
         if (searchInput && searchClear) {
             searchInput.addEventListener('input', (e) => {
                 const keyword = e.target.value;
@@ -3088,9 +4499,48 @@
             });
         }
 
-        const mfSearchInput = document.getElementById('mf-search-input');
-        const mfSearchClear = document.getElementById('mf-search-clear');
         if (mfSearchInput && mfSearchClear) {
+            const historyList = document.getElementById('mf-search-history-list');
+            const renderSearchHistory = () => {
+                if (!historyList) return;
+                let history = JSON.parse(localStorage.getItem('mf_search_history_list') || '[]');
+                if (history.length === 0) {
+                    historyList.classList.remove('show');
+                    return;
+                }
+                historyList.innerHTML = history.map((kw, idx) => `
+                    <li class="history-item" data-index="${idx}">
+                        <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" stroke-width="2" fill="none" style="opacity:0.5"><circle cx="12" cy="12" r="10"></circle><polyline points="12 6 12 12 16 14"></polyline></svg>
+                        <span style="flex:1; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">${kw}</span>
+                    </li>
+                `).join('') + `<li class="history-clear-btn" id="history-clear-btn">清除历史记录</li>`;
+
+                historyList.querySelectorAll('.history-item').forEach(item => {
+                    item.addEventListener('click', (e) => {
+                        e.stopPropagation();
+                        const selectedKeyword = history[item.dataset.index];
+                        mfSearchInput.value = selectedKeyword;
+                        // 同步更新 LocalStorage 里的搜索关键词
+                        localStorage.setItem('mf_search_keyword', selectedKeyword);
+                        mfSearchClear.classList.add('show');
+                        historyList.classList.remove('show');
+                        const mfSearchBtn = document.getElementById('mf-search-btn');
+                        if (mfSearchBtn) mfSearchBtn.click();
+                    });
+                });
+
+                document.getElementById('history-clear-btn').addEventListener('click', (e) => {
+                    e.stopPropagation();
+                    localStorage.removeItem('mf_search_history_list');
+                    historyList.classList.remove('show');
+                });
+
+                historyList.classList.add('show');
+            };
+
+            mfSearchInput.addEventListener('focus', renderSearchHistory);
+            mfSearchInput.addEventListener('click', renderSearchHistory);
+
             mfSearchInput.addEventListener('input', (e) => {
               mfSearchClear.classList.toggle('show', e.target.value.length > 0);
               localStorage.setItem('mf_search_keyword', e.target.value);
@@ -3102,11 +4552,18 @@
               mfSearchInput.focus();
             });
 
-            // 核心搜索逻辑：检测选择的是哪个引擎
             const doOnlineSearch = async () => {
                 mfSearchInput.blur();
                 const keyword = mfSearchInput.value.trim();
                 if (!keyword) { showToast("请输入要搜索的关键词"); return; }
+
+                if (historyList) historyList.classList.remove('show');
+                let history = JSON.parse(localStorage.getItem('mf_search_history_list') || '[]');
+                history = history.filter(item => item !== keyword);
+                history.unshift(keyword);
+                if (history.length > 5) history = history.slice(0, 5);
+                localStorage.setItem('mf_search_history_list', JSON.stringify(history));
+
                 const currentEngine = document.getElementById('engine-val').dataset.value;
 
                 if (currentEngine === 'MusicFree') {
@@ -3115,13 +4572,10 @@
                     onlineMusicItems = [];
                     playlistEl.innerHTML = '<div style="text-align: center; padding: 40px; color: var(--text-sub); font-size: 14px;">正在全网抓取数据，请稍候...</div>';
 
-                    // 兜底处理器（Fallback）
                     const handleFallback = (errorMsg) => {
-                        // 设备隔离锁：只有在控制小爱音箱时，才使用音箱底层的历史歌单来兜底
-                        if (currentDid !== "" && allPlaylists['_online_musicfree'] && allPlaylists['_online_musicfree'].length > 0) {
-                            onlineMusicItems = []; // 标记为 fallback 状态，阻断下游抓取
-                            // 绝佳架构：只让界面的画笔临时指向历史歌单
-                            songList = allPlaylists['_online_musicfree'];
+                        if (currentDid !== "" && allPlaylists['_online_iwebplayer_search'] && allPlaylists['_online_iwebplayer_search'].length > 0) {
+                            onlineMusicItems = [];
+                            songList = allPlaylists['_online_iwebplayer_search'];
                             renderPlaylist();
                             const text = formatPlaylistText('在线资源', songList.length);
                             playlistVal.innerHTML = text;
@@ -3129,7 +4583,6 @@
                             if (mfOpt) mfOpt.innerHTML = text;
                             showToast(`⚠️ ${errorMsg}，已为您展示音箱的历史歌单`);
 
-                            // 尝试为正在播放的歌曲打上红框
                             if (currentSongName !== "") {
                                 const safeCurrent = cleanStr(currentSongName);
                                 const matchIdx = songList.findIndex(song => cleanStr(song) === safeCurrent);
@@ -3140,14 +4593,12 @@
                                 }
                             }
                         } else {
-                            // 本机模式，将画笔指回真实的空数据，重置计数器
                             songList = allPlaylists['在线资源'] || [];
                             const text = formatPlaylistText('在线资源', songList.length);
                             playlistVal.innerHTML = text;
                             const mfOpt = document.querySelector('#playlist-opts .select-option[data-key="在线资源"]');
                             if (mfOpt) mfOpt.innerHTML = text;
 
-                            // 并在界面干干净净地报错
                             playlistEl.innerHTML = `<div style="text-align: center; padding: 40px; color: var(--text-sub); font-size: 14px;">${errorMsg}</div>`;
                         }
                     };
@@ -3157,29 +4608,28 @@
                         const data = await response.json();
                         if (data.success && data.data && data.data.length > 0) {
                             onlineMusicItems = data.data;
-                            songList = onlineMusicItems.map(item => `${item.title} - ${item.artist}`);
+                            songList = [...onlineMusicItems];
                             allPlaylists['在线资源'] = songList;
                             renderPlaylist();
+
+                            if (mfSearchSaveBtn) mfSearchSaveBtn.classList.add('show');
                             const text = formatPlaylistText('在线资源', songList.length);
                             playlistVal.innerHTML = text;
                             const mfOpt = document.querySelector('#playlist-opts .select-option[data-key="在线资源"]');
                             if (mfOpt) mfOpt.innerHTML = text;
 
                             if (localState.playlist === '在线资源' && localState.songName) {
-                                // 判定 currentSongName === ""，确保这是刚打开网页的初始状态
                                 if (currentSongName === "") {
-                                    const matchIdx = songList.indexOf(localState.songName);
+                                    const matchIdx = songList.findIndex(item => window.getSongNameObj(item) === localState.songName);
                                     if (matchIdx !== -1) {
                                         playSong(matchIdx, false, 0);
                                     }
                                 }
                             }
                         } else {
-                            // 触发兜底：搜索到0个结果
                             handleFallback("未找到相关歌曲，换个词或换个音源试试吧");
                         }
                     } catch (error) {
-                        // 触发兜底：插件源失效报错
                         handleFallback("源请求失败");
                     }
                 } else if (currentEngine === 'LXServer') {
@@ -3197,79 +4647,6 @@
             }
         }
 
-        // 保存与删除自建歌单交互
-        const searchSaveBtn = document.getElementById('search-save');
-        if (searchSaveBtn) {
-            searchSaveBtn.addEventListener('click', () => {
-                const currentKeyword = searchInput.value.trim();
-                saveInput.value = currentKeyword ? currentKeyword : '我的搜索结果';
-                saveModal.classList.add('show');
-                saveModal.setAttribute('aria-hidden', 'false');
-                document.body.style.overflow = 'hidden';
-                setTimeout(() => { saveInput.focus(); }, 100);
-            });
-        }
-
-        document.getElementById('save-modal-confirm').addEventListener('click', () => {
-            const rawName = saveInput.value.trim();
-            if (!rawName) { showToast("歌单名称不能为空哦！"); return; }
-            const listName = '🎵 ' + rawName;
-            closeSaveModal();
-            const targetList = allPlaylists['搜索'];
-            showToast("⏳ 正在保存歌单...");
-            fetch('/playlistupdatemusic', {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ name: listName, music_list: targetList })
-            })
-            .then(res => res.json())
-            .then(data => {
-                if (data.ret === "OK") {
-                  showToast("🎉 保存成功！正在同步曲库...");
-                  localState.playlist = listName;
-                  localStorage.setItem('local_state', JSON.stringify(localState));
-                  refreshMusicList(true);
-                } else {
-                  showToast("❌ 保存失败：" + data.ret);
-                }
-            }).catch(err => { showToast("❌ 网络请求失败"); });
-        });
-
-        const inlineDeleteBtn = document.getElementById('inline-delete-btn');
-        if (inlineDeleteBtn) {
-            inlineDeleteBtn.addEventListener('click', () => {
-                document.getElementById('del-modal-text').textContent = `确定要彻底删除该歌单吗？`;
-                delModal.classList.add('show');
-                delModal.setAttribute('aria-hidden', 'false');
-                document.body.style.overflow = 'hidden';
-            });
-        }
-
-        document.getElementById('del-modal-confirm').addEventListener('click', () => {
-            closeDelModal();
-            if(inlineDeleteBtn) inlineDeleteBtn.innerHTML = `<svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"></circle><polyline points="12 6 12 12 16 14"></polyline></svg>`;
-            fetch('/playlistdel', {
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ name: currentPlaylist })
-            })
-            .then(res => res.json())
-            .then(data => {
-                if (data.ret === "OK") {
-                  showToast("🗑️ 歌单已成功删除！");
-                  localState.playlist = "所有歌曲";
-                  localStorage.setItem('local_state', JSON.stringify(localState));
-                  setTimeout(() => { window.location.reload(); }, 600);
-                } else {
-                  if(inlineDeleteBtn) inlineDeleteBtn.innerHTML = `<svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path><line x1="10" y1="11" x2="10" y2="17"></line><line x1="14" y1="11" x2="14" y2="17"></line></svg>`;
-                  showToast("删除失败：" + data.ret);
-                }
-            }).catch(err => {
-              if(inlineDeleteBtn) inlineDeleteBtn.innerHTML = `<svg viewBox="0 0 24 24" width="16" height="16" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path><line x1="10" y1="11" x2="10" y2="17"></line><line x1="14" y1="11" x2="14" y2="17"></line></svg>`;
-              showToast("网络请求失败");
-            });
-        });
-
         document.getElementById('mf-source-refresh').addEventListener('click', async () => {
             const url = document.getElementById('mf-source-input').value.trim();
             if (!url) return showToast("请先输入源地址 URL");
@@ -3308,86 +4685,6 @@
             }
         });
 
-        window.toggleMfPlugin = async (name, enable, btnElement) => {
-            const originalText = btnElement.innerText;
-            btnElement.disabled = true;
-            btnElement.style.opacity = '0.5';
-            btnElement.innerText = '请稍候...';
-            showToast(`⏳ 正在${enable ? '启用' : '禁用'} ${name}...`, true);
-            try {
-                const res = await fetch(`/api/js-plugins/${name}/${enable ? 'enable' : 'disable'}`, { method: 'PUT' });
-                const data = await res.json();
-                if (data.success) {
-                    showToast(`✅ ${name} 已${enable ? '启用' : '禁用'}`);
-                    renderMfPluginManager();
-                    loadMFPlugins();
-                } else {
-                  btnElement.disabled = false;
-                  btnElement.style.opacity = '1';
-                  btnElement.innerText = originalText;
-                  showToast("❌ 操作失败：" + data.error);
-                }
-            } catch(e) {
-              btnElement.disabled = false;
-              btnElement.style.opacity = '1';
-              btnElement.innerText = originalText;
-              showToast("❌ 网络错误");
-            }
-        };
-
-        window.pinMfPlugin = async (name, btnElement) => {
-            const originalText = btnElement.innerText;
-            btnElement.disabled = true;
-            btnElement.style.opacity = '0.5';
-            btnElement.innerText = '置顶中...';
-            showToast(`⏳ 正在置顶 ${name}...`, true);
-            try {
-                let res = await fetch(`/api/js-plugins/${name}/disable`, { method: 'PUT' });
-                let data = await res.json();
-                if (!data.success) throw new Error(data.error || "禁用阶段失败");
-
-                res = await fetch(`/api/js-plugins/${name}/enable`, { method: 'PUT' });
-                data = await res.json();
-                if (!data.success) throw new Error(data.error || "启用阶段失败");
-
-                showToast(`✅ ${name} 已成功置顶！`);
-                renderMfPluginManager();
-                loadMFPlugins();
-            } catch(e) {
-              btnElement.disabled = false;
-              btnElement.style.opacity = '1';
-              btnElement.innerText = originalText;
-              showToast("❌ 置顶失败：" + e.message);
-            }
-        };
-
-        window.uninstallMfPlugin = async (name, btnElement) => {
-            if (!confirm(`彻底删除插件 "${name}" 吗？此操作不可恢复。`)) return;
-            const originalText = btnElement.innerText;
-            btnElement.disabled = true;
-            btnElement.style.opacity = '0.5';
-            btnElement.innerText = '删除中...';
-            try {
-                const res = await fetch(`/api/js-plugins/${name}/uninstall`, { method: 'DELETE' });
-                const data = await res.json();
-                if (data.success) {
-                  showToast("🗑️ 插件已彻底删除");
-                  renderMfPluginManager();
-                  loadMFPlugins();
-                } else {
-                  btnElement.disabled = false;
-                  btnElement.style.opacity = '1';
-                  btnElement.innerText = originalText;
-                  showToast("❌ 删除失败：" + data.error);
-                }
-            } catch(e) {
-              btnElement.disabled = false;
-              btnElement.style.opacity = '1';
-              btnElement.innerText = originalText;
-              showToast("❌ 网络错误");
-            }
-        };
-
         document.getElementById('mf-plugin-local-upload').addEventListener('click', () => {
             const fileInput = document.createElement('input');
             fileInput.type = 'file';
@@ -3414,10 +4711,84 @@
             };
             fileInput.click();
         });
+
+        const handleBulkAddClick = (e) => {
+            e.stopPropagation();
+            if (!songList || songList.length === 0) { showToast("当前列表为空，无法加入"); return; }
+
+            if (window.skipAddConfirm && window.lastAddedPlaylist) {
+                window.executeBulkAdd(window.lastAddedPlaylist);
+                return;
+            }
+
+            window.pendingBulkAdd = true;
+            window.pendingAddIndex = -1;
+
+            const nameSpan = document.getElementById('add-song-name');
+            if (nameSpan) nameSpan.textContent = `当前列表 (共 ${songList.length} 首)`;
+
+            const listEl = document.getElementById('add-song-playlist-list');
+            if (listEl) {
+                listEl.innerHTML = '';
+                const customKeysSet = new Set();
+                Object.keys(allPlaylists).forEach(key => {
+                    let baseName = key;
+                    if (key.startsWith('_online_mf_')) baseName = key.replace('_online_mf_', '');
+                    else if (key.startsWith('_online_lx_')) baseName = key.replace('_online_lx_', '');
+                    const isSystem = ['收藏', '在线资源', '本地搜索', '所有歌曲', '最近新增', '下载', '所有电台', '全部', '_local_iwebplayer_search', '其他'];
+                    if (!isSystem.includes(baseName)) {
+                        if (baseName === '_online_iwebplayer_search' || baseName.startsWith('🎵') || (window.customPlaylistNames && window.customPlaylistNames.includes(baseName))) {
+                            customKeysSet.add(baseName);
+                        }
+                    }
+                });
+
+                const customKeys = Array.from(customKeysSet).sort((a, b) => {
+                    const nameA = a === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : a.replace(/^🎵\s*/, '');
+                    const nameB = b === '_online_iwebplayer_search' ? '在线资源临时推送歌单' : b.replace(/^🎵\s*/, '');
+                    return nameA.localeCompare(nameB, 'zh-CN');
+                });
+
+                if (customKeys.length === 0) {
+                    listEl.innerHTML = '<li style="padding: 12px; text-align: center; color: var(--text-sub);">暂无自定义歌单，请在上方创建</li>';
+                } else {
+                    customKeys.forEach(k => {
+                        const li = document.createElement('li');
+                        li.style.cssText = 'padding: 12px 16px; border-bottom: 1px solid var(--border); cursor: pointer; color: var(--text-main); font-size: 14px; display: flex; align-items: center; gap: 10px; transition: background 0.2s;';
+                        let displayName = k.replace(/^🎵\s*/, '');
+                        if (k === '_online_iwebplayer_search') displayName = '在线资源临时推送歌单';
+                        const songCount = window.getMergedSongList ? window.getMergedSongList(k).length : 0;
+                        li.innerHTML = `<input type="radio" name="add_target_pl" style="pointer-events: none; margin: 0; width: 16px; height: 16px; accent-color: var(--primary);"> <span>${displayName} <span style="opacity: 0.6; font-size: 12px; margin-left: 2px;">(${songCount})</span></span>`;
+                        li.onmousedown = () => { li.style.backgroundColor = 'var(--border)'; };
+                        li.onclick = () => {
+                            Array.from(listEl.children).forEach(el => {
+                                el.style.backgroundColor = 'transparent'; el.style.fontWeight = 'normal';
+                                const radio = el.querySelector('input[type="radio"]');
+                                if (radio) radio.checked = false;
+                            });
+                            li.style.backgroundColor = 'var(--card-bg)'; li.style.fontWeight = 'bold';
+                            const myRadio = li.querySelector('input[type="radio"]');
+                            if (myRadio) myRadio.checked = true;
+                            window.tempSelectedPlaylist = k;
+                        };
+                        listEl.appendChild(li);
+                    });
+                }
+            }
+            if (addSongModal) {
+                addSongModal.classList.add('show');
+                addSongModal.setAttribute('aria-hidden', 'false');
+                document.body.style.overflow = 'hidden';
+            }
+        };
+
+        if (searchSaveBtn) searchSaveBtn.addEventListener('click', handleBulkAddClick);
+        if (mfSearchSaveBtn) mfSearchSaveBtn.addEventListener('click', handleBulkAddClick);
+
     }
 
     /* ==========================================
-     * 9. 启动引擎
+     * 10. 启动引擎
      * ========================================== */
     function renderLogos() {
       if (APP_LOGO) {
@@ -3429,6 +4800,57 @@
       }
     }
 
+    async function reloadGlobalData() {
+        try {
+            const backupOnlineSearch = allPlaylists["在线资源"] || [];
+
+            const [settingRes, listRes] = await Promise.all([
+                fetch(API.setting + '?t=' + Date.now()).catch(() => ({ json: () => ({}) })),
+                fetch(API.list)
+            ]);
+            const settingData = await settingRes.json();
+            // 如果后端没有传这个字段，默认算作 true（开启）
+            window.isVoiceCmdEnabled = settingData.enable_pull_ask !== false;
+            if (typeof updateVoiceCmdIconUI === 'function') updateVoiceCmdIconUI();
+
+            allPlaylists = await listRes.json();
+
+            window.customPlaylistNames = [];
+            if (settingData.custom_play_list_json) {
+                const customPlaylists = JSON.parse(settingData.custom_play_list_json);
+                window.customPlaylistNames.push(...Object.keys(customPlaylists));
+            }
+            if (settingData.music_list_json) {
+                const musicLists = JSON.parse(settingData.music_list_json);
+                musicLists.forEach(list => {
+                    if (list.name) {
+                        window.customPlaylistNames.push(list.name);
+                        if (list.name.startsWith('_online_') && list.musics && Array.isArray(list.musics)) {
+                            allPlaylists[list.name] = list.musics;
+                        }
+                    }
+                });
+            }
+
+            if (!allPlaylists["收藏"]) allPlaylists["收藏"] = [];
+            if (!allPlaylists["本地搜索"]) allPlaylists["本地搜索"] = [];
+
+            allPlaylists["在线资源"] = backupOnlineSearch;
+
+            const savedSearch = localStorage.getItem('local_search_keyword') || '';
+            if (savedSearch) {
+                const allSongs = allPlaylists['所有歌曲'] || [];
+                allPlaylists['本地搜索'] = allSongs.filter(song => song.toLowerCase().includes(savedSearch.toLowerCase().trim()));
+            }
+            favoriteList = allPlaylists["收藏"];
+
+            return settingData;
+        } catch (e) {
+            console.error("重载全局数据失败:", e);
+            throw e;
+        }
+    }
+
     async function init() {
       renderLogos();
       bindAllEvents();
@@ -3445,24 +4867,7 @@
       }
 
       try {
-        const [settingRes, listRes] = await Promise.all([
-          fetch(API.setting).catch(() => ({ json: () => ({}) })),
-          fetch(API.list)
-        ]);
-        const settingData = await settingRes.json();
-        allPlaylists = await listRes.json();
-
-        // 初始化在线资源大类
-        if (!allPlaylists["收藏"]) allPlaylists["收藏"] = [];
-        if (!allPlaylists["搜索"]) allPlaylists["搜索"] = [];
-        if (!allPlaylists["在线资源"]) allPlaylists["在线资源"] = [];
-
-        const savedSearch = localStorage.getItem('local_search_keyword') || '';
-        if (savedSearch) {
-          const allSongs = allPlaylists['所有歌曲'] || [];
-          allPlaylists['搜索'] = allSongs.filter(song => song.toLowerCase().includes(savedSearch.toLowerCase().trim()));
-        }
-        favoriteList = allPlaylists["收藏"];
+        const settingData = await reloadGlobalData();
 
         initDeviceDropdown(settingData.devices || {});
         initPlaylistDropdown();
@@ -3488,32 +4893,36 @@
         updatePlayModeUI();
         loadingEl.style.display = 'none';
 
-        if (currentDid === "" && localState.playlist && allPlaylists[localState.playlist]) {
+        const isValidPlaylist = localState.playlist && Array.from(document.querySelectorAll('#playlist-opts .select-option')).some(opt => opt.dataset.key === localState.playlist);
+        if (isValidPlaylist) {
           currentPlaylist = localState.playlist;
-          songList = allPlaylists[currentPlaylist];
-          playlistVal.innerHTML = formatPlaylistText(currentPlaylist, songList.length);
           document.querySelectorAll('#playlist-opts .select-option').forEach(opt => {
             opt.classList.remove('active');
             if (opt.dataset.key === currentPlaylist) opt.classList.add('active');
           });
-          if (!songList) songList = [];
+        }
 
-          // 统一调用司令部
-          updateSearchUI(currentPlaylist);
+        updateSearchUI(currentPlaylist);
 
-          renderPlaylist();
-          if (localState.songName) {
-            const idx = songList.indexOf(localState.songName);
-            if (idx !== -1) playSong(idx, false);
-          }
-        } else {
-          if (!songList) songList = [];
-          renderPlaylist();
-          // 即使未匹配到记忆歌单，也调用一次更新UI
-          updateSearchUI(currentPlaylist);
+        if (currentPlaylist === '本地搜索') {
+            const savedSearch = localStorage.getItem('local_search_keyword') || '';
+            performLocalSearch(savedSearch);
+        } else if (currentPlaylist !== '在线资源') {
+            songList = window.getMergedSongList(currentPlaylist);
+            renderPlaylist();
+        }
+
+        playlistVal.innerHTML = formatPlaylistText(currentPlaylist, songList.length);
+        const activeOpt = document.querySelector('#playlist-opts .select-option.active');
+        if (activeOpt) activeOpt.innerHTML = playlistVal.innerHTML;
+
+        if (localState.songName) {
+          const idx = songList.findIndex(item => window.getSongNameObj(item) === localState.songName);
+          if (idx !== -1) playSong(idx, false);
         }
 
         setupMediaSession();
+
         await updateDevicePresence();
 
         if (settingData.devices) {
@@ -3535,6 +4944,17 @@
           updatePushBtnState();
           window.dispatchEvent(new Event('resize'));
           scrollToCurrentSong('auto');
+
+          const savedAppVersion = localStorage.getItem('iwebplayer_version');
+          if (savedAppVersion !== APP_VERSION) {
+              const aboutModal = document.getElementById('about-backdrop');
+              if (aboutModal) {
+                  aboutModal.classList.add('show');
+                  aboutModal.setAttribute('aria-hidden', 'false');
+                  document.body.style.overflow = 'hidden';
+              }
+              localStorage.setItem('iwebplayer_version', APP_VERSION);
+          }
         }, 500);
       } catch (err) {
         console.error("引擎启动失败:", err);