@linxin666/dsh-pet 0.1.12 → 0.1.14

package/lib/types/state.d.ts

@@ -1,8 +1,7 @@
 /**
- * Pet state machine — pure, clock-injected. Maps the pet's working-phase
- * vocabulary (the service derives it from core session events) onto the
- * 9-state Codex pet animation contract, plus the session lifecycle
- * transitions the web UI exposes (turn end celebration, no-session idle).
+ * Pet state machine — pure, clock-injected. Maps official DSH session activity
+ * and the legacy `activity/status` vocabulary onto the 9-state Codex pet
+ * animation contract, plus turn-end celebration and no-session idle.
  *
  * The machine is deliberately dumb: it holds the last input phase, the
  * animation decision, and a one-shot "celebration" window after `done` so the
@@ -10,13 +9,13 @@
  * function of (input, nowMs); persistence and RPC live in the service.
  * @module @linxin666/dsh-pet/state
  */
-/** The pet's working-phase vocabulary (derived from core session events by the service). */
-export type ActivityPhase = 'idle' | 'waiting' | 'thinking' | 'tool' | 'done';
+/** Activity phases understood by the pet host. */
+export type ActivityPhase = 'idle' | 'waiting' | 'thinking' | 'tool' | 'review' | 'done' | 'failed';
 /** The Codex-compatible 9-state animation contract (spritesheet rows). */
 export type PetAnimation = 'idle' | 'running-right' | 'running-left' | 'waving' | 'jumping' | 'failed' | 'waiting' | 'running' | 'review';
 /** One input snapshot consumed by the machine. */
 export interface PetStateInput {
-    /** Current working phase of the active session. */
+    /** Current activity phase of the active session. */
     phase: ActivityPhase;
     /** Human-readable status line (plain text). */
     line?: string;
@@ -44,13 +43,12 @@ export interface PetStateConfig {
 export declare const defaultPetStateConfig: PetStateConfig;
 /**
  * Map one activity phase onto the animation contract.
- * - thinking / tool → `running` (focused work), with `running-right` as the
- *   side-alternating variant the client may use for tool activity.
+ * - thinking → `running` and tool → `running-right` (focused work).
+ * - review → `review` while answer text is streaming.
  * - waiting → `waiting` (expectant pose, needs user input).
  * - done → `jumping` (celebration), then back to `idle` after the window.
+ * - failed → `failed` until another activity event arrives.
  * - idle → `idle` (calm breathing loop).
- * `failed` has no DSH phase source yet; the machine keeps the mapping table
- * so a future error event can light it up.
  */
 export declare function animationForPhase(phase: ActivityPhase): PetAnimation;
 /** The spritesheet row index for one animation track. */
@@ -68,7 +66,7 @@ export declare class PetStateMachine {
     private sessionActive;
     private doneAt;
     constructor(config?: PetStateConfig, now?: () => number);
-    /** Consume one phase snapshot (fed by the service from session events). */
+    /** Consume one projected activity update. */
     onActivityStatus(input: PetStateInput): void;
     /** A session became the active one (or a fresh session started). */
     onSessionActive(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,4FAA4F;AAC5F,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAA;AAE7E,0EAA0E;AAC1E,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,eAAe,GACf,cAAc,GACd,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,SAAS,GACT,SAAS,GACT,QAAQ,CAAA;AAEZ,kDAAkD;AAClD,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,KAAK,EAAE,aAAa,CAAA;IACpB,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,4DAA4D;AAC5D,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,SAAS,EAAE,YAAY,CAAA;IACvB,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,oEAAoE;IACpE,kBAAkB,EAAE,MAAM,CAAA;IAC1B,oEAAoE;IACpE,KAAK,EAAE,aAAa,CAAA;IACpB,0DAA0D;IAC1D,aAAa,EAAE,OAAO,CAAA;CACvB;AAED,6BAA6B;AAC7B,MAAM,WAAW,cAAc;IAC7B,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,eAAO,MAAM,qBAAqB,EAAE,cAAsC,CAAA;AAE1E;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY,CAQpE;AAED,yDAAyD;AACzD,wBAAgB,KAAK,CAAC,SAAS,EAAE,YAAY,GAAG,MAAM,CAarD;AAED;;;GAGG;AACH,qBAAa,eAAe;IAQxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,MAAM,CAAoB;gBAGf,MAAM,GAAE,cAAsC,EAC9C,GAAG,GAAE,MAAM,MAAiB;IAG/C,2EAA2E;IAC3E,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAO5C,oEAAoE;IACpE,eAAe,IAAI,IAAI;IAIvB,sDAAsD;IACtD,iBAAiB,IAAI,IAAI;IAQzB,6CAA6C;IAC7C,MAAM,IAAI,gBAAgB;CAoB3B"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,kDAAkD;AAClD,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEnG,0EAA0E;AAC1E,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,eAAe,GACf,cAAc,GACd,QAAQ,GACR,SAAS,GACT,QAAQ,GACR,SAAS,GACT,SAAS,GACT,QAAQ,CAAA;AAEZ,kDAAkD;AAClD,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,KAAK,EAAE,aAAa,CAAA;IACpB,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,4DAA4D;AAC5D,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,SAAS,EAAE,YAAY,CAAA;IACvB,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,oEAAoE;IACpE,kBAAkB,EAAE,MAAM,CAAA;IAC1B,oEAAoE;IACpE,KAAK,EAAE,aAAa,CAAA;IACpB,0DAA0D;IAC1D,aAAa,EAAE,OAAO,CAAA;CACvB;AAED,6BAA6B;AAC7B,MAAM,WAAW,cAAc;IAC7B,kFAAkF;IAClF,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,eAAO,MAAM,qBAAqB,EAAE,cAAsC,CAAA;AAE1E;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY,CAUpE;AAED,yDAAyD;AACzD,wBAAgB,KAAK,CAAC,SAAS,EAAE,YAAY,GAAG,MAAM,CAarD;AAED;;;GAGG;AACH,qBAAa,eAAe;IAQxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,MAAM,CAAoB;gBAGf,MAAM,GAAE,cAAsC,EAC9C,GAAG,GAAE,MAAM,MAAiB;IAG/C,6CAA6C;IAC7C,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAO5C,oEAAoE;IACpE,eAAe,IAAI,IAAI;IAIvB,sDAAsD;IACtD,iBAAiB,IAAI,IAAI;IAQzB,6CAA6C;IAC7C,MAAM,IAAI,gBAAgB;CAwB3B"}

package/lib/types/state.js

@@ -1,8 +1,7 @@
 /**
- * Pet state machine — pure, clock-injected. Maps the pet's working-phase
- * vocabulary (the service derives it from core session events) onto the
- * 9-state Codex pet animation contract, plus the session lifecycle
- * transitions the web UI exposes (turn end celebration, no-session idle).
+ * Pet state machine — pure, clock-injected. Maps official DSH session activity
+ * and the legacy `activity/status` vocabulary onto the 9-state Codex pet
+ * animation contract, plus turn-end celebration and no-session idle.
  *
  * The machine is deliberately dumb: it holds the last input phase, the
  * animation decision, and a one-shot "celebration" window after `done` so the
@@ -13,20 +12,21 @@
 export const defaultPetStateConfig = { celebrateMs: 2400 };
 /**
  * Map one activity phase onto the animation contract.
- * - thinking / tool → `running` (focused work), with `running-right` as the
- *   side-alternating variant the client may use for tool activity.
+ * - thinking → `running` and tool → `running-right` (focused work).
+ * - review → `review` while answer text is streaming.
  * - waiting → `waiting` (expectant pose, needs user input).
  * - done → `jumping` (celebration), then back to `idle` after the window.
+ * - failed → `failed` until another activity event arrives.
  * - idle → `idle` (calm breathing loop).
- * `failed` has no DSH phase source yet; the machine keeps the mapping table
- * so a future error event can light it up.
  */
 export function animationForPhase(phase) {
     switch (phase) {
         case 'thinking': return 'running';
         case 'tool': return 'running-right';
+        case 'review': return 'review';
         case 'waiting': return 'waiting';
         case 'done': return 'jumping';
+        case 'failed': return 'failed';
         case 'idle': return 'idle';
     }
 }
@@ -61,7 +61,7 @@ export class PetStateMachine {
         this.config = config;
         this.now = now;
     }
-    /** Consume one phase snapshot (fed by the service from session events). */
+    /** Consume one projected activity update. */
     onActivityStatus(input) {
         this.phase = input.phase;
         this.line = input.line;
@@ -94,7 +94,11 @@ export class PetStateMachine {
                 animation = 'idle';
             }
         }
-        const bubble = this.phrase ?? this.line;
+        const bubble = this.phase === 'done'
+            && this.doneAt !== undefined
+            && nowMs - this.doneAt >= this.config.celebrateMs
+            ? undefined
+            : this.phrase ?? this.line;
         return {
             animation,
             ...(bubble === undefined ? {} : { bubble }),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-pet",
   "description": "鲸鱼娘宠物插件 for the dsh web GUI: a soft healing whale-girl companion that reacts to model activity (idle/waiting/thinking/tool/done), with petting/feeding interactions and an affinity score",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -53,16 +53,6 @@
     "schemastery": "^3.18.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

package/src/client/PluginSettingsCard.tsx

@@ -41,13 +41,14 @@ export function PluginSettingsCard(props: PluginSettingsCardProps) {
   if (!state.available) return null
   const title = props.t(props.titleKey)
   const blocked = !state.dirty || state.invalid || state.saving
+  const cardClass = open ? `${css.cardOpen} ${css.card}` : css.card
   // The namespace exists but the Host does not serve it to this client (the
   // official settings allowlist omits third-party namespaces): show a card
   // that explains the gap instead of vanishing, so a missing card never
   // reads as a missing plugin.
   if (!state.exposed) {
     return (
-      <li className={css.card}>
+      <li className={cardClass}>
         <button
           type="button"
           className={css.header}
@@ -59,7 +60,19 @@ export function PluginSettingsCard(props: PluginSettingsCardProps) {
             <span className={css.name}>{title}</span>
             <span className={css.description}>{props.t(props.descriptionKey)}</span>
           </span>
-          <span className={open ? css.chevronOpen : css.chevron}>▾</span>
+          <svg
+            width="14"
+            height="14"
+            viewBox="0 0 14 14"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            className={open ? `${css.chevron} ${css.chevronOpen}` : css.chevron}
+          >
+            <path
+              d="M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5Z"
+              fill="currentColor"
+            />
+          </svg>
         </button>
         {open
           ? (
@@ -72,7 +85,7 @@ export function PluginSettingsCard(props: PluginSettingsCardProps) {
     )
   }
   return (
-    <li className={css.card}>
+    <li className={cardClass}>
       <button
         type="button"
         className={css.header}
@@ -85,7 +98,19 @@ export function PluginSettingsCard(props: PluginSettingsCardProps) {
           <span className={css.description}>{props.t(props.descriptionKey)}</span>
         </span>
         {state.dirty ? <span className={css.pending}>{props.t('settings.unsaved')}</span> : null}
-        <span className={open ? css.chevronOpen : css.chevron}>▾</span>
+        <svg
+          width="14"
+          height="14"
+          viewBox="0 0 14 14"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+          className={open ? `${css.chevron} ${css.chevronOpen}` : css.chevron}
+        >
+          <path
+            d="M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5Z"
+            fill="currentColor"
+          />
+        </svg>
       </button>
       {open
         ? (
@@ -234,4 +259,4 @@ export function BooleanField(props: FieldProps & {
       <p className={css.hint}>{props.hint}</p>
     </div>
   )
-}
+}

package/src/client/WhalePet.test.tsx

@@ -55,7 +55,7 @@ afterEach(() => {
 })
 
 /** Render the pet with mocked callbacks; returns the rename spy. */
-function renderPet(): { onRename: ReturnType<typeof vi.fn> } {
+function renderPet(overrides: Partial<WhalePetProps> = {}): { onRename: ReturnType<typeof vi.fn> } {
   const onRename = vi.fn()
   const props: WhalePetProps = {
     snapshot,
@@ -68,6 +68,7 @@ function renderPet(): { onRename: ReturnType<typeof vi.fn> } {
     onRename,
     onFeedbackDone: vi.fn(),
     t,
+    ...overrides,
   }
   render(<WhalePet {...props} />)
   return { onRename }
@@ -136,3 +137,26 @@ describe('WhalePet rename input', () => {
     expect(screen.queryByPlaceholderText('输入新名字')).toBeNull()
   })
 })
+
+describe('WhalePet status bubble', () => {
+  const workingSnapshot: PetStateView = {
+    ...snapshot,
+    animation: 'running',
+    phase: 'thinking',
+    bubble: '正在思考',
+  }
+
+  it('renders host activity when no interaction feedback is active', () => {
+    renderPet({ snapshot: workingSnapshot })
+    expect(screen.queryByText('正在思考')).not.toBeNull()
+  })
+
+  it('lets transient interaction feedback replace host activity', () => {
+    renderPet({
+      snapshot: workingSnapshot,
+      feedback: { text: '摸摸成功', kind: 'pet', at: 1 },
+    })
+    expect(screen.queryByText('摸摸成功')).not.toBeNull()
+    expect(screen.queryByText('正在思考')).toBeNull()
+  })
+})

package/src/client/WhalePet.tsx

@@ -228,6 +228,7 @@ export function WhalePet(props: WhalePetProps): ReactPortal {
   const pos = dragPos ?? { right: display.right, bottom: display.bottom }
   const spriteWidth = Math.round(FRAME_WIDTH * spriteScale)
   const spriteHeight = Math.round(FRAME_HEIGHT * spriteScale)
+  const statusBubble = feedback === null && !hovered ? snapshot?.bubble : undefined
 
   const float = (
     <div
@@ -281,6 +282,11 @@ export function WhalePet(props: WhalePetProps): ReactPortal {
           {feedback.text}
         </div>
       )}
+      {statusBubble !== undefined && (
+        <div className={`${styles.bubble} ${styles.bubbleStatus}`} role="status" aria-live="polite">
+          {statusBubble}
+        </div>
+      )}
       {hovered && dragRef.current === null && (
         <div
           className={styles.panel}

package/src/client/pet.module.css

@@ -37,6 +37,15 @@
   background: rgba(56, 189, 248, 0.92);
 }
 
+.bubbleStatus {
+  max-width: min(280px, calc(100vw - 24px));
+  overflow: hidden;
+  text-overflow: ellipsis;
+  background: rgba(15, 23, 42, 0.9);
+  border: 1px solid rgba(125, 211, 252, 0.5);
+  animation: none;
+}
+
 @keyframes pet-bubble-pop {
   0% {
     opacity: 0;