Skip to content

Commit 7da182d

Browse files
refactor(provider-core): latest-version lookups go through a ProviderLatestVersions service
The npm and Muse channel caches shared a Context.Reference to a mutable Map with a server-namespaced key. ProviderLatestVersions owns the TTL policy and invalidation; drivers yield it like any other service and the server provides one instance. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 7e29597 commit 7da182d

28 files changed

Lines changed: 196 additions & 91 deletions

‎apps/server/src/orchestration-v2/AcpRegistryOrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import * as CodexInstallation from "../provider/CodexInstallation.ts";
2929
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
32+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
3233
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
3334
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
3435
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
@@ -112,6 +113,7 @@ const layerProviderInstanceRegistry = ProviderInstanceRegistryHydration.layer.pi
112113
ProviderEventLoggers.ProviderEventLoggers,
113114
ProviderEventLoggers.NoOpProviderEventLoggers,
114115
),
116+
ProviderLatestVersions.layer,
115117
ModelManifest.layerTest,
116118
AntigravityInstallation.AntigravityInstallation.layer.pipe(
117119
Layer.provide(layerServerConfig.pipe(Layer.provide(layerPlatformTest))),

‎apps/server/src/orchestration-v2/CursorOrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import * as CodexInstallation from "../provider/CodexInstallation.ts";
2929
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
32+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
3233
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
3334
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
3435
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
@@ -92,6 +93,7 @@ const layerProviderInstanceRegistry = ProviderInstanceRegistryHydration.layer.pi
9293
ProviderEventLoggers.ProviderEventLoggers,
9394
ProviderEventLoggers.NoOpProviderEventLoggers,
9495
),
96+
ProviderLatestVersions.layer,
9597
ModelManifest.layerTest,
9698
AntigravityInstallation.AntigravityInstallation.layer.pipe(
9799
Layer.provide(layerServerConfig.pipe(Layer.provide(layerPlatformTest))),

‎apps/server/src/orchestration-v2/GrokOrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import * as CodexInstallation from "../provider/CodexInstallation.ts";
2929
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
32+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
3233
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
3334
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
3435
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
@@ -91,6 +92,7 @@ const layerProviderInstanceRegistry = ProviderInstanceRegistryHydration.layer.pi
9192
ProviderEventLoggers.ProviderEventLoggers,
9293
ProviderEventLoggers.NoOpProviderEventLoggers,
9394
),
95+
ProviderLatestVersions.layer,
9496
ModelManifest.layerTest,
9597
AntigravityInstallation.AntigravityInstallation.layer.pipe(
9698
Layer.provide(layerServerConfig.pipe(Layer.provide(layerPlatformTest))),

‎apps/server/src/orchestration-v2/OpenCode2OrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import * as CodexInstallation from "../provider/CodexInstallation.ts";
5454
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
5555
import * as ModelManifest from "../provider/ModelManifest.ts";
5656
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
57+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
5758
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
5859
import * as OpenCode2Client from "@t3tools/provider-opencode/server/v2/OpenCode2Client";
5960
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
@@ -185,6 +186,7 @@ const layerProviderInstanceRegistry = ProviderInstanceRegistryHydration.layer.pi
185186
ProviderEventLoggers.ProviderEventLoggers,
186187
ProviderEventLoggers.NoOpProviderEventLoggers,
187188
),
189+
ProviderLatestVersions.layer,
188190
ModelManifest.layerTest,
189191
AntigravityInstallation.AntigravityInstallation.layer.pipe(
190192
Layer.provide(layerServerConfig.pipe(Layer.provide(layerPlatformTest))),

‎apps/server/src/provider/Drivers/ClaudeDriver.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { HttpClient } from "effect/http";
2424
import { ChildProcessSpawner } from "effect/process";
2525

2626
import { makeClaudeTextGeneration } from "../../textGeneration/ClaudeTextGeneration.ts";
27+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
2728
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
2829
import * as ServerConfig from "../../config.ts";
2930
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
@@ -100,6 +101,7 @@ export type ClaudeDriverEnv =
100101
| Crypto.Crypto
101102
| FileSystem.FileSystem
102103
| HttpClient.HttpClient
104+
| ProviderLatestVersions.ProviderLatestVersions
103105
| ModelCatalog.ModelCatalog
104106
| Path.Path
105107
| ProviderEventLoggers.ProviderEventLoggers
@@ -120,6 +122,7 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
120122
const path = yield* Path.Path;
121123
const { cwd } = yield* ServerConfig.ServerConfig;
122124
const httpClient = yield* HttpClient.HttpClient;
125+
const latestVersions = yield* ProviderLatestVersions.ProviderLatestVersions;
123126
const resetCreditCoordinator = yield* ResetCreditCoordinator.ResetCreditCoordinator;
124127
const catalogService = yield* ModelCatalog.ModelCatalog;
125128
const modelCatalog = catalogService
@@ -256,6 +259,7 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
256259
}),
257260
),
258261
Effect.provideService(HttpClient.HttpClient, httpClient),
262+
Effect.provideService(ProviderLatestVersions.ProviderLatestVersions, latestVersions),
259263
Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot)),
260264
),
261265
}).pipe(

‎apps/server/src/provider/Drivers/CodexDriver.test.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts";
2626
import * as ServerConfig from "../../config.ts";
2727
import * as ServerSettings from "../../serverSettings.ts";
2828
import * as ResetCreditCoordinator from "../resetCreditCoordinator.ts";
29+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
2930
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
3031
import * as ModelManifest from "../ModelManifest.ts";
3132
import {
3233
createProviderVersionAdvisory,
33-
ProviderVersionCache,
3434
resolveLatestProviderVersion,
3535
} from "@t3tools/provider-core/server/maintenanceResolver";
3636
import { CodexDriver } from "./CodexDriver.ts";
@@ -75,6 +75,7 @@ const layerDeps = ServerConfig.layerTest(process.cwd(), {
7575
ProviderEventLoggers.NoOpProviderEventLoggers,
7676
),
7777
),
78+
Layer.provideMerge(ProviderLatestVersions.layer),
7879
Layer.provideMerge(
7980
Layer.succeed(
8081
HttpClient.HttpClient,
@@ -557,11 +558,9 @@ it.layer(layerTest)("CodexDriver", (it) => {
557558
}).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, metadataSpawner));
558559
const capabilities = yield* instance.snapshot.resolveMaintenance();
559560
const latestVersion = yield* resolveLatestProviderVersion(capabilities).pipe(
560-
Effect.provideService(
561-
ProviderVersionCache,
562-
new Map([
563-
["@openai/codex", { expiresAt: Number.MAX_SAFE_INTEGER, version: "0.153.4" }],
564-
]),
561+
Effect.provideServiceEffect(
562+
ProviderLatestVersions.ProviderLatestVersions,
563+
ProviderLatestVersions.make([["@openai/codex", "0.153.4"]]),
565564
),
566565
);
567566
expect(probes).toEqual([]);

‎apps/server/src/provider/Drivers/CodexDriver.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { HttpClient } from "effect/http";
3131
import { ChildProcessSpawner } from "effect/process";
3232

3333
import { makeCodexTextGeneration } from "../../textGeneration/CodexTextGeneration.ts";
34+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
3435
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
3536
import * as ServerConfig from "../../config.ts";
3637
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
@@ -115,6 +116,7 @@ export type CodexDriverEnv =
115116
| Crypto.Crypto
116117
| FileSystem.FileSystem
117118
| HttpClient.HttpClient
119+
| ProviderLatestVersions.ProviderLatestVersions
118120
| ModelCatalog.ModelCatalog
119121
| Path.Path
120122
| ProviderEventLoggers.ProviderEventLoggers
@@ -147,6 +149,7 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
147149
const fileSystem = yield* FileSystem.FileSystem;
148150
const pathService = yield* Path.Path;
149151
const httpClient = yield* HttpClient.HttpClient;
152+
const latestVersions = yield* ProviderLatestVersions.ProviderLatestVersions;
150153
const modelCatalog = yield* ModelCatalog.ModelCatalog;
151154
const currentCatalog = modelCatalog.current(DRIVER_KIND);
152155
const processEnv = mergeProviderInstanceEnvironment(environment);
@@ -251,6 +254,7 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
251254
}),
252255
),
253256
Effect.provideService(HttpClient.HttpClient, httpClient),
257+
Effect.provideService(ProviderLatestVersions.ProviderLatestVersions, latestVersions),
254258
Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot)),
255259
),
256260
}).pipe(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import {
3535
type ProviderInstanceConfigMap,
3636
ProviderInstanceId,
3737
} from "@t3tools/contracts";
38+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
3839
import type { GrokSettings } from "@t3tools/provider-grok/settings";
3940
import type { CursorSettings } from "@t3tools/provider-cursor/settings";
4041
import { HostProcessPlatform, isHostWindows } from "@t3tools/shared/hostProcess";
@@ -228,6 +229,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
228229
ProviderEventLoggers.NoOpProviderEventLoggers,
229230
),
230231
),
232+
Layer.provideMerge(ProviderLatestVersions.layer),
231233
Layer.provideMerge(ModelManifest.layerTest),
232234
Layer.provideMerge(ResetCreditCoordinator.layerTest),
233235
);
@@ -609,6 +611,7 @@ describe("ProviderInstanceRegistry — all drivers slice", () => {
609611
ProviderEventLoggers.NoOpProviderEventLoggers,
610612
),
611613
),
614+
Layer.provideMerge(ProviderLatestVersions.layer),
612615
Layer.provideMerge(ModelManifest.layerTest),
613616
Layer.provideMerge(ResetCreditCoordinator.layerTest),
614617
);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import * as AntigravityInstallation from "./AntigravityInstallation.ts";
4545
import * as ModelManifest from "./ModelManifest.ts";
4646
import { applyProviderCompatibility } from "./providerCompatibility.ts";
4747
import * as ResetCreditCoordinator from "./resetCreditCoordinator.ts";
48+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
4849
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
4950
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
5051
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
@@ -2759,6 +2760,7 @@ it.layer(
27592760
ProviderEventLoggers.NoOpProviderEventLoggers,
27602761
),
27612762
),
2763+
Layer.provideMerge(ProviderLatestVersions.layer),
27622764
Layer.provideMerge(ModelManifest.layerTest),
27632765
Layer.provideMerge(ResetCreditCoordinator.layerTest),
27642766
Layer.provideMerge(
@@ -2862,6 +2864,7 @@ it.layer(
28622864
ProviderEventLoggers.NoOpProviderEventLoggers,
28632865
),
28642866
),
2867+
Layer.provideMerge(ProviderLatestVersions.layer),
28652868
Layer.provideMerge(ModelManifest.layerTest),
28662869
Layer.provideMerge(ResetCreditCoordinator.layerTest),
28672870
Layer.provideMerge(
@@ -2980,6 +2983,7 @@ it.layer(
29802983
ProviderEventLoggers.NoOpProviderEventLoggers,
29812984
),
29822985
),
2986+
Layer.provideMerge(ProviderLatestVersions.layer),
29832987
Layer.provideMerge(ModelManifest.layerTest),
29842988
Layer.provideMerge(ResetCreditCoordinator.layerTest),
29852989
Layer.provideMerge(
@@ -3038,6 +3042,7 @@ it.layer(
30383042
ProviderEventLoggers.NoOpProviderEventLoggers,
30393043
),
30403044
),
3045+
Layer.provideMerge(ProviderLatestVersions.layer),
30413046
Layer.provideMerge(ModelManifest.layerTest),
30423047
Layer.provideMerge(ResetCreditCoordinator.layerTest),
30433048
Layer.provideMerge(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import { SpawnExecutableResolution } from "@t3tools/shared/shell";
2626
import * as ProviderRegistry from "./ProviderRegistry.ts";
2727
import * as ModelManifest from "./ModelManifest.ts";
2828
import * as ProviderMaintenanceRunner from "./providerMaintenanceRunner.ts";
29+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
2930
import {
3031
makeProviderMaintenanceCapabilities,
31-
ProviderVersionCache,
3232
type ProviderMaintenanceCapabilities,
3333
} from "@t3tools/provider-core/server/maintenanceResolver";
3434
const isServerProviderUpdateError = Schema.is(ServerProviderUpdateError);
@@ -239,7 +239,7 @@ const makeTestRunner = (
239239
refreshInBackground: Effect.void,
240240
}),
241241
// Fresh per runner so a version cached by one test cannot leak into another.
242-
Layer.sync(ProviderVersionCache, () => new Map()),
242+
ProviderLatestVersions.layer,
243243
),
244244
),
245245
),

0 commit comments

Comments
 (0)