@linxin666/dsh-pet 0.1.13 → 0.1.14

package/lib/index.js

@@ -1,4 +1,4 @@
-import { a as AFFINITY_MAX, c as applyTurnReward, d as rankOf, i as rowOf, l as defaultAffinityConfig, n as animationForPhase, o as AFFINITY_RANKS, r as defaultPetStateConfig, s as applyInteraction, t as PetStateMachine, u as emptyAffinity } from "./state-C9EyycwI.js";
+import { a as AFFINITY_MAX, c as applyTurnReward, d as rankOf, i as rowOf, l as defaultAffinityConfig, n as animationForPhase, o as AFFINITY_RANKS, r as defaultPetStateConfig, s as applyInteraction, t as PetStateMachine, u as emptyAffinity } from "./state-P-wsVJ6O.js";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import z from "schemastery";
 import { Service } from "@deepseek-ai/cordis";
@@ -162,6 +162,116 @@ function savePetPersist(data, dir = petHomeDir()) {
 	writeFileSync(tmp, JSON.stringify(data, null, 2), "utf8");
 	renameSync(tmp, target);
 }
+/** Keep tool names readable inside the compact status bubble. */
+function displayToolName(name) {
+	const compact = name.replace(/\s+/g, " ").trim() || "工具";
+	return compact.length <= 24 ? compact : `${compact.slice(0, 21)}...`;
+}
+/** Whether a legacy phase is part of the pet's supported vocabulary. */
+function isActivityPhase(phase) {
+	return [
+		"idle",
+		"waiting",
+		"thinking",
+		"tool",
+		"review",
+		"done",
+		"failed"
+	].includes(phase);
+}
+/**
+* Project the durable DSH session vocabulary into the pet's visual phases.
+* Unknown and log-only events do not disturb the last meaningful activity.
+*/
+function projectOfficialEvent(event, runtime) {
+	switch (event.type) {
+		case "turn/start":
+			runtime.activeTools.clear();
+			runtime.stepHadFailure = false;
+			return { input: {
+				phase: "waiting",
+				line: "准备开始"
+			} };
+		case "step/start":
+			runtime.activeTools.clear();
+			runtime.stepHadFailure = false;
+			return { input: {
+				phase: "waiting",
+				line: "等待模型响应"
+			} };
+		case "assistant/chunk": {
+			const { chunk } = event.data;
+			if (chunk.type === "reasoning-delta" && chunk.text.length > 0) return { input: {
+				phase: "thinking",
+				line: "正在思考"
+			} };
+			if (chunk.type === "text-delta" && chunk.text.length > 0) return { input: {
+				phase: "review",
+				line: "整理回复中"
+			} };
+			return;
+		}
+		case "assistant/message": return { input: {
+			phase: "review",
+			line: "整理回复中"
+		} };
+		case "tool/call":
+			runtime.activeTools.add(String(event.data.callId));
+			return { input: {
+				phase: "tool",
+				line: `正在使用 ${displayToolName(event.data.name)}`
+			} };
+		case "tool/result": {
+			const block = event.data.message.content[0];
+			runtime.activeTools.delete(String(event.data.message.source.callId));
+			runtime.stepHadFailure ||= event.data.error !== void 0 || block.isError === true;
+			if (runtime.activeTools.size > 0) return { input: {
+				phase: "tool",
+				line: `还有 ${runtime.activeTools.size} 个工具运行中`
+			} };
+			return runtime.stepHadFailure ? { input: {
+				phase: "failed",
+				line: "工具执行失败"
+			} } : { input: {
+				phase: "thinking",
+				line: "处理工具结果"
+			} };
+		}
+		case "turn/end":
+			runtime.activeTools.clear();
+			switch (event.data.reason.kind) {
+				case "completed": return {
+					input: {
+						phase: "done",
+						line: "完成啦"
+					},
+					completedTurn: event.data.turn
+				};
+				case "error": return { input: {
+					phase: "failed",
+					line: "执行失败"
+				} };
+				case "max-tokens": return { input: {
+					phase: "failed",
+					line: "达到输出上限"
+				} };
+				case "interrupted": return { input: {
+					phase: "failed",
+					line: "执行意外中断"
+				} };
+				case "blocked": return { input: {
+					phase: "waiting",
+					line: "等待继续"
+				} };
+				case "aborted": return { input: {
+					phase: "idle",
+					line: "已停止"
+				} };
+				default: return { input: { phase: "idle" } };
+			}
+		default: return;
+	}
+}
 /**
 * Cordis service exposing the pet RPC domain. Lazy: nothing is scanned or
 * written until a query or interaction arrives; event listeners update only
@@ -179,6 +289,10 @@ var PetService = class extends Service {
 	rewardedTurns = /* @__PURE__ */ new Map();
 	enabled;
 	disposeActivity;
+	/** Session whose most recent meaningful event currently drives the global pet. */
+	displaySession;
+	sessionActivity = /* @__PURE__ */ new WeakMap();
+	lastLegacyTurnRewardAt = 0;
 	constructor(ctx, config = {}) {
 		super(ctx, "pet");
 		this.persistDir = config.persistDir ?? petHomeDir();
@@ -227,31 +341,26 @@ var PetService = class extends Service {
 		if (!this.enabled) return;
 		this.disposeActivity = (() => {
 			const disposers = [this.ctx.on("session/event", (session, event) => {
-				switch (event.type) {
-					case "turn/start":
-						this.machine.onSessionActive();
-						break;
-					case "step/start":
-						this.machine.onSessionActive();
-						this.machine.onActivityStatus({ phase: "thinking" });
-						break;
-					case "tool/call":
-						this.machine.onSessionActive();
-						this.machine.onActivityStatus({
-							phase: "tool",
-							line: "tool: " + event.data.name
-						});
-						break;
-					case "turn/end":
-						this.machine.onSessionActive();
-						if (event.data.reason.kind === "completed") {
-							this.machine.onActivityStatus({ phase: "done" });
-							this.rewardTurn(String(session.id), event.data.turn);
-						} else this.machine.onActivityStatus({ phase: "idle" });
-						break;
-					default: break;
+				const runtime = this.activityRuntime(session);
+				if (event.type === "activity/status") {
+					const payload = event.data ?? {};
+					if (typeof payload.phase !== "string" || !isActivityPhase(payload.phase)) return;
+					this.applyActivity(session, {
+						phase: payload.phase,
+						...typeof payload.line === "string" ? { line: payload.line } : {},
+						...typeof payload.phrase === "string" ? { phrase: payload.phrase } : {}
+					});
+					if (payload.phase === "done" && !runtime.officialEventsSeen) this.rewardLegacyTurn();
+					return;
 				}
-			}), this.ctx.on("session/disposed", () => {
+				const transition = projectOfficialEvent(event, runtime);
+				if (transition === void 0) return;
+				runtime.officialEventsSeen = true;
+				this.applyActivity(session, transition.input);
+				if (transition.completedTurn !== void 0) this.rewardTurn(String(session.id), transition.completedTurn);
+			}), this.ctx.on("session/disposed", (session) => {
+				if (session !== this.displaySession) return;
+				this.displaySession = void 0;
 				this.machine.onSessionDisposed();
 			})];
 			return () => {
@@ -259,6 +368,25 @@ var PetService = class extends Service {
 			};
 		})();
 	}
+	/** Return the projection state associated with one live session. */
+	activityRuntime(session) {
+		let runtime = this.sessionActivity.get(session);
+		if (runtime === void 0) {
+			runtime = {
+				activeTools: /* @__PURE__ */ new Set(),
+				officialEventsSeen: false,
+				stepHadFailure: false
+			};
+			this.sessionActivity.set(session, runtime);
+		}
+		return runtime;
+	}
+	/** Commit one activity as the host-global pet's most recent display state. */
+	applyActivity(session, input) {
+		this.displaySession = session;
+		this.machine.onActivityStatus(input);
+		this.machine.onSessionActive();
+	}
 	/** RPC: pet or feed the pet. */
 	async interact(kind) {
 		const nowMs = Date.now();
@@ -388,6 +516,17 @@ var PetService = class extends Service {
 	rewardTurn(sessionId, turn) {
 		if (turn <= (this.rewardedTurns.get(sessionId) ?? 0)) return;
 		this.rewardedTurns.set(sessionId, turn);
+		this.applyTurnReward();
+	}
+	/** Preserve turn rewards for installations that only emit legacy activity. */
+	rewardLegacyTurn() {
+		const nowMs = Date.now();
+		if (nowMs - this.lastLegacyTurnRewardAt < 5e3) return;
+		this.lastLegacyTurnRewardAt = nowMs;
+		this.applyTurnReward();
+	}
+	/** Persist one accepted completed-turn reward. */
+	applyTurnReward() {
 		this.persist = {
 			...this.persist,
 			affinity: applyTurnReward(this.persist.affinity, this.affinityConfig)

package/lib/invariant.js

@@ -1,4 +1,4 @@
-import { l as defaultAffinityConfig, n as animationForPhase, o as AFFINITY_RANKS } from "./state-C9EyycwI.js";
+import { l as defaultAffinityConfig, n as animationForPhase, o as AFFINITY_RANKS } from "./state-P-wsVJ6O.js";
 //#region src/invariant.ts
 /**
 * Package invariants — cheap structural checks run at import time on the

package/lib/{state-C9EyycwI.js → state-P-wsVJ6O.js}

@@ -112,20 +112,21 @@ function applyTurnReward(state, config = defaultAffinityConfig) {
 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.
 */
 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";
 	}
 }
@@ -159,7 +160,7 @@ var PetStateMachine = class {
 		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;
@@ -184,7 +185,7 @@ var PetStateMachine = class {
 		let animation = animationForPhase(this.phase);
 		if (this.phase === "done" && this.doneAt !== void 0) if (nowMs - this.doneAt < this.config.celebrateMs) animation = "jumping";
 		else animation = "idle";
-		const bubble = this.phrase ?? this.line;
+		const bubble = this.phase === "done" && this.doneAt !== void 0 && nowMs - this.doneAt >= this.config.celebrateMs ? void 0 : this.phrase ?? this.line;
 		return {
 			animation,
 			...bubble === void 0 ? {} : { bubble },

package/lib/types/client/WhalePet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhalePet.d.ts","sourceRoot":"","sources":["../../../src/client/WhalePet.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAqC,WAAW,EAAE,MAAM,OAAO,CAAA;AAE3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAGjD,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,gCAAgC,CAAA;AAEhE,mFAAmF;AACnF,eAAO,MAAM,gBAAgB,wBAAwB,CAAA;AAErD,wEAAwE;AACxE,MAAM,WAAW,aAAa;IAC5B,gDAAgD;IAChD,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAA;IAC7B,qDAAqD;IACrD,OAAO,EAAE,gBAAgB,CAAA;IACzB,sCAAsC;IACtC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAA;IAC5B,kCAAkC;IAClC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,+BAA+B;IAC/B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAClD,8CAA8C;IAC9C,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC,2DAA2D;IAC3D,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,+CAA+C;IAC/C,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;CAC1B;AAOD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAmT1D"}
+{"version":3,"file":"WhalePet.d.ts","sourceRoot":"","sources":["../../../src/client/WhalePet.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAqC,WAAW,EAAE,MAAM,OAAO,CAAA;AAE3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAGjD,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,gCAAgC,CAAA;AAEhE,mFAAmF;AACnF,eAAO,MAAM,gBAAgB,wBAAwB,CAAA;AAErD,wEAAwE;AACxE,MAAM,WAAW,aAAa;IAC5B,gDAAgD;IAChD,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAA;IAC7B,qDAAqD;IACrD,OAAO,EAAE,gBAAgB,CAAA;IACzB,sCAAsC;IACtC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAA;IAC5B,kCAAkC;IAClC,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,0CAA0C;IAC1C,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,+BAA+B;IAC/B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAClD,8CAA8C;IAC9C,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC,2DAA2D;IAC3D,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,+CAA+C;IAC/C,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;CAC1B;AAOD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAyT1D"}

package/lib/types/client/WhalePet.js

@@ -198,6 +198,7 @@ export function WhalePet(props) {
     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 = (_jsxs("div", { ref: floatRef, className: styles.float, style: { right: pos.right, bottom: pos.bottom, zIndex: 2147483000 }, onPointerEnter: () => {
             clearHideTimer();
             setHovered(true);
@@ -228,7 +229,7 @@ export function WhalePet(props) {
                     if (draggedRef.current)
                         return;
                     props.onPet();
-                }, role: "button", "aria-label": "whale girl" }), feedback !== null && (_jsx("div", { className: `${styles.bubble} ${feedback.kind === 'feed' ? styles.bubbleFeed : styles.bubblePet}`, children: feedback.text }, feedback.at)), hovered && dragRef.current === null && (_jsx("div", { className: styles.panel, onPointerEnter: () => {
+                }, role: "button", "aria-label": "whale girl" }), feedback !== null && (_jsx("div", { className: `${styles.bubble} ${feedback.kind === 'feed' ? styles.bubbleFeed : styles.bubblePet}`, children: feedback.text }, feedback.at)), statusBubble !== undefined && (_jsx("div", { className: `${styles.bubble} ${styles.bubbleStatus}`, role: "status", "aria-live": "polite", children: statusBubble })), hovered && dragRef.current === null && (_jsx("div", { className: styles.panel, onPointerEnter: () => {
                     // Reaching the panel (or its bridge) must cancel any hide timer
                     // the container's pointerleave may have armed while the pointer
                     // crossed the sliver between the sprite and the panel.

package/lib/types/service.d.ts

@@ -1,10 +1,9 @@
 /**
  * Pet host service — the `pet.*` RPC domain. Owns the state machine wiring
- * (maps core rc.6 session events — turn/step/tool boundaries — and the
- * session lifecycle onto the pet phases), the affinity ledger, and the
- * persisted display config. The API gateway maps this service's methods onto
- * `pet.state` / `pet.interact` / `pet.setVisible` / `pet.setConfig`
- * for browser consumers.
+ * (projects official session events and accepts legacy `activity/status`), the
+ * affinity ledger, and the persisted display config. The API gateway maps
+ * this service's methods onto `pet.state` / `pet.interact` /
+ * `pet.setVisible` / `pet.setConfig` for browser consumers.
  * @module @linxin666/dsh-pet/service
  */
 import { Context, Service } from '@deepseek-ai/cordis';
@@ -108,6 +107,10 @@ export declare class PetService extends Service {
     private rewardedTurns;
     private enabled;
     private disposeActivity;
+    /** Session whose most recent meaningful event currently drives the global pet. */
+    private displaySession;
+    private readonly sessionActivity;
+    private lastLegacyTurnRewardAt;
     constructor(ctx: Context, config?: PetConfig);
     /** Whether the pet service consumes session activity while enabled. */
     isEnabled(): boolean;
@@ -120,6 +123,10 @@ export declare class PetService extends Service {
     /** Start or stop the session-activity listeners that drive the pet. */
     setEnabled(enabled: boolean): void;
     private syncActivity;
+    /** Return the projection state associated with one live session. */
+    private activityRuntime;
+    /** Commit one activity as the host-global pet's most recent display state. */
+    private applyActivity;
     /** RPC: pet or feed the pet. */
     interact(kind: PetInteraction): Promise<PetInteractResult>;
     /** RPC: show or hide the pet. */
@@ -151,6 +158,10 @@ export declare class PetService extends Service {
     private syncSettingsFromPet;
     /** Award the turn reward once per completed turn (idempotent per session + turn). */
     private rewardTurn;
+    /** Preserve turn rewards for installations that only emit legacy activity. */
+    private rewardLegacyTurn;
+    /** Persist one accepted completed-turn reward. */
+    private applyTurnReward;
     /**
      * Settle the treat economy (work + time output since the last settlement)
      * and persist whenever the ledger changed. A zero-gain first settlement

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

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"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"}

package/lib/types/service.js

@@ -1,10 +1,9 @@
 /**
  * Pet host service — the `pet.*` RPC domain. Owns the state machine wiring
- * (maps core rc.6 session events — turn/step/tool boundaries — and the
- * session lifecycle onto the pet phases), the affinity ledger, and the
- * persisted display config. The API gateway maps this service's methods onto
- * `pet.state` / `pet.interact` / `pet.setVisible` / `pet.setConfig`
- * for browser consumers.
+ * (projects official session events and accepts legacy `activity/status`), the
+ * affinity ledger, and the persisted display config. The API gateway maps
+ * this service's methods onto `pet.state` / `pet.interact` /
+ * `pet.setVisible` / `pet.setConfig` for browser consumers.
  * @module @linxin666/dsh-pet/service
  */
 import { Service } from '@deepseek-ai/cordis';
@@ -14,6 +13,93 @@ import { defaultTreatConfig, settleTreatGrants, consumeTreat, } from "./treats.j
 import { defaultPetStateConfig, PetStateMachine, } from "./state.js";
 /** Settings namespace of the pet capability. Spelled here rather than imported: the browser half spells the same value. */
 export const PET_SETTINGS_NAMESPACE = 'pet';
+/** Keep tool names readable inside the compact status bubble. */
+function displayToolName(name) {
+    const compact = name.replace(/\s+/g, ' ').trim() || '工具';
+    return compact.length <= 24 ? compact : `${compact.slice(0, 21)}...`;
+}
+/** Whether a legacy phase is part of the pet's supported vocabulary. */
+function isActivityPhase(phase) {
+    return ['idle', 'waiting', 'thinking', 'tool', 'review', 'done', 'failed'].includes(phase);
+}
+/**
+ * Project the durable DSH session vocabulary into the pet's visual phases.
+ * Unknown and log-only events do not disturb the last meaningful activity.
+ */
+function projectOfficialEvent(event, runtime) {
+    switch (event.type) {
+        case 'turn/start':
+            runtime.activeTools.clear();
+            runtime.stepHadFailure = false;
+            return { input: { phase: 'waiting', line: '准备开始' } };
+        case 'step/start':
+            runtime.activeTools.clear();
+            runtime.stepHadFailure = false;
+            return { input: { phase: 'waiting', line: '等待模型响应' } };
+        case 'assistant/chunk': {
+            const { chunk } = event.data;
+            if (chunk.type === 'reasoning-delta' && chunk.text.length > 0) {
+                return { input: { phase: 'thinking', line: '正在思考' } };
+            }
+            if (chunk.type === 'text-delta' && chunk.text.length > 0) {
+                return { input: { phase: 'review', line: '整理回复中' } };
+            }
+            return undefined;
+        }
+        case 'assistant/message':
+            return { input: { phase: 'review', line: '整理回复中' } };
+        case 'tool/call':
+            runtime.activeTools.add(String(event.data.callId));
+            return {
+                input: {
+                    phase: 'tool',
+                    line: `正在使用 ${displayToolName(event.data.name)}`,
+                },
+            };
+        case 'tool/result': {
+            const block = event.data.message.content[0];
+            runtime.activeTools.delete(String(event.data.message.source.callId));
+            runtime.stepHadFailure ||= event.data.error !== undefined || block.isError === true;
+            if (runtime.activeTools.size > 0) {
+                return {
+                    input: {
+                        phase: 'tool',
+                        line: `还有 ${runtime.activeTools.size} 个工具运行中`,
+                    },
+                };
+            }
+            return runtime.stepHadFailure
+                ? { input: { phase: 'failed', line: '工具执行失败' } }
+                : { input: { phase: 'thinking', line: '处理工具结果' } };
+        }
+        case 'turn/end': {
+            runtime.activeTools.clear();
+            switch (event.data.reason.kind) {
+                case 'completed':
+                    return {
+                        input: { phase: 'done', line: '完成啦' },
+                        completedTurn: event.data.turn,
+                    };
+                case 'error':
+                    return { input: { phase: 'failed', line: '执行失败' } };
+                case 'max-tokens':
+                    return { input: { phase: 'failed', line: '达到输出上限' } };
+                case 'interrupted':
+                    return { input: { phase: 'failed', line: '执行意外中断' } };
+                case 'blocked':
+                    return { input: { phase: 'waiting', line: '等待继续' } };
+                case 'aborted':
+                    return { input: { phase: 'idle', line: '已停止' } };
+                default:
+                    // TurnEndReasonMap is merge-extensible; a newer ending must not
+                    // leave the pet showing stale in-progress work.
+                    return { input: { phase: 'idle' } };
+            }
+        }
+        default:
+            return undefined;
+    }
+}
 /**
  * Cordis service exposing the pet RPC domain. Lazy: nothing is scanned or
  * written until a query or interaction arrives; event listeners update only
@@ -31,6 +117,10 @@ export class PetService extends Service {
     rewardedTurns = new Map();
     enabled;
     disposeActivity;
+    /** Session whose most recent meaningful event currently drives the global pet. */
+    displaySession;
+    sessionActivity = new WeakMap();
+    lastLegacyTurnRewardAt = 0;
     constructor(ctx, config = {}) {
         super(ctx, 'pet');
         this.persistDir = config.persistDir ?? petHomeDir();
@@ -75,38 +165,40 @@ export class PetService extends Service {
         this.disposeActivity = (() => {
             const disposers = [
                 this.ctx.on('session/event', (session, event) => {
-                    // rc.6 publishes no 'activity/status' event (the working-activity
-                    // tracker is gone), so the pet derives its phases from the core
-                    // session vocabulary instead.
-                    switch (event.type) {
-                        case 'turn/start':
-                            this.machine.onSessionActive();
-                            break;
-                        case 'step/start':
-                            this.machine.onSessionActive();
-                            this.machine.onActivityStatus({ phase: 'thinking' });
-                            break;
-                        case 'tool/call':
-                            this.machine.onSessionActive();
-                            this.machine.onActivityStatus({ phase: 'tool', line: 'tool: ' + event.data.name });
-                            break;
-                        case 'turn/end':
-                            this.machine.onSessionActive();
-                            if (event.data.reason.kind === 'completed') {
-                                this.machine.onActivityStatus({ phase: 'done' });
-                                this.rewardTurn(String(session.id), event.data.turn);
-                            }
-                            else {
-                                // Aborted / failed turns clear the working pose instead of
-                                // freezing the pet on its last phase.
-                                this.machine.onActivityStatus({ phase: 'idle' });
-                            }
-                            break;
-                        default:
-                            break;
+                    const runtime = this.activityRuntime(session);
+                    // `activity/status` is an optional compatibility input. It is not
+                    // declared as a durable event type by this package because current
+                    // Harness installations publish the official session vocabulary.
+                    if (event.type === 'activity/status') {
+                        const payload = (event.data ?? {});
+                        if (typeof payload.phase !== 'string' || !isActivityPhase(payload.phase))
+                            return;
+                        this.applyActivity(session, {
+                            phase: payload.phase,
+                            ...(typeof payload.line === 'string' ? { line: payload.line } : {}),
+                            ...(typeof payload.phrase === 'string' ? { phrase: payload.phrase } : {}),
+                        });
+                        // On a legacy-only stream the compatibility event owns turn
+                        // rewards. Once any official activity is observed, turn/end owns
+                        // them and a derived legacy `done` cannot double-count.
+                        if (payload.phase === 'done' && !runtime.officialEventsSeen) {
+                            this.rewardLegacyTurn();
+                        }
+                        return;
+                    }
+                    const transition = projectOfficialEvent(event, runtime);
+                    if (transition === undefined)
+                        return;
+                    runtime.officialEventsSeen = true;
+                    this.applyActivity(session, transition.input);
+                    if (transition.completedTurn !== undefined) {
+                        this.rewardTurn(String(session.id), transition.completedTurn);
                     }
                 }),
-                this.ctx.on('session/disposed', () => {
+                this.ctx.on('session/disposed', (session) => {
+                    if (session !== this.displaySession)
+                        return;
+                    this.displaySession = undefined;
                     this.machine.onSessionDisposed();
                 }),
             ];
@@ -114,6 +206,25 @@ export class PetService extends Service {
                 dispose(); };
         })();
     }
+    /** Return the projection state associated with one live session. */
+    activityRuntime(session) {
+        let runtime = this.sessionActivity.get(session);
+        if (runtime === undefined) {
+            runtime = {
+                activeTools: new Set(),
+                officialEventsSeen: false,
+                stepHadFailure: false,
+            };
+            this.sessionActivity.set(session, runtime);
+        }
+        return runtime;
+    }
+    /** Commit one activity as the host-global pet's most recent display state. */
+    applyActivity(session, input) {
+        this.displaySession = session;
+        this.machine.onActivityStatus(input);
+        this.machine.onSessionActive();
+    }
     /** RPC: pet or feed the pet. */
     async interact(kind) {
         const nowMs = Date.now();
@@ -212,6 +323,19 @@ export class PetService extends Service {
         if (turn <= last)
             return;
         this.rewardedTurns.set(sessionId, turn);
+        this.applyTurnReward();
+    }
+    /** Preserve turn rewards for installations that only emit legacy activity. */
+    rewardLegacyTurn() {
+        const nowMs = Date.now();
+        // A legacy `done` snapshot may repeat during the celebration window.
+        if (nowMs - this.lastLegacyTurnRewardAt < 5_000)
+            return;
+        this.lastLegacyTurnRewardAt = nowMs;
+        this.applyTurnReward();
+    }
+    /** Persist one accepted completed-turn reward. */
+    applyTurnReward() {
         this.persist = { ...this.persist, affinity: applyTurnReward(this.persist.affinity, this.affinityConfig) };
         this.flush();
     }