fix: resolve google provider default API to google-generative-ai (#88480) (#88512)

1052326311 · xin · web-flow · commit b73e135f9730 · 2026-05-31T22:48:48.000+01:00
When a configured Google provider/model row had no explicit
but had a baseUrl set, the fallback defaulted to openai-completions,
causing Gemini requests to route through the OpenAI Responses
transport instead of the native @google/genai transport.

Made resolveConfiguredProviderDefaultApi provider-aware: for the
google provider, the default API is now google-generative-ai.

Root cause: the generic fallback assumed any provider with a baseUrl
should use openai-completions, which is incorrect for Google's native
Gemini API.

Co-authored-by: xin &lt;1052326311+xin@users.noreply.github.com&gt;
diff --git a/extensions/google/api.test.ts b/extensions/google/api.test.ts
@@ -86,6 +86,16 @@ describe("google generative ai helpers", () => {
   });
 
   it("normalizes transport baseUrls only for Google Generative AI", () => {
+    expect(
+      resolveGoogleGenerativeAiTransport({
+        provider: "google",
+        api: undefined,
+        baseUrl: "https://generativelanguage.googleapis.com",
+      }),
+    ).toEqual({
+      api: "google-generative-ai",
+      baseUrl: "https://generativelanguage.googleapis.com/v1beta",
+    });
     expect(
       resolveGoogleGenerativeAiTransport({
         api: "google-generative-ai",
diff --git a/extensions/google/provider-policy.ts b/extensions/google/provider-policy.ts
@@ -82,12 +82,16 @@ export function normalizeGoogleGenerativeAiBaseUrl(baseUrl?: string): string | u
 }
 
 export function resolveGoogleGenerativeAiTransport<TApi extends string | null | undefined>(params: {
+  provider?: string;
   api: TApi;
   baseUrl?: string;
-}): { api: TApi; baseUrl?: string } {
+}): { api: TApi | "google-generative-ai"; baseUrl?: string } {
+  const api =
+    params.api ??
+    (params.provider === "google" && params.baseUrl ? "google-generative-ai" : params.api);
   return {
-    api: params.api,
-    baseUrl: isGoogleGenerativeAiApi(params.api)
+    api,
+    baseUrl: isGoogleGenerativeAiApi(api)
       ? normalizeGoogleGenerativeAiBaseUrl(params.baseUrl)
       : params.baseUrl,
   };
diff --git a/extensions/google/provider-registration.ts b/extensions/google/provider-registration.ts
@@ -44,7 +44,8 @@ export function buildGoogleProvider(): ProviderPlugin {
         },
       }),
     ],
-    normalizeTransport: ({ api, baseUrl }) => resolveGoogleGenerativeAiTransport({ api, baseUrl }),
+    normalizeTransport: ({ provider, api, baseUrl }) =>
+      resolveGoogleGenerativeAiTransport({ provider, api, baseUrl }),
     normalizeConfig: ({ provider, providerConfig }) =>
       normalizeGoogleProviderConfig(provider, providerConfig),
     staticCatalog: {
diff --git a/src/agents/embedded-agent-runner/model.provider-runtime.test-support.ts b/src/agents/embedded-agent-runner/model.provider-runtime.test-support.ts
@@ -172,6 +172,16 @@ function normalizeTransport(params: {
       baseUrl: GOOGLE_GENERATIVE_AI_BASE_URL,
     };
   }
+  if (
+    params.provider === "google" &&
+    params.context.api == null &&
+    params.context.baseUrl === "https://generativelanguage.googleapis.com"
+  ) {
+    return {
+      api: "google-generative-ai",
+      baseUrl: GOOGLE_GENERATIVE_AI_BASE_URL,
+    };
+  }
   if (isNativeOpenAiTransport) {
     return {
       api: "openai-responses",
diff --git a/src/agents/embedded-agent-runner/model.test.ts b/src/agents/embedded-agent-runner/model.test.ts
@@ -989,6 +989,27 @@ describe("resolveModel", () => {
     expect(model.api).toBe("openai-completions");
   });
 
+  it("defaults baseUrl-only Google fallback models to native Gemini transport", () => {
+    const cfg = {
+      models: {
+        providers: {
+          google: {
+            baseUrl: "https://generativelanguage.googleapis.com",
+            models: [],
+          },
+        },
+      },
+    } as unknown as OpenClawConfig;
+
+    const result = resolveModelForTest("google", "gemini-2.5-flash-lite", "/tmp/agent", cfg);
+    const model = expectResolvedModel(result);
+
+    expect(model.provider).toBe("google");
+    expect(model.id).toBe("gemini-2.5-flash-lite");
+    expect(model.api).toBe("google-generative-ai");
+    expect(model.baseUrl).toBe("https://generativelanguage.googleapis.com/v1beta");
+  });
+
   it("uses bundled static metadata for configured provider fallback token limits", () => {
     resolveBundledStaticCatalogModelMock.mockReturnValueOnce({
       provider: "xiaomi-token-plan",
diff --git a/src/agents/embedded-agent-runner/model.ts b/src/agents/embedded-agent-runner/model.ts
@@ -338,14 +338,30 @@ function resolveProviderTransport(params: {
   };
 }
 
-function resolveConfiguredProviderDefaultApi(
-  providerConfig: InlineProviderConfig | undefined,
-): Api | undefined {
+function resolveConfiguredProviderDefaultApi(params: {
+  provider: string;
+  providerConfig: InlineProviderConfig | undefined;
+  cfg?: OpenClawConfig;
+  workspaceDir?: string;
+  runtimeHooks?: ProviderRuntimeHooks;
+}): Api | undefined {
+  const { providerConfig } = params;
   const explicit = normalizeResolvedTransportApi(providerConfig?.api);
   if (explicit) {
     return explicit;
   }
-  return providerConfig?.baseUrl ? "openai-completions" : undefined;
+  if (!providerConfig?.baseUrl) {
+    return undefined;
+  }
+  const normalized = resolveProviderTransport({
+    provider: params.provider,
+    api: undefined,
+    baseUrl: providerConfig.baseUrl,
+    cfg: params.cfg,
+    workspaceDir: params.workspaceDir,
+    runtimeHooks: params.runtimeHooks,
+  });
+  return normalized.api ?? "openai-completions";
 }
 
 function resolveProviderRequestTimeoutMs(timeoutSeconds: unknown): number | undefined {
@@ -660,7 +676,13 @@ function applyConfiguredProviderOverrides(params: {
     input: metadataOverrideModel?.input,
     fallbackInput: discoveredModel.input,
   });
-  const providerDefaultApi = resolveConfiguredProviderDefaultApi(providerConfig);
+  const providerDefaultApi = resolveConfiguredProviderDefaultApi({
+    provider: params.provider,
+    providerConfig,
+    cfg: params.cfg,
+    workspaceDir: params.workspaceDir,
+    runtimeHooks: params.runtimeHooks,
+  });
   const resolvedTransportApi =
     metadataOverrideModel?.api ??
     (params.preferDiscoveredTransport
@@ -697,7 +719,7 @@ function applyConfiguredProviderOverrides(params: {
     api:
       resolvedTransport.api ??
       normalizeResolvedTransportApi(discoveredModel.api) ??
-      resolveConfiguredProviderDefaultApi(providerConfig) ??
+      providerDefaultApi ??
       "openai-responses",
     baseUrl: resolvedTransport.baseUrl ?? discoveredModel.baseUrl,
     discoveredHeaders,
@@ -1040,7 +1062,13 @@ function resolveConfiguredFallbackModel(params: {
     provider,
     api:
       normalizeResolvedTransportApi(configuredModel?.api) ??
-      resolveConfiguredProviderDefaultApi(providerConfig) ??
+      resolveConfiguredProviderDefaultApi({
+        provider,
+        providerConfig,
+        cfg,
+        workspaceDir,
+        runtimeHooks,
+      }) ??
       normalizeResolvedTransportApi(staticCatalogModel?.api) ??
       "openai-responses",
     baseUrl: configuredModel?.baseUrl ?? providerConfig?.baseUrl ?? staticCatalogModel?.baseUrl,
