fix: skip stale post-switch update follow-ups

Author: steipete

src/cli/update-cli.test.ts

@@ -1013,6 +1013,9 @@ describe("update-cli", () => {
 
   it("skips plugin sync in the old process after switching from package to git", async () => {
     const tempDir = createCaseDir("openclaw-update");
+    const completionCacheSpy = vi
+      .spyOn(updateCliShared, "tryWriteCompletionCache")
+      .mockResolvedValue(undefined);
     mockPackageInstallStatus(tempDir);
     vi.mocked(runGatewayUpdate).mockResolvedValue(
       makeOkUpdateResult({
@@ -1021,6 +1024,7 @@ describe("update-cli", () => {
         after: { version: "2026.4.5" },
       }),
     );
+    serviceLoaded.mockResolvedValue(true);
     syncPluginsForUpdateChannel.mockRejectedValue(
       new Error("Config validation failed: old host version"),
     );
@@ -1029,6 +1033,9 @@ describe("update-cli", () => {
 
     expect(syncPluginsForUpdateChannel).not.toHaveBeenCalled();
     expect(replaceConfigFile).not.toHaveBeenCalled();
+    expect(completionCacheSpy).not.toHaveBeenCalled();
+    expect(runRestartScript).not.toHaveBeenCalled();
+    expect(runDaemonRestart).not.toHaveBeenCalled();
     expect(defaultRuntime.exit).not.toHaveBeenCalledWith(1);
     expect(
       vi
@@ -1038,6 +1045,14 @@ describe("update-cli", () => {
     ).toContain(
       "Skipped plugin update sync in the pre-update CLI process after switching to a git install.",
     );
+    expect(
+      vi
+        .mocked(defaultRuntime.log)
+        .mock.calls.map((call) => String(call[0]))
+        .join("\n"),
+    ).toContain(
+      "Skipped completion/restart follow-ups in the pre-update CLI process after switching to a git install.",
+    );
   });
   it("explains why git updates cannot run with edited files", async () => {
     vi.mocked(defaultRuntime.log).mockClear();

src/cli/update-cli/update-command.ts

@@ -1075,11 +1075,15 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     }
   }
 
+  const postUpdateRoot = result.root;
+
   // A package -> git switch still runs inside the pre-update CLI process.
-  // Plugin sync/validation can then compare new bundled plugin minima against
-  // the old host version and fail even though the install itself succeeded.
-  const deferPluginSync = switchToGit && result.mode === "git";
-  if (deferPluginSync) {
+  // Any follow-up work that re-enters the CLI can then compare new bundled
+  // plugin minima against the old host version and fail even though the
+  // install itself succeeded. Leave the switched checkout alone and let the
+  // new git install handle follow-up commands in a fresh process.
+  const deferOldProcessPostUpdateWork = switchToGit && result.mode === "git";
+  if (deferOldProcessPostUpdateWork) {
     if (!opts.json) {
       defaultRuntime.log(
         theme.muted(
@@ -1089,28 +1093,38 @@ export async function updateCommand(opts: UpdateCommandOptions): Promise<void> {
     }
   } else {
     await updatePluginsAfterCoreUpdate({
-      root,
+      root: postUpdateRoot,
       channel,
       configSnapshot: postUpdateConfigSnapshot,
       opts,
     });
   }
 
-  await tryWriteCompletionCache(root, Boolean(opts.json));
-  await tryInstallShellCompletion({
-    jsonMode: Boolean(opts.json),
-    skipPrompt: Boolean(opts.yes),
-  });
+  if (deferOldProcessPostUpdateWork) {
+    if (!opts.json) {
+      defaultRuntime.log(
+        theme.muted(
+          "Skipped completion/restart follow-ups in the pre-update CLI process after switching to a git install.",
+        ),
+      );
+    }
+  } else {
+    await tryWriteCompletionCache(postUpdateRoot, Boolean(opts.json));
+    await tryInstallShellCompletion({
+      jsonMode: Boolean(opts.json),
+      skipPrompt: Boolean(opts.yes),
+    });
 
-  await maybeRestartService({
-    shouldRestart,
-    result,
-    opts,
-    refreshServiceEnv: refreshGatewayServiceEnv,
-    gatewayPort,
-    restartScriptPath,
-    invocationCwd,
-  });
+    await maybeRestartService({
+      shouldRestart,
+      result,
+      opts,
+      refreshServiceEnv: refreshGatewayServiceEnv,
+      gatewayPort,
+      restartScriptPath,
+      invocationCwd,
+    });
+  }
 
   if (!opts.json) {
     defaultRuntime.log(theme.muted(pickUpdateQuip()));