dsh-agentic-pet 0.4.0 → 0.4.2

package/lib/{service-D-b8UzM2.js → service-BjTawwUn.js}

@@ -1,6 +1,7 @@
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
-import { appendFile, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { appendFile, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { Context, Service } from "@deepseek-ai/cordis";
@@ -4607,15 +4608,161 @@ function formatAvailableActions(available, cap = 24) {
 	return rest > 0 ? `${shown} …(+${String(rest)} more — pet_state {actions:true} lists all)` : shown;
 }
 //#endregion
-//#region lib/types/inner-voice.js
+//#region lib/types/petdata.js
 /**
-* The inner voice (docs/inner-voice.md): the pet's self-initiated expression
-* loop. This module owns the pure, testable half — config parsing with
-* defaults and clamps, the durable petId→sessionId store, and the wake/touch
-* prompt builders. The driver (driver.ts) owns the wiring: timers, gates,
-* SessionController calls, and the per-pet pending locks.
-* @module dsh-agentic-pet/inner-voice
+* The per-pet data store: everything the DRIVER persists about a pet lives
+* under `~/.dsh/whale598/<petId>/` — affection ledger, display name, event
+* history, tool-call history. One directory per pet, small files, single
+* writer (the driver), JSONL for append-only streams with bounded retention.
+*
+* Legacy layouts (`pet-affection.d/<id>.json`, the single legacy electron
+* book, names inside pet-settings.json) are READ as fallbacks and migrate to
+* the new layout on the next write — lazy migration, no data-loss window.
+* @module dsh-agentic-pet/petdata
 */
+/** The consolidated per-pet data root under the dsh home. */
+const WHALE_DIR = "whale598";
+function petDataDir(home, petId) {
+	return join(home, WHALE_DIR, petId);
+}
+/** New-layout path first; legacy layouts as read fallbacks (per-pet legacy
+* dir → the single legacy electron book). The ledger SHAPE is the driver's
+* (TouchLedger); this module only owns paths and raw IO. */
+function affectionPaths(home, petId) {
+	return {
+		current: join(petDataDir(home, petId), "pet-affection.json"),
+		legacy: [join(home, "pet-affection.d", `${petId}.json`), ...petId === "electron" ? [join(home, "pet-affection.json")] : []]
+	};
+}
+/** Read the affection ledger raw: the current file wins; legacy files answer
+* only while the current one is absent (first write migrates the full
+* ledger). Returns null when no layout holds data. */
+async function readAffectionRaw(home, petId) {
+	const { current, legacy } = affectionPaths(home, petId);
+	for (const file of [current, ...legacy]) try {
+		const parsed = JSON.parse(await readFile(file, "utf8"));
+		if (parsed !== null && typeof parsed === "object" && Object.keys(parsed).length > 0) return parsed;
+	} catch {}
+	return null;
+}
+async function writeAffectionRaw(home, petId, ledger) {
+	const dir = petDataDir(home, petId);
+	await mkdir(dir, { recursive: true });
+	await writeFile(join(dir, "pet-affection.json"), `${JSON.stringify(ledger)}\n`, "utf8");
+}
+function petNameFile(home, petId) {
+	return join(petDataDir(home, petId), "pet-name.json");
+}
+/** The user's custom display name: new-layout file → legacy
+* pet-settings.json `names` map → undefined (caller applies the built-in
+* default). */
+async function readPetName(home, petId) {
+	try {
+		const parsed = JSON.parse(await readFile(petNameFile(home, petId), "utf8"));
+		if (typeof parsed.name === "string" && parsed.name.trim() !== "") return parsed.name.trim();
+	} catch {}
+	try {
+		const settings = JSON.parse(await readFile(join(home, "pet-settings.json"), "utf8"));
+		const label = (typeof settings.names === "object" && settings.names !== null ? settings.names : {})[petId];
+		if (typeof label === "string" && label.trim() !== "") return label.trim();
+	} catch {}
+}
+/** Persist a custom name; `null` reverts to the built-in default (drops the
+* override file). Also strips the petId key from the legacy pet-settings
+* names map so the old layout cannot resurrect a cleared name. */
+async function writePetName(home, petId, name) {
+	await mkdir(petDataDir(home, petId), { recursive: true });
+	const file = petNameFile(home, petId);
+	if (name === null || name.trim() === "") await rm(file, { force: true });
+	else await writeFile(file, `${JSON.stringify({ name: name.trim() })}\n`, "utf8");
+	try {
+		const settingsPath = join(home, "pet-settings.json");
+		const settings = JSON.parse(await readFile(settingsPath, "utf8"));
+		if (typeof settings.names === "object" && settings.names !== null && petId in settings.names) {
+			Reflect.deleteProperty(settings.names, petId);
+			if (Object.keys(settings.names).length === 0) delete settings.names;
+			await writeFile(settingsPath, `${JSON.stringify(settings, null, 2)}\n`, "utf8");
+		}
+	} catch {}
+}
+const JSONL_MAX_LINES = 600;
+const JSONL_KEEP_LINES = 500;
+function eventsFile(home, petId) {
+	return join(petDataDir(home, petId), "events.jsonl");
+}
+/** Append one record; bounded retention trims the file when it outgrows the
+* cap (best-effort — a failed trim never loses the append). */
+async function appendJsonl(file, entry) {
+	await mkdir(dirname(file), { recursive: true });
+	await appendFile(file, `${JSON.stringify(entry)}\n`, "utf8");
+	try {
+		const lines = (await readFile(file, "utf8")).split("\n").filter((line) => line.trim() !== "");
+		if (lines.length > JSONL_MAX_LINES) await writeFile(file, `${lines.slice(lines.length - JSONL_KEEP_LINES).join("\n")}\n`, "utf8");
+	} catch {}
+}
+/** The last `limit` records (oldest last); malformed lines degrade to
+* `{raw}` instead of dropping the file. */
+async function readJsonl(file, limit) {
+	try {
+		return (await readFile(file, "utf8")).split("\n").filter((line) => line.trim() !== "").slice(-limit).map((line) => {
+			try {
+				return JSON.parse(line);
+			} catch {
+				return { raw: line };
+			}
+		});
+	} catch {
+		return [];
+	}
+}
+const GLOBAL_STATE_FILES = [
+	"pet-settings.json",
+	"pet-inner-voice.json",
+	"pet-interactions.json",
+	"pet-world.json",
+	"pet-window.json"
+];
+function globalPaths(home, name) {
+	return {
+		current: join(home, WHALE_DIR, name),
+		legacy: join(home, name)
+	};
+}
+function globalFilePath(home, name) {
+	return globalPaths(home, name).current;
+}
+/** Rename legacy → current for every global file that hasn't moved yet.
+* Best-effort: a failed rename leaves the legacy copy in place and the read
+* fallback still answers. Called once at driver install. */
+async function migrateGlobals(home) {
+	await mkdir(join(home, WHALE_DIR), { recursive: true });
+	for (const name of GLOBAL_STATE_FILES) {
+		const { current, legacy } = globalPaths(home, name);
+		try {
+			if (existsSync(current) || !existsSync(legacy)) continue;
+			await rename(legacy, current);
+		} catch {}
+	}
+}
+/** Read a global state file: current → legacy → {} (callers' defensive
+* field checks treat {} exactly like a missing file). */
+async function readGlobalJson(home, name) {
+	const { current, legacy } = globalPaths(home, name);
+	for (const file of [current, legacy]) try {
+		const parsed = JSON.parse(await readFile(file, "utf8"));
+		if (parsed && typeof parsed === "object") return parsed;
+	} catch {}
+	return {};
+}
+/** Write a global state file (current location only; pretty-printed — these
+* files are user-inspectable and hand-editable). */
+async function writeGlobalJson(home, name, obj) {
+	const { current } = globalPaths(home, name);
+	await mkdir(dirname(current), { recursive: true });
+	await writeFile(current, `${JSON.stringify(obj, null, 2)}\n`, "utf8");
+}
+//#endregion
+//#region lib/types/inner-voice.js
 const VOICE_SESSION_PREFIX = "whale598-";
 /**
 * Saved-setting migration for preset id renames: pet-settings.json holds the
@@ -4636,7 +4783,7 @@ const finite01 = (value, fallback) => typeof value === "number" && Number.isFini
 * folds to its default (defensive parse, `readAutonomy` precedent). */
 async function readInnerVoiceConfig(home) {
 	try {
-		const raw = JSON.parse(await readFile(join(home, "pet-settings.json"), "utf8"));
+		const raw = await readGlobalJson(home, "pet-settings.json");
 		const v = typeof raw.innerVoice === "object" && raw.innerVoice !== null ? raw.innerVoice : {};
 		const legacyMinutes = typeof v.touchReplyCooldownMinutes === "number" && Number.isFinite(v.touchReplyCooldownMinutes) ? v.touchReplyCooldownMinutes : void 0;
 		const secondsRaw = typeof v.touchReplyCooldownSeconds === "number" && Number.isFinite(v.touchReplyCooldownSeconds) ? v.touchReplyCooldownSeconds : legacyMinutes !== void 0 ? legacyMinutes * 60 : void 0;
@@ -4665,9 +4812,6 @@ async function readInnerVoiceConfig(home) {
 		};
 	}
 }
-function innerVoiceStorePath(home) {
-	return join(home, "pet-inner-voice.json");
-}
 /** Defensive extraction of the persisted generation counters (petId → n). */
 function generationsOf(raw) {
 	const out = {};
@@ -4678,7 +4822,7 @@ function generationsOf(raw) {
 }
 async function loadInnerVoiceStore(home) {
 	try {
-		const raw = JSON.parse(await readFile(innerVoiceStorePath(home), "utf8"));
+		const raw = await readGlobalJson(home, "pet-inner-voice.json");
 		const sessions = {};
 		for (const [petId, entry] of Object.entries(typeof raw.sessions === "object" && raw.sessions !== null ? raw.sessions : {})) {
 			const record = entry;
@@ -4700,7 +4844,7 @@ async function loadInnerVoiceStore(home) {
 }
 async function saveInnerVoiceStore(home, store) {
 	try {
-		await writeFile(innerVoiceStorePath(home), `${JSON.stringify(store)}\n`, "utf8");
+		await writeGlobalJson(home, "pet-inner-voice.json", store);
 	} catch (error) {
 		console.error(`pet-surface inner-voice: could not write the store: ${error instanceof Error ? error.message : String(error)}`);
 	}
@@ -4817,117 +4961,6 @@ function buildChatPrompt(text) {
 	return `[用户对你说] ${text.slice(0, 2e3)}`;
 }
 //#endregion
-//#region lib/types/petdata.js
-/**
-* The per-pet data store: everything the DRIVER persists about a pet lives
-* under `~/.dsh/whale598/<petId>/` — affection ledger, display name, event
-* history, tool-call history. One directory per pet, small files, single
-* writer (the driver), JSONL for append-only streams with bounded retention.
-*
-* Legacy layouts (`pet-affection.d/<id>.json`, the single legacy electron
-* book, names inside pet-settings.json) are READ as fallbacks and migrate to
-* the new layout on the next write — lazy migration, no data-loss window.
-* @module dsh-agentic-pet/petdata
-*/
-/** The consolidated per-pet data root under the dsh home. */
-const WHALE_DIR = "whale598";
-function petDataDir(home, petId) {
-	return join(home, WHALE_DIR, petId);
-}
-/** New-layout path first; legacy layouts as read fallbacks (per-pet legacy
-* dir → the single legacy electron book). The ledger SHAPE is the driver's
-* (TouchLedger); this module only owns paths and raw IO. */
-function affectionPaths(home, petId) {
-	return {
-		current: join(petDataDir(home, petId), "pet-affection.json"),
-		legacy: [join(home, "pet-affection.d", `${petId}.json`), ...petId === "electron" ? [join(home, "pet-affection.json")] : []]
-	};
-}
-/** Read the affection ledger raw: the current file wins; legacy files answer
-* only while the current one is absent (first write migrates the full
-* ledger). Returns null when no layout holds data. */
-async function readAffectionRaw(home, petId) {
-	const { current, legacy } = affectionPaths(home, petId);
-	for (const file of [current, ...legacy]) try {
-		const parsed = JSON.parse(await readFile(file, "utf8"));
-		if (parsed !== null && typeof parsed === "object" && Object.keys(parsed).length > 0) return parsed;
-	} catch {}
-	return null;
-}
-async function writeAffectionRaw(home, petId, ledger) {
-	const dir = petDataDir(home, petId);
-	await mkdir(dir, { recursive: true });
-	await writeFile(join(dir, "pet-affection.json"), `${JSON.stringify(ledger)}\n`, "utf8");
-}
-function petNameFile(home, petId) {
-	return join(petDataDir(home, petId), "pet-name.json");
-}
-/** The user's custom display name: new-layout file → legacy
-* pet-settings.json `names` map → undefined (caller applies the built-in
-* default). */
-async function readPetName(home, petId) {
-	try {
-		const parsed = JSON.parse(await readFile(petNameFile(home, petId), "utf8"));
-		if (typeof parsed.name === "string" && parsed.name.trim() !== "") return parsed.name.trim();
-	} catch {}
-	try {
-		const settings = JSON.parse(await readFile(join(home, "pet-settings.json"), "utf8"));
-		const label = (typeof settings.names === "object" && settings.names !== null ? settings.names : {})[petId];
-		if (typeof label === "string" && label.trim() !== "") return label.trim();
-	} catch {}
-}
-/** Persist a custom name; `null` reverts to the built-in default (drops the
-* override file). Also strips the petId key from the legacy pet-settings
-* names map so the old layout cannot resurrect a cleared name. */
-async function writePetName(home, petId, name) {
-	await mkdir(petDataDir(home, petId), { recursive: true });
-	const file = petNameFile(home, petId);
-	if (name === null || name.trim() === "") await rm(file, { force: true });
-	else await writeFile(file, `${JSON.stringify({ name: name.trim() })}\n`, "utf8");
-	try {
-		const settingsPath = join(home, "pet-settings.json");
-		const settings = JSON.parse(await readFile(settingsPath, "utf8"));
-		if (typeof settings.names === "object" && settings.names !== null && petId in settings.names) {
-			delete settings.names[petId];
-			if (Object.keys(settings.names).length === 0) delete settings.names;
-			await writeFile(settingsPath, `${JSON.stringify(settings, null, 2)}\n`, "utf8");
-		}
-	} catch {}
-}
-const JSONL_MAX_LINES = 600;
-const JSONL_KEEP_LINES = 500;
-function eventsFile(home, petId) {
-	return join(petDataDir(home, petId), "events.jsonl");
-}
-function toolCallsFile(home, petId) {
-	return join(petDataDir(home, petId), "toolcalls.jsonl");
-}
-/** Append one record; bounded retention trims the file when it outgrows the
-* cap (best-effort — a failed trim never loses the append). */
-async function appendJsonl(file, entry) {
-	await mkdir(dirname(file), { recursive: true });
-	await appendFile(file, `${JSON.stringify(entry)}\n`, "utf8");
-	try {
-		const lines = (await readFile(file, "utf8")).split("\n").filter((line) => line.trim() !== "");
-		if (lines.length > JSONL_MAX_LINES) await writeFile(file, `${lines.slice(lines.length - JSONL_KEEP_LINES).join("\n")}\n`, "utf8");
-	} catch {}
-}
-/** The last `limit` records (oldest last); malformed lines degrade to
-* `{raw}` instead of dropping the file. */
-async function readJsonl(file, limit) {
-	try {
-		return (await readFile(file, "utf8")).split("\n").filter((line) => line.trim() !== "").slice(-limit).map((line) => {
-			try {
-				return JSON.parse(line);
-			} catch {
-				return { raw: line };
-			}
-		});
-	} catch {
-		return [];
-	}
-}
-//#endregion
 //#region lib/types/registry.js
 /**
 * The pet registry: a directory of per-pet control manifests, replacing the
@@ -5093,8 +5126,6 @@ const ADJUST_MAX_DELTA = 3;
 const ADJUST_COOLDOWN_MS = 5 * 6e4;
 const ADJUST_DAILY_LIMIT = 8;
 const ADJUST_DAILY_SUM = 10;
-const DECAY_START_DAYS = 3;
-const DECAY_STEP_DAYS = 3;
 async function readLedger(home, petId) {
 	try {
 		const raw = await readAffectionRaw(home, petId);
@@ -5111,7 +5142,6 @@ async function readLedger(home, petId) {
 			recent: raw.recent ?? [],
 			adjustments: Array.isArray(raw.adjustments) ? raw.adjustments.filter((a) => typeof a === "object" && a !== null && typeof a.delta === "number" && typeof a.reason === "string" && typeof a.at === "number") : void 0,
 			quota: typeof raw.quota === "object" && raw.quota !== null ? raw.quota : void 0,
-			lastDecayAt: typeof raw.lastDecayAt === "number" ? raw.lastDecayAt : void 0,
 			bond: typeof raw.bond === "object" && raw.bond !== null && typeof raw.bond.lastCountedDate === "string" ? {
 				value: typeof raw.bond.value === "number" ? raw.bond.value : 0,
 				days: typeof raw.bond.days === "number" ? raw.bond.days : 0,
@@ -5136,7 +5166,7 @@ const logStamp = () => {
 	return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
 };
 const driverLog = (home, line) => {
-	appendFile(join(home, "pet-driver.log"), `${logStamp()} ${line}
+	appendFile(join(home, WHALE_DIR, "pet-driver.log"), `${logStamp()} ${line}
 `, "utf8").catch(() => {});
 };
 /** The one /events read both consumers share (§6 v4): the ledger loop
@@ -5218,6 +5248,7 @@ function markVoiceSpoke(petId) {
 }
 function installPetDriver(ctx, home, pet) {
 	driverLog(home, "installPetDriver entered");
+	migrateGlobals(home);
 	voiceOwners.clear();
 	voicePendingUntil.clear();
 	voiceLastSpokeAt.clear();
@@ -5338,7 +5369,7 @@ function installPetDriver(ctx, home, pet) {
 	*/
 	const readAutonomy = async () => {
 		try {
-			const p = JSON.parse(await readFile(join(home, "pet-settings.json"), "utf8")).proactivity;
+			const p = (await readGlobalJson(home, "pet-settings.json")).proactivity;
 			const gap = typeof p?.idleAnimationGapMinutes === "number" && Number.isFinite(p.idleAnimationGapMinutes) ? Math.min(120, Math.max(1, Math.round(p.idleAnimationGapMinutes))) : 10;
 			return {
 				idleAnimation: p?.idleAnimation !== false,
@@ -5434,7 +5465,7 @@ function installPetDriver(ctx, home, pet) {
 			}
 		} catch {}
 		try {
-			const raw = JSON.parse(await readFile(join(home, "pet-settings.json"), "utf8"));
+			const raw = await readGlobalJson(home, "pet-settings.json");
 			if (typeof raw.names === "object" && raw.names !== null) {
 				for (const [petId, label] of Object.entries(raw.names)) if (petId !== "" && typeof label === "string" && label.trim() !== "" && !voiceNames.has(petId)) voiceNames.set(petId, label.trim());
 			}
@@ -5501,7 +5532,7 @@ function installPetDriver(ctx, home, pet) {
 			abort
 		};
 	};
-	const interactionLedgerFile = join(home, "pet-interactions.json");
+	const interactionLedgerFile = globalFilePath(home, "pet-interactions.json");
 	const recordInteraction = (entry) => {
 		const at = Date.now();
 		(async () => {
@@ -6001,12 +6032,13 @@ ${text}`;
 function registerPetTools(ctx, home, pet) {
 	ctx.inject(["tools"], (scope) => {
 		console.log("pet-surface driver: pet tools registered");
+		const dshLoginAt = Date.now();
 		const sleep = (ms) => new Promise((resolve) => {
 			setTimeout(resolve, ms);
 		});
 		const readFocus = async () => {
 			try {
-				const raw = JSON.parse(await readFile(join(home, "pet-settings.json"), "utf8"));
+				const raw = await readGlobalJson(home, "pet-settings.json");
 				return typeof raw.focus === "string" && raw.focus !== "" ? raw.focus : void 0;
 			} catch {
 				return;
@@ -6061,14 +6093,10 @@ function registerPetTools(ctx, home, pet) {
 				}]
 			},
 			async execute(args, exec) {
-				const callStartedAt = Date.now();
-				let callPet = typeof args.pet === "string" && args.pet !== "" ? args.pet : "default";
-				let callDetail;
 				const text = String(args.text).slice(0, 200);
 				console.log(`pet-surface driver: pet_say ${JSON.stringify(text).slice(0, 60)}`);
 				try {
 					const entry = await resolveTarget(args.pet, exec?.agent?.id);
-					callPet = entry.id;
 					await pet.call(entry, "/say", {
 						method: "POST",
 						headers: { "content-type": "application/json" },
@@ -6076,17 +6104,7 @@ function registerPetTools(ctx, home, pet) {
 					});
 					if (markVoiceSpoke(entry.id)) driverLog(home, `VOICE pending released by say pet=${entry.id} (inner-voice turn complete)`);
 				} catch (error) {
-					callDetail = error instanceof Error ? error.message : String(error);
 					throw classify(error);
-				} finally {
-					appendJsonl(toolCallsFile(home, callPet), {
-						tool: "pet_say",
-						petId: callPet,
-						ok: callDetail === void 0,
-						...callDetail !== void 0 ? { detail: callDetail.slice(0, 120) } : {},
-						durationMs: Date.now() - callStartedAt,
-						at: Date.now()
-					});
 				}
 				return JSON.stringify({
 					shown: true,
@@ -6120,12 +6138,8 @@ function registerPetTools(ctx, home, pet) {
 				}]
 			},
 			async execute(args, exec) {
-				const callStartedAt = Date.now();
-				let callPet = typeof args.pet === "string" && args.pet !== "" ? args.pet : "default";
-				let callDetail;
 				try {
 					const entry = await resolveTarget(args.pet, exec?.agent?.id);
-					callPet = entry.id;
 					const requested = String(args.action);
 					const resolution = resolveActionRequest(requested, (await pet.capabilities(entry))?.actions ?? null);
 					if (resolution.kind === "unknown") throw new Error(`unknown action "${requested}" for pet "${entry.id}". Available: ${formatAvailableActions(resolution.available)}`);
@@ -6168,17 +6182,7 @@ function registerPetTools(ctx, home, pet) {
 						waitTimedOut: true
 					});
 				} catch (error) {
-					callDetail = error instanceof Error ? error.message : String(error);
 					throw classify(error);
-				} finally {
-					appendJsonl(toolCallsFile(home, callPet), {
-						tool: "pet_do",
-						petId: callPet,
-						ok: callDetail === void 0,
-						...callDetail !== void 0 ? { detail: callDetail.slice(0, 120) } : {},
-						durationMs: Date.now() - callStartedAt,
-						at: Date.now()
-					});
 				}
 			}
 		}));
@@ -6197,12 +6201,8 @@ function registerPetTools(ctx, home, pet) {
 				}]
 			},
 			async execute(args, exec) {
-				const callStartedAt = Date.now();
-				let callPet = typeof args.pet === "string" && args.pet !== "" ? args.pet : "default";
-				let callDetail;
 				try {
 					const entry = await resolveTarget(args.pet, exec?.agent?.id);
-					callPet = entry.id;
 					const cursor = digestCursors.get(entry.id) ?? 0;
 					let payload = await readEvents(pet, entry, cursor, 0);
 					if (payload.latest < cursor) payload = await readEvents(pet, entry, 0, 0);
@@ -6231,17 +6231,7 @@ function registerPetTools(ctx, home, pet) {
 						cursor: newest
 					});
 				} catch (error) {
-					callDetail = error instanceof Error ? error.message : String(error);
 					throw classify(error);
-				} finally {
-					appendJsonl(toolCallsFile(home, callPet), {
-						tool: "pet_digest",
-						petId: callPet,
-						ok: callDetail === void 0,
-						...callDetail !== void 0 ? { detail: callDetail.slice(0, 120) } : {},
-						durationMs: Date.now() - callStartedAt,
-						at: Date.now()
-					});
 				}
 			}
 		}));
@@ -6263,27 +6253,15 @@ function registerPetTools(ctx, home, pet) {
 				const limit = typeof args.limit === "number" && Number.isFinite(args.limit) ? Math.min(50, Math.max(1, Math.round(args.limit))) : 10;
 				let list = [];
 				try {
-					const raw = JSON.parse(await readFile(join(home, "pet-interactions.json"), "utf8"));
+					const raw = await readGlobalJson(home, "pet-interactions.json");
 					if (Array.isArray(raw)) list = raw;
 				} catch {}
-				appendJsonl(toolCallsFile(home, "all"), {
-					tool: "pet_interactions",
-					petId: "all",
-					ok: true,
-					durationMs: 0,
-					at: Date.now()
-				});
 				return JSON.stringify({ recent: list.slice(0, limit) });
 			}
 		}));
-		const settleDecay = (ledger, now) => {
-			const silentDays = (now - Math.max(ledger.lastTouchAt ?? 0, ledger.adjustments?.[0]?.at ?? 0, ledger.lastDecayAt ?? 0)) / 864e5;
-			if (silentDays <= DECAY_START_DAYS) return 0;
-			return Math.min(ledger.affection, Math.floor((silentDays - DECAY_START_DAYS) / DECAY_STEP_DAYS) + 1);
-		};
 		scope.tools.register(defineTool({
 			name: "pet_affection_get",
-			description: "Read the FULL affection context before adjusting it: the current value you maintain (and its mood), the touch FACTS the system records (counts by part — cause, not feeling), your recent adjustments with their reasons, the remaining daily quota, and any pending decay. Call this whenever you are deciding whether and how to adjust.",
+			description: "Read the FULL affection context before adjusting it: the current value you maintain (and its mood), the touch FACTS the system records (counts by part — cause, not feeling), your recent adjustments with their reasons, the remaining daily quota, and the time facts (now / lastInteractionAt / lastLoginAt, epoch ms — the system only records and reports facts, it never moves affection or bond). Judge honestly: if the silence since lastInteractionAt has made the current value no longer true, adjust it yourself with a concrete reason.",
 			parameters: { pet: {
 				type: "string",
 				description: "Which pet: its id from pet_state. Omit for the default pet."
@@ -6296,15 +6274,11 @@ function registerPetTools(ctx, home, pet) {
 				}]
 			},
 			async execute(args, exec) {
-				const callStartedAt = Date.now();
-				let callPet = typeof args.pet === "string" && args.pet !== "" ? args.pet : "default";
-				let callDetail;
 				try {
 					const entry = await resolveTarget(args.pet, exec?.agent?.id);
-					callPet = entry.id;
 					const ledger = await readLedger(home, entry.id);
-					const pendingDecay = settleDecay(ledger, Date.now());
-					const effective = Math.max(0, ledger.affection - pendingDecay);
+					const now = Date.now();
+					const lastInteractionAt = Math.max(ledger.lastTouchAt ?? 0, ledger.adjustments?.[0]?.at ?? 0);
 					const today = (/* @__PURE__ */ new Date()).toDateString();
 					const quota = ledger.quota?.date === today ? ledger.quota : {
 						date: today,
@@ -6313,8 +6287,8 @@ function registerPetTools(ctx, home, pet) {
 					};
 					return JSON.stringify({
 						pet: entry.id,
-						affection: effective,
-						mood: moodOf(effective),
+						affection: ledger.affection,
+						mood: moodOf(ledger.affection),
 						touch: {
 							total: ledger.total,
 							byPart: ledger.byPart,
@@ -6333,20 +6307,14 @@ function registerPetTools(ctx, home, pet) {
 							sum: quota.sum,
 							sumLimit: ADJUST_DAILY_SUM
 						},
-						pendingDecay
+						facts: {
+							now,
+							lastInteractionAt: lastInteractionAt > 0 ? lastInteractionAt : null,
+							lastLoginAt: dshLoginAt
+						}
 					});
 				} catch (error) {
-					callDetail = error instanceof Error ? error.message : String(error);
 					throw classify(error);
-				} finally {
-					appendJsonl(toolCallsFile(home, callPet), {
-						tool: "pet_affection_get",
-						petId: callPet,
-						ok: callDetail === void 0,
-						...callDetail !== void 0 ? { detail: callDetail.slice(0, 120) } : {},
-						durationMs: Date.now() - callStartedAt,
-						at: Date.now()
-					});
 				}
 			}
 		}));
@@ -6385,25 +6353,10 @@ function registerPetTools(ctx, home, pet) {
 				}]
 			},
 			async execute(args, exec) {
-				const callStartedAt = Date.now();
-				let callPet = typeof args.pet === "string" && args.pet !== "" ? args.pet : "default";
-				let callDetail;
 				try {
 					const entry = await resolveTarget(args.pet, exec?.agent?.id);
-					callPet = entry.id;
 					const ledger = await readLedger(home, entry.id);
 					const now = Date.now();
-					const pendingDecay = settleDecay(ledger, now);
-					if (pendingDecay > 0) {
-						ledger.affection = Math.max(0, ledger.affection - pendingDecay);
-						ledger.adjustments = [{
-							delta: -pendingDecay,
-							reason: `system: decay（${String(pendingDecay)} 天未互动）`,
-							at: now,
-							system: true
-						}, ...ledger.adjustments ?? []];
-						ledger.lastDecayAt = now;
-					}
 					const delta = typeof args.delta === "number" && Number.isInteger(args.delta) ? args.delta : NaN;
 					const reason = typeof args.reason === "string" ? args.reason.trim() : "";
 					if (Number.isNaN(delta) || delta === 0 || Math.abs(delta) > ADJUST_MAX_DELTA) throw new Error(`delta 必须是 -${String(ADJUST_MAX_DELTA)}..+${String(ADJUST_MAX_DELTA)} 的非零整数（收到 ${String(args.delta)}）`);
@@ -6461,17 +6414,7 @@ function registerPetTools(ctx, home, pet) {
 						}
 					});
 				} catch (error) {
-					callDetail = error instanceof Error ? error.message : String(error);
 					throw classify(error);
-				} finally {
-					appendJsonl(toolCallsFile(home, callPet), {
-						tool: "pet_affection_adjust",
-						petId: callPet,
-						ok: callDetail === void 0,
-						...callDetail !== void 0 ? { detail: callDetail.slice(0, 120) } : {},
-						durationMs: Date.now() - callStartedAt,
-						at: Date.now()
-					});
 				}
 			}
 		}));
@@ -6506,14 +6449,16 @@ function registerPetTools(ctx, home, pet) {
 				for (const id of knownIds) {
 					const ledger = await readLedger(home, id);
 					const mood = moodOf(ledger.affection);
+					const tier = bondTier(ledger.bond?.value ?? 0);
+					const bond = {
+						value: ledger.bond?.value ?? 0,
+						days: ledger.bond?.days ?? 0,
+						tier
+					};
 					ledgers[id] = {
 						...ledger,
 						mood,
-						bond: {
-							value: ledger.bond?.value ?? 0,
-							days: ledger.bond?.days ?? 0,
-							tier: bondTier(ledger.bond?.value ?? 0)
-						}
+						bond
 					};
 				}
 				const petsOut = states.map((state) => {
@@ -6526,13 +6471,6 @@ function registerPetTools(ctx, home, pet) {
 						name: voiceNames.get(state.id) ?? DEFAULT_PET_NAME[state.id] ?? state.id
 					};
 				});
-				appendJsonl(toolCallsFile(home, "all"), {
-					tool: "pet_state",
-					petId: "all",
-					ok: true,
-					durationMs: 0,
-					at: Date.now()
-				});
 				return JSON.stringify({
 					defaultPet: pets[0]?.id ?? null,
 					pets: petsOut,
@@ -6805,4 +6743,4 @@ function installPetService(ctx, home) {
 	return new PetHttpService(ctx, home);
 }
 //#endregion
-export { logStamp as a, readAffectionRaw as c, toolCallsFile as d, writeAffectionRaw as f, installPetDriver as i, readJsonl as l, installPetService as n, registerPetTools as o, writePetName as p, petHome as r, eventsFile as s, createUnregisteredPetHttp as t, readPetName as u };
+export { logStamp as a, globalFilePath as c, readJsonl as d, readPetName as f, writePetName as h, installPetDriver as i, readAffectionRaw as l, writeGlobalJson as m, installPetService as n, registerPetTools as o, writeAffectionRaw as p, petHome as r, eventsFile as s, createUnregisteredPetHttp as t, readGlobalJson as u };

package/lib/tools.js

@@ -1,4 +1,4 @@
-import { a as logStamp, o as registerPetTools, r as petHome, t as createUnregisteredPetHttp } from "./service-D-b8UzM2.js";
+import { a as logStamp, o as registerPetTools, r as petHome, t as createUnregisteredPetHttp } from "./service-BjTawwUn.js";
 import { appendFile } from "node:fs/promises";
 import { join } from "node:path";
 //#region lib/types/tools.js
@@ -18,7 +18,7 @@ import { join } from "node:path";
 /** Diagnostic trace into the driver log: the desktop host swallows stdout, so
 * the preset-row activation path is otherwise invisible. */
 const trace = (line) => {
-	appendFile(join(petHome(), "pet-driver.log"), `${logStamp()} pet-tools ${line}\n`, "utf8").catch(() => {});
+	appendFile(join(petHome(), "whale598", "pet-driver.log"), `${logStamp()} pet-tools ${line}\n`, "utf8").catch(() => {});
 };
 /**
 * Register the five pet tools for sessions mounted with the pet preset.