@linxin666/dsh-pet 0.1.18 → 0.1.20

package/src/client/PetSprite.test.tsx

@@ -88,9 +88,13 @@ afterEach(() => {
   cleanup()
 })
 
-/** Render the pet with mocked callbacks; returns the rename spy. */
-function renderPet(overrides: Partial<PetSpriteProps> = {}): { onRename: ReturnType<typeof vi.fn> } {
+/** Render the pet with mocked callbacks; returns the rename and open spys. */
+function renderPet(overrides: Partial<PetSpriteProps> = {}): {
+  onRename: ReturnType<typeof vi.fn>
+  onOpenSession: ReturnType<typeof vi.fn>
+} {
   const onRename = vi.fn()
+  const onOpenSession = vi.fn()
   const props: PetSpriteProps = {
     snapshot,
     definition: petDefinition(),
@@ -101,12 +105,13 @@ function renderPet(overrides: Partial<PetSpriteProps> = {}): { onRename: ReturnT
     onHide: vi.fn(),
     onDragEnd: vi.fn(),
     onRename,
+    onOpenSession,
     onFeedbackDone: vi.fn(),
     t,
     ...overrides,
   }
   render(<PetSprite {...props} />)
-  return { onRename }
+  return { onRename, onOpenSession }
 }
 
 /** Hover the sprite to open the panel, then click the rename button. */
@@ -194,6 +199,87 @@ 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()
+  })
+
+  it('clicking a session bubble navigates to that session', () => {
+    const { onOpenSession } = renderPet({
+      snapshot: {
+        ...workingSnapshot,
+        bubble: '正在思考',
+        sessions: [
+          { sessionId: 's-a', animation: 'running', phase: 'thinking', bubble: '正在思考' },
+          { sessionId: 's-b', animation: 'running-right', phase: 'tool', bubble: '正在使用 grep' },
+        ],
+      },
+    })
+    fireEvent.click(screen.getByText('正在使用 grep'))
+    expect(onOpenSession).toHaveBeenCalledTimes(1)
+    expect(onOpenSession).toHaveBeenCalledWith('s-b')
+    fireEvent.click(screen.getByText('正在思考'))
+    expect(onOpenSession).toHaveBeenCalledTimes(2)
+    expect(onOpenSession).toHaveBeenCalledWith('s-a')
+    // Petting stays on the sprite only: bubble clicks must not pet.
+  })
+
+  it('clicking the legacy single bubble does not navigate (no session identity)', () => {
+    const { onOpenSession } = renderPet({ snapshot: workingSnapshot })
+    fireEvent.click(screen.getByText('正在思考'))
+    expect(onOpenSession).not.toHaveBeenCalled()
+  })
+
+  it('keeps session bubbles visible and clickable while the hover panel is open', () => {
+    // Regression: the panel used to occupy the same region as the bubble
+    // stack and hide it on hover, so reaching a bubble was impossible. The
+    // panel now opens beside the sprite and the stack stays interactive.
+    const { onOpenSession } = renderPet({
+      snapshot: {
+        ...workingSnapshot,
+        sessions: [
+          { sessionId: 's-a', animation: 'running', phase: 'thinking', bubble: '正在思考' },
+          { sessionId: 's-b', animation: 'running-right', phase: 'tool', bubble: '正在使用 grep' },
+        ],
+      },
+    })
+    fireEvent.pointerOver(screen.getByRole('button', { name: '鲸鱼娘' }))
+    // The hover panel is open...
+    expect(screen.queryByText('改名')).not.toBeNull()
+    // ...and the bubbles are still there, still clickable.
+    expect(screen.getByText('正在使用 grep')).not.toBeNull()
+    fireEvent.click(screen.getByText('正在使用 grep'))
+    expect(onOpenSession).toHaveBeenCalledWith('s-b')
+  })
 })
 
 describe('PetSprite definition-driven render', () => {

package/src/client/PetSprite.tsx

@@ -43,6 +43,8 @@ export interface PetSpriteProps {
   onDragEnd: (right: number, bottom: number) => void
   /** Rename the selected pet (persisted by the host). */
   onRename: (name: string) => void
+  /** Navigate to the session one status bubble reports on. */
+  onOpenSession: (sessionId: string) => void
   /** Clear the reaction bubble (after its CSS animation). */
   onFeedbackDone: () => void
   /** Locale translate seat (namespace-bound). */
@@ -125,10 +127,9 @@ export function PetSprite(props: PetSpriteProps): ReactPortal {
     const tick = (ts: number): void => {
       const delta = ts - last
       last = ts
-      // Trim the track to the row's real frame count (transparent cells
-      // would render as a vanishing pet).
-      const row = rowOfTrack(animation)
-      const track = trimTrack(tracks[animation], rows[row] ?? tracks[animation].frames.length)
+      // row/track come from the effect scope: they were computed once above
+      // and this effect re-runs when animation/tracks/rows change, so the
+      // per-frame recompute (trimTrack slices fresh arrays) is pure waste.
       const st = frameRef.current
       if (st.track !== animation) {
         st.track = animation
@@ -209,7 +210,14 @@ 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. The hover panel now sits beside the sprite, so the
+  // bubbles stay visible and clickable while hovering — no region swap.
+  const sessionBubbles = snapshot?.sessions ?? []
+  const statusBubble = feedback === null && sessionBubbles.length === 0
+    ? snapshot?.bubble
+    : undefined
   const displayName = snapshot?.name ?? definition.displayName
 
   const float = (
@@ -222,13 +230,14 @@ export function PetSprite(props: PetSpriteProps): ReactPortal {
         setHovered(true)
       }}
       onPointerLeave={(e) => {
-        // The panel and bubble render OUTSIDE the container's box (absolute,
-        // above the sprite), so moving onto them fires pointerleave on the
-        // container. Treat a target still inside the container's DOM (the
-        // overflowed panel) as "still hovering"; otherwise give the pointer a
-        // short grace period to reach the panel across the gap above it. The
-        // bridge ('.panel::after') keeps the pointer inside the hit area, and
-        // the grace period covers a slow mouse crossing the remaining sliver.
+        // The panel renders OUTSIDE the container's box (absolute, beside
+        // the sprite), so moving onto it fires pointerleave on the container.
+        // Treat a target still inside the container's DOM (the overflowed
+        // panel) as "still hovering"; otherwise give the pointer a short
+        // grace period to reach the panel across the gap beside the sprite.
+        // The bridge ('.panel::after') keeps the pointer inside the hit
+        // area, and the grace period covers a slow mouse crossing the
+        // remaining sliver.
         const next = e.relatedTarget
         if (next instanceof Node && floatRef.current?.contains(next)) return
         clearHideTimer()
@@ -264,6 +273,21 @@ export function PetSprite(props: PetSpriteProps): ReactPortal {
           {feedback.text}
         </div>
       )}
+      {feedback === null && sessionBubbles.length > 0 && (
+        <div className={styles.bubbleStack}>
+          {sessionBubbles.map(session => (
+            <button
+              key={session.sessionId}
+              type="button"
+              className={clsx(styles.bubble, styles.bubbleStatus, styles.bubbleClickable)}
+              title={props.t('pet.openSessionHint')}
+              onClick={() => { props.onOpenSession(session.sessionId) }}
+            >
+              {session.bubble}
+            </button>
+          ))}
+        </div>
+      )}
       {statusBubble !== undefined && (
         <div className={clsx(styles.bubble, styles.bubbleStatus)} role="status" aria-live="polite">
           {statusBubble}

package/src/client/index.ts

@@ -11,7 +11,7 @@
  * @module @linxin666/dsh-pet/client
  */
 
-import type { ClientContext, SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-runtime/client'
+import type { ClientContext, ISessions, SessionId, SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-runtime/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
 import type {} from '@deepseek-ai/dsh-client-locale/client'
 // Type-only: pulls the settings-surface Context merge (ctx.settingsScope).
@@ -72,8 +72,8 @@ const POLL_MS = 2000
 /** Settings namespace the pet settings card edits (the Host plugin registers it). */
 const PET_SETTINGS_NS = 'pet'
 
-/** Required services. */
-export const inject = ['slots', 'locale', 'connection', 'settingsScope', 'remote']
+/** Required services (sessions powers bubble-to-session navigation). */
+export const inject = ['slots', 'locale', 'connection', 'settingsScope', 'remote', 'sessions']
 
 /** Re-exported for consumers that type against the injected face. */
 export type { PetInjected, PetDockEntryProps } from './PetDockEntry.tsx'
@@ -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.
@@ -146,6 +152,11 @@ export function apply(ctx: ClientContext): void {
       // tick tries again. After it lands, one list feeds both the sprite and
       // the settings card's choices.
       let petsLoaded = false
+      // Latest-wins guard: the 2s tick, visibility recovery, and
+      // interaction-triggered refreshes can overlap; only the newest
+      // response may publish, so a slow older one can never roll the
+      // snapshot back.
+      let stateSeq = 0
       const pollNow = (): void => {
         if (!petsLoaded) {
           petApi.pets().then((list) => {
@@ -155,9 +166,13 @@ export function apply(ctx: ClientContext): void {
             // Retry on the next poll tick.
           })
         }
+        const seq = stateSeq + 1
+        stateSeq = seq
         petApi.state().then((snapshot) => {
+          if (seq !== stateSeq) return
           setSnapshot(snapshot)
         }, () => {
+          if (seq !== stateSeq) return
           setState('error', 'pet.state transport error')
         })
       }
@@ -196,9 +211,23 @@ export function apply(ctx: ClientContext): void {
         }
       }, 'pet: poll')
 
+      // Clicking a session bubble jumps the GUI to that session. A bubble
+      // can outlive its disposed session by one poll tick, and the sessions
+      // service fails loud on unknown ids, so consult the live list first.
+      // The pet's type program also loads the host-side dsh-session package
+      // through the service types, whose Context merge declares a different
+      // 'sessions' face; pin the browser runtime's outward face here.
+      const sessions = ctx.sessions as unknown as ISessions
+      const openSession = (sessionId: string): void => {
+        const list = sessions.list.getSnapshot()
+        if (list.byId[sessionId as SessionId] === undefined) return
+        sessions.open(sessionId as SessionId)
+      }
+
       const injected = (): PetInjected => ({
         store: petStore,
         ensure: pollNow,
+        openSession,
         pet: () => {
           petApi.interact('pet').then((result) => {
             setFeedback({

package/src/client/locales.ts

@@ -19,6 +19,7 @@ export const zh = {
   'pet.treats': '小鱼干 ×{n}',
   'pet.state.loading': '宠物正在赶来…',
   'pet.state.error': '宠物迷路了（连接失败）',
+  'pet.openSessionHint': '点击跳转到对应会话',
   // 一级设置页（settings.section 席位）。
   'settings.title': '宠物',
   'settings.description': '选择宠物并调整它的显示布局。',
@@ -64,6 +65,7 @@ export const en = {
   'pet.treats': 'Treats ×{n}',
   'pet.state.loading': 'The pet is on its way…',
   'pet.state.error': 'The pet is lost (connection failed)',
+  'pet.openSessionHint': 'Click to jump to this session',
   // First-level settings section (the `settings.section` seat).
   'settings.title': 'Pet',
   'settings.description': 'Pick a pet and tune its display layout.',

package/src/client/pet.module.css

@@ -46,6 +46,44 @@
   animation: none;
 }
 
+/* 多会话气泡栈：并行会话各自一个气泡，自精灵头顶向上堆叠，
+   最近更新的会话在最上。栈内气泡改流入列布局，不再绝对定位
+   互相覆盖。气泡可点击：点击跳转到对应会话。 */
+.bubbleStack {
+  position: absolute;
+  bottom: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  pointer-events: auto;
+}
+
+.bubbleStack .bubble {
+  position: relative;
+  bottom: auto;
+  margin-bottom: 0;
+  pointer-events: auto;
+}
+
+.bubbleClickable {
+  cursor: pointer;
+  font: inherit;
+  text-align: center;
+  appearance: none;
+  transition: filter 120ms ease, box-shadow 120ms ease;
+}
+
+.bubbleClickable:hover {
+  filter: brightness(1.12);
+}
+
+.bubbleClickable:focus-visible {
+  outline: none;
+  /* 2px accent ring on the pet's own palette, theme-agnostic. */
+  box-shadow: 0 0 0 2px rgba(56, 189, 248, 0.85);
+}
+
 @keyframes pet-bubble-pop {
   0% {
     opacity: 0;
@@ -67,9 +105,14 @@
   }
 }
 
+/* 悬浮面板位于精灵左侧（bottom 对齐），不再占据精灵上方的空间：
+   会话气泡栈独占精灵头顶区域，两者互不遮挡 —— 气泡因此可以始终
+   显示并保持可点击，不必在 hover 时让位给面板。 */
 .panel {
   position: absolute;
-  bottom: 100%;
+  bottom: 0;
+  right: 100%;
+  margin-right: 8px;
   background: rgba(15, 23, 42, 0.92);
   border: 1px solid rgba(148, 163, 184, 0.35);
   border-radius: 10px;
@@ -84,18 +127,17 @@
   min-width: 132px;
 }
 
-/* 面板底边与图标顶边之间的 hover 桥接（issue #49）：
-   面板绝对定位在图标上方（bottom: 100%），若两者之间存在哪怕几个
-   像素的间隙，指针滑过间隙时会触发容器的 pointerleave，面板在指针
-   抵达按钮前就收起。这段透明伪元素把命中区向下延伸、覆盖图标顶部，
-   使指针在图标与按钮之间始终停留在 hover 区域内。 */
+/* 面板右缘与图标左缘之间的 hover 桥接（issue #49 的水平版）：
+   面板在图标左侧留有 8px 间隙，指针滑过间隙时会触发容器的
+   pointerleave，面板会在指针抵达按钮前收起。这段透明伪元素把命中区
+   向右延伸、覆盖间隙，使指针在图标与按钮之间始终停留在 hover 区域。 */
 .panel::after {
   content: '';
   position: absolute;
-  top: 100%;
-  left: 0;
-  right: 0;
-  height: 14px;
+  top: 0;
+  bottom: 0;
+  left: 100%;
+  width: 14px;
 }
 
 .rankRow {

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/client/spritesheet.ts

@@ -7,7 +7,7 @@
  * @module @linxin666/dsh-pet/client/spritesheet
  */
 
-import type { PetAnimation } from '../state.ts'
+import { rowOf, type PetAnimation } from '../state.ts'
 import type { PetCell, PetTrackDef } from '../registry.ts'
 
 /** Animation track shape the frame loop consumes. */
@@ -15,18 +15,8 @@ export type TrackDef = PetTrackDef
 
 /** Row index of one animation track (the fixed 9-row contract). */
 export function rowOfTrack(animation: PetAnimation): number {
-  const rows: Record<PetAnimation, number> = {
-    idle: 0,
-    'running-right': 1,
-    'running-left': 2,
-    waving: 3,
-    jumping: 4,
-    failed: 5,
-    waiting: 6,
-    running: 7,
-    review: 8,
-  }
-  return rows[animation]
+  // The table itself lives in state.ts (rowOf) — the single source of truth.
+  return rowOf(animation)
 }
 
 /**

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

@@ -19,12 +19,14 @@ import { PetService, PET_SETTINGS_NAMESPACE, type PetConfig, type PetSettingsSec
 import { makePetRoutes } from './routes.ts'
 import { loadPetRegistry, petPackageRoot } from './registry.ts'
 import { DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN } from './persist.ts'
+import { mountOnce } from './mount-once.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 +62,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,
@@ -126,7 +138,9 @@ export function makePetSettingsSchema(fallbackPetId: string) {
 }
 
 /** Register the pet service and its API + asset routes on the context. */
-export function apply(ctx: Context, config: PetConfig = {}): void {
+export const apply = mountOnce('@linxin666/dsh-pet', applyImpl)
+
+function applyImpl(ctx: Context, config: PetConfig = {}): void {
   const registry = config.registry
     ?? loadPetRegistry({
       packageRoot: petPackageRoot(import.meta.url),

package/src/ledger.test.ts

@@ -5,13 +5,11 @@ import { emptyPersist } from './persist.ts'
 import { PetLedger } from './ledger.ts'
 
 describe('PetLedger', () => {
-  it('settles the economy on completed turns (work treat per 3 turns)', () => {
+  it('settles the economy on completed turns (work treat per 30 turns)', () => {
     const ledger = new PetLedger(emptyPersist())
     const n = 1_000_000
-    ledger.rewardTurn('s1', 1, n)
-    ledger.rewardTurn('s1', 2, n + 1)
-    ledger.rewardTurn('s1', 3, n + 2)
-    expect(ledger.snapshot.affinity.turns).toBe(3)
+    for (let turn = 1; turn <= 30; turn++) ledger.rewardTurn('s1', turn, n + turn)
+    expect(ledger.snapshot.affinity.turns).toBe(30)
     expect(ledger.snapshot.treats.treats).toBe(1)
     expect(ledger.takeDirty()).toBe(true)
   })
@@ -25,6 +23,19 @@ describe('PetLedger', () => {
     expect(ledger.snapshot.affinity.turns).toBe(1)
   })
 
+  it('forgetSession re-arms a session so a repeated reward can award again', () => {
+    const ledger = new PetLedger(emptyPersist())
+    const n = 1_000_000
+    ledger.rewardTurn('s1', 1, n)
+    expect(ledger.snapshot.affinity.turns).toBe(1)
+    // The disposed-session eviction drops only the per-session bookkeeping.
+    ledger.forgetSession('s1')
+    // The same turn number is now treated as fresh: a same-turn retry on a
+    // new session lifecycle re-awards rather than being deduplicated.
+    expect(ledger.rewardTurn('s1', 1, n + 1)).toBe(true)
+    expect(ledger.snapshot.affinity.turns).toBe(2)
+  })
+
   it('a read of the view does not mark dirty (no settle on read)', () => {
     const ledger = new PetLedger(emptyPersist())
     ledger.affinityView(1_000_000)
@@ -34,16 +45,36 @@ describe('PetLedger', () => {
   it('feed consumes a treat and applies the feed reward', () => {
     const ledger = new PetLedger(emptyPersist())
     const n = 1_000_000
-    ledger.rewardTurn('s1', 1, n)
-    ledger.rewardTurn('s1', 2, n + 1)
-    ledger.rewardTurn('s1', 3, n + 2)
+    for (let turn = 1; turn <= 30; turn++) ledger.rewardTurn('s1', turn, n + turn)
     expect(ledger.snapshot.treats.treats).toBe(1)
-    const res = ledger.interact('feed', n + 10)
+    const res = ledger.interact('feed', n + 40)
     expect(res.delta).toBe(defaultAffinityConfig.feedReward)
     expect(ledger.snapshot.treats.treats).toBe(0)
     expect(ledger.snapshot.affinity.feeds).toBe(1)
   })
 
+  it('cycles per-pet custom remarks per slot and falls back to built-ins', () => {
+    const ledger = new PetLedger(emptyPersist(), {
+      remarks: { pet: ['第一句', '第二句'] },
+    })
+    const n = 1_000_000
+    expect(ledger.interact('pet', n).reaction).toBe('第一句')
+    // Per-slot counters: the cooldown refusal still opens with the built-in
+    // legacy line, not the custom pool above.
+    expect(ledger.interact('pet', n + 1).reaction).toBe('摸过头啦，让鲸鱼娘歇口气～')
+    // Feeding falls back to the built-in pool when the pet declares none.
+    expect(ledger.interact('feed', n + 2).reaction).toBe('没有小鱼干了，多陪我工作一会儿吧～')
+  })
+
+  it('swaps remark pools when the selected pet changes', () => {
+    const ledger = new PetLedger(emptyPersist(), { remarks: { pet: ['旧宠物台词'] } })
+    expect(ledger.interact('pet', 1_000_000).reaction).toBe('旧宠物台词')
+    ledger.setRemarks({ pet: ['新宠物台词'] })
+    expect(ledger.interact('pet', 1_011_000).reaction).toBe('新宠物台词')
+    ledger.setRemarks(undefined)
+    expect(ledger.interact('pet', 1_022_000).reaction).toBe('咕噜咕噜～被摸摸好舒服！')
+  })
+
   it('refuses a feed on an empty stock without burning anything', () => {
     const ledger = new PetLedger(emptyPersist())
     const res = ledger.interact('feed', 1_000_000)