Skip to content

Commit 6eaf397

Browse files
fix(server): skip provider CLI update when already on latest (pingdotgg#24763)
Co-authored-by: maria-rcks <[email protected]>
1 parent 9e97921 commit 6eaf397

2 files changed

Lines changed: 291 additions & 20 deletions

File tree

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

Lines changed: 243 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ function layerMockSpawner(
153153

154154
function makeRegistry(
155155
initialProviders: ServerProvider | ReadonlyArray<ServerProvider> = baseProvider,
156+
options?: {
157+
readonly installedVersionAfterUpdate?: string;
158+
},
156159
) {
157160
return Effect.gen(function* () {
158161
const providersRef = yield* Ref.make<ReadonlyArray<ServerProvider>>(
@@ -193,7 +196,18 @@ function makeRegistry(
193196
refresh: () => Ref.get(providersRef),
194197
refreshInstance: () => Ref.get(providersRef),
195198
reloadSecretsAndRefresh: () => Ref.get(providersRef),
196-
refreshAfterUpdate: () => Ref.get(providersRef),
199+
refreshAfterUpdate: () => {
200+
const version = options?.installedVersionAfterUpdate;
201+
if (version === undefined) {
202+
return Ref.get(providersRef);
203+
}
204+
return Ref.updateAndGet(providersRef, (providers) =>
205+
providers.map((provider) => ({
206+
...provider,
207+
version,
208+
})),
209+
);
210+
},
197211
refreshWorkspaceSnapshot: () => Ref.get(providersRef),
198212
getProviderMaintenanceCapabilitiesForInstance: (_instanceId, provider) =>
199213
Effect.succeed(lifecycleFor(provider)),
@@ -220,6 +234,7 @@ const makeTestRunner = (
220234
ranges: [],
221235
})),
222236
},
237+
latestVersions: Layer.Layer<ProviderLatestVersions.ProviderLatestVersions> = ProviderLatestVersions.layer,
223238
) =>
224239
Effect.service(ProviderMaintenanceRunner.ProviderMaintenanceRunner).pipe(
225240
Effect.provide(
@@ -233,13 +248,28 @@ const makeTestRunner = (
233248
forceRefresh: Effect.succeed(manifest),
234249
refreshInBackground: Effect.void,
235250
}),
236-
ProviderLatestVersions.layer,
251+
latestVersions,
237252
),
238253
),
239254
),
240255
),
241256
);
242257

258+
function layerFailingLatestLookupAfterFirst() {
259+
let lookups = 0;
260+
return Layer.succeed(ProviderLatestVersions.ProviderLatestVersions, {
261+
cached: (_key, lookup) =>
262+
Effect.gen(function* () {
263+
lookups += 1;
264+
if (lookups > 1) {
265+
return yield* Effect.die("latest lookup failed");
266+
}
267+
return yield* lookup;
268+
}),
269+
invalidate: () => Effect.void,
270+
});
271+
}
272+
243273
describe("providerMaintenanceRunner", () => {
244274
it.effect("runs the allowlisted provider update command and records success", () => {
245275
const calls: Array<{ command: string; args: ReadonlyArray<string> }> = [];
@@ -269,7 +299,190 @@ describe("providerMaintenanceRunner", () => {
269299
Effect.provide(
270300
Layer.mergeAll(
271301
layerNonWindowsPlatform,
272-
layerLatestVersionHttpClient("0.0.0"),
302+
layerLatestVersionHttpClient("1.0.0"),
303+
layerMockSpawner((command, args) => {
304+
calls.push({ command, args });
305+
return { stdout: "updated" };
306+
}),
307+
),
308+
),
309+
);
310+
});
311+
312+
it.effect.each([
313+
{ name: "current", probe: {}, skip: true },
314+
{ name: "failed", probe: { status: "error" }, skip: false },
315+
{ name: "behind", probe: { version: "2.1.309" }, skip: false },
316+
{ name: "unknown", probe: { version: null }, skip: false },
317+
{
318+
name: "installed current",
319+
probe: { version: "2.1.309", installedVersion: "2.1.310" },
320+
skip: true,
321+
},
322+
{ name: "installed behind", probe: { installedVersion: "2.1.309" }, skip: false },
323+
{ name: "installed unknown", probe: { installedVersion: null }, skip: false },
324+
] as const)("only skips a successful fresh current probe: $name", ({ probe, skip }) => {
325+
const calls: Array<{ command: string; args: ReadonlyArray<string> }> = [];
326+
const refreshedInstanceIds: Array<ProviderInstanceId> = [];
327+
return Effect.gen(function* () {
328+
const { registry, updateStatesRef, providersRef } = yield* makeRegistry({
329+
...baseProvider,
330+
version: "2.1.309",
331+
versionAdvisory: {
332+
status: "behind_latest",
333+
currentVersion: "2.1.309",
334+
latestVersion: "2.1.310",
335+
updateCommand: "claude update",
336+
canUpdate: true,
337+
checkedAt: "2026-04-10T00:00:00.000Z",
338+
message: "Update available.",
339+
},
340+
});
341+
const updater = yield* makeTestRunner({
342+
...registry,
343+
refreshInstance: (instanceId) => {
344+
refreshedInstanceIds.push(instanceId);
345+
return Ref.updateAndGet(providersRef, (providers) =>
346+
providers.map((provider) =>
347+
provider.instanceId === instanceId
348+
? {
349+
...provider,
350+
version: "2.1.310",
351+
...probe,
352+
checkedAt: "2026-04-10T00:00:01.000Z",
353+
}
354+
: provider,
355+
),
356+
);
357+
},
358+
getProviderMaintenanceCapabilitiesForInstance: () =>
359+
Effect.succeed(
360+
makeProviderMaintenanceCapabilities({
361+
provider: CODEX_DRIVER,
362+
packageName: "@anthropic-ai/claude-code",
363+
updateExecutable: "claude",
364+
updateArgs: ["update"],
365+
updateLockKey: "claudeAgent-native",
366+
}),
367+
),
368+
});
369+
370+
const result = yield* updater.updateProvider(CODEX_DRIVER);
371+
assert.deepStrictEqual(refreshedInstanceIds, [CODEX_INSTANCE_ID]);
372+
assert.deepStrictEqual(calls, skip ? [] : [{ command: "claude", args: ["update"] }]);
373+
if (!skip) return;
374+
assert.strictEqual(result.providers[0]?.updateState?.status, "succeeded");
375+
assert.strictEqual(result.providers[0]?.updateState?.message, "Already up to date.");
376+
assert.deepStrictEqual(
377+
(yield* Ref.get(updateStatesRef)).map((state) => [state.status, state.message]),
378+
[
379+
["queued", "Waiting for another provider update to finish."],
380+
["running", "Checking for the latest version"],
381+
["succeeded", "Already up to date."],
382+
],
383+
);
384+
}).pipe(
385+
Effect.provide(
386+
Layer.mergeAll(
387+
layerNonWindowsPlatform,
388+
layerLatestVersionHttpClient("2.1.310"),
389+
layerMockSpawner((command, args) => {
390+
calls.push({ command, args });
391+
return { stdout: "updated" };
392+
}),
393+
),
394+
),
395+
);
396+
});
397+
398+
it.effect("still runs the installer when refreshInstance returns the cached snapshot", () => {
399+
const calls: Array<{ command: string; args: ReadonlyArray<string> }> = [];
400+
return Effect.gen(function* () {
401+
const { registry } = yield* makeRegistry({
402+
...baseProvider,
403+
version: "2.1.310",
404+
});
405+
const updater = yield* makeTestRunner({
406+
...registry,
407+
getProviderMaintenanceCapabilitiesForInstance: () =>
408+
Effect.succeed(
409+
makeProviderMaintenanceCapabilities({
410+
provider: CODEX_DRIVER,
411+
packageName: "@anthropic-ai/claude-code",
412+
updateExecutable: "claude",
413+
updateArgs: ["update"],
414+
updateLockKey: "claudeAgent-native",
415+
}),
416+
),
417+
});
418+
419+
const result = yield* updater.updateProvider(CODEX_DRIVER);
420+
assert.deepStrictEqual(calls, [{ command: "claude", args: ["update"] }]);
421+
assert.strictEqual(result.providers[0]?.updateState?.status, "succeeded");
422+
}).pipe(
423+
Effect.provide(
424+
Layer.mergeAll(
425+
layerNonWindowsPlatform,
426+
layerLatestVersionHttpClient("2.1.310"),
427+
layerMockSpawner((command, args) => {
428+
calls.push({ command, args });
429+
return { stdout: "updated" };
430+
}),
431+
),
432+
),
433+
);
434+
});
435+
436+
it.effect("still runs the installer when precheck advisory enrichment fails", () => {
437+
const calls: Array<{ command: string; args: ReadonlyArray<string> }> = [];
438+
return Effect.gen(function* () {
439+
const { registry, providersRef } = yield* makeRegistry({
440+
...baseProvider,
441+
version: "2.1.310",
442+
versionAdvisory: {
443+
status: "current",
444+
currentVersion: "2.1.310",
445+
latestVersion: "2.1.310",
446+
updateCommand: "claude update",
447+
canUpdate: true,
448+
checkedAt: "2026-04-10T00:00:00.000Z",
449+
message: null,
450+
},
451+
});
452+
const updater = yield* makeTestRunner(
453+
{
454+
...registry,
455+
refreshInstance: (instanceId) =>
456+
Ref.updateAndGet(providersRef, (providers) =>
457+
providers.map((provider) =>
458+
provider.instanceId === instanceId
459+
? { ...provider, checkedAt: "2026-04-10T00:00:01.000Z" }
460+
: provider,
461+
),
462+
),
463+
getProviderMaintenanceCapabilitiesForInstance: () =>
464+
Effect.succeed(
465+
makeProviderMaintenanceCapabilities({
466+
provider: CODEX_DRIVER,
467+
packageName: "@anthropic-ai/claude-code",
468+
updateExecutable: "claude",
469+
updateArgs: ["update"],
470+
updateLockKey: "claudeAgent-native",
471+
}),
472+
),
473+
},
474+
undefined,
475+
layerFailingLatestLookupAfterFirst(),
476+
);
477+
478+
const result = yield* updater.updateProvider(CODEX_DRIVER);
479+
assert.deepStrictEqual(calls, [{ command: "claude", args: ["update"] }]);
480+
assert.strictEqual(result.providers[0]?.updateState?.status, "succeeded");
481+
}).pipe(
482+
Effect.provide(
483+
Layer.mergeAll(
484+
layerNonWindowsPlatform,
485+
layerLatestVersionHttpClient("2.1.310"),
273486
layerMockSpawner((command, args) => {
274487
calls.push({ command, args });
275488
return { stdout: "updated" };
@@ -298,7 +511,7 @@ describe("providerMaintenanceRunner", () => {
298511
Effect.provide(
299512
Layer.mergeAll(
300513
layerNonWindowsPlatform,
301-
layerLatestVersionHttpClient("0.0.0"),
514+
layerLatestVersionHttpClient("1.0.0"),
302515
layerMockSpawner(() => ({ stdout: "updated" })),
303516
),
304517
),
@@ -331,7 +544,7 @@ describe("providerMaintenanceRunner", () => {
331544
Effect.provide(
332545
Layer.mergeAll(
333546
layerNonWindowsPlatform,
334-
layerLatestVersionHttpClient("0.0.0"),
547+
layerLatestVersionHttpClient("1.0.0"),
335548
layerMockSpawner((_command, _args, options) => {
336549
seen.push(options.env);
337550
return { stdout: "updated" };
@@ -371,7 +584,7 @@ describe("providerMaintenanceRunner", () => {
371584
Effect.provide(
372585
Layer.mergeAll(
373586
layerNonWindowsPlatform,
374-
layerLatestVersionHttpClient("0.0.0"),
587+
layerLatestVersionHttpClient("1.0.0"),
375588
layerMockSpawner((command, args) => {
376589
calls.push({ command, args });
377590
return { stdout: "updated" };
@@ -433,7 +646,7 @@ describe("providerMaintenanceRunner", () => {
433646
Effect.provide(
434647
Layer.mergeAll(
435648
layerNonWindowsPlatform,
436-
layerLatestVersionHttpClient("0.0.0"),
649+
layerLatestVersionHttpClient("1.0.0"),
437650
layerMockSpawner((command) => {
438651
calls.push(command);
439652
return { stdout: "updated" };
@@ -461,7 +674,7 @@ describe("providerMaintenanceRunner", () => {
461674
Effect.provide(
462675
Layer.mergeAll(
463676
layerNonWindowsPlatform,
464-
layerLatestVersionHttpClient("0.0.0"),
677+
layerLatestVersionHttpClient("1.0.0"),
465678
layerMockSpawner(() => ({
466679
stdout: "checking install\n",
467680
stderr: "Error: Could not detect the Codex installation method.\n\n",
@@ -487,7 +700,7 @@ describe("providerMaintenanceRunner", () => {
487700
Effect.provide(
488701
Layer.mergeAll(
489702
layerNonWindowsPlatform,
490-
layerLatestVersionHttpClient("0.0.0"),
703+
layerLatestVersionHttpClient("1.0.0"),
491704
layerMockSpawner(() => ({ code: 1 })),
492705
),
493706
),
@@ -552,7 +765,7 @@ describe("providerMaintenanceRunner", () => {
552765
Effect.provide(
553766
Layer.mergeAll(
554767
layerNonWindowsPlatform,
555-
layerLatestVersionHttpClient("0.0.0"),
768+
layerLatestVersionHttpClient("1.0.0"),
556769
layerMockSpawner(() => {
557770
startedLatch.resolve();
558771
return {
@@ -571,7 +784,9 @@ describe("providerMaintenanceRunner", () => {
571784
"releases the running-provider marker when interrupted after queuing but before the lock run starts",
572785
() =>
573786
Effect.gen(function* () {
574-
const { registry } = yield* makeRegistry(baseProvider);
787+
const { registry } = yield* makeRegistry(baseProvider, {
788+
installedVersionAfterUpdate: "1.0.0",
789+
});
575790
let blockQueuedState = true;
576791
const queuedStateWrittenLatch: { resolve: () => void } = { resolve: () => {} };
577792
const releaseQueuedStateLatch: { resolve: () => void } = { resolve: () => {} };
@@ -612,7 +827,7 @@ describe("providerMaintenanceRunner", () => {
612827
Effect.provide(
613828
Layer.mergeAll(
614829
layerNonWindowsPlatform,
615-
layerLatestVersionHttpClient("0.0.0"),
830+
layerLatestVersionHttpClient("1.0.0"),
616831
layerMockSpawner(() => ({ stdout: "updated" })),
617832
),
618833
),
@@ -626,7 +841,9 @@ describe("providerMaintenanceRunner", () => {
626841
readonly shell: boolean | string | undefined;
627842
}> = [];
628843
return Effect.gen(function* () {
629-
const { registry } = yield* makeRegistry(baseProvider);
844+
const { registry } = yield* makeRegistry(baseProvider, {
845+
installedVersionAfterUpdate: "1.0.0",
846+
});
630847
const runner = yield* makeTestRunner(registry);
631848

632849
const result = yield* runner.updateProvider(CODEX_DRIVER);
@@ -652,7 +869,7 @@ describe("providerMaintenanceRunner", () => {
652869
Layer.succeed(SpawnExecutableResolution, (command) =>
653870
command === "npm" ? "C:\\fake\\npm\\npm.cmd" : undefined,
654871
),
655-
layerLatestVersionHttpClient("0.0.0"),
872+
layerLatestVersionHttpClient("1.0.0"),
656873
Layer.succeed(
657874
ChildProcessSpawner.ChildProcessSpawner,
658875
ChildProcessSpawner.make((command) => {
@@ -689,8 +906,14 @@ it.effect.each([
689906
status: "succeeded",
690907
},
691908
{
692-
mode: "unknown",
909+
mode: "targeted-current",
693910
version: "1.14.20",
911+
installation: { installedVersion: "1.14.20" },
912+
status: "succeeded",
913+
},
914+
{
915+
mode: "unknown",
916+
version: "1.14.19",
694917
installation: { installedVersion: null },
695918
status: "unchanged",
696919
},
@@ -723,6 +946,10 @@ it.effect.each([
723946
const updater = yield* makeTestRunner(
724947
{
725948
...registry,
949+
refreshInstance: () =>
950+
Ref.updateAndGet(providersRef, (providers) =>
951+
providers.map((provider) => ({ ...provider, checkedAt: "2026-04-10T00:00:01.000Z" })),
952+
),
726953
getProviderMaintenanceCapabilitiesForInstance: () => Effect.succeed(pinnedCapabilities),
727954
refreshAfterUpdate: () =>
728955
Effect.gen(function* () {
@@ -786,7 +1013,7 @@ it.effect(
7861013
"uses fresh installer versions for post-update verification and compatibility checks",
7871014
() => {
7881015
const calls: string[] = [];
789-
let latest = "1.0.0";
1016+
let latest = "2.0.0";
7901017
const manifest: ModelManifest.ModelManifestData = {
7911018
version: 1,
7921019
currentModels: {},

0 commit comments

Comments
 (0)