feat(providers): recluster vendors by host:port when website_url empty

messages/en/settings/index.ts

@@ -18,6 +18,7 @@ import providersFilter from "./providers/filter.json";
 import providersGuide from "./providers/guide.json";
 import providersInlineEdit from "./providers/inlineEdit.json";
 import providersList from "./providers/list.json";
+import providersRecluster from "./providers/recluster.json";
 import providersSchedulingDialog from "./providers/schedulingDialog.json";
 import providersSearch from "./providers/search.json";
 import providersSection from "./providers/section.json";
@@ -81,6 +82,7 @@ const providers = {
   guide: providersGuide,
   inlineEdit: providersInlineEdit,
   list: providersList,
+  recluster: providersRecluster,
   schedulingDialog: providersSchedulingDialog,
   search: providersSearch,
   section: providersSection,

messages/en/settings/providers/recluster.json

@@ -0,0 +1,16 @@
+{
+  "button": "Recluster",
+  "dialogTitle": "Recluster Providers",
+  "dialogDescription": "Reorganize providers based on updated clustering rules. For providers without a website URL, host:port will be used as the clustering key.",
+  "providersMoved": "Providers Moved",
+  "vendorsCreated": "Vendors Created",
+  "vendorsToDelete": "Vendors to Delete",
+  "skipped": "Skipped (Invalid URL)",
+  "providerHeader": "Provider",
+  "vendorChangeHeader": "Vendor Change",
+  "noChanges": "No changes needed (already clustered correctly)",
+  "moreChanges": "{count} more changes...",
+  "confirm": "Apply Changes",
+  "success": "Reclustered {count} providers",
+  "error": "Recluster failed"
+}

messages/ja/settings/index.ts

@@ -18,6 +18,7 @@ import providersFilter from "./providers/filter.json";
 import providersGuide from "./providers/guide.json";
 import providersInlineEdit from "./providers/inlineEdit.json";
 import providersList from "./providers/list.json";
+import providersRecluster from "./providers/recluster.json";
 import providersSchedulingDialog from "./providers/schedulingDialog.json";
 import providersSearch from "./providers/search.json";
 import providersSection from "./providers/section.json";
@@ -81,6 +82,7 @@ const providers = {
   guide: providersGuide,
   inlineEdit: providersInlineEdit,
   list: providersList,
+  recluster: providersRecluster,
   schedulingDialog: providersSchedulingDialog,
   search: providersSearch,
   section: providersSection,

messages/ja/settings/providers/recluster.json

@@ -0,0 +1,16 @@
+{
+  "button": "再クラスタ",
+  "dialogTitle": "プロバイダーの再クラスタリング",
+  "dialogDescription": "更新されたクラスタリングルールに基づいてプロバイダーを再編成します。ウェブサイトURLが設定されていないプロバイダーには、host:port がクラスタリングキーとして使用されます。",
+  "providersMoved": "移動したプロバイダー",
+  "vendorsCreated": "作成されるベンダー",
+  "vendorsToDelete": "削除されるベンダー",
+  "skipped": "スキップ (無効なURL)",
+  "providerHeader": "プロバイダー",
+  "vendorChangeHeader": "ベンダー変更",
+  "noChanges": "変更不要 (既に正しくクラスタリング済み)",
+  "moreChanges": "他 {count} 件の変更...",
+  "confirm": "変更を適用",
+  "success": "{count} 件のプロバイダーを再クラスタリングしました",
+  "error": "再クラスタリングに失敗しました"
+}

messages/ru/settings/index.ts

@@ -18,6 +18,7 @@ import providersFilter from "./providers/filter.json";
 import providersGuide from "./providers/guide.json";
 import providersInlineEdit from "./providers/inlineEdit.json";
 import providersList from "./providers/list.json";
+import providersRecluster from "./providers/recluster.json";
 import providersSchedulingDialog from "./providers/schedulingDialog.json";
 import providersSearch from "./providers/search.json";
 import providersSection from "./providers/section.json";
@@ -81,6 +82,7 @@ const providers = {
   guide: providersGuide,
   inlineEdit: providersInlineEdit,
   list: providersList,
+  recluster: providersRecluster,
   schedulingDialog: providersSchedulingDialog,
   search: providersSearch,
   section: providersSection,

messages/ru/settings/providers/recluster.json

@@ -0,0 +1,16 @@
+{
+  "button": "Перегруппировать",
+  "dialogTitle": "Перегруппировка поставщиков",
+  "dialogDescription": "Реорганизация поставщиков по обновленным правилам группировки. Для поставщиков без URL сайта в качестве ключа группировки используется host:port.",
+  "providersMoved": "Перемещено поставщиков",
+  "vendorsCreated": "Создано групп",
+  "vendorsToDelete": "Групп к удалению",
+  "skipped": "Пропущено (неверный URL)",
+  "providerHeader": "Поставщик",
+  "vendorChangeHeader": "Изменение группы",
+  "noChanges": "Изменения не требуются (уже правильно сгруппировано)",
+  "moreChanges": "Еще {count} изменений...",
+  "confirm": "Применить изменения",
+  "success": "Перегруппировано {count} поставщиков",
+  "error": "Ошибка перегруппировки"
+}

messages/zh-CN/settings/index.ts

@@ -18,6 +18,7 @@ import providersFilter from "./providers/filter.json";
 import providersGuide from "./providers/guide.json";
 import providersInlineEdit from "./providers/inlineEdit.json";
 import providersList from "./providers/list.json";
+import providersRecluster from "./providers/recluster.json";
 import providersSchedulingDialog from "./providers/schedulingDialog.json";
 import providersSearch from "./providers/search.json";
 import providersSection from "./providers/section.json";
@@ -81,6 +82,7 @@ const providers = {
   guide: providersGuide,
   inlineEdit: providersInlineEdit,
   list: providersList,
+  recluster: providersRecluster,
   schedulingDialog: providersSchedulingDialog,
   search: providersSearch,
   section: providersSection,

messages/zh-CN/settings/providers/recluster.json

@@ -0,0 +1,16 @@
+{
+  "button": "重新分组",
+  "dialogTitle": "重新分组供应商",
+  "dialogDescription": "根据更新的分组规则重新组织供应商。对于未设置网站URL的供应商，将使用 host:port 作为分组键。",
+  "providersMoved": "供应商移动",
+  "vendorsCreated": "新建分组",
+  "vendorsToDelete": "待删除分组",
+  "skipped": "跳过(无效URL)",
+  "providerHeader": "供应商",
+  "vendorChangeHeader": "分组变更",
+  "noChanges": "无需更改（已正确分组）",
+  "moreChanges": "还有 {count} 条变更...",
+  "confirm": "应用变更",
+  "success": "已重新分组 {count} 个供应商",
+  "error": "重新分组失败"
+}

messages/zh-TW/settings/index.ts

@@ -18,6 +18,7 @@ import providersFilter from "./providers/filter.json";
 import providersGuide from "./providers/guide.json";
 import providersInlineEdit from "./providers/inlineEdit.json";
 import providersList from "./providers/list.json";
+import providersRecluster from "./providers/recluster.json";
 import providersSchedulingDialog from "./providers/schedulingDialog.json";
 import providersSearch from "./providers/search.json";
 import providersSection from "./providers/section.json";
@@ -81,6 +82,7 @@ const providers = {
   guide: providersGuide,
   inlineEdit: providersInlineEdit,
   list: providersList,
+  recluster: providersRecluster,
   schedulingDialog: providersSchedulingDialog,
   search: providersSearch,
   section: providersSection,

messages/zh-TW/settings/providers/recluster.json

@@ -0,0 +1,16 @@
+{
+  "button": "重新分組",
+  "dialogTitle": "重新分組供應商",
+  "dialogDescription": "根據更新的分組規則重新組織供應商。對於未設定網站URL的供應商，將使用 host:port 作為分組鍵。",
+  "providersMoved": "供應商移動",
+  "vendorsCreated": "新建分組",
+  "vendorsToDelete": "待刪除分組",
+  "skipped": "跳過(無效URL)",
+  "providerHeader": "供應商",
+  "vendorChangeHeader": "分組變更",
+  "noChanges": "無需更改（已正確分組）",
+  "moreChanges": "還有 {count} 條變更...",
+  "confirm": "應用變更",
+  "success": "已重新分組 {count} 個供應商",
+  "error": "重新分組失敗"
+}

src/actions/providers.ts

@@ -1,8 +1,11 @@
 "use server";
 
+import { eq } from "drizzle-orm";
 import { GeminiAuth } from "@/app/v1/_lib/gemini/auth";
 import { isClientAbortError } from "@/app/v1/_lib/proxy/errors";
 import { buildProxyUrl } from "@/app/v1/_lib/url";
+import { db } from "@/drizzle/db";
+import { providers as providersTable } from "@/drizzle/schema";
 import { getSession } from "@/lib/auth";
 import { publishProviderCacheInvalidation } from "@/lib/cache/provider-cache";
 import {
@@ -44,7 +47,13 @@ import {
   updateProvider,
   updateProviderPrioritiesBatch,
 } from "@/repository/provider";
-import { tryDeleteProviderVendorIfEmpty } from "@/repository/provider-endpoints";
+import {
+  backfillProviderEndpointsFromProviders,
+  computeVendorKey,
+  findProviderVendorById,
+  getOrCreateProviderVendorIdFromUrls,
+  tryDeleteProviderVendorIfEmpty,
+} from "@/repository/provider-endpoints";
 import type { CacheTtlPreference } from "@/types/cache";
 import type {
   CodexParallelToolCallsPreference,
@@ -3548,3 +3557,187 @@ export async function getModelSuggestionsByProviderGroup(
     return { ok: false, error: "获取模型建议列表失败" };
   }
 }
+
+// ============================================================================
+// Recluster Provider Vendors
+// ============================================================================
+
+type ReclusterChange = {
+  providerId: number;
+  providerName: string;
+  oldVendorId: number;
+  oldVendorDomain: string;
+  newVendorDomain: string;
+};
+
+type ReclusterResult = {
+  preview: {
+    providersMoved: number;
+    vendorsCreated: number;
+    vendorsToDelete: number;
+    skippedInvalidUrl: number;
+  };
+  changes: ReclusterChange[];
+  applied: boolean;
+};
+
+/**
+ * Recluster provider vendors based on updated clustering rules.
+ * When websiteUrl is empty, uses host:port as vendor key instead of just hostname.
+ *
+ * @param confirm - false=preview mode (calculate changes only), true=apply mode (execute changes)
+ */
+export async function reclusterProviderVendors(args: {
+  confirm: boolean;
+}): Promise<ActionResult<ReclusterResult>> {
+  try {
+    const session = await getSession();
+    if (!session || session.user.role !== "admin") {
+      return { ok: false, error: "NO_PERMISSION" };
+    }
+
+    const allProviders = await findAllProvidersFresh();
+
+    if (allProviders.length === 0) {
+      return {
+        ok: true,
+        data: {
+          preview: {
+            providersMoved: 0,
+            vendorsCreated: 0,
+            vendorsToDelete: 0,
+            skippedInvalidUrl: 0,
+          },
+          changes: [],
+          applied: args.confirm,
+        },
+      };
+    }
+
+    const changes: ReclusterChange[] = [];
+    const newVendorKeys = new Set<string>();
+    const oldVendorIds = new Set<number>();
+    let skippedInvalidUrl = 0;
+
+    // Batch load all vendor data upfront to avoid N+1 queries
+    const uniqueVendorIds = [
+      ...new Set(
+        allProviders
+          .map((p) => p.providerVendorId)
+          .filter((id): id is number => id !== null && id !== undefined && id > 0)
+      ),
+    ];
+    const vendors = await Promise.all(uniqueVendorIds.map((id) => findProviderVendorById(id)));
+    const vendorMap = new Map(
+      vendors.filter((v): v is NonNullable<typeof v> => v !== null).map((v) => [v.id, v])
+    );
+
+    // Build provider map for quick lookup in transaction
+    const providerMap = new Map(allProviders.map((p) => [p.id, p]));
+
+    // Calculate new vendor key for each provider
+    for (const provider of allProviders) {
+      const newVendorKey = computeVendorKey({
+        providerUrl: provider.url,
+        websiteUrl: provider.websiteUrl,
+      });
+
+      if (!newVendorKey) {
+        skippedInvalidUrl++;
+        continue;
+      }
+
+      // Get current vendor domain from pre-loaded map
+      const currentVendor = provider.providerVendorId ? vendorMap.get(provider.providerVendorId) : null;
+      const currentDomain = currentVendor?.websiteDomain ?? "";
+
+      // If key changed, record the change
+      if (currentDomain !== newVendorKey) {
+        newVendorKeys.add(newVendorKey);
+        if (provider.providerVendorId) {
+          oldVendorIds.add(provider.providerVendorId);
+        }
+        changes.push({
+          providerId: provider.id,
+          providerName: provider.name,
+          oldVendorId: provider.providerVendorId ?? 0,
+          oldVendorDomain: currentDomain,
+          newVendorDomain: newVendorKey,
+        });
+      }
+    }
+
+    const preview = {
+      providersMoved: changes.length,
+      vendorsCreated: newVendorKeys.size,
+      vendorsToDelete: oldVendorIds.size,
+      skippedInvalidUrl,
+    };
+
+    // Preview mode: return without modifying DB
+    if (!args.confirm) {
+      return {
+        ok: true,
+        data: {
+          preview,
+          changes,
+          applied: false,
+        },
+      };
+    }
+
+    // Apply mode: execute changes in transaction
+    if (changes.length > 0) {
+      await db.transaction(async (tx) => {
+        for (const change of changes) {
+          // Use pre-built map for O(1) lookup instead of O(N) find()
+          const provider = providerMap.get(change.providerId);
+          if (!provider) continue;
+
+          // Get or create new vendor
+          const newVendorId = await getOrCreateProviderVendorIdFromUrls({
+            providerUrl: provider.url,
+            websiteUrl: provider.websiteUrl ?? null,
+          });
+
+          // Update provider's vendorId
+          await tx
+            .update(providersTable)
+            .set({ providerVendorId: newVendorId, updatedAt: new Date() })
+            .where(eq(providersTable.id, change.providerId));
+        }
+      });
+
+      // Backfill provider_endpoints
+      await backfillProviderEndpointsFromProviders();
+
+      // Cleanup empty vendors
+      for (const oldVendorId of oldVendorIds) {
+        await tryDeleteProviderVendorIfEmpty(oldVendorId);
+      }
+
+      // Publish cache invalidation
+      try {
+        await publishProviderCacheInvalidation();
+      } catch (error) {
+        logger.warn("reclusterProviderVendors:cache_invalidation_failed", {
+          changedCount: changes.length,
+          error: error instanceof Error ? error.message : String(error),
+        });
+      }
+    }
+
+    return {
+      ok: true,
+      data: {
+        preview,
+        changes,
+        applied: true,
+      },
+    };
+  } catch (error) {
+    logger.error("reclusterProviderVendors:error", error);
+    const message = error instanceof Error ? error.message : "Recluster failed";
+    return { ok: false, error: message };
+  }
+}

src/app/[locale]/dashboard/providers/page.tsx

@@ -2,6 +2,7 @@ import { BarChart3 } from "lucide-react";
 import { getTranslations } from "next-intl/server";
 import { AutoSortPriorityDialog } from "@/app/[locale]/settings/providers/_components/auto-sort-priority-dialog";
 import { ProviderManagerLoader } from "@/app/[locale]/settings/providers/_components/provider-manager-loader";
+import { ReclusterVendorsDialog } from "@/app/[locale]/settings/providers/_components/recluster-vendors-dialog";
 import { SchedulingRulesDialog } from "@/app/[locale]/settings/providers/_components/scheduling-rules-dialog";
 import { Section } from "@/components/section";
 import { Button } from "@/components/ui/button";
@@ -48,6 +49,7 @@ export default async function DashboardProvidersPage({
               </Link>
             </Button>
             <AutoSortPriorityDialog />
+            <ReclusterVendorsDialog />
             <SchedulingRulesDialog />
           </>
         }