@linxin666/dsh-pet 0.4.8 → 0.4.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/README.i18n.yaml +2 -2
  2. package/README.md +7 -2
  3. package/README.zh.md +7 -2
  4. package/contracts/voice-pack-v1.schema.json +27 -0
  5. package/lib/client.js +24 -13
  6. package/lib/client.js.map +1 -1
  7. package/lib/index.js +160 -28
  8. package/lib/types/affinity.d.ts +26 -3
  9. package/lib/types/affinity.d.ts.map +1 -1
  10. package/lib/types/affinity.js +27 -4
  11. package/lib/types/client/PetDockEntry.d.ts +5 -0
  12. package/lib/types/client/PetDockEntry.d.ts.map +1 -1
  13. package/lib/types/client/PetDockEntry.js +1 -1
  14. package/lib/types/client/PetSprite.d.ts +5 -0
  15. package/lib/types/client/PetSprite.d.ts.map +1 -1
  16. package/lib/types/client/PetSprite.js +20 -8
  17. package/lib/types/client/index.d.ts.map +1 -1
  18. package/lib/types/client/index.js +15 -1
  19. package/lib/types/index.d.ts +1 -1
  20. package/lib/types/index.d.ts.map +1 -1
  21. package/lib/types/ledger.d.ts +10 -1
  22. package/lib/types/ledger.d.ts.map +1 -1
  23. package/lib/types/ledger.js +11 -1
  24. package/lib/types/pair-access.d.ts.map +1 -1
  25. package/lib/types/pair-access.js +26 -3
  26. package/lib/types/service.d.ts +14 -12
  27. package/lib/types/service.d.ts.map +1 -1
  28. package/lib/types/service.js +22 -17
  29. package/lib/types/voice-pack.d.ts +20 -1
  30. package/lib/types/voice-pack.d.ts.map +1 -1
  31. package/lib/types/voice-pack.js +86 -3
  32. package/package.json +24 -24
  33. package/src/affinity.test.ts +42 -0
  34. package/src/affinity.ts +46 -3
  35. package/src/client/PetDockEntry.tsx +6 -0
  36. package/src/client/PetSprite.test.tsx +42 -0
  37. package/src/client/PetSprite.tsx +24 -8
  38. package/src/client/index.test.tsx +4 -0
  39. package/src/client/index.ts +15 -1
  40. package/src/index.ts +2 -0
  41. package/src/ledger.test.ts +19 -0
  42. package/src/ledger.ts +15 -1
  43. package/src/pair-access.ts +26 -3
  44. package/src/service.test.ts +61 -0
  45. package/src/service.ts +27 -18
  46. package/src/voice-pack.test.ts +112 -0
  47. package/src/voice-pack.ts +101 -3
@@ -1 +1 @@
1
- {"version":3,"file":"ledger.d.ts","sourceRoot":"","sources":["../../src/ledger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ledger.d.ts","sourceRoot":"","sources":["../../src/ledger.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,8 @@ export class PetLedger {
19
19
  treatConfig;
20
20
  /** Round-robin reaction picker; rebuilt when the selected pet changes. */
21
21
  picker;
22
+ /** Declared rank ladder; undefined keeps the built-in whale ladder. */
23
+ rankLadder;
22
24
  current;
23
25
  /** Completed turns already rewarded, per session (turn numbers are per-session). */
24
26
  rewardedTurns = new Map();
@@ -28,6 +30,7 @@ export class PetLedger {
28
30
  this.affinityConfig = { ...defaultAffinityConfig, ...(config.affinity ?? {}) };
29
31
  this.treatConfig = { ...defaultTreatConfig, ...(config.treats ?? {}) };
30
32
  this.picker = new RemarkPicker(config.remarks, config.voiceRemarks);
33
+ this.rankLadder = config.rankLadder;
31
34
  this.current = persist;
32
35
  }
33
36
  /** Affinity cooldown/rank tuning (read-only). */
@@ -109,6 +112,13 @@ export class PetLedger {
109
112
  setRemarks(remarks, voiceRemarks) {
110
113
  this.picker = new RemarkPicker(remarks, voiceRemarks);
111
114
  }
115
+ /**
116
+ * Swap the display-only rank ladder to the selected pet's declared one
117
+ * (called on pet selection). Undefined restores the built-in ladder.
118
+ */
119
+ setRankLadder(ladder) {
120
+ this.rankLadder = ladder;
121
+ }
112
122
  /**
113
123
  * Settle the treat economy (work + time output since the last settlement).
114
124
  * A zero-gain first settlement still starts the time clock (anchor write),
@@ -229,6 +239,6 @@ export class PetLedger {
229
239
  }
230
240
  /** Current affinity view for the RPC snapshot. */
231
241
  affinityView(nowMs) {
232
- return affinityViewOf(this.current.affinity, nowMs, this.affinityConfig);
242
+ return affinityViewOf(this.current.affinity, nowMs, this.affinityConfig, this.rankLadder);
233
243
  }
234
244
  }
@@ -1 +1 @@
1
- {"version":3,"file":"pair-access.d.ts","sourceRoot":"","sources":["../../src/pair-access.ts"],"names":[],"mappings":"AACA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAGhD,0EAA0E;AAC1E,UAAU,aAAa;IACrB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAA;CAClD;AAED;;;;;GAKG;AACH,UAAU,SAAS;IACjB,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;IAC7C,kBAAkB,CAAC,EAAE,aAAa,CAAA;CACnC;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAK3F"}
1
+ {"version":3,"file":"pair-access.d.ts","sourceRoot":"","sources":["../../src/pair-access.ts"],"names":[],"mappings":"AACA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAGhD,0EAA0E;AAC1E,UAAU,aAAa;IACrB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAA;CAClD;AAED;;;;;GAKG;AACH,UAAU,SAAS;IACjB,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;IAC7C,kBAAkB,CAAC,EAAE,aAAa,CAAA;CACnC;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAG3F"}
@@ -8,9 +8,32 @@ import { isLoopbackRequest } from "./loopback.js";
8
8
  export function isPairedOrLoopbackAllowed(ctx, request) {
9
9
  if (isLoopbackRequest(request))
10
10
  return true;
11
- const fromGet = typeof ctx.get === 'function' ? ctx.get('remoteWebUiPairing', false) : undefined;
12
- const pairing = (isPairingAccess(fromGet) ? fromGet : ctx.remoteWebUiPairing);
13
- return pairing?.isPairedDevice(request) === true;
11
+ return lookupPairing(ctx)?.isPairedDevice(request) === true;
12
+ }
13
+ /**
14
+ * The pairing service, or undefined when this composition does not expose it.
15
+ *
16
+ * Two lookups exist because the fence is shared with test harnesses that hand
17
+ * over a bare object: a real cordis context resolves services through `get`, a
18
+ * harness may carry the property directly. `get(name, false)` is the
19
+ * non-strict form, so an unloaded service answers undefined rather than
20
+ * throwing. Reading an un-injected service as a PROPERTY throws instead
21
+ * (`cannot get property "remoteWebUiPairing" without inject`); a trust fence
22
+ * must answer "not paired" in that case, never leak the error into the route
23
+ * handler, where the host web server turns it into an empty-body 400 (#1942).
24
+ */
25
+ function lookupPairing(ctx) {
26
+ if (typeof ctx.get === 'function') {
27
+ const viaGet = ctx.get('remoteWebUiPairing', false);
28
+ return isPairingAccess(viaGet) ? viaGet : undefined;
29
+ }
30
+ try {
31
+ const viaProperty = ctx.remoteWebUiPairing;
32
+ return isPairingAccess(viaProperty) ? viaProperty : undefined;
33
+ }
34
+ catch {
35
+ return undefined;
36
+ }
14
37
  }
15
38
  function isPairingAccess(value) {
16
39
  return value !== undefined
@@ -309,19 +309,21 @@ export declare class PetService extends Service {
309
309
  /** Whether the pet service consumes session activity while enabled. */
310
310
  isEnabled(): boolean;
311
311
  /**
312
- * The remark layers one pet contributes to the ledger: its manifest pools
313
- * first, then the voice packs (a pet directory's voice.json over the global
314
- * `$DSH_HOME/pets/.voice.json`). Every path that seats the ledger's remark
315
- * pools resolves them here, so no call site can apply the manifest pools and
316
- * silently drop the voice layer: doing that reverted a pet whose lines a voice
317
- * pack had translated back to the built-in pools the moment the settings
318
- * surface applied.
319
- * @param entry - the pet whose remark pools apply.
320
- * @returns the layers `PetLedger.setRemarks` takes.
312
+ * The voice layers one pet contributes to the ledger: its manifest remark
313
+ * pools first, then the voice packs (a pet directory's voice.json over the
314
+ * global `$DSH_HOME/pets/.voice.json`). The voice pack's `panel.ranks`
315
+ * ladder rides the same merge, so a ladder declared by either layer applies
316
+ * with the documented precedence. Every path that seats these layers
317
+ * resolves them here, so no call site can apply the manifest pools and
318
+ * silently drop the voice layer: doing that reverted a pet whose lines a
319
+ * voice pack had translated back to the built-in pools the moment the
320
+ * settings surface applied.
321
+ * @param entry - the pet whose layers apply.
322
+ * @returns the layers `PetLedger` takes.
321
323
  */
322
- private remarkLayers;
323
- /** Re-seat the ledger's remark pools from one pet's layers. */
324
- private applyRemarks;
324
+ private voiceLayers;
325
+ /** Re-seat the ledger's remark pools and rank ladder from one pet's layers. */
326
+ private applyVoiceLayers;
325
327
  /** RPC: current pet state snapshot. */
326
328
  state(currentSessionId?: string): Promise<PetStateView>;
327
329
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACpF,OAAO,EAA2D,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAC7G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,EAAgC,KAAK,uBAAuB,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,EAAuB,KAAK,0BAA0B,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAClH,OAAO,EAWL,KAAK,gBAAgB,EACtB,MAAM,cAAc,CAAA;AACrB,OAAO,EAML,KAAK,aAAa,EAElB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,qBAAqB,EAC3B,MAAM,eAAe,CAAA;AAItB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAA;AAgBnB,4BAA4B;AAC5B,MAAM,WAAW,SAAS;IACxB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAClC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC/B,4BAA4B;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC7B,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iEAAiE;IACjE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,6EAA6E;IAC7E,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,0FAA0F;IAC1F,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,oEAAoE;IACpE,IAAI,CAAC,EAAE,SAAS,WAAW,EAAE,CAAA;CAC9B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC,2EAA2E;IAC3E,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,qBAAqB;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAA;IACb,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAA;IACd,kEAAkE;IAClE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iEAAiE;IACjE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,sEAAsE;IACtE,aAAa,CAAC,EAAE,mBAAmB,CAAA;CACpC;AAED;;;;;;;;;;GAUG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,KAAK,CAAA;AAEhD,0EAA0E;AAC1E,eAAO,MAAM,mBAAmB,EAAE,SAAS,mBAAmB,EAAoB,CAAA;AAElF,iFAAiF;AACjF,eAAO,MAAM,0BAA0B,EAAE,mBAA4B,CAAA;AAErE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAEpE;AAED,2HAA2H;AAC3H,eAAO,MAAM,sBAAsB,QAAQ,CAAA;AAE3C;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,SAAS,EAAE,MAAM,CAAA;IACjB,uDAAuD;IACvD,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACxC,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,yCAAyC;IACzC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAChC,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,gFAAgF;AAChF,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,wCAAwC;AACxC,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACxC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAA;IAC3B,gCAAgC;IAChC,QAAQ,EAAE,eAAe,CAAA;IACzB,6BAA6B;IAC7B,OAAO,EAAE,gBAAgB,CAAA;IACzB,4CAA4C;IAC5C,GAAG,EAAE;QACH,mBAAmB;QACnB,EAAE,EAAE,MAAM,CAAA;QACV,iDAAiD;QACjD,WAAW,EAAE,MAAM,CAAA;QACnB,4BAA4B;QAC5B,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,kCAAkC;IAClC,MAAM,EAAE;QACN,0BAA0B;QAC1B,OAAO,EAAE,MAAM,CAAA;QACf,iBAAiB;QACjB,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD;;;;OAIG;IACH,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,oBAAoB,CAAA;IAC/B;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,eAAe,CAAA;IAC9B;;;;OAIG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAA;IACjC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;;;OAIG;IACH,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACpC;AAED,gCAAgC;AAChC,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAA;AAEvD,+FAA+F;AAC/F,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,yEAAyE;IACzE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB;AAED,uEAAuE;AACvE,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,OAAO,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,0DAA0D;IAC1D,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,yBAAyB;IACzB,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC5B,mEAAmE;IACnE,KAAK,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C,IAAI,CAAC,EAAE,oBAAoB,CAAA;CAC5B;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,GAAG,EAAE,UAAU,CAAA;KAChB;CACF;AAgBD;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,OAAO;IACrC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAK;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,OAAO,CAAS;IACxB,0EAA0E;IAC1E,OAAO,CAAC,iBAAiB,CAAS;IAClC,yEAAyE;IACzE,OAAO,CAAC,aAAa,CAAqB;IAC1C;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IACnE,OAAO,CAAC,eAAe,CAA0B;IACjD,kFAAkF;IAClF,OAAO,CAAC,cAAc,CAAqB;IAC3C;;;;OAIG;IACH,OAAO,CAAC,UAAU,CAA8D;IAChF;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;IACtE;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4B;IACzD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAyB;IAC/D;;;;;;;OAOG;IACH,yBAAyB,EAAE,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CAAY;gBAEjE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,SAAc;IAiChD;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAYlB,uEAAuE;IACvE,SAAS,IAAI,OAAO;IAIpB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,YAAY;IAOpB,+DAA+D;IAC/D,OAAO,CAAC,YAAY;IAKpB,uCAAuC;IACjC,KAAK,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI7D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE;IAsBzC;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAK1B;;;;;;;;;;;;;;;;;;OAkBG;IACH,mBAAmB,CAAC,MAAM,EAAE,0BAA0B,GAAG,MAAM,IAAI;IAInE;;;;;;;;OAQG;IACG,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAS7E,yDAAyD;IACzD,OAAO,IAAI,gBAAgB;IAI3B,2EAA2E;IACrE,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAItC,gEAAgE;IAChE,gBAAgB,IAAI,WAAW;IAI/B,wEAAwE;IAClE,WAAW,IAAI,OAAO,CAAC;QAAE,WAAW,EAAE,qBAAqB,EAAE,CAAA;KAAE,CAAC;IAItE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAMxB,yCAAyC;IACzC,WAAW,IAAI,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;IAI1D,6CAA6C;IAC7C,aAAa,IAAI,MAAM;IAIvB,yEAAyE;IACzE,OAAO,CAAC,KAAK,GAAE,MAA6B,GAAG,MAAM;IAMrD,4EAA4E;IACtE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAUlG,uEAAuE;IACvE,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAMlC,OAAO,CAAC,YAAY;IAuEpB,uGAAuG;IACvG,OAAO,CAAC,aAAa;IAMrB,0EAA0E;IAC1E,OAAO,CAAC,UAAU;IAclB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAqBrB,gCAAgC;IAC1B,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAahE,2DAA2D;IAC3D,OAAO,CAAC,WAAW;IAInB,mEAAmE;IACnE,OAAO,CAAC,aAAa;IAgBrB,+FAA+F;IAC/F,OAAO,CAAC,cAAc;IAatB;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAM3B,2DAA2D;IAC3D,OAAO,CAAC,cAAc;IAKtB;;;OAGG;IACG,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAuClE;;;;OAIG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAkB1E,yEAAyE;IACnE,gBAAgB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAexD,0EAA0E;IACpE,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAiCjE,iCAAiC;IAC3B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE,CAAC;IAOpF;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAMrB;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAc5G,6GAA6G;IACvG,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE,CAAC;IAYnG,2EAA2E;IACrE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAS/F;;;;;OAKG;IACH,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IA4BvD,oFAAoF;IACpF,OAAO,CAAC,mBAAmB;IAgB3B,qFAAqF;IACrF,OAAO,CAAC,UAAU;IAIlB,8EAA8E;IAC9E,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,IAAI;IAkGZ,OAAO,CAAC,KAAK;CAOd"}
1
+ {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,KAAK,EAAE,cAAc,EAAoB,eAAe,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACtG,OAAO,EAA2D,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAC7G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAS9C,OAAO,EAAgC,KAAK,uBAAuB,EAAE,MAAM,aAAa,CAAA;AACxF,OAAO,EAAuB,KAAK,0BAA0B,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAClH,OAAO,EAWL,KAAK,gBAAgB,EACtB,MAAM,cAAc,CAAA;AACrB,OAAO,EAML,KAAK,aAAa,EAElB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,qBAAqB,EAC3B,MAAM,eAAe,CAAA;AAItB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAA;AAgBnB,4BAA4B;AAC5B,MAAM,WAAW,SAAS;IACxB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAClC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC/B,4BAA4B;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC7B,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,iEAAiE;IACjE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,6EAA6E;IAC7E,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,0FAA0F;IAC1F,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,oEAAoE;IACpE,IAAI,CAAC,EAAE,SAAS,WAAW,EAAE,CAAA;CAC9B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAkB;IACjC,2EAA2E;IAC3E,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,qBAAqB;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAA;IACb,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAA;IACd,kEAAkE;IAClE,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iEAAiE;IACjE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,sEAAsE;IACtE,aAAa,CAAC,EAAE,mBAAmB,CAAA;CACpC;AAED;;;;;;;;;;GAUG;AACH,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,KAAK,CAAA;AAEhD,0EAA0E;AAC1E,eAAO,MAAM,mBAAmB,EAAE,SAAS,mBAAmB,EAAoB,CAAA;AAElF,iFAAiF;AACjF,eAAO,MAAM,0BAA0B,EAAE,mBAA4B,CAAA;AAErE;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAEpE;AAED,2HAA2H;AAC3H,eAAO,MAAM,sBAAsB,QAAQ,CAAA;AAE3C;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,SAAS,EAAE,MAAM,CAAA;IACjB,uDAAuD;IACvD,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACxC,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,yCAAyC;IACzC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAChC,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,gFAAgF;AAChF,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,wCAAwC;AACxC,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;IACxC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAA;IAC3B,gCAAgC;IAChC,QAAQ,EAAE,eAAe,CAAA;IACzB,6BAA6B;IAC7B,OAAO,EAAE,gBAAgB,CAAA;IACzB,4CAA4C;IAC5C,GAAG,EAAE;QACH,mBAAmB;QACnB,EAAE,EAAE,MAAM,CAAA;QACV,iDAAiD;QACjD,WAAW,EAAE,MAAM,CAAA;QACnB,4BAA4B;QAC5B,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,yEAAyE;IACzE,IAAI,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,kCAAkC;IAClC,MAAM,EAAE;QACN,0BAA0B;QAC1B,OAAO,EAAE,MAAM,CAAA;QACf,iBAAiB;QACjB,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;IACD;;;;OAIG;IACH,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,oBAAoB,CAAA;IAC/B;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,eAAe,CAAA;IAC9B;;;;OAIG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAA;IACjC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC;;;;OAIG;IACH,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACpC;AAED,gCAAgC;AAChC,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAA;AAEvD,+FAA+F;AAC/F,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,yEAAyE;IACzE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB;AAED,uEAAuE;AACvE,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,OAAO,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,0DAA0D;IAC1D,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,yBAAyB;IACzB,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC5B,mEAAmE;IACnE,KAAK,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5C,IAAI,CAAC,EAAE,oBAAoB,CAAA;CAC5B;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,GAAG,EAAE,UAAU,CAAA;KAChB;CACF;AAgBD;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,OAAO;IACrC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAK;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,OAAO,CAAS;IACxB,0EAA0E;IAC1E,OAAO,CAAC,iBAAiB,CAAS;IAClC,yEAAyE;IACzE,OAAO,CAAC,aAAa,CAAqB;IAC1C;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IACnE,OAAO,CAAC,eAAe,CAA0B;IACjD,kFAAkF;IAClF,OAAO,CAAC,cAAc,CAAqB;IAC3C;;;;OAIG;IACH,OAAO,CAAC,UAAU,CAA8D;IAChF;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsC;IACtE;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4B;IACzD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAyB;IAC/D;;;;;;;OAOG;IACH,yBAAyB,EAAE,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CAAY;gBAEjE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,SAAc;IAiChD;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAYlB,uEAAuE;IACvE,SAAS,IAAI,OAAO;IAIpB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,WAAW;IAanB,+EAA+E;IAC/E,OAAO,CAAC,gBAAgB;IAMxB,uCAAuC;IACjC,KAAK,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI7D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE;IAsBzC;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAK1B;;;;;;;;;;;;;;;;;;OAkBG;IACH,mBAAmB,CAAC,MAAM,EAAE,0BAA0B,GAAG,MAAM,IAAI;IAInE;;;;;;;;OAQG;IACG,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAS7E,yDAAyD;IACzD,OAAO,IAAI,gBAAgB;IAI3B,2EAA2E;IACrE,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAItC,gEAAgE;IAChE,gBAAgB,IAAI,WAAW;IAI/B,wEAAwE;IAClE,WAAW,IAAI,OAAO,CAAC;QAAE,WAAW,EAAE,qBAAqB,EAAE,CAAA;KAAE,CAAC;IAItE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAMxB,yCAAyC;IACzC,WAAW,IAAI,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;IAI1D,6CAA6C;IAC7C,aAAa,IAAI,MAAM;IAIvB,yEAAyE;IACzE,OAAO,CAAC,KAAK,GAAE,MAA6B,GAAG,MAAM;IAMrD,4EAA4E;IACtE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAUlG,uEAAuE;IACvE,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAMlC,OAAO,CAAC,YAAY;IAuEpB,uGAAuG;IACvG,OAAO,CAAC,aAAa;IAMrB,0EAA0E;IAC1E,OAAO,CAAC,UAAU;IAclB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAqBrB,gCAAgC;IAC1B,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAahE,2DAA2D;IAC3D,OAAO,CAAC,WAAW;IAInB,mEAAmE;IACnE,OAAO,CAAC,aAAa;IAgBrB,+FAA+F;IAC/F,OAAO,CAAC,cAAc;IAatB;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAM3B,2DAA2D;IAC3D,OAAO,CAAC,cAAc;IAKtB;;;OAGG;IACG,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAuClE;;;;OAIG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAkB1E,yEAAyE;IACnE,gBAAgB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAexD,0EAA0E;IACpE,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAiCjE,iCAAiC;IAC3B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE,CAAC;IAOpF;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAMrB;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAc5G,6GAA6G;IACvG,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,gBAAgB,CAAA;KAAE,CAAC;IAYnG,2EAA2E;IACrE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAS/F;;;;;OAKG;IACH,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IA4BvD,oFAAoF;IACpF,OAAO,CAAC,mBAAmB;IAgB3B,qFAAqF;IACrF,OAAO,CAAC,UAAU;IAIlB,8EAA8E;IAC9E,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,IAAI;IAkGZ,OAAO,CAAC,KAAK;CAOd"}
@@ -125,7 +125,7 @@ export class PetService extends Service {
125
125
  const ledgerConfig = {
126
126
  affinity: config.affinity,
127
127
  treats: config.treats,
128
- ...this.remarkLayers(selected),
128
+ ...this.voiceLayers(selected),
129
129
  };
130
130
  this.ledger = new PetLedger(persist, ledgerConfig);
131
131
  this.stateConfig = { ...defaultPetStateConfig, ...(config.state ?? {}) };
@@ -156,26 +156,31 @@ export class PetService extends Service {
156
156
  return this.enabled;
157
157
  }
158
158
  /**
159
- * The remark layers one pet contributes to the ledger: its manifest pools
160
- * first, then the voice packs (a pet directory's voice.json over the global
161
- * `$DSH_HOME/pets/.voice.json`). Every path that seats the ledger's remark
162
- * pools resolves them here, so no call site can apply the manifest pools and
163
- * silently drop the voice layer: doing that reverted a pet whose lines a voice
164
- * pack had translated back to the built-in pools the moment the settings
165
- * surface applied.
166
- * @param entry - the pet whose remark pools apply.
167
- * @returns the layers `PetLedger.setRemarks` takes.
159
+ * The voice layers one pet contributes to the ledger: its manifest remark
160
+ * pools first, then the voice packs (a pet directory's voice.json over the
161
+ * global `$DSH_HOME/pets/.voice.json`). The voice pack's `panel.ranks`
162
+ * ladder rides the same merge, so a ladder declared by either layer applies
163
+ * with the documented precedence. Every path that seats these layers
164
+ * resolves them here, so no call site can apply the manifest pools and
165
+ * silently drop the voice layer: doing that reverted a pet whose lines a
166
+ * voice pack had translated back to the built-in pools the moment the
167
+ * settings surface applied.
168
+ * @param entry - the pet whose layers apply.
169
+ * @returns the layers `PetLedger` takes.
168
170
  */
169
- remarkLayers(entry) {
171
+ voiceLayers(entry) {
172
+ const voice = mergeVoicePacks(this.registry.globalVoice, entry.voice);
170
173
  return {
171
174
  remarks: entry.remarks,
172
- voiceRemarks: mergeVoicePacks(this.registry.globalVoice, entry.voice)?.remarks,
175
+ voiceRemarks: voice?.remarks,
176
+ rankLadder: voice?.panel?.ranks,
173
177
  };
174
178
  }
175
- /** Re-seat the ledger's remark pools from one pet's layers. */
176
- applyRemarks(entry) {
177
- const layers = this.remarkLayers(entry);
179
+ /** Re-seat the ledger's remark pools and rank ladder from one pet's layers. */
180
+ applyVoiceLayers(entry) {
181
+ const layers = this.voiceLayers(entry);
178
182
  this.ledger.setRemarks(layers.remarks, layers.voiceRemarks);
183
+ this.ledger.setRankLadder(layers.rankLadder);
179
184
  }
180
185
  /** RPC: current pet state snapshot. */
181
186
  async state(currentSessionId) {
@@ -314,7 +319,7 @@ export class PetService extends Service {
314
319
  if (entry === undefined)
315
320
  return { ok: false, error: 'unknown-pet' };
316
321
  this.ledger.setPetId(entry.id);
317
- this.applyRemarks(entry);
322
+ this.applyVoiceLayers(entry);
318
323
  this.flush();
319
324
  this.syncSettingsFromPet();
320
325
  return { ok: true, petId: entry.id };
@@ -720,7 +725,7 @@ export class PetService extends Service {
720
725
  const selected = typeof section.petId === 'string' ? this.registry.byId(section.petId) : undefined;
721
726
  if (selected !== undefined) {
722
727
  this.ledger.setPetId(selected.id);
723
- this.applyRemarks(selected);
728
+ this.applyVoiceLayers(selected);
724
729
  }
725
730
  else if (section.petId !== undefined) {
726
731
  // The stored selection names a pet the registry no longer has: keep the
@@ -29,6 +29,7 @@
29
29
  */
30
30
  import { type VoicePackOverrides, type WhisperCategory, type WhisperResult } from './chatter.ts';
31
31
  import { type PetRemarks } from './remarks.ts';
32
+ import type { AffinityRankName } from './affinity.ts';
32
33
  /** Schema version this module normalizes (optional field; missing = 1). */
33
34
  export declare const VOICE_PACK_V1: 1;
34
35
  /** Hover-panel action buttons a pack can show or hide (canonical order). */
@@ -48,6 +49,11 @@ export interface PetPanelView {
48
49
  stats?: Partial<Record<PanelStatKey, string>>;
49
50
  /** Actions to render in canonical order; absent = all three; [] = none. */
50
51
  actions?: PanelAction[];
52
+ /**
53
+ * Display-only affinity ladder: replaces the built-in tier names for this
54
+ * pet. Points, rewards, cooldowns and the persisted ledger are untouched.
55
+ */
56
+ ranks?: readonly AffinityRankName[];
51
57
  }
52
58
  /** One normalized voice pack (a pet's voice.json or the global override). */
53
59
  export interface VoicePack {
@@ -65,6 +71,10 @@ export declare const VOICE_POOL_LINES_MAX = 64;
65
71
  export declare const VOICE_LINE_MAX = 160;
66
72
  export declare const VOICE_LABEL_MAX = 40;
67
73
  export declare const VOICE_STAT_MAX = 80;
74
+ /** Hard cap on a pet-declared affinity ladder (entries). */
75
+ export declare const RANK_LADDER_MAX = 16;
76
+ /** Longest accepted rank name in a pet-declared ladder (characters). */
77
+ export declare const RANK_NAME_MAX = 24;
68
78
  type PoolKind = 'status' | 'tools' | 'toolRemaining' | 'whisperCategory' | 'whisperResult' | 'label' | 'stat';
69
79
  /**
70
80
  * Normalize one pool slot. Accepts a single line or an array; non-string
@@ -79,7 +89,16 @@ export declare function normalizePool(raw: unknown, kind: PoolKind, onWarning?:
79
89
  export declare function normalizeWhisperCategories(raw: unknown, onWarning?: (message: string) => void): Partial<Record<WhisperCategory, readonly string[]>> | undefined;
80
90
  /** Normalize whisper outcome pools; a key replaces that outcome's built-in pool (an explicit empty pool mutes it). */
81
91
  export declare function normalizeWhisperResults(raw: unknown, onWarning?: (message: string) => void): Partial<Record<WhisperResult, readonly string[]>> | undefined;
82
- /** Normalize the panel block (labels / stats / actions; warn-and-drop). */
92
+ /**
93
+ * Normalize one pet-declared affinity ladder (`panel.ranks`). A ladder is
94
+ * all-or-nothing: it must be an array of 1-{@link RANK_LADDER_MAX} entries,
95
+ * start at min 0, sort ascending with unique minima, and carry names of
96
+ * 1-{@link RANK_NAME_MAX} characters. Any violation warns and drops the
97
+ * whole ladder, so the pet keeps the built-in names instead of a half-broken
98
+ * ladder; a bad ladder never rejects the pet.
99
+ */
100
+ export declare function normalizeRankLadder(raw: unknown, onWarning?: (message: string) => void): AffinityRankName[] | undefined;
101
+ /** Normalize the panel block (labels / stats / actions / ranks; warn-and-drop). */
83
102
  export declare function normalizePanel(raw: unknown, onWarning?: (message: string) => void): PetPanelView | undefined;
84
103
  /** Voice-pack top-level fields ('$schema' mirrors the schema twin; drift-locked in tests). */
85
104
  export declare const VOICE_PACK_KEYS: Set<string>;
@@ -1 +1 @@
1
- {"version":3,"file":"voice-pack.d.ts","sourceRoot":"","sources":["../../src/voice-pack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"voice-pack.d.ts","sourceRoot":"","sources":["../../src/voice-pack.ts"],"names":[],"mappings":"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"}
@@ -42,6 +42,10 @@ export const VOICE_POOL_LINES_MAX = 64;
42
42
  export const VOICE_LINE_MAX = 160;
43
43
  export const VOICE_LABEL_MAX = 40;
44
44
  export const VOICE_STAT_MAX = 80;
45
+ /** Hard cap on a pet-declared affinity ladder (entries). */
46
+ export const RANK_LADDER_MAX = 16;
47
+ /** Longest accepted rank name in a pet-declared ladder (characters). */
48
+ export const RANK_NAME_MAX = 24;
45
49
  /** Any '{token}' placeholder (no nesting, no newlines). */
46
50
  const PLACEHOLDER_PATTERN = /{[^{}]*}/g;
47
51
  /** Allowed placeholder tokens per pool kind (absent kind = none allowed). */
@@ -150,7 +154,72 @@ export function normalizeWhisperResults(raw, onWarning = () => { }) {
150
154
  }
151
155
  return Object.keys(pools).length > 0 ? pools : undefined;
152
156
  }
153
- /** Normalize the panel block (labels / stats / actions; warn-and-drop). */
157
+ /** Validate one rank name slot of a declared ladder. */
158
+ function rankName(raw, index, field, onWarning) {
159
+ if (typeof raw !== 'string') {
160
+ onWarning('panel.ranks[' + index + '].' + field + ' must be a string');
161
+ return undefined;
162
+ }
163
+ const trimmed = raw.trim();
164
+ if (trimmed === '' || trimmed.length > RANK_NAME_MAX) {
165
+ onWarning('panel.ranks[' + index + '].' + field + ' must be 1-' + RANK_NAME_MAX + ' characters');
166
+ return undefined;
167
+ }
168
+ return trimmed;
169
+ }
170
+ /**
171
+ * Normalize one pet-declared affinity ladder (`panel.ranks`). A ladder is
172
+ * all-or-nothing: it must be an array of 1-{@link RANK_LADDER_MAX} entries,
173
+ * start at min 0, sort ascending with unique minima, and carry names of
174
+ * 1-{@link RANK_NAME_MAX} characters. Any violation warns and drops the
175
+ * whole ladder, so the pet keeps the built-in names instead of a half-broken
176
+ * ladder; a bad ladder never rejects the pet.
177
+ */
178
+ export function normalizeRankLadder(raw, onWarning = () => { }) {
179
+ if (!Array.isArray(raw)) {
180
+ onWarning('panel.ranks must be an array');
181
+ return undefined;
182
+ }
183
+ if (raw.length === 0 || raw.length > RANK_LADDER_MAX) {
184
+ onWarning('panel.ranks must contain 1-' + RANK_LADDER_MAX + ' entries');
185
+ return undefined;
186
+ }
187
+ const ladder = [];
188
+ let previousMin = -1;
189
+ for (let index = 0; index < raw.length; index++) {
190
+ const entry = raw[index];
191
+ if (!isRecord(entry)) {
192
+ onWarning('panel.ranks[' + index + '] must be an object');
193
+ return undefined;
194
+ }
195
+ const min = entry.min;
196
+ if (typeof min !== 'number' || !Number.isSafeInteger(min) || min < 0) {
197
+ onWarning('panel.ranks[' + index + '].min must be a non-negative integer');
198
+ return undefined;
199
+ }
200
+ if (index === 0 && min !== 0) {
201
+ onWarning('panel.ranks must start at min 0');
202
+ return undefined;
203
+ }
204
+ if (min <= previousMin) {
205
+ onWarning('panel.ranks must be sorted ascending with unique min values');
206
+ return undefined;
207
+ }
208
+ previousMin = min;
209
+ const defaultName = rankName(entry.name, index, 'name', onWarning);
210
+ if (defaultName === undefined)
211
+ return undefined;
212
+ let nameEn;
213
+ if (entry.nameEn !== undefined) {
214
+ nameEn = rankName(entry.nameEn, index, 'nameEn', onWarning);
215
+ if (nameEn === undefined)
216
+ return undefined;
217
+ }
218
+ ladder.push({ min, name: defaultName, ...(nameEn === undefined ? {} : { nameEn }) });
219
+ }
220
+ return ladder;
221
+ }
222
+ /** Normalize the panel block (labels / stats / actions / ranks; warn-and-drop). */
154
223
  export function normalizePanel(raw, onWarning = () => { }) {
155
224
  if (!isRecord(raw)) {
156
225
  onWarning('panel must be an object');
@@ -221,7 +290,14 @@ export function normalizePanel(raw, onWarning = () => { }) {
221
290
  panel.actions = PANEL_ACTIONS.filter(action => seen.has(action));
222
291
  }
223
292
  }
224
- if (panel.labels === undefined && panel.stats === undefined && panel.actions === undefined)
293
+ const ranksRaw = raw.ranks;
294
+ if (ranksRaw !== undefined) {
295
+ const ladder = normalizeRankLadder(ranksRaw, onWarning);
296
+ if (ladder !== undefined)
297
+ panel.ranks = ladder;
298
+ }
299
+ if (panel.labels === undefined && panel.stats === undefined
300
+ && panel.actions === undefined && panel.ranks === undefined)
225
301
  return undefined;
226
302
  return panel;
227
303
  }
@@ -364,6 +440,7 @@ export function mergeVoicePacks(...layers) {
364
440
  const stats = {};
365
441
  let remarks;
366
442
  let ranks;
443
+ let panelRanks;
367
444
  let actions;
368
445
  let panelSeen = false;
369
446
  let any = false;
@@ -390,6 +467,10 @@ export function mergeVoicePacks(...layers) {
390
467
  Object.assign(stats, layer.panel.stats);
391
468
  if (layer.panel.actions !== undefined)
392
469
  actions = layer.panel.actions;
470
+ // A ladder is atomic: a declaring layer replaces the previous ladder
471
+ // whole instead of merging tiers across layers.
472
+ if (layer.panel.ranks !== undefined)
473
+ panelRanks = layer.panel.ranks;
393
474
  }
394
475
  if (layer.remarks !== undefined) {
395
476
  remarks = { ...(remarks ?? {}), ...layer.remarks };
@@ -404,8 +485,10 @@ export function mergeVoicePacks(...layers) {
404
485
  ...(Object.keys(labels).length > 0 ? { labels } : {}),
405
486
  ...(Object.keys(stats).length > 0 ? { stats } : {}),
406
487
  ...(actions === undefined ? {} : { actions }),
488
+ ...(panelRanks === undefined ? {} : { ranks: panelRanks }),
407
489
  };
408
- const panelEmpty = panel.labels === undefined && panel.stats === undefined && panel.actions === undefined;
490
+ const panelEmpty = panel.labels === undefined && panel.stats === undefined
491
+ && panel.actions === undefined && panel.ranks === undefined;
409
492
  return {
410
493
  overrides,
411
494
  ...(panelSeen && !panelEmpty ? { panel } : {}),
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@linxin666/dsh-pet",
3
3
  "description": "Multi-pet companion plugin for the dsh web GUI: a registry-driven floating pet that reacts to model activity, with per-pet naming, petting/feeding interactions and an affinity score",
4
- "version": "0.4.8",
4
+ "version": "0.4.10",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
@@ -50,7 +50,7 @@
50
50
  "license": "Apache-2.0",
51
51
  "dsh": {
52
52
  "engines": {
53
- "dsh": ">=0.2.1-rc.2"
53
+ "dsh": ">=0.2.1-rc.3"
54
54
  },
55
55
  "bundle": {
56
56
  "patch": "./cordis.patch.yml"
@@ -71,33 +71,33 @@
71
71
  "clsx": "^2.1.1"
72
72
  },
73
73
  "peerDependencies": {
74
- "@deepseek-ai/dsh": ">=0.2.1-rc.2",
74
+ "@deepseek-ai/dsh": ">=0.2.1-rc.3",
75
75
  "react": "^18.2.0",
76
76
  "react-dom": "^18.2.0"
77
77
  },
78
78
  "devDependencies": {
79
79
  "@deepseek-ai/cordis": "~4.0.5",
80
- "@deepseek-ai/dsh-agent": "^0.2.1-rc.2",
81
- "@deepseek-ai/dsh-api-remotes": "^0.2.1-rc.2",
82
- "@deepseek-ai/dsh-api-session-controller": "^0.2.1-rc.2",
83
- "@deepseek-ai/dsh-api-workspace-controller": "^0.2.1-rc.2",
84
- "@deepseek-ai/dsh-client-locale": "^0.2.1-rc.2",
85
- "@deepseek-ai/dsh-client-store": "^0.2.1-rc.2",
86
- "@deepseek-ai/dsh-client-ui-conversation": "^0.2.1-rc.2",
87
- "@deepseek-ai/dsh-client-ui-renderer": "^0.2.1-rc.2",
88
- "@deepseek-ai/dsh-client-ui-settings": "^0.2.1-rc.2",
89
- "@deepseek-ai/dsh-client-ui-slots": "^0.2.1-rc.2",
90
- "@deepseek-ai/dsh-client-ui-workspace": "^0.2.1-rc.2",
91
- "@deepseek-ai/dsh-host-webserver": "^0.2.1-rc.2",
92
- "@deepseek-ai/dsh-llm": "^0.2.1-rc.2",
93
- "@deepseek-ai/dsh-scope": "^0.2.1-rc.2",
94
- "@deepseek-ai/dsh-session": "^0.2.1-rc.2",
95
- "@deepseek-ai/dsh-settings": "^0.2.1-rc.2",
96
- "@deepseek-ai/dsh-subagent": "^0.2.1-rc.2",
97
- "@deepseek-ai/dsh-timeout": "^0.2.1-rc.2",
98
- "@deepseek-ai/dsh-tools": "^0.2.1-rc.2",
99
- "@deepseek-ai/dsh-util-time": "^0.2.1-rc.2",
100
- "@deepseek-ai/dsh-util-values": "^0.2.1-rc.2",
80
+ "@deepseek-ai/dsh-agent": "^0.2.1-rc.3",
81
+ "@deepseek-ai/dsh-api-remotes": "^0.2.1-rc.3",
82
+ "@deepseek-ai/dsh-api-session-controller": "^0.2.1-rc.3",
83
+ "@deepseek-ai/dsh-api-workspace-controller": "^0.2.1-rc.3",
84
+ "@deepseek-ai/dsh-client-locale": "^0.2.1-rc.3",
85
+ "@deepseek-ai/dsh-client-store": "^0.2.1-rc.3",
86
+ "@deepseek-ai/dsh-client-ui-conversation": "^0.2.1-rc.3",
87
+ "@deepseek-ai/dsh-client-ui-renderer": "^0.2.1-rc.3",
88
+ "@deepseek-ai/dsh-client-ui-settings": "^0.2.1-rc.3",
89
+ "@deepseek-ai/dsh-client-ui-slots": "^0.2.1-rc.3",
90
+ "@deepseek-ai/dsh-client-ui-workspace": "^0.2.1-rc.3",
91
+ "@deepseek-ai/dsh-host-webserver": "^0.2.1-rc.3",
92
+ "@deepseek-ai/dsh-llm": "^0.2.1-rc.3",
93
+ "@deepseek-ai/dsh-scope": "^0.2.1-rc.3",
94
+ "@deepseek-ai/dsh-session": "^0.2.1-rc.3",
95
+ "@deepseek-ai/dsh-settings": "^0.2.1-rc.3",
96
+ "@deepseek-ai/dsh-subagent": "^0.2.1-rc.3",
97
+ "@deepseek-ai/dsh-timeout": "^0.2.1-rc.3",
98
+ "@deepseek-ai/dsh-tools": "^0.2.1-rc.3",
99
+ "@deepseek-ai/dsh-util-time": "^0.2.1-rc.3",
100
+ "@deepseek-ai/dsh-util-values": "^0.2.1-rc.3",
101
101
  "@testing-library/dom": "^10.4.1",
102
102
  "@testing-library/react": "^16.3.2",
103
103
  "@types/node": "^22.20.0",
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
2
2
  import {
3
3
  AFFINITY_MAX,
4
4
  AFFINITY_RANKS,
5
+ affinityViewOf,
5
6
  applyInteraction,
6
7
  applyTurnReward,
7
8
  defaultAffinityConfig,
@@ -82,6 +83,47 @@ describe('rankOf', () => {
82
83
  expect(rankOf(-1).name).toBe(AFFINITY_RANKS[0]!.name)
83
84
  })
84
85
 
86
+ it('maps points onto a declared ladder while keeping the built-in marker', () => {
87
+ const ladder = [
88
+ { min: 0, name: '小煤球', nameEn: 'Little Coal Ball' },
89
+ { min: 25, name: '火星伙伴', nameEn: 'Martian Buddy' },
90
+ { min: 50, name: '煤球挚友' },
91
+ ]
92
+ expect(rankOf(0, ladder).name).toBe('小煤球')
93
+ expect(rankOf(24, ladder).name).toBe('小煤球')
94
+ expect(rankOf(25, ladder).name).toBe('火星伙伴')
95
+ expect(rankOf(100_000, ladder).name).toBe('煤球挚友')
96
+ // Display-only: the built-in tier still supplies the marker glyph.
97
+ expect(rankOf(0, ladder).emoji).toBe(AFFINITY_RANKS[0]!.emoji)
98
+ expect(rankOf(100_000, ladder).emoji).toBe(AFFINITY_RANKS[AFFINITY_RANKS.length - 1]!.emoji)
99
+ })
100
+
101
+ it('keeps the built-in names for a pet that declares no ladder', () => {
102
+ expect(rankOf(0).name).toBe('幼鲸')
103
+ expect(rankOf(100_000).name).toBe('鲸生共渡')
104
+ })
105
+
106
+ it('carries nameEn into the affinity view only when the ladder declares it', () => {
107
+ const state = { ...emptyAffinity(), points: 25 }
108
+ const declared = affinityViewOf(state, 0, defaultAffinityConfig, [
109
+ { min: 0, name: '小煤球', nameEn: 'Little Coal Ball' },
110
+ { min: 25, name: '火星伙伴', nameEn: 'Martian Buddy' },
111
+ ])
112
+ expect(declared.rank).toBe('火星伙伴')
113
+ expect(declared.rankEn).toBe('Martian Buddy')
114
+ expect(declared.points).toBe(25)
115
+ expect(declared.rankEmoji).toBe(rankOf(25).emoji)
116
+
117
+ const chineseOnly = affinityViewOf(state, 0, defaultAffinityConfig, [{ min: 0, name: '小煤球' }])
118
+ expect(chineseOnly.rank).toBe('小煤球')
119
+ expect(chineseOnly.rankEn).toBeUndefined()
120
+ })
121
+
122
+ it('does not change the point economy', () => {
123
+ const outcome = applyInteraction(emptyAffinity(), 'feed', 1_000_000)
124
+ expect(outcome.affinity.points).toBe(defaultAffinityConfig.feedReward)
125
+ })
126
+
85
127
  it('extends past the removed 100 cap with higher tiers', () => {
86
128
  // The original four tiers keep their thresholds; the ladder now reaches
87
129
  // into the 999,999,999 range instead of freezing at 80 points.