@linxin666/dsh-pet 0.1.18 → 0.1.19

package/lib/index.js

@@ -1,4 +1,4 @@
-import { a as AFFINITY_MAX, c as applyInteraction, d as emptyAffinity, f as rankOf, i as rowOf, l as applyTurnReward, n as animationForPhase, o as AFFINITY_RANKS, r as defaultPetStateConfig, s as affinityViewOf, t as PetStateMachine, u as defaultAffinityConfig } from "./state-CFyJv0sQ.js";
+import { _ as RemarkPicker, a as AFFINITY_MAX, c as applyInteraction, d as emptyAffinity, f as rankOf, g as REMARK_LINE_MAX, h as REMARK_LINES_MAX, i as rowOf, l as applyTurnReward, m as REMARK_KINDS, n as animationForPhase, o as AFFINITY_RANKS, p as BUILTIN_REMARKS, r as defaultPetStateConfig, s as affinityViewOf, t as PetStateMachine, u as defaultAffinityConfig, v as builtinRemark, y as normalizePetRemarks } from "./state-Diiq8vjk.js";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import z from "schemastery";
 import { Service } from "@deepseek-ai/cordis";
@@ -117,10 +117,7 @@ function projectOfficialEvent(event, runtime) {
 					phase: "waiting",
 					line: "等待继续"
 				} };
-				case "aborted": return { input: {
-					phase: "idle",
-					line: "已停止"
-				} };
+				case "aborted": return { input: { phase: "idle" } };
 				default: return { input: { phase: "idle" } };
 			}
 		default: return;
@@ -129,8 +126,8 @@ function projectOfficialEvent(event, runtime) {
 //#endregion
 //#region src/treats.ts
 const defaultTreatConfig = {
-	turnsPerTreat: 3,
-	timeTreatMs: 30 * 6e4,
+	turnsPerTreat: 30,
+	timeTreatMs: 300 * 6e4,
 	maxTreats: 20
 };
 function emptyTreatLedger() {
@@ -217,6 +214,8 @@ function consumeTreat(ledger) {
 var PetLedger = class {
 	affinityConfig;
 	treatConfig;
+	/** Round-robin reaction picker; rebuilt when the selected pet changes. */
+	picker;
 	current;
 	/** Completed turns already rewarded, per session (turn numbers are per-session). */
 	rewardedTurns = /* @__PURE__ */ new Map();
@@ -231,6 +230,7 @@ var PetLedger = class {
 			...defaultTreatConfig,
 			...config.treats ?? {}
 		};
+		this.picker = new RemarkPicker(config.remarks);
 		this.current = persist;
 	}
 	/** Affinity cooldown/rank tuning (read-only). */
@@ -251,6 +251,13 @@ var PetLedger = class {
 		this.dirty = false;
 		return was;
 	}
+	/**
+	* Drop a session's rewarded-turn bookkeeping once that session is disposed,
+	* so the per-session map does not grow without bound.
+	*/
+	forgetSession(sessionId) {
+		this.rewardedTurns.delete(sessionId);
+	}
 	/** Replace the display block (clamping stays a caller concern). */
 	setDisplay(display) {
 		this.current = {
@@ -280,9 +287,16 @@ var PetLedger = class {
 		this.dirty = true;
 	}
 	/**
+	* Swap the reaction pools to another pet's custom remarks (called on pet
+	* selection). Slots the pet does not declare fall back to built-ins.
+	*/
+	setRemarks(remarks) {
+		this.picker = new RemarkPicker(remarks);
+	}
+	/**
 	* Settle the treat economy (work + time output since the last settlement).
 	* A zero-gain first settlement still starts the time clock (anchor write),
-	* which is how the 30-minute time output can ever accrue. Returns true when
+	* which is how the time output can ever accrue. Returns true when
 	* the in-memory ledger changed and should be persisted.
 	*/
 	settleTreats(nowMs) {
@@ -332,14 +346,14 @@ var PetLedger = class {
 		if (kind === "feed") this.settleTreats(nowMs);
 		const outcome = applyInteraction(this.current.affinity, kind, nowMs, this.affinityConfig);
 		if (kind === "feed" && !outcome.accepted) return {
-			reaction: outcome.reaction,
+			reaction: this.picker.pick("feedCooldown"),
 			delta: 0,
 			affinity: this.affinityView(nowMs)
 		};
 		if (kind === "feed") {
 			const consume = consumeTreat(this.current.treats);
 			if (!consume.ok) return {
-				reaction: "没有小鱼干了，多陪我工作一会儿吧～",
+				reaction: this.picker.pick("noTreats"),
 				delta: 0,
 				affinity: this.affinityView(nowMs)
 			};
@@ -357,7 +371,7 @@ var PetLedger = class {
 			this.dirty = true;
 		}
 		return {
-			reaction: outcome.reaction,
+			reaction: this.picker.pick(outcome.accepted ? kind : "petCooldown"),
 			delta: outcome.delta,
 			affinity: this.affinityView(nowMs)
 		};
@@ -464,7 +478,7 @@ function loadPetPersist(dir = petHomeDir()) {
 		const base = emptyPersist();
 		const rawAffinity = parsed.affinity ?? {};
 		const affinity = {
-			points: clamp(finiteNum(rawAffinity.points, 0), 100),
+			points: clamp(finiteNum(rawAffinity.points, 0), AFFINITY_MAX),
 			lastPetAt: clamp(finiteNum(rawAffinity.lastPetAt, 0), Number.MAX_SAFE_INTEGER),
 			lastFeedAt: clamp(finiteNum(rawAffinity.lastFeedAt, 0), Number.MAX_SAFE_INTEGER),
 			pets: clamp(finiteNum(rawAffinity.pets, 0), Number.MAX_SAFE_INTEGER),
@@ -728,6 +742,7 @@ function resolvePetManifest(raw, dir, options = {}) {
 	const rows = DEFAULT_FRAME_COUNTS.map((fallback, index) => {
 		return finiteInt(Array.isArray(source.frames) ? source.frames[index] : void 0, fallback, columns);
 	});
+	const remarks = normalizePetRemarks(source.remarks, (message) => warn("manifest " + id + ": " + message));
 	const trackOverrides = typeof source.tracks === "object" && source.tracks !== null ? source.tracks : {};
 	const tracks = {};
 	for (const [row, animation] of PET_ROW_ORDER.entries()) {
@@ -758,7 +773,8 @@ function resolvePetManifest(raw, dir, options = {}) {
 		atlasUrl: assetUrl(assetPrefix, id, spritesheet),
 		manifestUrl: assetUrl(assetPrefix, id, "pet.json"),
 		dir,
-		spritesheetPath: spritesheetPath.join("/")
+		spritesheetPath: spritesheetPath.join("/"),
+		...remarks === void 0 ? {} : { remarks }
 	};
 }
 /** Scan one directory of pet folders; entries come back in name order. */
@@ -852,6 +868,8 @@ function petEntryView(entry) {
 		manifestUrl: entry.manifestUrl
 	};
 }
+/** Hard cap on simultaneously displayed session bubbles (most recent first). */
+const MAX_SESSION_BUBBLES = 12;
 /**
 * Cordis service exposing the pet RPC domain. Lazy: nothing is scanned or
 * written until an economic event or interaction arrives; event listeners
@@ -861,6 +879,7 @@ function petEntryView(entry) {
 var PetService = class extends Service {
 	static inject = [];
 	machine;
+	stateConfig;
 	ledger;
 	registry;
 	persistDir;
@@ -868,7 +887,12 @@ var PetService = class extends Service {
 	disposeActivity;
 	/** Session whose most recent meaningful event currently drives the global pet. */
 	displaySession;
-	sessionActivity = /* @__PURE__ */ new WeakMap();
+	/**
+	* Per-session activity, most recent last (Map insertion order). Bounded by
+	* MAX_SESSION_BUBBLES so a burst of sessions cannot grow it without bound;
+	* disposed sessions are removed by the 'session/disposed' listener.
+	*/
+	sessionActivity = /* @__PURE__ */ new Map();
 	constructor(ctx, config = {}) {
 		super(ctx, "pet");
 		this.persistDir = config.persistDir ?? petHomeDir();
@@ -882,15 +906,18 @@ var PetService = class extends Service {
 			...persist,
 			petId: this.registry.defaultEntry().id
 		};
+		const selected = this.registry.byId(persist.petId) ?? this.registry.defaultEntry();
 		const ledgerConfig = {
 			affinity: config.affinity,
-			treats: config.treats
+			treats: config.treats,
+			remarks: selected.remarks
 		};
 		this.ledger = new PetLedger(persist, ledgerConfig);
-		this.machine = new PetStateMachine({
+		this.stateConfig = {
 			...defaultPetStateConfig,
 			...config.state ?? {}
-		});
+		};
+		this.machine = new PetStateMachine(this.stateConfig);
 		this.enabled = config.enabled ?? true;
 		this.syncActivity();
 	}
@@ -936,6 +963,7 @@ var PetService = class extends Service {
 			error: "unknown-pet"
 		};
 		this.ledger.setPetId(entry.id);
+		this.ledger.setRemarks(entry.remarks);
 		this.flush();
 		this.syncSettingsFromPet();
 		return {
@@ -956,7 +984,7 @@ var PetService = class extends Service {
 		if (!this.enabled) return;
 		this.disposeActivity = (() => {
 			const disposers = [this.ctx.on("session/event", (session, event) => {
-				const runtime = this.activityRuntime(session);
+				const runtime = this.activityOf(session).runtime;
 				if (event.type === "activity/status") {
 					const payload = event.data ?? {};
 					if (typeof payload.phase !== "string" || !isActivityPhase(payload.phase)) return;
@@ -974,26 +1002,52 @@ var PetService = class extends Service {
 				this.applyActivity(session, transition.input);
 				if (transition.completedTurn !== void 0) this.rewardTurn(String(session.id), transition.completedTurn);
 			}), this.ctx.on("session/disposed", (session) => {
+				this.ledger.forgetSession(String(session.id));
+				this.sessionActivity.delete(session);
 				if (session !== this.displaySession) return;
 				this.displaySession = void 0;
-				this.machine.onSessionDisposed();
+				const remaining = [...this.sessionActivity.entries()].at(-1);
+				if (remaining !== void 0) {
+					const [nextSession, activity] = remaining;
+					this.displaySession = nextSession;
+					if (activity.lastInput !== void 0) this.machine.onActivityStatus(activity.lastInput);
+					this.machine.onSessionActive();
+				} else this.machine.onSessionDisposed();
 			})];
 			return () => {
 				for (const dispose of disposers) dispose();
 			};
 		})();
 	}
-	/** Return the projection state associated with one live session. */
-	activityRuntime(session) {
-		let runtime = this.sessionActivity.get(session);
-		if (runtime === void 0) {
-			runtime = emptyProjectionRuntime();
-			this.sessionActivity.set(session, runtime);
+	/** Return the per-session activity record, creating it on first sight. */
+	activityOf(session) {
+		let activity = this.sessionActivity.get(session);
+		if (activity === void 0) {
+			activity = {
+				runtime: emptyProjectionRuntime(),
+				machine: new PetStateMachine(this.stateConfig)
+			};
+			this.sessionActivity.set(session, activity);
 		}
-		return runtime;
+		return activity;
 	}
-	/** Commit one activity as the host-global pet's most recent display state. */
+	/**
+	* Commit one activity: the session's own machine renders its bubble, and
+	* the session becomes the host-global display session (most recent
+	* meaningful event wins the sprite animation).
+	*/
 	applyActivity(session, input) {
+		const activity = this.activityOf(session);
+		activity.lastInput = input;
+		activity.machine.onActivityStatus(input);
+		activity.machine.onSessionActive();
+		this.sessionActivity.delete(session);
+		this.sessionActivity.set(session, activity);
+		while (this.sessionActivity.size > 12) {
+			const oldest = this.sessionActivity.keys().next().value;
+			if (oldest === void 0) break;
+			this.sessionActivity.delete(oldest);
+		}
 		this.displaySession = session;
 		this.machine.onActivityStatus(input);
 		this.machine.onSessionActive();
@@ -1060,8 +1114,11 @@ var PetService = class extends Service {
 	* @param section - the resolved settings section.
 	*/
 	applySettingsSection(section) {
-		if (typeof section.petId === "string" && this.registry.byId(section.petId) !== void 0) this.ledger.setPetId(section.petId);
-		else if (section.petId !== void 0) this.syncSettingsFromPet();
+		const selected = typeof section.petId === "string" ? this.registry.byId(section.petId) : void 0;
+		if (selected !== void 0) {
+			this.ledger.setPetId(selected.id);
+			this.ledger.setRemarks(selected.remarks);
+		} else if (section.petId !== void 0) this.syncSettingsFromPet();
 		const next = { ...this.ledger.snapshot.display };
 		next.visible = section.visible && (section.enabled ?? true);
 		next.size = Math.round(Math.min(512, Math.max(32, section.size)));
@@ -1094,11 +1151,24 @@ var PetService = class extends Service {
 	view() {
 		const snapshot = this.machine.render();
 		const entry = this.activeEntry();
+		const sessions = [];
+		for (const [session, activity] of [...this.sessionActivity.entries()].reverse()) {
+			if (sessions.length >= 12) break;
+			const perSession = activity.machine.render();
+			if (perSession.bubble === void 0) continue;
+			sessions.push({
+				sessionId: String(session.id),
+				animation: perSession.animation,
+				bubble: perSession.bubble,
+				phase: perSession.phase
+			});
+		}
 		return {
 			animation: snapshot.animation,
 			...snapshot.bubble === void 0 ? {} : { bubble: snapshot.bubble },
 			phase: snapshot.phase,
 			sessionActive: snapshot.sessionActive,
+			sessions,
 			affinity: this.ledger.affinityView(Date.now()),
 			display: { ...this.ledger.snapshot.display },
 			pet: {
@@ -1457,4 +1527,4 @@ function apply(ctx, config = {}) {
 	syncRoutes();
 }
 //#endregion
-export { AFFINITY_MAX, AFFINITY_RANKS, DEFAULT_FRAME_COUNTS, DEFAULT_PET_CELL, DEFAULT_PET_COLUMNS, DEFAULT_PET_ID, DEFAULT_PET_NAME, DEFAULT_PET_ROW_COUNT, DEFAULT_TRACK_PATTERNS, PET_API_PREFIX, PET_ASSET_PREFIX, PET_NAME_MAX_LENGTH, PET_ROW_ORDER, PetService, PetStateMachine, animationForPhase, apply, applyInteraction, applyTurnReward, codexPetsDir, consumeTreat, defaultDisplayConfig, defaultTreatConfig, emptyAffinity, emptyPersist, emptyTreatLedger, inject, loadPetPersist, loadPetRegistry, makePetRoutes, makePetSettingsSchema, name, petEntryView, petHomeDir, petPackageRoot, rankOf, resolvePetManifest, rowOf, savePetPersist, settleTreatGrants };
+export { AFFINITY_MAX, AFFINITY_RANKS, BUILTIN_REMARKS, DEFAULT_FRAME_COUNTS, DEFAULT_PET_CELL, DEFAULT_PET_COLUMNS, DEFAULT_PET_ID, DEFAULT_PET_NAME, DEFAULT_PET_ROW_COUNT, DEFAULT_TRACK_PATTERNS, MAX_SESSION_BUBBLES, PET_API_PREFIX, PET_ASSET_PREFIX, PET_NAME_MAX_LENGTH, PET_ROW_ORDER, PetService, PetStateMachine, REMARK_KINDS, REMARK_LINES_MAX, REMARK_LINE_MAX, RemarkPicker, animationForPhase, apply, applyInteraction, applyTurnReward, builtinRemark, codexPetsDir, consumeTreat, defaultDisplayConfig, defaultTreatConfig, emptyAffinity, emptyPersist, emptyTreatLedger, inject, loadPetPersist, loadPetRegistry, makePetRoutes, makePetSettingsSchema, name, normalizePetRemarks, petEntryView, petHomeDir, petPackageRoot, rankOf, resolvePetManifest, rowOf, savePetPersist, settleTreatGrants };

package/lib/invariant.js

@@ -1,4 +1,4 @@
-import { n as animationForPhase, o as AFFINITY_RANKS, u as defaultAffinityConfig } from "./state-CFyJv0sQ.js";
+import { a as AFFINITY_MAX, n as animationForPhase, o as AFFINITY_RANKS, u as defaultAffinityConfig } from "./state-Diiq8vjk.js";
 //#region src/invariant.ts
 /**
 * Package invariants — cheap structural checks run at import time on the
@@ -11,7 +11,7 @@ function invariant(condition, message) {
 }
 /** Run every package invariant once; throws on the first violation. */
 function runPetInvariants() {
-	invariant(true, "AFFINITY_MAX must be positive");
+	invariant(AFFINITY_MAX > 0, "AFFINITY_MAX must be positive");
 	invariant(AFFINITY_RANKS.length > 0 && AFFINITY_RANKS[0].min === 0, "AFFINITY_RANKS must start at 0");
 	invariant(defaultAffinityConfig.turnReward > 0, "turnReward must be positive");
 	invariant(defaultAffinityConfig.feedCooldownMs > defaultAffinityConfig.petCooldownMs, "feed cooldown must exceed pet cooldown");