@linxin666/dsh-pet 0.4.2 → 0.4.4

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,
@@ -6007,38 +6017,111 @@ function makePetRoutes(deps) {
 * the loader accepts a standalone install of the same package side by side;
 * without this guard the second instance would still re-register the same
 * webserver routes, tools, settings namespaces, and system-prompt sections
-* and fail the boot. mountOnce makes the second host apply a no-op for the
-* lifetime of the first instance (the browser half is already deduped by
-* package name in the client module host).
+* and fail the boot. mountOnce makes a mount of an already-mounted package a
+* no-op for as long as the first instance lives (the browser half is already
+* deduped by package name in the client module host).
+*
+* A no-op is only safe while the holder is ALIVE. The holder can be disposed
+* long after the refused mount ran its course: the Host reloads a profile by
+* creating the new loader entries before the old ones are torn down (a
+* plugin-manager enable/disable/install write, a settings-driven row reload,
+* HMR), so the new aggregate shell entry mounts its family plugin while the
+* previous entry still owns the name. Dropping that refused mount lost the
+* plugin for good - the previous entry then disposed its own mount, releasing
+* the name with nobody left to take it, and the family row stayed listed as
+* active while its host routes 404ed (the task-board panel showed
+* "board.hostError.notMounted", no degraded record appeared, and only a Host
+* restart recovered it).
+*
+* The refused mount is therefore QUEUED, not dropped, and replayed the moment
+* the holder releases the name - if the waiting fiber is still alive then. The
+* single-instance guarantee is unchanged: exactly one mount is live per
+* package name, and the replay re-enters the guard so a later mount still
+* dedupes against it.
 *
 * The registry rides a global symbol so two module instances of the same
-* package (npm copy vs repository link) still share one verdict. cordis
-* `ctx.effect` runs its callback immediately and treats the callback's
+* package (npm copy vs repository link) still share one verdict. That symbol
+* is a CROSS-REPOSITORY contract, not this file's private state: the four
+* satellite packages (dsh-skins / dsh-pet / dsh-presets /
+* dsh-community-plugins) are separate repositories carrying their own copy of
+* this guard, rebuilt on their own schedule, so the value under `MOUNTED`
+* must keep the shape every published copy reads (a `Set` of package names
+* with `has`/`add`/`delete`). The wait queues this guard added therefore live
+* under their own additive key, and the registry reads back a `Set` even when
+* some other build left a different value there. Changing `MOUNTED`'s shape
+* in place broke that contract once: a satellite's legacy copy created a
+* `Set`, the family's new copy read it as a `Map`, and every family row
+* mounted after it failed with "claims.get is not a function".
+*
+* cordis `ctx.effect` runs its callback immediately and treats the callback's
 * return value as the fiber disposer, so the unmarker is returned, not run.
 */
+/** Published cross-repository contract: package names currently mounted. */
 const MOUNTED = Symbol.for("dsh-web.mounted-plugins");
+/** Additive key this guard owns: refused mounts waiting for the name. */
+const WAITERS = Symbol.for("dsh-web.mounted-plugins.waiters");
+/**
+* The shared name registry, always a `Set` whatever another build stored here:
+* a foreign value (an interim shape, a hand-written global) must not take every
+* family plugin down with it.
+* @returns the process-wide set of mounted package names.
+*/
 function mountedSet() {
 	const registry = globalThis;
-	return registry[MOUNTED] ??= /* @__PURE__ */ new Set();
+	const existing = registry[MOUNTED];
+	if (existing instanceof Set) return existing;
+	const created = /* @__PURE__ */ new Set();
+	registry[MOUNTED] = created;
+	return created;
+}
+/** Queue per package name for mounts refused while a holder was alive. */
+function mountWaiters() {
+	const registry = globalThis;
+	return registry[WAITERS] ??= /* @__PURE__ */ new Map();
 }
 /**
 * Wrap a cordis plugin apply so the package runs at most once per process.
-* The first mount registers normally and unmarks when its fiber disposes;
-* any later mount of the same package name is a no-op.
+* The first mount registers normally and releases the name when its fiber
+* disposes; a mount refused while that name is held waits for the release and
+* then runs, unless its own fiber disposes first.
 * @param packageName - npm package identity shared by every install source.
 * @param fn - the original plugin apply.
 * @returns an apply of the same shape.
 */
 function mountOnce(packageName, fn) {
-	return ((...args) => {
+	const mount = (...args) => {
 		const mounted = mountedSet();
-		if (mounted.has(packageName)) return;
+		const ctx = args[0];
+		if (mounted.has(packageName)) {
+			const waiters = mountWaiters();
+			const queue = waiters.get(packageName) ?? [];
+			let alive = true;
+			const pending = { run: () => {
+				if (alive) mount(...args);
+			} };
+			ctx?.effect?.(() => () => {
+				alive = false;
+				const index = queue.indexOf(pending);
+				if (index >= 0) queue.splice(index, 1);
+			});
+			queue.push(pending);
+			waiters.set(packageName, queue);
+			return;
+		}
 		mounted.add(packageName);
-		args[0]?.effect?.(() => () => {
+		ctx?.effect?.(() => () => {
 			mounted.delete(packageName);
+			const waiters = mountWaiters();
+			const queue = waiters.get(packageName);
+			if (queue === void 0) return;
+			waiters.delete(packageName);
+			for (const waiter of queue.splice(0)) queueMicrotask(() => {
+				waiter.run();
+			});
 		});
 		return fn(...args);
-	});
+	};
+	return mount;
 }
 //#endregion
 //#region src/index.ts
@@ -6098,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 = {}) {
@@ -6132,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/client/PetSettingsCard.d.ts

@@ -57,8 +57,6 @@ export interface PetSettingsCardState extends CardShell {
         value: string;
         label: string;
     }[];
-    /** Registry diagnostics (v1 migration hints, invalid entries), host-served. */
-    petDiagnostics: readonly PetDiagnosticView[];
 }
 /** The registration-side face the card's slot entry injects. */
 export interface PetSettingsCardFace extends CardActions {
@@ -67,20 +65,16 @@ export interface PetSettingsCardFace extends CardActions {
         petSettingsCard: SnapshotStore<PetSettingsCardState>;
     };
 }
-/** One registry diagnostic as served by '/api/pet/diagnostics' (#623). */
-export interface PetDiagnosticView {
-    level: 'error' | 'warning';
-    message: string;
-}
 /** Bridges the 'pet' scope onto the card's staged form. */
 export declare class PetSettingsCardController {
     private readonly form;
     private readonly store;
     private readonly petChoices;
     private readonly petLabels;
-    private diagnostics;
     private selectedPetId;
+    private selectedVisible;
     private stagedPetId;
+    private stagedVisible;
     private savingPet;
     private petSaveFailed;
     private loaded;
@@ -90,13 +84,23 @@ export declare class PetSettingsCardController {
     private pendingTimer;
     /** @param scope - the bound configuration form for the 'pet' entry. */
     constructor(scope: ConfigForm<PetSettings>);
-    /** Fetch registry diagnostics once (soft-fail: an empty list on error). */
-    private loadDiagnostics;
     /** Resolve the registry choices once (retried a few times on failure). */
     private loadPets;
-    private loadSelectedPet;
+    private loadPetState;
     private fallback;
-    private savePetSelection;
+    /**
+     * The visibility the fallback switch renders: the staged draft when the user
+     * moved it, the persisted value otherwise. There is no user layer to override
+     * here, so the field is never marked overridden.
+     */
+    private fallbackVisible;
+    /**
+     * Persist the staged selection and visibility through the pet API — the only
+     * writer available when the aggregate shell serves this card, since there is
+     * no Host settings form to mutate — then confirm the read-back before the
+     * drafts are cleared.
+     */
+    private saveFallback;
     private projection;
     /**
      * Build the face the card's slot registration injects.

package/lib/types/client/PetSettingsCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PetSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/PetSettingsCard.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PetSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/PetSettingsCard.tsx"],"names":[],"mappings":"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"}

package/lib/types/client/PetSettingsCard.js

@@ -9,23 +9,16 @@ async function fetchPetChoices() {
         throw new Error('pet pets failed: ' + response.status);
     return (await response.json());
 }
-/** Fetch the registry diagnostics (v1 migration hints, invalid entries). */
-async function fetchPetDiagnostics() {
-    const response = await fetch('/api/pet/diagnostics');
-    if (!response.ok)
-        throw new Error('pet diagnostics failed: ' + response.status);
-    const body = (await response.json());
-    return body.diagnostics ?? [];
-}
-/** Read the selection from the same persisted state the pet renders. */
-async function fetchSelectedPetId() {
+/** Read the selection and visibility from the same persisted state the pet renders. */
+async function fetchPetState() {
     const response = await fetch('/api/pet/state');
     if (!response.ok)
         throw new Error('pet state failed: ' + response.status);
     const body = (await response.json());
     if (typeof body.pet?.id !== 'string')
         throw new Error('pet state has no selected pet');
-    return body.pet.id;
+    // A Host without the display block predates the visibility switch; the pet shows.
+    return { petId: body.pet.id, visible: body.display?.visible !== false };
 }
 /** Bridges the 'pet' scope onto the card's staged form. */
 export class PetSettingsCardController {
@@ -36,9 +29,10 @@ export class PetSettingsCardController {
     // without rebuilding the form.
     petChoices = [];
     petLabels = new Map();
-    diagnostics = [];
     selectedPetId;
+    selectedVisible;
     stagedPetId;
+    stagedVisible;
     savingPet = false;
     petSaveFailed = false;
     loaded = false;
@@ -68,22 +62,9 @@ export class PetSettingsCardController {
             if (this.disposed)
                 return;
             void this.loadPets();
-            void this.loadDiagnostics();
-            void this.loadSelectedPet();
+            void this.loadPetState();
         }, 0);
     }
-    /** Fetch registry diagnostics once (soft-fail: an empty list on error). */
-    async loadDiagnostics() {
-        try {
-            this.diagnostics = await fetchPetDiagnostics();
-            if (this.disposed)
-                return;
-            this.store.set(this.projection());
-        }
-        catch {
-            this.diagnostics = [];
-        }
-    }
     /** Resolve the registry choices once (retried a few times on failure). */
     async loadPets() {
         if (this.loaded || this.disposed)
@@ -112,12 +93,13 @@ export class PetSettingsCardController {
             }
         }
     }
-    async loadSelectedPet() {
+    async loadPetState() {
         try {
-            const petId = await fetchSelectedPetId();
+            const state = await fetchPetState();
             if (this.disposed)
                 return;
-            this.selectedPetId = petId;
+            this.selectedPetId = state.petId;
+            this.selectedVisible = state.visible;
             this.store.set(this.projection());
         }
         catch {
@@ -129,26 +111,65 @@ export class PetSettingsCardController {
         const shell = this.form.shell();
         return shell.available && !shell.exposed && this.selectedPetId !== undefined;
     }
-    async savePetSelection() {
+    /**
+     * The visibility the fallback switch renders: the staged draft when the user
+     * moved it, the persisted value otherwise. There is no user layer to override
+     * here, so the field is never marked overridden.
+     */
+    fallbackVisible() {
+        const value = this.stagedVisible ?? this.selectedVisible;
+        return { text: value === undefined ? '' : String(value), overridden: false, invalid: false };
+    }
+    /**
+     * Persist the staged selection and visibility through the pet API — the only
+     * writer available when the aggregate shell serves this card, since there is
+     * no Host settings form to mutate — then confirm the read-back before the
+     * drafts are cleared.
+     */
+    async saveFallback() {
         const petId = this.stagedPetId;
-        if (petId === undefined || this.savingPet || !this.petChoices.includes(petId))
+        const visible = this.stagedVisible;
+        if (this.savingPet)
+            return;
+        if (petId === undefined && visible === undefined)
+            return;
+        if (petId !== undefined && !this.petChoices.includes(petId))
             return;
         this.savingPet = true;
         this.petSaveFailed = false;
         this.store.set(this.projection());
         try {
-            const response = await fetch('/api/pet/set-pet', {
-                method: 'POST',
-                headers: { 'content-type': 'application/json' },
-                body: JSON.stringify({ petId }),
-            });
-            const result = (await response.json());
-            if (!response.ok || result.ok !== true || result.petId !== petId || await fetchSelectedPetId() !== petId) {
-                throw new Error('pet selection was not persisted');
+            if (petId !== undefined) {
+                const response = await fetch('/api/pet/set-pet', {
+                    method: 'POST',
+                    headers: { 'content-type': 'application/json' },
+                    body: JSON.stringify({ petId }),
+                });
+                const result = (await response.json());
+                if (!response.ok || result.ok !== true || result.petId !== petId) {
+                    throw new Error('pet selection was not persisted');
+                }
+            }
+            if (visible !== undefined) {
+                const response = await fetch('/api/pet/set-visible', {
+                    method: 'POST',
+                    headers: { 'content-type': 'application/json' },
+                    body: JSON.stringify({ visible }),
+                });
+                if (!response.ok)
+                    throw new Error('pet visibility was not persisted');
             }
-            this.selectedPetId = petId;
+            const persisted = await fetchPetState();
+            if (petId !== undefined && persisted.petId !== petId)
+                throw new Error('pet selection was not persisted');
+            if (visible !== undefined && persisted.visible !== visible)
+                throw new Error('pet visibility was not persisted');
+            this.selectedPetId = persisted.petId;
+            this.selectedVisible = persisted.visible;
             if (this.stagedPetId === petId)
                 this.stagedPetId = undefined;
+            if (this.stagedVisible === visible)
+                this.stagedVisible = undefined;
         }
         catch {
             this.petSaveFailed = true;
@@ -168,7 +189,8 @@ export class PetSettingsCardController {
             ...(fallback ? {
                 exposed: true,
                 writable: true,
-                dirty: this.stagedPetId !== undefined && this.stagedPetId !== this.selectedPetId,
+                dirty: this.stagedPetId !== undefined && this.stagedPetId !== this.selectedPetId
+                    || this.stagedVisible !== undefined && this.stagedVisible !== this.selectedVisible,
                 invalid: this.stagedPetId !== undefined && !this.petChoices.includes(this.stagedPetId),
                 saving: this.savingPet,
                 failed: this.petSaveFailed,
@@ -177,7 +199,7 @@ export class PetSettingsCardController {
             petSelectionFallback: fallback,
             enabled: this.form.field('enabled'),
             decorationEnabled: this.form.field('decorationEnabled'),
-            visible: this.form.field('visible'),
+            visible: fallback ? this.fallbackVisible() : this.form.field('visible'),
             size: this.form.field('size'),
             right: this.form.field('right'),
             bottom: this.form.field('bottom'),
@@ -188,7 +210,6 @@ export class PetSettingsCardController {
                     ? { ...configuredPet, text: this.selectedPetId }
                     : configuredPet,
             petChoices: this.petChoices.map(id => ({ value: id, label: this.petLabels.get(id) ?? id })),
-            petDiagnostics: this.diagnostics,
         };
     }
     /**
@@ -202,29 +223,36 @@ export class PetSettingsCardController {
             edit: (field, value) => {
                 if (!this.fallback())
                     return actions.edit(field, value);
-                if (field !== 'petId')
+                if (field === 'petId')
+                    this.stagedPetId = value === '' ? undefined : value;
+                else if (field === 'visible')
+                    this.stagedVisible = value === '' ? undefined : value === 'true';
+                else
                     return;
-                this.stagedPetId = value === '' ? undefined : value;
                 this.petSaveFailed = false;
                 this.store.set(this.projection());
             },
             resetField: (field) => {
                 if (!this.fallback())
                     return actions.resetField(field);
-                if (field !== 'petId')
+                if (field === 'petId')
+                    this.stagedPetId = undefined;
+                else if (field === 'visible')
+                    this.stagedVisible = undefined;
+                else
                     return;
-                this.stagedPetId = undefined;
                 this.petSaveFailed = false;
                 this.store.set(this.projection());
             },
             save: () => { if (this.fallback())
-                void this.savePetSelection();
+                void this.saveFallback();
             else
                 actions.save(); },
             discard: () => {
                 if (!this.fallback())
                     return actions.discard();
                 this.stagedPetId = undefined;
+                this.stagedVisible = undefined;
                 this.petSaveFailed = false;
                 this.store.set(this.projection());
             },
@@ -260,7 +288,7 @@ export function PetSettingsCard(props) {
         invalidLabel: t('settings.invalidNumber'),
         disabled,
     };
-    return (_jsxs(PluginSettingsCard, { t: t, titleKey: "settings.title", descriptionKey: "settings.description", descriptionNode: state.petSelectionFallback ? t('settings.petHint') : undefined, state: state, onSave: props.save, onDiscard: props.discard, alwaysOpen: true, children: [state.petSelectionFallback ? null : _jsx(BooleanField, { id: "settings-pet-enabled", label: t('settings.enabled'), hint: t('settings.enabledHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.enabled, onEdit: (text) => { props.edit('enabled', text); }, onReset: () => { props.resetField('enabled'); } }), state.petSelectionFallback ? null : _jsx(BooleanField, { id: "settings-pet-decoration", label: t('settings.decoration'), hint: t('settings.decorationHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.decorationEnabled, onEdit: (text) => { props.edit('decorationEnabled', text); }, onReset: () => { props.resetField('decorationEnabled'); } }), _jsx(ChoiceField, { id: "settings-pet-pet", label: t('settings.pet'), hint: t('settings.petHint'), inheritLabel: t('settings.inherit'), ...fieldProps, ...state.petId, choices: state.petChoices, onEdit: (text) => { props.edit('petId', text); }, onReset: () => { props.resetField('petId'); } }), state.petDiagnostics.length === 0 ? null : (_jsxs("li", { className: sectionCss.diagnostics, "data-dsh-part": "diagnostics", children: [_jsx("span", { className: sectionCss.diagnosticsTitle, children: t('settings.diagnosticsTitle') }), _jsx("ul", { children: state.petDiagnostics.map((diagnostic, index) => (_jsx("li", { "data-level": diagnostic.level, children: diagnostic.message }, index))) })] })), state.petSelectionFallback ? null : _jsx(BooleanField, { id: "settings-pet-visible", label: t('settings.visible'), hint: t('settings.visibleHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.visible, onEdit: (text) => { props.edit('visible', text); }, onReset: () => { props.resetField('visible'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-size", label: t('settings.size'), hint: t('settings.sizeHint'), numeric: true, ...fieldProps, ...state.size, onEdit: (text) => { props.edit('size', text); }, onReset: () => { props.resetField('size'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-right", label: t('settings.right'), hint: t('settings.rightHint'), numeric: true, ...fieldProps, ...state.right, onEdit: (text) => { props.edit('right', text); }, onReset: () => { props.resetField('right'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-bottom", label: t('settings.bottom'), hint: t('settings.bottomHint'), numeric: true, ...fieldProps, ...state.bottom, onEdit: (text) => { props.edit('bottom', text); }, onReset: () => { props.resetField('bottom'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-bubble-scale", label: t('settings.bubbleScale'), hint: t('settings.bubbleScaleHint'), numeric: true, ...fieldProps, ...state.bubbleScale, onEdit: (text) => { props.edit('bubbleScale', text); }, onReset: () => { props.resetField('bubbleScale'); } })] }));
+    return (_jsxs(PluginSettingsCard, { t: t, titleKey: "settings.title", descriptionKey: "settings.description", descriptionNode: state.petSelectionFallback ? t('settings.petHint') : undefined, state: state, onSave: props.save, onDiscard: props.discard, alwaysOpen: true, children: [state.petSelectionFallback ? null : _jsx(BooleanField, { id: "settings-pet-enabled", label: t('settings.enabled'), hint: t('settings.enabledHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.enabled, onEdit: (text) => { props.edit('enabled', text); }, onReset: () => { props.resetField('enabled'); } }), state.petSelectionFallback ? null : _jsx(BooleanField, { id: "settings-pet-decoration", label: t('settings.decoration'), hint: t('settings.decorationHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.decorationEnabled, onEdit: (text) => { props.edit('decorationEnabled', text); }, onReset: () => { props.resetField('decorationEnabled'); } }), _jsx(ChoiceField, { id: "settings-pet-pet", label: t('settings.pet'), hint: t('settings.petHint'), inheritLabel: t('settings.inherit'), ...fieldProps, ...state.petId, choices: state.petChoices, onEdit: (text) => { props.edit('petId', text); }, onReset: () => { props.resetField('petId'); } }), _jsx(BooleanField, { id: "settings-pet-visible", label: t('settings.visible'), hint: t('settings.visibleHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.visible, onEdit: (text) => { props.edit('visible', text); }, onReset: () => { props.resetField('visible'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-size", label: t('settings.size'), hint: t('settings.sizeHint'), numeric: true, ...fieldProps, ...state.size, onEdit: (text) => { props.edit('size', text); }, onReset: () => { props.resetField('size'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-right", label: t('settings.right'), hint: t('settings.rightHint'), numeric: true, ...fieldProps, ...state.right, onEdit: (text) => { props.edit('right', text); }, onReset: () => { props.resetField('right'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-bottom", label: t('settings.bottom'), hint: t('settings.bottomHint'), numeric: true, ...fieldProps, ...state.bottom, onEdit: (text) => { props.edit('bottom', text); }, onReset: () => { props.resetField('bottom'); } }), state.petSelectionFallback ? null : _jsx(ValueField, { id: "settings-pet-bubble-scale", label: t('settings.bubbleScale'), hint: t('settings.bubbleScaleHint'), numeric: true, ...fieldProps, ...state.bubbleScale, onEdit: (text) => { props.edit('bubbleScale', text); }, onReset: () => { props.resetField('bubbleScale'); } })] }));
 }
 /** Render the pet settings card as a first-level settings page. */
 export function PetSettingsSection(props) {

package/lib/types/client/locales.d.ts

@@ -53,7 +53,6 @@ export declare const zh: {
     readonly 'pet.moreSessions': "展开其余 {n} 个会话的气泡";
     readonly 'pet.collapseSessions': "收起会话气泡";
     readonly 'settings.title': "宠物";
-    readonly 'settings.diagnosticsTitle': "宠物目录诊断";
     readonly 'settings.description': "选择宠物并调整它的显示布局。";
     readonly 'settings.pet': "宠物";
     readonly 'settings.petHint': "选择显示哪只宠物；每只宠物独立命名，可在宠物悬浮面板改名。";
@@ -136,7 +135,6 @@ export declare const en: {
     readonly 'pet.moreSessions': "Expand {n} more session bubbles";
     readonly 'pet.collapseSessions': "Collapse session bubbles";
     readonly 'settings.title': "Pet";
-    readonly 'settings.diagnosticsTitle': "Pet directory diagnostics";
     readonly 'settings.description': "Pick a pet and tune its display layout.";
     readonly 'settings.pet': "Pet";
     readonly 'settings.petHint': "Choose which pet shows. Names are stored per pet; rename from the pet hover panel.";

package/lib/types/client/locales.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../../../src/client/locales.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,mDAAmD;AACnD,eAAO,MAAM,EAAE,QAAQ,CAAA;AAEvB,oBAAoB;AACpB,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmFL,CAAA;AAEV,oBAAoB;AACpB,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmFL,CAAA;AAEV,oCAAoC;AACpC,MAAM,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAA;AAEpC,qDAAqD;AACrD,MAAM,MAAM,eAAe,GAAG,MAAM,CAAA;AAEpC;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAGnD;AAED;;;;;;;GAOG;AACH,wBAAgB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAQvE;AAED,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,kBAAkB;QAC1B,uBAAuB;QACvB,GAAG,EAAE,MAAM,CAAA;KACZ;CACF"}
+{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../../../src/client/locales.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,mDAAmD;AACnD,eAAO,MAAM,EAAE,QAAQ,CAAA;AAEvB,oBAAoB;AACpB,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkFL,CAAA;AAEV,oBAAoB;AACpB,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkFL,CAAA;AAEV,oCAAoC;AACpC,MAAM,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAA;AAEpC,qDAAqD;AACrD,MAAM,MAAM,eAAe,GAAG,MAAM,CAAA;AAEpC;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAGnD;AAED;;;;;;;GAOG;AACH,wBAAgB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAQvE;AAED,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,kBAAkB;QAC1B,uBAAuB;QACvB,GAAG,EAAE,MAAM,CAAA;KACZ;CACF"}

package/lib/types/client/locales.js

@@ -55,7 +55,6 @@ export const zh = {
     'pet.collapseSessions': '收起会话气泡',
     // 一级设置页（settings.section 席位）。
     'settings.title': '宠物',
-    'settings.diagnosticsTitle': '宠物目录诊断',
     'settings.description': '选择宠物并调整它的显示布局。',
     'settings.pet': '宠物',
     'settings.petHint': '选择显示哪只宠物；每只宠物独立命名，可在宠物悬浮面板改名。',
@@ -140,7 +139,6 @@ export const en = {
     'pet.collapseSessions': 'Collapse session bubbles',
     // First-level settings section (the `settings.section` seat).
     'settings.title': 'Pet',
-    'settings.diagnosticsTitle': 'Pet directory diagnostics',
     'settings.description': 'Pick a pet and tune its display layout.',
     'settings.pet': 'Pet',
     'settings.petHint': 'Choose which pet shows. Names are stored per pet; rename from the pet hover panel.',

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. */