dsh-agentic-pet 0.4.3 → 0.4.5

package/README.zh.md

@@ -36,13 +36,11 @@ dsh plugin --profile <name> add dsh-agentic-pet
 
 ## 开发
 
-TypeScript 构建仍在 dsh monorepo workspace 内进行（被打包的 `@deepseek-ai/dsh-*` 依赖未发布 npm）。流程：
+日常迭代在本仓库内完成：改 `src/` → 本地构建（tsc + tsdown，工具链与私有包依赖的准备见文档）→ 部署到桌面 profile 的 vendor 目录 → 重启 DeepSeek Harness。**完整手册（含工具链准备、部署/验证/清理命令与已知坑）见 [docs/DEV-DEPLOY.md](docs/DEV-DEPLOY.md)**。
 
-1. monorepo 内：`pnpm run build`（插件 `lib/`）与 `pnpm --filter @deepseek-ai/dsh-pet run build`（载体 `lib/` + `dist-renderer/`）。
-2. 本仓库：`scripts\sync-from-monorepo.cmd`——把源码与构建产物镜像进本仓库。
-3. 本仓库提交，然后在本仓库发布（见下文「发布」；先素材包后插件包，手册见 [dsh-pet-assets/PUBLISH.md](../dsh-pet-assets/PUBLISH.md)）。
+历史上的构建在 dsh monorepo workspace 内进行（被打包的 `@deepseek-ai/dsh-*` 依赖未发布 npm），经 `scripts\sync-from-monorepo.cmd` 镜像进本仓库——monorepo 侧副本已停在 `0.2.1-rc.3`，该链路已过期，仅留档；直接运行会用旧代码覆盖本仓库。
 
-测试：`npx vitest run tests/registry-service.spec.ts` 自持可跑（只需 `cordis` 与 `vitest`）；含 `tests/pet-app.spec.ts` 的全量测试在 monorepo workspace 内跑。
+测试：`node_modules/.bin/vitest run`（vitest 及 `js-yaml@4.1.0`、`@deepseek-ai/cordis-plugin-include` 为 ad-hoc 安装，见文档 §4）；`tests/registry-service.spec.ts` 等纯函数规格只需 `cordis` 与 `vitest` 即可自持运行。
 
 ## 发布
 
@@ -60,6 +58,7 @@ git push --follow-tags
 
 ## 文档
 
+- 开发与部署手册（本地构建工具链、vendor 部署、测试、发布、已知坑）：[docs/DEV-DEPLOY.md](docs/DEV-DEPLOY.md)。
 - 控制面契约（所有宠物实现共同讲述的冻结消费方 API）见项目文档的多宠指南。
 - 说话朗读（BreezeBlue TTS）设计笔记见 monorepo 工作区的 `packages/bundle/pet-app/docs/tts.md`。
 - 已知边界与设计笔记见仓库 wiki 与项目工程文档。

package/client/pet-settings.js

@@ -233,14 +233,14 @@ window.__ModuleLoader__.load({
             update({ innerVoice: { enabled: !(iv.enabled !== false) } })
           } })),
           h('div', { style: row },
-            '唤醒间隔',
+            '世界时钟间隔',
             h('input', { style: inputStyle, value: String(iv.wakeIntervalMinutes ?? 2), onChange: function (e) {
               var v = parseInt(e.target.value, 10)
               if (Number.isFinite(v)) update({ innerVoice: { wakeIntervalMinutes: v } })
             } }),
             '分钟'),
           h('div', { style: row },
-            '请求模型的概率',
+            '世界时钟唤醒概率',
             h('input', { style: inputStyle, value: String(Math.round(((typeof iv.speakProbability === 'number' ? iv.speakProbability : 0.5)) * 100)), onChange: function (e) {
               var v = parseFloat(e.target.value)
               if (Number.isFinite(v)) update({ innerVoice: { speakProbability: Math.min(100, Math.max(0, v)) / 100 } })
@@ -260,6 +260,25 @@ window.__ModuleLoader__.load({
               if (Number.isFinite(v) && v >= 0) update({ innerVoice: { touchReplyCooldownSeconds: Math.min(600, v) } })
             } }),
             '秒（0 = 不限）'),
+          h('div', { style: row }, '自主唤醒遇用户忙',
+            (function () {
+              var seg = function (active, side) {
+                return { padding: '4px 12px', fontSize: 12, cursor: 'pointer',
+                  border: '1px solid ' + (active ? '#22c55e' : '#c9d4e0'),
+                  background: active ? '#22c55e' : '#f4f7fa',
+                  color: active ? '#ffffff' : '#1c2733',
+                  borderRadius: side === 'left' ? '4px 0 0 4px' : '0 4px 4px 0',
+                  marginLeft: side === 'right' ? -1 : 0 }
+              }
+              var policy = iv.selfWakeBusyPolicy === 'defer' ? 'defer' : 'fire'
+              return h('div', { style: { display: 'inline-flex' } },
+                h('button', { style: seg(policy === 'fire', 'left'), onClick: function () {
+                  if (policy !== 'fire') update({ innerVoice: { selfWakeBusyPolicy: 'fire' } })
+                } }, '到点必醒'),
+                h('button', { style: seg(policy === 'defer', 'right'), onClick: function () {
+                  if (policy !== 'defer') update({ innerVoice: { selfWakeBusyPolicy: 'defer' } })
+                } }, '忙时顺延'))
+            })()),
           h('div', { style: row }, '会话模式',
             (function () {
               var seg = function (active, side) {
@@ -286,7 +305,7 @@ window.__ModuleLoader__.load({
               else delete next.electron
               update({ innerVoice: { boundSessions: next } })
             } })),
-          h(Hint, null, '宠物在自己专属的会话里醒来，用气泡和动作自主表达；那条「鲸鱼娘的内心戏」会话可在会话列表查看，也可以直接在那里和它聊天。用户忙于会话或宠物表达未完成时不会打扰。会话模式切换只对新建会话生效：归档旧会话后，她会在下次对话时自动换代重建（旧会话记忆不迁移）。指定会话立即生效——下一次对话就用新绑定的会话；清空后自动回落到她之前的会话（那条若已被归档，会自动创建新的）。')),
+          h(Hint, null, '宠物在自己专属的会话里醒来，用气泡和动作自主表达；那条「鲸鱼娘的内心戏」会话可在会话列表查看，也可以直接在那里和它聊天。醒来有两个来源：世界时钟是环境节拍，按上面的间隔和唤醒概率随机轻拍她，用户忙于会话或宠物表达未完成时不会打扰；自主唤醒是她用 pet_schedule_wake 给自己定的闹钟，到点带着当初的打算醒来，不受这个概率影响（上面的「自主唤醒遇用户忙」决定你正忙时她是否照醒，默认到点必醒）。会话模式切换只对新建会话生效：归档旧会话后，她会在下次对话时自动换代重建（旧会话记忆不迁移）。指定会话立即生效——下一次对话就用新绑定的会话；清空后自动回落到她之前的会话（那条若已被归档，会自动创建新的）。')),
 
         h(Section, { title: h('span', null, '自由活动 ', h('span', { style: { fontSize: 11, fontWeight: 400, color: 'rgba(127,127,127,.9)' } }, '逻辑驱动')) },
           h('div', { style: row }, '自由活动（宠物自娱）', h(Toggle, { value: pro.idleAnimation !== false, onChange: function () {

package/lib/index.js

@@ -1,13 +1,13 @@
-import { c as globalFilePath, d as readJsonl, f as readPetName, h as writePetName, i as installPetDriver, l as readAffectionRaw, m as writeGlobalJson, n as installPetService, p as writeAffectionRaw, r as petHome, s as eventsFile, u as readGlobalJson } from "./service-BjTawwUn.js";
+import { c as globalFilePath, d as readJsonl, f as readPetName, h as writePetName, i as installPetDriver, l as readAffectionRaw, m as writeGlobalJson, n as installPetService, p as writeAffectionRaw, r as petHome, s as eventsFile, u as readGlobalJson } from "./service-R8qwDx1Q.js";
 import { createRequire } from "node:module";
-import { spawn, spawnSync } from "node:child_process";
+import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
-import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
+import { appendFileSync, existsSync, readFileSync } from "node:fs";
 import { mkdir, readFile, rm, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, extname, join, normalize, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-//#region lib/types/settings-page.js
+// lib/types/settings-page.js
 /**
 * The settings page's host half: local HTTP routes backing the desktop
 * sidebar "桌宠" page (the client half lives in ./client/pet-settings.js and
@@ -36,6 +36,7 @@ const DEFAULT_SETTINGS = {
 		speakProbability: .5,
 		touchReplyProbability: .3,
 		touchReplyCooldownSeconds: 30,
+		selfWakeBusyPolicy: "fire",
 		boundSessions: {}
 	},
 	tts: { enabled: false },
@@ -78,7 +79,7 @@ async function readJsonBody(req) {
 	let size = 0;
 	for await (const chunk of req) {
 		size += chunk.length;
-		if (size > 1024 * 1024) return void 0;
+		if (size > 1048576) return void 0;
 		chunks.push(chunk);
 	}
 	try {
@@ -130,6 +131,7 @@ function mergeSettings(current, patch) {
 		if (typeof v.touchReplyProbability === "number" && Number.isFinite(v.touchReplyProbability)) innerVoice.touchReplyProbability = Math.min(1, Math.max(0, v.touchReplyProbability));
 		const replyCooldown = clampNumber(v.touchReplyCooldownSeconds, 0, 600);
 		if (replyCooldown !== void 0) innerVoice.touchReplyCooldownSeconds = replyCooldown;
+		if (v.selfWakeBusyPolicy === "defer" || v.selfWakeBusyPolicy === "fire") innerVoice.selfWakeBusyPolicy = v.selfWakeBusyPolicy;
 		const bound = v.boundSessions;
 		if (typeof bound === "object" && bound !== null) {
 			const record = {};
@@ -177,7 +179,8 @@ function openPathInFileManager(path) {
 		}).unref();
 		return;
 	}
-	spawn(process.platform === "darwin" ? "open" : "xdg-open", [path], {
+	const command = process.platform === "darwin" ? "open" : "xdg-open";
+	spawn(command, [path], {
 		detached: true,
 		stdio: "ignore"
 	}).unref();
@@ -371,8 +374,7 @@ function installSettingsPage(ctx, home, pet) {
 		}
 	});
 }
-//#endregion
-//#region lib/types/index.js
+// lib/types/index.js
 /**
 * dsh-agentic-pet — the pet-surface bundle's runtime glue plugin plus
 * the bundle patch (`cordis.patch.yml`, declared by the `dsh.bundle.patch`
@@ -433,7 +435,7 @@ const MIME = {
 	".webmanifest": "application/manifest+json",
 	".woff2": "font/woff2"
 };
-const STATIC_MISS_CODES = new Set([
+const STATIC_MISS_CODES = /* @__PURE__ */ new Set([
 	"ENOENT",
 	"EISDIR",
 	"ENOTDIR"
@@ -477,7 +479,8 @@ function bytesBody(bytes) {
 async function servePetStatic(request, distRoot, distIndex, authorizeIndex) {
 	const pathname = decodeURIComponent(new URL(request.url).pathname);
 	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))));
+	const relative = pathname === "/whale598" || pathname === `/whale598/` ? "/" : pathname.slice(9);
+	const target = resolve(normalize(join(distRoot, relative)));
 	if (target !== distRoot && !target.startsWith(distRoot + sep)) return new Response(null, { status: 403 });
 	let body;
 	let headers;
@@ -626,7 +629,8 @@ function apply(ctx) {
 	*/
 	const resolveElectronBinary = () => {
 		if (process.env.DSH_PET_ELECTRON !== void 0 && process.env.DSH_PET_ELECTRON !== "") return process.env.DSH_PET_ELECTRON;
-		const staged = join(resolve(join(dirname(fileURLToPath(import.meta.url)), "..")), "electron-bin", process.platform === "win32" ? "electron.exe" : process.platform === "darwin" ? join("Electron.app", "Contents", "MacOS", "Electron") : "electron");
+		const pkgRoot = resolve(join(dirname(fileURLToPath(import.meta.url)), ".."));
+		const staged = join(pkgRoot, "electron-bin", process.platform === "win32" ? "electron.exe" : process.platform === "darwin" ? join("Electron.app", "Contents", "MacOS", "Electron") : "electron");
 		if (existsSync(staged)) return staged;
 		try {
 			const require = createRequire(import.meta.url);
@@ -637,7 +641,8 @@ function apply(ctx) {
 			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());
+				const exe = readFileSync(join(pkgDir, "path.txt"), "utf8").trim();
+				const binary = join(pkgDir, "dist", exe);
 				if (existsSync(binary)) return binary;
 				const parent = dirname(dir);
 				if (parent === dir) break;
@@ -656,31 +661,9 @@ function apply(ctx) {
 		const carrierDir = resolve(join(dirname(fileURLToPath(import.meta.url)), "..", "carrier"));
 		const electronBinary = resolveElectronBinary();
 		if (process.env.DSH_PET_NO_SPAWN === "1" || electronBinary === void 0 || !existsSync(join(carrierDir, "package.json"))) return;
-		let probeStatus = "unstarted";
-		const startsSandboxed = (() => {
-			try {
-				const probe = spawnSync(electronBinary, ["--version"], {
-					env: stripRunAsNode(process.env),
-					stdio: "ignore",
-					timeout: 5e3
-				});
-				probeStatus = probe.error === void 0 ? `status=${String(probe.status)}` : `error=${String(probe.error.code ?? probe.error.message)}`;
-				return probe.status === 0;
-			} catch (error) {
-				probeStatus = `throw=${error instanceof Error ? error.message : String(error)}`;
-				return false;
-			}
-		})();
 		const launchArgs = [carrierDir];
-		if (!startsSandboxed) {
-			console.error("pet-surface: this machine cannot start a sandboxed Electron; launching the carrier with --no-sandbox");
-			const carrierUserData = join(dirname(petLocatorPath()), "carrier-userdata");
-			try {
-				mkdirSync(carrierUserData, { recursive: true });
-			} catch {}
-			launchArgs.push("--no-sandbox", `--user-data-dir=${carrierUserData}`);
-		}
-		logCarrier(`spawn binary=${electronBinary} args=${JSON.stringify(launchArgs)} probe=${probeStatus} pid=${String(process.pid)}`);
+		if (process.env.DSH_PET_NO_SANDBOX === "1") launchArgs.push("--no-sandbox");
+		logCarrier(`spawn binary=${electronBinary} args=${JSON.stringify(launchArgs)} pid=${String(process.pid)}`);
 		const child = (() => {
 			try {
 				return spawn(electronBinary, launchArgs, {
@@ -743,5 +726,4 @@ function apply(ctx) {
 		}).catch(() => {});
 	}, "pet-surface: locator withdrawal");
 }
-//#endregion
 export { PET_PATH_PREFIX, apply, inject, name, petLocatorPath, servePetStatic };