fix #84745: preserve proxy Google model normalization

zhangguiping-xydt · claude · zhangguiping-xydt · commit c59163c80954 · 2026-05-22T01:26:31.000+08:00
Restore nested google/ suffix normalization for proxy providers while keeping bare non-Google Gemini-looking refs unchanged, with regression coverage for LiteLLM allowlist entries.

Co-Authored-By: Claude Opus 4.7 &lt;noreply@anthropic.com&gt;
diff --git a/src/commands/model-picker.test.ts b/src/commands/model-picker.test.ts
@@ -1445,7 +1445,17 @@ describe("applyModelAllowlist", () => {
     expect(next.agents?.defaults?.models).toEqual({
       "google/gemini-3.1-pro-preview": { alias: "gemini" },
       "google-gemini-cli/gemini-3.1-pro-preview": {},
-      "openrouter/google/gemini-3-pro-preview": {},
+      "openrouter/google/gemini-3.1-pro-preview": {},
+    });
+  });
+
+  it("keeps non-Google provider Gemini-looking refs unchanged while writing selected models", () => {
+    const config = {} as OpenClawConfig;
+
+    const next = applyModelAllowlist(config, ["litellm/gemini-3-flash", "litellm/gemini-3.1-pro"]);
+    expect(next.agents?.defaults?.models).toEqual({
+      "litellm/gemini-3-flash": {},
+      "litellm/gemini-3.1-pro": {},
     });
   });
 
@@ -1572,7 +1582,7 @@ describe("applyModelFallbacksFromSelection", () => {
     ]);
     expect(next.agents?.defaults?.model).toEqual({
       primary: "openai/gpt-5.5",
-      fallbacks: ["google/gemini-3.1-pro-preview", "openrouter/google/gemini-3-pro-preview"],
+      fallbacks: ["google/gemini-3.1-pro-preview", "openrouter/google/gemini-3.1-pro-preview"],
     });
   });
 
diff --git a/src/config/model-input.ts b/src/config/model-input.ts
@@ -78,9 +78,10 @@ export function normalizeAgentModelRefForConfig(model: string): string {
 
   const provider = normalizeProviderId(trimmed.slice(0, slash));
   const modelSuffix = trimmed.slice(slash + 1);
-  const normalizedModel = GOOGLE_PROVIDER_IDS.has(provider)
-    ? normalizeGooglePreviewModelId(modelSuffix)
-    : modelSuffix;
+  const normalizedModel =
+    GOOGLE_PROVIDER_IDS.has(provider) || modelSuffix.startsWith("google/")
+      ? normalizeGooglePreviewModelId(modelSuffix)
+      : modelSuffix;
   return modelKeyForConfig(provider, normalizedModel);
 }
 
