@linxin666/dsh-pet 0.2.3 → 0.2.4

package/contracts/voice-pack-v1.schema.json

@@ -0,0 +1,234 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://schemas.linxin666.org/dsh-pet/voice-pack-v1.schema.json",
+  "title": "DSH Pet Voice Pack v1",
+  "description": "Pet-center voice pack (issue #677). Optional voice.json inside a pet directory, or the global $DSH_HOME/pets/.voice.json override — pure JSON content layering status / tool / whisper copy over the built-in pools, plus hover-panel chrome. Structure is fail-closed per file (a non-object root drops the pack); content is warn-and-drop per slot.",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "$schema": {
+      "type": "string"
+    },
+    "voicePackVersion": {
+      "const": 1,
+      "description": "Optional; absent reads as v1."
+    },
+    "status": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Status copy pools keyed by the eleven StatusScene ids; each key replaces that scene's built-in pool.",
+      "properties": {
+        "prepare": {
+          "$ref": "#/definitions/pool"
+        },
+        "waiting": {
+          "$ref": "#/definitions/pool"
+        },
+        "thinking": {
+          "$ref": "#/definitions/pool"
+        },
+        "review": {
+          "$ref": "#/definitions/pool"
+        },
+        "toolResult": {
+          "$ref": "#/definitions/pool"
+        },
+        "done": {
+          "$ref": "#/definitions/pool"
+        },
+        "failed": {
+          "$ref": "#/definitions/pool"
+        },
+        "toolFailed": {
+          "$ref": "#/definitions/pool"
+        },
+        "maxTokens": {
+          "$ref": "#/definitions/pool"
+        },
+        "interrupted": {
+          "$ref": "#/definitions/pool"
+        },
+        "blocked": {
+          "$ref": "#/definitions/pool"
+        }
+      }
+    },
+    "tools": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Tool copy pools keyed by the seventeen ToolCategory ids; {tool} and {hint} interpolate.",
+      "properties": {
+        "read": {
+          "$ref": "#/definitions/pool"
+        },
+        "write": {
+          "$ref": "#/definitions/pool"
+        },
+        "edit": {
+          "$ref": "#/definitions/pool"
+        },
+        "shell": {
+          "$ref": "#/definitions/pool"
+        },
+        "grep": {
+          "$ref": "#/definitions/pool"
+        },
+        "find": {
+          "$ref": "#/definitions/pool"
+        },
+        "ls": {
+          "$ref": "#/definitions/pool"
+        },
+        "webSearch": {
+          "$ref": "#/definitions/pool"
+        },
+        "webFetch": {
+          "$ref": "#/definitions/pool"
+        },
+        "mcp": {
+          "$ref": "#/definitions/pool"
+        },
+        "memory": {
+          "$ref": "#/definitions/pool"
+        },
+        "subagent": {
+          "$ref": "#/definitions/pool"
+        },
+        "todo": {
+          "$ref": "#/definitions/pool"
+        },
+        "browser": {
+          "$ref": "#/definitions/pool"
+        },
+        "git": {
+          "$ref": "#/definitions/pool"
+        },
+        "ask": {
+          "$ref": "#/definitions/pool"
+        },
+        "generic": {
+          "$ref": "#/definitions/pool"
+        }
+      }
+    },
+    "toolRemaining": {
+      "$ref": "#/definitions/pool",
+      "description": "The parallel-tools count line pool; {n} interpolates the count."
+    },
+    "whispers": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Murmur pools; each section replaces the built-in one as a whole. An explicit empty array mutes that channel.",
+      "properties": {
+        "generic": {
+          "$ref": "#/definitions/pool"
+        },
+        "rules": {
+          "type": "array",
+          "maxItems": 32,
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": [
+              "keywords",
+              "pool"
+            ],
+            "properties": {
+              "keywords": {
+                "type": "array",
+                "maxItems": 16,
+                "items": {
+                  "type": "string",
+                  "maxLength": 40,
+                  "minLength": 1
+                },
+                "description": "Lowercase substrings matched against the model's output."
+              },
+              "pool": {
+                "$ref": "#/definitions/pool"
+              }
+            }
+          }
+        }
+      }
+    },
+    "panel": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Hover-panel chrome; unset slots keep the client's i18n dictionary copy.",
+      "properties": {
+        "labels": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "feed": {
+              "type": "string",
+              "maxLength": 40
+            },
+            "rename": {
+              "type": "string",
+              "maxLength": 40
+            },
+            "hide": {
+              "type": "string",
+              "maxLength": 40
+            },
+            "confirm": {
+              "type": "string",
+              "maxLength": 40
+            }
+          }
+        },
+        "stats": {
+          "type": "object",
+          "additionalProperties": false,
+          "description": "{rank} / {n} / {points} interpolate the live values.",
+          "properties": {
+            "rank": {
+              "type": "string",
+              "maxLength": 80
+            },
+            "treats": {
+              "type": "string",
+              "maxLength": 80
+            },
+            "points": {
+              "type": "string",
+              "maxLength": 80
+            }
+          }
+        },
+        "actions": {
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "enum": [
+              "feed",
+              "rename",
+              "hide"
+            ]
+          },
+          "description": "Subset of actions to render in canonical order; absent = all three, [] = none."
+        }
+      }
+    }
+  },
+  "definitions": {
+    "pool": {
+      "oneOf": [
+        {
+          "type": "string",
+          "maxLength": 160
+        },
+        {
+          "type": "array",
+          "maxItems": 64,
+          "items": {
+            "type": "string",
+            "maxLength": 160
+          }
+        }
+      ]
+    }
+  }
+}

package/lib/client.js

@@ -220,6 +220,78 @@ window.__ModuleLoader__.load({
 			return Math.max(0, Math.min(max, value));
 		}
 		/**
+		* The status decoration ornament (pet-center M5, #567). Renders the active
+		* phase's frame segment as a CSS-background strip at a compact bubble
+		* height; prefers-reduced-motion holds the segment's first frame, and a
+		* missing or undecodable asset simply paints nothing (CSS background
+		* failure) — the bubble text is never disturbed. The span is aria-hidden;
+		* the bubble keeps its own semantics untouched.
+		*/
+		function StatusOrnament(props) {
+			const { decoration, phase } = props;
+			const segment = decoration.phases[phase];
+			const shown = segment !== void 0 && segment !== "hide";
+			const segmentKey = segment !== void 0 && segment !== "hide" ? segment.from + ":" + segment.to : "none";
+			const spanRef = (0, react.useRef)(null);
+			const scale = 18 / decoration.cell.height;
+			const frameWidth = Math.round(decoration.cell.width * scale);
+			const stripWidth = decoration.columns * frameWidth;
+			const durationsKey = decoration.durations.join(",");
+			(0, react.useEffect)(() => {
+				if (segment === void 0 || segment === "hide") return;
+				const el = spanRef.current;
+				if (el === null) return;
+				const position = (index) => -index * frameWidth + "px 0px";
+				const reduceMotion = window.matchMedia?.("(prefers-reduced-motion: reduce)")?.matches === true;
+				el.style.backgroundPosition = position(segment.from);
+				if (reduceMotion) return;
+				let raf = 0;
+				let index = segment.from;
+				let elapsed = 0;
+				let last = performance.now();
+				const tick = (ts) => {
+					const delta = ts - last;
+					last = ts;
+					elapsed += delta;
+					const duration = decoration.durations[index] ?? 160;
+					if (elapsed >= duration) {
+						elapsed = 0;
+						if (index < segment.to) index += 1;
+						else if (decoration.loop) index = segment.from;
+					}
+					el.style.backgroundPosition = position(index);
+					if (!decoration.loop && index === segment.to) return;
+					raf = requestAnimationFrame(tick);
+				};
+				raf = requestAnimationFrame(tick);
+				return () => cancelAnimationFrame(raf);
+			}, [
+				shown,
+				segmentKey,
+				frameWidth,
+				decoration.loop,
+				durationsKey
+			]);
+			if (!shown) return null;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				ref: spanRef,
+				"aria-hidden": "true",
+				"data-dsh-pet-decoration": decoration.id,
+				style: {
+					display: "inline-block",
+					width: frameWidth,
+					height: 18,
+					marginRight: 6,
+					verticalAlign: "middle",
+					flexShrink: 0,
+					backgroundImage: "url(" + decoration.entryUrl + ")",
+					backgroundSize: stripWidth + "px 18px",
+					backgroundRepeat: "no-repeat",
+					backgroundPosition: "0px 0px"
+				}
+			});
+		}
+		/**
 		* The floating pet. The spritesheet frame advances on requestAnimationFrame
 		* with per-frame durations from the definition's tracks; the atlas image is
 		* loaded once and the background position is written straight to the sprite
@@ -253,6 +325,21 @@ window.__ModuleLoader__.load({
 			const rows = definition.rows;
 			const tracks = definition.tracks;
 			const sequences = definition.sequences;
+			const panel = definition.panel;
+			const panelLabel = (slot, i18n) => panel?.labels?.[slot] ?? i18n;
+			const panelStat = (slot, i18nKey, values) => {
+				const format = panel?.stats?.[slot] ?? props.t(i18nKey, values);
+				if (panel?.stats?.[slot] === void 0) return format;
+				const all = {
+					rank: snapshot?.affinity.rank ?? "?",
+					n: snapshot?.treats.stocked ?? 0,
+					points: snapshot?.affinity.points ?? 0
+				};
+				let text = format;
+				for (const [name, value] of Object.entries(all)) text = text.replaceAll("{" + name + "}", String(value));
+				return text;
+			};
+			const panelShows = (action) => panel?.actions === void 0 || panel.actions.includes(action);
 			(0, react.useEffect)(() => {
 				if (props.visual !== void 0) return;
 				let cancelled = false;
@@ -392,6 +479,7 @@ window.__ModuleLoader__.load({
 			const whisper = feedback === null ? snapshot?.whisper : void 0;
 			const bubblePresent = feedback !== null || sessionBubbles.length > 0 || statusBubble !== void 0 || whisper !== void 0;
 			const displayName = snapshot?.name ?? definition.displayName;
+			const decoration = snapshot?.decoration;
 			(0, react.useEffect)(() => {
 				if (sessionBubbles.length <= 1) setStackPinned(false);
 			}, [sessionBubbles.length]);
@@ -481,14 +569,17 @@ window.__ModuleLoader__.load({
 						onPointerLeave: () => setStackPeek(false),
 						children: [visibleSessions.map((session, index) => {
 							const speaksWhisper = index === 0 && whisper !== void 0;
-							const bubble = /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							const bubble = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 								type: "button",
 								className: clsx(pet_module_css_default.bubble, pet_module_css_default.bubbleStatus, pet_module_css_default.bubbleClickable, speaksWhisper && pet_module_css_default.bubbleWhisper),
 								title: props.t("pet.openSessionHint"),
 								onClick: () => {
 									props.onOpenSession(session.sessionId);
 								},
-								children: speaksWhisper ? whisper : session.bubble
+								children: [index === 0 && !speaksWhisper && decoration !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusOrnament, {
+									decoration,
+									phase
+								}), speaksWhisper ? whisper : session.bubble]
 							}, speaksWhisper ? "whisper:" + whisper : session.sessionId);
 							if (index !== 0 || sessionBubbles.length <= 1) return bubble;
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
@@ -506,11 +597,14 @@ window.__ModuleLoader__.load({
 									children: stackOpen ? "×" : "+" + String(sessionBubbles.length - 1)
 								})]
 							}, "primary");
-						}), sessionBubbles.length === 0 && (statusBubble !== void 0 || whisper !== void 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						}), sessionBubbles.length === 0 && (statusBubble !== void 0 || whisper !== void 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: clsx(pet_module_css_default.bubble, pet_module_css_default.bubbleStatus, whisper !== void 0 && pet_module_css_default.bubbleWhisper),
 							role: "status",
 							"aria-live": "polite",
-							children: whisper ?? statusBubble
+							children: [whisper === void 0 && decoration !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusOrnament, {
+								decoration,
+								phase
+							}), whisper ?? statusBubble]
 						}, whisper === void 0 ? "status" : "whisper:" + whisper)]
 					}),
 					hovered && dragRef.current === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -556,7 +650,7 @@ window.__ModuleLoader__.load({
 										setRenaming(false);
 									}
 								},
-								children: props.t("pet.confirm")
+								children: panelLabel("confirm", props.t("pet.confirm"))
 							})]
 						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -566,29 +660,29 @@ window.__ModuleLoader__.load({
 									children: displayName
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 									className: pet_module_css_default.statRank,
-									children: props.t("pet.rank", { rank: snapshot?.affinity.rank ?? "?" })
+									children: panelStat("rank", "pet.rank", { rank: snapshot?.affinity.rank ?? "?" })
 								})]
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: pet_module_css_default.rankRow,
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 									className: pet_module_css_default.statTreats,
-									children: props.t("pet.treats", { n: snapshot?.treats.stocked ?? 0 })
+									children: panelStat("treats", "pet.treats", { n: snapshot?.treats.stocked ?? 0 })
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 									className: pet_module_css_default.statPoints,
-									children: props.t("pet.points", { points: snapshot?.affinity.points ?? 0 })
+									children: panelStat("points", "pet.points", { points: snapshot?.affinity.points ?? 0 })
 								})]
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: pet_module_css_default.actions,
 								children: [
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									panelShows("feed") && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
 										className: pet_module_css_default.action,
 										onClick: props.onFeed,
-										children: props.t("pet.feed")
+										children: panelLabel("feed", props.t("pet.feed"))
 									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									panelShows("rename") && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
 										className: pet_module_css_default.action,
 										onClick: () => {
@@ -596,13 +690,13 @@ window.__ModuleLoader__.load({
 											setNameDraft(displayName);
 											setRenaming(true);
 										},
-										children: props.t("pet.rename")
+										children: panelLabel("rename", props.t("pet.rename"))
 									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									panelShows("hide") && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
 										className: pet_module_css_default.action,
 										onClick: props.onHide,
-										children: props.t("pet.hide")
+										children: panelLabel("hide", props.t("pet.hide"))
 									})
 								]
 							})
@@ -917,6 +1011,14 @@ window.__ModuleLoader__.load({
 		//#region src/client/renderers/live2d.ts
 		/** The de-facto tap-motion group of Cubism sample models. */
 		const TAP_GROUP = "TapBody";
+		/**
+		* Keep one screen-appropriate atlas LOD instead of asking Pixi for the
+		* engine's default full mip chain. A user model can legitimately carry an
+		* 8192px texture while the pet itself is only a few hundred pixels tall;
+		* `single-auto` preserves the source for larger renders and generates one
+		* downsampled atlas only when the effective on-screen scale warrants it.
+		*/
+		const TEXTURE_OPTIONS = { lod: "single-auto" };
 		let vendorConfigured = false;
 		/** Configure pixi extensions + the Cubism SDK once per page. */
 		function configureOnce(vendor) {
@@ -995,7 +1097,8 @@ window.__ModuleLoader__.load({
 					ctx.container.appendChild(pixiApp.canvas);
 					const loaded = await vendor.Live2DModel.from(config.modelUrl, {
 						autoHitTest: false,
-						autoFocus: false
+						autoFocus: false,
+						textureOptions: TEXTURE_OPTIONS
 					});
 					if (disposed) {
 						pixiApp.destroy(true, { children: true });
@@ -1717,7 +1820,8 @@ window.__ModuleLoader__.load({
 				const valid = plan.filter((item) => item.run !== void 0);
 				if (plan.length === 0 || this.saving || valid.length !== plan.length) return;
 				const plannedWrites = valid.map((item) => item.op);
-				const fields = new Set(plan.map((item) => item.field));
+				const pending = /* @__PURE__ */ new Map();
+				for (const item of plan) pending.set(item.field, this.staged.get(item.field));
 				this.saving = true;
 				this.failed = false;
 				this.failedReason = void 0;
@@ -1730,9 +1834,9 @@ window.__ModuleLoader__.load({
 						for (const field of result.fields) if (field.landed) landed.add(field.field);
 					} else this.failedReason = result.message;
 				} else for (const item of valid) if (await item.run()) landed.add(item.field);
-				for (const field of fields) if (landed.has(field)) this.staged.delete(field);
+				for (const [field, before] of pending) if (landed.has(field) && this.staged.get(field) === before) this.staged.delete(field);
 				this.saving = false;
-				this.failed = landed.size !== fields.size;
+				this.failed = landed.size !== pending.size;
 				this.publish();
 			}
 			/** The scope's batch surface when it supports one; undefined conservatively otherwise. */
@@ -1875,6 +1979,7 @@ window.__ModuleLoader__.load({
 			constructor(scope) {
 				this.form = new CardForm(scope, [
 					booleanField("enabled"),
+					booleanField("decorationEnabled"),
 					booleanField("visible"),
 					numberField("size"),
 					numberField("right"),
@@ -1914,6 +2019,7 @@ window.__ModuleLoader__.load({
 				return {
 					...this.form.shell(),
 					enabled: this.form.field("enabled"),
+					decorationEnabled: this.form.field("decorationEnabled"),
 					visible: this.form.field("visible"),
 					size: this.form.field("size"),
 					right: this.form.field("right"),
@@ -1984,6 +2090,22 @@ window.__ModuleLoader__.load({
 							props.resetField("enabled");
 						}
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(BooleanField, {
+						id: "settings-pet-decoration",
+						label: t("settings.decoration"),
+						hint: t("settings.decorationHint"),
+						inheritLabel: t("settings.inherit"),
+						onLabel: t("settings.on"),
+						offLabel: t("settings.off"),
+						...fieldProps,
+						...state.decorationEnabled,
+						onEdit: (text) => {
+							props.edit("decorationEnabled", text);
+						},
+						onReset: () => {
+							props.resetField("decorationEnabled");
+						}
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ChoiceField, {
 						id: "settings-pet-pet",
 						label: t("settings.pet"),
@@ -2115,6 +2237,8 @@ window.__ModuleLoader__.load({
 			"settings.petHint": "选择显示哪只宠物；每只宠物独立命名，可在宠物悬浮面板改名。",
 			"settings.enabled": "启用宠物",
 			"settings.enabledHint": "关闭后隐藏宠物并停止轮询，可在设置里重新启用。",
+			"settings.decoration": "状态装饰",
+			"settings.decorationHint": "在宠物状态气泡里显示喷水鲸鱼等状态装饰；关闭后气泡只剩文字。",
 			"settings.visible": "显示宠物",
 			"settings.visibleHint": "关闭后宠物隐藏，可从聊天输入区重新召唤。",
 			"settings.size": "大小（px）",
@@ -2166,6 +2290,8 @@ window.__ModuleLoader__.load({
 			"settings.petHint": "Choose which pet shows. Names are stored per pet; rename from the pet hover panel.",
 			"settings.enabled": "Enable the pet",
 			"settings.enabledHint": "When off, the pet hides and polling stops; re-enable it here.",
+			"settings.decoration": "Status decoration",
+			"settings.decorationHint": "Show ornaments like the spouting whale inside the pet status bubbles; when off, bubbles stay text-only.",
 			"settings.visible": "Show the pet",
 			"settings.visibleHint": "When off, the pet hides; summon it again from the input row.",
 			"settings.size": "Size (px)",