Skip to content
Open
Show file tree
Hide file tree
Changes from 3 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
108 changes: 108 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import type { ProviderInstance } from "../ProviderDriver.ts";
import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";
import { ProviderRegistry } from "../Services/ProviderRegistry.ts";
import { makeManualOnlyProviderMaintenanceCapabilities } from "../providerMaintenance.ts";
import { makeManagedServerProvider } from "../makeManagedServerProvider.ts";
const decodeServerSettings = Schema.decodeSync(ServerSettings);
const encodeServerSettings = Schema.encodeSync(ServerSettings);
const encodedDefaultServerSettings = encodeServerSettings(DEFAULT_SERVER_SETTINGS);
Expand Down Expand Up @@ -845,6 +846,108 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
}),
);

it.effect("is the single startup refresh owner for managed provider instances", () =>
Effect.scoped(
Effect.gen(function* () {
const codexDriver = ProviderDriverKind.make("codex");
const codexInstanceId = ProviderInstanceId.make("codex");
const initialProvider = {
instanceId: codexInstanceId,
driver: codexDriver,
status: "warning",
enabled: true,
installed: false,
auth: { status: "unknown" },
checkedAt: "2026-04-29T10:00:00.000Z",
version: null,
message: "Checking provider availability...",
models: [],
slashCommands: [],
skills: [],
} as const satisfies ServerProvider;
const { message: _message, ...initialProviderWithoutMessage } = initialProvider;
const refreshedProvider = {
...initialProviderWithoutMessage,
status: "ready",
installed: true,
checkedAt: "2026-04-29T10:00:01.000Z",
} as const satisfies ServerProvider;
const checkCalls = yield* Ref.make(0);
const managedProvider = yield* makeManagedServerProvider<{ readonly enabled: boolean }>(
{
maintenanceCapabilities: makeManualOnlyProviderMaintenanceCapabilities({
provider: codexDriver,
packageName: null,
}),
getSettings: Effect.succeed({ enabled: true }),
streamSettings: Stream.empty,
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
initialSnapshot: () => Effect.succeed(initialProvider),
checkProvider: Ref.update(checkCalls, (count) => count + 1).pipe(
Effect.as(refreshedProvider),
),
refreshInterval: "1 hour",
},
);

yield* Effect.yieldNow;
assert.strictEqual(
yield* Ref.get(checkCalls),
0,
"managed providers must not self-start their own boot probe",
);

const instance = {
instanceId: codexInstanceId,
driverKind: codexDriver,
continuationIdentity: {
driverKind: codexDriver,
continuationKey: "codex:instance:codex",
},
displayName: undefined,
enabled: true,
snapshot: managedProvider,
adapter: {} as ProviderInstance["adapter"],
textGeneration: {} as ProviderInstance["textGeneration"],
} satisfies ProviderInstance;
const instanceRegistryLayer = Layer.succeed(ProviderInstanceRegistry, {
getInstance: (instanceId) =>
Effect.succeed(instanceId === codexInstanceId ? instance : undefined),
listInstances: Effect.succeed([instance]),
listUnavailable: Effect.succeed([]),
streamChanges: Stream.empty,
subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), (pubsub) =>
PubSub.subscribe(pubsub),
),
});
const scope = yield* Scope.make();
yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
const runtimeServices = yield* Layer.build(
ProviderRegistryLive.pipe(
Layer.provideMerge(instanceRegistryLayer),
Layer.provideMerge(
ServerConfig.layerTest(process.cwd(), {
prefix: "t3-provider-registry-single-startup-refresh-",
}),
),
Layer.provideMerge(NodeServices.layer),
),
).pipe(Scope.provide(scope));

yield* Effect.gen(function* () {
const registry = yield* ProviderRegistry;

assert.deepStrictEqual(yield* registry.getProviders, [refreshedProvider]);
assert.strictEqual(
yield* Ref.get(checkCalls),
1,
"ProviderRegistryLive should perform exactly one startup refresh",
);
}).pipe(Effect.provide(runtimeServices));
Comment thread
mjc marked this conversation as resolved.
}),
),
);

it.effect("keeps consuming registry changes after one sync fails", () =>
Effect.gen(function* () {
const codexDriver = ProviderDriverKind.make("codex");
Expand Down Expand Up @@ -1131,6 +1234,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsService.layerTest(), T
const initialCheckedAt = initialCodex?.checkedAt;
assert.notStrictEqual(initialCheckedAt, undefined);

// Advance the virtual clock before driving the settings change so
// the fresh probe's `checkedAt` can distinguish it from the
// boot-time probe.
yield* TestClock.adjust("50 millis");

// Drive a settings change. The Hydration layer's
// `SettingsWatcherLive` consumes this via `streamChanges`,
// calls `reconcile`, which rebuilds the codex instance (the
Expand Down
175 changes: 132 additions & 43 deletions apps/server/src/provider/makeManagedServerProvider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as Fiber from "effect/Fiber";
import * as PubSub from "effect/PubSub";
import * as Ref from "effect/Ref";
import * as Stream from "effect/Stream";
import * as TestClock from "effect/testing/TestClock";

import { makeManagedServerProvider } from "./makeManagedServerProvider.ts";

Expand Down Expand Up @@ -101,45 +102,71 @@ const enrichedSnapshotSecond: ServerProvider = {
};

describe("makeManagedServerProvider", () => {
it.effect(
"runs the initial provider check in the background and streams the refreshed snapshot",
() =>
Effect.scoped(
Effect.gen(function* () {
const checkCalls = yield* Ref.make(0);
const releaseCheck = yield* Deferred.make<void>();
const provider = yield* makeManagedServerProvider<TestSettings>({
maintenanceCapabilities,
getSettings: Effect.succeed({ enabled: true }),
streamSettings: Stream.empty,
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
initialSnapshot: () => Effect.succeed(initialSnapshot),
checkProvider: Ref.update(checkCalls, (count) => count + 1).pipe(
Effect.flatMap(() => Deferred.await(releaseCheck)),
Effect.as(refreshedSnapshot),
),
refreshInterval: "1 hour",
});
it.effect("does not probe during construction or unchanged snapshot reads", () =>
Effect.scoped(
Effect.gen(function* () {
const checkCalls = yield* Ref.make(0);
const provider = yield* makeManagedServerProvider<TestSettings>({
maintenanceCapabilities,
getSettings: Effect.succeed({ enabled: true }),
streamSettings: Stream.empty,
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
initialSnapshot: () => Effect.succeed(initialSnapshot),
checkProvider: Ref.update(checkCalls, (count) => count + 1).pipe(
Effect.as(refreshedSnapshot),
),
refreshInterval: "1 hour",
});

const initial = yield* provider.getSnapshot;
assert.deepStrictEqual(initial, initialSnapshot);
yield* Effect.yieldNow;

const updatesFiber = yield* Stream.take(provider.streamChanges, 1).pipe(
Stream.runCollect,
Effect.forkChild,
);
yield* Effect.yieldNow;
assert.deepStrictEqual(yield* provider.getSnapshot, initialSnapshot);
assert.deepStrictEqual(yield* provider.getSnapshot, initialSnapshot);
assert.strictEqual(yield* Ref.get(checkCalls), 0);
}),
),
);

yield* Deferred.succeed(releaseCheck, undefined);
it.effect("streams an explicit provider refresh", () =>
Effect.scoped(
Effect.gen(function* () {
const checkCalls = yield* Ref.make(0);
const releaseCheck = yield* Deferred.make<void>();
const provider = yield* makeManagedServerProvider<TestSettings>({
maintenanceCapabilities,
getSettings: Effect.succeed({ enabled: true }),
streamSettings: Stream.empty,
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
initialSnapshot: () => Effect.succeed(initialSnapshot),
checkProvider: Ref.update(checkCalls, (count) => count + 1).pipe(
Effect.flatMap(() => Deferred.await(releaseCheck)),
Effect.as(refreshedSnapshot),
),
refreshInterval: "1 hour",
});

const initial = yield* provider.getSnapshot;
assert.deepStrictEqual(initial, initialSnapshot);

const updatesFiber = yield* Stream.take(provider.streamChanges, 1).pipe(
Stream.runCollect,
Effect.forkChild,
);
const refreshFiber = yield* provider.refresh.pipe(Effect.forkChild);
yield* Effect.yieldNow;

yield* Deferred.succeed(releaseCheck, undefined);

const updates = Array.from(yield* Fiber.join(updatesFiber));
const latest = yield* provider.getSnapshot;
const refreshed = yield* Fiber.join(refreshFiber);
const updates = Array.from(yield* Fiber.join(updatesFiber));
const latest = yield* provider.getSnapshot;

assert.deepStrictEqual(updates, [refreshedSnapshot]);
assert.deepStrictEqual(latest, refreshedSnapshot);
assert.strictEqual(yield* Ref.get(checkCalls), 1);
}),
),
assert.deepStrictEqual(refreshed, refreshedSnapshot);
assert.deepStrictEqual(updates, [refreshedSnapshot]);
assert.deepStrictEqual(latest, refreshedSnapshot);
assert.strictEqual(yield* Ref.get(checkCalls), 1);
}),
),
);

it.effect("reruns the provider check when streamed settings change", () =>
Expand All @@ -148,7 +175,6 @@ describe("makeManagedServerProvider", () => {
const settingsRef = yield* Ref.make<TestSettings>({ enabled: true });
const settingsChanges = yield* PubSub.unbounded<TestSettings>();
const checkCalls = yield* Ref.make(0);
const releaseInitialCheck = yield* Deferred.make<void>();
const releaseSettingsCheck = yield* Deferred.make<void>();
const provider = yield* makeManagedServerProvider<TestSettings>({
maintenanceCapabilities,
Expand All @@ -157,36 +183,95 @@ describe("makeManagedServerProvider", () => {
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
initialSnapshot: () => Effect.succeed(initialSnapshot),
checkProvider: Ref.updateAndGet(checkCalls, (count) => count + 1).pipe(
Effect.flatMap((count) =>
count === 1
? Deferred.await(releaseInitialCheck).pipe(Effect.as(refreshedSnapshot))
: Deferred.await(releaseSettingsCheck).pipe(Effect.as(refreshedSnapshotSecond)),
Effect.flatMap(() =>
Deferred.await(releaseSettingsCheck).pipe(Effect.as(refreshedSnapshotSecond)),
),
),
refreshInterval: "1 hour",
});

const updatesFiber = yield* Stream.take(provider.streamChanges, 2).pipe(
const updatesFiber = yield* Stream.take(provider.streamChanges, 1).pipe(
Stream.runCollect,
Effect.forkChild,
);
yield* Effect.yieldNow;

yield* Deferred.succeed(releaseInitialCheck, undefined);
yield* Ref.set(settingsRef, { enabled: false });
yield* PubSub.publish(settingsChanges, { enabled: false });
yield* Deferred.succeed(releaseSettingsCheck, undefined);

const updates = Array.from(yield* Fiber.join(updatesFiber));
const latest = yield* provider.getSnapshot;

assert.deepStrictEqual(updates, [refreshedSnapshot, refreshedSnapshotSecond]);
assert.deepStrictEqual(updates, [refreshedSnapshotSecond]);
assert.deepStrictEqual(latest, refreshedSnapshotSecond);
assert.strictEqual(yield* Ref.get(checkCalls), 2);
assert.strictEqual(yield* Ref.get(checkCalls), 1);
}),
),
);

it.effect("ignores streamed settings updates that do not change provider settings", () =>
Effect.scoped(
Effect.gen(function* () {
const settingsRef = yield* Ref.make<TestSettings>({ enabled: true });
const settingsChanges = yield* PubSub.unbounded<TestSettings>();
const checkCalls = yield* Ref.make(0);
const provider = yield* makeManagedServerProvider<TestSettings>({
maintenanceCapabilities,
getSettings: Ref.get(settingsRef),
streamSettings: Stream.fromPubSub(settingsChanges),
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
initialSnapshot: () => Effect.succeed(initialSnapshot),
checkProvider: Ref.update(checkCalls, (count) => count + 1).pipe(
Effect.as(refreshedSnapshot),
),
refreshInterval: "1 hour",
});

yield* PubSub.publish(settingsChanges, { enabled: true });
yield* Effect.yieldNow;

assert.deepStrictEqual(yield* provider.getSnapshot, initialSnapshot);
assert.strictEqual(yield* Ref.get(checkCalls), 0);
}),
),
);

it.effect("still refreshes on the configured periodic interval", () =>
Effect.scoped(
Effect.gen(function* () {
const checkCalls = yield* Ref.make(0);
const provider = yield* makeManagedServerProvider<TestSettings>({
maintenanceCapabilities,
getSettings: Effect.succeed({ enabled: true }),
streamSettings: Stream.empty,
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
initialSnapshot: () => Effect.succeed(initialSnapshot),
checkProvider: Ref.updateAndGet(checkCalls, (count) => count + 1).pipe(
Effect.map((count) => ({
...refreshedSnapshot,
checkedAt: `2026-04-10T00:00:0${count}.000Z`,
})),
),
refreshInterval: "1 minute",
});

const updatesFiber = yield* Stream.take(provider.streamChanges, 1).pipe(
Stream.runCollect,
Effect.forkChild,
);

yield* TestClock.adjust("1 minute");
yield* Effect.yieldNow;

const updates = Array.from(yield* Fiber.join(updatesFiber));
assert.deepStrictEqual(updates, [refreshedSnapshot]);
assert.deepStrictEqual(yield* provider.getSnapshot, refreshedSnapshot);
assert.strictEqual(yield* Ref.get(checkCalls), 1);
}),
).pipe(Effect.provide(TestClock.layer())),
);

it.effect("streams supplemental snapshot updates after the base provider check completes", () =>
Effect.scoped(
Effect.gen(function* () {
Expand All @@ -210,9 +295,11 @@ describe("makeManagedServerProvider", () => {
Stream.runCollect,
Effect.forkChild,
);
const refreshFiber = yield* provider.refresh.pipe(Effect.forkChild);
yield* Effect.yieldNow;

yield* Deferred.succeed(releaseCheck, undefined);
yield* Fiber.join(refreshFiber);

yield* Deferred.succeed(releaseEnrichment, undefined);

Expand Down Expand Up @@ -262,10 +349,12 @@ describe("makeManagedServerProvider", () => {
Stream.runCollect,
Effect.forkChild,
);
const firstRefreshFiber = yield* provider.refresh.pipe(Effect.forkChild);
yield* Effect.yieldNow;

yield* Deferred.succeed(allowFirstRefresh, undefined);
yield* Deferred.await(firstCallbackReady);
yield* Fiber.join(firstRefreshFiber);

yield* provider.refresh;
yield* Deferred.await(secondCallbackReady);
Expand Down
5 changes: 0 additions & 5 deletions apps/server/src/provider/makeManagedServerProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,6 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
),
).pipe(Effect.forkScoped);

yield* applySnapshot(initialSettings, { forceRefresh: true }).pipe(
Effect.ignoreCause({ log: true }),
Effect.forkScoped,
);

return {
maintenanceCapabilities: input.maintenanceCapabilities,
getSnapshot: input.getSettings.pipe(
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"typecheck": "turbo run typecheck",
"lint": "oxlint --report-unused-disable-directives",
"test": "turbo run test",
"bench:startup": "bun scripts/bench-startup.js",
Comment thread
mjc marked this conversation as resolved.
"test:desktop-smoke": "turbo run smoke-test --filter=@t3tools/desktop",
"fmt": "oxfmt",
"fmt:check": "oxfmt --check",
Expand Down
Loading
Loading