@linxin666/dsh-pet 0.1.15 → 0.1.16

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

@@ -1,42 +1,16 @@
 /**
- * Whale-girl spritesheet geometry and animation tracks.
- *
- * The atlas follows the Codex/hatch-pet contract: 8 columns × 9 rows of
- * 192×208 cells (1536×1872 total), rows in this order:
- *   0 idle, 1 running-right, 2 running-left, 3 waving, 4 jumping,
- *   5 failed, 6 waiting, 7 running, 8 review
- *
- * Frame counts and per-frame durations are per-track definitions below; the
- * whale-girl atlas is produced by the hatch-pet pipeline, so calibrate
- * `TRACKS` against the actual run (`pet_request.json` frame counts) when the
- * asset lands. Tracks that do not loop hand off to `fallback`.
+ * Spritesheet geometry helpers — parameterized by the pet definition the
+ * host serves over '/api/pet/pets', so the browser half renders any registry
+ * entry without per-pet code. The per-track tables (frames, durations, loop,
+ * fallback) also come from the registry; these helpers only place frames,
+ * guard track lengths, and map the fixed 9-row animation contract.
  * @module @linxin666/dsh-pet/client/spritesheet
  */
 import type { PetAnimation } from '../state.ts';
-/** Atlas cell size in px (Codex contract). */
-export declare const FRAME_WIDTH = 192;
-export declare const FRAME_HEIGHT = 208;
-/** Columns per row (max frames per track). */
-export declare const FRAME_COLUMNS = 8;
-/** One animation track: frame indices into the row + per-frame durations. */
-export interface TrackDef {
-    /** Frame indices (columns) played in order; must be < FRAME_COLUMNS. */
-    frames: readonly number[];
-    /** Per-frame duration in ms; same length as frames. */
-    durations: readonly number[];
-    /** Whether the track loops; a non-looping track hands off to fallback. */
-    loop: boolean;
-    /** Track to play after a non-looping track finishes. */
-    fallback?: PetAnimation;
-}
-/**
- * Track definitions for the whale-girl. Durations are tuned for a soft,
- * slow-healing feel (roughly 2.5× the earlier fast draft — the pet should
- * breathe, not race); calibrate frame counts against the hatch-pet run when
- * the asset lands (rows may carry 4–8 frames).
- */
-export declare const TRACKS: Record<PetAnimation, TrackDef>;
-/** Row index of one animation track (mirrors state.ts rowOf). */
+import type { PetCell, PetTrackDef } from '../registry.ts';
+/** Animation track shape the frame loop consumes. */
+export type TrackDef = PetTrackDef;
+/** Row index of one animation track (the fixed 9-row contract). */
 export declare function rowOfTrack(animation: PetAnimation): number;
 /**
  * Background-position (px) of one frame cell within the scaled atlas.
@@ -45,25 +19,17 @@ export declare function rowOfTrack(animation: PetAnimation): number;
  * atlas coordinates here would drift each frame by the scale factor and
  * render torn/overlapping frames.
  */
-export declare function framePosition(row: number, col: number, scale?: number): {
+export declare function framePosition(cell: PetCell, columns: number, row: number, col: number, scale?: number): {
     x: number;
     y: number;
 };
 /** Total duration of one track, ms. */
 export declare function trackDuration(track: TrackDef): number;
 /**
- * Detect how many frames each row actually carries by scanning the decoded
- * atlas for non-transparent cells (hatch-pet rows may hold 4–8 frames; the
- * unused trailing cells are fully transparent). Rows whose every sample is
- * transparent report 0.
- * @param image - the fully decoded spritesheet (natural size 1536×1872).
- * @returns per-row frame counts, length 9.
- */
-export declare function detectFrameCounts(image: HTMLImageElement): number[];
-/**
- * Trim a track to the actual frame count of its row. A row with 0 detected
- * frames degrades to the first frame (the atlas is still loading or corrupt)
- * so the pet never renders blank.
+ * Trim a track to the actual frame count of its row (the manifest's per-row
+ * counts are authoritative; this is a last-line guard against a definition
+ * whose row count disagrees with its track table). A row with 0 detected
+ * frames degrades to the first frame so the pet never renders blank.
  */
 export declare function trimTrack(track: TrackDef, frameCount: number): TrackDef;
 //# sourceMappingURL=spritesheet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"spritesheet.d.ts","sourceRoot":"","sources":["../../../src/client/spritesheet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,8CAA8C;AAC9C,eAAO,MAAM,WAAW,MAAM,CAAA;AAC9B,eAAO,MAAM,YAAY,MAAM,CAAA;AAC/B,8CAA8C;AAC9C,eAAO,MAAM,aAAa,IAAI,CAAA;AAE9B,6EAA6E;AAC7E,MAAM,WAAW,QAAQ;IACvB,wEAAwE;IACxE,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;IACzB,uDAAuD;IACvD,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,0EAA0E;IAC1E,IAAI,EAAE,OAAO,CAAA;IACb,wDAAwD;IACxD,QAAQ,CAAC,EAAE,YAAY,CAAA;CACxB;AAED;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,QAAQ,CAUjD,CAAA;AAED,iEAAiE;AACjE,wBAAgB,UAAU,CAAC,SAAS,EAAE,YAAY,GAAG,MAAM,CAa1D;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAE3F;AAED,uCAAuC;AACvC,wBAAgB,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAErD;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,EAAE,CA6BnE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,QAAQ,CAQvE"}
+{"version":3,"file":"spritesheet.d.ts","sourceRoot":"","sources":["../../../src/client/spritesheet.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE1D,qDAAqD;AACrD,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAA;AAElC,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,SAAS,EAAE,YAAY,GAAG,MAAM,CAa1D;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAE3H;AAED,uCAAuC;AACvC,wBAAgB,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,QAAQ,CAQvE"}

package/lib/types/client/spritesheet.js

@@ -1,40 +1,12 @@
 /**
- * Whale-girl spritesheet geometry and animation tracks.
- *
- * The atlas follows the Codex/hatch-pet contract: 8 columns × 9 rows of
- * 192×208 cells (1536×1872 total), rows in this order:
- *   0 idle, 1 running-right, 2 running-left, 3 waving, 4 jumping,
- *   5 failed, 6 waiting, 7 running, 8 review
- *
- * Frame counts and per-frame durations are per-track definitions below; the
- * whale-girl atlas is produced by the hatch-pet pipeline, so calibrate
- * `TRACKS` against the actual run (`pet_request.json` frame counts) when the
- * asset lands. Tracks that do not loop hand off to `fallback`.
+ * Spritesheet geometry helpers — parameterized by the pet definition the
+ * host serves over '/api/pet/pets', so the browser half renders any registry
+ * entry without per-pet code. The per-track tables (frames, durations, loop,
+ * fallback) also come from the registry; these helpers only place frames,
+ * guard track lengths, and map the fixed 9-row animation contract.
  * @module @linxin666/dsh-pet/client/spritesheet
  */
-/** Atlas cell size in px (Codex contract). */
-export const FRAME_WIDTH = 192;
-export const FRAME_HEIGHT = 208;
-/** Columns per row (max frames per track). */
-export const FRAME_COLUMNS = 8;
-/**
- * Track definitions for the whale-girl. Durations are tuned for a soft,
- * slow-healing feel (roughly 2.5× the earlier fast draft — the pet should
- * breathe, not race); calibrate frame counts against the hatch-pet run when
- * the asset lands (rows may carry 4–8 frames).
- */
-export const TRACKS = {
-    idle: { frames: [0, 1, 2, 3, 4, 5], durations: [400, 400, 500, 400, 400, 500], loop: true },
-    'running-right': { frames: [0, 1, 2, 3, 4, 5, 6, 7], durations: [225, 225, 225, 225, 225, 225, 225, 225], loop: true },
-    'running-left': { frames: [0, 1, 2, 3, 4, 5, 6, 7], durations: [225, 225, 225, 225, 225, 225, 225, 225], loop: true },
-    waving: { frames: [0, 1, 2, 3], durations: [350, 350, 350, 350], loop: true },
-    jumping: { frames: [0, 1, 2, 3, 4], durations: [300, 300, 300, 350, 350], loop: false, fallback: 'idle' },
-    failed: { frames: [0, 1, 2, 3, 4, 5, 6, 7], durations: [450, 450, 450, 500, 550, 600, 450, 450], loop: false, fallback: 'idle' },
-    waiting: { frames: [0, 1, 2, 3, 4, 5], durations: [450, 450, 500, 450, 450, 500], loop: true },
-    running: { frames: [0, 1, 2, 3, 4, 5], durations: [250, 250, 250, 250, 250, 250], loop: true },
-    review: { frames: [0, 1, 2, 3, 4, 5], durations: [550, 550, 550, 550, 550, 550], loop: true },
-};
-/** Row index of one animation track (mirrors state.ts rowOf). */
+/** Row index of one animation track (the fixed 9-row contract). */
 export function rowOfTrack(animation) {
     const rows = {
         idle: 0,
@@ -56,61 +28,21 @@ export function rowOfTrack(animation) {
  * atlas coordinates here would drift each frame by the scale factor and
  * render torn/overlapping frames.
  */
-export function framePosition(row, col, scale = 1) {
-    return { x: -col * FRAME_WIDTH * scale, y: -row * FRAME_HEIGHT * scale };
+export function framePosition(cell, columns, row, col, scale = 1) {
+    return { x: -col * cell.width * scale, y: -row * cell.height * scale };
 }
 /** Total duration of one track, ms. */
 export function trackDuration(track) {
     return track.durations.reduce((sum, d) => sum + d, 0);
 }
 /**
- * Detect how many frames each row actually carries by scanning the decoded
- * atlas for non-transparent cells (hatch-pet rows may hold 4–8 frames; the
- * unused trailing cells are fully transparent). Rows whose every sample is
- * transparent report 0.
- * @param image - the fully decoded spritesheet (natural size 1536×1872).
- * @returns per-row frame counts, length 9.
- */
-export function detectFrameCounts(image) {
-    const canvas = document.createElement('canvas');
-    canvas.width = image.naturalWidth;
-    canvas.height = image.naturalHeight;
-    const ctx = canvas.getContext('2d');
-    if (ctx === null)
-        return Array.from({ length: 9 }, () => FRAME_COLUMNS);
-    ctx.drawImage(image, 0, 0);
-    const data = ctx.getImageData(0, 0, canvas.width, canvas.height).data;
-    const counts = [];
-    const stride = FRAME_COLUMNS * FRAME_WIDTH;
-    const probeStep = 8;
-    const margin = 12;
-    for (let row = 0; row < 9; row++) {
-        let count = 0;
-        for (let col = 0; col < FRAME_COLUMNS; col++) {
-            let hasContent = false;
-            const x0 = col * FRAME_WIDTH;
-            const y0 = row * FRAME_HEIGHT;
-            for (let y = y0 + margin; y < y0 + FRAME_HEIGHT - margin && !hasContent; y += probeStep) {
-                for (let x = x0 + margin; x < x0 + FRAME_WIDTH - margin && !hasContent; x += probeStep) {
-                    const idx = (y * stride + x) * 4;
-                    if ((data[idx + 3] ?? 0) > 8)
-                        hasContent = true;
-                }
-            }
-            if (hasContent)
-                count += 1;
-        }
-        counts.push(count);
-    }
-    return counts;
-}
-/**
- * Trim a track to the actual frame count of its row. A row with 0 detected
- * frames degrades to the first frame (the atlas is still loading or corrupt)
- * so the pet never renders blank.
+ * Trim a track to the actual frame count of its row (the manifest's per-row
+ * counts are authoritative; this is a last-line guard against a definition
+ * whose row count disagrees with its track table). A row with 0 detected
+ * frames degrades to the first frame so the pet never renders blank.
  */
 export function trimTrack(track, frameCount) {
-    const n = Math.max(1, Math.min(frameCount, track.frames.length));
+    const n = Math.max(1, Math.min(frameCount, track.frames.length, track.durations.length));
     return {
         frames: track.frames.slice(0, n),
         durations: track.durations.slice(0, n),

package/lib/types/index.d.ts

@@ -1,43 +1,56 @@
 /**
  * dsh-pet host half — mounts the pet service and its HTTP routes. The
- * browser half (the `./client` entry) renders the whale-girl companion and
- * drives it through the same-origin `/api/pet/*` JSON endpoints plus the
- * `/pet/whale/*` media route. Install via `dsh plugin --profile web add
- * link:<dsh-web-ui>/packages/dsh-pet`; the cordis.patch.yml inserts this plugin row.
+ * browser half (the './client' entry) renders the selected pet and drives it
+ * through the same-origin '/api/pet/*' JSON endpoints plus the '/pet/<id>/*'
+ * media route. The host builds the multi-pet registry once at startup from
+ * the package assets, the hatch-pet custom pets directory, and composed
+ * config entries; adding a pet means dropping a manifest + atlas into one of
+ * those sources, never touching host or client code. Install via
+ * 'dsh plugin --profile web add link:<dsh-web-ui>/packages/dsh-pet'; the
+ * cordis.patch.yml inserts this plugin row.
  * @module @linxin666/dsh-pet
  */
 import { Context } from '@deepseek-ai/cordis';
 import z from 'schemastery';
 import { type PetConfig } from './service.ts';
 export { PetService } from './service.ts';
-export type { PetConfig, PetInteractResult, PetStateView, } from './service.ts';
+export type { PetConfig, PetInteractResult, PetSettingsSection, PetStateView, } from './service.ts';
 export { AFFINITY_MAX, AFFINITY_RANKS, applyInteraction, applyTurnReward, emptyAffinity, rankOf, } from './affinity.ts';
 export type { AffinityConfig, AffinityState, InteractionOutcome, PetInteraction, } from './affinity.ts';
 export { animationForPhase, PetStateMachine, rowOf, } from './state.ts';
 export type { ActivityPhase, PetAnimation, PetStateConfig, PetStateInput, PetStateSnapshot, } from './state.ts';
 export { consumeTreat, defaultTreatConfig, emptyTreatLedger, settleTreatGrants, } from './treats.ts';
 export type { TreatConfig, TreatLedger, TreatSettlement } from './treats.ts';
-export { defaultDisplayConfig, emptyPersist, loadPetPersist, petHomeDir, savePetPersist, } from './persist.ts';
+export { DEFAULT_PET_ID, DEFAULT_PET_NAME, PET_NAME_MAX_LENGTH, defaultDisplayConfig, emptyPersist, loadPetPersist, petHomeDir, savePetPersist, } from './persist.ts';
 export type { PetDisplayConfig, PetPersist } from './persist.ts';
-export { makePetRoutes, petPackageRoot, PET_API_PREFIX, PET_ASSET_PREFIX, } from './routes.ts';
+export { DEFAULT_FRAME_COUNTS, DEFAULT_PET_CELL, DEFAULT_PET_COLUMNS, DEFAULT_PET_ROW_COUNT, DEFAULT_TRACK_PATTERNS, PET_ROW_ORDER, codexPetsDir, loadPetRegistry, petEntryView, petPackageRoot, resolvePetManifest, } from './registry.ts';
+export type { PetDefinition, PetEntry, PetManifest, PetRegistry, PetRegistryOptions, PetTrackDef, PetTrackOverride, } from './registry.ts';
+export { makePetRoutes, PET_API_PREFIX, PET_ASSET_PREFIX, } from './routes.ts';
 /** Stable cordis plugin name (matches cordis.patch.yml insert id). */
 export declare const name = "pet";
 /** Services required before the pet can mount its surfaces. */
 export declare const inject: string[];
-/** Settings section schema: the display fields and name the web settings surface edits. */
-export declare const PET_SETTINGS_SCHEMA: z<Schemastery.ObjectS<{
+/**
+ * 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'.
+ */
+export declare function makePetSettingsSchema(fallbackPetId: string): z<Schemastery.ObjectS<{
     visible: z<boolean, boolean>;
     size: z<number, number>;
     right: z<number, number>;
     bottom: z<number, number>;
-    name: z<string, string>;
+    petId: z<string, string>;
     enabled: z<boolean, boolean>;
 }>, Schemastery.ObjectT<{
     visible: z<boolean, boolean>;
     size: z<number, number>;
     right: z<number, number>;
     bottom: z<number, number>;
-    name: z<string, string>;
+    petId: z<string, string>;
     enabled: z<boolean, boolean>;
 }>>;
 /** Register the pet service and its API + asset routes on the context. */

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG7C,OAAO,CAAC,MAAM,aAAa,CAAA;AAC3B,OAAO,EAAsC,KAAK,SAAS,EAA2B,MAAM,cAAc,CAAA;AAU1G,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,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,oBAAoB,EACpB,YAAY,EACZ,cAAc,EACd,UAAU,EACV,cAAc,GACf,MAAM,cAAc,CAAA;AACrB,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEhE,OAAO,EACL,aAAa,EACb,cAAc,EACd,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,2FAA2F;AAC3F,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;GAO9B,CAAA;AAEF,0EAA0E;AAC1E,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,SAAc,GAAG,IAAI,CAoDhE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG7C,OAAO,CAAC,MAAM,aAAa,CAAA;AAC3B,OAAO,EAAsC,KAAK,SAAS,EAA2B,MAAM,cAAc,CAAA;AAK1G,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,kBAAkB,EAClB,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,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;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM;;;;;;;;;;;;;;IAS1D;AAED,0EAA0E;AAC1E,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,SAAc,GAAG,IAAI,CA+DhE"}

package/lib/types/index.js

@@ -1,61 +1,81 @@
 /**
  * dsh-pet host half — mounts the pet service and its HTTP routes. The
- * browser half (the `./client` entry) renders the whale-girl companion and
- * drives it through the same-origin `/api/pet/*` JSON endpoints plus the
- * `/pet/whale/*` media route. Install via `dsh plugin --profile web add
- * link:<dsh-web-ui>/packages/dsh-pet`; the cordis.patch.yml inserts this plugin row.
+ * browser half (the './client' entry) renders the selected pet and drives it
+ * through the same-origin '/api/pet/*' JSON endpoints plus the '/pet/<id>/*'
+ * media route. The host builds the multi-pet registry once at startup from
+ * the package assets, the hatch-pet custom pets directory, and composed
+ * config entries; adding a pet means dropping a manifest + atlas into one of
+ * those sources, never touching host or client code. Install via
+ * 'dsh plugin --profile web add link:<dsh-web-ui>/packages/dsh-pet'; the
+ * cordis.patch.yml inserts this plugin row.
  * @module @linxin666/dsh-pet
  */
 import { installSettingsSection, settingsNamespace } from '@deepseek-ai/dsh-settings';
 import z from 'schemastery';
 import { PetService, PET_SETTINGS_NAMESPACE } from "./service.js";
-import { makePetRoutes, petPackageRoot } from "./routes.js";
-import { DEFAULT_PET_NAME, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN, PET_NAME_MAX_LENGTH, } from "./persist.js";
+import { makePetRoutes } from "./routes.js";
+import { loadPetRegistry, petPackageRoot } from "./registry.js";
+import { DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN } from "./persist.js";
 export { PetService } from "./service.js";
 export { AFFINITY_MAX, AFFINITY_RANKS, applyInteraction, applyTurnReward, emptyAffinity, rankOf, } from "./affinity.js";
 export { animationForPhase, PetStateMachine, rowOf, } from "./state.js";
 export { consumeTreat, defaultTreatConfig, emptyTreatLedger, settleTreatGrants, } from "./treats.js";
-export { defaultDisplayConfig, emptyPersist, loadPetPersist, petHomeDir, savePetPersist, } from "./persist.js";
-export { makePetRoutes, petPackageRoot, PET_API_PREFIX, PET_ASSET_PREFIX, } from "./routes.js";
+export { DEFAULT_PET_ID, DEFAULT_PET_NAME, PET_NAME_MAX_LENGTH, defaultDisplayConfig, emptyPersist, loadPetPersist, petHomeDir, savePetPersist, } from "./persist.js";
+export { DEFAULT_FRAME_COUNTS, DEFAULT_PET_CELL, DEFAULT_PET_COLUMNS, DEFAULT_PET_ROW_COUNT, DEFAULT_TRACK_PATTERNS, PET_ROW_ORDER, codexPetsDir, loadPetRegistry, petEntryView, petPackageRoot, resolvePetManifest, } from "./registry.js";
+export { makePetRoutes, PET_API_PREFIX, PET_ASSET_PREFIX, } from "./routes.js";
 /** Stable cordis plugin name (matches cordis.patch.yml insert id). */
 export const name = 'pet';
 /** Services required before the pet can mount its surfaces. */
 export const inject = ['webServer'];
-/** Settings section schema: the display fields and name the web settings surface edits. */
-export const PET_SETTINGS_SCHEMA = z.object({
-    visible: z.boolean().default(true),
-    size: z.number().step(1).min(DISPLAY_SIZE_MIN).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),
-    name: z.string().min(1).max(PET_NAME_MAX_LENGTH).pattern(/\S/).default(DEFAULT_PET_NAME),
-    enabled: z.boolean().default(true),
-});
+/**
+ * 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'.
+ */
+export function makePetSettingsSchema(fallbackPetId) {
+    return z.object({
+        visible: z.boolean().default(true),
+        size: z.number().step(1).min(DISPLAY_SIZE_MIN).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),
+        petId: z.string().default(fallbackPetId),
+        enabled: z.boolean().default(true),
+    });
+}
 /** Register the pet service and its API + asset routes on the context. */
 export function apply(ctx, config = {}) {
-    const service = new PetService(ctx, config);
-    // The settings surface edits the display config through the `pet`
-    // namespace. The composition `base` starts as the persisted pet.json
-    // values (clamped to schema bounds), so an empty user layer resolves to
-    // exactly what the pet already shows — a fresh deployment never
-    // overwrites a customized layout, and reset re-inherits it. Runtime drag
-    // interactions mirror back into the settings document through the service
-    // (see syncSettingsFromPet), keeping both views consistent.
+    const registry = config.registry
+        ?? loadPetRegistry({
+            packageRoot: petPackageRoot(import.meta.url),
+            ...(config.pets === undefined ? {} : { extra: config.pets }),
+        });
+    const service = new PetService(ctx, { ...config, registry });
+    // The settings surface edits the pet selection + display config through
+    // the 'pet' namespace. The composition 'base' starts as the persisted
+    // pet.json values (clamped to schema bounds), so an empty user layer
+    // resolves to exactly what the pet already shows — a fresh deployment
+    // never overwrites a customized layout, and reset re-inherits it. Runtime
+    // drag interactions mirror back into the settings document through the
+    // service (see syncSettingsFromPet), keeping both views consistent.
     let current = () => base;
     const base = {
         visible: service.display().visible,
         size: service.display().size,
         right: service.display().right,
         bottom: service.display().bottom,
-        name: service.petName(),
+        petId: service.selectedPetId(),
         enabled: config.enabled ?? true,
     };
     // The browser half talks to the pet through same-origin JSON endpoints and
-    // loads the atlas from the pet's own media route (RPC domains are
-    // platform-registered, so the pet serves its own API — the same pattern as
-    // dsh-remote-web-ui's /api/pair family). The routes are registered while
-    // the plugin is enabled; toggling the setting off makes the pet API
-    // disappear until it is re-enabled.
-    const routes = makePetRoutes({ service, packageRoot: petPackageRoot(import.meta.url) });
+    // 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
+    // pattern as dsh-remote-web-ui's /api/pair family). The routes are
+    // registered while the plugin is enabled; toggling the setting off makes
+    // the pet API disappear until it is re-enabled.
+    const routes = makePetRoutes({ service });
     let disposeRoutes;
     const syncRoutes = () => {
         const enabled = current().enabled ?? true;
@@ -71,7 +91,7 @@ export function apply(ctx, config = {}) {
             disposeRoutes = undefined;
         }
     };
-    installSettingsSection(ctx, settingsNamespace(PET_SETTINGS_NAMESPACE), PET_SETTINGS_SCHEMA, base, {
+    installSettingsSection(ctx, settingsNamespace(PET_SETTINGS_NAMESPACE), makePetSettingsSchema(service.selectedPetId()), base, {
         setSource: (source) => { current = source; },
         onChange: () => {
             const section = current();

package/lib/types/ledger.d.ts

@@ -47,8 +47,10 @@ export declare class PetLedger {
     takeDirty(): boolean;
     /** Replace the display block (clamping stays a caller concern). */
     setDisplay(display: PetDisplayConfig): void;
-    /** Replace the pet display name (validation stays a caller concern). */
-    setName(name: string): void;
+    /** Replace the selected pet id (validation stays a caller concern). */
+    setPetId(petId: string): void;
+    /** Replace one pet's display name (validation stays a caller concern). */
+    setPetName(petId: string, name: string): void;
     /**
      * Settle the treat economy (work + time output since the last settlement).
      * A zero-gain first settlement still starts the time clock (anchor write),

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

@@ -1 +1 @@
-{"version":3,"file":"ledger.d.ts","sourceRoot":"","sources":["../../src/ledger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,eAAe,CAAA;AACtB,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEhE,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B;AAED,wEAAwE;AACxE,MAAM,WAAW,uBAAuB;IACtC,4BAA4B;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAA;IACb,6DAA6D;IAC7D,QAAQ,EAAE,eAAe,CAAA;CAC1B;AAED;;;;GAIG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,OAAO,CAAY;IAC3B,oFAAoF;IACpF,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,sBAAsB,CAAI;IAClC,OAAO,CAAC,KAAK,CAAQ;gBAET,OAAO,EAAE,UAAU,EAAE,MAAM,GAAE,YAAiB;IAM1D,iDAAiD;IACjD,IAAI,QAAQ,IAAI,cAAc,CAE7B;IAED,qEAAqE;IACrE,IAAI,QAAQ,IAAI,UAAU,CAEzB;IAED,qCAAqC;IACrC,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,+DAA+D;IAC/D,SAAS,IAAI,OAAO;IAMpB,mEAAmE;IACnE,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAK3C,wEAAwE;IACxE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK3B;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAapC;;;;OAIG;IACH,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IASnE,8EAA8E;IAC9E,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IASxC,OAAO,CAAC,eAAe;IASvB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,uBAAuB;IAyBtE,kDAAkD;IAClD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe;CAG7C"}
+{"version":3,"file":"ledger.d.ts","sourceRoot":"","sources":["../../src/ledger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,eAAe,CAAA;AACtB,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEhE,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B;AAED,wEAAwE;AACxE,MAAM,WAAW,uBAAuB;IACtC,4BAA4B;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAA;IACb,6DAA6D;IAC7D,QAAQ,EAAE,eAAe,CAAA;CAC1B;AAED;;;;GAIG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,OAAO,CAAY;IAC3B,oFAAoF;IACpF,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,sBAAsB,CAAI;IAClC,OAAO,CAAC,KAAK,CAAQ;gBAET,OAAO,EAAE,UAAU,EAAE,MAAM,GAAE,YAAiB;IAM1D,iDAAiD;IACjD,IAAI,QAAQ,IAAI,cAAc,CAE7B;IAED,qEAAqE;IACrE,IAAI,QAAQ,IAAI,UAAU,CAEzB;IAED,qCAAqC;IACrC,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,+DAA+D;IAC/D,SAAS,IAAI,OAAO;IAMpB,mEAAmE;IACnE,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAK3C,uEAAuE;IACvE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAM7B,0EAA0E;IAC1E,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAK7C;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAapC;;;;OAIG;IACH,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IASnE,8EAA8E;IAC9E,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IASxC,OAAO,CAAC,eAAe;IASvB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,uBAAuB;IAyBtE,kDAAkD;IAClD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe;CAG7C"}

package/lib/types/ledger.js

@@ -49,9 +49,16 @@ export class PetLedger {
         this.current = { ...this.current, display };
         this.dirty = true;
     }
-    /** Replace the pet display name (validation stays a caller concern). */
-    setName(name) {
-        this.current = { ...this.current, name };
+    /** Replace the selected pet id (validation stays a caller concern). */
+    setPetId(petId) {
+        if (this.current.petId === petId)
+            return;
+        this.current = { ...this.current, petId };
+        this.dirty = true;
+    }
+    /** Replace one pet's display name (validation stays a caller concern). */
+    setPetName(petId, name) {
+        this.current = { ...this.current, names: { ...this.current.names, [petId]: name } };
         this.dirty = true;
     }
     /**
@@ -118,7 +125,7 @@ export class PetLedger {
             const consume = consumeTreat(this.current.treats);
             if (!consume.ok) {
                 return {
-                    reaction: '没有小鱼干了，多陪鲸鱼娘工作一会儿吧～',
+                    reaction: '没有小鱼干了，多陪我工作一会儿吧～',
                     delta: 0,
                     affinity: this.affinityView(nowMs),
                 };

package/lib/types/persist.d.ts

@@ -24,14 +24,21 @@ export declare const DISPLAY_SIZE_MAX = 512;
 export declare const DISPLAY_INSET_MAX = 10000;
 /** Everything persisted for the pet. */
 export interface PetPersist {
-    /** User-customizable pet display name. */
-    name: string;
+    /** Selected pet id (a registry entry; clamped at service startup). */
+    petId: string;
+    /**
+     * Per-pet display names keyed by pet id. A pet without an entry falls back
+     * to its manifest displayName, so only user renames are stored here.
+     */
+    names: Record<string, string>;
     affinity: AffinityState;
     /** Treat (小鱼干) stock ledger. */
     treats: TreatLedger;
     display: PetDisplayConfig;
 }
-/** Default pet name (used until the user renames the pet). */
+/** Pet id the legacy single-pet installs resolve to on migration. */
+export declare const DEFAULT_PET_ID = "whale-girl";
+/** Default pet name (used only when a manifest carries no displayName). */
 export declare const DEFAULT_PET_NAME = "\u9CB8\u9C7C\u5A18";
 /** Name constraints. */
 export declare const PET_NAME_MAX_LENGTH = 20;

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

@@ -1 +1 @@
-{"version":3,"file":"persist.d.ts","sourceRoot":"","sources":["../../src/persist.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAA+B,KAAK,aAAa,EAAE,MAAM,eAAe,CAAA;AAC/E,OAAO,EAAwC,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAEpF,gDAAgD;AAChD,MAAM,WAAW,gBAAgB;IAC/B,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;CACf;AAED,eAAO,MAAM,oBAAoB,EAAE,gBAKlC,CAAA;AAED,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAClC,eAAO,MAAM,gBAAgB,MAAM,CAAA;AACnC,eAAO,MAAM,iBAAiB,QAAS,CAAA;AAEvC,wCAAwC;AACxC,MAAM,WAAW,UAAU;IACzB,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,aAAa,CAAA;IACvB,gCAAgC;IAChC,MAAM,EAAE,WAAW,CAAA;IACnB,OAAO,EAAE,gBAAgB,CAAA;CAC1B;AAED,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,uBAAQ,CAAA;AAErC,wBAAwB;AACxB,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,wBAAgB,YAAY,IAAI,UAAU,CAOzC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAYD,4EAA4E;AAC5E,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAqB,GAAG,UAAU,CAwCrE;AAED,sDAAsD;AACtD,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,GAAE,MAAqB,GAAG,IAAI,CAMjF"}
+{"version":3,"file":"persist.d.ts","sourceRoot":"","sources":["../../src/persist.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAA+B,KAAK,aAAa,EAAE,MAAM,eAAe,CAAA;AAC/E,OAAO,EAAwC,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAEpF,gDAAgD;AAChD,MAAM,WAAW,gBAAgB;IAC/B,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;CACf;AAED,eAAO,MAAM,oBAAoB,EAAE,gBAKlC,CAAA;AAED,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAClC,eAAO,MAAM,gBAAgB,MAAM,CAAA;AACnC,eAAO,MAAM,iBAAiB,QAAS,CAAA;AAEvC,wCAAwC;AACxC,MAAM,WAAW,UAAU;IACzB,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,QAAQ,EAAE,aAAa,CAAA;IACvB,gCAAgC;IAChC,MAAM,EAAE,WAAW,CAAA;IACnB,OAAO,EAAE,gBAAgB,CAAA;CAC1B;AAED,qEAAqE;AACrE,eAAO,MAAM,cAAc,eAAe,CAAA;AAE1C,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,uBAAQ,CAAA;AAErC,wBAAwB;AACxB,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,wBAAgB,YAAY,IAAI,UAAU,CAQzC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AA4BD,4EAA4E;AAC5E,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAqB,GAAG,UAAU,CAiDrE;AAED,sDAAsD;AACtD,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,GAAE,MAAqB,GAAG,IAAI,CAMjF"}

package/lib/types/persist.js

@@ -19,13 +19,16 @@ export const defaultDisplayConfig = {
 export const DISPLAY_SIZE_MIN = 32;
 export const DISPLAY_SIZE_MAX = 512;
 export const DISPLAY_INSET_MAX = 10_000;
-/** Default pet name (used until the user renames the pet). */
+/** Pet id the legacy single-pet installs resolve to on migration. */
+export const DEFAULT_PET_ID = 'whale-girl';
+/** Default pet name (used only when a manifest carries no displayName). */
 export const DEFAULT_PET_NAME = '鲸鱼娘';
 /** Name constraints. */
 export const PET_NAME_MAX_LENGTH = 20;
 export function emptyPersist() {
     return {
-        name: DEFAULT_PET_NAME,
+        petId: DEFAULT_PET_ID,
+        names: {},
         affinity: emptyAffinity(),
         treats: emptyTreatLedger(),
         display: { ...defaultDisplayConfig },
@@ -43,6 +46,21 @@ export function petHomeDir() {
 function finiteNum(value, fallback) {
     return typeof value === 'number' && Number.isFinite(value) ? value : fallback;
 }
+/** Sanitize the per-pet names map (string keys, non-empty trimmed values). */
+function loadPetNames(parsed) {
+    const names = {};
+    if (typeof parsed.names !== 'object' || parsed.names === null)
+        return names;
+    for (const [id, value] of Object.entries(parsed.names)) {
+        if (id === '' || typeof value !== 'string')
+            continue;
+        const name = value.trim();
+        if (name === '')
+            continue;
+        names[id] = name.slice(0, PET_NAME_MAX_LENGTH);
+    }
+    return names;
+}
 /** Clamp one count/score into [0, max]. */
 function clamp(value, max) {
     return Math.min(max, Math.max(0, value));
@@ -77,10 +95,19 @@ export function loadPetPersist(dir = petHomeDir()) {
             right: Math.round(clamp(finiteNum(rawDisplay.right, base.display.right), DISPLAY_INSET_MAX)),
             bottom: Math.round(clamp(finiteNum(rawDisplay.bottom, base.display.bottom), DISPLAY_INSET_MAX)),
         };
+        const petId = typeof parsed.petId === 'string' && parsed.petId.trim() !== ''
+            ? parsed.petId.trim()
+            : base.petId;
+        const names = loadPetNames(parsed);
+        // Legacy migration: pre-registry installs persisted one flat `name`
+        // field. Move it onto the selected pet (the legacy whale-girl unless the
+        // file already names another pet) so renames survive the upgrade.
+        if (typeof parsed.name === 'string' && parsed.name.trim() !== '' && names[petId] === undefined) {
+            names[petId] = parsed.name.trim().slice(0, PET_NAME_MAX_LENGTH);
+        }
         return {
-            name: typeof parsed.name === 'string' && parsed.name.trim() !== ''
-                ? parsed.name
-                : base.name,
+            petId,
+            names,
             affinity,
             treats,
             display,