Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

feat(ai): sequence default provider names

tianma-ifb235567c3740
diff --git a/apps/web/src/components/settings/AiModelCard.tsx b/apps/web/src/components/settings/AiModelCard.tsx
index 56955bcc..5233889b 100644
--- a/apps/web/src/components/settings/AiModelCard.tsx
+++ b/apps/web/src/components/settings/AiModelCard.tsx
@@ -4,7 +4,12 @@ import type { AiProvider } from "@edgeever/shared";
import { ChevronDown, Loader2, Plus, Server, Sparkles, TriangleAlert } from "lucide-react";
import { useTranslation } from "react-i18next";
import { AiProviderCard } from "@/components/settings/AiProviderCard";
-import { aiErrorMessage, providerDefaults } from "@/components/settings/ai-provider-options";
+import {
+ aiErrorMessage,
+ formatProviderOrdinal,
+ isLegacyProviderDisplayName,
+ providerDefaults,
+} from "@/components/settings/ai-provider-options";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
@@ -22,21 +27,21 @@ import { api } from "@/lib/api";
import { cn } from "@/lib/utils";
export const AiModelCard = () => {
- const { t } = useTranslation();
+ const { i18n, t } = useTranslation();
const queryClient = useQueryClient();
const settingsQuery = useQuery({ queryKey: ["ai-settings"], queryFn: api.getAiSettings });
const [expanded, setExpanded] = useState(true);
const [showAdd, setShowAdd] = useState(false);
const [provider, setProvider] = useState<AiProvider>("openai-compatible");
- const [displayName, setDisplayName] = useState(providerDefaults["openai-compatible"].displayName);
+ const [displayName, setDisplayName] = useState("");
const [baseUrl, setBaseUrl] = useState(providerDefaults["openai-compatible"].baseUrl);
const [apiKey, setApiKey] = useState("");
const [initialModelId, setInitialModelId] = useState(providerDefaults["openai-compatible"].modelId);
const refresh = () => queryClient.invalidateQueries({ queryKey: ["ai-settings"] });
- const resetAddForm = () => {
+ const resetAddForm = (nextDisplayName = "") => {
setProvider("openai-compatible");
- setDisplayName(providerDefaults["openai-compatible"].displayName);
+ setDisplayName(nextDisplayName);
setBaseUrl(providerDefaults["openai-compatible"].baseUrl);
setInitialModelId(providerDefaults["openai-compatible"].modelId);
setApiKey("");
@@ -66,7 +71,6 @@ export const AiModelCard = () => {
const previous = providerDefaults[provider];
const defaults = providerDefaults[next];
setProvider(next);
- if (!displayName || displayName === previous.displayName) setDisplayName(defaults.displayName);
if (!baseUrl || baseUrl === previous.baseUrl) setBaseUrl(defaults.baseUrl);
if (!initialModelId || initialModelId === previous.modelId) setInitialModelId(defaults.modelId);
};
@@ -77,11 +81,21 @@ export const AiModelCard = () => {
const settings = settingsQuery.data;
const readOnly = settings?.readOnly ?? true;
- const allModels = settings?.providers.flatMap((item) =>
- item.models.map((model) => ({ ...model, providerName: item.displayName, providerEnabled: item.isEnabled }))) ?? [];
+ const locale = i18n.resolvedLanguage ?? i18n.language;
+ const getDefaultProviderName = (index: number) => t("aiModel.defaultProviderName", {
+ ordinal: formatProviderOrdinal(index + 1, locale),
+ });
+ const getProviderName = (item: NonNullable<typeof settings>["providers"][number], index: number) =>
+ isLegacyProviderDisplayName(item.displayName, item.provider) ? getDefaultProviderName(index) : item.displayName;
+ const allModels = settings?.providers.flatMap((item, index) =>
+ item.models.map((model) => ({ ...model, providerName: getProviderName(item, index), providerEnabled: item.isEnabled }))) ?? [];
const defaultModelAvailable = !settings?.defaultModelId
|| allModels.some((model) => model.id === settings.defaultModelId && model.providerEnabled);
const error = defaultMutation.error ?? settingsQuery.error;
+ const openAddDialog = () => {
+ resetAddForm(getDefaultProviderName(settings?.providers.length ?? 0));
+ setShowAdd(true);
+ };
return (
<Collapsible open={expanded} onOpenChange={setExpanded} asChild>
@@ -149,16 +163,17 @@ export const AiModelCard = () => {
{t("aiModel.serviceCount", { count: settings?.providers.length ?? 0 })}
</p>
</div>
- <Button type="button" variant="outline" size="sm" disabled={readOnly} onClick={() => setShowAdd(true)}>
+ <Button type="button" variant="outline" size="sm" disabled={readOnly} onClick={openAddDialog}>
<Plus className="h-4 w-4" />{t("aiModel.addProvider")}
</Button>
</div>
<div className="grid gap-3">
- {settings?.providers.map((item) => (
+ {settings?.providers.map((item, index) => (
<AiProviderCard
key={item.id}
provider={item}
+ defaultDisplayName={getDefaultProviderName(index)}
defaultModelId={settings.defaultModelId}
readOnly={readOnly}
onChanged={refresh}
diff --git a/apps/web/src/components/settings/AiProviderCard.tsx b/apps/web/src/components/settings/AiProviderCard.tsx
index 186f2fe0..eac8262d 100644
--- a/apps/web/src/components/settings/AiProviderCard.tsx
+++ b/apps/web/src/components/settings/AiProviderCard.tsx
@@ -3,7 +3,7 @@ import { useMutation } from "@tanstack/react-query";
import type { AiDiscoveredModel, AiModelConfig, AiProvider, AiProviderConfig } from "@edgeever/shared";
import { CheckCircle2, Loader2, MoreHorizontal, Pencil, Plus, Search, Trash2 } from "lucide-react";
import { useTranslation } from "react-i18next";
-import { aiErrorMessage, providerDefaults } from "@/components/settings/ai-provider-options";
+import { aiErrorMessage, isLegacyProviderDisplayName, providerDefaults } from "@/components/settings/ai-provider-options";
import { Button } from "@/components/ui/button";
import {
Dialog,
@@ -25,16 +25,20 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
import { Switch } from "@/components/ui/switch";
import { api } from "@/lib/api";
-export const AiProviderCard = ({ provider: saved, defaultModelId, readOnly, onChanged }: {
+export const AiProviderCard = ({ provider: saved, defaultDisplayName, defaultModelId, readOnly, onChanged }: {
provider: AiProviderConfig;
+ defaultDisplayName: string;
defaultModelId: string | null;
readOnly: boolean;
onChanged: () => Promise<unknown>;
}) => {
const { t } = useTranslation();
const datalistId = `ai-models-${useId().replaceAll(":", "")}`;
+ const effectiveDisplayName = isLegacyProviderDisplayName(saved.displayName, saved.provider)
+ ? defaultDisplayName
+ : saved.displayName;
const [provider, setProvider] = useState<AiProvider>(saved.provider);
- const [displayName, setDisplayName] = useState(saved.displayName);
+ const [displayName, setDisplayName] = useState(effectiveDisplayName);
const [baseUrl, setBaseUrl] = useState(saved.baseUrl);
const [apiKey, setApiKey] = useState("");
const [modelId, setModelId] = useState("");
@@ -44,9 +48,9 @@ export const AiProviderCard = ({ provider: saved, defaultModelId, readOnly, onCh
useEffect(() => {
setProvider(saved.provider);
- setDisplayName(saved.displayName);
+ setDisplayName(effectiveDisplayName);
setBaseUrl(saved.baseUrl);
- }, [saved.baseUrl, saved.displayName, saved.provider]);
+ }, [effectiveDisplayName, saved.baseUrl, saved.provider]);
const saveMutation = useMutation({
mutationFn: () => api.updateAiProvider(saved.id, {
@@ -104,24 +108,22 @@ export const AiProviderCard = ({ provider: saved, defaultModelId, readOnly, onCh
const modelBusy = discoverMutation.isPending || addModelMutation.isPending || deleteModelMutation.isPending;
const cardBusy = toggleMutation.isPending || deleteMutation.isPending || modelBusy;
const connectionDirty = provider !== saved.provider
- || displayName.trim() !== saved.displayName
+ || displayName.trim() !== effectiveDisplayName
|| baseUrl.trim() !== saved.baseUrl
|| Boolean(apiKey);
const connectionError = saveMutation.error ?? testMutation.error;
const cardError = toggleMutation.error ?? deleteMutation.error ?? discoverMutation.error ?? addModelMutation.error ?? deleteModelMutation.error;
const providerLabel = t(`aiModel.providers.${saved.provider}`);
- const showProviderLabel = saved.displayName.trim().toLocaleLowerCase() !== providerLabel.trim().toLocaleLowerCase();
const handleProviderChange = (next: AiProvider) => {
const previous = providerDefaults[provider];
const defaults = providerDefaults[next];
setProvider(next);
- if (!displayName || displayName === previous.displayName) setDisplayName(defaults.displayName);
if (!baseUrl || baseUrl === previous.baseUrl) setBaseUrl(defaults.baseUrl);
};
const resetConnectionForm = () => {
setProvider(saved.provider);
- setDisplayName(saved.displayName);
+ setDisplayName(effectiveDisplayName);
setBaseUrl(saved.baseUrl);
setApiKey("");
saveMutation.reset();
@@ -148,7 +150,7 @@ export const AiProviderCard = ({ provider: saved, defaultModelId, readOnly, onCh
saveMutation.mutate();
};
const deleteProvider = () => {
- if (window.confirm(t("aiModel.deleteProviderConfirm", { name: saved.displayName }))) deleteMutation.mutate();
+ if (window.confirm(t("aiModel.deleteProviderConfirm", { name: effectiveDisplayName }))) deleteMutation.mutate();
};
const deleteModel = (model: AiModelConfig) => {
if (window.confirm(t("aiModel.deleteModelConfirm", { name: model.displayName }))) deleteModelMutation.mutate(model.id);
@@ -158,9 +160,9 @@ export const AiProviderCard = ({ provider: saved, defaultModelId, readOnly, onCh
<section className="overflow-hidden rounded-lg border bg-white">
<div className="flex items-start justify-between gap-3 p-4">
<div className="min-w-0">
- <h3 className="truncate text-sm font-semibold text-slate-900">{saved.displayName}</h3>
+ <h3 className="truncate text-sm font-semibold text-slate-900">{effectiveDisplayName}</h3>
<div className="mt-1.5 flex flex-wrap items-center gap-x-2 gap-y-1 text-xs text-slate-500">
- {showProviderLabel ? <span className="rounded bg-slate-100 px-1.5 py-0.5 font-medium text-slate-600">{providerLabel}</span> : null}
+ <span className="rounded bg-slate-100 px-1.5 py-0.5 font-medium text-slate-600">{providerLabel}</span>
<span className="max-w-full truncate">{formatBaseUrl(saved.baseUrl)}</span>
<span aria-hidden="true">·</span>
<span>{t("aiModel.modelCount", { count: saved.models.length })}</span>
@@ -250,7 +252,7 @@ export const AiProviderCard = ({ provider: saved, defaultModelId, readOnly, onCh
<form className="grid gap-5" onSubmit={submit}>
<DialogHeader>
<DialogTitle>{t("aiModel.editConnection")}</DialogTitle>
- <DialogDescription>{t("aiModel.connectionDescription", { name: saved.displayName })}</DialogDescription>
+ <DialogDescription>{t("aiModel.connectionDescription", { name: effectiveDisplayName })}</DialogDescription>
</DialogHeader>
<div className="grid gap-4 sm:grid-cols-2">
<Field label={t("aiModel.displayName")}>
diff --git a/apps/web/src/components/settings/ai-provider-options.test.mjs b/apps/web/src/components/settings/ai-provider-options.test.mjs
new file mode 100644
index 00000000..01cf8184
--- /dev/null
+++ b/apps/web/src/components/settings/ai-provider-options.test.mjs
@@ -0,0 +1,15 @@
+import { describe, expect, test } from "bun:test";
+import { formatProviderOrdinal, isLegacyProviderDisplayName } from "./ai-provider-options.ts";
+
+describe("AI provider display names", () => {
+ test("formats sequential Chinese provider names", () => {
+ expect([1, 2, 10, 11, 20, 21].map((position) => formatProviderOrdinal(position, "zh-CN")))
+ .toEqual(["一", "二", "十", "十一", "二十", "二十一"]);
+ expect(formatProviderOrdinal(2, "en-US")).toBe("2");
+ });
+
+ test("recognizes names generated by the legacy protocol defaults", () => {
+ expect(isLegacyProviderDisplayName("OpenAI-compatible", "openai-compatible")).toBe(true);
+ expect(isLegacyProviderDisplayName("OpenRouter", "openai-compatible")).toBe(false);
+ });
+});
diff --git a/apps/web/src/components/settings/ai-provider-options.ts b/apps/web/src/components/settings/ai-provider-options.ts
index d76a1445..364b98c9 100644
--- a/apps/web/src/components/settings/ai-provider-options.ts
+++ b/apps/web/src/components/settings/ai-provider-options.ts
@@ -7,6 +7,19 @@ export const providerDefaults: Record<AiProvider, { displayName: string; baseUrl
google: { displayName: "Google Gemini", baseUrl: "https://generativelanguage.googleapis.com/v1beta", modelId: "gemini-2.5-flash" },
};
+const chineseDigits = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九"];
+
+export const formatProviderOrdinal = (position: number, locale: string) => {
+ if (!locale.toLowerCase().startsWith("zh") || position <= 0 || position >= 100) return String(position);
+ if (position < 10) return chineseDigits[position];
+ const tens = Math.floor(position / 10);
+ const ones = position % 10;
+ return `${tens === 1 ? "" : chineseDigits[tens]}十${ones ? chineseDigits[ones] : ""}`;
+};
+
+export const isLegacyProviderDisplayName = (displayName: string, provider: AiProvider) =>
+ displayName.trim().toLocaleLowerCase() === providerDefaults[provider].displayName.toLocaleLowerCase();
+
export const aiErrorMessage = (error: unknown, fallback: string, encryptionMessage: string) => {
if (error instanceof ApiRequestError && error.code === "ai_encryption_key_missing") return encryptionMessage;
return error instanceof Error ? error.message : fallback;
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 2b357a5b..95444bd8 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -298,6 +298,7 @@ export const enUS = {
noProviders: "No model services yet. Add OpenAI, OpenRouter, Anthropic, Gemini, or another compatible service to begin.",
servicesTitle: "Model services",
serviceCount: "Configured: {{count}}",
+ defaultProviderName: "Model provider {{ordinal}}",
addProvider: "Add model service",
addProviderDescription: "Connect a model API, then discover or add more models after the service is created.",
createProvider: "Add service",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index ca65930d..b3ef2746 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -298,6 +298,7 @@ export const zhCN = {
noProviders: "还没有模型服务。添加 OpenAI、OpenRouter、Anthropic、Gemini 或其他兼容服务即可开始。",
servicesTitle: "模型服务",
serviceCount: "{{count}} 个服务",
+ defaultProviderName: "模型服务商{{ordinal}}",
addProvider: "添加模型服务",
addProviderDescription: "连接一个模型 API;创建后可以继续发现或添加更多模型。",
createProvider: "添加服务",