engine7 7.1.5 → 7.1.7

package/dist/cli.mjs

@@ -447,7 +447,8 @@ async function main() {
     printHelp();
     process.exit(0);
   }
-  if (subcommand === "start") {
+  if (subcommand === "start" || subcommand === "restart") {
+    const label = subcommand === "restart" ? "\u{1F504} engine7 restart" : "\u{1F680} engine7 start";
     let configPath2 = "";
     for (let i = 1; i < args.length; i++) {
       if (args[i] === "--config" && args[i + 1]) {
@@ -512,7 +513,7 @@ engine7 start \u2014 \u542F\u52A8 Engine
         }
       }
     }
-    console.log(`\u{1F680} engine7 start`);
+    console.log(label);
     console.log(`   config: ${configPath2}`);
     console.log(`   engine: ${enginePath}`);
     const configName = path.basename(configPath2);
@@ -539,56 +540,6 @@ engine7 start \u2014 \u542F\u52A8 Engine
     child.on("exit", (code) => process.exit(code ?? 1));
     return;
   }
-  if (subcommand === "restart") {
-    const { execSync } = await import("node:child_process");
-    const myPid = process.pid;
-    console.log("\u{1F504} engine7 restart");
-    try {
-      if (process.platform === "win32") {
-        execSync(`powershell -Command "Get-WmiObject Win32_Process | Where-Object { $_.Name -eq 'node.exe' -and $_.CommandLine -like '*dist/main.mjs*' -and $_.ProcessId -ne ${myPid} } | ForEach-Object { Write-Host '[restart] Killing PID' $_.ProcessId; Stop-Process -Id $_.ProcessId -Force }"`, { stdio: "inherit" });
-      } else {
-        const pids = execSync(`pgrep -f "dist/main.mjs" 2>/dev/null || true`, { encoding: "utf-8" }).trim();
-        const otherPids = pids.split("\n").filter((p) => p && p.trim() !== String(myPid)).join("\n").trim();
-        if (otherPids) {
-          console.log(`[restart] Killing existing engine (PID: ${otherPids})...`);
-          execSync(`echo "${otherPids}" | xargs kill -9 2>/dev/null || true`);
-          await new Promise((r) => setTimeout(r, 2e3));
-        }
-      }
-    } catch {
-    }
-    let configPath2 = "";
-    for (let i = 1; i < args.length; i++) {
-      if (args[i] === "--config" && args[i + 1]) configPath2 = args[++i];
-    }
-    if (!configPath2) {
-      const defaultCfg = path.join("configs", "main7.json");
-      const homeCfg = path.join(process.env.HOME || process.env.USERPROFILE || ".", ".engine7", "configs", "main7.json");
-      if (fs.existsSync(defaultCfg)) configPath2 = defaultCfg;
-      else if (fs.existsSync(homeCfg)) configPath2 = homeCfg;
-      else {
-        const ptr = readHomePointer();
-        if (ptr?.stateDir) {
-          const ptrCfg = path.join(ptr.stateDir, "configs", "main7.json");
-          if (fs.existsSync(ptrCfg)) configPath2 = ptrCfg;
-        }
-      }
-    }
-    if (!configPath2) {
-      console.error("\u274C \u627E\u4E0D\u5230 config");
-      process.exit(1);
-    }
-    const cliPath = path.resolve(process.argv[1]);
-    const distDir = path.dirname(cliPath);
-    const enginePath = fs.existsSync(path.join(distDir, "main.mjs")) ? path.join(distDir, "main.mjs") : path.join(path.dirname(path.dirname(cliPath)), "lib", "node_modules", "engine7", "dist", "main.mjs");
-    console.log(`   config: ${configPath2}`);
-    console.log(`   engine: ${enginePath}`);
-    console.log("");
-    const { spawn } = await import("node:child_process");
-    const child = spawn(process.execPath, [enginePath, "--engine-config", configPath2], { stdio: "inherit", shell: false });
-    child.on("exit", (code) => process.exit(code ?? 1));
-    return;
-  }
   if (subcommand === "service") {
     const action = args[1];
     if (!action || action === "--help" || action === "-h") {

package/dist/engine-startup.mjs

@@ -29646,8 +29646,27 @@ function killTree(pid) {
   try {
     if (process.platform === "win32") {
       execSync(`taskkill /PID ${pid} /T /F`, { stdio: "ignore", timeout: 8e3 });
+      try {
+        const parentPid = execSync(`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) {
+          execSync(`taskkill /PID ${parentPid} /F`, { stdio: "ignore", timeout: 3e3 });
+        }
+      } catch {
+      }
     } else {
       process.kill(pid, "SIGKILL");
+      try {
+        const ppid = parseInt(fs.readFileSync(`/proc/${pid}/status`, "utf-8").match(/PPid:\s+(\d+)/)?.[1] || "0", 10);
+        const macPpid = parseInt(execSync(`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 {
+          }
+        }
+      } catch {
+      }
     }
   } catch (err) {
     console.warn(`[pid-lock] kill ${pid} failed: ${err.message}`);

package/dist/main.mjs

@@ -30004,8 +30004,27 @@ function killTree(pid) {
   try {
     if (process.platform === "win32") {
       execSync(`taskkill /PID ${pid} /T /F`, { stdio: "ignore", timeout: 8e3 });
+      try {
+        const parentPid = execSync(`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) {
+          execSync(`taskkill /PID ${parentPid} /F`, { stdio: "ignore", timeout: 3e3 });
+        }
+      } catch {
+      }
     } else {
       process.kill(pid, "SIGKILL");
+      try {
+        const ppid = parseInt(fs2.readFileSync(`/proc/${pid}/status`, "utf-8").match(/PPid:\s+(\d+)/)?.[1] || "0", 10);
+        const macPpid = parseInt(execSync(`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 {
+          }
+        }
+      } catch {
+      }
     }
   } catch (err) {
     console.warn(`[pid-lock] kill ${pid} failed: ${err.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engine7",
-  "version": "7.1.5",
+  "version": "7.1.7",
   "type": "module",
   "description": "Engine 7 — Self-hosted AI agent engine",
   "main": "dist/main.mjs",