dsh-agentic-pet 0.3.2 → 0.4.0

package/carrier/lib/main.js

@@ -287,7 +287,7 @@ function spawnHostChild() {
  * The pet-surface locator: pet-app bundles inside a running runtime publish
  * their authenticated root here (the desktop shell keeps its URL in process
  * memory only). A published URL wins over spawning a dedicated profile, so the
- * pet follows whichever live runtime serves /pet/ — the user's desktop when it
+ * pet follows whichever live runtime serves /whale598/ — the user's desktop when it
  * runs, otherwise the last publisher still alive.
  */
 async function readLocatorUrl() {
@@ -311,14 +311,16 @@ async function readLocatorUrl() {
     }
 }
 /**
- * The pet surface URL for an authenticated web root: path `/pet/` with the
+ * The pet surface URL for an authenticated web root: path `/whale598/` with the
  * token **dropped** — authorizeIndex mints the root cookie from the token and
  * rejects any token-carrying request on a subpath, so the pet page itself is
  * entered cookie-only after the root mint.
  */
 function petSurfaceUrl(authenticated) {
     const parsed = new URL(authenticated);
-    parsed.pathname = '/pet/';
+    // MUST stay in lockstep with the plugin's PET_PATH_PREFIX (/whale598) —
+    // separate builds, so the literal is duplicated here by design.
+    parsed.pathname = '/whale598/';
     parsed.search = '';
     parsed.hash = '';
     return parsed.toString();
@@ -465,7 +467,7 @@ async function main() {
     });
     // Connection's token exchange is root-path-only (authorizeIndex admits
     // `/?token=…`, never a subpath): load the authenticated root once to mint
-    // the browser cookie, then enter /pet/ with it. The root load starts the
+    // the browser cookie, then enter /whale598/ with it. The root load starts the
     // Web GUI; the second navigation aborts it, so the web app is at most a
     // flash.
     await window.loadURL(authenticated).catch(() => { });
@@ -979,7 +981,9 @@ async function main() {
         // swap blindness). The legacy single file keeps being written during the
         // transition so pre-registry readers still see this carrier.
         const manifest = `${JSON.stringify({ port, pid: process.pid, since: Date.now(), pet: 'electron' })}\n`;
-        const registryDir = join(DSH_HOME, 'pet-http.d');
+        // Namespaced under whale598/ (collision avoidance); the driver scans
+        // the legacy pet-http.d/ as a read fallback for older pet builds.
+        const registryDir = join(DSH_HOME, 'whale598', 'pet-http.d');
         try {
             mkdirSync(registryDir, { recursive: true });
         }
@@ -1021,7 +1025,7 @@ async function main() {
         // find a dead port in pet-http.d/ — stale entries were the "旧端点残留"
         // incident class. Best effort: a killed carrier leaves the file, and the
         // readers' pid+probe validation is the backstop.
-        for (const file of ['pet-http.d/electron.json', 'pet-http-electron.json']) {
+        for (const file of ['whale598/pet-http.d/electron.json', 'pet-http.d/electron.json', 'pet-http-electron.json']) {
             void rm(join(DSH_HOME, file), { force: true }).catch(() => { });
         }
         if (handle === undefined)

package/client/pet-settings.js

@@ -96,6 +96,34 @@ window.__ModuleLoader__.load({
       var pets = (data && data.pets) || []
       if (!(pets && pets.length) && data && data.pet) pets = [Object.assign({ id: 'electron' }, data.pet)]
       var moodOf = function (a) { return a >= 80 ? '开心' : a >= 40 ? '满足' : '平静' }
+      // 显示名：用户自定义（settings.names）优先，缺省回落内置名；
+      // 宠物区改名后好感度区自动跟随（同一状态、同一渲染趟）。
+      var defaultName = function (id) { return id === 'electron' ? '鲸鱼娘' : id === 'pure' ? 'Pure 宠物' : id }
+      var BOND_TIERS = [[0, "陌生"], [5, "认识"], [15, "熟了"], [40, "亲近"], [90, "离不开"], [180, "只有你"]]
+      var bondTier = function (days) {
+        var name = "陌生"
+        BOND_TIERS.forEach(function (t) { if (days >= t[0]) name = t[1] })
+        return name
+      }
+      var petName = function (id) {
+        var custom = settings.names && settings.names[id]
+        return custom ? String(custom) : defaultName(id)
+      }
+      // 提交一次改名（失焦/回车调用）：与当前值比较，无变化零开销；
+      // 空值删键（回落默认）。一次编辑 = 至多一次 update = 至多一条 [改名]。
+      var commitName = function (id, raw) {
+        var v = (raw || '').trim()
+        var next = Object.assign({}, (settings.names || {}))
+        var current = next[id]
+        if (v !== '' && v !== defaultName(id)) {
+          if (current === v) return
+          next[id] = v
+        } else {
+          if (current === undefined) return
+          delete next[id]
+        }
+        update({ names: next })
+      }
 
       function update(patch, doneMessage) { act(UPDATE, { patch: patch }, doneMessage) }
 
@@ -111,9 +139,13 @@ window.__ModuleLoader__.load({
         h(Section, { title: '宠物' },
           pets.length
             ? pets.map(function (p) {
-              var name = p.id === 'electron' ? 'TS 宠物' : p.id === 'pure' ? 'Pure 宠物' : String(p.id)
               return h('div', { key: p.id, style: row },
-                h('span', { style: { fontWeight: 700 } }, name),
+                // Uncontrolled + commit-on-blur/Enter: typing is LOCAL until the
+                // edit completes — a per-keystroke update would fire a [改名]
+                // turn per character.清空 + 失焦 = 恢复默认名。
+                h('input', { style: Object.assign({}, inputStyle, { width: 120, fontWeight: 700 }), defaultValue: petName(p.id), title: '改名后点击空白处或回车生效；清空恢复默认',
+                  onBlur: function (e) { commitName(p.id, e.target.value) },
+                  onKeyDown: function (e) { if (e.key === 'Enter') { commitName(p.id, e.target.value); e.target.blur() } } }),
                 p.online
                   ? h('span', null, '在线',
                     h('span', { style: muted }, 'pid ' + String(p.pid ?? '?')),
@@ -121,7 +153,7 @@ window.__ModuleLoader__.load({
                     p.animation ? h('span', { style: muted }, String(p.animation)) : null)
                   : h('span', { style: muted }, '离线'))
             })
-            : h('div', null, '没有在线的宠物', h(Hint, null, '启动 DeepSeek Harness 后 TS 宠物会自动上桌；Pure 宠物需自行启动。'))),
+            : h('div', null, '没有在线的宠物', h(Hint, null, '启动 DeepSeek Harness 后鲸鱼娘会自动上桌；Pure 宠物需自行启动。'))),
 
         // ── 好感度（每宠独立账本） ──
         h(Section, { title: '好感度' },
@@ -133,18 +165,20 @@ window.__ModuleLoader__.load({
             if (!ids.length) return h('div', { style: muted }, '还没有互动记录')
             return ids.map(function (id) {
               var book = (affection && affection[id]) || { affection: 0, total: 0 }
-              var name = id === 'electron' ? 'TS 宠物' : id === 'pure' ? 'Pure 宠物' : id
+              var name = petName(id)
               return h('div', { key: id, style: row },
                 h('span', { style: { fontWeight: 700 } }, name),
                 h('span', { style: { fontSize: 18, fontWeight: 700 } }, String(book.affection ?? 0)),
-                h('span', { style: muted }, '/ 100 · ' + moodOf(book.affection ?? 0)),
+                h('span', { style: muted }, '/ 100 · ' + moodOf(book.affection ?? 0) + ' · 羁绊：' + bondTier(book.bond ? (book.bond.value ?? book.bond.days ?? 0) : 0) + '（' + String(book.bond ? (book.bond.value ?? book.bond.days ?? 0) : 0) + ' 天）'), 
                 h('span', { style: muted }, '累计 ' + String(book.total ?? 0) + ' 次'))
             })
           })(),
           h('div', { style: row }, h(SButton, { variant: 'danger', disabled: busy, onClick: function () {
             if (window.confirm('清空所有好感度账本？此操作不可撤销。')) act('/api/pet-settings/reset-affection', {}, '账本已清空')
           } }, '重置账本'),
-          h('span', { style: muted }, '每跨 10 点该宠物会自主庆祝一次'))),
+          h('span', { style: muted }, '每 10 次触摸该宠物会自主庆祝一次'))),
+
+
 
         // ── 内心戏（宠物自主说话）──
         h(Section, { title: h('span', null, '自主表达 ', h('span', { style: { fontSize: 11, fontWeight: 400, color: 'rgba(127,127,127,.9)' } }, '模型驱动')) },
@@ -190,11 +224,11 @@ window.__ModuleLoader__.load({
                   marginLeft: side === 'right' ? -1 : 0 }
               }
               return h('div', { style: { display: 'inline-flex' } },
-                h('button', { style: seg(iv.preset !== 'pet', 'left'), onClick: function () {
-                  if (iv.preset !== 'pet-inner-voice') update({ innerVoice: { preset: 'pet-inner-voice' } })
+                h('button', { style: seg(iv.preset === 'whale598', 'left'), onClick: function () {
+                  if (iv.preset !== 'whale598') update({ innerVoice: { preset: 'whale598' } })
                 } }, '精简（仅表达）'),
-                h('button', { style: seg(iv.preset === 'pet', 'right'), onClick: function () {
-                  if (iv.preset !== 'pet') update({ innerVoice: { preset: 'pet' } })
+                h('button', { style: seg(iv.preset === 'whale598-standard', 'right'), onClick: function () {
+                  if (iv.preset !== 'whale598-standard') update({ innerVoice: { preset: 'whale598-standard' } })
                 } }, '普通（含工作工具）'))
             })()),
           h('div', { style: row }, '指定会话（高级）',

package/lib/index.js

@@ -1,4 +1,4 @@
-import { i as installPetDriver, n as installPetService } from "./service-Vj-lLpIv.js";
+import { c as readAffectionRaw, d as toolCallsFile, f as writeAffectionRaw, i as installPetDriver, l as readJsonl, n as installPetService, p as writePetName, s as eventsFile, u as readPetName } from "./service-D-b8UzM2.js";
 import { createRequire } from "node:module";
 import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
@@ -20,6 +20,7 @@ import { fileURLToPath } from "node:url";
 * dispatch — the webserver throws on duplicate path registration.
 * @module dsh-agentic-pet/settings-page
 */
+/** The touch ledger the driver owns; reset writes the driver's empty shape. */
 const DEFAULT_SETTINGS = {
 	proactivity: {
 		enabled: false,
@@ -30,7 +31,7 @@ const DEFAULT_SETTINGS = {
 	},
 	innerVoice: {
 		enabled: true,
-		preset: "pet-inner-voice",
+		preset: "whale598",
 		wakeIntervalMinutes: 2,
 		speakProbability: .5,
 		touchReplyProbability: .3,
@@ -39,7 +40,6 @@ const DEFAULT_SETTINGS = {
 	},
 	debug: { cdp: false }
 };
-/** The touch ledger the driver owns; reset writes the driver's empty shape. */
 const EMPTY_LEDGER = {
 	affection: 0,
 	total: 0,
@@ -169,7 +169,6 @@ function openPathInFileManager(path) {
 */
 function installSettingsPage(ctx, home, pet) {
 	const settingsPath = join(home, "pet-settings.json");
-	const ledgerPath = join(home, "pet-affection.json");
 	const windowPath = join(home, "pet-window.json");
 	/** Summarize EVERY live pet (id, online flag, normalized /status). */
 	const petStatus = async () => {
@@ -224,18 +223,49 @@ function installSettingsPage(ctx, home, pet) {
 			petStatus()
 		]);
 		const affection = {};
-		const legacyBook = await readFile(ledgerPath, "utf8").then((raw) => JSON.parse(raw), () => null);
 		const bookIds = new Set(status.pets.map((pet) => String(pet.id)));
 		bookIds.add("electron");
 		for (const id of bookIds) {
-			const book = await readFile(id === "electron" && legacyBook !== null ? ledgerPath : join(home, "pet-affection.d", `${id}.json`), "utf8").then((raw) => JSON.parse(raw), () => null);
+			const book = await readAffectionRaw(home, id);
 			if (book !== null) affection[id] = book;
 		}
+		const names = {};
+		for (const id of bookIds) {
+			const label = await readPetName(home, id);
+			if (label !== void 0) names[id] = label;
+		}
+		const composed = {
+			...settings,
+			names
+		};
+		const history = [];
+		const touchTotals = {};
+		for (const id of bookIds) {
+			const events = await readJsonl(eventsFile(home, id), 600);
+			const totals = {
+				total: 0,
+				byPart: {}
+			};
+			for (const event of events) {
+				if (event.type !== "touch") continue;
+				const part = typeof event.part === "string" ? event.part : "miss";
+				totals.total += 1;
+				totals.byPart[part] = (totals.byPart[part] ?? 0) + 1;
+			}
+			if (totals.total > 0) touchTotals[id] = totals;
+			for (const call of await readJsonl(toolCallsFile(home, id), 12)) history.push({
+				...call,
+				petId: id
+			});
+		}
+		history.sort((a, b) => Number(b.at ?? 0) - Number(a.at ?? 0));
 		writeJson(res, 200, {
-			settings,
+			settings: composed,
 			affection,
 			windowPosition,
-			pets: status.pets
+			pets: status.pets,
+			history: history.slice(0, 12),
+			touchTotals
 		});
 	});
 	route("POST", "/api/pet-settings/update", async (req, res) => {
@@ -245,6 +275,11 @@ function installSettingsPage(ctx, home, pet) {
 			writeJson(res, 400, { error: "body must be {patch:{...}}" });
 			return;
 		}
+		const patchNames = patch.names;
+		if (typeof patchNames === "object" && patchNames !== null) {
+			for (const [petId, label] of Object.entries(patchNames)) await writePetName(home, petId, typeof label === "string" && label.trim() !== "" ? label : null);
+			delete patch.names;
+		}
 		const next = mergeSettings(await readSettings(), patch);
 		await writeFile(settingsPath, `${JSON.stringify(next, null, 2)}\n`, "utf8");
 		ctx.emit("pet-settings/changed");
@@ -254,7 +289,7 @@ function installSettingsPage(ctx, home, pet) {
 		});
 	});
 	route("POST", "/api/pet-settings/reset-affection", async (_req, res) => {
-		await writeFile(ledgerPath, `${JSON.stringify(EMPTY_LEDGER)}\n`, "utf8");
+		await writeAffectionRaw(home, "electron", EMPTY_LEDGER);
 		writeJson(res, 200, {
 			ok: true,
 			affection: EMPTY_LEDGER
@@ -311,7 +346,7 @@ const inject = [
 	"workspaceController"
 ];
 /** The URL path prefix the pet renderer is served under. No trailing slash. */
-const PET_PATH_PREFIX = "/pet";
+const PET_PATH_PREFIX = "/whale598";
 /**
 * Locator file naming this runtime's authenticated root for the pet carrier.
 * The desktop shell keeps its authenticated URL in process memory only, so a
@@ -367,7 +402,7 @@ function bytesBody(bytes) {
 /**
 * Answer one GET or HEAD `/pet` request. The URL path is the full server
 * pathname (`/pet` prefix included); it must be exactly the prefix or stay
-* under it. The index entry (`/pet`, `/pet/`, `/pet/index.html`) passes
+* under it. The index entry (`/whale598`, `/whale598/`, `/whale598/index.html`) passes
 * Connection's browser authentication; every other file is public with a weak
 * ETag and `cache-control: no-cache`, answering a matching `If-None-Match`
 * with 304. Traversal outside the dist root is 403, missing paths are 404, a
@@ -379,7 +414,8 @@ function bytesBody(bytes) {
 */
 async function servePetStatic(request, distRoot, distIndex, authorizeIndex) {
 	const pathname = decodeURIComponent(new URL(request.url).pathname);
-	const target = resolve(normalize(join(distRoot, pathname === "/pet" || pathname === `/pet/` ? "/" : pathname.slice(4))));
+	if (!(pathname === "/whale598" || pathname.startsWith(`/whale598/`))) return new Response(null, { status: 404 });
+	const target = resolve(normalize(join(distRoot, pathname === "/whale598" || pathname === `/whale598/` ? "/" : pathname.slice(9))));
 	if (target !== distRoot && !target.startsWith(distRoot + sep)) return new Response(null, { status: 403 });
 	let body;
 	let headers;