dsh-agentic-pet 0.3.2 → 0.4.1

package/lib/{service-Vj-lLpIv.js → service-BjTawwUn.js}

@@ -1,9 +1,9 @@
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
-import { appendFile, readFile, readdir, writeFile } from "node:fs/promises";
+import { appendFile, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { Context, Service } from "@deepseek-ai/cordis";
 //#region ../../../vendor/cosmokit/src/misc.ts
 /** Return true when a value is `null` or `undefined`. */
@@ -4608,23 +4608,182 @@ 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
+* user's 会话模式 choice by id, and a rename orphans that saved value (every
+* ensure would first try a dead id and fall back). Map the legacy ids onto
+* their successors; unknown ids pass through untouched.
+*/
+const LEGACY_PRESET_IDS = {
+	"pet-inner-voice": "whale598",
+	"pet": "whale598-standard"
+};
+function migratePreset(preset) {
+	return LEGACY_PRESET_IDS[preset] ?? preset;
+}
 const clamp = (value, min, max) => Math.min(max, Math.max(min, value));
 const finite01 = (value, fallback) => typeof value === "number" && Number.isFinite(value) ? clamp(value, 0, 1) : fallback;
 /** Read `innerVoice` from pet-settings.json; anything missing or mistyped
 * 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;
@@ -4634,7 +4793,7 @@ async function readInnerVoiceConfig(home) {
 		}
 		return {
 			enabled: v.enabled !== false,
-			preset: typeof v.preset === "string" && v.preset !== "" ? v.preset : "pet-inner-voice",
+			preset: migratePreset(typeof v.preset === "string" && v.preset !== "" ? v.preset : "whale598"),
 			wakeIntervalMinutes: typeof v.wakeIntervalMinutes === "number" && Number.isFinite(v.wakeIntervalMinutes) ? clamp(Math.round(v.wakeIntervalMinutes), 1, 60) : 2,
 			speakProbability: finite01(v.speakProbability, .5),
 			touchReplyProbability: finite01(v.touchReplyProbability, .3),
@@ -4644,7 +4803,7 @@ async function readInnerVoiceConfig(home) {
 	} catch {
 		return {
 			enabled: true,
-			preset: "pet-inner-voice",
+			preset: "whale598",
 			wakeIntervalMinutes: 2,
 			speakProbability: .5,
 			touchReplyProbability: .3,
@@ -4653,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 = {};
@@ -4666,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;
@@ -4688,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)}`);
 	}
@@ -4731,10 +4887,44 @@ function mintVoiceSessionId(petId, generation, isArchived) {
 function buildGreetPrompt(facts) {
 	return [
 		"[启动问好]",
-		`用户刚打开 DeepSeek，你的世界刚亮起来（好感 ${String(facts.affection)}，${moodOf(facts.affection)}）。`,
+		`用户刚打开 DeepSeek，你的世界刚亮起来（好感 ${String(facts.affection)}，${moodOf(facts.affection)}；羁绊 ${facts.bondTier}，一起过了 ${String(facts.bondDays)} 天）。`,
 		"主动打个招呼（pet_say）——按当下的时辰自然问好，一两句就好，别问问题等回答。"
 	].join(" ");
 }
+/** B 层 · 羁绊档位：days-with-interaction → tier name. Only grows, never
+* decays; the names are the display contract (settings page keeps its own
+* copy of the thresholds). */
+const BOND_TIERS = [
+	{
+		since: 0,
+		name: "陌生"
+	},
+	{
+		since: 5,
+		name: "认识"
+	},
+	{
+		since: 15,
+		name: "熟了"
+	},
+	{
+		since: 40,
+		name: "亲近"
+	},
+	{
+		since: 90,
+		name: "离不开"
+	},
+	{
+		since: 180,
+		name: "只有你"
+	}
+];
+function bondTier(days) {
+	let tier = BOND_TIERS[0]?.name ?? "陌生";
+	for (const t of BOND_TIERS) if (days >= t.since) tier = t.name;
+	return tier;
+}
 /** Shared mood vocabulary (pet_state computes the same from the ledger). */
 function moodOf(affection) {
 	return affection >= 80 ? "happy" : affection >= 40 ? "content" : "neutral";
@@ -4752,7 +4942,7 @@ function buildWakePrompt(facts) {
 	const user = facts.userActive ? `用户最近正在会话中工作（${String(facts.minutesSinceUserActivity ?? 0)} 分钟内有动静）` : "用户最近没有活动";
 	return [
 		"[自主唤醒]",
-		`好感 ${String(facts.affection)}（${moodOf(facts.affection)}）；${lastSpoke}；${user}。`,
+		`好感 ${String(facts.affection)}（${moodOf(facts.affection)}）；羁绊 ${facts.bondTier}（一起过了 ${String(facts.bondDays)} 天）；${lastSpoke}；${user}。`,
 		"醒来想到什么就说一句（pet_say），想配动作就 pet_do；也可以只是安静待着（两者都不调，正文写「…」）。"
 	].join(" ");
 }
@@ -4776,14 +4966,16 @@ function buildChatPrompt(text) {
 * The pet registry: a directory of per-pet control manifests, replacing the
 * last-writer-wins single files whose races caused repeated swap incidents
 * (a dying carrier's late write burying a live pet's registration). Each pet
-* implementation owns its own file under pet-http.d/ and re-asserts it on a
+* implementation owns its own file under whale598/pet-http.d/ (legacy
+* pet-http.d/ still scanned) and re-asserts it on a
 * cadence; entries whose publisher pid is dead expire by omission. The
 * driver reads the whole table and routes per the multi-pet design: the
 * session's bound pet if alive, else the default pet (first alive entry),
 * plus an all-notify broadcast mode for interactions.
 * @module dsh-agentic-pet/registry
 */
-const REGISTRY_DIR = "pet-http.d";
+const REGISTRY_DIR = `${WHALE_DIR}/pet-http.d`;
+const LEGACY_REGISTRY_DIR = "pet-http.d";
 /**
 * A live pet is one whose control plane ANSWERS, not merely one whose pid
 * exists — and not merely one whose port accepts TCP: a frozen pet (stuck
@@ -4818,27 +5010,37 @@ async function probeControlPlane(port) {
 * they expire by omission the next time their file is rewritten — and so are
 * silent entries (pid alive, control plane unresponsive). */
 async function readLivePets(home) {
+	const candidates = /* @__PURE__ */ new Map();
+	for (const dir of [join(home, REGISTRY_DIR), join(home, LEGACY_REGISTRY_DIR)]) {
+		let names = [];
+		try {
+			names = (await readdir(dir)).filter((name) => name.endsWith(".json"));
+		} catch {
+			continue;
+		}
+		for (const name of names) {
+			const id = name.slice(0, -5);
+			if (id !== "" && !candidates.has(id)) candidates.set(id, join(dir, name));
+		}
+	}
 	const live = [];
-	try {
-		const files = (await readdir(join(home, REGISTRY_DIR))).filter((name) => name.endsWith(".json"));
-		for (const file of files) try {
-			const raw = JSON.parse(await readFile(join(home, REGISTRY_DIR, file), "utf8"));
-			const port = typeof raw.port === "number" ? raw.port : NaN;
-			const pid = typeof raw.pid === "number" ? raw.pid : NaN;
-			if (!Number.isFinite(port) || !Number.isFinite(pid)) continue;
-			try {
-				process.kill(pid, 0);
-			} catch {
-				continue;
-			}
-			if (!await probeControlPlane(port)) continue;
-			live.push({
-				id: file.slice(0, -5),
-				port,
-				pid,
-				since: typeof raw.since === "number" ? raw.since : 0
-			});
-		} catch {}
+	for (const [id, file] of candidates) try {
+		const raw = JSON.parse(await readFile(file, "utf8"));
+		const port = typeof raw.port === "number" ? raw.port : NaN;
+		const pid = typeof raw.pid === "number" ? raw.pid : NaN;
+		if (!Number.isFinite(port) || !Number.isFinite(pid)) continue;
+		try {
+			process.kill(pid, 0);
+		} catch {
+			continue;
+		}
+		if (!await probeControlPlane(port)) continue;
+		live.push({
+			id,
+			port,
+			pid,
+			since: typeof raw.since === "number" ? raw.since : 0
+		});
 	} catch {}
 	return live;
 }
@@ -4920,15 +5122,32 @@ const EMPTY_LEDGER = {
 	lastTouchAt: void 0,
 	recent: []
 };
-async function readLedger(ledgerFile) {
+const ADJUST_MAX_DELTA = 3;
+const ADJUST_COOLDOWN_MS = 5 * 6e4;
+const ADJUST_DAILY_LIMIT = 8;
+const ADJUST_DAILY_SUM = 10;
+async function readLedger(home, petId) {
 	try {
-		const raw = JSON.parse(await readFile(ledgerFile, "utf8"));
+		const raw = await readAffectionRaw(home, petId);
+		if (raw === null) return {
+			...EMPTY_LEDGER,
+			byPart: {},
+			recent: []
+		};
 		return {
 			affection: typeof raw.affection === "number" ? raw.affection : 0,
 			total: typeof raw.total === "number" ? raw.total : 0,
 			byPart: raw.byPart ?? {},
 			lastTouchAt: raw.lastTouchAt,
-			recent: raw.recent ?? []
+			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,
+			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,
+				lastCountedDate: raw.bond.lastCountedDate
+			} : void 0,
+			bondAdjustments: Array.isArray(raw.bondAdjustments) ? raw.bondAdjustments.filter((a) => typeof a === "object" && a !== null && typeof a.delta === "number" && typeof a.reason === "string" && typeof a.at === "number") : void 0
 		};
 	} catch {
 		return {
@@ -4938,12 +5157,6 @@ async function readLedger(ledgerFile) {
 		};
 	}
 }
-/** The per-pet ledger file. Legacy deployments' single book is folded under
-* the electron id so pre-registry affection history survives the upgrade. */
-function ledgerFileFor(home, petId) {
-	if (petId === "electron" && !existsSync(join(home, "pet-affection.d"))) return join(home, "pet-affection.json");
-	return join(home, "pet-affection.d", `${petId}.json`);
-}
 /** Local-time log stamp: the driver log is the user's primary debugging
 * tool, so timestamps show the USER's wall clock, not UTC (toISOString's Z
 * form read 8h off and cost a confusion round). Sortable, zero-padded. */
@@ -4953,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
@@ -4995,6 +5208,23 @@ const voiceLastSpokeAt = /* @__PURE__ */ new Map();
 const voiceLastTouchReplyAt = /* @__PURE__ */ new Map();
 const voiceNextWakeAt = /* @__PURE__ */ new Map();
 const voiceGreetedOnce = /* @__PURE__ */ new Set();
+const voiceNames = /* @__PURE__ */ new Map();
+const DEFAULT_PET_NAME = { electron: "鲸鱼娘" };
+/** B-layer bond day counting: the FIRST interaction of a calendar day
+* (touch / user chat / model adjustment) marks that day as shared. Called
+* at the interaction points, never on reads — reading the ledger does not
+* make a day meaningful. Mutates in place; the caller persists. Module-level
+* because both the driver closures AND the model tools (registerPetTools)
+* count bond days. */
+const countBondDay = (ledger) => {
+	const today = (/* @__PURE__ */ new Date()).toDateString();
+	if (ledger.bond?.lastCountedDate === today) return;
+	ledger.bond = {
+		value: ledger.bond?.value ?? 0,
+		days: (ledger.bond?.days ?? 0) + 1,
+		lastCountedDate: today
+	};
+};
 const voiceLastPrompt = /* @__PURE__ */ new Map();
 const voiceBoundSessions = /* @__PURE__ */ new Map();
 const voiceWakeTimer = { timer: void 0 };
@@ -5018,12 +5248,14 @@ function markVoiceSpoke(petId) {
 }
 function installPetDriver(ctx, home, pet) {
 	driverLog(home, "installPetDriver entered");
+	migrateGlobals(home);
 	voiceOwners.clear();
 	voicePendingUntil.clear();
 	voiceLastSpokeAt.clear();
 	voiceLastTouchReplyAt.clear();
 	voiceNextWakeAt.clear();
 	voiceGreetedOnce.clear();
+	voiceNames.clear();
 	voiceLastPrompt.clear();
 	voiceBoundSessions.clear();
 	if (voiceWakeTimer.timer !== void 0) clearTimeout(voiceWakeTimer.timer);
@@ -5056,7 +5288,7 @@ function installPetDriver(ctx, home, pet) {
 			if (!latestArchived.has(entry.sessionId)) continue;
 			const generation = (voiceStore.generations[petId] ?? 0) + 1;
 			voiceStore.generations[petId] = generation;
-			delete voiceStore.sessions[petId];
+			Reflect.deleteProperty(voiceStore.sessions, petId);
 			const ownerEntry = [...voiceOwners.entries()].find(([, owner]) => owner === petId);
 			if (ownerEntry !== void 0) voiceOwners.delete(ownerEntry[0]);
 			voicePendingUntil.delete(petId);
@@ -5082,13 +5314,15 @@ function installPetDriver(ctx, home, pet) {
 		}
 	};
 	const attachedSessions = /* @__PURE__ */ new Set();
+	const petWorkspaceDir = () => join(homedir(), "whale598");
 	const attachVoiceSession = async (sessionId) => {
 		if (attachedSessions.has(sessionId)) return;
 		attachedSessions.add(sessionId);
 		try {
 			const registry = ctx.get("workspaceRegistry");
 			if (registry === void 0) return;
-			await (await registry.create(homedir()))?.attachSession?.(sessionId);
+			await mkdir(petWorkspaceDir(), { recursive: true });
+			await (await registry.create(petWorkspaceDir()))?.attachSession?.(sessionId);
 			driverLog(home, `VOICE session attached to workspace (${sessionId})`);
 		} catch (error) {
 			attachedSessions.delete(sessionId);
@@ -5135,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,
@@ -5210,7 +5444,7 @@ function installPetDriver(ctx, home, pet) {
 			const petId = voiceOwners.get(sessionId);
 			voiceOwners.delete(sessionId);
 			if (petId !== void 0) {
-				delete voiceStore.sessions[petId];
+				Reflect.deleteProperty(voiceStore.sessions, petId);
 				voicePendingUntil.delete(petId);
 				saveInnerVoiceStore(home, voiceStore);
 				driverLog(home, `VOICE session removed by user; pet=${petId} will re-create on next wake`);
@@ -5222,6 +5456,22 @@ function installPetDriver(ctx, home, pet) {
 		boundPetId = void 0;
 		pushState("idle");
 	});
+	const refreshNames = async () => {
+		voiceNames.clear();
+		try {
+			for (const petId of await readdir(join(home, WHALE_DIR))) {
+				const name = await readPetName(home, petId);
+				if (name !== void 0) voiceNames.set(petId, name);
+			}
+		} catch {}
+		try {
+			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());
+			}
+		} catch {}
+	};
+	refreshNames();
 	const refreshBoundSessions = async () => {
 		const config = await readInnerVoiceConfig(home);
 		voiceBoundSessions.clear();
@@ -5229,7 +5479,31 @@ function installPetDriver(ctx, home, pet) {
 	};
 	refreshBoundSessions();
 	events.on("pet-settings/changed", () => {
-		refreshBoundSessions();
+		const prevNames = new Map(voiceNames);
+		(async () => {
+			await refreshNames();
+			refreshBoundSessions();
+			const changedPets = new Set([...prevNames.keys(), ...voiceNames.keys()]);
+			for (const petId of changedPets) {
+				if (prevNames.get(petId) === voiceNames.get(petId)) continue;
+				const nextName = voiceNames.get(petId);
+				const label = nextName ?? DEFAULT_PET_NAME[petId] ?? petId;
+				const entry = voiceStore.sessions[petId];
+				if (entry !== void 0) {
+					const title = `${label}的内心戏`;
+					try {
+						await voiceController?.rename({
+							sessionId: entry.sessionId,
+							title
+						});
+						driverLog(home, `VOICE session retitled pet=${petId} → ${title}`);
+					} catch (error) {
+						driverLog(home, `VOICE retitle skipped pet=${petId}: ${error instanceof Error ? error.message : String(error)}`);
+					}
+				}
+				triggerRenameNotice(petId, nextName, label);
+			}
+		})();
 		if (currentState !== void 0) pushState(currentState);
 	});
 	const startAskPet = (pet, body, signal) => {
@@ -5258,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 () => {
@@ -5403,16 +5677,19 @@ function installPetDriver(ctx, home, pet) {
 		if (minted.hops > 0) driverLog(home, `VOICE mint skipped ${String(minted.hops)} archived id(s) pet=${petId} → ${minted.sessionId}`);
 		const sessionId = minted.sessionId;
 		try {
+			await mkdir(petWorkspaceDir(), { recursive: true });
 			await voiceController.create({
 				sessionId,
-				agentPreset: config.preset
+				agentPreset: config.preset,
+				cwd: petWorkspaceDir()
 			});
 		} catch (firstError) {
 			driverLog(home, `VOICE preset "${config.preset}" rejected for pet=${petId}: ${firstError instanceof Error ? firstError.message : String(firstError)}; falling back`);
 			try {
 				await voiceController.create({
 					sessionId,
-					agentPreset: "pet-inner-voice"
+					agentPreset: "whale598",
+					cwd: petWorkspaceDir()
 				});
 			} catch (secondError) {
 				driverLog(home, `VOICE session create failed for pet=${petId}: ${secondError instanceof Error ? secondError.message : String(secondError)}`);
@@ -5420,9 +5697,10 @@ function installPetDriver(ctx, home, pet) {
 			}
 		}
 		try {
+			const customName = voiceNames.get(petId);
 			await voiceController.rename({
 				sessionId,
-				title: `鲸鱼娘的内心戏`
+				title: `${customName ?? DEFAULT_PET_NAME[petId] ?? petId}的内心戏`
 			});
 		} catch {}
 		voiceStore.sessions[petId] = {
@@ -5447,6 +5725,9 @@ function installPetDriver(ctx, home, pet) {
 	const promptVoice = async (petId, text, opts = {}) => {
 		const { retried = false, userDriven = false } = opts;
 		if (latestArchived.has(voiceStore.sessions[petId]?.sessionId ?? "")) reconcileArchivedVoiceSessions();
+		const customName = voiceNames.get(petId);
+		if (customName !== void 0 && !text.startsWith("[名字]")) text = `[名字] 你叫「${customName}」。
+${text}`;
 		const sessionId = await ensureVoiceSession(petId);
 		if (sessionId === void 0 || voiceController === void 0) return false;
 		try {
@@ -5460,7 +5741,24 @@ function installPetDriver(ctx, home, pet) {
 				}]
 			}, new AbortController().signal);
 		} catch (error) {
-			driverLog(home, `VOICE prompt failed pet=${petId}: ${error instanceof Error ? error.message : String(error)}`);
+			const message = error instanceof Error ? error.message : String(error);
+			driverLog(home, `VOICE prompt failed pet=${petId}: ${message}`);
+			if (/Unknown agent preset/i.test(message) && !retried) {
+				if (voiceStore.sessions[petId] !== void 0) {
+					const generation = (voiceStore.generations[petId] ?? 0) + 1;
+					voiceStore.generations[petId] = generation;
+					Reflect.deleteProperty(voiceStore.sessions, petId);
+					const ownerEntry = [...voiceOwners.entries()].find(([, owner]) => owner === petId);
+					if (ownerEntry !== void 0) voiceOwners.delete(ownerEntry[0]);
+					voiceLastPrompt.delete(petId);
+					saveInnerVoiceStore(home, voiceStore);
+					driverLog(home, `VOICE session retired pet=${petId} (recorded preset no longer exists — id renamed) — fresh -g${generation} mounts the current preset`);
+					return promptVoice(petId, text, {
+						retried: true,
+						userDriven
+					});
+				}
+			}
 			return false;
 		}
 		voicePendingUntil.set(petId, Date.now() + 25e3);
@@ -5507,11 +5805,25 @@ function installPetDriver(ctx, home, pet) {
 	* greeting (pet offline) releases the flag for the next sweep to retry. */
 	const triggerGreeting = async (petId) => {
 		if (!await voiceGateOpen(petId, false, "greeting")) return;
-		if (await promptVoice(petId, buildGreetPrompt({ affection: (await readLedger(ledgerFileFor(home, petId))).affection }))) {
+		const ledger = await readLedger(home, petId);
+		if (await promptVoice(petId, buildGreetPrompt({
+			affection: ledger.affection,
+			bondValue: ledger.bond?.value ?? 0,
+			bondDays: ledger.bond?.days ?? 0,
+			bondTier: bondTier(ledger.bond?.value ?? 0)
+		}))) {
 			voiceGreetedOnce.add(petId);
 			driverLog(home, `VOICE boot greeting pet=${petId}`);
 		} else voiceGreetedOnce.delete(petId);
 	};
+	/** Rename notice (user request): fired when the user's custom name actually
+	* changes — she acknowledges out loud, once. The per-turn short name line
+	* stays as the compaction-proof invariant; a skipped notice (pet offline /
+	* turn in flight) loses nothing because that line still carries the name. */
+	const triggerRenameNotice = async (petId, nextName, label) => {
+		if (!await voiceGateOpen(petId, false, "rename")) return;
+		if (await promptVoice(petId, nextName !== void 0 ? `[改名] 用户给你改名叫「${label}」——以后自我介绍、气泡里自称，都用这个名字。` : `[改名] 用户把你改回了「${label}」。`)) driverLog(home, `VOICE rename notice pet=${petId} → ${label}`);
+	};
 	/** Random-wake trigger (docs/inner-voice.md §6.3). The gate decides whether
 	* this wake speaks — never the model. */
 	const triggerWake = async (petId) => {
@@ -5523,11 +5835,14 @@ function installPetDriver(ctx, home, pet) {
 			return;
 		}
 		if (!await voiceGateOpen(petId, true, "wake")) return;
-		const ledger = await readLedger(ledgerFileFor(home, petId));
+		const ledger = await readLedger(home, petId);
 		const now = Date.now();
 		const lastSpoke = voiceLastSpokeAt.get(petId);
 		if (await promptVoice(petId, buildWakePrompt({
 			affection: ledger.affection,
+			bondValue: ledger.bond?.value ?? 0,
+			bondDays: ledger.bond?.days ?? 0,
+			bondTier: bondTier(ledger.bond?.value ?? 0),
 			minutesSinceLastSpoke: lastSpoke === void 0 ? void 0 : Math.round((now - lastSpoke) / 6e4),
 			minutesSinceUserActivity: voiceUserActivityAt === void 0 ? void 0 : Math.round((now - voiceUserActivityAt) / 6e4),
 			userActive: voiceUserActivityAt !== void 0 && now - voiceUserActivityAt < 30 * 6e4
@@ -5555,7 +5870,7 @@ function installPetDriver(ctx, home, pet) {
 			return;
 		}
 		if (!await voiceGateOpen(petId, false, "touch", true)) return;
-		const ledger = await readLedger(ledgerFileFor(home, petId));
+		const ledger = await readLedger(home, petId);
 		if (await promptVoice(petId, buildTouchPrompt({
 			part,
 			touchesToday: ledger.recent.filter((entry) => entry.part === part).length + 1,
@@ -5613,12 +5928,10 @@ function installPetDriver(ctx, home, pet) {
 	wakeSweep();
 	const lastEventSeqs = /* @__PURE__ */ new Map();
 	const recordTouch = async (petId, part, at) => {
-		const ledgerFile = ledgerFileFor(home, petId);
-		const ledger = await readLedger(ledgerFile);
+		const ledger = await readLedger(home, petId);
+		countBondDay(ledger);
 		ledger.total += 1;
 		ledger.byPart[part] = (ledger.byPart[part] ?? 0) + 1;
-		const before = ledger.affection;
-		ledger.affection = Math.min(100, ledger.affection + (part === "head" ? 2 : 1));
 		ledger.lastTouchAt = at;
 		ledger.recent.unshift({
 			part,
@@ -5626,12 +5939,11 @@ function installPetDriver(ctx, home, pet) {
 		});
 		ledger.recent = ledger.recent.slice(0, 10);
 		try {
-			await writeFile(ledgerFile, `${JSON.stringify(ledger)}
-`, "utf8");
+			await writeAffectionRaw(home, petId, ledger);
 		} catch (error) {
 			console.error(`pet-surface driver: could not write the ledger: ${error instanceof Error ? error.message : String(error)}`);
 		}
-		if (Math.floor(ledger.affection / 10) > Math.floor(before / 10)) {
+		if (Math.floor(ledger.total / 10) > Math.floor((ledger.total - 1) / 10)) {
 			const target = (await pet.list()).find((pet) => pet.id === petId);
 			if (target !== void 0) fetch(`http://127.0.0.1:${String(target.port)}/action`, {
 				method: "POST",
@@ -5641,17 +5953,23 @@ function installPetDriver(ctx, home, pet) {
 		}
 		triggerTouchReply(petId, part);
 	};
-	/** Event dispatch for ONE pet event. touch → the affection ledger;
-	* chat → STRAIGHT to the pet's inner-voice session, bypassing the touch
-	* path's probability/cooldown/user-busy gates entirely (a user reaching
-	* out to talk is never throttled — §6 routing constraint); unknown types
-	* are ignored while the cursor still advances. */
 	const handlePetEvent = async (petId, event) => {
+		appendJsonl(eventsFile(home, petId), {
+			seq: event.seq,
+			type: event.type,
+			...event.type === "touch" ? { part: event.part } : {},
+			at: event.at
+		});
 		if (event.type === "touch") {
 			if (event.part !== void 0) await recordTouch(petId, event.part, event.at);
 			return;
 		}
-		if (event.type === "chat" && event.text !== void 0 && event.text !== "") triggerChat(petId, event.text);
+		if (event.type === "chat" && event.text !== void 0 && event.text !== "") {
+			const ledger = await readLedger(home, petId);
+			countBondDay(ledger);
+			await writeAffectionRaw(home, petId, ledger);
+			triggerChat(petId, event.text);
+		}
 	};
 	/** Per-pet long-poll loops (§6 v4): each live pet parks ONE /events
 	* hold=30 request; the answer — an event batch or the 30s empty one —
@@ -5714,12 +6032,13 @@ function installPetDriver(ctx, home, pet) {
 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;
@@ -5900,7 +6219,7 @@ function registerPetTools(ctx, home, pet) {
 						if (event.at > (lastTouchAt ?? 0)) lastTouchAt = event.at;
 					}
 					digestCursors.set(entry.id, newest);
-					const ledger = await readLedger(ledgerFileFor(home, entry.id));
+					const ledger = await readLedger(home, entry.id);
 					const mood = moodOf(ledger.affection);
 					return JSON.stringify({
 						pet: entry.id,
@@ -5934,12 +6253,171 @@ 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 {}
 				return JSON.stringify({ recent: list.slice(0, limit) });
 			}
 		}));
+		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 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."
+			} },
+			output: {
+				schema: { type: "string" },
+				render: (_args, value) => [{
+					type: "text",
+					text: value
+				}]
+			},
+			async execute(args, exec) {
+				try {
+					const entry = await resolveTarget(args.pet, exec?.agent?.id);
+					const ledger = await readLedger(home, entry.id);
+					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,
+						count: 0,
+						sum: 0
+					};
+					return JSON.stringify({
+						pet: entry.id,
+						affection: ledger.affection,
+						mood: moodOf(ledger.affection),
+						touch: {
+							total: ledger.total,
+							byPart: ledger.byPart,
+							lastTouchAt: ledger.lastTouchAt ?? null
+						},
+						bond: {
+							value: ledger.bond?.value ?? 0,
+							days: ledger.bond?.days ?? 0,
+							tier: bondTier(ledger.bond?.value ?? 0)
+						},
+						recentBondAdjustments: (ledger.bondAdjustments ?? []).slice(0, 3),
+						recentAdjustments: (ledger.adjustments ?? []).slice(0, 5),
+						quota: {
+							used: quota.count,
+							limit: ADJUST_DAILY_LIMIT,
+							sum: quota.sum,
+							sumLimit: ADJUST_DAILY_SUM
+						},
+						facts: {
+							now,
+							lastInteractionAt: lastInteractionAt > 0 ? lastInteractionAt : null,
+							lastLoginAt: dshLoginAt
+						}
+					});
+				} catch (error) {
+					throw classify(error);
+				}
+			}
+		}));
+		scope.tools.register(defineTool({
+			name: "pet_affection_adjust",
+			description: "Adjust the affection YOU maintain toward the user: delta (-3..+3 integer) plus a SPECIFIC reason citing what happened. Touch counts are facts the system records separately — this tool is your judgment layer, and the driver never moves the value on a touch. Limits: at least 5 minutes between adjustments, 8 per day, |daily sum| <= 10 — violations are REJECTED with the remaining quota, not clamped. Judge honestly: this number is your read of the relationship, not a score to farm.",
+			parameters: {
+				delta: {
+					type: "number",
+					required: true,
+					description: "The change: a NON-ZERO integer between -3 and +3."
+				},
+				reason: {
+					type: "string",
+					required: true,
+					description: "WHY this delta — cite the concrete interaction. Empty or generic reasons are rejected."
+				},
+				pet: {
+					type: "string",
+					description: "Which pet: its id from pet_state. Omit for the default pet."
+				},
+				bondDelta: {
+					type: "number",
+					description: "OPTIONAL change to the long-term bond: a NON-ZERO integer between -1 and +1. The slowest variable — the smallest steps."
+				},
+				bondReason: {
+					type: "string",
+					description: "Required when bondDelta is given: the concrete event that moved the bond."
+				}
+			},
+			output: {
+				schema: { type: "string" },
+				render: (_args, value) => [{
+					type: "text",
+					text: value
+				}]
+			},
+			async execute(args, exec) {
+				try {
+					const entry = await resolveTarget(args.pet, exec?.agent?.id);
+					const ledger = await readLedger(home, entry.id);
+					const now = Date.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)}）`);
+					if (reason === "") throw new Error("reason 必填：没有理由的调整不予记录");
+					const adjustments = ledger.adjustments ?? [];
+					const cooldownLeft = (adjustments.find((a) => !a.system)?.at ?? 0) + ADJUST_COOLDOWN_MS - now;
+					if (cooldownLeft > 0) throw new Error(`距上次调整还有 ${String(Math.ceil(cooldownLeft / 1e3))} 秒冷却`);
+					const today = (/* @__PURE__ */ new Date()).toDateString();
+					const quota = ledger.quota?.date === today ? ledger.quota : {
+						date: today,
+						count: 0,
+						sum: 0
+					};
+					if (quota.count >= ADJUST_DAILY_LIMIT) throw new Error(`今日调整次数已用完（${String(ADJUST_DAILY_LIMIT)}）——明天再判断，或者相信当前的关系状态`);
+					if (Math.abs(quota.sum + delta) > ADJUST_DAILY_SUM) throw new Error(`今日净变动将超过 ±${String(ADJUST_DAILY_SUM)}（当前 ${String(quota.sum)}）——剩下的留给明天`);
+					countBondDay(ledger);
+					const bondDelta = typeof args.bondDelta === "number" && Number.isInteger(args.bondDelta) ? args.bondDelta : 0;
+					const bondReason = typeof args.bondReason === "string" ? args.bondReason.trim() : "";
+					if (bondDelta !== 0) {
+						if (Math.abs(bondDelta) > 1) throw new Error("bondDelta 每次至多 ±1：羁绊是最慢的变量，不接受大步幅");
+						if (bondReason === "") throw new Error("bondReason 必填：羁绊的增减要有具体的事由");
+					}
+					ledger.affection = Math.min(100, Math.max(0, ledger.affection + delta));
+					quota.count += 1;
+					quota.sum += delta;
+					ledger.quota = quota;
+					ledger.adjustments = [{
+						delta,
+						reason,
+						at: now
+					}, ...adjustments].slice(0, 20);
+					if (bondDelta !== 0) {
+						ledger.bond = {
+							value: Math.max(0, (ledger.bond?.value ?? 0) + bondDelta),
+							days: ledger.bond?.days ?? 0,
+							lastCountedDate: ledger.bond?.lastCountedDate ?? (/* @__PURE__ */ new Date()).toDateString()
+						};
+						ledger.bondAdjustments = [{
+							delta: bondDelta,
+							reason: bondReason,
+							at: now
+						}, ...ledger.bondAdjustments ?? []].slice(0, 10);
+					}
+					await writeAffectionRaw(home, entry.id, ledger);
+					return JSON.stringify({
+						pet: entry.id,
+						affection: ledger.affection,
+						mood: moodOf(ledger.affection),
+						applied: delta,
+						quota: {
+							used: quota.count,
+							limit: ADJUST_DAILY_LIMIT,
+							sum: quota.sum,
+							sumLimit: ADJUST_DAILY_SUM
+						}
+					});
+				} catch (error) {
+					throw classify(error);
+				}
+			}
+		}));
 		scope.tools.register(defineTool({
 			name: "pet_state",
 			description: "Read the desktop pets' current state: every running pet with its id, what it is doing, which animation is playing, where it sits on screen (location), where it may roam (world, when the pet supports one), its visibility, plus each pet's affection book. Use it when the user refers to a pet, to pick a target for pet_say/pet_do, or to react to a pet.",
@@ -5969,18 +6447,28 @@ function registerPetTools(ctx, home, pet) {
 				]);
 				const ledgers = {};
 				for (const id of knownIds) {
-					const ledger = await readLedger(ledgerFileFor(home, id));
+					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
+						mood,
+						bond
 					};
 				}
 				const petsOut = states.map((state) => {
 					const actions = actionsById.get(state.id);
-					return actions === void 0 ? state : {
-						...state,
-						actions
+					return {
+						...actions === void 0 ? state : {
+							...state,
+							actions
+						},
+						name: voiceNames.get(state.id) ?? DEFAULT_PET_NAME[state.id] ?? state.id
 					};
 				});
 				return JSON.stringify({
@@ -6255,4 +6743,4 @@ function installPetService(ctx, home) {
 	return new PetHttpService(ctx, home);
 }
 //#endregion
-export { logStamp as a, installPetDriver as i, installPetService as n, registerPetTools as o, petHome as r, createUnregisteredPetHttp as t };
+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 };