Skip to content

Commit 9cd1814

Browse files
fix(server): project model discovery retries until it reads, and follows machine model changes
A failed project model read stored a snapshot that both the server and the client treated as complete, so the project's own models stayed missing until the 5-minute TTL. Workspace snapshots now carry `modelsPending`, which the existing retry guards treat like `slashCommandsPending`. A machine refresh that changes the machine models now drops folder snapshots with their own catalog so they rescan, and clients discard fetched snapshots when the machine models change. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent ca458db commit 9cd1814

6 files changed

Lines changed: 190 additions & 9 deletions

File tree

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

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,52 @@ it.layer(
477477
assert.strictEqual(removed.workspaceSnapshots?.[0]?.models, undefined);
478478
});
479479

480+
it("drops folder catalogs when a machine refresh changes the machine models", () => {
481+
const machineModel = {
482+
slug: "opencode/big-pickle",
483+
name: "Big Pickle",
484+
isCustom: false,
485+
capabilities: null,
486+
} satisfies ServerProvider["models"][number];
487+
const projectModel = { ...machineModel, slug: "uni/medium-gpt", name: "Medium GPT" };
488+
const addedModel = { ...machineModel, slug: "opencode/new", name: "New" };
489+
const provider = {
490+
instanceId: ProviderInstanceId.make("opencode"),
491+
driver: ProviderDriverKind.make("opencode"),
492+
status: "ready",
493+
enabled: true,
494+
installed: true,
495+
auth: { status: "authenticated" },
496+
checkedAt: "2026-03-25T00:00:00.000Z",
497+
version: "2.0.0",
498+
models: [machineModel],
499+
slashCommands: [],
500+
skills: [],
501+
} satisfies ServerProvider;
502+
const withCatalog = ProviderRegistry.upsertProviderWorkspaceSnapshot(
503+
ProviderRegistry.upsertProviderWorkspaceSnapshot(provider, "/project", {
504+
...provider,
505+
workspaceModels: [machineModel, projectModel],
506+
}),
507+
"/plain",
508+
provider,
509+
);
510+
511+
const unchanged = ProviderRegistry.mergeProviderSnapshot(withCatalog, provider);
512+
assert.deepStrictEqual(
513+
unchanged.workspaceSnapshots?.map((snapshot) => snapshot.cwd),
514+
["/project", "/plain"],
515+
);
516+
const changed = ProviderRegistry.mergeProviderSnapshot(withCatalog, {
517+
...provider,
518+
models: [machineModel, addedModel],
519+
});
520+
assert.deepStrictEqual(
521+
changed.workspaceSnapshots?.map((snapshot) => snapshot.cwd),
522+
["/plain"],
523+
);
524+
});
525+
480526
it("stores workspace skills, commands and options without changing machine metadata", () => {
481527
const provider = {
482528
instanceId: ProviderInstanceId.make("codex"),
@@ -1562,6 +1608,108 @@ it.layer(
15621608
}),
15631609
);
15641610

1611+
it.effect("rescans a folder whose model catalog could not be read before its TTL", () =>
1612+
Effect.gen(function* () {
1613+
const driver = ProviderDriverKind.make("opencode");
1614+
const instanceId = ProviderInstanceId.make("opencode");
1615+
const machineModel = {
1616+
slug: "opencode/big-pickle",
1617+
name: "Big Pickle",
1618+
isCustom: false,
1619+
capabilities: null,
1620+
} satisfies ServerProvider["models"][number];
1621+
const projectModel = { ...machineModel, slug: "uni/medium-gpt", name: "Medium GPT" };
1622+
const provider = {
1623+
instanceId,
1624+
driver,
1625+
status: "ready",
1626+
enabled: true,
1627+
installed: true,
1628+
auth: { status: "authenticated" },
1629+
checkedAt: "2026-06-10T00:00:00.000Z",
1630+
version: "2.0.0",
1631+
models: [machineModel],
1632+
slashCommands: [],
1633+
skills: [],
1634+
} as const satisfies ServerProvider;
1635+
const scanResult = yield* Ref.make<ProviderWorkspaceSnapshot>({
1636+
...provider,
1637+
slashCommandsPending: false,
1638+
workspaceModelsPending: true,
1639+
});
1640+
const instance: ProviderInstance = {
1641+
instanceId,
1642+
driverKind: driver,
1643+
continuationIdentity: {
1644+
driverKind: driver,
1645+
continuationKey: "opencode:instance:opencode",
1646+
},
1647+
displayName: undefined,
1648+
enabled: true,
1649+
snapshot: {
1650+
resolveMaintenance: () =>
1651+
Effect.succeed(
1652+
makeManualOnlyProviderMaintenanceCapabilities({
1653+
provider: driver,
1654+
packageName: null,
1655+
}),
1656+
),
1657+
getSnapshot: Effect.succeed(provider),
1658+
refresh: Effect.succeed(provider),
1659+
streamChanges: Stream.empty,
1660+
applyUsageLimits: () => Effect.void,
1661+
},
1662+
snapshotForCwd: () => Ref.get(scanResult),
1663+
orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
1664+
textGeneration: {} as ProviderInstance["textGeneration"],
1665+
};
1666+
const layerInstanceRegistry = Layer.succeed(
1667+
ProviderInstanceRegistry.ProviderInstanceRegistry,
1668+
{
1669+
getInstance: (requestedId) =>
1670+
Effect.succeed(requestedId === instanceId ? instance : undefined),
1671+
listInstances: Effect.succeed([instance]),
1672+
listUnavailable: Effect.succeed([]),
1673+
streamChanges: Stream.empty,
1674+
subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
1675+
},
1676+
);
1677+
const scope = yield* Scope.make();
1678+
yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
1679+
const runtimeServices = yield* Layer.build(
1680+
ProviderRegistry.layer.pipe(
1681+
Layer.provide(layerUnusedMutator),
1682+
Layer.provideMerge(layerInstanceRegistry),
1683+
Layer.provideMerge(
1684+
ServerConfig.layerTest(process.cwd(), {
1685+
prefix: "t3-provider-registry-pending-workspace-models-",
1686+
}),
1687+
),
1688+
Layer.provideMerge(NodeServices.layer),
1689+
),
1690+
).pipe(Scope.provide(scope));
1691+
1692+
yield* Effect.gen(function* () {
1693+
const registry = yield* ProviderRegistry.ProviderRegistry;
1694+
const workspaceOf = Effect.map(
1695+
registry.getProviders,
1696+
(providers) => providers[0]?.workspaceSnapshots?.[0],
1697+
);
1698+
yield* registry.refreshWorkspaceSnapshot({ instanceId, cwd: "/project" });
1699+
const unread = yield* workspaceOf;
1700+
assert.strictEqual(unread?.models, undefined);
1701+
assert.strictEqual(unread?.modelsPending, true);
1702+
1703+
const workspaceModels = [machineModel, projectModel];
1704+
yield* Ref.set(scanResult, { ...provider, slashCommandsPending: false, workspaceModels });
1705+
yield* registry.refreshWorkspaceSnapshot({ instanceId, cwd: "/project" });
1706+
const recovered = yield* workspaceOf;
1707+
assert.deepStrictEqual(recovered?.models, workspaceModels);
1708+
assert.strictEqual(recovered?.modelsPending, undefined);
1709+
}).pipe(Effect.provide(runtimeServices));
1710+
}),
1711+
);
1712+
15651713
it.effect("shares one in-flight pass between concurrent untargeted refreshes", () =>
15661714
Effect.gen(function* () {
15671715
const driver = ProviderDriverKind.make("codex");

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
defaultInstanceIdForDriver,
33
isProviderWorkspaceSnapshotCurrent,
4+
isProviderWorkspaceSnapshotPending,
45
ProviderDriverKind,
56
type ProviderInstanceId,
67
type ServerProvider,
@@ -150,6 +151,7 @@ export function upsertProviderWorkspaceSnapshot(
150151
skills: scopedSnapshot.skills,
151152
...(optionDescriptors === undefined ? {} : { optionDescriptors }),
152153
...(models === undefined ? {} : { models }),
154+
...(scopedSnapshot.workspaceModelsPending ? { modelsPending: true } : {}),
153155
} satisfies NonNullable<ServerProvider["workspaceSnapshots"]>[number];
154156
return {
155157
...provider,
@@ -277,14 +279,19 @@ export const mergeProviderSnapshot = (
277279
}
278280
const savedAccount = carrySavedAntigravityAccount(previousProvider, nextProvider);
279281
const { message: _uncheckedMessage, ...nextWithoutMessage } = nextProvider;
282+
const models = mergeProviderModels(nextProvider, previousProvider.models, nextProvider.models);
283+
// A folder's own catalog was read against the old machine catalog, so it rescans.
284+
const previousWorkspaceSnapshots = Equal.equals(models, previousProvider.models)
285+
? previousProvider.workspaceSnapshots
286+
: previousProvider.workspaceSnapshots?.filter((snapshot) => snapshot.models === undefined);
280287
return {
281288
...(savedAccount?.status === "ready" ? nextWithoutMessage : nextProvider),
282289
...savedAccount,
283-
models: mergeProviderModels(nextProvider, previousProvider.models, nextProvider.models),
290+
models,
284291
...(nextProvider.workspaceSnapshots !== undefined
285292
? { workspaceSnapshots: nextProvider.workspaceSnapshots }
286-
: previousProvider.workspaceSnapshots !== undefined
287-
? { workspaceSnapshots: previousProvider.workspaceSnapshots }
293+
: previousWorkspaceSnapshots !== undefined
294+
? { workspaceSnapshots: previousWorkspaceSnapshots }
288295
: {}),
289296
...(shouldRetainMissingOpenCodeMetadata(nextProvider)
290297
? {
@@ -944,7 +951,7 @@ export const layer = Layer.effect(
944951
!provider.enabled ||
945952
(!input.fresh &&
946953
scannedFrom &&
947-
!scannedFrom.slashCommandsPending &&
954+
!isProviderWorkspaceSnapshotPending(scannedFrom) &&
948955
isProviderWorkspaceSnapshotCurrent(scannedFrom, DateTime.toEpochMillis(now)))
949956
) {
950957
return providers;

‎packages/client-runtime/src/providerSkills.test.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,22 @@ describe("provider workspace snapshot refresh atom", () => {
308308
expect(vi.getTimerCount()).toBe(0);
309309
});
310310

311+
it("rescans a current snapshot whose commands are complete but models are pending", () => {
312+
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:00:00.000Z") });
313+
const [current] = withSnapshot("2026-01-01T00:00:00.000Z");
314+
const { run, unmount } = setup([
315+
{
316+
...current!,
317+
workspaceSnapshots: current!.workspaceSnapshots!.map((snapshot) => ({
318+
...snapshot,
319+
modelsPending: true,
320+
})),
321+
},
322+
]);
323+
expect(run).toHaveBeenCalledTimes(1);
324+
unmount();
325+
});
326+
311327
it("stops retrying after three failed scans until the TTL lapses", async () => {
312328
vi.useFakeTimers({ now: Date.parse("2026-01-01T00:00:00.000Z") });
313329
const { registry, atom, run, unmount } = setup(withSnapshot("2026-01-01T00:00:00.000Z", true));

‎packages/client-runtime/src/providerSkills.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
type EnvironmentId,
33
isProviderWorkspaceSnapshotCurrent,
4+
isProviderWorkspaceSnapshotPending,
45
PROVIDER_WORKSPACE_SNAPSHOT_TTL_MS,
56
type ProviderInstanceId,
67
type ServerProvider,
@@ -102,7 +103,7 @@ export function hasCompleteProviderWorkspaceSnapshot(
102103
cwd: string | null | undefined,
103104
): boolean {
104105
const snapshot = provider && resolveProviderWorkspaceSnapshot(provider, cwd);
105-
return Boolean(snapshot && !snapshot.slashCommandsPending);
106+
return Boolean(snapshot && !isProviderWorkspaceSnapshotPending(snapshot));
106107
}
107108

108109
function hasCurrentProviderWorkspaceSnapshot(
@@ -113,7 +114,7 @@ function hasCurrentProviderWorkspaceSnapshot(
113114
const snapshot = provider && resolveProviderWorkspaceSnapshot(provider, cwd);
114115
return Boolean(
115116
snapshot &&
116-
!snapshot.slashCommandsPending &&
117+
!isProviderWorkspaceSnapshotPending(snapshot) &&
117118
isProviderWorkspaceSnapshotCurrent(snapshot, nowMs),
118119
);
119120
}
@@ -216,8 +217,8 @@ function planProviderWorkspaceSnapshotRefresh(
216217
if (refresh) {
217218
return { state: { ...state, requestedAt: now }, refresh: true, recheckAt: null };
218219
}
219-
const pending =
220-
(provider && resolveProviderWorkspaceSnapshot(provider, cwd)?.slashCommandsPending) === true;
220+
const snapshot = provider && resolveProviderWorkspaceSnapshot(provider, cwd);
221+
const pending = Boolean(snapshot && isProviderWorkspaceSnapshotPending(snapshot));
221222
return { state, refresh: false, recheckAt: pending ? retryNotBefore : null };
222223
}
223224

@@ -251,7 +252,7 @@ function resolveWorkspaceSnapshotStatus(
251252
): WorkspaceSnapshotStatus {
252253
const snapshot = provider && resolveProviderWorkspaceSnapshot(provider, cwd);
253254
if (!snapshot) return "absent";
254-
return snapshot.slashCommandsPending ? "pending" : "complete";
255+
return isProviderWorkspaceSnapshotPending(snapshot) ? "pending" : "complete";
255256
}
256257

257258
interface ProviderWorkspaceSnapshotRefreshTarget {

‎packages/client-runtime/src/state/server.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,7 @@ type ServerProviderEntry = ServerConfig["providers"][number];
662662
const snapshotBasis = (provider: ServerProviderEntry | undefined) =>
663663
provider && {
664664
enabled: provider.enabled,
665+
models: provider.models,
665666
slashCommands: provider.slashCommands,
666667
skills: provider.skills,
667668
};

‎packages/contracts/src/server.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ export const ServerProviderWorkspaceSnapshot = Schema.Struct({
130130
optionDescriptors: Schema.optional(Schema.Array(ProviderOptionDescriptor)),
131131
// Absent means the provider's machine `models`, which keeps most snapshots small.
132132
models: Schema.optional(Schema.Array(ServerProviderModel)),
133+
modelsPending: Schema.optional(Schema.Boolean),
133134
});
134135
export type ServerProviderWorkspaceSnapshot = typeof ServerProviderWorkspaceSnapshot.Type;
135136

@@ -142,6 +143,13 @@ export function isProviderWorkspaceSnapshotCurrent(
142143
return nowMs - Date.parse(snapshot.checkedAt) < PROVIDER_WORKSPACE_SNAPSHOT_TTL_MS;
143144
}
144145

146+
/** A pending snapshot keeps what it found before and is rescanned before its TTL. */
147+
export function isProviderWorkspaceSnapshotPending(
148+
snapshot: Pick<ServerProviderWorkspaceSnapshot, "slashCommandsPending" | "modelsPending">,
149+
): boolean {
150+
return snapshot.slashCommandsPending === true || snapshot.modelsPending === true;
151+
}
152+
145153
/** Unavailable snapshots must set installed and enabled false. */
146154
export const ServerProviderAvailability = Schema.Literals(["available", "unavailable"]);
147155
export type ServerProviderAvailability = typeof ServerProviderAvailability.Type;

0 commit comments

Comments
 (0)