@linxin666/dsh-pet 0.1.14 → 0.1.16

package/lib/types/service.d.ts

@@ -1,15 +1,18 @@
 /**
- * Pet host service — the `pet.*` RPC domain. Owns the state machine wiring
- * (projects official session events and accepts legacy `activity/status`), the
- * affinity ledger, and the persisted display config. The API gateway maps
- * this service's methods onto `pet.state` / `pet.interact` /
- * `pet.setVisible` / `pet.setConfig` for browser consumers.
+ * Pet host service — the `pet.*` RPC domain. A composition facade: it wires
+ * the pure event projection (`event-projection`) onto the state machine,
+ * delegates the affinity economy to the ledger (`ledger`), and routes
+ * persistence through `persist`. The API gateway maps these methods onto
+ * `pet.state` / `pet.pets` / `pet.interact` / `pet.setVisible` /
+ * `pet.setConfig` / `pet.setName` / `pet.setPet` for browser consumers.
  * @module @linxin666/dsh-pet/service
  */
 import { Context, Service } from '@deepseek-ai/cordis';
-import { type AffinityConfig, type PetInteraction } from './affinity.ts';
+import type { AffinityConfig, PetAffinityView, PetInteraction } from './affinity.ts';
+import type { TreatConfig } from './treats.ts';
+import { type LedgerInteractionResult } from './ledger.ts';
 import { type PetDisplayConfig } from './persist.ts';
-import { type TreatConfig } from './treats.ts';
+import { type PetDefinition, type PetManifest, type PetRegistry } from './registry.ts';
 import { type PetStateConfig, type PetStateSnapshot } from './state.ts';
 /** Plugin configuration. */
 export interface PetConfig {
@@ -23,13 +26,21 @@ export interface PetConfig {
     persistDir?: string;
     /** Master switch for the plugin (browser half + host routes). */
     enabled?: boolean;
+    /** Prebuilt registry (tests); defaults to scanning the package + user dirs. */
+    registry?: PetRegistry;
+    /** Extra manifest entries composed by the embedding application. */
+    pets?: readonly PetManifest[];
 }
 /**
- * The pet's settings-namespace section: the display fields and name the web
- * settings surface edits. `right`/`bottom` are also updated by drag
+ * The pet's settings-namespace section: the pet selection and display fields
+ * the web settings surface edits. `right`/`bottom` are also updated by drag
  * interactions, which keep the settings document in sync through the service.
+ * Naming is per pet and lives outside the settings document (the hover-panel
+ * rename targets the selected pet).
  */
 export interface PetSettingsSection {
+    /** Selected pet id (a registry entry; the service clamps stale values). */
+    petId?: string;
     /** Master switch. */
     visible: boolean;
     /** Scale of the rendered pet in px (sprite cell height). */
@@ -38,8 +49,6 @@ export interface PetSettingsSection {
     right: number;
     /** Vertical inset from the viewport bottom edge, px. */
     bottom: number;
-    /** User-customizable pet display name. */
-    name: string;
     /** Master switch for the plugin (browser half + host routes). */
     enabled?: boolean;
 }
@@ -52,21 +61,19 @@ export interface PetStateView {
     phase: PetStateSnapshot['phase'];
     sessionActive: boolean;
     /** Affinity ledger snapshot. */
-    affinity: {
-        points: number;
-        rank: string;
-        rankEmoji: string;
-        pets: number;
-        feeds: number;
-        turns: number;
-        /** True while the pet interaction is inside its cooldown. */
-        petCooldown: boolean;
-        /** True while the feed is inside its cooldown. */
-        feedCooldown: boolean;
-    };
+    affinity: PetAffinityView;
     /** Display configuration. */
     display: PetDisplayConfig;
-    /** User-customizable pet display name. */
+    /** The selected pet's registry identity. */
+    pet: {
+        /** Registry id. */
+        id: string;
+        /** Manifest display name (unrenamed default). */
+        displayName: string;
+        /** Manifest description. */
+        description: string;
+    };
+    /** The selected pet's display name (user rename or manifest default). */
     name: string;
     /** Treat (小鱼干) stock snapshot. */
     treats: {
@@ -77,14 +84,7 @@ export interface PetStateView {
     };
 }
 /** Result of `pet.interact`. */
-export interface PetInteractResult {
-    /** Reaction copy bubble. */
-    reaction: string;
-    /** Points gained (0 when inside the cooldown). */
-    delta: number;
-    /** Full affinity snapshot (same shape as state view). */
-    affinity: PetStateView['affinity'];
-}
+export type PetInteractResult = LedgerInteractionResult;
 declare module '@deepseek-ai/cordis' {
     interface Context {
         pet: PetService;
@@ -92,25 +92,21 @@ declare module '@deepseek-ai/cordis' {
 }
 /**
  * Cordis service exposing the pet RPC domain. Lazy: nothing is scanned or
- * written until a query or interaction arrives; event listeners update only
- * in-memory state, and persistence happens on interaction/config changes
- * plus every completed turn.
+ * written until an economic event or interaction arrives; event listeners
+ * update only in-memory state, and persistence happens on economic changes
+ * (turn rewards, feeds, config/name changes) — never on a read.
  */
 export declare class PetService extends Service {
     static inject: string[];
     private readonly machine;
-    private readonly affinityConfig;
-    private readonly treatConfig;
+    private readonly ledger;
+    private readonly registry;
     private readonly persistDir;
-    private persist;
-    /** Completed turns already rewarded, per session (turn numbers are per-session). */
-    private rewardedTurns;
     private enabled;
     private disposeActivity;
     /** Session whose most recent meaningful event currently drives the global pet. */
     private displaySession;
     private readonly sessionActivity;
-    private lastLegacyTurnRewardAt;
     constructor(ctx: Context, config?: PetConfig);
     /** Whether the pet service consumes session activity while enabled. */
     isEnabled(): boolean;
@@ -118,8 +114,24 @@ export declare class PetService extends Service {
     state(): Promise<PetStateView>;
     /** Current persisted display config (read-only view). */
     display(): PetDisplayConfig;
-    /** Current persisted pet name (read-only view). */
-    petName(): string;
+    /** RPC: the registry entries the browser half renders and selects from. */
+    pets(): Promise<PetDefinition[]>;
+    /** The loaded registry (the asset routes serve its entries). */
+    registrySnapshot(): PetRegistry;
+    /** The selected pet's registry entry. */
+    activeEntry(): NonNullable<PetRegistry['entries'][number]>;
+    /** Currently selected pet id (persisted). */
+    selectedPetId(): string;
+    /** The display name of one pet (user rename or manifest displayName). */
+    petName(petId?: string): string;
+    /** RPC: switch the selected pet (persisted, settings document mirrored). */
+    setPetId(petId: string): Promise<{
+        ok: true;
+        petId: string;
+    } | {
+        ok: false;
+        error: string;
+    }>;
     /** Start or stop the session-activity listeners that drive the pet. */
     setEnabled(enabled: boolean): void;
     private syncActivity;
@@ -139,7 +151,7 @@ export declare class PetService extends Service {
         ok: true;
         display: PetDisplayConfig;
     }>;
-    /** RPC: rename the pet (trimmed, 1–20 chars). */
+    /** RPC: rename the selected pet (trimmed, 1–20 chars, per-pet storage). */
     setName(name: string): Promise<{
         ok: true;
         name: string;
@@ -148,9 +160,9 @@ export declare class PetService extends Service {
         error: string;
     }>;
     /**
-     * Apply a committed settings section to the persisted display config. Called
-     * by the settings surface on every change; values are clamped exactly like
-     * the setConfig RPC so both write paths converge.
+     * Apply a committed settings section to the persisted selection and display
+     * config. Called by the settings surface on every change; values are
+     * clamped exactly like the setConfig RPC so both write paths converge.
      * @param section - the resolved settings section.
      */
     applySettingsSection(section: PetSettingsSection): void;
@@ -160,17 +172,7 @@ export declare class PetService extends Service {
     private rewardTurn;
     /** Preserve turn rewards for installations that only emit legacy activity. */
     private rewardLegacyTurn;
-    /** Persist one accepted completed-turn reward. */
-    private applyTurnReward;
-    /**
-     * Settle the treat economy (work + time output since the last settlement)
-     * and persist whenever the ledger changed. A zero-gain first settlement
-     * still starts the time clock (anchor write), which is what lets the
-     * 30-minute time output ever accrue.
-     */
-    private settleTreats;
     private view;
-    private affinityView;
     private flush;
 }
 //# sourceMappingURL=service.d.ts.map

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":"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"}

package/lib/types/service.js

@@ -1,136 +1,60 @@
 /**
- * Pet host service — the `pet.*` RPC domain. Owns the state machine wiring
- * (projects official session events and accepts legacy `activity/status`), the
- * affinity ledger, and the persisted display config. The API gateway maps
- * this service's methods onto `pet.state` / `pet.interact` /
- * `pet.setVisible` / `pet.setConfig` for browser consumers.
+ * Pet host service — the `pet.*` RPC domain. A composition facade: it wires
+ * the pure event projection (`event-projection`) onto the state machine,
+ * delegates the affinity economy to the ledger (`ledger`), and routes
+ * persistence through `persist`. The API gateway maps these methods onto
+ * `pet.state` / `pet.pets` / `pet.interact` / `pet.setVisible` /
+ * `pet.setConfig` / `pet.setName` / `pet.setPet` for browser consumers.
  * @module @linxin666/dsh-pet/service
  */
 import { Service } from '@deepseek-ai/cordis';
-import { applyInteraction, applyTurnReward, defaultAffinityConfig, rankOf, } from "./affinity.js";
-import { loadPetPersist, petHomeDir, savePetPersist, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN, DISPLAY_INSET_MAX, PET_NAME_MAX_LENGTH, } from "./persist.js";
-import { defaultTreatConfig, settleTreatGrants, consumeTreat, } from "./treats.js";
+import { emptyProjectionRuntime, isActivityPhase, projectOfficialEvent, } from "./event-projection.js";
+import { PetLedger } from "./ledger.js";
+import { DEFAULT_PET_NAME, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN, PET_NAME_MAX_LENGTH, loadPetPersist, petHomeDir, savePetPersist, } from "./persist.js";
+import { loadPetRegistry, petEntryView, petPackageRoot, } from "./registry.js";
 import { defaultPetStateConfig, PetStateMachine, } from "./state.js";
 /** Settings namespace of the pet capability. Spelled here rather than imported: the browser half spells the same value. */
 export const PET_SETTINGS_NAMESPACE = 'pet';
-/** Keep tool names readable inside the compact status bubble. */
-function displayToolName(name) {
-    const compact = name.replace(/\s+/g, ' ').trim() || '工具';
-    return compact.length <= 24 ? compact : `${compact.slice(0, 21)}...`;
-}
-/** Whether a legacy phase is part of the pet's supported vocabulary. */
-function isActivityPhase(phase) {
-    return ['idle', 'waiting', 'thinking', 'tool', 'review', 'done', 'failed'].includes(phase);
-}
-/**
- * Project the durable DSH session vocabulary into the pet's visual phases.
- * Unknown and log-only events do not disturb the last meaningful activity.
- */
-function projectOfficialEvent(event, runtime) {
-    switch (event.type) {
-        case 'turn/start':
-            runtime.activeTools.clear();
-            runtime.stepHadFailure = false;
-            return { input: { phase: 'waiting', line: '准备开始' } };
-        case 'step/start':
-            runtime.activeTools.clear();
-            runtime.stepHadFailure = false;
-            return { input: { phase: 'waiting', line: '等待模型响应' } };
-        case 'assistant/chunk': {
-            const { chunk } = event.data;
-            if (chunk.type === 'reasoning-delta' && chunk.text.length > 0) {
-                return { input: { phase: 'thinking', line: '正在思考' } };
-            }
-            if (chunk.type === 'text-delta' && chunk.text.length > 0) {
-                return { input: { phase: 'review', line: '整理回复中' } };
-            }
-            return undefined;
-        }
-        case 'assistant/message':
-            return { input: { phase: 'review', line: '整理回复中' } };
-        case 'tool/call':
-            runtime.activeTools.add(String(event.data.callId));
-            return {
-                input: {
-                    phase: 'tool',
-                    line: `正在使用 ${displayToolName(event.data.name)}`,
-                },
-            };
-        case 'tool/result': {
-            const block = event.data.message.content[0];
-            runtime.activeTools.delete(String(event.data.message.source.callId));
-            runtime.stepHadFailure ||= event.data.error !== undefined || block.isError === true;
-            if (runtime.activeTools.size > 0) {
-                return {
-                    input: {
-                        phase: 'tool',
-                        line: `还有 ${runtime.activeTools.size} 个工具运行中`,
-                    },
-                };
-            }
-            return runtime.stepHadFailure
-                ? { input: { phase: 'failed', line: '工具执行失败' } }
-                : { input: { phase: 'thinking', line: '处理工具结果' } };
-        }
-        case 'turn/end': {
-            runtime.activeTools.clear();
-            switch (event.data.reason.kind) {
-                case 'completed':
-                    return {
-                        input: { phase: 'done', line: '完成啦' },
-                        completedTurn: event.data.turn,
-                    };
-                case 'error':
-                    return { input: { phase: 'failed', line: '执行失败' } };
-                case 'max-tokens':
-                    return { input: { phase: 'failed', line: '达到输出上限' } };
-                case 'interrupted':
-                    return { input: { phase: 'failed', line: '执行意外中断' } };
-                case 'blocked':
-                    return { input: { phase: 'waiting', line: '等待继续' } };
-                case 'aborted':
-                    return { input: { phase: 'idle', line: '已停止' } };
-                default:
-                    // TurnEndReasonMap is merge-extensible; a newer ending must not
-                    // leave the pet showing stale in-progress work.
-                    return { input: { phase: 'idle' } };
-            }
-        }
-        default:
-            return undefined;
-    }
-}
 /**
  * Cordis service exposing the pet RPC domain. Lazy: nothing is scanned or
- * written until a query or interaction arrives; event listeners update only
- * in-memory state, and persistence happens on interaction/config changes
- * plus every completed turn.
+ * written until an economic event or interaction arrives; event listeners
+ * update only in-memory state, and persistence happens on economic changes
+ * (turn rewards, feeds, config/name changes) — never on a read.
  */
 export class PetService extends Service {
     static inject = [];
     machine;
-    affinityConfig;
-    treatConfig;
+    ledger;
+    registry;
     persistDir;
-    persist;
-    /** Completed turns already rewarded, per session (turn numbers are per-session). */
-    rewardedTurns = new Map();
     enabled;
     disposeActivity;
     /** Session whose most recent meaningful event currently drives the global pet. */
     displaySession;
     sessionActivity = new WeakMap();
-    lastLegacyTurnRewardAt = 0;
     constructor(ctx, config = {}) {
         super(ctx, 'pet');
         this.persistDir = config.persistDir ?? petHomeDir();
-        this.affinityConfig = { ...defaultAffinityConfig, ...(config.affinity ?? {}) };
-        this.treatConfig = { ...defaultTreatConfig, ...(config.treats ?? {}) };
+        this.registry = config.registry
+            ?? loadPetRegistry({
+                packageRoot: petPackageRoot(import.meta.url),
+                ...(config.pets === undefined ? {} : { extra: config.pets }),
+            });
+        if (this.registry.entries.length === 0) {
+            throw new Error('[dsh-pet] no valid pet manifests found; nothing to render');
+        }
+        let persist = loadPetPersist(this.persistDir);
+        if (this.registry.byId(persist.petId) === undefined) {
+            // The selected pet no longer exists (removed or a fresh install with a
+            // copied pet.json): fall back to the registry default.
+            persist = { ...persist, petId: this.registry.defaultEntry().id };
+        }
+        const ledgerConfig = { affinity: config.affinity, treats: config.treats };
+        this.ledger = new PetLedger(persist, ledgerConfig);
         this.machine = new PetStateMachine({
             ...defaultPetStateConfig,
             ...(config.state ?? {}),
         });
-        this.persist = loadPetPersist(this.persistDir);
         this.enabled = config.enabled ?? true;
         this.syncActivity();
     }
@@ -144,11 +68,40 @@ export class PetService extends Service {
     }
     /** Current persisted display config (read-only view). */
     display() {
-        return { ...this.persist.display };
+        return { ...this.ledger.snapshot.display };
+    }
+    /** RPC: the registry entries the browser half renders and selects from. */
+    async pets() {
+        return this.registry.entries.map(petEntryView);
+    }
+    /** The loaded registry (the asset routes serve its entries). */
+    registrySnapshot() {
+        return this.registry;
+    }
+    /** The selected pet's registry entry. */
+    activeEntry() {
+        return this.registry.byId(this.selectedPetId()) ?? this.registry.defaultEntry();
+    }
+    /** Currently selected pet id (persisted). */
+    selectedPetId() {
+        return this.ledger.snapshot.petId;
     }
-    /** Current persisted pet name (read-only view). */
-    petName() {
-        return this.persist.name;
+    /** The display name of one pet (user rename or manifest displayName). */
+    petName(petId = this.selectedPetId()) {
+        const stored = this.ledger.snapshot.names[petId];
+        if (stored !== undefined && stored.trim() !== '')
+            return stored;
+        return this.registry.byId(petId)?.displayName ?? DEFAULT_PET_NAME;
+    }
+    /** RPC: switch the selected pet (persisted, settings document mirrored). */
+    async setPetId(petId) {
+        const entry = this.registry.byId(petId);
+        if (entry === undefined)
+            return { ok: false, error: 'unknown-pet' };
+        this.ledger.setPetId(entry.id);
+        this.flush();
+        this.syncSettingsFromPet();
+        return { ok: true, petId: entry.id };
     }
     /** Start or stop the session-activity listeners that drive the pet. */
     setEnabled(enabled) {
@@ -210,11 +163,7 @@ export class PetService extends Service {
     activityRuntime(session) {
         let runtime = this.sessionActivity.get(session);
         if (runtime === undefined) {
-            runtime = {
-                activeTools: new Set(),
-                officialEventsSeen: false,
-                stepHadFailure: false,
-            };
+            runtime = emptyProjectionRuntime();
             this.sessionActivity.set(session, runtime);
         }
         return runtime;
@@ -228,78 +177,61 @@ export class PetService extends Service {
     /** RPC: pet or feed the pet. */
     async interact(kind) {
         const nowMs = Date.now();
-        // Feeding consumes a treat: settle the economy first (work + time
-        // output since the last settlement), then gate on the feed cooldown
-        // BEFORE spending stock — a feed inside the cooldown must not burn a
-        // treat for nothing.
-        if (kind === 'feed')
-            this.settleTreats(nowMs);
-        const outcome = applyInteraction(this.persist.affinity, kind, nowMs, this.affinityConfig);
-        if (kind === 'feed' && !outcome.accepted) {
-            return { reaction: outcome.reaction, delta: 0, affinity: this.affinityView(this.persist.affinity) };
-        }
-        if (kind === 'feed') {
-            const consume = consumeTreat(this.persist.treats);
-            if (!consume.ok) {
-                const affinity = this.affinityView(this.persist.affinity);
-                return {
-                    reaction: '没有小鱼干了，多陪鲸鱼娘工作一会儿吧～',
-                    delta: 0,
-                    affinity,
-                };
-            }
-            this.persist = { ...this.persist, treats: consume.ledger };
-        }
-        if (outcome.accepted) {
-            this.persist = { ...this.persist, affinity: outcome.affinity };
+        const result = this.ledger.interact(kind, nowMs);
+        if (this.ledger.takeDirty())
             this.flush();
-        }
-        const affinity = this.affinityView(outcome.affinity);
-        return { reaction: outcome.reaction, delta: outcome.delta, affinity };
+        return result;
     }
     /** RPC: show or hide the pet. */
     async setVisible(visible) {
-        this.persist = { ...this.persist, display: { ...this.persist.display, visible } };
+        this.ledger.setDisplay({ ...this.ledger.snapshot.display, visible });
         this.flush();
         this.syncSettingsFromPet();
-        return { ok: true, display: this.persist.display };
+        return { ok: true, display: this.ledger.snapshot.display };
     }
     /** RPC: update display config (size / position). Values are clamped to whole pixels. */
     async setConfig(patch) {
-        const next = { ...this.persist.display, ...patch };
+        const next = { ...this.ledger.snapshot.display, ...patch };
         next.size = Math.round(Math.min(DISPLAY_SIZE_MAX, Math.max(DISPLAY_SIZE_MIN, next.size)));
         next.right = Math.round(Math.min(DISPLAY_INSET_MAX, Math.max(0, next.right)));
         next.bottom = Math.round(Math.min(DISPLAY_INSET_MAX, Math.max(0, next.bottom)));
-        this.persist = { ...this.persist, display: next };
+        this.ledger.setDisplay(next);
         this.flush();
         this.syncSettingsFromPet();
-        return { ok: true, display: this.persist.display };
+        return { ok: true, display: this.ledger.snapshot.display };
     }
-    /** RPC: rename the pet (trimmed, 1–20 chars). */
+    /** RPC: rename the selected pet (trimmed, 1–20 chars, per-pet storage). */
     async setName(name) {
         const trimmed = name.trim();
         if (trimmed === '')
             return { ok: false, error: 'name-empty' };
         if (trimmed.length > PET_NAME_MAX_LENGTH)
             return { ok: false, error: 'name-too-long' };
-        this.persist = { ...this.persist, name: trimmed };
+        this.ledger.setPetName(this.selectedPetId(), trimmed);
         this.flush();
-        this.syncSettingsFromPet();
         return { ok: true, name: trimmed };
     }
     /**
-     * Apply a committed settings section to the persisted display config. Called
-     * by the settings surface on every change; values are clamped exactly like
-     * the setConfig RPC so both write paths converge.
+     * Apply a committed settings section to the persisted selection and display
+     * config. Called by the settings surface on every change; values are
+     * clamped exactly like the setConfig RPC so both write paths converge.
      * @param section - the resolved settings section.
      */
     applySettingsSection(section) {
-        const next = { ...this.persist.display };
+        if (typeof section.petId === 'string' && this.registry.byId(section.petId) !== undefined) {
+            this.ledger.setPetId(section.petId);
+        }
+        else if (section.petId !== undefined) {
+            // The stored selection names a pet the registry no longer has: keep the
+            // current selection and repair the settings document.
+            this.syncSettingsFromPet();
+        }
+        const next = { ...this.ledger.snapshot.display };
         next.visible = section.visible && (section.enabled ?? true);
         next.size = Math.round(Math.min(DISPLAY_SIZE_MAX, Math.max(DISPLAY_SIZE_MIN, section.size)));
         next.right = Math.round(Math.min(DISPLAY_INSET_MAX, Math.max(0, section.right)));
         next.bottom = Math.round(Math.min(DISPLAY_INSET_MAX, Math.max(0, section.bottom)));
-        this.persist = { ...this.persist, display: next, name: section.name.trim() };
+        this.ledger.setDisplay(next);
         this.flush();
     }
     /** Mirror the persisted display config into the settings document (best-effort). */
@@ -307,86 +239,54 @@ export class PetService extends Service {
         const settings = this.ctx.get('settings', false);
         if (settings === undefined)
             return;
+        const snapshot = this.ledger.snapshot;
         void settings.update(PET_SETTINGS_NAMESPACE, {
-            visible: this.persist.display.visible,
-            size: this.persist.display.size,
-            right: this.persist.display.right,
-            bottom: this.persist.display.bottom,
-            name: this.persist.name,
+            visible: snapshot.display.visible,
+            size: snapshot.display.size,
+            right: snapshot.display.right,
+            bottom: snapshot.display.bottom,
+            petId: snapshot.petId,
         }).catch(() => {
             // A settings write failure must not break the pet's own persistence.
         });
     }
     /** Award the turn reward once per completed turn (idempotent per session + turn). */
     rewardTurn(sessionId, turn) {
-        const last = this.rewardedTurns.get(sessionId) ?? 0;
-        if (turn <= last)
-            return;
-        this.rewardedTurns.set(sessionId, turn);
-        this.applyTurnReward();
+        if (this.ledger.rewardTurn(sessionId, turn, Date.now()))
+            this.flush();
     }
     /** Preserve turn rewards for installations that only emit legacy activity. */
     rewardLegacyTurn() {
-        const nowMs = Date.now();
-        // A legacy `done` snapshot may repeat during the celebration window.
-        if (nowMs - this.lastLegacyTurnRewardAt < 5_000)
-            return;
-        this.lastLegacyTurnRewardAt = nowMs;
-        this.applyTurnReward();
-    }
-    /** Persist one accepted completed-turn reward. */
-    applyTurnReward() {
-        this.persist = { ...this.persist, affinity: applyTurnReward(this.persist.affinity, this.affinityConfig) };
-        this.flush();
-    }
-    /**
-     * Settle the treat economy (work + time output since the last settlement)
-     * and persist whenever the ledger changed. A zero-gain first settlement
-     * still starts the time clock (anchor write), which is what lets the
-     * 30-minute time output ever accrue.
-     */
-    settleTreats(nowMs) {
-        const settlement = settleTreatGrants(this.persist.treats, this.persist.affinity.turns, nowMs, this.treatConfig);
-        if (settlement.ledger !== this.persist.treats) {
-            this.persist = { ...this.persist, treats: settlement.ledger };
+        if (this.ledger.rewardLegacyTurn(Date.now()))
             this.flush();
-        }
     }
     view() {
         const snapshot = this.machine.render();
-        // Time-output treats accrue while the host is idle too; settle on read.
-        this.settleTreats(Date.now());
+        const entry = this.activeEntry();
+        // Read-only: the ledger settles on economic events only, never on a read,
+        // so polling the state cannot trigger pet.json writes.
         return {
             animation: snapshot.animation,
             ...(snapshot.bubble === undefined ? {} : { bubble: snapshot.bubble }),
             phase: snapshot.phase,
             sessionActive: snapshot.sessionActive,
-            affinity: this.affinityView(this.persist.affinity),
-            display: { ...this.persist.display },
-            name: this.persist.name,
+            affinity: this.ledger.affinityView(Date.now()),
+            display: { ...this.ledger.snapshot.display },
+            pet: {
+                id: entry.id,
+                displayName: entry.displayName,
+                description: entry.description,
+            },
+            name: this.petName(),
             treats: {
-                stocked: this.persist.treats.treats,
-                max: this.treatConfig.maxTreats,
+                stocked: this.ledger.snapshot.treats.treats,
+                max: this.ledger.treatMax,
             },
         };
     }
-    affinityView(affinity) {
-        const nowMs = Date.now();
-        const rank = rankOf(affinity.points);
-        return {
-            points: affinity.points,
-            rank: rank.name,
-            rankEmoji: rank.emoji,
-            pets: affinity.pets,
-            feeds: affinity.feeds,
-            turns: affinity.turns,
-            petCooldown: nowMs - affinity.lastPetAt < this.affinityConfig.petCooldownMs,
-            feedCooldown: nowMs - affinity.lastFeedAt < this.affinityConfig.feedCooldownMs,
-        };
-    }
     flush() {
         try {
-            savePetPersist(this.persist, this.persistDir);
+            savePetPersist(this.ledger.snapshot, this.persistDir);
         }
         catch {
             // Persistence is best-effort; the in-memory ledger keeps working.