@linxin666/dsh-pet 0.3.3 → 0.3.5

package/lib/types/service.js

@@ -19,6 +19,9 @@ import { DEFAULT_DECORATION_ID, decorationView, loadPetRegistry, petEntryView, p
 import { WHISPER_TTL_MS } from "./chatter.js";
 import { mergeVoicePacks } from "./voice-pack.js";
 import { defaultPetStateConfig, PetStateMachine, } from "./state.js";
+import { applyGameplayEffects, drawLotteryTier, initialGameplayState, rollTouchBranch, rollWorkOutcome, settleGameplay, } from "./gameplay.js";
+/** The unified gameplay currency: the shared treat (小鱼干) ledger. */
+const GAMEPLAY_TREATS_CURRENCY = 'treats';
 /** 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). */
@@ -111,8 +114,8 @@ export class PetService extends Service {
         return this.enabled;
     }
     /** RPC: current pet state snapshot. */
-    async state() {
-        return this.view();
+    async state(currentSessionId) {
+        return this.view(currentSessionId);
     }
     /** Current persisted display config (read-only view). */
     display() {
@@ -295,6 +298,174 @@ export class PetService extends Service {
             this.flush();
         return result;
     }
+    /* ---------------------------------------------------------------- *
+     * Gameplay verbs (miku-pet generalization). The manifest block lives
+     * on the registry entry; dynamic state persists per pet id. Verbs
+     * settle and persist; the state view projects without writing.
+     * ---------------------------------------------------------------- */
+    /** The active pet's gameplay block, if it declares one. */
+    gameplayDef() {
+        return this.activeEntry().gameplay;
+    }
+    /** The persisted (or fresh) gameplay state of the selected pet. */
+    gameplayState(def, now) {
+        const petId = this.selectedPetId();
+        const stored = this.ledger.snapshot.gameplay[petId];
+        return {
+            petId,
+            state: stored === undefined
+                ? initialGameplayState(def, now)
+                : { stats: { ...stored.stats }, currencies: { ...stored.currencies }, mode: stored.mode, settledAt: stored.settledAt },
+        };
+    }
+    /** Display view of one gameplay state (rounded stats; treats ride the shared treat ledger). */
+    gameplayViewOf(state) {
+        const stats = {};
+        for (const [name, value] of Object.entries(state.stats))
+            stats[name] = Math.round(value);
+        return { stats, mode: state.mode };
+    }
+    /**
+     * Move gameplay 'treats' currency (the unified post-wallet currency) from
+     * the engine's settle work area into the shared treat ledger, capped by
+     * the stock cap. The engine keeps its generic currency record for settle
+     * math; this drain is the only bridge to the wallet-free economy.
+     */
+    drainGameplayTreats(state) {
+        const pending = Math.floor(state.currencies[GAMEPLAY_TREATS_CURRENCY] ?? 0);
+        delete state.currencies[GAMEPLAY_TREATS_CURRENCY];
+        if (pending > 0)
+            this.ledger.grantTreats(pending);
+    }
+    /** Persist the mutated gameplay state of one verb call. */
+    commitGameplay(petId, state) {
+        this.ledger.setGameplay(petId, state);
+        if (this.ledger.takeDirty())
+            this.flush();
+    }
+    /**
+     * RPC: a touch on the pet. 'zone' names a touch zone (roll a branch);
+     * omitted means a plain click while a touch animation holds (clickBoost).
+     */
+    async gameplayTouch(zone) {
+        const def = this.gameplayDef();
+        if (def === undefined)
+            return { ok: false, error: 'no-gameplay' };
+        const now = Date.now();
+        const { petId, state } = this.gameplayState(def, now);
+        settleGameplay(state, def, now, { sessionActive: this.machine.render().sessionActive });
+        if (zone === undefined) {
+            const boost = def.touch?.clickBoost;
+            if (boost === undefined)
+                return { ok: false, error: 'no-touch' };
+            const amount = boost.min + Math.floor(Math.random() * (boost.max - boost.min + 1));
+            if (amount > 0)
+                applyGameplayEffects(state, def, [{ stat: boost.stat, amount }]);
+            this.drainGameplayTreats(state);
+            this.commitGameplay(petId, state);
+            return { ok: true, hit: false, view: this.gameplayViewOf(state) };
+        }
+        const target = def.touch?.zones.find(entry => entry.name === zone);
+        if (target === undefined)
+            return { ok: false, error: 'unknown-zone' };
+        const branch = rollTouchBranch(target, Math.random);
+        if (branch === undefined) {
+            this.drainGameplayTreats(state);
+            this.commitGameplay(petId, state);
+            return { ok: true, hit: false, view: this.gameplayViewOf(state) };
+        }
+        if (branch.effects !== undefined)
+            applyGameplayEffects(state, def, branch.effects);
+        const phrase = branch.phrases !== undefined && branch.phrases.length > 0
+            ? branch.phrases[Math.floor(Math.random() * branch.phrases.length)]
+            : undefined;
+        this.drainGameplayTreats(state);
+        this.commitGameplay(petId, state);
+        return {
+            ok: true,
+            hit: true,
+            ...(branch.state === undefined ? {} : { state: branch.state }),
+            ...(branch.stateMs === undefined ? {} : { stateMs: branch.stateMs }),
+            ...(phrase === undefined ? {} : { phrase }),
+            view: this.gameplayViewOf(state),
+        };
+    }
+    /** RPC: enter or leave a gameplay mode ('work' | 'sleep' | null). */
+    async gameplaySetMode(mode) {
+        const def = this.gameplayDef();
+        if (def === undefined)
+            return { ok: false, error: 'no-gameplay' };
+        if (mode === 'work' && def.work === undefined)
+            return { ok: false, error: 'no-work' };
+        if (mode === 'sleep' && def.sleep === undefined)
+            return { ok: false, error: 'no-sleep' };
+        const now = Date.now();
+        const { petId, state } = this.gameplayState(def, now);
+        settleGameplay(state, def, now, { sessionActive: this.machine.render().sessionActive });
+        state.mode = mode;
+        this.drainGameplayTreats(state);
+        this.commitGameplay(petId, state);
+        return { ok: true, view: this.gameplayViewOf(state) };
+    }
+    /** RPC: one work-round adjudication (only while the work mode holds). */
+    async gameplayWorkTick() {
+        const def = this.gameplayDef();
+        if (def?.work === undefined)
+            return { ok: false, error: 'no-work' };
+        const now = Date.now();
+        const { petId, state } = this.gameplayState(def, now);
+        if (state.mode !== 'work')
+            return { ok: false, error: 'not-working' };
+        settleGameplay(state, def, now, { sessionActive: this.machine.render().sessionActive });
+        const outcome = rollWorkOutcome(def.work, Math.random);
+        const effects = outcome === 'success' ? def.work.success?.effects : def.work.fail?.effects;
+        if (effects !== undefined)
+            applyGameplayEffects(state, def, effects);
+        this.drainGameplayTreats(state);
+        this.commitGameplay(petId, state);
+        return { ok: true, outcome, view: this.gameplayViewOf(state) };
+    }
+    /** RPC: buy one shop item (effects, currency swap, or a lottery draw). */
+    async gameplayBuy(itemId) {
+        const def = this.gameplayDef();
+        if (def === undefined)
+            return { ok: false, error: 'no-gameplay' };
+        const item = def.shop?.items.find(entry => entry.id === itemId);
+        if (item === undefined)
+            return { ok: false, error: 'unknown-item' };
+        const now = Date.now();
+        const { petId, state } = this.gameplayState(def, now);
+        settleGameplay(state, def, now, { sessionActive: this.machine.render().sessionActive });
+        // The unified currency is the shared treat ledger (wallet removed): shop
+        // prices and prizes ride the same balance the panel shows and feeding
+        // consumes, capped by the stock cap.
+        const treats = item.currency === GAMEPLAY_TREATS_CURRENCY;
+        const balance = treats ? this.ledger.snapshot.treats.treats : (state.currencies[item.currency] ?? 0);
+        if (balance < item.price) {
+            return { ok: false, error: 'insufficient-funds', view: this.gameplayViewOf(state) };
+        }
+        if (treats)
+            this.ledger.spendTreats(item.price);
+        else
+            state.currencies[item.currency] = balance - item.price;
+        if (item.effects !== undefined)
+            applyGameplayEffects(state, def, item.effects);
+        let prize;
+        if (item.lottery !== undefined) {
+            if (item.lottery.effects !== undefined)
+                applyGameplayEffects(state, def, item.lottery.effects);
+            const tier = drawLotteryTier(item.lottery, Math.random);
+            const prizeCurrency = tier.currency ?? item.lottery.currency ?? item.currency;
+            if (prizeCurrency === GAMEPLAY_TREATS_CURRENCY)
+                this.ledger.grantTreats(tier.prize);
+            else
+                state.currencies[prizeCurrency] = (state.currencies[prizeCurrency] ?? 0) + tier.prize;
+            prize = { amount: tier.prize, currency: prizeCurrency };
+        }
+        this.drainGameplayTreats(state);
+        this.commitGameplay(petId, state);
+        return { ok: true, ...(prize === undefined ? {} : { prize }), view: this.gameplayViewOf(state) };
+    }
     /** RPC: show or hide the pet. */
     async setVisible(visible) {
         this.ledger.setDisplay({ ...this.ledger.snapshot.display, visible });
@@ -376,15 +547,17 @@ export class PetService extends Service {
         if (this.ledger.rewardLegacyTurn(Date.now()))
             this.flush();
     }
-    view() {
+    view(currentSessionId) {
         const snapshot = this.machine.render();
         const entry = this.activeEntry();
-        // One bubble per concurrently active TOP-LEVEL session, most recent
-        // first. Subagent children render no bubble of their own (their activity
-        // already shows through the spawning conversation's bubble/display, and
-        // the bubble buttons navigate to GUI sessions, which subagents are not).
-        // Sessions whose own machine has settled (no bubble copy) drop out, so a
-        // finished turn does not leave a stale bubble behind.
+        // One bubble per concurrently active TOP-LEVEL session. The GUI's current
+        // session leads the stack when reported (the browser half passes its
+        // session list's 'current'); everything else keeps the most recent
+        // meaningful event order. Subagent children render no bubble of their own
+        // (their activity already shows through the spawning conversation's
+        // bubble/display, and the bubble buttons navigate to GUI sessions, which
+        // subagents are not). 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)
@@ -394,23 +567,39 @@ export class PetService extends Service {
             const perSession = activity.machine.render();
             if (perSession.bubble === undefined)
                 continue;
+            // Each session's whisper rides its own bubble while fresh; an expired
+            // whisper simply stops appearing (the client's 2 s poll drops it).
+            const whisper = activity.whisper;
+            const freshWhisper = whisper !== undefined && Date.now() - whisper.at < WHISPER_TTL_MS
+                ? whisper.text
+                : undefined;
             sessions.push({
                 sessionId: String(session.id),
                 animation: perSession.animation,
                 bubble: perSession.bubble,
                 phase: perSession.phase,
+                ...(freshWhisper === undefined ? {} : { whisper: freshWhisper }),
             });
         }
-        // The display session's inner whisper rides the global view while fresh;
-        // an expired whisper simply stops appearing (the client's 2s poll drops it).
-        const displayActivity = this.displaySession === undefined
-            ? undefined
-            : this.sessionActivity.get(this.displaySession);
-        const whisper = displayActivity?.whisper;
-        const freshWhisper = whisper !== undefined && Date.now() - whisper.at < WHISPER_TTL_MS
-            ? whisper.text
-            : undefined;
+        // The browser half reports the session the user is currently on; that
+        // session's bubble leads the stack (its whisper then speaks on the
+        // collapsed single bubble). An unreported or absent session keeps the
+        // legacy most-recent-first order.
+        if (currentSessionId !== undefined) {
+            const index = sessions.findIndex(session => session.sessionId === currentSessionId);
+            if (index > 0)
+                sessions.unshift(sessions.splice(index, 1)[0]);
+        }
         const decoration = this.activeDecoration();
+        // Gameplay view: a read-only projection. The settle runs on a copy, so
+        // polling never writes pet.json (verbs settle and persist).
+        const gameplayDef = this.gameplayDef();
+        let gameplay;
+        if (gameplayDef !== undefined) {
+            const { state } = this.gameplayState(gameplayDef, Date.now());
+            settleGameplay(state, gameplayDef, Date.now(), { sessionActive: snapshot.sessionActive });
+            gameplay = this.gameplayViewOf(state);
+        }
         // Read-only: the ledger settles on economic events only, never on a read,
         // so polling the state cannot trigger pet.json writes.
         return {
@@ -419,7 +608,6 @@ export class PetService extends Service {
             phase: snapshot.phase,
             sessionActive: snapshot.sessionActive,
             sessions,
-            ...(freshWhisper === undefined ? {} : { whisper: freshWhisper }),
             ...(decoration === undefined ? {} : { decoration }),
             affinity: this.ledger.affinityView(Date.now()),
             display: { ...this.ledger.snapshot.display },
@@ -433,6 +621,7 @@ export class PetService extends Service {
                 stocked: this.ledger.snapshot.treats.treats,
                 max: this.ledger.treatMax,
             },
+            ...(gameplay === undefined ? {} : { gameplay }),
         };
     }
     flush() {

package/lib/types/voice-pack.d.ts

@@ -27,7 +27,7 @@
  * TypeScript mode: keep it erasable-syntax-only.
  * @module @linxin666/dsh-pet/voice-pack
  */
-import { type VoicePackOverrides, type WhisperRule } from './chatter.ts';
+import { type VoicePackOverrides, type WhisperCategory, type WhisperResult } from './chatter.ts';
 /** Schema version this module normalizes (optional field; missing = 1). */
 export declare const VOICE_PACK_V1: 1;
 /** Hover-panel action buttons a pack can show or hide (canonical order). */
@@ -58,12 +58,9 @@ export interface VoicePack {
 /** Hard caps shared by every pool slot (mirrors the remarks discipline). */
 export declare const VOICE_POOL_LINES_MAX = 64;
 export declare const VOICE_LINE_MAX = 160;
-export declare const VOICE_KEYWORDS_PER_RULE_MAX = 16;
-export declare const VOICE_KEYWORD_MAX = 40;
-export declare const VOICE_RULES_MAX = 32;
 export declare const VOICE_LABEL_MAX = 40;
 export declare const VOICE_STAT_MAX = 80;
-type PoolKind = 'status' | 'tools' | 'toolRemaining' | 'whisperGeneric' | 'whisperRule' | 'label' | 'stat';
+type PoolKind = 'status' | 'tools' | 'toolRemaining' | 'whisperCategory' | 'whisperResult' | 'label' | 'stat';
 /**
  * Normalize one pool slot. Accepts a single line or an array; non-string
  * entries warn and drop, empty lines drop silently, lines over the length
@@ -73,8 +70,10 @@ type PoolKind = 'status' | 'tools' | 'toolRemaining' | 'whisperGeneric' | 'whisp
  * undefined (the slot keeps the built-in pool).
  */
 export declare function normalizePool(raw: unknown, kind: PoolKind, onWarning?: (message: string) => void): string[] | undefined;
-/** Normalize the ordered keyword-rule list ([] disables the keyword channel). */
-export declare function normalizeWhisperRules(raw: unknown, onWarning?: (message: string) => void): WhisperRule[] | undefined;
+/** Normalize whisper category pools; a key replaces that category's built-in pool (an explicit empty pool mutes it). */
+export declare function normalizeWhisperCategories(raw: unknown, onWarning?: (message: string) => void): Partial<Record<WhisperCategory, readonly string[]>> | undefined;
+/** Normalize whisper outcome pools; a key replaces that outcome's built-in pool (an explicit empty pool mutes it). */
+export declare function normalizeWhisperResults(raw: unknown, onWarning?: (message: string) => void): Partial<Record<WhisperResult, readonly string[]>> | undefined;
 /** Normalize the panel block (labels / stats / actions; warn-and-drop). */
 export declare function normalizePanel(raw: unknown, onWarning?: (message: string) => void): PetPanelView | undefined;
 /** Voice-pack top-level fields ('$schema' mirrors the schema twin; drift-locked in tests). */

package/lib/types/voice-pack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"voice-pack.d.ts","sourceRoot":"","sources":["../../src/voice-pack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,cAAc,CAAA;AAErB,2EAA2E;AAC3E,eAAO,MAAM,aAAa,EAAG,CAAU,CAAA;AAEvC,4EAA4E;AAC5E,eAAO,MAAM,aAAa,qCAAsC,CAAA;AAChE,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAA;AAExD,8EAA8E;AAC9E,eAAO,MAAM,gBAAgB,gDAAiD,CAAA;AAC9E,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAE7D,0EAA0E;AAC1E,eAAO,MAAM,eAAe,uCAAwC,CAAA;AACpE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAA;AAE3D,+DAA+D;AAC/D,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAA;IAC/C,oEAAoE;IACpE,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IAC7C,2EAA2E;IAC3E,OAAO,CAAC,EAAE,WAAW,EAAE,CAAA;CACxB;AAED,6EAA6E;AAC7E,MAAM,WAAW,SAAS;IACxB,yEAAyE;IACzE,SAAS,EAAE,kBAAkB,CAAA;IAC7B,sDAAsD;IACtD,KAAK,CAAC,EAAE,YAAY,CAAA;CACrB;AAED,4EAA4E;AAC5E,eAAO,MAAM,oBAAoB,KAAK,CAAA;AACtC,eAAO,MAAM,cAAc,MAAM,CAAA;AACjC,eAAO,MAAM,2BAA2B,KAAK,CAAA;AAC7C,eAAO,MAAM,iBAAiB,KAAK,CAAA;AACnC,eAAO,MAAM,eAAe,KAAK,CAAA;AACjC,eAAO,MAAM,eAAe,KAAK,CAAA;AACjC,eAAO,MAAM,cAAc,KAAK,CAAA;AAYhC,KAAK,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,eAAe,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,GAAG,MAAM,CAAA;AA8B1G;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,QAAQ,EACd,SAAS,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAe,GAC9C,MAAM,EAAE,GAAG,SAAS,CAoBtB;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,OAAO,EACZ,SAAS,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAe,GAC9C,WAAW,EAAE,GAAG,SAAS,CAyC3B;AAED,2EAA2E;AAC3E,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,EACZ,SAAS,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAe,GAC9C,YAAY,GAAG,SAAS,CA+D1B;AAED,8FAA8F;AAC9F,eAAO,MAAM,eAAe,aAAoG,CAAA;AAEhI,8DAA8D;AAC9D,eAAO,MAAM,YAAY,aAAgC,CAAA;AAEzD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,OAAO,EACZ,SAAS,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAe,GAC9C,SAAS,GAAG,SAAS,CAmFvB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,SAAS,CAsC3F"}
+{"version":3,"file":"voice-pack.d.ts","sourceRoot":"","sources":["../../src/voice-pack.ts"],"names":[],"mappings":"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"}

package/lib/types/voice-pack.js

@@ -27,7 +27,7 @@
  * TypeScript mode: keep it erasable-syntax-only.
  * @module @linxin666/dsh-pet/voice-pack
  */
-import { STATUS_SCENES, TOOL_CATEGORIES, } from "./chatter.js";
+import { STATUS_SCENES, TOOL_CATEGORIES, WHISPER_CATEGORIES, WHISPER_RESULTS, } from "./chatter.js";
 /** Schema version this module normalizes (optional field; missing = 1). */
 export const VOICE_PACK_V1 = 1;
 /** Hover-panel action buttons a pack can show or hide (canonical order). */
@@ -39,9 +39,6 @@ export const PANEL_STAT_KEYS = ['rank', 'treats', 'points'];
 /** Hard caps shared by every pool slot (mirrors the remarks discipline). */
 export const VOICE_POOL_LINES_MAX = 64;
 export const VOICE_LINE_MAX = 160;
-export const VOICE_KEYWORDS_PER_RULE_MAX = 16;
-export const VOICE_KEYWORD_MAX = 40;
-export const VOICE_RULES_MAX = 32;
 export const VOICE_LABEL_MAX = 40;
 export const VOICE_STAT_MAX = 80;
 /** Any '{token}' placeholder (no nesting, no newlines). */
@@ -112,51 +109,45 @@ export function normalizePool(raw, kind, onWarning = () => { }) {
     }
     return pool;
 }
-/** Normalize the ordered keyword-rule list ([] disables the keyword channel). */
-export function normalizeWhisperRules(raw, onWarning = () => { }) {
+/** Normalize whisper category pools; a key replaces that category's built-in pool (an explicit empty pool mutes it). */
+export function normalizeWhisperCategories(raw, onWarning = () => { }) {
     if (raw === undefined)
         return undefined;
-    if (!Array.isArray(raw)) {
-        onWarning('whispers.rules must be an array');
+    if (!isRecord(raw)) {
+        onWarning('whispers.categories must be an object');
         return undefined;
     }
-    if (raw.length > VOICE_RULES_MAX) {
-        onWarning('whispers.rules has more than ' + VOICE_RULES_MAX + ' rules; extra rules are ignored');
-    }
-    const rules = [];
-    for (const item of raw.slice(0, VOICE_RULES_MAX)) {
-        if (!isRecord(item)) {
-            onWarning('whisper rule must be an object');
+    const pools = {};
+    for (const key of Object.keys(raw)) {
+        if (!WHISPER_CATEGORIES.includes(key)) {
+            onWarning('unknown whisper category ' + key + ' ignored');
             continue;
         }
-        for (const key of Object.keys(item)) {
-            if (key !== 'keywords' && key !== 'pool')
-                onWarning('unknown whisper rule field ' + key + ' ignored');
-        }
-        const keywordsRaw = item.keywords;
-        const keywords = [];
-        if (Array.isArray(keywordsRaw)) {
-            for (const entry of keywordsRaw.slice(0, VOICE_KEYWORDS_PER_RULE_MAX)) {
-                if (typeof entry !== 'string') {
-                    onWarning('non-string keyword dropped');
-                    continue;
-                }
-                const trimmed = entry.trim().toLowerCase().slice(0, VOICE_KEYWORD_MAX);
-                if (trimmed !== '')
-                    keywords.push(trimmed);
-            }
-            if (keywordsRaw.length > VOICE_KEYWORDS_PER_RULE_MAX) {
-                onWarning('rule has more than ' + VOICE_KEYWORDS_PER_RULE_MAX + ' keywords; extra keywords are ignored');
-            }
-        }
-        const pool = normalizePool(item.pool, 'whisperRule', onWarning);
-        if (keywords.length === 0 || pool === undefined || pool.length === 0) {
-            onWarning('whisper rule dropped (needs keywords and a non-empty pool)');
+        const pool = normalizePool(raw[key], 'whisperCategory', onWarning);
+        if (pool !== undefined)
+            pools[key] = pool;
+    }
+    return Object.keys(pools).length > 0 ? pools : undefined;
+}
+/** Normalize whisper outcome pools; a key replaces that outcome's built-in pool (an explicit empty pool mutes it). */
+export function normalizeWhisperResults(raw, onWarning = () => { }) {
+    if (raw === undefined)
+        return undefined;
+    if (!isRecord(raw)) {
+        onWarning('whispers.results must be an object');
+        return undefined;
+    }
+    const pools = {};
+    for (const key of Object.keys(raw)) {
+        if (!WHISPER_RESULTS.includes(key)) {
+            onWarning('unknown whisper result ' + key + ' ignored');
             continue;
         }
-        rules.push({ keywords, pool });
+        const pool = normalizePool(raw[key], 'whisperResult', onWarning);
+        if (pool !== undefined)
+            pools[key] = pool;
     }
-    return rules;
+    return Object.keys(pools).length > 0 ? pools : undefined;
 }
 /** Normalize the panel block (labels / stats / actions; warn-and-drop). */
 export function normalizePanel(raw, onWarning = () => { }) {
@@ -236,7 +227,7 @@ export function normalizePanel(raw, onWarning = () => { }) {
 /** Voice-pack top-level fields ('$schema' mirrors the schema twin; drift-locked in tests). */
 export const VOICE_PACK_KEYS = new Set(['$schema', 'voicePackVersion', 'status', 'tools', 'toolRemaining', 'whispers', 'panel']);
 /** Allowed whisper-section fields (drift-locked in tests). */
-export const WHISPER_KEYS = new Set(['generic', 'rules']);
+export const WHISPER_KEYS = new Set(['categories', 'results']);
 /**
  * Normalize one raw voice.json document into a VoicePack, or undefined when
  * the file cannot serve as a pack at all (non-object root — structure is
@@ -307,15 +298,21 @@ export function normalizeVoicePack(raw, onWarning = () => { }) {
         }
         else {
             for (const key of Object.keys(whispersRaw)) {
-                if (!WHISPER_KEYS.has(key))
+                if (key === 'generic' || key === 'rules') {
+                    // pet M6: keyword and ambient whisper channels are gone; legacy
+                    // fields are ignored with a warning, never mapped to the new shape.
+                    onWarning('whispers.' + key + ' is no longer supported and was ignored');
+                }
+                else if (!WHISPER_KEYS.has(key)) {
                     onWarning('unknown whispers field ' + key + ' ignored');
+                }
             }
-            const generic = normalizePool(whispersRaw.generic, 'whisperGeneric', onWarning);
-            const rules = normalizeWhisperRules(whispersRaw.rules, onWarning);
-            if (generic !== undefined || rules !== undefined) {
+            const categories = normalizeWhisperCategories(whispersRaw.categories, onWarning);
+            const results = normalizeWhisperResults(whispersRaw.results, onWarning);
+            if (categories !== undefined || results !== undefined) {
                 overrides.whispers = {
-                    ...(generic === undefined ? {} : { generic }),
-                    ...(rules === undefined ? {} : { rules }),
+                    ...(categories === undefined ? {} : { categories }),
+                    ...(results === undefined ? {} : { results }),
                 };
             }
         }

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.3.3",
+  "version": "0.3.5",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -31,7 +31,10 @@
     "lib/**/*.d.ts.map",
     "src",
     "cordis.patch.yml",
-    "assets",
+    "assets/whale",
+    "assets/whale-refined",
+    "assets/ouo-neko",
+    "assets/decorations",
     "contracts"
   ],
   "license": "Apache-2.0",

package/src/chatter.test.ts

@@ -11,8 +11,9 @@ import {
   TOOL_POOLS,
   toolArgHint,
   toolCategory,
-  WHISPER_GENERIC_POOL,
-  WHISPER_RULES,
+  WHISPER_CATEGORY_POOLS,
+  WHISPER_RESULT_POOLS,
+  looksLikeTestTool,
   WhisperEngine,
   type VoicePackOverrides,
 } from './chatter.ts'
@@ -127,30 +128,65 @@ describe('toolArgHint', () => {
 })
 
 describe('WhisperEngine', () => {
-  it('wakes a themed whisper from a keyword in the model output', () => {
+  it('speaks a category line for the current situation, then respects the cooldown', () => {
     const engine = new WhisperEngine()
-    expect(engine.feed('这里有个错误需要处理', 0)).toBe(WHISPER_RULES[1]!.pool[0])
+    expect(engine.feed('thinking', 0)).toBe(WHISPER_CATEGORY_POOLS.thinking[0])
+    expect(engine.feed('writing', 1)).toBeUndefined()
   })
 
-  it('suppresses whispers during the cooldown, then rotates the pool', () => {
+  it('rotates within each category and keeps the category cursors apart', () => {
     const engine = new WhisperEngine()
-    expect(engine.feed('出现一个错误', 0)).toBe(WHISPER_RULES[1]!.pool[0])
-    expect(engine.feed('又一个错误', 1000)).toBeUndefined()
-    expect(engine.feed('还有一个错误', 9000)).toBe(WHISPER_RULES[1]!.pool[1])
+    expect(engine.feed('thinking', 0)).toBe(WHISPER_CATEGORY_POOLS.thinking[0])
+    expect(engine.feed('writing', 9001)).toBe(WHISPER_CATEGORY_POOLS.writing[0])
+    expect(engine.feed('thinking', 18002)).toBe(WHISPER_CATEGORY_POOLS.thinking[1])
   })
 
-  it('earns an ambient whisper from output volume alone', () => {
-    const engine = new WhisperEngine(undefined, 0, 10)
-    expect(engine.feed('aaaaaaaa', 0)).toBeUndefined()
-    expect(engine.feed('bbbb', 1)).toBe(WHISPER_GENERIC_POOL[0])
-    // The counter resets after speaking: another budget must accumulate.
-    expect(engine.feed('cccc', 2)).toBeUndefined()
-    expect(engine.feed('dddddddddd', 3)).toBe(WHISPER_GENERIC_POOL[1])
+  it('stays quiet on an explicitly muted category', () => {
+    const engine = new WhisperEngine(() => ({ whispers: { categories: { thinking: [] } } }))
+    expect(engine.feed('thinking', 0)).toBeUndefined()
   })
 
-  it('ignores empty chunks', () => {
-    const engine = new WhisperEngine(undefined, 0, 0)
-    expect(engine.feed('', 0)).toBeUndefined()
+  it('wakes outcome whispers on their own shorter cooldown and rotates per outcome', () => {
+    const engine = new WhisperEngine()
+    expect(engine.result('pass', 0)).toBe(WHISPER_RESULT_POOLS.pass[0])
+    expect(engine.result('fail', 1000)).toBeUndefined()
+    expect(engine.result('fail', 5001)).toBe(WHISPER_RESULT_POOLS.fail[0])
+    expect(engine.result('pass', 10002)).toBe(WHISPER_RESULT_POOLS.pass[1])
+  })
+
+  it('paces category and outcome whispers against one shared clock', () => {
+    const engine = new WhisperEngine()
+    expect(engine.feed('writing', 0)).toBe(WHISPER_CATEGORY_POOLS.writing[0])
+    // An outcome right after a category reply must wait the outcome cooldown.
+    expect(engine.result('done', 4999)).toBeUndefined()
+    expect(engine.result('done', 5000)).toBe(WHISPER_RESULT_POOLS.done[0])
+    // After an outcome, the category must wait the full category cooldown
+    // measured from the outcome whisper (5000), so 14000 is the next slot.
+    expect(engine.feed('thinking', 5001)).toBeUndefined()
+    expect(engine.feed('thinking', 14000)).toBe(WHISPER_CATEGORY_POOLS.thinking[0])
+  })
+
+  it('mutes an outcome with an explicit empty pool', () => {
+    const engine = new WhisperEngine(() => ({ whispers: { results: { fail: [] } } }))
+    expect(engine.result('fail', 0)).toBeUndefined()
+  })
+})
+
+describe('looksLikeTestTool', () => {
+  it('recognizes test tools by name and by shell command', () => {
+    expect(looksLikeTestTool('run_tests', undefined)).toBe(true)
+    expect(looksLikeTestTool('run_code', '{"command":"npm test"}')).toBe(true)
+    expect(looksLikeTestTool('run_code', '{"command":"pnpm run test -- --run"}')).toBe(true)
+    expect(looksLikeTestTool('bash', '{"command":"pytest -q"}')).toBe(true)
+    expect(looksLikeTestTool('bash', '{"command":"go test ./..."}')).toBe(true)
+    expect(looksLikeTestTool('run_code', '{"code":"import pytest"}')).toBe(true)
+  })
+
+  it('does not misfire on ordinary tools or mentions in generic code', () => {
+    expect(looksLikeTestTool('bash', '{"command":"node server.js"}')).toBe(false)
+    expect(looksLikeTestTool('grep', '{"pattern":"test"}')).toBe(false)
+    expect(looksLikeTestTool('read', '{"file_path":"/repo/test/fixture.txt"}')).toBe(false)
+    expect(looksLikeTestTool('run_code', '{"code":"server.listen(8080)"}')).toBe(false)
   })
 })
 
@@ -165,8 +201,8 @@ describe('voice-pack overrides (pet-center M4)', () => {
     },
     toolRemaining: ['后台还有 {n} 个'],
     whispers: {
-      generic: ['自定义碎碎念 A', '自定义碎碎念 B'],
-      rules: [{ keywords: ['测试通过'], pool: ['自定义全绿'] }],
+      categories: { thinking: ['自定义思考', '自定义思考二'] },
+      results: { pass: ['自定义全绿'] },
     },
   })
 
@@ -214,28 +250,22 @@ describe('voice-pack overrides (pet-center M4)', () => {
     expect(voice.scene('done', 5000)).toBe('换声了')
   })
 
-  it('replaces the whisper rules as a whole', () => {
+  it('replaces whisper category pools per key', () => {
     const engine = new WhisperEngine(PACK)
-    expect(engine.feed('这里有一个错误', 0)).toBeUndefined()
-    // The built-in error rule is gone; only the pack's rule fires.
-    expect(engine.feed('测试通过', 1000)).toBe('自定义全绿')
+    expect(engine.feed('thinking', 0)).toBe('自定义思考')
+    expect(engine.feed('writing', 9000)).toBe(WHISPER_CATEGORY_POOLS.writing[0])
+    expect(engine.feed('thinking', 18000)).toBe('自定义思考二')
   })
 
-  it('replaces the ambient generic pool', () => {
-    const engine = new WhisperEngine(PACK, 0, 3)
-    expect(engine.feed('aaaa', 0)).toBe('自定义碎碎念 A')
-    expect(engine.feed('bbbb', 1)).toBe('自定义碎碎念 B')
-  })
-
-  it('mutes ambient whispers when the generic pool is explicitly empty', () => {
-    const engine = new WhisperEngine(() => ({ whispers: { generic: [] } }), 0, 3)
-    expect(engine.feed('aaaa', 0)).toBeUndefined()
-    expect(engine.feed('bbbb', 1)).toBeUndefined()
+  it('replaces whisper outcome pools per key', () => {
+    const engine = new WhisperEngine(PACK)
+    expect(engine.result('pass', 0)).toBe('自定义全绿')
+    expect(engine.result('fail', 5001)).toBe(WHISPER_RESULT_POOLS.fail[0])
   })
 
-  it('disables keyword rules when the rules array is explicitly empty', () => {
-    const engine = new WhisperEngine(() => ({ whispers: { rules: [] } }), 0, 3)
-    // No keyword rule matches anymore; volume still earns a built-in ambient.
-    expect(engine.feed('测试通过', 0)).toBe(WHISPER_GENERIC_POOL[0])
+  it('mutes a whisper channel with an explicit empty override', () => {
+    const engine = new WhisperEngine(() => ({ whispers: { categories: { thinking: [] }, results: { done: [] } } }))
+    expect(engine.feed('thinking', 0)).toBeUndefined()
+    expect(engine.result('done', 0)).toBeUndefined()
   })
 })