@nonamelego/dsh-catppuccin 0.6.4 → 0.6.5-beta.2

package/README.en.md

@@ -56,7 +56,7 @@ glass skin on Web / Desktop, and the four official theme palettes auto-synced to
 
 It ships all four Catppuccin flavours — **Latte**, **Frappé**, **Macchiato**, **Mocha** —
 remapping the whole interface to the matching palette, with a **settings section of its own**
-(**Settings → Catppuccin**: flavour, code highlighting, token overrides, glass, update check).
+(**Settings → Catppuccin**: flavour, code highlighting, token overrides, glass, update check, feedback).
 Your choice is persisted and restored after restarts.
 
 It also includes an optional **glassmorphism** skin: the top bar, sidebar, composer,
@@ -69,7 +69,7 @@ Catppuccin theme automatically.
 - 🎨 Four themes: Latte (light), Frappé / Macchiato / Mocha (dark)
 - 🧩 Registered into the official theme system, on a par with the built-in light / dark / system themes
 - 🎯 Full-UI colour coverage — not just one or two accent colours
-- ⚙️ One-click switch in Settings, persisted and restored across restarts
+- ⚙️ One-click switch on its own Settings section, persisted and restored across restarts
 - 🔧 **Custom token overrides**: override individual colour tokens with `--dsw-* var: value` pairs (e.g. turn comments blue); persisted alongside the selected flavour
 - 🖍️ **Code-block highlight style**: default / italic-comments shiki themes
 - 🌐 Seven UI languages (Chinese / English / Japanese / Korean / Spanish / French / German, follows the system language)
@@ -80,7 +80,7 @@ Catppuccin theme automatically.
   (interaction reference: [DSH-Transparent-UI-Plugin](https://github.com/WYH66666666/DSH-Transparent-UI-Plugin))
 - 🌫️ **Glass details**: gradient blur bands at the top/bottom page edges, a floating glass
   rail when the sidebar is collapsed, an ambient theme-following ground (a same-family
-  wash + two soft glows) — content softens as it scrolls under the panes
+  wash; the two soft glows are an **opt-in switch, off by default**) — content softens as it scrolls under the panes
 - 🎨 Glass colours follow the current Catppuccin theme
 - 🔄 **Update check**: one-click "Check for updates" in Settings compares the latest npm
   version and gives you a copyable upgrade command; **auto-check is on by default** (once at
@@ -260,6 +260,14 @@ The **Glass** section lives on the **Settings → Catppuccin** page:
 - **Backdrop brightness**: dark mode darkens 0–50, light mode brightens 50–100 (50 = as-is),
   mixed straight into the ground; at the extremes the ambience fades out and the ground
   collapses back to pure white / pure black.
+- **Ground glows**: adds two screen-pinned soft glows on top of the ground (the `0.6.3` look),
+  **off by default** — they do not follow the panes, so each pane transmits a different slice
+  of them and the top-left corner brightens visibly when on.
+- **In-place previews**: a **ground sample strip** in the glass section (drag brightness or
+  toggle the glows and it changes on the spot — it is painted by the page ground's own rule);
+  a **code sample** under the highlight picker (reads `--shiki-token-*`, so switching to
+  italic-comments recolours it immediately); and **Show the UI** next to the mode picker,
+  which closes Settings so you can look at the real layout.
 
 Glass colours follow the active theme live; all settings persist across restarts.
 
@@ -296,8 +304,9 @@ What this plugin does:
   bubbles and the new-session button; in Mica mode they become rounded floating cards and
   chat content scrolls *under* the glass, blurred; the collapsed sidebar becomes a
   floating rail at the edge of the chat area (the "performance & usage" stats line is
-  *not* one of them — it stays stock, outside the glass card; see the `0.6.2`
-  "fused band removed" entry in the changelog);
+  *not* a glass card and stays outside it, but since `0.6.4` it sits on a **frosted
+  ground-coloured strip** so the scrolling transcript cannot read through the readouts —
+  see the `0.6.2` "fused band removed" entry and issue #29 in `0.6.4`);
 - **Page-edge gradient blur**: a blur band at the top and bottom of the viewport so
   messages are softened as they melt past the edges (borrowed from
   [DSH-Transparent-UI-Plugin](https://github.com/WYH66666666/DSH-Transparent-UI-Plugin)'s
@@ -371,10 +380,15 @@ theme/glass actually reached the sidebar in that run), so no conclusion is drawn
 | DSH | `>=0.1.7-rc.1` (the settings page consumes the official `dsh-client-ui-primitives` `SegmentedControl`, which only exists from `0.1.7-alpha.1`; the legacy `settingsScope` code path is kept, but 0.1.5 / 0.1.6 hosts are no longer declared supported) |
 | Node.js | `>=20` |
 | Profile | `web` (the Web GUI and both desktop shells run the web UI and share this plugin); desktop profiles are named `desktop` |
-| Verified exact version | `0.1.7-rc.1`: installed, started, persisted a setting to disk and restored it across a restart in a real profile ([evidence](docs/issue-15-settings-seam-0.1.7.md)); `0.1.7-rc.2`: boot-level e2e and live-page sampling of the glass layer (issues #16 / #17); `0.1.5-rc.3`, `0.1.7-alpha.1` and `0.1.7-alpha.2` are declared as the same seam |
+| Verified exact version | `0.2.1-rc.2`: real-device acceptance on the official desktop shell — plugin boots, tokens apply, glass recipe intact, **settings writes really reach `cordis.patch.yml`** (they did not before the fix) and are adopted back after a restart ([audit](docs/desktop-0.2.1-adaptation-audit.md)); `0.2.0-rc.2`: boot-level e2e on the official shell's bundled runtime (19/19), real desktop-window pixels and the title-bar colour chain, `configForms` persistence ([audit](docs/desktop-0.2.0-adaptation-audit.md)); `0.1.7-rc.1`: installed, started, persisted a setting to disk and restored it across a restart in a real profile ([evidence](docs/issue-15-settings-seam-0.1.7.md)); `0.1.7-rc.2`: boot-level e2e and live-page sampling of the glass layer (issues #16 / #17); `0.1.5-rc.1`: boot-level e2e rerun under the CI recipe (**historical**, below the current floor) |
 
-The machine-readable form of the above is `dsh.compatibility` (`dsh` / `dshReleases` /
-`dshOperations`) in `package.json`.
+`dsh.compatibility` (`dsh` / `dshReleases` / `dshOperations`) in `package.json` **declares only the
+three currently supported lines**: `0.1.7-rc.1` / `0.2.0-rc.2` / `0.2.1-rc.2` (floor `>=0.1.7-rc.1`).
+Earlier `0.1.5-rc.*` / `0.1.7-alpha.*` runs are records of what was verified **at the time** and are no
+longer declared.
+
+Colour coverage is based on `dsh-v0.2.0-rc.2`'s `design-platform.css`: all 190 `--dsw-*` tokens per
+scheme (static 77 / alias 101 / specific 11 / non-family 1), including the 17 aliases added in 0.2.0.
 
 ### Permissions and external access
 

package/README.md

@@ -53,7 +53,7 @@ Web / 桌面端做全界面换色与玻璃质感，TUI 端自动同步四套官
 
 它内置 Catppuccin 的四个主题——**Latte**、**Frappé**、**Macchiato**、**Mocha**——
 把整个界面的配色都换成对应的 Catppuccin 色板；并在设置里拥有**自己的独立分区**
-（**设置 → Catppuccin**：风味、代码高亮、自定义覆盖、玻璃质感、更新检查都在这一页），
+（**设置 → Catppuccin**：风味、代码高亮、自定义覆盖、玻璃质感、更新检查、反馈与支持都在这一页），
 选择会自动保存、重启自动恢复。
 
 同时内置一套可开关的**玻璃质感**（Glassmorphism）皮肤：顶栏、侧边栏、
@@ -66,7 +66,7 @@ Catppuccin 主题。
 - 🎨 四个主题：Latte（浅色）、Frappé / Macchiato / Mocha（深色）
 - 🧩 接入官方主题系统，与内置浅色 / 深色 / 跟随系统主题平级
 - 🎯 全界面配色覆盖，不只是一两个强调色
-- ⚙️ 设置页一行切换，选择自动保存、重启自动恢复
+- ⚙️ 设置页独立分区一键切换，选择自动保存、重启自动恢复
 - 🔧 **自定义 token 覆盖**：按「`--dsw-* 变量: 值`」逐条覆盖单个配色 token（例如把注释色换成蓝色），与所选风味一起持久保存
 - 🖍️ **代码块高亮风格**：默认 / 注释斜体（italic-comments）两套 shiki 风格可选
 - 🌐 中 / 英 / 日 / 韩 / 西 / 法 / 德七语文案（跟随系统语言）
@@ -75,7 +75,7 @@ Catppuccin 主题。
   只给输入框卡片与浮层上玻璃），模糊度、磨砂度、
   背景亮度自由调节（交互参考 [DSH-Transparent-UI-Plugin](https://github.com/WYH66666666/DSH-Transparent-UI-Plugin)）
 - 🌫️ **玻璃拟态细节**：页面上下边缘渐变模糊、折叠侧边栏悬浮玻璃、
-  随主题的氛围地面（同色系渐变 + 两枚柔光斑）——内容滚入视口边缘时柔化穿过，
+  随主题的氛围地面（同色系渐变；两枚柔光斑是**可选开关、默认关**）——内容滚入视口边缘时柔化穿过，
   玻璃透着地面的明暗，层次更立体
 - 🎨 玻璃配色自动跟随当前 Catppuccin 主题
 - 🔄 **检查 Catppuccin 插件更新**：设置页一键检测本插件（dsh-catppuccin）在 npm 上的最新版本，发现新版直接给出可复制的升级命令；**默认开启自动检查**（启动后一次 + 每 6 小时），更新渠道可选稳定版 / Beta
@@ -229,6 +229,11 @@ dsh plugin --profile dsh-tui add https://github.com/NoNameLeGo/dsh-catppuccin-th
   不透明度。
 - **背景亮度**：深色模式 0–50 压暗、浅色模式 50–100 提亮（50 为原样），
   直接调和进地面底色；拉到两端时氛围层淡出，回到纯白 / 纯黑。
+- **地面光斑**：在地面渐变上叠两枚**固定于屏幕**的柔光斑（`0.6.3` 的观感），**默认关**——
+  光斑不跟面板走，每块玻璃透出的是它的不同部位，打开后左上角会明显偏亮。
+- **就地预览**：玻璃区里有一条**地面样本条**（拖亮度或切光斑，它当场变化——取的就是页面地面那套色）；
+  代码高亮下方有**代码样本**（直接读 `--shiki-token-*`，切「柔和注释」即刻变色）；
+  模式选择旁的 **看一眼主界面** 会关掉设置页，让你直接看真实布局。
 
 玻璃配色自动跟随当前主题，切换 Latte / Frappé / Macchiato / Mocha 时即时
 变色；所有设置跨重启自动恢复。
@@ -263,8 +268,8 @@ dsh plugin --profile dsh-tui add https://github.com/NoNameLeGo/dsh-catppuccin-th
 - **六个区域玻璃化**：顶栏、侧边栏、输入框、轨迹视图、聊天气泡
   和新会话按钮；云母模式下成为带圆角的悬浮卡片，聊天内容滚动时从玻璃
   下方穿过、被模糊；折叠侧边栏时导航条同样悬浮在聊天区边缘
-  （「性能与用量」统计行不在此列——它保持上游原样，留在玻璃卡之外；见
-  CHANGELOG 的 `0.6.2`「拆除融合带」）；
+  （「性能与用量」统计行不套玻璃卡、留在卡外，但自 `0.6.4` 起它下面有一条**同色磨砂背板**，
+  防止滚动正文从状态栏读数底下透出——见 CHANGELOG 的 `0.6.2`「拆除融合带」与 `0.6.4` 的 issue #29）；
 - **页面边缘渐变模糊**：视口上下各有一条渐变模糊带，消息滚到边缘时被
   柔化穿过——内容在边界「融化」（借鉴
   [DSH-Transparent-UI-Plugin](https://github.com/WYH66666666/DSH-Transparent-UI-Plugin)
@@ -328,9 +333,12 @@ console.table({ backdropFilter: cs.backdropFilter, background: cs.backgroundColo
 | DSH | `>=0.1.7-rc.1`（设置页消费官方 `dsh-client-ui-primitives` 的 `SegmentedControl`，该导出自 `0.1.7-alpha.1` 起才有；旧的 `settingsScope` 通道代码保留，但 0.1.5 / 0.1.6 宿主不再声明支持） |
 | Node.js | `>=20` |
 | Profile | `web`（Web GUI 与两个桌面壳都启动 web 界面，共用本插件）；桌面端默认 profile 名为 `desktop`（已声明） |
-| 已验证的具体版本 | `0.2.1-rc.2`：官方桌面壳真机验收——插件正常启动、token 逐项生效、玻璃配方完整，**改设置真写回 `cordis.patch.yml`（修复前不写）**、重启后从文档采纳回来（[审计](docs/desktop-0.2.1-adaptation-audit.md)）；`0.2.0-rc.2`：官方桌面壳自带运行时的启动级 e2e（19/19）、真机桌面窗口像素与标题栏取色链路、`configForms` 落盘（[审计](docs/desktop-0.2.0-adaptation-audit.md)）；`0.1.7-rc.1`：真实 profile 上完成安装、启动、改设置落盘与重启恢复（[证据](docs/issue-15-settings-seam-0.1.7.md)）；`0.1.7-rc.2`：启动级 e2e 与玻璃层的真页采样（issue #16 / #17）；`0.1.5-rc.1`：按 CI 口径复跑的启动级 e2e；`0.1.5-rc.3`、`0.1.7-alpha.1`、`0.1.7-alpha.2` 为同一 seam 的声明 |
+| 已验证的具体版本 | `0.2.1-rc.2`：官方桌面壳真机验收——插件正常启动、token 逐项生效、玻璃配方完整，**改设置真写回 `cordis.patch.yml`（修复前不写）**、重启后从文档采纳回来（[审计](docs/desktop-0.2.1-adaptation-audit.md)）；`0.2.0-rc.2`：官方桌面壳自带运行时的启动级 e2e（19/19）、真机桌面窗口像素与标题栏取色链路、`configForms` 落盘（[审计](docs/desktop-0.2.0-adaptation-audit.md)）；`0.1.7-rc.1`：真实 profile 上完成安装、启动、改设置落盘与重启恢复（[证据](docs/issue-15-settings-seam-0.1.7.md)）；`0.1.7-rc.2`：启动级 e2e 与玻璃层的真页采样（issue #16 / #17）；`0.1.5-rc.1`：按 CI 口径复跑的启动级 e2e（**历史记录**，已低于当前兼容下限） |
+
+`package.json` 的 `dsh.compatibility`（`dsh` / `dshReleases` / `dshOperations`）**只声明当前支持的三条**：
+`0.1.7-rc.1` / `0.2.0-rc.2` / `0.2.1-rc.2`（兼容下限 `>=0.1.7-rc.1`）；更早的 `0.1.5-rc.*`
+与 `0.1.7-alpha.*` 是**当时**的验证记录，不在声明内。
 
-以上也是 `package.json` 里 `dsh.compatibility`（`dsh` / `dshReleases` / `dshOperations`）的机器可读版本。
 色彩覆盖以 `dsh-v0.2.0-rc.2` 的 `design-platform.css` 为基线：每方案 190 个 `--dsw-*` token（static 77 /
 alias 101 / specific 11 / 非三族 1）全覆盖，含 0.2.0 新增的 17 个 alias。
 

package/lib/client.js

@@ -683,10 +683,88 @@ window.__ModuleLoader__.load({
 		function stateFromSettingsSection(section) {
 			return sanitizeState(section);
 		}
+		/** Field-for-field equality of two override maps — the same rule
+		*  {@link settingsSectionsEqual} applies to them (both directions, so a key
+		*  that only one side holds makes them differ). */
+		function sameOverrides(a, b) {
+			const keys = Object.keys(a);
+			return keys.length === Object.keys(b).length && keys.every((key) => b[key] === a[key]);
+		}
 		/** Whether two settings sections are field-for-field equal (used to skip
 		*  redundant mirror writes and to recognize the Host echoing our own write). */
 		function settingsSectionsEqual(a, b) {
-			return a.flavor === b.flavor && a.glass.enabled === b.glass.enabled && a.glass.mode === b.glass.mode && a.glass.blur === b.glass.blur && a.glass.frost === b.glass.frost && a.glass.brightness === b.glass.brightness && a.glass.glow === b.glass.glow && a.autoCheck === b.autoCheck && a.updateChannel === b.updateChannel && a.shikiStyle === b.shikiStyle && Object.keys(a.overrides).every((key) => b.overrides[key] === a.overrides[key]) && Object.keys(b.overrides).every((key) => a.overrides[key] === b.overrides[key]);
+			return a.flavor === b.flavor && a.glass.enabled === b.glass.enabled && a.glass.mode === b.glass.mode && a.glass.blur === b.glass.blur && a.glass.frost === b.glass.frost && a.glass.brightness === b.glass.brightness && a.glass.glow === b.glass.glow && a.autoCheck === b.autoCheck && a.updateChannel === b.updateChannel && a.shikiStyle === b.shikiStyle && sameOverrides(a.overrides, b.overrides);
+		}
+		/**
+		* Replay the local changes a window made BEFORE the durable channel became
+		* usable onto the document state — the issue #30 fix.
+		*
+		* The R2 mechanism (`pendingLocalPush` in `src/client/index.ts`) exists so a
+		* change made during the boot window is not rolled back by the first snapshot
+		* the settings scope resolves. It used to replay the WHOLE local state, and on
+		* a fresh origin (empty localStorage: a new port, a cleared site, a webview
+		* partition) "the whole local state" is nothing but the shipped defaults — so
+		* the first snapshot rewrote the document to `flavor: off`, `glass.enabled:
+		* false`, `mode: mica`. The trigger is not even a user action: the glass layer
+		* republishes on every `theme/change`, and `ui-theme` adopts its preference on
+		* every boot.
+		*
+		* This replays only the fields whose value moved away from `baseline` — the
+		* local section as of the last moment the window knew it was in sync with the
+		* document (boot, or the last adoption / successful write). Everything else
+		* keeps the document's value, and `changed === false` tells the caller to take
+		* the ordinary "document wins" adoption path instead of writing anything.
+		*
+		* ⚠️ Every field of {@link CatppuccinSettingsSection} must be carried here.
+		* A missing one is SILENT in both directions — a boot-window change to it is
+		* dropped, and (because the caller's whole-state fallback is gone) nothing
+		* else would notice. Same rule as `stateToMutateOps` (issue #26), and
+		* `tests/state.spec.ts` holds a drift guard that fails when a field is added
+		* without a mutant here.
+		*
+		* Known gap (accepted): a delta cannot tell "untouched" from "explicitly set
+		* to the current default", so setting a field BACK to its default value inside
+		* the boot window yields to the document. The window is sub-second and the
+		* direction is "document wins", i.e. no durable data is lost.
+		*
+		* @param document - the section the settings document resolved (wins).
+		* @param baseline - the local section at the last sync point.
+		* @param local - the local section right now.
+		* @returns the merged state plus whether anything actually differed.
+		*/
+		function replayLocalChanges(document, baseline, local) {
+			const merged = settingsSectionFromState(document);
+			let changed = false;
+			const carry = (key) => {
+				if (local[key] !== baseline[key]) {
+					merged[key] = local[key];
+					changed = true;
+				}
+			};
+			const carryGlass = (key) => {
+				if (local.glass[key] !== baseline.glass[key]) {
+					merged.glass[key] = local.glass[key];
+					changed = true;
+				}
+			};
+			carry("flavor");
+			carryGlass("enabled");
+			carryGlass("mode");
+			carryGlass("blur");
+			carryGlass("frost");
+			carryGlass("brightness");
+			carryGlass("glow");
+			carry("autoCheck");
+			carry("updateChannel");
+			carry("shikiStyle");
+			if (!sameOverrides(local.overrides, baseline.overrides)) {
+				merged.overrides = { ...local.overrides };
+				changed = true;
+			}
+			return {
+				state: sanitizeState(merged),
+				changed
+			};
 		}
 		//#endregion
 		//#region src/client/glass/glass-layer.ts
@@ -3371,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.
@@ -4160,29 +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())) 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) => {
-					if (outcome === "written") lastWrittenSection = settingsSectionFromState(state);
-					else if (outcome === "stale") {
+					const settled = pendingLocalSection !== null && settingsSectionsEqual(pendingLocalSection, flushed);
+					if (outcome === "written") {
+						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?.();
 					}
@@ -4190,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 {}
 					});
 				};
@@ -4220,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);
 				};
@@ -4242,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);
@@ -4253,18 +4426,52 @@ 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;
-						queuePersist();
-						return;
+						const replayed = replayLocalChanges(state, syncedSection, settingsSectionFromState(local));
+						if (replayed.changed) {
+							writeFlavor(replayed.state.flavor);
+							glass.applyRemote(replayed.state.glass);
+							writeAutoCheck(replayed.state.autoCheck);
+							writeUpdateChannel(replayed.state.updateChannel);
+							writeOverrides(replayed.state.overrides);
+							writeShikiStyle(replayed.state.shikiStyle);
+							emitPrefs();
+							reapplyThemePrefs();
+							applyDesired();
+							syncedSection = settingsSectionFromState(replayed.state);
+							lastDocumentSection = settingsSectionFromState(state);
+							queuePersist();
+							return;
+						}
 					}
 					if (!scope.hasUserLayer(snapshot)) {
 						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);
@@ -4274,6 +4481,7 @@ window.__ModuleLoader__.load({
 					emitPrefs();
 					reapplyThemePrefs();
 					applyDesired();
+					if (pushCleaned) queuePersist();
 				};
 				applyScopeSnapshot();
 				const offScope = scope.subscribe(applyScopeSnapshot);
@@ -4307,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");
@@ -4331,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,