@linxin666/dsh-pet 0.3.23 → 0.3.25

package/lib/index.js

@@ -1,5 +1,5 @@
 import { _ as RemarkPicker, a as AFFINITY_MAX, c as applyInteraction, d as emptyAffinity, f as rankOf, g as REMARK_LINE_MAX, h as REMARK_LINES_MAX, i as rowOf, l as applyTurnReward, m as REMARK_KINDS, n as animationForPhase, o as AFFINITY_RANKS, p as BUILTIN_REMARKS, r as defaultPetStateConfig, s as affinityViewOf, t as PetStateMachine, u as defaultAffinityConfig, v as builtinRemark, y as normalizePetRemarks } from "./state-NvDEoCln.js";
-import z from "schemastery";
+import z from "@deepseek-ai/schemastery";
 import { Service } from "@deepseek-ai/cordis";
 import { closeSync, existsSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, realpathSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
@@ -11,10 +11,10 @@ import { readFile } from "node:fs/promises";
 /** Default freshness window. */
 const ANNOUNCE_DEFAULT_TTL_MS = 1e4;
 /**
-* Hard TTL ceiling. A repeating announcer (dsh-usage) declares its poll
-* cadence as the TTL, so an `always`-mode bubble stays continuous across
-* polls; the ceiling means a source that dies unmounts its bubble within at
-* most one missed refresh cycle rather than lingering forever.
+* Hard TTL ceiling. A repeating announcer declares its poll cadence as
+* the TTL, so an always-on bubble stays continuous across polls; the
+* ceiling means a source that dies unmounts its bubble within at most one
+* missed refresh cycle rather than lingering forever.
 */
 const ANNOUNCE_MAX_TTL_MS = 72e5;
 /** Hard bounds: lengths and the TTL range (1 s .. 60 s). */
@@ -894,9 +894,9 @@ function projectOfficialEvent(event, runtime, nowMs = Date.now()) {
 			};
 		}
 		case "tool/result": {
-			const block = event.data.message.content[0];
-			const callId = String(event.data.message.source.callId);
-			const failed = event.data.error !== void 0 || block.isError === true;
+			const { message } = event.data;
+			const callId = String(message.toolCallId);
+			const failed = event.data.error !== void 0 || message.isError === true;
 			const wasTest = runtime.testCalls.delete(callId);
 			runtime.activeTools.delete(callId);
 			runtime.stepHadFailure ||= failed;
@@ -1000,7 +1000,7 @@ function projectAssistantStreamFrame(frame, runtime, nowMs = Date.now()) {
 //#region src/treats.ts
 const defaultTreatConfig = {
 	turnsPerTreat: 30,
-	timeTreatMs: 300 * 6e4,
+	timeTreatMs: 18e6,
 	maxTreats: 20
 };
 function emptyTreatLedger() {
@@ -1474,7 +1474,7 @@ function loadGameplay(parsed) {
 		const item = {
 			stats,
 			currencies,
-			mode: record.mode === "work" || record.mode === "sleep" ? record.mode : null,
+			mode: typeof record.mode === "string" && record.mode.length > 0 && record.mode.length <= 24 ? record.mode : null,
 			settledAt: clamp(finiteNum(record.settledAt, 0), Number.MAX_SAFE_INTEGER)
 		};
 		if (typeof record.incomeCarryMs === "number" && Number.isFinite(record.incomeCarryMs)) item.incomeCarryMs = Math.max(0, record.incomeCarryMs);
@@ -1664,49 +1664,55 @@ function normalizePanel(raw, onWarning = () => {}) {
 	}
 	const panel = {};
 	const labelsRaw = raw.labels;
-	if (labelsRaw !== void 0) if (!isRecord$3(labelsRaw)) onWarning("panel.labels must be an object");
-	else {
-		const labels = {};
-		for (const key of PANEL_LABEL_KEYS) {
-			const value = labelsRaw[key];
-			if (value === void 0) continue;
-			if (typeof value !== "string") {
-				onWarning("panel.labels." + key + " must be a string");
-				continue;
+	if (labelsRaw !== void 0) {
+		if (!isRecord$3(labelsRaw)) onWarning("panel.labels must be an object");
+		else {
+			const labels = {};
+			for (const key of PANEL_LABEL_KEYS) {
+				const value = labelsRaw[key];
+				if (value === void 0) continue;
+				if (typeof value !== "string") {
+					onWarning("panel.labels." + key + " must be a string");
+					continue;
+				}
+				const line = normalizeLine(value, "label", onWarning);
+				if (line !== void 0) labels[key] = line.slice(0, 40);
 			}
-			const line = normalizeLine(value, "label", onWarning);
-			if (line !== void 0) labels[key] = line.slice(0, 40);
+			if (Object.keys(labels).length > 0) panel.labels = labels;
 		}
-		if (Object.keys(labels).length > 0) panel.labels = labels;
 	}
 	const statsRaw = raw.stats;
-	if (statsRaw !== void 0) if (!isRecord$3(statsRaw)) onWarning("panel.stats must be an object");
-	else {
-		const stats = {};
-		for (const key of PANEL_STAT_KEYS) {
-			const value = statsRaw[key];
-			if (value === void 0) continue;
-			if (typeof value !== "string") {
-				onWarning("panel.stats." + key + " must be a string");
-				continue;
+	if (statsRaw !== void 0) {
+		if (!isRecord$3(statsRaw)) onWarning("panel.stats must be an object");
+		else {
+			const stats = {};
+			for (const key of PANEL_STAT_KEYS) {
+				const value = statsRaw[key];
+				if (value === void 0) continue;
+				if (typeof value !== "string") {
+					onWarning("panel.stats." + key + " must be a string");
+					continue;
+				}
+				const line = normalizeLine(value, "stat", onWarning);
+				if (line !== void 0) stats[key] = line.slice(0, 80);
 			}
-			const line = normalizeLine(value, "stat", onWarning);
-			if (line !== void 0) stats[key] = line.slice(0, 80);
+			if (Object.keys(stats).length > 0) panel.stats = stats;
 		}
-		if (Object.keys(stats).length > 0) panel.stats = stats;
 	}
 	const actionsRaw = raw.actions;
-	if (actionsRaw !== void 0) if (!Array.isArray(actionsRaw)) onWarning("panel.actions must be an array");
-	else {
-		const seen = /* @__PURE__ */ new Set();
-		for (const entry of actionsRaw) {
-			if (typeof entry !== "string" || !PANEL_ACTIONS.includes(entry)) {
-				onWarning("unknown panel action dropped: " + String(entry));
-				continue;
+	if (actionsRaw !== void 0) {
+		if (!Array.isArray(actionsRaw)) onWarning("panel.actions must be an array");
+		else {
+			const seen = /* @__PURE__ */ new Set();
+			for (const entry of actionsRaw) {
+				if (typeof entry !== "string" || !PANEL_ACTIONS.includes(entry)) {
+					onWarning("unknown panel action dropped: " + String(entry));
+					continue;
+				}
+				seen.add(entry);
 			}
-			seen.add(entry);
+			panel.actions = PANEL_ACTIONS.filter((action) => seen.has(action));
 		}
-		panel.actions = PANEL_ACTIONS.filter((action) => seen.has(action));
 	}
 	if (panel.labels === void 0 && panel.stats === void 0 && panel.actions === void 0) return void 0;
 	return panel;
@@ -1741,30 +1747,34 @@ function normalizeVoicePack(raw, onWarning = () => {}) {
 	if (version !== void 0 && (typeof version !== "number" || version !== 1)) onWarning("voicePackVersion " + String(version) + " is not supported; reading as v1 best-effort");
 	const overrides = {};
 	const statusRaw = raw.status;
-	if (statusRaw !== void 0) if (!isRecord$3(statusRaw)) onWarning("status must be an object");
-	else for (const key of Object.keys(statusRaw)) {
-		if (!STATUS_SCENES.includes(key)) {
-			onWarning("unknown status scene " + key + " ignored");
-			continue;
+	if (statusRaw !== void 0) {
+		if (!isRecord$3(statusRaw)) onWarning("status must be an object");
+		else for (const key of Object.keys(statusRaw)) {
+			if (!STATUS_SCENES.includes(key)) {
+				onWarning("unknown status scene " + key + " ignored");
+				continue;
+			}
+			const pool = normalizePool(statusRaw[key], "status", onWarning);
+			if (pool !== void 0 && pool.length > 0) overrides.status = {
+				...overrides.status,
+				[key]: pool
+			};
 		}
-		const pool = normalizePool(statusRaw[key], "status", onWarning);
-		if (pool !== void 0 && pool.length > 0) overrides.status = {
-			...overrides.status,
-			[key]: pool
-		};
 	}
 	const toolsRaw = raw.tools;
-	if (toolsRaw !== void 0) if (!isRecord$3(toolsRaw)) onWarning("tools must be an object");
-	else for (const key of Object.keys(toolsRaw)) {
-		if (!TOOL_CATEGORIES.includes(key)) {
-			onWarning("unknown tool family " + key + " ignored");
-			continue;
+	if (toolsRaw !== void 0) {
+		if (!isRecord$3(toolsRaw)) onWarning("tools must be an object");
+		else for (const key of Object.keys(toolsRaw)) {
+			if (!TOOL_CATEGORIES.includes(key)) {
+				onWarning("unknown tool family " + key + " ignored");
+				continue;
+			}
+			const pool = normalizePool(toolsRaw[key], "tools", onWarning);
+			if (pool !== void 0 && pool.length > 0) overrides.tools = {
+				...overrides.tools,
+				[key]: pool
+			};
 		}
-		const pool = normalizePool(toolsRaw[key], "tools", onWarning);
-		if (pool !== void 0 && pool.length > 0) overrides.tools = {
-			...overrides.tools,
-			[key]: pool
-		};
 	}
 	const remainingRaw = raw.toolRemaining;
 	if (remainingRaw !== void 0) {
@@ -1772,27 +1782,31 @@ function normalizeVoicePack(raw, onWarning = () => {}) {
 		if (pool !== void 0 && pool.length > 0) overrides.toolRemaining = pool;
 	}
 	const whispersRaw = raw.whispers;
-	if (whispersRaw !== void 0) if (!isRecord$3(whispersRaw)) onWarning("whispers must be an object");
-	else {
-		for (const key of Object.keys(whispersRaw)) if (key === "generic" || key === "rules") onWarning("whispers." + key + " is no longer supported and was ignored");
-		else if (!WHISPER_KEYS.has(key)) onWarning("unknown whispers field " + key + " ignored");
-		const categories = normalizeWhisperCategories(whispersRaw.categories, onWarning);
-		const results = normalizeWhisperResults(whispersRaw.results, onWarning);
-		if (categories !== void 0 || results !== void 0) overrides.whispers = {
-			...categories === void 0 ? {} : { categories },
-			...results === void 0 ? {} : { results }
-		};
+	if (whispersRaw !== void 0) {
+		if (!isRecord$3(whispersRaw)) onWarning("whispers must be an object");
+		else {
+			for (const key of Object.keys(whispersRaw)) if (key === "generic" || key === "rules") onWarning("whispers." + key + " is no longer supported and was ignored");
+			else if (!WHISPER_KEYS.has(key)) onWarning("unknown whispers field " + key + " ignored");
+			const categories = normalizeWhisperCategories(whispersRaw.categories, onWarning);
+			const results = normalizeWhisperResults(whispersRaw.results, onWarning);
+			if (categories !== void 0 || results !== void 0) overrides.whispers = {
+				...categories === void 0 ? {} : { categories },
+				...results === void 0 ? {} : { results }
+			};
+		}
 	}
 	const panel = raw.panel === void 0 ? void 0 : normalizePanel(raw.panel, onWarning);
 	const remarks = raw.remarks === void 0 ? void 0 : normalizePetRemarks(raw.remarks, onWarning);
 	const ranksRaw = raw.ranks;
 	let ranks;
-	if (ranksRaw !== void 0) if (!isRecord$3(ranksRaw)) onWarning("ranks must be an object");
-	else {
-		const out = {};
-		for (const [key, value] of Object.entries(ranksRaw)) if (typeof value === "string" && value.trim() !== "") out[key] = value.trim().slice(0, 80);
-		else onWarning("invalid rank name for " + key);
-		if (Object.keys(out).length > 0) ranks = out;
+	if (ranksRaw !== void 0) {
+		if (!isRecord$3(ranksRaw)) onWarning("ranks must be an object");
+		else {
+			const out = {};
+			for (const [key, value] of Object.entries(ranksRaw)) if (typeof value === "string" && value.trim() !== "") out[key] = value.trim().slice(0, 80);
+			else onWarning("invalid rank name for " + key);
+			if (Object.keys(out).length > 0) ranks = out;
+		}
 	}
 	if (overrides.status === void 0 && overrides.tools === void 0 && overrides.toolRemaining === void 0 && overrides.whispers === void 0 && panel === void 0 && remarks === void 0 && ranks === void 0) return;
 	return {
@@ -1864,6 +1878,13 @@ function mergeVoicePacks(...layers) {
 }
 //#endregion
 //#region src/gameplay.ts
+/** Every roam direction, in roll order (equal chance each unless restricted). */
+const PET_ROAM_DIRECTIONS = [
+	"up",
+	"down",
+	"left",
+	"right"
+];
 const KEBAB = /^[a-z0-9][a-z0-9-]*$/;
 const MAX_STATS = 16;
 const MAX_ZONES = 8;
@@ -1873,6 +1894,8 @@ const MAX_SHOP_ITEMS = 32;
 const MAX_LOTTERY_TIERS = 16;
 const MAX_PHRASES = 64;
 const PHRASE_MAX_LENGTH = 120;
+const MAX_MODES = 8;
+const MODE_LABEL_MAX_LENGTH = 40;
 const STAT_VALUE_MAX = 1e6;
 const CURRENCY_MAX = 9999999;
 const KNOWN_GAMEPLAY = /* @__PURE__ */ new Set([
@@ -1882,6 +1905,8 @@ const KNOWN_GAMEPLAY = /* @__PURE__ */ new Set([
 	"touch",
 	"work",
 	"sleep",
+	"modes",
+	"roam",
 	"passiveIncome",
 	"shop",
 	"dragState",
@@ -1928,6 +1953,26 @@ const KNOWN_SLEEP = /* @__PURE__ */ new Set([
 	"wakeState",
 	"restore"
 ]);
+const KNOWN_MODE = /* @__PURE__ */ new Set([
+	"state",
+	"label",
+	"activeLabel",
+	"restore"
+]);
+const KNOWN_ROAM = /* @__PURE__ */ new Set([
+	"state",
+	"intervalMs",
+	"probability",
+	"distanceMin",
+	"distanceMax",
+	"speed",
+	"directions"
+]);
+const KNOWN_RESTORE = /* @__PURE__ */ new Set([
+	"stat",
+	"amount",
+	"intervalMs"
+]);
 const KNOWN_SHOP_ITEM = /* @__PURE__ */ new Set([
 	"id",
 	"label",
@@ -2024,6 +2069,25 @@ function parseStateRef(raw, field, hooks) {
 	}
 	return raw;
 }
+/** Parse one mode restore rule "{ stat (declared), amount, intervalMs }". */
+function parseModeRestore(raw, field, stats, fail) {
+	if (!isRecord$2(raw)) {
+		fail(field + " must be an object { stat, amount, intervalMs }");
+		return;
+	}
+	const extra = unknownKeys$2(raw, KNOWN_RESTORE);
+	if (extra.length > 0) fail(field + ": unknown field(s) " + extra.map((k) => JSON.stringify(k)).join(", "));
+	const stat = typeof raw.stat === "string" && stats[raw.stat] !== void 0 ? raw.stat : void 0;
+	if (stat === void 0) fail(field + ".stat must reference a declared stat");
+	if (!intIn(raw.amount, 1, 1e3)) fail(field + ".amount must be an integer in [1, 1000]");
+	if (!intIn(raw.intervalMs, 1e3, 6e5)) fail(field + ".intervalMs must be an integer in [1000, 600000]");
+	if (stat === void 0 || !intIn(raw.amount, 1, 1e3) || !intIn(raw.intervalMs, 1e3, 6e5)) return void 0;
+	return {
+		stat,
+		amount: raw.amount,
+		intervalMs: raw.intervalMs
+	};
+}
 /**
 * Validate the manifest 'gameplay' block (fail-closed). Only frames2d pets
 * may declare gameplay today: every state reference checks against the
@@ -2043,72 +2107,80 @@ function parseGameplayManifest(raw, hooks) {
 		error(message);
 	};
 	const stats = {};
-	if (raw.stats !== void 0) if (!isRecord$2(raw.stats)) fail("gameplay.stats must be an object keyed by stat id");
-	else {
-		const entries = Object.entries(raw.stats);
-		if (entries.length > MAX_STATS) fail("gameplay.stats declares too many stats (max 16)");
-		for (const [name, value] of entries) {
-			if (!validName(name, 24)) {
-				fail("gameplay.stats: invalid stat id " + JSON.stringify(name));
-				continue;
-			}
-			if (!isRecord$2(value)) {
-				fail("gameplay.stats." + name + " must be an object");
-				continue;
-			}
-			const statExtra = unknownKeys$2(value, KNOWN_STAT);
-			if (statExtra.length > 0) fail("gameplay.stats." + name + ": unknown field(s) " + statExtra.map((k) => JSON.stringify(k)).join(", "));
-			if (!intIn(value.max, 1, STAT_VALUE_MAX)) {
-				fail("gameplay.stats." + name + ".max must be an integer in [1, 1000000]");
-				continue;
+	if (raw.stats !== void 0) {
+		if (!isRecord$2(raw.stats)) fail("gameplay.stats must be an object keyed by stat id");
+		else {
+			const entries = Object.entries(raw.stats);
+			if (entries.length > MAX_STATS) fail("gameplay.stats declares too many stats (max 16)");
+			for (const [name, value] of entries) {
+				if (!validName(name, 24)) {
+					fail("gameplay.stats: invalid stat id " + JSON.stringify(name));
+					continue;
+				}
+				if (!isRecord$2(value)) {
+					fail("gameplay.stats." + name + " must be an object");
+					continue;
+				}
+				const statExtra = unknownKeys$2(value, KNOWN_STAT);
+				if (statExtra.length > 0) fail("gameplay.stats." + name + ": unknown field(s) " + statExtra.map((k) => JSON.stringify(k)).join(", "));
+				if (!intIn(value.max, 1, STAT_VALUE_MAX)) {
+					fail("gameplay.stats." + name + ".max must be an integer in [1, 1000000]");
+					continue;
+				}
+				const def = { max: value.max };
+				if (value.initial !== void 0) {
+					if (!numIn(value.initial, 0, value.max)) fail("gameplay.stats." + name + ".initial must be within [0, max]");
+					else def.initial = value.initial;
+				}
+				for (const key of [
+					"decayPerMinute",
+					"workingDecayPerMinute",
+					"idleDecayPerMinute"
+				]) if (value[key] !== void 0) {
+					if (!numIn(value[key], 0, 1e3)) fail("gameplay.stats." + name + "." + key + " must be a number in [0, 1000]");
+					else def[key] = value[key];
+				}
+				stats[name] = def;
 			}
-			const def = { max: value.max };
-			if (value.initial !== void 0) if (!numIn(value.initial, 0, value.max)) fail("gameplay.stats." + name + ".initial must be within [0, max]");
-			else def.initial = value.initial;
-			for (const key of [
-				"decayPerMinute",
-				"workingDecayPerMinute",
-				"idleDecayPerMinute"
-			]) if (value[key] !== void 0) if (!numIn(value[key], 0, 1e3)) fail("gameplay.stats." + name + "." + key + " must be a number in [0, 1000]");
-			else def[key] = value[key];
-			stats[name] = def;
 		}
 	}
 	const block = {};
 	if (Object.keys(stats).length > 0) block.stats = stats;
-	if (raw.idleDirector !== void 0) if (!isRecord$2(raw.idleDirector) || !Array.isArray(raw.idleDirector.acts)) fail("gameplay.idleDirector must be an object with an acts array");
-	else {
-		const d = raw.idleDirector;
-		const dExtra = unknownKeys$2(d, KNOWN_IDLE_DIRECTOR);
-		if (dExtra.length > 0) fail("gameplay.idleDirector: unknown field(s) " + dExtra.map((k) => JSON.stringify(k)).join(", "));
-		if (d.intervalMs !== void 0 && !intIn(d.intervalMs, 1e3, 6e4)) fail("gameplay.idleDirector.intervalMs must be an integer in [1000, 60000]");
-		if (d.maxMiss !== void 0 && !intIn(d.maxMiss, 0, 10)) fail("gameplay.idleDirector.maxMiss must be an integer in [0, 10]");
-		if (d.idleWeight !== void 0 && !intIn(d.idleWeight, 0, 1e4)) fail("gameplay.idleDirector.idleWeight must be an integer in [0, 10000]");
-		if (d.acts.length === 0 || d.acts.length > MAX_ACTS) fail("gameplay.idleDirector.acts must declare 1..16 acts");
-		const acts = [];
-		for (const act of d.acts) {
-			if (!isRecord$2(act) || !intIn(act.weight, 1, 1e4)) {
-				fail("gameplay.idleDirector.acts entries need a weight integer in [1, 10000]");
-				continue;
+	if (raw.idleDirector !== void 0) {
+		if (!isRecord$2(raw.idleDirector) || !Array.isArray(raw.idleDirector.acts)) fail("gameplay.idleDirector must be an object with an acts array");
+		else {
+			const d = raw.idleDirector;
+			const dExtra = unknownKeys$2(d, KNOWN_IDLE_DIRECTOR);
+			if (dExtra.length > 0) fail("gameplay.idleDirector: unknown field(s) " + dExtra.map((k) => JSON.stringify(k)).join(", "));
+			if (d.intervalMs !== void 0 && !intIn(d.intervalMs, 1e3, 6e4)) fail("gameplay.idleDirector.intervalMs must be an integer in [1000, 60000]");
+			if (d.maxMiss !== void 0 && !intIn(d.maxMiss, 0, 10)) fail("gameplay.idleDirector.maxMiss must be an integer in [0, 10]");
+			if (d.idleWeight !== void 0 && !intIn(d.idleWeight, 0, 1e4)) fail("gameplay.idleDirector.idleWeight must be an integer in [0, 10000]");
+			if (d.acts.length === 0 || d.acts.length > MAX_ACTS) fail("gameplay.idleDirector.acts must declare 1..16 acts");
+			const acts = [];
+			for (const act of d.acts) {
+				if (!isRecord$2(act) || !intIn(act.weight, 1, 1e4)) {
+					fail("gameplay.idleDirector.acts entries need a weight integer in [1, 10000]");
+					continue;
+				}
+				const aExtra = unknownKeys$2(act, KNOWN_ACT);
+				if (aExtra.length > 0) fail("gameplay.idleDirector.acts: unknown field(s) " + aExtra.map((k) => JSON.stringify(k)).join(", "));
+				const track = parseStateRef(act.track, "gameplay.idleDirector.acts.track", hooks);
+				if (track === void 0) continue;
+				const entry = {
+					track,
+					weight: act.weight
+				};
+				const phrases = parsePhrases(act.phrases, "gameplay.idleDirector.acts.phrases", hooks);
+				if (phrases !== void 0) entry.phrases = phrases;
+				acts.push(entry);
 			}
-			const aExtra = unknownKeys$2(act, KNOWN_ACT);
-			if (aExtra.length > 0) fail("gameplay.idleDirector.acts: unknown field(s) " + aExtra.map((k) => JSON.stringify(k)).join(", "));
-			const track = parseStateRef(act.track, "gameplay.idleDirector.acts.track", hooks);
-			if (track === void 0) continue;
-			const entry = {
-				track,
-				weight: act.weight
+			if (acts.length > 0) block.idleDirector = {
+				intervalMs: intIn(d.intervalMs, 1e3, 6e4) ? d.intervalMs : 5e3,
+				maxMiss: intIn(d.maxMiss, 0, 10) ? d.maxMiss : 2,
+				idleWeight: intIn(d.idleWeight, 0, 1e4) ? d.idleWeight : 0,
+				acts
 			};
-			const phrases = parsePhrases(act.phrases, "gameplay.idleDirector.acts.phrases", hooks);
-			if (phrases !== void 0) entry.phrases = phrases;
-			acts.push(entry);
 		}
-		if (acts.length > 0) block.idleDirector = {
-			intervalMs: intIn(d.intervalMs, 1e3, 6e4) ? d.intervalMs : 5e3,
-			maxMiss: intIn(d.maxMiss, 0, 10) ? d.maxMiss : 2,
-			idleWeight: intIn(d.idleWeight, 0, 1e4) ? d.idleWeight : 0,
-			acts
-		};
 	}
 	if (raw.hitBox !== void 0) {
 		const b = raw.hitBox;
@@ -2120,66 +2192,70 @@ function parseGameplayManifest(raw, hooks) {
 			y1: b.y1
 		};
 	}
-	if (raw.touch !== void 0) if (!isRecord$2(raw.touch) || !Array.isArray(raw.touch.zones)) fail("gameplay.touch must be an object with a zones array");
-	else {
-		const tExtra = unknownKeys$2(raw.touch, KNOWN_TOUCH);
-		if (tExtra.length > 0) fail("gameplay.touch: unknown field(s) " + tExtra.map((k) => JSON.stringify(k)).join(", "));
-		let clickBoost;
-		if (raw.touch.clickBoost !== void 0) {
-			const cb = raw.touch.clickBoost;
-			if (!isRecord$2(cb) || typeof cb.stat !== "string" || stats[cb.stat] === void 0 || !intIn(cb.min, 0, 1e3) || !intIn(cb.max, 0, 1e3) || cb.min > cb.max) fail("gameplay.touch.clickBoost must be { stat (declared), min, max } integers with 0 <= min <= max <= 1000");
-			else clickBoost = {
-				stat: cb.stat,
-				min: cb.min,
-				max: cb.max
-			};
-		}
-		const zones = [];
-		if (raw.touch.zones.length === 0 || raw.touch.zones.length > MAX_ZONES) fail("gameplay.touch.zones must declare 1..8 zones");
-		for (const zoneRaw of raw.touch.zones) {
-			if (!isRecord$2(zoneRaw) || !validName(zoneRaw.name) || !numIn(zoneRaw.y0, 0, 1) || !numIn(zoneRaw.y1, 0, 1) || !(zoneRaw.y0 < zoneRaw.y1)) {
-				fail("gameplay.touch.zones entries need a kebab name and 0 <= y0 < y1 <= 1");
-				continue;
-			}
-			const zExtra = unknownKeys$2(zoneRaw, KNOWN_ZONE);
-			if (zExtra.length > 0) fail("gameplay.touch." + zoneRaw.name + ": unknown field(s) " + zExtra.map((k) => JSON.stringify(k)).join(", "));
-			if (!Array.isArray(zoneRaw.branches) || zoneRaw.branches.length === 0 || zoneRaw.branches.length > MAX_BRANCHES) {
-				fail("gameplay.touch." + zoneRaw.name + ".branches must declare 1..8 branches");
-				continue;
+	if (raw.touch !== void 0) {
+		if (!isRecord$2(raw.touch) || !Array.isArray(raw.touch.zones)) fail("gameplay.touch must be an object with a zones array");
+		else {
+			const tExtra = unknownKeys$2(raw.touch, KNOWN_TOUCH);
+			if (tExtra.length > 0) fail("gameplay.touch: unknown field(s) " + tExtra.map((k) => JSON.stringify(k)).join(", "));
+			let clickBoost;
+			if (raw.touch.clickBoost !== void 0) {
+				const cb = raw.touch.clickBoost;
+				if (!isRecord$2(cb) || typeof cb.stat !== "string" || stats[cb.stat] === void 0 || !intIn(cb.min, 0, 1e3) || !intIn(cb.max, 0, 1e3) || cb.min > cb.max) fail("gameplay.touch.clickBoost must be { stat (declared), min, max } integers with 0 <= min <= max <= 1000");
+				else clickBoost = {
+					stat: cb.stat,
+					min: cb.min,
+					max: cb.max
+				};
 			}
-			let probabilitySum = 0;
-			const branches = [];
-			for (const branchRaw of zoneRaw.branches) {
-				if (!isRecord$2(branchRaw) || !numIn(branchRaw.probability, 0, 1) || branchRaw.probability === 0) {
-					fail("gameplay.touch." + zoneRaw.name + ".branches entries need a probability in (0, 1]");
+			const zones = [];
+			if (raw.touch.zones.length === 0 || raw.touch.zones.length > MAX_ZONES) fail("gameplay.touch.zones must declare 1..8 zones");
+			for (const zoneRaw of raw.touch.zones) {
+				if (!isRecord$2(zoneRaw) || !validName(zoneRaw.name) || !numIn(zoneRaw.y0, 0, 1) || !numIn(zoneRaw.y1, 0, 1) || !(zoneRaw.y0 < zoneRaw.y1)) {
+					fail("gameplay.touch.zones entries need a kebab name and 0 <= y0 < y1 <= 1");
 					continue;
 				}
-				const bExtra = unknownKeys$2(branchRaw, KNOWN_BRANCH);
-				if (bExtra.length > 0) fail("gameplay.touch." + zoneRaw.name + ": unknown branch field(s) " + bExtra.map((k) => JSON.stringify(k)).join(", "));
-				probabilitySum += branchRaw.probability;
-				const branch = { probability: branchRaw.probability };
-				const effects = parseEffects(branchRaw.effects, "gameplay.touch." + zoneRaw.name + ".effects", stats, hooks);
-				if (effects !== void 0) branch.effects = effects;
-				const state = parseStateRef(branchRaw.state, "gameplay.touch." + zoneRaw.name + ".state", hooks);
-				if (state !== void 0) branch.state = state;
-				if (branchRaw.stateMs !== void 0) if (!intIn(branchRaw.stateMs, 200, 1e4)) fail("gameplay.touch." + zoneRaw.name + ".stateMs must be an integer in [200, 10000]");
-				else branch.stateMs = branchRaw.stateMs;
-				const phrases = parsePhrases(branchRaw.phrases, "gameplay.touch." + zoneRaw.name + ".phrases", hooks);
-				if (phrases !== void 0) branch.phrases = phrases;
-				branches.push(branch);
+				const zExtra = unknownKeys$2(zoneRaw, KNOWN_ZONE);
+				if (zExtra.length > 0) fail("gameplay.touch." + zoneRaw.name + ": unknown field(s) " + zExtra.map((k) => JSON.stringify(k)).join(", "));
+				if (!Array.isArray(zoneRaw.branches) || zoneRaw.branches.length === 0 || zoneRaw.branches.length > MAX_BRANCHES) {
+					fail("gameplay.touch." + zoneRaw.name + ".branches must declare 1..8 branches");
+					continue;
+				}
+				let probabilitySum = 0;
+				const branches = [];
+				for (const branchRaw of zoneRaw.branches) {
+					if (!isRecord$2(branchRaw) || !numIn(branchRaw.probability, 0, 1) || branchRaw.probability === 0) {
+						fail("gameplay.touch." + zoneRaw.name + ".branches entries need a probability in (0, 1]");
+						continue;
+					}
+					const bExtra = unknownKeys$2(branchRaw, KNOWN_BRANCH);
+					if (bExtra.length > 0) fail("gameplay.touch." + zoneRaw.name + ": unknown branch field(s) " + bExtra.map((k) => JSON.stringify(k)).join(", "));
+					probabilitySum += branchRaw.probability;
+					const branch = { probability: branchRaw.probability };
+					const effects = parseEffects(branchRaw.effects, "gameplay.touch." + zoneRaw.name + ".effects", stats, hooks);
+					if (effects !== void 0) branch.effects = effects;
+					const state = parseStateRef(branchRaw.state, "gameplay.touch." + zoneRaw.name + ".state", hooks);
+					if (state !== void 0) branch.state = state;
+					if (branchRaw.stateMs !== void 0) {
+						if (!intIn(branchRaw.stateMs, 200, 1e4)) fail("gameplay.touch." + zoneRaw.name + ".stateMs must be an integer in [200, 10000]");
+						else branch.stateMs = branchRaw.stateMs;
+					}
+					const phrases = parsePhrases(branchRaw.phrases, "gameplay.touch." + zoneRaw.name + ".phrases", hooks);
+					if (phrases !== void 0) branch.phrases = phrases;
+					branches.push(branch);
+				}
+				if (probabilitySum > 1 + 1e-9) fail("gameplay.touch." + zoneRaw.name + ": branch probabilities must sum to at most 1");
+				if (branches.length > 0) zones.push({
+					name: zoneRaw.name,
+					y0: zoneRaw.y0,
+					y1: zoneRaw.y1,
+					branches
+				});
 			}
-			if (probabilitySum > 1.000000001) fail("gameplay.touch." + zoneRaw.name + ": branch probabilities must sum to at most 1");
-			if (branches.length > 0) zones.push({
-				name: zoneRaw.name,
-				y0: zoneRaw.y0,
-				y1: zoneRaw.y1,
-				branches
-			});
+			if (zones.length > 0 || clickBoost !== void 0) block.touch = {
+				zones,
+				...clickBoost === void 0 ? {} : { clickBoost }
+			};
 		}
-		if (zones.length > 0 || clickBoost !== void 0) block.touch = {
-			zones,
-			...clickBoost === void 0 ? {} : { clickBoost }
-		};
 	}
 	if (raw.work !== void 0) {
 		const w = raw.work;
@@ -2200,15 +2276,19 @@ function parseGameplayManifest(raw, hooks) {
 					tickMs: w.tickMs,
 					successProbability: w.successProbability
 				};
-				if (w.resultMs !== void 0) if (!isRecord$2(w.resultMs) || !intIn(w.resultMs.success, 200, 1e4) || !intIn(w.resultMs.fail, 200, 1e4)) fail("gameplay.work.resultMs must be { success, fail } integers in [200, 10000]");
-				else work.resultMs = {
-					success: w.resultMs.success,
-					fail: w.resultMs.fail
-				};
-				for (const key of ["success", "fail"]) if (w[key] !== void 0) if (!isRecord$2(w[key])) fail("gameplay.work." + key + " must be an object { effects }");
-				else {
-					const effects = parseEffects(w[key].effects, "gameplay.work." + key + ".effects", stats, hooks);
-					if (effects !== void 0) work[key] = { effects };
+				if (w.resultMs !== void 0) {
+					if (!isRecord$2(w.resultMs) || !intIn(w.resultMs.success, 200, 1e4) || !intIn(w.resultMs.fail, 200, 1e4)) fail("gameplay.work.resultMs must be { success, fail } integers in [200, 10000]");
+					else work.resultMs = {
+						success: w.resultMs.success,
+						fail: w.resultMs.fail
+					};
+				}
+				for (const key of ["success", "fail"]) if (w[key] !== void 0) {
+					if (!isRecord$2(w[key])) fail("gameplay.work." + key + " must be an object { effects }");
+					else {
+						const effects = parseEffects(w[key].effects, "gameplay.work." + key + ".effects", stats, hooks);
+						if (effects !== void 0) work[key] = { effects };
+					}
 				}
 				block.work = work;
 			}
@@ -2222,18 +2302,101 @@ function parseGameplayManifest(raw, hooks) {
 			if (sExtra.length > 0) fail("gameplay.sleep: unknown field(s) " + sExtra.map((k) => JSON.stringify(k)).join(", "));
 			const state = parseStateRef(s.state, "gameplay.sleep.state", hooks);
 			const wakeState = parseStateRef(s.wakeState, "gameplay.sleep.wakeState", hooks);
-			const restoreStat = typeof s.restore.stat === "string" && stats[s.restore.stat] !== void 0 ? s.restore.stat : void 0;
-			if (restoreStat === void 0) fail("gameplay.sleep.restore.stat must reference a declared stat");
-			if (!intIn(s.restore.amount, 1, 1e3)) fail("gameplay.sleep.restore.amount must be an integer in [1, 1000]");
-			if (!intIn(s.restore.intervalMs, 1e3, 6e5)) fail("gameplay.sleep.restore.intervalMs must be an integer in [1000, 600000]");
-			if (state !== void 0 && restoreStat !== void 0 && intIn(s.restore.amount, 1, 1e3) && intIn(s.restore.intervalMs, 1e3, 6e5)) block.sleep = {
+			const restore = parseModeRestore(s.restore, "gameplay.sleep.restore", stats, fail);
+			if (state !== void 0 && restore !== void 0) block.sleep = {
 				state,
 				...wakeState === void 0 ? {} : { wakeState },
-				restore: {
-					stat: restoreStat,
-					amount: s.restore.amount,
-					intervalMs: s.restore.intervalMs
+				restore
+			};
+		}
+	}
+	if (raw.modes !== void 0) {
+		if (!isRecord$2(raw.modes)) fail("gameplay.modes must be an object keyed by mode id");
+		else {
+			const entries = Object.entries(raw.modes);
+			if (entries.length > MAX_MODES) fail("gameplay.modes declares too many modes (max 8)");
+			const modes = {};
+			for (const [name, value] of entries) {
+				if (!validName(name, 24) || name === "work" || name === "sleep") {
+					fail("gameplay.modes: invalid mode id " + JSON.stringify(name) + " (kebab, and not the reserved work/sleep)");
+					continue;
+				}
+				if (!isRecord$2(value)) {
+					fail("gameplay.modes." + name + " must be an object");
+					continue;
 				}
+				const mExtra = unknownKeys$2(value, KNOWN_MODE);
+				if (mExtra.length > 0) fail("gameplay.modes." + name + ": unknown field(s) " + mExtra.map((k) => JSON.stringify(k)).join(", "));
+				const state = parseStateRef(value.state, "gameplay.modes." + name + ".state", hooks);
+				let usable = state !== void 0;
+				let label;
+				if (value.label !== void 0) {
+					if (typeof value.label !== "string" || value.label.trim() === "" || value.label.length > MODE_LABEL_MAX_LENGTH) {
+						fail("gameplay.modes." + name + ".label must be a non-empty string of at most 40 chars");
+						usable = false;
+					} else label = value.label.trim();
+				}
+				let activeLabel;
+				if (value.activeLabel !== void 0) {
+					if (typeof value.activeLabel !== "string" || value.activeLabel.trim() === "" || value.activeLabel.length > MODE_LABEL_MAX_LENGTH) {
+						fail("gameplay.modes." + name + ".activeLabel must be a non-empty string of at most 40 chars");
+						usable = false;
+					} else activeLabel = value.activeLabel.trim();
+				}
+				const restore = value.restore === void 0 ? void 0 : parseModeRestore(value.restore, "gameplay.modes." + name + ".restore", stats, fail);
+				if (value.restore !== void 0 && restore === void 0) usable = false;
+				if (usable && state !== void 0) modes[name] = {
+					state,
+					...label === void 0 ? {} : { label },
+					...activeLabel === void 0 ? {} : { activeLabel },
+					...restore === void 0 ? {} : { restore }
+				};
+			}
+			if (Object.keys(modes).length > 0) block.modes = modes;
+		}
+	}
+	if (raw.roam !== void 0) {
+		const rm = raw.roam;
+		if (!isRecord$2(rm)) fail("gameplay.roam must be an object");
+		else {
+			const rExtra = unknownKeys$2(rm, KNOWN_ROAM);
+			if (rExtra.length > 0) fail("gameplay.roam: unknown field(s) " + rExtra.map((k) => JSON.stringify(k)).join(", "));
+			const state = parseStateRef(rm.state, "gameplay.roam.state", hooks);
+			if (!intIn(rm.intervalMs, 1e3, 36e5)) fail("gameplay.roam.intervalMs must be an integer in [1000, 3600000]");
+			if (!numIn(rm.probability, 0, 1) || rm.probability === 0) fail("gameplay.roam.probability must be a number in (0, 1]");
+			if (!intIn(rm.distanceMin, 1, 2e3)) fail("gameplay.roam.distanceMin must be an integer in [1, 2000]");
+			if (!intIn(rm.distanceMax, 1, 2e3)) fail("gameplay.roam.distanceMax must be an integer in [1, 2000]");
+			if (intIn(rm.distanceMin, 1, 2e3) && intIn(rm.distanceMax, 1, 2e3) && rm.distanceMin > rm.distanceMax) fail("gameplay.roam.distanceMin must not exceed distanceMax");
+			if (!intIn(rm.speed, 1, 2e3)) fail("gameplay.roam.speed must be an integer in [1, 2000] (px per second)");
+			let directions;
+			if (rm.directions !== void 0) {
+				if (!Array.isArray(rm.directions) || rm.directions.length === 0) fail("gameplay.roam.directions must be a non-empty array of up, down, left, right");
+				else {
+					const picked = [];
+					for (const entry of rm.directions) {
+						if (typeof entry !== "string" || !PET_ROAM_DIRECTIONS.includes(entry)) {
+							fail("gameplay.roam.directions entries must be up, down, left or right");
+							picked.length = 0;
+							break;
+						}
+						if (picked.includes(entry)) {
+							fail("gameplay.roam.directions must not repeat " + entry);
+							picked.length = 0;
+							break;
+						}
+						picked.push(entry);
+					}
+					if (picked.length > 0) directions = picked;
+				}
+			}
+			if (state !== void 0 && intIn(rm.intervalMs, 1e3, 36e5) && numIn(rm.probability, 0, 1) && rm.probability !== 0 && intIn(rm.distanceMin, 1, 2e3) && intIn(rm.distanceMax, 1, 2e3) && rm.distanceMin <= rm.distanceMax && intIn(rm.speed, 1, 2e3)) block.roam = {
+				state,
+				intervalMs: rm.intervalMs,
+				probability: rm.probability,
+				distanceMin: rm.distanceMin,
+				distanceMax: rm.distanceMax,
+				speed: rm.speed,
+				...directions === void 0 ? {} : { directions }
 			};
 		}
 	}
@@ -2283,8 +2446,10 @@ function parseGameplayManifest(raw, hooks) {
 					price: itemRaw.price,
 					currency: itemRaw.currency
 				};
-				if (itemRaw.image !== void 0) if (typeof itemRaw.image !== "string" || itemRaw.image.includes("..") || itemRaw.image.includes("\\") || itemRaw.image.startsWith("/")) fail("gameplay.shop." + itemRaw.id + ".image must be a safe manifest-relative frame path");
-				else item.image = itemRaw.image;
+				if (itemRaw.image !== void 0) {
+					if (typeof itemRaw.image !== "string" || itemRaw.image.includes("..") || itemRaw.image.includes("\\") || itemRaw.image.startsWith("/")) fail("gameplay.shop." + itemRaw.id + ".image must be a safe manifest-relative frame path");
+					else item.image = itemRaw.image;
+				}
 				const effects = parseEffects(itemRaw.effects, "gameplay.shop." + itemRaw.id + ".effects", stats, hooks);
 				if (effects !== void 0) item.effects = effects;
 				if (itemRaw.lottery !== void 0) {
@@ -2306,11 +2471,13 @@ function parseGameplayManifest(raw, hooks) {
 								probability: tierRaw.probability,
 								prize: tierRaw.prize
 							};
-							if (tierRaw.currency !== void 0) if (!validName(tierRaw.currency, 24)) fail("gameplay.shop." + itemRaw.id + ".lottery tier currency must be a kebab id");
-							else tier.currency = tierRaw.currency;
+							if (tierRaw.currency !== void 0) {
+								if (!validName(tierRaw.currency, 24)) fail("gameplay.shop." + itemRaw.id + ".lottery tier currency must be a kebab id");
+								else tier.currency = tierRaw.currency;
+							}
 							tiers.push(tier);
 						}
-						if (tierSum > 1.000000001) fail("gameplay.shop." + itemRaw.id + ".lottery tier probabilities must sum to at most 1");
+						if (tierSum > 1 + 1e-9) fail("gameplay.shop." + itemRaw.id + ".lottery tier probabilities must sum to at most 1");
 						if (tiers.length > 0) {
 							const lotteryEffects = parseEffects(l.effects, "gameplay.shop." + itemRaw.id + ".lottery.effects", stats, hooks);
 							item.lottery = {
@@ -2343,6 +2510,29 @@ function parseGameplayManifest(raw, hooks) {
 	}
 	return failed ? void 0 : block;
 }
+/**
+* One declared extra mode, by OWN key only. A plain `modes[id]` lookup also
+* answers for Object.prototype members ('constructor', 'toString', …), which
+* would let a crafted mode id pass the "is it declared?" test.
+*/
+function declaredModeOf(manifest, mode) {
+	const modes = manifest.modes;
+	if (modes === void 0 || !Object.prototype.hasOwnProperty.call(modes, mode)) return void 0;
+	return modes[mode];
+}
+/** The restore rule of one active mode, when it declares one. */
+function modeRestoreOf(manifest, mode) {
+	if (mode === null) return void 0;
+	if (mode === "sleep") return manifest.sleep?.restore;
+	if (mode === "work") return void 0;
+	return declaredModeOf(manifest, mode)?.restore;
+}
+/** Whether the manifest still declares this gameplay mode id. */
+function isDeclaredMode(manifest, mode) {
+	if (mode === "work") return manifest.work !== void 0;
+	if (mode === "sleep") return manifest.sleep !== void 0;
+	return declaredModeOf(manifest, mode) !== void 0;
+}
 /** Fresh state for one pet: stats at their initial (default max), no currency. */
 function initialGameplayState(manifest, now) {
 	const stats = {};
@@ -2364,9 +2554,11 @@ function clampGameplay(state, manifest) {
 	for (const [name, value] of Object.entries(state.currencies)) state.currencies[name] = Math.min(CURRENCY_MAX, Math.max(0, Math.floor(value)));
 }
 /**
-* Lazy settle: apply stat decay, passive income and sleep restore for the
-* elapsed wall time since the last settle. Mirrors the treats.ts discipline
-* (no host timers; read paths settle). Returns whether anything changed.
+* Lazy settle: apply stat decay, passive income and the active mode's restore
+* rule (sleep restores energy, a declared extra mode restores whatever it
+* declares) for the elapsed wall time since the last settle. Mirrors the
+* treats.ts discipline (no host timers; read paths settle). Returns whether
+* anything changed.
 */
 function settleGameplay(state, manifest, now, options) {
 	const elapsedMs = now - state.settledAt;
@@ -2397,14 +2589,14 @@ function settleGameplay(state, manifest, now, options) {
 			changed = true;
 		}
 	}
-	if (state.mode === "sleep" && manifest.sleep !== void 0) {
+	const restore = modeRestoreOf(manifest, state.mode);
+	if (restore !== void 0) {
 		const restoreElapsed = elapsedMs + (state.restoreCarryMs ?? 0);
-		const interval = manifest.sleep.restore.intervalMs;
+		const interval = restore.intervalMs;
 		const ticks = Math.floor(restoreElapsed / interval);
 		state.restoreCarryMs = restoreElapsed % interval;
 		if (ticks > 0) {
-			const stat = manifest.sleep.restore.stat;
-			state.stats[stat] = (state.stats[stat] ?? 0) + ticks * manifest.sleep.restore.amount;
+			state.stats[restore.stat] = (state.stats[restore.stat] ?? 0) + ticks * restore.amount;
 			changed = true;
 		}
 	} else state.restoreCarryMs = 0;
@@ -2649,16 +2841,26 @@ function parseSprite2dBlock(raw, diag) {
 	const spritesheetPath = safeManifestPath(raw.spritesheetPath);
 	if (spritesheetPath === void 0) diag.error("sprite2d.spritesheetPath must be a safe manifest-relative path");
 	const block = { spritesheetPath: spritesheetPath ?? "" };
-	if (raw.cell !== void 0) if (!isRecord$1(raw.cell)) diag.error("sprite2d.cell must be an object { width?, height? }");
-	else block.cell = raw.cell;
-	if (raw.columns !== void 0) if (typeof raw.columns !== "number" || !Number.isInteger(raw.columns) || raw.columns < 1) diag.error("sprite2d.columns must be a positive integer");
-	else block.columns = raw.columns;
-	if (raw.atlasRows !== void 0) if (typeof raw.atlasRows !== "number" || !Number.isInteger(raw.atlasRows) || raw.atlasRows < 1) diag.error("sprite2d.atlasRows must be a positive integer");
-	else block.atlasRows = raw.atlasRows;
-	if (raw.frames !== void 0) if (!Array.isArray(raw.frames) || raw.frames.some((v) => typeof v !== "number" || !Number.isInteger(v) || v < 0)) diag.error("sprite2d.frames must be an array of non-negative integers");
-	else block.frames = raw.frames;
-	if (raw.tracks !== void 0) if (!isRecord$1(raw.tracks)) diag.error("sprite2d.tracks must be an object keyed by animation");
-	else block.tracks = raw.tracks;
+	if (raw.cell !== void 0) {
+		if (!isRecord$1(raw.cell)) diag.error("sprite2d.cell must be an object { width?, height? }");
+		else block.cell = raw.cell;
+	}
+	if (raw.columns !== void 0) {
+		if (typeof raw.columns !== "number" || !Number.isInteger(raw.columns) || raw.columns < 1) diag.error("sprite2d.columns must be a positive integer");
+		else block.columns = raw.columns;
+	}
+	if (raw.atlasRows !== void 0) {
+		if (typeof raw.atlasRows !== "number" || !Number.isInteger(raw.atlasRows) || raw.atlasRows < 1) diag.error("sprite2d.atlasRows must be a positive integer");
+		else block.atlasRows = raw.atlasRows;
+	}
+	if (raw.frames !== void 0) {
+		if (!Array.isArray(raw.frames) || raw.frames.some((v) => typeof v !== "number" || !Number.isInteger(v) || v < 0)) diag.error("sprite2d.frames must be an array of non-negative integers");
+		else block.frames = raw.frames;
+	}
+	if (raw.tracks !== void 0) {
+		if (!isRecord$1(raw.tracks)) diag.error("sprite2d.tracks must be an object keyed by animation");
+		else block.tracks = raw.tracks;
+	}
 	return diag.hasErrors ? void 0 : block;
 }
 function parseLive2dBlock(raw, diag) {
@@ -2678,16 +2880,24 @@ function parseLive2dBlock(raw, diag) {
 		model: model ?? "",
 		motions: motions ?? { idle: "" }
 	};
-	if (raw.scale !== void 0) if (typeof raw.scale !== "number" || !Number.isFinite(raw.scale) || raw.scale <= 0 || raw.scale > 10) diag.error("live2d.scale must be a number in (0, 10]");
-	else block.scale = raw.scale;
-	if (raw.translate !== void 0) if (!isRecord$1(raw.translate) || raw.translate.x !== void 0 && typeof raw.translate.x !== "number" || raw.translate.y !== void 0 && typeof raw.translate.y !== "number") diag.error("live2d.translate must be an object { x?: number, y?: number }");
-	else block.translate = raw.translate;
+	if (raw.scale !== void 0) {
+		if (typeof raw.scale !== "number" || !Number.isFinite(raw.scale) || raw.scale <= 0 || raw.scale > 10) diag.error("live2d.scale must be a number in (0, 10]");
+		else block.scale = raw.scale;
+	}
+	if (raw.translate !== void 0) {
+		if (!isRecord$1(raw.translate) || raw.translate.x !== void 0 && typeof raw.translate.x !== "number" || raw.translate.y !== void 0 && typeof raw.translate.y !== "number") diag.error("live2d.translate must be an object { x?: number, y?: number }");
+		else block.translate = raw.translate;
+	}
 	const expressions = parsePhaseStringMap(raw.expressions, "live2d.expressions", diag);
 	if (expressions !== void 0) block.expressions = expressions;
-	if (raw.hitAreas !== void 0) if (!Array.isArray(raw.hitAreas) || raw.hitAreas.some((v) => typeof v !== "string" || v.trim() === "")) diag.error("live2d.hitAreas must be an array of non-empty strings");
-	else block.hitAreas = raw.hitAreas;
-	if (raw.lipSync !== void 0) if (typeof raw.lipSync !== "boolean") diag.error("live2d.lipSync must be a boolean");
-	else block.lipSync = raw.lipSync;
+	if (raw.hitAreas !== void 0) {
+		if (!Array.isArray(raw.hitAreas) || raw.hitAreas.some((v) => typeof v !== "string" || v.trim() === "")) diag.error("live2d.hitAreas must be an array of non-empty strings");
+		else block.hitAreas = raw.hitAreas;
+	}
+	if (raw.lipSync !== void 0) {
+		if (typeof raw.lipSync !== "boolean") diag.error("live2d.lipSync must be a boolean");
+		else block.lipSync = raw.lipSync;
+	}
 	return diag.hasErrors ? void 0 : block;
 }
 const FRAMES2D_TRACK_NAME = /^[a-z0-9][a-z0-9-]*$/;
@@ -2724,25 +2934,33 @@ function parseFrames2dTrack(raw, field, diag) {
 	const extra = unknownKeys$1(raw, KNOWN_FRAMES2D_TRACK);
 	if (extra.length > 0) diag.error(field + ": unknown field(s) " + extra.map((k) => JSON.stringify(k)).join(", "));
 	const track = {};
-	if (raw.frames !== void 0) if (!Array.isArray(raw.frames) || raw.frames.length === 0) diag.error(field + ".frames must be a non-empty array of frame file names");
-	else if (raw.frames.length > FRAMES2D_MAX_FRAMES) diag.error(field + ".frames declares too many frames (" + raw.frames.length + ", max 64)");
-	else {
-		const frames = [];
-		for (const entry of raw.frames) {
-			const safe = safeFrameName(entry);
-			if (safe === void 0) diag.error(field + ".frames entry " + JSON.stringify(String(entry)) + " is not a safe image file name");
-			else frames.push(safe);
+	if (raw.frames !== void 0) {
+		if (!Array.isArray(raw.frames) || raw.frames.length === 0) diag.error(field + ".frames must be a non-empty array of frame file names");
+		else if (raw.frames.length > FRAMES2D_MAX_FRAMES) diag.error(field + ".frames declares too many frames (" + raw.frames.length + ", max 64)");
+		else {
+			const frames = [];
+			for (const entry of raw.frames) {
+				const safe = safeFrameName(entry);
+				if (safe === void 0) diag.error(field + ".frames entry " + JSON.stringify(String(entry)) + " is not a safe image file name");
+				else frames.push(safe);
+			}
+			if (frames.length === raw.frames.length) track.frames = frames;
 		}
-		if (frames.length === raw.frames.length) track.frames = frames;
-	}
-	if (raw.frameMs !== void 0) if (!Array.isArray(raw.frameMs) || raw.frameMs.length === 0 || raw.frameMs.some((v) => typeof v !== "number" || !Number.isInteger(v) || v < FRAMES2D_MIN_FRAME_MS || v > FRAMES2D_MAX_FRAME_MS)) diag.error(field + ".frameMs must be a non-empty array of integer ms in [16, 5000]");
-	else if (track.frames === void 0) diag.error(field + ".frameMs requires a valid explicit frames list (directory tracks use filename-encoded ms or defaultFrameMs)");
-	else if (raw.frameMs.length !== track.frames.length) diag.error(field + ".frameMs must have the same length as frames");
-	else track.frameMs = raw.frameMs;
-	if (raw.loop !== void 0) if (typeof raw.loop !== "boolean") diag.error(field + ".loop must be a boolean");
-	else track.loop = raw.loop;
-	if (raw.fallback !== void 0) if (typeof raw.fallback !== "string" || !validTrackName(raw.fallback)) diag.error(field + ".fallback must be a track name");
-	else track.fallback = raw.fallback;
+	}
+	if (raw.frameMs !== void 0) {
+		if (!Array.isArray(raw.frameMs) || raw.frameMs.length === 0 || raw.frameMs.some((v) => typeof v !== "number" || !Number.isInteger(v) || v < FRAMES2D_MIN_FRAME_MS || v > FRAMES2D_MAX_FRAME_MS)) diag.error(field + ".frameMs must be a non-empty array of integer ms in [16, 5000]");
+		else if (track.frames === void 0) diag.error(field + ".frameMs requires a valid explicit frames list (directory tracks use filename-encoded ms or defaultFrameMs)");
+		else if (raw.frameMs.length !== track.frames.length) diag.error(field + ".frameMs must have the same length as frames");
+		else track.frameMs = raw.frameMs;
+	}
+	if (raw.loop !== void 0) {
+		if (typeof raw.loop !== "boolean") diag.error(field + ".loop must be a boolean");
+		else track.loop = raw.loop;
+	}
+	if (raw.fallback !== void 0) {
+		if (typeof raw.fallback !== "string" || !validTrackName(raw.fallback)) diag.error(field + ".fallback must be a track name");
+		else track.fallback = raw.fallback;
+	}
 	return diag.hasErrors ? void 0 : track;
 }
 function parseFrames2dBlock(raw, diag) {
@@ -2761,8 +2979,10 @@ function parseFrames2dBlock(raw, diag) {
 		if (dir === void 0) diag.error("frames2d.dir must be a safe manifest-relative directory");
 		else block.dir = dir;
 	}
-	if (raw.defaultFrameMs !== void 0) if (typeof raw.defaultFrameMs !== "number" || !Number.isInteger(raw.defaultFrameMs) || raw.defaultFrameMs < FRAMES2D_MIN_FRAME_MS || raw.defaultFrameMs > FRAMES2D_MAX_FRAME_MS) diag.error("frames2d.defaultFrameMs must be an integer in [16, 5000]");
-	else block.defaultFrameMs = raw.defaultFrameMs;
+	if (raw.defaultFrameMs !== void 0) {
+		if (typeof raw.defaultFrameMs !== "number" || !Number.isInteger(raw.defaultFrameMs) || raw.defaultFrameMs < FRAMES2D_MIN_FRAME_MS || raw.defaultFrameMs > FRAMES2D_MAX_FRAME_MS) diag.error("frames2d.defaultFrameMs must be an integer in [16, 5000]");
+		else block.defaultFrameMs = raw.defaultFrameMs;
+	}
 	const tracks = {};
 	if (!isRecord$1(raw.tracks)) diag.error("frames2d.tracks is required and must be an object keyed by track name");
 	else {
@@ -2788,99 +3008,105 @@ function parseFrames2dBlock(raw, diag) {
 		for (const [phase, target] of Object.entries(block.phases)) if (target !== void 0 && tracks[target] === void 0) diag.error("frames2d.phases." + phase + " references unknown track " + JSON.stringify(target));
 	}
 	for (const [name, track] of Object.entries(tracks)) if (track.fallback !== void 0 && tracks[track.fallback] === void 0) diag.error("frames2d.tracks." + name + ".fallback references unknown track " + JSON.stringify(track.fallback));
-	if (raw.skins !== void 0) if (!Array.isArray(raw.skins) || raw.skins.length === 0 || raw.skins.length > 16) diag.error("frames2d.skins must be an array of 1..16 skins");
-	else {
-		const skins = [];
-		const seen = /* @__PURE__ */ new Set();
-		for (const [index, entry] of raw.skins.entries()) {
-			const field = "frames2d.skins[" + index + "]";
-			if (!isRecord$1(entry)) {
-				diag.error(field + " must be an object");
-				continue;
-			}
-			const extra = unknownKeys$1(entry, KNOWN_SKIN);
-			if (extra.length > 0) diag.error(field + ": unknown field(s) " + extra.map((k) => JSON.stringify(k)).join(", "));
-			const id = typeof entry.id === "string" ? entry.id.trim() : "";
-			if (id === "" || id.length > 24 || !FRAMES2D_TRACK_NAME.test(id)) {
-				diag.error(field + ".id must be a lowercase kebab id of at most 24 chars");
-				continue;
-			}
-			if (seen.has(id)) {
-				diag.error(field + ": duplicate skin id " + JSON.stringify(id));
-				continue;
-			}
-			seen.add(id);
-			const label = typeof entry.label === "string" ? entry.label.trim() : "";
-			if (label === "" || label.length > 40) {
-				diag.error(field + ".label must be a non-empty string of at most 40 chars");
-				continue;
-			}
-			const idleTrack = typeof entry.idleTrack === "string" ? entry.idleTrack : "";
-			if (!validTrackName(idleTrack) || tracks[idleTrack] === void 0) {
-				diag.error(field + ".idleTrack must name a declared frames2d track");
-				continue;
-			}
-			let clickActions;
-			if (entry.clickActions !== void 0) if (!Array.isArray(entry.clickActions) || entry.clickActions.length === 0 || entry.clickActions.length > 8) diag.error(field + ".clickActions must be an array of 1..8 actions");
-			else {
-				const resolved = [];
-				for (const [cIndex, action] of entry.clickActions.entries()) {
-					const cField = field + ".clickActions[" + cIndex + "]";
-					if (!isRecord$1(action)) {
-						diag.error(cField + " must be an object");
-						continue;
-					}
-					const cExtra = unknownKeys$1(action, KNOWN_SKIN_CLICK);
-					if (cExtra.length > 0) diag.error(cField + ": unknown field(s) " + cExtra.map((k) => JSON.stringify(k)).join(", "));
-					const trackName = typeof action.track === "string" ? action.track : "";
-					if (!validTrackName(trackName) || tracks[trackName] === void 0) {
-						diag.error(cField + ".track must name a declared frames2d track");
-						continue;
-					}
-					if (typeof action.probability !== "number" || !Number.isFinite(action.probability) || action.probability <= 0 || action.probability > 1) {
-						diag.error(cField + ".probability must be a number in (0, 1]");
-						continue;
-					}
-					const phrases = parseSkinPhrases(action.phrases, cField + ".phrases", diag);
-					resolved.push({
-						track: trackName,
-						probability: action.probability,
-						...phrases === void 0 ? {} : { phrases }
-					});
+	if (raw.skins !== void 0) {
+		if (!Array.isArray(raw.skins) || raw.skins.length === 0 || raw.skins.length > 16) diag.error("frames2d.skins must be an array of 1..16 skins");
+		else {
+			const skins = [];
+			const seen = /* @__PURE__ */ new Set();
+			for (const [index, entry] of raw.skins.entries()) {
+				const field = "frames2d.skins[" + index + "]";
+				if (!isRecord$1(entry)) {
+					diag.error(field + " must be an object");
+					continue;
 				}
-				if (resolved.length > 0) clickActions = resolved;
-			}
-			let gameplayTracks;
-			if (entry.gameplayTracks !== void 0) if (!isRecord$1(entry.gameplayTracks)) diag.error(field + ".gameplayTracks must be an object mapping gameplay state names to tracks");
-			else {
-				const states = Object.keys(entry.gameplayTracks);
-				if (states.length === 0 || states.length > 8) diag.error(field + ".gameplayTracks must map 1..8 gameplay states");
-				else {
-					const resolvedTracks = {};
-					for (const state of states) {
-						if (!/^[a-z0-9][a-z0-9-]*$/.test(state)) {
-							diag.error(field + ".gameplayTracks key " + JSON.stringify(state) + " must be a lowercase kebab state name");
-							continue;
+				const extra = unknownKeys$1(entry, KNOWN_SKIN);
+				if (extra.length > 0) diag.error(field + ": unknown field(s) " + extra.map((k) => JSON.stringify(k)).join(", "));
+				const id = typeof entry.id === "string" ? entry.id.trim() : "";
+				if (id === "" || id.length > 24 || !FRAMES2D_TRACK_NAME.test(id)) {
+					diag.error(field + ".id must be a lowercase kebab id of at most 24 chars");
+					continue;
+				}
+				if (seen.has(id)) {
+					diag.error(field + ": duplicate skin id " + JSON.stringify(id));
+					continue;
+				}
+				seen.add(id);
+				const label = typeof entry.label === "string" ? entry.label.trim() : "";
+				if (label === "" || label.length > 40) {
+					diag.error(field + ".label must be a non-empty string of at most 40 chars");
+					continue;
+				}
+				const idleTrack = typeof entry.idleTrack === "string" ? entry.idleTrack : "";
+				if (!validTrackName(idleTrack) || tracks[idleTrack] === void 0) {
+					diag.error(field + ".idleTrack must name a declared frames2d track");
+					continue;
+				}
+				let clickActions;
+				if (entry.clickActions !== void 0) {
+					if (!Array.isArray(entry.clickActions) || entry.clickActions.length === 0 || entry.clickActions.length > 8) diag.error(field + ".clickActions must be an array of 1..8 actions");
+					else {
+						const resolved = [];
+						for (const [cIndex, action] of entry.clickActions.entries()) {
+							const cField = field + ".clickActions[" + cIndex + "]";
+							if (!isRecord$1(action)) {
+								diag.error(cField + " must be an object");
+								continue;
+							}
+							const cExtra = unknownKeys$1(action, KNOWN_SKIN_CLICK);
+							if (cExtra.length > 0) diag.error(cField + ": unknown field(s) " + cExtra.map((k) => JSON.stringify(k)).join(", "));
+							const trackName = typeof action.track === "string" ? action.track : "";
+							if (!validTrackName(trackName) || tracks[trackName] === void 0) {
+								diag.error(cField + ".track must name a declared frames2d track");
+								continue;
+							}
+							if (typeof action.probability !== "number" || !Number.isFinite(action.probability) || action.probability <= 0 || action.probability > 1) {
+								diag.error(cField + ".probability must be a number in (0, 1]");
+								continue;
+							}
+							const phrases = parseSkinPhrases(action.phrases, cField + ".phrases", diag);
+							resolved.push({
+								track: trackName,
+								probability: action.probability,
+								...phrases === void 0 ? {} : { phrases }
+							});
 						}
-						const gTrack = entry.gameplayTracks[state];
-						if (typeof gTrack !== "string" || !validTrackName(gTrack) || tracks[gTrack] === void 0) {
-							diag.error(field + ".gameplayTracks[" + JSON.stringify(state) + "] must name a declared frames2d track");
-							continue;
+						if (resolved.length > 0) clickActions = resolved;
+					}
+				}
+				let gameplayTracks;
+				if (entry.gameplayTracks !== void 0) {
+					if (!isRecord$1(entry.gameplayTracks)) diag.error(field + ".gameplayTracks must be an object mapping gameplay state names to tracks");
+					else {
+						const states = Object.keys(entry.gameplayTracks);
+						if (states.length === 0 || states.length > 8) diag.error(field + ".gameplayTracks must map 1..8 gameplay states");
+						else {
+							const resolvedTracks = {};
+							for (const state of states) {
+								if (!/^[a-z0-9][a-z0-9-]*$/.test(state)) {
+									diag.error(field + ".gameplayTracks key " + JSON.stringify(state) + " must be a lowercase kebab state name");
+									continue;
+								}
+								const gTrack = entry.gameplayTracks[state];
+								if (typeof gTrack !== "string" || !validTrackName(gTrack) || tracks[gTrack] === void 0) {
+									diag.error(field + ".gameplayTracks[" + JSON.stringify(state) + "] must name a declared frames2d track");
+									continue;
+								}
+								resolvedTracks[state] = gTrack;
+							}
+							if (Object.keys(resolvedTracks).length > 0) gameplayTracks = resolvedTracks;
 						}
-						resolvedTracks[state] = gTrack;
 					}
-					if (Object.keys(resolvedTracks).length > 0) gameplayTracks = resolvedTracks;
 				}
+				skins.push({
+					id,
+					label,
+					idleTrack,
+					...clickActions === void 0 ? {} : { clickActions },
+					...gameplayTracks === void 0 ? {} : { gameplayTracks }
+				});
 			}
-			skins.push({
-				id,
-				label,
-				idleTrack,
-				...clickActions === void 0 ? {} : { clickActions },
-				...gameplayTracks === void 0 ? {} : { gameplayTracks }
-			});
+			if (skins.length > 0) block.skins = skins;
 		}
-		if (skins.length > 0) block.skins = skins;
 	}
 	return diag.hasErrors ? void 0 : block;
 }
@@ -2931,14 +3157,22 @@ function parseV2(source, diag) {
 		renderer
 	};
 	if (license !== void 0) manifest.license = license;
-	if (source.description !== void 0) if (typeof source.description !== "string" || source.description.length > 500) diag.error("description must be a string of at most 500 chars");
-	else manifest.description = source.description;
-	if (source.version !== void 0) if (typeof source.version !== "string" || !SEMVER_PATTERN.test(source.version)) diag.error("version must be a semver string (x.y.z)");
-	else manifest.version = source.version;
-	if (source.author !== void 0) if (typeof source.author !== "string" || source.author.length > 128) diag.error("author must be a string of at most 128 chars");
-	else manifest.author = source.author;
-	if (source.homepage !== void 0) if (typeof source.homepage !== "string") diag.error("homepage must be a string URL");
-	else manifest.homepage = source.homepage;
+	if (source.description !== void 0) {
+		if (typeof source.description !== "string" || source.description.length > 500) diag.error("description must be a string of at most 500 chars");
+		else manifest.description = source.description;
+	}
+	if (source.version !== void 0) {
+		if (typeof source.version !== "string" || !SEMVER_PATTERN.test(source.version)) diag.error("version must be a semver string (x.y.z)");
+		else manifest.version = source.version;
+	}
+	if (source.author !== void 0) {
+		if (typeof source.author !== "string" || source.author.length > 128) diag.error("author must be a string of at most 128 chars");
+		else manifest.author = source.author;
+	}
+	if (source.homepage !== void 0) {
+		if (typeof source.homepage !== "string") diag.error("homepage must be a string URL");
+		else manifest.homepage = source.homepage;
+	}
 	if (renderer === "sprite2d") {
 		const block = parseSprite2dBlock(source.sprite2d, diag);
 		if (block !== void 0) manifest.sprite2d = block;
@@ -2955,13 +3189,15 @@ function parseV2(source, diag) {
 		if (source.sprite2d !== void 0) diag.error("renderer frames2d must not declare a sprite2d block");
 		if (source.live2d !== void 0) diag.error("renderer frames2d must not declare a live2d block");
 	}
-	if (source.gameplay !== void 0) if (renderer !== "frames2d") diag.error("gameplay currently requires renderer frames2d (its state references name frames2d tracks)");
-	else {
-		const gameplay = parseGameplayManifest(source.gameplay, {
-			stateNames: new Set(Object.keys(manifest.frames2d?.tracks ?? {})),
-			error: (message) => diag.error("gameplay: " + message)
-		});
-		if (gameplay !== void 0) manifest.gameplay = gameplay;
+	if (source.gameplay !== void 0) {
+		if (renderer !== "frames2d") diag.error("gameplay currently requires renderer frames2d (its state references name frames2d tracks)");
+		else {
+			const gameplay = parseGameplayManifest(source.gameplay, {
+				stateNames: new Set(Object.keys(manifest.frames2d?.tracks ?? {})),
+				error: (message) => diag.error("gameplay: " + message)
+			});
+			if (gameplay !== void 0) manifest.gameplay = gameplay;
+		}
 	}
 	const sequences = parseSequences(source.sequences, diag);
 	if (sequences !== void 0) manifest.sequences = sequences;
@@ -3411,7 +3647,8 @@ function petPackageRoot(importMetaUrl) {
 /** Resolve the hatch-pet custom pets directory (CODEX_HOME or ~/.codex). */
 function codexPetsDir(env = process.env, home = homedir()) {
 	const raw = env.CODEX_HOME !== void 0 && env.CODEX_HOME.trim() !== "" ? env.CODEX_HOME.trim() : join(home, ".codex");
-	return join(raw === "~" ? home : raw.startsWith("~/") || raw.startsWith("~\\") ? join(home, raw.slice(2)) : raw, "pets");
+	const expanded = raw === "~" ? home : raw.startsWith("~/") || raw.startsWith("~\\") ? join(home, raw.slice(2)) : raw;
+	return join(expanded, "pets");
 }
 /** Finite non-negative integer guard, else the fallback. */
 function finiteInt(value, fallback, max) {
@@ -4048,7 +4285,7 @@ function readPetJson(file, options) {
 * symlink — must not hang or exhaust the host before the warn-and-drop
 * discipline can apply (review-spd follow-up, pet-center M4/M5).
 */
-const PET_SCAN_JSON_CAP = 64 * 1024;
+const PET_SCAN_JSON_CAP = 65536;
 /**
 * Stat one scanned JSON descriptor with a regular-file + size guard, so a
 * pathological user file is skipped with a warning instead of stalling or
@@ -4651,10 +4888,9 @@ var PetService = class extends Service {
 		return {
 			petId,
 			state: stored === void 0 ? initialGameplayState(def, now) : {
+				...stored,
 				stats: { ...stored.stats },
-				currencies: { ...stored.currencies },
-				mode: stored.mode,
-				settledAt: stored.settledAt
+				currencies: { ...stored.currencies }
 			}
 		};
 	}
@@ -4662,9 +4898,10 @@ var PetService = class extends Service {
 	gameplayViewOf(state) {
 		const stats = {};
 		for (const [name, value] of Object.entries(state.stats)) stats[name] = Math.round(value);
+		const def = this.gameplayDef();
 		return {
 			stats,
-			mode: state.mode
+			mode: state.mode !== null && def !== void 0 && !isDeclaredMode(def, state.mode) ? null : state.mode
 		};
 	}
 	/**
@@ -4743,7 +4980,11 @@ var PetService = class extends Service {
 			view: this.gameplayViewOf(state)
 		};
 	}
-	/** RPC: enter or leave a gameplay mode ('work' | 'sleep' | null). */
+	/**
+	* RPC: enter or leave a gameplay mode (null clears it). Every mode the
+	* manifest declares is accepted: 'work', 'sleep', or one of the extra
+	* 'modes' entries (a bath, a play session…).
+	*/
 	async gameplaySetMode(mode) {
 		const def = this.gameplayDef();
 		if (def === void 0) return {
@@ -4758,9 +4999,14 @@ var PetService = class extends Service {
 			ok: false,
 			error: "no-sleep"
 		};
+		if (mode !== null && !isDeclaredMode(def, mode)) return {
+			ok: false,
+			error: "unknown-mode"
+		};
 		const now = Date.now();
 		const { petId, state } = this.gameplayState(def, now);
 		settleGameplay(state, def, now, { sessionActive: this.machine.render().sessionActive });
+		if (state.mode !== mode) state.restoreCarryMs = 0;
 		state.mode = mode;
 		this.drainGameplayTreats(state);
 		this.commitGameplay(petId, state);
@@ -5103,7 +5349,7 @@ function isPetAllowed(ctx, request) {
 //#endregion
 //#region src/http.ts
 /** Default body cap for readJsonBody: 64 KiB. */
-const DEFAULT_JSON_BODY_MAX_BYTES = 64 * 1024;
+const DEFAULT_JSON_BODY_MAX_BYTES = 65536;
 /** Family-default JSON response headers; callers may append or override. */
 const JSON_HEADERS = {
 	"content-type": "application/json; charset=utf-8",
@@ -5186,11 +5432,11 @@ const PREVIEW_PATTERN = /^[A-Za-z0-9._-]+$/;
 */
 const PET_ASSET_CAPS = {
 	/** pet.json manifest. */
-	manifest: 64 * 1024,
+	manifest: 65536,
 	/** Atlas, preview and Live2D texture imagery. */
-	image: 20 * 1024 * 1024,
+	image: 20971520,
 	/** Live2D model closure files (.moc3, motion/physics/expression JSON; M3). */
-	model: 32 * 1024 * 1024
+	model: 33554432
 };
 /** Imagery extensions classify into the image cap; everything else served from a closure is model-class. */
 const IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -5305,7 +5551,7 @@ function postRoute(ctx, path, run) {
 		handler: (req, res) => {
 			if (!guard(ctx, req, res)) return Promise.resolve();
 			if (!requireMethod(req, res, "POST")) return Promise.resolve();
-			return readJsonBody(req, { maxBytes: 64 * 1024 }).then((parsed) => {
+			return readJsonBody(req, { maxBytes: 65536 }).then((parsed) => {
 				const payload = parsed ?? {};
 				return run(typeof payload === "object" && payload !== null ? payload : {}).then((value) => writeJson(res, 200, value), (error) => {
 					writeJson(res, 400, {
@@ -5718,7 +5964,7 @@ function makePetRoutes(deps) {
 		}),
 		postRoute(ctx, "/api/pet/gameplay/mode", (body) => {
 			const mode = body.mode;
-			if (mode !== null && mode !== "work" && mode !== "sleep") return Promise.reject(/* @__PURE__ */ new Error("invalid-mode"));
+			if (mode !== null && typeof mode !== "string") return Promise.reject(/* @__PURE__ */ new Error("invalid-mode"));
 			return service.gameplaySetMode(mode);
 		}),
 		postRoute(ctx, "/api/pet/gameplay/work-tick", () => service.gameplayWorkTick()),
@@ -5801,24 +6047,77 @@ const name = "pet";
 /** Services required before the pet can mount its surfaces. */
 const inject = ["webServer"];
 /**
-* Settings section schema: pet selection and display fields the web settings
-* surface edits. petId is a plain string on purpose: the service clamps the
-* resolved value against the registry, so a stored selection that points at
-* a removed pet cannot invalidate the section (a strict union would refuse
-* the whole registration). The settings card renders the actual registry
-* choices itself from '/api/pet/pets'.
+* Defaults of the fields the pet's settings page edits. They are the schema
+* defaults of the pet row's own config, i.e. what a field the profile entry
+* never set resolves to.
 */
-function makePetSettingsSchema(fallbackPetId) {
-	return z.object({
-		visible: z.boolean().default(true),
-		size: z.number().step(1).min(32).max(DISPLAY_SIZE_MAX).default(160),
-		right: z.number().step(1).min(0).max(DISPLAY_INSET_MAX).default(24),
-		bottom: z.number().step(1).min(0).max(DISPLAY_INSET_MAX).default(20),
-		bubbleScale: z.number().step(.05).min(BUBBLE_SCALE_MIN).max(2).default(1),
-		petId: z.string().default(fallbackPetId),
-		enabled: z.boolean().default(true),
-		decorationEnabled: z.boolean().default(true)
-	});
+const PET_FORM_DEFAULTS = {
+	visible: true,
+	size: 160,
+	right: 24,
+	bottom: 20,
+	bubbleScale: 1,
+	petId: DEFAULT_PET_ID,
+	enabled: true,
+	decorationEnabled: true
+};
+/**
+* Plugin configuration. Under the 0.1.7 settings model a plugin's own Cordis
+* Config IS its settings page: the Host derives one form per profile entry
+* from this schema, so the fields the pet card edits live here with the
+* defaults the card inherits, next to the tuning block a profile may still
+* declare.
+*
+* Every page field is `volatile()` on purpose. The Host serves exactly the
+* volatile fields of a Config and refuses writes to any other path, and a
+* volatile field is the one it can commit into the RUNNING config: the pet
+* reads the edited value from the live reference instead of being remounted
+* for each edit (see `syncSettings` in `apply`). petId stays a plain string
+* because the service clamps the value against the registry, so a stored
+* selection naming a removed pet cannot invalidate the entry.
+*/
+const Config = z.object({
+	visible: z.boolean().default(PET_FORM_DEFAULTS.visible).volatile(),
+	size: z.number().step(1).min(32).max(DISPLAY_SIZE_MAX).default(PET_FORM_DEFAULTS.size).volatile(),
+	right: z.number().step(1).min(0).max(DISPLAY_INSET_MAX).default(PET_FORM_DEFAULTS.right).volatile(),
+	bottom: z.number().step(1).min(0).max(DISPLAY_INSET_MAX).default(PET_FORM_DEFAULTS.bottom).volatile(),
+	bubbleScale: z.number().step(.05).min(BUBBLE_SCALE_MIN).max(2).default(PET_FORM_DEFAULTS.bubbleScale).volatile(),
+	petId: z.string().volatile(),
+	enabled: z.boolean().default(PET_FORM_DEFAULTS.enabled).volatile(),
+	decorationEnabled: z.boolean().default(PET_FORM_DEFAULTS.decorationEnabled).volatile()
+});
+/**
+* Read one live config field.
+* @param field - the field's live reference, plain value, or nothing at all.
+* @param fallback - value used when the field is absent.
+* @returns the current field value.
+*/
+function readLive(field, fallback) {
+	if (field === void 0) return fallback;
+	const ref = field;
+	return typeof ref.get === "function" ? ref.get() ?? fallback : field;
+}
+/**
+* The settings section the pet runs with: the effective values of the row's
+* own config. `fallbackPetId` covers a mount whose config names no pet at all
+* (a direct mount outside a Loader) — under a Loader the schema default is
+* always present, so the persisted selection stands whenever the config
+* carries it.
+* @param config - the effective config of the pet row.
+* @param fallbackPetId - pet id to use when the config names none.
+* @returns the resolved settings section.
+*/
+function petSettingsSection(config, fallbackPetId) {
+	return {
+		visible: readLive(config.visible, PET_FORM_DEFAULTS.visible),
+		size: readLive(config.size, PET_FORM_DEFAULTS.size),
+		right: readLive(config.right, PET_FORM_DEFAULTS.right),
+		bottom: readLive(config.bottom, PET_FORM_DEFAULTS.bottom),
+		bubbleScale: readLive(config.bubbleScale, PET_FORM_DEFAULTS.bubbleScale),
+		petId: readLive(config.petId, fallbackPetId),
+		enabled: readLive(config.enabled, PET_FORM_DEFAULTS.enabled),
+		decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled)
+	};
 }
 /** Register the pet service and its API + asset routes on the context. */
 const apply = mountOnce("@linxin666/dsh-pet", applyImpl);
@@ -5829,18 +6128,11 @@ function applyImpl(ctx, config = {}) {
 	});
 	const service = new PetService(ctx, {
 		...config,
+		enabled: readLive(config.enabled, PET_FORM_DEFAULTS.enabled),
+		decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
 		registry
 	});
-	let current = () => base;
-	const base = {
-		visible: service.display().visible,
-		size: service.display().size,
-		right: service.display().right,
-		bottom: service.display().bottom,
-		petId: service.selectedPetId(),
-		enabled: config.enabled ?? true,
-		decorationEnabled: config.decorationEnabled ?? true
-	};
+	const current = () => petSettingsSection(config, service.selectedPetId());
 	const routes = makePetRoutes({
 		service,
 		ctx
@@ -5859,33 +6151,25 @@ function applyImpl(ctx, config = {}) {
 			disposeRoutes = void 0;
 		}
 	};
+	const syncSettings = () => {
+		const section = current();
+		service.applySettingsSection(section);
+		service.setEnabled(section.enabled ?? true);
+		syncRoutes();
+	};
+	ctx.on("loader/volatile-update", () => {
+		syncSettings();
+	});
 	ctx.inject(["settings"], (settingsCtx) => {
-		try {
-			const schema = makePetSettingsSchema(service.selectedPetId());
-			if (typeof settingsCtx.settings?.installSection === "function") settingsCtx.settings.installSection(ctx, "pet", schema, base, {
-				setSource: (source) => {
-					current = source;
-				},
-				onChange: () => {
-					const section = current();
-					service.applySettingsSection(section);
-					service.setEnabled(section.enabled ?? true);
-					syncRoutes();
-				}
-			});
-			else if (typeof settingsCtx.settings?.register === "function") {
-				const scope = settingsCtx.settings.register("pet", schema, { base });
-				current = () => scope?.get?.() ?? base;
-				scope?.watch?.(() => {
-					const section = current();
-					service.applySettingsSection(section);
-					service.setEnabled(section.enabled ?? true);
-					syncRoutes();
-				});
+		settingsCtx.effect(() => {
+			try {
+				return settingsCtx.settings.configure({ auto: false }, ctx.fiber);
+			} catch {
+				return () => {};
 			}
-		} catch {}
+		}, "pet: settings page policy");
 	});
-	syncRoutes();
+	syncSettings();
 }
 //#endregion
-export { AFFINITY_MAX, AFFINITY_RANKS, BUILTIN_REMARKS, DEFAULT_FRAME_COUNTS, DEFAULT_PET_CELL, DEFAULT_PET_COLUMNS, DEFAULT_PET_ID, DEFAULT_PET_NAME, DEFAULT_PET_ROW_COUNT, DEFAULT_TRACK_PATTERNS, MAX_SESSION_BUBBLES, PET_API_PREFIX, PET_ASSET_PREFIX, PET_NAME_MAX_LENGTH, PET_ROW_ORDER, PetService, PetStateMachine, REMARK_KINDS, REMARK_LINES_MAX, REMARK_LINE_MAX, RemarkPicker, animationForPhase, apply, applyInteraction, applyTurnReward, builtinRemark, codexPetsDir, consumeTreat, defaultDisplayConfig, defaultTreatConfig, emptyAffinity, emptyPersist, emptyTreatLedger, inject, loadPetPersist, loadPetRegistry, makePetRoutes, makePetSettingsSchema, name, normalizePetRemarks, petEntryView, petHomeDir, petPackageRoot, rankOf, resolvePetManifest, rowOf, savePetPersist, settleTreatGrants };
+export { AFFINITY_MAX, AFFINITY_RANKS, BUILTIN_REMARKS, Config, DEFAULT_FRAME_COUNTS, DEFAULT_PET_CELL, DEFAULT_PET_COLUMNS, DEFAULT_PET_ID, DEFAULT_PET_NAME, DEFAULT_PET_ROW_COUNT, DEFAULT_TRACK_PATTERNS, MAX_SESSION_BUBBLES, PET_API_PREFIX, PET_ASSET_PREFIX, PET_FORM_DEFAULTS, PET_NAME_MAX_LENGTH, PET_ROW_ORDER, PetService, PetStateMachine, REMARK_KINDS, REMARK_LINES_MAX, REMARK_LINE_MAX, RemarkPicker, animationForPhase, apply, applyInteraction, applyTurnReward, builtinRemark, codexPetsDir, consumeTreat, defaultDisplayConfig, defaultTreatConfig, emptyAffinity, emptyPersist, emptyTreatLedger, inject, loadPetPersist, loadPetRegistry, makePetRoutes, name, normalizePetRemarks, petEntryView, petHomeDir, petPackageRoot, petSettingsSection, rankOf, resolvePetManifest, rowOf, savePetPersist, settleTreatGrants };