@nonamelego/dsh-catppuccin 0.5.5 → 0.5.6-beta.0

package/lib/client.js

@@ -134,6 +134,7 @@ window.__ModuleLoader__.load({
 			const style = (0, react.useSyncExternalStore)(subscribePrefs, shikiStyle);
 			const [overridesOpen, setOverridesOpen] = (0, react.useState)(false);
 			const [draftRows, setDraftRows] = (0, react.useState)([]);
+			const nextDraftId = (0, react.useRef)(0);
 			const isTokenKey = (key) => key.trim().startsWith("--");
 			/** Commit a draft row on blur. If both fields are valid, promote to persisted;
 			*  otherwise keep in draft state. Item XX: changed from onChange to onBlur so
@@ -457,11 +458,13 @@ window.__ModuleLoader__.load({
 											children: "✕"
 										})
 									]
-								}, `draft-${index}`)),
+								}, row.id)),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 									type: "button",
 									onClick: () => {
+										nextDraftId.current += 1;
 										setDraftRows([...draftRows, {
+											id: nextDraftId.current,
 											key: "",
 											value: ""
 										}]);
@@ -1959,6 +1962,21 @@ window.__ModuleLoader__.load({
 			for (const [key, value] of Object.entries(input)) if (typeof value === "string" && key.startsWith("--")) out[key] = value;
 			return out;
 		}
+		/**
+		* Whether a raw overrides map carries entries {@link sanitizeOverrides} would
+		* drop — a key that is not a `--` token, or a non-string value.
+		*
+		* The settings-document schema types `overrides` as a dict of strings only, so
+		* a hand-edited document can hold such entries. The client reads them away but
+		* never wrote the cleaned map back, so every settings publish re-ran the
+		* "document wins" adoption for a difference nothing could clear (audit F7).
+		* The caller uses this to push the sanitized shape back once, so the document
+		* converges instead of drifting forever.
+		*/
+		function hasUnpersistableOverrides(raw) {
+			if (typeof raw !== "object" || raw === null) return false;
+			return Object.entries(raw).some(([key, value]) => typeof value !== "string" || !key.startsWith("--"));
+		}
 		/** 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;
@@ -2057,6 +2075,13 @@ window.__ModuleLoader__.load({
 			frost: "dsh.catppuccin.glass.frost",
 			brightness: "dsh.catppuccin.glass.brightness"
 		};
+		/** The localStorage names of the numeric knobs — the reverse of
+		*  `NUMERIC_KEYS`. Used by the cross-tab `storage` handler: the event's `key`
+		*  is a localStorage name (`dsh.catppuccin.glass.blur`), so it must be matched
+		*  against the VALUES, never with `key in NUMERIC_KEYS` (that tests the object's
+		*  property names — `blur`/`frost`/`brightness` — and is false for every real
+		*  storage key, which silently killed cross-tab knob sync; audit F1). */
+		const NUMERIC_STORAGE_KEYS = Object.values(NUMERIC_KEYS);
 		const MODE_KEY = "dsh.catppuccin.glass.mode";
 		/** Clamp a numeric knob into its sane range. */
 		function clampSetting(key, value) {
@@ -2156,7 +2181,7 @@ window.__ModuleLoader__.load({
 						} else if (event.key === "dsh.catppuccin.glass.enabled") {
 							this.enabled = readEnabled();
 							this.sync();
-						} else if (event.key === MODE_KEY || event.key in NUMERIC_KEYS) {
+						} else if (event.key === MODE_KEY || NUMERIC_STORAGE_KEYS.includes(event.key)) {
 							this.reloadSettings();
 							if (this.enabled) this.applySettings();
 							this.publish();
@@ -2446,8 +2471,10 @@ window.__ModuleLoader__.load({
 			const { label, value, options, onSelect } = props;
 			const [focused, setFocused] = (0, react.useState)(null);
 			const refs = (0, react.useRef)(/* @__PURE__ */ new Map());
+			const matchesValue = options.some((option) => option.id === value);
+			const anchor = focused ?? (matchesValue ? value : options[0]?.id);
 			const moveFocus = (direction) => {
-				const current = focused ?? value;
+				const current = anchor;
 				const index = options.findIndex((option) => option.id === current);
 				let next;
 				if (direction === "home") next = 0;
@@ -2491,7 +2518,7 @@ window.__ModuleLoader__.load({
 					type: "button",
 					className: option.id === value ? GlassRow_module_css_default.segActive : GlassRow_module_css_default.seg,
 					"aria-pressed": option.id === value,
-					tabIndex: option.id === (focused ?? value) ? 0 : -1,
+					tabIndex: option.id === anchor ? 0 : -1,
 					onFocus: () => {
 						setFocused(option.id);
 					},
@@ -2807,13 +2834,13 @@ window.__ModuleLoader__.load({
 				}
 				setRetryRemaining(null);
 			};
-			const runCheck = async (withChannel = channelValue) => {
+			const runCheck = async (withChannel) => {
 				cancelRetry();
 				setPhase("checking");
 				setCopied(false);
 				let next;
 				try {
-					next = await check(withChannel);
+					next = await check(withChannel ?? channel());
 				} catch {
 					next = {
 						ok: false,
@@ -3359,6 +3386,39 @@ window.__ModuleLoader__.load({
 			pendingTimer = void 0;
 			pendingWrite = void 0;
 		}
+		/**
+		* Capture-once holder for the revision a debounced write is based on (audit
+		* F2, 2026-09-22).
+		*
+		* The read-side guard in {@link persistStateToScope} only means anything if
+		* `baseRevision` is the revision the LOCAL state was derived from — i.e.
+		* sampled when the change was SCHEDULED. Reading it inside the flush instead
+		* made the comparison a tautology: the flush and the guard's own
+		* `scope.getSnapshot()` run in the same synchronous block, so the two
+		* revisions are always equal and `'stale'` is unreachable. The effect was a
+		* silently lost read-side protection: with two windows open, an external edit
+		* landing inside the 300 ms debounce window was overwritten by the stale local
+		* state and the conflict banner never appeared.
+		*
+		* `capture` keeps the FIRST revision of a burst (`??=`, not assignment): a
+		* slider drag emits several changes, and the local state each of them is based
+		* on is still the one that was current when the burst started. `take` clears
+		* the slot as it reads, so the next burst starts fresh — including when the
+		* flush bails out (unusable scope), where the value must not leak forward.
+		*/
+		function createBaseRevisionTracker() {
+			let pending;
+			return {
+				capture(read) {
+					if (pending === void 0) pending = read();
+				},
+				take() {
+					const value = pending;
+					pending = void 0;
+					return value;
+				}
+			};
+		}
 		//#endregion
 		//#region src/client/index.ts
 		/** Locale namespace owned by this plugin. */
@@ -3396,6 +3456,21 @@ window.__ModuleLoader__.load({
 				return "off";
 			}
 		}
+		/** Whether localStorage carries an EXPLICIT `off` flavour choice.
+		*
+		* `readFlavor()` maps both "no value" and "off" to `off`, and the two are not
+		* the same thing: DSH Desktop boots the GUI on a fresh random loopback port, so
+		* its localStorage starts empty on every launch and the settings document —
+		* which may legitimately hold a flavour — is what should win. Only a literal
+		* `off` in storage proves the user (or another window) actually turned the
+		* flavour off, which is the case the cross-tab restore must act on (audit F4). */
+		function readExplicitFlavorOff() {
+			try {
+				return localStorage.getItem(FLAVOR_STORAGE_KEY) === "off";
+			} catch {
+				return false;
+			}
+		}
 		/** Persist the flavour choice (storage failures keep the in-memory state). */
 		function writeFlavor(choice) {
 			try {
@@ -3637,11 +3712,15 @@ window.__ModuleLoader__.load({
 			};
 			let lastWrittenSection;
 			let handleStaleConflict;
+			const baseRevisionTracker = createBaseRevisionTracker();
+			const queuePersist = () => {
+				baseRevisionTracker.capture(() => scope.getSnapshot().revision);
+				scheduleDurablePersist(persistLocal);
+			};
 			const persistLocal = () => {
-				const snapshot = scope.getSnapshot();
-				if (!isScopeUsable(snapshot)) return;
+				const baseRevision = baseRevisionTracker.take();
+				if (!isScopeUsable(scope.getSnapshot())) return;
 				const state = buildLocalState();
-				const baseRevision = snapshot.revision;
 				persistStateToScope(scope, state, {
 					baseRevision,
 					lastWrittenSection
@@ -3682,7 +3761,11 @@ window.__ModuleLoader__.load({
 				const applyDesired = () => {
 					rememberBuiltinPreference(theme.getTheme().preference);
 					const desired = readFlavor();
-					if (desired === "off") return;
+					if (desired === "off") {
+						const preference = theme.getTheme().preference;
+						if (readExplicitFlavorOff() && flavorFromThemeId(preference) !== "off") scheduleRestore(readRestoredPreference());
+						return;
+					}
 					const preference = theme.getTheme().preference;
 					if (preference === desired) return;
 					if (builtinPickWins(preference, liveBuiltinPick)) return;
@@ -3698,11 +3781,16 @@ window.__ModuleLoader__.load({
 						try {
 							theme.setTheme(next);
 						} catch {}
+						return;
 					}
+					if (flavorFromThemeId(theme.getTheme().preference) === "off") return;
+					try {
+						theme.setTheme(readRestoredPreference());
+					} catch {}
 				};
 				window.addEventListener("storage", onStorage);
 				const offGlass = glass.subscribe(() => {
-					scheduleDurablePersist(persistLocal);
+					queuePersist();
 				});
 				const applyScopeSnapshot = () => {
 					const snapshot = scope.getSnapshot();
@@ -3710,9 +3798,10 @@ window.__ModuleLoader__.load({
 					if (state === null) return;
 					const local = buildLocalState();
 					if (snapshot.user === void 0) {
-						if (!isDefaultState(local)) scheduleDurablePersist(persistLocal);
+						if (!isDefaultState(local)) queuePersist();
 						return;
 					}
+					if (hasUnpersistableOverrides(snapshot.value?.overrides)) queuePersist();
 					if (settingsSectionsEqual(settingsSectionFromState(local), settingsSectionFromState(state))) return;
 					writeFlavor(state.flavor);
 					glass.applyRemote(state.glass);
@@ -3776,7 +3865,7 @@ window.__ModuleLoader__.load({
 					if (choice === "off") {
 						writeFlavor("off");
 						theme.setTheme(readRestoredPreference());
-						scheduleDurablePersist(persistLocal);
+						queuePersist();
 						return;
 					}
 					const flavor = flavorInfo(choice);
@@ -3784,21 +3873,21 @@ window.__ModuleLoader__.load({
 					writeFlavor(flavor.themeId);
 					ensureThemeRegistered(flavor.themeId);
 					theme.setTheme(flavor.themeId);
-					scheduleDurablePersist(persistLocal);
+					queuePersist();
 				},
 				overrides: overridesSnapshot,
 				setOverrides: (overrides) => {
 					writeOverrides(overrides);
 					emitPrefs();
 					reapplyThemePrefs();
-					scheduleDurablePersist(persistLocal);
+					queuePersist();
 				},
 				shikiStyle: () => readShikiStyle(),
 				setShikiStyle: (style) => {
 					writeShikiStyle(style);
 					emitPrefs();
 					reapplyThemePrefs();
-					scheduleDurablePersist(persistLocal);
+					queuePersist();
 				},
 				subscribePrefs: (listener) => {
 					prefsListeners.add(listener);
@@ -3859,14 +3948,14 @@ window.__ModuleLoader__.load({
 				setAutoCheck: (value) => {
 					writeAutoCheck(value);
 					emitPrefs();
-					scheduleDurablePersist(persistLocal);
+					queuePersist();
 					armAutoCheck?.();
 				},
 				channel: () => readUpdateChannel(),
 				setChannel: (channel) => {
 					writeUpdateChannel(channel);
 					emitPrefs();
-					scheduleDurablePersist(persistLocal);
+					queuePersist();
 				},
 				subscribePrefs: (listener) => {
 					prefsListeners.add(listener);
@@ -3909,6 +3998,7 @@ window.__ModuleLoader__.load({
 		exports.inject = inject;
 		exports.overridesSnapshot = overridesSnapshot;
 		exports.readAutoCheck = readAutoCheck;
+		exports.readExplicitFlavorOff = readExplicitFlavorOff;
 		exports.readFlavor = readFlavor;
 		exports.readOverrides = readOverrides;
 		exports.readRestoredPreference = readRestoredPreference;