dsh-dracula-theme 0.1.3 → 0.1.4

package/lib/client.js

@@ -799,51 +799,59 @@ window.__ModuleLoader__.load({
 				style.remove();
 			}, "dsh-dracula-theme: surface tint lifecycle");
 
-			// Restore the saved skin against the boot adoption storm. The
-			// ThemeService adopts its durable built-in preference
-			// ("light"/"dark"/"system") from the Host settings scope
-			// asynchronously after boot; every adoption emits theme/change
-			// with a built-in preference that overwrites a third-party one.
-			// In slower boot paths — the desktop client's RPC bridge emits
-			// more, later sync events — a fixed retry budget (a handful of
-			// tries within a few seconds) can be exhausted and the theme
-			// silently reverts to default. So instead of a time-boxed guard
-			// we stay armed while the storm is active: re-assert the saved
-			// skin on every built-in revert, and only yield to user actions
-			// once the preference has rested on the saved skin for a quiet
-			// period with no further adoption events.
+			// Restore the saved skin and hold it against the theme runtime's
+			// built-in preference. The ThemeService adopts its durable
+			// built-in preference ("light"/"dark"/"system") from the Host
+			// settings scope; every adoption emits theme/change with a
+			// built-in preference that overwrites a third-party one. That can
+			// happen not only in a boot storm, but ANY time the settings
+			// document is re-synced mid-session (another client touching the
+			// shared settings.yaml is enough) — which silently reverts the
+			// UI to the built-in appearance without any user action.
+			//
+			// Strategy: track the last observed durable value. A built-in
+			// preference equal to it is an adoption echo of an unchanged
+			// document → re-assert the saved skin. A different value is a
+			// real user change of the Appearance row (or the first boot
+			// adoption, within a short boot window) — the first sighting
+			// within the boot window re-asserts, any later one is respected
+			// and drops our stored choice, so the user's explicit
+			// appearance choice always wins afterwards.
 			const saved = readSavedSkin();
-			const savedValid = typeof saved === "string" && saved !== DEFAULT_SKIN && SKINS.some((skinDefinition) => skinDefinition.id === saved);
-			let armed = savedValid;
-			let quietTimer;
-			const disarm = () => {
-				armed = false;
-			};
-			const scheduleDisarm = () => {
-				clearTimeout(quietTimer);
-				quietTimer = setTimeout(disarm, 4000);
+			let savedValid = typeof saved === "string" && saved !== DEFAULT_SKIN && SKINS.some((skinDefinition) => skinDefinition.id === saved);
+			let lastSeenDurable = null;
+			const bootUntil = Date.now() + 15000;
+
+			/** Re-assert the saved skin from a fresh task (see the dispatch note below). */
+			const reassertSaved = () => {
+				if (!savedValid) return;
+				setTimeout(() => {
+					const pref = ctx.theme.getTheme().preference;
+					if (pref !== saved) ctx.theme.setTheme(saved);
+				}, 0);
 			};
-			const reassertAgainstAdoption = () => {
-				if (!armed) return;
-				const pref = ctx.theme.getTheme().preference;
-				if (pref === saved) {
-					scheduleDisarm();
+			/** Handle a built-in preference (light/dark/system) sighting. */
+			const considerBuiltin = (pref) => {
+				if (pref === lastSeenDurable) {
+					// Adoption echo: the document was re-synced with the same
+					// durable value. Hold the skin.
+					reassertSaved();
 					return;
 				}
-				if (pref === "light" || pref === "dark" || pref === DEFAULT_SKIN) {
-					// A built-in won — during boot this can only be a scope
-					// adoption (nobody reaches the Appearance row that fast).
-					// Re-assert, then require another quiet period.
-					ctx.theme.setTheme(saved);
-					scheduleDisarm();
+				lastSeenDurable = pref;
+				if (Date.now() <= bootUntil) {
+					// First sighting inside the boot window — the boot
+					// adoption arriving. Restore the saved skin.
+					reassertSaved();
+					return;
 				}
-				// Another third-party theme — the drop-foreign convention
-				// below clears our stored choice instead of fighting.
+				// A durable change after boot is a real user action on the
+				// Appearance row: respect it and drop our stored choice so
+				// later echoes of the same value cannot resurrect the skin.
+				writeSavedSkin(DEFAULT_SKIN);
+				savedValid = false;
 			};
-			reassertAgainstAdoption();
-			ctx.effect(() => () => {
-				clearTimeout(quietTimer);
-			}, "dsh-dracula-theme: boot restore lifecycle");
+			considerBuiltin(ctx.theme.getTheme().preference);
 
 			const skinStore = createSkinStore();
 			let skinBound;
@@ -852,19 +860,18 @@ window.__ModuleLoader__.load({
 			};
 			ctx.on("theme/change", (snapshot) => {
 				syncSkin(snapshot);
+				const pref = snapshot.preference;
+				if (pref === DEFAULT_SKIN || pref === "light" || pref === "dark") {
+					considerBuiltin(pref);
+					return;
+				}
 				// If the preference moved to another plugin's third-party theme,
 				// drop our stored choice so only the last-picked plugin restores
 				// at boot (both plugins must implement this convention).
-				const pref = snapshot.preference;
-				if (pref !== DEFAULT_SKIN && pref !== "light" && pref !== "dark" && !SKINS.some((skinDefinition) => skinDefinition.id === pref)) {
+				if (!SKINS.some((skinDefinition) => skinDefinition.id === pref)) {
 					writeSavedSkin(DEFAULT_SKIN);
+					savedValid = false;
 				}
-				// Re-assert from a fresh task: a re-entrant setTheme inside the
-				// dispatch is missed by other subscribers (ui-layout's
-				// ThemePresenter), so the restored skin would never reach the DOM.
-				setTimeout(() => {
-					reassertAgainstAdoption();
-				}, 0);
 			});
 
 			ctx.effect(() => ctx.locale.register(SETTINGS_NS, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-dracula-theme",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "🧛 Dracula theme for DeepSeek Harness: the classic dark palette (plus the Soft variant) registered into the built-in theme runtime",
   "license": "MIT",
   "author": "ossFrankFrank",