Skip to content

Commit ad0872c

Browse files
committed
fix(server): install the advertised version for pnpm-global provider updates
pnpm 11 and later resolve @latest to the newest release older than minimumReleaseAge and exit 0, so the update left the provider outdated. Pin the update command to the version the advisory shows.
1 parent 27bdf1a commit ad0872c

4 files changed

Lines changed: 80 additions & 2 deletions

File tree

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,33 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
214214
});
215215
});
216216

217+
it("pins the advertised version in a pnpm-global update command", () => {
218+
const pnpmTool = makeProviderMaintenanceCapabilities({
219+
provider: driver("packageTool"),
220+
packageName: "@example/package-tool",
221+
updateExecutable: "pnpm",
222+
updateArgs: ["add", "-g", "@example/package-tool@latest"],
223+
updateLockKey: "pnpm-global",
224+
});
225+
const npmTool = makeProviderMaintenanceCapabilities({
226+
provider: driver("packageTool"),
227+
packageName: "@example/package-tool",
228+
updateExecutable: "npm",
229+
updateArgs: ["install", "-g", "@example/package-tool@latest"],
230+
updateLockKey: "npm-global:/opt/node",
231+
});
232+
const advisoryFor = (maintenanceCapabilities: typeof pnpmTool) =>
233+
createProviderVersionAdvisory({
234+
driver: driver("packageTool"),
235+
currentVersion: "1.0.0",
236+
latestVersion: "1.1.0",
237+
maintenanceCapabilities,
238+
});
239+
240+
expect(advisoryFor(pnpmTool).updateCommand).toBe("pnpm add -g @example/[email protected]");
241+
expect(advisoryFor(npmTool).updateCommand).toBe("npm install -g @example/package-tool@latest");
242+
});
243+
217244
it("keeps the manual update hint when the install is behind but unowned", () => {
218245
expect(
219246
createProviderVersionAdvisory({

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,20 @@ export function makeTargetedProviderUpdateAction(
213213
return { ...update, args, command };
214214
}
215215

216+
/**
217+
* The action that installs `latestVersion`. pnpm 11 and later resolve `@latest`
218+
* to the newest release older than `minimumReleaseAge` and still exit 0, so a
219+
* pnpm-global update installs the advertised version by exact spec instead.
220+
*/
221+
export function resolveLatestProviderUpdateAction(
222+
capabilities: ProviderMaintenanceCapabilities,
223+
latestVersion: string | null,
224+
): ProviderMaintenanceCommandAction | null {
225+
const update = capabilities.update;
226+
if (update?.lockKey !== "pnpm-global" || latestVersion === null) return update;
227+
return makeTargetedProviderUpdateAction(capabilities, latestVersion) ?? update;
228+
}
229+
216230
export function makeManualOnlyProviderMaintenanceCapabilities(input: {
217231
readonly provider: ProviderDriverKind;
218232
readonly packageName: string | null;
@@ -652,7 +666,7 @@ export function createProviderVersionAdvisory(input: {
652666
status: advisory.status,
653667
currentVersion: input.currentVersion,
654668
latestVersion,
655-
updateCommand: capabilities.update?.command ?? null,
669+
updateCommand: resolveLatestProviderUpdateAction(capabilities, latestVersion)?.command ?? null,
656670
canUpdate: capabilities.update !== null,
657671
canInstallVersion: makeTargetedProviderUpdateAction(capabilities, "0.0.0") !== null,
658672
checkedAt: input.checkedAt ?? null,

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,42 @@ describe("providerMaintenanceRunner", () => {
407407
);
408408
});
409409

410+
it.effect("installs the advertised version when pnpm owns the global install", () => {
411+
const calls: Array<{ command: string; args: ReadonlyArray<string> }> = [];
412+
return Effect.gen(function* () {
413+
const { registry } = yield* makeRegistry(baseProvider);
414+
const updater = yield* makeTestRunner({
415+
...registry,
416+
getProviderMaintenanceCapabilitiesForInstance: (_instanceId, provider) =>
417+
Effect.succeed(
418+
makeProviderMaintenanceCapabilities({
419+
provider,
420+
packageName: "@openai/codex",
421+
updateExecutable: "pnpm",
422+
updateArgs: ["add", "-g", "@openai/codex@latest"],
423+
updateLockKey: "pnpm-global",
424+
}),
425+
),
426+
});
427+
428+
yield* updater.updateProvider(CODEX_DRIVER);
429+
assert.deepStrictEqual(calls, [
430+
{ command: "pnpm", args: ["add", "-g", "@openai/[email protected]"] },
431+
]);
432+
}).pipe(
433+
Effect.provide(
434+
Layer.mergeAll(
435+
NonWindowsPlatform,
436+
latestVersionHttpClient("9.9.9"),
437+
mockSpawnerLayer((command, args) => {
438+
calls.push({ command, args });
439+
return { stdout: "updated" };
440+
}),
441+
),
442+
),
443+
);
444+
});
445+
410446
it.effect("aborts without running when the installation changed since the advisory", () => {
411447
const calls: Array<string> = [];
412448
return Effect.gen(function* () {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { makeProviderMaintenanceCommandCoordinator } from "./providerMaintenance
2828
import {
2929
enrichProviderSnapshotWithVersionAdvisory,
3030
makeTargetedProviderUpdateAction,
31+
resolveLatestProviderUpdateAction,
3132
resolveLatestProviderVersion,
3233
type ProviderMaintenanceCommandAction,
3334
ProviderVersionCache,
@@ -400,7 +401,7 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
400401
const command =
401402
targetVersion !== undefined
402403
? makeTargetedProviderUpdateAction(fresh, targetVersion)
403-
: fresh.update;
404+
: resolveLatestProviderUpdateAction(fresh, candidateVersion);
404405
const rejected =
405406
targetVersion !== undefined
406407
? !command ||

0 commit comments

Comments
 (0)