diff --git a/packages/gui-extensions/src/updater/actions.tsx b/packages/gui-extensions/src/updater/actions.tsx
index abce10e2c42..3ba5c518d13 100644
--- a/packages/gui-extensions/src/updater/actions.tsx
+++ b/packages/gui-extensions/src/updater/actions.tsx
@@ -1,7 +1,7 @@
import { Button } from "@opencode/ui/button"
import { Dialog, DialogFooter, DialogHeader, DialogTitleGroup } from "@opencode/ui/dialog"
import { Icon } from "@opencode/ui/icon"
-import { showToast } from "@opencode/ui/toast"
+import { showToast, toaster } from "@opencode/ui/toast"
import type { DialogHandle, IpcClient, SetupContext } from "../sdk"
import type { Updater } from "./contract"
import type definition from "./index"
@@ -29,29 +29,38 @@ export function install(ctx: Context, client: Client) {
}
export async function check(ctx: Context, client: Client) {
+ const checking = showToast({ variant: "loading", title: ctx.t("action.checking") })
+
const state = await client
.check({ signal: ctx.signal })
.catch((cause: unknown) => requestFailed(ctx, cause))
+ .finally(() => toaster.dismiss(checking))
if (!state || ctx.signal.aborted) return
- if (state.status === "download-required") {
- install(ctx, client)
-
- return
- }
-
- if (state.status === "up-to-date") {
- showToast({
- variant: "success",
- icon: () => ,
- title: ctx.t("toast.latest.title"),
- description: ctx.t("toast.latest.description", { version: ctx.build.version }),
- })
- }
-
- if (state.status === "error") {
- showToast({ title: ctx.t("common.requestFailed"), description: state.message })
+ // Every settled check says what happened; only an install already underway stays quiet.
+ switch (state.status) {
+ case "download-required":
+ return install(ctx, client)
+ case "up-to-date":
+ return void showToast({
+ variant: "success",
+ icon: () => ,
+ title: ctx.t("toast.latest.title"),
+ description: ctx.t("toast.latest.description", { version: ctx.build.version }),
+ })
+ case "ready":
+ return void showToast({
+ title: ctx.t("dialog.ready.title"),
+ description: ctx.t("dialog.ready.message", { version: state.version }),
+ persistent: true,
+ actions: [
+ { label: ctx.t("dialog.restart"), variant: "primary", onClick: () => install(ctx, client) },
+ { label: ctx.t("dialog.later"), variant: "secondary", onClick: "dismiss" },
+ ],
+ })
+ case "error":
+ return void showToast({ title: ctx.t("common.requestFailed"), description: state.message })
}
}
diff --git a/packages/gui-extensions/src/updater/machine.test.ts b/packages/gui-extensions/src/updater/machine.test.ts
index 96d2030933b..537ba3d9e30 100644
--- a/packages/gui-extensions/src/updater/machine.test.ts
+++ b/packages/gui-extensions/src/updater/machine.test.ts
@@ -256,6 +256,14 @@ describe("updater", () => {
expect(app.state()).toEqual({ status: "download-required", version: "2.0.0" })
})
+ // Check for Updates reports what this resolves to, so a staged update must come back as ready, not silently.
+ test("a manual check while an update is staged resolves to the staged version", async () => {
+ const app = await setup({ checks: ["2.0.0"] })
+ await app.start()
+
+ expect(await app.check()).toEqual({ status: "ready", version: "2.0.0" })
+ })
+
test("concurrent checks share one platform check", async () => {
const app = await setup()