dsh-mpkg-wallpaper 3.1.0 → 3.1.2

package/README.en.md

@@ -16,7 +16,7 @@ One plugin covers the whole wallpaper chain — import, parsing, playback, rotat
 - **Video files**: pick an mp4/webm file directly as a video background
 
 **🌊 Full-screen frosted blur suite**
-- **Unified blur (own section)**: one slider controls the wallpaper blur degree of the whole screen (0 = sharp, higher = more blurred); sidebar/title-bar fog thickness, chat-area follow and new-chat button follow are adjustable independently; when on it takes over the items below (sidebar frost, title-bar frost and the frosted-blur slider are disabled with a hint)
+- **Unified blur (own section)**: one slider controls the wallpaper blur degree of the whole screen (0 = sharp, higher = more blurred); sidebar fog thickness, chat-area follow and new-chat button follow are adjustable independently; when on it takes over the sidebar frost and the frosted-blur slider (the title bar is NOT taken over - it follows its own frost slider, transparent by default)
 - **UI blur (own section)**:
   - **Blur dialogs**: generic center-screen windows + the chat input box (frosted backdrop; text scrolling under the input box turns hazy)
   - **Blur settings panel**: the DSH settings panel with its own toggle + amount
@@ -51,7 +51,7 @@ One plugin covers the whole wallpaper chain — import, parsing, playback, rotat
 
 - **Background source**: master toggle, hybrid large-file mode, .mpkg file, image URL, local image/GIF, local wallpaper library (Steam discovery + custom folder + folder picker), wallpaper switching & rotation
 - **Appearance**: panel opacity, frosted blur, lens zoom, lens position
-- **Unified blur**: full-screen blur toggle + amount, sidebar/title-bar fog thickness, chat-area follow, new-chat button follow
+- **Unified blur**: full-screen blur toggle + amount, sidebar fog thickness, chat-area follow, new-chat button follow
 - **UI blur**: dialog / settings panel / download-confirm popup blur (each with its own toggle + amount), popover blur, mask blur, sidebar frost (Aqua scheme), Deep diving background box, title-bar frost/show (independent frost amount)
 - **Other**: sidebar shows wallpaper, light sharpen, third-party UI radius compat (off by default), update check / one-click hot update, restore defaults
 
@@ -106,7 +106,7 @@ Settings → **Wallpaper Engine Background**:
 | Image URL / local image | Plain images or GIFs |
 | Panel opacity | 50–100% |
 | Frosted blur | How blurred the wallpaper itself is, 0–40px (0 = sharp) |
-| Unified blur (own section) | One slider controls the whole screen's wallpaper blur degree (0=sharp, higher=more blurred); sidebar/title-bar fog thickness, chat-area follow and new-chat follow adjustable; takes over the items below when on |
+| Unified blur (own section) | One slider controls the whole screen's wallpaper blur degree (0=sharp, higher=more blurred); sidebar fog thickness, chat-area follow and new-chat follow adjustable; takes over sidebar frost and the frosted-blur slider when on (title bar keeps its own frost slider) |
 | Dialog / settings panel / confirm popup / popover / mask blur | Each with its own toggle + amount slider; sidebar frost (Aqua scheme, auto-lifted while a dialog is open) |
 | Lens zoom / position | Zoom (10–2000%) and pan the background; zoom out to see components at the picture edges |
 | Sidebar / title-bar wallpaper | Toggles; off = solid opaque color for that area; title-bar frost amount adjustable independently |
@@ -117,49 +117,48 @@ Settings → **Wallpaper Engine Background**:
 
 ## Install
 
-### Option 1: dsh plugin add (recommended)
+The plugin is published on npm (`dsh-mpkg-wallpaper`). Pick one:
+
+### Option 1: dsh plugin add (recommended, market-recognized)
 
 ```bash
 dsh plugin --profile web add dsh-mpkg-wallpaper
 # restart dsh web, then hard-refresh the browser (Ctrl+F5)
 ```
 
-### Option 2: pnpm install (standard for the pnpm-workspace profile)
-
-```bash
-# 1. Put the plugin folder under the profile's node_modules (or extract the GitHub zip)
-git clone https://github.com/XHR666/dsh-mpkg-wallpaper.git $DSH_HOME/profiles/web/node_modules/dsh-mpkg-wallpaper
-#    (if your profile is not at ~/.dsh/profiles/web, use your profile directory)
+Installs from the official npm registry and writes into the profile's `package.json`
+dependencies — the plugin market recognizes it as installed, shows the download count,
+and can manage updates.
 
-# 2. Register a line in the profile's cordis.patch.yml:
-#    - insert:
-#        - id: dsh-mpkg-wallpaper
-#          name: dsh-mpkg-wallpaper
+### Option 2: pnpm manual install (pnpm-workspace profile)
 
-# 3. Restart dsh web, then Ctrl+F5 in the browser
+```bash
+# run in the profile directory (replace <profile> with your profile name, e.g. web)
+pnpm --dir $DSH_HOME/profiles/<profile> add dsh-mpkg-wallpaper
+# restart dsh web, then Ctrl+F5 in the browser
 ```
 
-> Note: the DSH profile is a pnpm workspace (`pnpm-workspace.yaml`, `nodeLinker: hoisted`),
-> so a plugin folder under the profile's `node_modules/` is picked up by pnpm's hoisted
-> linking automatically — no manual lockfile edits. Prefer Option 1 (`dsh plugin add`) if
-> you want a registry install.
+Also writes into the dependency table, so the market recognizes it. No pnpm available?
+Use Option 1 (`dsh plugin add` wraps pnpm).
 
-### Option 3: Git clone
+### Option 3: Git clone (developers / offline)
 
 ```bash
 git clone https://github.com/XHR666/dsh-mpkg-wallpaper.git $DSH_HOME/profiles/node_modules/dsh-mpkg-wallpaper
+# then register in the profile's cordis.patch.yml:
+#   - insert:
+#       - id: dsh-mpkg-wallpaper
+#         name: dsh-mpkg-wallpaper
+# restart to take effect
 ```
 
-Uninstall: `dsh plugin --profile web remove dsh-mpkg-wallpaper` (or remove the mount line + delete the plugin directory + restart).
-
-> **Why does the plugin market show this plugin but not in the "installed plugins" list?**
-> The market's installed detection reads only the profile's `package.json` dependencies.
-> Manual installs (Option 2/3: clone into `node_modules` + `cordis.patch.yml` insert) are
-> not recorded there, so the market reports "not installed" — this only affects the market
-> display, not the wallpaper feature. To be recognized as installed (and market-managed for
-> updates), install via **Option 1** `dsh plugin add` and remove the old manual copy (the
+> Note: Option 3 is a manual placement and is **not** recorded in the dependency table —
+> the market won't report it as installed (market display only; the wallpaper feature is
+> unaffected). For market recognition use Option 1/2, and remove the old manual copy (the
 > `cordis.patch.yml` insert line + plugin directory) to avoid double-loading the plugin.
 
+Uninstall: `dsh plugin --profile web remove dsh-mpkg-wallpaper`.
+
 
 ## Official Docs
 
@@ -198,6 +197,11 @@ dsh-mpkg-wallpaper/
 ```
 
 
+## Acknowledgements
+
+- [Bil812](https://github.com/Bil812) — proposed wallpaper tint, adaptive text color and full-screen unified-mask appearance ideas in [PR #2](https://github.com/XHR666/dsh-mpkg-wallpaper/pull/2) and maintains a long-running fork. The wallpaper tint, adaptive ink, blue-cleanup and color-picker ideas were absorbed as the plugin's **Aqua experiment** mode (toggles, off by default).
+- [awesome-dsh-plugin](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin) community — listing & promotion.
+
 ## Notes for Distribution
 
 ### Portability

package/README.md

@@ -16,7 +16,7 @@
 - **视频文件**：直接选择 mp4/webm 文件作为视频背景
 
 **🌊 整屏虚化（磨砂）体系**
-- **统一虚化（独立分组）**：一个条控制整屏壁纸模糊度（0 = 壁纸清晰，拉高 = 越来越模糊）；侧边栏/标题栏白雾厚度、聊天区跟随、新会话按钮跟随独立可调；开启时接管下方各项（界面虚化里的侧边栏磨砂、标题栏磨砂、磨砂模糊条被接管并提示）
+- **统一虚化（独立分组）**：一个条控制整屏壁纸模糊度（0 = 壁纸清晰，拉高 = 越来越模糊）；侧边栏白雾厚度、聊天区跟随、新会话按钮跟随独立可调；开启时接管侧边栏磨砂与磨砂模糊条（标题栏不接管，按自己的磨砂条，默认透明）
 - **界面虚化（独立分组）**：
   - **虚化对话框**：通用居中窗口 + 聊天输入框（背景磨砂，滚动经过输入框的文字变朦胧）
   - **虚化设置面板**：DSH 设置面板独立开关 + 程度
@@ -27,6 +27,10 @@
 **🎬 镜头与外观**
 - 镜头缩放（10–2000%）与平移、侧边栏/标题栏透出壁纸开关、轻度锐化、Deep diving 背景框
 
+**🧪 Aqua 实验模式（默认全关，不影响原功能）**
+- 可开关的社区方案实验：**统一雾**（全屏遮罩统一雾色，强度独立滑条）、**面板匹配壁纸色**（自动取色 + 强度滑条 + 自定义取色盘）、**自适应文字色 + 蓝色清理**（品牌色统一，带自定义取色盘）、**深底文字可读增强**、**任务列表磨砂**
+- 设置页顶部 Tab 分类切换（来源/外观/统一虚化/界面虚化/透出壁纸/Aqua/其他）
+
 **🚀 大文件混合模式（hybrid）**
 - 开启后 mpkg **流式上传到 DSH 宿主** → 磁盘存储 → HTTP Range 流式播放，**支持 >600MB 的大文件**，内存占用极低
 - 关闭则回到纯浏览器模式（600MB 上限）
@@ -117,47 +121,41 @@
 
 ## 安装
 
-### 方式一：dsh plugin add（推荐）
+插件已发布到 npm（`dsh-mpkg-wallpaper`）。任选一种：
+
+### 方式一：dsh plugin add（推荐，市场可识别）
 
 ```bash
 dsh plugin --profile web add dsh-mpkg-wallpaper
 # 重启 dsh web 后浏览器 Ctrl+F5 生效
 ```
 
-### 方式二：pnpm 安装（profile 是 pnpm workspace 时的标准做法）
-
-```bash
-# 1. 把插件目录放到 profile 的 node_modules 下
-#    （或用 GitHub 下载的 zip 解压）
-git clone https://github.com/XHR666/dsh-mpkg-wallpaper.git $DSH_HOME/profiles/web/node_modules/dsh-mpkg-wallpaper
-#    （若 profile 不在 ~/.dsh/profiles/web，把路径换成你的 profile 目录）
+从 npm 官方仓库安装，会写入 profile 的 `package.json` 依赖表——插件市场自动识别为「已安装」，并可显示下载量、用市场管理更新。
 
-# 2. 在 profile 的 cordis.patch.yml 注册一行：
-#    - insert:
-#        - id: dsh-mpkg-wallpaper
-#          name: dsh-mpkg-wallpaper
+### 方式二：pnpm 手动安装（profile 是 pnpm workspace 时）
 
-# 3. 重启 dsh web，浏览器 Ctrl+F5 生效
+```bash
+# 在 profile 目录下执行（将 <profile> 换成你的 profile 名，如 web）
+pnpm --dir $DSH_HOME/profiles/<profile> add dsh-mpkg-wallpaper
+# 重启 dsh web，浏览器 Ctrl+F5 生效
 ```
 
-> 注：DSH profile 使用 pnpm workspace（`pnpm-workspace.yaml`，`nodeLinker: hoisted`），
-> 插件目录放在 profile 的 `node_modules/` 下即可被 pnpm 的 hoisted 链接识别，
-> 无需手动改 lockfile；若你更习惯 registry 安装，用方式一 `dsh plugin add`。
+同样写入依赖表，市场可识别。若你的环境没有 pnpm，用方式一（`dsh plugin add` 内部就是 pnpm）。
 
-### 方式三：GitHub 克隆
+### 方式三：GitHub 克隆（开发者 / 离线场景）
 
 ```bash
 git clone https://github.com/XHR666/dsh-mpkg-wallpaper.git $DSH_HOME/profiles/node_modules/dsh-mpkg-wallpaper
+# 然后在 profile 的 cordis.patch.yml 注册：
+#   - insert:
+#       - id: dsh-mpkg-wallpaper
+#         name: dsh-mpkg-wallpaper
+# 重启后生效
 ```
 
-卸载：`dsh plugin --profile web remove dsh-mpkg-wallpaper`（或删除挂载行 + 插件目录 + 重启）。
+> 注：方式三是手动放置，**不会**写入依赖表——插件市场不识别为「已安装」（仅影响市场显示，不影响功能）。要市场识别请用方式一/方式二，并移除旧的手动副本（`cordis.patch.yml` 的 insert 行 + 插件目录），避免同一插件被加载两次。
 
-> **为什么插件市场里显示了本插件、但「已安装插件」列表里没有？**
-> 插件市场的已安装检测只读 profile 的 `package.json` 依赖表。方式二/方式三（手动 clone
-> 到 `node_modules` + `cordis.patch.yml` insert）不会被依赖表记录，所以市场判为「未安装」
-> ——不影响壁纸功能，只是市场显示如此。想被市场识别为已安装（并可用市场管理更新），
-> 请用**方式一** `dsh plugin add` 安装，并把旧的手动副本（`cordis.patch.yml` 的 insert 行 +
-> 插件目录）移除，避免同一插件被加载两次。
+卸载：`dsh plugin --profile web remove dsh-mpkg-wallpaper`。
 
 
 ## 官方文档
@@ -197,6 +195,11 @@ dsh-mpkg-wallpaper/
 ```
 
 
+## 致谢
+
+- [Bil812](https://github.com/Bil812) — 在 [PR #2](https://github.com/XHR666/dsh-mpkg-wallpaper/pull/2) 中提出壁纸取色、自适应文字色、全屏统一遮罩等外观方案，并长期维护 fork。其中**壁纸取色、自适应文字色、蓝色清理、取色盘**等思路已吸收为本插件的「Aqua 实验」模式（可开关，默认关）。
+- [awesome-dsh-plugin](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin) 社区 — 收录与推广。
+
 ## GitHub 发布说明
 
 ### 可移植性（在他人的设备上也能用）

package/lib/client.js

@@ -7,6 +7,8 @@ window.__ModuleLoader__.load({
 
 		let react = require("react");
 
+
+
 		// ═══════════════════════════════════════════════════════════════════
 		//  常量
 		// ═══════════════════════════════════════════════════════════════════
@@ -20,7 +22,7 @@ window.__ModuleLoader__.load({
 		const DEFAULT_SHARP = true;
 		const DEFAULT_HEADER = true;
 		const DEFAULT_HEADER_BG = true;
-		const DEFAULT_HEADER_BLUR_AMOUNT = 80; // 标题栏磨砂程度 0-100%（白雾厚度，独立于整屏虚化）
+		const DEFAULT_HEADER_BLUR_AMOUNT = 0; // 标题栏磨砂程度 0-100%（白雾厚度；默认 0=透明，避免 session log 等按钮被白色矩形框包住）
 		const DEFAULT_DIALOG_BLUR = true;
 		const DEFAULT_DIALOG_AMOUNT = 14;
 		// ①(新) 虚化对话框拆三类：通用居中窗口 / 设置面板 / 下载·确认弹窗，各自独立开关+程度
@@ -38,9 +40,24 @@ window.__ModuleLoader__.load({
 		const DEFAULT_UNIFY_TINT = true; // 统一虚化：整屏模糊感由一个独立条控制
 		const DEFAULT_UNIFY_AMOUNT = 30; // 统一虚化程度 0-40：0=清晰，40=强模糊（控制壁纸层 blur）
 		const DEFAULT_CHAT_FOLLOW = true; // ①(新) 统一虚化是否接管聊天区壁纸（开=整屏统一；关=磨砂条独立控制聊天区，统一虚化只管侧边栏/标题栏）
-		const DEFAULT_SIDEBAR_ALPHA = 55; // ①(新) 统一虚化下侧边栏/标题栏白雾厚度 0-100（独立于不透明度条）
+		const DEFAULT_SIDEBAR_ALPHA = 35; // ①(新) 统一虚化下侧边栏/标题栏白雾厚度 0-100（默认 35：顶栏/侧边栏一致且白底淡，session log/模式标签后不会太突兀；用户实测 55 太厚）
 		const DEFAULT_SESSION_FOLLOW = true; // 统一虚化下，「新会话」按钮是否随整屏虚化（关=随面板不透明度）
 		const DEFAULT_HYBRID = true; // ①(新) 大文件混合模式：上传到 DSH 宿主流式播放（>600MB 无限制）；关=纯浏览器模式
+		// ⑲(新) Aqua 实验模式（借鉴 Bil812 fork，默认全关，不影响原功能）：
+		// - aquaMask：统一雾（#mpw-mask 全屏遮罩，所有表面共享一种雾色）
+		// - aquaTint：面板颜色匹配壁纸主色（48×48 采样）
+		// - aquaInk：自适应文字色 + 蓝色清理（brand 覆写为墨色衍生）
+		const DEFAULT_AQUA_MASK = false;
+		const DEFAULT_AQUA_TINT = false;
+		const DEFAULT_AQUA_INK = false;
+		// ⑲(新) 深底文字可读增强（默认关；近似方案=全局双色描边，无法精确"只变经过深色处"）
+		const DEFAULT_AQUA_TEXT_ENHANCE = false;
+		// ⑲(新) 任务列表（todo 卡片）磨砂背景（默认关）
+		const DEFAULT_TODO_BLUR = false;
+		// ⑲(新) 统一雾强度（独立滑条，默认 82%）
+		const DEFAULT_AQUA_MASK_ALPHA = 82;
+		// ⑲(新) 面板取色强度（壁纸色混合比例 0-100%，默认 45——用户实测默认太淡看不出变化）
+		const DEFAULT_AQUA_TINT_STRENGTH = 45;
 		const DEFAULT_ROTATE = false; // ③(新) 壁纸轮换：定时自动切换下一个壁纸
 		const DEFAULT_BRIGHTNESS = 100; // ⑧(新) 画面亮度（50-150%，滤镜）
 		const DEFAULT_FLOAT = false; // ①(新) 悬浮效果：侧边栏/标题栏悬浮卡片（默认关）
@@ -719,6 +736,20 @@ window.__ModuleLoader__.load({
 				else document.body.removeAttribute("data-mpw-sblur");
 			} catch {}
 			try { setupSblurObserver(); } catch {}
+			try { setupAquaThemeWatch(); } catch {}
+			// ⑲(新) Aqua 实验模式：body 门控 + 遮罩/取色刷新（默认关，不影响原功能）
+			try {
+				if (aquaOn(section)) document.body.setAttribute("data-mpw-aqua", "");
+				else document.body.removeAttribute("data-mpw-aqua");
+				if (section.aquaTextEnhance !== void 0 ? !!section.aquaTextEnhance : DEFAULT_AQUA_TEXT_ENHANCE)
+					document.body.setAttribute("data-mpw-aqua-text", "");
+				else document.body.removeAttribute("data-mpw-aqua-text");
+				if (section.todoBlur !== void 0 ? !!section.todoBlur : DEFAULT_TODO_BLUR)
+					document.body.setAttribute("data-mpw-todo-blur", "");
+				else document.body.removeAttribute("data-mpw-todo-blur");
+				refreshAqua();
+				if (aquaOn(section)) scheduleAquaTint();
+			} catch {}
 			// 2(修正) seam 标记 sidebar root（解除宽度用，参考 seam-stamper）
 			try {
 				const sr = document.querySelector('[class*="sidebarCol"] [class*="root"]');
@@ -735,6 +766,228 @@ window.__ModuleLoader__.load({
 			try { updateClock(); } catch {}
 		}
 
+		// ═══════════════════════════════════════════════════════════════════
+		//  ⑲(新) Aqua 实验模式（借鉴 Bil812 fork；默认全关，不影响原功能）
+		//  - 统一雾：#mpw-aqua-mask 全屏覆盖层（z-index:-1，壁纸之上内容之下）
+		//  - 壁纸取色：48×48 平均色 → --mpw-panel-tint → --mpw-mask-rgb
+		//  - 自适应文字色 + 蓝色清理：mask 亮度 → 亮字/深字，brand 覆写为墨色
+		// ═══════════════════════════════════════════════════════════════════
+		let aquaMaskEl = null;
+		let aquaTintHooked = new WeakSet();
+		let aquaTintSig = "";
+		function aquaOn(section) {
+			return (section.aquaMask !== void 0 ? !!section.aquaMask : DEFAULT_AQUA_MASK)
+				|| (section.aquaTint !== void 0 ? !!section.aquaTint : DEFAULT_AQUA_TINT)
+				|| (section.aquaInk !== void 0 ? !!section.aquaInk : DEFAULT_AQUA_INK);
+		}
+		function ensureAquaMask() {
+			if (aquaMaskEl && aquaMaskEl.isConnected) return aquaMaskEl;
+			aquaMaskEl = document.createElement("div");
+			aquaMaskEl.id = "mpw-aqua-mask";
+			aquaMaskEl.style.cssText = "position:fixed;inset:0;z-index:-1;pointer-events:none;display:none;";
+			(document.body || document.documentElement).appendChild(aquaMaskEl);
+			return aquaMaskEl;
+		}
+		function aquaParseHex(hex) {
+			const h = String(hex || "").replace("#", "").trim();
+			if (!/^[0-9a-fA-F]{3,8}$/.test(h)) return null;
+			const full = h.length <= 4 ? h.split("").map((c) => c + c).join("").slice(0, 6) : h;
+			return [parseInt(full.slice(0, 2), 16), parseInt(full.slice(2, 4), 16), parseInt(full.slice(4, 6), 16)];
+		}
+		function aquaMixRgb(a, b, t) {
+			return [Math.round(a[0] + (b[0] - a[0]) * t), Math.round(a[1] + (b[1] - a[1]) * t), Math.round(a[2] + (b[2] - a[2]) * t)];
+		}
+		function aquaHexOf(rgb) {
+			return "#" + rgb.map((v) => Math.max(0, Math.min(255, Math.round(v))).toString(16).padStart(2, "0")).join("");
+		}
+		/** 自适应文字色：暗遮罩 → 亮字 / 亮遮罩 → 深字（固定高可读中性色）。 */
+		function aquaInkForRgb(rgb) {
+			const er = rgb[0], eg = rgb[1], eb = rgb[2];
+			const luma = (0.299 * er + 0.587 * eg + 0.114 * eb) / 255;
+			return luma <= 0.6
+				? { luma, ink: "#eef1f7", inkSecondary: "#c3cbd8", inkTertiary: "#aab4c4" }
+				: { luma, ink: "#10141f", inkSecondary: "#3d4657", inkTertiary: "#5f6a7c" };
+		}
+		/** 遮罩有效色：自定义色 > 壁纸主色（亮主题掺 35%、暗主题掺 55%）> 主题中性色。 */
+		function aquaEffectiveColor(section) {
+			const darkTheme = !!(document.body && document.body.hasAttribute("data-ds-dark-theme"));
+			const custom = section.aquaColor && /^#[0-9a-fA-F]{3,8}$/.test(section.aquaColor) ? aquaParseHex(section.aquaColor) : null;
+			if (custom) return custom;
+			const tintOn = section.aquaTint !== void 0 ? !!section.aquaTint : DEFAULT_AQUA_TINT;
+			if (tintOn) {
+				let raw = "";
+				try { raw = getComputedStyle(document.documentElement).getPropertyValue("--mpw-panel-tint").trim(); } catch {}
+				const parts = String(raw || "").trim().split(/\s+/).map(Number);
+				if (parts.length >= 3 && !parts.some((v) => isNaN(v))) {
+					const neutral = darkTheme ? [14, 20, 32] : [255, 255, 255];
+					// ⑲(修正) 取色强度可调：aquaTintStrength 0-100（默认 45）
+					const strength = Math.max(0, Math.min(100, section.aquaTintStrength !== void 0 ? section.aquaTintStrength : DEFAULT_AQUA_TINT_STRENGTH));
+					const ratio = strength / 100;
+					return [
+						Math.round(ratio * parts[0] + (1 - ratio) * neutral[0]),
+						Math.round(ratio * parts[1] + (1 - ratio) * neutral[1]),
+						Math.round(ratio * parts[2] + (1 - ratio) * neutral[2])
+					];
+				}
+			}
+			return darkTheme ? [14, 20, 32] : [255, 255, 255];
+		}
+		/** ink 的反色：深 ink → 白；浅 ink → 深（用于按钮背景/图标保证对比）。 */
+		function aquaInkContrast(inkHex) {
+			const rgb = aquaParseHex(inkHex);
+			if (!rgb) return "#ffffff";
+			const luma = (0.299 * rgb[0] + 0.587 * rgb[1] + 0.114 * rgb[2]) / 255;
+			return luma <= 0.5 ? "#ffffff" : "#10141f";
+		}
+		/** 自定义品牌色：aquaInkColor 有效时用它做品牌/主按钮色，否则用 ink。 */
+		function aquaBrandColor(section) {
+			if (section.aquaInkColor && /^#[0-9a-fA-F]{3,8}$/.test(section.aquaInkColor)) return section.aquaInkColor;
+			let inkRaw = "";
+			try { inkRaw = getComputedStyle(document.documentElement).getPropertyValue("--mpw-aqua-ink").trim(); } catch {}
+			return inkRaw || "#10141f";
+		}
+		/** 刷新 Aqua：设 CSS 变量 + 全屏遮罩背景；关闭时清理。 */
+		function refreshAqua() {
+			try {
+				const s = readSection();
+				const enabled = s.enabled !== void 0 ? !!s.enabled : DEFAULT_ENABLED;
+				const on = aquaOn(s);
+				const root = document.documentElement;
+				const el = ensureAquaMask();
+				if (!on || !enabled || !s.image) {
+					el.style.display = "none";
+					for (const p of ["--mpw-aqua-rgb", "--mpw-aqua-ink", "--mpw-aqua-ink-secondary", "--mpw-aqua-ink-tertiary"]) root.style.removeProperty(p);
+					aquaTintSig = "";
+					return;
+				}
+				const rgb = aquaEffectiveColor(s);
+				const info = aquaInkForRgb(rgb);
+				root.style.setProperty("--mpw-aqua-rgb", `${rgb[0]} ${rgb[1]} ${rgb[2]}`);
+				root.style.setProperty("--mpw-aqua-ink", info.ink);
+				root.style.setProperty("--mpw-aqua-ink-secondary", info.inkSecondary);
+				root.style.setProperty("--mpw-aqua-ink-tertiary", info.inkTertiary);
+				root.style.setProperty("--mpw-aqua-ink-contrast", aquaInkContrast(info.ink));
+				root.style.setProperty("--mpw-aqua-brand-contrast", aquaInkContrast(aquaBrandColor(s)));
+				const maskOn = s.aquaMask !== void 0 ? !!s.aquaMask : DEFAULT_AQUA_MASK;
+				if (maskOn) {
+					const panel = Math.max(0, Math.min(100, s.aquaMaskAlpha !== void 0 ? s.aquaMaskAlpha : DEFAULT_AQUA_MASK_ALPHA)) / 100;
+					el.style.background = `rgba(${rgb[0]}, ${rgb[1]}, ${rgb[2]}, ${panel})`;
+					el.style.display = "";
+				} else {
+					el.style.display = "none";
+				}
+			} catch {}
+		}
+		/** 从当前壁纸抽主色（48×48 平均色）→ --mpw-panel-tint。 */
+		function applyAquaTint() {
+			try {
+				const s = readSection();
+				if (!(s.aquaTint !== void 0 ? !!s.aquaTint : DEFAULT_AQUA_TINT)) return;
+				const { img, video } = bgElements();
+				const src = (video && video.readyState >= 2 && video.videoWidth > 0)
+					? video
+					: (img && img.complete && img.naturalWidth > 0 ? img : null);
+				if (!src) return;
+				const S = 48;
+				const canvas = document.createElement("canvas");
+				canvas.width = S; canvas.height = S;
+				const ctx = canvas.getContext("2d", { willReadFrequently: true });
+				if (!ctx) return;
+				ctx.drawImage(src, 0, 0, S, S);
+				const data = ctx.getImageData(0, 0, S, S).data;
+				let r = 0, g = 0, b = 0, n = 0;
+				for (let i = 0; i < data.length; i += 4) {
+					if (data[i + 3] < 128) continue;
+					r += data[i]; g += data[i + 1]; b += data[i + 2]; n++;
+				}
+				if (!n) return;
+				const R = Math.round(r / n), G = Math.round(g / n), B = Math.round(b / n);
+				const sig = `${R},${G},${B}`;
+				if (sig === aquaTintSig) return;
+				aquaTintSig = sig;
+				document.documentElement.style.setProperty("--mpw-panel-tint", `${R} ${G} ${B}`);
+				refreshAqua();
+			} catch {}
+		}
+		/** 监听壁纸加载/播放，周期刷新取色（视频/GIF 节流 2s）。 */
+		function scheduleAquaTint() {
+			try {
+				const { img, video } = bgElements();
+				if (!img && !video) return;
+				const doTint = () => { try { applyAquaTint(); } catch {} };
+				if (img && !aquaTintHooked.has(img)) {
+					aquaTintHooked.add(img);
+					img.addEventListener("load", doTint, { passive: true });
+				}
+				if (video && !aquaTintHooked.has(video)) {
+					aquaTintHooked.add(video);
+					video.addEventListener("loadeddata", doTint, { passive: true });
+					let last = 0;
+					video.addEventListener("timeupdate", () => {
+						const now = Date.now();
+						if (now - last < 2000) return;
+						last = now;
+						doTint();
+					}, { passive: true });
+				}
+			} catch {}
+		}
+		/** Aqua 开启时的 token 覆盖（mask 色背景 + ink 文字 + 蓝色清理），合并进 applyTokenOverrides。 */
+		function aquaTokenOverrides(section) {
+			const darkTheme = !!(document.body && document.body.hasAttribute("data-ds-dark-theme"));
+			let maskRaw = "";
+			try { maskRaw = getComputedStyle(document.documentElement).getPropertyValue("--mpw-aqua-rgb").trim(); } catch {}
+			const parts = String(maskRaw || "").trim().split(/\s+/).map(Number);
+			if (parts.length < 3 || parts.some((v) => isNaN(v))) return null;
+			const rgb = parts;
+			const info = aquaInkForRgb(rgb);
+			const tinted = (alpha) => `color-mix(in srgb, rgb(var(--mpw-aqua-rgb)) ${Math.round(alpha * 100)}%, transparent)`;
+			const out = {
+				"--dsw-alias-bg-base": { light: tinted(0.62), dark: tinted(0.62) },
+				"--dsw-alias-bg-overlay": { light: tinted(0.72), dark: tinted(0.72) },
+				"--dsw-alias-bg-layer-2": { light: tinted(0.72), dark: tinted(0.72) },
+				"--dsw-alias-bg-layer-3": { light: tinted(0.72), dark: tinted(0.72) },
+				"--dsw-specific-sidebar-fill": { light: tinted(0.85), dark: tinted(0.85) },
+				"--dsw-specific-menu": { light: tinted(0.86), dark: tinted(0.86) },
+				"--dsw-specific-bubble": { light: tinted(0.84), dark: tinted(0.84) },
+				"--dsw-specific-bubble-highlight": { light: tinted(0.92), dark: tinted(0.92) },
+				"--dsw-specific-selector": { light: tinted(0.78), dark: tinted(0.78) },
+				"--dsw-specific-tip": { light: tinted(0.85), dark: tinted(0.85) },
+				"--dsw-specific-input-major": { light: tinted(0.9), dark: tinted(0.9) },
+				"--dsw-specific-sidebar-nav-item-active": { light: tinted(0.72), dark: tinted(0.72) },
+				"--dsw-specific-sidebar-nav-item-hover": { light: tinted(0.6), dark: tinted(0.6) },
+				"--dsw-specific-sidebar-nav-item-active-accent": { light: tinted(0.6), dark: tinted(0.6) },
+				"--dsw-alias-bg-module-platform": { light: tinted(0.86), dark: tinted(0.86) },
+				"--dsw-alias-bg-multi-select": { light: tinted(0.82), dark: tinted(0.82) },
+				"--dsw-alias-button-elevated-fill": { light: tinted(0.78), dark: tinted(0.78) },
+				"--dsw-alias-button-floating-fill": { light: tinted(0.85), dark: tinted(0.85) },
+				"--dsw-alias-button-ghost-active-fill": { light: tinted(0.7), dark: tinted(0.7) },
+				"--dsw-alias-button-ghost-active-border": { light: tinted(0.6), dark: tinted(0.6) },
+				"--dsw-alias-button-contrast-fill": { light: tinted(0.9), dark: tinted(0.9) },
+				"--dsw-alias-interactive-bg-selected": { light: tinted(0.68), dark: tinted(0.68) },
+				"--dsw-alias-interactive-bg-hover": { light: tinted(0.55), dark: tinted(0.55) },
+				"--dsw-alias-interactive-bg-hover-solid": { light: tinted(0.72), dark: tinted(0.72) },
+				"--dsw-alias-tooltip-bg": { light: `color-mix(in srgb, rgb(var(--mpw-aqua-rgb)) 96%, var(--dsw-static-neutral-bluish-850))`, dark: `color-mix(in srgb, rgb(var(--mpw-aqua-rgb)) 96%, var(--dsw-static-neutral-bluish-850))` },
+				"--dsw-alias-toast-bg": { light: tinted(0.9), dark: tinted(0.9) },
+				"--dsw-alias-markdown-inline-code": { light: tinted(0.24), dark: tinted(0.24) },
+				"--dsw-alias-markdown-code-block": { light: tinted(0.32), dark: tinted(0.32) }
+			};
+			const inkOn = section.aquaInk !== void 0 ? !!section.aquaInk : DEFAULT_AQUA_INK;
+			if (inkOn) {
+				// ⑲(修正) 品牌色支持自定义（aquaInkColor 取色器）：默认用 ink，
+				// 自定义色时按钮/发送键/插件文字用自定义色，保证对比（用户实测默认 ink 让发送键看不清）
+				const brand = aquaBrandColor(section);
+				out["--dsw-alias-label-primary"] = { light: info.ink, dark: info.ink };
+				out["--dsw-alias-label-secondary"] = { light: info.inkSecondary, dark: info.inkSecondary };
+				out["--dsw-alias-label-tertiary"] = { light: info.inkTertiary, dark: info.inkTertiary };
+				out["--dsw-alias-brand-primary"] = { light: brand, dark: brand };
+				out["--dsw-alias-brand-text"] = { light: brand, dark: brand };
+				out["--dsw-alias-button-info-fill"] = { light: brand, dark: brand };
+				out["--dsw-alias-button-info-hover"] = { light: brand, dark: brand };
+			}
+			return out;
+		}
+
 		/**
 		 * ⑭ 用 token override 实现对话框/弹层半透明（参考 ui-theme-background-custom 方案）。
 		 * DSH 的弹层/菜单/对话框背景由 --dsw-alias-bg-overlay 驱动；主画布由
@@ -803,6 +1056,13 @@ window.__ModuleLoader__.load({
 				try { if (tokenDisposer) { tokenDisposer(); tokenDisposer = null; } } catch {}
 				return;
 			}
+			// ⑲(新) Aqua 实验模式：开时用 mask 色覆盖主要背景/文字 token（在现有 override 之后生效）
+			try {
+				if (aquaOn(section)) {
+					const aquaOv = aquaTokenOverrides(section);
+					if (aquaOv) Object.assign(overrides, aquaOv);
+				}
+			} catch {}
 			try {
 				if (tokenDisposer) { tokenDisposer(); tokenDisposer = null; }
 				tokenDisposer = ctx.theme.overrideTokens("@local/dsh-mpkg-wallpaper-tokens", overrides);
@@ -1102,10 +1362,12 @@ ${frostedLayers}
 				// ①(修正) 标题栏磨砂。**绝不能给 header 本体加 backdrop-filter**——
 				// header 有 fixed 子元素（子代理展开面板/后台任务条），backdrop-filter 会成为
 				// 它们的 containing block，导致面板定位错乱（用户实测 bug）。
-				// ①(修正) 标题栏雾底：统一虚化开 → 跟随 sidebarAlpha（标题栏磨砂程度条被接管）；
-				// 关 → 由「标题栏磨砂程度」条控制。headerBg/headerBlur 开关仍独立（关=纯白）。
+				// ①(修正) 标题栏雾底：unify 开 → **透明**（session log 按钮/标准模式标签
+				// 后的白框 = 标题栏白底，用户两次要求去掉；标题栏直接透出模糊壁纸）；
+				// unify 关 → 按「标题栏磨砂程度」条（默认 0=透明，需要雾底自行拉高）。
+				// 侧边栏白雾由「侧边栏/标题栏透明度」条控制（仅侧边栏）。
 				const hblurAmt = section.headerBlurAmount !== void 0 ? section.headerBlurAmount : DEFAULT_HEADER_BLUR_AMOUNT;
-				const hdrAlpha = unifyTint ? uAlpha : Math.max(0, Math.min(100, hblurAmt));
+				const hdrAlpha = unifyTint ? 0 : Math.max(0, Math.min(100, hblurAmt));
 				const hdrBg = `color-mix(in srgb, var(--dsw-static-neutral-bluish-950) ${hdrAlpha}%, transparent)`;
 				css += `
 .wSkVaW_header {
@@ -1456,6 +1718,77 @@ ${unifyTint ? `body:not([data-ds-dark-theme]) [data-cordis-panel] [class*="row"]
 	.hHd-Xa_regionArea, .wSkVaW_scrollBody, .ydkMvW_body { backdrop-filter: none !important; }
 }
 `;
+			// ⑲(新) Aqua 实验模式：文字色/品牌蓝兜底 + 弹层模糊（token override 之外）
+			if (aquaOn(section)) {
+				css += `
+/* ── Aqua 实验模式：自适应文字色 + 蓝色清理（可开关，默认关） ── */
+body[data-mpw-aqua] {
+	--dsw-alias-label-primary: var(--mpw-aqua-ink, inherit);
+	--dsw-alias-label-secondary: var(--mpw-aqua-ink-secondary, inherit);
+	--dsw-alias-label-tertiary: var(--mpw-aqua-ink-tertiary, inherit);
+	--dsw-alias-label-caption: var(--mpw-aqua-ink-tertiary, inherit);
+	--dsw-alias-label-dimmed: var(--mpw-aqua-ink-tertiary, inherit);
+	--dsw-alias-brand-primary: var(--mpw-aqua-ink, inherit);
+	--dsw-alias-brand-text: var(--mpw-aqua-ink, inherit);
+	--dsw-alias-state-business-primary: var(--mpw-aqua-ink-secondary, inherit);
+}
+/* ⑲(修正) Aqua 模式下弹层背景被 mask 色半透明化，必须配 backdrop blur 防文字叠压
+   （用户实测：加号/命令/权限/模型/上下文选择器透明但无模糊 → 文字叠在一起） */
+body[data-mpw-aqua] [role="menu"],
+body[data-mpw-aqua] [role="listbox"],
+body[data-mpw-aqua] [role="combobox"],
+body[data-mpw-aqua] [data-dsh-surface] {
+	backdrop-filter: blur(14px) !important;
+	-webkit-backdrop-filter: blur(14px) !important;
+}
+/* ⑲(修正) 发送键对比：背景用品牌色（ink 或自定义），图标反色 → 不再"只剩圆圈"
+   （用户实测默认 ink 下发送键背景变浅、箭头看不清） */
+body[data-mpw-aqua] [data-composer-card] [class*="primary"],
+body[data-mpw-aqua] [data-slot*="composer"] [class*="primary"] {
+	background-color: var(--dsw-alias-brand-primary, var(--mpw-aqua-ink)) !important;
+	color: var(--mpw-aqua-brand-contrast, var(--mpw-aqua-ink-contrast)) !important;
+}
+/* ⑲(修正) 本插件弹窗（冲突/下载/确认）文字保持主题对比色，不跟 ink
+   （用户实测：aquaInk 开时冲突弹窗文字与背景叠色看不清） */
+body[data-mpw-aqua] .mpw_dialog { color: var(--dsw-static-neutral-bluish-850) !important; }
+body[data-mpw-aqua] body[data-ds-dark-theme] .mpw_dialog { color: var(--dsw-static-neutral-bluish-100) !important; }
+body[data-mpw-aqua] .mpw_dialog .mpw_title,
+body[data-mpw-aqua] .mpw_dialog .mpw_label,
+body[data-mpw-aqua] .mpw_dialog .mpw_hint,
+body[data-mpw-aqua] .mpw_dialog .mpw_value { color: inherit !important; }
+`;
+			}
+			// ⑲(新) 深底文字可读增强（aquaTextEnhance，默认关）：
+			// 尝试过两种开源方案均不理想：① 双色 text-shadow 描边（浅底上像"喷墨打印机"）；
+			// ② mix-blend-mode difference（全局反色，粉色/彩色文字全被反转，用户实测不可用）。
+			// 最终方案：**只加白色细描边**——浅色背景上白边不可见（不破坏浅底），
+			// 深色/黑色背景上自动给文字勾勒白色轮廓（深底可读）。这是唯一不破坏浅色背景的近似。
+			// 说明：浏览器无法精确实现"只变经过深色处的字"（需逐字采样背景像素，滚动动态内容下不可靠）。
+			if (section.aquaTextEnhance !== void 0 ? !!section.aquaTextEnhance : false) {
+				css += `
+/* ── 深底文字可读增强（实验，默认关）：白色细描边（浅底不可见，深底提亮轮廓） ── */
+body[data-mpw-aqua-text] [data-conversation-scroll] :is(p, li, h1, h2, h3, h4, td, th) {
+	text-shadow: 0 0 1px rgba(255,255,255,.85), 0 1px 1px rgba(255,255,255,.55) !important;
+}
+`;
+			}
+			// ⑲(新) 任务列表（todo 卡片）磨砂背景：收纳/展开状态都模糊（类似标题栏/侧边栏磨砂）。
+			// 独立开关（todoBlur，默认关）。
+			// ②(修正) 去掉 70% 白色底条（用户实测像"灰色滤镜"+ 白色底条难看），
+			// 改为纯 backdrop blur：背景透明，背后内容（壁纸/聊天区）真模糊 = 磨砂玻璃。
+			if (section.todoBlur !== void 0 ? !!section.todoBlur : false) {
+				css += `
+/* ── 任务列表磨砂（实验，默认关）：todo 卡片纯模糊，无白色底条 ── */
+body[data-mpw-todo-blur] [data-tool="todo_write"] {
+	backdrop-filter: blur(16px) !important;
+	-webkit-backdrop-filter: blur(16px) !important;
+	background-color: transparent !important;
+}
+body[data-mpw-todo-blur] [data-tool="todo_write"] * {
+	background-color: transparent !important;
+}
+`;
+			}
 			return css + buildUiCss(section, dlgFrosted);
 		}
 
@@ -1477,6 +1810,55 @@ ${unifyTint ? `body:not([data-ds-dark-theme]) [data-cordis-panel] [class*="row"]
 	color: var(--dsw-alias-label-primary); letter-spacing: 0.02em;
 }
 .mpw_section:first-of-type { margin-top: 10px; }
+/* ⑳(修正) 取色盘色块（点开取色器的按钮） */
+.mpw_colorSwatch {
+	flex: none; width: 84px; height: 38px; box-sizing: border-box;
+	border: 1px solid var(--dsw-alias-border-l2); border-radius: 8px;
+	cursor: pointer; position: relative;
+}
+.mpw_colorSwatch::after {
+	content: ""; position: absolute; inset: 0; border-radius: 8px;
+	border: 1px solid rgba(0,0,0,.15); pointer-events: none;
+}
+/* ⑳(修正) 顶部 Tab 条：圆角导航栏 + 下划线平滑移动（indicator 平移）+ 内容真滑动 */
+.mpw_tabBar {
+	display: flex; gap: 2px; align-items: center;
+	position: relative;
+	border-radius: 12px; padding: 4px 6px;
+	margin-bottom: 8px; position: sticky; top: 0; z-index: 5;
+	background: color-mix(in srgb, var(--dsw-alias-bg-layer-2) 65%, transparent);
+	border: 1px solid color-mix(in srgb, var(--dsw-alias-border-l2) 60%, transparent);
+}
+body[data-ds-dark-theme] .mpw_tabBar {
+	background: color-mix(in srgb, var(--dsw-alias-bg-layer-2) 45%, transparent);
+}
+.mpw_tab {
+	flex: none; font: inherit; color: var(--dsw-alias-label-secondary);
+	cursor: pointer; white-space: nowrap; background: 0 0; border: none;
+	padding: 6px 12px; font-size: 13px; border-radius: 8px;
+}
+.mpw_tab:hover { color: var(--dsw-alias-label-primary); background: color-mix(in srgb, var(--dsw-alias-interactive-bg-hover) 60%, transparent); }
+.mpw_tabActive {
+	color: var(--dsw-alias-brand-primary, #4f6ef7);
+	font-weight: 600;
+}
+/* 下划线指示条：切换时 left/width 平滑平移（useEffect 测量激活 tab） */
+.mpw_tabIndicator {
+	position: absolute; bottom: 0; height: 2px; border-radius: 2px;
+	background: var(--dsw-alias-brand-primary, #4f6ef7);
+	transition: left .22s cubic-bezier(.4,0,.2,1), width .22s cubic-bezier(.4,0,.2,1);
+	left: 0; width: 0; pointer-events: none;
+}
+/* 内容区：外层固定裁剪（overflow hidden），内层 tabRow translateX 滑动（翻页效果）。
+   ⑳(修正) transform 必须加在内层——加在外层会连裁剪区一起左移，内容全空（用户实测）。 */
+.mpw_tabBody {
+	overflow: hidden; min-height: 60px;
+}
+.mpw_tabRow {
+	display: flex;
+	transition: transform .24s cubic-bezier(.4,0,.2,1);
+	will-change: transform;
+}
 .mpw_field { display: flex; flex-direction: column; gap: 6px; padding: 8px 4px; border-top: 1px solid color-mix(in srgb, var(--dsw-alias-border-l2) 45%, transparent); }
 .mpw_label { font-size: 13px; line-height: 20px; font-weight: 500; color: var(--dsw-alias-label-secondary); }
 .mpw_inline { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
@@ -1702,7 +2084,11 @@ body[data-mpw-modal] [role="dialog"] {
 			} catch {}
 			try {
 				document.querySelectorAll("body > *").forEach((el) => {
-					if (el.classList && el.classList.contains("mpw-bgWrap")) return; // 自己的壁纸层
+					// ①(修正) 排除自己的元素：壁纸层（bgWrap）、Aqua 全屏遮罩（aqua-mask）、时钟。
+					// 曾把自己的 mask 误报为冲突（fullscreen-bg:DIV → 自动关闭壁纸功能，用户实测）。
+					const ownId = el && el.id;
+					if (ownId === BG_WRAP_ID || ownId === "mpw-aqua-mask" || ownId === "mpw-clock") return;
+					if (el.classList && el.classList.contains("mpw-bgWrap")) return; // 自己的壁纸层（class 兜底）
 					const cs = getComputedStyle(el);
 					const z = Number(cs.zIndex);
 					if (cs.position === "fixed" && isFinite(z) && z < 0) {
@@ -1831,6 +2217,9 @@ body[data-mpw-modal] [role="dialog"] {
 			});
 		}
 
+		// ⑳(新) Tab 顺序（内容区 translateX 滑动用）
+		const TAB_ORDER = ["source", "appearance", "unify", "blur", "show", "aqua", "other"];
+
 		function MpkgSection(props) {
 			try {
 			const { t } = props;
@@ -1840,6 +2229,14 @@ body[data-mpw-modal] [role="dialog"] {
 				return null;
 			})();
 			const [section, setSection] = react.useState(readSection());
+			// ⑳(新) 设置页顶部 Tab（来源/外观/统一虚化/界面虚化/透出/Aqua/其他），减少滚动。
+			// Tab 切换只改 display，控件始终挂载（hooks 稳定，不能条件卸载 sliderRow/toggleRow）。
+			const [settingsTab, setSettingsTab] = react.useState("source");
+			// ②(修正) Tab 切换：内容区 translateX 滑动（TAB_ORDER 顺序）
+			const switchTab = (id) => {
+				if (id === settingsTab) return;
+				setSettingsTab(id);
+			};
 			const [mpkgMeta, setMpkgMeta] = react.useState(initMeta); // { name, key, info, entryName, slot }
 			const [busy, setBusy] = react.useState(false);
 			const [hint, setHint] = react.useState("");
@@ -1878,6 +2275,19 @@ body[data-mpw-modal] [role="dialog"] {
 				fetch(HOST_BASE + "/ping", { method: "GET" }).then((r) => setHostOk(!!r.ok)).catch(() => setHostOk(false));
 			}, []);
 
+			// ⑳(修正) Tab 下划线平滑移动：测量激活 tab 位置/宽度 → indicator 平移过去
+			react.useEffect(() => {
+				try {
+					const bar = document.querySelector('[data-mpw-tabbar]');
+					const ind = document.querySelector('[data-mpw-tabind]');
+					const active = bar && bar.querySelector(".mpw_tabActive");
+					if (bar && ind && active) {
+						ind.style.left = active.offsetLeft + "px";
+						ind.style.width = active.offsetWidth + "px";
+					}
+				} catch {}
+			}, [settingsTab]);
+
 			// ④ 总开关：开启时若有冲突 → 弹窗确认
 			const onMaster = (v) => {
 				if (v && conflicts.length && !section.forceEnabled) {
@@ -1899,6 +2309,111 @@ body[data-mpw-modal] [role="dialog"] {
 				applyFromStorage();
 				return next;
 			};
+			// ⑲(新) 内置取色盘（自绘 HSV，无外部依赖/无加载副作用）：
+			// 曾内联 vanilla-picker，但其 UMD 在模块加载时立即操作 DOM 且覆盖 module.exports，
+			// 导致 dsh 加载插件崩溃（cannot get property "onChange" without inject）——已改为
+			// 点击时创建 DOM 的自绘取色器（色相条 + 饱和/亮度面板 + hex 输入）。
+			let pickerInst = null;
+			const openPicker = (key, currentColor) => {
+				try {
+					if (pickerInst) { pickerInst.remove(); pickerInst = null; }
+					const parent = document.querySelector('[data-mpw-picker-anchor="' + key + '"]');
+					if (!parent) return;
+					const start = currentColor && /^#[0-9a-fA-F]{6}$/.test(currentColor) ? currentColor : "#808080";
+					let h = 0, s = 0.5, v = 0.5, drag = null;
+					const hexToHsv = (hex) => {
+						const n = parseInt(hex.slice(1), 16);
+						const r = ((n >> 16) & 255) / 255, g = ((n >> 8) & 255) / 255, bl = (n & 255) / 255;
+						const mx = Math.max(r, g, bl), mn = Math.min(r, g, bl), dlt = mx - mn;
+						let hh = 0;
+						if (dlt !== 0) {
+							if (mx === r) hh = ((g - bl) / dlt) % 6;
+							else if (mx === g) hh = (bl - r) / dlt + 2;
+							else hh = (r - g) / dlt + 4;
+							hh *= 60; if (hh < 0) hh += 360;
+						}
+						return { h: hh, s: mx === 0 ? 0 : dlt / mx, v: mx };
+					};
+					const hsvToHex = (hh, ss, vv) => {
+						const c = vv * ss, x = c * (1 - Math.abs(((hh / 60) % 2) - 1)), m = vv - c;
+						let r = 0, g = 0, bl = 0;
+						if (hh < 60) { r = c; g = x; } else if (hh < 120) { r = x; g = c; } else if (hh < 180) { g = c; bl = x; }
+						else if (hh < 240) { g = x; bl = c; } else if (hh < 300) { r = x; bl = c; } else { r = c; bl = x; }
+						const to = (q) => Math.round((q + m) * 255).toString(16).padStart(2, "0");
+						return "#" + to(r) + to(g) + to(bl);
+					};
+					const { h: ih, s: is, v: iv } = hexToHsv(start);
+					h = ih; s = is; v = iv;
+					const wrap = document.createElement("div");
+					wrap.className = "mpw_pickerWrap";
+					wrap.style.cssText = "position:fixed;z-index:4000;background:var(--dsw-static-neutral-bluish-00,#fff);border:1px solid var(--dsw-alias-border-l2);border-radius:12px;padding:10px;box-shadow:0 12px 40px rgba(0,0,0,.35);width:224px;font-family:var(--dsw-font-family);";
+					// 色相条
+					const hueBar = document.createElement("div");
+					hueBar.style.cssText = "height:14px;border-radius:7px;background:linear-gradient(90deg,#f00,#ff0,#0f0,#0ff,#00f,#f0f,#f00);cursor:pointer;position:relative;";
+					const hueKnob = document.createElement("div");
+					hueKnob.style.cssText = "position:absolute;top:-3px;width:8px;height:20px;border-radius:4px;border:2px solid #fff;box-shadow:0 0 4px rgba(0,0,0,.5);pointer-events:none;";
+					hueBar.appendChild(hueKnob);
+					// SV 面板
+					const svPanel = document.createElement("div");
+					svPanel.style.cssText = "height:120px;border-radius:8px;cursor:pointer;position:relative;margin-top:8px;";
+					const svKnob = document.createElement("div");
+					svKnob.style.cssText = "position:absolute;width:12px;height:12px;border-radius:50%;border:2px solid #fff;box-shadow:0 0 4px rgba(0,0,0,.5);pointer-events:none;transform:translate(-50%,-50%);";
+					svPanel.appendChild(svKnob);
+					// hex 输入 + 预览 + 确定
+					const bottom = document.createElement("div");
+					bottom.style.cssText = "display:flex;gap:6px;align-items:center;margin-top:8px;";
+					const preview = document.createElement("div");
+					preview.style.cssText = "width:26px;height:26px;border-radius:6px;border:1px solid var(--dsw-alias-border-l2);";
+					const hexInput = document.createElement("input");
+					hexInput.style.cssText = "flex:1;min-width:0;height:28px;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;padding:0 8px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;outline:none;";
+					hexInput.addEventListener("focus", () => { hexInput.style.borderColor = "var(--dsw-alias-label-primary)"; hexInput.style.boxShadow = "0 0 0 1px var(--dsw-alias-label-primary)"; });
+					hexInput.addEventListener("blur", () => { hexInput.style.borderColor = "var(--dsw-alias-border-l2)"; hexInput.style.boxShadow = "none"; });
+					hexInput.value = start;
+					const okBtn = document.createElement("button");
+					okBtn.textContent = t("default") === "默认" ? "确定" : "OK";
+					okBtn.style.cssText = "height:28px;padding:0 12px;border:none;border-radius:6px;background:#3964fe;color:#fff;font:inherit;font-size:12px;cursor:pointer;";
+					bottom.appendChild(preview); bottom.appendChild(hexInput); bottom.appendChild(okBtn);
+					wrap.appendChild(hueBar); wrap.appendChild(svPanel); wrap.appendChild(bottom);
+					document.body.appendChild(wrap);
+					const refresh = () => {
+						svPanel.style.background = "linear-gradient(180deg, #fff 0%, hsl(" + h + ",100%,50%) 50%, #000 100%)";
+						const cur = hsvToHex(h, s, v);
+						preview.style.background = cur;
+						hexInput.value = cur;
+						hueKnob.style.left = (h / 360 * 100) + "%";
+						svKnob.style.left = (s * 100) + "%";
+						svKnob.style.top = ((1 - v) * 100) + "%";
+					};
+					const setFromInput = () => {
+						const val = hexInput.value.trim();
+						if (/^#[0-9a-fA-F]{6}$/.test(val)) { const c = hexToHsv(val); h = c.h; s = c.s; v = c.v; refresh(); }
+					};
+					hexInput.addEventListener("change", setFromInput);
+					const pickPos = (e, el, vertical) => {
+						const r = el.getBoundingClientRect();
+						let p = (vertical ? e.clientY - r.top : e.clientX - r.left) / (vertical ? r.height : r.width);
+						p = Math.max(0, Math.min(1, p));
+						return p;
+					};
+					hueBar.addEventListener("mousedown", (e) => { drag = "hue"; h = pickPos(e, hueBar, false) * 360; refresh(); });
+					svPanel.addEventListener("mousedown", (e) => { drag = "sv"; s = pickPos(e, svPanel, false); v = 1 - pickPos(e, svPanel, true); refresh(); });
+					window.addEventListener("mousemove", (e) => {
+						if (drag === "hue") { h = pickPos(e, hueBar, false) * 360; refresh(); }
+						else if (drag === "sv") { s = pickPos(e, svPanel, false); v = 1 - pickPos(e, svPanel, true); refresh(); }
+					});
+					window.addEventListener("mouseup", () => { drag = null; });
+					okBtn.addEventListener("click", () => { commit({ [key]: hexInput.value.trim() }, true); pickerInst = null; wrap.remove(); });
+					// 定位在色块附近
+					const pr = parent.getBoundingClientRect();
+					wrap.style.left = Math.min(window.innerWidth - 240, pr.right + 8) + "px";
+					wrap.style.top = Math.max(0, pr.top - 10) + "px";
+					refresh();
+					pickerInst = wrap;
+					// 点击外部关闭
+					const outside = (e) => { if (!wrap.contains(e.target) && e.target !== parent) { wrap.remove(); pickerInst = null; document.removeEventListener("mousedown", outside); } };
+					setTimeout(() => document.addEventListener("mousedown", outside), 0);
+				} catch {}
+			};
 			// ④(新) 扫描本地壁纸库（Steam 自动发现，host 提供）
 			const scanLibrary = async () => {
 				if (!hostOk) { showError(t("lib.noHost")); return; }
@@ -1950,11 +2465,15 @@ body[data-mpw-modal] [role="dialog"] {
 			// ①(新) 目录选择器：打开并列出指定路径的子目录（跨平台，host 浏览）
 			const openDirPicker = async (path) => {
 				setDirPick(true); // ⑦(修正) 打开弹窗（之前漏了这行导致"浏览"无反应）
-				setDirPath(path);
+				setDirPath(path || "/");
 				try {
-					const r = await fetch(HOST_BASE + "/list-dirs?path=" + encodeURIComponent(path));
+					// 空路径 → host 返回主目录（home）；显示用 "/" 兜底，实际路径由 host 规范化
+					const r = await fetch(HOST_BASE + "/list-dirs?path=" + encodeURIComponent(path || ""));
 					const d = await r.json();
 					setDirSubs(d.ok && d.subdirs ? d.subdirs : []);
+					// ①(修正) 用 host 规范化的实际路径更新 dirPath（空/相对路径 → 绝对），
+					// 否则进子目录会拼出相对路径 → 列表空/上级错乱（用户实测浏览功能坏）
+					if (d.ok && d.dir) setDirPath(d.dir);
 					if (d.ok && d.home) setDirHome(d.home);
 					if (d.ok && d.platform) setDirPlatform(d.platform);
 				} catch { setDirSubs([]); }
@@ -2087,6 +2606,7 @@ body[data-mpw-modal] [role="dialog"] {
 					popoverBlur: DEFAULT_POPOVER_BLUR, popoverAmount: DEFAULT_POPOVER_AMOUNT,
 					maskBlur: DEFAULT_MASK_BLUR, maskAmount: DEFAULT_MASK_AMOUNT,
 					unifyTint: DEFAULT_UNIFY_TINT, unifyAmount: DEFAULT_UNIFY_AMOUNT, sidebarAlpha: DEFAULT_SIDEBAR_ALPHA, chatFollow: DEFAULT_CHAT_FOLLOW, sessionFollow: DEFAULT_SESSION_FOLLOW,
+					aquaMask: DEFAULT_AQUA_MASK, aquaTint: DEFAULT_AQUA_TINT, aquaInk: DEFAULT_AQUA_INK, aquaColor: "", aquaInkColor: "", aquaTextEnhance: DEFAULT_AQUA_TEXT_ENHANCE, todoBlur: DEFAULT_TODO_BLUR, aquaMaskAlpha: DEFAULT_AQUA_MASK_ALPHA, aquaTintStrength: DEFAULT_AQUA_TINT_STRENGTH,
 					hybrid: DEFAULT_HYBRID, roundCompat: DEFAULT_ROUND_COMPAT,
 					rotate: DEFAULT_ROTATE, rotateMin: 5, customDirPath: "", brightness: DEFAULT_BRIGHTNESS, float: DEFAULT_FLOAT,
 					thinkBg: DEFAULT_THINK_BG,
@@ -2493,9 +3013,26 @@ body[data-mpw-modal] [role="dialog"] {
 			};
 
 			return h("div", { className: "mpw_row" }, [
+				// ①(修正) 标题/描述在 Tab 条上方
 				h("div", { className: "mpw_title" }, t("title")),
 				h("p", { className: "mpw_desc" }, t("desc")),
-
+				// ②(修正) 圆角导航栏 + 下划线平滑移动（indicator 平移）+ 内容真滑动（translateX）
+				h("div", { className: "mpw_tabBar", "data-mpw-tabbar": "" }, [
+					h("div", { className: "mpw_tabIndicator", "data-mpw-tabind": "" }),
+					h("button", { className: "mpw_tab" + (settingsTab === "source" ? " mpw_tabActive" : ""), type: "button", onClick: () => switchTab("source") }, t("sec.source")),
+					h("button", { className: "mpw_tab" + (settingsTab === "appearance" ? " mpw_tabActive" : ""), type: "button", onClick: () => switchTab("appearance") }, t("sec.appearance")),
+					h("button", { className: "mpw_tab" + (settingsTab === "unify" ? " mpw_tabActive" : ""), type: "button", onClick: () => switchTab("unify") }, t("sec.unify")),
+					h("button", { className: "mpw_tab" + (settingsTab === "blur" ? " mpw_tabActive" : ""), type: "button", onClick: () => switchTab("blur") }, t("sec.blur")),
+					h("button", { className: "mpw_tab" + (settingsTab === "show" ? " mpw_tabActive" : ""), type: "button", onClick: () => switchTab("show") }, t("sec.show")),
+					h("button", { className: "mpw_tab" + (settingsTab === "aqua" ? " mpw_tabActive" : ""), type: "button", onClick: () => switchTab("aqua") }, t("sec.aqua")),
+					h("button", { className: "mpw_tab" + (settingsTab === "other" ? " mpw_tabActive" : ""), type: "button", onClick: () => switchTab("other") }, t("sec.other")),
+				]),
+				// 内容区：flex 行 + translateX 滑动（真翻页；所有 tab 内容始终挂载，hooks 稳定）
+				h("div", { className: "mpw_tabBody" }, [
+				// 内层 flex 行：translateX 滑动（外层裁剪区固定，否则整体左移内容全空——用户实测）
+				h("div", { className: "mpw_tabRow", style: { transform: "translateX(-" + TAB_ORDER.indexOf(settingsTab) * 100 + "%)" } }, [
+				// source 组
+				h("div", { style: { flex: "0 0 100%", minWidth: "100%", boxSizing: "border-box", paddingRight: "4px" } }, [
 				// ═══ 背景来源 ═══
 				h("div", { className: "mpw_section" }, t("sec.source")),
 
@@ -2690,7 +3227,9 @@ body[data-mpw-modal] [role="dialog"] {
 					h("input", { ref: imgRef, type: "file", accept: "image/*,.gif,.mp4,.webm,.mkv,.mov", style: { display: "none" }, onChange: onMedia })
 				]),
 
+				]),
 				// ═══ 外观 ═══
+				h("div", { style: { flex: "0 0 100%", minWidth: "100%", boxSizing: "border-box", paddingRight: "4px" } }, [
 				h("div", { className: "mpw_section" }, t("sec.appearance")),
 				// ②(新) 外观组说明：各项作用一目了然
 				h("p", { className: "mpw_hint" }, t("sec.appearance.desc")),
@@ -2765,7 +3304,9 @@ body[data-mpw-modal] [role="dialog"] {
 					])
 				]),
 
+				]),
 				// ═══ 统一虚化（独立大标题分组）═══
+				h("div", { style: { flex: "0 0 100%", minWidth: "100%", boxSizing: "border-box", paddingRight: "4px" } }, [
 				h("div", { className: "mpw_section" }, t("sec.unify")),
 				h("p", { className: "mpw_hint" }, t("sec.unify.desc")),
 
@@ -2789,7 +3330,9 @@ body[data-mpw-modal] [role="dialog"] {
 				h("div", { style: { display: (section.unifyTint !== void 0 ? !!section.unifyTint : DEFAULT_UNIFY_TINT) ? "" : "none" } },
 					toggleRow(t("sessionFollow"), t("sessionFollow.desc"), "sessionFollow", DEFAULT_SESSION_FOLLOW)),
 
+				]),
 				// ═══ 界面虚化 ═══
+				h("div", { style: { flex: "0 0 100%", minWidth: "100%", boxSizing: "border-box", paddingRight: "4px" } }, [
 				h("div", { className: "mpw_section" }, t("sec.blur")),
 				h("p", { className: "mpw_hint" }, t("sec.blur.desc")),
 
@@ -2823,7 +3366,9 @@ body[data-mpw-modal] [role="dialog"] {
 				h("div", { style: { display: (section.maskBlur !== void 0 ? !!section.maskBlur : DEFAULT_MASK_BLUR) ? "" : "none" } },
 					sliderRow(t("maskBlurAmount"), "maskAmount", 0, 40, "px", 1, DEFAULT_MASK_AMOUNT)),
 
+				]),
 				// ═══ 透出壁纸 ═══
+				h("div", { style: { flex: "0 0 100%", minWidth: "100%", boxSizing: "border-box", paddingRight: "4px" } }, [
 				h("div", { className: "mpw_section" }, t("sec.show")),
 				h("p", { className: "mpw_hint" }, t("sec.show.desc")),
 
@@ -2834,19 +3379,12 @@ body[data-mpw-modal] [role="dialog"] {
 				toggleRow(t("headerBg"), t("headerBg.desc"), "headerBg", DEFAULT_HEADER_BG),
 
 				// ①(重做) 标题栏磨砂：归到「标题栏透出壁纸」下面，透出关闭时隐藏。
-				// ①(修正) 统一虚化开启时，「标题栏磨砂程度」条被整屏虚化接管（禁用+提示）；
+				// ②(修正) 不再被统一虚化接管：磨砂程度条始终可调（默认 0=透明）。
 				// 开关（headerBg/headerBlur）仍独立：开关关 = 纯白背景。
 				h("div", { style: { display: (section.headerBg !== void 0 ? !!section.headerBg : DEFAULT_HEADER_BG) ? "" : "none" } },
 					toggleRow(t("headerBlur"), t("headerBlur.desc"), "headerBlur", DEFAULT_HEADER)),
-				h("div", { style: {
-					display: (section.headerBg !== void 0 ? !!section.headerBg : DEFAULT_HEADER_BG) && (section.headerBlur !== void 0 ? !!section.headerBlur : DEFAULT_HEADER) ? "" : "none",
-					opacity: (section.unifyTint !== void 0 ? !!section.unifyTint : DEFAULT_UNIFY_TINT) ? 0.45 : 1,
-					pointerEvents: (section.unifyTint !== void 0 ? !!section.unifyTint : DEFAULT_UNIFY_TINT) ? "none" : "auto"
-				} },
+				h("div", { style: { display: (section.headerBg !== void 0 ? !!section.headerBg : DEFAULT_HEADER_BG) && (section.headerBlur !== void 0 ? !!section.headerBlur : DEFAULT_HEADER) ? "" : "none" } },
 					sliderRow(t("headerBlurAmount"), "headerBlurAmount", 0, 100, "%", 1, DEFAULT_HEADER_BLUR_AMOUNT)),
-				(section.unifyTint !== void 0 ? !!section.unifyTint : DEFAULT_UNIFY_TINT)
-					? h("p", { className: "mpw_hint" }, t("headerBlur.overridden"))
-					: null,
 
 				// ①(新) 侧边栏磨砂（Aqua 方案）：与标题栏磨砂同类（区域自身玻璃化），
 				// 弹窗打开时自动摘除（防弹窗被模糊层困住）；统一虚化开启时被整屏虚化接管
@@ -2861,7 +3399,56 @@ body[data-mpw-modal] [role="dialog"] {
 					? h("p", { className: "mpw_hint" }, t("sidebarBlur.overridden"))
 					: null,
 
+				]),
+				// ═══ Aqua 实验（默认全关，不影响原功能）═══
+				h("div", { style: { flex: "0 0 100%", minWidth: "100%", boxSizing: "border-box", paddingRight: "4px" } }, [
+				h("div", { className: "mpw_section" }, t("sec.aqua")),
+				h("p", { className: "mpw_hint" }, t("sec.aqua.desc")),
+				// ①(修正) Aqua 方案来源：跳转 Bil812 的 PR #2（致谢可视化）
+				h("div", { className: "mpw_inline", style: { marginBottom: 4 } }, [
+					h("a", { className: "mpw_link", href: "https://github.com/XHR666/dsh-mpkg-wallpaper/pull/2", target: "_blank", rel: "noopener" }, "→ " + t("aqua.credit"))
+				]),
+				toggleRow(t("aquaMask"), t("aquaMask.desc"), "aquaMask", DEFAULT_AQUA_MASK),
+				// ⑲(新) 统一雾强度：独立滑条（用户实测没有单独控制条，mask 透明度只能靠「面板不透明度」但该条不存在）
+				h("div", { style: { display: (section.aquaMask !== void 0 ? !!section.aquaMask : DEFAULT_AQUA_MASK) ? "" : "none" } },
+					sliderRow(t("aquaMaskAlpha"), "aquaMaskAlpha", 0, 100, "%", 1, DEFAULT_AQUA_MASK_ALPHA)),
+				toggleRow(t("aquaTint"), t("aquaTint.desc"), "aquaTint", DEFAULT_AQUA_TINT),
+				h("div", { style: { display: (section.aquaTint !== void 0 ? !!section.aquaTint : DEFAULT_AQUA_TINT) ? "" : "none" } },
+					sliderRow(t("aquaTintStrength"), "aquaTintStrength", 0, 100, "%", 1, DEFAULT_AQUA_TINT_STRENGTH)),
+				toggleRow(t("aquaInk"), t("aquaInk.desc"), "aquaInk", DEFAULT_AQUA_INK),
+				// ⑲(新) 取色器：遮罩自定义色 / 品牌（发送键等主色）自定义色
+				h("div", { className: "mpw_field" }, [
+					h("label", { className: "mpw_label" }, t("aquaColor")),
+					h("div", { className: "mpw_inline" }, [
+						h("button", {
+							className: "mpw_colorSwatch", "data-mpw-picker-anchor": "aquaColor", type: "button",
+							style: { background: (section.aquaColor && /^#[0-9a-fA-F]{6}$/.test(section.aquaColor) ? section.aquaColor : "#808080") },
+							onClick: () => openPicker("aquaColor", section.aquaColor)
+						}),
+						h("button", { className: "mpw_miniBtn", type: "button", onClick: () => commit({ aquaColor: "" }, true) }, t("aquaColorReset")),
+						h("span", { className: "mpw_hint" }, t("aquaColor.hint"))
+					])
+				]),
+				h("div", { className: "mpw_field" }, [
+					h("label", { className: "mpw_label" }, t("aquaInkColor")),
+					h("div", { className: "mpw_inline" }, [
+						h("button", {
+							className: "mpw_colorSwatch", "data-mpw-picker-anchor": "aquaInkColor", type: "button",
+							style: { background: (section.aquaInkColor && /^#[0-9a-fA-F]{6}$/.test(section.aquaInkColor) ? section.aquaInkColor : "#808080") },
+							onClick: () => openPicker("aquaInkColor", section.aquaInkColor)
+						}),
+						h("button", { className: "mpw_miniBtn", type: "button", onClick: () => commit({ aquaInkColor: "" }, true) }, t("aquaColorReset")),
+						h("span", { className: "mpw_hint" }, t("aquaInkColor.hint"))
+					])
+				]),
+				// ⑲(新) 深底文字可读增强（近似方案：全局双色描边）
+				toggleRow(t("aquaTextEnhance"), t("aquaTextEnhance.desc"), "aquaTextEnhance", DEFAULT_AQUA_TEXT_ENHANCE),
+				// ⑲(新) 任务列表磨砂（收纳/展开统一模糊）
+				toggleRow(t("todoBlur"), t("todoBlur.desc"), "todoBlur", DEFAULT_TODO_BLUR),
+
+				]),
 				// ═══ 其他 ═══
+				h("div", { style: { flex: "0 0 100%", minWidth: "100%", boxSizing: "border-box", paddingRight: "4px" } }, [
 				h("div", { className: "mpw_section" }, t("sec.other")),
 
 				// ⑦ 轻度锐化（可能影响 GIF 流畅度）
@@ -2888,7 +3475,9 @@ body[data-mpw-modal] [role="dialog"] {
 							: null
 					]),
 					updState && updState.error ? h("p", { className: "mpw_hint mpw_err" }, t("update.fail") + updState.error) : null,
-					updState && updState.hasUpdate ? h("p", { className: "mpw_hint" }, t("update.found") + updState.localVersion + " → " + updState.remoteVersion) : null,
+					updState && updState.hasUpdate && updState.sameVersionDiff
+						? h("p", { className: "mpw_hint mpw_err" }, t("update.diff"))
+						: (updState && updState.hasUpdate ? h("p", { className: "mpw_hint" }, t("update.found") + updState.localVersion + " → " + updState.remoteVersion) : null),
 					updState && updState.applied ? h("p", { className: "mpw_hint" }, t("update.applied")) : null,
 					updState && updState.hasUpdate === false ? h("p", { className: "mpw_hint" }, t("update.latest")) : null
 				]),
@@ -2992,6 +3581,9 @@ body[data-mpw-modal] [role="dialog"] {
 						])
 					])
 				]) : null
+				]),
+				]),
+				]),
 			]);
 		} catch (err) {
 			// 渲染错误边界：任何渲染异常只显示错误信息，绝不整页空白
@@ -3061,10 +3653,30 @@ body[data-mpw-modal] [role="dialog"] {
 			"sec.blur": "界面虚化",
 			"sec.blur.desc": "各类弹层/面板打开时的背景虚化：对话框（通用居中窗口+聊天输入框）、设置面板、下载确认弹窗各自独立；弹层=菜单/下拉/提示；遮罩=弹层背后的全屏背景；侧边栏磨砂=侧边栏自身玻璃化",
 			"sec.unify": "统一虚化",
-			"sec.unify.desc": "整屏所有控件的模糊感由一组设置统一管理（一个条全管侧边栏/标题栏/聊天区）；开启后下方「界面虚化」里的侧边栏磨砂被接管。关闭则各区域单独调节",
+			"sec.unify.desc": "整屏所有控件的模糊感由一组设置统一管理（一个条全管侧边栏/标题栏/聊天区）；开启后「界面虚化」里的侧边栏磨砂被接管（标题栏不再接管，按自己的磨砂条）。关闭则各区域单独调节",
 			"sec.show": "透出壁纸",
 			"sec.show.desc": "控制对应区域是否显示壁纸：关=纯色不透明",
 			"sec.other": "其他",
+			"sec.aqua": "Aqua 实验",
+			"sec.aqua.desc": "外观方案来自 Bil812（PR #2）的构想，已采用并全部做成独立开关（默认全关，不影响原功能）：统一雾 = 全屏遮罩让所有表面共享一种雾色；面板取色 = 颜色跟随壁纸主色；自适应文字 = 文字色随背景亮度变化 + 蓝色清理",
+			"aqua.credit": "Bil812 的 PR #2（方案来源）",
+			"aquaMask": "统一雾（全屏遮罩）",
+			"aquaMask.desc": "所有表面（侧边栏/标题栏/聊天区/按钮）共享一种雾色（强度由下方「统一雾强度」条控制），不再分区白雾；关 = 保持现有分区雾",
+			"aquaMaskAlpha": "统一雾强度",
+			"aquaTint": "面板颜色匹配壁纸",
+			"aquaTint.desc": "自动采样壁纸主色作为面板底色（视频/GIF 每 2 秒刷新）；强度由下方滑条控制；关 = 使用主题中性色",
+			"aquaTintStrength": "面板取色强度",
+			"aquaInk": "自适应文字色 + 蓝色清理",
+			"aquaColor": "遮罩自定义色（取色盘）",
+			"aquaColor.hint": "设置后优先于壁纸取色；点「默认」恢复自动",
+			"aquaColorReset": "默认",
+			"aquaInkColor": "品牌/发送键自定义色（取色盘）",
+			"aquaInkColor.hint": "发送键/主按钮/插件文字用它（默认 = 自适应墨色）；设深色可让发送键箭头清晰",
+			"aquaTextEnhance": "深底文字可读增强",
+			"aquaTextEnhance.desc": "给聊天区文字加双色描边，黑色/深色背景上也能看清（近似方案：无法精确到'只变经过深色处的字'；默认关）",
+			"todoBlur": "任务列表磨砂",
+			"todoBlur.desc": "对话中列出的任务（todo 卡片）背景模糊，收纳/展开状态统一（类似标题栏/侧边栏磨砂；默认关）",
+			"aquaInk.desc": "文字颜色随遮罩亮度自适应（亮底深字/暗底浅字），并把品牌蓝等硬编码色统一为墨色衍生色",
 			"mpkg.pick": "选择 .mpkg 文件",
 			"mpkg.busy": "解析中…",
 			"mpkg.hint": "支持 Wallpaper Engine 的 .mpkg 包；此位置也可直接选择 mp4/webm 视频文件；视频类壁纸自动播放内嵌 mp4",
@@ -3096,6 +3708,7 @@ body[data-mpw-modal] [role="dialog"] {
 			"update.applying": "更新中…",
 			"update.found": "发现新版本：",
 			"update.latest": "已是最新版本",
+			"update.diff": "本地与 GitHub 代码存在内容差异（版本号相同，可能是本地有未推送的改动）——推送后即一致",
 			"update.applied": "更新完成！请重启 dsh web 并 Ctrl+F5 生效",
 			"update.fail": "检查失败：",
 			"update.warnTitle": "新版本发布未满 24 小时",
@@ -3130,14 +3743,14 @@ body[data-mpw-modal] [role="dialog"] {
 			"headerBlur": "标题栏磨砂",
 			"headerBg": "标题栏透出壁纸",
 			"headerBg.desc": "关闭后标题栏为纯白（暗色主题为纯深色）不透明，不再显示壁纸",
-			"headerBlur.desc": "标题栏半透明透出（已模糊的）壁纸，磨砂程度独立可调（下方滑条），即使整屏虚化调 0 也保持雾底保证文字可读。需先开启「标题栏透出壁纸」",
+			"headerBlur.desc": "标题栏透出壁纸，磨砂程度由下方滑条控制（默认 0 = 透明，session log 等按钮不会被白色矩形框包住；拉高可加白雾保证文字可读）。需先开启「标题栏透出壁纸」",
 			"headerBlurAmount": "标题栏磨砂程度",
-			"headerBlur.overridden": "统一虚化开启中：标题栏磨砂程度由「整屏虚化程度」接管（白雾跟随侧边栏/标题栏透明度条）；关闭统一虚化后恢复",
+			
 			"unifyTint": "统一虚化",
-			"unifyTint.desc": "开启后，侧边栏和标题栏获得类似聊天框的毛玻璃虚化（整块模糊、无缝隙，只模糊它们背后的内容，壁纸其他地方保持清晰），强度由「整屏虚化程度」条控制；表面白雾厚度由「侧边栏/标题栏透明度」条控制。关闭后各区域单独调节",
+			"unifyTint.desc": "开启后，侧边栏获得类似聊天框的毛玻璃虚化（整块模糊、无缝隙），强度由「整屏虚化程度」条控制；侧边栏表面白雾厚度由「侧边栏透明度」条控制；标题栏始终按自己的磨砂条（默认透明）。关闭后各区域单独调节",
 			"unifyAmount": "整屏虚化程度",
 			"sidebarAlpha": "侧边栏/标题栏透明度",
-			"sidebarAlpha.desc": "统一虚化开启时：侧边栏和标题栏表面的白雾厚度（0 = 全透明透出模糊壁纸，100 = 实心）。与「整屏虚化程度」解耦，可单独调",
+			"sidebarAlpha.desc": "统一虚化开启时：侧边栏表面的白雾厚度（0 = 全透明透出模糊壁纸，100 = 实心）。与「整屏虚化程度」解耦，可单独调；标题栏不再跟随（按自己的磨砂条）",
 			"chatFollow": "聊天区跟随整屏虚化",
 			"chatFollow.desc": "统一虚化开启时：开 = 聊天区壁纸模糊也随「整屏虚化程度」（磨砂条被接管禁用）；关 = 磨砂条恢复可调，聊天区壁纸由磨砂条控制（统一虚化只虚化侧边栏/标题栏）",
 			"sessionFollow": "新会话按钮跟随面板不透明度",
@@ -3231,10 +3844,30 @@ body[data-mpw-modal] [role="dialog"] {
 			"sec.blur": "UI blur",
 			"sec.blur.desc": "Backdrop blur when each popup layer opens: dialogs (generic center windows + chat input), the settings panel, and download/confirm popups each have their own switch; popovers = menus/dropdowns/tooltips; mask = the full-screen dim behind popups; sidebar frost = the sidebar itself becomes glass",
 			"sec.unify": "Unified blur",
-			"sec.unify.desc": "One set of controls rules the frosted feel of every surface (sidebar/titlebar/chat via one slider); when on, sidebar frost below is taken over. Off = each area adjusts separately",
+			"sec.unify.desc": "One set of controls rules the frosted feel of every surface (sidebar/titlebar/chat via one slider); when on, sidebar frost below is taken over (the title bar is not taken over - it follows its own frost slider). Off = each area adjusts separately",
 			"sec.show": "Show wallpaper",
 			"sec.show.desc": "Whether the corresponding area shows the wallpaper: off = solid color, opaque",
 			"sec.other": "Other",
+			"sec.aqua": "Aqua experiment",
+			"sec.aqua.desc": "Appearance ideas from Bil812 (PR #2), adopted and made into independent toggles (all OFF by default, original features untouched): unified fog = full-screen mask, every surface shares one fog color; panel tint = colors follow the wallpaper dominant color; adaptive ink = text follows background brightness + blue cleanup",
+			"aqua.credit": "Bil812 PR #2 (idea source)",
+			"aquaMask": "Unified fog (full-screen mask)",
+			"aquaMask.desc": "Every surface (sidebar/title bar/chat/buttons) shares one fog color (strength by the Unified-fog-strength slider below) instead of per-area fog; off = keep the current per-area fog",
+			"aquaMaskAlpha": "Unified fog strength",
+			"aquaTint": "Panel colors match wallpaper",
+			"aquaTint.desc": "Auto-samples the wallpaper's dominant color as the panel base (videos/GIFs refresh every 2s); strength by the slider below; off = theme neutral colors",
+			"aquaTintStrength": "Panel tint strength",
+			"aquaInk": "Adaptive text color + blue cleanup",
+			"aquaColor": "Custom mask color (picker)",
+			"aquaColor.hint": "When set, takes priority over wallpaper tint; Default restores auto",
+			"aquaColorReset": "Default",
+			"aquaInkColor": "Custom brand / send-button color (picker)",
+			"aquaInkColor.hint": "Send button / primary buttons / plugin text use it (default = adaptive ink); a dark color keeps the send arrow visible",
+			"aquaTextEnhance": "Dark-background text readability",
+			"aquaTextEnhance.desc": "Adds a dual-color text outline to chat text so it stays readable over black/dark backgrounds (approximation - cannot limit to text passing over dark areas only; off by default)",
+			"todoBlur": "Task list frost",
+			"todoBlur.desc": "Frosted background for the task (todo) cards in the conversation, collapsed and expanded alike (like the title-bar/sidebar frost; off by default)",
+			"aquaInk.desc": "Text color adapts to mask brightness (dark text on light / light on dark) and hard-coded brand blues are unified to ink-derived colors",
 			"mpkg.pick": "Choose .mpkg file",
 			"mpkg.busy": "Parsing…",
 			"mpkg.hint": "Wallpaper Engine .mpkg packages; you can also pick an mp4/webm video file here; video wallpapers play their embedded mp4",
@@ -3266,6 +3899,7 @@ body[data-mpw-modal] [role="dialog"] {
 			"update.applying": "Updating…",
 			"update.found": "New version found: ",
 			"update.latest": "Already up to date",
+			"update.diff": "Local code differs from GitHub (same version — probably un-pushed local changes); push to align",
 			"update.applied": "Update done! Restart dsh web and Ctrl+F5",
 			"update.fail": "Check failed: ",
 			"update.warnTitle": "New version released <24h ago",
@@ -3300,11 +3934,11 @@ body[data-mpw-modal] [role="dialog"] {
 			"headerBlur": "Frost the title bar",
 			"headerBg": "Show wallpaper behind the title bar",
 			"headerBg.desc": "Off makes the title bar solid white (solid dark in dark theme), no wallpaper behind it",
-			"headerBlur.desc": "Title bar semi-transparent over the (blurred) wallpaper; frosted amount adjustable via the slider below and kept even when full-screen blur is 0, so text stays readable. Needs \"Show wallpaper behind the title bar\" on",
+			"headerBlur.desc": "Title bar shows the wallpaper; frosted amount via the slider below (default 0 = transparent, so the session-log button is not wrapped in a white rectangle; raise it for a readable fog). Needs \"Show wallpaper behind the title bar\" on",
 			"headerBlurAmount": "Title bar frost amount",
-			"headerBlur.overridden": "Unified blur is on: the title-bar frost amount is taken over by the Full-screen blur degree (fog follows the sidebar/title-bar opacity slider); turn unified blur off to restore it",
+			
 			"unifyTint": "Unify blur",
-			"unifyTint.desc": "On: the sidebar and title bar get a chat-box-like frosted blur (one seamless layer, no seams; only what's behind them is blurred, the wallpaper stays sharp elsewhere), strength controlled by the Full-screen blur degree slider; surface white-fog thickness by the Sidebar/title-bar opacity slider. Off = per-area control",
+			"unifyTint.desc": "On: the sidebar gets a chat-box-like frosted blur (one seamless layer, no seams); strength by the Full-screen blur degree; sidebar white-fog thickness by the Sidebar opacity slider; the title bar always follows its own frost slider (transparent by default). Off = per-area control",
 			"unifyAmount": "Full-screen blur degree",
 			"sidebarAlpha": "Sidebar / title-bar opacity",
 			"sidebarAlpha.desc": "When unified blur is on: white-fog thickness on the sidebar and title bar (0 = fully transparent showing blurred wallpaper, 100 = solid). Decoupled from the blur degree, adjustable independently",
@@ -3389,12 +4023,18 @@ body[data-mpw-modal] [role="dialog"] {
 		// ①(新) 侧边栏磨砂摘除：监听居中弹窗出现/消失，body 打 data-mpw-sblur-off。
 		// backdrop-filter 会把 sidebarCol 变成 fixed 弹窗的 containing block（困住弹窗），
 		// 弹窗打开时摘除侧边栏模糊、关闭即恢复。不用 :has()（Firefox 层叠 bug，见 E 块注释）。
+		// ②(修正) 只摘除 **sidebarCol 内** 的弹窗：backdrop-filter 只困住 sidebarCol 的后代弹窗。
+		// 用户实测：打开「上下文占用」小弹窗（不在 sidebarCol 内）也被摘除，导致统一虚化的
+		// 侧边栏/标题栏模糊失效（session log 框随之消失）——已修正为只匹配 sidebarCol 内的
+		// role=dialog（如设置面板，它在侧边栏 footArea 里）。
 		let sblurObserver = null;
 		function setupSblurObserver() {
 			if (sblurObserver !== null) return;
 			const check = () => {
 				try {
-					const hasDlg = !!document.querySelector('[role="dialog"], [role="alertdialog"]');
+					const hasDlg = !!document.querySelector(
+						'[class*="sidebarCol"] [role="dialog"], [class*="sidebarCol"] [role="alertdialog"]'
+					);
 					if (hasDlg) document.body.setAttribute("data-mpw-sblur-off", "");
 					else document.body.removeAttribute("data-mpw-sblur-off");
 				} catch {}
@@ -3406,6 +4046,24 @@ body[data-mpw-modal] [role="dialog"] {
 			check();
 		}
 
+		// ⑲(修正) Aqua 主题切换监听：深色/浅色切换时重算遮罩色与自适应文字色
+		//（用户实测：aquaInk 开时切换主题，文字色卡在旧主题——黑字黑底/白字白底看不清）。
+		let aquaThemeWatch = null;
+		function setupAquaThemeWatch() {
+			if (aquaThemeWatch !== null) return;
+			const onTheme = () => {
+				try {
+					refreshAqua();
+					const s = readSection();
+					if (aquaOn(s)) applyTokenOverrides(pluginCtx, s);
+				} catch {}
+			};
+			try {
+				aquaThemeWatch = new MutationObserver(onTheme);
+				aquaThemeWatch.observe(document.body, { attributes: true, attributeFilter: ["data-ds-dark-theme"] });
+			} catch { aquaThemeWatch = null; }
+		}
+
 		function applyInner(ctx) {
 			// 背景 DOM 常驻
 			ensureBgDom();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mpkg-wallpaper",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "DSH Web 壁纸引擎 Wallpaper Engine mpkg 背景插件：浏览器内直接解析 .mpkg（preview.gif 动态背景/内嵌 mp4 视频/多时段切换），整屏统一虚化/对话框/弹层/遮罩独立虚化、镜头缩放平移、时钟、冲突检测。",
   "private": false,
   "type": "module",
@@ -33,10 +33,7 @@
     }
   },
   "peerDependencies": {
-    "react": "^18.2.0",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@deepseek-ai/cordis": "^4.0.1"
+    "react": "^18.2.0"
   },
   "license": "MIT",
   "keywords": [