From f72f4ba71b8ce0dd0d98be21f63cdd6bacbeb1f1 Mon Sep 17 00:00:00 2001
From: yoma <yingwaizhiying@gmail.com>
Date: Sat, 11 Jul 2026 22:16:03 +0800
Subject: [PATCH] Improve MCP token default names

---
 .../src/components/settings/McpConfigCard.tsx | 30 ++++++++++++++++---
 apps/web/src/i18n/resources/en-US.ts          |  2 +-
 apps/web/src/i18n/resources/zh-CN.ts          |  2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/components/settings/McpConfigCard.tsx b/apps/web/src/components/settings/McpConfigCard.tsx
index c151ddf8..4d3ccb25 100644
--- a/apps/web/src/components/settings/McpConfigCard.tsx
+++ b/apps/web/src/components/settings/McpConfigCard.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState, type FormEvent } from "react";
+import { useEffect, useRef, useState, type FormEvent } from "react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import { ChevronDown, Copy, KeyRound, Plus, ShieldCheck, Trash2 } from "lucide-react";
@@ -24,6 +24,15 @@ interface CreatedTokenNoticeProps {
   token: string;
 }
 
+const getNextTokenName = (tokens: ApiToken[]) => {
+  const highestNumber = tokens.reduce((highest, token) => {
+    const match = token.name.match(/^MCP Token (\d+)$/i);
+    return match ? Math.max(highest, Number(match[1])) : highest;
+  }, 0);
+
+  return `MCP Token ${highestNumber + 1}`;
+};
+
 const CreatedTokenNotice = ({ token }: CreatedTokenNoticeProps) => {
   const { t } = useTranslation();
   const [copiedAction, setCopiedAction] = useState<"token" | "config" | null>(null);
@@ -322,7 +331,9 @@ const TokenList = ({ tokens, isLoading, isDeleting, onDelete }: TokenListProps)
 export const McpConfigCard = () => {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
-  const [name, setName] = useState("MCP Agent");
+  const [name, setName] = useState("MCP Token 1");
+  const [isNameCustomized, setIsNameCustomized] = useState(false);
+  const nameInitialized = useRef(false);
   const [selectedScopes, setSelectedScopes] = useState<Set<string>>(() => new Set(ALL_TOKEN_SCOPES));
   const [scopeDefaultsSynced, setScopeDefaultsSynced] = useState(false);
   const [createdToken, setCreatedToken] = useState<{ token: string; apiToken: ApiToken } | null>(null);
@@ -345,11 +356,19 @@ export const McpConfigCard = () => {
     setScopeDefaultsSynced(true);
   }, [scopeDefaultsSynced, tokensQuery.data?.availableScopes]);
 
+  useEffect(() => {
+    if (!nameInitialized.current && !isNameCustomized && tokensQuery.data?.apiTokens) {
+      setName(getNextTokenName(tokensQuery.data.apiTokens));
+      nameInitialized.current = true;
+    }
+  }, [isNameCustomized, tokensQuery.data?.apiTokens]);
+
   const createMutation = useMutation({
     mutationFn: api.createApiToken,
     onSuccess: async (data) => {
       setCreatedToken(data);
-      setName("");
+      setName(getNextTokenName([...tokens, data.apiToken]));
+      setIsNameCustomized(true);
       setSelectedScopes(new Set(availableScopes));
       await queryClient.invalidateQueries({ queryKey: ["api-tokens"] });
     },
@@ -400,7 +419,10 @@ export const McpConfigCard = () => {
               <Input
                 className="h-9 min-w-0 flex-1 text-xs focus-visible:ring-4 focus-visible:ring-emerald-500/10"
                 value={name}
-                onChange={(event) => setName(event.target.value)}
+                onChange={(event) => {
+                  setName(event.target.value);
+                  setIsNameCustomized(true);
+                }}
                 placeholder={t("mcp.namePlaceholder")}
               />
               <Button
diff --git a/apps/web/src/i18n/resources/en-US.ts b/apps/web/src/i18n/resources/en-US.ts
index 0c00cf18..99fa331d 100644
--- a/apps/web/src/i18n/resources/en-US.ts
+++ b/apps/web/src/i18n/resources/en-US.ts
@@ -534,7 +534,7 @@ export const enUS = {
     legacyConfigCannotCopy: "MCP config cannot be copied for old tokens",
     deleteToken: "Delete token",
     description: "Allow AI Agents to read and organize your notes.",
-    namePlaceholder: "Token purpose, e.g. MCP Agent",
+    namePlaceholder: "Token name, e.g. Codex or Claude Code",
     createToken: "Generate token",
     activeTokens: "Token list",
     deleteConfirmTitle: "Delete token “{{name}}”?",
diff --git a/apps/web/src/i18n/resources/zh-CN.ts b/apps/web/src/i18n/resources/zh-CN.ts
index 33f07de0..201fe637 100644
--- a/apps/web/src/i18n/resources/zh-CN.ts
+++ b/apps/web/src/i18n/resources/zh-CN.ts
@@ -534,7 +534,7 @@ export const zhCN = {
     legacyConfigCannotCopy: "旧 Token 无法复制 MCP 配置",
     deleteToken: "删除 Token",
     description: "让 AI Agent 可以读取和整理你的笔记。",
-    namePlaceholder: "Token 用途，例如：MCP Agent",
+    namePlaceholder: "Token 名称，例如：Codex 或 Claude Code",
     createToken: "生成 Token",
     activeTokens: "Token 列表",
     deleteConfirmTitle: "确定要删除 Token「{{name}}」吗？",