@linxin666/dsh-pet 0.1.19 → 0.2.0

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.19",
+  "version": "0.2.0",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -58,14 +58,14 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@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-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "^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-client-locale": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.20.0",

package/src/affinity.test.ts

@@ -26,8 +26,9 @@ describe('applyInteraction', () => {
     const second = applyInteraction(first.affinity, 'pet', now + defaultAffinityConfig.petCooldownMs - 1)
     expect(second.accepted).toBe(false)
     expect(second.delta).toBe(0)
-    expect(second.affinity).toBe(first.affinity) // same reference: no mutation
+    expect(second.affinity).not.toBe(first.affinity)
     expect(second.affinity.pets).toBe(1)
+    expect(second.affinity.petRejects).toBe(1)
   })
 
   it('accepts a pet again after the cooldown elapsed', () => {
@@ -44,8 +45,9 @@ describe('applyInteraction', () => {
     const second = applyInteraction(first.affinity, 'feed', now + defaultAffinityConfig.feedCooldownMs - 1)
     expect(second.accepted).toBe(false)
     expect(second.delta).toBe(0)
-    expect(second.affinity).toBe(first.affinity)
+    expect(second.affinity).not.toBe(first.affinity)
     expect(second.affinity.feeds).toBe(1)
+    expect(second.affinity.feedRejects).toBe(1)
   })
 
   it('clamps points at AFFINITY_MAX', () => {

package/src/affinity.ts

@@ -8,7 +8,7 @@
  * @module @linxin666/dsh-pet/affinity
  */
 
-import { builtinRemark } from './remarks.ts'
+import { BUILTIN_REMARKS, builtinRemark } from './remarks.ts'
 
 /** One interaction the user can perform on the pet. */
 export type PetInteraction = 'pet' | 'feed'
@@ -25,6 +25,10 @@ export interface AffinityState {
   pets: number
   /** Total feed count (lifetime). */
   feeds: number
+  /** Total pet attempts rejected by cooldown (lifetime). */
+  petRejects: number
+  /** Total feed attempts rejected by cooldown (lifetime). */
+  feedRejects: number
   /** Total completed turns witnessed (lifetime). */
   turns: number
 }
@@ -75,7 +79,16 @@ export const defaultAffinityConfig: AffinityConfig = {
 }
 
 export function emptyAffinity(): AffinityState {
-  return { points: 0, lastPetAt: 0, lastFeedAt: 0, pets: 0, feeds: 0, turns: 0 }
+  return {
+    points: 0,
+    lastPetAt: 0,
+    lastFeedAt: 0,
+    pets: 0,
+    feeds: 0,
+    petRejects: 0,
+    feedRejects: 0,
+    turns: 0,
+  }
 }
 
 /** Outcome of one interaction. */
@@ -136,6 +149,12 @@ function clamp(points: number): number {
   return Math.min(AFFINITY_MAX, Math.max(0, points))
 }
 
+/** Built-in reaction selected deterministically from a persisted counter. */
+function countedRemark(kind: 'pet' | 'petCooldown' | 'feed' | 'feedCooldown', count: number): string {
+  const pool = BUILTIN_REMARKS[kind]
+  return pool[Math.max(0, Math.floor(count)) % pool.length] ?? builtinRemark(kind)
+}
+
 /**
  * Apply one interaction to a copy of the state (immutable style: returns a
  * new object; the caller replaces the persisted state). Cooldowns only
@@ -151,7 +170,13 @@ export function applyInteraction(
   const next = { ...state }
   if (kind === 'pet') {
     if (state.lastPetAt !== 0 && nowMs - state.lastPetAt < config.petCooldownMs) {
-      return { affinity: state, delta: 0, reaction: builtinRemark('petCooldown'), accepted: false }
+      next.petRejects += 1
+      return {
+        affinity: next,
+        delta: 0,
+        reaction: countedRemark('petCooldown', state.petRejects),
+        accepted: false,
+      }
     }
     next.lastPetAt = nowMs
     next.pets += 1
@@ -159,13 +184,19 @@ export function applyInteraction(
     return {
       affinity: next,
       delta: config.petReward,
-      reaction: builtinRemark('pet'),
+      reaction: countedRemark('pet', state.pets),
       accepted: true,
     }
   }
   if (kind === 'feed') {
     if (state.lastFeedAt !== 0 && nowMs - state.lastFeedAt < config.feedCooldownMs) {
-      return { affinity: state, delta: 0, reaction: builtinRemark('feedCooldown'), accepted: false }
+      next.feedRejects += 1
+      return {
+        affinity: next,
+        delta: 0,
+        reaction: countedRemark('feedCooldown', state.feedRejects),
+        accepted: false,
+      }
     }
     next.lastFeedAt = nowMs
     next.feeds += 1
@@ -173,7 +204,7 @@ export function applyInteraction(
     return {
       affinity: next,
       delta: config.feedReward,
-      reaction: builtinRemark('feed'),
+      reaction: countedRemark('feed', state.feeds),
       accepted: true,
     }
   }

package/src/chatter.test.ts

@@ -0,0 +1,154 @@
+/**
+ * Chatter unit tests: the status voice (scene-stable lines, cadence rotation,
+ * per-tool families, argument hints) and the murmur engine (keyword moods,
+ * cooldown, output-volume budget). Everything is deterministic round-robin,
+ * so exact lines are asserted.
+ */
+import { describe, expect, it } from 'vitest'
+import {
+  STATUS_POOLS,
+  StatusVoice,
+  TOOL_POOLS,
+  toolArgHint,
+  toolCategory,
+  WHISPER_GENERIC_POOL,
+  WHISPER_RULES,
+  WhisperEngine,
+} from './chatter.ts'
+
+describe('StatusVoice', () => {
+  it('opens every scene with its legacy fixed line', () => {
+    // The first pool line is the wording the plugin has always shown.
+    expect(STATUS_POOLS.prepare[0]).toBe('准备开始')
+    expect(STATUS_POOLS.waiting[0]).toBe('等待模型响应')
+    expect(STATUS_POOLS.thinking[0]).toBe('正在思考')
+    expect(STATUS_POOLS.review[0]).toBe('整理回复中')
+    expect(STATUS_POOLS.toolResult[0]).toBe('处理工具结果')
+    expect(STATUS_POOLS.done[0]).toBe('完成啦')
+    expect(STATUS_POOLS.failed[0]).toBe('执行失败')
+    expect(STATUS_POOLS.toolFailed[0]).toBe('工具执行失败')
+  })
+
+  it('keeps the line stable while a scene repeats within the rotation window', () => {
+    const voice = new StatusVoice()
+    // Streamed chunks re-emit the same scene many times a second: the copy
+    // must not flicker per chunk.
+    expect(voice.scene('thinking', 1000)).toBe('正在思考')
+    expect(voice.scene('thinking', 2000)).toBe('正在思考')
+    expect(voice.scene('thinking', 4999)).toBe('正在思考')
+  })
+
+  it('advances the line once the scene persists past the rotation cadence', () => {
+    const voice = new StatusVoice()
+    expect(voice.scene('thinking', 1000)).toBe('正在思考')
+    expect(voice.scene('thinking', 5001)).toBe(STATUS_POOLS.thinking[1])
+    expect(voice.scene('thinking', 9002)).toBe(STATUS_POOLS.thinking[2])
+  })
+
+  it('rotates round-robin when a scene is revisited after another scene', () => {
+    const voice = new StatusVoice()
+    expect(voice.scene('thinking', 0)).toBe(STATUS_POOLS.thinking[0])
+    expect(voice.scene('review', 100)).toBe(STATUS_POOLS.review[0])
+    expect(voice.scene('thinking', 200)).toBe(STATUS_POOLS.thinking[1])
+  })
+
+  it('interpolates the tool name and argument hint into tool lines', () => {
+    const voice = new StatusVoice()
+    expect(voice.tool('bash', 'bash', 'npm test', 0)).toBe('正在使用 bash')
+    // Same family within the window: the pool line repeats but the CURRENT
+    // call's name/hint are interpolated, so copy never goes stale.
+    expect(voice.tool('bash', 'bash', 'pnpm build', 100)).toBe('正在使用 bash')
+    // Past the cadence the shell family rotates to a hint-carrying line.
+    const rotated = voice.tool('bash', 'bash', 'npm test', 5000)
+    expect(rotated).toBe(TOOL_POOLS.shell[1]!.replace('{hint}', 'npm test'))
+  })
+
+  it('falls back to the tool name when no argument hint is available', () => {
+    const voice = new StatusVoice()
+    const line = voice.tool('grep', 'grep', undefined, 5000)
+    expect(line).not.toContain('{hint}')
+    expect(line).not.toContain('{tool}')
+  })
+
+  it('interpolates the running count into the remaining-tools line', () => {
+    const voice = new StatusVoice()
+    expect(voice.toolRemaining(1, 0)).toBe('还有 1 个工具运行中')
+    expect(voice.toolRemaining(3, 5000)).toContain('3')
+  })
+})
+
+describe('toolCategory', () => {
+  it('maps the common tool vocabulary onto copy families', () => {
+    expect(toolCategory('read')).toBe('read')
+    expect(toolCategory('write')).toBe('write')
+    expect(toolCategory('edit')).toBe('edit')
+    expect(toolCategory('str_replace_editor')).toBe('edit')
+    expect(toolCategory('run_code')).toBe('shell')
+    expect(toolCategory('bash')).toBe('shell')
+    expect(toolCategory('grep')).toBe('grep')
+    expect(toolCategory('glob')).toBe('find')
+    expect(toolCategory('web_search')).toBe('webSearch')
+    expect(toolCategory('browserFetch')).toBe('webFetch')
+    expect(toolCategory('mcp__mem0__search_memories')).toBe('memory')
+    expect(toolCategory('subagent')).toBe('subagent')
+    expect(toolCategory('todo_write')).toBe('todo')
+    expect(toolCategory('some_future_tool')).toBe('generic')
+  })
+})
+
+describe('toolArgHint', () => {
+  it('extracts the shell command', () => {
+    expect(toolArgHint('bash', '{"command":"npm test"}')).toBe('npm test')
+    expect(toolArgHint('run_code', '{"code":"console.log(1)"}')).toBe('console.log(1)')
+  })
+
+  it('reduces file paths to their basename', () => {
+    expect(toolArgHint('read', '{"file_path":"/repo/src/client/PetSprite.tsx"}')).toBe('PetSprite.tsx')
+  })
+
+  it('extracts search patterns and web queries', () => {
+    expect(toolArgHint('grep', '{"pattern":"bubbleStack"}')).toBe('bubbleStack')
+    expect(toolArgHint('web_search', '{"query":"dsh 插件"}')).toBe('dsh 插件')
+  })
+
+  it('stays hintless for unparseable or shapeless arguments', () => {
+    expect(toolArgHint('bash', 'not json')).toBeUndefined()
+    expect(toolArgHint('bash', '[]')).toBeUndefined()
+    expect(toolArgHint('bash', '{"timeout":1000}')).toBeUndefined()
+  })
+
+  it('caps long hints so the bubble stays compact', () => {
+    const hint = toolArgHint('bash', JSON.stringify({ command: 'x'.repeat(60) }))
+    expect(hint).toBeDefined()
+    expect(hint!.length).toBeLessThanOrEqual(28)
+    expect(hint!.endsWith('...')).toBe(true)
+  })
+})
+
+describe('WhisperEngine', () => {
+  it('wakes a themed whisper from a keyword in the model output', () => {
+    const engine = new WhisperEngine()
+    expect(engine.feed('这里有个错误需要处理', 0)).toBe(WHISPER_RULES[1]!.pool[0])
+  })
+
+  it('suppresses whispers during the cooldown, then rotates the pool', () => {
+    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])
+  })
+
+  it('earns an ambient whisper from output volume alone', () => {
+    const engine = new WhisperEngine(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('ignores empty chunks', () => {
+    const engine = new WhisperEngine(0, 0)
+    expect(engine.feed('', 0)).toBeUndefined()
+  })
+})