fix(ui): treat started managed-service handoff as pending update instead of skipped

xydigit-sj · xydigit-sj · commit 1c92f2ace374 · 2026-07-09T15:30:03.000+08:00
diff --git a/ui/src/app/overlays.test.ts b/ui/src/app/overlays.test.ts
@@ -145,22 +145,54 @@ describe("application approval overlays", () => {
 });
 
 describe("application update overlays", () => {
-  it("surfaces a coalesced restart while reconnect verification remains active", async () => {
+  it("treats a started managed-service handoff as pending update instead of skipped", async () => {
     const request = vi.fn<RequestFn>().mockResolvedValue({
       ok: true,
-      restart: { coalesced: true },
-      result: { status: "ok", after: { version: "2.0.0" } },
+      result: {
+        status: "skipped",
+        reason: "managed-service-handoff-started",
+        before: { version: "1.0.0" },
+      },
+      handoff: { status: "started", command: "openclaw update --yes --timeout 1800" },
     });
     const harness = createGatewayHarness(client(request));
+    harness.update({
+      hello: {
+        snapshot: {
+          updateAvailable: {
+            currentVersion: "1.0.0",
+            latestVersion: "2.0.0",
+            channel: "latest",
+          },
+        },
+      },
+    } as unknown as Partial<ApplicationGatewaySnapshot>);
     const overlays = createApplicationOverlays(harness.gateway);
 
     await overlays.runUpdate();
 
     expect(request).toHaveBeenCalledWith("update.run", {});
-    expect(overlays.snapshot.updateStatusBanner).toEqual({
-      tone: "info",
-      text: "Update installed. A gateway restart is already in progress; status will refresh after it reconnects.",
+    expect(overlays.snapshot.updateStatusBanner).toBeNull();
+    expect(overlays.snapshot.updateRunning).toBe(false);
+    overlays.dispose();
+  });
+
+  it("falls back to null expected version when handoff has no after and no updateAvailable", async () => {
+    const request = vi.fn<RequestFn>().mockResolvedValue({
+      ok: true,
+      result: {
+        status: "skipped",
+        reason: "managed-service-handoff-started",
+      },
+      handoff: { status: "started", command: "openclaw update --yes --timeout 1800" },
     });
+    const harness = createGatewayHarness(client(request));
+    const overlays = createApplicationOverlays(harness.gateway);
+
+    await overlays.runUpdate();
+
+    expect(request).toHaveBeenCalledWith("update.run", {});
+    expect(overlays.snapshot.updateStatusBanner).toBeNull();
     expect(overlays.snapshot.updateRunning).toBe(false);
     overlays.dispose();
   });
diff --git a/ui/src/app/overlays.ts b/ui/src/app/overlays.ts
@@ -126,6 +126,8 @@ function resolveUpdateStatusBanner(params: {
       "restart-unhealthy":
         "The replacement process never became healthy. The previous process stayed up so you can recover.",
       "doctor-failed": "Doctor repair failed. Run `openclaw doctor --non-interactive` and retry.",
+      "managed-service-handoff-started":
+        "The update was handed off to the host service. The gateway will restart automatically when the update completes.",
     }[reason] ?? "See the gateway logs for the exact failure and retry once the cause is fixed.";
   return {
     tone: status === "skipped" ? "warn" : "danger",
@@ -508,7 +510,10 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
           return;
         }
         const status = response.result?.status ?? (response.ok === true ? "ok" : "error");
-        const expectedVersion = response.result?.after?.version?.trim() || null;
+        const expectedVersion =
+          response.result?.after?.version?.trim() ||
+          snapshot.updateAvailable?.latestVersion?.trim() ||
+          null;
         if (
           response.ok === true &&
           status === "skipped" &&
