dsh-background-by-model 0.7.3 → 0.7.5

package/lib/index.js

@@ -76,18 +76,22 @@ function defaultRotation() {
 *   `sidebar` sidebar (`--dsw-specific-sidebar-fill`)
 *   `card`    cards/panels (`--dsw-alias-bg-layer-1/2/3`, `--dsw-specific-menu`
 *             and its 0.1.7 alias `--dsw-menu-surface-fill`)
+*   `code`    code blocks, banner included (`--dsw-alias-markdown-code-block`,
+*             `--dsw-alias-markdown-code-block-banner`)
 *   `input`   input/control surfaces (`--dsw-specific-input-major`)
 */
 const PART_OPACITY_KEYS = [
 	"bg",
 	"sidebar",
 	"card",
+	"code",
 	"input"
 ];
 const DEFAULT_PART_OPACITIES = {
 	bg: .85,
 	sidebar: .93,
 	card: 1,
+	code: 1,
 	input: 1
 };
 /**
@@ -185,7 +189,9 @@ function hexToHsl(hex) {
 *
 * Holidays default to `fill` rather than a rule's `fit`: these are full-bleed
 * festival wallpapers, and `fit` would letterbox them on every aspect ratio the
-* art was not cut for.
+* art was not cut for. The mode now lives on the IMAGE (see `BgImage.bgMode`), so
+* that default is written there — and `fill` is what a holiday's read-back
+* sanitizer refuses to lose (see `normalizeHolidayRule`).
 */
 function defaultHolidayRule(def) {
 	const color = hexToHsl(def.color);
@@ -193,13 +199,13 @@ function defaultHolidayRule(def) {
 		id: def.id,
 		images: [{
 			slot: def.slot,
+			bgMode: "fill",
 			bgState: { ...DEFAULT_BG_STATE },
 			color
 		}],
 		match: "",
 		enabled: true,
 		color,
-		bgMode: "fill",
 		wallpaperOpacity: 1,
 		blur: 0,
 		rotate: defaultRotation()
@@ -308,12 +314,21 @@ function normalizeTransition(raw, legacyMs) {
 * same as absent: an entry with `color: null` is an image the user explicitly set
 * to "follow the system theme", and re-inheriting the rule's color over that
 * would undo a deliberate choice on every load.
+*
+* `inheritMode` is the same one-shot lift for the layout mode, and it is the
+* caller's to resolve because the two callers answer differently: a user rule
+* passes the mode its config carried at the RULE level (a schema-5 config, where
+* 适应/填充 was one choice for the whole rotation), a holiday passes `fill` (its
+* own default, which is not up for the lift to change). An entry that HAS a
+* `bgMode` key keeps it — including one that has just been set to a value equal
+* to the default, which is a decision and not an absence.
 */
-function normalizeImage(raw, inherit = null) {
+function normalizeImage(raw, inherit = null, inheritMode = "fit") {
 	const i = raw ?? {};
 	if (typeof i.slot !== "string" || !SLOT_RE.test(i.slot)) return null;
 	return {
 		slot: i.slot,
+		bgMode: BG_MODES.includes(i.bgMode) ? i.bgMode : inheritMode,
 		bgState: normalizeBgState(i.bgState),
 		color: hasOwn(i, "color") ? normalizeHsl(i.color) : inherit
 	};
@@ -333,6 +348,14 @@ function normalizeImage(raw, inherit = null) {
 * it as well: it is not a default for its images at paint time any more, but it
 * is still what the rule paints once its last picture is gone.
 *
+* The layout mode makes the same trip in the other direction, and this is the
+* last release that has to: a config written before 0.8 keeps `bgMode` at the RULE
+* level, where one value covered every picture of a rotation, so it is read here
+* once and handed to each image as its inherited mode. What the user chose
+* therefore survives the move the same way it survived the color's — the mode is
+* not reset to the default on upgrade, and the field it used to live on is simply
+* not written back.
+*
 * An EMPTY list is a legitimate rule, not a broken one: removing a rule's last
 * picture has to be expressible, and forcing an entry back in is what produced a
 * phantom blank image that took slot 1 and could never be deleted again (the next
@@ -347,11 +370,12 @@ function normalizeRule(raw) {
 	const id = typeof r.id === "string" && r.id !== "" ? r.id : null;
 	if (id === null) return null;
 	const color = normalizeHsl(r.color);
+	const mode = BG_MODES.includes(r.bgMode) ? r.bgMode : "fit";
 	const images = [];
 	const seen = /* @__PURE__ */ new Set();
 	const hadList = Array.isArray(r.images);
 	if (hadList) for (const entry of r.images) {
-		const image = normalizeImage(entry, color);
+		const image = normalizeImage(entry, color, mode);
 		if (image === null || seen.has(image.slot)) continue;
 		seen.add(image.slot);
 		images.push(image);
@@ -359,21 +383,22 @@ function normalizeRule(raw) {
 	const legacySlot = typeof r.slot === "string" && SLOT_RE.test(r.slot) ? r.slot : null;
 	if (images.length === 0 && legacySlot !== null) images.push({
 		slot: legacySlot,
+		bgMode: mode,
 		bgState: normalizeBgState(r.bgState),
 		color
 	});
 	if (images.length === 0 && !hadList) return null;
-	const mode = BG_MODES.includes(r.bgMode) ? r.bgMode : "fit";
+	const rotate = normalizeRotation(r.rotate);
+	if (images.length < 2) rotate.enabled = false;
 	return {
 		id,
 		images,
 		match: typeof r.match === "string" ? r.match : "",
 		enabled: r.enabled !== false,
 		color,
-		bgMode: mode,
 		wallpaperOpacity: clamp01(r.wallpaperOpacity, 1),
 		blur: clamp(r.blur, 0, 60, 0),
-		rotate: normalizeRotation(r.rotate)
+		rotate
 	};
 }
 /**
@@ -384,9 +409,12 @@ function normalizeRule(raw) {
 * its bytes, and its theme color is a fixed part of what that holiday looks like —
 * so a stale or hand-edited value would either orphan the wallpaper, point the
 * holiday at a rule's image, or paint a festival in a color it does not have.
-* Everything else is sanitized exactly like a rule's field — except the image
-* list and the rotation, which stay the definition's own single image and stay
-* off, so a festival can never be swapped or cycled.
+* Everything else is sanitized exactly like a rule's field — except three things
+* that stay the definition's own: the image list and the rotation (so a festival
+* can never be swapped or cycled), and the layout mode, which is the definition's
+* `fill` for the same reason the color is its own — full-bleed art letterboxed by
+* a stale `fit` is the one thing this feature must not do, and the mode is not
+* editable for a holiday anywhere in the panel.
 */
 function normalizeHolidayRule(def, raw) {
 	const r = raw ?? {};
@@ -394,11 +422,11 @@ function normalizeHolidayRule(def, raw) {
 	return {
 		...base,
 		enabled: r.enabled !== false,
-		bgMode: BG_MODES.includes(r.bgMode) ? r.bgMode : base.bgMode,
 		wallpaperOpacity: clamp01(r.wallpaperOpacity, base.wallpaperOpacity),
 		blur: clamp(r.blur, 0, 60, base.blur),
 		images: base.images.map((image) => ({
 			slot: image.slot,
+			bgMode: image.bgMode,
 			bgState: normalizeBgState(r.images?.[0]?.bgState ?? r.bgState),
 			color: image.color
 		}))
@@ -517,12 +545,12 @@ async function migrateLegacy(raw) {
 			id: "m1",
 			images: [{
 				slot: "m1",
+				bgMode: typeof r.bgMode === "string" ? r.bgMode : "fit",
 				bgState: r.bgState ?? {}
 			}],
 			match: "",
 			enabled: true,
 			color: Array.isArray(r.color) ? r.color : null,
-			bgMode: typeof r.bgMode === "string" ? r.bgMode : "fit",
 			wallpaperOpacity: typeof r.wallpaperOpacity === "number" ? r.wallpaperOpacity : 1,
 			blur: typeof r.blur === "number" ? r.blur : 0
 		}],
@@ -564,7 +592,11 @@ const LEGACY_CONFIG_KEYS = /* @__PURE__ */ new Set([
 	"blur",
 	"bgState"
 ]);
-const LEGACY_RULE_KEYS = /* @__PURE__ */ new Set(["slot", "bgState"]);
+const LEGACY_RULE_KEYS = /* @__PURE__ */ new Set([
+	"slot",
+	"bgState",
+	"bgMode"
+]);
 const LEGACY_NESTED_KEYS = /* @__PURE__ */ new Set(["rules[].rotate.fadeMs"]);
 const warnedConfigKeys = /* @__PURE__ */ new Set();
 function warnUnknownConfigKeys(raw, normalized) {
@@ -818,7 +850,7 @@ async function handleRpcMethod(ctx, endpoint, payload) {
 				value: {
 					config: await readConfig(),
 					slots: await listSlots(),
-					schema: 5
+					schema: 6
 				}
 			};
 			case "writeConfig": return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-background-by-model",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "Appearance plugin for DeepSeek Harness: an ordered list of model rules, each carrying its own wallpapers — every image with its own framing and theme color — plus layout mode, opacity and blur; the background follows the model you switch to, and a rule can rotate through several images on its own rhythm.",
   "keywords": [
     "deepseek-harness",
@@ -60,9 +60,11 @@
     "check:rotation": "node scripts/rotation-check.ts",
     "check:transition": "node scripts/transition-check.ts",
     "check:repaint": "node scripts/repaint-check.ts",
+    "check:code-plate": "node scripts/code-plate-check.ts",
+    "check:image-mode": "node scripts/image-mode-check.ts",
     "check:ui": "node scripts/ui-strings-check.ts",
     "check:node": "node scripts/node-half-check.mjs",
-    "test": "tsdown && tsc -p tsconfig.json && node scripts/holiday-check.ts && node scripts/rotation-check.ts && node scripts/transition-check.ts && node scripts/repaint-check.ts && node scripts/ui-strings-check.ts && node scripts/node-half-check.mjs"
+    "test": "tsdown && tsc -p tsconfig.json && node scripts/holiday-check.ts && node scripts/rotation-check.ts && node scripts/transition-check.ts && node scripts/repaint-check.ts && node scripts/code-plate-check.ts && node scripts/image-mode-check.ts && node scripts/ui-strings-check.ts && node scripts/node-half-check.mjs"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6",