Skip to content

Commit 55f46fa

Browse files
Persist merged provider snapshots with live updates
- keep cached models when refreshes return an empty list - persist only the updated provider snapshots after merge
1 parent 7d3d2ce commit 55f46fa

2 files changed

Lines changed: 121 additions & 3 deletions

File tree

‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import {
3333
} from "./ProviderRegistry.ts";
3434
import { ServerConfig } from "../../config.ts";
3535
import { ServerSettingsService, type ServerSettingsShape } from "../../serverSettings.ts";
36+
import { readProviderStatusCache, resolveProviderStatusCachePath } from "../providerStatusCache.ts";
3637
import type { ProviderInstance } from "../ProviderDriver.ts";
3738
import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";
3839
import { ProviderRegistry } from "../Services/ProviderRegistry.ts";
@@ -575,6 +576,118 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
575576
]);
576577
});
577578

579+
it.effect("persists the merged snapshot when a live update has empty models", () =>
580+
Effect.gen(function* () {
581+
const cursorDriver = ProviderDriverKind.make("cursor");
582+
const cursorInstanceId = ProviderInstanceId.make("cursor");
583+
const initialProvider = {
584+
instanceId: cursorInstanceId,
585+
driver: cursorDriver,
586+
status: "ready",
587+
enabled: true,
588+
installed: true,
589+
auth: { status: "authenticated" },
590+
checkedAt: "2026-04-14T00:00:00.000Z",
591+
version: "2026.04.09-f2b0fcd",
592+
models: [
593+
{
594+
slug: "claude-opus-4-6",
595+
name: "Opus 4.6",
596+
isCustom: false,
597+
capabilities: createModelCapabilities({
598+
optionDescriptors: [
599+
selectDescriptor("reasoning", "Reasoning", [
600+
{ id: "high", label: "High", isDefault: true },
601+
]),
602+
],
603+
}),
604+
},
605+
],
606+
slashCommands: [],
607+
skills: [],
608+
} as const satisfies ServerProvider;
609+
const refreshedProvider = {
610+
...initialProvider,
611+
checkedAt: "2026-04-14T00:01:00.000Z",
612+
models: [],
613+
} satisfies ServerProvider;
614+
const changes = yield* PubSub.unbounded<ServerProvider>();
615+
const instance = {
616+
instanceId: cursorInstanceId,
617+
driverKind: cursorDriver,
618+
continuationIdentity: {
619+
driverKind: cursorDriver,
620+
continuationKey: "cursor:instance:cursor",
621+
},
622+
displayName: undefined,
623+
enabled: true,
624+
snapshot: {
625+
maintenanceCapabilities: makeManualOnlyProviderMaintenanceCapabilities({
626+
provider: cursorDriver,
627+
packageName: null,
628+
}),
629+
getSnapshot: Effect.succeed(initialProvider),
630+
refresh: Effect.succeed(refreshedProvider),
631+
streamChanges: Stream.fromPubSub(changes),
632+
},
633+
adapter: {} as ProviderInstance["adapter"],
634+
textGeneration: {} as ProviderInstance["textGeneration"],
635+
} satisfies ProviderInstance;
636+
const instanceRegistryLayer = Layer.succeed(ProviderInstanceRegistry, {
637+
getInstance: (instanceId) =>
638+
Effect.succeed(instanceId === cursorInstanceId ? instance : undefined),
639+
listInstances: Effect.succeed([instance]),
640+
listUnavailable: Effect.succeed([]),
641+
streamChanges: Stream.empty,
642+
subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), (pubsub) =>
643+
PubSub.subscribe(pubsub),
644+
),
645+
});
646+
const scope = yield* Scope.make();
647+
yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
648+
const runtimeServices = yield* Layer.build(
649+
ProviderRegistryLive.pipe(
650+
Layer.provideMerge(instanceRegistryLayer),
651+
Layer.provideMerge(
652+
ServerConfig.layerTest(process.cwd(), {
653+
prefix: "t3-provider-registry-merged-persist-",
654+
}),
655+
),
656+
Layer.provideMerge(NodeServices.layer),
657+
),
658+
).pipe(Scope.provide(scope));
659+
660+
yield* Effect.gen(function* () {
661+
const registry = yield* ProviderRegistry;
662+
const config = yield* ServerConfig;
663+
const filePath = yield* resolveProviderStatusCachePath({
664+
cacheDir: config.providerStatusCacheDir,
665+
instanceId: cursorInstanceId,
666+
});
667+
668+
assert.deepStrictEqual((yield* registry.getProviders)[0]?.models, [
669+
...initialProvider.models,
670+
]);
671+
yield* PubSub.publish(changes, refreshedProvider);
672+
673+
let cachedProvider = yield* readProviderStatusCache(filePath);
674+
for (
675+
let attempt = 0;
676+
attempt < 50 && cachedProvider?.checkedAt !== refreshedProvider.checkedAt;
677+
attempt += 1
678+
) {
679+
yield* Effect.sleep("10 millis");
680+
cachedProvider = yield* readProviderStatusCache(filePath);
681+
}
682+
683+
assert.deepStrictEqual(cachedProvider, {
684+
...refreshedProvider,
685+
models: [...initialProvider.models],
686+
});
687+
}).pipe(Effect.provide(runtimeServices));
688+
}),
689+
);
690+
578691
it.effect("returns the cached provider list when a manual refresh fails", () =>
579692
Effect.gen(function* () {
580693
const codexDriver = ProviderDriverKind.make("codex");

‎apps/server/src/provider/Layers/ProviderRegistry.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,15 +329,17 @@ export const ProviderRegistryLive = Layer.effect(
329329
concurrency: "unbounded",
330330
},
331331
);
332-
const [previousProviders, providers] = yield* Ref.modify(
332+
const [previousProviders, providers, providersToPersist] = yield* Ref.modify(
333333
providersRef,
334334
(previousProviders) => {
335335
const mergedProviders = new Map(
336336
previousProviders.map((provider) => [snapshotInstanceKey(provider), provider] as const),
337337
);
338+
const updatedKeys = new Set<ProviderInstanceId>();
338339

339340
for (const provider of nextProvidersWithUpdateState) {
340341
const key = snapshotInstanceKey(provider);
342+
updatedKeys.add(key);
341343
mergedProviders.set(
342344
key,
343345
options?.replace === true
@@ -347,13 +349,16 @@ export const ProviderRegistryLive = Layer.effect(
347349
}
348350

349351
const providers = orderProviderSnapshots([...mergedProviders.values()]);
350-
return [[previousProviders, providers] as const, providers];
352+
const providersToPersist = providers.filter((provider) =>
353+
updatedKeys.has(snapshotInstanceKey(provider)),
354+
);
355+
return [[previousProviders, providers, providersToPersist] as const, providers];
351356
},
352357
);
353358

354359
if (haveProvidersChanged(previousProviders, providers)) {
355360
if (options?.persist !== false) {
356-
yield* Effect.forEach(nextProvidersWithUpdateState, persistProvider, {
361+
yield* Effect.forEach(providersToPersist, persistProvider, {
357362
concurrency: "unbounded",
358363
discard: true,
359364
});

0 commit comments

Comments
 (0)