refactor: untangle remaining plugin sdk boundaries

extensions/modelstudio/index.ts

@@ -1,6 +1,5 @@
 import { emptyPluginConfigSchema, type OpenClawPluginApi } from "openclaw/plugin-sdk/core";
-import { createProviderApiKeyAuthMethod } from "../../src/plugins/provider-api-key-auth.js";
-import { buildSingleProviderApiKeyCatalog } from "../../src/plugins/provider-catalog.js";
+import { createProviderApiKeyAuthMethod } from "openclaw/plugin-sdk/provider-auth";
 import {
   applyModelStudioConfig,
   applyModelStudioConfigCn,
@@ -79,13 +78,22 @@ const modelStudioPlugin = {
       ],
       catalog: {
         order: "simple",
-        run: (ctx) =>
-          buildSingleProviderApiKeyCatalog({
-            ctx,
-            providerId: PROVIDER_ID,
-            buildProvider: buildModelStudioProvider,
-            allowExplicitBaseUrl: true,
-          }),
+        run: async (ctx) => {
+          const apiKey = ctx.resolveProviderApiKey(PROVIDER_ID).apiKey;
+          if (!apiKey) {
+            return null;
+          }
+          const explicitProvider = ctx.config.models?.providers?.[PROVIDER_ID];
+          const explicitBaseUrl =
+            typeof explicitProvider?.baseUrl === "string" ? explicitProvider.baseUrl.trim() : "";
+          return {
+            provider: {
+              ...buildModelStudioProvider(),
+              ...(explicitBaseUrl ? { baseUrl: explicitBaseUrl } : {}),
+              apiKey,
+            },
+          };
+        },
       },
     });
   },

extensions/modelstudio/onboard.ts

@@ -1,13 +1,13 @@
-import {
-  applyAgentDefaultModelPrimary,
-  applyProviderConfigWithModelCatalog,
-} from "../../src/commands/onboard-auth.config-shared.js";
-import type { OpenClawConfig } from "../../src/config/config.js";
 import {
   MODELSTUDIO_CN_BASE_URL,
   MODELSTUDIO_DEFAULT_MODEL_REF,
   MODELSTUDIO_GLOBAL_BASE_URL,
-} from "./model-definitions.js";
+} from "openclaw/plugin-sdk/provider-models";
+import {
+  applyAgentDefaultModelPrimary,
+  applyProviderConfigWithModelCatalog,
+  type OpenClawConfig,
+} from "openclaw/plugin-sdk/provider-onboard";
 import { buildModelStudioProvider } from "./provider-catalog.js";
 
 export { MODELSTUDIO_CN_BASE_URL, MODELSTUDIO_DEFAULT_MODEL_REF, MODELSTUDIO_GLOBAL_BASE_URL };

extensions/modelstudio/provider-catalog.ts

@@ -1,4 +1,7 @@
-import type { ModelDefinitionConfig, ModelProviderConfig } from "../../src/config/types.models.js";
+import type {
+  ModelDefinitionConfig,
+  ModelProviderConfig,
+} from "openclaw/plugin-sdk/provider-models";
 
 export const MODELSTUDIO_BASE_URL = "https://coding-intl.dashscope.aliyuncs.com/v1";
 export const MODELSTUDIO_DEFAULT_MODEL_ID = "qwen3.5-plus";