Skip to content

Commit 208aa56

Browse files
committed
refactor(provider): remove redundant maintenance input
1 parent 0f0de88 commit 208aa56

7 files changed

Lines changed: 12 additions & 22 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
151151
UPDATE.resolve(),
152152
{ enabled },
153153
);
154-
const maintenanceCapabilities = yield* maintenanceSources.advisory;
155154
const continuationGroupKey = yield* makeClaudeContinuationGroupKey(effectiveConfig);
156155
const stampIdentity = withInstanceIdentity({
157156
instanceId,
@@ -205,7 +204,6 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
205204

206205
const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
207206
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<ClaudeSettings>>({
208-
maintenanceCapabilities,
209207
resolveMaintenance: maintenanceSources.fresh,
210208
getSettings: snapshotSettings.getSettings,
211209
streamSettings: snapshotSettings.streamSettings,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
168168
UPDATE.resolve(),
169169
{ enabled },
170170
);
171-
const maintenanceCapabilities = yield* maintenanceSources.advisory;
172171

173172
// `makeCodexAdapter` and `makeCodexTextGeneration` have `never` error
174173
// channels at construction time — their failure modes are all on the
@@ -204,7 +203,6 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
204203
);
205204
const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
206205
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<CodexSettings>>({
207-
maintenanceCapabilities,
208206
resolveMaintenance: maintenanceSources.fresh,
209207
getSettings: snapshotSettings.getSettings,
210208
streamSettings: snapshotSettings.streamSettings,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export const CursorDriver: ProviderDriver<CursorSettings, CursorDriverEnv> = {
142142

143143
const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
144144
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<CursorSettings>>({
145-
maintenanceCapabilities,
145+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
146146
getSettings: snapshotSettings.getSettings,
147147
streamSettings: snapshotSettings.streamSettings,
148148
haveSettingsChanged: haveProviderSnapshotSettingsChanged,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {
134134
GrokMaintenanceResolver.resolve(),
135135
{ enabled },
136136
);
137-
const maintenanceCapabilities = yield* maintenanceSources.advisory;
138137

139138
const adapter = yield* makeGrokAdapter(effectiveConfig, {
140139
environment: processEnv,
@@ -151,7 +150,6 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {
151150

152151
const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
153152
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<GrokSettings>>({
154-
maintenanceCapabilities,
155153
resolveMaintenance: maintenanceSources.fresh,
156154
getSettings: snapshotSettings.getSettings,
157155
streamSettings: snapshotSettings.streamSettings,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ export const OpenCodeDriver: ProviderDriver<OpenCodeSettings, OpenCodeDriverEnv>
159159
UPDATE.resolve(),
160160
{ enabled },
161161
);
162-
const maintenanceCapabilities = yield* maintenanceSources.advisory;
163162

164163
const adapter = yield* makeOpenCodeAdapter(effectiveConfig, {
165164
instanceId,
@@ -191,7 +190,6 @@ export const OpenCodeDriver: ProviderDriver<OpenCodeSettings, OpenCodeDriverEnv>
191190
const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
192191
const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<OpenCodeSettings>>(
193192
{
194-
maintenanceCapabilities,
195193
resolveMaintenance: maintenanceSources.fresh,
196194
getSettings: snapshotSettings.getSettings,
197195
streamSettings: snapshotSettings.streamSettings,

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ describe("makeManagedServerProvider", () => {
158158
const checkCalls = yield* Ref.make(0);
159159
const releaseCheck = yield* Deferred.make<void>();
160160
const provider = yield* makeManagedServerProvider<TestSettings>({
161-
maintenanceCapabilities,
161+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
162162
getSettings: Effect.succeed({ enabled: true }),
163163
streamSettings: Stream.empty,
164164
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -198,7 +198,7 @@ describe("makeManagedServerProvider", () => {
198198
const checkCalls = yield* Ref.make(0);
199199
const initialCheckDone = yield* Deferred.make<void>();
200200
yield* makeManagedServerProvider<TestSettings>({
201-
maintenanceCapabilities,
201+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
202202
getSettings: Effect.succeed({ enabled: true }),
203203
streamSettings: Stream.empty,
204204
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -229,7 +229,7 @@ describe("makeManagedServerProvider", () => {
229229
const checkCalls = yield* Ref.make(0);
230230
const initialCheckDone = yield* Deferred.make<void>();
231231
yield* makeManagedServerProvider<TestSettings>({
232-
maintenanceCapabilities,
232+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
233233
getSettings: Effect.succeed({ enabled: true }),
234234
streamSettings: Stream.empty,
235235
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -256,7 +256,7 @@ describe("makeManagedServerProvider", () => {
256256
const checkCalls = yield* Ref.make(0);
257257
const initialCheckDone = yield* Deferred.make<void>();
258258
const provider = yield* makeManagedServerProvider<TestSettings>({
259-
maintenanceCapabilities,
259+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
260260
getSettings: Effect.succeed({ enabled: true }),
261261
streamSettings: Stream.empty,
262262
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -311,7 +311,7 @@ describe("makeManagedServerProvider", () => {
311311
const periodicCheckDone = yield* Deferred.make<void>();
312312

313313
yield* makeManagedServerProvider<TestSettings>({
314-
maintenanceCapabilities,
314+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
315315
getSettings: Effect.succeed({ enabled: true }),
316316
streamSettings: Stream.empty,
317317
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -353,7 +353,7 @@ describe("makeManagedServerProvider", () => {
353353
const releaseInitialCheck = yield* Deferred.make<void>();
354354
const releaseSettingsCheck = yield* Deferred.make<void>();
355355
const provider = yield* makeManagedServerProvider<TestSettings>({
356-
maintenanceCapabilities,
356+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
357357
getSettings: Ref.get(settingsRef),
358358
streamSettings: Stream.fromPubSub(settingsChanges),
359359
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -397,7 +397,7 @@ describe("makeManagedServerProvider", () => {
397397
const initialCheckDone = yield* Deferred.make<void>();
398398
const enrichmentCalls = yield* Ref.make(0);
399399
yield* makeManagedServerProvider<TestSettings>({
400-
maintenanceCapabilities,
400+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
401401
getSettings: Effect.succeed({ enabled: true }),
402402
streamSettings: Stream.fromPubSub(settingsChanges),
403403
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -430,7 +430,7 @@ describe("makeManagedServerProvider", () => {
430430
const releaseEnrichment = yield* Deferred.make<void>();
431431
const releaseCheck = yield* Deferred.make<void>();
432432
const provider = yield* makeManagedServerProvider<TestSettings>({
433-
maintenanceCapabilities,
433+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
434434
getSettings: Effect.succeed({ enabled: true }),
435435
streamSettings: Stream.empty,
436436
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
@@ -471,7 +471,7 @@ describe("makeManagedServerProvider", () => {
471471
const secondCallbackReady = yield* Deferred.make<void>();
472472
const allowFirstRefresh = yield* Deferred.make<void>();
473473
const provider = yield* makeManagedServerProvider<TestSettings>({
474-
maintenanceCapabilities,
474+
resolveMaintenance: Effect.succeed(maintenanceCapabilities),
475475
getSettings: Effect.succeed({ enabled: true }),
476476
streamSettings: Stream.empty,
477477
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import * as Semaphore from "effect/Semaphore";
1717

1818
import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
1919
import { ServerSettingsService } from "../serverSettings.ts";
20-
import type { ProviderMaintenanceCapabilities } from "./providerMaintenance.ts";
2120
import type { ServerProviderShape } from "./Services/ServerProvider.ts";
2221

2322
interface ProviderSnapshotState {
@@ -28,8 +27,7 @@ interface ProviderSnapshotState {
2827
export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(function* <
2928
Settings,
3029
>(input: {
31-
readonly maintenanceCapabilities: ProviderMaintenanceCapabilities;
32-
readonly resolveMaintenance?: Effect.Effect<ProviderMaintenanceCapabilities>;
30+
readonly resolveMaintenance: ServerProviderShape["resolveMaintenance"];
3331
readonly getSettings: Effect.Effect<Settings, ServerSettingsError>;
3432
readonly streamSettings: Stream.Stream<Settings>;
3533
readonly haveSettingsChanged: (previous: Settings, next: Settings) => boolean;
@@ -240,7 +238,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
240238
);
241239

242240
return {
243-
resolveMaintenance: input.resolveMaintenance ?? Effect.succeed(input.maintenanceCapabilities),
241+
resolveMaintenance: input.resolveMaintenance,
244242
getSnapshot: Ref.get(snapshotStateRef).pipe(Effect.map((state) => state.snapshot)),
245243
refresh: refreshSnapshot().pipe(Effect.tapError(Effect.logError), Effect.orDie),
246244
get streamChanges() {

0 commit comments

Comments
 (0)