Skip to content

Commit 0bf13ec

Browse files
fix(server): a check that finishes before boot wins over the saved status
Telling a pending snapshot apart by reference identity mistook a probe that completed before the registry booted for the placeholder: boot laid the cached status over it and the first sync skipped restoring it. Managed providers now report whether their first check has completed, and the registry shows the cached status only for boot instances still awaiting it. Snapshots that are already check results merge and persist as before. AI-assisted; verified with the tests and tools listed above. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9d1bc55 commit 0bf13ec

5 files changed

Lines changed: 100 additions & 3 deletions

File tree

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,9 @@ it.layer(
12701270
}),
12711271
),
12721272
getSnapshot: Ref.get(currentProvider),
1273+
isAwaitingFirstCheck: Ref.get(currentProvider).pipe(
1274+
Effect.map((provider) => provider === pendingProvider),
1275+
),
12731276
refresh: Ref.get(nextProvider).pipe(
12741277
Effect.tap((provider) => Ref.set(currentProvider, provider)),
12751278
),
@@ -1352,6 +1355,79 @@ it.layer(
13521355
),
13531356
),
13541357
);
1358+
it.effect("keeps a check that finished before boot over the cached status", () =>
1359+
Effect.gen(function* () {
1360+
const config = yield* ServerConfig.ServerConfig;
1361+
const filePath = yield* resolveProviderStatusCachePath({
1362+
cacheDir: config.providerStatusCacheDir,
1363+
instanceId: cachedProvider.instanceId,
1364+
});
1365+
yield* writeProviderStatusCache({
1366+
filePath,
1367+
provider: { ...cachedProvider, status: "ready" },
1368+
});
1369+
const instance = {
1370+
instanceId: cachedProvider.instanceId,
1371+
driverKind: cachedProvider.driver,
1372+
continuationIdentity: {
1373+
driverKind: cachedProvider.driver,
1374+
continuationKey: "codex:instance:codex-personal",
1375+
},
1376+
displayName: undefined,
1377+
enabled: true,
1378+
snapshot: {
1379+
resolveMaintenance: () =>
1380+
Effect.succeed(
1381+
makeManualOnlyProviderMaintenanceCapabilities({
1382+
provider: cachedProvider.driver,
1383+
packageName: null,
1384+
}),
1385+
),
1386+
getSnapshot: Effect.succeed(failedProvider),
1387+
isAwaitingFirstCheck: Effect.succeed(false),
1388+
refresh: Effect.succeed(failedProvider),
1389+
streamChanges: Stream.empty,
1390+
applyUsageLimits: () => Effect.void,
1391+
},
1392+
orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
1393+
textGeneration: {} as ProviderInstance["textGeneration"],
1394+
} satisfies ProviderInstance;
1395+
const layerInstanceRegistry = Layer.succeed(
1396+
ProviderInstanceRegistry.ProviderInstanceRegistry,
1397+
{
1398+
getInstance: (id) =>
1399+
Effect.succeed(id === instance.instanceId ? instance : undefined),
1400+
listInstances: Effect.succeed([instance]),
1401+
listUnavailable: Effect.succeed([]),
1402+
streamChanges: Stream.empty,
1403+
subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
1404+
},
1405+
);
1406+
1407+
yield* Effect.gen(function* () {
1408+
const registry = yield* ProviderRegistry.ProviderRegistry;
1409+
assert.strictEqual((yield* registry.getProviders)[0]?.status, failedProvider.status);
1410+
assert.strictEqual(
1411+
(yield* readProviderStatusCache(filePath))?.status,
1412+
failedProvider.status,
1413+
);
1414+
}).pipe(
1415+
Effect.provide(
1416+
ProviderRegistry.layer.pipe(
1417+
Layer.provide(layerInstanceRegistry),
1418+
Layer.provide(layerUnusedMutator),
1419+
),
1420+
),
1421+
Effect.scoped,
1422+
);
1423+
}).pipe(
1424+
Effect.provide(
1425+
ServerConfig.layerTest(process.cwd(), {
1426+
prefix: "t3-codex-probed-before-boot-",
1427+
}).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1428+
),
1429+
),
1430+
);
13551431
});
13561432

13571433
describe("Antigravity model inventories", () => {

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,13 @@ export const layer = Layer.effect(
386386
}
387387
fallbackByInstance.set(source.instanceId, provider);
388388
}
389+
// Read after the snapshots: a snapshot read as awaiting is the pre-check placeholder.
390+
const awaitingBootInstances = new Set<ProviderInstance>();
391+
for (const instance of bootInstances) {
392+
if (yield* instance.snapshot.isAwaitingFirstCheck ?? Effect.succeed(false)) {
393+
awaitingBootInstances.add(instance);
394+
}
395+
}
389396

390397
const bootProviders = yield* Effect.forEach(
391398
bootSources,
@@ -864,8 +871,11 @@ export const layer = Layer.effect(
864871
Effect.gen(function* () {
865872
const source = buildSnapshotSource(instance);
866873
const provider = yield* source.getSnapshot;
867-
// Boot already merged this unprobed snapshot under the cached status; re-merging would overwrite and persist it.
868-
if (provider === fallbackByInstance.get(source.instanceId)) {
874+
// Boot shows the cached status until this instance's first check publishes a result.
875+
if (
876+
awaitingBootInstances.has(instance) &&
877+
(yield* instance.snapshot.isAwaitingFirstCheck ?? Effect.succeed(false))
878+
) {
869879
return yield* refreshCompatibility;
870880
}
871881
yield* correlateSnapshotWithSource(source, provider).pipe(
@@ -925,6 +935,10 @@ export const layer = Layer.effect(
925935
Scope.provide(serviceScope),
926936
);
927937

938+
yield* upsertProviders(
939+
fallbackProviders.filter((_, index) => !awaitingBootInstances.has(bootInstances[index]!)),
940+
{ publish: false },
941+
);
928942
const instanceChanges = yield* instanceRegistry.subscribeChanges;
929943
yield* syncLiveSources;
930944
yield* Stream.runForEach(

‎packages/provider-core/src/server/managedProvider.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ describe("makeManagedServerProvider", () => {
272272

273273
const initial = yield* provider.getSnapshot;
274274
assert.deepStrictEqual(initial, initialSnapshot);
275+
assert.strictEqual(yield* provider.isAwaitingFirstCheck!, true);
275276

276277
const updatesFiber = yield* Stream.take(provider.streamChanges, 1).pipe(
277278
Stream.runCollect,
@@ -287,6 +288,7 @@ describe("makeManagedServerProvider", () => {
287288

288289
assert.deepStrictEqual(updates, [refreshedSnapshot]);
289290
assert.deepStrictEqual(latest, refreshedSnapshot);
291+
assert.strictEqual(yield* provider.isAwaitingFirstCheck!, false);
290292
assert.strictEqual(yield* Ref.get(checkCalls), 1);
291293
}),
292294
).pipe(Effect.provide(layerAlwaysRunTest)),

‎packages/provider-core/src/server/managedProvider.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ interface ProviderSnapshotState {
2828
readonly enrichmentGeneration: number;
2929
// null preserves an explicitly cleared plan across probes and enrichment.
3030
readonly usageAuthLabel: string | null | undefined;
31+
readonly checked: boolean;
3132
}
3233

3334
function withUsageLimits(
@@ -79,6 +80,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
7980
snapshot: initialSnapshot,
8081
enrichmentGeneration: 0,
8182
usageAuthLabel: undefined,
83+
checked: false,
8284
});
8385
const settingsRef = yield* Ref.make(initialSettings);
8486
const enrichmentFiberRef = yield* Ref.make<Fiber.Fiber<void, unknown> | null>(null);
@@ -218,7 +220,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
218220
);
219221
return [
220222
{ snapshot, generation },
221-
{ snapshot, enrichmentGeneration: generation, usageAuthLabel },
223+
{ snapshot, enrichmentGeneration: generation, usageAuthLabel, checked: true },
222224
] as const;
223225
},
224226
);
@@ -425,6 +427,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
425427
return {
426428
resolveMaintenance: input.resolveMaintenance,
427429
getSnapshot: Ref.get(snapshotStateRef).pipe(Effect.map((state) => state.snapshot)),
430+
isAwaitingFirstCheck: Ref.get(snapshotStateRef).pipe(Effect.map((state) => !state.checked)),
428431
refresh: input
429432
.resolveMaintenance({ fresh: true })
430433
.pipe(Effect.andThen(refreshSnapshot), Effect.tapError(Effect.logError), Effect.orDie),

‎packages/provider-core/src/server/snapshot.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ export interface ManagedServerProvider {
2121
readonly fresh?: boolean;
2222
}) => Effect.Effect<ProviderMaintenanceCapabilities>;
2323
readonly getSnapshot: Effect.Effect<ServerProvider>;
24+
/** True while getSnapshot still returns the placeholder from before the first completed check. */
25+
readonly isAwaitingFirstCheck?: Effect.Effect<boolean>;
2426
readonly refresh: Effect.Effect<ServerProvider>;
2527
readonly refreshUsage?: Effect.Effect<void, ServerSettingsError>;
2628
readonly streamChanges: Stream.Stream<ServerProvider>;

0 commit comments

Comments
 (0)