@linxin666/dsh-pet 0.2.2 → 0.2.4

package/src/chatter.ts

@@ -17,6 +17,11 @@
  * plugin has always shown, so existing installs keep their wording until the
  * scene cycles. No emoji anywhere (repository rule); ～ is the whale-girl's
  * signature.
+ *
+ * Since pet-center M4 (issue #677) every pool is overridable through a
+ * {@link VoicePoolsProvider}: the built-in pools are the fallback layer, and
+ * voice packs (per-pet voice.json / the global .voice.json) layer their
+ * pools on top at draw time.
  * @module @linxin666/dsh-pet/chatter
  */
 
@@ -193,6 +198,18 @@ export type ToolCategory =
   | 'ask'
   | 'generic'
 
+/** Every status scene key, in declaration order (voice-pack key allow-list). */
+export const STATUS_SCENES: readonly StatusScene[] = [
+  'prepare', 'waiting', 'thinking', 'review', 'toolResult', 'done',
+  'failed', 'toolFailed', 'maxTokens', 'interrupted', 'blocked',
+]
+
+/** Every tool-family key, in declaration order (voice-pack key allow-list). */
+export const TOOL_CATEGORIES: readonly ToolCategory[] = [
+  'read', 'write', 'edit', 'shell', 'grep', 'find', 'ls', 'webSearch',
+  'webFetch', 'mcp', 'memory', 'subagent', 'todo', 'browser', 'git', 'ask', 'generic',
+]
+
 /** Map a raw tool name onto its copy family (working-activity style regexes). */
 export function toolCategory(toolName: string): ToolCategory {
   const name = toolName.toLowerCase()
@@ -433,12 +450,19 @@ export function toolArgHint(toolName: string, argumentsJson: string): string | u
  * stretch keeps changing its wording.
  */
 export class StatusVoice {
+  private readonly pools: VoicePoolsProvider
+  private readonly rotateMs: number
   private readonly counters = new Map<string, number>()
   private lastScene = ''
   private lastLine = ''
   private lastLineAt = Number.NEGATIVE_INFINITY
 
-  constructor(private readonly rotateMs: number = STATUS_ROTATE_MS) {}
+  constructor(pools: VoicePoolsProvider = () => BUILTIN_VOICE_PACK, rotateMs: number = STATUS_ROTATE_MS) {
+    // Plain property assignment, not parameter properties: this module is
+    // imported by scripts/ under node's strip-only mode (pet-center M4).
+    this.pools = pools
+    this.rotateMs = rotateMs
+  }
 
   /** Draw the next line of one pool, advancing its round-robin cursor. */
   private draw(poolKey: string, pool: readonly string[]): string {
@@ -456,24 +480,38 @@ export class StatusVoice {
     return this.lastLine
   }
 
+  /**
+   * A scene's effective pool: the voice-pack override when it carries lines,
+   * else the built-in pool. Empty overrides fall back rather than blank the
+   * bubble — a scene line always renders.
+   */
+  private scenePool(scene: StatusScene): readonly string[] {
+    const override = this.pools().status?.[scene]
+    return override !== undefined && override.length > 0 ? override : STATUS_POOLS[scene]
+  }
+
   /** Status line for a phase scene. */
   scene(scene: StatusScene, nowMs: number): string {
-    return this.voice('scene:' + scene, 'pool:' + scene, STATUS_POOLS[scene], nowMs)
+    return this.voice('scene:' + scene, 'pool:' + scene, this.scenePool(scene), nowMs)
   }
 
   /** Status line for a tool call, with the real-argument hint when known. */
   tool(toolName: string, displayName: string, hint: string | undefined, nowMs: number): string {
     const category = toolCategory(toolName)
-    const line = this.voice('tool:' + category, 'tool:' + category, TOOL_POOLS[category], nowMs)
+    const override = this.pools().tools?.[category]
+    const pool = override !== undefined && override.length > 0 ? override : TOOL_POOLS[category]
+    const line = this.voice('tool:' + category, 'tool:' + category, pool, nowMs)
     return line
-      .replace('{tool}', displayName)
-      .replace('{hint}', hint ?? displayName)
+      .replaceAll('{tool}', displayName)
+      .replaceAll('{hint}', hint ?? displayName)
   }
 
   /** Status line while sibling tools still run (always reflects the count). */
   toolRemaining(count: number, nowMs: number): string {
-    return this.voice('toolRemaining', 'toolRemaining', TOOL_REMAINING_POOL, nowMs)
-      .replace('{n}', String(count))
+    const override = this.pools().toolRemaining
+    const pool = override !== undefined && override.length > 0 ? override : TOOL_REMAINING_POOL
+    return this.voice('toolRemaining', 'toolRemaining', pool, nowMs)
+      .replaceAll('{n}', String(count))
   }
 }
 
@@ -734,24 +772,89 @@ export const WHISPER_RULES: readonly WhisperRule[] = [
   },
 ]
 
+/**
+ * Voice-pack overrides (pet-center M4, issue #677): the content a voice
+ * pack can replace, one pool at a time. Every field is optional — missing
+ * keys inherit the built-in pools. Resolution happens at draw time through
+ * a provider function, so swapping pets (or editing the global file) re-
+ * voices live engines without rebuilding them.
+ *
+ * Override semantics:
+ *  - status/tools/toolRemaining: a non-empty override replaces the built-in
+ *    pool for that key; an empty override falls back to the built-in pool
+ *    (a scene line always renders, so it can never be blanked).
+ *  - whispers.generic / whispers.rules: the override REPLACES the built-in
+ *    section; an empty array mutes that channel (ambient or keyword).
+ */
+export interface VoicePackOverrides {
+  /** Status copy pools by scene; each key replaces that scene's pool. */
+  status?: Partial<Record<StatusScene, readonly string[]>>
+  /** Tool copy pools by family; each key replaces that family's pool. */
+  tools?: Partial<Record<ToolCategory, readonly string[]>>
+  /** The parallel-tools count line pool ({n} interpolates the count). */
+  toolRemaining?: readonly string[]
+  /** Murmur pools; each section replaces the built-in one as a whole. */
+  whispers?: {
+    /** Ambient inner-whisper pool (empty mutes ambient whispers). */
+    generic?: readonly string[]
+    /** Ordered keyword rules (empty disables keyword-triggered whispers). */
+    rules?: readonly WhisperRule[]
+  }
+}
+
+/** Read the current effective voice-pack overrides (draw-time resolution). */
+export type VoicePoolsProvider = () => VoicePackOverrides
+
+/** The built-in voice pack: the plugin's default copy, unchanged since v1. */
+export const BUILTIN_VOICE_PACK: VoicePackOverrides = {
+  status: STATUS_POOLS,
+  tools: TOOL_POOLS,
+  toolRemaining: TOOL_REMAINING_POOL,
+  whispers: { generic: WHISPER_GENERIC_POOL, rules: WHISPER_RULES },
+}
+
 /**
  * The murmur engine (碎碎念): watches the model's own output and lets the pet
  * whisper its inner voice. Two ways to earn a whisper:
  *  - a keyword rule matches the fresh chunk text (themed whisper);
  *  - enough output volume flowed by without one (ambient whisper).
  * A cooldown keeps whispers occasional; all picks are round-robin so tests
- * reproduce exact lines.
+ * reproduce exact lines. The voice-pack provider (pet-center M4) swaps the
+ * pools at draw time, so a pet switch re-voices live engines in place.
  */
 export class WhisperEngine {
+  private readonly pools: VoicePoolsProvider
+  private readonly cooldownMs: number
+  private readonly charBudget: number
   private readonly counters = new Map<number, number>()
   private genericCursor = 0
   private lastWhisperAt = Number.NEGATIVE_INFINITY
   private charsSinceWhisper = 0
 
   constructor(
-    private readonly cooldownMs: number = WHISPER_COOLDOWN_MS,
-    private readonly charBudget: number = WHISPER_CHAR_BUDGET,
-  ) {}
+    pools: VoicePoolsProvider = () => BUILTIN_VOICE_PACK,
+    cooldownMs: number = WHISPER_COOLDOWN_MS,
+    charBudget: number = WHISPER_CHAR_BUDGET,
+  ) {
+    this.pools = pools
+    this.cooldownMs = cooldownMs
+    this.charBudget = charBudget
+  }
+
+  /**
+   * Effective keyword rules: an override replaces the built-in rules as a
+   * whole; an explicit empty array disables keyword-triggered whispers.
+   */
+  private rules(): readonly WhisperRule[] {
+    const override = this.pools().whispers?.rules
+    return override === undefined ? WHISPER_RULES : override
+  }
+
+  /** Effective ambient pool (an explicit empty array mutes ambient whispers). */
+  private generic(): readonly string[] {
+    const override = this.pools().whispers?.generic
+    return override === undefined ? WHISPER_GENERIC_POOL : override
+  }
 
   /**
    * Feed one model-output chunk (reasoning or text). Returns the whisper to
@@ -765,8 +868,9 @@ export class WhisperEngine {
       return undefined
     }
     const haystack = text.toLowerCase()
-    for (let ruleIndex = 0; ruleIndex < WHISPER_RULES.length; ruleIndex += 1) {
-      const rule = WHISPER_RULES[ruleIndex]!
+    const rules = this.rules()
+    for (let ruleIndex = 0; ruleIndex < rules.length; ruleIndex += 1) {
+      const rule = rules[ruleIndex]!
       if (!rule.keywords.some(keyword => haystack.includes(keyword))) continue
       const index = (this.counters.get(ruleIndex) ?? 0) % rule.pool.length
       this.counters.set(ruleIndex, index + 1)
@@ -774,7 +878,9 @@ export class WhisperEngine {
     }
     this.charsSinceWhisper += text.length
     if (this.charsSinceWhisper < this.charBudget) return undefined
-    const line = WHISPER_GENERIC_POOL[this.genericCursor % WHISPER_GENERIC_POOL.length]!
+    const generic = this.generic()
+    if (generic.length === 0) return undefined
+    const line = generic[this.genericCursor % generic.length]!
     this.genericCursor += 1
     return this.speak(line, nowMs)
   }

package/src/client/PetDockEntry.tsx

@@ -16,6 +16,7 @@ import type { PropsLocale } from '@deepseek-ai/dsh-client-ui-slots'
 import type { PetDisplayConfig } from '../persist.ts'
 import type { PetStoreInstance } from './pet-store.ts'
 import { PetSprite } from './PetSprite.tsx'
+import { PetRendererSwitch } from './renderers/PetRendererSwitch.tsx'
 import { NS } from './locales.ts'
 import styles from './pet.module.css'
 
@@ -75,20 +76,27 @@ export function PetDockEntry(props: PetDockEntryProps): ReactElement {
         {snapshot === null || definition === null
           ? null
           : (
-            <PetSprite
-              snapshot={snapshot}
+            <PetRendererSwitch
               definition={definition}
-              display={snapshot.display}
-              feedback={feedback}
+              phase={snapshot?.phase ?? 'idle'}
               onPet={props.pet}
-              onFeed={props.feed}
-              onHide={props.hide}
-              onDragEnd={props.dragEnd}
-              onRename={props.rename}
-              onOpenSession={props.openSession}
-              onFeedbackDone={props.feedbackDone}
               t={props.t}
-            />
+            >
+              <PetSprite
+                snapshot={snapshot}
+                definition={definition}
+                display={snapshot.display}
+                feedback={feedback}
+                onPet={props.pet}
+                onFeed={props.feed}
+                onHide={props.hide}
+                onDragEnd={props.dragEnd}
+                onRename={props.rename}
+                onOpenSession={props.openSession}
+                onFeedbackDone={props.feedbackDone}
+                t={props.t}
+              />
+            </PetRendererSwitch>
           )}
       </span>
     )

package/src/client/PetSettingsCard.tsx

@@ -30,6 +30,8 @@ export interface PetSettings {
   bottom?: number
   /** Selected pet id (a registry entry). */
   petId?: string
+  /** Status-decoration master switch (pet-center M5, #567). */
+  decorationEnabled?: boolean
 }
 
 /** What the pet settings card renders. */
@@ -46,8 +48,12 @@ export interface PetSettingsCardState extends CardShell {
   bottom: CardFieldState
   /** Selected pet. */
   petId: CardFieldState
+  /** Status-decoration master switch. */
+  decorationEnabled: CardFieldState
   /** Pet choices (registry ids + display names), loaded from the host. */
   petChoices: readonly { value: string; label: string }[]
+  /** Registry diagnostics (v1 migration hints, invalid entries), host-served. */
+  petDiagnostics: readonly PetDiagnosticView[]
 }
 
 /** The registration-side face the card's slot entry injects. */
@@ -64,6 +70,12 @@ interface PetChoice {
   displayName: string
 }
 
+/** One registry diagnostic as served by '/api/pet/diagnostics' (#623). */
+export interface PetDiagnosticView {
+  level: 'error' | 'warning'
+  message: string
+}
+
 /** Fetch the registry list (the same data the sprite renders from). */
 async function fetchPetChoices(): Promise<PetChoice[]> {
   const response = await fetch('/api/pet/pets')
@@ -71,6 +83,14 @@ async function fetchPetChoices(): Promise<PetChoice[]> {
   return (await response.json()) as PetChoice[]
 }
 
+/** Fetch the registry diagnostics (v1 migration hints, invalid entries). */
+async function fetchPetDiagnostics(): Promise<PetDiagnosticView[]> {
+  const response = await fetch('/api/pet/diagnostics')
+  if (!response.ok) throw new Error('pet diagnostics failed: ' + response.status)
+  const body = (await response.json()) as { diagnostics?: PetDiagnosticView[] }
+  return body.diagnostics ?? []
+}
+
 /** Bridges the 'pet' scope onto the card's staged form. */
 export class PetSettingsCardController {
   private readonly form: CardForm<PetSettings>
@@ -80,6 +100,7 @@ export class PetSettingsCardController {
   // without rebuilding the form.
   private readonly petChoices: string[] = []
   private readonly petLabels = new Map<string, string>()
+  private diagnostics: PetDiagnosticView[] = []
   private loaded = false
   private attempts = 0
 
@@ -87,6 +108,7 @@ export class PetSettingsCardController {
   constructor(scope: SettingsScope<PetSettings>) {
     this.form = new CardForm(scope, [
       booleanField('enabled'),
+      booleanField('decorationEnabled'),
       booleanField('visible'),
       numberField('size'),
       numberField('right'),
@@ -95,6 +117,17 @@ export class PetSettingsCardController {
     ])
     this.store = this.form.bind(() => this.projection())
     void this.loadPets()
+    void this.loadDiagnostics()
+  }
+
+  /** Fetch registry diagnostics once (soft-fail: an empty list on error). */
+  private async loadDiagnostics(): Promise<void> {
+    try {
+      this.diagnostics = await fetchPetDiagnostics()
+      this.store.set(this.projection())
+    } catch {
+      this.diagnostics = []
+    }
   }
 
   /** Resolve the registry choices once (retried a few times on failure). */
@@ -118,12 +151,14 @@ export class PetSettingsCardController {
     return {
       ...this.form.shell(),
       enabled: this.form.field('enabled'),
+      decorationEnabled: this.form.field('decorationEnabled'),
       visible: this.form.field('visible'),
       size: this.form.field('size'),
       right: this.form.field('right'),
       bottom: this.form.field('bottom'),
       petId: this.form.field('petId'),
       petChoices: this.petChoices.map(id => ({ value: id, label: this.petLabels.get(id) ?? id })),
+      petDiagnostics: this.diagnostics,
     }
   }
 
@@ -186,6 +221,18 @@ export function PetSettingsCard(props: PetSettingsCardProps) {
         onEdit={(text) => { props.edit('enabled', text) }}
         onReset={() => { props.resetField('enabled') }}
       />
+      <BooleanField
+        id="settings-pet-decoration"
+        label={t('settings.decoration')}
+        hint={t('settings.decorationHint')}
+        inheritLabel={t('settings.inherit')}
+        onLabel={t('settings.on')}
+        offLabel={t('settings.off')}
+        {...fieldProps}
+        {...state.decorationEnabled}
+        onEdit={(text) => { props.edit('decorationEnabled', text) }}
+        onReset={() => { props.resetField('decorationEnabled') }}
+      />
       <ChoiceField
         id="settings-pet-pet"
         label={t('settings.pet')}
@@ -197,6 +244,16 @@ export function PetSettingsCard(props: PetSettingsCardProps) {
         onEdit={(text) => { props.edit('petId', text) }}
         onReset={() => { props.resetField('petId') }}
       />
+      {state.petDiagnostics.length === 0 ? null : (
+        <li className={sectionCss.diagnostics} data-dsh-part="diagnostics">
+          <span className={sectionCss.diagnosticsTitle}>{t('settings.diagnosticsTitle')}</span>
+          <ul>
+            {state.petDiagnostics.map((diagnostic, index) => (
+              <li key={index} data-level={diagnostic.level}>{diagnostic.message}</li>
+            ))}
+          </ul>
+        </li>
+      )}
       <BooleanField
         id="settings-pet-visible"
         label={t('settings.visible')}