@linxin666/dsh-pet 0.1.18 → 0.1.19

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

@@ -5,6 +5,10 @@
  * 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.
+ *
+ * Concurrent sessions each keep their own machine: the sprite animation
+ * follows the most recent meaningful event (the display session) while the
+ * state view carries one bubble per active session.
  * @module @linxin666/dsh-pet/service
  */
 import { Service } from '@deepseek-ai/cordis';
@@ -15,6 +19,8 @@ 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';
+/** Hard cap on simultaneously displayed session bubbles (most recent first). */
+export const MAX_SESSION_BUBBLES = 12;
 /**
  * Cordis service exposing the pet RPC domain. Lazy: nothing is scanned or
  * written until an economic event or interaction arrives; event listeners
@@ -24,6 +30,7 @@ export const PET_SETTINGS_NAMESPACE = 'pet';
 export class PetService extends Service {
     static inject = [];
     machine;
+    stateConfig;
     ledger;
     registry;
     persistDir;
@@ -31,7 +38,12 @@ export class PetService extends Service {
     disposeActivity;
     /** Session whose most recent meaningful event currently drives the global pet. */
     displaySession;
-    sessionActivity = new WeakMap();
+    /**
+     * Per-session activity, most recent last (Map insertion order). Bounded by
+     * MAX_SESSION_BUBBLES so a burst of sessions cannot grow it without bound;
+     * disposed sessions are removed by the 'session/disposed' listener.
+     */
+    sessionActivity = new Map();
     constructor(ctx, config = {}) {
         super(ctx, 'pet');
         this.persistDir = config.persistDir ?? petHomeDir();
@@ -49,12 +61,15 @@ export class PetService extends Service {
             // copied pet.json): fall back to the registry default.
             persist = { ...persist, petId: this.registry.defaultEntry().id };
         }
-        const ledgerConfig = { affinity: config.affinity, treats: config.treats };
+        const selected = this.registry.byId(persist.petId) ?? this.registry.defaultEntry();
+        const ledgerConfig = {
+            affinity: config.affinity,
+            treats: config.treats,
+            remarks: selected.remarks,
+        };
         this.ledger = new PetLedger(persist, ledgerConfig);
-        this.machine = new PetStateMachine({
-            ...defaultPetStateConfig,
-            ...(config.state ?? {}),
-        });
+        this.stateConfig = { ...defaultPetStateConfig, ...(config.state ?? {}) };
+        this.machine = new PetStateMachine(this.stateConfig);
         this.enabled = config.enabled ?? true;
         this.syncActivity();
     }
@@ -99,6 +114,7 @@ export class PetService extends Service {
         if (entry === undefined)
             return { ok: false, error: 'unknown-pet' };
         this.ledger.setPetId(entry.id);
+        this.ledger.setRemarks(entry.remarks);
         this.flush();
         this.syncSettingsFromPet();
         return { ok: true, petId: entry.id };
@@ -118,7 +134,7 @@ export class PetService extends Service {
         this.disposeActivity = (() => {
             const disposers = [
                 this.ctx.on('session/event', (session, event) => {
-                    const runtime = this.activityRuntime(session);
+                    const runtime = this.activityOf(session).runtime;
                     // `activity/status` is an optional compatibility input. It is not
                     // declared as a durable event type by this package because current
                     // Harness installations publish the official session vocabulary.
@@ -149,27 +165,63 @@ export class PetService extends Service {
                     }
                 }),
                 this.ctx.on('session/disposed', (session) => {
+                    this.ledger.forgetSession(String(session.id));
+                    this.sessionActivity.delete(session);
                     if (session !== this.displaySession)
                         return;
+                    // The display session is gone: fall back to the most recent
+                    // remaining session's last input, or settle to idle when none.
                     this.displaySession = undefined;
-                    this.machine.onSessionDisposed();
+                    const remaining = [...this.sessionActivity.entries()].at(-1);
+                    if (remaining !== undefined) {
+                        const [nextSession, activity] = remaining;
+                        this.displaySession = nextSession;
+                        if (activity.lastInput !== undefined)
+                            this.machine.onActivityStatus(activity.lastInput);
+                        this.machine.onSessionActive();
+                    }
+                    else {
+                        this.machine.onSessionDisposed();
+                    }
                 }),
             ];
             return () => { for (const dispose of disposers)
                 dispose(); };
         })();
     }
-    /** Return the projection state associated with one live session. */
-    activityRuntime(session) {
-        let runtime = this.sessionActivity.get(session);
-        if (runtime === undefined) {
-            runtime = emptyProjectionRuntime();
-            this.sessionActivity.set(session, runtime);
+    /** Return the per-session activity record, creating it on first sight. */
+    activityOf(session) {
+        let activity = this.sessionActivity.get(session);
+        if (activity === undefined) {
+            activity = {
+                runtime: emptyProjectionRuntime(),
+                machine: new PetStateMachine(this.stateConfig),
+            };
+            this.sessionActivity.set(session, activity);
         }
-        return runtime;
+        return activity;
     }
-    /** Commit one activity as the host-global pet's most recent display state. */
+    /**
+     * Commit one activity: the session's own machine renders its bubble, and
+     * the session becomes the host-global display session (most recent
+     * meaningful event wins the sprite animation).
+     */
     applyActivity(session, input) {
+        const activity = this.activityOf(session);
+        activity.lastInput = input;
+        activity.machine.onActivityStatus(input);
+        activity.machine.onSessionActive();
+        // Move to the tail so map order reads most-recent-last, then trim the
+        // oldest session states beyond the bubble cap. The display session is
+        // reassigned below, so trimming its stale predecessor is safe.
+        this.sessionActivity.delete(session);
+        this.sessionActivity.set(session, activity);
+        while (this.sessionActivity.size > MAX_SESSION_BUBBLES) {
+            const oldest = this.sessionActivity.keys().next().value;
+            if (oldest === undefined)
+                break;
+            this.sessionActivity.delete(oldest);
+        }
         this.displaySession = session;
         this.machine.onActivityStatus(input);
         this.machine.onSessionActive();
@@ -218,8 +270,10 @@ export class PetService extends Service {
      * @param section - the resolved settings section.
      */
     applySettingsSection(section) {
-        if (typeof section.petId === 'string' && this.registry.byId(section.petId) !== undefined) {
-            this.ledger.setPetId(section.petId);
+        const selected = typeof section.petId === 'string' ? this.registry.byId(section.petId) : undefined;
+        if (selected !== undefined) {
+            this.ledger.setPetId(selected.id);
+            this.ledger.setRemarks(selected.remarks);
         }
         else if (section.petId !== undefined) {
             // The stored selection names a pet the registry no longer has: keep the
@@ -263,6 +317,23 @@ export class PetService extends Service {
     view() {
         const snapshot = this.machine.render();
         const entry = this.activeEntry();
+        // One bubble per concurrently active session, most recent first.
+        // Sessions whose own machine has settled (no bubble copy) drop out, so a
+        // finished turn does not leave a stale bubble behind.
+        const sessions = [];
+        for (const [session, activity] of [...this.sessionActivity.entries()].reverse()) {
+            if (sessions.length >= MAX_SESSION_BUBBLES)
+                break;
+            const perSession = activity.machine.render();
+            if (perSession.bubble === undefined)
+                continue;
+            sessions.push({
+                sessionId: String(session.id),
+                animation: perSession.animation,
+                bubble: perSession.bubble,
+                phase: perSession.phase,
+            });
+        }
         // Read-only: the ledger settles on economic events only, never on a read,
         // so polling the state cannot trigger pet.json writes.
         return {
@@ -270,6 +341,7 @@ export class PetService extends Service {
             ...(snapshot.bubble === undefined ? {} : { bubble: snapshot.bubble }),
             phase: snapshot.phase,
             sessionActive: snapshot.sessionActive,
+            sessions,
             affinity: this.ledger.affinityView(Date.now()),
             display: { ...this.ledger.snapshot.display },
             pet: {

package/lib/types/state.js

@@ -94,11 +94,11 @@ export class PetStateMachine {
                 animation = 'idle';
             }
         }
-        const bubble = this.phase === 'done'
-            && this.doneAt !== undefined
-            && nowMs - this.doneAt >= this.config.celebrateMs
-            ? undefined
-            : this.phrase ?? this.line;
+        // Settled sessions never bubble: idle (e.g. an aborted/stopped turn)
+        // and done past its celebration window both fall silent.
+        const settled = this.phase === 'idle'
+            || (this.phase === 'done' && this.doneAt !== undefined && nowMs - this.doneAt >= this.config.celebrateMs);
+        const bubble = settled ? undefined : this.phrase ?? this.line;
         return {
             animation,
             ...(bubble === undefined ? {} : { bubble }),

package/lib/types/treats.d.ts

@@ -3,6 +3,9 @@
  * two sources, both tied to companionship:
  *  - work output: every N completed turns grant one treat;
  *  - time output: every T minutes of wall-clock time grant one treat.
+ * Difficulty tuned deliberately high (10x the original cadence): treats are
+ * a rare delicacy the pet earns through sustained companionship, not a
+ * routine drop.
  * Feeding consumes one treat. Settlement is lazy: it runs whenever the host
  * serves a state snapshot or an interaction, so there is no timer and no
  * drift — elapsed periods are computed from the persisted last-grant marks.

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

@@ -1 +1 @@
-{"version":3,"file":"treats.d.ts","sourceRoot":"","sources":["../../src/treats.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,4BAA4B;AAC5B,MAAM,WAAW,WAAW;IAC1B,6CAA6C;IAC7C,aAAa,EAAE,MAAM,CAAA;IACrB,2CAA2C;IAC3C,WAAW,EAAE,MAAM,CAAA;IACnB,kCAAkC;IAClC,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,kBAAkB,EAAE,WAIhC,CAAA;AAED,mDAAmD;AACnD,MAAM,WAAW,WAAW;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,iGAAiG;IACjG,gBAAgB,EAAE,MAAM,CAAA;IACxB,8EAA8E;IAC9E,qBAAqB,EAAE,MAAM,CAAA;CAC9B;AAED,wBAAgB,gBAAgB,IAAI,WAAW,CAE9C;AAED,sCAAsC;AACtC,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,MAAM,EAAE,WAAW,CAAA;IACnB,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAA;CACf;AAMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,WAAgC,GACvC,eAAe,CA6BjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,WAAW,GAClB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAGnD"}
+{"version":3,"file":"treats.d.ts","sourceRoot":"","sources":["../../src/treats.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,4BAA4B;AAC5B,MAAM,WAAW,WAAW;IAC1B,6CAA6C;IAC7C,aAAa,EAAE,MAAM,CAAA;IACrB,2CAA2C;IAC3C,WAAW,EAAE,MAAM,CAAA;IACnB,kCAAkC;IAClC,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,kBAAkB,EAAE,WAIhC,CAAA;AAED,mDAAmD;AACnD,MAAM,WAAW,WAAW;IAC1B,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAA;IACd,iGAAiG;IACjG,gBAAgB,EAAE,MAAM,CAAA;IACxB,8EAA8E;IAC9E,qBAAqB,EAAE,MAAM,CAAA;CAC9B;AAED,wBAAgB,gBAAgB,IAAI,WAAW,CAE9C;AAED,sCAAsC;AACtC,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,MAAM,EAAE,WAAW,CAAA;IACnB,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAA;CACf;AAMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,WAAgC,GACvC,eAAe,CA6BjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,WAAW,GAClB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAGnD"}

package/lib/types/treats.js

@@ -3,14 +3,17 @@
  * two sources, both tied to companionship:
  *  - work output: every N completed turns grant one treat;
  *  - time output: every T minutes of wall-clock time grant one treat.
+ * Difficulty tuned deliberately high (10x the original cadence): treats are
+ * a rare delicacy the pet earns through sustained companionship, not a
+ * routine drop.
  * Feeding consumes one treat. Settlement is lazy: it runs whenever the host
  * serves a state snapshot or an interaction, so there is no timer and no
  * drift — elapsed periods are computed from the persisted last-grant marks.
  * @module @linxin666/dsh-pet/treats
  */
 export const defaultTreatConfig = {
-    turnsPerTreat: 3,
-    timeTreatMs: 30 * 60_000,
+    turnsPerTreat: 30,
+    timeTreatMs: 300 * 60_000,
     maxTreats: 20,
 };
 export function emptyTreatLedger() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-pet",
   "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",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"

package/src/affinity.test.ts

@@ -52,6 +52,14 @@ describe('applyInteraction', () => {
     const state = { ...emptyAffinity(), points: AFFINITY_MAX - 1 }
     const outcome = applyInteraction(state, 'pet', 1_000_000)
     expect(outcome.affinity.points).toBe(AFFINITY_MAX)
+    expect(outcome.affinity.points).toBe(999_999_999)
+  })
+
+  it('keeps the legacy first lines as the default reactions', () => {
+    const outcome = applyInteraction(emptyAffinity(), 'pet', 1_000_000)
+    expect(outcome.reaction).toBe('咕噜咕噜～被摸摸好舒服！')
+    const feed = applyInteraction(emptyAffinity(), 'feed', 1_000_000)
+    expect(feed.reaction).toBe('呜哇！小鱼干好好吃！')
   })
 })
 
@@ -71,4 +79,15 @@ describe('rankOf', () => {
     expect(rankOf(AFFINITY_MAX).name).toBe(AFFINITY_RANKS[AFFINITY_RANKS.length - 1]!.name)
     expect(rankOf(-1).name).toBe(AFFINITY_RANKS[0]!.name)
   })
+
+  it('extends past the removed 100 cap with higher tiers', () => {
+    // The original four tiers keep their thresholds; the ladder now reaches
+    // into the 999,999,999 range instead of freezing at 80 points.
+    expect(rankOf(80).name).toBe('深海羁绊')
+    expect(rankOf(200).name).toBe('心有灵犀')
+    expect(rankOf(100_000).name).toBe('鲸生共渡')
+    expect(rankOf(1_000_000).name).toBe('鲸生共渡')
+    expect(AFFINITY_RANKS[AFFINITY_RANKS.length - 1]!.min).toBe(100_000)
+    expect(AFFINITY_MAX).toBe(999_999_999)
+  })
 })

package/src/affinity.ts

@@ -3,9 +3,13 @@
  * work together and care for it: every completed turn earns a small reward,
  * petting earns a tiny one (cooldown-gated), feeding earns the most.
  * Persistence lives in the service; this module only computes transitions.
+ * Reaction copy resolves from the shared remark library (first line of each
+ * built-in pool); the ledger layers per-pet custom remarks on top.
  * @module @linxin666/dsh-pet/affinity
  */
 
+import { builtinRemark } from './remarks.ts'
+
 /** One interaction the user can perform on the pet. */
 export type PetInteraction = 'pet' | 'feed'
 
@@ -25,16 +29,27 @@ export interface AffinityState {
   turns: number
 }
 
-export const AFFINITY_MAX = 100
+/**
+ * Affinity points cap. Historically 100; removed so long-term companions
+ * keep growing — the default limit is now the full 999,999,999 range.
+ */
+export const AFFINITY_MAX = 999_999_999
 
 /** Affinity ranks by points; the pet visibly grows with its rank.
- *  Marker glyphs are plain ASCII (the repo bans all emoji characters);
- *  they read as a growing star trail alongside the rank name. */
+ *  The original four tiers (0/25/50/80) are unchanged; higher tiers reach
+ *  into the extended cap so the ladder stays meaningful for veteran
+ *  companions. Marker glyphs are plain ASCII (the repo bans all emoji
+ *  characters); they read as a growing star trail alongside the rank name. */
 export const AFFINITY_RANKS = [
   { min: 0, name: '幼鲸', emoji: '*' },
   { min: 25, name: '伙伴', emoji: '**' },
   { min: 50, name: '挚友', emoji: '***' },
   { min: 80, name: '深海羁绊', emoji: '****' },
+  { min: 200, name: '心有灵犀', emoji: '*****' },
+  { min: 500, name: '传说羁绊', emoji: '******' },
+  { min: 2_000, name: '神话羁绊', emoji: '*******' },
+  { min: 10_000, name: '永恒之契', emoji: '********' },
+  { min: 100_000, name: '鲸生共渡', emoji: '*********' },
 ] as const
 
 /** Interaction tuning (all in points / ms). */
@@ -136,7 +151,7 @@ export function applyInteraction(
   const next = { ...state }
   if (kind === 'pet') {
     if (state.lastPetAt !== 0 && nowMs - state.lastPetAt < config.petCooldownMs) {
-      return { affinity: state, delta: 0, reaction: '摸过头啦，让鲸鱼娘歇口气～', accepted: false }
+      return { affinity: state, delta: 0, reaction: builtinRemark('petCooldown'), accepted: false }
     }
     next.lastPetAt = nowMs
     next.pets += 1
@@ -144,13 +159,13 @@ export function applyInteraction(
     return {
       affinity: next,
       delta: config.petReward,
-      reaction: '咕噜咕噜～被摸摸好舒服！',
+      reaction: builtinRemark('pet'),
       accepted: true,
     }
   }
   if (kind === 'feed') {
     if (state.lastFeedAt !== 0 && nowMs - state.lastFeedAt < config.feedCooldownMs) {
-      return { affinity: state, delta: 0, reaction: '吃饱啦，晚点再喂～', accepted: false }
+      return { affinity: state, delta: 0, reaction: builtinRemark('feedCooldown'), accepted: false }
     }
     next.lastFeedAt = nowMs
     next.feeds += 1
@@ -158,7 +173,7 @@ export function applyInteraction(
     return {
       affinity: next,
       delta: config.feedReward,
-      reaction: '呜哇！小鱼干好好吃！',
+      reaction: builtinRemark('feed'),
       accepted: true,
     }
   }

package/src/client/PetSettingsCard.tsx

@@ -134,6 +134,14 @@ export class PetSettingsCardController {
   inject(): PetSettingsCardFace {
     return { hooks: { petSettingsCard: this.store }, ...this.form.actions() }
   }
+
+  /**
+   * Release the card's scope subscription and bound stores; the slot
+   * disposer calls this on teardown.
+   */
+  dispose(): void {
+    this.form.dispose()
+  }
 }
 
 /** Props the renderer binds for the pet settings card. */

package/src/client/PetSprite.test.tsx

@@ -194,6 +194,39 @@ describe('PetSprite status bubble', () => {
     expect(screen.queryByText('摸摸成功')).not.toBeNull()
     expect(screen.queryByText('正在思考')).toBeNull()
   })
+
+  it('renders one bubble per concurrent session without duplicating the global bubble', () => {
+    renderPet({
+      snapshot: {
+        ...workingSnapshot,
+        bubble: '正在思考',
+        sessions: [
+          { sessionId: 's-a', animation: 'running', phase: 'thinking', bubble: '正在思考' },
+          { sessionId: 's-b', animation: 'running-right', phase: 'tool', bubble: '正在使用 grep' },
+        ],
+      },
+    })
+    // The display session appears in the stack exactly once: the legacy
+    // single bubble is not rendered on top of the session list.
+    expect(screen.getAllByText('正在思考')).toHaveLength(1)
+    expect(screen.queryByText('正在使用 grep')).not.toBeNull()
+  })
+
+  it('lets feedback replace the whole session bubble stack', () => {
+    renderPet({
+      snapshot: {
+        ...workingSnapshot,
+        sessions: [
+          { sessionId: 's-a', animation: 'running', phase: 'thinking', bubble: '正在思考' },
+          { sessionId: 's-b', animation: 'running-right', phase: 'tool', bubble: '正在使用 grep' },
+        ],
+      },
+      feedback: { text: '摸摸成功', kind: 'pet', at: 1 },
+    })
+    expect(screen.queryByText('摸摸成功')).not.toBeNull()
+    expect(screen.queryByText('正在思考')).toBeNull()
+    expect(screen.queryByText('正在使用 grep')).toBeNull()
+  })
 })
 
 describe('PetSprite definition-driven render', () => {

package/src/client/PetSprite.tsx

@@ -209,7 +209,13 @@ export function PetSprite(props: PetSpriteProps): ReactPortal {
   const pos = dragPos ?? { right: display.right, bottom: display.bottom }
   const spriteWidth = Math.round(cell.width * spriteScale)
   const spriteHeight = Math.round(cell.height * spriteScale)
-  const statusBubble = feedback === null && !hovered ? snapshot?.bubble : undefined
+  // Concurrent sessions each render their own bubble (stacked above the
+  // sprite); the legacy single 'bubble' is the fallback when the host serves
+  // no per-session list.
+  const sessionBubbles = snapshot?.sessions ?? []
+  const statusBubble = feedback === null && !hovered && sessionBubbles.length === 0
+    ? snapshot?.bubble
+    : undefined
   const displayName = snapshot?.name ?? definition.displayName
 
   const float = (
@@ -264,6 +270,15 @@ export function PetSprite(props: PetSpriteProps): ReactPortal {
           {feedback.text}
         </div>
       )}
+      {feedback === null && !hovered && sessionBubbles.length > 0 && (
+        <div className={styles.bubbleStack} role="status" aria-live="polite">
+          {sessionBubbles.map(session => (
+            <div key={session.sessionId} className={clsx(styles.bubble, styles.bubbleStatus)}>
+              {session.bubble}
+            </div>
+          ))}
+        </div>
+      )}
       {statusBubble !== undefined && (
         <div className={clsx(styles.bubble, styles.bubbleStatus)} role="status" aria-live="polite">
           {statusBubble}

package/src/client/index.ts

@@ -116,14 +116,20 @@ export function apply(ctx: ClientContext): void {
   // namespace, registered as a top-level settings page. The controller loads
   // the petId choices from the registry endpoint itself.
   const petSettings = new PetSettingsCardController(settingsScope)
-  ctx.slots.inject('settings.section', () => ctx.slots.register({
-    name: 'settings.section',
-    id: 'pet',
-    order: 130,
-    label: () => ctx.locale.bind('pet')('settings.title'),
-    locale: 'pet',
-    inject: () => petSettings.inject(),
-  }, PetSettingsSection))
+  ctx.slots.inject('settings.section', () => {
+    const unregister = ctx.slots.register({
+      name: 'settings.section',
+      id: 'pet',
+      order: 130,
+      label: () => ctx.locale.bind('pet')('settings.title'),
+      locale: 'pet',
+      inject: () => petSettings.inject(),
+    }, PetSettingsSection)
+    return () => {
+      petSettings.dispose()
+      unregister()
+    }
+  })
 
   // The global pet entry, its store, and the poll loop live while the plugin
   // is enabled; toggling the setting off hides the pet and stops polling.

package/src/client/pet.module.css

@@ -46,6 +46,25 @@
   animation: none;
 }
 
+/* 多会话气泡栈：并行会话各自一个气泡，自精灵头顶向上堆叠，
+   最近更新的会话在最上。栈内气泡改流入列布局，不再绝对定位
+   互相覆盖。 */
+.bubbleStack {
+  position: absolute;
+  bottom: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  pointer-events: none;
+}
+
+.bubbleStack .bubble {
+  position: relative;
+  bottom: auto;
+  margin-bottom: 0;
+}
+
 @keyframes pet-bubble-pop {
   0% {
     opacity: 0;

package/src/client/settings-form.ts

@@ -234,6 +234,9 @@ export class CardForm<T> {
   private readonly specs: Map<string, FieldSpec>
   private readonly staged = new Map<string, StagedEdit>()
   private readonly listeners = new Set<() => void>()
+  /** The scope subscription installed in the constructor; released by dispose(). */
+  private readonly disposeScope: () => void
+  private disposed = false
   private saving = false
   private failed = false
   private failedReason: string | undefined
@@ -244,7 +247,18 @@ export class CardForm<T> {
     specs: FieldSpec[],
   ) {
     this.specs = new Map(specs.map(spec => [spec.field, spec]))
-    scope.subscribe(() => { this.publish() })
+    this.disposeScope = scope.subscribe(() => { this.publish() })
+  }
+
+  /**
+   * Release the scope subscription and every bound store listener. The card
+   * must call this on teardown; later calls are no-ops.
+   */
+  dispose(): void {
+    if (this.disposed) return
+    this.disposed = true
+    this.disposeScope()
+    this.listeners.clear()
   }
 
   /** Publish a projection of this form, rebuilt whenever the scope or a draft changes. */

package/src/event-projection.ts

@@ -115,7 +115,9 @@ export function projectOfficialEvent(
         case 'blocked':
           return { input: { phase: 'waiting', line: '等待继续' } }
         case 'aborted':
-          return { input: { phase: 'idle', line: '已停止' } }
+          // A stopped session settles to idle without a bubble: the pet
+          // visibly calms down and the session drops out of the bubble stack.
+          return { input: { phase: 'idle' } }
         default:
           // TurnEndReasonMap is merge-extensible; a newer ending must not
           // leave the pet showing stale in-progress work.

package/src/index.ts

@@ -20,11 +20,12 @@ import { makePetRoutes } from './routes.ts'
 import { loadPetRegistry, petPackageRoot } from './registry.ts'
 import { DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN } from './persist.ts'
 
-export { PetService } from './service.ts'
+export { PetService, MAX_SESSION_BUBBLES } from './service.ts'
 export type {
   PetConfig,
   PetInteractResult,
   PetSettingsSection,
+  PetSessionView,
   PetStateView,
 } from './service.ts'
 export {
@@ -60,6 +61,16 @@ export {
   settleTreatGrants,
 } from './treats.ts'
 export type { TreatConfig, TreatLedger, TreatSettlement } from './treats.ts'
+export {
+  BUILTIN_REMARKS,
+  REMARK_KINDS,
+  REMARK_LINE_MAX,
+  REMARK_LINES_MAX,
+  RemarkPicker,
+  builtinRemark,
+  normalizePetRemarks,
+} from './remarks.ts'
+export type { PetRemarks, PetRemarksManifest, RemarkKind } from './remarks.ts'
 export {
   DEFAULT_PET_ID,
   DEFAULT_PET_NAME,