engine7 7.1.117 → 7.1.119

package/dist/engine-startup.mjs

@@ -23776,17 +23776,81 @@ import * as path16 from "node:path";
 import fs11 from "node:fs";
 import path11 from "node:path";
 import { execSync as execSync2 } from "node:child_process";
-function acquireEngineLock(stateDir) {
-  const lockFile = path11.join(stateDir, ".engine.pid");
-  const myPid = process.pid;
+function enginePidFile(stateDir) {
+  return path11.join(stateDir, ".engine.pid");
+}
+function isEngineImage(text) {
+  return /node|engine7|electron/i.test(text);
+}
+function isPidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function probeImage(pid) {
   try {
-    const oldPid = parseInt(fs11.readFileSync(lockFile, "utf-8").trim(), 10);
-    if (oldPid && oldPid !== myPid && isNodeEngineAlive(oldPid)) {
-      console.log(`[pid-lock] Stale engine PID ${oldPid} still alive (node), killing tree...`);
-      killTree(oldPid);
+    if (process.platform === "win32") {
+      return execSync2(`tasklist /FI "PID eq ${pid}" /NH /FO CSV`, {
+        encoding: "utf-8",
+        timeout: 3e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      });
     }
+    if (process.platform === "darwin") {
+      return execSync2(`ps -p ${pid} -o comm=`, {
+        encoding: "utf-8",
+        timeout: 3e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      });
+    }
+    return fs11.readFileSync(`/proc/${pid}/comm`, "utf-8");
+  } catch {
+    return null;
+  }
+}
+function probeEngineImage(pid) {
+  return isEngineImage(probeImage(pid) ?? "");
+}
+function isCliWrapperImage(text) {
+  return /node/i.test(text);
+}
+function probeIsCliWrapper(pid) {
+  return isCliWrapperImage(probeImage(pid) ?? "");
+}
+function readOwnEnginePidText(stateDir) {
+  try {
+    return fs11.readFileSync(enginePidFile(stateDir), "utf-8");
   } catch (err) {
     if (err?.code !== "ENOENT") console.warn(`[pid-lock] read lock failed: ${err.message}`);
+    return null;
+  }
+}
+function pickOwnEnginePid(probe) {
+  const pid = parseInt((probe.pidFileContent ?? "").trim(), 10);
+  if (!Number.isInteger(pid) || pid <= 0) return null;
+  if (pid === probe.myPid) return null;
+  if (!probe.isAlive(pid)) return null;
+  if (!probe.isEngineImage(pid)) return null;
+  return pid;
+}
+function ownEnginePid(stateDir, myPid = process.pid) {
+  return pickOwnEnginePid({
+    pidFileContent: readOwnEnginePidText(stateDir),
+    myPid,
+    isAlive: isPidAlive,
+    isEngineImage: probeEngineImage
+  });
+}
+function acquireEngineLock(stateDir) {
+  const lockFile = enginePidFile(stateDir);
+  const myPid = process.pid;
+  const stale = ownEnginePid(stateDir, myPid);
+  if (stale !== null) {
+    console.log(`[pid-lock] Stale engine PID ${stale} still alive (engine), killing tree...`);
+    killTree(stale);
   }
   try {
     fs11.mkdirSync(stateDir, { recursive: true });
@@ -23812,54 +23876,42 @@ function acquireEngineLock(stateDir) {
     process.exit(0);
   });
 }
-function isNodeEngineAlive(pid) {
-  try {
-    process.kill(pid, 0);
-  } catch {
-    return false;
-  }
-  try {
-    if (process.platform === "win32") {
-      const out = execSync2(`tasklist /FI "PID eq ${pid}" /NH /FO CSV`, {
-        encoding: "utf-8",
-        timeout: 3e3,
-        stdio: ["ignore", "pipe", "ignore"]
-      });
-      return /node\.exe/i.test(out);
-    } else if (process.platform === "darwin") {
-      const out = execSync2(`ps -p ${pid} -o comm=`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] });
-      return /node/.test(out);
-    }
-    return /node/.test(fs11.readFileSync(`/proc/${pid}/cmdline`, "utf-8"));
-  } catch {
-    return false;
-  }
+function pickParentPid(procStatus, psOutput) {
+  const fromProc = Number(/PPid:\s*(\d+)/.exec(procStatus ?? "")?.[1] ?? NaN);
+  if (Number.isInteger(fromProc) && fromProc > 0) return fromProc;
+  const fromPs = Number((psOutput ?? "").trim());
+  return Number.isInteger(fromPs) && fromPs > 0 ? fromPs : 0;
 }
 function killTree(pid) {
   try {
     if (process.platform === "win32") {
       execSync2(`taskkill /PID ${pid} /T /F`, { stdio: "ignore", timeout: 8e3 });
       try {
-        const parentPid = execSync2(`wmic process where ProcessId=${pid} get ParentProcessId /value`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).match(/ParentProcessId=(\d+)/)?.[1];
-        if (parentPid && parseInt(parentPid) !== process.ppid) {
+        const parentPid = parseInt(execSync2(`wmic process where ProcessId=${pid} get ParentProcessId /value`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).match(/ParentProcessId=(\d+)/)?.[1] ?? "0", 10);
+        if (parentPid && parentPid !== process.ppid && probeIsCliWrapper(parentPid)) {
           execSync2(`taskkill /PID ${parentPid} /F`, { stdio: "ignore", timeout: 3e3 });
         }
       } catch {
       }
     } else {
       process.kill(pid, "SIGKILL");
+      let parentPid = 0;
       try {
-        const ppid = parseInt(fs11.readFileSync(`/proc/${pid}/status`, "utf-8").match(/PPid:\s+(\d+)/)?.[1] || "0", 10);
-        const macPpid = parseInt(execSync2(`ps -p ${pid} -o ppid=`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).trim(), 10);
-        const parentPid = ppid || macPpid;
-        if (parentPid && parentPid > 1) {
-          try {
-            process.kill(parentPid, "SIGKILL");
-          } catch {
-          }
-        }
+        parentPid = pickParentPid(fs11.readFileSync(`/proc/${pid}/status`, "utf-8"), null);
       } catch {
       }
+      if (!parentPid) {
+        try {
+          parentPid = pickParentPid(null, execSync2(`ps -p ${pid} -o ppid=`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }));
+        } catch {
+        }
+      }
+      if (parentPid > 1 && parentPid !== process.ppid && probeIsCliWrapper(parentPid)) {
+        try {
+          process.kill(parentPid, "SIGKILL");
+        } catch {
+        }
+      }
     }
   } catch (err) {
     console.warn(`[pid-lock] kill ${pid} failed: ${err.message}`);

package/dist/main.mjs

@@ -24156,17 +24156,81 @@ import * as path16 from "node:path";
 import fs11 from "node:fs";
 import path11 from "node:path";
 import { execSync as execSync2 } from "node:child_process";
-function acquireEngineLock(stateDir) {
-  const lockFile = path11.join(stateDir, ".engine.pid");
-  const myPid = process.pid;
+function enginePidFile(stateDir) {
+  return path11.join(stateDir, ".engine.pid");
+}
+function isEngineImage(text) {
+  return /node|engine7|electron/i.test(text);
+}
+function isPidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function probeImage(pid) {
   try {
-    const oldPid = parseInt(fs11.readFileSync(lockFile, "utf-8").trim(), 10);
-    if (oldPid && oldPid !== myPid && isNodeEngineAlive(oldPid)) {
-      console.log(`[pid-lock] Stale engine PID ${oldPid} still alive (node), killing tree...`);
-      killTree(oldPid);
+    if (process.platform === "win32") {
+      return execSync2(`tasklist /FI "PID eq ${pid}" /NH /FO CSV`, {
+        encoding: "utf-8",
+        timeout: 3e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      });
     }
+    if (process.platform === "darwin") {
+      return execSync2(`ps -p ${pid} -o comm=`, {
+        encoding: "utf-8",
+        timeout: 3e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      });
+    }
+    return fs11.readFileSync(`/proc/${pid}/comm`, "utf-8");
+  } catch {
+    return null;
+  }
+}
+function probeEngineImage(pid) {
+  return isEngineImage(probeImage(pid) ?? "");
+}
+function isCliWrapperImage(text) {
+  return /node/i.test(text);
+}
+function probeIsCliWrapper(pid) {
+  return isCliWrapperImage(probeImage(pid) ?? "");
+}
+function readOwnEnginePidText(stateDir) {
+  try {
+    return fs11.readFileSync(enginePidFile(stateDir), "utf-8");
   } catch (err) {
     if (err?.code !== "ENOENT") console.warn(`[pid-lock] read lock failed: ${err.message}`);
+    return null;
+  }
+}
+function pickOwnEnginePid(probe) {
+  const pid = parseInt((probe.pidFileContent ?? "").trim(), 10);
+  if (!Number.isInteger(pid) || pid <= 0) return null;
+  if (pid === probe.myPid) return null;
+  if (!probe.isAlive(pid)) return null;
+  if (!probe.isEngineImage(pid)) return null;
+  return pid;
+}
+function ownEnginePid(stateDir, myPid = process.pid) {
+  return pickOwnEnginePid({
+    pidFileContent: readOwnEnginePidText(stateDir),
+    myPid,
+    isAlive: isPidAlive,
+    isEngineImage: probeEngineImage
+  });
+}
+function acquireEngineLock(stateDir) {
+  const lockFile = enginePidFile(stateDir);
+  const myPid = process.pid;
+  const stale = ownEnginePid(stateDir, myPid);
+  if (stale !== null) {
+    console.log(`[pid-lock] Stale engine PID ${stale} still alive (engine), killing tree...`);
+    killTree(stale);
   }
   try {
     fs11.mkdirSync(stateDir, { recursive: true });
@@ -24192,54 +24256,42 @@ function acquireEngineLock(stateDir) {
     process.exit(0);
   });
 }
-function isNodeEngineAlive(pid) {
-  try {
-    process.kill(pid, 0);
-  } catch {
-    return false;
-  }
-  try {
-    if (process.platform === "win32") {
-      const out = execSync2(`tasklist /FI "PID eq ${pid}" /NH /FO CSV`, {
-        encoding: "utf-8",
-        timeout: 3e3,
-        stdio: ["ignore", "pipe", "ignore"]
-      });
-      return /node\.exe/i.test(out);
-    } else if (process.platform === "darwin") {
-      const out = execSync2(`ps -p ${pid} -o comm=`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] });
-      return /node/.test(out);
-    }
-    return /node/.test(fs11.readFileSync(`/proc/${pid}/cmdline`, "utf-8"));
-  } catch {
-    return false;
-  }
+function pickParentPid(procStatus, psOutput) {
+  const fromProc = Number(/PPid:\s*(\d+)/.exec(procStatus ?? "")?.[1] ?? NaN);
+  if (Number.isInteger(fromProc) && fromProc > 0) return fromProc;
+  const fromPs = Number((psOutput ?? "").trim());
+  return Number.isInteger(fromPs) && fromPs > 0 ? fromPs : 0;
 }
 function killTree(pid) {
   try {
     if (process.platform === "win32") {
       execSync2(`taskkill /PID ${pid} /T /F`, { stdio: "ignore", timeout: 8e3 });
       try {
-        const parentPid = execSync2(`wmic process where ProcessId=${pid} get ParentProcessId /value`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).match(/ParentProcessId=(\d+)/)?.[1];
-        if (parentPid && parseInt(parentPid) !== process.ppid) {
+        const parentPid = parseInt(execSync2(`wmic process where ProcessId=${pid} get ParentProcessId /value`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).match(/ParentProcessId=(\d+)/)?.[1] ?? "0", 10);
+        if (parentPid && parentPid !== process.ppid && probeIsCliWrapper(parentPid)) {
           execSync2(`taskkill /PID ${parentPid} /F`, { stdio: "ignore", timeout: 3e3 });
         }
       } catch {
       }
     } else {
       process.kill(pid, "SIGKILL");
+      let parentPid = 0;
       try {
-        const ppid = parseInt(fs11.readFileSync(`/proc/${pid}/status`, "utf-8").match(/PPid:\s+(\d+)/)?.[1] || "0", 10);
-        const macPpid = parseInt(execSync2(`ps -p ${pid} -o ppid=`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }).trim(), 10);
-        const parentPid = ppid || macPpid;
-        if (parentPid && parentPid > 1) {
-          try {
-            process.kill(parentPid, "SIGKILL");
-          } catch {
-          }
-        }
+        parentPid = pickParentPid(fs11.readFileSync(`/proc/${pid}/status`, "utf-8"), null);
       } catch {
       }
+      if (!parentPid) {
+        try {
+          parentPid = pickParentPid(null, execSync2(`ps -p ${pid} -o ppid=`, { encoding: "utf-8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] }));
+        } catch {
+        }
+      }
+      if (parentPid > 1 && parentPid !== process.ppid && probeIsCliWrapper(parentPid)) {
+        try {
+          process.kill(parentPid, "SIGKILL");
+        } catch {
+        }
+      }
     }
   } catch (err) {
     console.warn(`[pid-lock] kill ${pid} failed: ${err.message}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "engine7",
   "license": "Apache-2.0",
-  "version": "7.1.117",
+  "version": "7.1.119",
   "type": "module",
   "description": "Engine 7 — 给助手一个家 / A home for your AI assistant",
   "main": "dist/main.mjs",