fix: keep gemini config normalization acyclic

steipete · steipete · commit 132bcebe4110 · 2026-05-08T07:33:51.000+01:00
diff --git a/src/agents/live-target-matcher.ts b/src/agents/live-target-matcher.ts
@@ -1,10 +1,10 @@
 import type { OpenClawConfig } from "../config/types.openclaw.js";
+import { normalizeGooglePreviewModelId } from "../plugin-sdk/provider-model-id-normalize.js";
 import {
   normalizeLowercaseStringOrEmpty,
   normalizeOptionalLowercaseString,
 } from "../shared/string-coerce.js";
 import { liveProvidersShareOwningPlugin } from "./live-provider-owner.js";
-import { normalizeStaticProviderModelId } from "./model-ref-shared.js";
 import { normalizeProviderId } from "./provider-id.js";
 
 type ModelTarget = {
@@ -13,6 +13,15 @@ type ModelTarget = {
   modelId: string;
 };
 
+const GOOGLE_LIVE_TARGET_PROVIDERS = new Set(["google", "google-gemini-cli", "google-vertex"]);
+
+function normalizeLiveTargetModelId(provider: string, modelId: string): string {
+  const trimmed = modelId.trim();
+  return GOOGLE_LIVE_TARGET_PROVIDERS.has(provider)
+    ? normalizeGooglePreviewModelId(trimmed)
+    : trimmed;
+}
+
 function normalizeCsvSet(values: Set<string> | null): Set<string> | null {
   if (!values) {
     return null;
@@ -42,7 +51,7 @@ function parseModelTarget(raw: string): ModelTarget | null {
   }
   const provider = normalizeProviderId(trimmed.slice(0, slash));
   const modelId = normalizeLowercaseStringOrEmpty(
-    normalizeStaticProviderModelId(provider, trimmed.slice(slash + 1)),
+    normalizeLiveTargetModelId(provider, trimmed.slice(slash + 1)),
   );
   if (!provider || !modelId) {
     return null;
diff --git a/src/config/model-input.ts b/src/config/model-input.ts
@@ -1,5 +1,5 @@
-import { modelKey, normalizeStaticProviderModelId } from "../agents/model-ref-shared.js";
 import { normalizeProviderId } from "../agents/provider-id.js";
+import { normalizeGooglePreviewModelId } from "../plugin-sdk/provider-model-id-normalize.js";
 import { normalizeOptionalString, resolvePrimaryStringValue } from "../shared/string-coerce.js";
 import type { AgentModelConfig } from "./types.agents-shared.js";
 
@@ -11,6 +11,20 @@ type AgentModelListLike = {
 
 const GOOGLE_CONFIG_MODEL_PROVIDERS = new Set(["google", "google-gemini-cli", "google-vertex"]);
 
+function modelKeyForConfig(provider: string, model: string): string {
+  const providerId = provider.trim();
+  const modelId = model.trim();
+  if (!providerId) {
+    return modelId;
+  }
+  if (!modelId) {
+    return providerId;
+  }
+  return modelId.toLowerCase().startsWith(`${providerId.toLowerCase()}/`)
+    ? modelId
+    : `${providerId}/${modelId}`;
+}
+
 export function resolveAgentModelPrimaryValue(model?: AgentModelConfig): string | undefined {
   return resolvePrimaryStringValue(model);
 }
@@ -56,6 +70,6 @@ export function normalizeAgentModelRefForConfig(model: string): string {
     return trimmed;
   }
 
-  const normalizedModel = normalizeStaticProviderModelId(provider, trimmed.slice(slash + 1));
-  return modelKey(provider, normalizedModel);
+  const normalizedModel = normalizeGooglePreviewModelId(trimmed.slice(slash + 1));
+  return modelKeyForConfig(provider, normalizedModel);
 }
diff --git a/src/gateway/gateway-models.profiles.live.test.ts b/src/gateway/gateway-models.profiles.live.test.ts
@@ -38,7 +38,6 @@ import {
 import { createLiveTargetMatcher } from "../agents/live-target-matcher.js";
 import { isLiveProfileKeyModeEnabled, isLiveTestEnabled } from "../agents/live-test-helpers.js";
 import { getApiKeyForModel, resolveEnvApiKey } from "../agents/model-auth.js";
-import { normalizeStaticProviderModelId } from "../agents/model-ref-shared.js";
 import { normalizeProviderId } from "../agents/model-selection.js";
 import { shouldSuppressBuiltInModel } from "../agents/model-suppression.js";
 import { ensureOpenClawModelsJson } from "../agents/models-config.js";
@@ -1658,9 +1657,11 @@ function parseExplicitLiveModelRef(
   const slash = trimmed.indexOf("/");
   if (slash !== -1) {
     const provider = normalizeProviderId(trimmed.slice(0, slash));
-    const modelId = provider
-      ? normalizeStaticProviderModelId(provider, trimmed.slice(slash + 1)).trim()
-      : "";
+    const rawModelId = trimmed.slice(slash + 1).trim();
+    const modelId =
+      provider === "google" || provider === "google-gemini-cli" || provider === "google-vertex"
+        ? normalizeGoogleModelId(rawModelId)
+        : rawModelId;
     return provider && modelId ? { provider, modelId } : null;
   }
   if (!providerFilter || providerFilter.size !== 1) {
