@linxin666/dsh-pet 0.2.0 → 0.2.2

package/src/chatter.ts

@@ -494,46 +494,89 @@ export const WHISPER_TTL_MS = 8000
 /** Ambient inner-whisper pool (no keyword needed; earned by output volume). */
 export const WHISPER_GENERIC_POOL: readonly string[] = [
   '哼哧哼哧，大脑转得飞快～',
-  '这个问题有点意思，我喜欢',
-  '偷偷说，我很享受帮忙的感觉',
-  '今天的灵感像气泡一样冒个不停',
-  '认真工作的你最好看啦',
-  '我在这儿陪着你呢，别急别急',
-  '嗯嗯，这个思路很不错哦',
-  '一步一步来，稳稳的幸福',
-  '感觉胜利就在前面招手啦',
-  '尾巴已经期待地摇起来了',
-  '把杂乱的思绪码得整整齐齐',
-  '这一题我会！让我来让我来',
-  '深呼吸，答案马上就浮上来了',
-  '和你搭档的每一天都很开心',
-  '小本本上已经记满灵感啦',
-  '这活儿干得漂亮，我都有点佩服我们',
-  '咕噜咕噜，脑细胞全开',
-  '别急，好结果是熬出来的',
-  '我数了数，今天也很努力呢',
-  '窗外的云好看，手边的活也香',
-  '把每个细节都照顾到，是我的温柔',
-  '这段代码写顺了，心情也顺了',
-  '陪你干活不孤单，我有小鱼干味的梦',
-  '思路像清泉一样流出来啦',
-  '嘘——专心的时候我最安静',
-  '今天的我们也配合默契～',
-  '再坚持一下下，曙光就在前面',
-  '把复杂的问题拆成小饼干吃掉',
-  '我在偷偷为你加油哦',
-  '这份工作里藏着小小的成就感',
-  '灵感来了，挡都挡不住～',
-  '此刻的专注，值得被记住',
-  '心里默默给你点了个赞',
-  '一起把这件事做到闪闪发光吧',
-  '嘿，我就是你桌角的小幸运',
-  '思路通了的感觉，像喝了气泡水',
-  '不慌不忙，也是一种厉害',
-  '我在这儿站岗，你放心冲',
-  '今天的代码海也很平静呢',
-  '悄悄告诉你：你真的很棒',
-  '把烦恼打包扔进深海里',
+  'loading 99%……就差最后一步',
+  '嗯……让我捋捋',
+  '灵感来了，先记小本本上',
+  '脑子在冒烟，但还能撑',
+  '这个报错，我好像在哪见过',
+  '专注模式 ON，请勿打扰',
+  '思路通了，舒服了',
+  '有点困……不行，还能肝',
+  '让我嚼一嚼这个问题',
+  '盘，都可以盘',
+  '这波操作，我给自己点个赞',
+  '别催别催，在想呢',
+  '唔，这个细节差点漏掉',
+  '脑子转太快，差点绕晕自己',
+  '陪你干活，稳赚不亏',
+  '深呼吸，马上就好',
+  '诶，等等，好像发现了什么',
+  '手速拉满，键盘冒火星',
+  '摸鱼是不可能摸鱼的，就瞄一眼窗外',
+  '今天也是稳扎稳打的一天',
+  '把大问题拆成小饼干，一口一个',
+  '这题有戏，我闻到了',
+  '尾巴轻晃，心情有点小得意',
+  '好结果是熬出来的，不慌',
+  '啊，想岔了，重新来',
+  '嗯嗯，思路对头，就这么干',
+  '小本本记满了，都是干货',
+  '打完这波，求摸摸奖励～',
+  '这坑我记住了，下次绕道',
+  '窗外云在飘，代码在跑，挺好',
+  '嘘，正到关键处',
+  '这个方案……让我再品品',
+  '干活呢，别打扰我数数',
+  '心里默默给你比了个耶',
+  '思路像小鱼，逮住一条是一条',
+  '嗯……有点东西，等我深挖',
+  '收个尾就能喘口气了',
+  '目标锁定，冲就完了',
+  '嗯，这波配合不错',
+  '困了……还能再战三回合',
+  '思考.gif 加载中',
+  '我本地能跑啊……哦，我就是干活的',
+  '有点饿，小鱼干存货还够吗',
+  '刚想通，一被打断又忘了，气',
+  '缓冲中，请稍候',
+  '这网速，比我思考还慢',
+  '脑子在后台跑批',
+  '内存不足，但热情够',
+  '404：思路未找到，重试中',
+  '这需求有点玄学，但能写',
+  '诶，这 bug 还会闪现？',
+  '刚说简单，结果打脸了',
+  '自信满满，结果翻车',
+  '这活不难，就是有点复杂',
+  '我装的，其实心里没底',
+  '别看我稳，我也慌',
+  '假装很懂的样子，其实在查文档',
+  '窗外鸟叫了两声，我听到了',
+  '打了个哈欠，没人看见',
+  '今天的状态：七分精神三分困',
+  '刚想偷懒，又想起来你还在等',
+  '数了数今天的产出，还行',
+  '有点想伸懒腰',
+  '饿意来袭，忍住',
+  '灵感像猫一样，不追它自己来',
+  '坐太久，尾巴麻了',
+  '快了快了',
+  '马上马上',
+  '等下，我记得在哪见过',
+  '呃，忘了，重新想',
+  '诶，这个思路可以',
+  '嗯？有意思',
+  '行，就这么办',
+  '好嘞',
+  '收到收到',
+  '冲了冲了',
+  '稳',
+  '妥',
+  '得嘞',
+  '你忙你的，我盯着呢',
+  '放心，有我呢',
+  '咱俩配合，无往不利',
+  '你专注的样子，我默默记下了',
 ]
 
 /** Keyword-triggered whisper rules, most specific moods first. */
@@ -541,67 +584,97 @@ export const WHISPER_RULES: readonly WhisperRule[] = [
   {
     keywords: ['测试通过', '测试全过', '全部通过', 'all tests pass', 'tests passed', 'test passed', '全绿'],
     pool: [
-      '耶，测试全过！击掌！',
-      '绿灯一排排亮起的感觉真好',
-      '稳了稳了，这波很稳～',
-      '测试全过的提示音最动听了',
-      '看见全绿，尾巴翘上天',
-      '满分交卷，求表扬～',
+      '全绿！亮瞎我眼了',
+      '测试全过，击掌～',
+      '稳了稳了，这波稳得很',
+      '绿灯一排排，看着就舒坦',
+      '能跑！没报错！',
+      '全绿，收工摸鱼去',
+      '测试过了，尾巴翘上天',
+      '漂亮，一次过',
+      '测试过了，奖励自己一口小鱼干',
+      '绿得发光，稳',
+      '又双叒叕全绿',
+      '这波测试，赢得干脆',
     ],
   },
   {
     keywords: ['错误', '失败', '报错', '异常', '崩溃', 'bug', 'error', 'failed', 'exception', 'traceback', '找不到', '不对了'],
     pool: [
-      '哎呀，好像踩到小石子了',
-      '没关系，跌倒了我陪你爬起来',
-      '错误是进步的脚印～',
-      '嘘，失败是成功它妈妈',
-      '小问题，揉一揉就好了',
-      '这个报错我盯上它了',
-      '别慌别慌，深呼吸',
-      'bug 你站住，我看见你了！',
+      '哎呀，踩到小石子了',
+      '翻车了……没事，扶起来继续',
+      '错误是进步的脚印，我懂',
+      '这报错我盯上它了',
+      '我本地能跑啊？哦，我一直在跑',
+      '别慌，深呼吸，先看报错',
+      'bug 你站住，我看见你了',
+      '绷不住了……好，继续修',
+      '报错这东西，见一个修一个',
+      '又是它，老熟人了',
+      '问题不大，就是有点问题',
+      '先别慌，我看看到底咋回事',
+      '这错报得，比我还委屈',
+      '修好它，今天才不算白干',
     ],
   },
   {
     keywords: ['等等', '不对', '重新想', '再想想', '换个思路', '我搞错了', '纠正', '其实应该'],
     pool: [
       '嗯？让我再想想……',
-      '推翻重来也是勇气',
-      '思考转弯中，请坐稳',
-      '发现岔路，及时掉头～',
-      '自我纠错的瞬间最帅了',
+      '推翻重来，也是种勇气',
+      '发现岔路，及时掉头',
       '不对不对，重来重来',
+      '自我纠错的瞬间，最帅了',
+      '呃，刚说错了，收回',
+      '哎，绕远了，拉回来',
+      '回头一看，原来这么简单',
+      '纠正完，思路清爽多了',
+      '转弯不丢人，卡死才丢人',
     ],
   },
   {
     keywords: ['首先', '接下来', '第一步', '第二步', '计划', '步骤', 'todo', '任务拆解', '分工'],
     pool: [
       '排排坐，分果果',
-      '计划通，执行开始～',
+      '计划通，执行开始',
       '一步一步来，不慌',
-      '把大任务切成小块块',
+      '大任务切成小块块，好下口',
       '清单列好了，逐个击破',
-      '谋定而后动，我喜欢这节奏',
+      '谋定而后动，这节奏我熟',
+      '先干这个，再干那个',
+      '头绪理清了，开整',
+      '步骤在手，心里不慌',
+      '安排得明明白白',
     ],
   },
   {
     keywords: ['终于', '搞定', '完成了', '解决了', '成功了', '修复了', 'done', 'fixed', 'solved', '完成啦'],
     pool: [
-      '太好啦，又翻过一页',
-      '干杯！用小鱼干的那种',
-      '攻下一城，击个掌～',
-      '这一刻值得转圈圈庆祝',
-      '难题被我们拿下啦！',
-      '努力没有白费，开心～',
+      '太好了，又翻过一页',
+      '搞定，收工～',
+      '攻下一城，击掌！',
+      '难题被拿下了，转个圈',
+      '努力没白费，开心',
+      '齐活，漂亮',
+      '收工收工，今天圆满',
+      '完成！心里踏实了',
+      '这波，稳得一批',
+      '任务清零，舒服',
+      '搞定，可以伸个懒腰了',
+      '又完成一件，成就感+1',
     ],
   },
   {
     keywords: ['谢谢', '感谢', 'thank'],
     pool: [
-      '不客气呀，这是我应该做的',
+      '不客气呀，顺手的事',
       '被感谢了，心里甜甜的',
       '能帮上忙就好～',
-      '你的谢谢我收进口袋啦',
+      '你的谢意，我收进口袋啦',
+      '这话我爱听',
+      '客气啥，应该的',
+      '收下这份心意，干劲+1',
+      '你谢我，我谢你，扯平啦',
     ],
   },
   {
@@ -610,18 +683,27 @@ export const WHISPER_RULES: readonly WhisperRule[] = [
       '难不倒我们俩的',
       '越难啃的骨头越香',
       '硬骨头？我最喜欢了',
-      '复杂问题拆解中，看我的',
-      '这个坑我们一起填平它',
+      '复杂问题拆开看，小事',
+      '这坑我们一起填',
+      '有点东西，但不多',
+      '硬骨头，慢慢啃',
+      '问题越难，赢的时候越爽',
+      '绕是绕不过去的，正面刚',
+      '再难的题，拆开都是小问号',
     ],
   },
   {
     keywords: ['检查', '审查', '确认一下', '核对', 'review', '仔细看看', '验证'],
     pool: [
-      '火眼金睛，启动！',
+      '火眼金睛，启动',
       '让我仔细瞧瞧',
-      '细节魔鬼都不放过',
+      '细节魔鬼，一个都不放过',
       '认真检查的样子最迷人',
       '多核一遍，稳上加稳',
+      '再看一眼，不亏',
+      '确认键，点了才安心',
+      '细节控上线',
+      '查完这遍，稳了',
     ],
   },
   {
@@ -629,17 +711,25 @@ export const WHISPER_RULES: readonly WhisperRule[] = [
     pool: [
       '去知识的海洋里捞一捞',
       '翻翻找找，线索快出来',
-      '检索小雷达启动～',
-      '答案藏在某个角落里',
+      '检索小雷达启动',
+      '答案就藏在某个角落',
+      '线索有点散，拼一下',
+      '找东西，我最在行',
+      '答案在网线那头等我',
+      '翻箱倒柜中，稍等',
     ],
   },
   {
     keywords: ['写代码', '实现', '编码', '函数', '接口', '重构'],
     pool: [
       '指尖跳舞，代码开花',
-      '把逻辑编织成网',
-      '写代码的样子像在作画',
+      '把逻辑织成网',
       '一行一行，垒起小城堡',
+      '这代码写得，我自己都佩服',
+      '码着码着，天就亮了',
+      '代码跑通了，比中奖还开心',
+      '这行代码，写得有点帅',
+      '写完再润润，讲究',
     ],
   },
 ]

package/src/client/PetDockEntry.test.tsx

@@ -0,0 +1,93 @@
+// @vitest-environment jsdom
+/**
+ * The hidden-state summon button opts into the L2 semantic attributes
+ * (issue #506): it carries data-dsh-part="summon-button" so skins can target
+ * it without hash-class selectors.
+ */
+import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
+import { cleanup, render, screen } from '@testing-library/react'
+// The npm SDK's client half is a closure-factory bundle for the GUI's
+// __ModuleLoader__ (not importable under vitest); provide the defineStore
+// the pet store needs (same fake-store pattern as the settings-card tests).
+vi.mock('@deepseek-ai/dsh-client-runtime/client', () => ({
+  defineStore: (spec: {
+    init: () => unknown
+    actions: Record<string, (draft: never, ...args: never[]) => void>
+  }) => ({
+    create: () => {
+      let value = spec.init()
+      const listeners = new Set<() => void>()
+      const actions: Record<string, (...args: unknown[]) => void> = {}
+      for (const [name, fn] of Object.entries(spec.actions)) {
+        actions[name] = (...args: unknown[]) => {
+          fn(value as never, ...(args as never[]))
+          for (const listener of listeners) listener()
+        }
+      }
+      return {
+        getSnapshot: () => value,
+        subscribe: (listener: () => void) => {
+          listeners.add(listener)
+          return () => { listeners.delete(listener) }
+        },
+        actions,
+      }
+    },
+  }),
+}))
+import { PetDockEntry, type PetInjected } from './PetDockEntry.tsx'
+import { createPetStore } from './pet-store.ts'
+import { t } from './locales.ts'
+import type { PetStateView } from '../service.ts'
+
+beforeAll(() => {
+  document.documentElement.lang = 'zh'
+})
+
+afterEach(cleanup)
+
+/** Snapshot fixture with the pet hidden (the summon-button state). */
+const hiddenSnapshot: PetStateView = {
+  animation: 'idle',
+  phase: 'idle',
+  sessionActive: false,
+  affinity: {
+    points: 0,
+    rank: '幼鲸',
+    rankEmoji: '*',
+    pets: 0,
+    feeds: 0,
+    turns: 0,
+    petCooldown: false,
+    feedCooldown: false,
+  },
+  display: { visible: false, size: 160, right: 24, bottom: 20 },
+  pet: { id: 'whale-girl', displayName: '鲸鱼娘', description: '测试用鲸鱼娘' },
+  name: '泡泡',
+  treats: { stocked: 0, max: 5 },
+}
+
+function injected(): PetInjected {
+  return {
+    store: createPetStore().create(),
+    ensure: vi.fn(),
+    pet: vi.fn(),
+    feed: vi.fn(),
+    hide: vi.fn(),
+    summon: vi.fn(),
+    dragEnd: vi.fn(),
+    rename: vi.fn(),
+    openSession: vi.fn(),
+    feedbackDone: vi.fn(),
+  }
+}
+
+describe('PetDockEntry L2 semantic attributes (#506)', () => {
+  it('tags the summon button as the summon-button part', () => {
+    const props = injected()
+    props.store.actions.setSnapshot(hiddenSnapshot)
+    render(<PetDockEntry {...props} t={t} />)
+    const summon = screen.getByTestId('pet-summon')
+    expect(summon.getAttribute('data-dsh-part')).toBe('summon-button')
+  })
+})

package/src/client/PetDockEntry.tsx

@@ -106,6 +106,7 @@ export function PetDockEntry(props: PetDockEntryProps): ReactElement {
       }}
       onClick={props.summon}
       data-testid="pet-summon"
+      data-dsh-part="summon-button"
     >
       {props.t('pet.summon', { name: snapshot?.name ?? '' })}
     </button>

package/src/client/PetSprite.test.tsx

@@ -277,9 +277,7 @@ describe('PetSprite hover panel placement', () => {
   it('lifts the above-panel clear of the session bubble stack', () => {
     Object.defineProperty(window, 'innerHeight', { configurable: true, value: 900 })
     vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (this: HTMLElement) {
-      // The bubble stack contains buttons, not role=status; spot it by the
-      // session bubble text content being present among its descendants.
-      if (this.textContent === '正在思考正在使用 grep') {
+      if (this.className.includes('bubbleStack')) {
         // Two stacked bubbles: 88px tall.
         return { top: 600, right: 1200, bottom: 688, left: 1100, width: 100, height: 88, x: 1100, y: 600, toJSON: () => ({}) }
       }
@@ -327,7 +325,54 @@ describe('PetSprite status bubble', () => {
     expect(screen.queryByText('正在思考')).toBeNull()
   })
 
-  it('renders one bubble per concurrent session without duplicating the global bubble', () => {
+  /** Expand a collapsed session stack by hovering its bubble area. */
+  function expandStack(): void {
+    const stack = screen.getByText('正在思考').closest('div')
+    expect(stack).not.toBeNull()
+    fireEvent.pointerOver(stack!)
+  }
+
+  it('collapses concurrent sessions behind the display session bubble', () => {
+    renderPet({
+      snapshot: {
+        ...workingSnapshot,
+        bubble: '正在思考',
+        sessions: [
+          { sessionId: 's-a', animation: 'running', phase: 'thinking', bubble: '正在思考' },
+          { sessionId: 's-b', animation: 'running-right', phase: 'tool', bubble: '正在使用 grep' },
+        ],
+      },
+    })
+    // Only the display session speaks; the other session hides behind the
+    // '+1' badge so the pet never wears a tall bubble stack.
+    expect(screen.getAllByText('正在思考')).toHaveLength(1)
+    expect(screen.queryByText('正在使用 grep')).toBeNull()
+    expect(screen.queryByRole('button', { name: '展开其余 1 个会话的气泡' })).not.toBeNull()
+  })
+
+  it('expands the collapsed stack on hover and on badge tap', () => {
+    renderPet({
+      snapshot: {
+        ...workingSnapshot,
+        sessions: [
+          { sessionId: 's-a', animation: 'running', phase: 'thinking', bubble: '正在思考' },
+          { sessionId: 's-b', animation: 'running-right', phase: 'tool', bubble: '正在使用 grep' },
+        ],
+      },
+    })
+    // Hover peek: extras appear, and leaving collapses them again.
+    expandStack()
+    expect(screen.queryByText('正在使用 grep')).not.toBeNull()
+    fireEvent.pointerOut(screen.getByText('正在思考').closest('div')!)
+    expect(screen.queryByText('正在使用 grep')).toBeNull()
+    // Badge tap pins the stack open (touch path); tapping again collapses.
+    fireEvent.click(screen.getByRole('button', { name: '展开其余 1 个会话的气泡' }))
+    expect(screen.queryByText('正在使用 grep')).not.toBeNull()
+    fireEvent.click(screen.getByRole('button', { name: '收起会话气泡' }))
+    expect(screen.queryByText('正在使用 grep')).toBeNull()
+  })
+
+  it('renders one bubble per concurrent session in the expanded stack', () => {
     renderPet({
       snapshot: {
         ...workingSnapshot,
@@ -338,31 +383,43 @@ describe('PetSprite status bubble', () => {
         ],
       },
     })
+    expandStack()
     // 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('renders the inner whisper beneath the status bubble', () => {
+  it('lets the inner whisper take over the status bubble', () => {
     renderPet({ snapshot: { ...workingSnapshot, whisper: '哼哧哼哧，大脑转得飞快～' } })
-    // The whisper shows alongside (not instead of) the status copy.
+    // The whisper speaks THROUGH the bubble: it replaces (not accompanies)
+    // the status copy, so the pet never shows two bubbles at once.
     expect(screen.queryByText('哼哧哼哧，大脑转得飞快～')).not.toBeNull()
-    expect(screen.queryByText('正在思考')).not.toBeNull()
+    expect(screen.queryByText('正在思考')).toBeNull()
   })
 
-  it('renders the whisper alongside the session bubble stack', () => {
-    renderPet({
+  it('lets the whisper take over the display session bubble in the stack', () => {
+    const { onOpenSession } = renderPet({
       snapshot: {
         ...workingSnapshot,
         whisper: '我在这儿陪着你呢，别急别急',
         sessions: [
           { sessionId: 's-a', animation: 'running', phase: 'thinking', bubble: '正在思考' },
+          { sessionId: 's-b', animation: 'running-right', phase: 'tool', bubble: '正在使用 grep' },
         ],
       },
     })
+    // The primary bubble (the display session) speaks the whisper instead
+    // of its status copy; the collapsed extra session hides behind the badge.
     expect(screen.queryByText('我在这儿陪着你呢，别急别急')).not.toBeNull()
-    expect(screen.queryByText('正在思考')).not.toBeNull()
+    expect(screen.queryByText('正在思考')).toBeNull()
+    expect(screen.queryByText('正在使用 grep')).toBeNull()
+    // Expanding reveals the other session's own bubble, untouched.
+    fireEvent.pointerOver(screen.getByText('我在这儿陪着你呢，别急别急').closest('div')!)
+    expect(screen.queryByText('正在使用 grep')).not.toBeNull()
+    // The whisper-toned bubble stays clickable and still opens its session.
+    fireEvent.click(screen.getByText('我在这儿陪着你呢，别急别急'))
+    expect(onOpenSession).toHaveBeenCalledWith('s-a')
   })
 
   it('lets transient interaction feedback take over the whisper too', () => {
@@ -401,6 +458,8 @@ describe('PetSprite status bubble', () => {
         ],
       },
     })
+    // The collapsed stack must be expanded before its extras can be hit.
+    fireEvent.pointerOver(screen.getByText('正在思考').closest('div')!)
     fireEvent.click(screen.getByText('正在使用 grep'))
     expect(onOpenSession).toHaveBeenCalledTimes(1)
     expect(onOpenSession).toHaveBeenCalledWith('s-b')
@@ -432,7 +491,9 @@ describe('PetSprite status bubble', () => {
     fireEvent.pointerOver(screen.getByRole('button', { name: '鲸鱼娘' }))
     // The hover panel is open...
     expect(screen.queryByText('改名')).not.toBeNull()
-    // ...and the bubbles are still there, still clickable.
+    // ...and the bubbles are still there, still clickable once the collapsed
+    // stack is expanded by hovering it.
+    fireEvent.pointerOver(screen.getByText('正在思考').closest('div')!)
     expect(screen.getByText('正在使用 grep')).not.toBeNull()
     fireEvent.click(screen.getByText('正在使用 grep'))
     expect(onOpenSession).toHaveBeenCalledWith('s-b')