Skip to content

Commit 1aa6c92

Browse files
committed
fix(server): skip provider CLI update when already on latest
Re-probe before spawning so a stale behind_latest advisory does not run the installer when the binary already matches latest. Unknown version and an explicit pin still install.
1 parent c79ef8c commit 1aa6c92

2 files changed

Lines changed: 169 additions & 17 deletions

File tree

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

Lines changed: 120 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ function layerMockSpawner(
153153

154154
function makeRegistry(
155155
initialProviders: ServerProvider | ReadonlyArray<ServerProvider> = baseProvider,
156+
options?: {
157+
// Fixtures do not rewrite the binary. refreshInstance is the pre-spawn
158+
// probe and must keep the fixture version so skip-if-current can still
159+
// see "behind". refreshAfterUpdate is post-update verification.
160+
readonly installedVersionAfterUpdate?: string;
161+
},
156162
) {
157163
return Effect.gen(function* () {
158164
const providersRef = yield* Ref.make<ReadonlyArray<ServerProvider>>(
@@ -192,7 +198,17 @@ function makeRegistry(
192198
getProviders: Ref.get(providersRef),
193199
refresh: () => Ref.get(providersRef),
194200
refreshInstance: () => Ref.get(providersRef),
195-
refreshAfterUpdate: () => Ref.get(providersRef),
201+
refreshAfterUpdate: () => {
202+
if (options?.installedVersionAfterUpdate === undefined) {
203+
return Ref.get(providersRef);
204+
}
205+
return Ref.updateAndGet(providersRef, (providers) =>
206+
providers.map((provider) => ({
207+
...provider,
208+
version: options.installedVersionAfterUpdate,
209+
})),
210+
);
211+
},
196212
refreshWorkspaceSnapshot: () => Ref.get(providersRef),
197213
getProviderMaintenanceCapabilitiesForInstance: (_instanceId, provider) =>
198214
Effect.succeed(lifecycleFor(provider)),
@@ -268,7 +284,92 @@ describe("providerMaintenanceRunner", () => {
268284
Effect.provide(
269285
Layer.mergeAll(
270286
layerNonWindowsPlatform,
271-
layerLatestVersionHttpClient("0.0.0"),
287+
layerLatestVersionHttpClient("1.0.0"),
288+
layerMockSpawner((command, args) => {
289+
calls.push({ command, args });
290+
return { stdout: "updated" };
291+
}),
292+
),
293+
),
294+
);
295+
});
296+
297+
it.effect("skips the installer when a fresh probe already matches latest", () => {
298+
const calls: Array<{ command: string; args: ReadonlyArray<string> }> = [];
299+
return Effect.gen(function* () {
300+
const { registry, updateStatesRef } = yield* makeRegistry({
301+
...baseProvider,
302+
version: "2.1.310",
303+
});
304+
const updater = yield* makeTestRunner({
305+
...registry,
306+
getProviderMaintenanceCapabilitiesForInstance: () =>
307+
Effect.succeed(
308+
makeProviderMaintenanceCapabilities({
309+
provider: CODEX_DRIVER,
310+
packageName: "@anthropic-ai/claude-code",
311+
updateExecutable: "claude",
312+
updateArgs: ["update"],
313+
updateLockKey: "claudeAgent-native",
314+
}),
315+
),
316+
});
317+
318+
const result = yield* updater.updateProvider(CODEX_DRIVER);
319+
assert.deepStrictEqual(calls, []);
320+
assert.strictEqual(result.providers[0]?.updateState?.status, "succeeded");
321+
assert.strictEqual(result.providers[0]?.updateState?.message, "Already up to date.");
322+
assert.deepStrictEqual(
323+
(yield* Ref.get(updateStatesRef)).map((state) => [state.status, state.message]),
324+
[
325+
["queued", "Waiting for another provider update to finish."],
326+
["running", "Checking for the latest version"],
327+
["succeeded", "Already up to date."],
328+
],
329+
);
330+
}).pipe(
331+
Effect.provide(
332+
Layer.mergeAll(
333+
layerNonWindowsPlatform,
334+
layerLatestVersionHttpClient("2.1.310"),
335+
layerMockSpawner((command, args) => {
336+
calls.push({ command, args });
337+
return { stdout: "updated" };
338+
}),
339+
),
340+
),
341+
);
342+
});
343+
344+
it.effect("still runs the installer when the fresh probe is behind latest", () => {
345+
const calls: Array<{ command: string; args: ReadonlyArray<string> }> = [];
346+
return Effect.gen(function* () {
347+
const { registry } = yield* makeRegistry({
348+
...baseProvider,
349+
version: "2.1.309",
350+
});
351+
const updater = yield* makeTestRunner({
352+
...registry,
353+
getProviderMaintenanceCapabilitiesForInstance: () =>
354+
Effect.succeed(
355+
makeProviderMaintenanceCapabilities({
356+
provider: CODEX_DRIVER,
357+
packageName: "@anthropic-ai/claude-code",
358+
updateExecutable: "claude",
359+
updateArgs: ["update"],
360+
updateLockKey: "claudeAgent-native",
361+
}),
362+
),
363+
});
364+
365+
const result = yield* updater.updateProvider(CODEX_DRIVER);
366+
assert.deepStrictEqual(calls, [{ command: "claude", args: ["update"] }]);
367+
assert.strictEqual(result.providers[0]?.updateState?.status, "unchanged");
368+
}).pipe(
369+
Effect.provide(
370+
Layer.mergeAll(
371+
layerNonWindowsPlatform,
372+
layerLatestVersionHttpClient("2.1.310"),
272373
layerMockSpawner((command, args) => {
273374
calls.push({ command, args });
274375
return { stdout: "updated" };
@@ -297,7 +398,7 @@ describe("providerMaintenanceRunner", () => {
297398
Effect.provide(
298399
Layer.mergeAll(
299400
layerNonWindowsPlatform,
300-
layerLatestVersionHttpClient("0.0.0"),
401+
layerLatestVersionHttpClient("1.0.0"),
301402
layerMockSpawner(() => ({ stdout: "updated" })),
302403
),
303404
),
@@ -330,7 +431,7 @@ describe("providerMaintenanceRunner", () => {
330431
Effect.provide(
331432
Layer.mergeAll(
332433
layerNonWindowsPlatform,
333-
layerLatestVersionHttpClient("0.0.0"),
434+
layerLatestVersionHttpClient("1.0.0"),
334435
layerMockSpawner((_command, _args, options) => {
335436
seen.push(options.env);
336437
return { stdout: "updated" };
@@ -370,7 +471,7 @@ describe("providerMaintenanceRunner", () => {
370471
Effect.provide(
371472
Layer.mergeAll(
372473
layerNonWindowsPlatform,
373-
layerLatestVersionHttpClient("0.0.0"),
474+
layerLatestVersionHttpClient("1.0.0"),
374475
layerMockSpawner((command, args) => {
375476
calls.push({ command, args });
376477
return { stdout: "updated" };
@@ -432,7 +533,7 @@ describe("providerMaintenanceRunner", () => {
432533
Effect.provide(
433534
Layer.mergeAll(
434535
layerNonWindowsPlatform,
435-
layerLatestVersionHttpClient("0.0.0"),
536+
layerLatestVersionHttpClient("1.0.0"),
436537
layerMockSpawner((command) => {
437538
calls.push(command);
438539
return { stdout: "updated" };
@@ -460,7 +561,7 @@ describe("providerMaintenanceRunner", () => {
460561
Effect.provide(
461562
Layer.mergeAll(
462563
layerNonWindowsPlatform,
463-
layerLatestVersionHttpClient("0.0.0"),
564+
layerLatestVersionHttpClient("1.0.0"),
464565
layerMockSpawner(() => ({
465566
stdout: "checking install\n",
466567
stderr: "Error: Could not detect the Codex installation method.\n\n",
@@ -486,7 +587,7 @@ describe("providerMaintenanceRunner", () => {
486587
Effect.provide(
487588
Layer.mergeAll(
488589
layerNonWindowsPlatform,
489-
layerLatestVersionHttpClient("0.0.0"),
590+
layerLatestVersionHttpClient("1.0.0"),
490591
layerMockSpawner(() => ({ code: 1 })),
491592
),
492593
),
@@ -551,7 +652,7 @@ describe("providerMaintenanceRunner", () => {
551652
Effect.provide(
552653
Layer.mergeAll(
553654
layerNonWindowsPlatform,
554-
layerLatestVersionHttpClient("0.0.0"),
655+
layerLatestVersionHttpClient("1.0.0"),
555656
layerMockSpawner(() => {
556657
startedLatch.resolve();
557658
return {
@@ -570,7 +671,9 @@ describe("providerMaintenanceRunner", () => {
570671
"releases the running-provider marker when interrupted after queuing but before the lock run starts",
571672
() =>
572673
Effect.gen(function* () {
573-
const { registry } = yield* makeRegistry(baseProvider);
674+
const { registry } = yield* makeRegistry(baseProvider, {
675+
installedVersionAfterUpdate: "1.0.0",
676+
});
574677
let blockQueuedState = true;
575678
const queuedStateWrittenLatch: { resolve: () => void } = { resolve: () => {} };
576679
const releaseQueuedStateLatch: { resolve: () => void } = { resolve: () => {} };
@@ -611,7 +714,7 @@ describe("providerMaintenanceRunner", () => {
611714
Effect.provide(
612715
Layer.mergeAll(
613716
layerNonWindowsPlatform,
614-
layerLatestVersionHttpClient("0.0.0"),
717+
layerLatestVersionHttpClient("1.0.0"),
615718
layerMockSpawner(() => ({ stdout: "updated" })),
616719
),
617720
),
@@ -625,7 +728,9 @@ describe("providerMaintenanceRunner", () => {
625728
readonly shell: boolean | string | undefined;
626729
}> = [];
627730
return Effect.gen(function* () {
628-
const { registry } = yield* makeRegistry(baseProvider);
731+
const { registry } = yield* makeRegistry(baseProvider, {
732+
installedVersionAfterUpdate: "1.0.0",
733+
});
629734
const runner = yield* makeTestRunner(registry);
630735

631736
const result = yield* runner.updateProvider(CODEX_DRIVER);
@@ -651,7 +756,7 @@ describe("providerMaintenanceRunner", () => {
651756
Layer.succeed(SpawnExecutableResolution, (command) =>
652757
command === "npm" ? "C:\\fake\\npm\\npm.cmd" : undefined,
653758
),
654-
layerLatestVersionHttpClient("0.0.0"),
759+
layerLatestVersionHttpClient("1.0.0"),
655760
Layer.succeed(
656761
ChildProcessSpawner.ChildProcessSpawner,
657762
ChildProcessSpawner.make((command) => {
@@ -689,7 +794,7 @@ it.effect.each([
689794
},
690795
{
691796
mode: "unknown",
692-
version: "1.14.20",
797+
version: "1.14.19",
693798
installation: { installedVersion: null },
694799
status: "unchanged",
695800
},
@@ -785,7 +890,7 @@ it.effect(
785890
"uses fresh installer versions for post-update verification and compatibility checks",
786891
() => {
787892
const calls: string[] = [];
788-
let latest = "1.0.0";
893+
let latest = "2.0.0";
789894
const manifest: ModelManifest.ModelManifestData = {
790895
version: 1,
791896
currentModels: {},

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

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,14 @@ function isOutdatedProvider(provider: ServerProvider | undefined): boolean {
269269
return provider?.versionAdvisory?.status === "behind_latest";
270270
}
271271

272+
function isAlreadyOnLatest(provider: ServerProvider | undefined): boolean {
273+
return (
274+
provider !== undefined &&
275+
isStillInstalled(provider) &&
276+
provider.versionAdvisory?.status === "current"
277+
);
278+
}
279+
272280
function isStillInstalled(provider: ServerProvider): boolean {
273281
return provider.installed;
274282
}
@@ -315,12 +323,13 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
315323
}),
316324
});
317325

318-
const verifyRefreshedProvider = (
326+
const verifyFromRefresh = (
327+
refresh: Effect.Effect<ReadonlyArray<ServerProvider>>,
319328
provider: ProviderDriverKind,
320329
maintenanceCapabilities: ProviderMaintenanceCapabilities,
321330
instanceId: ProviderInstanceId,
322331
): Effect.Effect<VerifiedProviderRefresh> =>
323-
providerRegistry.refreshAfterUpdate(provider, instanceId).pipe(
332+
refresh.pipe(
324333
Effect.flatMap((providers) => {
325334
const refreshedProviders = providers.filter(
326335
(candidate) => candidate.driver === provider && candidate.instanceId === instanceId,
@@ -364,6 +373,18 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
364373
}),
365374
);
366375

376+
const verifyRefreshedProvider = (
377+
provider: ProviderDriverKind,
378+
maintenanceCapabilities: ProviderMaintenanceCapabilities,
379+
instanceId: ProviderInstanceId,
380+
): Effect.Effect<VerifiedProviderRefresh> =>
381+
verifyFromRefresh(
382+
providerRegistry.refreshAfterUpdate(provider, instanceId),
383+
provider,
384+
maintenanceCapabilities,
385+
instanceId,
386+
);
387+
367388
const updateProvider: ProviderMaintenanceRunnerShape["updateProvider"] = Effect.fn(
368389
"ProviderMaintenanceRunner.updateProvider",
369390
)(function* (target) {
@@ -481,6 +502,32 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
481502
}),
482503
);
483504
}
505+
506+
// Re-probe before spawning. A stale behind_latest advisory must
507+
// not run the installer when the binary is already current.
508+
// Unknown version stays on the installer path.
509+
if (targetVersion === undefined) {
510+
const precheck = yield* verifyFromRefresh(
511+
providerRegistry.refreshInstance(instanceId),
512+
provider,
513+
fresh,
514+
instanceId,
515+
);
516+
const alreadyCurrent =
517+
precheck.verifiedProviders.length > 0 &&
518+
precheck.verifiedProviders.every(isAlreadyOnLatest);
519+
if (alreadyCurrent) {
520+
return yield* finish(
521+
makeUpdateState({
522+
status: "succeeded",
523+
startedAt,
524+
finishedAt: yield* nowIso,
525+
message: "Already up to date.",
526+
}),
527+
);
528+
}
529+
}
530+
484531
yield* setRunningMessage(`Running ${describeCommand(command)}`);
485532
const result = yield* runMaintenanceCommand(command, setRunningMessage);
486533
const finishedAt = yield* nowIso;

0 commit comments

Comments
 (0)