@linxin666/dsh-pet 0.1.13 → 0.1.15

package/lib/types/event-projection.js

@@ -0,0 +1,98 @@
+/**
+ * Official session event projection — pure. Maps the durable DSH session
+ * vocabulary onto the pet's visual phases and carries an optional completed-
+ * turn reward for the ledger. Holds no state of its own; callers keep a
+ * {@link ProjectionRuntime} per session and feed events in arrival order.
+ * @module @linxin666/dsh-pet/event-projection
+ */
+/** Fresh projection runtime for a newly seen session. */
+export function emptyProjectionRuntime() {
+    return { activeTools: new Set(), officialEventsSeen: false, stepHadFailure: false };
+}
+/** 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. */
+export 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.
+ */
+export 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;
+    }
+}

package/lib/types/ledger.d.ts

@@ -0,0 +1,77 @@
+/**
+ * Pet affinity economy (ledger) — composes the pure affinity and treats
+ * modules with the cooldown/dedup bookkeeping and emits updated persistence
+ * snapshots, marking dirty so the owning facade decides when to flush. Read
+ * paths (view) no longer settle the economy; settlements happen on explicit
+ * economic events: completed-turn rewards (official or legacy) and feeds.
+ * @module @linxin666/dsh-pet/ledger
+ */
+import { type AffinityConfig, type PetAffinityView, type PetInteraction } from './affinity.ts';
+import { type TreatConfig } from './treats.ts';
+import type { PetDisplayConfig, PetPersist } from './persist.ts';
+/** Tuning overrides for the affinity economy. */
+export interface LedgerConfig {
+    affinity?: Partial<AffinityConfig>;
+    treats?: Partial<TreatConfig>;
+}
+/** Result of one ledger interaction (the shape the pet RPC returns). */
+export interface LedgerInteractionResult {
+    /** Reaction copy bubble. */
+    reaction: string;
+    /** Points gained (0 when inside the cooldown). */
+    delta: number;
+    /** Full affinity snapshot (same shape as the state view). */
+    affinity: PetAffinityView;
+}
+/**
+ * Holds the current persistence snapshot and all economy bookkeeping. Every
+ * mutating call flags takeDirty so the facade persists exactly once per
+ * batch of changes; read methods (snapshot, affinityView) never write.
+ */
+export declare class PetLedger {
+    private readonly affinityConfig;
+    private readonly treatConfig;
+    private current;
+    /** Completed turns already rewarded, per session (turn numbers are per-session). */
+    private rewardedTurns;
+    private lastLegacyTurnRewardAt;
+    private dirty;
+    constructor(persist: PetPersist, config?: LedgerConfig);
+    /** Affinity cooldown/rank tuning (read-only). */
+    get affinity(): AffinityConfig;
+    /** The current persistence snapshot (trade a copy when mutating). */
+    get snapshot(): PetPersist;
+    /** Stock cap reported to clients. */
+    get treatMax(): number;
+    /** Consume the pending-write flag if any mutation occurred. */
+    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;
+    /**
+     * Settle the treat economy (work + time output since the last settlement).
+     * A zero-gain first settlement still starts the time clock (anchor write),
+     * which is how the 30-minute time output can ever accrue. Returns true when
+     * the in-memory ledger changed and should be persisted.
+     */
+    settleTreats(nowMs: number): boolean;
+    /**
+     * Award the completed-turn reward once per session+turn (idempotent) and
+     * run the treat settlement that work output feeds. Returns true when the
+     * snapshot changed.
+     */
+    rewardTurn(sessionId: string, turn: number, nowMs: number): boolean;
+    /** Preserve turn rewards for installations that only emit legacy activity. */
+    rewardLegacyTurn(nowMs: number): boolean;
+    private applyTurnReward;
+    /**
+     * Pet or feed the pet. Feeding settles first, then gates on the feed
+     * cooldown before spending stock — a feed inside the cooldown must not burn
+     * a treat for nothing.
+     */
+    interact(kind: PetInteraction, nowMs: number): LedgerInteractionResult;
+    /** Current affinity view for the RPC snapshot. */
+    affinityView(nowMs: number): PetAffinityView;
+}
+//# sourceMappingURL=ledger.d.ts.map

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

@@ -0,0 +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"}

package/lib/types/ledger.js

@@ -0,0 +1,139 @@
+/**
+ * Pet affinity economy (ledger) — composes the pure affinity and treats
+ * modules with the cooldown/dedup bookkeeping and emits updated persistence
+ * snapshots, marking dirty so the owning facade decides when to flush. Read
+ * paths (view) no longer settle the economy; settlements happen on explicit
+ * economic events: completed-turn rewards (official or legacy) and feeds.
+ * @module @linxin666/dsh-pet/ledger
+ */
+import { applyInteraction, affinityViewOf, applyTurnReward, defaultAffinityConfig, } from "./affinity.js";
+import { consumeTreat, defaultTreatConfig, settleTreatGrants, } from "./treats.js";
+/**
+ * Holds the current persistence snapshot and all economy bookkeeping. Every
+ * mutating call flags takeDirty so the facade persists exactly once per
+ * batch of changes; read methods (snapshot, affinityView) never write.
+ */
+export class PetLedger {
+    affinityConfig;
+    treatConfig;
+    current;
+    /** Completed turns already rewarded, per session (turn numbers are per-session). */
+    rewardedTurns = new Map();
+    lastLegacyTurnRewardAt = 0;
+    dirty = false;
+    constructor(persist, config = {}) {
+        this.affinityConfig = { ...defaultAffinityConfig, ...(config.affinity ?? {}) };
+        this.treatConfig = { ...defaultTreatConfig, ...(config.treats ?? {}) };
+        this.current = persist;
+    }
+    /** Affinity cooldown/rank tuning (read-only). */
+    get affinity() {
+        return this.affinityConfig;
+    }
+    /** The current persistence snapshot (trade a copy when mutating). */
+    get snapshot() {
+        return this.current;
+    }
+    /** Stock cap reported to clients. */
+    get treatMax() {
+        return this.treatConfig.maxTreats;
+    }
+    /** Consume the pending-write flag if any mutation occurred. */
+    takeDirty() {
+        const was = this.dirty;
+        this.dirty = false;
+        return was;
+    }
+    /** Replace the display block (clamping stays a caller concern). */
+    setDisplay(display) {
+        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 };
+        this.dirty = true;
+    }
+    /**
+     * Settle the treat economy (work + time output since the last settlement).
+     * A zero-gain first settlement still starts the time clock (anchor write),
+     * which is how the 30-minute time output can ever accrue. Returns true when
+     * the in-memory ledger changed and should be persisted.
+     */
+    settleTreats(nowMs) {
+        const settlement = settleTreatGrants(this.current.treats, this.current.affinity.turns, nowMs, this.treatConfig);
+        if (settlement.ledger === this.current.treats)
+            return false;
+        this.current = { ...this.current, treats: settlement.ledger };
+        this.dirty = true;
+        return true;
+    }
+    /**
+     * Award the completed-turn reward once per session+turn (idempotent) and
+     * run the treat settlement that work output feeds. Returns true when the
+     * snapshot changed.
+     */
+    rewardTurn(sessionId, turn, nowMs) {
+        const last = this.rewardedTurns.get(sessionId) ?? 0;
+        if (turn <= last)
+            return false;
+        this.rewardedTurns.set(sessionId, turn);
+        let changed = this.applyTurnReward();
+        if (this.settleTreats(nowMs))
+            changed = true;
+        return changed;
+    }
+    /** Preserve turn rewards for installations that only emit legacy activity. */
+    rewardLegacyTurn(nowMs) {
+        // A legacy done snapshot may repeat during the celebration window.
+        if (nowMs - this.lastLegacyTurnRewardAt < 5_000)
+            return false;
+        this.lastLegacyTurnRewardAt = nowMs;
+        let changed = this.applyTurnReward();
+        if (this.settleTreats(nowMs))
+            changed = true;
+        return changed;
+    }
+    applyTurnReward() {
+        this.current = {
+            ...this.current,
+            affinity: applyTurnReward(this.current.affinity, this.affinityConfig),
+        };
+        this.dirty = true;
+        return true;
+    }
+    /**
+     * Pet or feed the pet. Feeding settles first, then gates on the feed
+     * cooldown before spending stock — a feed inside the cooldown must not burn
+     * a treat for nothing.
+     */
+    interact(kind, nowMs) {
+        if (kind === 'feed')
+            this.settleTreats(nowMs);
+        const outcome = applyInteraction(this.current.affinity, kind, nowMs, this.affinityConfig);
+        if (kind === 'feed' && !outcome.accepted) {
+            return { reaction: outcome.reaction, delta: 0, affinity: this.affinityView(nowMs) };
+        }
+        if (kind === 'feed') {
+            const consume = consumeTreat(this.current.treats);
+            if (!consume.ok) {
+                return {
+                    reaction: '没有小鱼干了，多陪鲸鱼娘工作一会儿吧～',
+                    delta: 0,
+                    affinity: this.affinityView(nowMs),
+                };
+            }
+            this.current = { ...this.current, treats: consume.ledger };
+            this.dirty = true;
+        }
+        if (outcome.accepted) {
+            this.current = { ...this.current, affinity: outcome.affinity };
+            this.dirty = true;
+        }
+        return { reaction: outcome.reaction, delta: outcome.delta, affinity: this.affinityView(nowMs) };
+    }
+    /** Current affinity view for the RPC snapshot. */
+    affinityView(nowMs) {
+        return affinityViewOf(this.current.affinity, nowMs, this.affinityConfig);
+    }
+}

package/lib/types/persist.d.ts

@@ -36,7 +36,11 @@ export declare const DEFAULT_PET_NAME = "\u9CB8\u9C7C\u5A18";
 /** Name constraints. */
 export declare const PET_NAME_MAX_LENGTH = 20;
 export declare function emptyPersist(): PetPersist;
-/** Resolve the persistence directory ($DSH_HOME or ~/.dsh). */
+/**
+ * Resolve the persistence directory ($DSH_HOME or ~/.dsh). Delegates to the
+ * shared {@link dshHome} resolution so the plugin family keeps one DSH_HOME
+ * definition (env override, ~ expansion, cwd-joined relative values).
+ */
 export declare function petHomeDir(): string;
 /** Load persisted state; missing or corrupt files fall back to defaults. */
 export declare function loadPetPersist(dir?: string): PetPersist;

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,+DAA+D;AAC/D,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,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"}

package/lib/types/persist.js

@@ -6,7 +6,7 @@
  */
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { homedir } from 'node:os';
+import { dshHome } from "./dsh-home.js";
 import { AFFINITY_MAX, emptyAffinity } from "./affinity.js";
 import { defaultTreatConfig, emptyTreatLedger } from "./treats.js";
 export const defaultDisplayConfig = {
@@ -31,9 +31,13 @@ export function emptyPersist() {
         display: { ...defaultDisplayConfig },
     };
 }
-/** Resolve the persistence directory ($DSH_HOME or ~/.dsh). */
+/**
+ * Resolve the persistence directory ($DSH_HOME or ~/.dsh). Delegates to the
+ * shared {@link dshHome} resolution so the plugin family keeps one DSH_HOME
+ * definition (env override, ~ expansion, cwd-joined relative values).
+ */
 export function petHomeDir() {
-    return process.env.DSH_HOME ?? join(homedir(), '.dsh');
+    return dshHome();
 }
 /** Numeric field guard: finite numbers only, else the fallback. */
 function finiteNum(value, fallback) {

package/lib/types/service.d.ts

@@ -1,16 +1,17 @@
 /**
- * Pet host service — the `pet.*` RPC domain. Owns the state machine wiring
- * (maps core rc.6 session events — turn/step/tool boundaries — and the
- * session lifecycle onto the pet phases), 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.interact` / `pet.setVisible` / `pet.setConfig` 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 PetStateConfig, type PetStateSnapshot } from './state.ts';
 /** Plugin configuration. */
 export interface PetConfig {
@@ -53,18 +54,7 @@ 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. */
@@ -78,14 +68,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;
@@ -93,21 +76,20 @@ 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 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;
     constructor(ctx: Context, config?: PetConfig);
     /** Whether the pet service consumes session activity while enabled. */
     isEnabled(): boolean;
@@ -120,6 +102,10 @@ export declare class PetService extends Service {
     /** Start or stop the session-activity listeners that drive the pet. */
     setEnabled(enabled: boolean): void;
     private syncActivity;
+    /** Return the projection state associated with one live session. */
+    private activityRuntime;
+    /** Commit one activity as the host-global pet's most recent display state. */
+    private applyActivity;
     /** RPC: pet or feed the pet. */
     interact(kind: PetInteraction): Promise<PetInteractResult>;
     /** RPC: show or hide the pet. */
@@ -151,15 +137,9 @@ export declare class PetService extends Service {
     private syncSettingsFromPet;
     /** Award the turn reward once per completed turn (idempotent per session + turn). */
     private rewardTurn;
-    /**
-     * 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;
+    /** Preserve turn rewards for installations that only emit legacy activity. */
+    private rewardLegacyTurn;
     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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"}