Skip to content

Commit 12bf7df

Browse files
fix(opencode): fall back to the server version when the local CLI probe fails
A loopback OpenCode server without a readable local CLI keeps its version advisory and update capabilities from the server's reported version. AI-assisted; verified with the tests and tools listed above.
1 parent b062e42 commit 12bf7df

4 files changed

Lines changed: 36 additions & 54 deletions

File tree

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,12 +1002,6 @@ it.effect.each([
10021002
installation: { installedVersion: "1.14.20" },
10031003
status: "succeeded",
10041004
},
1005-
{
1006-
mode: "default-unknown",
1007-
version: "1.14.19",
1008-
installation: { installedVersion: null },
1009-
status: "unchanged",
1010-
},
10111005
{
10121006
mode: "unknown",
10131007
version: "1.14.19",
@@ -1098,11 +1092,11 @@ it.effect.each([
10981092
if (mode === "default-precurrent") return;
10991093
assert.strictEqual(
11001094
provider.versionAdvisory?.status,
1101-
mode.endsWith("unknown") ? "unknown" : "current",
1095+
mode === "unknown" ? "unknown" : "current",
11021096
);
11031097
assert.strictEqual(
11041098
provider.versionAdvisory?.currentVersion,
1105-
mode.endsWith("unknown") ? null : "1.14.20",
1099+
mode === "unknown" ? null : "1.14.20",
11061100
);
11071101
}).pipe(
11081102
Effect.provide(

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,6 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
594594
? verifiedProvider.installedVersion
595595
: verifiedProvider.version;
596596
return (
597-
verifiedProvider.installedVersion === null ||
598597
!isStillInstalled(verifiedProvider) ||
599598
(verifiedProvider.status === "error" &&
600599
(verifiedProvider.auth.status !== "unauthenticated" ||

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

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ import * as ProviderMaintenance from "@t3tools/provider-core/server/maintenanceR
3737
import * as OpenCodeRuntime from "./OpenCodeRuntime.ts";
3838
import { OpenCodeDriver, isLocalOpenCodeServerUrl, openCodeUpdateFor } from "./driver.ts";
3939
import * as OpenCodeServerLedger from "./OpenCodeServerLedger.ts";
40-
import {
41-
OPENCODE_1_RESPONSES,
42-
OPENCODE_2_RESPONSES,
43-
replayOpenCodeServer,
44-
} from "./probeResponses.fixture.ts";
40+
import { OPENCODE_2_RESPONSES, replayOpenCodeServer } from "./probeResponses.fixture.ts";
4541
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
4642

4743
it("only probes a locally configured OpenCode server's installed CLI", () => {
@@ -228,8 +224,9 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
228224

229225
const snapshot = yield* instance.snapshot.refresh;
230226
assert.strictEqual(snapshot.version, "2.0.18");
231-
assert.strictEqual(snapshot.installedVersion, installedVersion);
232-
yield* instance.snapshot.resolveMaintenance({ fresh: true });
227+
assert.strictEqual(snapshot.installedVersion, installedVersion ?? undefined);
228+
const maintenance = yield* instance.snapshot.resolveMaintenance({ fresh: true });
229+
assert.strictEqual(maintenance.packageName, "@opencode/cli");
233230
assert.isNotEmpty(probeOffline);
234231
assert.isTrue(probeOffline.every((offline) => offline === "1"));
235232
}).pipe(Effect.scoped),
@@ -861,42 +858,31 @@ it.layer(layerUpdate)("OpenCodeDriver updates", (it) => {
861858
"offers no package update for an unknown version and follows a changed one on a fresh read",
862859
() =>
863860
Effect.gen(function* () {
864-
for (const serverUrl of ["", "http://127.0.0.1:4096"]) {
865-
const root = NodeFS.realpathSync(
866-
NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-opencode-driver-update-")),
867-
);
868-
const binaryPath = npmGlobalInstall(
869-
NodePath.join(root, "v1"),
870-
["opencode-ai"],
871-
"opencode",
872-
);
873-
const instance = yield* OpenCodeDriver.create({
874-
instanceId: ProviderInstanceId.make("opencode-update"),
875-
displayName: undefined,
876-
environment: [],
877-
enabled: true,
878-
config: { ...OpenCodeDriver.defaultConfig(), binaryPath, serverUrl },
879-
}).pipe(
880-
Effect.provideService(
881-
HttpClient.HttpClient,
882-
serverUrl ? replayOpenCodeServer(OPENCODE_1_RESPONSES, "") : noHttp,
883-
),
884-
);
885-
886-
versionOutput.current = undefined;
887-
const unknown = yield* instance.snapshot.resolveMaintenance({ fresh: true });
888-
assert.isNull(unknown.update);
889-
assert.isNull(unknown.packageName);
890-
891-
versionOutput.current = "1.18.32\n";
892-
const v1 = yield* instance.snapshot.resolveMaintenance({ fresh: true });
893-
assert.strictEqual(v1.packageName, "opencode-ai");
894-
895-
versionOutput.current = "opencode v2.0.18\n";
896-
const v2 = yield* instance.snapshot.resolveMaintenance({ fresh: true });
897-
assert.strictEqual(v2.packageName, "@opencode/cli");
898-
assert.isNull(v2.update);
899-
}
861+
const root = NodeFS.realpathSync(
862+
NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-opencode-driver-update-")),
863+
);
864+
const binaryPath = npmGlobalInstall(NodePath.join(root, "v1"), ["opencode-ai"], "opencode");
865+
const instance = yield* OpenCodeDriver.create({
866+
instanceId: ProviderInstanceId.make("opencode-update"),
867+
displayName: undefined,
868+
environment: [],
869+
enabled: true,
870+
config: { ...OpenCodeDriver.defaultConfig(), binaryPath },
871+
}).pipe(Effect.provideService(HttpClient.HttpClient, noHttp));
872+
873+
versionOutput.current = undefined;
874+
const unknown = yield* instance.snapshot.resolveMaintenance({ fresh: true });
875+
assert.isNull(unknown.update);
876+
assert.isNull(unknown.packageName);
877+
878+
versionOutput.current = "1.18.32\n";
879+
const v1 = yield* instance.snapshot.resolveMaintenance({ fresh: true });
880+
assert.strictEqual(v1.packageName, "opencode-ai");
881+
882+
versionOutput.current = "opencode v2.0.18\n";
883+
const v2 = yield* instance.snapshot.resolveMaintenance({ fresh: true });
884+
assert.strictEqual(v2.packageName, "@opencode/cli");
885+
assert.isNull(v2.update);
900886
}).pipe(Effect.scoped),
901887
);
902888

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,10 @@ export const OpenCodeDriver: ProviderDriver<
301301
? probeOpenCodeBinary(
302302
effectiveConfig.binaryPath,
303303
providerProbeEnvironment(processEnv),
304-
).pipe(Effect.provideService(OpenCodeRuntime.OpenCodeRuntime, openCodeRuntime))
304+
).pipe(
305+
Effect.provideService(OpenCodeRuntime.OpenCodeRuntime, openCodeRuntime),
306+
Effect.catch(() => runtimeProbe.get),
307+
)
305308
: runtimeProbe.get,
306309
),
307310
);
@@ -427,7 +430,7 @@ export const OpenCodeDriver: ProviderDriver<
427430
providerProbeEnvironment(processEnv),
428431
).pipe(
429432
Effect.map((probed) => probed.version),
430-
Effect.orElseSucceed(() => null),
433+
Effect.orElseSucceed(() => undefined),
431434
)
432435
: Effect.void,
433436
provider: checkOpenCodeProviderStatus(

0 commit comments

Comments
 (0)