From e1c4c3151cf8a785b42daed2b31cfa0f97d4e7ce Mon Sep 17 00:00:00 2001
From: Shakker <shakkerdroid@gmail.com>
Date: Wed, 10 Jun 2026 20:01:25 +0100
Subject: [PATCH] fix: keep gateway stopped after plugin update failure

---
 src/cli/update-cli.test.ts           | 19 +++++--------------
 src/cli/update-cli/update-command.ts |  4 ----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/cli/update-cli.test.ts b/src/cli/update-cli.test.ts
index b88a629ee77..f5d5f8ff78f 100644
--- a/src/cli/update-cli.test.ts
+++ b/src/cli/update-cli.test.ts
@@ -1011,7 +1011,7 @@ describe("update-cli", () => {
     expect(defaultRuntime.exit).not.toHaveBeenCalledWith(1);
   });
 
-  it("restarts a stopped managed gateway after post-core plugin errors", async () => {
+  it("does not restart a stopped managed gateway after post-core plugin errors", async () => {
     const root = createCaseDir("openclaw-update");
     const entryPath = path.join(root, "dist", "index.js");
     mockPackageInstallStatus(root);
@@ -1071,14 +1071,9 @@ describe("update-cli", () => {
     await updateCommand({ yes: true });
 
     expect(serviceStop).toHaveBeenCalled();
-    expect(serviceRestart).toHaveBeenCalledTimes(1);
+    expect(serviceRestart).not.toHaveBeenCalled();
     expect(runDaemonRestart).not.toHaveBeenCalled();
     expect(defaultRuntime.exit).toHaveBeenCalledWith(1);
-    expect(
-      requireValue(serviceStop.mock.invocationCallOrder[0], "service stop call order"),
-    ).toBeLessThan(
-      requireValue(serviceRestart.mock.invocationCallOrder[0], "service restart call order"),
-    );
   });
 
   it("does not carry gateway service markers into the post-core update process", async () => {
@@ -2916,7 +2911,7 @@ describe("update-cli", () => {
     expect(runGatewayUpdate).toHaveBeenCalledTimes(1);
   });
 
-  it("restarts a stopped git service before exiting on plugin post-update failure", async () => {
+  it("leaves a stopped git service down when plugin post-update fails", async () => {
     const serviceEntrypoint = path.join(process.cwd(), "dist", "index.js");
     const invalidPostUpdateSnapshot: ConfigFileSnapshot = {
       ...baseSnapshot,
@@ -2946,13 +2941,9 @@ describe("update-cli", () => {
     await updateCommand({ yes: true });
 
     expect(serviceStop).toHaveBeenCalledTimes(1);
-    expect(serviceRestart).toHaveBeenCalledTimes(1);
+    expect(serviceRestart).not.toHaveBeenCalled();
+    expect(runDaemonRestart).not.toHaveBeenCalled();
     expect(defaultRuntime.exit).toHaveBeenCalledWith(1);
-    expect(
-      requireValue(serviceStop.mock.invocationCallOrder[0], "service stop call order"),
-    ).toBeLessThan(
-      requireValue(serviceRestart.mock.invocationCallOrder[0], "service restart call order"),
-    );
   });
 
   it("keeps managed service stop output off stdout during json package updates", async () => {
diff --git a/src/cli/update-cli/update-command.ts b/src/cli/update-cli/update-command.ts
index b75fde553c7..70ada82a317 100644
--- a/src/cli/update-cli/update-command.ts
+++ b/src/cli/update-cli/update-command.ts
@@ -3757,10 +3757,6 @@ async function updateCommandInternal(opts: UpdateCommandOptions): Promise<void>
       result: resultWithPostUpdate,
       jsonMode: Boolean(opts.json),
     });
-    await maybeRestartServiceAfterFailedMutableUpdate({
-      preManagedServiceStop,
-      jsonMode: Boolean(opts.json),
-    });
     if (opts.json) {
       defaultRuntime.writeJson(resultWithPostUpdate);
     } else {