Simplify chat model provider support

Author: Wistomize

apps/tui/src/config/config-client.ts

@@ -146,14 +146,7 @@ const DatasourceSchemaResponseSchema = z.object({
 // ==================== Model Profile Schemas ====================
 
 const ModelProfileSchema = CommonFieldsSchema.extend({
-  provider: z.enum([
-    "openai-compatible",
-    "bailian",
-    "deepseek",
-    "openai",
-    "anthropic",
-    "google",
-  ]),
+  provider: z.string().default("openai-compatible"),
   baseUrl: z.string().optional(),
   modelName: z.string(),
   secretRef: z.string().optional(),

apps/tui/src/state/data-task-state.ts

@@ -572,16 +572,24 @@ function dbTypeOptions(): Array<{ value: string; label: string }> {
     : [...DB_TYPE_OPTIONS];
 }
 
-/** Aligns with dataFoundry `LLM_PROVIDER` env and Mastra router provider ids. */
+/** Chat models use one OpenAI-compatible provider path; vendor choice lives in baseUrl/modelName. */
 export const LLM_PROVIDER_OPTIONS = [
   { value: "openai-compatible", label: "OpenAI 兼容 (LLM_PROVIDER=openai-compatible)" },
-  { value: "bailian", label: "百炼 DashScope (bailian)" },
-  { value: "deepseek", label: "DeepSeek (deepseek)" },
-  { value: "openai", label: "OpenAI (openai)" },
-  { value: "anthropic", label: "Anthropic (anthropic)" },
-  { value: "google", label: "Google Gemini (google)" },
 ] as const;
 
+function normalizeLlmProvider(provider?: string): string {
+  const normalized = provider?.trim().toLowerCase().replaceAll("_", "-") ?? "";
+  if (
+    normalized === "bailian"
+    || normalized === "deepseek"
+    || normalized === "openai"
+    || normalized === "openai-compatible"
+  ) {
+    return "openai-compatible";
+  }
+  return normalized || "openai-compatible";
+}
+
 export function normalizeLlmSettings(
   settings?: Record<string, string>,
 ): {
@@ -591,7 +599,7 @@ export function normalizeLlmSettings(
   modelName: string;
 } {
   return {
-    provider: settings?.provider ?? "openai-compatible",
+    provider: normalizeLlmProvider(settings?.provider),
     baseUrl: settings?.baseUrl ?? settings?.base_url ?? "",
     apiKey: settings?.apiKey ?? settings?.api_key ?? "",
     modelName:
@@ -836,7 +844,7 @@ export const WORKSPACE_CONFIG_FIELDS: Record<
       inputType: "select",
       options: [...LLM_PROVIDER_OPTIONS],
       helpText:
-        "对应服务端 LLM_PROVIDER。openai-compatible / bailian 使用 OpenAI 兼容 /chat/completions；其他值走 Mastra model router（provider/model）。",
+        "对应服务端 LLM_PROVIDER。所有 chat 模型都通过 OpenAI 兼容 /chat/completions 调用。",
       required: true,
       readOnly: (item) => !!item.builtin,
       fullWidth: true,

apps/web/src/app/data-tasks/__tests__/config-api-adapter.test.ts

@@ -4,6 +4,7 @@ import {
   itemToCreateBody,
   itemToPatchBody,
   mcpServerDtoToItem,
+  modelProfileDtoToItem,
   workspaceConfigDtoToStore,
 } from "../../../lib/config-api/adapter";
 import {
@@ -162,6 +163,33 @@ describe("config api adapter", () => {
     expect(body.reasoningModel).toBe(true);
   });
 
+  it("normalizes legacy llm providers to openai-compatible", () => {
+    const item = modelProfileDtoToItem({
+      id: "deepseek",
+      name: "DeepSeek",
+      provider: "deepseek",
+      modelName: "deepseek-chat",
+    });
+    const createBody = itemToCreateBody("llm", {
+      id: "qwen",
+      name: "Qwen",
+      description: "",
+      enabled: true,
+      settings: { provider: "openai_compatible", modelName: "qwen-plus" },
+    });
+    const patchBody = itemToPatchBody("llm", {
+      id: "qwen",
+      name: "Qwen",
+      description: "",
+      enabled: true,
+      settings: { provider: "bailian" },
+    });
+
+    expect(item.settings?.provider).toBe("openai-compatible");
+    expect(createBody.provider).toBe("openai-compatible");
+    expect(patchBody.provider).toBe("openai-compatible");
+  });
+
   it("maps workspace config dto to store buckets", () => {
     const store = workspaceConfigDtoToStore({
       datasources: [],

apps/web/src/app/data-tasks/__tests__/dashscope-prompt-compat.test.ts

@@ -8,7 +8,7 @@ import {
 describe("dashscope prompt compat", () => {
   it("enables compat for openai-compatible providers", () => {
     expect(shouldApplyDashScopePromptCompat("openai-compatible")).toBe(true);
-    expect(shouldApplyDashScopePromptCompat("mastra-router")).toBe(false);
+    expect(shouldApplyDashScopePromptCompat("unsupported-provider")).toBe(false);
   });
 
   it("adds placeholder text to assistant messages that only contain tool calls", () => {

apps/web/src/app/data-tasks/data-task-state.ts

@@ -1058,16 +1058,24 @@ export const MCP_AUTH_TYPE_OPTIONS = [
   { value: "custom-header", label: "Custom header (pending backend)" },
 ] as const;
 
-/** Aligns with dataFoundry `LLM_PROVIDER` env and Mastra router provider ids. */
+/** Chat models use one OpenAI-compatible provider path; vendor choice lives in baseUrl/modelName. */
 export const LLM_PROVIDER_OPTIONS = [
   { value: "openai-compatible", label: "OpenAI compatible (LLM_PROVIDER=openai-compatible)" },
-  { value: "bailian", label: "Bailian DashScope (bailian)" },
-  { value: "deepseek", label: "DeepSeek (deepseek)" },
-  { value: "openai", label: "OpenAI (openai)" },
-  { value: "anthropic", label: "Anthropic (anthropic)" },
-  { value: "google", label: "Google Gemini (google)" },
 ] as const;
 
+function normalizeLlmProvider(provider?: string): string {
+  const normalized = provider?.trim().toLowerCase().replaceAll("_", "-") ?? "";
+  if (
+    normalized === "bailian"
+    || normalized === "deepseek"
+    || normalized === "openai"
+    || normalized === "openai-compatible"
+  ) {
+    return "openai-compatible";
+  }
+  return normalized || "openai-compatible";
+}
+
 export function normalizeLlmSettings(
   settings?: Record<string, string>,
 ): {
@@ -1077,7 +1085,7 @@ export function normalizeLlmSettings(
   modelName: string;
 } {
   return {
-    provider: settings?.provider ?? "openai-compatible",
+    provider: normalizeLlmProvider(settings?.provider),
     baseUrl: settings?.baseUrl ?? settings?.base_url ?? "",
     apiKey: settings?.apiKey ?? settings?.api_key ?? "",
     modelName:
@@ -1668,7 +1676,7 @@ export const WORKSPACE_CONFIG_FIELDS: Record<
       inputType: "select",
       options: [...LLM_PROVIDER_OPTIONS],
       helpText:
-        "openai-compatible / bailian use the OpenAI-compatible path. anthropic/google await integration validation.",
+        "All chat models use the OpenAI-compatible /chat/completions path.",
       required: true,
       fullWidth: true,
     },

apps/web/src/lib/config-api/adapter.ts

@@ -27,6 +27,19 @@ function pickString(record: Record<string, unknown>, ...keys: string[]): string
   return "";
 }
 
+function normalizeLlmProvider(provider?: string): string {
+  const normalized = provider?.trim().toLowerCase().replaceAll("_", "-") ?? "";
+  if (
+    normalized === "bailian"
+    || normalized === "deepseek"
+    || normalized === "openai"
+    || normalized === "openai-compatible"
+  ) {
+    return "openai-compatible";
+  }
+  return normalized || "openai-compatible";
+}
+
 function pickBooleanString(record: Record<string, unknown>, key: string): string {
   const value = record[key];
   if (typeof value === "boolean") return value ? "true" : "false";
@@ -194,7 +207,7 @@ export function modelProfileDtoToItem(dto: ModelProfileDto): WorkspaceConfigItem
     revision: dto.revision,
     status: mapConnectionStatus(dto.connectionStatus),
     settings: {
-      provider: dto.provider ?? "openai-compatible",
+      provider: normalizeLlmProvider(dto.provider),
       baseUrl: dto.baseUrl ?? "",
       modelName: dto.modelName ?? "",
       apiKey: "",
@@ -468,7 +481,7 @@ export function itemToCreateBody(
       ]);
       return {
         ...base,
-        provider: settings.provider ?? "openai-compatible",
+        provider: normalizeLlmProvider(settings.provider),
         modelName: settings.modelName?.trim() ?? "",
         baseUrl: settings.baseUrl?.trim() ?? "",
         ...(parseNumber(settings.timeoutMs) !== undefined
@@ -646,7 +659,7 @@ export function itemToPatchBody(
       appendMcpStdioFields(body, settings);
       break;
     case "llm":
-      if (settings.provider?.trim()) body.provider = settings.provider.trim();
+      body.provider = normalizeLlmProvider(settings.provider);
       if (settings.modelName?.trim()) body.modelName = settings.modelName.trim();
       if (settings.baseUrl?.trim()) body.baseUrl = settings.baseUrl.trim();
       if (settings.fallbackProfileId?.trim()) {

packages/contracts/src/index.ts

@@ -307,7 +307,12 @@ export type EnvConfig = {
 export const ENV_VARIABLE_SPECS: EnvVariableSpec[] = [
   { name: "API_HOST", required: false, default_value: "127.0.0.1", description: "Agent runtime bind host." },
   { name: "API_PORT", required: false, default_value: "8787", description: "Agent runtime bind port." },
-  { name: "LLM_PROVIDER", required: false, default_value: "bailian", description: "Chat model provider." },
+  {
+    name: "LLM_PROVIDER",
+    required: false,
+    default_value: "openai-compatible",
+    description: "Chat model provider. Only OpenAI-compatible chat completions are supported."
+  },
   { name: "LLM_MODEL", required: false, default_value: "qwen-plus", description: "Chat model name." },
   { name: "LLM_BASE_URL", required: true, description: "OpenAI-compatible chat completions base URL." },
   {
@@ -348,7 +353,7 @@ export const createEnvConfig = (env: Record<string, string | undefined>): EnvCon
     port: Number.parseInt(env.API_PORT ?? "8787", 10)
   },
   llm: {
-    provider: env.LLM_PROVIDER ?? "bailian",
+    provider: env.LLM_PROVIDER ?? "openai-compatible",
     model: env.LLM_MODEL ?? "qwen-plus",
     base_url: env.LLM_BASE_URL ?? "https://dashscope.aliyuncs.com/compatible-mode/v1",
     ...(env.LLM_API_KEY ? { api_key: env.LLM_API_KEY } : {})

packages/providers/src/index.ts

@@ -18,11 +18,6 @@ export type EmbeddingProviderConfig = {
 };
 
 export type ModelProvider =
-  | {
-      kind: "mastra-router";
-      model_name: string;
-      model: unknown;
-    }
   | {
       kind: "openai-compatible";
       model_name: string;
@@ -45,7 +40,10 @@ export const createModelProvider = (env: Record<string, string | undefined>): Mo
 
 /** Create one model provider from a persisted model-profile configuration. */
 export const createModelProviderFromConfig = (config: ChatProviderConfig): ModelProvider => {
-  const providerName = config.provider.toLowerCase();
+  const providerName = normalizeChatProviderName(config.provider);
+  if (!providerName) {
+    throw new Error(`PROVIDER_UNSUPPORTED:${config.provider}`);
+  }
 
   if (!config.api_key) {
     return {
@@ -54,20 +52,6 @@ export const createModelProviderFromConfig = (config: ChatProviderConfig): Model
     };
   }
 
-  if (!isOpenAiCompatibleProvider(providerName)) {
-    const modelId = normalizeMastraRouterModelId(providerName, config.model);
-
-    return {
-      kind: "mastra-router",
-      model_name: modelId,
-      model: {
-        id: modelId,
-        url: config.base_url,
-        apiKey: config.api_key
-      }
-    };
-  }
-
   const provider = createOpenAI({
     apiKey: config.api_key,
     baseURL: config.base_url
@@ -80,8 +64,16 @@ export const createModelProviderFromConfig = (config: ChatProviderConfig): Model
   };
 };
 
-const normalizeMastraRouterModelId = (provider: string, model: string): string =>
-  model.includes("/") ? model : `${provider}/${model}`;
+const normalizeChatProviderName = (provider: string): "openai-compatible" | undefined => {
+  const normalized = provider.trim().toLowerCase().replaceAll("_", "-");
+  if (
+    normalized === "openai-compatible"
+    || normalized === "bailian"
+    || normalized === "deepseek"
+    || normalized === "openai"
+  ) {
+    return "openai-compatible";
+  }
 
-const isOpenAiCompatibleProvider = (provider: string): boolean =>
-  provider === "openai-compatible" || provider === "openai_compatible" || provider === "bailian";
+  return undefined;
+};

scripts/smoke-context-compilation.mjs

@@ -1071,7 +1071,7 @@ const configuredAgent = await createDataFoundry({
   dataGateway: {},
   emitter: { emit: () => undefined },
   modelProvider: {
-    kind: "mastra-router",
+    kind: "openai-compatible",
     model_name: "context-smoke/model",
     model: { id: "context-smoke/model", url: "http://127.0.0.1:1", apiKey: "unused" }
   },

scripts/smoke-long-term-memory.mjs

@@ -133,7 +133,7 @@ try {
     longTermMemory: { records: memories },
     messages: [{ id: "agent-user", role: "user", content: "继续分析 GMV 和退款率" }],
     modelProvider: {
-      kind: "mastra-router",
+      kind: "openai-compatible",
       model_name: "long-term-memory-smoke/model",
       model: { id: "long-term-memory-smoke/model", url: "http://127.0.0.1:1", apiKey: "unused" }
     },