Skip to content

Commit d0f7a50

Browse files
t3dotggclaude
andauthored
feat(models): the model picker checks for new models when it opens (pingdotgg#33511)
Co-authored-by: Claude Code <[email protected]>
1 parent 077fd62 commit d0f7a50

15 files changed

Lines changed: 154 additions & 14 deletions

File tree

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,19 @@ function ThreadSettingsMainContent(props: {
913913
reportFailure: false,
914914
});
915915
const refreshProviderCatalog = createProviderCatalogRefreshRunner(refreshProvidersCommand);
916+
const registry = use(RegistryContext);
917+
const refreshModelCatalog = useEffectEvent(() => {
918+
const environmentId = session.environmentId;
919+
if (!environmentId) return;
920+
// An older server drops the field and probes every provider.
921+
const config = registry.get(environmentServerConfigsAtom).get(environmentId);
922+
if (config?.environment.capabilities.modelCatalogRefresh !== true) return;
923+
void refreshProvidersCommand({ environmentId, input: { modelCatalogOnly: true } });
924+
});
925+
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- asks the server for newly released models when the model list opens
926+
useEffect(() => {
927+
refreshModelCatalog();
928+
}, []);
916929
const [isRefreshingProviders, setIsRefreshingProviders] = useState(false);
917930
const refreshProviders = () => {
918931
if (!session.environmentId || isRefreshingProviders) return;

‎apps/server/src/environment/ServerEnvironment.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ export const make = Effect.gen(function* () {
249249
environmentThemes: true,
250250
usageLimitSources: true,
251251
providerWorkspaceSnapshotsOnDemand: true,
252+
modelCatalogRefresh: true,
252253
usagePriceOverrides: true,
253254
usageModelAliases: true,
254255
threadPinning: true,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ const makeHarness = Effect.fn("test.makeCodexInstallation")(function* (
9494
current: input.manifestCurrent ?? Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
9595
refresh: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
9696
forceRefresh: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
97+
refreshOnDemand: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
9798
refreshInBackground: Effect.void,
9899
}),
99100
Effect.provideService(HostProcess.Platform, input.platform ?? "darwin"),

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ describe("resolveProviderCatalog", () => {
8787
current: Effect.succeed(manifest),
8888
refresh: Effect.die("Catalog reads must not refresh the manifest"),
8989
forceRefresh: Effect.die("Catalog reads must not refresh the manifest"),
90+
refreshOnDemand: Effect.die("Catalog reads must not refresh the manifest"),
9091
refreshInBackground: Effect.die("Catalog reads must not refresh the manifest"),
9192
}),
9293
),
@@ -335,6 +336,34 @@ describe("ModelManifest service", () => {
335336
);
336337
});
337338

339+
it.effect("refetches for an opened model picker after five minutes, not an hour", () => {
340+
let fetches = 0;
341+
return Effect.gen(function* () {
342+
const service = yield* ModelManifest.make;
343+
yield* service.refresh;
344+
yield* TestClock.adjust("4 minutes");
345+
yield* service.refreshOnDemand;
346+
assert.strictEqual(fetches, 1);
347+
348+
yield* TestClock.adjust("1 minute");
349+
yield* service.refresh;
350+
assert.strictEqual(fetches, 1);
351+
yield* service.refreshOnDemand;
352+
assert.strictEqual(fetches, 2);
353+
}).pipe(
354+
Effect.scoped,
355+
Effect.provide(
356+
layerService({
357+
prefix: "model-manifest-on-demand-test",
358+
response: () => {
359+
fetches += 1;
360+
return Response.json(REMOTE_MANIFEST);
361+
},
362+
}),
363+
),
364+
);
365+
});
366+
338367
it.live("drops a disk cache of a manifest older than the bundled one", () =>
339368
Effect.gen(function* () {
340369
const fs = yield* FileSystem.FileSystem;

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ const MODEL_MANIFEST_URL =
2727

2828
const MANIFEST_TTL_MS = 60 * 60 * 1000;
2929

30+
/** GitHub's raw CDN caches about this long, so a shorter window buys nothing. */
31+
const MANIFEST_ON_DEMAND_TTL_MS = 5 * 60 * 1000;
32+
3033
/** Back off failed fetches so offline health checks do not each wait on the network. */
3134
const MANIFEST_RETRY_MS = 5 * 60 * 1000;
3235

@@ -174,6 +177,8 @@ export class ModelManifest extends Context.Service<
174177
readonly current: Effect.Effect<ModelManifestData>;
175178
readonly refresh: Effect.Effect<ModelManifestData>;
176179
readonly forceRefresh: Effect.Effect<ModelManifestData>;
180+
/** For a user looking at the model list: tolerates far less staleness than `refresh`. */
181+
readonly refreshOnDemand: Effect.Effect<ModelManifestData>;
177182
/** Process-shared fetches must survive the triggering instance's teardown. */
178183
readonly refreshInBackground: Effect.Effect<void>;
179184
}
@@ -183,6 +188,7 @@ const BundledOnlyModelManifest: ModelManifest["Service"] = {
183188
current: Effect.succeed(BUNDLED_MODEL_MANIFEST),
184189
refresh: Effect.succeed(BUNDLED_MODEL_MANIFEST),
185190
forceRefresh: Effect.succeed(BUNDLED_MODEL_MANIFEST),
191+
refreshOnDemand: Effect.succeed(BUNDLED_MODEL_MANIFEST),
186192
refreshInBackground: Effect.void,
187193
};
188194

@@ -218,13 +224,16 @@ export const make = Effect.gen(function* () {
218224
}),
219225
);
220226

221-
const refresh = Effect.fn("ModelManifest.refresh")(function* (force = false) {
227+
const refresh = Effect.fn("ModelManifest.refresh")(function* (
228+
force = false,
229+
ttlMs = MANIFEST_TTL_MS,
230+
) {
222231
yield* ensureDiskCacheLoaded;
223232
const now = yield* Clock.currentTimeMillis;
224233
// Expire future timestamps after clock rollback; disk caches cross restarts, ruling out monotonic time.
225234
const isWithin = (sinceMs: number | null, windowMs: number) =>
226235
sinceMs !== null && now >= sinceMs && now - sinceMs < windowMs;
227-
if (!force && isWithin(fetchedAtMs, MANIFEST_TTL_MS)) return manifest;
236+
if (!force && isWithin(fetchedAtMs, ttlMs)) return manifest;
228237
if (!force && isWithin(lastAttemptMs, MANIFEST_RETRY_MS)) return manifest;
229238

230239
const settings = yield* settingsService.getSettings.pipe(
@@ -262,6 +271,7 @@ export const make = Effect.gen(function* () {
262271
current: ensureDiskCacheLoaded.pipe(Effect.map(() => manifest)),
263272
refresh: guardedRefresh,
264273
forceRefresh: refreshSemaphore.withPermits(1)(refresh(true)),
274+
refreshOnDemand: refreshSemaphore.withPermits(1)(refresh(false, MANIFEST_ON_DEMAND_TTL_MS)),
265275
refreshInBackground: Effect.forkIn(guardedRefresh, serviceScope).pipe(Effect.asVoid),
266276
});
267277
});

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,6 +1492,7 @@ it.layer(
14921492
it.effect("invalidates model caches only for an explicit model refresh", () =>
14931493
Effect.gen(function* () {
14941494
const forceRefreshCalls = yield* Ref.make(0);
1495+
const manifest = yield* Ref.make(ModelManifest.BUNDLED_MODEL_MANIFEST);
14951496
const makeInstance = (name: string) =>
14961497
Effect.gen(function* () {
14971498
const driver = ProviderDriverKind.make("codex");
@@ -1510,6 +1511,7 @@ it.layer(
15101511
skills: [],
15111512
} as const satisfies ServerProvider;
15121513
const invalidations = yield* Ref.make(0);
1514+
const probes = yield* Ref.make(0);
15131515
const maintenanceReads = yield* Ref.make<ReadonlyArray<boolean>>([]);
15141516
const instance = {
15151517
instanceId,
@@ -1531,7 +1533,7 @@ it.layer(
15311533
),
15321534
),
15331535
getSnapshot: Effect.succeed(provider),
1534-
refresh: Effect.succeed(provider),
1536+
refresh: Ref.update(probes, (count) => count + 1).pipe(Effect.as(provider)),
15351537
streamChanges: Stream.empty,
15361538
applyUsageLimits: () => Effect.void,
15371539
},
@@ -1540,7 +1542,7 @@ it.layer(
15401542
textGeneration: {} as ProviderInstance["textGeneration"],
15411543
} satisfies ProviderInstance;
15421544
const takeMaintenanceReads = Ref.getAndSet(maintenanceReads, []);
1543-
return { instance, invalidations, takeMaintenanceReads };
1545+
return { instance, invalidations, probes, takeMaintenanceReads };
15441546
});
15451547
const first = yield* makeInstance("codex_first");
15461548
const second = yield* makeInstance("codex_second");
@@ -1557,11 +1559,12 @@ it.layer(
15571559
},
15581560
);
15591561
const layerModelManifest = Layer.succeed(ModelManifest.ModelManifest, {
1560-
current: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
1562+
current: Ref.get(manifest),
15611563
refresh: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
15621564
forceRefresh: Ref.update(forceRefreshCalls, (count) => count + 1).pipe(
15631565
Effect.as(ModelManifest.BUNDLED_MODEL_MANIFEST),
15641566
),
1567+
refreshOnDemand: Ref.get(manifest),
15651568
refreshInBackground: Effect.void,
15661569
});
15671570
const layerLatestVersions = Layer.effect(
@@ -1607,6 +1610,18 @@ it.layer(
16071610
assert.deepStrictEqual(yield* first.takeMaintenanceReads, [true]);
16081611
yield* registry.invalidateModelCaches({ ...workspace, fresh: true });
16091612
assert.deepStrictEqual(yield* first.takeMaintenanceReads, [false]);
1613+
1614+
// An opened model picker probes only when the manifest differs from what the last pass saw.
1615+
const probesBefore = yield* Ref.get(second.probes);
1616+
yield* registry.refreshModelCatalog;
1617+
assert.strictEqual(yield* Ref.get(second.probes), probesBefore);
1618+
yield* Ref.set(manifest, {
1619+
...ModelManifest.BUNDLED_MODEL_MANIFEST,
1620+
updatedAt: "2999-01-01T00:00:00Z",
1621+
});
1622+
yield* registry.refreshModelCatalog;
1623+
yield* registry.refreshModelCatalog;
1624+
assert.strictEqual(yield* Ref.get(second.probes), probesBefore + 1);
16101625
}).pipe(
16111626
Effect.provide(
16121627
ProviderRegistry.layer.pipe(

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

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ export class ProviderRegistry extends Context.Service<
9292
readonly fresh?: boolean | undefined;
9393
}) => Effect.Effect<void>;
9494

95+
/**
96+
* For an opened model picker: refetch a model manifest older than a few
97+
* minutes, and probe providers only when it has models they have not seen.
98+
*/
99+
readonly refreshModelCatalog: Effect.Effect<void>;
100+
95101
readonly getProviderMaintenanceCapabilitiesForInstance: (
96102
instanceId: ProviderInstanceId,
97103
provider: ProviderDriverKind,
@@ -624,6 +630,9 @@ export const layer = Layer.effect(
624630
Option.none(),
625631
);
626632

633+
// What the last full pass could see; a later manifest fetch does not reach providers by itself.
634+
const probedManifestUpdatedAt = yield* Ref.make(initialManifest.updatedAt);
635+
627636
const refreshAll = Effect.fn("refreshAll")(function* () {
628637
const claimed = yield* Ref.modify(
629638
refreshAllInFlightRef,
@@ -643,15 +652,20 @@ export const layer = Layer.effect(
643652
if (claimed.owner) {
644653
// Detach shared passes so the first caller's interruption cannot cancel other callers' work.
645654
// Syncing first keeps a refresh right after a rebuild from probing the replaced instance.
646-
yield* syncLiveSourcesAndContinue.pipe(
647-
Effect.andThen(Ref.get(liveSubsRef)),
648-
Effect.flatMap((instances) =>
649-
Effect.forEach(instances.values(), (instance) => refreshOneSource(instance), {
650-
concurrency: "unbounded",
651-
discard: true,
652-
}),
655+
yield* manifestService.current.pipe(
656+
Effect.flatMap(({ updatedAt }) =>
657+
syncLiveSourcesAndContinue.pipe(
658+
Effect.andThen(Ref.get(liveSubsRef)),
659+
Effect.flatMap((instances) =>
660+
Effect.forEach(instances.values(), (instance) => refreshOneSource(instance), {
661+
concurrency: "unbounded",
662+
discard: true,
663+
}),
664+
),
665+
Effect.andThen(Ref.get(providersRef)),
666+
Effect.tap(() => Ref.set(probedManifestUpdatedAt, updatedAt)),
667+
),
653668
),
654-
Effect.andThen(Ref.get(providersRef)),
655669
Effect.onExit((exit) =>
656670
Ref.set(refreshAllInFlightRef, Option.none()).pipe(
657671
Effect.andThen(Deferred.done(claimed.completion, exit)),
@@ -1069,6 +1083,15 @@ export const layer = Layer.effect(
10691083
);
10701084
});
10711085

1086+
const refreshModelCatalog = Effect.fn("ProviderRegistry.refreshModelCatalog")(function* () {
1087+
const { updatedAt } = yield* manifestService.refreshOnDemand;
1088+
// The first pass can be one that started before the fetch, so allow one more.
1089+
for (let pass = 0; pass < 2; pass++) {
1090+
if ((yield* Ref.get(probedManifestUpdatedAt)) === updatedAt) return;
1091+
yield* refreshAll();
1092+
}
1093+
});
1094+
10721095
return {
10731096
getProviders: Ref.get(providersRef),
10741097
refresh: (provider?: ProviderDriverKind) =>
@@ -1081,6 +1104,10 @@ export const layer = Layer.effect(
10811104
refreshWorkspaceSnapshot(input).pipe(Effect.catchCause(recoverRefreshFailure)),
10821105
refreshAfterUpdate,
10831106
invalidateModelCaches,
1107+
refreshModelCatalog: refreshModelCatalog().pipe(
1108+
Effect.catchCause(recoverRefreshFailure),
1109+
Effect.asVoid,
1110+
),
10841111
getProviderMaintenanceCapabilitiesForInstance,
10851112
setProviderMaintenanceActionState,
10861113
get streamChanges() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ it.effect("a remote policy refresh preserves a newer health result on the regist
285285
current: Ref.get(manifest),
286286
refresh,
287287
forceRefresh: refresh,
288+
refreshOnDemand: refresh,
288289
refreshInBackground: Effect.void,
289290
}),
290291
Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ function makeRegistry(
212212
},
213213
refreshWorkspaceSnapshot: () => Ref.get(providersRef),
214214
invalidateModelCaches: () => Effect.void,
215+
refreshModelCatalog: Effect.void,
215216
getProviderMaintenanceCapabilitiesForInstance: (_instanceId, provider) =>
216217
Effect.succeed(lifecycleFor(provider)),
217218
setProviderMaintenanceActionState,
@@ -249,6 +250,7 @@ const makeTestRunner = (
249250
current: Effect.succeed(manifest),
250251
refresh: Effect.succeed(manifest),
251252
forceRefresh: Effect.succeed(manifest),
253+
refreshOnDemand: Effect.succeed(manifest),
252254
refreshInBackground: Effect.void,
253255
}),
254256
latestVersions,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const makeProviderRegistryMock = (
1515
refreshAfterUpdate: () => Effect.succeed(providers),
1616
refreshWorkspaceSnapshot: () => Effect.succeed(providers),
1717
invalidateModelCaches: () => Effect.void,
18+
refreshModelCatalog: Effect.void,
1819
getProviderMaintenanceCapabilitiesForInstance: (_instanceId, provider) =>
1920
Effect.succeed(makeManualOnlyProviderMaintenanceCapabilities({ provider, packageName: null })),
2021
setProviderMaintenanceActionState: () => Effect.succeed(providers),

0 commit comments

Comments
 (0)