@linxin666/dsh-pet 0.4.3 → 0.4.4

package/lib/client.js

@@ -4132,7 +4132,7 @@ window.__ModuleLoader__.load({
 		/** The building package's version, when the bundle carries it. */
 		function bakedVersion() {
 			try {
-				return "0.4.3";
+				return "0.4.4";
 			} catch {
 				return;
 			}

package/lib/index.js

@@ -4638,6 +4638,15 @@ var PetService = class extends Service {
 	* the same turn again after the pet is disabled and re-enabled.
 	*/
 	officialEventSessions = /* @__PURE__ */ new WeakSet();
+	/**
+	* Resolve the settings namespace this plugin's own config is served as, when
+	* the caller can read it off the composition. A plugin's settings ARE its own
+	* config, so the namespace is the row's id — and an aggregate bundle renames
+	* child rows (`pet` becomes `web-ui-pet`), which is why it cannot be assumed
+	* to be {@link PET_SETTINGS_NAMESPACE}. `apply` sets this; absent means the
+	* plugin runs outside a Loader and the package's own id stands.
+	*/
+	settingsNamespaceProvider = void 0;
 	constructor(ctx, config = {}) {
 		super(ctx, "pet");
 		this.persistDir = config.persistDir ?? petHomeDir();
@@ -5194,8 +5203,9 @@ var PetService = class extends Service {
 	syncSettingsFromPet() {
 		const settings = this.ctx.get("settings", false);
 		if (settings === void 0) return;
+		const ns = this.settingsNamespaceProvider?.() ?? "pet";
 		const snapshot = this.ledger.snapshot;
-		settings.update("pet", {
+		settings.update(ns, {
 			visible: snapshot.display.visible,
 			size: snapshot.display.size,
 			right: snapshot.display.right,
@@ -6171,27 +6181,91 @@ function readLive(field, fallback) {
 	return typeof ref.get === "function" ? ref.get() ?? fallback : field;
 }
 /**
+* Resolve one display field of the section. The precedence is deliberate:
+*
+* 1. an explicit profile value (`committed`) — the user's own choice, and the
+*    only signal that carries a value equal to the schema default on purpose;
+* 2. a live value the row committed at runtime, i.e. one that differs from the
+*    schema default, which is all an untouched field ever resolves to;
+* 3. what the pet's own `pet.json` already holds (`persisted`), so a field the
+*    profile never touched keeps the position the user dragged instead of
+*    snapping back to the schema default on the next mount.
+*
+* Step 3 is what makes a drag survive a restart. The display fields carry
+* schema defaults (`right: 24`, `bottom: 20` — the bottom-right corner), and a
+* config that never set them reads back exactly like one that set them to the
+* defaults, so without `persisted` the startup section resets the layout every
+* time the profile commits none — which is what an aggregate install does.
+* @param key - the display field to resolve.
+* @param live - the row config's own field, absent when the entry declares none.
+* @param persisted - the display the pet already shows (its own `pet.json`).
+* @param committed - the profile layer's explicit display values, when known.
+* @returns the value the pet runs with.
+*/
+function displayField(key, live, persisted, committed) {
+	const explicit = committed[key];
+	if (explicit !== void 0) return explicit;
+	const value = readLive(live, PET_FORM_DEFAULTS[key]);
+	if (value !== PET_FORM_DEFAULTS[key]) return value;
+	const kept = persisted[key];
+	return kept === void 0 ? value : kept;
+}
+/**
 * 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.
+* carries it. `persisted` and `committed` give the display fields the same
+* treatment; see {@link displayField}.
 * @param config - the effective config of the pet row.
 * @param fallbackPetId - pet id to use when the config names none.
+* @param persisted - the display the pet already shows (its own `pet.json`).
+* @param committed - the profile layer's explicit display values, when known.
 * @returns the resolved settings section.
 */
-function petSettingsSection(config, fallbackPetId) {
+function petSettingsSection(config, fallbackPetId, persisted = {}, committed = {}) {
 	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),
+		visible: displayField("visible", config.visible, persisted, committed),
+		size: displayField("size", config.size, persisted, committed),
+		right: displayField("right", config.right, persisted, committed),
+		bottom: displayField("bottom", config.bottom, persisted, committed),
+		bubbleScale: displayField("bubbleScale", config.bubbleScale, persisted, committed),
 		petId: readLive(config.petId, fallbackPetId),
 		enabled: readLive(config.enabled, PET_FORM_DEFAULTS.enabled),
 		decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled)
 	};
 }
+/** The settings row ids a pet install is served under, most specific first. */
+const PET_SETTINGS_ROW_IDS = [
+	"web-ui-pet",
+	"ui-pet",
+	"pet"
+];
+/**
+* The settings row serving this plugin's own config, or undefined when the
+* settings service is not mounted (a direct mount) or serves no row for the pet.
+*
+* Every settings write has to address this row's id, and that id is not the
+* package's plugin name: an aggregate bundle renames child rows (`pet` becomes
+* `web-ui-pet`). The browser half resolves the same id through its own
+* `servedEntryId`, so both halves write to one namespace.
+* @param ctx - the plugin's context.
+* @returns the serving row, when there is one.
+*/
+function servedRow(ctx) {
+	try {
+		const settings = ctx.get("settings", false);
+		if (settings === void 0) return void 0;
+		const rows = settings.describe();
+		for (const id of PET_SETTINGS_ROW_IDS) {
+			const row = rows.find((candidate) => candidate.ns === id);
+			if (row !== void 0) return row;
+		}
+		return;
+	} catch {
+		return;
+	}
+}
 /** Register the pet service and its API + asset routes on the context. */
 const apply = mountOnce("@linxin666/dsh-pet", applyImpl);
 function applyImpl(ctx, config = {}) {
@@ -6205,7 +6279,8 @@ function applyImpl(ctx, config = {}) {
 		decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
 		registry
 	});
-	const current = () => petSettingsSection(config, service.selectedPetId());
+	service.settingsNamespaceProvider = () => servedRow(ctx)?.ns;
+	const current = () => petSettingsSection(config, service.selectedPetId(), service.display(), servedRow(ctx)?.user);
 	const routes = makePetRoutes({
 		service,
 		ctx

package/lib/types/index.d.ts

@@ -13,6 +13,7 @@
 import { Context, type Volatile } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
 import { type PetConfig, type PetSettingsSection } from './service.ts';
+import { type PetDisplayConfig } from './persist.ts';
 export { PetService, MAX_SESSION_BUBBLES } from './service.ts';
 export type { PetConfig, PetInteractResult, PetSettingsSection, PetSessionView, PetStateView, } from './service.ts';
 export { AFFINITY_MAX, AFFINITY_RANKS, applyInteraction, applyTurnReward, emptyAffinity, rankOf, } from './affinity.ts';
@@ -112,12 +113,15 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
  * 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.
+ * carries it. `persisted` and `committed` give the display fields the same
+ * treatment; see {@link displayField}.
  * @param config - the effective config of the pet row.
  * @param fallbackPetId - pet id to use when the config names none.
+ * @param persisted - the display the pet already shows (its own `pet.json`).
+ * @param committed - the profile layer's explicit display values, when known.
  * @returns the resolved settings section.
  */
-export declare function petSettingsSection(config: PetFormConfig, fallbackPetId: string): PetSettingsSection;
+export declare function petSettingsSection(config: PetFormConfig, fallbackPetId: string, persisted?: Partial<PetDisplayConfig>, committed?: Partial<PetDisplayConfig>): PetSettingsSection;
 /** Register the pet service and its API + asset routes on the context. */
 export declare const apply: typeof applyImpl;
 /** Plugin config: the tuning block a profile may declare plus the pet's settings fields. */

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAI5D,OAAO,CAAC,MAAM,0BAA0B,CAAA;AACxC,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAMlF,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAC9D,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,YAAY,GACb,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,MAAM,GACP,MAAM,eAAe,CAAA;AACtB,YAAY,EACV,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,cAAc,GACf,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,KAAK,GACN,MAAM,YAAY,CAAA;AACnB,YAAY,EACV,aAAa,EACb,YAAY,EACZ,cAAc,EACd,aAAa,EACb,gBAAgB,GACjB,MAAM,YAAY,CAAA;AACnB,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,aAAa,CAAA;AACpB,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC5E,OAAO,EACL,eAAe,EACf,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,mBAAmB,GACpB,MAAM,cAAc,CAAA;AACrB,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9E,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,EACZ,cAAc,EACd,UAAU,EACV,cAAc,GACf,MAAM,cAAc,CAAA;AACrB,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAChE,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,aAAa,EACb,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,cAAc,EACd,kBAAkB,GACnB,MAAM,eAAe,CAAA;AACtB,YAAY,EACV,aAAa,EACb,QAAQ,EACR,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,gBAAgB,GACjB,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,aAAa,EACb,cAAc,EACd,gBAAgB,GACjB,MAAM,aAAa,CAAA;AAEpB,sEAAsE;AACtE,eAAO,MAAM,IAAI,QAAQ,CAAA;AAEzB,+DAA+D;AAC/D,eAAO,MAAM,MAAM,UAAgB,CAAA;AAEnC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;CASpB,CAAA;AAEV;;;;;GAKG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAE1C,4EAA4E;AAC5E,MAAM,WAAW,aAAa;IAC5B,iEAAiE;IACjE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC5B,6EAA6E;IAC7E,iBAAiB,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IACtC,yCAAyC;IACzC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC5B,4DAA4D;IAC5D,IAAI,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IACxB,yDAAyD;IACzD,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IACzB,wDAAwD;IACxD,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IAC1B,4EAA4E;IAC5E,WAAW,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IAC/B,2EAA2E;IAC3E,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACtC;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;aAWjB,CAAA;AAcF;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,kBAAkB,CAWnG;AAED,0EAA0E;AAC1E,eAAO,MAAM,KAAK,kBAA6C,CAAA;AAE/D,4FAA4F;AAC5F,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,mBAAmB,CAAC,GAAG,aAAa,CAAA;AAE9F,iBAAS,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,eAAoB,GAAG,IAAI,CAsEnE;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,MAAM;QACd;;;;WAIG;QACH,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;KACtE;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/lib/types/index.js

@@ -11,7 +11,7 @@
  * @module @linxin666/dsh-pet
  */
 import z from '@deepseek-ai/schemastery';
-import { PetService } from "./service.js";
+import { PET_SETTINGS_NAMESPACE, PetService } from "./service.js";
 import { makePetRoutes } from "./routes.js";
 import { loadPetRegistry, petPackageRoot } from "./registry.js";
 import { BUBBLE_SCALE_MAX, BUBBLE_SCALE_MIN, DEFAULT_PET_ID, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN } from "./persist.js";
@@ -82,28 +82,93 @@ function readLive(field, fallback) {
     const ref = field;
     return typeof ref.get === 'function' ? ref.get() ?? fallback : field;
 }
+/**
+ * Resolve one display field of the section. The precedence is deliberate:
+ *
+ * 1. an explicit profile value (`committed`) — the user's own choice, and the
+ *    only signal that carries a value equal to the schema default on purpose;
+ * 2. a live value the row committed at runtime, i.e. one that differs from the
+ *    schema default, which is all an untouched field ever resolves to;
+ * 3. what the pet's own `pet.json` already holds (`persisted`), so a field the
+ *    profile never touched keeps the position the user dragged instead of
+ *    snapping back to the schema default on the next mount.
+ *
+ * Step 3 is what makes a drag survive a restart. The display fields carry
+ * schema defaults (`right: 24`, `bottom: 20` — the bottom-right corner), and a
+ * config that never set them reads back exactly like one that set them to the
+ * defaults, so without `persisted` the startup section resets the layout every
+ * time the profile commits none — which is what an aggregate install does.
+ * @param key - the display field to resolve.
+ * @param live - the row config's own field, absent when the entry declares none.
+ * @param persisted - the display the pet already shows (its own `pet.json`).
+ * @param committed - the profile layer's explicit display values, when known.
+ * @returns the value the pet runs with.
+ */
+function displayField(key, live, persisted, committed) {
+    const explicit = committed[key];
+    if (explicit !== undefined)
+        return explicit;
+    const value = readLive(live, PET_FORM_DEFAULTS[key]);
+    if (value !== PET_FORM_DEFAULTS[key])
+        return value;
+    const kept = persisted[key];
+    return kept === undefined ? value : kept;
+}
 /**
  * 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.
+ * carries it. `persisted` and `committed` give the display fields the same
+ * treatment; see {@link displayField}.
  * @param config - the effective config of the pet row.
  * @param fallbackPetId - pet id to use when the config names none.
+ * @param persisted - the display the pet already shows (its own `pet.json`).
+ * @param committed - the profile layer's explicit display values, when known.
  * @returns the resolved settings section.
  */
-export function petSettingsSection(config, fallbackPetId) {
+export function petSettingsSection(config, fallbackPetId, persisted = {}, committed = {}) {
     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),
+        visible: displayField('visible', config.visible, persisted, committed),
+        size: displayField('size', config.size, persisted, committed),
+        right: displayField('right', config.right, persisted, committed),
+        bottom: displayField('bottom', config.bottom, persisted, committed),
+        bubbleScale: displayField('bubbleScale', config.bubbleScale, persisted, committed),
         petId: readLive(config.petId, fallbackPetId),
         enabled: readLive(config.enabled, PET_FORM_DEFAULTS.enabled),
         decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
     };
 }
+/** The settings row ids a pet install is served under, most specific first. */
+const PET_SETTINGS_ROW_IDS = ['web-ui-pet', 'ui-pet', PET_SETTINGS_NAMESPACE];
+/**
+ * The settings row serving this plugin's own config, or undefined when the
+ * settings service is not mounted (a direct mount) or serves no row for the pet.
+ *
+ * Every settings write has to address this row's id, and that id is not the
+ * package's plugin name: an aggregate bundle renames child rows (`pet` becomes
+ * `web-ui-pet`). The browser half resolves the same id through its own
+ * `servedEntryId`, so both halves write to one namespace.
+ * @param ctx - the plugin's context.
+ * @returns the serving row, when there is one.
+ */
+function servedRow(ctx) {
+    try {
+        const settings = ctx.get('settings', false);
+        if (settings === undefined)
+            return undefined;
+        const rows = settings.describe();
+        for (const id of PET_SETTINGS_ROW_IDS) {
+            const row = rows.find(candidate => candidate.ns === id);
+            if (row !== undefined)
+                return row;
+        }
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** Register the pet service and its API + asset routes on the context. */
 export const apply = mountOnce('@linxin666/dsh-pet', applyImpl);
 function applyImpl(ctx, config = {}) {
@@ -118,12 +183,19 @@ function applyImpl(ctx, config = {}) {
         decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
         registry,
     });
+    // The mirror back into the settings document (see syncSettingsFromPet) has to
+    // address the row that serves this plugin's config, which an aggregate bundle
+    // renames; the id is resolved lazily, once the composition serves it.
+    service.settingsNamespaceProvider = () => servedRow(ctx)?.ns;
     // The effective settings ARE this row's own config: the Host serves one form
     // per profile entry from `Config` above, and every edit is committed into the
     // running config, so the plugin re-reads the section here instead of holding
     // a separate settings document (0.1.6 registered one through
-    // settings.installSection/register and re-resolved it on every change).
-    const current = () => petSettingsSection(config, service.selectedPetId());
+    // settings.installSection/register and re-resolved it on every change). The
+    // display fields additionally read the persisted layout and the profile layer,
+    // so a mount with a config that never set them cannot reset a dragged
+    // position to the schema defaults (see displayField).
+    const current = () => petSettingsSection(config, service.selectedPetId(), service.display(), servedRow(ctx)?.user);
     // The browser half talks to the pet through same-origin JSON endpoints and
     // loads each pet's atlas from the registry's own media route (RPC domains
     // are platform-registered, so the pet serves its own API — the same

package/lib/types/service.d.ts

@@ -222,6 +222,15 @@ export declare class PetService extends Service {
      * the same turn again after the pet is disabled and re-enabled.
      */
     private readonly officialEventSessions;
+    /**
+     * Resolve the settings namespace this plugin's own config is served as, when
+     * the caller can read it off the composition. A plugin's settings ARE its own
+     * config, so the namespace is the row's id — and an aggregate bundle renames
+     * child rows (`pet` becomes `web-ui-pet`), which is why it cannot be assumed
+     * to be {@link PET_SETTINGS_NAMESPACE}. `apply` sets this; absent means the
+     * plugin runs outside a Loader and the package's own id stands.
+     */
+    settingsNamespaceProvider: (() => string | undefined) | undefined;
     constructor(ctx: Context, config?: PetConfig);
     /**
      * The draw-time voice-pool provider handed to every projection runtime.

package/lib/types/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACpF,OAAO,EAAwC,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAC1F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,EAAgC,KAAK,uBAAuB,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,EAWL,KAAK,gBAAgB,EACtB,MAAM,cAAc,CAAA;AACrB,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,qBAAqB,EAC3B,MAAM,eAAe,CAAA;AAGtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAA;AAgBnB,4BAA4B;AAC5B,MAAM,WAAW,SAAS;IACxB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAClC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC/B,4BAA4B;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC7B,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iEAAiE;IACjE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,6EAA6E;IAC7E,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,oEAAoE;IACpE,IAAI,CAAC,EAAE,SAAS,WAAW,EAAE,CAAA;CAC9B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC,2EAA2E;IAC3E,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,qBAAqB;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAA;IACb,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAA;IACd,kEAAkE;IAClE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iEAAiE;IACjE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B;AAED,2HAA2H;AAC3H,eAAO,MAAM,sBAAsB,QAAQ,CAAA;AAE3C;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,SAAS,EAAE,MAAM,CAAA;IACjB,uDAAuD;IACvD,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACxC,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,yCAAyC;IACzC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAChC,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,gFAAgF;AAChF,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,wCAAwC;AACxC,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACxC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAA;IAC3B,gCAAgC;IAChC,QAAQ,EAAE,eAAe,CAAA;IACzB,6BAA6B;IAC7B,OAAO,EAAE,gBAAgB,CAAA;IACzB,4CAA4C;IAC5C,GAAG,EAAE;QACH,mBAAmB;QACnB,EAAE,EAAE,MAAM,CAAA;QACV,iDAAiD;QACjD,WAAW,EAAE,MAAM,CAAA;QACnB,4BAA4B;QAC5B,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,kCAAkC;IAClC,MAAM,EAAE;QACN,0BAA0B;QAC1B,OAAO,EAAE,MAAM,CAAA;QACf,iBAAiB;QACjB,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD;;;;OAIG;IACH,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,oBAAoB,CAAA;IAC/B;;;;OAIG;IACH,YAAY,CAAC,EAAE,eAAe,CAAA;CAC/B;AAED,gCAAgC;AAChC,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAA;AAEvD,+FAA+F;AAC/F,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,yEAAyE;IACzE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB;AAED,uEAAuE;AACvE,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,OAAO,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,0DAA0D;IAC1D,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,yBAAyB;IACzB,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC5B,mEAAmE;IACnE,KAAK,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C,IAAI,CAAC,EAAE,oBAAoB,CAAA;CAC5B;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,GAAG,EAAE,UAAU,CAAA;KAChB;CACF;AAgBD;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,OAAO;IACrC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAK;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,OAAO,CAAS;IACxB,0EAA0E;IAC1E,OAAO,CAAC,iBAAiB,CAAS;IAClC,qEAAqE;IACrE,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,eAAe,CAA0B;IACjD,kFAAkF;IAClF,OAAO,CAAC,cAAc,CAAqB;IAC3C;;;;OAIG;IACH,OAAO,CAAC,UAAU,CAA8D;IAChF;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;IACtE;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAyB;IAC/D;;;;;;;OAOG;IACH,yBAAyB,EAAE,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CAAY;gBAEjE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,SAAc;IAkChD;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAYlB,uEAAuE;IACvE,SAAS,IAAI,OAAO;IAIpB,uCAAuC;IACjC,KAAK,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI7D;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE;IAOzC,yDAAyD;IACzD,OAAO,IAAI,gBAAgB;IAI3B,2EAA2E;IACrE,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAItC,gEAAgE;IAChE,gBAAgB,IAAI,WAAW;IAI/B,wEAAwE;IAClE,WAAW,IAAI,OAAO,CAAC;QAAE,WAAW,EAAE,qBAAqB,EAAE,CAAA;KAAE,CAAC;IAItE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAMxB,yCAAyC;IACzC,WAAW,IAAI,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;IAI1D,6CAA6C;IAC7C,aAAa,IAAI,MAAM;IAIvB,yEAAyE;IACzE,OAAO,CAAC,KAAK,GAAE,MAA6B,GAAG,MAAM;IAMrD,4EAA4E;IACtE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAWlG,uEAAuE;IACvE,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAMlC,OAAO,CAAC,YAAY;IAuEpB,uGAAuG;IACvG,OAAO,CAAC,aAAa;IAMrB,0EAA0E;IAC1E,OAAO,CAAC,UAAU;IAclB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAqBrB,gCAAgC;IAC1B,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAahE,2DAA2D;IAC3D,OAAO,CAAC,WAAW;IAInB,mEAAmE;IACnE,OAAO,CAAC,aAAa;IAgBrB,+FAA+F;IAC/F,OAAO,CAAC,cAAc;IAatB;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAM3B,2DAA2D;IAC3D,OAAO,CAAC,cAAc;IAKtB;;;OAGG;IACG,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAuClE;;;;OAIG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAkB1E,yEAAyE;IACnE,gBAAgB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAexD,0EAA0E;IACpE,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAiCjE,iCAAiC;IAC3B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE,CAAC;IAOpF;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAMrB;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAc5G,6GAA6G;IACvG,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE,CAAC;IAYnG,2EAA2E;IACrE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAS/F;;;;;OAKG;IACH,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAqBvD,oFAAoF;IACpF,OAAO,CAAC,mBAAmB;IAgB3B,qFAAqF;IACrF,OAAO,CAAC,UAAU;IAIlB,8EAA8E;IAC9E,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,IAAI;IAkFZ,OAAO,CAAC,KAAK;CAOd"}

package/lib/types/service.js

@@ -66,6 +66,15 @@ export class PetService extends Service {
      * the same turn again after the pet is disabled and re-enabled.
      */
     officialEventSessions = new WeakSet();
+    /**
+     * Resolve the settings namespace this plugin's own config is served as, when
+     * the caller can read it off the composition. A plugin's settings ARE its own
+     * config, so the namespace is the row's id — and an aggregate bundle renames
+     * child rows (`pet` becomes `web-ui-pet`), which is why it cannot be assumed
+     * to be {@link PET_SETTINGS_NAMESPACE}. `apply` sets this; absent means the
+     * plugin runs outside a Loader and the package's own id stands.
+     */
+    settingsNamespaceProvider = undefined;
     constructor(ctx, config = {}) {
         super(ctx, 'pet');
         this.persistDir = config.persistDir ?? petHomeDir();
@@ -609,8 +618,9 @@ export class PetService extends Service {
         const settings = this.ctx.get('settings', false);
         if (settings === undefined)
             return;
+        const ns = this.settingsNamespaceProvider?.() ?? PET_SETTINGS_NAMESPACE;
         const snapshot = this.ledger.snapshot;
-        void settings.update(PET_SETTINGS_NAMESPACE, {
+        void settings.update(ns, {
             visible: snapshot.display.visible,
             size: snapshot.display.size,
             right: snapshot.display.right,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-pet",
   "description": "Multi-pet companion plugin for the dsh web GUI: a registry-driven floating pet that reacts to model activity, with per-pet naming, petting/feeding interactions and an affinity score",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "publishConfig": {
     "access": "public"
   },

package/src/index.test.ts

@@ -117,3 +117,42 @@ describe('petSettingsSection', () => {
     expect(section.petId).toBe('doro')
   })
 })
+
+describe('petSettingsSection display persistence', () => {
+  /** The layout a user dragged the pet to, as its own pet.json holds it. */
+  const dragged = { visible: true, size: 160, right: 1428, bottom: 167, bubbleScale: 1 }
+
+  it('user keeps the dragged position when the profile never committed one', () => {
+    // Given a pet.json holding the layout the pet was dragged to
+    // And a row config that never set the display fields, so they read back as
+    // the schema defaults (the bottom-right corner)
+    // When the plugin starts and resolves its active settings
+    const section = petSettingsSection(Config({}), 'ouo-neko', dragged)
+    // Then the dragged layout stands instead of snapping back to those defaults
+    expect(section).toMatchObject({ right: 1428, bottom: 167 })
+  })
+
+  it('user commits a display field and the profile value outranks the persisted one', () => {
+    // Given a dragged layout and a profile layer that committed a right inset
+    const section = petSettingsSection(Config({}), 'ouo-neko', dragged, { right: 48 })
+    // Then the explicit choice wins and the untouched field keeps the dragged one
+    expect(section).toMatchObject({ right: 48, bottom: 167 })
+  })
+
+  it('user commits the schema default and the choice is not mistaken for unset', () => {
+    // Given a dragged layout and a profile layer that committed the default inset
+    const section = petSettingsSection(Config({}), 'ouo-neko', dragged, { right: 24 })
+    // Then the explicit (default-valued) choice stands over the persisted one
+    expect(section.right).toBe(24)
+  })
+
+  it('user commits a layout at runtime and the result outranks the persisted one', () => {
+    // Given a live reference the Host committed into the running config
+    const resolved = Config({})
+    commitLive(resolved.right, 500)
+    // When the plugin resolves the section against an older persisted layout
+    const section = petSettingsSection(resolved, 'ouo-neko', dragged)
+    // Then the live commit wins and the persisted value fills the other fields
+    expect(section).toMatchObject({ right: 500, bottom: 167 })
+  })
+})

package/src/index.ts

@@ -16,10 +16,10 @@ import { Context, type Volatile } from '@deepseek-ai/cordis'
 import type {} from '@deepseek-ai/dsh-settings'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import z from '@deepseek-ai/schemastery'
-import { PetService, type PetConfig, type PetSettingsSection } from './service.ts'
+import { PET_SETTINGS_NAMESPACE, PetService, type PetConfig, type PetSettingsSection } from './service.ts'
 import { makePetRoutes } from './routes.ts'
 import { loadPetRegistry, petPackageRoot } from './registry.ts'
-import { BUBBLE_SCALE_MAX, BUBBLE_SCALE_MIN, DEFAULT_PET_ID, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN } from './persist.ts'
+import { BUBBLE_SCALE_MAX, BUBBLE_SCALE_MIN, DEFAULT_PET_ID, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN, type PetDisplayConfig } from './persist.ts'
 import { mountOnce } from './mount-once.ts'
 
 export { PetService, MAX_SESSION_BUBBLES } from './service.ts'
@@ -203,29 +203,115 @@ function readLive<T>(field: LiveField<T> | undefined, fallback: T): T {
   return typeof ref.get === 'function' ? ref.get() ?? fallback : field as T
 }
 
+/**
+ * Resolve one display field of the section. The precedence is deliberate:
+ *
+ * 1. an explicit profile value (`committed`) — the user's own choice, and the
+ *    only signal that carries a value equal to the schema default on purpose;
+ * 2. a live value the row committed at runtime, i.e. one that differs from the
+ *    schema default, which is all an untouched field ever resolves to;
+ * 3. what the pet's own `pet.json` already holds (`persisted`), so a field the
+ *    profile never touched keeps the position the user dragged instead of
+ *    snapping back to the schema default on the next mount.
+ *
+ * Step 3 is what makes a drag survive a restart. The display fields carry
+ * schema defaults (`right: 24`, `bottom: 20` — the bottom-right corner), and a
+ * config that never set them reads back exactly like one that set them to the
+ * defaults, so without `persisted` the startup section resets the layout every
+ * time the profile commits none — which is what an aggregate install does.
+ * @param key - the display field to resolve.
+ * @param live - the row config's own field, absent when the entry declares none.
+ * @param persisted - the display the pet already shows (its own `pet.json`).
+ * @param committed - the profile layer's explicit display values, when known.
+ * @returns the value the pet runs with.
+ */
+function displayField<K extends keyof PetDisplayConfig>(
+  key: K,
+  live: LiveField<PetDisplayConfig[K]> | undefined,
+  persisted: Partial<PetDisplayConfig>,
+  committed: Partial<PetDisplayConfig>,
+): PetDisplayConfig[K] {
+  const explicit = committed[key]
+  if (explicit !== undefined) return explicit
+  const value = readLive<PetDisplayConfig[K]>(live, PET_FORM_DEFAULTS[key])
+  if (value !== PET_FORM_DEFAULTS[key]) return value
+  const kept = persisted[key]
+  return kept === undefined ? value : kept
+}
+
 /**
  * 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.
+ * carries it. `persisted` and `committed` give the display fields the same
+ * treatment; see {@link displayField}.
  * @param config - the effective config of the pet row.
  * @param fallbackPetId - pet id to use when the config names none.
+ * @param persisted - the display the pet already shows (its own `pet.json`).
+ * @param committed - the profile layer's explicit display values, when known.
  * @returns the resolved settings section.
  */
-export function petSettingsSection(config: PetFormConfig, fallbackPetId: string): PetSettingsSection {
+export function petSettingsSection(
+  config: PetFormConfig,
+  fallbackPetId: string,
+  persisted: Partial<PetDisplayConfig> = {},
+  committed: Partial<PetDisplayConfig> = {},
+): PetSettingsSection {
   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),
+    visible: displayField('visible', config.visible, persisted, committed),
+    size: displayField('size', config.size, persisted, committed),
+    right: displayField('right', config.right, persisted, committed),
+    bottom: displayField('bottom', config.bottom, persisted, committed),
+    bubbleScale: displayField('bubbleScale', config.bubbleScale, persisted, committed),
     petId: readLive(config.petId, fallbackPetId),
     enabled: readLive(config.enabled, PET_FORM_DEFAULTS.enabled),
     decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
   }
 }
 
+/** The settings row ids a pet install is served under, most specific first. */
+const PET_SETTINGS_ROW_IDS: readonly string[] = ['web-ui-pet', 'ui-pet', PET_SETTINGS_NAMESPACE]
+
+/**
+ * The fields this host half reads off one settings descriptor. The settings
+ * service serves one descriptor per plugin row (see `describe`), and a plugin's
+ * own config IS its settings page, so the two that matter here are the row's
+ * namespace and the profile layer's explicit values.
+ */
+interface ServedSettingsRow {
+  /** The profile entry's id, which is also this plugin's settings namespace. */
+  ns: string
+  /** The profile layer's explicit values; absent fields were never committed. */
+  user?: Partial<PetDisplayConfig>
+}
+
+/**
+ * The settings row serving this plugin's own config, or undefined when the
+ * settings service is not mounted (a direct mount) or serves no row for the pet.
+ *
+ * Every settings write has to address this row's id, and that id is not the
+ * package's plugin name: an aggregate bundle renames child rows (`pet` becomes
+ * `web-ui-pet`). The browser half resolves the same id through its own
+ * `servedEntryId`, so both halves write to one namespace.
+ * @param ctx - the plugin's context.
+ * @returns the serving row, when there is one.
+ */
+function servedRow(ctx: Context): ServedSettingsRow | undefined {
+  try {
+    const settings = ctx.get('settings', false) as { describe(): readonly ServedSettingsRow[] } | undefined
+    if (settings === undefined) return undefined
+    const rows = settings.describe()
+    for (const id of PET_SETTINGS_ROW_IDS) {
+      const row = rows.find(candidate => candidate.ns === id)
+      if (row !== undefined) return row
+    }
+    return undefined
+  } catch {
+    return undefined
+  }
+}
+
 /** Register the pet service and its API + asset routes on the context. */
 export const apply = mountOnce('@linxin666/dsh-pet', applyImpl)
 
@@ -244,13 +330,21 @@ function applyImpl(ctx: Context, config: PetPluginConfig = {}): void {
     decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
     registry,
   })
+  // The mirror back into the settings document (see syncSettingsFromPet) has to
+  // address the row that serves this plugin's config, which an aggregate bundle
+  // renames; the id is resolved lazily, once the composition serves it.
+  service.settingsNamespaceProvider = () => servedRow(ctx)?.ns
 
   // The effective settings ARE this row's own config: the Host serves one form
   // per profile entry from `Config` above, and every edit is committed into the
   // running config, so the plugin re-reads the section here instead of holding
   // a separate settings document (0.1.6 registered one through
-  // settings.installSection/register and re-resolved it on every change).
-  const current = (): PetSettingsSection => petSettingsSection(config, service.selectedPetId())
+  // settings.installSection/register and re-resolved it on every change). The
+  // display fields additionally read the persisted layout and the profile layer,
+  // so a mount with a config that never set them cannot reset a dragged
+  // position to the schema defaults (see displayField).
+  const current = (): PetSettingsSection =>
+    petSettingsSection(config, service.selectedPetId(), service.display(), servedRow(ctx)?.user)
   // The browser half talks to the pet through same-origin JSON endpoints and
   // loads each pet's atlas from the registry's own media route (RPC domains
   // are platform-registered, so the pet serves its own API — the same

package/src/service.ts

@@ -300,6 +300,15 @@ export class PetService extends Service {
    * the same turn again after the pet is disabled and re-enabled.
    */
   private readonly officialEventSessions = new WeakSet<Session>()
+  /**
+   * Resolve the settings namespace this plugin's own config is served as, when
+   * the caller can read it off the composition. A plugin's settings ARE its own
+   * config, so the namespace is the row's id — and an aggregate bundle renames
+   * child rows (`pet` becomes `web-ui-pet`), which is why it cannot be assumed
+   * to be {@link PET_SETTINGS_NAMESPACE}. `apply` sets this; absent means the
+   * plugin runs outside a Loader and the package's own id stands.
+   */
+  settingsNamespaceProvider: (() => string | undefined) | undefined = undefined
 
   constructor(ctx: Context, config: PetConfig = {}) {
     super(ctx, 'pet')
@@ -836,8 +845,9 @@ export class PetService extends Service {
   private syncSettingsFromPet(): void {
     const settings = this.ctx.get('settings', false) as { update(ns: string, patch: object): Promise<void> } | undefined
     if (settings === undefined) return
+    const ns = this.settingsNamespaceProvider?.() ?? PET_SETTINGS_NAMESPACE
     const snapshot = this.ledger.snapshot
-    void settings.update(PET_SETTINGS_NAMESPACE, {
+    void settings.update(ns, {
       visible: snapshot.display.visible,
       size: snapshot.display.size,
       right: snapshot.display.right,