Skip to content

Commit 7252980

Browse files
committed
fix(server): preserve explicit provider enabled settings
1 parent d72f323 commit 7252980

2 files changed

Lines changed: 51 additions & 6 deletions

File tree

‎apps/server/src/serverSettings.test.ts‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,25 @@ it.layer(NodeServices.layer)("server settings", (it) => {
643643
}).pipe(Effect.provide(makeServerSettingsLayer())),
644644
);
645645

646+
it.effect("preserves valid provider flags when another settings field is invalid", () =>
647+
Effect.gen(function* () {
648+
const serverConfig = yield* ServerConfig.ServerConfig;
649+
const fileSystem = yield* FileSystem.FileSystem;
650+
const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
651+
yield* fileSystem.writeFileString(
652+
serverConfig.settingsPath,
653+
'{"addProjectBaseDirectory":42,"providers":{"cursor":{"enabled":false},"grok":{"enabled":true}}}',
654+
);
655+
yield* recordProviderUsage("cursor");
656+
657+
const settings = yield* serverSettings.getSettings;
658+
659+
assert.isFalse(settings.providers.cursor.enabled);
660+
assert.isTrue(settings.providers.grok.enabled);
661+
assert.isFalse(settings.providers.opencode.enabled);
662+
}).pipe(Effect.provide(makeServerSettingsLayer())),
663+
);
664+
646665
it.effect("restores providers from persisted runtime sessions", () =>
647666
Effect.gen(function* () {
648667
const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
@@ -694,6 +713,30 @@ it.layer(NodeServices.layer)("server settings", (it) => {
694713
}).pipe(Effect.provide(makeServerSettingsLayer())),
695714
);
696715

716+
it.effect("persists explicit provider enables before their first use", () =>
717+
Effect.gen(function* () {
718+
const serverConfig = yield* ServerConfig.ServerConfig;
719+
const fileSystem = yield* FileSystem.FileSystem;
720+
const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
721+
722+
yield* serverSettings.updateSettings({
723+
providers: {
724+
cursor: { enabled: true },
725+
grok: { enabled: true },
726+
opencode: { enabled: true },
727+
},
728+
});
729+
yield* serverSettings.updateSettings({ addProjectBaseDirectory: "~/Development" });
730+
731+
const raw = yield* fileSystem.readFileString(serverConfig.settingsPath);
732+
// @effect-diagnostics-next-line preferSchemaOverJson:off
733+
const persisted = JSON.parse(raw);
734+
assert.isTrue(persisted.providers.cursor.enabled);
735+
assert.isTrue(persisted.providers.grok.enabled);
736+
assert.isTrue(persisted.providers.opencode.enabled);
737+
}).pipe(Effect.provide(makeServerSettingsLayer())),
738+
);
739+
697740
it.effect("keeps optional providers disabled after a new installation writes settings", () =>
698741
Effect.gen(function* () {
699742
const serverConfig = yield* ServerConfig.ServerConfig;

‎apps/server/src/serverSettings.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,14 @@ const ATOMIC_SETTINGS_KEYS: ReadonlySet<string> = new Set([
326326
"textGenerationModelSelection",
327327
]);
328328

329-
// Preserve explicit disables because provider history can restore an omitted enabled flag.
330-
const PERSISTED_SERVER_SETTINGS_DEFAULTS: ServerSettings = {
329+
// Preserve both enabled states because provider history cannot recover a new opt-in.
330+
const PERSISTED_SERVER_SETTINGS_DEFAULTS = {
331331
...DEFAULT_SERVER_SETTINGS,
332332
providers: {
333333
...DEFAULT_SERVER_SETTINGS.providers,
334-
cursor: { ...DEFAULT_SERVER_SETTINGS.providers.cursor, enabled: true },
335-
grok: { ...DEFAULT_SERVER_SETTINGS.providers.grok, enabled: true },
336-
opencode: { ...DEFAULT_SERVER_SETTINGS.providers.opencode, enabled: true },
334+
cursor: { ...DEFAULT_SERVER_SETTINGS.providers.cursor, enabled: undefined },
335+
grok: { ...DEFAULT_SERVER_SETTINGS.providers.grok, enabled: undefined },
336+
opencode: { ...DEFAULT_SERVER_SETTINGS.providers.opencode, enabled: undefined },
337337
},
338338
};
339339

@@ -418,6 +418,9 @@ const make = Effect.gen(function* () {
418418
const raw = yield* readRawConfig;
419419
const decoded = decodeServerSettingsJsonExit(raw);
420420
const persistedSettings = decodePersistedOptionalProviderSettingsJsonExit(raw);
421+
if (persistedSettings._tag === "Success") {
422+
persisted = persistedSettings.value;
423+
}
421424
if (decoded._tag === "Failure" || persistedSettings._tag === "Failure") {
422425
const failure = decoded._tag === "Failure" ? decoded : persistedSettings;
423426
if (failure._tag === "Failure") {
@@ -429,7 +432,6 @@ const make = Effect.gen(function* () {
429432
}
430433
} else {
431434
settings = decoded.value;
432-
persisted = persistedSettings.value;
433435
}
434436
}
435437

0 commit comments

Comments
 (0)