@nonamelego/dsh-catppuccin 0.6.5-beta.0 → 0.6.5

package/lib/client.js

@@ -3449,6 +3449,46 @@ window.__ModuleLoader__.load({
 			}
 		];
 		//#endregion
+		//#region src/boot-palette.ts
+		/** Attribute marking the injected `<style>` so the Client can find it. */
+		const BOOT_PALETTE_ATTR = "data-dsh-catppuccin-boot";
+		//#endregion
+		//#region src/client/boot-palette.ts
+		/**
+		* Client half of the pre-paint palette (issue #30 补充, 2026-10-27).
+		*
+		* The Host injects a `<style data-dsh-catppuccin-boot>` into the index HTML so
+		* the first frame is already the persisted flavour (see `src/boot-palette.ts`).
+		* That sheet is only a stand-in: its selector is `html body` (0,0,2), which
+		* outranks the official `body` token block, so leaving it in place would pin
+		* every token and defeat later theme switches (the user picks Light or turns the
+		* flavour off and nothing changes).
+		*
+		* So it is removed the moment the flavour theme actually takes over — which is
+		* NOT the same instant as "setTheme was called":
+		*  - a reload where the runtime preference already equals the flavour id never
+		*    calls setTheme (see `applyDesired`'s early return), and
+		*  - a built-in pick (Light / Dark / System) must remove it too, because the
+		*    sheet belongs to a flavour that is no longer wanted.
+		* The restore effect therefore clears it from every one of those points plus a
+		* fallback timer and the effect teardown.
+		*/
+		/**
+		* Remove every injected pre-paint sheet from this document.
+		*
+		* Idempotent and safe when nothing was injected (hosts without the index
+		* injection seam, `flavor: off`, a document that already cleared it).
+		* @returns whether an element was actually removed (diagnostics and tests).
+		*/
+		function clearBootPalette() {
+			let removed = false;
+			for (const element of document.querySelectorAll(`[${BOOT_PALETTE_ATTR}]`)) {
+				element.remove();
+				removed = true;
+			}
+			return removed;
+		}
+		//#endregion
 		//#region src/client/shiki-tokens.ts
 		/**
 		* Canonical Catppuccin syntax colours per flavour.
@@ -4238,32 +4278,57 @@ window.__ModuleLoader__.load({
 			const reapplyThemePrefs = () => {
 				const active = theme.getTheme().preference;
 				const flavor = flavorInfo(active);
-				if (flavor === void 0 || !themeDisposers.has(flavor.themeId)) return;
-				disposeThemeRegistrations();
+				if (flavor === void 0) return;
+				const dispose = themeDisposers.get(flavor.themeId);
+				if (dispose === void 0) return;
+				themeDisposers.delete(flavor.themeId);
+				dispose();
 				registerThemeFor(flavor);
+				try {
+					theme.setTheme(flavor.themeId);
+				} catch {}
 			};
 			let lastWrittenSection;
 			let handleStaleConflict;
+			let applyRestoredPreference;
 			let pendingLocalPush = false;
+			let pendingLocalSection = null;
+			let maxSeenRevision;
+			let revisionKind;
+			let lastDocumentSection = null;
 			let syncedSection = settingsSectionFromState(buildLocalState());
 			const baseRevisionTracker = createBaseRevisionTracker();
 			const queuePersist = () => {
-				if (!isScopeUsable(scope.getSnapshot()) && !settingsSectionsEqual(settingsSectionFromState(buildLocalState()), syncedSection)) pendingLocalPush = true;
+				const localSection = settingsSectionFromState(buildLocalState());
+				if ((lastDocumentSection === null || !settingsSectionsEqual(localSection, lastDocumentSection)) && !settingsSectionsEqual(localSection, syncedSection)) {
+					pendingLocalSection = localSection;
+					if (!isScopeUsable(scope.getSnapshot())) pendingLocalPush = true;
+				}
 				baseRevisionTracker.capture(() => scope.getSnapshot().revision);
 				scheduleDurablePersist(persistLocal);
 			};
 			const persistLocal = () => {
 				const baseRevision = baseRevisionTracker.take();
-				if (!isScopeUsable(scope.getSnapshot())) return;
+				if (!isScopeUsable(scope.getSnapshot())) {
+					pendingLocalSection = null;
+					return;
+				}
 				const state = buildLocalState();
+				const flushed = settingsSectionFromState(state);
 				persistStateToScope(scope, state, {
 					baseRevision,
 					lastWrittenSection
 				}).then((outcome) => {
+					const settled = pendingLocalSection !== null && settingsSectionsEqual(pendingLocalSection, flushed);
 					if (outcome === "written") {
-						lastWrittenSection = settingsSectionFromState(state);
-						syncedSection = lastWrittenSection;
+						lastWrittenSection = flushed;
+						syncedSection = flushed;
+						if (settled) pendingLocalSection = null;
+					} else if (outcome === "noop") {
+						syncedSection = flushed;
+						if (settled) pendingLocalSection = null;
 					} else if (outcome === "stale") {
+						if (settled) pendingLocalSection = null;
 						emitConflict();
 						handleStaleConflict?.();
 					}
@@ -4271,28 +4336,49 @@ window.__ModuleLoader__.load({
 			};
 			const AUTO_CHECK_BOOT_DELAY_MS = 3e3;
 			const AUTO_CHECK_INTERVAL_MS = 216e5;
+			/** How long the Host's pre-paint palette may survive before it is removed
+			*  unconditionally (issue #30 补充). Generous on purpose: removing it EARLY
+			*  re-exposes the official palette for one frame, which is the bug. */
+			const BOOT_PALETTE_FALLBACK_MS = 1e4;
 			let lastAutoResult = null;
 			let armAutoCheck;
 			ctx.effect(() => {
 				let liveBuiltinPick = null;
+				const bootPaletteFallback = window.setTimeout(() => {
+					clearBootPalette();
+				}, BOOT_PALETTE_FALLBACK_MS);
 				const originalSetTheme = theme.setTheme;
-				const restoreGuardSetTheme = (id) => {
-					liveBuiltinPick = isBuiltinPreference(id) ? id : null;
+				const commitTheme = (id, record) => {
+					if (record) liveBuiltinPick = isBuiltinPreference(id) ? id : null;
 					originalSetTheme.call(theme, id);
+					clearBootPalette();
+				};
+				const restoreGuardSetTheme = (id) => {
+					commitTheme(id, true);
 				};
 				theme.setTheme = restoreGuardSetTheme;
+				applyRestoredPreference = (id) => {
+					commitTheme(id, false);
+				};
 				let restorePending = false;
+				let pendingDesired;
 				const scheduleRestore = (desired) => {
+					pendingDesired = desired;
 					if (restorePending) return;
 					restorePending = true;
 					queueMicrotask(() => {
 						restorePending = false;
+						const wanted = pendingDesired;
+						pendingDesired = void 0;
 						const preference = theme.getTheme().preference;
-						if (preference === desired) return;
+						if (preference === wanted) {
+							clearBootPalette();
+							return;
+						}
 						if (builtinPickWins(preference, liveBuiltinPick)) return;
-						ensureThemeRegistered(desired);
+						ensureThemeRegistered(wanted);
 						try {
-							theme.setTheme(desired);
+							commitTheme(wanted, false);
 						} catch {}
 					});
 				};
@@ -4301,11 +4387,17 @@ window.__ModuleLoader__.load({
 					const desired = readFlavor();
 					if (desired === "off") {
 						const preference = theme.getTheme().preference;
-						if (readExplicitFlavorOff() && flavorFromThemeId(preference) !== "off") scheduleRestore(readRestoredPreference());
+						if (readExplicitFlavorOff()) {
+							clearBootPalette();
+							if (flavorFromThemeId(preference) !== "off") scheduleRestore(readRestoredPreference());
+						}
 						return;
 					}
 					const preference = theme.getTheme().preference;
-					if (preference === desired) return;
+					if (preference === desired) {
+						clearBootPalette();
+						return;
+					}
 					if (builtinPickWins(preference, liveBuiltinPick)) return;
 					scheduleRestore(desired);
 				};
@@ -4323,7 +4415,7 @@ window.__ModuleLoader__.load({
 					}
 					if (flavorFromThemeId(theme.getTheme().preference) === "off") return;
 					try {
-						theme.setTheme(readRestoredPreference());
+						commitTheme(readRestoredPreference(), false);
 					} catch {}
 				};
 				window.addEventListener("storage", onStorage);
@@ -4334,6 +4426,15 @@ window.__ModuleLoader__.load({
 					const snapshot = scope.getSnapshot();
 					const state = durableStateFromSnapshot(snapshot);
 					if (state === null) return;
+					const revision = snapshot.revision;
+					if (revision !== void 0) {
+						if (revisionKind !== scope.kind) {
+							revisionKind = scope.kind;
+							maxSeenRevision = void 0;
+						}
+						if (maxSeenRevision !== void 0 && revision < maxSeenRevision) return;
+						maxSeenRevision = Math.max(maxSeenRevision ?? revision, revision);
+					}
 					const local = buildLocalState();
 					if (pendingLocalPush) {
 						pendingLocalPush = false;
@@ -4349,6 +4450,7 @@ window.__ModuleLoader__.load({
 							reapplyThemePrefs();
 							applyDesired();
 							syncedSection = settingsSectionFromState(replayed.state);
+							lastDocumentSection = settingsSectionFromState(state);
 							queuePersist();
 							return;
 						}
@@ -4357,8 +4459,19 @@ window.__ModuleLoader__.load({
 						if (!isDefaultState(local)) queuePersist();
 						return;
 					}
-					if (hasUnpersistableOverrides(snapshot.value?.overrides)) queuePersist();
-					if (settingsSectionsEqual(settingsSectionFromState(local), settingsSectionFromState(state))) return;
+					const pushCleaned = hasUnpersistableOverrides(snapshot.value?.overrides);
+					const localSection = settingsSectionFromState(local);
+					const documentSection = settingsSectionFromState(state);
+					if (settingsSectionsEqual(localSection, documentSection)) {
+						lastDocumentSection = documentSection;
+						return;
+					}
+					if (pendingLocalSection !== null && !settingsSectionsEqual(pendingLocalSection, documentSection)) return;
+					cancelDurablePersist();
+					baseRevisionTracker.take();
+					pendingLocalSection = null;
+					lastDocumentSection = documentSection;
+					syncedSection = documentSection;
 					writeFlavor(state.flavor);
 					glass.applyRemote(state.glass);
 					writeAutoCheck(state.autoCheck);
@@ -4368,7 +4481,7 @@ window.__ModuleLoader__.load({
 					emitPrefs();
 					reapplyThemePrefs();
 					applyDesired();
-					syncedSection = settingsSectionFromState(state);
+					if (pushCleaned) queuePersist();
 				};
 				applyScopeSnapshot();
 				const offScope = scope.subscribe(applyScopeSnapshot);
@@ -4402,10 +4515,13 @@ window.__ModuleLoader__.load({
 					offGlass();
 					disposer();
 					window.removeEventListener("storage", onStorage);
+					window.clearTimeout(bootPaletteFallback);
+					clearBootPalette();
 					window.clearTimeout(bootTimer);
 					window.clearInterval(intervalTimer);
 					cancelDurablePersist();
 					handleStaleConflict = void 0;
+					applyRestoredPreference = void 0;
 					armAutoCheck = void 0;
 					if (theme.setTheme === restoreGuardSetTheme) theme.setTheme = originalSetTheme;
 					else console.warn("[dsh-catppuccin] theme.setTheme was replaced by another extension; leaving it in place");
@@ -4426,18 +4542,32 @@ window.__ModuleLoader__.load({
 					if (choice === "off") {
 						writeFlavor("off");
 						try {
-							theme.setTheme(readRestoredPreference());
+							if (applyRestoredPreference !== void 0) applyRestoredPreference(readRestoredPreference());
+							else theme.setTheme(readRestoredPreference());
 						} catch {}
 						queuePersist();
 						return;
 					}
 					const flavor = flavorInfo(choice);
 					if (!flavor) return;
+					const previous = readFlavor();
 					writeFlavor(flavor.themeId);
 					ensureThemeRegistered(flavor.themeId);
 					try {
 						theme.setTheme(flavor.themeId);
-					} catch {}
+					} catch {
+						themeDisposers.get(flavor.themeId)?.();
+						themeDisposers.delete(flavor.themeId);
+						registerThemeFor(flavor);
+						try {
+							theme.setTheme(flavor.themeId);
+						} catch {
+							writeFlavor(previous);
+							emitPrefs();
+							emitConflict();
+							return;
+						}
+					}
 					queuePersist();
 				},
 				overrides: overridesSnapshot,