fix: normalize detached update swap failures

IAMSamuelRodda · IAMSamuelRodda · commit 4224f5bc48ca · 2026-05-02T09:49:26.000+09:30
diff --git a/src/gateway/server-restart-sentinel.test.ts b/src/gateway/server-restart-sentinel.test.ts
@@ -500,7 +500,7 @@ describe("scheduleRestartSentinelWake", () => {
           message: "continue",
         },
       },
-    } as unknown as Awaited<ReturnType<typeof mocks.readRestartSentinel>>);
+    });
 
     const wakePromise = scheduleRestartSentinelWake({ deps: {} as never });
     await Promise.resolve();
@@ -535,7 +535,7 @@ describe("scheduleRestartSentinelWake", () => {
         } as never,
         threadId: "fresh-thread",
       },
-    } as unknown as Awaited<ReturnType<typeof mocks.readRestartSentinel>>);
+    });
 
     await scheduleRestartSentinelWake({ deps: {} as never });
 
@@ -796,7 +796,7 @@ describe("scheduleRestartSentinelWake", () => {
           message: "continue",
         },
       },
-    } as unknown as Awaited<ReturnType<typeof mocks.readRestartSentinel>>);
+    });
     mocks.deliveryContextFromSession.mockReturnValue({
       channel: "telegram",
       to: "telegram:200482621",
@@ -1048,9 +1048,7 @@ describe("scheduleRestartSentinelWake", () => {
           },
         },
       } as Awaited<ReturnType<typeof mocks.readRestartSentinel>>)
-      .mockResolvedValueOnce(
-        null as unknown as Awaited<ReturnType<typeof mocks.readRestartSentinel>>,
-      );
+      .mockResolvedValueOnce(null);
 
     await scheduleRestartSentinelWake({ deps: {} as never });
     await scheduleRestartSentinelWake({ deps: {} as never });
@@ -1063,7 +1061,7 @@ describe("scheduleRestartSentinelWake", () => {
       payload: {
         message: "restart message",
       },
-    } as unknown as Awaited<ReturnType<typeof mocks.readRestartSentinel>>);
+    });
 
     await scheduleRestartSentinelWake({ deps: {} as never });
 
@@ -1083,7 +1081,7 @@ describe("scheduleRestartSentinelWake", () => {
           message: "continue",
         },
       },
-    } as unknown as Awaited<ReturnType<typeof mocks.readRestartSentinel>>);
+    });
 
     await scheduleRestartSentinelWake({ deps: {} as never });
 
diff --git a/src/infra/update-runner.test.ts b/src/infra/update-runner.test.ts
@@ -8,7 +8,7 @@ import { withEnvAsync } from "../test-utils/env.js";
 import { pathExists } from "../utils.js";
 import { writePackageDistInventory } from "./package-dist-inventory.js";
 import { resolveStableNodePath } from "./stable-node-path.js";
-import { runGatewayUpdate } from "./update-runner.js";
+import { normalizeFallbackFailureReason, runGatewayUpdate } from "./update-runner.js";
 
 type CommandResponse = { stdout?: string; stderr?: string; code?: number | null };
 type CommandResult = { stdout: string; stderr: string; code: number | null };
@@ -1783,3 +1783,11 @@ describe("runGatewayUpdate", () => {
     expect(result.reason).toBe("ui-assets-missing");
   });
 });
+
+describe("normalizeFallbackFailureReason", () => {
+  it("reports detached staged npm swap failures as global install failures", () => {
+    expect(normalizeFallbackFailureReason("global install swap (detached win32)")).toBe(
+      "global-install-failed",
+    );
+  });
+});
diff --git a/src/infra/update-runner.ts b/src/infra/update-runner.ts
@@ -571,13 +571,18 @@ function shouldRunDevPreflightLint(): boolean {
   return process.platform !== "win32";
 }
 
-function normalizeFallbackFailureReason(stepName: string): NonNullable<UpdateRunResult["reason"]> {
+export function normalizeFallbackFailureReason(
+  stepName: string,
+): NonNullable<UpdateRunResult["reason"]> {
+  if (stepName === "global install swap" || stepName.startsWith("global install swap ")) {
+    return "global-install-failed";
+  }
+
   switch (stepName) {
     case "global update":
     case "global update (omit optional)":
     case "global install stage":
     case "global install verify":
-    case "global install swap":
       return "global-install-failed";
     case "openclaw doctor":
       return "doctor-failed";
