@linxin666/dsh-pet 0.1.13 → 0.1.14

package/README.i18n.yaml

@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   node scripts/verify-docs.mjs --write <dir>
-README.md: 6de6b9e5520f85dba7c98490157a939963e2865d
-README.zh.md: ad16832b07def470629863af0f1701ad9ef90f94
+README.md: 437e1068038cb013e2880441e69cf1c259f51e79
+README.zh.md: 46511480ae653cc8d6c9b164e9e84ff5645f5945

package/README.md

@@ -4,7 +4,7 @@ English | [中文](README.zh.md)
 
 > A soft, healing whale-girl who works alongside you in DeepSeek Harness.
 
-While the model thinks, you wait — she swims. She follows the model's working state and switches animations — working, waiting, thinking, celebrating completion; you can also pat her head, feed her dried fish, and watch her grow from a baby whale into your deep-sea bond.
+While the model thinks, you wait — she swims. She follows official session activity and switches animations while waiting, thinking, using tools, composing a reply, celebrating completion, or reporting failure; you can also pat her head, feed her dried fish, and watch her grow from a baby whale into your deep-sea bond.
 
 Re-implemented from the pet feature of the Codex desktop app, as an official DSH plugin shape (cordis bundle: host half + client half in one package).
 
@@ -12,7 +12,7 @@ Re-implemented from the pet feature of the Codex desktop app, as an official DSH
 
 | Feature | Description |
 |---|---|
-| State animation | Model state → whale-girl animation: `thinking/tool → working`, `waiting → waiting`, `done → jumping celebration`, idle breathes standby |
+| State animation | Official session activity → whale-girl animation: `thinking → running`, `tool → running-right`, `review → review`, `waiting → waiting`, `done → jumping`, `failed → failed` |
 | Head-pat interaction | Click the whale-girl → bubble feedback + affinity +1 (10s cooldown) |
 | Feeding | Hover panel "喂食" (Feed) → consumes 1 dried fish + affinity +5 (30s cooldown) |
 | Treat economy | Dried-fish stock (cap 20): +1 every 3 rounds of work, +1 every 30 minutes; when low it prompts "多陪鲸鱼娘工作一会儿" (Work with the whale-girl a bit more) |
@@ -20,7 +20,8 @@ Re-implemented from the pet feature of the Codex desktop app, as an official DSH
 | Custom naming | Hover panel "改名" (Rename) → 1–20 characters, persisted, echoed in the summon button/panel |
 | Dragging | Hold and drag the whale-girl to reposition; position persisted |
 | Hide/Summon | Hover panel "隐藏" (Hide); after hiding, a "召唤{name}" (Summon {name}) button appears in the input selector row |
-| Status bubble | While working, shows the model's current status phrase |
+| Status bubble | Shows the current session stage or tool name; transient interaction feedback temporarily takes priority |
+| Multi-session activity | The pet is host-global: the most recent meaningful event controls its display, while completed turns from every session contribute affinity and treats |
 
 ## Animation preview
 
@@ -41,7 +42,7 @@ dsh-pet/
 |-- src/
 |   |-- index.ts        # host half: plugin entry (cordis apply, route registration)
 |   |-- service.ts      # PetService: pet state machine + affinity + config (HTTP API service face)
-|   |-- state.ts        # pet state machine: activity/status phase → 9 state animations
+|   |-- state.ts        # pet state machine: projected session activity → 9 state animations
 |   |-- affinity.ts     # affinity ledger (pure functions + cooldowns)
 |   |-- treats.ts       # dried-fish stock ledger
 |   |-- persist.ts      # persistence ($DSH_HOME/pet.json, atomic write)
@@ -59,14 +60,17 @@ dsh-pet/
 ### Data flow
 
 ```
-activity/status session events (published by the former working-activity plugin) --> PetService (host)
+official session events (turn/step/chunk/tool) ----\
+                                                    > PetService (host)
+optional legacy activity/status ------------------/
                                                               | /api/pet/* JSON
 global React root (createRoot → document.body) <-- polling 800ms -- pet-client (browser)
                                                               |
                                                    WhalePet floating layer (portal + rAF)
 ```
 
-- **Status source**: listens to the `activity/status` session events (phase: idle/waiting/thinking/tool/done + status phrase), consumed by the host half; the event used to be published by the working-activity plugin, which has been removed from this repo, so without it the pet only changes with the session lifecycle.
+- **Status source**: the host projects official `turn/start`, `step/start`, `assistant/chunk`, `assistant/message`, `tool/call`, `tool/result`, and `turn/end` events into waiting/thinking/tool/review/done/failed states. Optional legacy `activity/status` events remain a compatibility input.
+- **Multi-session semantics**: the API and browser mount are host-global and expose no foreground-session identity, so the most recent meaningful event wins the display. Every session's completed turns are still rewarded independently, and disposing a non-current session does not reset the visible state.
 - **Mount point**: `document.body` (global React root, always shown: no session / new session / mid-session — the old mount point `conversation.composer.dock` only rendered in an active session, hiding the pet in new sessions); the component uses `createPortal` internally to render the global floating layer.
 - **Rendering**: CSS sprite (background-position) per-frame animation, frame durations from the track definitions in `spritesheet.ts`.
 - **Communication**: browser ↔ host over the same-origin `/api/pet/*` JSON endpoints (state/interact/set-visible/set-config); the atlas loads from `/pet/whale/spritesheet.webp` — both the RPC domain and the `/plugins/` static service are platform-registered, and the plugin self-sufficiently provides its own API and assets (the same pattern as dsh-remote-web-ui's `/api/pair`).
@@ -93,7 +97,7 @@ After installing, **restart `dsh web`** — the whale-girl appears at the bottom
 
 ```sh
 pnpm build        # tsc -b (types+declarations) && tsdown (node half + browser bundle)
-pnpm test         # vitest unit tests (affinity / treats / persist / state)
+pnpm test         # vitest unit/component tests (event projection / state / UI / ledgers)
 pnpm prepare      # transpile-only build (no type checking, for consumer installs)
 pnpm typecheck    # type check only
 ```

package/README.zh.md

@@ -4,7 +4,7 @@
 
 > 一只软萌治愈的鲸鱼娘，陪你在 DeepSeek Harness 里工作。
 
-模型思考的时候你在等，她在游。她会跟着模型的工作状态切换动画——干活、等待、思考、庆祝完成；你还可以摸头、喂小鱼干，看着她从幼鲸慢慢长成你的深海羁绊。
+模型思考的时候你在等，她在游。她会跟随官方会话活动，在等待、思考、使用工具、整理回复、庆祝完成或报告失败时切换动画；你还可以摸头、喂小鱼干，看着她从幼鲸慢慢长成你的深海羁绊。
 
 复刻自 Codex 桌面版的宠物功能，以 DSH 官方插件形态实现（cordis bundle：host 半区 + client 半区单包）。
 
@@ -12,7 +12,7 @@
 
 | 功能 | 说明 |
 |---|---|
-| 状态动画 | 模型状态 → 鲸鱼娘动画：`thinking/tool → 工作`、`waiting → 等待`、`done → 跳跃庆祝`、空闲 `idle` 呼吸待机 |
+| 状态动画 | 官方会话活动 → 鲸鱼娘动画：`thinking → running`、`tool → running-right`、`review → review`、`waiting → waiting`、`done → jumping`、`failed → failed` |
 | 摸头互动 | 点击鲸鱼娘 → 气泡反馈 + 亲密度 +1（10s 冷却） |
 | 喂食 | 悬浮面板「喂食」→ 消耗 1 条小鱼干 + 亲密度 +5（30s 冷却） |
 | 饲料经济 | 小鱼干库存（上限 20）：工作每 3 回合 +1 条、每 30 分钟 +1 条；库存不足会提示「多陪鲸鱼娘工作一会儿」 |
@@ -20,7 +20,8 @@
 | 自定义命名 | 悬浮面板「改名」→ 1–20 字符，持久化，召唤按钮/面板同步显示 |
 | 拖动 | 按住鲸鱼娘拖动重新摆放，位置持久化 |
 | 隐藏/召唤 | 悬浮面板「隐藏」；隐藏后输入选择行出现「召唤{名字}」按钮 |
-| 状态气泡 | 工作时显示模型当前状态短语 |
+| 状态气泡 | 显示当前会话阶段或工具名；短暂的交互反馈会临时优先显示 |
+| 多会话活动 | 宠物是 host 全局的：最近一条有效事件决定显示，所有会话的完成回合都会计入亲密度与小鱼干 |
 
 ## 动画演示
 
@@ -41,7 +42,7 @@ dsh-pet/
 |-- src/
 |   |-- index.ts        # host 半区：插件入口（cordis apply，注册路由）
 |   |-- service.ts      # PetService：宠物状态机 + 亲密度 + 配置（HTTP API 服务面）
-|   |-- state.ts        # 宠物状态机：activity/status phase → 9 状态动画
+|   |-- state.ts        # 宠物状态机：投影后的会话活动 → 9 状态动画
 |   |-- affinity.ts     # 亲密度账本（纯函数 + 冷却）
 |   |-- treats.ts       # 小鱼干库存账本
 |   |-- persist.ts      # 持久化（$DSH_HOME/pet.json，原子写入）
@@ -59,14 +60,17 @@ dsh-pet/
 ### 数据流
 
 ```
-activity/status session 事件（原 working-activity 插件发布） --> PetService（host）
+官方会话事件（turn/step/chunk/tool） ----\
+                                                    > PetService（host）
+可选的兼容事件 activity/status --------------/
                                                               | /api/pet/* JSON
 global React root（createRoot → document.body） <-- 轮询 800ms -- pet-client（浏览器）
                                                               |
                                                    WhalePet 浮层（portal + rAF）
 ```
 
-- **状态源**：监听 `activity/status` 会话事件（phase: idle/waiting/thinking/tool/done + 状态短语），由 host 半区消费；该事件曾由 working-activity 插件发布，插件已从本仓库移除，未安装时宠物只随会话生命周期变化。
+- **状态源**：host 将官方 `turn/start`、`step/start`、`assistant/chunk`、`assistant/message`、`tool/call`、`tool/result` 和 `turn/end` 事件投影为 waiting/thinking/tool/review/done/failed 状态。可选的旧版 `activity/status` 事件仍作为兼容输入。
+- **多会话语义**：API 和浏览器挂载是 host 全局的，也不提供前台会话标识，因此最近一条有效事件决定显示。各会话的完成回合仍独立奖励，销毁非当前会话不会重置可见状态。
 - **挂载点**：`document.body`（全局 React root，无会话/新会话/会话中全程显示——旧挂载点 `conversation.composer.dock` 只在活跃会话渲染，导致新会话界面看不到宠物），组件内部 `createPortal` 渲染全局浮层。
 - **渲染**：CSS sprite（background-position）逐帧动画，帧时长来自 `spritesheet.ts` 的轨道定义。
 - **通信**：浏览器 ↔ host 走同源 `/api/pet/*` JSON 端点（state/interact/set-visible/set-config），图集从 `/pet/whale/spritesheet.webp` 加载——RPC 域与 `/plugins/` 静态服务都是平台注册的，插件自足地提供自己的 API 与素材（与 dsh-remote-web-ui 的 `/api/pair` 同一模式）。
@@ -93,7 +97,7 @@ dsh plugin --profile web add link:$(pwd)/packages/dsh-pet
 
 ```sh
 pnpm build        # tsc -b（类型+声明）&& tsdown（node 半区 + 浏览器 bundle）
-pnpm test         # vitest 单元测试（affinity / treats / persist / state）
+pnpm test         # vitest 单元/组件测试（事件投影 / state / UI / 账本）
 pnpm prepare      # 仅转译构建（无类型检查，供消费者安装）
 pnpm typecheck    # 仅类型检查
 ```

package/lib/client.js

@@ -305,7 +305,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region \0dsh-css:packages/dsh-pet/src/client/pet.module.css.mjs
-		const css$1 = ".kz2Bea_float{pointer-events:auto;-webkit-user-select:none;user-select:none;flex-direction:column;align-items:center;display:flex;position:fixed}.kz2Bea_sprite{image-rendering:auto;touch-action:none;position:relative}.kz2Bea_bubble{white-space:nowrap;color:#fff;pointer-events:none;border-radius:999px;margin-bottom:6px;padding:4px 10px;font-size:12px;line-height:1.4;animation:2.6s ease-out forwards kz2Bea_pet-bubble-pop;position:absolute;bottom:100%;box-shadow:0 2px 8px #00000040}.kz2Bea_bubblePet{background:#f472b6eb}.kz2Bea_bubbleFeed{background:#38bdf8eb}@keyframes kz2Bea_pet-bubble-pop{0%{opacity:0;transform:translateY(6px)scale(.85)}15%{opacity:1;transform:translateY(0)scale(1.05)}25%{transform:translateY(0)scale(1)}75%{opacity:1}to{opacity:0;transform:translateY(-8px)scale(.95)}}.kz2Bea_panel{color:#e2e8f0;backdrop-filter:blur(6px);background:#0f172aeb;border:1px solid #94a3b859;border-radius:10px;flex-direction:column;gap:6px;min-width:132px;padding:8px 10px;font-size:12px;display:flex;position:absolute;bottom:100%;box-shadow:0 4px 16px #00000059}.kz2Bea_panel:after{content:\"\";height:14px;position:absolute;top:100%;left:0;right:0}.kz2Bea_rankRow{white-space:nowrap;justify-content:space-between;gap:10px;display:flex}.kz2Bea_nameCell{font-weight:600}.kz2Bea_renameRow{align-items:center;gap:6px;display:flex}.kz2Bea_nameInput{color:#e2e8f0;background:#1e293be6;border:1px solid #7dd3fc80;border-radius:6px;outline:none;flex:1;min-width:0;padding:3px 6px;font-size:12px}.kz2Bea_nameInput:focus{border-color:#38bdf8;box-shadow:0 0 0 2px #38bdf873}.kz2Bea_actions{gap:6px;display:flex}.kz2Bea_action{cursor:pointer;color:#0f172a;background:linear-gradient(#7dd3fc,#38bdf8);border:none;border-radius:6px;flex:1;padding:4px 8px;font-size:12px;transition:filter .12s,box-shadow .12s}.kz2Bea_action:hover{filter:brightness(1.08)}.kz2Bea_action:active{filter:brightness(.94)}.kz2Bea_action:focus-visible{outline:none;box-shadow:0 0 0 2px #38bdf8d9}.kz2Bea_summon{color:#7dd3fc;cursor:pointer;background:#0f172abf;border:1px dashed #7dd3fc99;border-radius:999px;padding:2px 10px;font-size:11px;transition:border-color .12s,color .12s,background .12s,box-shadow .12s}.kz2Bea_summon:hover{color:#bae6fd;background:#0f172ae6;border-color:#7dd3fcf2}.kz2Bea_summon:active{color:#7dd3fc;border-color:#7dd3fccc}.kz2Bea_summon:focus-visible{outline:none;box-shadow:0 0 0 2px #38bdf8d9}@media (prefers-reduced-motion:reduce){.kz2Bea_bubble{opacity:1;animation:none}.kz2Bea_action,.kz2Bea_summon{transition:none}}";
+		const css$1 = ".kz2Bea_float{pointer-events:auto;-webkit-user-select:none;user-select:none;flex-direction:column;align-items:center;display:flex;position:fixed}.kz2Bea_sprite{image-rendering:auto;touch-action:none;position:relative}.kz2Bea_bubble{white-space:nowrap;color:#fff;pointer-events:none;border-radius:999px;margin-bottom:6px;padding:4px 10px;font-size:12px;line-height:1.4;animation:2.6s ease-out forwards kz2Bea_pet-bubble-pop;position:absolute;bottom:100%;box-shadow:0 2px 8px #00000040}.kz2Bea_bubblePet{background:#f472b6eb}.kz2Bea_bubbleFeed{background:#38bdf8eb}.kz2Bea_bubbleStatus{text-overflow:ellipsis;background:#0f172ae6;border:1px solid #7dd3fc80;max-width:min(280px,100vw - 24px);animation:none;overflow:hidden}@keyframes kz2Bea_pet-bubble-pop{0%{opacity:0;transform:translateY(6px)scale(.85)}15%{opacity:1;transform:translateY(0)scale(1.05)}25%{transform:translateY(0)scale(1)}75%{opacity:1}to{opacity:0;transform:translateY(-8px)scale(.95)}}.kz2Bea_panel{color:#e2e8f0;backdrop-filter:blur(6px);background:#0f172aeb;border:1px solid #94a3b859;border-radius:10px;flex-direction:column;gap:6px;min-width:132px;padding:8px 10px;font-size:12px;display:flex;position:absolute;bottom:100%;box-shadow:0 4px 16px #00000059}.kz2Bea_panel:after{content:\"\";height:14px;position:absolute;top:100%;left:0;right:0}.kz2Bea_rankRow{white-space:nowrap;justify-content:space-between;gap:10px;display:flex}.kz2Bea_nameCell{font-weight:600}.kz2Bea_renameRow{align-items:center;gap:6px;display:flex}.kz2Bea_nameInput{color:#e2e8f0;background:#1e293be6;border:1px solid #7dd3fc80;border-radius:6px;outline:none;flex:1;min-width:0;padding:3px 6px;font-size:12px}.kz2Bea_nameInput:focus{border-color:#38bdf8;box-shadow:0 0 0 2px #38bdf873}.kz2Bea_actions{gap:6px;display:flex}.kz2Bea_action{cursor:pointer;color:#0f172a;background:linear-gradient(#7dd3fc,#38bdf8);border:none;border-radius:6px;flex:1;padding:4px 8px;font-size:12px;transition:filter .12s,box-shadow .12s}.kz2Bea_action:hover{filter:brightness(1.08)}.kz2Bea_action:active{filter:brightness(.94)}.kz2Bea_action:focus-visible{outline:none;box-shadow:0 0 0 2px #38bdf8d9}.kz2Bea_summon{color:#7dd3fc;cursor:pointer;background:#0f172abf;border:1px dashed #7dd3fc99;border-radius:999px;padding:2px 10px;font-size:11px;transition:border-color .12s,color .12s,background .12s,box-shadow .12s}.kz2Bea_summon:hover{color:#bae6fd;background:#0f172ae6;border-color:#7dd3fcf2}.kz2Bea_summon:active{color:#7dd3fc;border-color:#7dd3fccc}.kz2Bea_summon:focus-visible{outline:none;box-shadow:0 0 0 2px #38bdf8d9}@media (prefers-reduced-motion:reduce){.kz2Bea_bubble{opacity:1;animation:none}.kz2Bea_action,.kz2Bea_summon{transition:none}}";
 		const tagId$1 = "@linxin666/dsh-pet/pet.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
 			const tag = document.createElement("style");
@@ -320,6 +320,7 @@ window.__ModuleLoader__.load({
 			"bubble": "kz2Bea_bubble",
 			"bubbleFeed": "kz2Bea_bubbleFeed",
 			"bubblePet": "kz2Bea_bubblePet",
+			"bubbleStatus": "kz2Bea_bubbleStatus",
 			"float": "kz2Bea_float",
 			"nameCell": "kz2Bea_nameCell",
 			"nameInput": "kz2Bea_nameInput",
@@ -487,6 +488,7 @@ window.__ModuleLoader__.load({
 			};
 			const spriteWidth = Math.round(192 * spriteScale);
 			const spriteHeight = Math.round(208 * spriteScale);
+			const statusBubble = feedback === null && !hovered ? snapshot?.bubble : void 0;
 			return (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				ref: floatRef,
 				className: pet_module_css_default.float,
@@ -532,6 +534,12 @@ window.__ModuleLoader__.load({
 						className: `${pet_module_css_default.bubble} ${feedback.kind === "feed" ? pet_module_css_default.bubbleFeed : pet_module_css_default.bubblePet}`,
 						children: feedback.text
 					}, feedback.at),
+					statusBubble !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: `${pet_module_css_default.bubble} ${pet_module_css_default.bubbleStatus}`,
+						role: "status",
+						"aria-live": "polite",
+						children: statusBubble
+					}),
 					hovered && dragRef.current === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: pet_module_css_default.panel,
 						onPointerEnter: () => {