@linxin666/dsh-pet 0.3.4 → 0.3.5

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: 515f3af940b587c685e194b5467ca91020af36a2
-README.zh.md: f3dc4a805673d04289018dab31a9a4f0d16112fb
+README.md: 2501ae7db35246c4348ed08fd169ee58a7569a95
+README.zh.md: a490c37210773c3da3eec1d9c61807864f56b6aa

package/README.md

@@ -23,8 +23,8 @@ Re-implemented from the pet feature of the Codex desktop app, as an official DSH
 | Dragging | Hold and drag the pet to reposition; position persisted |
 | Hide/Summon | The hover panel sits below the pet (lifted above the status bubbles when there is no room below) and provides 隐藏 (Hide); after hiding, a 召唤{name} (Summon {name}) button appears |
 | Witty remarks | Built-in remark library (10 lines per event) plus per-pet custom lines; success lines rotate by persisted success counts and cooldown lines by persisted rejection counts |
-| Status bubbles | Only the most recently active top-level session speaks by default — when several sessions run at once, the rest collapse behind a +N badge on the main bubble instead of stacking a tall column; hover the bubble (or tap the badge, for touch) to fan every session's bubble out above it and click one to jump to its session; subagent sessions report through their spawning conversation and never occupy a bubble of their own; transient interaction feedback temporarily takes priority. Bubble copy comes from generous rotating pools per scene (waiting / thinking / writing / done / failed...), tool calls map onto per-family witty lines carrying the real argument hint (e.g. 跑跑 npm test), and a long-lived scene re-phrases itself every few seconds |
-| Inner whispers | 碎碎念: while the model streams, the pet occasionally speaks its inner voice through its own bubble — a fresh whisper takes over the display session's bubble and marks it with 「」 quotes — sharing the same DeepSeek-blue glass as every status bubble, so stacked bubbles never clash — instead of stacking a second bubble — keyword moods woken by the model output (errors, test greens, plans, victories...) plus ambient whispers earned by output volume; paced by a cooldown, the status copy returns after a few seconds |
+| Status bubbles | Only one top-level session speaks by default — the session the GUI is currently on when it is reported, otherwise the most recently active one — and the rest collapse behind a +N badge on the main bubble instead of stacking a tall column; hover the bubble (or tap the badge, for touch) to fan every session's bubble out above it and click one to jump to its session; subagent sessions report through their spawning conversation and never occupy a bubble of their own; transient interaction feedback temporarily takes priority. Bubble copy comes from generous rotating pools per scene (waiting / thinking / writing / done / failed...), tool calls map onto per-family witty lines carrying the real argument hint (e.g. 跑跑 npm test), and a long-lived scene re-phrases itself every few seconds |
+| Inner whispers | 碎碎念: while a session streams, the pet occasionally speaks its inner voice through that session's own bubble — a fresh whisper takes over the bubble and marks it with 「」 quotes — sharing the same DeepSeek-blue glass as every status bubble, so stacked bubbles never clash — instead of stacking a second bubble — category lines woken by the SITUATION (thinking / writing / the running tool family) plus outcome lines woken only by structured results (test green from a passed test tool, error from a failed tool result, completion from a completed turn) — never from the model's words, so a discussion that merely mentions a keyword cannot wake a mood, and a whisper never quotes real content (no tool names, paths or model text); paced by cooldowns (9 s category, 5 s outcome) and an 8 s display TTL, the status copy returns after a few seconds |
 | Multi-session activity | The pet is host-global: the most recent meaningful event drives the sprite animation while every active top-level session reports its own state in a separate bubble; completed turns from every session (subagents included) contribute affinity and treats |
 | Voice packs and panel DIY | A per-pet voice.json plus the global $DSH_HOME/pets/.voice.json override replace every bubble word and the hover panel (button labels, stat formats, button visibility); merge precedence per-pet > global > built-in, broken packs warn and never reject a pet |
 
@@ -102,11 +102,14 @@ Every word in the thought bubble (status / tool / whisper copy) and the hover pa
     "shell": ["Running {hint}", "Hit enter: {hint}"]
   },
   "toolRemaining": ["{n} helpers still at work"],   // {n} allowed
-  "whispers": {                        // murmur pools; each section replaces the built-in one
-    "generic": ["On it", "Almost there"],  // ambient pool; an explicit empty array mutes it
-    "rules": [                         // ordered keyword rules; given rules replace the built-ins
-      { "keywords": ["all tests pass"], "pool": ["All green!"] }
-    ]
+  "whispers": {                        // murmur pools; keys replace the built-in pools
+    "categories": {                    // situation pools; an explicit empty array mutes that category
+      "thinking": ["Let me think..."],
+      "running": ["It's running now"]
+    },
+    "results": {                       // outcome pools (test green / error / completion)
+      "pass": ["All green!"]
+    }
   },
   "panel": {                           // hover panel; unset slots keep the plugin i18n copy
     "labels": { "feed": "Treat", "hide": "Dive", "rename": "Rename me", "confirm": "Sure" },
@@ -116,11 +119,11 @@ Every word in the thought bubble (status / tool / whisper copy) and the hover pa
 }
 ```
 
-- Merge precedence (per slot): the pet voice.json > the global .voice.json > built-in copy. status/tools merge per key, whispers replace per section, panel merges per slot; any slot a layer misses falls through.
+- Merge precedence (per slot): the pet voice.json > the global .voice.json > built-in copy. status/tools/whispers merge per key, panel merges per slot; any slot a layer misses falls through.
 - Placeholder whitelist: tools accept {tool} / {hint}; toolRemaining accepts {n}; panel.stats accept {rank} / {n} / {points}; status, whisper and panel-label lines accept no placeholders (lines carrying one are dropped with a warning).
-- Caps (warn-and-drop): at most 64 lines per pool and 160 characters per line; at most 32 rules and 16 keywords (40 characters) per rule; panel labels 40 and stats 80 characters.
+- Caps (warn-and-drop): at most 64 lines per pool and 160 characters per line; panel labels 40 and stats 80 characters.
 - A broken pack never breaks the pet: voice.json that is not valid JSON or whose root is not an object is ignored with a warning; every other issue drops its slot only. Diagnostics appear under Settings > Pet directory diagnostics. node scripts/dsh-pet validate <dir> fails installs on structure errors and lists content issues as warnings.
-- Semantics: an empty status/tools pool falls back to the built-in copy (a scene line always renders); an explicit empty whisper pool mutes that channel; an empty panel actions array hides all three buttons; uncovered buttons and stats keep the plugin bilingual dictionary.
+- Semantics: an empty status/tools pool falls back to the built-in copy (a scene line always renders); an explicit empty whisper pool mutes that channel; an empty panel actions array hides all three buttons; uncovered buttons and stats keep the plugin bilingual dictionary. Legacy whispers.generic / whispers.rules fields are no longer supported and are ignored with a warning.
 
 ## Live2D pets (renderer: live2d)
 

package/README.zh.md

@@ -23,8 +23,8 @@
 | 拖动 | 按住拖动宠物换位置；位置持久化 |
 | 隐藏/召唤 | 悬浮面板位于宠物下方（下方空间不足时上移到状态气泡之上）并提供 隐藏；隐藏后出现 召唤{name} 按钮 |
 | 妙语库 | 内置默认妙语库（每类事件 10 句）+ 宠物自定义台词；成功文案按持久化成功次数轮换，冷却文案按持久化拒绝次数轮换 |
-| 状态气泡 | 默认只有最近活动的顶层会话说话——多会话并行时，其余会话收进主气泡右上角的 +N 角标，不再叠出一长列；悬停气泡（触屏点按角标）即可向上展开所有会话的气泡，点击任一气泡跳转到对应会话；子代理会话借由其发起会话体现，不占用独立气泡；瞬时互动反馈临时优先。气泡文案按场景准备了大量轮换词库（等待 / 思考 / 整理 / 完成 / 失败……），工具调用按工具族映射俏皮文案并带上真实参数（如 跑跑 npm test），同一场景持续数秒会自动换一种说法 |
-| 碎碎念 | 模型流式输出期间，宠物会偶尔借自己的气泡说出内心独白——新鲜的碎碎念会接管展示会话的气泡并以「」引号标记——与状态气泡共用同一片 DeepSeek 蓝黑玻璃，气泡栈内颜色统一不再色差——不再叠出第二只气泡——由模型输出里的关键词触发对应心境（报错、测试全绿、做计划、打胜仗……），输出量累积也会换来日常碎碎念；有冷却节制，数秒后气泡恢复状态文案 |
+| 状态气泡 | 默认只有一个顶层会话说话——上报 GUI 当前会话时优先它，否则是最近活动的一个——其余会话收进主气泡右上角的 +N 角标，不再叠出一长列；悬停气泡（触屏点按角标）即可向上展开所有会话的气泡，点击任一气泡跳转到对应会话；子代理会话借由其发起会话体现，不占用独立气泡；瞬时互动反馈临时优先。气泡文案按场景准备了大量轮换词库（等待 / 思考 / 整理 / 完成 / 失败……），工具调用按工具族映射俏皮文案并带上真实参数（如 跑跑 npm test），同一场景持续数秒会自动换一种说法 |
+| 碎碎念 | 会话流式输出期间，宠物会偶尔借该会话自己的气泡说出内心独白——新鲜的碎碎念接管所属会话的气泡并以「」引号标记——与状态气泡共用同一片 DeepSeek 蓝黑玻璃，气泡栈内颜色统一不再色差——不再叠出第二只气泡——分类台词由「正在干什么」触发（思考 / 写回复 / 正在跑的工具族），结果台词只由结构化结果触发（测试工具通过 → 全绿、工具失败 → 报错、回合完成 → 收工）——决不读模型说的话，讨论里提到关键词也不会误触发心境；碎碎念也从不引用真实内容（无工具名、路径、模型原文）；分类冷却 9 秒、结果冷却 5 秒，展示 8 秒后气泡恢复状态文案 |
 | 多会话活动 | 宠物是宿主全局的：最近一次有意义事件驱动精灵动画，同时每个活动的顶层会话用自己的气泡报告各自状态；每个会话（含子代理）完成的轮次都计入亲密度与小鱼干 |
 | 语音包与面板 DIY | 宠物目录 voice.json + 全局 $DSH_HOME/pets/.voice.json 覆盖气泡全部文案与悬浮面板（按钮标签/统计格式/按钮显隐）；合并优先级 宠物自带 > 全局 > 内置，坏包警告不拒载 |
 
@@ -102,11 +102,14 @@ node scripts/dsh-pet install <dir> --force    # 覆盖同名已安装宠物
     "shell": ["跑跑 {hint}", "敲回车！{hint}"]
   },
   "toolRemaining": ["后台还有 {n} 位小助手"],   // 允许 {n}
-  "whispers": {                        // 碎碎念：按节替换（非逐条合并）
-    "generic": ["冲了冲了", "稳"],      // 环境池；显式空数组 = 静音
-    "rules": [                         // 关键词规则（有序；给出即整体替换内置规则）
-      { "keywords": ["测试通过"], "pool": ["全绿！"] }
-    ]
+  "whispers": {                        // 碎碎念：按键替换内置池
+    "categories": {                    // 分类池；显式空数组 = 静音该分类
+      "thinking": ["让我想想……"],
+      "running": ["正在跑，我盯着"]
+    },
+    "results": {                       // 结果池（测试全绿 / 报错 / 完成）
+      "pass": ["全绿！"]
+    }
   },
   "panel": {                           // 悬浮面板（每槽未声明时回落插件 i18n 文案）
     "labels": { "feed": "投喂", "hide": "藏起来", "rename": "起名字", "confirm": "好的" },
@@ -116,11 +119,11 @@ node scripts/dsh-pet install <dir> --force    # 覆盖同名已安装宠物
 }
 ```
 
-- 合并优先级（逐槽）：宠物自带 voice.json > 全局 .voice.json > 内置文案。status/tools 逐键合并、whispers 按节替换、panel 逐槽合并，任何层缺失的槽位回落下一层。
+- 合并优先级（逐槽）：宠物自带 voice.json > 全局 .voice.json > 内置文案。status/tools/whispers 逐键合并、panel 逐槽合并，任何层缺失的槽位回落下一层。
 - 占位符白名单：tools 允许 {tool} / {hint}；toolRemaining 允许 {n}；panel.stats 允许 {rank} / {n} / {points}；status、碎碎念与面板标签不允许任何占位符（含非法占位符的行被警告丢弃）。
-- 上限（warn-and-drop）：每池 64 行以内、每行 160 字符以内；规则 32 条以内、每规则关键词 16 条以内（40 字符以内）；面板标签 40 以内、统计 80 字符以内。
+- 上限（warn-and-drop）：每池 64 行以内、每行 160 字符以内；面板标签 40 以内、统计 80 字符以内。
 - 坏包不影响宠物：voice.json 不是合法 JSON 或根不是对象 → 警告并整体忽略；其余问题逐槽警告丢弃。诊断显示在设置 → 宠物目录诊断。node scripts/dsh-pet validate <dir> 会把结构错误判为安装失败、内容问题列为警告。
-- 语义细节：status/tools 的空池回落内置文案（场景行始终有话说）；whispers 的显式空数组是静音（关掉该通道）；面板 actions 为空数组 = 三个按钮全部隐藏；未覆盖的按钮/统计继续使用插件双语字典。
+- 语义细节：status/tools 的空池回落内置文案（场景行始终有话说）；whispers 的显式空数组是静音（关掉该通道）；面板 actions 为空数组 = 三个按钮全部隐藏；未覆盖的按钮/统计继续使用插件双语字典。旧的 whispers.generic / whispers.rules 字段已不再支持，会被忽略并给出警告。
 
 ## Live2D 宠物（renderer: live2d）
 

package/contracts/voice-pack-v1.schema.json

@@ -118,36 +118,31 @@
     "whispers": {
       "type": "object",
       "additionalProperties": false,
-      "description": "Murmur pools; each section replaces the built-in one as a whole. An explicit empty array mutes that channel.",
+      "description": "Murmur pools: category pools keyed by the ten WhisperCategory ids plus outcome pools keyed by pass / fail / done. A key replaces that key's built-in pool; an explicit empty array mutes that channel. Legacy generic / rules fields are ignored with a warning.",
       "properties": {
-        "generic": {
-          "$ref": "#/definitions/pool"
+        "categories": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "thinking": { "$ref": "#/definitions/pool" },
+            "writing": { "$ref": "#/definitions/pool" },
+            "reading": { "$ref": "#/definitions/pool" },
+            "editing": { "$ref": "#/definitions/pool" },
+            "running": { "$ref": "#/definitions/pool" },
+            "searching": { "$ref": "#/definitions/pool" },
+            "git": { "$ref": "#/definitions/pool" },
+            "delegating": { "$ref": "#/definitions/pool" },
+            "browsing": { "$ref": "#/definitions/pool" },
+            "generic": { "$ref": "#/definitions/pool" }
+          }
         },
-        "rules": {
-          "type": "array",
-          "maxItems": 32,
-          "items": {
-            "type": "object",
-            "additionalProperties": false,
-            "required": [
-              "keywords",
-              "pool"
-            ],
-            "properties": {
-              "keywords": {
-                "type": "array",
-                "maxItems": 16,
-                "items": {
-                  "type": "string",
-                  "maxLength": 40,
-                  "minLength": 1
-                },
-                "description": "Lowercase substrings matched against the model's output."
-              },
-              "pool": {
-                "$ref": "#/definitions/pool"
-              }
-            }
+        "results": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "pass": { "$ref": "#/definitions/pool" },
+            "fail": { "$ref": "#/definitions/pool" },
+            "done": { "$ref": "#/definitions/pool" }
           }
         }
       }

package/lib/client.js

@@ -517,8 +517,7 @@ window.__ModuleLoader__.load({
 			const stackOpen = stackPeek || stackPinned;
 			const visibleSessions = !stackOpen && sessionBubbles.length > 1 ? sessionBubbles.slice(0, 1) : sessionBubbles;
 			const statusBubble = feedback === null && sessionBubbles.length === 0 ? snapshot?.bubble : void 0;
-			const whisper = feedback === null ? snapshot?.whisper : void 0;
-			const bubblePresent = feedback !== null || sessionBubbles.length > 0 || statusBubble !== void 0 || whisper !== void 0;
+			const bubblePresent = feedback !== null || sessionBubbles.length > 0 || statusBubble !== void 0;
 			const displayName = snapshot?.name ?? definition.displayName;
 			const decoration = snapshot?.decoration;
 			(0, react.useEffect)(() => {
@@ -615,13 +614,13 @@ window.__ModuleLoader__.load({
 						className: clsx(pet_module_css_default.bubble, feedback.kind === "feed" ? pet_module_css_default.bubbleFeed : pet_module_css_default.bubblePet),
 						children: feedback.text
 					}, feedback.at),
-					feedback === null && (sessionBubbles.length > 0 || statusBubble !== void 0 || whisper !== void 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					feedback === null && (sessionBubbles.length > 0 || statusBubble !== void 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						ref: bubbleRef,
 						className: pet_module_css_default.bubbleStack,
 						onPointerEnter: () => setStackPeek(true),
 						onPointerLeave: () => setStackPeek(false),
 						children: [visibleSessions.map((session, index) => {
-							const speaksWhisper = index === 0 && whisper !== void 0;
+							const speaksWhisper = session.whisper !== void 0;
 							const bubble = /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 								type: "button",
 								className: clsx(pet_module_css_default.bubble, pet_module_css_default.bubbleStatus, pet_module_css_default.bubbleClickable, speaksWhisper && pet_module_css_default.bubbleWhisper),
@@ -632,8 +631,8 @@ window.__ModuleLoader__.load({
 								children: [index === 0 && !speaksWhisper && decoration !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusOrnament, {
 									decoration,
 									phase
-								}), speaksWhisper ? whisper : session.bubble]
-							}, speaksWhisper ? "whisper:" + whisper : session.sessionId);
+								}), session.whisper ?? session.bubble]
+							}, speaksWhisper ? "whisper:" + session.whisper : session.sessionId);
 							if (index !== 0 || sessionBubbles.length <= 1) return bubble;
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 								className: pet_module_css_default.bubbleAnchor,
@@ -650,15 +649,15 @@ window.__ModuleLoader__.load({
 									children: stackOpen ? "×" : "+" + String(sessionBubbles.length - 1)
 								})]
 							}, "primary");
-						}), sessionBubbles.length === 0 && (statusBubble !== void 0 || whisper !== void 0) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: clsx(pet_module_css_default.bubble, pet_module_css_default.bubbleStatus, whisper !== void 0 && pet_module_css_default.bubbleWhisper),
+						}), sessionBubbles.length === 0 && statusBubble !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: clsx(pet_module_css_default.bubble, pet_module_css_default.bubbleStatus),
 							role: "status",
 							"aria-live": "polite",
-							children: [whisper === void 0 && decoration !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusOrnament, {
+							children: [decoration !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusOrnament, {
 								decoration,
 								phase
-							}), whisper ?? statusBubble]
-						}, whisper === void 0 ? "status" : "whisper:" + whisper)]
+							}), statusBubble]
+						}, "status")]
 					}),
 					hovered && dragRef.current === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						ref: panelRef,
@@ -3243,7 +3242,7 @@ window.__ModuleLoader__.load({
 		/** The building package's version, when the bundle carries it. */
 		function bakedVersion() {
 			try {
-				return "0.3.4";
+				return "0.3.5";
 			} catch {
 				return;
 			}
@@ -3319,7 +3318,7 @@ window.__ModuleLoader__.load({
 		}
 		/** The live host API instance (always defined; failures surface per call). */
 		const petApi = {
-			state: () => petFetch("/api/pet/state"),
+			state: (currentSessionId) => petFetch("/api/pet/state" + (currentSessionId === void 0 ? "" : "?current=" + encodeURIComponent(currentSessionId))),
 			pets: () => petFetch("/api/pet/pets"),
 			interact: (kind) => petFetch("/api/pet/interact", { kind }),
 			setVisible: (visible) => petFetch("/api/pet/set-visible", { visible }),
@@ -3406,6 +3405,11 @@ window.__ModuleLoader__.load({
 					const setPets = petStore.actions.setPets;
 					const setState = petStore.actions.setState;
 					const setFeedback = petStore.actions.setFeedback;
+					const sessions = ctx.sessions;
+					const currentSessionId = () => {
+						const current = sessions.list.getSnapshot().current;
+						return current === void 0 ? void 0 : String(current);
+					};
 					let petsLoaded = false;
 					let stateSeq = 0;
 					const pollNow = () => {
@@ -3415,7 +3419,7 @@ window.__ModuleLoader__.load({
 						}, () => {});
 						const seq = stateSeq + 1;
 						stateSeq = seq;
-						petApi.state().then((snapshot) => {
+						petApi.state(currentSessionId()).then((snapshot) => {
 							if (seq !== stateSeq) return;
 							setSnapshot(snapshot);
 						}, () => {
@@ -3447,7 +3451,11 @@ window.__ModuleLoader__.load({
 							document.removeEventListener("visibilitychange", onVisibility);
 						};
 					}, "pet: poll");
-					const sessions = ctx.sessions;
+					ctx.effect(() => {
+						return sessions.list.subscribe(() => {
+							if (document.visibilityState === "visible") pollNow();
+						});
+					}, "pet: current-session watch");
 					const openSession = (sessionId) => {
 						if (sessions.list.getSnapshot().byId[sessionId] === void 0) return;
 						sessions.open(sessionId);