engine7 7.1.1 → 7.1.3

package/dist/cli.mjs

@@ -39,6 +39,7 @@ Engine 7 \u2014 Self-hosted AI agent engine
 \u7528\u6CD5:
   engine7 init --state-dir <path> [\u9009\u9879]   \u521D\u59CB\u5316 agent \u5DE5\u4F5C\u76EE\u5F55
   engine7 start [--config <path>]          \u542F\u52A8 Engine
+  engine7 restart [--config <path>]        \u91CD\u542F Engine\uFF08\u6740\u65E7\u8FDB\u7A0B+\u542F\u52A8\uFF09
   engine7 service install|uninstall|status \u5F00\u673A\u81EA\u542F\u52A8\u7BA1\u7406
 
 init \u9009\u9879:
@@ -515,14 +516,16 @@ engine7 start \u2014 \u542F\u52A8 Engine
     console.log(`   config: ${configPath2}`);
     console.log(`   engine: ${enginePath}`);
     const configName = path.basename(configPath2);
+    const myPid = process.pid;
     try {
       if (process.platform === "win32") {
-        execSync(`powershell -Command "Get-WmiObject Win32_Process | Where-Object { $_.Name -eq 'node.exe' -and $_.CommandLine -like '*${configName}*' -and $_.CommandLine -like '*dist*' } | ForEach-Object { Write-Host '[start] Killing PID' $_.ProcessId; Stop-Process -Id $_.ProcessId -Force }"`, { stdio: "inherit" });
+        execSync(`powershell -Command "Get-WmiObject Win32_Process | Where-Object { $_.Name -eq 'node.exe' -and $_.CommandLine -like '*${configName}*' -and $_.CommandLine -like '*dist*' -and $_.ProcessId -ne ${myPid} } | ForEach-Object { Write-Host '[start] Killing PID' $_.ProcessId; Stop-Process -Id $_.ProcessId -Force }"`, { stdio: "inherit" });
       } else {
-        const pids = execSync(`pgrep -f "${configName}.*dist/main.mjs" 2>/dev/null || true`, { encoding: "utf-8" }).trim();
-        if (pids) {
-          console.log(`[start] Killing existing engine (PID: ${pids})...`);
-          execSync(`echo "${pids}" | xargs kill -9 2>/dev/null || true`);
+        const pids = execSync(`pgrep -f "dist/main.mjs.*${configName}" 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(`[start] Killing existing engine (PID: ${otherPids})...`);
+          execSync(`echo "${otherPids}" | xargs kill -9 2>/dev/null || true`);
           await new Promise((r) => setTimeout(r, 2e3));
         }
       }
@@ -536,6 +539,55 @@ 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 enginePath = path.join(path.dirname(cliPath), "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/main.mjs

@@ -23347,9 +23347,9 @@ var init_handler = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname10 = sp.dirname(file);
+        const dirname11 = sp.dirname(file);
         const basename9 = sp.basename(file);
-        const parent = this.fsw._getWatchedDir(dirname10);
+        const parent = this.fsw._getWatchedDir(dirname11);
         let prevStats = stats2;
         if (parent.has(basename9))
           return;
@@ -23376,7 +23376,7 @@ var init_handler = __esm({
                 prevStats = newStats2;
               }
             } catch (error) {
-              this.fsw._remove(dirname10, basename9);
+              this.fsw._remove(dirname11, basename9);
             }
           } else if (parent.has(basename9)) {
             const at = newStats.atimeMs;
@@ -35974,8 +35974,8 @@ ${text}` : text });
   console.log(`[${sessionId}] >>> query start (${messages.length} msgs in history)`);
   try {
     const { writeFileSync: writeFileSync17 } = await import("node:fs");
-    const { join: join41 } = await import("node:path");
-    const contextPath = join41(workspace, ".context-debug.txt");
+    const { join: join42 } = await import("node:path");
+    const contextPath = join42(workspace, ".context-debug.txt");
     const lines = [
       "=== Context Debug ===",
       `Time: ${(/* @__PURE__ */ new Date()).toISOString()}`,
@@ -45934,8 +45934,8 @@ function startConfigWatcher(config2, deps, provider) {
   }
   if (!fs53.existsSync(configPath2)) {
     const __filename2 = fileURLToPath(import.meta.url);
-    const __dirname2 = path54.dirname(__filename2);
-    configPath2 = path54.resolve(__dirname2, "..", raw);
+    const __dirname22 = path54.dirname(__filename2);
+    configPath2 = path54.resolve(__dirname22, "..", raw);
   }
   if (!fs53.existsSync(configPath2)) {
     console.warn(`[config-watch] config path invalid: ${configPath2}, watcher disabled`);
@@ -45982,6 +45982,11 @@ function startConfigWatcher(config2, deps, provider) {
 }
 
 // src/main.ts
+import { readFileSync as readFileSync28 } from "node:fs";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { dirname as dirname10, join as join41 } from "node:path";
+var __dirname2 = dirname10(fileURLToPath2(import.meta.url));
+var pkg = JSON.parse(readFileSync28(join41(__dirname2, "..", "package.json"), "utf-8"));
 var epipeSeen = false;
 process.on("uncaughtException", (err) => {
   const code = err?.code ?? "";
@@ -46055,7 +46060,7 @@ if (args[0] === "features") {
   process.exit(0);
 }
 var config = loadConfig(configPath);
-console.log("=== OpenClaw Engine v0.1 ===");
+console.log(`=== Engine 7 v${pkg.version} ===`);
 console.log(`PID: ${process.pid}`);
 console.log(configSummary(config));
 startEngine(config, { cliMode: true }).catch((err) => {

package/package.json

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