@@ -29,6 +29,13 @@ import {
2929 matchCanonicalModelId,
3030 parseModelsDevCapabilities,
3131 } from "./model-info-normalize.ts";
32+import {
33+ getKnownLocalProviders,
34+ getRemoteConfiguredProviders,
35+ getVisibleProviders,
36+ isLocalProviderConnectionStateStale,
37+ refreshLocalProviderConnections,
38+} from "./provider-discovery.ts";
3239
3340 const MODELS_DEV_SYNC_KEY = "last_models_dev_sync_at";
3441 const PROVIDER_SYNC_KEY_PREFIX = "last_provider_sync_at:";
@@ -44,16 +51,6 @@ export {
4451 } from "./model-info-normalize.ts";
4552 export type { LiveModel };
4653
47-const REMOTE_PROVIDER_ENV_KEYS: ReadonlyArray<{
48- provider: string;
49- envKeys: readonly string[];
50-}> = [
51- { provider: "zen", envKeys: ["OPENCODE_API_KEY"] },
52- { provider: "openai", envKeys: ["OPENAI_API_KEY"] },
53- { provider: "anthropic", envKeys: ["ANTHROPIC_API_KEY"] },
54- { provider: "google", envKeys: ["GOOGLE_API_KEY", "GEMINI_API_KEY"] },
55-];
56-
5754 export interface AvailableModelsSnapshot {
5855 models: LiveModel[];
5956 stale: boolean;
@@ -99,52 +96,53 @@ function parseStateInt(key: string): number | null {
9996 return value;
10097 }
10198
102-function hasAnyEnvKey(
103- env: Record<string, string | undefined>,
104- keys: readonly string[],
105-): boolean {
106- for (const key of keys) {
107- if (env[key]) return true;
108- }
109- return false;
110-}
111-
11299 export function getRemoteProvidersFromEnv(
113100 env: Record<string, string | undefined>,
114101 ): string[] {
115- const providers = REMOTE_PROVIDER_ENV_KEYS.filter((entry) =>
116- hasAnyEnvKey(env, entry.envKeys),
117- ).map((entry) => entry.provider);
118-
119- // Include providers with OAuth login even without env keys.
120- if (!providers.includes("openai") && isLoggedIn("openai")) {
121- providers.push("openai");
122- }
123-
124- return providers;
102+ return getRemoteConfiguredProviders(env, {
103+ openaiLoggedIn: isLoggedIn("openai"),
104+ });
125105 }
126106
127107 export function getProvidersToRefreshFromEnv(
128108 env: Record<string, string | undefined>,
109+ opts?: { localProviders?: readonly string[] },
129110 ): string[] {
130- return [...getRemoteProvidersFromEnv(env), "ollama"];
111+ const localProviders = opts?.localProviders;
112+ return getVisibleProviders(env, {
113+ openaiLoggedIn: isLoggedIn("openai"),
114+ ...(localProviders ? { localProviders } : {}),
115+ });
131116 }
132117
133118 function getVisibleProvidersForSnapshotFromEnv(
134119 env: Record<string, string | undefined>,
120+ opts?: { localProviders?: readonly string[] },
135121 ): ReadonlySet<string> {
136- return new Set(getProvidersToRefreshFromEnv(env));
122+ const localProviders = opts?.localProviders;
123+ return new Set(
124+ getProvidersToRefreshFromEnv(
125+ env,
126+ localProviders ? { localProviders } : undefined,
127+ ),
128+ );
137129 }
138130
139131 export function isProviderVisibleInSnapshot(
140132 provider: string,
141133 env: Record<string, string | undefined>,
134+ opts?: { localProviders?: readonly string[] },
142135 ): boolean {
143- return getVisibleProvidersForSnapshotFromEnv(env).has(provider);
136+ return getVisibleProvidersForSnapshotFromEnv(env, opts).has(provider);
144137 }
145138
146-function getConfiguredProvidersForSync(): string[] {
147- return getProvidersToRefreshFromEnv(process.env);
139+function getConfiguredProvidersForSync(
140+ localProviders?: readonly string[],
141+): string[] {
142+ return getProvidersToRefreshFromEnv(
143+ process.env,
144+ localProviders ? { localProviders } : undefined,
145+ );
148146 }
149147
150148 function getProvidersRequiredForFreshness(): string[] {
@@ -159,6 +157,7 @@ function isModelInfoStale(now = Date.now()): boolean {
159157 ensureLoaded();
160158 if (parseStateInt(CACHE_VERSION_KEY) !== CACHE_VERSION) return true;
161159 if (isStaleTimestamp(parseStateInt(MODELS_DEV_SYNC_KEY), now)) return true;
160+ if (isLocalProviderConnectionStateStale(now)) return true;
162161 for (const provider of getProvidersRequiredForFreshness()) {
163162 const providerSync = parseStateInt(getProviderSyncKey(provider));
164163 if (isStaleTimestamp(providerSync, now)) return true;
@@ -193,10 +192,14 @@ function providerRowsFromCandidates(
193192 }));
194193 }
195194
196-async function refreshModelInfoInternal(): Promise<void> {
195+async function refreshModelInfoInternal(
196+ localProviders?: readonly string[],
197+): Promise<void> {
197198 ensureLoaded();
198199 const now = Date.now();
199- const providers = getConfiguredProvidersForSync();
200+ const discoveredLocalProviders =
201+ localProviders ?? (await refreshLocalProviderConnections(process.env));
202+ const providers = getConfiguredProvidersForSync(discoveredLocalProviders);
200203 const providerResults = await Promise.all(
201204 providers.map(async (provider) => ({
202205 provider,
@@ -230,14 +233,27 @@ async function refreshModelInfoInternal(): Promise<void> {
230233
231234 export function refreshModelInfoInBackground(opts?: {
232235 force?: boolean;
236+ localProviders?: readonly string[];
233237 }): Promise<void> {
234238 ensureLoaded();
235239 const force = opts?.force ?? false;
236- if (!force && !isModelInfoStale()) return Promise.resolve();
240+ if (
241+ !force &&
242+ !isModelInfoStale() &&
243+ !shouldBlockOnMissingVisibleProviderModels({
244+ hasAnyCachedModels: runtimeCache.providerModelsByKey.size > 0,
245+ hasCachedModelsForAllVisibleProviders:
246+ hasCachedModelsForAllVisibleProviders(),
247+ })
248+ ) {
249+ return Promise.resolve();
250+ }
237251 if (refreshInFlight) return refreshInFlight;
238- refreshInFlight = refreshModelInfoInternal().finally(() => {
239- refreshInFlight = null;
240- });
252+ refreshInFlight = refreshModelInfoInternal(opts?.localProviders).finally(
253+ () => {
254+ refreshInFlight = null;
255+ },
256+ );
241257 return refreshInFlight;
242258 }
243259
@@ -275,7 +291,9 @@ export function supportsThinking(modelString: string): boolean {
275291 /** Return cached model IDs synchronously (for Tab-completion). */
276292 export function getCachedModelIds(): string[] {
277293 ensureLoaded();
278- const visible = getVisibleProvidersForSnapshotFromEnv(process.env);
294+ const visible = getVisibleProvidersForSnapshotFromEnv(process.env, {
295+ localProviders: getKnownLocalProviders(),
296+ });
279297 const ids: string[] = [];
280298 for (const row of runtimeCache.providerModelsByKey.values()) {
281299 if (visible.has(row.provider)) {
@@ -287,7 +305,9 @@ export function getCachedModelIds(): string[] {
287305 }
288306
289307 function hasCachedModelsForAllVisibleProviders(): boolean {
290- const visible = getVisibleProvidersForSnapshotFromEnv(process.env);
308+ const visible = getVisibleProvidersForSnapshotFromEnv(process.env, {
309+ localProviders: getKnownLocalProviders(),
310+ });
291311 for (const provider of visible) {
292312 let found = false;
293313 for (const row of runtimeCache.providerModelsByKey.values()) {
@@ -301,24 +321,36 @@ function hasCachedModelsForAllVisibleProviders(): boolean {
301321 return true;
302322 }
303323
324+export function shouldBlockOnMissingVisibleProviderModels(opts: {
325+ hasAnyCachedModels: boolean;
326+ hasCachedModelsForAllVisibleProviders: boolean;
327+}): boolean {
328+ return (
329+ !opts.hasAnyCachedModels || !opts.hasCachedModelsForAllVisibleProviders
330+ );
331+}
332+
304333 export async function fetchAvailableModelsSnapshot(): Promise<AvailableModelsSnapshot> {
305334 ensureLoaded();
306- if (isModelInfoStale() && !isModelInfoRefreshing()) {
307- // Block when the cache is empty or a visible provider has no cached models
308- // (e.g. user just logged in via OAuth). Otherwise refresh in background.
309- if (
310- runtimeCache.providerModelsByKey.size === 0 ||
311- !hasCachedModelsForAllVisibleProviders()
312- ) {
313- await refreshModelInfoInBackground({ force: true });
314- } else {
315- void refreshModelInfoInBackground();
316- }
335+ const stale = isModelInfoStale();
336+ const shouldBlock = shouldBlockOnMissingVisibleProviderModels({
337+ hasAnyCachedModels: runtimeCache.providerModelsByKey.size > 0,
338+ hasCachedModelsForAllVisibleProviders:
339+ hasCachedModelsForAllVisibleProviders(),
Cut short: this commit's diff is over 1000 lines.