dsh-agentic-pet 0.3.1 → 0.4.0

package/README.md

@@ -1,50 +1,56 @@
----
-description: "The dsh desktop pet: an agentic pet plugin that serves the pet renderer over the web composition, drives it from in-process dsh events, and answers approvals and questions from the desktop."
-kind: "package-bundle"
----
-
-# dsh-agentic-pet
-
-English | [中文](README.zh.md)
-
-## Summary
-
-`dsh-agentic-pet` is a desktop-pet plugin for the [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) ecosystem: the pet lives on your desktop as a transparent always-on-top window, follows your agent sessions (idle / thinking / working / error), races the web GUI to answer approvals and user questions (first answer wins), collects a per-pet touch-affection ledger, and exposes expressive tools (`pet_say`, `pet_do`, `pet_digest`, `pet_interactions`, `pet_state`) so the model can speak and act through the pet. Multiple pet implementations can run side by side — a directory registry (`~/.dsh/pet-http.d/`) discovers every live pet and routes state, interactions, and ledgers per pet.
-
-The pet itself is a dumb display with zero dsh knowledge. Everything that understands the runtime — event convergence, interaction waterfalls, multi-pet routing, the model tools — lives in the plugin's driver, and the pet only implements a small local HTTP control interface. Any pet implementation that speaks the same HTTP contract can be adopted without changing this plugin.
-
-## What's in this repo
-
-| Path | What it is |
-|---|---|
-| `src/` | The plugin (Cordis bundle): `/pet` route, event driver, registry, `PetService` seam, model tools, settings-page routes |
-| `client/` | The desktop sidebar settings page (client half) |
-| `carrier/` | The Electron carrier **build artifacts** shipped with the package (`lib/`, `dist-renderer/`) |
-| `carrier-src/` | The carrier **sources** (mirrored from the dev upstream; media assets live in [dsh-pet-assets](https://github.com/beyondgjc/dsh-pet-assets)) |
-| `vendor/typert-plugin/` | Vendored typert decorator plugin used by the packaging config |
-| `tests/` | Vitest specs (pure-function coverage of the registry routing and the `/status` field-matrix normalization) |
-
-## Install
-
-From the DeepSeek Harness desktop app's plugin page, or:
-
-```bash
-dsh plugin --profile <name> add dsh-agentic-pet
-```
-
-The animation media ship as a separate package, `dsh-agentic-pet-assets`, and are pulled in automatically as a dependency.
-
-## Development
-
-The TypeScript build still runs inside the dsh monorepo workspace (the bundled `@deepseek-ai/dsh-*` deps are not published to npm). The flow:
-
-1. In the monorepo: `pnpm run build` (plugin `lib/`) and `pnpm --filter @deepseek-ai/dsh-pet run build` (carrier `lib/` + `dist-renderer/`).
-2. Here: `scripts\sync-from-monorepo.cmd` — mirrors sources and build outputs into this repo.
-3. Commit here, then `npm publish` (assets package first; see [dsh-pet-assets/PUBLISH.md](../dsh-pet-assets/PUBLISH.md) for the release manual).
-
-Tests: `npx vitest run tests/registry-service.spec.ts` runs self-contained (needs only `cordis` and `vitest`); the full suite including `tests/pet-app.spec.ts` runs in the monorepo workspace.
-
-## Documentation
-
-- Control-plane contract (the frozen consumer API every pet implementation speaks): see the multi-pet guide in the project documentation.
-- Known limitations and design notes live in the repo wiki and the project's engineering docs.
+---
+description: "The dsh desktop pet: an agentic pet plugin that serves the pet renderer over the web composition, drives it from in-process dsh events, and answers approvals and questions from the desktop."
+kind: "package-bundle"
+---
+
+# dsh-agentic-pet
+
+English | [中文](README.zh.md)
+
+## Summary
+
+`dsh-agentic-pet` is a desktop-pet plugin for the [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) ecosystem: the pet lives on your desktop as a transparent always-on-top window, follows your agent sessions (idle / thinking / working / error), races the web GUI to answer approvals and user questions (first answer wins), collects a per-pet touch-affection ledger, and exposes expressive tools (`pet_say`, `pet_do`, `pet_digest`, `pet_interactions`, `pet_state`) so the model can speak and act through the pet. Multiple pet implementations can run side by side — a directory registry (`~/.dsh/pet-http.d/`) discovers every live pet and routes state, interactions, and ledgers per pet.
+
+The pet itself is a dumb display with zero dsh knowledge. Everything that understands the runtime — event convergence, interaction waterfalls, multi-pet routing, the model tools — lives in the plugin's driver, and the pet only implements a small local HTTP control interface. Any pet implementation that speaks the same HTTP contract can be adopted without changing this plugin.
+
+## What's in this repo
+
+| Path | What it is |
+|---|---|
+| `src/` | The plugin (Cordis bundle): `/pet` route, event driver, registry, `PetService` seam, model tools, settings-page routes |
+| `client/` | The desktop sidebar settings page (client half) |
+| `carrier/` | The Electron carrier **build artifacts** shipped with the package (`lib/`, `dist-renderer/`) |
+| `carrier-src/` | The carrier **sources** (mirrored from the dev upstream; media assets live in [dsh-pet-assets](https://github.com/beyondgjc/dsh-pet-assets)) |
+| `vendor/typert-plugin/` | Vendored typert decorator plugin used by the packaging config |
+| `tests/` | Vitest specs (pure-function coverage of the registry routing and the `/status` field-matrix normalization) |
+
+## Install
+
+From the DeepSeek Harness desktop app's plugin page, or:
+
+```bash
+dsh plugin --profile <name> add dsh-agentic-pet
+```
+
+The animation media ship as a separate package, `dsh-agentic-pet-assets`, and are pulled in automatically as a dependency.
+
+## Development
+
+The TypeScript build still runs inside the dsh monorepo workspace (the bundled `@deepseek-ai/dsh-*` deps are not published to npm). The flow:
+
+1. In the monorepo: `pnpm run build` (plugin `lib/`) and `pnpm --filter @deepseek-ai/dsh-pet run build` (carrier `lib/` + `dist-renderer/`).
+2. Here: `scripts\sync-from-monorepo.cmd` — mirrors sources and build outputs into this repo.
+3. Commit here, then `npm publish` (assets package first; see [dsh-pet-assets/PUBLISH.md](../dsh-pet-assets/PUBLISH.md) for the release manual).
+
+Tests: `npx vitest run tests/registry-service.spec.ts` runs self-contained (needs only `cordis` and `vitest`); the full suite including `tests/pet-app.spec.ts` runs in the monorepo workspace.
+
+## Documentation
+
+- Control-plane contract (the frozen consumer API every pet implementation speaks): see the multi-pet guide in the project documentation.
+- Known limitations and design notes live in the repo wiki and the project's engineering docs.
+
+
+## Credits & Licensing
+
+- This project is a derivative of [PC2005-cloud/dsh-pet](https://github.com/PC2005-cloud/dsh-pet) — the upstream dsh-pet plugin by PC2005-cloud. Plugin code is licensed MIT.
+- The character artwork (the "大肥鱼" whale-girl character under `carrier/assets` and `dsh-agentic-pet-assets`) is licensed **CC BY-NC-SA 4.0** (attribution · non-commercial · share-alike) by its original author — [original statement](https://www.bilibili.com/opus/1247156596114456581). Non-commercial use only; artwork derivatives must be shared under the same license.

package/README.zh.md

@@ -1,50 +1,56 @@
----
-description: "dsh 桌面宠物：经由 web 组合层伺服宠物页面、由进程内 dsh 事件驱动、可从桌面应答审批与提问的 agentic 宠物插件。"
-kind: "package-bundle"
----
-
-# dsh-agentic-pet
-
-[English](README.md) | 中文
-
-## 简介
-
-`dsh-agentic-pet` 是 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 生态的桌面宠物插件：宠物以透明置顶窗常驻桌面，跟随 agent 会话状态（idle / thinking / working / error），与 web 界面竞速应答审批与提问（先答者赢），维护每宠独立的触摸好感账本，并向模型暴露表达工具（`pet_say`、`pet_do`、`pet_digest`、`pet_interactions`、`pet_state`）——模型可以借宠物说话、做动作、感知被触摸。多只宠物实现可以并存：目录注册表（`~/.dsh/pet-http.d/`）发现全部在线宠物，状态、交互、账本按宠路由。
-
-宠物本身是零 DSH 知识的纯显示端。理解运行时的一切——事件收敛、交互瀑布、多宠路由、模型工具——都在插件的 driver 里，宠物只实现一个小型本地 HTTP 控制接口。任何讲同一 HTTP 契约的宠物实现都能被采纳，插件零改动。
-
-## 仓库结构
-
-| 路径 | 内容 |
-|---|---|
-| `src/` | 插件（Cordis bundle）：`/pet` 路由、事件 driver、注册表、`PetService` 接缝、模型工具、设置页路由 |
-| `client/` | 桌面侧边栏设置页（client 半边） |
-| `carrier/` | 随包分发的 Electron 载体**构建产物**（`lib/`、`dist-renderer/`） |
-| `carrier-src/` | 载体**源码**（自开发上游镜像；素材在 [dsh-pet-assets](https://github.com/beyondgjc/dsh-pet-assets)） |
-| `vendor/typert-plugin/` | 打包配置使用的 typert 装饰器插件（vendored） |
-| `tests/` | Vitest 用例（注册表路由与 `/status` 字段矩阵的纯函数覆盖） |
-
-## 安装
-
-在 DeepSeek Harness 桌面端插件页安装，或：
-
-```bash
-dsh plugin --profile <name> add dsh-agentic-pet
-```
-
-动画素材以独立包 `dsh-agentic-pet-assets` 分发，作为依赖自动带入。
-
-## 开发
-
-TypeScript 构建仍在 dsh monorepo workspace 内进行（被打包的 `@deepseek-ai/dsh-*` 依赖未发布 npm）。流程：
-
-1. monorepo 内：`pnpm run build`（插件 `lib/`）与 `pnpm --filter @deepseek-ai/dsh-pet run build`（载体 `lib/` + `dist-renderer/`）。
-2. 本仓库：`scripts\sync-from-monorepo.cmd`——把源码与构建产物镜像进本仓库。
-3. 本仓库提交，然后 `npm publish`（先素材包后插件包；发布手册见 [dsh-pet-assets/PUBLISH.md](../dsh-pet-assets/PUBLISH.md)）。
-
-测试：`npx vitest run tests/registry-service.spec.ts` 自持可跑（只需 `cordis` 与 `vitest`）；含 `tests/pet-app.spec.ts` 的全量测试在 monorepo workspace 内跑。
-
-## 文档
-
-- 控制面契约（所有宠物实现共同讲述的冻结消费方 API）见项目文档的多宠指南。
-- 已知边界与设计笔记见仓库 wiki 与项目工程文档。
+---
+description: "dsh 桌面宠物：经由 web 组合层伺服宠物页面、由进程内 dsh 事件驱动、可从桌面应答审批与提问的 agentic 宠物插件。"
+kind: "package-bundle"
+---
+
+# dsh-agentic-pet
+
+[English](README.md) | 中文
+
+## 简介
+
+`dsh-agentic-pet` 是 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 生态的桌面宠物插件：宠物以透明置顶窗常驻桌面，跟随 agent 会话状态（idle / thinking / working / error），与 web 界面竞速应答审批与提问（先答者赢），维护每宠独立的触摸好感账本，并向模型暴露表达工具（`pet_say`、`pet_do`、`pet_digest`、`pet_interactions`、`pet_state`）——模型可以借宠物说话、做动作、感知被触摸。多只宠物实现可以并存：目录注册表（`~/.dsh/pet-http.d/`）发现全部在线宠物，状态、交互、账本按宠路由。
+
+宠物本身是零 DSH 知识的纯显示端。理解运行时的一切——事件收敛、交互瀑布、多宠路由、模型工具——都在插件的 driver 里，宠物只实现一个小型本地 HTTP 控制接口。任何讲同一 HTTP 契约的宠物实现都能被采纳，插件零改动。
+
+## 仓库结构
+
+| 路径 | 内容 |
+|---|---|
+| `src/` | 插件（Cordis bundle）：`/pet` 路由、事件 driver、注册表、`PetService` 接缝、模型工具、设置页路由 |
+| `client/` | 桌面侧边栏设置页（client 半边） |
+| `carrier/` | 随包分发的 Electron 载体**构建产物**（`lib/`、`dist-renderer/`） |
+| `carrier-src/` | 载体**源码**（自开发上游镜像；素材在 [dsh-pet-assets](https://github.com/beyondgjc/dsh-pet-assets)） |
+| `vendor/typert-plugin/` | 打包配置使用的 typert 装饰器插件（vendored） |
+| `tests/` | Vitest 用例（注册表路由与 `/status` 字段矩阵的纯函数覆盖） |
+
+## 安装
+
+在 DeepSeek Harness 桌面端插件页安装，或：
+
+```bash
+dsh plugin --profile <name> add dsh-agentic-pet
+```
+
+动画素材以独立包 `dsh-agentic-pet-assets` 分发，作为依赖自动带入。
+
+## 开发
+
+TypeScript 构建仍在 dsh monorepo workspace 内进行（被打包的 `@deepseek-ai/dsh-*` 依赖未发布 npm）。流程：
+
+1. monorepo 内：`pnpm run build`（插件 `lib/`）与 `pnpm --filter @deepseek-ai/dsh-pet run build`（载体 `lib/` + `dist-renderer/`）。
+2. 本仓库：`scripts\sync-from-monorepo.cmd`——把源码与构建产物镜像进本仓库。
+3. 本仓库提交，然后 `npm publish`（先素材包后插件包；发布手册见 [dsh-pet-assets/PUBLISH.md](../dsh-pet-assets/PUBLISH.md)）。
+
+测试：`npx vitest run tests/registry-service.spec.ts` 自持可跑（只需 `cordis` 与 `vitest`）；含 `tests/pet-app.spec.ts` 的全量测试在 monorepo workspace 内跑。
+
+## 文档
+
+- 控制面契约（所有宠物实现共同讲述的冻结消费方 API）见项目文档的多宠指南。
+- 已知边界与设计笔记见仓库 wiki 与项目工程文档。
+
+
+## 致谢与授权
+
+- 本项目基于 [PC2005-cloud/dsh-pet](https://github.com/PC2005-cloud/dsh-pet) 衍生（上游 dsh-pet 插件，作者 PC2005-cloud）。插件代码以 MIT 许可发布。
+- 角色形象（"大肥鱼"鲸鱼娘，见 `carrier/assets` 与 `dsh-agentic-pet-assets`）的形象授权为 **CC BY-NC-SA 4.0**（署名 · 非商业 · 相同方式共享），[原作者声明](https://www.bilibili.com/opus/1247156596114456581)。仅限非商业使用；形象衍生须以相同方式共享。

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,8 +1,8 @@
-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";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { mkdir, readFile, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, extname, join, normalize, resolve, sep } from "node:path";
@@ -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;
@@ -535,6 +571,17 @@ function apply(ctx) {
 			const candidate = String(require("electron"));
 			if (existsSync(candidate)) return candidate;
 		} catch {}
+		try {
+			let dir = dirname(fileURLToPath(import.meta.url));
+			for (let i = 0; i < 8; i += 1) {
+				const pkgDir = join(dir, "node_modules", "electron");
+				const binary = join(pkgDir, "dist", readFileSync(join(pkgDir, "path.txt"), "utf8").trim());
+				if (existsSync(binary)) return binary;
+				const parent = dirname(dir);
+				if (parent === dir) break;
+				dir = parent;
+			}
+		} catch {}
 		return process.versions.electron !== void 0 ? process.execPath : void 0;
 	};
 	const spawnPetCarrier = (url) => {