fix: use triggerOpenClawRestart for Windows unmanaged gateway restart

Thatgfsj · Thatgfsj · commit fa95f44788ec · 2026-05-20T04:13:29.000+08:00
On Windows, neither SIGUSR1 nor SIGTERM are safe for cross-process
restart signaling: SIGUSR1 is unsupported, and Node.js unconditionally
terminates the target process on SIGTERM, bypassing any JS-level
handler. Instead, use the existing triggerOpenClawRestart() path
(schtasks-based handoff) which is the established Windows restart
mechanism. If it fails (e.g. no scheduled task installed), the error
message directs the user to run "openclaw gateway install".

Per ClawSweeper P1 review feedback — the SIGTERM substitution was
incorrect because: "Node v26 docs state that process.kill() with
SIGTERM on Windows causes unconditional termination of the target
process" so the gateway's SIGTERM handler would never run.
diff --git a/src/cli/daemon-cli/lifecycle.test.ts b/src/cli/daemon-cli/lifecycle.test.ts
@@ -38,6 +38,10 @@ const renderRestartDiagnostics = vi.fn(() => ["diag: unhealthy runtime"]);
 const resolveGatewayPort = vi.hoisted(() => vi.fn((_cfg?: unknown, _env?: unknown) => 18789));
 const findVerifiedGatewayListenerPidsOnPortSync = vi.fn<(port: number) => number[]>(() => []);
 const signalVerifiedGatewayPidSync = vi.fn<(pid: number, signal: "SIGTERM" | "SIGUSR1") => void>();
+const triggerOpenClawRestart = vi.fn<() => { ok: boolean; method: string; detail?: string; tried?: string[] }>(() => ({
+  ok: true,
+  method: "schtasks",
+}));
 const formatGatewayPidList = vi.fn<(pids: number[]) => string>((pids) => pids.join(", "));
 const probeGateway = vi.fn<
   (opts: {
@@ -93,6 +97,11 @@ vi.mock("../../infra/gateway-processes.js", () => ({
   formatGatewayPidList: (pids: number[]) => formatGatewayPidList(pids),
 }));
 
+vi.mock("../../infra/restart.js", () => ({
+  writeGatewayRestartIntentSync: vi.fn(),
+  triggerOpenClawRestart: () => triggerOpenClawRestart(),
+}));
+
 vi.mock("../../gateway/probe.js", () => ({
   probeGateway: (opts: {
     url: string;
@@ -535,19 +544,18 @@ describe("runDaemonRestart health checks", () => {
     expect(service.restart).not.toHaveBeenCalled();
   });
 
-  it("uses SIGTERM for unmanaged gateway restart on Windows", async () => {
+  it("uses scheduled task restart for unmanaged gateway restart on Windows", async () => {
     vi.spyOn(process, "platform", "get").mockReturnValue("win32");
     findVerifiedGatewayListenerPidsOnPortSync.mockReturnValue([4200]);
     mockUnmanagedRestart({ runPostRestartCheck: true });
 
     await runDaemonRestart({ json: true });
 
     expect(findVerifiedGatewayListenerPidsOnPortSync).toHaveBeenCalledWith(18789);
-    // SIGUSR1 is unsupported on Windows; SIGTERM is sent instead.
-    // The gateway's SIGTERM handler reads the restart intent file (written
-    // before signaling) and triggers a restart rather than a stop.
-    expect(signalVerifiedGatewayPidSync).toHaveBeenCalledWith(4200, "SIGTERM");
-    expect(signalVerifiedGatewayPidSync).not.toHaveBeenCalledWith(4200, "SIGUSR1");
+    // On Windows, SIGUSR1 is unsupported for cross-process signaling.
+    // triggerOpenClawRestart() uses the scheduled-task restart handoff.
+    expect(triggerOpenClawRestart).toHaveBeenCalledOnce();
+    expect(signalVerifiedGatewayPidSync).not.toHaveBeenCalled();
     expect(probeGateway).toHaveBeenCalledTimes(1);
     expect(waitForGatewayHealthyListener).toHaveBeenCalledTimes(1);
     expect(waitForGatewayHealthyRestart).not.toHaveBeenCalled();
diff --git a/src/cli/daemon-cli/lifecycle.ts b/src/cli/daemon-cli/lifecycle.ts
@@ -9,7 +9,11 @@ import {
   signalVerifiedGatewayPidSync,
 } from "../../infra/gateway-processes.js";
 import type { SafeGatewayRestartRequestResult } from "../../infra/restart-coordinator.js";
-import { type GatewayRestartIntent, writeGatewayRestartIntentSync } from "../../infra/restart.js";
+import {
+  type GatewayRestartIntent,
+  triggerOpenClawRestart,
+  writeGatewayRestartIntentSync,
+} from "../../infra/restart.js";
 import { defaultRuntime } from "../../runtime.js";
 import { normalizeOptionalString } from "../../shared/string-coerce.js";
 import { theme } from "../../terminal/theme.js";
@@ -211,13 +215,23 @@ async function restartGatewayWithoutServiceManager(
     reason: "gateway.restart",
     ...(restartIntent ? { intent: restartIntent } : {}),
   });
-  // On Windows, SIGUSR1 is not supported; use SIGTERM instead.
-  // The gateway's SIGTERM handler reads the restart intent file written above
-  // and triggers a draining restart (instead of stopping) when the intent is present.
-  signalVerifiedGatewayPidSync(
-    pids[0],
-    process.platform === "win32" ? "SIGTERM" : "SIGUSR1",
-  );
+  // On Windows, SIGUSR1 is not supported for cross-process signaling.
+  // Node.js unconditionally terminates the target on Windows for SIGTERM too,
+  // so we must use the scheduled-task restart handoff instead.
+  if (process.platform === "win32") {
+    const result = triggerOpenClawRestart();
+    if (!result.ok) {
+      throw new Error(
+        `Gateway restart failed on Windows: ${result.detail ?? "unknown error"}. ` +
+          `Run "openclaw gateway install" to set up the Windows scheduled task.`,
+      );
+    }
+    return {
+      result: "restarted" as const,
+      message: `Gateway restart triggered via ${result.method} on port ${port}: ${pids[0]}.`,
+    };
+  }
+  signalVerifiedGatewayPidSync(pids[0], "SIGUSR1");
   return {
     result: "restarted" as const,
     message: `Gateway restart signal sent to unmanaged process on port ${port}: ${pids[0]}.`,
