@iasiv5/dsh-skins 1.5.25 → 1.5.27

package/lib/client.js

@@ -2969,7 +2969,7 @@ ${references.join("\n")}`,
     if (typeof extension !== "string" || !/^[a-z0-9]+$/.test(extension)) {
       throw new RangeError(`builtinAssetUrl: invalid extension ${JSON.stringify(extension)}`);
     }
-    const rev = "1.5.25";
+    const rev = "1.5.27";
     return `/dsh-skins/assets/b_${skinId}_${assetKey}.${extension}?v=${rev}`;
   }
 
@@ -3094,11 +3094,20 @@ ${references.join("\n")}`,
    * 灯箱 .dsvm-lightbox 根同带 role/aria 语义，浅色 tint 会把影院式黑遮罩染
    * 成浅毛玻璃、白色控件整体隐形（用户双模式实拍）——影院遮罩归 dsh-m 自有
    * 不变量（0.9.62 起 background !important 自持），此处 :not 双保险、语义
-   * 归位。 */
+   * 归位。1.5.26 增补（ADR-0007 amendment）：非模态 dialog 钩子
+   * [role="dialog"]:not([aria-modal="true"]):not(.dsvm-lightbox)——
+   * better-sidebar 锚定浮层（Git 提交图悬停卡、行上下文菜单）与其悬浮窗
+   * 壳、chat 用量统计面板、conversation 用量浮卡全部 portal 到 body 的
+   * fixed 浮层，底色吃半透 bg-layer/menu token 且自带 0 blur；官方 token
+   * 值不透明故官方皮肤无症状，皮肤半透后透字（Git 悬停卡主人实拍
+   * 2026-11-03）。2026-11-03 对已装插件与宿主 client 逐面排查：该钩子
+   * 命中面全为浮层、无误染；灯箱本带 aria-modal，:not 三重保险仅属
+   * 与 v1 钩子同构的 belt。 */
   ${scope} { --dsw-menu-surface-fill: rgba(${menu.light}, 0.94); --dsw-alias-menu-group-header-fill: rgba(${menu.light}, 0.94); --dsw-specific-menu: rgba(${menu.light}, 0.94); }
   ${scope}[data-ds-dark-theme] { --dsw-menu-surface-fill: rgba(${menu.dark}, 0.94); --dsw-alias-menu-group-header-fill: rgba(${menu.dark}, 0.94); --dsw-specific-menu: rgba(${menu.dark}, 0.94); }
   ${scope} { --dsw-mask-blur: blur(10px); }
   ${scope} [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),
+  ${scope} [role="dialog"]:not([aria-modal="true"]):not(.dsvm-lightbox),
   ${scope} .dshm-panel,
   ${scope} .dshm-compat-dialog,
   ${scope} .dshm-dshchip-tip,
@@ -3108,6 +3117,7 @@ ${references.join("\n")}`,
     -webkit-backdrop-filter: blur(14px) saturate(1.3);
   }
   ${scope}[data-ds-dark-theme] [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),
+  ${scope}[data-ds-dark-theme] [role="dialog"]:not([aria-modal="true"]):not(.dsvm-lightbox),
   ${scope}[data-ds-dark-theme] .dshm-panel,
   ${scope}[data-ds-dark-theme] .dshm-compat-dialog,
   ${scope}[data-ds-dark-theme] .dshm-dshchip-tip,
@@ -3166,6 +3176,10 @@ ${references.join("\n")}`,
   }
 
   // src/client/skins/define-skin.js
+  var FONT_TOKENS = {
+    text: "--dsh-font-family-text-default",
+    code: "--dsh-font-family-code-default"
+  };
   var REQUIRED = [
     "id",
     "label",
@@ -3175,6 +3189,7 @@ ${references.join("\n")}`,
     "anchor",
     "bodyAttribute",
     "riding",
+    "fonts",
     "scrim",
     "blur",
     "glassVar",
@@ -3231,6 +3246,28 @@ ${references.join("\n")}`,
     }
     return wallpaper;
   }
+  function deriveFonts(fonts) {
+    if (fonts === null || typeof fonts !== "object" || Array.isArray(fonts)) {
+      throw new Error("fonts must be an object keyed by font slot");
+    }
+    const derived = {};
+    for (const [slot, value] of Object.entries(fonts)) {
+      if (!Object.hasOwn(FONT_TOKENS, slot)) throw new Error(`Unknown font slot: ${slot}`);
+      const bad = `font slot "${slot}": value must be null, a non-empty string, or { light, dark }`;
+      if (value === null) continue;
+      if (typeof value === "string") {
+        if (value === "") throw new Error(bad);
+        derived[FONT_TOKENS[slot]] = { light: value, dark: value };
+        continue;
+      }
+      const keys = typeof value === "object" && !Array.isArray(value) ? Object.keys(value) : [];
+      if (keys.length !== 2 || !keys.includes("light") || !keys.includes("dark") || typeof value.light !== "string" || value.light === "" || typeof value.dark !== "string" || value.dark === "") {
+        throw new Error(bad);
+      }
+      derived[FONT_TOKENS[slot]] = { light: value.light, dark: value.dark };
+    }
+    return derived;
+  }
   function defineSkin(spec) {
     for (const key of Object.keys(spec)) {
       if (!KNOWN_KEYS.has(key)) throw new Error(`Unknown spec key: ${key}`);
@@ -3249,13 +3286,16 @@ ${references.join("\n")}`,
       spec.backgroundArt ? { art: { mime: spec.backgroundArt.mime, url: spec.backgroundArt.url } } : {},
       spec.builtinAssets ?? {}
     );
+    const fontTokens = deriveFonts(spec.fonts);
+    const constantBase = spec.constantTokens ?? {};
+    const constantTokens = Object.keys(fontTokens).length > 0 || Object.keys(constantBase).length > 0 ? { ...constantBase, ...fontTokens } : null;
     const table = {
       bodyAttribute: spec.bodyAttribute,
       titleBrand: spec.titleBrand,
       favicon: spec.favicon,
       anchor: spec.anchor,
       riding: spec.riding,
-      constantTokens: spec.constantTokens ?? null,
+      constantTokens,
       scrim: buildScrim(spec),
       blur: spec.blur,
       glassVar: spec.glassVar,
@@ -3311,6 +3351,8 @@ ${references.join("\n")}`,
       "--dsw-specific-bubble": { light: "rgba(184, 67, 63, 0.10)", dark: "rgba(24, 24, 34, 0.90)" },
       "--dsw-specific-bubble-highlight": { light: "rgba(184, 67, 63, 0.18)", dark: "rgba(40, 40, 56, 0.92)" }
     },
+    // 字体槽位（ADR-0025）：宿主跟随。
+    fonts: { text: null, code: null },
     scrim: { kind: "overlay", coefficient: 30, light: "252, 250, 246", dark: "16, 16, 26" },
     blur: { max: 12 },
     glassVar: "--dsh-mrz-glass-blur",
@@ -3486,17 +3528,13 @@ ${references.join("\n")}`,
       "--dsw-alias-interactive-bg-hover-accent": { light: "rgba(140, 206, 63, 0.14)", dark: "rgba(165, 212, 64, 0.16)" },
       "--dsw-specific-bubble": { light: "rgba(0, 138, 191, 0.10)", dark: "rgba(20, 41, 60, 0.90)" },
       "--dsw-specific-bubble-highlight": { light: "rgba(0, 138, 191, 0.18)", dark: "rgba(29, 61, 85, 0.90)" },
-      "--dsw-font-family": {
-        light: '-apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Arial, sans-serif',
-        dark: '-apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Arial, sans-serif'
-      },
-      "--ds-font-family-code": {
-        light: '"JetBrains Mono", ui-monospace, "SF Mono", "Cascadia Code", Menlo, Consolas, monospace',
-        dark: '"JetBrains Mono", ui-monospace, "SF Mono", "Cascadia Code", Menlo, Consolas, monospace'
-      },
       "--dsh-scrollbar-thumb": { light: "var(--dsw-alias-scrollbar-bg-l2)", dark: "var(--dsw-alias-scrollbar-bg-l2)" },
       "--dsh-scrollbar-thumb-hover": { light: "var(--dsw-alias-scrollbar-hover-l2)", dark: "var(--dsw-alias-scrollbar-hover-l2)" }
     },
+    // 字体槽位（ADR-0025）：宿主跟随。JetBrains Mono 历史代码栈封存于
+    // docs/adr/0025-font-slots-and-host-tracking.md「JBM 封存」，一行
+    // code: '<封存栈>' 即复活。
+    fonts: { text: null, code: null },
     scrim: {
       kind: "baked-gradient",
       stops: {
@@ -3657,12 +3695,10 @@ ${references.join("\n")}`,
       "--dsw-alias-interactive-bg-hover": { light: "rgba(101, 83, 216, 0.09)", dark: "rgba(169, 156, 255, 0.11)" },
       "--dsw-alias-interactive-bg-active": { light: "rgba(101, 83, 216, 0.15)", dark: "rgba(169, 156, 255, 0.18)" },
       "--dsw-specific-bubble": { light: "rgba(101, 83, 216, 0.11)", dark: "rgba(60, 48, 108, 0.90)" },
-      "--dsw-specific-bubble-highlight": { light: "rgba(101, 83, 216, 0.18)", dark: "rgba(78, 63, 138, 0.92)" },
-      "--dsw-font-family": {
-        light: '-apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", sans-serif',
-        dark: '-apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", sans-serif'
-      }
+      "--dsw-specific-bubble-highlight": { light: "rgba(101, 83, 216, 0.18)", dark: "rgba(78, 63, 138, 0.92)" }
     },
+    // 字体槽位（ADR-0025）：宿主跟随。
+    fonts: { text: null, code: null },
     scrim: {
       kind: "baked-gradient",
       stops: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@iasiv5/dsh-skins",
   "description": "DSH Web 皮肤插件：多套品牌皮肤侧栏热切换。",
   "icon": "./icon.svg",
-  "version": "1.5.25",
+  "version": "1.5.27",
   "homepage": "https://github.com/iasiv5/dsh-skins#readme",
   "repository": {
     "type": "git",
@@ -88,6 +88,7 @@
     "verify:bundle": "node scripts/verify-bundle-guard.mjs",
     "verify:delivery": "node scripts/verify-delivery.mjs",
     "verify:hooks": "node scripts/verify-upstream-hooks.mjs",
+    "verify:hot-deploy": "bash scripts/verify-hot-deploy-roundtrip.sh",
     "check": "pnpm run check:lockfile && pnpm run build && node --check lib/client.js && node --check lib/index.js && pnpm run lint && pnpm run test && pnpm run verify:readme && pnpm run verify:bundle && pnpm run verify:hooks && pnpm run verify:delivery && git diff --exit-code -- lib/index.js lib/client.js",
     "lint": "eslint ."
   }