Skip to content

Commit 2347756

Browse files
committed
fix(server): isolate provider model refresh failures
1 parent 6577c6b commit 2347756

5 files changed

Lines changed: 245 additions & 25 deletions

File tree

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {
22
defaultInstanceIdForDriver,
33
isProviderWorkspaceSnapshotCurrent,
44
ProviderDriverKind,
5+
ProviderSetupError,
56
type ProviderInstanceId,
67
type ServerProvider,
78
type ServerProviderUpdateState,
@@ -64,6 +65,10 @@ export class ProviderRegistry extends Context.Service<
6465
instanceId: ProviderInstanceId,
6566
) => Effect.Effect<ReadonlyArray<ServerProvider>>;
6667

68+
readonly refreshModels: (
69+
instanceId?: ProviderInstanceId,
70+
) => Effect.Effect<ReadonlyArray<ServerProvider>, ProviderSetupError>;
71+
6772
/** Re-reads secret-backed environments first, so a fixed secret applies without a restart. */
6873
readonly reloadSecretsAndRefresh: (
6974
instanceId?: ProviderInstanceId,
@@ -685,6 +690,57 @@ export const layer = Layer.effect(
685690
return yield* refreshOneSource(instance);
686691
});
687692

693+
const refreshModels = Effect.fn("ProviderRegistry.refreshModels")(function* (
694+
instanceId?: ProviderInstanceId,
695+
) {
696+
yield* syncLiveSourcesAndContinue;
697+
const providers = yield* Ref.get(providersRef);
698+
const instances = yield* instanceRegistry.listInstances;
699+
yield* Effect.forEach(
700+
instances,
701+
(instance) => {
702+
if (
703+
!instance.refreshModels ||
704+
(instanceId !== undefined && instanceId !== instance.instanceId) ||
705+
!providers.some(
706+
(provider) =>
707+
provider.instanceId === instance.instanceId &&
708+
provider.enabled &&
709+
provider.installed,
710+
)
711+
) {
712+
return Effect.void;
713+
}
714+
const refresh = instance.refreshModels().pipe(
715+
Effect.mapError(
716+
(error) =>
717+
new ProviderSetupError({
718+
instanceId: instance.instanceId,
719+
operation: "refresh-models",
720+
detail: error.detail,
721+
}),
722+
),
723+
Effect.andThen(
724+
refreshInstance(instance.instanceId).pipe(Effect.catchCause(recoverRefreshFailure)),
725+
),
726+
Effect.asVoid,
727+
);
728+
return instanceId === undefined
729+
? refresh.pipe(
730+
Effect.catch((error) =>
731+
Effect.logWarning("provider model refresh failed", {
732+
instanceId: instance.instanceId,
733+
detail: error.detail,
734+
}),
735+
),
736+
)
737+
: refresh;
738+
},
739+
{ concurrency: 2, discard: true },
740+
);
741+
return yield* Ref.get(providersRef);
742+
});
743+
688744
const reloadSecretsAndRefresh = Effect.fn("reloadSecretsAndRefresh")(function* (
689745
instanceId?: ProviderInstanceId,
690746
) {
@@ -1080,6 +1136,7 @@ export const layer = Layer.effect(
10801136
refreshWorkspaceSnapshot: (input) =>
10811137
refreshWorkspaceSnapshot(input).pipe(Effect.catchCause(recoverRefreshFailure)),
10821138
refreshAfterUpdate,
1139+
refreshModels,
10831140
invalidateModelCaches,
10841141
getProviderMaintenanceCapabilitiesForInstance,
10851142
setProviderMaintenanceActionState,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ function makeRegistry(
197197
getProviders: Ref.get(providersRef),
198198
refresh: () => Ref.get(providersRef),
199199
refreshInstance: () => Ref.get(providersRef),
200+
refreshModels: () => Ref.get(providersRef),
200201
reloadSecretsAndRefresh: () => Ref.get(providersRef),
201202
refreshAfterUpdate: () => {
202203
const version = options?.installedVersionAfterUpdate;

‎apps/server/src/provider/testUtils/providerRegistryMock.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const makeProviderRegistryMock = (
1111
getProviders: Effect.succeed(providers),
1212
refresh: () => Effect.succeed(providers),
1313
refreshInstance: () => Effect.succeed(providers),
14+
refreshModels: () => Effect.succeed(providers),
1415
reloadSecretsAndRefresh: () => Effect.succeed(providers),
1516
refreshAfterUpdate: () => Effect.succeed(providers),
1617
refreshWorkspaceSnapshot: () => Effect.succeed(providers),

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

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import * as Fiber from "effect/Fiber";
3434
import * as Layer from "effect/Layer";
3535
import * as PubSub from "effect/PubSub";
3636
import * as Queue from "effect/Queue";
37+
import * as Ref from "effect/Ref";
3738
import * as Stream from "effect/Stream";
3839
import * as TestClock from "effect/testing/TestClock";
3940
import { Headers } from "effect/http";
@@ -81,6 +82,10 @@ import * as ProjectCloneTracker from "./project/ProjectCloneTracker.ts";
8182
import * as ProjectSetupScriptRunner from "./project/ProjectSetupScriptRunner.ts";
8283
import * as ProviderAuthService from "./provider/ProviderAuthService.ts";
8384
import * as ProviderInstanceRegistry from "./provider/ProviderInstanceRegistry.ts";
85+
import * as ProviderInstanceRegistryMutator from "./provider/ProviderInstanceRegistryMutator.ts";
86+
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
87+
import { ProviderDriverError } from "@t3tools/provider-core/server/errors";
88+
import { makeManualOnlyProviderMaintenanceCapabilities } from "@t3tools/provider-core/server/maintenanceResolver";
8489
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
8590
import * as ProviderMaintenanceRunner from "./provider/providerMaintenanceRunner.ts";
8691
import * as ProviderRegistry from "./provider/ProviderRegistry.ts";
@@ -1346,6 +1351,186 @@ it.effect("on-demand clients get provider config without workspace snapshots", (
13461351
),
13471352
);
13481353

1354+
it.effect.each(["all", "single"] as const)(
1355+
"%s model refresh preserves cached models when an instance fails",
1356+
(target) =>
1357+
Effect.gen(function* () {
1358+
const driver = ProviderDriverKind.make("antigravity");
1359+
const firstId = ProviderInstanceId.make("antigravity_first");
1360+
const secondId = ProviderInstanceId.make("antigravity_second");
1361+
const thirdId = ProviderInstanceId.make("antigravity_third");
1362+
const thirdStarted = yield* Deferred.make<void>();
1363+
const activeRefreshes = yield* Ref.make(0);
1364+
const maxRefreshes = yield* Ref.make(0);
1365+
const model = (slug: string) => ({ slug, name: slug, isCustom: false, capabilities: null });
1366+
const makeInstance = Effect.fn("Test.makeModelRefreshInstance")(function* (
1367+
instanceId: ProviderInstanceId,
1368+
) {
1369+
const snapshot = yield* Ref.make<ServerProvider>({
1370+
instanceId,
1371+
driver,
1372+
enabled: true,
1373+
installed: true,
1374+
version: "1.1.1",
1375+
status: "ready",
1376+
auth: { status: "authenticated" },
1377+
checkedAt: "2026-10-25T00:00:00.000Z",
1378+
models: [model("cached-model")],
1379+
slashCommands: [],
1380+
skills: [],
1381+
});
1382+
return {
1383+
instanceId,
1384+
driverKind: driver,
1385+
continuationIdentity: { driverKind: driver, continuationKey: instanceId },
1386+
displayName: undefined,
1387+
enabled: true,
1388+
snapshot: {
1389+
getSnapshot: Ref.get(snapshot),
1390+
refresh: Ref.get(snapshot),
1391+
resolveMaintenance: () =>
1392+
Effect.succeed(
1393+
makeManualOnlyProviderMaintenanceCapabilities({
1394+
provider: driver,
1395+
packageName: null,
1396+
}),
1397+
),
1398+
streamChanges: Stream.empty,
1399+
applyUsageLimits: () => Effect.void,
1400+
},
1401+
refreshModels: () =>
1402+
Effect.gen(function* () {
1403+
if (instanceId === firstId) {
1404+
return yield* new ProviderDriverError({
1405+
driver,
1406+
instanceId,
1407+
detail: "Model refresh failed.",
1408+
});
1409+
}
1410+
const active = yield* Ref.updateAndGet(activeRefreshes, (count) => count + 1);
1411+
yield* Ref.update(maxRefreshes, (count) => Math.max(count, active));
1412+
yield* instanceId === secondId
1413+
? Deferred.await(thirdStarted)
1414+
: Deferred.succeed(thirdStarted, undefined);
1415+
yield* Ref.update(snapshot, (provider) => ({
1416+
...provider,
1417+
models: [model("refreshed-model")],
1418+
}));
1419+
yield* Ref.update(activeRefreshes, (count) => count - 1);
1420+
}),
1421+
orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
1422+
textGeneration: {} as ProviderInstance["textGeneration"],
1423+
} satisfies ProviderInstance;
1424+
});
1425+
const instances = [
1426+
yield* makeInstance(firstId),
1427+
yield* makeInstance(secondId),
1428+
yield* makeInstance(thirdId),
1429+
];
1430+
const changes = yield* PubSub.unbounded<void>();
1431+
const instanceLayer = Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, {
1432+
listInstances: Effect.succeed(instances),
1433+
getInstance: (id) =>
1434+
Effect.succeed(instances.find((instance) => instance.instanceId === id)),
1435+
listUnavailable: Effect.succeed([]),
1436+
streamChanges: Stream.empty,
1437+
subscribeChanges: PubSub.subscribe(changes),
1438+
});
1439+
const registryLayer = ProviderRegistry.layer.pipe(
1440+
Layer.provide(
1441+
Layer.mergeAll(
1442+
instanceLayer,
1443+
ModelManifest.layerTest,
1444+
Layer.mock(ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutator)({}),
1445+
Layer.mock(ProviderLatestVersions.ProviderLatestVersions)({}),
1446+
),
1447+
),
1448+
);
1449+
const responses =
1450+
yield* Queue.unbounded<
1451+
Exit.Exit<{ readonly providers: ReadonlyArray<ServerProvider> }, unknown>
1452+
>();
1453+
const services = Layer.mergeAll(
1454+
layerUnusedConfigRpcServices,
1455+
instanceLayer,
1456+
registryLayer,
1457+
Layer.mock(UsageLimitSources.UsageLimitSources)({ refresh: Effect.void }),
1458+
Layer.mock(ExternalLauncher.ExternalLauncher)({}),
1459+
Layer.mock(RemoteOpenTargets.RemoteOpenTargets)({}),
1460+
Layer.mock(DirectEndpoints.DirectEndpoints)({}),
1461+
Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({ namedProjectsRoot: "/unused" }),
1462+
Layer.mock(ScratchThreadPromotion.ScratchThreadPromotion)({}),
1463+
Layer.mock(ServerEnvironment.ServerEnvironment)({}),
1464+
Layer.mock(EnvironmentAuth.EnvironmentAuth)({}),
1465+
);
1466+
const server = yield* RpcServer.makeNoSerialization(
1467+
RpcGroup.make(WsServerRefreshProvidersRpc),
1468+
{
1469+
...WS_RPC_SERVER_OPTIONS,
1470+
onFromServer: (response) =>
1471+
response._tag === "Exit" ? Queue.offer(responses, response.exit) : Effect.void,
1472+
},
1473+
).pipe(
1474+
Effect.provide(
1475+
layerWsRpc(
1476+
{
1477+
sessionId: AuthSessionId.make("model-refresh-test"),
1478+
subject: "model-refresh-test",
1479+
method: "browser-session-cookie",
1480+
scopes: [],
1481+
},
1482+
{},
1483+
yield* ServerBrowser.ServerBrowser,
1484+
() => Effect.void,
1485+
{ secretReferences: true },
1486+
).pipe(Layer.provide(services)),
1487+
),
1488+
);
1489+
yield* server.write(0, {
1490+
_tag: "Request",
1491+
id: RpcMessage.RequestId("refresh-models"),
1492+
tag: WS_METHODS.serverRefreshProviders,
1493+
payload: { refreshModels: true, ...(target === "single" ? { instanceId: firstId } : {}) },
1494+
headers: Headers.empty,
1495+
});
1496+
const response = yield* Queue.take(responses);
1497+
if (target === "single") {
1498+
assert.equal(response._tag, "Failure");
1499+
if (response._tag === "Failure") {
1500+
assert.match(Cause.pretty(response.cause), /Model refresh failed/);
1501+
}
1502+
assert.equal(yield* Ref.get(maxRefreshes), 0);
1503+
return;
1504+
}
1505+
assert.equal(response._tag, "Success");
1506+
if (response._tag === "Success") {
1507+
assert.deepEqual(
1508+
Object.fromEntries(
1509+
response.value.providers.map((provider) => [
1510+
provider.instanceId,
1511+
provider.models.map((entry) => entry.slug),
1512+
]),
1513+
),
1514+
{
1515+
[firstId]: ["cached-model"],
1516+
[secondId]: ["refreshed-model"],
1517+
[thirdId]: ["refreshed-model"],
1518+
},
1519+
);
1520+
assert.equal(yield* Ref.get(maxRefreshes), 2);
1521+
}
1522+
}).pipe(
1523+
Effect.provide(
1524+
Layer.mergeAll(
1525+
Layer.fresh(layerConfigSources),
1526+
Layer.mock(PreviewAutomationBroker.PreviewAutomationBroker)({}),
1527+
Layer.mock(ServerBrowser.ServerBrowser)({}),
1528+
),
1529+
),
1530+
Effect.scoped,
1531+
),
1532+
);
1533+
13491534
it.effect("a publish whose push fails still refreshes the new remote", () =>
13501535
Effect.gen(function* () {
13511536
const refreshes = yield* Queue.unbounded<string>();

‎apps/server/src/ws.ts‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2497,31 +2497,7 @@ export const layerWsRpc = (
24972497
? providerRegistry.refreshInstance(input.instanceId)
24982498
: providerRegistry.refresh();
24992499
if (input.refreshModels) {
2500-
const instances = yield* providerInstances.listInstances;
2501-
for (const instance of instances) {
2502-
if (
2503-
!instance.refreshModels ||
2504-
(input.instanceId !== undefined && input.instanceId !== instance.instanceId) ||
2505-
!providers.some(
2506-
(provider) =>
2507-
provider.instanceId === instance.instanceId &&
2508-
provider.enabled &&
2509-
provider.installed,
2510-
)
2511-
)
2512-
continue;
2513-
yield* instance.refreshModels().pipe(
2514-
Effect.mapError(
2515-
(error) =>
2516-
new ProviderSetupError({
2517-
instanceId: instance.instanceId,
2518-
operation: "refresh-models",
2519-
detail: error.detail,
2520-
}),
2521-
),
2522-
);
2523-
providers = yield* providerRegistry.refreshInstance(instance.instanceId);
2524-
}
2500+
providers = yield* providerRegistry.refreshModels(input.instanceId);
25252501
}
25262502
if (input.workspaceSnapshotsOnDemand !== true) return { providers };
25272503
const commandProviders =

0 commit comments

Comments
 (0)