feat: improve BYOK provider configuration and model management

apps/controller/openapi.json

@@ -8259,6 +8259,65 @@
         }
       }
     },
+    "/api/v1/model-providers/instances/test-model": {
+      "post": {
+        "tags": [
+          "Model Providers"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "apiKey": {
+                    "type": "string"
+                  },
+                  "baseUrl": {
+                    "type": "string"
+                  },
+                  "modelId": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "instanceKey": {
+                    "type": "string",
+                    "minLength": 1
+                  }
+                },
+                "required": [
+                  "modelId",
+                  "instanceKey"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Test a model against a provider instance",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "ok": {
+                      "type": "boolean"
+                    },
+                    "error": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "ok"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/model-providers/{providerId}/validate": {
       "post": {
         "tags": [
@@ -8322,6 +8381,70 @@
         }
       }
     },
+    "/api/v1/model-providers/{providerId}/test-model": {
+      "post": {
+        "tags": [
+          "Model Providers"
+        ],
+        "parameters": [
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": true,
+            "name": "providerId",
+            "in": "path"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "apiKey": {
+                    "type": "string"
+                  },
+                  "baseUrl": {
+                    "type": "string"
+                  },
+                  "modelId": {
+                    "type": "string",
+                    "minLength": 1
+                  }
+                },
+                "required": [
+                  "modelId"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Test a model against provider credentials",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "ok": {
+                      "type": "boolean"
+                    },
+                    "error": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "ok"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/model-providers/minimax/oauth/status": {
       "get": {
         "tags": [

apps/controller/src/lib/model-provider-runtime.ts

@@ -95,6 +95,13 @@ function resolveDefaultBaseUrls(
   return getDefaultProviderBaseUrls(providerId);
 }
 
+function normalizeGoogleNativeBaseUrl(baseUrl: string): string {
+  return (
+    normalizeProviderBaseUrl(baseUrl)?.replace(/\/(v1|v1beta|v1alpha)$/i, "") ??
+    baseUrl
+  );
+}
+
 function isProviderProxied(input: {
   providerId: string;
   baseUrl: string;
@@ -111,6 +118,20 @@ function isProviderProxied(input: {
       .filter((value): value is string => value !== null),
   );
 
+  if (input.providerId === "google") {
+    const normalizedGoogleBaseUrl = normalizeGoogleNativeBaseUrl(input.baseUrl);
+    const normalizedGoogleDefaultBaseUrls = new Set(
+      [...normalizedDefaultBaseUrls].map((value) =>
+        normalizeGoogleNativeBaseUrl(value),
+      ),
+    );
+
+    return (
+      normalizedGoogleDefaultBaseUrls.size > 0 &&
+      !normalizedGoogleDefaultBaseUrls.has(normalizedGoogleBaseUrl)
+    );
+  }
+
   return (
     normalizedDefaultBaseUrls.size > 0 &&
     !normalizedDefaultBaseUrls.has(normalizedBaseUrl)

apps/controller/src/lib/openclaw-config-compiler.ts

@@ -126,9 +126,10 @@ function compileModelsConfig(
     // with "Unknown model: link/...").
     const hasUsableApiKey =
       apiKey !== null && !(typeof apiKey === "string" && apiKey.length === 0);
-    providers[descriptor.runtimeKey] = {
+    const providerConfig: NonNullable<
+      OpenClawConfig["models"]
+    >["providers"][string] = {
       baseUrl: descriptor.provider.baseUrl,
-      ...(hasUsableApiKey ? { apiKey } : {}),
       api: descriptor.apiKind,
       ...(descriptor.authHeader ? { authHeader: true } : {}),
       ...(descriptor.defaultHeaders
@@ -141,6 +142,12 @@ function compileModelsConfig(
         ),
       ),
     };
+
+    if (hasUsableApiKey && apiKey !== undefined) {
+      providerConfig.apiKey = apiKey;
+    }
+
+    providers[descriptor.runtimeKey] = providerConfig;
   }
 
   const desktopCloud = isDesktopCloudConfig(config.desktop.cloud)

apps/controller/src/routes/model-routes.ts

@@ -13,6 +13,9 @@ import {
   quotaFallbackResponseSchema,
   restoreManagedBodySchema,
   supportedByokProviderIds,
+  testProviderInstanceModelBodySchema,
+  testProviderModelBodySchema,
+  testProviderModelResponseSchema,
   validateProviderInstanceBodySchema,
   verifyProviderBodySchema,
   verifyProviderResponseSchema,
@@ -178,6 +181,41 @@ export function registerModelRoutes(
     },
   );
 
+  app.openapi(
+    createRoute({
+      method: "post",
+      path: "/api/v1/model-providers/instances/test-model",
+      tags: ["Model Providers"],
+      request: {
+        body: {
+          content: {
+            "application/json": {
+              schema: testProviderInstanceModelBodySchema,
+            },
+          },
+        },
+      },
+      responses: {
+        200: {
+          content: {
+            "application/json": { schema: testProviderModelResponseSchema },
+          },
+          description: "Test a model against a provider instance",
+        },
+      },
+    }),
+    async (c) => {
+      const { instanceKey, ...input } = c.req.valid("json");
+      return c.json(
+        await container.modelProviderService.testProviderInstanceModel(
+          instanceKey,
+          input,
+        ),
+        200,
+      );
+    },
+  );
+
   app.openapi(
     createRoute({
       method: "post",
@@ -210,6 +248,40 @@ export function registerModelRoutes(
     },
   );
 
+  app.openapi(
+    createRoute({
+      method: "post",
+      path: "/api/v1/model-providers/{providerId}/test-model",
+      tags: ["Model Providers"],
+      request: {
+        params: verifyProviderIdParamSchema,
+        body: {
+          content: {
+            "application/json": { schema: testProviderModelBodySchema },
+          },
+        },
+      },
+      responses: {
+        200: {
+          content: {
+            "application/json": { schema: testProviderModelResponseSchema },
+          },
+          description: "Test a model against provider credentials",
+        },
+      },
+    }),
+    async (c) => {
+      const { providerId } = c.req.valid("param");
+      return c.json(
+        await container.modelProviderService.testProviderModel(
+          providerId,
+          c.req.valid("json"),
+        ),
+        200,
+      );
+    },
+  );
+
   app.openapi(
     createRoute({
       method: "get",