dsh-agentic-pet 0.4.1 → 0.4.3

package/carrier/lib/main.js

@@ -1022,13 +1022,20 @@ async function main() {
     // kill only runs on the runtime's graceful shutdown; a terminated runtime
     // leaves a detached pet orphaned on the desktop. Poll the spawning
     // runtime's pid and exit with it.
+    //
+    // Only ESRCH means gone: a confined carrier can run at a lower integrity
+    // level than the runtime, where probing a heavier process answers EPERM —
+    // "it exists, you may not signal it". Counting that as death made the pet
+    // quit ten seconds after an otherwise fine start.
     const runtimePid = Number(process.env.DSH_PET_RUNTIME_PID);
     if (Number.isInteger(runtimePid) && runtimePid > 0) {
         setInterval(() => {
             try {
                 process.kill(runtimePid, 0);
             }
-            catch {
+            catch (error) {
+                if (error.code !== 'ESRCH')
+                    return;
                 console.log('[pet] the spawning runtime is gone; exiting');
                 app.quit();
             }

package/client/pet-settings.js

@@ -117,20 +117,19 @@ window.__ModuleLoader__.load({
         var custom = settings.names && settings.names[id]
         return custom ? String(custom) : defaultName(id)
       }
-      // 提交一次改名（失焦/回车调用）：与当前值比较，无变化零开销；
-      // 空值删键（回落默认）。一次编辑 = 至多一次 update = 至多一条 [改名]。
+      // 提交一次改名（失焦/回车调用）：与当前生效名比较，无变化零开销。
+      // 清空或改回内置名 = 发空串，宿主据此删掉 pet-name.json、回落到默认名。
+      // 早先这里删键后发的是 {}，而宿主是按 patch 里的键逐个写的——空对象等于
+      // 零次写入，"改回默认名"因此是一次静默的空操作。
       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 })
+        var next = v === '' || v === defaultName(id) ? '' : v
+        // 比较"生效名"而不是 patch：本来就用默认名时，清空/再输默认名是一次
+        // 无变化的编辑，不该发请求（否则每次点进输入框失焦都会 POST 一遍）。
+        if ((next === '' ? defaultName(id) : next) === petName(id)) return
+        var patch = {}
+        patch[id] = next
+        update({ names: patch })
       }
 
       function update(patch, doneMessage) { act(UPDATE, { patch: patch }, doneMessage) }
@@ -189,7 +188,9 @@ window.__ModuleLoader__.load({
                 // 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: '改名后点击空白处或回车生效；清空恢复默认',
+                // key 钉在当前生效名上：设置异步到达或改名成功后重挂，输入框
+                // 才不会停在首帧的默认值上（曾显示"鲸鱼娘"而实际存着自定义名）。
+                h('input', { key: 'name-' + petName(p.id), 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

package/lib/index.js

@@ -1,8 +1,8 @@
 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 { createRequire } from "node:module";
-import { spawn } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { existsSync, readFileSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, 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";
@@ -646,31 +646,79 @@ function apply(ctx) {
 		} catch {}
 		return process.versions.electron !== void 0 ? process.execPath : void 0;
 	};
+	/** Carrier spawn diagnostics; the packaged host's stderr is not visible. */
+	const logCarrier = (line) => {
+		try {
+			appendFileSync(join(dirname(petLocatorPath()), "carrier-spawn.log"), `${(/* @__PURE__ */ new Date()).toISOString()} ${line}\n`, "utf8");
+		} catch {}
+	};
 	const spawnPetCarrier = (url) => {
 		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;
-		const child = spawn(electronBinary, [carrierDir], {
-			env: {
-				...stripRunAsNode(process.env),
-				DSH_PET_URL: url,
-				DSH_PET_RUNTIME_PID: String(process.pid)
-			},
-			detached: true,
-			stdio: [
-				"ignore",
-				"pipe",
-				"pipe"
-			]
-		});
+		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)}`);
+		const child = (() => {
+			try {
+				return spawn(electronBinary, launchArgs, {
+					env: {
+						...stripRunAsNode(process.env),
+						DSH_PET_URL: url,
+						DSH_PET_RUNTIME_PID: String(process.pid)
+					},
+					detached: true,
+					stdio: [
+						"ignore",
+						"pipe",
+						"pipe"
+					]
+				});
+			} catch (error) {
+				logCarrier(`spawn threw: ${error instanceof Error ? error.message : String(error)}`);
+				return;
+			}
+		})();
+		if (child === void 0) return;
+		logCarrier(`spawned pid=${String(child.pid ?? "unknown")}`);
+		let stderrTail = "";
 		child.stdout?.setEncoding("utf8");
 		child.stdout?.on("data", (chunk) => {
 			process.stdout.write(`[pet-carrier] ${chunk}`);
 		});
 		child.stderr?.setEncoding("utf8");
 		child.stderr?.on("data", (chunk) => {
+			stderrTail = (stderrTail + chunk).slice(-2e3);
 			process.stderr.write(`[pet-carrier] ${chunk}`);
 		});
+		child.on("error", (error) => {
+			logCarrier(`child error: ${error.message}`);
+		});
+		child.on("exit", (code, signal) => {
+			logCarrier(`child exit code=${String(code)} signal=${String(signal)} stderr=${JSON.stringify(stderrTail.slice(-700))}`);
+		});
 		child.unref();
 		ctx.effect(() => () => {
 			child.kill();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-agentic-pet",
   "description": "The pet-surface bundle: serves the desktop pet renderer over the web composition, turning dsh into a surface the desktop pet attaches to as an authenticated client",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "publishConfig": {
     "access": "public"
   },
@@ -57,5 +57,13 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.5"
-  }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/beyondgjc/dsh-agentic-pet.git"
+  },
+  "bugs": {
+    "url": "https://github.com/beyondgjc/dsh-agentic-pet/issues"
+  },
+  "homepage": "https://github.com/beyondgjc/dsh-agentic-pet#readme"
 }