Skip to content

Commit 72fb03f

Browse files
committed
fix(opencode): surface verified CLI update and restart state
1 parent 8409b7b commit 72fb03f

5 files changed

Lines changed: 74 additions & 14 deletions

File tree

‎apps/server/src/provider/providerMaintenanceRunner.test.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,12 @@ it.effect.each([
992992
installation: { installedVersion: "1.14.20" },
993993
status: "succeeded",
994994
},
995+
{
996+
mode: "default-unknown",
997+
version: "1.14.19",
998+
installation: { installedVersion: null },
999+
status: "unchanged",
1000+
},
9951001
{
9961002
mode: "unknown",
9971003
version: "1.14.19",
@@ -1055,11 +1061,11 @@ it.effect.each([
10551061

10561062
const result = yield* updater.updateProvider({
10571063
provider: OPENCODE_DRIVER,
1058-
...(mode === "default" ? {} : { targetVersion: "1.14.20" }),
1064+
...(mode.startsWith("default") ? {} : { targetVersion: "1.14.20" }),
10591065
});
10601066

10611067
assert.deepStrictEqual(calls, [
1062-
`npm install -g opencode-ai@${mode === "default" ? "latest" : "1.14.20"}`,
1068+
`npm install -g opencode-ai@${mode.startsWith("default") ? "latest" : "1.14.20"}`,
10631069
]);
10641070
const provider = result.providers[0];
10651071
assert.ok(provider);
@@ -1074,11 +1080,11 @@ it.effect.each([
10741080
assert.strictEqual("installedVersion" in provider, mode !== "legacy");
10751081
assert.strictEqual(
10761082
provider.versionAdvisory?.status,
1077-
mode === "unknown" ? "unknown" : "current",
1083+
mode.endsWith("unknown") ? "unknown" : "current",
10781084
);
10791085
assert.strictEqual(
10801086
provider.versionAdvisory?.currentVersion,
1081-
mode === "unknown" ? null : "1.14.20",
1087+
mode.endsWith("unknown") ? null : "1.14.20",
10821088
);
10831089
}).pipe(
10841090
Effect.provide(

‎apps/server/src/provider/providerMaintenanceRunner.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
578578
? verifiedProvider.installedVersion
579579
: verifiedProvider.version;
580580
return (
581+
verifiedProvider.installedVersion === null ||
581582
!isStillInstalled(verifiedProvider) ||
582583
(verifiedProvider.status === "error" &&
583584
(verifiedProvider.auth.status !== "unauthenticated" ||

‎apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,30 @@ describe("getProviderUpdateRunToastView", () => {
318318
result,
319319
});
320320

321+
it("preserves the local server restart instruction after a successful update", () => {
322+
const message =
323+
"OpenCode CLI updated. Restart the configured local OpenCode server to use the new version.";
324+
const updated = {
325+
...provider({
326+
driver: driver("opencode"),
327+
version: "2.1.2",
328+
advisoryStatus: "current",
329+
updateState: updateState("succeeded", message),
330+
}),
331+
installedVersion: "2.2.5",
332+
};
333+
expect(
334+
getProviderUpdateRunToastView([
335+
run("Linux", "opencode", AsyncResult.success({ providers: [updated] })),
336+
]),
337+
).toMatchObject({ type: "success", description: message });
338+
expect(
339+
getProviderUpdateSidebarPillView([updated], {
340+
visibleAfterIso: sessionStartedAt,
341+
}),
342+
).toMatchObject({ title: "OpenCode updated: v2.2.5", description: message });
343+
});
344+
321345
it("lists every failed update and ignores interrupted ones", () => {
322346
const view = getProviderUpdateRunToastView([
323347
run(
@@ -351,7 +375,8 @@ describe("getProviderUpdateRunToastView", () => {
351375
expect(view).toEqual({
352376
type: "error",
353377
title: "2 of 3 provider updates failed",
354-
description: "Mac Studio · Claude: npm exited with code 1.\nLaptop · Codex: WebSocket closed",
378+
description:
379+
"Mac Studio · Claude: npm exited with code 1.\nLaptop · Codex: WebSocket closed\nProvider updated.",
355380
});
356381
});
357382
});

‎apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ function dedupeProvidersByDriver<T extends ServerProvider>(providers: ReadonlyAr
7878
return [...latestProviderByDriver.values()];
7979
}
8080

81-
function getProviderUpdatedTitle(provider: Pick<ServerProvider, "driver" | "version">): string {
81+
function getProviderUpdatedTitle(
82+
provider: Pick<ServerProvider, "driver" | "version" | "installedVersion">,
83+
): string {
8284
const providerName = PROVIDER_DISPLAY_NAMES[provider.driver] ?? provider.driver;
83-
return provider.version
84-
? `${providerName} updated: ${formatVersion(provider.version)}`
85-
: `${providerName} updated`;
85+
const version = provider.installedVersion ?? provider.version;
86+
return version ? `${providerName} updated: ${formatVersion(version)}` : `${providerName} updated`;
8687
}
8788

8889
function getProviderUpdatedDescription(providerCount: number): string {
@@ -200,7 +201,8 @@ export interface ProviderUpdateRun {
200201
export function getProviderUpdateRunOutcome(
201202
run: ProviderUpdateRun,
202203
):
203-
| { readonly status: "interrupted" | "updated" }
204+
| { readonly status: "interrupted" }
205+
| { readonly status: "updated"; readonly message: string | null }
204206
| { readonly status: "failed"; readonly line: string } {
205207
if (isAtomCommandInterrupted(run.result)) return { status: "interrupted" };
206208
const label = `${run.machineLabel} · ${PROVIDER_DISPLAY_NAMES[run.driver] ?? run.driver}`;
@@ -215,7 +217,7 @@ export function getProviderUpdateRunOutcome(
215217
(provider) => provider.instanceId === run.instanceId,
216218
)?.updateState;
217219
return updateState?.status === "succeeded"
218-
? { status: "updated" }
220+
? { status: "updated", message: updateState.message }
219221
: {
220222
status: "failed",
221223
line: `${label}: ${updateState?.message ?? "Provider update did not finish."}`,
@@ -236,11 +238,18 @@ export function getProviderUpdateRunToastView(runs: ReadonlyArray<ProviderUpdate
236238
const failureLines = settled.flatMap((outcome) =>
237239
outcome.status === "failed" ? [outcome.line] : [],
238240
);
241+
const successMessages = [
242+
...new Set(
243+
settled.flatMap((outcome) =>
244+
outcome.status === "updated" && outcome.message ? [outcome.message] : [],
245+
),
246+
),
247+
];
239248
if (failureLines.length === 0) {
240249
return {
241250
type: "success",
242251
title: settled.length === 1 ? "Provider updated" : `${settled.length} providers updated`,
243-
description: getProviderUpdatedDescription(settled.length),
252+
description: successMessages.join("\n") || getProviderUpdatedDescription(settled.length),
244253
};
245254
}
246255
return {
@@ -251,7 +260,7 @@ export function getProviderUpdateRunToastView(runs: ReadonlyArray<ProviderUpdate
251260
: settled.length === 1
252261
? "Provider update failed"
253262
: "Provider updates failed",
254-
description: failureLines.join("\n"),
263+
description: [...failureLines, ...successMessages].join("\n"),
255264
};
256265
}
257266

@@ -398,7 +407,14 @@ export function getProviderUpdateSidebarPillView(
398407
succeededProviders.length === 1
399408
? getProviderUpdatedTitle(succeededProvider)
400409
: `${succeededProviders.length} providers updated`,
401-
description: getProviderUpdatedDescription(succeededProviders.length),
410+
description:
411+
[
412+
...new Set(
413+
succeededProviders.flatMap((provider) =>
414+
provider.updateState?.message ? [provider.updateState.message] : [],
415+
),
416+
),
417+
].join("\n") || getProviderUpdatedDescription(succeededProviders.length),
402418
dismissAfterVisibleMs: PROVIDER_UPDATE_SUCCESS_VISIBLE_MS,
403419
});
404420
}

‎apps/web/src/components/settings/ProviderInstanceCard.tsx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,13 @@ export function ProviderInstanceCard({
732732
!isUpdating && (updateState?.status === "failed" || updateState?.status === "unchanged")
733733
? updateState.message
734734
: null;
735+
const updateSuccess =
736+
enabled &&
737+
!isUpdating &&
738+
updateState?.status === "succeeded" &&
739+
(instance.driver !== "opencode" || liveProvider?.installedVersion !== liveProvider?.version)
740+
? updateState.message
741+
: null;
735742
const hasCompatibilityWarning =
736743
compatibility !== undefined &&
737744
compatibility.status !== "supported" &&
@@ -1163,6 +1170,11 @@ export function ProviderInstanceCard({
11631170
{editorStatusNode}
11641171
</div>
11651172
</ProviderStatusDiagnostic>
1173+
{updateSuccess ? (
1174+
<p aria-live="polite" className="text-xs leading-snug [overflow-wrap:anywhere]">
1175+
{updateSuccess}
1176+
</p>
1177+
) : null}
11661178
{urlAuthAction && onAcceptUrlAuth ? (
11671179
<div className="grid max-w-xl gap-1.5 pt-1 text-xs">
11681180
<p>{urlAuthAction.message}</p>

0 commit comments

Comments
 (0)