Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(
// no longer transitively provides it. Exposing it at the runtime level
// keeps a single Live for all opencode consumers.
Layer.provideMerge(OpenCodeRuntimeLive),
Layer.provideMerge(ServerSettingsLive),
Layer.provideMerge(WorkspaceLayerLive),
Layer.provideMerge(ProjectFaviconResolverLayerLive),
Layer.provideMerge(RepositoryIdentityResolverLive),
Expand All @@ -328,11 +327,12 @@ const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(
);

const RuntimeDependenciesLive = RuntimeCoreDependenciesLive.pipe(
Layer.provideMerge(AnalyticsServiceLayerLive),
Layer.provideMerge(ServerSettingsLive),
// Misc.
Layer.provideMerge(ProcessDiagnostics.layer),
Layer.provideMerge(ProcessResourceMonitor.layer),
Layer.provideMerge(TraceDiagnostics.layer),
Layer.provideMerge(AnalyticsServiceLayerLive),
Layer.provideMerge(ExternalLauncher.layer),
Layer.provideMerge(ServerLifecycleEventsLive),
Layer.provide(NetService.layer),
Expand Down
111 changes: 109 additions & 2 deletions apps/server/src/serverSettings.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import * as Effect from "effect/Effect";
import * as Duration from "effect/Duration";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Path from "effect/Path";
import * as Schema from "effect/Schema";
import { ServerConfig } from "./config.ts";
import { ServerSettingsLive, ServerSettingsService } from "./serverSettings.ts";
Expand Down Expand Up @@ -427,6 +428,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
const fileSystem = yield* FileSystem.FileSystem;
const next = yield* serverSettings.updateSettings({
addProjectBaseDirectory: "~/Development",
automaticGitFetchInterval: Duration.seconds(10),
observability: {
otlpTracesUrl: "http://localhost:4318/v1/traces",
otlpMetricsUrl: "http://localhost:4318/v1/metrics",
Expand All @@ -440,7 +442,8 @@ it.layer(NodeServices.layer)("server settings", (it) => {
serverPassword: "secret-password",
},
},
automaticGitFetchInterval: Duration.seconds(10),
telemetryEnabled: true,
telemetryPreferenceSet: true,
});

assert.equal(next.providers.codex.binaryPath, "/opt/homebrew/bin/codex");
Expand All @@ -449,6 +452,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
// @effect-diagnostics-next-line preferSchemaOverJson:off
assert.deepEqual(JSON.parse(raw), {
addProjectBaseDirectory: "~/Development",
automaticGitFetchInterval: 10_000,
observability: {
otlpTracesUrl: "http://localhost:4318/v1/traces",
otlpMetricsUrl: "http://localhost:4318/v1/metrics",
Expand All @@ -462,11 +466,114 @@ it.layer(NodeServices.layer)("server settings", (it) => {
serverPassword: "secret-password",
},
},
automaticGitFetchInterval: 10_000,
telemetryEnabled: true,
telemetryPreferenceSet: true,
});
}).pipe(Effect.provide(makeServerSettingsLayer())),
);

it.effect("persists explicit telemetry opt-out marker", () =>
Effect.gen(function* () {
const serverSettings = yield* ServerSettingsService;
const serverConfig = yield* ServerConfig;
const fileSystem = yield* FileSystem.FileSystem;

yield* serverSettings.updateSettings({
telemetryEnabled: false,
});

const raw = yield* fileSystem.readFileString(serverConfig.settingsPath);
// @effect-diagnostics-next-line preferSchemaOverJson:off
assert.deepEqual(JSON.parse(raw), {
telemetryPreferenceSet: true,
});
}).pipe(Effect.provide(makeServerSettingsLayer())),
);

it.effect("loads persisted telemetryEnabled as an explicit preference", () =>
Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
prefix: "t3code-server-settings-telemetry-",
});
const settingsPath = path.join(baseDir, "userdata", "settings.json");
yield* fileSystem.makeDirectory(path.dirname(settingsPath), { recursive: true });
yield* fileSystem.writeFileString(settingsPath, '{ "telemetryEnabled": false }\n');

const layer = ServerSettingsLive.pipe(
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), baseDir)),
);
const settings = yield* Effect.gen(function* () {
const serverSettings = yield* ServerSettingsService;
yield* serverSettings.start;
return yield* serverSettings.getSettings;
}).pipe(Effect.provide(layer));

assert.deepInclude(settings, {
telemetryEnabled: false,
telemetryPreferenceSet: true,
});
}),
);

it.effect("loads malformed persisted telemetryEnabled as an explicit preference", () =>
Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
prefix: "t3code-server-settings-telemetry-malformed-",
});
const settingsPath = path.join(baseDir, "userdata", "settings.json");
yield* fileSystem.makeDirectory(path.dirname(settingsPath), { recursive: true });
yield* fileSystem.writeFileString(settingsPath, '{ "telemetryEnabled": "false" }\n');

const layer = ServerSettingsLive.pipe(
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), baseDir)),
);
const settings = yield* Effect.gen(function* () {
const serverSettings = yield* ServerSettingsService;
yield* serverSettings.start;
return yield* serverSettings.getSettings;
}).pipe(Effect.provide(layer));

assert.deepInclude(settings, {
telemetryEnabled: false,
telemetryPreferenceSet: true,
});
}),
);

it.effect("loads persisted telemetry opt-in from schema-invalid settings", () =>
Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
prefix: "t3code-server-settings-telemetry-invalid-opt-in-",
});
const settingsPath = path.join(baseDir, "userdata", "settings.json");
yield* fileSystem.makeDirectory(path.dirname(settingsPath), { recursive: true });
yield* fileSystem.writeFileString(
settingsPath,
'{ "telemetryEnabled": true, "providers": null }\n',
);

const layer = ServerSettingsLive.pipe(
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), baseDir)),
);
const settings = yield* Effect.gen(function* () {
const serverSettings = yield* ServerSettingsService;
yield* serverSettings.start;
return yield* serverSettings.getSettings;
}).pipe(Effect.provide(layer));

assert.deepInclude(settings, {
telemetryEnabled: true,
telemetryPreferenceSet: true,
});
}),
);

it.effect("stores sensitive provider instance environment values outside settings.json", () =>
Effect.gen(function* () {
const serverSettings = yield* ServerSettingsService;
Expand Down
9 changes: 6 additions & 3 deletions apps/server/src/serverSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ import { writeFileStringAtomically } from "./atomicWrite.ts";
import { ServerConfig } from "./config.ts";
import { type DeepPartial, deepMerge } from "@t3tools/shared/Struct";
import { fromJsonStringPretty, fromLenientJson } from "@t3tools/shared/schemaJson";
import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";
import {
applyServerSettingsPatch,
normalizeDecodedPersistedServerSettings,
} from "@t3tools/shared/serverSettings";
import * as ServerSecretStore from "./auth/ServerSecretStore.ts";

const encodeServerSettings = Schema.encodeEffect(ServerSettings);
Expand Down Expand Up @@ -304,9 +307,9 @@ const makeServerSettings = Effect.gen(function* () {
path: settingsPath,
issues: Cause.pretty(decoded.cause),
});
return DEFAULT_SERVER_SETTINGS;
return normalizeDecodedPersistedServerSettings(DEFAULT_SERVER_SETTINGS, raw);
}
return decoded.value;
return normalizeDecodedPersistedServerSettings(decoded.value, raw);
});

const settingsCache = yield* Cache.make<typeof cacheKey, ServerSettings, ServerSettingsError>({
Expand Down
Loading
Loading