@linxin666/dsh-pet 0.3.5 → 0.3.9

package/lib/index.js

@@ -1,5 +1,4 @@
-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-DrMX22GL.js";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
+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-NvDEoCln.js";
 import z from "schemastery";
 import { Service } from "@deepseek-ai/cordis";
 import { closeSync, existsSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, realpathSync, renameSync, statSync, writeFileSync } from "node:fs";
@@ -8,6 +7,67 @@ import { homedir } from "node:os";
 import { isAbsolute as isAbsolute$1, join as join$1 } from "node:path/posix";
 import { fileURLToPath } from "node:url";
 import { readFile } from "node:fs/promises";
+//#region src/announce.ts
+/** Default freshness window. */
+const ANNOUNCE_DEFAULT_TTL_MS = 1e4;
+/**
+* Hard TTL ceiling. A repeating announcer (dsh-usage) declares its poll
+* cadence as the TTL, so an `always`-mode bubble stays continuous across
+* polls; the ceiling means a source that dies unmounts its bubble within at
+* most one missed refresh cycle rather than lingering forever.
+*/
+const ANNOUNCE_MAX_TTL_MS = 72e5;
+/** Hard bounds: lengths and the TTL range (1 s .. 60 s). */
+const TITLE_MAX = 80;
+const TEXT_MAX = 120;
+const SOURCE_MAX = 64;
+function boundedString(value, max) {
+	if (typeof value !== "string") return void 0;
+	const trimmed = value.trim();
+	if (trimmed === "") return void 0;
+	return trimmed.length <= max ? trimmed : trimmed.slice(0, max);
+}
+/**
+* Validate one announce payload. Unknown fields are dropped, oversized text
+* is truncated, and anything structurally wrong resolves to undefined — a
+* malformed announcement never reaches the pet's bubble surface.
+* @param input - the payload a sibling plugin passed to `pet.announce`.
+* @param now - epoch ms the announcement arrived.
+*/
+function parseAnnouncement(input, now) {
+	if (typeof input !== "object" || input === null) return void 0;
+	const data = input;
+	const source = boundedString(data.source, SOURCE_MAX);
+	const title = boundedString(data.title, TITLE_MAX);
+	if (source === void 0 || title === void 0) return void 0;
+	const kind = data.kind === "balance" || data.kind === "cost" || data.kind === "plan" ? data.kind : void 0;
+	if (kind === void 0) return void 0;
+	const amount = boundedString(data.amount, TEXT_MAX);
+	const resetAt = boundedString(data.resetAt, TEXT_MAX);
+	const note = boundedString(data.note, TITLE_MAX);
+	const percent = typeof data.percent === "number" && Number.isFinite(data.percent) ? Math.max(0, Math.min(100, data.percent)) : void 0;
+	if ((kind === "balance" || kind === "cost") && amount === void 0) return void 0;
+	if (kind === "plan" && percent === void 0) return void 0;
+	const tone = data.tone === "warn" || data.tone === "low" ? data.tone : "ok";
+	const ttlMs = typeof data.ttlMs === "number" && Number.isFinite(data.ttlMs) ? Math.max(1e3, Math.min(ANNOUNCE_MAX_TTL_MS, data.ttlMs)) : ANNOUNCE_DEFAULT_TTL_MS;
+	return {
+		source,
+		kind,
+		title,
+		...amount !== void 0 ? { amount } : {},
+		...percent !== void 0 ? { percent } : {},
+		...resetAt !== void 0 ? { resetAt } : {},
+		...note !== void 0 ? { note } : {},
+		tone,
+		ttlMs,
+		at: now
+	};
+}
+/** Whether an announcement is still fresh at `now`. */
+function announcementFresh(announcement, now) {
+	return now - announcement.at < announcement.ttlMs;
+}
+//#endregion
 //#region src/chatter.ts
 /** While a scene persists, its copy advances on this cadence (ms). */
 const STATUS_ROTATE_MS = 4e3;
@@ -1037,7 +1097,7 @@ var PetLedger = class {
 			...defaultTreatConfig,
 			...config.treats ?? {}
 		};
-		this.picker = new RemarkPicker(config.remarks);
+		this.picker = new RemarkPicker(config.remarks, config.voiceRemarks);
 		this.current = persist;
 	}
 	/** Affinity cooldown/rank tuning (read-only). */
@@ -1106,10 +1166,10 @@ var PetLedger = class {
 	}
 	/**
 	* 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.
+	* selection). Slots the pet does not declare fall back to voice packs or built-ins.
 	*/
-	setRemarks(remarks) {
-		this.picker = new RemarkPicker(remarks);
+	setRemarks(remarks, voiceRemarks) {
+		this.picker = new RemarkPicker(remarks, voiceRemarks);
 	}
 	/**
 	* Settle the treat economy (work + time output since the last settlement).
@@ -1600,7 +1660,9 @@ const VOICE_PACK_KEYS = /* @__PURE__ */ new Set([
 	"tools",
 	"toolRemaining",
 	"whispers",
-	"panel"
+	"panel",
+	"remarks",
+	"ranks"
 ]);
 /** Allowed whisper-section fields (drift-locked in tests). */
 const WHISPER_KEYS = /* @__PURE__ */ new Set(["categories", "results"]);
@@ -1663,10 +1725,22 @@ function normalizeVoicePack(raw, onWarning = () => {}) {
 		};
 	}
 	const panel = raw.panel === void 0 ? void 0 : normalizePanel(raw.panel, onWarning);
-	if (overrides.status === void 0 && overrides.tools === void 0 && overrides.toolRemaining === void 0 && overrides.whispers === void 0 && panel === void 0) return;
+	const remarks = raw.remarks === void 0 ? void 0 : normalizePetRemarks(raw.remarks, onWarning);
+	const ranksRaw = raw.ranks;
+	let ranks;
+	if (ranksRaw !== void 0) if (!isRecord$3(ranksRaw)) onWarning("ranks must be an object");
+	else {
+		const out = {};
+		for (const [key, value] of Object.entries(ranksRaw)) if (typeof value === "string" && value.trim() !== "") out[key] = value.trim().slice(0, 80);
+		else onWarning("invalid rank name for " + key);
+		if (Object.keys(out).length > 0) ranks = out;
+	}
+	if (overrides.status === void 0 && overrides.tools === void 0 && overrides.toolRemaining === void 0 && overrides.whispers === void 0 && panel === void 0 && remarks === void 0 && ranks === void 0) return;
 	return {
 		overrides,
-		...panel === void 0 ? {} : { panel }
+		...panel === void 0 ? {} : { panel },
+		...remarks === void 0 ? {} : { remarks },
+		...ranks === void 0 ? {} : { ranks }
 	};
 }
 /**
@@ -1679,6 +1753,8 @@ function mergeVoicePacks(...layers) {
 	const overrides = {};
 	const labels = {};
 	const stats = {};
+	let remarks;
+	let ranks;
 	let actions;
 	let panelSeen = false;
 	let any = false;
@@ -1704,6 +1780,14 @@ function mergeVoicePacks(...layers) {
 			if (layer.panel.stats !== void 0) Object.assign(stats, layer.panel.stats);
 			if (layer.panel.actions !== void 0) actions = layer.panel.actions;
 		}
+		if (layer.remarks !== void 0) remarks = {
+			...remarks ?? {},
+			...layer.remarks
+		};
+		if (layer.ranks !== void 0) ranks = {
+			...ranks ?? {},
+			...layer.ranks
+		};
 	}
 	if (!any) return void 0;
 	const panel = {
@@ -1714,7 +1798,9 @@ function mergeVoicePacks(...layers) {
 	const panelEmpty = panel.labels === void 0 && panel.stats === void 0 && panel.actions === void 0;
 	return {
 		overrides,
-		...panelSeen && !panelEmpty ? { panel } : {}
+		...panelSeen && !panelEmpty ? { panel } : {},
+		...remarks !== void 0 ? { remarks } : {},
+		...ranks !== void 0 ? { ranks } : {}
 	};
 }
 //#endregion
@@ -4064,6 +4150,8 @@ var PetService = class extends Service {
 	enabled;
 	/** Status-decoration master switch (M5, #567); mirrored from settings. */
 	decorationEnabled;
+	/** The freshest plugin-authored announcement (dsh-usage linkage). */
+	announcement;
 	disposeActivity;
 	/** Session whose most recent meaningful event currently drives the global pet. */
 	displaySession;
@@ -4099,10 +4187,12 @@ var PetService = class extends Service {
 			petId: this.registry.defaultEntry().id
 		};
 		const selected = this.registry.byId(persist.petId) ?? this.registry.defaultEntry();
+		const voiceRemarks = mergeVoicePacks(this.registry.globalVoice, selected.voice)?.remarks;
 		const ledgerConfig = {
 			affinity: config.affinity,
 			treats: config.treats,
-			remarks: selected.remarks
+			remarks: selected.remarks,
+			voiceRemarks
 		};
 		this.ledger = new PetLedger(persist, ledgerConfig);
 		this.stateConfig = {
@@ -4139,6 +4229,18 @@ var PetService = class extends Service {
 	async state(currentSessionId) {
 		return this.view(currentSessionId);
 	}
+	/**
+	* RPC: one plugin-authored announcement bubble (dsh-usage linkage). The
+	* payload is validated into a bounded PetAnnouncement; a malformed one is
+	* dropped silently — a sibling plugin's bug must never surface as pet
+	* breakage. The announcement is in-memory only.
+	*/
+	announce(input) {
+		const parsed = parseAnnouncement(input, Date.now());
+		if (parsed === void 0) return { ok: false };
+		this.announcement = parsed;
+		return { ok: true };
+	}
 	/** Current persisted display config (read-only view). */
 	display() {
 		return { ...this.ledger.snapshot.display };
@@ -4186,7 +4288,8 @@ var PetService = class extends Service {
 			error: "unknown-pet"
 		};
 		this.ledger.setPetId(entry.id);
-		this.ledger.setRemarks(entry.remarks);
+		const voiceRemarks = mergeVoicePacks(this.registry.globalVoice, entry.voice)?.remarks;
+		this.ledger.setRemarks(entry.remarks, voiceRemarks);
 		this.flush();
 		this.syncSettingsFromPet();
 		return {
@@ -4617,6 +4720,7 @@ var PetService = class extends Service {
 			settleGameplay(state, gameplayDef, Date.now(), { sessionActive: snapshot.sessionActive });
 			gameplay = this.gameplayViewOf(state);
 		}
+		const announcement = this.announcement !== void 0 && announcementFresh(this.announcement, Date.now()) ? this.announcement : void 0;
 		return {
 			animation: snapshot.animation,
 			...snapshot.bubble === void 0 ? {} : { bubble: snapshot.bubble },
@@ -4624,6 +4728,7 @@ var PetService = class extends Service {
 			sessionActive: snapshot.sessionActive,
 			sessions,
 			...decoration === void 0 ? {} : { decoration },
+			...announcement === void 0 ? {} : { announcement },
 			affinity: this.ledger.affinityView(Date.now()),
 			display: { ...this.ledger.snapshot.display },
 			pet: {
@@ -4691,23 +4796,33 @@ function isLoopbackRequest(request) {
 	}
 }
 //#endregion
-//#region src/access.ts
+//#region src/pair-access.ts
 /**
-* Whether this request may enter any /api/pet or /pet asset route.
+* Whether this request may enter the plugin's host routes.
 * @param ctx - host context; may expose remoteWebUiPairing.
 * @param request - the incoming HTTP request.
 * @returns true for loopback, or a live paired-device cookie.
 */
-function isPetAllowed(ctx, request) {
+function isPairedOrLoopbackAllowed(ctx, request) {
 	if (isLoopbackRequest(request)) return true;
-	const bag = ctx;
-	const fromGet = typeof bag.get === "function" ? bag.get("remoteWebUiPairing", false) : void 0;
-	return (isPairingAccess(fromGet) ? fromGet : bag.remoteWebUiPairing)?.isPairedDevice(request) === true;
+	const fromGet = typeof ctx.get === "function" ? ctx.get("remoteWebUiPairing", false) : void 0;
+	return (isPairingAccess(fromGet) ? fromGet : ctx.remoteWebUiPairing)?.isPairedDevice(request) === true;
 }
 function isPairingAccess(value) {
 	return value !== void 0 && value !== null && typeof value.isPairedDevice === "function";
 }
 //#endregion
+//#region src/access.ts
+/**
+* Whether this request may enter any /api/pet or /pet asset route.
+* @param ctx - host context; may expose remoteWebUiPairing.
+* @param request - the incoming HTTP request.
+* @returns true for loopback, or a live paired-device cookie.
+*/
+function isPetAllowed(ctx, request) {
+	return isPairedOrLoopbackAllowed(ctx, request);
+}
+//#endregion
 //#region src/http.ts
 /** Default body cap for readJsonBody: 64 KiB. */
 const DEFAULT_JSON_BODY_MAX_BYTES = 64 * 1024;
@@ -5427,16 +5542,18 @@ function applyImpl(ctx, config = {}) {
 			disposeRoutes = void 0;
 		}
 	};
-	installSettingsSection(ctx, settingsNamespace("pet"), makePetSettingsSchema(service.selectedPetId()), base, {
-		setSource: (source) => {
-			current = source;
-		},
-		onChange: () => {
-			const section = current();
-			service.applySettingsSection(section);
-			service.setEnabled(section.enabled ?? true);
-			syncRoutes();
-		}
+	ctx.inject(["settings"], (settingsCtx) => {
+		settingsCtx.settings.installSection(ctx, "pet", makePetSettingsSchema(service.selectedPetId()), base, {
+			setSource: (source) => {
+				current = source;
+			},
+			onChange: () => {
+				const section = current();
+				service.applySettingsSection(section);
+				service.setEnabled(section.enabled ?? true);
+				syncRoutes();
+			}
+		});
 	});
 	syncRoutes();
 }

package/lib/invariant.js

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