fix(models): keep bundled provider catalog when configured base URL is blank

yetval · yetval · commit 5a5c8bf8d6a4 · 2026-06-08T01:20:07.000Z
A models.providers.<id> entry with a blank baseUrl ("") erased the bundled provider catalog from the generated model registry. The empty base URL flowed into provider discovery and the catalog merge, where it overrode the bundled transport URL; the resulting provider then failed isWritableProviderConfig and was dropped from models.json entirely. For Google this meant gemini-2.5-flash and gemini-flash-latest stopped resolving on the embedded runtime with model_not_found, even though the bundled Google catalog and forward-compat resolver know those ids. This hit users in merge mode whose config was partially written by a plugin. Strip blank provider base URLs before discovery and merge so a blank value means "use the provider default" instead of clobbering it. Fixes #91270
diff --git a/src/agents/models-config.plan.ts b/src/agents/models-config.plan.ts
@@ -107,8 +107,11 @@ export async function resolveProvidersForModelsJsonWithDeps(
     resolveImplicitProviders?: ResolveImplicitProvidersForModelsJson;
   },
 ): Promise<Record<string, ProviderConfig>> {
-  const { cfg, agentDir, env } = params;
-  const explicitProviders = cfg.models?.providers ?? {};
+  const { agentDir, env } = params;
+  const explicitProviders = stripBlankProviderBaseUrls(params.cfg.models?.providers ?? {});
+  const cfg = params.cfg.models?.providers
+    ? { ...params.cfg, models: { ...params.cfg.models, providers: explicitProviders } }
+    : params.cfg;
   const resolveImplicitProvidersImpl = deps?.resolveImplicitProviders ?? resolveImplicitProviders;
   const implicitProviders = await resolveImplicitProvidersImpl({
     agentDir,
@@ -133,6 +136,23 @@ export async function resolveProvidersForModelsJsonWithDeps(
   });
 }
 
+function stripBlankProviderBaseUrls(
+  providers: Record<string, ProviderConfig>,
+): Record<string, ProviderConfig> {
+  let mutated = false;
+  const next: Record<string, ProviderConfig> = {};
+  for (const [key, provider] of Object.entries(providers)) {
+    if (typeof provider?.baseUrl === "string" && provider.baseUrl.trim() === "") {
+      const { baseUrl: _blank, ...rest } = provider;
+      next[key] = rest as ProviderConfig;
+      mutated = true;
+      continue;
+    }
+    next[key] = provider;
+  }
+  return mutated ? next : providers;
+}
+
 function resolveProvidersForMode(params: {
   mode: NonNullable<ModelsConfig["mode"]>;
   existingParsed: unknown;
