@linxin666/dsh-client-ui-skin-center 0.3.3 → 0.3.4

package/contracts/semantic-attrs-v1.md

@@ -45,7 +45,7 @@
 | `data-dsh-wallpaper-active` | html + body（body/html 级，另行管理） | WE 壁纸挂载期间置 `true`，卸载 / 禁用清除；供皮肤 CSS 与壁纸中和规则锚定（#734） |
 | `data-dsh-wallpaper-surface` | 官方 shell 全视口背景元素 + 侧栏工作区淡化条（元素级） | `WallpaperController.markWallpaperSurfaces()` 在 WE 壁纸挂载期间打标（全视口 bg-base 背景 + `data-slot="sidebar.workspaces"` 内渐变淡化条），命中 `html[data-dsh-wallpaper-active] [data-dsh-wallpaper-surface]` 中和；卸载清除，不含哈希类依赖（#734） |
 
-## part 组（31 行，含各 owner 行）
+## part 组（38 行，含各 owner 行）
 
 shell 区域（owner: shell）：
 
@@ -59,6 +59,7 @@ shell 区域（owner: shell）：
 | `queue-dock` | 排队条；`[data-queue-dock]` |
 | `turn-tail` | turn 尾行；`[data-turn-tail]` |
 | `resize-handle` | 列宽手柄；`[data-side]` |
+| `new-session` | 侧栏新会话按钮；官方稳定属性落地前由兼容适配器从 `button[class*="newSession"]` 补打，皮肤不得依赖本地化文案 |
 
 family / 插件区域：
 
@@ -101,8 +102,14 @@ family / 插件区域：
 | `row` | session-id | 会话列表行；面板内行容器（`[data-dsh-part="row"]`） |
 | `copy` | session-id | 每行复制按钮；`button[data-dsh-part="copy"]` |
 | `search` | session-id | 面板搜索输入框；`input[type="search"][data-dsh-part="search"]` |
+| `sprite` | miku-pet | 宠物帧舞台；`[data-dsh-plugin="miku-pet"] [data-dsh-part="sprite"]` |
+| `menu` | miku-pet | 悬停菜单（两级）；`[data-dsh-part="menu"]` |
+| `stats` | miku-pet | 左侧属性彩条；`[data-dsh-part="stats"]` |
+| `shop` | miku-pet | 商店居中窗口；`[data-dsh-part="shop"]` |
+| `bubble` | miku-pet | 对话气泡；`[data-dsh-part="bubble"]` |
+| `float` | miku-pet | 互动飘字；`[data-dsh-part="float"]` |
 
-## plugin 组（12 个，含停更 aionui-panel）
+## plugin 组（13 个，含停更 aionui-panel）
 
 | data-dsh-plugin | owner | 锚定方式 |
 | --- | --- | --- |
@@ -118,6 +125,7 @@ family / 插件区域：
 | `dsh-web-ui-market` | dsh-market | 创意工坊商店一级页（settings.section id `dsh-web-ui-market`），商店卡与目录条目容器 |
 | `skin-center` | skins/skin-center | 一级设置分区 settings.section id `skin-center`（列已安装皮肤，属内置源时显式标记） |
 | `session-id` | dsh-session-id | footer action slot entry id `session-id`；`[data-dsh-plugin="session-id"]`（面板 overlay 根 + 入口触发器） |
+| `miku-pet` | dsh-miku-pet | 宠物浮层根 `[data-dsh-plugin="miku-pet"]`；host 路由前缀 `/miku-pet/*`；设置页 settings.section id `miku-pet-config` |
 
 ## 已知脆弱点（上游主题缝 PR 诉求）
 

package/lib/client.js

@@ -746,6 +746,11 @@ window.__ModuleLoader__.load({
 				this.publish();
 				this.scope.set("weLibraryDirs", this.dirsValue);
 			}
+			failedIds = /* @__PURE__ */ new Set();
+			isDisplaying = () => {
+				const id = this.activeId();
+				return this.enabledValue && id !== null && !this.failedIds.has(id);
+			};
 			activeId = () => {
 				const current = this.previewing ?? this.applied;
 				return this.mediaLayer !== null && current !== null ? current.id : null;
@@ -811,6 +816,7 @@ window.__ModuleLoader__.load({
 				this.scope.set("volume", this.volumeValue);
 			}
 			applySelection(descriptor) {
+				this.failedIds.delete(descriptor.id);
 				this.applied = descriptor;
 				this.previewing = null;
 				this.selectionValue = descriptor.id;
@@ -842,6 +848,7 @@ window.__ModuleLoader__.load({
 				if (descriptor !== null) this.probeSceneCapabilitiesIfNeeded(descriptor);
 			}
 			tryOn(descriptor) {
+				this.failedIds.delete(descriptor.id);
 				this.previewing = descriptor;
 				this.render();
 				this.publish();
@@ -1111,6 +1118,22 @@ window.__ModuleLoader__.load({
 					const nextFallback = frameUrl !== null ? previewUrl : null;
 					const img = this.buildImage(nextUrl, nextFallback);
 					if (img && video.parentElement) video.parentElement.replaceChild(img, video);
+					else {
+						const currentId = this.previewing?.id ?? this.applied?.id;
+						if (currentId) {
+							this.failedIds.add(currentId);
+							this.render();
+							this.publish();
+						}
+					}
+				}, { once: true });
+				else video.addEventListener("error", () => {
+					const currentId = this.previewing?.id ?? this.applied?.id;
+					if (currentId) {
+						this.failedIds.add(currentId);
+						this.render();
+						this.publish();
+					}
 				}, { once: true });
 				video.play()?.catch(() => {});
 				return video;
@@ -1161,9 +1184,18 @@ window.__ModuleLoader__.load({
 				const image = this.doc.createElement("img");
 				image.src = url;
 				image.alt = "";
-				if (fallbackUrl !== null && fallbackUrl !== url) image.addEventListener("error", () => {
-					if (image.src !== fallbackUrl) image.src = fallbackUrl;
-				}, { once: true });
+				image.addEventListener("error", () => {
+					if (fallbackUrl !== null && fallbackUrl !== url && image.src !== fallbackUrl) {
+						image.src = fallbackUrl;
+						return;
+					}
+					const currentId = this.previewing?.id ?? this.applied?.id;
+					if (currentId) {
+						this.failedIds.add(currentId);
+						this.render();
+						this.publish();
+					}
+				});
 				styleCover(image, this.fitValue);
 				return image;
 			}
@@ -2130,7 +2162,7 @@ window.__ModuleLoader__.load({
 		* @returns the plugin card.
 		*/
 		function SkinCenter({ t, runtime, theme, background, wallpaper, preview, customTheme }) {
-			const snapshot = (0, react.useSyncExternalStore)((listener) => theme.subscribe(listener), () => theme.getTheme());
+			(0, react.useSyncExternalStore)((listener) => theme.subscribe(listener), () => theme.getTheme());
 			const enabled = (0, react.useSyncExternalStore)(background.subscribe, background.enabled);
 			const opacity = (0, react.useSyncExternalStore)(background.subscribe, background.opacity);
 			const blurEmpty = (0, react.useSyncExternalStore)(background.subscribe, background.blurEmpty);
@@ -2253,7 +2285,7 @@ window.__ModuleLoader__.load({
 					return active;
 				}));
 			};
-			const dark = snapshot.active.colorScheme === "dark";
+			const dark = document.body.hasAttribute("data-ds-dark-theme");
 			/** One row: try-on control + apply button. Shared by the official card and every skin card. */
 			const actionButtons = (opts) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: skin_center_module_css_default.actions,
@@ -3055,20 +3087,30 @@ window.__ModuleLoader__.load({
 			}
 			return Object.keys(patch).length === 0 ? null : patch;
 		}
+		/** Deterministic serialization of the user layer for content-based dedup. */
+		function serializeSkinBackgroundUserLayer(user) {
+			const extracted = extractSkinBackgroundUserLayer(user);
+			return extracted === null ? "" : JSON.stringify(extracted);
+		}
 		/**
-		* Accept a scope publication only when its namespace revision is new. The
-		* caller records the returned revision even when there is no user patch, so a
-		* later mirror publication with the same revision stays inert.
+		* Accept a scope publication only when its namespace revision is new AND the
+		* user layer has actually changed. A revision bump with identical user-layer
+		* content is a replay (settings-mirror resync, WS reconnect, or another
+		* plugin writing to the global settings document) and must not overwrite the
+		* authoritative v2 state.
 		*/
-		function reconcileSkinBackgroundScope(current, snapshot, lastRevision) {
-			if (snapshot.revision === void 0 || snapshot.revision === lastRevision) return {
+		function reconcileSkinBackgroundScope(current, snapshot, lastRevision, lastUserJson) {
+			const currentUserJson = serializeSkinBackgroundUserLayer(snapshot.user);
+			if (snapshot.revision === void 0 || snapshot.revision === lastRevision || currentUserJson === lastUserJson) return {
 				accepted: false,
-				revision: lastRevision,
+				revision: snapshot.revision ?? lastRevision,
+				lastUserJson: currentUserJson,
 				patch: null
 			};
 			return {
 				accepted: true,
 				revision: snapshot.revision,
+				lastUserJson: currentUserJson,
 				patch: skinBackgroundUserPatch(current, snapshot.user)
 			};
 		}
@@ -3431,6 +3473,11 @@ window.__ModuleLoader__.load({
 				attrs: [["data-dsh-part", "resize-handle"]],
 				note: "column resize handle"
 			},
+			{
+				selector: "button[class*=\"newSession\"]",
+				attrs: [["data-dsh-part", "new-session"]],
+				note: "sidebar new-session action (compat seam shields skins from localized labels)"
+			},
 			{
 				selector: "[data-dsh-taskboard-view], [data-dsh-taskboard-board], [data-dsh-taskboard-entry]",
 				attrs: [["data-dsh-plugin", "task-board"]],
@@ -3610,10 +3657,31 @@ window.__ModuleLoader__.load({
     ${scoped("[data-dsh-part=\"scrollport\"]")} {
       /* The composer is the scrollport's final in-flow child. Reserving physical
          padding after it lifts the active dock by one composer height and also
-         shifts the hero above center. Scroll padding keeps scrollIntoView()
-         clearance without changing either layout's geometry. */
+         shifts the hero above center. */
       padding-bottom: 0 !important;
-      scroll-padding-bottom: var(--dsh-composer-height, 100px) !important;
+    }
+    /* #978 / #1133: Line-level scroll-margin retains scrollIntoView() clearance
+       above the sticky composer without placing a scrollport-level scroll-padding
+       that breaks browser caret-reveal geometry (which caused micro-scrolling on
+       every keystroke while reading history). */
+    ${scoped("[data-conversation-scroll] [data-chat-anchor-key]")},
+    ${scoped("[data-conversation-scroll] [data-chat-flow-kind]")},
+    ${scoped("[data-conversation-scroll] [data-dsh-part=\"message-row\"]")},
+    ${scoped("[data-conversation-scroll] [data-turn-tail]")},
+    ${scoped("[data-conversation-scroll] [class*=\"_userRow\"]")},
+    ${scoped("[data-conversation-scroll] [class*=\"_compactionRow\"]")},
+    ${scoped("[data-conversation-scroll] [class*=\"_contextRow\"]")},
+    ${scoped("[data-conversation-scroll] [class*=\"_turnErrorRow\"]")} {
+      scroll-margin-bottom: var(--dsh-composer-height, 100px) !important;
+    }
+    /* #1117: The upstream recommended badge pairs two background-fill tokens
+       as bg + text — in dark mode, skins like Blue Fantasy collapse them to
+       near-identical dark navy values (contrast ~1:1). Override the text
+       color to a readable foreground and tweak the background for contrast. */
+    body[data-ds-dark-theme] ${scoped("[data-question-key] [class*=\"_badge\"]")},
+    body[data-ds-dark-theme] ${scoped("[data-question-scroll] [class*=\"_badge\"]")} {
+      color: var(--dsw-alias-label-primary, #ffffff) !important;
+      background: var(--dsw-alias-interactive-bg-active, color-mix(in srgb, var(--dsw-alias-button-info-fill, #4a5fa8) 50%, transparent)) !important;
     }
   `;
 		}
@@ -4159,9 +4227,11 @@ window.__ModuleLoader__.load({
 						active = payload.ok && typeof payload.active === "string" ? payload.active : null;
 					}
 					if (active === null) return;
-					const entry = store.find(active);
+					let entry = store.find(active);
 					if (entry === null) {
-						await controller.switchTo(null, null);
+						const defaultEntry = store.find("blue-fantasy");
+						if (defaultEntry !== null) await controller.switchTo("blue-fantasy", defaultEntry);
+						else await controller.switchTo(null, null);
 						return;
 					}
 					await controller.switchTo(active, entry);
@@ -4169,6 +4239,18 @@ window.__ModuleLoader__.load({
 					await controller.switchTo(null, null).catch(() => {});
 				}
 			})();
+			if (typeof doc.defaultView !== "undefined" && doc.defaultView !== null) {
+				const win = doc.defaultView;
+				const onSkinApplied = (e) => {
+					const detail = e.detail;
+					if (detail && typeof detail.id === "string") refreshCatalog().then(async () => {
+						const entry = store.find(detail.id);
+						if (entry !== null) await controller.switchTo(detail.id, entry);
+					});
+				};
+				win.addEventListener("dsh-skin-applied", onSkinApplied);
+				listeners.add(() => win.removeEventListener("dsh-skin-applied", onSkinApplied));
+			}
 			return store;
 		}
 		//#endregion
@@ -4552,7 +4634,7 @@ window.__ModuleLoader__.load({
 		/** The building package's version, when the bundle carries it. */
 		function bakedVersion() {
 			try {
-				return "0.3.3";
+				return "0.3.4";
 			} catch {
 				return;
 			}
@@ -4707,6 +4789,7 @@ window.__ModuleLoader__.load({
 			};
 			let v2Loaded = false;
 			let lastScopeRevision = backgroundScope.getSnapshot().revision;
+			let lastUserJson = serializeSkinBackgroundUserLayer(backgroundScope.getSnapshot().user);
 			const background = new BackgroundController(scopeConfig(), persistBackground);
 			const reconcileScope = () => {
 				if (!v2Loaded) return;
@@ -4714,10 +4797,10 @@ window.__ModuleLoader__.load({
 				const result = reconcileSkinBackgroundScope(background.snapshot(), {
 					revision: snapshot.revision,
 					user: snapshot.user
-				}, lastScopeRevision);
-				if (!result.accepted) return;
+				}, lastScopeRevision, lastUserJson);
 				lastScopeRevision = result.revision;
-				if (result.patch === null) return;
+				lastUserJson = result.lastUserJson;
+				if (!result.accepted || result.patch === null) return;
 				const current = background.snapshot();
 				background.init({
 					...current,
@@ -4743,7 +4826,7 @@ window.__ModuleLoader__.load({
 			const wallpaper = new WallpaperController(binder.bind({ namespace: SKIN_WALLPAPER_NS }));
 			ctx.effect(() => () => wallpaper.dispose(), "ui-skin-center: wallpaper dispose");
 			installBootRestore(wallpaper);
-			const runtime = bootSkinRuntime({ suppressBackgroundMedia: () => wallpaper.enabled() && wallpaper.activeId() !== null && wallpaper.activeId() !== "" });
+			const runtime = bootSkinRuntime({ suppressBackgroundMedia: () => wallpaper.enabled() && wallpaper.isDisplaying() });
 			ctx.effect(() => () => runtime.shutdown(), "ui-skin-center: runtime shutdown");
 			ctx.effect(() => wallpaper.subscribe(() => {
 				runtime.controller.refresh();