@linxin666/dsh-client-ui-skin-center 0.3.0 → 0.3.2

package/contracts/README.md

@@ -12,6 +12,7 @@ every official-DSH coupling behind them.
 | `skin-manifest-v2.schema.json` | skin.json v2 structure. Editors/IDEs may point at it; validators must use this local copy and never fetch the `$id` URL. |
 | `hooks-api.d.ts` | The `facets.client` escape-hatch API (`x-org.linxin666.skin-center/v1alpha1`): `SkinHooksContext`, `defineSkinHooks()`. |
 | `semantic-attrs-v1.md` | The L2 semantic-attribute enumeration (`data-dsh-surface` / `data-dsh-part` / `data-dsh-plugin`) with owner, version and meaning per value. |
+| `primary-action-tokens-v1.md` | The filled-primary-button token set (fill / hover / dimmed / foreground), the skin author rules, the loader completion matrix and the warning-only audit. |
 
 The runtime validator (`src/core/manifest-v2/validate.ts`) is the
 authoritative fail-closed check; the JSON Schema mirrors it for editors and

package/contracts/primary-action-tokens-v1.md

@@ -0,0 +1,70 @@
+# Primary-Action Token Contract (v1) — issue #506 follow-up
+
+The filled primary button (the "one-click install" CTA, every plugin's
+primary action) renders from **one matched set** in every theme. This file is
+the authoritative statement of that set, of what a skin must declare, and of
+what the skin-center proves when a skin loads.
+
+## The set
+
+| Token | Role |
+| --- | --- |
+| `--dsw-alias-button-primary-fill` | Button background |
+| `--dsw-alias-button-primary-hover` | Button background while hovered |
+| `--dsw-alias-button-primary-dimmed` | Disabled-button tint |
+| `--dsw-alias-label-primary-foreground` | Text on the fill |
+
+The official shell declares all four (fill and dimmed derive from
+`brand-primary` / statics). `--dsw-alias-brand-primary` and
+`--dsw-alias-brand-primary-invert` are **accent and foreground tokens, not a
+button pair**: in the current official theme both resolve to the same
+theme-neutral, so using them as fill + text renders black-on-black (light) or
+white-on-white (dark). Never consume them as a button fill.
+
+## Skin author rules
+
+1. Prefer declaring the full set per theme (light block and
+   `body[data-ds-dark-theme]` block), as matched colors.
+2. The legacy pair (declare both `brand-primary` and
+   `brand-primary-invert`) is still honored: the loader derives fill from
+   the brand, derives hover/dimmed toward the surface, and uses the invert
+   as the foreground — because the pair is matched by the author.
+3. Partial declarations warn (catalog warnings, `dsh-skin validate`,
+   `dsh-skin list`) but never fail: the loader completes what is missing,
+   and a skin with no brand and no button tokens at all deliberately keeps
+   the shell's own matched CTA.
+4. The loader never overrides a token the skin defines, and hygiene-wise a
+   new skin's button set should be self-contained (explicit
+   `button-primary-hover` etc.) rather than relying on derivation.
+
+## Completion matrix (loader, `css-safety/fallback.ts`)
+
+| The skin declares | The loader adds |
+| --- | --- |
+| `brand-primary` | `button-primary-fill: var(brand-primary)` |
+| fill available (explicit or derived) | `button-primary-hover` / `button-primary-dimmed`: `color-mix` toward `--dsw-alias-bg-layer-1` |
+| `brand-primary` + `brand-primary-invert` | `label-primary-foreground: var(brand-primary-invert)` |
+| nothing (no brand, no button tokens) | nothing — the official shell CTA applies |
+
+## Audit (`css-safety/token-audit.ts`)
+
+Warning-only, never fatal — the completion rules keep every outcome legible.
+
+- Completeness: fill satisfied by `button-primary-fill` or `brand-primary`;
+  hover by `button-primary-hover` or the fill anchor; foreground by
+  `label-primary-foreground` or the legacy invert pair.
+- Contrast: per theme, WCAG 2.x ratio of the resolved foreground vs fill
+  (skin values, one `var()` hop, official static palette for
+  `--dsw-static-*` references, shell defaults as the fallback stand-ins).
+  Below **3:1** warns. Unresolvable chains skip the ratio rather than guess.
+- Enforcement points: catalog build (surfaces in `dsh-skin list` and the
+  Skin Center diagnostics), `dsh-skin validate` / `install`, and the
+  built-in-skins CI gate (zero contract warnings for shipped skins).
+
+## Consumer rule (plugins)
+
+A filled primary button uses the set — fill / hover / foreground — verbatim
+(BG = `button-primary-fill`, label = `label-primary-foreground`, hover =
+`button-primary-hover`). Do not use `brand-primary` as a button
+background, do not introduce per-plugin hardcoded accents, and do not pair
+the tokens across families (e.g. brand fill with shell foreground).

package/contracts/semantic-attrs-v1.md

@@ -115,7 +115,7 @@ family / 插件区域：
 | `skill-explorer` | dsh-skill-explorer | `[data-dsh-skill-explorer-view]` / `[data-dsh-skill-explorer-entry]` |
 | `doctor` | dsh-doctor | web-ui.plugin.item 槽 entry id `doctor`（设置 → Web UI 插件 → Doctor 卡片）；卡片内 `[data-dsh-plugin="doctor"]` |
 | `aionui-panel` | dsh-aionui-panel（停更） | dock entry id `aionui-*` |
-| `dsh-market` | dsh-market | 创意工坊商店一级页（settings.section id `dsh-market`），商店卡与目录条目容器 |
+| `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 根 + 入口触发器） |
 

package/lib/client.js

@@ -668,8 +668,8 @@ window.__ModuleLoader__.load({
 						const manifestResponse = await fetchFn(payload.sceneUrl.replace("/scene-runtime/", "/scene-manifest/"));
 						const manifestPayload = manifestResponse.ok ? await manifestResponse.json().catch(() => null) : null;
 						const manifest = manifestPayload?.ok === true ? manifestPayload.manifest : void 0;
-						if (manifest && typeof manifest.width === "number" && typeof manifest.height === "number") {
-							const fullscreenIndex = manifest.layers?.findIndex((layer) => typeof layer.texUrl === "string" && Math.abs((layer.w ?? 0) - manifest.width) <= 1 && Math.abs((layer.h ?? 0) - manifest.height) <= 1 && Math.abs((layer.x ?? 0) - manifest.width / 2) <= 1 && Math.abs((layer.y ?? 0) - manifest.height / 2) <= 1) ?? -1;
+						if (manifest && manifest.timeSchedule === void 0 && typeof manifest.width === "number" && typeof manifest.height === "number") {
+							const fullscreenIndex = manifest.layers?.findIndex((layer) => typeof layer.texUrl === "string" && typeof layer.videoUrl !== "string" && Math.abs((layer.w ?? 0) - manifest.width) <= 1 && Math.abs((layer.h ?? 0) - manifest.height) <= 1 && Math.abs((layer.x ?? 0) - manifest.width / 2) <= 1 && Math.abs((layer.y ?? 0) - manifest.height / 2) <= 1) ?? -1;
 							if (fullscreenIndex >= 0) {
 								sceneBaseUrl = manifest.layers?.[fullscreenIndex]?.texUrl ?? null;
 								preferSceneBase = manifest.layers?.slice(fullscreenIndex + 1).some((layer) => (layer.w ?? 0) > manifest.width * 1.25 || (layer.h ?? 0) > manifest.height * 1.25) === true;
@@ -2149,7 +2149,11 @@ window.__ModuleLoader__.load({
 					setError(t("applyFailed"));
 					return;
 				}
-				run(target, () => preview.runSkin(() => switchAndDeactivateCustomTheme(target, entry)));
+				run(target, () => preview.runSkin(async () => {
+					const active = await switchAndDeactivateCustomTheme(target, entry);
+					if (wallpaper.selection() !== "") wallpaper.clearSelection();
+					return active;
+				}));
 			};
 			const tryOnCustomTheme = () => {
 				run("custom-theme", () => preview.runCustomTheme(async () => {
@@ -4399,10 +4403,16 @@ window.__ModuleLoader__.load({
 		* @param ctx - client root context.
 		*/
 		function apply(ctx) {
-			ctx.effect(() => ctx.locale.register(NS, {
-				zh,
-				en
-			}), "ui-skin-center: dictionaries");
+			ctx.effect(() => {
+				try {
+					return ctx.locale.register(NS, {
+						zh,
+						en
+					});
+				} catch {
+					return () => {};
+				}
+			}, "ui-skin-center: dictionaries");
 			ctx.effect(() => {
 				document.body.dataset.dshSkinCenter = "";
 				return () => {
@@ -4530,14 +4540,20 @@ window.__ModuleLoader__.load({
 					dispose: () => wallpaper.dispose()
 				}
 			});
-			ctx.slots.inject("settings.section", () => ctx.slots.register({
-				name: "settings.section",
-				id: "skin-center",
-				order: 120,
-				label: () => ctx.locale.bind("skinCenter")("title"),
-				locale: "skinCenter",
-				inject: injected
-			}, SkinCenterSection));
+			ctx.slots.inject("settings.section", () => {
+				try {
+					return ctx.slots.register({
+						name: "settings.section",
+						id: "skin-center",
+						order: 120,
+						label: () => ctx.locale.bind("skinCenter")("title"),
+						locale: "skinCenter",
+						inject: injected
+					}, SkinCenterSection);
+				} catch {
+					return () => {};
+				}
+			});
 		}
 		//#endregion
 		exports.NS = NS;