Skip to content

Commit 702b061

Browse files
committed
fix(opencode): track installed CLI version separately
1 parent bed9239 commit 702b061

8 files changed

Lines changed: 419 additions & 53 deletions

File tree

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

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import * as ModelManifest from "./ModelManifest.ts";
2828
import * as ProviderMaintenanceRunner from "./providerMaintenanceRunner.ts";
2929
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
3030
import {
31+
enrichProviderSnapshotWithVersionAdvisory,
3132
makeProviderMaintenanceCapabilities,
3233
type ProviderMaintenanceCapabilities,
3334
} from "@t3tools/provider-core/server/maintenanceResolver";
@@ -993,6 +994,184 @@ describe("providerMaintenanceRunner", () => {
993994
});
994995
});
995996

997+
it.effect("verifies a targeted OpenCode update against the installed version", () => {
998+
const calls: string[] = [];
999+
const manifest: ModelManifest.ModelManifestData = {
1000+
version: 1,
1001+
currentModels: {},
1002+
compatibility: [
1003+
{
1004+
driver: OPENCODE_DRIVER,
1005+
t3CodeRange: ">=0.0.42",
1006+
recommendedVersion: "2.0.0",
1007+
ranges: [{ range: "=2.0.0", status: "supported" }],
1008+
},
1009+
],
1010+
};
1011+
return Effect.gen(function* () {
1012+
const { registry, providersRef } = yield* makeRegistry({
1013+
...baseOpenCodeProvider,
1014+
version: "1.14.19",
1015+
});
1016+
const capabilities = lifecycleFor(OPENCODE_DRIVER);
1017+
const updater = yield* makeTestRunner(
1018+
{
1019+
...registry,
1020+
getProviderMaintenanceCapabilitiesForInstance: () =>
1021+
Effect.succeed({
1022+
...capabilities,
1023+
update: { ...capabilities.update!, lockKey: "npm-global:/fixture" },
1024+
}),
1025+
},
1026+
manifest,
1027+
);
1028+
yield* Ref.update(providersRef, (providers) =>
1029+
providers.map((entry) => ({
1030+
...entry,
1031+
version: "1.14.19",
1032+
installedVersion: "2.0.0",
1033+
})),
1034+
);
1035+
1036+
const result = yield* updater.updateProvider({
1037+
provider: OPENCODE_DRIVER,
1038+
targetVersion: "2.0.0",
1039+
});
1040+
1041+
assert.deepStrictEqual(calls, ["npm install -g [email protected]"]);
1042+
assert.strictEqual(result.providers[0]?.updateState?.status, "succeeded");
1043+
assert.strictEqual(result.providers[0]?.version, "1.14.19");
1044+
assert.strictEqual(result.providers[0]?.installedVersion, "2.0.0");
1045+
}).pipe(
1046+
Effect.provide(
1047+
Layer.mergeAll(
1048+
layerNonWindowsPlatform,
1049+
layerLatestVersionHttpClient("0.0.0"),
1050+
layerMockSpawner((command, args) => {
1051+
calls.push([command, ...args].join(" "));
1052+
return { stdout: "installed" };
1053+
}),
1054+
),
1055+
),
1056+
);
1057+
});
1058+
1059+
it.effect(
1060+
"succeeds for the default update when the installed CLI is current but the server is older",
1061+
() => {
1062+
const calls: string[] = [];
1063+
const installedVersion = "1.14.20";
1064+
const capabilities = lifecycleFor(OPENCODE_DRIVER);
1065+
const manifest: ModelManifest.ModelManifestData = {
1066+
version: 1,
1067+
currentModels: {},
1068+
compatibility: [
1069+
{
1070+
driver: OPENCODE_DRIVER,
1071+
t3CodeRange: ">=0.0.42",
1072+
recommendedVersion: installedVersion,
1073+
ranges: [{ range: `=${installedVersion}`, status: "supported" }],
1074+
},
1075+
],
1076+
};
1077+
const enrichedSnapshot = enrichProviderSnapshotWithVersionAdvisory(
1078+
{
1079+
...baseOpenCodeProvider,
1080+
version: "1.14.19",
1081+
installedVersion,
1082+
},
1083+
capabilities,
1084+
{ enableProviderUpdateChecks: true },
1085+
).pipe(
1086+
Effect.provideServiceEffect(
1087+
ProviderLatestVersions.ProviderLatestVersions,
1088+
ProviderLatestVersions.make([["opencode-ai", installedVersion]]),
1089+
),
1090+
Effect.provideService(
1091+
HttpClient.HttpClient,
1092+
HttpClient.make(() => Effect.die("seeded latest version should avoid HTTP")),
1093+
),
1094+
);
1095+
1096+
return Effect.gen(function* () {
1097+
const provider = yield* enrichedSnapshot;
1098+
assert.strictEqual(provider.version, "1.14.19");
1099+
1100+
const { registry } = yield* makeRegistry(provider);
1101+
const updater = yield* makeTestRunner(registry, manifest);
1102+
const result = yield* updater.updateProvider(OPENCODE_DRIVER);
1103+
1104+
assert.deepStrictEqual(calls, ["npm install -g opencode-ai@latest"]);
1105+
assert.strictEqual(result.providers[0]?.updateState?.status, "succeeded");
1106+
assert.strictEqual(result.providers[0]?.version, "1.14.19");
1107+
assert.strictEqual(result.providers[0]?.installedVersion, installedVersion);
1108+
assert.strictEqual(result.providers[0]?.versionAdvisory?.status, "current");
1109+
assert.strictEqual(result.providers[0]?.versionAdvisory?.currentVersion, installedVersion);
1110+
assert.strictEqual(result.providers[0]?.versionAdvisory?.status, "current");
1111+
}).pipe(
1112+
Effect.provide(
1113+
Layer.mergeAll(
1114+
layerNonWindowsPlatform,
1115+
layerLatestVersionHttpClient(installedVersion),
1116+
layerMockSpawner((command, args) => {
1117+
calls.push([command, ...args].join(" "));
1118+
return { stdout: "installed" };
1119+
}),
1120+
),
1121+
),
1122+
);
1123+
},
1124+
);
1125+
1126+
it.effect("does not use runtime version when installed version is explicitly unknown", () => {
1127+
const manifest: ModelManifest.ModelManifestData = {
1128+
version: 1,
1129+
currentModels: {},
1130+
compatibility: [
1131+
{
1132+
driver: OPENCODE_DRIVER,
1133+
t3CodeRange: ">=0.0.42",
1134+
recommendedVersion: "2.0.0",
1135+
ranges: [{ range: "=2.0.0", status: "supported" }],
1136+
},
1137+
],
1138+
};
1139+
return Effect.gen(function* () {
1140+
const { registry } = yield* makeRegistry({
1141+
...baseOpenCodeProvider,
1142+
version: "2.0.0",
1143+
installedVersion: null,
1144+
});
1145+
const capabilities = lifecycleFor(OPENCODE_DRIVER);
1146+
const updater = yield* makeTestRunner(
1147+
{
1148+
...registry,
1149+
getProviderMaintenanceCapabilitiesForInstance: () =>
1150+
Effect.succeed({
1151+
...capabilities,
1152+
update: { ...capabilities.update!, lockKey: "npm-global:/fixture" },
1153+
}),
1154+
},
1155+
manifest,
1156+
);
1157+
1158+
const result = yield* updater.updateProvider({
1159+
provider: OPENCODE_DRIVER,
1160+
targetVersion: "2.0.0",
1161+
});
1162+
1163+
assert.strictEqual(result.providers[0]?.updateState?.status, "unchanged");
1164+
}).pipe(
1165+
Effect.provide(
1166+
Layer.mergeAll(
1167+
layerNonWindowsPlatform,
1168+
layerLatestVersionHttpClient("0.0.0"),
1169+
layerMockSpawner(() => ({ stdout: "installed" })),
1170+
),
1171+
),
1172+
);
1173+
});
1174+
9961175
it.effect("refuses incompatible latest versions and unapproved or unpinnable targets", () => {
9971176
const calls: string[] = [];
9981177
const manifest: ModelManifest.ModelManifestData = {

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -531,12 +531,17 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
531531
// Cursor's `about` probe can fail transiently on a healthy binary.
532532
const couldNotVerify =
533533
verifiedProviders.length === 0 ||
534-
verifiedProviders.some(
535-
(verifiedProvider) =>
534+
verifiedProviders.some((verifiedProvider) => {
535+
const installedVersion =
536+
verifiedProvider.installedVersion !== undefined
537+
? verifiedProvider.installedVersion
538+
: verifiedProvider.version;
539+
return (
536540
!isStillInstalled(verifiedProvider) ||
537541
(targetVersion !== undefined &&
538-
verifiedProvider.version?.replace(/^v/, "") !== targetVersion),
539-
);
542+
installedVersion?.replace(/^v/, "") !== targetVersion)
543+
);
544+
});
540545
const stillOutdated =
541546
targetVersion === undefined &&
542547
verifiedProviders.some((verifiedProvider) => isOutdatedProvider(verifiedProvider));

‎packages/contracts/src/server.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ const baseProviderSnapshot = {
3232
};
3333

3434
describe("ServerProvider", () => {
35+
it("round-trips the optional installed version, including an unknown value", () => {
36+
expect(
37+
decodeServerProvider({ ...baseProviderSnapshot, installedVersion: "1.2.3" }),
38+
).toHaveProperty("installedVersion", "1.2.3");
39+
expect(
40+
decodeServerProvider({ ...baseProviderSnapshot, installedVersion: null }),
41+
).toHaveProperty("installedVersion", null);
42+
expect(decodeServerProvider(baseProviderSnapshot)).not.toHaveProperty("installedVersion");
43+
});
44+
3545
it.each([undefined, true, false])("decodes workspace command discovery pending=%s", (pending) => {
3646
const workspace = {
3747
cwd: "/workspace/project",

‎packages/contracts/src/server.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ export const ServerProvider = Schema.Struct({
290290
enabled: Schema.Boolean,
291291
installed: Schema.Boolean,
292292
version: Schema.NullOr(TrimmedNonEmptyString),
293+
// Version reported by the installed CLI for a local provider with a separate
294+
// server. Null means unknown; absence keeps legacy snapshots on `version`.
295+
installedVersion: Schema.optionalKey(Schema.NullOr(TrimmedNonEmptyString)),
293296
status: ServerProviderState,
294297
auth: ServerProviderAuth,
295298
checkedAt: IsoDateTime,

‎packages/provider-core/src/server/maintenanceResolver.test.ts‎

Lines changed: 109 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,11 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
158158
);
159159

160160
it.effect("does not fetch latest provider versions when update checks are disabled", () =>
161-
enrichProviderSnapshotWithVersionAdvisory(installedPackageToolProvider, manualPackageTool, {
162-
enableProviderUpdateChecks: false,
163-
}).pipe(
161+
enrichProviderSnapshotWithVersionAdvisory(
162+
{ ...installedPackageToolProvider, installedVersion: "1.1.0" },
163+
manualPackageTool,
164+
{ enableProviderUpdateChecks: false },
165+
).pipe(
164166
Effect.provide(ProviderLatestVersions.layer),
165167
Effect.provideService(
166168
HttpClient.HttpClient,
@@ -171,14 +173,117 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
171173
Effect.map((provider) => {
172174
expect(provider.versionAdvisory).toMatchObject({
173175
status: "unknown",
174-
currentVersion: "1.0.0",
176+
currentVersion: "1.1.0",
175177
latestVersion: null,
176178
checkedAt: "2026-04-10T00:00:00.000Z",
177179
});
178180
}),
179181
),
180182
);
181183

184+
it.effect("uses the installed version for advisory while preserving runtime version", () =>
185+
enrichProviderSnapshotWithVersionAdvisory(
186+
{ ...installedPackageToolProvider, installedVersion: "1.1.0" },
187+
manualPackageTool,
188+
{ enableProviderUpdateChecks: true },
189+
).pipe(
190+
Effect.provideServiceEffect(
191+
ProviderLatestVersions.ProviderLatestVersions,
192+
ProviderLatestVersions.make([["@example/package-tool", "1.2.0"]]),
193+
),
194+
Effect.provideService(
195+
HttpClient.HttpClient,
196+
HttpClient.make(() => Effect.die("cached latest version should avoid HTTP")),
197+
),
198+
Effect.map((provider) => {
199+
expect(provider.version).toBe("1.0.0");
200+
expect(provider.installedVersion).toBe("1.1.0");
201+
expect(provider.versionAdvisory).toMatchObject({
202+
status: "behind_latest",
203+
currentVersion: "1.1.0",
204+
latestVersion: "1.2.0",
205+
});
206+
}),
207+
),
208+
);
209+
210+
it.effect(
211+
"reports current when the installed version matches latest but the server is older",
212+
() =>
213+
enrichProviderSnapshotWithVersionAdvisory(
214+
{ ...installedPackageToolProvider, installedVersion: "1.1.0" },
215+
manualPackageTool,
216+
{ enableProviderUpdateChecks: true },
217+
).pipe(
218+
Effect.provideServiceEffect(
219+
ProviderLatestVersions.ProviderLatestVersions,
220+
ProviderLatestVersions.make([["@example/package-tool", "1.1.0"]]),
221+
),
222+
Effect.provideService(
223+
HttpClient.HttpClient,
224+
HttpClient.make(() => Effect.die("cached latest version should avoid HTTP")),
225+
),
226+
Effect.map((provider) => {
227+
expect(provider.version).toBe("1.0.0");
228+
expect(provider.versionAdvisory).toMatchObject({
229+
status: "current",
230+
currentVersion: "1.1.0",
231+
latestVersion: "1.1.0",
232+
});
233+
}),
234+
),
235+
);
236+
237+
it.effect("does not let a newer running server mask an outdated installation", () =>
238+
enrichProviderSnapshotWithVersionAdvisory(
239+
{ ...installedPackageToolProvider, version: "1.2.0", installedVersion: "1.0.0" },
240+
manualPackageTool,
241+
{ enableProviderUpdateChecks: true },
242+
).pipe(
243+
Effect.provideServiceEffect(
244+
ProviderLatestVersions.ProviderLatestVersions,
245+
ProviderLatestVersions.make([["@example/package-tool", "1.1.0"]]),
246+
),
247+
Effect.provideService(
248+
HttpClient.HttpClient,
249+
HttpClient.make(() => Effect.die("cached latest version should avoid HTTP")),
250+
),
251+
Effect.map((provider) => {
252+
expect(provider.version).toBe("1.2.0");
253+
expect(provider.versionAdvisory).toMatchObject({
254+
status: "behind_latest",
255+
currentVersion: "1.0.0",
256+
latestVersion: "1.1.0",
257+
});
258+
}),
259+
),
260+
);
261+
262+
it.effect("keeps an explicitly unknown installed version unknown", () =>
263+
enrichProviderSnapshotWithVersionAdvisory(
264+
{ ...installedPackageToolProvider, installedVersion: null },
265+
manualPackageTool,
266+
{ enableProviderUpdateChecks: true },
267+
).pipe(
268+
Effect.provideServiceEffect(
269+
ProviderLatestVersions.ProviderLatestVersions,
270+
ProviderLatestVersions.make([["@example/package-tool", "1.2.0"]]),
271+
),
272+
Effect.provideService(
273+
HttpClient.HttpClient,
274+
HttpClient.make(() => Effect.die("unknown installed version should skip lookup")),
275+
),
276+
Effect.map((provider) => {
277+
expect(provider.version).toBe("1.0.0");
278+
expect(provider.versionAdvisory).toMatchObject({
279+
status: "unknown",
280+
currentVersion: null,
281+
latestVersion: null,
282+
});
283+
}),
284+
),
285+
);
286+
182287
it("marks providers with unknown current versions as unknown", () => {
183288
expect(
184289
createProviderVersionAdvisory({

0 commit comments

Comments
 (0)