Skip to content

Commit b5256ad

Browse files
intrepid37maria-rcksjuliusmarminge
authored
fix(opencode): verify CLI updates when loopback server is still running (#22839)
Co-authored-by: maria-rcks <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 0d36f2b commit b5256ad

9 files changed

Lines changed: 241 additions & 25 deletions

File tree

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,12 @@ describe("providerMaintenanceRunner", () => {
978978
});
979979

980980
it.effect.each([
981+
{
982+
mode: "default-precurrent",
983+
version: "1.14.19",
984+
installation: { installedVersion: "1.14.20" },
985+
status: "succeeded",
986+
},
981987
{
982988
mode: "default",
983989
version: "1.14.19",
@@ -1033,7 +1039,11 @@ it.effect.each([
10331039
...registry,
10341040
refreshInstance: () =>
10351041
Ref.updateAndGet(providersRef, (providers) =>
1036-
providers.map((provider) => ({ ...provider, checkedAt: "2026-04-10T00:00:01.000Z" })),
1042+
providers.map((provider) => ({
1043+
...provider,
1044+
...(mode === "default-precurrent" ? installation : {}),
1045+
checkedAt: "2026-04-10T00:00:01.000Z",
1046+
})),
10371047
),
10381048
getProviderMaintenanceCapabilitiesForInstance: () => Effect.succeed(pinnedCapabilities),
10391049
refreshAfterUpdate: () =>
@@ -1059,17 +1069,27 @@ it.effect.each([
10591069

10601070
const result = yield* updater.updateProvider({
10611071
provider: OPENCODE_DRIVER,
1062-
...(mode === "default" ? {} : { targetVersion: "1.14.20" }),
1072+
...(mode.startsWith("default") ? {} : { targetVersion: "1.14.20" }),
10631073
});
10641074

1065-
assert.deepStrictEqual(calls, [
1066-
`npm install -g opencode-ai@${mode === "default" ? "latest" : "1.14.20"}`,
1067-
]);
1075+
assert.deepStrictEqual(
1076+
calls,
1077+
mode === "default-precurrent"
1078+
? []
1079+
: [`npm install -g opencode-ai@${mode.startsWith("default") ? "latest" : "1.14.20"}`],
1080+
);
10681081
const provider = result.providers[0];
10691082
assert.ok(provider);
10701083
assert.strictEqual(provider.updateState?.status, status);
1084+
if (mode === "default" || mode === "default-precurrent" || mode === "targeted") {
1085+
assert.strictEqual(
1086+
provider.updateState?.message,
1087+
"OpenCode CLI updated. Restart the configured local OpenCode server to use the new version.",
1088+
);
1089+
}
10711090
assert.strictEqual(provider.version, version);
10721091
assert.strictEqual("installedVersion" in provider, mode !== "legacy");
1092+
if (mode === "default-precurrent") return;
10731093
assert.strictEqual(
10741094
provider.versionAdvisory?.status,
10751095
mode === "unknown" ? "unknown" : "current",

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@ interface VerifiedProviderRefresh {
9494

9595
const nowIso = Effect.map(DateTime.now, DateTime.formatIso);
9696

97+
const OPENCODE_SERVER_RESTART_MESSAGE =
98+
"OpenCode CLI updated. Restart the configured local OpenCode server to use the new version.";
99+
100+
const needsOpenCodeServerRestart = (providers: ReadonlyArray<ServerProvider>) =>
101+
providers.some(
102+
(provider) =>
103+
provider.driver === ProviderDriverKind.make("opencode") &&
104+
provider.installedVersion != null &&
105+
provider.version != null &&
106+
provider.installedVersion !== provider.version,
107+
);
108+
97109
const runProviderMaintenanceCommandWithSpawner = Effect.fn("ProviderMaintenanceRunner.runCommand")(
98110
function* (input: {
99111
readonly spawner: ChildProcessSpawner.ChildProcessSpawner["Service"];
@@ -527,7 +539,9 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
527539
status: "succeeded",
528540
startedAt,
529541
finishedAt: yield* nowIso,
530-
message: "Already up to date.",
542+
message: needsOpenCodeServerRestart(precheck.verifiedProviders)
543+
? OPENCODE_SERVER_RESTART_MESSAGE
544+
: "Already up to date.",
531545
}),
532546
);
533547
}
@@ -600,7 +614,9 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
600614
? "Update command completed, but T3 Code could not verify the provider version."
601615
: stillOutdated
602616
? "Update command completed, but T3 Code still detects an outdated provider version."
603-
: "Provider updated.",
617+
: needsOpenCodeServerRestart(verifiedProviders)
618+
? OPENCODE_SERVER_RESTART_MESSAGE
619+
: "Provider updated.",
604620
output: commandOutput(result),
605621
}),
606622
);

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,41 @@ 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+
run("Laptop", "opencode", AsyncResult.success({ providers: [updated] })),
337+
]),
338+
).toMatchObject({
339+
type: "success",
340+
description: `Linux · OpenCode: ${message}\nLaptop · OpenCode: ${message}`,
341+
});
342+
expect(
343+
getProviderUpdateSidebarPillView([updated], {
344+
visibleAfterIso: sessionStartedAt,
345+
}),
346+
).toMatchObject({ title: "OpenCode updated: v2.2.5", description: message });
347+
348+
const restarted = { ...updated, version: "2.2.5" };
349+
expect(
350+
getProviderUpdateRunToastView([
351+
run("Linux", "opencode", AsyncResult.success({ providers: [restarted] })),
352+
]),
353+
).toMatchObject({ description: "New sessions will use the updated provider." });
354+
});
355+
321356
it("lists every failed update and ignores interrupted ones", () => {
322357
const view = getProviderUpdateRunToastView([
323358
run(

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

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,24 @@ 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`;
87+
}
88+
89+
// Only OpenCode reports an installed CLI apart from a running external server.
90+
export function getProviderRestartNotice(
91+
provider: Pick<ServerProvider, "version" | "installedVersion" | "updateState">,
92+
): string | null {
93+
return provider.updateState?.status === "succeeded" &&
94+
provider.installedVersion != null &&
95+
provider.version != null &&
96+
provider.installedVersion !== provider.version
97+
? provider.updateState.message
98+
: null;
8699
}
87100

88101
function getProviderUpdatedDescription(providerCount: number): string {
@@ -200,7 +213,8 @@ export interface ProviderUpdateRun {
200213
export function getProviderUpdateRunOutcome(
201214
run: ProviderUpdateRun,
202215
):
203-
| { readonly status: "interrupted" | "updated" }
216+
| { readonly status: "interrupted" }
217+
| { readonly status: "updated"; readonly message: string | null }
204218
| { readonly status: "failed"; readonly line: string } {
205219
if (isAtomCommandInterrupted(run.result)) return { status: "interrupted" };
206220
const label = `${run.machineLabel} · ${PROVIDER_DISPLAY_NAMES[run.driver] ?? run.driver}`;
@@ -211,11 +225,13 @@ export function getProviderUpdateRunOutcome(
211225
line: `${label}: ${error instanceof Error ? error.message : "Provider update failed."}`,
212226
};
213227
}
214-
const updateState = run.result.value.providers.find(
215-
(provider) => provider.instanceId === run.instanceId,
216-
)?.updateState;
228+
const provider = run.result.value.providers.find(
229+
(candidate) => candidate.instanceId === run.instanceId,
230+
);
231+
const updateState = provider?.updateState;
232+
const restartNotice = provider ? getProviderRestartNotice(provider) : null;
217233
return updateState?.status === "succeeded"
218-
? { status: "updated" }
234+
? { status: "updated", message: restartNotice ? `${label}: ${restartNotice}` : null }
219235
: {
220236
status: "failed",
221237
line: `${label}: ${updateState?.message ?? "Provider update did not finish."}`,
@@ -236,11 +252,18 @@ export function getProviderUpdateRunToastView(runs: ReadonlyArray<ProviderUpdate
236252
const failureLines = settled.flatMap((outcome) =>
237253
outcome.status === "failed" ? [outcome.line] : [],
238254
);
255+
const successMessages = [
256+
...new Set(
257+
settled.flatMap((outcome) =>
258+
outcome.status === "updated" && outcome.message ? [outcome.message] : [],
259+
),
260+
),
261+
];
239262
if (failureLines.length === 0) {
240263
return {
241264
type: "success",
242265
title: settled.length === 1 ? "Provider updated" : `${settled.length} providers updated`,
243-
description: getProviderUpdatedDescription(settled.length),
266+
description: successMessages.join("\n") || getProviderUpdatedDescription(settled.length),
244267
};
245268
}
246269
return {
@@ -251,7 +274,7 @@ export function getProviderUpdateRunToastView(runs: ReadonlyArray<ProviderUpdate
251274
: settled.length === 1
252275
? "Provider update failed"
253276
: "Provider updates failed",
254-
description: failureLines.join("\n"),
277+
description: [...failureLines, ...successMessages].join("\n"),
255278
};
256279
}
257280

@@ -398,7 +421,9 @@ export function getProviderUpdateSidebarPillView(
398421
succeededProviders.length === 1
399422
? getProviderUpdatedTitle(succeededProvider)
400423
: `${succeededProviders.length} providers updated`,
401-
description: getProviderUpdatedDescription(succeededProviders.length),
424+
description:
425+
[...new Set(succeededProviders.map(getProviderRestartNotice).filter(Boolean))].join("\n") ||
426+
getProviderUpdatedDescription(succeededProviders.length),
402427
dismissAfterVisibleMs: PROVIDER_UPDATE_SUCCESS_VISIBLE_MS,
403428
});
404429
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ import { SettingResetButton, SettingsRow, SettingsSection } from "./settingsLayo
7070
import { AcpSessionManagementSection } from "./AcpSessionManagementSection";
7171
import { FoldedSettingsSection } from "./FoldedSettingsSection";
7272
import { readCodexSetupMode } from "./CodexSetupSection.logic";
73+
import { getProviderRestartNotice } from "../ProviderUpdateLaunchNotification.logic";
7374
import {
7475
getProviderVersionAdvisoryPresentation,
7576
PROVIDER_STATUS_STYLES,
@@ -770,6 +771,8 @@ export function ProviderInstanceCard({
770771
!isUpdating && (updateState?.status === "failed" || updateState?.status === "unchanged")
771772
? updateState.message
772773
: null;
774+
const restartNotice =
775+
enabled && !isUpdating && liveProvider ? getProviderRestartNotice(liveProvider) : null;
773776
const hasCompatibilityWarning =
774777
compatibility !== undefined &&
775778
compatibility.status !== "supported" &&
@@ -1212,6 +1215,11 @@ export function ProviderInstanceCard({
12121215
{editorStatusNode}
12131216
</div>
12141217
</ProviderStatusDiagnostic>
1218+
{restartNotice ? (
1219+
<p aria-live="polite" className="text-xs leading-snug [overflow-wrap:anywhere]">
1220+
{restartNotice}
1221+
</p>
1222+
) : null}
12151223
{urlAuthAction && onAcceptUrlAuth ? (
12161224
<div className="grid max-w-xl gap-1.5 pt-1 text-xs">
12171225
<p>{urlAuthAction.message}</p>

‎docs/user/providers-opencode.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ settings. T3 Code uses only that configured password for an external server; it
4141
does not forward a local `OPENCODE_SERVER_PASSWORD`. If connection or version checks
4242
fail, check the URL, credentials, and OpenCode version, then refresh provider status.
4343

44+
When **Server URL** points to a locally running server (such as `127.0.0.1`),
45+
the update button upgrades its installed CLI without terminating the running server.
46+
The server can still report the previous version until you restart it. T3 Code
47+
shows that restart requirement instead of treating the CLI update as a failure.
48+
Restart the server when active sessions can safely be interrupted.
49+
4450
After a lost connection, send another prompt to reconnect to the same OpenCode
4551
session.
4652

‎packages/provider-opencode/src/server/driver.test.ts‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,23 @@ import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderS
3535
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
3636
import * as ProviderMaintenance from "@t3tools/provider-core/server/maintenanceResolver";
3737
import * as OpenCodeRuntime from "./OpenCodeRuntime.ts";
38+
import { OpenCodeDriver, isLocalOpenCodeServerUrl, openCodeUpdateFor } from "./driver.ts";
3839
import * as OpenCodeServerLedger from "./OpenCodeServerLedger.ts";
3940
import { OPENCODE_2_RESPONSES, replayOpenCodeServer } from "./probeResponses.fixture.ts";
40-
import { OpenCodeDriver, openCodeUpdateFor } from "./driver.ts";
4141
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
4242

43+
it("only probes a locally configured OpenCode server's installed CLI", () => {
44+
assert.isTrue(isLocalOpenCodeServerUrl("http://127.0.0.1:35768"));
45+
assert.isTrue(isLocalOpenCodeServerUrl("http://127.255.255.254:4096"));
46+
assert.isFalse(isLocalOpenCodeServerUrl("http://127.example.com:4096"));
47+
assert.isFalse(isLocalOpenCodeServerUrl("http://128.0.0.1:4096"));
48+
assert.isTrue(isLocalOpenCodeServerUrl("http://localhost:4096"));
49+
assert.isTrue(isLocalOpenCodeServerUrl("http://[::1]:4096"));
50+
assert.isFalse(isLocalOpenCodeServerUrl("https://remote.example.com:4096"));
51+
assert.isFalse(isLocalOpenCodeServerUrl(""));
52+
assert.isFalse(isLocalOpenCodeServerUrl("file:///tmp/opencode"));
53+
});
54+
4355
const serverStarts: Array<string> = [];
4456
const reachedServer = (operation: string) =>
4557
Effect.sync(() => serverStarts.push(operation)).pipe(
@@ -70,12 +82,12 @@ const layer = Layer.mergeAll(
7082
Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, openCode2Runtime),
7183
).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
7284

73-
const create = (config: Partial<OpenCodeSettings>, http: HttpClient.HttpClient) =>
85+
const create = (config: Partial<OpenCodeSettings>, http: HttpClient.HttpClient, enabled = true) =>
7486
OpenCodeDriver.create({
7587
instanceId: ProviderInstanceId.make("opencode-test"),
7688
displayName: undefined,
7789
environment: [],
78-
enabled: true,
90+
enabled,
7991
config: { ...OpenCodeDriver.defaultConfig(), ...config },
8092
}).pipe(Effect.provideService(HttpClient.HttpClient, http));
8193

@@ -187,6 +199,60 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
187199
}).pipe(Effect.scoped),
188200
);
189201

202+
it.effect.each(["2.1.2", null])(
203+
"reports the installed CLI version independently of the loopback server (%s)",
204+
(installedVersion) =>
205+
Effect.gen(function* () {
206+
const probeOffline: Array<string | undefined> = [];
207+
const runtime = {
208+
...openCode2Runtime,
209+
runOpenCodeCommand: (input) =>
210+
Effect.sync(() => {
211+
probeOffline.push(input.environment?.MISE_OFFLINE);
212+
return {
213+
stdout:
214+
installedVersion === null ? "unrecognized" : `opencode v${installedVersion}\n`,
215+
stderr: "",
216+
code: 0,
217+
};
218+
}),
219+
} as OpenCodeRuntime.OpenCodeRuntime["Service"];
220+
const instance = yield* create(
221+
{ serverUrl: "http://127.0.0.1:4096" },
222+
replayOpenCodeServer(OPENCODE_2_RESPONSES, ""),
223+
).pipe(Effect.provideService(OpenCodeRuntime.OpenCodeRuntime, runtime));
224+
225+
const snapshot = yield* instance.snapshot.refresh;
226+
assert.strictEqual(snapshot.version, "2.0.18");
227+
assert.strictEqual(snapshot.installedVersion, installedVersion ?? undefined);
228+
const maintenance = yield* instance.snapshot.resolveMaintenance({ fresh: true });
229+
assert.strictEqual(maintenance.packageName, "@opencode/cli");
230+
assert.isNotEmpty(probeOffline);
231+
assert.isTrue(probeOffline.every((offline) => offline === "1"));
232+
}).pipe(Effect.scoped),
233+
);
234+
235+
it.effect("skips the installed CLI probe when a localhost provider is disabled", () =>
236+
Effect.gen(function* () {
237+
const probed: string[] = [];
238+
const runtime = {
239+
...openCode2Runtime,
240+
runOpenCodeCommand: () =>
241+
Effect.sync(() => {
242+
probed.push("--version");
243+
return { stdout: "opencode v2.1.2\n", stderr: "", code: 0 };
244+
}),
245+
} as OpenCodeRuntime.OpenCodeRuntime["Service"];
246+
const instance = yield* create({ serverUrl: "http://127.0.0.1:4096" }, noHttp, false).pipe(
247+
Effect.provideService(OpenCodeRuntime.OpenCodeRuntime, runtime),
248+
);
249+
250+
const snapshot = yield* instance.snapshot.refresh;
251+
assert.isFalse(snapshot.enabled);
252+
assert.deepStrictEqual(probed, []);
253+
}).pipe(Effect.scoped),
254+
);
255+
190256
it.effect("opens a session through OpenCode 2 that a lazy mise shim installs on first use", () =>
191257
Effect.gen(function* () {
192258
serverStarts.length = 0;

0 commit comments

Comments
 (0)