@nonamelego/dsh-catppuccin 0.2.11 → 0.3.1

package/README.md

@@ -152,7 +152,8 @@ pnpm --dir C:\Users\LeGo\.dsh\profiles\web add link:D:\Vibe-Coding\dsh-catppucci
 2. 进入 **设置 → 常规**。
 3. 在 **外观** 区域下方找到 **Catppuccin** 行，选择主题：
    **Latte**（浅色）、**Frappé**、**Macchiato** 或 **Mocha**（深色）。
-4. 选择 **跟随系统** 则回退到官方主题。
+4. 选择 **跟随系统** 则回退到官方主题——会还原你启用 Catppuccin 之前
+   的官方偏好（浅色 / 深色 / 跟随系统），而不是强制重置。
 
 ### 玻璃质感
 
@@ -162,6 +163,8 @@ pnpm --dir C:\Users\LeGo\.dsh\profiles\web add link:D:\Vibe-Coding\dsh-catppucci
   关闭即完全还原原生界面（无需刷新）。
 - **模式**：**云母效果**把界面改成悬浮磨砂卡片；**兼容模式**保持原版排版，
   只把材质换成玻璃。
+- **预设**：**清透 / 标准 / 磨砂** 三档一键套用；想微调再用下面的滑条
+  （当前旋钮值与某档一致时该档高亮）。
 - **玻璃模糊度**（0–40 px）、**磨砂度**（0–100%）：控制玻璃的模糊半径与
   不透明度。
 - **背景亮度**：深色模式 0–50 压暗、浅色模式 50–100 提亮（50 为原样），
@@ -179,7 +182,8 @@ localStorage 只作为即时缓存与多标签页同步——**DSH Desktop** 每
 在 **设置 → 常规** 的 **玻璃质感** 正下方找到 **检查 Catppuccin 插件更新** 行：
 
 - 点击 **检查更新**，插件宿主会查询 npm registry 上本插件（`dsh-catppuccin`）
-  的最新版本，并与当前安装版本比较（含预发布版本的语义化版本比较）。
+  的最新版本，并与当前安装版本比较（含预发布版本的语义化版本比较）；
+  宿主侧对检查结果缓存 5 分钟，短时间内反复点击不会重复请求 registry。
 - 已是最新 → 显示当前版本号；发现新版 → 显示新版本号，并给出可复制的
   升级命令。命令中的 profile 名由宿主**自动探测**：优先取当前进程的
   `--profile` 参数，否则扫描 `~/.dsh/profiles/*` 找到实际安装了本插件的

package/lib/client.js

@@ -129,6 +129,10 @@ window.__ModuleLoader__.load({
 			"glass.modeMica": "云母效果",
 			"glass.modeCompat": "兼容模式",
 			"glass.modeHint": "云母效果把界面改成悬浮磨砂卡片；兼容模式保持原版排版，只换玻璃材质",
+			"glass.presets": "预设",
+			"glass.presetClear": "清透",
+			"glass.presetStandard": "标准",
+			"glass.presetFrosted": "磨砂",
 			"glass.blur": "玻璃模糊度",
 			"glass.frost": "磨砂度",
 			"glass.brightness": "背景亮度",
@@ -177,6 +181,10 @@ window.__ModuleLoader__.load({
 			"glass.modeMica": "Mica",
 			"glass.modeCompat": "Compatibility",
 			"glass.modeHint": "Mica restyles the UI into floating frosted cards; Compatibility keeps the stock layout and only swaps the material to glass",
+			"glass.presets": "Presets",
+			"glass.presetClear": "Clear",
+			"glass.presetStandard": "Standard",
+			"glass.presetFrosted": "Frosted",
 			"glass.blur": "Glass blur",
 			"glass.frost": "Frost",
 			"glass.brightness": "Backdrop brightness",
@@ -1029,6 +1037,67 @@ window.__ModuleLoader__.load({
 				observer.disconnect();
 			};
 		}
+		/** Host route answering the durable state (GET reads, PUT writes). */
+		const STATE_ROUTE_PATH = "/catppuccin/state";
+		/** The four registered Catppuccin theme ids. MUST stay in sync with the
+		*  `themeId` of `CATPPUCCIN_FLAVORS` in `src/client/palettes.ts` — guarded by
+		*  `tests/state.spec.ts` — because the persisted flavour value IS the theme id. */
+		const CATPPUCCIN_THEME_IDS = [
+			"catppuccin-latte",
+			"catppuccin-frappe",
+			"catppuccin-macchiato",
+			"catppuccin-mocha"
+		];
+		/** Shipped glass defaults — the single source of truth; the client glass layer
+		*  (`src/client/glass/glass-layer.ts`) derives its knob defaults from here. */
+		const DEFAULT_GLASS = {
+			enabled: false,
+			mode: "mica",
+			blur: 2,
+			frost: 20,
+			brightness: 50
+		};
+		/** A fully default state: no Catppuccin flavour and no glass. */
+		function defaultState() {
+			return {
+				version: 1,
+				flavor: "off",
+				glass: { ...DEFAULT_GLASS }
+			};
+		}
+		/** Clamp a finite number into [min, max]; non-finite values fall back. */
+		function clampFinite(value, min, max, fallback) {
+			return typeof value === "number" && Number.isFinite(value) ? Math.min(max, Math.max(min, value)) : fallback;
+		}
+		/**
+		* Normalize arbitrary input (JSON from disk or the wire) into a valid state:
+		* unknown/missing fields fall back to defaults, out-of-range numbers clamp,
+		* and unknown flavours/invalid enums fall back too. The Host applies this on
+		* both read and write so a corrupt file or a hand-crafted payload can never
+		* poison the plugin's settings.
+		*/
+		function sanitizeState(input) {
+			const state = defaultState();
+			if (typeof input !== "object" || input === null) return state;
+			const raw = input;
+			const flavor = raw.flavor;
+			if (typeof flavor === "string" && CATPPUCCIN_THEME_IDS.includes(flavor)) state.flavor = flavor;
+			else if (flavor === "off") state.flavor = "off";
+			const glass = typeof raw.glass === "object" && raw.glass !== null ? raw.glass : {};
+			state.glass.enabled = glass.enabled === true;
+			state.glass.mode = glass.mode === "compat" ? "compat" : "mica";
+			state.glass.blur = clampFinite(glass.blur, 0, 40, DEFAULT_GLASS.blur);
+			state.glass.frost = clampFinite(glass.frost, 0, 100, DEFAULT_GLASS.frost);
+			state.glass.brightness = clampFinite(glass.brightness, 0, 100, DEFAULT_GLASS.brightness);
+			return state;
+		}
+		/** Whether a normalized state carries nothing beyond the shipped defaults —
+		*  i.e. the user never actually chose anything worth persisting. Used to tell
+		*  "no durable state yet" apart from "an explicit default choice". */
+		function isDefaultState(state) {
+			const expected = defaultState();
+			return state.flavor === expected.flavor && state.glass.enabled === expected.glass.enabled && state.glass.mode === expected.glass.mode && state.glass.blur === expected.glass.blur && state.glass.frost === expected.glass.frost && state.glass.brightness === expected.glass.brightness;
+		}
 		//#endregion
 		//#region src/client/glass/glass-layer.ts
 		/** html attribute selecting the glass layer: CSS hooks and page effects. */
@@ -1039,18 +1108,21 @@ window.__ModuleLoader__.load({
 		const GLASS_COMPAT_ATTRIBUTE = "data-dsh-glass-compat";
 		/** localStorage key carrying the layer enable flag. */
 		const GLASS_ENABLED_KEY = "dsh.catppuccin.glass.enabled";
+		/** Default state when nothing is stored yet: off (the stock UI stays stock). */
+		const DEFAULT_ENABLED = DEFAULT_GLASS.enabled;
 		/**
-		* Shipped knob defaults — aligned with the reference project
+		* Shipped knob defaults — the knob-only view of `DEFAULT_GLASS` in
+		* `src/state.ts` (the single source of truth, inlined into both bundles).
+		* The shipped look aligns with the reference project
 		* (DSH-Transparent-UI-Plugin / Aqua): mica mode, blur 2px, frost 20
 		* (the 0-100 slider maps to a 0-1.4 alpha multiplier via frost/50, so 20
-		* reads as a light frost) and neutral backdrop brightness. MUST stay in sync
-		* with `DEFAULT_GLASS` in `src/state.ts` (guarded by `tests/state.spec.ts`).
+		* reads as a light frost) and neutral backdrop brightness.
 		*/
 		const SETTINGS_DEFAULTS = {
-			mode: "mica",
-			blur: 2,
-			frost: 20,
-			brightness: 50
+			mode: DEFAULT_GLASS.mode,
+			blur: DEFAULT_GLASS.blur,
+			frost: DEFAULT_GLASS.frost,
+			brightness: DEFAULT_GLASS.brightness
 		};
 		/** Numeric knob keys and their localStorage names. */
 		const NUMERIC_KEYS = {
@@ -1097,9 +1169,9 @@ window.__ModuleLoader__.load({
 		function readEnabled() {
 			try {
 				const raw = localStorage.getItem(GLASS_ENABLED_KEY);
-				return raw === null ? false : raw === "true";
+				return raw === null ? DEFAULT_ENABLED : raw === "true";
 			} catch {
-				return false;
+				return DEFAULT_ENABLED;
 			}
 		}
 		/** Persist the enable flag (storage failures keep the in-memory state). */
@@ -1430,6 +1502,33 @@ window.__ModuleLoader__.load({
 				}, option.id))
 			});
 		}
+		/** One-click material presets — blur/frost/brightness triples the row applies
+		*  through the existing setters (the debounced persist coalesces the burst
+		*  into one Host write). Brightness stays neutral (50) so every preset works
+		*  in both schemes; the sliders remain for fine tuning. */
+		const GLASS_PRESETS = [
+			{
+				id: "clear",
+				key: "glass.presetClear",
+				blur: 0,
+				frost: 8,
+				brightness: 50
+			},
+			{
+				id: "standard",
+				key: "glass.presetStandard",
+				blur: SETTINGS_DEFAULTS.blur,
+				frost: SETTINGS_DEFAULTS.frost,
+				brightness: SETTINGS_DEFAULTS.brightness
+			},
+			{
+				id: "frosted",
+				key: "glass.presetFrosted",
+				blur: 12,
+				frost: 45,
+				brightness: 50
+			}
+		];
 		/**
 		* Render the glass row: title, the master switch, and — while enabled — the
 		* mode picker and every knob.
@@ -1441,6 +1540,7 @@ window.__ModuleLoader__.load({
 			const bgMin = dark ? 0 : 50;
 			const bgMax = dark ? 50 : 100;
 			const bgDisplay = Math.min(bgMax, Math.max(bgMin, brightness));
+			const activePreset = GLASS_PRESETS.find((p) => p.blur === blur && p.frost === frost && p.brightness === brightness)?.id ?? "";
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: GlassRow_module_css_default.group,
 				children: [
@@ -1497,6 +1597,27 @@ window.__ModuleLoader__.load({
 								className: GlassRow_module_css_default.rowHint,
 								children: t("glass.modeHint")
 							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: GlassRow_module_css_default.row,
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: GlassRow_module_css_default.rowLabel,
+									children: t("glass.presets")
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Segmented, {
+									label: t("glass.presets"),
+									value: activePreset,
+									options: GLASS_PRESETS.map((p) => ({
+										id: p.id,
+										label: t(p.key)
+									})),
+									onSelect: (id) => {
+										const preset = GLASS_PRESETS.find((p) => p.id === id);
+										if (preset === void 0) return;
+										setBlur(preset.blur);
+										setFrost(preset.frost);
+										setBrightness(preset.brightness);
+									}
+								})]
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Knob, {
 								label: t("glass.blur"),
 								value: blur,
@@ -1803,67 +1924,6 @@ window.__ModuleLoader__.load({
 		`${"@nonamelego/dsh-catppuccin".replace("/", "%2F")}`;
 		/** Host route the Client row fetches (exact match, same origin). */
 		const UPDATE_ROUTE_PATH = "/catppuccin/check-update";
-		/** Host route answering the durable state (GET reads, PUT writes). */
-		const STATE_ROUTE_PATH = "/catppuccin/state";
-		/** The four registered Catppuccin theme ids. MUST stay in sync with the
-		*  `themeId` of `CATPPUCCIN_FLAVORS` in `src/client/palettes.ts` — guarded by
-		*  `tests/state.spec.ts` — because the persisted flavour value IS the theme id. */
-		const CATPPUCCIN_THEME_IDS = [
-			"catppuccin-latte",
-			"catppuccin-frappe",
-			"catppuccin-macchiato",
-			"catppuccin-mocha"
-		];
-		/** Shipped glass defaults — aligned with `SETTINGS_DEFAULTS` in
-		*  `src/client/glass/glass-layer.ts` (guarded by `tests/state.spec.ts`). */
-		const DEFAULT_GLASS = {
-			enabled: false,
-			mode: "mica",
-			blur: 2,
-			frost: 20,
-			brightness: 50
-		};
-		/** A fully default state: no Catppuccin flavour and no glass. */
-		function defaultState() {
-			return {
-				version: 1,
-				flavor: "off",
-				glass: { ...DEFAULT_GLASS }
-			};
-		}
-		/** Clamp a finite number into [min, max]; non-finite values fall back. */
-		function clampFinite(value, min, max, fallback) {
-			return typeof value === "number" && Number.isFinite(value) ? Math.min(max, Math.max(min, value)) : fallback;
-		}
-		/**
-		* Normalize arbitrary input (JSON from disk or the wire) into a valid state:
-		* unknown/missing fields fall back to defaults, out-of-range numbers clamp,
-		* and unknown flavours/invalid enums fall back too. The Host applies this on
-		* both read and write so a corrupt file or a hand-crafted payload can never
-		* poison the plugin's settings.
-		*/
-		function sanitizeState(input) {
-			const state = defaultState();
-			if (typeof input !== "object" || input === null) return state;
-			const raw = input;
-			const flavor = raw.flavor;
-			if (typeof flavor === "string" && CATPPUCCIN_THEME_IDS.includes(flavor)) state.flavor = flavor;
-			else if (flavor === "off") state.flavor = "off";
-			const glass = typeof raw.glass === "object" && raw.glass !== null ? raw.glass : {};
-			state.glass.enabled = glass.enabled === true;
-			state.glass.mode = glass.mode === "compat" ? "compat" : "mica";
-			state.glass.blur = clampFinite(glass.blur, 0, 40, DEFAULT_GLASS.blur);
-			state.glass.frost = clampFinite(glass.frost, 0, 100, DEFAULT_GLASS.frost);
-			state.glass.brightness = clampFinite(glass.brightness, 0, 100, DEFAULT_GLASS.brightness);
-			return state;
-		}
-		/** Whether a normalized state carries nothing beyond the shipped defaults —
-		*  i.e. the user never actually chose anything worth persisting. Used to tell
-		*  "no durable state yet" apart from "an explicit default choice". */
-		function isDefaultState(state) {
-			const expected = defaultState();
-			return state.flavor === expected.flavor && state.glass.enabled === expected.glass.enabled && state.glass.mode === expected.glass.mode && state.glass.blur === expected.glass.blur && state.glass.frost === expected.glass.frost && state.glass.brightness === expected.glass.brightness;
-		}
 		//#endregion
 		//#region src/client/state-sync.ts
 		/**
@@ -1981,6 +2041,28 @@ window.__ModuleLoader__.load({
 				localStorage.setItem(FLAVOR_STORAGE_KEY, choice);
 			} catch {}
 		}
+		/** localStorage key recording the last built-in theme preference. */
+		const RESTORE_STORAGE_KEY = "dsh.catppuccin.restore";
+		/** Remember a built-in preference (system/light/dark) whenever the runtime is
+		*  not on a Catppuccin flavour, so switching the plugin off restores the
+		*  user's pre-plugin choice instead of dropping them onto 'system'. The boot
+		*  preference is the settings-document value, so this survives Desktop's
+		*  per-launch port churn without joining the durable state schema. */
+		function rememberBuiltinPreference(preference) {
+			if (CATPPUCCIN_FLAVOR_VALUES.includes(preference)) return;
+			try {
+				localStorage.setItem(RESTORE_STORAGE_KEY, preference);
+			} catch {}
+		}
+		/** The preference to restore when turning the flavour off (default: system). */
+		function readRestoredPreference() {
+			try {
+				const raw = localStorage.getItem(RESTORE_STORAGE_KEY);
+				return raw === "light" || raw === "dark" ? raw : "system";
+			} catch {
+				return "system";
+			}
+		}
 		/** Required services: slots + locale (settings rows) and theme (register + switch). */
 		const inject = [
 			"slots",
@@ -2023,6 +2105,7 @@ window.__ModuleLoader__.load({
 			});
 			ctx.effect(() => {
 				const applyDesired = () => {
+					rememberBuiltinPreference(theme.getTheme().preference);
 					const desired = readFlavor();
 					if (desired === "off") return;
 					const preference = theme.getTheme().preference;
@@ -2079,7 +2162,7 @@ window.__ModuleLoader__.load({
 				select: (choice) => {
 					if (choice === "off") {
 						writeFlavor("off");
-						theme.setTheme("system");
+						theme.setTheme(readRestoredPreference());
 						scheduleDurablePersist(buildLocalState);
 						return;
 					}
@@ -2149,11 +2232,14 @@ window.__ModuleLoader__.load({
 		exports.CATPPUCCIN_FLAVOR_VALUES = CATPPUCCIN_FLAVOR_VALUES;
 		exports.FLAVOR_STORAGE_KEY = FLAVOR_STORAGE_KEY;
 		exports.NS = NS;
+		exports.RESTORE_STORAGE_KEY = RESTORE_STORAGE_KEY;
 		exports.apply = apply;
 		exports.flavorFromThemeId = flavorFromThemeId;
 		exports.flavorInfo = flavorInfo;
 		exports.inject = inject;
 		exports.readFlavor = readFlavor;
+		exports.readRestoredPreference = readRestoredPreference;
+		exports.rememberBuiltinPreference = rememberBuiltinPreference;
 		exports.writeFlavor = writeFlavor;
 		return module.exports;
 	}