From 48532aedab500111acc6a1ece810ee5e72737b4d Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:57:22 +0800
Subject: [PATCH 01/27] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=95=86=E8=A1=A8=E5=8D=95=E5=B0=8F=E5=B1=8F=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E9=81=AE=E6=8C=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/add-provider-dialog.tsx        |  2 +-
 .../provider-form/components/form-tab-nav.tsx  |  2 +-
 .../_components/forms/provider-form/index.tsx  | 18 ++++++++++--------
 .../_components/provider-list-item.legacy.tsx  |  4 ++--
 .../_components/provider-rich-list-item.tsx    |  4 ++--
 .../_components/vendor-keys-compact-list.tsx   |  4 ++--
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx b/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
index 917d30a05..2363923fb 100644
--- a/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
@@ -22,7 +22,7 @@ export function AddProviderDialog({ enableMultiProviderTypes }: AddProviderDialo
           <ServerCog className="h-4 w-4" /> {t("addProvider")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col">
+      <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
         <VisuallyHidden>
           <DialogTitle>{t("addProvider")}</DialogTitle>
         </VisuallyHidden>
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
index f0af08497..c4447964b 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
@@ -211,7 +211,7 @@ export function FormTabNav({
       </nav>
 
       {/* Mobile: Bottom Navigation */}
-      <nav className="flex md:hidden fixed bottom-0 left-0 right-0 z-50 border-t border-border/50 bg-card/95 backdrop-blur-md safe-area-bottom">
+      <nav className="flex md:hidden shrink-0 relative border-t border-border/50 bg-card/95 backdrop-blur-md safe-area-bottom">
         <div className="flex items-center justify-around w-full px-2 py-1">
           {TAB_CONFIG.map((tab) => {
             const Icon = tab.icon;
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
index 33430a398..4ec02fcda 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
@@ -553,18 +553,20 @@ function ProviderFormContent({
     <form onSubmit={handleSubmit} className="flex flex-col h-full max-h-[85vh]">
       {/* Form Layout */}
       <div className="flex flex-col lg:flex-row flex-1 min-h-0">
-        {/* Tab Navigation */}
-        <FormTabNav
-          activeTab={state.ui.activeTab}
-          onTabChange={handleTabChange}
-          disabled={isPending}
-          tabStatus={getTabStatus()}
-        />
+        <div className="order-2 md:order-1 shrink-0">
+          {/* Tab Navigation */}
+          <FormTabNav
+            activeTab={state.ui.activeTab}
+            onTabChange={handleTabChange}
+            disabled={isPending}
+            tabStatus={getTabStatus()}
+          />
+        </div>
 
         {/* All Sections Stacked Vertically */}
         <div
           ref={contentRef}
-          className="flex-1 overflow-y-auto p-6 pb-24 md:pb-6 min-h-0 scroll-smooth"
+          className="order-1 md:order-2 flex-1 overflow-y-auto p-6 min-h-0 scroll-smooth"
           onScroll={handleScroll}
         >
           <div className="space-y-8">
diff --git a/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx b/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
index 92e8656ba..a7da424b1 100644
--- a/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
+++ b/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
@@ -280,7 +280,7 @@ export function ProviderListItem({
                       <Edit className="h-3.5 w-3.5" />
                     </Button>
                   </DialogTrigger>
-                  <DialogContent className="sm:max-w-3xl max-h-[85vh] overflow-y-auto">
+                  <DialogContent className="sm:max-w-3xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
                     <FormErrorBoundary>
                       <ProviderForm
                         mode="edit"
@@ -308,7 +308,7 @@ export function ProviderListItem({
                       <Copy className="h-3.5 w-3.5" />
                     </Button>
                   </DialogTrigger>
-                  <DialogContent className="sm:max-w-3xl max-h-[85vh] overflow-y-auto">
+                  <DialogContent className="sm:max-w-3xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
                     <FormErrorBoundary>
                       <ProviderForm
                         mode="create"
diff --git a/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx b/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
index 0ef6d258b..081c461ee 100644
--- a/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
+++ b/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
@@ -978,7 +978,7 @@ export function ProviderRichListItem({
 
       {/* 编辑 Dialog */}
       <Dialog open={openEdit} onOpenChange={setOpenEdit}>
-        <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col">
+        <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
           <VisuallyHidden>
             <DialogTitle>{t("editProvider")}</DialogTitle>
           </VisuallyHidden>
@@ -997,7 +997,7 @@ export function ProviderRichListItem({
 
       {/* 克隆 Dialog */}
       <Dialog open={openClone} onOpenChange={setOpenClone}>
-        <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col">
+        <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
           <VisuallyHidden>
             <DialogTitle>{t("clone")}</DialogTitle>
           </VisuallyHidden>
diff --git a/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx b/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
index 1a679d623..840e258ef 100644
--- a/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
+++ b/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
@@ -105,7 +105,7 @@ export function VendorKeysCompactList(props: {
                 {t("addVendorKey")}
               </Button>
             </DialogTrigger>
-            <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col">
+            <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
               <VisuallyHidden>
                 <DialogTitle>{t("addVendorKey")}</DialogTitle>
               </VisuallyHidden>
@@ -503,7 +503,7 @@ function VendorKeyRow(props: {
                     <Edit2 className="h-4 w-4" />
                   </Button>
                 </DialogTrigger>
-                <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col">
+                <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
                   <VisuallyHidden>
                     <DialogTitle>{t("editProvider")}</DialogTitle>
                   </VisuallyHidden>

From d70d66d22542655011dbb0fea4a3c28fcfe1d101 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:57:39 +0800
Subject: [PATCH 02/27] =?UTF-8?q?test(vitest):=20=E4=BF=AE=E5=A4=8D=20node?=
 =?UTF-8?q?=20=E5=86=85=E7=BD=AE=E6=A8=A1=E5=9D=97=20mock=20=E5=B9=B6?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E9=BB=98=E8=AE=A4=20worker=20=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database-backup/docker-executor.test.ts   | 20 ++++++++-----------
 vitest.config.ts                              |  9 +++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/tests/unit/lib/database-backup/docker-executor.test.ts b/tests/unit/lib/database-backup/docker-executor.test.ts
index ab2ded088..f56eaff8f 100644
--- a/tests/unit/lib/database-backup/docker-executor.test.ts
+++ b/tests/unit/lib/database-backup/docker-executor.test.ts
@@ -5,19 +5,15 @@ const { mockSpawn, mockCreateReadStream } = vi.hoisted(() => ({
   mockCreateReadStream: vi.fn(() => ({ pipe: vi.fn(), on: vi.fn() })),
 }));
 
-vi.mock("node:child_process", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:child_process")>();
-  return { default: { ...actual, spawn: mockSpawn }, ...actual, spawn: mockSpawn };
-});
+vi.mock("node:child_process", () => ({
+  default: { spawn: mockSpawn },
+  spawn: mockSpawn,
+}));
 
-vi.mock("node:fs", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("node:fs")>();
-  return {
-    default: { ...actual, createReadStream: mockCreateReadStream },
-    ...actual,
-    createReadStream: mockCreateReadStream,
-  };
-});
+vi.mock("node:fs", () => ({
+  default: { createReadStream: mockCreateReadStream },
+  createReadStream: mockCreateReadStream,
+}));
 
 vi.mock("@/drizzle/db", () => ({
   db: { execute: vi.fn() },
diff --git a/vitest.config.ts b/vitest.config.ts
index 43e673ac5..a6d0e9890 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -5,6 +5,12 @@ const isIntegrationFileFilterRequested = process.argv.some((arg) =>
   /tests[\\/]+integration[\\/].+\.(test|spec)\.[cm]?[jt]sx?$/.test(arg)
 );
 
+function parsePositiveInt(value: string | undefined, fallback: number): number {
+  if (!value) return fallback;
+  const parsed = Number.parseInt(value, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+
 export default defineConfig({
   test: {
     // ==================== 全局配置 ====================
@@ -90,6 +96,9 @@ export default defineConfig({
     // ==================== 并发配置 ====================
     maxConcurrency: 5, // 最大并发测试数
     pool: "threads", // 使用线程池（推荐）
+    // 高核机器/Windows 下 threads worker 过多可能触发 EMFILE / 资源争用导致用例超时。
+    // 允许通过环境变量覆盖：VITEST_MAX_WORKERS=...
+    maxWorkers: parsePositiveInt(process.env.VITEST_MAX_WORKERS, 8),
 
     // ==================== 文件匹配 ====================
     include: [

From c9b77febc7e7ade8a03107579a17b222adf02a99 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:34:15 +0800
Subject: [PATCH 03/27] =?UTF-8?q?fix(ui):=20=E8=A1=A5=E9=BD=90=20safe-area?=
 =?UTF-8?q?-bottom=20=E5=B9=B6=E4=BF=AE=E6=AD=A3=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forms/provider-form/components/form-tab-nav.tsx    | 10 ++++++----
 src/app/globals.css                                    |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
index c4447964b..832d05765 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
@@ -42,6 +42,10 @@ export function FormTabNav({
     }
   };
 
+  const activeTabIndex = TAB_CONFIG.findIndex((tab) => tab.id === activeTab);
+  const stepNumber = activeTabIndex >= 0 ? activeTabIndex + 1 : 0;
+  const stepProgressWidth = `${(stepNumber / TAB_CONFIG.length) * 100}%`;
+
   if (layout === "horizontal") {
     return (
       <nav className="sticky top-0 z-10 border-b border-border/50 bg-card/80 backdrop-blur-md shrink-0">
@@ -263,10 +267,8 @@ export function FormTabNav({
         <div className="absolute top-0 left-0 right-0 h-0.5 bg-muted">
           <motion.div
             className="h-full bg-primary"
-            initial={{ width: "20%" }}
-            animate={{
-              width: `${((TAB_CONFIG.findIndex((t) => t.id === activeTab) + 1) / TAB_CONFIG.length) * 100}%`,
-            }}
+            initial={{ width: stepProgressWidth }}
+            animate={{ width: stepProgressWidth }}
             transition={{ type: "spring", stiffness: 300, damping: 30 }}
           />
         </div>
diff --git a/src/app/globals.css b/src/app/globals.css
index 001d03124..2b34a0a9c 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -135,6 +135,11 @@
     display: none;
   }
 
+  /* iOS 安全区：避免底部固定导航被 Home Indicator 挡住 */
+  .safe-area-bottom {
+    padding-bottom: env(safe-area-inset-bottom, 0px);
+  }
+
   /* 新增记录高亮动画 */
   @keyframes highlight-flash {
     0% {

From 884340e8a6500a4426d52ff52d7682ae4fd8f545 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 13:50:27 +0800
Subject: [PATCH 04/27] =?UTF-8?q?test(e2e):=20=E9=80=9A=E8=BF=87=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8D=A2=E5=8F=96=E4=BC=9A=E8=AF=9D=20token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/e2e/_helpers/auth.ts              | 53 +++++++++++++++++++++++++
 tests/e2e/api-complete.test.ts          | 24 +++++++++--
 tests/e2e/notification-settings.test.ts | 24 ++++++++---
 tests/e2e/users-keys-complete.test.ts   | 24 +++++++++--
 4 files changed, 112 insertions(+), 13 deletions(-)
 create mode 100644 tests/e2e/_helpers/auth.ts

diff --git a/tests/e2e/_helpers/auth.ts b/tests/e2e/_helpers/auth.ts
new file mode 100644
index 000000000..3836633e1
--- /dev/null
+++ b/tests/e2e/_helpers/auth.ts
@@ -0,0 +1,53 @@
+function resolveAppOrigin(apiBaseUrl: string): string {
+  return apiBaseUrl.replace(/\/api\/actions\/?$/, "");
+}
+
+function getSetCookieHeaders(response: Response): string[] {
+  const headersWithGetSetCookie = response.headers as unknown as {
+    getSetCookie?: () => string[];
+  };
+
+  const headerList = headersWithGetSetCookie.getSetCookie?.();
+  if (Array.isArray(headerList) && headerList.length > 0) {
+    return headerList;
+  }
+
+  const combined = response.headers.get("set-cookie");
+  if (!combined) return [];
+
+  return combined
+    .split(/,(?=[^;]+?=)/g)
+    .map((s) => s.trim())
+    .filter(Boolean);
+}
+
+function extractCookieValue(setCookieHeader: string, cookieName: string): string | null {
+  const match = new RegExp(`^${cookieName}=([^;]+)`).exec(setCookieHeader.trim());
+  return match?.[1] ?? null;
+}
+
+export async function loginAndGetAuthToken(apiBaseUrl: string, key: string): Promise<string> {
+  const origin = resolveAppOrigin(apiBaseUrl);
+
+  const response = await fetch(`${origin}/api/auth/login`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ key }),
+  });
+
+  if (!response.ok) {
+    const text = await response.text().catch(() => "");
+    throw new Error(`[e2e] login failed: ${response.status} ${text}`);
+  }
+
+  const setCookieHeaders = getSetCookieHeaders(response);
+  const authToken = setCookieHeaders
+    .map((header) => extractCookieValue(header, "auth-token"))
+    .find((value): value is string => Boolean(value));
+
+  if (!authToken) {
+    throw new Error("[e2e] login succeeded but auth-token cookie is missing");
+  }
+
+  return authToken;
+}
diff --git a/tests/e2e/api-complete.test.ts b/tests/e2e/api-complete.test.ts
index 4543b2f19..c50f56661 100644
--- a/tests/e2e/api-complete.test.ts
+++ b/tests/e2e/api-complete.test.ts
@@ -13,12 +13,16 @@
  * 🧹 清理：测试完成后自动清理数据
  */
 
-import { afterAll, describe, expect, test } from "vitest";
+import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { loginAndGetAuthToken } from "./_helpers/auth";
 
 // ==================== 配置 ====================
 
 const API_BASE_URL = process.env.API_BASE_URL || "http://localhost:13500/api/actions";
-const ADMIN_TOKEN = process.env.TEST_ADMIN_TOKEN || process.env.ADMIN_TOKEN;
+const ADMIN_KEY = process.env.TEST_ADMIN_TOKEN || process.env.ADMIN_TOKEN;
+const run = ADMIN_KEY ? describe : describe.skip;
+
+let authToken: string | undefined;
 
 const testData = {
   userIds: [] as number[],
@@ -26,12 +30,22 @@ const testData = {
 
 // ==================== 辅助函数 ====================
 
+beforeAll(async () => {
+  if (!ADMIN_KEY) return;
+  authToken = await loginAndGetAuthToken(API_BASE_URL, ADMIN_KEY);
+});
+
 async function callApi(module: string, action: string, body: Record<string, unknown> = {}) {
+  if (!authToken) {
+    throw new Error("E2E tests require ADMIN_TOKEN/TEST_ADMIN_TOKEN (used to login)");
+  }
+
   const response = await fetch(`${API_BASE_URL}/${module}/${action}`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      Cookie: `auth-token=${ADMIN_TOKEN}`,
+      Authorization: `Bearer ${authToken}`,
+      Cookie: `auth-token=${authToken}`,
     },
     body: JSON.stringify(body),
   });
@@ -56,6 +70,8 @@ async function expectSuccess(module: string, action: string, body: Record<string
 // ==================== 测试清理 ====================
 
 afterAll(async () => {
+  if (!authToken) return;
+
   console.log(`\n🧹 清理 ${testData.userIds.length} 个测试用户...`);
   for (const userId of testData.userIds) {
     try {
@@ -69,7 +85,7 @@ afterAll(async () => {
 
 // ==================== 测试 ====================
 
-describe("用户和 Key 管理 - E2E 测试", () => {
+run("用户和 Key 管理 - E2E 测试", () => {
   let user1Id: number;
   let user2Id: number;
 
diff --git a/tests/e2e/notification-settings.test.ts b/tests/e2e/notification-settings.test.ts
index ef592cd90..d28cd1f8c 100644
--- a/tests/e2e/notification-settings.test.ts
+++ b/tests/e2e/notification-settings.test.ts
@@ -11,17 +11,26 @@
  * - 已配置 ADMIN_TOKEN（或 TEST_ADMIN_TOKEN）
  */
 
-import { afterAll, describe, expect, test } from "vitest";
+import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { loginAndGetAuthToken } from "./_helpers/auth";
 
 const API_BASE_URL = process.env.API_BASE_URL || "http://localhost:13500/api/actions";
-const ADMIN_TOKEN = process.env.TEST_ADMIN_TOKEN || process.env.ADMIN_TOKEN;
+const ADMIN_KEY = process.env.TEST_ADMIN_TOKEN || process.env.ADMIN_TOKEN;
+const run = ADMIN_KEY ? describe : describe.skip;
+
+let authToken: string | undefined;
 
 async function callApi(module: string, action: string, body: Record<string, unknown> = {}) {
+  if (!authToken) {
+    throw new Error("E2E tests require ADMIN_TOKEN/TEST_ADMIN_TOKEN (used to login)");
+  }
+
   const response = await fetch(`${API_BASE_URL}/${module}/${action}`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      Cookie: `auth-token=${ADMIN_TOKEN}`,
+      Authorization: `Bearer ${authToken}`,
+      Cookie: `auth-token=${authToken}`,
     },
     body: JSON.stringify(body),
   });
@@ -47,7 +56,14 @@ const testState = {
   targetIds: [] as number[],
 };
 
+beforeAll(async () => {
+  if (!ADMIN_KEY) return;
+  authToken = await loginAndGetAuthToken(API_BASE_URL, ADMIN_KEY);
+});
+
 afterAll(async () => {
+  if (!authToken) return;
+
   // 尽量清理测试数据（忽略失败）
   for (const id of testState.targetIds) {
     try {
@@ -58,8 +74,6 @@ afterAll(async () => {
   }
 });
 
-const run = ADMIN_TOKEN ? describe : describe.skip;
-
 run("通知设置 - Webhook 目标与绑定（E2E）", () => {
   let targetId: number;
 
diff --git a/tests/e2e/users-keys-complete.test.ts b/tests/e2e/users-keys-complete.test.ts
index 0e4607ba9..c57695987 100644
--- a/tests/e2e/users-keys-complete.test.ts
+++ b/tests/e2e/users-keys-complete.test.ts
@@ -23,14 +23,18 @@
  */
 
 import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { loginAndGetAuthToken } from "./_helpers/auth";
 
 // ==================== 配置 ====================
 
 /** API 基础 URL */
 const API_BASE_URL = process.env.API_BASE_URL || "http://localhost:13500/api/actions";
 
-/** 管理员认证 Token（从环境变量读取）*/
-const ADMIN_TOKEN = process.env.TEST_ADMIN_TOKEN || process.env.ADMIN_TOKEN;
+/** 管理员认证 Key（从环境变量读取，用于登录换取会话 token）*/
+const ADMIN_KEY = process.env.TEST_ADMIN_TOKEN || process.env.ADMIN_TOKEN;
+const run = ADMIN_KEY ? describe : describe.skip;
+
+let sessionToken: string | undefined;
 
 /** 测试数据存储（用于清理）*/
 const testData = {
@@ -58,14 +62,19 @@ async function callApi(
   module: string,
   action: string,
   body: Record<string, unknown> = {},
-  authToken = ADMIN_TOKEN
+  authToken = sessionToken
 ) {
+  if (!authToken) {
+    throw new Error("E2E tests require ADMIN_TOKEN/TEST_ADMIN_TOKEN (used to login)");
+  }
+
   const url = `${API_BASE_URL}/${module}/${action}`;
 
   const response = await fetch(url, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
+      Authorization: `Bearer ${authToken}`,
       Cookie: `auth-token=${authToken}`,
     },
     body: JSON.stringify(body),
@@ -160,6 +169,8 @@ async function expectError(module: string, action: string, body: Record<string,
  * 2. 删除所有创建的用户
  */
 afterAll(async () => {
+  if (!sessionToken) return;
+
   console.log("\n🧹 开始清理 E2E 测试数据...");
   console.log(`   用户数：${testData.userIds.length}`);
   console.log(`   Key数：${testData.keyIds.length}`);
@@ -178,7 +189,12 @@ afterAll(async () => {
 
 // ==================== 测试套件 ====================
 
-describe("用户和 Key 管理 - 完整 E2E 测试", () => {
+beforeAll(async () => {
+  if (!ADMIN_KEY) return;
+  sessionToken = await loginAndGetAuthToken(API_BASE_URL, ADMIN_KEY);
+});
+
+run("用户和 Key 管理 - 完整 E2E 测试", () => {
   // 测试用户 ID（在多个测试间共享）
   let testUser1Id: number;
   let testUser2Id: number;

From 68a6553a162c660f5f5f53f578812a40cd5d3e32 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:00:53 +0800
Subject: [PATCH 05/27] =?UTF-8?q?test(e2e):=20=E7=99=BB=E5=BD=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BC=9A=E8=AF=9D=20token=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/e2e/_helpers/auth.ts | 68 +++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/tests/e2e/_helpers/auth.ts b/tests/e2e/_helpers/auth.ts
index 3836633e1..3368a4307 100644
--- a/tests/e2e/_helpers/auth.ts
+++ b/tests/e2e/_helpers/auth.ts
@@ -26,28 +26,64 @@ function extractCookieValue(setCookieHeader: string, cookieName: string): string
   return match?.[1] ?? null;
 }
 
+async function sleep(ms: number): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 export async function loginAndGetAuthToken(apiBaseUrl: string, key: string): Promise<string> {
   const origin = resolveAppOrigin(apiBaseUrl);
 
-  const response = await fetch(`${origin}/api/auth/login`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ key }),
-  });
+  const url = `${origin}/api/auth/login`;
+  const maxAttempts = 10;
+  let lastError: unknown;
 
-  if (!response.ok) {
-    const text = await response.text().catch(() => "");
-    throw new Error(`[e2e] login failed: ${response.status} ${text}`);
-  }
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      const response = await fetch(url, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ key }),
+      });
+
+      if (!response.ok) {
+        const text = await response.text().catch(() => "");
+        const errorCode = (() => {
+          try {
+            const parsed = JSON.parse(text) as { errorCode?: unknown };
+            return typeof parsed?.errorCode === "string" ? parsed.errorCode : undefined;
+          } catch {
+            return undefined;
+          }
+        })();
+
+        const shouldRetry = response.status === 503 && errorCode === "SESSION_CREATE_FAILED";
+        if (!shouldRetry || attempt >= maxAttempts) {
+          throw new Error(`[e2e] login failed: ${response.status} ${text}`);
+        }
+
+        await sleep(Math.min(1000, 100 * 2 ** (attempt - 1)));
+        continue;
+      }
+
+      const setCookieHeaders = getSetCookieHeaders(response);
+      const authToken = setCookieHeaders
+        .map((header) => extractCookieValue(header, "auth-token"))
+        .find((value): value is string => Boolean(value));
+
+      if (!authToken) {
+        throw new Error("[e2e] login succeeded but auth-token cookie is missing");
+      }
 
-  const setCookieHeaders = getSetCookieHeaders(response);
-  const authToken = setCookieHeaders
-    .map((header) => extractCookieValue(header, "auth-token"))
-    .find((value): value is string => Boolean(value));
+      return authToken;
+    } catch (error) {
+      lastError = error;
+      if (attempt >= maxAttempts) {
+        break;
+      }
 
-  if (!authToken) {
-    throw new Error("[e2e] login succeeded but auth-token cookie is missing");
+      await sleep(Math.min(1000, 100 * 2 ** (attempt - 1)));
+    }
   }
 
-  return authToken;
+  throw lastError instanceof Error ? lastError : new Error("[e2e] login failed");
 }

From b9f1ebfa3ce94c927242ab8f8c4430dfb5d6d0d3 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:11:24 +0800
Subject: [PATCH 06/27] =?UTF-8?q?fix(redis):=20CI=20=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=BF=9E=E6=8E=A5=20Redis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/redis/client.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/redis/client.ts b/src/lib/redis/client.ts
index eb49fb70f..57ceb3293 100644
--- a/src/lib/redis/client.ts
+++ b/src/lib/redis/client.ts
@@ -74,8 +74,8 @@ export function buildRedisOptionsForUrl(redisUrl: string) {
 }
 
 export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean }): Redis | null {
-  // Skip Redis connection during CI/build phase (avoid connection attempts)
-  if (process.env.CI === "true" || process.env.NEXT_PHASE === "phase-production-build") {
+  // Skip Redis connection during Next.js production build phase (avoid connection attempts)
+  if (process.env.NEXT_PHASE === "phase-production-build") {
     return null;
   }
 

From 6887c5bdf7f12e80a37b988ff5c721ba01185b49 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 15:00:15 +0800
Subject: [PATCH 07/27] =?UTF-8?q?fix(ui):=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=20?=
 =?UTF-8?q?dvh=20=E8=A7=86=E5=8F=A3=E9=AB=98=E5=BA=A6=E4=B8=8E=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E5=8C=BA=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/_components/dashboard-main.tsx  |  6 ++-
 .../usage-logs-view-virtualized.tsx           |  2 +-
 .../_components/session-details-tabs.tsx      |  2 +-
 src/app/globals.css                           | 37 +++++++++++++++++++
 src/components/ui/drawer.tsx                  |  2 +-
 src/components/ui/sheet.tsx                   |  2 +-
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/app/[locale]/dashboard/_components/dashboard-main.tsx b/src/app/[locale]/dashboard/_components/dashboard-main.tsx
index 43de60b5e..4c67a41d8 100644
--- a/src/app/[locale]/dashboard/_components/dashboard-main.tsx
+++ b/src/app/[locale]/dashboard/_components/dashboard-main.tsx
@@ -20,7 +20,11 @@ export function DashboardMain({ children }: DashboardMainProps) {
     normalizedPathname.includes("/dashboard/sessions/") && normalizedPathname.endsWith("/messages");
 
   if (isSessionMessagesPage) {
-    return <main className="h-[calc(100vh-64px)] w-full overflow-hidden">{children}</main>;
+    return (
+      <main className="h-[calc(var(--cch-viewport-height,100vh)-64px)] w-full overflow-hidden">
+        {children}
+      </main>
+    );
   }
 
   return <main className="mx-auto w-full max-w-7xl px-6 py-8">{children}</main>;
diff --git a/src/app/[locale]/dashboard/logs/_components/usage-logs-view-virtualized.tsx b/src/app/[locale]/dashboard/logs/_components/usage-logs-view-virtualized.tsx
index 1d64e0e61..388e34550 100644
--- a/src/app/[locale]/dashboard/logs/_components/usage-logs-view-virtualized.tsx
+++ b/src/app/[locale]/dashboard/logs/_components/usage-logs-view-virtualized.tsx
@@ -476,7 +476,7 @@ function UsageLogsViewContent({
               hideStatusBar={true}
               hideScrollToTop={true}
               hiddenColumns={hideProviderColumn ? ["provider"] : undefined}
-              bodyClassName="h-[calc(100vh-56px-32px-40px)]"
+              bodyClassName="h-[calc(var(--cch-viewport-height,100vh)-56px-32px-40px)]"
             />
           </div>
         </div>
diff --git a/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-details-tabs.tsx b/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-details-tabs.tsx
index 25654969b..6cd4b0fcd 100644
--- a/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-details-tabs.tsx
+++ b/src/app/[locale]/dashboard/sessions/[sessionId]/messages/_components/session-details-tabs.tsx
@@ -68,7 +68,7 @@ export function SessionMessagesDetailsTabs({
   isResponseCopied,
 }: SessionMessagesDetailsTabsProps) {
   const t = useTranslations("dashboard.sessions");
-  const codeExpandedMaxHeight = "calc(100vh - 260px)";
+  const codeExpandedMaxHeight = "calc(var(--cch-viewport-height, 100vh) - 260px)";
 
   // 后端已根据 STORE_SESSION_MESSAGES 配置进行脱敏，前端直接显示
   const requestBodyContent = useMemo(() => {
diff --git a/src/app/globals.css b/src/app/globals.css
index 2b34a0a9c..012f5271b 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -45,6 +45,7 @@
 
 :root {
   --radius: 0.65rem;
+  --cch-viewport-height: 100vh;
   --background: oklch(1 0 0);
   --foreground: oklch(0.141 0.005 285.823);
   --card: oklch(1 0 0);
@@ -78,6 +79,12 @@
   --sidebar-ring: oklch(0.705 0.213 47.604);
 }
 
+@supports (height: 100dvh) {
+  :root {
+    --cch-viewport-height: 100dvh;
+  }
+}
+
 .dark {
   --background: oklch(0.141 0.005 285.823);
   --foreground: oklch(0.985 0 0);
@@ -140,6 +147,36 @@
     padding-bottom: env(safe-area-inset-bottom, 0px);
   }
 
+  /* 视口高度：在移动端地址栏伸缩时，dvh 比 vh 更符合可视区域 */
+  @supports (height: 100dvh) {
+    .max-h-\[50vh\] {
+      max-height: 50dvh;
+    }
+    .max-h-\[70vh\] {
+      max-height: 70dvh;
+    }
+    .max-h-\[80vh\] {
+      max-height: 80dvh;
+    }
+    .max-h-\[85vh\] {
+      max-height: 85dvh;
+    }
+    .max-h-\[90vh\] {
+      max-height: 90dvh;
+    }
+    .max-h-\[95vh\] {
+      max-height: 95dvh;
+    }
+
+    /* vaul Drawer 的 max-h 通过 data attribute 控制，直接用 dvh 覆盖 vh */
+    [data-slot="drawer-content"][data-vaul-drawer-direction="top"] {
+      max-height: 80dvh;
+    }
+    [data-slot="drawer-content"][data-vaul-drawer-direction="bottom"] {
+      max-height: 95dvh;
+    }
+  }
+
   /* 新增记录高亮动画 */
   @keyframes highlight-flash {
     0% {
diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
index f5763ff6d..7ee40b63f 100644
--- a/src/components/ui/drawer.tsx
+++ b/src/components/ui/drawer.tsx
@@ -48,7 +48,7 @@ function DrawerContent({
       <DrawerPrimitive.Content
         data-slot="drawer-content"
         className={cn(
-          "group/drawer-content bg-background fixed z-50 flex h-auto flex-col",
+          "group/drawer-content bg-background fixed z-50 flex h-auto flex-col safe-area-bottom",
           "data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",
           "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[95vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
           "data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm",
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 0ea51b4c5..4c7ce7ab8 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -52,7 +52,7 @@ function SheetContent({
       <SheetPrimitive.Content
         data-slot="sheet-content"
         className={cn(
-          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
+          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500 safe-area-bottom",
           side === "right" &&
             "data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm",
           side === "left" &&

From 4886ad153025d3d245134f6beea4faa6749b645f Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 15:11:44 +0800
Subject: [PATCH 08/27] =?UTF-8?q?fix(e2e):=20=E7=99=BB=E5=BD=95=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E4=BB=85=E8=A6=86=E7=9B=96=E5=8F=AF=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/e2e/_helpers/auth.ts | 79 ++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 29 deletions(-)

diff --git a/tests/e2e/_helpers/auth.ts b/tests/e2e/_helpers/auth.ts
index 3368a4307..e840b83b6 100644
--- a/tests/e2e/_helpers/auth.ts
+++ b/tests/e2e/_helpers/auth.ts
@@ -22,8 +22,20 @@ function getSetCookieHeaders(response: Response): string[] {
 }
 
 function extractCookieValue(setCookieHeader: string, cookieName: string): string | null {
-  const match = new RegExp(`^${cookieName}=([^;]+)`).exec(setCookieHeader.trim());
-  return match?.[1] ?? null;
+  const trimmed = setCookieHeader.trim();
+  if (!trimmed) return null;
+
+  const segments = trimmed.split(";");
+  for (const segment of segments) {
+    const part = segment.trim();
+    if (!part) continue;
+
+    if (part.startsWith(`${cookieName}=`)) {
+      return part.slice(cookieName.length + 1) || null;
+    }
+  }
+
+  return null;
 }
 
 async function sleep(ms: number): Promise<void> {
@@ -38,51 +50,60 @@ export async function loginAndGetAuthToken(apiBaseUrl: string, key: string): Pro
   let lastError: unknown;
 
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    let response: Response;
     try {
-      const response = await fetch(url, {
+      response = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ key }),
       });
+    } catch (error) {
+      lastError = error;
+      if (attempt >= maxAttempts) {
+        break;
+      }
 
-      if (!response.ok) {
-        const text = await response.text().catch(() => "");
-        const errorCode = (() => {
-          try {
-            const parsed = JSON.parse(text) as { errorCode?: unknown };
-            return typeof parsed?.errorCode === "string" ? parsed.errorCode : undefined;
-          } catch {
-            return undefined;
-          }
-        })();
-
-        const shouldRetry = response.status === 503 && errorCode === "SESSION_CREATE_FAILED";
-        if (!shouldRetry || attempt >= maxAttempts) {
-          throw new Error(`[e2e] login failed: ${response.status} ${text}`);
-        }
+      await sleep(Math.min(1000, 100 * 2 ** (attempt - 1)));
+      continue;
+    }
 
-        await sleep(Math.min(1000, 100 * 2 ** (attempt - 1)));
-        continue;
-      }
+    if (!response.ok) {
+      const text = await response.text().catch(() => "");
+      const errorCode = (() => {
+        try {
+          const parsed = JSON.parse(text) as { errorCode?: unknown };
+          return typeof parsed?.errorCode === "string" ? parsed.errorCode : undefined;
+        } catch {
+          return undefined;
+        }
+      })();
 
-      const setCookieHeaders = getSetCookieHeaders(response);
-      const authToken = setCookieHeaders
-        .map((header) => extractCookieValue(header, "auth-token"))
-        .find((value): value is string => Boolean(value));
+      const error = new Error(`[e2e] login failed: ${response.status} ${text}`);
+      const shouldRetry = response.status === 503 && errorCode === "SESSION_CREATE_FAILED";
 
-      if (!authToken) {
-        throw new Error("[e2e] login succeeded but auth-token cookie is missing");
+      if (!shouldRetry) {
+        throw error;
       }
 
-      return authToken;
-    } catch (error) {
       lastError = error;
       if (attempt >= maxAttempts) {
         break;
       }
 
       await sleep(Math.min(1000, 100 * 2 ** (attempt - 1)));
+      continue;
     }
+
+    const setCookieHeaders = getSetCookieHeaders(response);
+    const authToken = setCookieHeaders
+      .map((header) => extractCookieValue(header, "auth-token"))
+      .find((value): value is string => Boolean(value));
+
+    if (!authToken) {
+      throw new Error("[e2e] login succeeded but auth-token cookie is missing");
+    }
+
+    return authToken;
   }
 
   throw lastError instanceof Error ? lastError : new Error("[e2e] login failed");

From 7f8d184f7b0e9280b775a50d659575582c99ca36 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 15:11:50 +0800
Subject: [PATCH 09/27] =?UTF-8?q?fix(redis):=20=E8=BF=9E=E6=8E=A5=E7=BB=88?=
 =?UTF-8?q?=E6=AD=A2=E5=90=8E=E9=87=8D=E7=BD=AE=E5=8D=95=E4=BE=8B=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=83=B5=E5=B0=B8=E5=AE=A2=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/redis/client.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/redis/client.ts b/src/lib/redis/client.ts
index 57ceb3293..1991da368 100644
--- a/src/lib/redis/client.ts
+++ b/src/lib/redis/client.ts
@@ -92,7 +92,11 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
   const safeRedisUrl = maskRedisUrl(redisUrl);
 
   if (redisClient) {
-    return redisClient;
+    if (redisClient.status === "end") {
+      redisClient = null;
+    } else {
+      return redisClient;
+    }
   }
 
   try {
@@ -149,6 +153,11 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
       logger.warn("[Redis] Connection closed", { redisUrl: safeRedisUrl });
     });
 
+    redisClient.on("end", () => {
+      logger.warn("[Redis] Connection ended, resetting client", { redisUrl: safeRedisUrl });
+      redisClient = null;
+    });
+
     // 5. 返回客户端实例
     return redisClient;
   } catch (error) {

From e7a9136396c8926600656b789e8c57da9774b29d Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:34:37 +0800
Subject: [PATCH 10/27] =?UTF-8?q?fix(ui,redis):=20safe-area=20=E4=BD=9C?=
 =?UTF-8?q?=E7=94=A8=E5=9F=9F=E4=B8=8E=20Redis=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/globals.css          |  3 ++-
 src/components/ui/drawer.tsx |  3 ++-
 src/components/ui/sheet.tsx  |  3 ++-
 src/lib/redis/client.ts      | 43 +++++++++++-------------------------
 4 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index 012f5271b..8f19ad1e9 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -144,7 +144,8 @@
 
   /* iOS 安全区：避免底部固定导航被 Home Indicator 挡住 */
   .safe-area-bottom {
-    padding-bottom: env(safe-area-inset-bottom, 0px);
+    /* 可通过 --safe-area-pb 覆盖：例如 style={{ "--safe-area-pb": "0px" }} */
+    padding-bottom: var(--safe-area-pb, env(safe-area-inset-bottom, 0px));
   }
 
   /* 视口高度：在移动端地址栏伸缩时，dvh 比 vh 更符合可视区域 */
diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
index 7ee40b63f..96dd5e6ea 100644
--- a/src/components/ui/drawer.tsx
+++ b/src/components/ui/drawer.tsx
@@ -48,7 +48,8 @@ function DrawerContent({
       <DrawerPrimitive.Content
         data-slot="drawer-content"
         className={cn(
-          "group/drawer-content bg-background fixed z-50 flex h-auto flex-col safe-area-bottom",
+          "group/drawer-content bg-background fixed z-50 flex h-auto flex-col",
+          "data-[vaul-drawer-direction=bottom]:safe-area-bottom data-[vaul-drawer-direction=left]:safe-area-bottom data-[vaul-drawer-direction=right]:safe-area-bottom",
           "data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",
           "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[95vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
           "data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm",
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 4c7ce7ab8..2671a916b 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -52,7 +52,8 @@ function SheetContent({
       <SheetPrimitive.Content
         data-slot="sheet-content"
         className={cn(
-          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500 safe-area-bottom",
+          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
+          side !== "top" && "safe-area-bottom",
           side === "right" &&
             "data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm",
           side === "left" &&
diff --git a/src/lib/redis/client.ts b/src/lib/redis/client.ts
index 1991da368..2726a75fc 100644
--- a/src/lib/redis/client.ts
+++ b/src/lib/redis/client.ts
@@ -100,39 +100,19 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
   }
 
   try {
-    const useTls = redisUrl.startsWith("rediss://");
-
-    // 1. 定义基础配置
-    const redisOptions: RedisOptions = {
-      enableOfflineQueue: false, // 快速失败
-      maxRetriesPerRequest: 3,
-      retryStrategy(times) {
-        if (times > 5) {
-          logger.error("[Redis] Max retries reached, giving up");
-          return null; // 停止重试，降级
-        }
-        const delay = Math.min(times * 200, 2000);
-        logger.warn(`[Redis] Retry ${times}/5 after ${delay}ms`);
-        return delay;
-      },
-    };
+    const { isTLS: useTls, options: redisOptions } = buildRedisOptionsForUrl(redisUrl);
 
-    // 2. 如果使用 rediss://，则添加显式的 TLS 配置（支持跳过证书验证）
     if (useTls) {
-      const raw = process.env.REDIS_TLS_REJECT_UNAUTHORIZED?.trim();
-      const rejectUnauthorized = raw !== "false" && raw !== "0";
-      logger.info("[Redis] Using TLS connection (rediss://)", {
-        redisUrl: safeRedisUrl,
-        rejectUnauthorized,
-      });
-      redisOptions.tls = buildTlsConfig(redisUrl);
+      logger.info("[Redis] Using TLS connection (rediss://)", { redisUrl: safeRedisUrl });
     }
 
     // 3. 使用组合后的配置创建客户端
-    redisClient = new Redis(redisUrl, redisOptions);
+    const client = new Redis(redisUrl, redisOptions as RedisOptions);
+    redisClient = client;
 
     // 4. 保持原始的事件监听器
-    redisClient.on("connect", () => {
+    client.on("connect", () => {
+      if (redisClient !== client) return;
       logger.info("[Redis] Connected successfully", {
         protocol: useTls ? "rediss" : "redis",
         tlsEnabled: useTls,
@@ -140,7 +120,8 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
       });
     });
 
-    redisClient.on("error", (error) => {
+    client.on("error", (error) => {
+      if (redisClient !== client) return;
       logger.error("[Redis] Connection error", {
         error: error instanceof Error ? error.message : String(error),
         protocol: useTls ? "rediss" : "redis",
@@ -149,17 +130,19 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
       });
     });
 
-    redisClient.on("close", () => {
+    client.on("close", () => {
+      if (redisClient !== client) return;
       logger.warn("[Redis] Connection closed", { redisUrl: safeRedisUrl });
     });
 
-    redisClient.on("end", () => {
+    client.on("end", () => {
+      if (redisClient !== client) return;
       logger.warn("[Redis] Connection ended, resetting client", { redisUrl: safeRedisUrl });
       redisClient = null;
     });
 
     // 5. 返回客户端实例
-    return redisClient;
+    return client;
   } catch (error) {
     logger.error("[Redis] Failed to initialize:", error, { redisUrl: safeRedisUrl });
     return null;

From 674c55cd06b0e869e557474f50cff9691c81bfbd Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 17:29:03 +0800
Subject: [PATCH 11/27] =?UTF-8?q?fix(ui,redis):=20dvh=20=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E4=B8=8E=20closeRedis=20=E5=AE=88=E5=8D=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bento/statistics-chart-card.tsx           |  4 ++-
 .../_components/user/add-key-dialog.tsx       |  2 +-
 .../_components/user/add-user-dialog.tsx      |  2 +-
 .../user/batch-edit/batch-edit-dialog.tsx     |  2 +-
 .../_components/user/edit-key-dialog.tsx      |  2 +-
 .../_components/user/key-actions.tsx          |  4 +--
 .../_components/user/key-list-header.tsx      |  2 +-
 .../_components/user/user-actions.tsx         |  2 +-
 .../dashboard/_components/user/user-list.tsx  |  2 +-
 src/app/[locale]/dashboard/layout.tsx         |  2 +-
 .../_components/edit-key-quota-dialog.tsx     |  2 +-
 .../_components/edit-user-quota-dialog.tsx    |  2 +-
 .../_components/session-messages-dialog.tsx   |  2 +-
 .../internal/dashboard/big-screen/loading.tsx |  2 +-
 .../internal/dashboard/big-screen/page.tsx    |  2 +-
 src/app/[locale]/layout.tsx                   |  2 +-
 src/app/[locale]/login/loading.tsx            |  2 +-
 src/app/[locale]/login/page.tsx               |  6 ++--
 src/app/[locale]/my-usage/layout.tsx          |  2 +-
 .../_components/add-rule-dialog.tsx           |  2 +-
 .../_components/edit-rule-dialog.tsx          |  2 +-
 src/app/[locale]/settings/layout.tsx          |  2 +-
 .../_components/binding-selector.tsx          |  2 +-
 .../_components/webhook-target-dialog.tsx     |  2 +-
 .../_components/sync-conflict-dialog.tsx      |  2 +-
 .../_components/add-provider-dialog.tsx       |  2 +-
 .../_components/auto-sort-priority-dialog.tsx |  2 +-
 .../batch-edit/provider-batch-dialog.tsx      |  2 +-
 .../provider-batch-preview-step.tsx           |  2 +-
 .../_components/forms/provider-form/index.tsx |  2 +-
 .../_components/forms/test-result-card.tsx    |  2 +-
 .../_components/provider-list-item.legacy.tsx |  4 +--
 .../_components/provider-rich-list-item.tsx   |  4 +--
 .../_components/recluster-vendors-dialog.tsx  |  2 +-
 .../_components/scheduling-rules-dialog.tsx   |  2 +-
 .../_components/vendor-keys-compact-list.tsx  |  4 +--
 .../_components/filter-dialog.tsx             |  2 +-
 .../_components/add-word-dialog.tsx           |  2 +-
 .../_components/edit-word-dialog.tsx          |  2 +-
 src/app/[locale]/usage-doc/layout.tsx         |  2 +-
 src/app/globals.css                           | 30 -------------------
 src/components/ui/drawer.tsx                  |  4 +--
 src/lib/redis/client.ts                       | 27 ++++++++++-------
 .../login/login-visual-regression.test.tsx    |  3 +-
 44 files changed, 69 insertions(+), 89 deletions(-)

diff --git a/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx b/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx
index 35c7ee3f6..7dbbae668 100644
--- a/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx
+++ b/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx
@@ -168,7 +168,9 @@ export function StatisticsChartCard({
   };
 
   return (
-    <BentoCard className={cn("flex flex-col p-0 overflow-hidden max-h-[50vh]", className)}>
+    <BentoCard
+      className={cn("flex flex-col p-0 overflow-hidden max-h-[50vh] max-h-[50dvh]", className)}
+    >
       {/* Header */}
       <div className="flex items-center justify-between border-b border-border/50 dark:border-white/[0.06]">
         <div className="flex items-center gap-4 p-4">
diff --git a/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx b/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx
index f1afa32db..af51746b2 100644
--- a/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx
@@ -70,7 +70,7 @@ export function AddKeyDialog({
 
   return (
     <Dialog open={open} onOpenChange={handleClose}>
-      <DialogContent className="max-w-2xl max-h-[90dvh] max-h-[90vh] p-0 flex flex-col overflow-hidden">
+      <DialogContent className="max-w-2xl max-h-[90vh] max-h-[90dvh] p-0 flex flex-col overflow-hidden">
         {generatedKey ? (
           <>
             <DialogHeader className="px-6 pt-6 pb-4 border-b">
diff --git a/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx b/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx
index c91c1fa74..f9314c137 100644
--- a/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx
@@ -34,7 +34,7 @@ export function AddUserDialog({
           <ListPlus className="h-4 w-4" /> {t("addUser")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-h-[85vh] overflow-y-auto">
+      <DialogContent className="max-h-[85vh] max-h-[85dvh] overflow-y-auto">
         <FormErrorBoundary>
           <UserForm onSuccess={() => setOpen(false)} currentUser={currentUser} />
         </FormErrorBoundary>
diff --git a/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx b/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx
index 22f7e2667..cb9aaa96a 100644
--- a/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx
@@ -443,7 +443,7 @@ function BatchEditDialogInner({
           </DialogDescription>
         </DialogHeader>
 
-        <div className="max-h-[70vh] overflow-y-auto space-y-6 pr-1">
+        <div className="max-h-[70vh] max-h-[70dvh] overflow-y-auto space-y-6 pr-1">
           {selectedUsersCount > 0 ? (
             <BatchUserSection
               affectedUsersCount={selectedUsersCount}
diff --git a/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx b/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx
index ea543338f..d0a9ac269 100644
--- a/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx
@@ -52,7 +52,7 @@ export function EditKeyDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl max-h-[90dvh] p-0 flex flex-col overflow-hidden">
+      <DialogContent className="max-w-2xl max-h-[90vh] max-h-[90dvh] p-0 flex flex-col overflow-hidden">
         <DialogHeader className="sr-only">
           <DialogTitle>{t("title")}</DialogTitle>
           <DialogDescription>{t("description")}</DialogDescription>
diff --git a/src/app/[locale]/dashboard/_components/user/key-actions.tsx b/src/app/[locale]/dashboard/_components/user/key-actions.tsx
index 610ae7b65..37f7219c1 100644
--- a/src/app/[locale]/dashboard/_components/user/key-actions.tsx
+++ b/src/app/[locale]/dashboard/_components/user/key-actions.tsx
@@ -50,7 +50,7 @@ export function KeyActions({
             <SquarePen className="h-4 w-4" />
           </button>
         </DialogTrigger>
-        <DialogContent className="max-h-[80vh] flex flex-col overflow-hidden">
+        <DialogContent className="max-h-[80vh] max-h-[80dvh] flex flex-col overflow-hidden">
           <FormErrorBoundary>
             <EditKeyForm
               keyData={keyData}
@@ -75,7 +75,7 @@ export function KeyActions({
               <Trash2 className="h-4 w-4" />
             </button>
           </DialogTrigger>
-          <DialogContent className="max-h-[80vh] flex flex-col overflow-hidden">
+          <DialogContent className="max-h-[80vh] max-h-[80dvh] flex flex-col overflow-hidden">
             <FormErrorBoundary>
               <DeleteKeyConfirm keyData={keyData} onSuccess={() => setOpenDelete(false)} />
             </FormErrorBoundary>
diff --git a/src/app/[locale]/dashboard/_components/user/key-list-header.tsx b/src/app/[locale]/dashboard/_components/user/key-list-header.tsx
index 84efc15b1..c84dbefcf 100644
--- a/src/app/[locale]/dashboard/_components/user/key-list-header.tsx
+++ b/src/app/[locale]/dashboard/_components/user/key-list-header.tsx
@@ -318,7 +318,7 @@ export function KeyListHeader({
                 <ListPlus className="h-3.5 w-3.5" /> {t("addKey")}
               </Button>
             </DialogTrigger>
-            <DialogContent className="max-h-[80vh] flex flex-col overflow-y-auto">
+            <DialogContent className="max-h-[80vh] max-h-[80dvh] flex flex-col overflow-y-auto">
               <FormErrorBoundary>
                 <AddKeyForm
                   userId={activeUser?.id}
diff --git a/src/app/[locale]/dashboard/_components/user/user-actions.tsx b/src/app/[locale]/dashboard/_components/user/user-actions.tsx
index 1913bbeb2..d3019f280 100644
--- a/src/app/[locale]/dashboard/_components/user/user-actions.tsx
+++ b/src/app/[locale]/dashboard/_components/user/user-actions.tsx
@@ -40,7 +40,7 @@ export function UserActions({ user, currentUser }: UserActionsProps) {
             <SquarePen className="h-3.5 w-3.5" />
           </button>
         </DialogTrigger>
-        <DialogContent className="max-h-[85vh] overflow-y-auto">
+        <DialogContent className="max-h-[85vh] max-h-[85dvh] overflow-y-auto">
           <FormErrorBoundary>
             <UserForm user={user} onSuccess={() => setOpenEdit(false)} currentUser={currentUser} />
           </FormErrorBoundary>
diff --git a/src/app/[locale]/dashboard/_components/user/user-list.tsx b/src/app/[locale]/dashboard/_components/user/user-list.tsx
index fa6da22d2..8c9c58326 100644
--- a/src/app/[locale]/dashboard/_components/user/user-list.tsx
+++ b/src/app/[locale]/dashboard/_components/user/user-list.tsx
@@ -388,7 +388,7 @@ export function UserList({ users, activeUserId, onUserSelect, currentUser }: Use
           if (!open) setEditUser(null);
         }}
       >
-        <DialogContent className="max-h-[85vh] overflow-y-auto">
+        <DialogContent className="max-h-[85vh] max-h-[85dvh] overflow-y-auto">
           <FormErrorBoundary>
             {editUser ? (
               <UserForm
diff --git a/src/app/[locale]/dashboard/layout.tsx b/src/app/[locale]/dashboard/layout.tsx
index 19b020358..2fe637f75 100644
--- a/src/app/[locale]/dashboard/layout.tsx
+++ b/src/app/[locale]/dashboard/layout.tsx
@@ -27,7 +27,7 @@ export default async function DashboardLayout({
   }
 
   return (
-    <div className="min-h-screen bg-background">
+    <div className="min-h-[var(--cch-viewport-height,100vh)] bg-background">
       <DashboardHeader session={session} />
       <DashboardMain>{children}</DashboardMain>
       <WebhookMigrationDialog />
diff --git a/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx b/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx
index abe61ebbc..d11885ab5 100644
--- a/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx
+++ b/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx
@@ -149,7 +149,7 @@ export function EditKeyQuotaDialog({
           </Button>
         )}
       </DialogTrigger>
-      <DialogContent className="sm:max-w-[600px] max-h-[70vh] flex flex-col">
+      <DialogContent className="sm:max-w-[600px] max-h-[70vh] max-h-[70dvh] flex flex-col">
         <DialogHeader className="flex-shrink-0">
           <DialogTitle>{t("title")}</DialogTitle>
           <DialogDescription>{t("description", { keyName, userName })}</DialogDescription>
diff --git a/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx b/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx
index be54a92d0..4d148690a 100644
--- a/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx
+++ b/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx
@@ -87,7 +87,7 @@ export function EditUserQuotaDialog({
           </Button>
         )}
       </DialogTrigger>
-      <DialogContent className="sm:max-w-[600px] max-h-[70vh] flex flex-col">
+      <DialogContent className="sm:max-w-[600px] max-h-[70vh] max-h-[70dvh] flex flex-col">
         <DialogHeader className="flex-shrink-0">
           <DialogTitle>{t("title")}</DialogTitle>
           <DialogDescription>{t("description", { userName })}</DialogDescription>
diff --git a/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx b/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx
index b26143ee4..16264d343 100644
--- a/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx
+++ b/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx
@@ -67,7 +67,7 @@ export function SessionMessagesDialog({ sessionId }: SessionMessagesDialogProps)
           {t("actions.view")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-3xl max-h-[80vh] overflow-y-auto">
+      <DialogContent className="max-w-3xl max-h-[80vh] max-h-[80dvh] overflow-y-auto">
         <DialogHeader>
           <DialogTitle>{t("details.title")}</DialogTitle>
           <DialogDescription className="font-mono text-xs">{sessionId}</DialogDescription>
diff --git a/src/app/[locale]/internal/dashboard/big-screen/loading.tsx b/src/app/[locale]/internal/dashboard/big-screen/loading.tsx
index 33e7040e9..60947d22e 100644
--- a/src/app/[locale]/internal/dashboard/big-screen/loading.tsx
+++ b/src/app/[locale]/internal/dashboard/big-screen/loading.tsx
@@ -3,7 +3,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 
 export default function BigScreenLoading() {
   return (
-    <div className="min-h-screen bg-background p-6 space-y-6">
+    <div className="min-h-[var(--cch-viewport-height,100vh)] bg-background p-6 space-y-6">
       <Skeleton className="h-8 w-48" />
       <div className="grid gap-4 lg:grid-cols-4">
         {Array.from({ length: 4 }).map((_, index) => (
diff --git a/src/app/[locale]/internal/dashboard/big-screen/page.tsx b/src/app/[locale]/internal/dashboard/big-screen/page.tsx
index 5b6060bee..c06b41af0 100644
--- a/src/app/[locale]/internal/dashboard/big-screen/page.tsx
+++ b/src/app/[locale]/internal/dashboard/big-screen/page.tsx
@@ -787,7 +787,7 @@ export default function BigScreenPage() {
 
   return (
     <div
-      className={`relative w-full h-screen overflow-hidden transition-colors duration-500 font-sans selection:bg-orange-500/30 ${theme.bg}`}
+      className={`relative w-full h-[var(--cch-viewport-height,100vh)] overflow-hidden transition-colors duration-500 font-sans selection:bg-orange-500/30 ${theme.bg}`}
     >
       <ParticleBackground themeMode={themeMode} />
 
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index a0b201806..7f2309f96 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -80,7 +80,7 @@ export default async function RootLayout({
       <body className="antialiased">
         <NextIntlClientProvider messages={messages} timeZone={timeZone} now={now}>
           <AppProviders>
-            <div className="flex min-h-screen flex-col bg-background text-foreground">
+            <div className="flex min-h-[var(--cch-viewport-height,100vh)] flex-col bg-background text-foreground">
               <main className="flex-1">{children}</main>
               <Footer />
             </div>
diff --git a/src/app/[locale]/login/loading.tsx b/src/app/[locale]/login/loading.tsx
index d1dc82c19..bc64028b7 100644
--- a/src/app/[locale]/login/loading.tsx
+++ b/src/app/[locale]/login/loading.tsx
@@ -3,7 +3,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 
 export default function LoginLoading() {
   return (
-    <div className="flex min-h-screen bg-background">
+    <div className="flex min-h-[var(--cch-viewport-height,100vh)] bg-background">
       {/* Brand Panel Skeleton - Desktop Only */}
       <div className="hidden w-[45%] items-center justify-center lg:flex">
         <div className="flex flex-col items-center gap-6">
diff --git a/src/app/[locale]/login/page.tsx b/src/app/[locale]/login/page.tsx
index 48421f025..d9267d52c 100644
--- a/src/app/[locale]/login/page.tsx
+++ b/src/app/[locale]/login/page.tsx
@@ -203,7 +203,7 @@ function LoginPageContent() {
   const isLoading = status === "submitting" || status === "success";
 
   return (
-    <div className="relative min-h-screen overflow-hidden bg-gradient-to-br from-background via-background to-orange-500/5 dark:to-orange-500/10">
+    <div className="relative min-h-[var(--cch-viewport-height,100vh)] overflow-hidden bg-gradient-to-br from-background via-background to-orange-500/5 dark:to-orange-500/10">
       {/* Fullscreen Loading Overlay */}
       {isLoading && (
         <div
@@ -253,7 +253,7 @@ function LoginPageContent() {
       </div>
 
       {/* Main Layout */}
-      <div className="flex min-h-screen">
+      <div className="flex min-h-[var(--cch-viewport-height,100vh)]">
         {/* Brand Panel - Desktop Only */}
         <motion.aside
           data-testid="login-brand-panel"
@@ -433,7 +433,7 @@ function LoginPageContent() {
 
 function LoginPageFallback() {
   return (
-    <div className="flex min-h-screen items-center justify-center bg-background">
+    <div className="flex min-h-[var(--cch-viewport-height,100vh)] items-center justify-center bg-background">
       <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
     </div>
   );
diff --git a/src/app/[locale]/my-usage/layout.tsx b/src/app/[locale]/my-usage/layout.tsx
index cc6e16e1e..e97d94050 100644
--- a/src/app/[locale]/my-usage/layout.tsx
+++ b/src/app/[locale]/my-usage/layout.tsx
@@ -21,7 +21,7 @@ export default async function MyUsageLayout({
   }
 
   return (
-    <div className="min-h-screen bg-background">
+    <div className="min-h-[var(--cch-viewport-height,100vh)] bg-background">
       <main className="mx-auto w-full max-w-4xl px-4 py-6 sm:px-6">{children}</main>
     </div>
   );
diff --git a/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx b/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx
index 0ac23b9ec..a2e6b0a63 100644
--- a/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx
+++ b/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx
@@ -131,7 +131,7 @@ export function AddRuleDialog() {
           {t("errorRules.add")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
+      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("errorRules.dialog.addTitle")}</DialogTitle>
diff --git a/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx b/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx
index c171215b4..5a72a7293 100644
--- a/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx
+++ b/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx
@@ -139,7 +139,7 @@ export function EditRuleDialog({ rule, open, onOpenChange }: EditRuleDialogProps
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
+      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("errorRules.dialog.editTitle")}</DialogTitle>
diff --git a/src/app/[locale]/settings/layout.tsx b/src/app/[locale]/settings/layout.tsx
index 55a633e56..034e072dd 100644
--- a/src/app/[locale]/settings/layout.tsx
+++ b/src/app/[locale]/settings/layout.tsx
@@ -31,7 +31,7 @@ export default async function SettingsLayout({
   const translatedNavItems = await getTranslatedNavItems();
 
   return (
-    <div className="min-h-screen bg-background">
+    <div className="min-h-[var(--cch-viewport-height,100vh)] bg-background">
       <DashboardHeader session={session} />
       <main className="mx-auto w-full max-w-7xl px-4 py-6 md:px-6 md:py-8 pb-24 md:pb-8">
         <div className="space-y-6">
diff --git a/src/app/[locale]/settings/notifications/_components/binding-selector.tsx b/src/app/[locale]/settings/notifications/_components/binding-selector.tsx
index f6ed4a2a4..6d76f082c 100644
--- a/src/app/[locale]/settings/notifications/_components/binding-selector.tsx
+++ b/src/app/[locale]/settings/notifications/_components/binding-selector.tsx
@@ -336,7 +336,7 @@ export function BindingSelector({ type, targets, bindings, onSave }: BindingSele
         open={templateDialogOpen}
         onOpenChange={(open) => (open ? setTemplateDialogOpen(true) : closeTemplateDialog())}
       >
-        <DialogContent className="w-full max-w-3xl max-h-[90vh] overflow-y-auto">
+        <DialogContent className="w-full max-w-3xl max-h-[90vh] max-h-[90dvh] overflow-y-auto">
           <DialogHeader>
             <DialogTitle>{t("notifications.bindings.templateOverrideTitle")}</DialogTitle>
           </DialogHeader>
diff --git a/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx b/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx
index 5fcbb7a30..25fb17164 100644
--- a/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx
+++ b/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx
@@ -228,7 +228,7 @@ export function WebhookTargetDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-full max-w-2xl max-h-[90vh] overflow-y-auto">
+      <DialogContent className="w-full max-w-2xl max-h-[90vh] max-h-[90dvh] overflow-y-auto">
         <DialogHeader>
           <DialogTitle>
             {mode === "create"
diff --git a/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx b/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx
index 2940ba240..118e7d118 100644
--- a/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx
+++ b/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx
@@ -251,7 +251,7 @@ export function SyncConflictDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-3xl max-h-[80vh] overflow-hidden flex flex-col">
+      <DialogContent className="max-w-3xl max-h-[80vh] max-h-[80dvh] overflow-hidden flex flex-col">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <AlertTriangle className="h-5 w-5 text-amber-500" />
diff --git a/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx b/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
index 2363923fb..ece58f564 100644
--- a/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
@@ -22,7 +22,7 @@ export function AddProviderDialog({ enableMultiProviderTypes }: AddProviderDialo
           <ServerCog className="h-4 w-4" /> {t("addProvider")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
+      <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
         <VisuallyHidden>
           <DialogTitle>{t("addProvider")}</DialogTitle>
         </VisuallyHidden>
diff --git a/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx b/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx
index eaebd4992..1f8876f62 100644
--- a/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx
@@ -136,7 +136,7 @@ export function AutoSortPriorityDialog() {
           {t("button")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
         <DialogHeader>
           <DialogTitle>{t("dialogTitle")}</DialogTitle>
           <DialogDescription>{t("dialogDescription")}</DialogDescription>
diff --git a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx
index f55ac2ae7..3612f740d 100644
--- a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx
@@ -119,7 +119,7 @@ function BatchEditDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-6xl max-h-[90vh] overflow-hidden flex flex-col">
+      <DialogContent className="max-w-6xl max-h-[90vh] max-h-[90dvh] overflow-hidden flex flex-col">
         <ProviderFormProvider
           mode="batch"
           enableMultiProviderTypes={false}
diff --git a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx
index a1f88394e..97bea031f 100644
--- a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx
+++ b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx
@@ -112,7 +112,7 @@ export function ProviderBatchPreviewStep({
       </p>
 
       {/* Provider groups */}
-      <div className="max-h-[50vh] space-y-3 overflow-y-auto">
+      <div className="max-h-[50vh] max-h-[50dvh] space-y-3 overflow-y-auto">
         {grouped.map((group) => {
           const excluded = excludedProviderIds.has(group.providerId);
           return (
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
index 4ec02fcda..0f895243a 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
@@ -550,7 +550,7 @@ function ProviderFormContent({
   };
 
   return (
-    <form onSubmit={handleSubmit} className="flex flex-col h-full max-h-[85vh]">
+    <form onSubmit={handleSubmit} className="flex flex-col h-full max-h-[85vh] max-h-[85dvh]">
       {/* Form Layout */}
       <div className="flex flex-col lg:flex-row flex-1 min-h-0">
         <div className="order-2 md:order-1 shrink-0">
diff --git a/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx b/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx
index 2b32ee667..f23ebfee2 100644
--- a/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx
@@ -172,7 +172,7 @@ export function TestResultCard({ result }: TestResultCardProps) {
                 {t("viewDetails")}
               </Button>
             </DialogTrigger>
-            <DialogContent className="max-w-4xl max-h-[85vh] overflow-y-auto">
+            <DialogContent className="max-w-4xl max-h-[85vh] max-h-[85dvh] overflow-y-auto">
               <DialogHeader>
                 <DialogTitle className="flex items-center gap-2">
                   {icon}
diff --git a/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx b/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
index a7da424b1..74a78bc89 100644
--- a/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
+++ b/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
@@ -280,7 +280,7 @@ export function ProviderListItem({
                       <Edit className="h-3.5 w-3.5" />
                     </Button>
                   </DialogTrigger>
-                  <DialogContent className="sm:max-w-3xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
+                  <DialogContent className="sm:max-w-3xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
                     <FormErrorBoundary>
                       <ProviderForm
                         mode="edit"
@@ -308,7 +308,7 @@ export function ProviderListItem({
                       <Copy className="h-3.5 w-3.5" />
                     </Button>
                   </DialogTrigger>
-                  <DialogContent className="sm:max-w-3xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
+                  <DialogContent className="sm:max-w-3xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
                     <FormErrorBoundary>
                       <ProviderForm
                         mode="create"
diff --git a/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx b/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
index 081c461ee..e669b5355 100644
--- a/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
+++ b/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
@@ -978,7 +978,7 @@ export function ProviderRichListItem({
 
       {/* 编辑 Dialog */}
       <Dialog open={openEdit} onOpenChange={setOpenEdit}>
-        <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
+        <DialogContent className="max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
           <VisuallyHidden>
             <DialogTitle>{t("editProvider")}</DialogTitle>
           </VisuallyHidden>
@@ -997,7 +997,7 @@ export function ProviderRichListItem({
 
       {/* 克隆 Dialog */}
       <Dialog open={openClone} onOpenChange={setOpenClone}>
-        <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
+        <DialogContent className="max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
           <VisuallyHidden>
             <DialogTitle>{t("clone")}</DialogTitle>
           </VisuallyHidden>
diff --git a/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx b/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx
index 89b4a263c..f1867efca 100644
--- a/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx
@@ -140,7 +140,7 @@ export function ReclusterVendorsDialog() {
           {t("button")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
         <DialogHeader>
           <DialogTitle>{t("dialogTitle")}</DialogTitle>
           <DialogDescription>{t("dialogDescription")}</DialogDescription>
diff --git a/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx b/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx
index 92b8d3e23..2ab328d40 100644
--- a/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx
@@ -227,7 +227,7 @@ export function SchedulingRulesDialog() {
           {t("triggerButton")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-3xl max-h-[80vh] overflow-y-auto">
+      <DialogContent className="max-w-3xl max-h-[80vh] max-h-[80dvh] overflow-y-auto">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2 text-xl">
             <Lightbulb className="h-5 w-5 text-primary" />
diff --git a/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx b/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
index 840e258ef..e5d676919 100644
--- a/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
+++ b/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
@@ -105,7 +105,7 @@ export function VendorKeysCompactList(props: {
                 {t("addVendorKey")}
               </Button>
             </DialogTrigger>
-            <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
+            <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
               <VisuallyHidden>
                 <DialogTitle>{t("addVendorKey")}</DialogTitle>
               </VisuallyHidden>
@@ -503,7 +503,7 @@ function VendorKeyRow(props: {
                     <Edit2 className="h-4 w-4" />
                   </Button>
                 </DialogTrigger>
-                <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] flex flex-col overflow-hidden p-0 gap-0">
+                <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
                   <VisuallyHidden>
                     <DialogTitle>{t("editProvider")}</DialogTitle>
                   </VisuallyHidden>
diff --git a/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx b/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx
index cd5f79455..cac1c0fa6 100644
--- a/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx
+++ b/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx
@@ -260,7 +260,7 @@ export function FilterDialog({ mode, trigger, filter, open, onOpenChange }: Prop
   };
 
   const content = (
-    <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
+    <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
       <DialogHeader className="flex-shrink-0">
         <DialogTitle className="text-foreground">
           {mode === "create" ? t("dialog.createTitle") : t("dialog.editTitle")}
diff --git a/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx b/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx
index dbd25346b..76e37a303 100644
--- a/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx
+++ b/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx
@@ -76,7 +76,7 @@ export function AddWordDialog() {
           {t("sensitiveWords.add")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("sensitiveWords.dialog.addTitle")}</DialogTitle>
diff --git a/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx b/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx
index 114c62b16..7f2c72fed 100644
--- a/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx
+++ b/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx
@@ -79,7 +79,7 @@ export function EditWordDialog({ word, open, onOpenChange }: EditWordDialogProps
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("sensitiveWords.dialog.editTitle")}</DialogTitle>
diff --git a/src/app/[locale]/usage-doc/layout.tsx b/src/app/[locale]/usage-doc/layout.tsx
index 06b1b1044..370ef28e9 100644
--- a/src/app/[locale]/usage-doc/layout.tsx
+++ b/src/app/[locale]/usage-doc/layout.tsx
@@ -42,7 +42,7 @@ export default async function UsageDocLayout({
   const [session, t] = await Promise.all([getSession(), getUsageTranslations(locale)]);
 
   return (
-    <div className="min-h-screen bg-background">
+    <div className="min-h-[var(--cch-viewport-height,100vh)] bg-background">
       {/* 条件渲染头部：已登录显示 DashboardHeader，未登录显示简化版头部 */}
       {session ? (
         <DashboardHeader session={session} />
diff --git a/src/app/globals.css b/src/app/globals.css
index 8f19ad1e9..8dff49fbd 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -148,36 +148,6 @@
     padding-bottom: var(--safe-area-pb, env(safe-area-inset-bottom, 0px));
   }
 
-  /* 视口高度：在移动端地址栏伸缩时，dvh 比 vh 更符合可视区域 */
-  @supports (height: 100dvh) {
-    .max-h-\[50vh\] {
-      max-height: 50dvh;
-    }
-    .max-h-\[70vh\] {
-      max-height: 70dvh;
-    }
-    .max-h-\[80vh\] {
-      max-height: 80dvh;
-    }
-    .max-h-\[85vh\] {
-      max-height: 85dvh;
-    }
-    .max-h-\[90vh\] {
-      max-height: 90dvh;
-    }
-    .max-h-\[95vh\] {
-      max-height: 95dvh;
-    }
-
-    /* vaul Drawer 的 max-h 通过 data attribute 控制，直接用 dvh 覆盖 vh */
-    [data-slot="drawer-content"][data-vaul-drawer-direction="top"] {
-      max-height: 80dvh;
-    }
-    [data-slot="drawer-content"][data-vaul-drawer-direction="bottom"] {
-      max-height: 95dvh;
-    }
-  }
-
   /* 新增记录高亮动画 */
   @keyframes highlight-flash {
     0% {
diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
index 96dd5e6ea..2a883ddff 100644
--- a/src/components/ui/drawer.tsx
+++ b/src/components/ui/drawer.tsx
@@ -50,8 +50,8 @@ function DrawerContent({
         className={cn(
           "group/drawer-content bg-background fixed z-50 flex h-auto flex-col",
           "data-[vaul-drawer-direction=bottom]:safe-area-bottom data-[vaul-drawer-direction=left]:safe-area-bottom data-[vaul-drawer-direction=right]:safe-area-bottom",
-          "data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",
-          "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[95vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
+          "data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:max-h-[80dvh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",
+          "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[95vh] data-[vaul-drawer-direction=bottom]:max-h-[95dvh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
           "data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm",
           "data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-3/4 data-[vaul-drawer-direction=left]:border-r data-[vaul-drawer-direction=left]:sm:max-w-sm",
           className
diff --git a/src/lib/redis/client.ts b/src/lib/redis/client.ts
index 2726a75fc..b1694763f 100644
--- a/src/lib/redis/client.ts
+++ b/src/lib/redis/client.ts
@@ -20,7 +20,7 @@ function maskRedisUrl(redisUrl: string) {
  * Supports skipping certificate verification via REDIS_TLS_REJECT_UNAUTHORIZED env.
  * Includes servername for SNI (Server Name Indication) support.
  */
-function buildTlsConfig(redisUrl: string): Record<string, unknown> {
+function buildTlsConfig(redisUrl: string): NonNullable<RedisOptions["tls"]> {
   const raw = process.env.REDIS_TLS_REJECT_UNAUTHORIZED?.trim();
   const rejectUnauthorized = raw !== "false" && raw !== "0";
 
@@ -42,7 +42,10 @@ function buildTlsConfig(redisUrl: string): Record<string, unknown> {
  * - When `redis://` is used, keep plaintext TCP (no TLS option)
  * - Supports REDIS_TLS_REJECT_UNAUTHORIZED env to skip certificate verification
  */
-export function buildRedisOptionsForUrl(redisUrl: string) {
+export function buildRedisOptionsForUrl(redisUrl: string): {
+  isTLS: boolean;
+  options: RedisOptions;
+} {
   const isTLS = (() => {
     try {
       const parsed = new URL(redisUrl);
@@ -53,7 +56,7 @@ export function buildRedisOptionsForUrl(redisUrl: string) {
     }
   })();
 
-  const baseOptions = {
+  const baseOptions: RedisOptions = {
     enableOfflineQueue: false, // 快速失败
     maxRetriesPerRequest: 3,
     retryStrategy(times: number) {
@@ -65,12 +68,13 @@ export function buildRedisOptionsForUrl(redisUrl: string) {
       logger.warn(`[Redis] Retry ${times}/5 after ${delay}ms`);
       return delay;
     },
-  } as const;
+  };
 
-  // Explicit TLS config for Upstash and other managed Redis providers
-  const tlsOptions = isTLS ? { tls: buildTlsConfig(redisUrl) } : {};
+  const options: RedisOptions = isTLS
+    ? { ...baseOptions, tls: buildTlsConfig(redisUrl) }
+    : { ...baseOptions };
 
-  return { isTLS, options: { ...baseOptions, ...tlsOptions } };
+  return { isTLS, options };
 }
 
 export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean }): Redis | null {
@@ -107,7 +111,7 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
     }
 
     // 3. 使用组合后的配置创建客户端
-    const client = new Redis(redisUrl, redisOptions as RedisOptions);
+    const client = new Redis(redisUrl, redisOptions);
     redisClient = client;
 
     // 4. 保持原始的事件监听器
@@ -151,7 +155,10 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
 
 export async function closeRedis(): Promise<void> {
   if (redisClient) {
-    await redisClient.quit();
-    redisClient = null;
+    const client = redisClient;
+    await client.quit();
+    if (redisClient === client) {
+      redisClient = null;
+    }
   }
 }
diff --git a/tests/unit/login/login-visual-regression.test.tsx b/tests/unit/login/login-visual-regression.test.tsx
index f9b3abff5..c251a552f 100644
--- a/tests/unit/login/login-visual-regression.test.tsx
+++ b/tests/unit/login/login-visual-regression.test.tsx
@@ -64,9 +64,10 @@ describe("LoginPage Visual Regression", () => {
   it("renders key structural elements", async () => {
     await render();
 
-    const mainContainer = container.querySelector("div.min-h-screen");
+    const mainContainer = container.querySelector("div.bg-gradient-to-br");
     expect(mainContainer).not.toBeNull();
     const className = mainContainer?.className || "";
+    expect(className).toContain("min-h-[var(--cch-viewport-height,100vh)]");
     expect(className).toContain("bg-gradient-to");
 
     const langSwitcher = container.querySelector(".fixed.top-4.right-4");

From e88440a5d50f2e6f81caaabce88916fa88bc7d2e Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:11:16 +0800
Subject: [PATCH 12/27] =?UTF-8?q?fix(ui,i18n,redis):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20max-h/i18n=20=E4=B8=8E=20closeRedis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 messages/en/dashboard.json                    |  6 +++++
 messages/en/settings/providers/batchEdit.json |  1 +
 messages/ja/dashboard.json                    |  6 +++++
 messages/ja/settings/providers/batchEdit.json |  1 +
 messages/ru/dashboard.json                    |  6 +++++
 messages/ru/settings/providers/batchEdit.json |  1 +
 messages/zh-CN/dashboard.json                 |  6 +++++
 .../zh-CN/settings/providers/batchEdit.json   |  1 +
 messages/zh-TW/dashboard.json                 |  6 +++++
 .../zh-TW/settings/providers/batchEdit.json   |  1 +
 .../bento/statistics-chart-card.tsx           |  5 +++-
 .../_components/user/add-key-dialog.tsx       |  2 +-
 .../_components/user/add-user-dialog.tsx      |  2 +-
 .../user/batch-edit/batch-edit-dialog.tsx     |  2 +-
 .../_components/user/create-user-dialog.tsx   |  2 +-
 .../_components/user/edit-key-dialog.tsx      |  2 +-
 .../_components/user/edit-user-dialog.tsx     |  2 +-
 .../_components/user/key-actions.tsx          |  4 ++--
 .../_components/user/key-list-header.tsx      | 24 ++++++++++++-------
 .../_components/user/user-actions.tsx         |  2 +-
 .../dashboard/_components/user/user-list.tsx  |  2 +-
 .../_components/edit-key-quota-dialog.tsx     |  2 +-
 .../_components/edit-user-quota-dialog.tsx    |  2 +-
 .../_components/session-messages-dialog.tsx   |  2 +-
 .../_components/add-rule-dialog.tsx           |  2 +-
 .../_components/edit-rule-dialog.tsx          |  2 +-
 .../_components/binding-selector.tsx          |  2 +-
 .../_components/webhook-target-dialog.tsx     |  2 +-
 .../_components/sync-conflict-dialog.tsx      |  2 +-
 .../_components/add-provider-dialog.tsx       |  2 +-
 .../_components/auto-sort-priority-dialog.tsx |  2 +-
 .../batch-edit/provider-batch-dialog.tsx      |  2 +-
 .../provider-batch-preview-step.tsx           | 10 ++++----
 .../_components/forms/provider-form/index.tsx |  5 +++-
 .../_components/forms/test-result-card.tsx    |  2 +-
 .../_components/provider-list-item.legacy.tsx |  4 ++--
 .../_components/provider-rich-list-item.tsx   |  4 ++--
 .../_components/recluster-vendors-dialog.tsx  |  2 +-
 .../_components/scheduling-rules-dialog.tsx   |  2 +-
 .../_components/vendor-keys-compact-list.tsx  |  4 ++--
 .../_components/filter-dialog.tsx             |  2 +-
 .../_components/add-word-dialog.tsx           |  2 +-
 .../_components/edit-word-dialog.tsx          |  2 +-
 src/app/globals.css                           | 12 ++++++++++
 src/components/ui/drawer.tsx                  |  4 ++--
 src/lib/redis/client.ts                       | 16 ++++++++++---
 46 files changed, 124 insertions(+), 53 deletions(-)

diff --git a/messages/en/dashboard.json b/messages/en/dashboard.json
index 084d29071..15195b0c5 100644
--- a/messages/en/dashboard.json
+++ b/messages/en/dashboard.json
@@ -790,6 +790,12 @@
   },
   "keyListHeader": {
     "todayUsage": "Today's Usage",
+    "userStatus": {
+      "disabled": "Disabled",
+      "expired": "Expired",
+      "expiringSoon": "Expiring soon",
+      "active": "Enabled"
+    },
     "allowedModels": {
       "label": "Allowed Models",
       "noRestrictions": "Allowed Models: No restrictions"
diff --git a/messages/en/settings/providers/batchEdit.json b/messages/en/settings/providers/batchEdit.json
index c1bc48a12..24fc6ec90 100644
--- a/messages/en/settings/providers/batchEdit.json
+++ b/messages/en/settings/providers/batchEdit.json
@@ -64,6 +64,7 @@
     "description": "Review changes before applying to {count} providers",
     "providerHeader": "{name}",
     "fieldChanged": "{field}: {before} -> {after}",
+    "nullValue": "null",
     "fieldSkipped": "{field}: Skipped ({reason})",
     "excludeProvider": "Exclude",
     "summary": "{providerCount} providers, {fieldCount} changes, {skipCount} skipped",
diff --git a/messages/ja/dashboard.json b/messages/ja/dashboard.json
index d6776bb09..1555e52af 100644
--- a/messages/ja/dashboard.json
+++ b/messages/ja/dashboard.json
@@ -782,6 +782,12 @@
   },
   "keyListHeader": {
     "todayUsage": "本日の使用量",
+    "userStatus": {
+      "disabled": "無効",
+      "expired": "期限切れ",
+      "expiringSoon": "まもなく期限切れ",
+      "active": "有効"
+    },
     "allowedModels": {
       "label": "許可モデル",
       "noRestrictions": "許可されたクライアント：制限なし"
diff --git a/messages/ja/settings/providers/batchEdit.json b/messages/ja/settings/providers/batchEdit.json
index 8feb4f198..166fa5d68 100644
--- a/messages/ja/settings/providers/batchEdit.json
+++ b/messages/ja/settings/providers/batchEdit.json
@@ -64,6 +64,7 @@
     "description": "{count} 件のプロバイダーに適用する前に変更内容を確認してください",
     "providerHeader": "{name}",
     "fieldChanged": "{field}: {before} -> {after}",
+    "nullValue": "なし",
     "fieldSkipped": "{field}: スキップ ({reason})",
     "excludeProvider": "除外",
     "summary": "{providerCount} 件のプロバイダー, {fieldCount} 件の変更, {skipCount} 件スキップ",
diff --git a/messages/ru/dashboard.json b/messages/ru/dashboard.json
index c98716709..64a2c8211 100644
--- a/messages/ru/dashboard.json
+++ b/messages/ru/dashboard.json
@@ -785,6 +785,12 @@
   },
   "keyListHeader": {
     "todayUsage": "Использование сегодня",
+    "userStatus": {
+      "disabled": "Отключен",
+      "expired": "Истек",
+      "expiringSoon": "Скоро истечет",
+      "active": "Активен"
+    },
     "allowedModels": {
       "label": "Разрешённые модели",
       "noRestrictions": "Разрешённые модели: без ограничений"
diff --git a/messages/ru/settings/providers/batchEdit.json b/messages/ru/settings/providers/batchEdit.json
index 9a620bf1b..b601c8b87 100644
--- a/messages/ru/settings/providers/batchEdit.json
+++ b/messages/ru/settings/providers/batchEdit.json
@@ -64,6 +64,7 @@
     "description": "Проверьте изменения перед применением к {count} поставщикам",
     "providerHeader": "{name}",
     "fieldChanged": "{field}: {before} -> {after}",
+    "nullValue": "null",
     "fieldSkipped": "{field}: Пропущено ({reason})",
     "excludeProvider": "Исключить",
     "summary": "{providerCount} поставщиков, {fieldCount} изменений, {skipCount} пропущено",
diff --git a/messages/zh-CN/dashboard.json b/messages/zh-CN/dashboard.json
index 740766f85..6743b6857 100644
--- a/messages/zh-CN/dashboard.json
+++ b/messages/zh-CN/dashboard.json
@@ -791,6 +791,12 @@
   },
   "keyListHeader": {
     "todayUsage": "今日用量",
+    "userStatus": {
+      "disabled": "已禁用",
+      "expired": "已过期",
+      "expiringSoon": "即将过期",
+      "active": "已启用"
+    },
     "allowedModels": {
       "label": "允许的模型",
       "noRestrictions": "允许的模型：无限制"
diff --git a/messages/zh-CN/settings/providers/batchEdit.json b/messages/zh-CN/settings/providers/batchEdit.json
index 49d938805..64ce1ad86 100644
--- a/messages/zh-CN/settings/providers/batchEdit.json
+++ b/messages/zh-CN/settings/providers/batchEdit.json
@@ -64,6 +64,7 @@
     "description": "将变更应用到 {count} 个供应商前请先确认",
     "providerHeader": "{name}",
     "fieldChanged": "{field}: {before} -> {after}",
+    "nullValue": "空",
     "fieldSkipped": "{field}: 已跳过 ({reason})",
     "excludeProvider": "排除",
     "summary": "{providerCount} 个供应商, {fieldCount} 项变更, {skipCount} 项跳过",
diff --git a/messages/zh-TW/dashboard.json b/messages/zh-TW/dashboard.json
index 96e47b627..e28e8eb07 100644
--- a/messages/zh-TW/dashboard.json
+++ b/messages/zh-TW/dashboard.json
@@ -782,6 +782,12 @@
   },
   "keyListHeader": {
     "todayUsage": "今日使用量",
+    "userStatus": {
+      "disabled": "已禁用",
+      "expired": "已過期",
+      "expiringSoon": "即將過期",
+      "active": "已啟用"
+    },
     "allowedModels": {
       "label": "允許的模型",
       "noRestrictions": "允許的模型：無限制"
diff --git a/messages/zh-TW/settings/providers/batchEdit.json b/messages/zh-TW/settings/providers/batchEdit.json
index b8541e6e1..664a23a52 100644
--- a/messages/zh-TW/settings/providers/batchEdit.json
+++ b/messages/zh-TW/settings/providers/batchEdit.json
@@ -64,6 +64,7 @@
     "description": "將變更應用到 {count} 個供應商前請先確認",
     "providerHeader": "{name}",
     "fieldChanged": "{field}: {before} -> {after}",
+    "nullValue": "空",
     "fieldSkipped": "{field}: 已跳過 ({reason})",
     "excludeProvider": "排除",
     "summary": "{providerCount} 個供應商, {fieldCount} 項變更, {skipCount} 項跳過",
diff --git a/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx b/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx
index 7dbbae668..0d67f4b42 100644
--- a/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx
+++ b/src/app/[locale]/dashboard/_components/bento/statistics-chart-card.tsx
@@ -169,7 +169,10 @@ export function StatisticsChartCard({
 
   return (
     <BentoCard
-      className={cn("flex flex-col p-0 overflow-hidden max-h-[50vh] max-h-[50dvh]", className)}
+      className={cn(
+        "flex flex-col p-0 overflow-hidden max-h-[var(--cch-viewport-height-50)]",
+        className
+      )}
     >
       {/* Header */}
       <div className="flex items-center justify-between border-b border-border/50 dark:border-white/[0.06]">
diff --git a/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx b/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx
index af51746b2..746c412d8 100644
--- a/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/add-key-dialog.tsx
@@ -70,7 +70,7 @@ export function AddKeyDialog({
 
   return (
     <Dialog open={open} onOpenChange={handleClose}>
-      <DialogContent className="max-w-2xl max-h-[90vh] max-h-[90dvh] p-0 flex flex-col overflow-hidden">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-90)] p-0 flex flex-col overflow-hidden">
         {generatedKey ? (
           <>
             <DialogHeader className="px-6 pt-6 pb-4 border-b">
diff --git a/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx b/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx
index f9314c137..168560aec 100644
--- a/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/add-user-dialog.tsx
@@ -34,7 +34,7 @@ export function AddUserDialog({
           <ListPlus className="h-4 w-4" /> {t("addUser")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-h-[85vh] max-h-[85dvh] overflow-y-auto">
+      <DialogContent className="max-h-[var(--cch-viewport-height-85)] overflow-y-auto">
         <FormErrorBoundary>
           <UserForm onSuccess={() => setOpen(false)} currentUser={currentUser} />
         </FormErrorBoundary>
diff --git a/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx b/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx
index cb9aaa96a..d466a2dde 100644
--- a/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/batch-edit/batch-edit-dialog.tsx
@@ -443,7 +443,7 @@ function BatchEditDialogInner({
           </DialogDescription>
         </DialogHeader>
 
-        <div className="max-h-[70vh] max-h-[70dvh] overflow-y-auto space-y-6 pr-1">
+        <div className="max-h-[var(--cch-viewport-height-70)] overflow-y-auto space-y-6 pr-1">
           {selectedUsersCount > 0 ? (
             <BatchUserSection
               affectedUsersCount={selectedUsersCount}
diff --git a/src/app/[locale]/dashboard/_components/user/create-user-dialog.tsx b/src/app/[locale]/dashboard/_components/user/create-user-dialog.tsx
index 32e8f73fe..93df8eb89 100644
--- a/src/app/[locale]/dashboard/_components/user/create-user-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/create-user-dialog.tsx
@@ -337,7 +337,7 @@ function CreateUserDialogInner({ onOpenChange, onSuccess }: CreateUserDialogProp
   }
 
   return (
-    <DialogContent className="w-full max-w-[95vw] sm:max-w-[85vw] md:max-w-[70vw] lg:max-w-3xl max-h-[90vh] max-h-[90dvh] p-0 flex flex-col overflow-hidden">
+    <DialogContent className="w-full max-w-[95vw] sm:max-w-[85vw] md:max-w-[70vw] lg:max-w-3xl max-h-[var(--cch-viewport-height-90)] p-0 flex flex-col overflow-hidden">
       <form onSubmit={form.handleSubmit} className="flex flex-1 min-h-0 flex-col">
         <DialogHeader className="px-6 pt-6 pb-4 border-b flex-shrink-0">
           <div className="flex items-center gap-2">
diff --git a/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx b/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx
index d0a9ac269..0a9d6827d 100644
--- a/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/edit-key-dialog.tsx
@@ -52,7 +52,7 @@ export function EditKeyDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl max-h-[90vh] max-h-[90dvh] p-0 flex flex-col overflow-hidden">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-90)] p-0 flex flex-col overflow-hidden">
         <DialogHeader className="sr-only">
           <DialogTitle>{t("title")}</DialogTitle>
           <DialogDescription>{t("description")}</DialogDescription>
diff --git a/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx b/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx
index 2a73c239b..9d687f0c1 100644
--- a/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx
@@ -244,7 +244,7 @@ function EditUserDialogInner({ onOpenChange, user, onSuccess }: EditUserDialogPr
   };
 
   return (
-    <DialogContent className="w-full max-w-[95vw] sm:max-w-[85vw] md:max-w-[70vw] lg:max-w-3xl max-h-[90vh] max-h-[90dvh] p-0 flex flex-col overflow-hidden">
+    <DialogContent className="w-full max-w-[95vw] sm:max-w-[85vw] md:max-w-[70vw] lg:max-w-3xl max-h-[var(--cch-viewport-height-90)] p-0 flex flex-col overflow-hidden">
       <form onSubmit={form.handleSubmit} className="flex flex-1 min-h-0 flex-col">
         <DialogHeader className="px-6 pt-6 pb-4 border-b flex-shrink-0">
           <div className="flex items-center gap-2">
diff --git a/src/app/[locale]/dashboard/_components/user/key-actions.tsx b/src/app/[locale]/dashboard/_components/user/key-actions.tsx
index 37f7219c1..ade599c7c 100644
--- a/src/app/[locale]/dashboard/_components/user/key-actions.tsx
+++ b/src/app/[locale]/dashboard/_components/user/key-actions.tsx
@@ -50,7 +50,7 @@ export function KeyActions({
             <SquarePen className="h-4 w-4" />
           </button>
         </DialogTrigger>
-        <DialogContent className="max-h-[80vh] max-h-[80dvh] flex flex-col overflow-hidden">
+        <DialogContent className="max-h-[var(--cch-viewport-height-80)] flex flex-col overflow-hidden">
           <FormErrorBoundary>
             <EditKeyForm
               keyData={keyData}
@@ -75,7 +75,7 @@ export function KeyActions({
               <Trash2 className="h-4 w-4" />
             </button>
           </DialogTrigger>
-          <DialogContent className="max-h-[80vh] max-h-[80dvh] flex flex-col overflow-hidden">
+          <DialogContent className="max-h-[var(--cch-viewport-height-80)] flex flex-col overflow-hidden">
             <FormErrorBoundary>
               <DeleteKeyConfirm keyData={keyData} onSuccess={() => setOpenDelete(false)} />
             </FormErrorBoundary>
diff --git a/src/app/[locale]/dashboard/_components/user/key-list-header.tsx b/src/app/[locale]/dashboard/_components/user/key-list-header.tsx
index c84dbefcf..f40ffce9e 100644
--- a/src/app/[locale]/dashboard/_components/user/key-list-header.tsx
+++ b/src/app/[locale]/dashboard/_components/user/key-list-header.tsx
@@ -27,6 +27,15 @@ import { UserActions } from "./user-actions";
 
 const PROXY_STATUS_REFRESH_INTERVAL = 2000;
 
+type UserStatusCode = "disabled" | "expired" | "expiringSoon" | "active";
+
+const USER_STATUS_LABEL_KEYS: Record<UserStatusCode, string> = {
+  disabled: "userStatus.disabled",
+  expired: "userStatus.expired",
+  expiringSoon: "userStatus.expiringSoon",
+  active: "userStatus.active",
+};
+
 async function fetchProxyStatus(): Promise<ProxyStatusResponse> {
   const result = await getProxyStatus();
   if (result.ok) {
@@ -123,19 +132,18 @@ export function KeyListHeader({
     const exp = activeUser.expiresAt ? new Date(activeUser.expiresAt).getTime() : null;
 
     let status: {
-      code: string;
-      badge: string;
+      code: UserStatusCode;
       variant: "default" | "secondary" | "destructive" | "outline";
     };
 
     if (!activeUser.isEnabled) {
-      status = { code: "disabled", badge: "已禁用", variant: "secondary" };
+      status = { code: "disabled", variant: "secondary" };
     } else if (exp && exp <= now) {
-      status = { code: "expired", badge: "已过期", variant: "destructive" };
+      status = { code: "expired", variant: "destructive" };
     } else if (exp && exp - now <= 72 * 60 * 60 * 1000) {
-      status = { code: "expiringSoon", badge: "即将过期", variant: "outline" };
+      status = { code: "expiringSoon", variant: "outline" };
     } else {
-      status = { code: "active", badge: "已启用", variant: "default" };
+      status = { code: "active", variant: "default" };
     }
 
     const expiryText = activeUser.expiresAt
@@ -255,7 +263,7 @@ export function KeyListHeader({
             <span>{activeUser ? activeUser.name : "-"}</span>
             {activeUser && userStatusInfo && (
               <Badge variant={userStatusInfo.status.variant} className="text-xs">
-                {userStatusInfo.status.badge}
+                {t(USER_STATUS_LABEL_KEYS[userStatusInfo.status.code])}
               </Badge>
             )}
             {activeUser && <UserActions user={activeUser} currentUser={currentUser} />}
@@ -318,7 +326,7 @@ export function KeyListHeader({
                 <ListPlus className="h-3.5 w-3.5" /> {t("addKey")}
               </Button>
             </DialogTrigger>
-            <DialogContent className="max-h-[80vh] max-h-[80dvh] flex flex-col overflow-y-auto">
+            <DialogContent className="max-h-[var(--cch-viewport-height-80)] flex flex-col overflow-y-auto">
               <FormErrorBoundary>
                 <AddKeyForm
                   userId={activeUser?.id}
diff --git a/src/app/[locale]/dashboard/_components/user/user-actions.tsx b/src/app/[locale]/dashboard/_components/user/user-actions.tsx
index d3019f280..6e1c2bc25 100644
--- a/src/app/[locale]/dashboard/_components/user/user-actions.tsx
+++ b/src/app/[locale]/dashboard/_components/user/user-actions.tsx
@@ -40,7 +40,7 @@ export function UserActions({ user, currentUser }: UserActionsProps) {
             <SquarePen className="h-3.5 w-3.5" />
           </button>
         </DialogTrigger>
-        <DialogContent className="max-h-[85vh] max-h-[85dvh] overflow-y-auto">
+        <DialogContent className="max-h-[var(--cch-viewport-height-85)] overflow-y-auto">
           <FormErrorBoundary>
             <UserForm user={user} onSuccess={() => setOpenEdit(false)} currentUser={currentUser} />
           </FormErrorBoundary>
diff --git a/src/app/[locale]/dashboard/_components/user/user-list.tsx b/src/app/[locale]/dashboard/_components/user/user-list.tsx
index 8c9c58326..cb64c5bd6 100644
--- a/src/app/[locale]/dashboard/_components/user/user-list.tsx
+++ b/src/app/[locale]/dashboard/_components/user/user-list.tsx
@@ -388,7 +388,7 @@ export function UserList({ users, activeUserId, onUserSelect, currentUser }: Use
           if (!open) setEditUser(null);
         }}
       >
-        <DialogContent className="max-h-[85vh] max-h-[85dvh] overflow-y-auto">
+        <DialogContent className="max-h-[var(--cch-viewport-height-85)] overflow-y-auto">
           <FormErrorBoundary>
             {editUser ? (
               <UserForm
diff --git a/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx b/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx
index d11885ab5..1d8335c46 100644
--- a/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx
+++ b/src/app/[locale]/dashboard/quotas/keys/_components/edit-key-quota-dialog.tsx
@@ -149,7 +149,7 @@ export function EditKeyQuotaDialog({
           </Button>
         )}
       </DialogTrigger>
-      <DialogContent className="sm:max-w-[600px] max-h-[70vh] max-h-[70dvh] flex flex-col">
+      <DialogContent className="sm:max-w-[600px] max-h-[var(--cch-viewport-height-70)] flex flex-col">
         <DialogHeader className="flex-shrink-0">
           <DialogTitle>{t("title")}</DialogTitle>
           <DialogDescription>{t("description", { keyName, userName })}</DialogDescription>
diff --git a/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx b/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx
index 4d148690a..3967c2f97 100644
--- a/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx
+++ b/src/app/[locale]/dashboard/quotas/keys/_components/edit-user-quota-dialog.tsx
@@ -87,7 +87,7 @@ export function EditUserQuotaDialog({
           </Button>
         )}
       </DialogTrigger>
-      <DialogContent className="sm:max-w-[600px] max-h-[70vh] max-h-[70dvh] flex flex-col">
+      <DialogContent className="sm:max-w-[600px] max-h-[var(--cch-viewport-height-70)] flex flex-col">
         <DialogHeader className="flex-shrink-0">
           <DialogTitle>{t("title")}</DialogTitle>
           <DialogDescription>{t("description", { userName })}</DialogDescription>
diff --git a/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx b/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx
index 16264d343..d5cae7334 100644
--- a/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx
+++ b/src/app/[locale]/dashboard/sessions/_components/session-messages-dialog.tsx
@@ -67,7 +67,7 @@ export function SessionMessagesDialog({ sessionId }: SessionMessagesDialogProps)
           {t("actions.view")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-3xl max-h-[80vh] max-h-[80dvh] overflow-y-auto">
+      <DialogContent className="max-w-3xl max-h-[var(--cch-viewport-height-80)] overflow-y-auto">
         <DialogHeader>
           <DialogTitle>{t("details.title")}</DialogTitle>
           <DialogDescription className="font-mono text-xs">{sessionId}</DialogDescription>
diff --git a/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx b/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx
index a2e6b0a63..5a5441732 100644
--- a/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx
+++ b/src/app/[locale]/settings/error-rules/_components/add-rule-dialog.tsx
@@ -131,7 +131,7 @@ export function AddRuleDialog() {
           {t("errorRules.add")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-80)] flex flex-col bg-card/95 backdrop-blur-xl border-border">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("errorRules.dialog.addTitle")}</DialogTitle>
diff --git a/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx b/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx
index 5a72a7293..6b28b099d 100644
--- a/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx
+++ b/src/app/[locale]/settings/error-rules/_components/edit-rule-dialog.tsx
@@ -139,7 +139,7 @@ export function EditRuleDialog({ rule, open, onOpenChange }: EditRuleDialogProps
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-80)] flex flex-col bg-card/95 backdrop-blur-xl border-border">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("errorRules.dialog.editTitle")}</DialogTitle>
diff --git a/src/app/[locale]/settings/notifications/_components/binding-selector.tsx b/src/app/[locale]/settings/notifications/_components/binding-selector.tsx
index 6d76f082c..e7bb8eb43 100644
--- a/src/app/[locale]/settings/notifications/_components/binding-selector.tsx
+++ b/src/app/[locale]/settings/notifications/_components/binding-selector.tsx
@@ -336,7 +336,7 @@ export function BindingSelector({ type, targets, bindings, onSave }: BindingSele
         open={templateDialogOpen}
         onOpenChange={(open) => (open ? setTemplateDialogOpen(true) : closeTemplateDialog())}
       >
-        <DialogContent className="w-full max-w-3xl max-h-[90vh] max-h-[90dvh] overflow-y-auto">
+        <DialogContent className="w-full max-w-3xl max-h-[var(--cch-viewport-height-90)] overflow-y-auto">
           <DialogHeader>
             <DialogTitle>{t("notifications.bindings.templateOverrideTitle")}</DialogTitle>
           </DialogHeader>
diff --git a/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx b/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx
index 25fb17164..2932da38e 100644
--- a/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx
+++ b/src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx
@@ -228,7 +228,7 @@ export function WebhookTargetDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-full max-w-2xl max-h-[90vh] max-h-[90dvh] overflow-y-auto">
+      <DialogContent className="w-full max-w-2xl max-h-[var(--cch-viewport-height-90)] overflow-y-auto">
         <DialogHeader>
           <DialogTitle>
             {mode === "create"
diff --git a/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx b/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx
index 118e7d118..ecda7790f 100644
--- a/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx
+++ b/src/app/[locale]/settings/prices/_components/sync-conflict-dialog.tsx
@@ -251,7 +251,7 @@ export function SyncConflictDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-3xl max-h-[80vh] max-h-[80dvh] overflow-hidden flex flex-col">
+      <DialogContent className="max-w-3xl max-h-[var(--cch-viewport-height-80)] overflow-hidden flex flex-col">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
             <AlertTriangle className="h-5 w-5 text-amber-500" />
diff --git a/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx b/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
index ece58f564..f11ab9676 100644
--- a/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/add-provider-dialog.tsx
@@ -22,7 +22,7 @@ export function AddProviderDialog({ enableMultiProviderTypes }: AddProviderDialo
           <ServerCog className="h-4 w-4" /> {t("addProvider")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
+      <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[var(--cch-viewport-height-90)] flex flex-col overflow-hidden p-0 gap-0">
         <VisuallyHidden>
           <DialogTitle>{t("addProvider")}</DialogTitle>
         </VisuallyHidden>
diff --git a/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx b/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx
index 1f8876f62..13b2d9db6 100644
--- a/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/auto-sort-priority-dialog.tsx
@@ -136,7 +136,7 @@ export function AutoSortPriorityDialog() {
           {t("button")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-80)] flex flex-col">
         <DialogHeader>
           <DialogTitle>{t("dialogTitle")}</DialogTitle>
           <DialogDescription>{t("dialogDescription")}</DialogDescription>
diff --git a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx
index 3612f740d..6920c1888 100644
--- a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-dialog.tsx
@@ -119,7 +119,7 @@ function BatchEditDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-6xl max-h-[90vh] max-h-[90dvh] overflow-hidden flex flex-col">
+      <DialogContent className="max-w-6xl max-h-[var(--cch-viewport-height-90)] overflow-hidden flex flex-col">
         <ProviderFormProvider
           mode="batch"
           enableMultiProviderTypes={false}
diff --git a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx
index 97bea031f..62168bda0 100644
--- a/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx
+++ b/src/app/[locale]/settings/providers/_components/batch-edit/provider-batch-preview-step.tsx
@@ -112,7 +112,7 @@ export function ProviderBatchPreviewStep({
       </p>
 
       {/* Provider groups */}
-      <div className="max-h-[50vh] max-h-[50dvh] space-y-3 overflow-y-auto">
+      <div className="max-h-[var(--cch-viewport-height-50)] space-y-3 overflow-y-auto">
         {grouped.map((group) => {
           const excluded = excludedProviderIds.has(group.providerId);
           return (
@@ -148,8 +148,8 @@ export function ProviderBatchPreviewStep({
                     {row.status === "changed"
                       ? t("preview.fieldChanged", {
                           field: getFieldLabel(row.field),
-                          before: formatValue(row.before),
-                          after: formatValue(row.after),
+                          before: formatValue(row.before, t),
+                          after: formatValue(row.after, t),
                         })
                       : t("preview.fieldSkipped", {
                           field: getFieldLabel(row.field),
@@ -170,8 +170,8 @@ export function ProviderBatchPreviewStep({
 // Helpers
 // ---------------------------------------------------------------------------
 
-function formatValue(value: unknown): string {
-  if (value === null || value === undefined) return "null";
+function formatValue(value: unknown, t: (key: string) => string): string {
+  if (value === null || value === undefined) return t("preview.nullValue");
   if (typeof value === "boolean") return String(value);
   if (typeof value === "number") return String(value);
   if (typeof value === "string") return value;
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
index 0f895243a..698da26f8 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/index.tsx
@@ -550,7 +550,10 @@ function ProviderFormContent({
   };
 
   return (
-    <form onSubmit={handleSubmit} className="flex flex-col h-full max-h-[85vh] max-h-[85dvh]">
+    <form
+      onSubmit={handleSubmit}
+      className="flex flex-col h-full max-h-[var(--cch-viewport-height-85)]"
+    >
       {/* Form Layout */}
       <div className="flex flex-col lg:flex-row flex-1 min-h-0">
         <div className="order-2 md:order-1 shrink-0">
diff --git a/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx b/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx
index f23ebfee2..f7b1c909d 100644
--- a/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/test-result-card.tsx
@@ -172,7 +172,7 @@ export function TestResultCard({ result }: TestResultCardProps) {
                 {t("viewDetails")}
               </Button>
             </DialogTrigger>
-            <DialogContent className="max-w-4xl max-h-[85vh] max-h-[85dvh] overflow-y-auto">
+            <DialogContent className="max-w-4xl max-h-[var(--cch-viewport-height-85)] overflow-y-auto">
               <DialogHeader>
                 <DialogTitle className="flex items-center gap-2">
                   {icon}
diff --git a/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx b/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
index 74a78bc89..8e3a81935 100644
--- a/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
+++ b/src/app/[locale]/settings/providers/_components/provider-list-item.legacy.tsx
@@ -280,7 +280,7 @@ export function ProviderListItem({
                       <Edit className="h-3.5 w-3.5" />
                     </Button>
                   </DialogTrigger>
-                  <DialogContent className="sm:max-w-3xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
+                  <DialogContent className="sm:max-w-3xl max-h-[var(--cch-viewport-height-90)] flex flex-col overflow-hidden p-0 gap-0">
                     <FormErrorBoundary>
                       <ProviderForm
                         mode="edit"
@@ -308,7 +308,7 @@ export function ProviderListItem({
                       <Copy className="h-3.5 w-3.5" />
                     </Button>
                   </DialogTrigger>
-                  <DialogContent className="sm:max-w-3xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
+                  <DialogContent className="sm:max-w-3xl max-h-[var(--cch-viewport-height-90)] flex flex-col overflow-hidden p-0 gap-0">
                     <FormErrorBoundary>
                       <ProviderForm
                         mode="create"
diff --git a/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx b/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
index e669b5355..afd79455d 100644
--- a/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
+++ b/src/app/[locale]/settings/providers/_components/provider-rich-list-item.tsx
@@ -978,7 +978,7 @@ export function ProviderRichListItem({
 
       {/* 编辑 Dialog */}
       <Dialog open={openEdit} onOpenChange={setOpenEdit}>
-        <DialogContent className="max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
+        <DialogContent className="max-w-6xl max-h-[var(--cch-viewport-height-90)] flex flex-col overflow-hidden p-0 gap-0">
           <VisuallyHidden>
             <DialogTitle>{t("editProvider")}</DialogTitle>
           </VisuallyHidden>
@@ -997,7 +997,7 @@ export function ProviderRichListItem({
 
       {/* 克隆 Dialog */}
       <Dialog open={openClone} onOpenChange={setOpenClone}>
-        <DialogContent className="max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
+        <DialogContent className="max-w-6xl max-h-[var(--cch-viewport-height-90)] flex flex-col overflow-hidden p-0 gap-0">
           <VisuallyHidden>
             <DialogTitle>{t("clone")}</DialogTitle>
           </VisuallyHidden>
diff --git a/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx b/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx
index f1867efca..d22b1f3a4 100644
--- a/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/recluster-vendors-dialog.tsx
@@ -140,7 +140,7 @@ export function ReclusterVendorsDialog() {
           {t("button")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-80)] flex flex-col">
         <DialogHeader>
           <DialogTitle>{t("dialogTitle")}</DialogTitle>
           <DialogDescription>{t("dialogDescription")}</DialogDescription>
diff --git a/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx b/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx
index 2ab328d40..bb394393f 100644
--- a/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx
+++ b/src/app/[locale]/settings/providers/_components/scheduling-rules-dialog.tsx
@@ -227,7 +227,7 @@ export function SchedulingRulesDialog() {
           {t("triggerButton")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-3xl max-h-[80vh] max-h-[80dvh] overflow-y-auto">
+      <DialogContent className="max-w-3xl max-h-[var(--cch-viewport-height-80)] overflow-y-auto">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2 text-xl">
             <Lightbulb className="h-5 w-5 text-primary" />
diff --git a/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx b/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
index e5d676919..15b268f7f 100644
--- a/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
+++ b/src/app/[locale]/settings/providers/_components/vendor-keys-compact-list.tsx
@@ -105,7 +105,7 @@ export function VendorKeysCompactList(props: {
                 {t("addVendorKey")}
               </Button>
             </DialogTrigger>
-            <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
+            <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[var(--cch-viewport-height-90)] flex flex-col overflow-hidden p-0 gap-0">
               <VisuallyHidden>
                 <DialogTitle>{t("addVendorKey")}</DialogTitle>
               </VisuallyHidden>
@@ -503,7 +503,7 @@ function VendorKeyRow(props: {
                     <Edit2 className="h-4 w-4" />
                   </Button>
                 </DialogTrigger>
-                <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[90vh] max-h-[90dvh] flex flex-col overflow-hidden p-0 gap-0">
+                <DialogContent className="max-w-full sm:max-w-5xl lg:max-w-6xl max-h-[var(--cch-viewport-height-90)] flex flex-col overflow-hidden p-0 gap-0">
                   <VisuallyHidden>
                     <DialogTitle>{t("editProvider")}</DialogTitle>
                   </VisuallyHidden>
diff --git a/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx b/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx
index cac1c0fa6..75238c183 100644
--- a/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx
+++ b/src/app/[locale]/settings/request-filters/_components/filter-dialog.tsx
@@ -260,7 +260,7 @@ export function FilterDialog({ mode, trigger, filter, open, onOpenChange }: Prop
   };
 
   const content = (
-    <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col bg-card/95 backdrop-blur-xl border-border">
+    <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-80)] flex flex-col bg-card/95 backdrop-blur-xl border-border">
       <DialogHeader className="flex-shrink-0">
         <DialogTitle className="text-foreground">
           {mode === "create" ? t("dialog.createTitle") : t("dialog.editTitle")}
diff --git a/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx b/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx
index 76e37a303..a852a07ad 100644
--- a/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx
+++ b/src/app/[locale]/settings/sensitive-words/_components/add-word-dialog.tsx
@@ -76,7 +76,7 @@ export function AddWordDialog() {
           {t("sensitiveWords.add")}
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-80)] flex flex-col">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("sensitiveWords.dialog.addTitle")}</DialogTitle>
diff --git a/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx b/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx
index 7f2c72fed..f91a8856c 100644
--- a/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx
+++ b/src/app/[locale]/settings/sensitive-words/_components/edit-word-dialog.tsx
@@ -79,7 +79,7 @@ export function EditWordDialog({ word, open, onOpenChange }: EditWordDialogProps
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl max-h-[80vh] max-h-[80dvh] flex flex-col">
+      <DialogContent className="max-w-2xl max-h-[var(--cch-viewport-height-80)] flex flex-col">
         <form onSubmit={handleSubmit} className="flex flex-col flex-1 min-h-0">
           <DialogHeader className="flex-shrink-0">
             <DialogTitle>{t("sensitiveWords.dialog.editTitle")}</DialogTitle>
diff --git a/src/app/globals.css b/src/app/globals.css
index 8dff49fbd..4bc2e3056 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -46,6 +46,12 @@
 :root {
   --radius: 0.65rem;
   --cch-viewport-height: 100vh;
+  --cch-viewport-height-50: 50vh;
+  --cch-viewport-height-70: 70vh;
+  --cch-viewport-height-80: 80vh;
+  --cch-viewport-height-85: 85vh;
+  --cch-viewport-height-90: 90vh;
+  --cch-viewport-height-95: 95vh;
   --background: oklch(1 0 0);
   --foreground: oklch(0.141 0.005 285.823);
   --card: oklch(1 0 0);
@@ -82,6 +88,12 @@
 @supports (height: 100dvh) {
   :root {
     --cch-viewport-height: 100dvh;
+    --cch-viewport-height-50: 50dvh;
+    --cch-viewport-height-70: 70dvh;
+    --cch-viewport-height-80: 80dvh;
+    --cch-viewport-height-85: 85dvh;
+    --cch-viewport-height-90: 90dvh;
+    --cch-viewport-height-95: 95dvh;
   }
 }
 
diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
index 2a883ddff..304d8cda9 100644
--- a/src/components/ui/drawer.tsx
+++ b/src/components/ui/drawer.tsx
@@ -50,8 +50,8 @@ function DrawerContent({
         className={cn(
           "group/drawer-content bg-background fixed z-50 flex h-auto flex-col",
           "data-[vaul-drawer-direction=bottom]:safe-area-bottom data-[vaul-drawer-direction=left]:safe-area-bottom data-[vaul-drawer-direction=right]:safe-area-bottom",
-          "data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:max-h-[80dvh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",
-          "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[95vh] data-[vaul-drawer-direction=bottom]:max-h-[95dvh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
+          "data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[var(--cch-viewport-height-80)] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b",
+          "data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[var(--cch-viewport-height-95)] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t",
           "data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm",
           "data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-3/4 data-[vaul-drawer-direction=left]:border-r data-[vaul-drawer-direction=left]:sm:max-w-sm",
           className
diff --git a/src/lib/redis/client.ts b/src/lib/redis/client.ts
index b1694763f..af7b1506f 100644
--- a/src/lib/redis/client.ts
+++ b/src/lib/redis/client.ts
@@ -154,9 +154,19 @@ export function getRedisClient(input?: { allowWhenRateLimitDisabled?: boolean })
 }
 
 export async function closeRedis(): Promise<void> {
-  if (redisClient) {
-    const client = redisClient;
-    await client.quit();
+  const client = redisClient;
+  if (!client) return;
+
+  try {
+    if (client.status !== "end") {
+      await client.quit();
+    }
+  } catch (error) {
+    logger.warn("[Redis] Error during quit, forcing disconnect", {
+      error: error instanceof Error ? error.message : String(error),
+    });
+    client.disconnect();
+  } finally {
     if (redisClient === client) {
       redisClient = null;
     }

From 6265bdc992f2a79343f3cb98c088e708227a05fe Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 19:08:59 +0800
Subject: [PATCH 13/27] =?UTF-8?q?fix(ui,test,a11y):=20=E8=A1=A5=E9=BD=90?=
 =?UTF-8?q?=E5=B0=8F=E5=B1=8F=E4=BD=93=E9=AA=8C=E4=B8=8E=E5=8D=95=E6=B5=8B?=
 =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en/settings/providers/form/common.json    |   3 +-
 .../en/settings/providers/form/sections.json  |   3 +
 .../ja/settings/providers/form/common.json    |   3 +-
 .../ja/settings/providers/form/sections.json  |   3 +
 .../ru/settings/providers/form/common.json    |   3 +-
 .../ru/settings/providers/form/sections.json  |   3 +
 .../zh-CN/settings/providers/form/common.json |   3 +-
 .../settings/providers/form/sections.json     |   3 +
 .../zh-TW/settings/providers/form/common.json |   3 +-
 .../settings/providers/form/sections.json     |   3 +
 .../_components/user/edit-user-dialog.tsx     |   2 +-
 .../_components/user/user-actions.tsx         |   2 +-
 .../provider-form/components/form-tab-nav.tsx |   9 +-
 .../sections/routing-section.tsx              | 178 ++++++------------
 src/app/global-error.tsx                      |   2 +-
 .../form/client-restrictions-editor.tsx       | 156 +++++++++++++++
 .../unit/lib/endpoint-circuit-breaker.test.ts |  33 +++-
 17 files changed, 282 insertions(+), 130 deletions(-)
 create mode 100644 src/components/form/client-restrictions-editor.tsx

diff --git a/messages/en/settings/providers/form/common.json b/messages/en/settings/providers/form/common.json
index 36534463d..ab4c7b067 100644
--- a/messages/en/settings/providers/form/common.json
+++ b/messages/en/settings/providers/form/common.json
@@ -5,6 +5,7 @@
     "routing": "Routing",
     "limits": "Limits",
     "network": "Network",
-    "testing": "Testing"
+    "testing": "Testing",
+    "stepProgress": "Step progress"
   }
 }
diff --git a/messages/en/settings/providers/form/sections.json b/messages/en/settings/providers/form/sections.json
index 315d2b860..59548820e 100644
--- a/messages/en/settings/providers/form/sections.json
+++ b/messages/en/settings/providers/form/sections.json
@@ -306,6 +306,9 @@
       "title": "Model Allowlist"
     },
     "clientRestrictions": {
+      "toggleLabel": "Enable Client Restrictions",
+      "toggleDesc": "Clients are not restricted by default. Enable to configure allowlist/blocklist rules.",
+      "priorityNote": "Blocklist takes precedence over allowlist.",
       "allowedLabel": "Allowed Clients",
       "allowedPlaceholder": "e.g. claude-code-cli",
       "blockedLabel": "Blocked Clients",
diff --git a/messages/ja/settings/providers/form/common.json b/messages/ja/settings/providers/form/common.json
index d1cb1da2c..fe766439c 100644
--- a/messages/ja/settings/providers/form/common.json
+++ b/messages/ja/settings/providers/form/common.json
@@ -5,6 +5,7 @@
     "routing": "ルーティング",
     "limits": "制限",
     "network": "ネットワーク",
-    "testing": "テスト"
+    "testing": "テスト",
+    "stepProgress": "ステップ進捗"
   }
 }
diff --git a/messages/ja/settings/providers/form/sections.json b/messages/ja/settings/providers/form/sections.json
index d7d23a3c2..619801caf 100644
--- a/messages/ja/settings/providers/form/sections.json
+++ b/messages/ja/settings/providers/form/sections.json
@@ -307,6 +307,9 @@
       "title": "モデル許可リスト"
     },
     "clientRestrictions": {
+      "toggleLabel": "クライアント制限を有効化",
+      "toggleDesc": "既定ではクライアントを制限しません。有効化すると許可/拒否リストを設定できます。",
+      "priorityNote": "拒否リストは許可リストより優先されます。",
       "allowedLabel": "許可クライアント",
       "allowedPlaceholder": "例: claude-code-cli",
       "blockedLabel": "ブロッククライアント",
diff --git a/messages/ru/settings/providers/form/common.json b/messages/ru/settings/providers/form/common.json
index fadb3569f..a294a3792 100644
--- a/messages/ru/settings/providers/form/common.json
+++ b/messages/ru/settings/providers/form/common.json
@@ -5,6 +5,7 @@
     "routing": "Маршрутизация",
     "limits": "Лимиты",
     "network": "Сеть",
-    "testing": "Тестирование"
+    "testing": "Тестирование",
+    "stepProgress": "Прогресс шагов"
   }
 }
diff --git a/messages/ru/settings/providers/form/sections.json b/messages/ru/settings/providers/form/sections.json
index aac6a6fea..30367befc 100644
--- a/messages/ru/settings/providers/form/sections.json
+++ b/messages/ru/settings/providers/form/sections.json
@@ -307,6 +307,9 @@
       "title": "Список разрешённых моделей"
     },
     "clientRestrictions": {
+      "toggleLabel": "Включить ограничения клиентов",
+      "toggleDesc": "По умолчанию клиенты не ограничиваются. Включите, чтобы настроить правила белого/чёрного списка.",
+      "priorityNote": "Чёрный список имеет приоритет над белым списком.",
       "allowedLabel": "Разрешённые клиенты",
       "allowedPlaceholder": "напр. claude-code-cli",
       "blockedLabel": "Заблокированные клиенты",
diff --git a/messages/zh-CN/settings/providers/form/common.json b/messages/zh-CN/settings/providers/form/common.json
index 88808dc1f..ea5277908 100644
--- a/messages/zh-CN/settings/providers/form/common.json
+++ b/messages/zh-CN/settings/providers/form/common.json
@@ -5,6 +5,7 @@
     "routing": "路由",
     "limits": "限制",
     "network": "网络",
-    "testing": "测试"
+    "testing": "测试",
+    "stepProgress": "步骤进度"
   }
 }
diff --git a/messages/zh-CN/settings/providers/form/sections.json b/messages/zh-CN/settings/providers/form/sections.json
index 59ecf6d46..efc9d7c8d 100644
--- a/messages/zh-CN/settings/providers/form/sections.json
+++ b/messages/zh-CN/settings/providers/form/sections.json
@@ -50,6 +50,9 @@
       "moreModels": "+{count} 更多"
     },
     "clientRestrictions": {
+      "toggleLabel": "启用客户端限制",
+      "toggleDesc": "默认不限制客户端。启用后可配置白名单/黑名单。",
+      "priorityNote": "黑名单优先级高于白名单。",
       "allowedLabel": "白名单客户端",
       "allowedPlaceholder": "例如 claude-code-cli",
       "blockedLabel": "黑名单客户端",
diff --git a/messages/zh-TW/settings/providers/form/common.json b/messages/zh-TW/settings/providers/form/common.json
index 89489e20e..246f543fd 100644
--- a/messages/zh-TW/settings/providers/form/common.json
+++ b/messages/zh-TW/settings/providers/form/common.json
@@ -5,6 +5,7 @@
     "routing": "路由",
     "limits": "限制",
     "network": "網路",
-    "testing": "測試"
+    "testing": "測試",
+    "stepProgress": "步驟進度"
   }
 }
diff --git a/messages/zh-TW/settings/providers/form/sections.json b/messages/zh-TW/settings/providers/form/sections.json
index 70cd5707e..e8c4333f7 100644
--- a/messages/zh-TW/settings/providers/form/sections.json
+++ b/messages/zh-TW/settings/providers/form/sections.json
@@ -307,6 +307,9 @@
       "title": "模型允許清單"
     },
     "clientRestrictions": {
+      "toggleLabel": "啟用用戶端限制",
+      "toggleDesc": "預設不限制用戶端。啟用後可設定白名單/黑名單。",
+      "priorityNote": "黑名單優先於白名單。",
       "allowedLabel": "白名單客戶端",
       "allowedPlaceholder": "例如 claude-code-cli",
       "blockedLabel": "黑名單客戶端",
diff --git a/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx b/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx
index 9d687f0c1..5a0fcf9bb 100644
--- a/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx
+++ b/src/app/[locale]/dashboard/_components/user/edit-user-dialog.tsx
@@ -244,7 +244,7 @@ function EditUserDialogInner({ onOpenChange, user, onSuccess }: EditUserDialogPr
   };
 
   return (
-    <DialogContent className="w-full max-w-[95vw] sm:max-w-[85vw] md:max-w-[70vw] lg:max-w-3xl max-h-[var(--cch-viewport-height-90)] p-0 flex flex-col overflow-hidden">
+    <DialogContent className="w-full max-w-[95vw] sm:max-w-[85vw] md:max-w-[70vw] lg:max-w-3xl max-h-[var(--cch-viewport-height-90,90vh)] p-0 flex flex-col overflow-hidden">
       <form onSubmit={form.handleSubmit} className="flex flex-1 min-h-0 flex-col">
         <DialogHeader className="px-6 pt-6 pb-4 border-b flex-shrink-0">
           <div className="flex items-center gap-2">
diff --git a/src/app/[locale]/dashboard/_components/user/user-actions.tsx b/src/app/[locale]/dashboard/_components/user/user-actions.tsx
index 6e1c2bc25..6196c8e0b 100644
--- a/src/app/[locale]/dashboard/_components/user/user-actions.tsx
+++ b/src/app/[locale]/dashboard/_components/user/user-actions.tsx
@@ -40,7 +40,7 @@ export function UserActions({ user, currentUser }: UserActionsProps) {
             <SquarePen className="h-3.5 w-3.5" />
           </button>
         </DialogTrigger>
-        <DialogContent className="max-h-[var(--cch-viewport-height-85)] overflow-y-auto">
+        <DialogContent className="max-h-[var(--cch-viewport-height-85,85vh)] overflow-y-auto">
           <FormErrorBoundary>
             <UserForm user={user} onSuccess={() => setOpenEdit(false)} currentUser={currentUser} />
           </FormErrorBoundary>
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
index 832d05765..90ee3afad 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
@@ -264,7 +264,14 @@ export function FormTabNav({
           })}
         </div>
         {/* Step indicator */}
-        <div className="absolute top-0 left-0 right-0 h-0.5 bg-muted">
+        <div
+          className="absolute top-0 left-0 right-0 h-0.5 bg-muted"
+          role="progressbar"
+          aria-valuenow={stepNumber}
+          aria-valuemin={0}
+          aria-valuemax={TAB_CONFIG.length}
+          aria-label={t("tabs.stepProgress")}
+        >
           <motion.div
             className="h-full bg-primary"
             initial={{ width: stepProgressWidth }}
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index 6b5458774..d6d01ecf5 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -3,11 +3,11 @@
 import { motion } from "framer-motion";
 import { Info, Layers, Route, Scale, Settings, Timer } from "lucide-react";
 import { useTranslations } from "next-intl";
+import { useEffect, useState } from "react";
 import { toast } from "sonner";
+import { ClientRestrictionsEditor } from "@/components/form/client-restrictions-editor";
 import { Badge } from "@/components/ui/badge";
-import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
 import {
   Select,
   SelectContent,
@@ -18,14 +18,6 @@ import {
 import { Switch } from "@/components/ui/switch";
 import { TagInput } from "@/components/ui/tag-input";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import {
-  CLIENT_RESTRICTION_PRESET_OPTIONS,
-  isPresetSelected,
-  mergePresetAndCustomClients,
-  removePresetValues,
-  splitPresetAndCustomClients,
-  togglePresetSelection,
-} from "@/lib/client-restrictions/client-presets";
 import { getProviderTypeConfig } from "@/lib/provider-type-utils";
 import type {
   CodexParallelToolCallsPreference,
@@ -81,43 +73,24 @@ export function RoutingSection() {
   const providerTypes: ProviderType[] = ["claude", "codex", "gemini", "openai-compatible"];
   const allowedClients = state.routing.allowedClients;
   const blockedClients = state.routing.blockedClients;
-  const { customValues: customAllowedClients } = splitPresetAndCustomClients(allowedClients);
-  const { customValues: customBlockedClients } = splitPresetAndCustomClients(blockedClients);
-
-  const handleAllowToggle = (presetValue: string, checked: boolean) => {
-    const nextAllowed = togglePresetSelection(allowedClients, presetValue, checked);
-    dispatch({ type: "SET_ALLOWED_CLIENTS", payload: nextAllowed });
+  const hasAnyClientRestrictions = allowedClients.length > 0 || blockedClients.length > 0;
+  const [clientRestrictionsEnabled, setClientRestrictionsEnabled] =
+    useState(hasAnyClientRestrictions);
 
-    if (checked) {
-      const nextBlocked = removePresetValues(blockedClients, presetValue);
-      dispatch({ type: "SET_BLOCKED_CLIENTS", payload: nextBlocked });
+  useEffect(() => {
+    if (hasAnyClientRestrictions) {
+      setClientRestrictionsEnabled(true);
     }
-  };
-
-  const handleBlockToggle = (presetValue: string, checked: boolean) => {
-    const nextBlocked = togglePresetSelection(blockedClients, presetValue, checked);
-    dispatch({ type: "SET_BLOCKED_CLIENTS", payload: nextBlocked });
+  }, [hasAnyClientRestrictions]);
 
-    if (checked) {
-      const nextAllowed = removePresetValues(allowedClients, presetValue);
-      dispatch({ type: "SET_ALLOWED_CLIENTS", payload: nextAllowed });
+  const handleClientRestrictionsEnabledChange = (enabled: boolean) => {
+    setClientRestrictionsEnabled(enabled);
+    if (!enabled) {
+      dispatch({ type: "SET_ALLOWED_CLIENTS", payload: [] });
+      dispatch({ type: "SET_BLOCKED_CLIENTS", payload: [] });
     }
   };
 
-  const handleCustomAllowedChange = (customValues: string[]) => {
-    dispatch({
-      type: "SET_ALLOWED_CLIENTS",
-      payload: mergePresetAndCustomClients(allowedClients, customValues),
-    });
-  };
-
-  const handleCustomBlockedChange = (customValues: string[]) => {
-    dispatch({
-      type: "SET_BLOCKED_CLIENTS",
-      payload: mergePresetAndCustomClients(blockedClients, customValues),
-    });
-  };
-
   return (
     <TooltipProvider>
       <motion.div
@@ -266,86 +239,55 @@ export function RoutingSection() {
                 )}
               </p>
             </FieldGroup>
-          </div>
 
-          {/* Client Restrictions */}
-          <FieldGroup label={t("sections.routing.clientRestrictions.allowedLabel")}>
-            <div className="space-y-2 rounded-md border p-3">
-              {CLIENT_RESTRICTION_PRESET_OPTIONS.map((option) => {
-                const isAllowed = isPresetSelected(allowedClients, option.value);
-                const isBlocked = isPresetSelected(blockedClients, option.value);
-                return (
-                  <div key={option.value} className="flex items-center gap-4 py-1">
-                    <span className="flex-1 text-sm">
-                      {t(`sections.routing.clientRestrictions.presetClients.${option.value}`)}
-                    </span>
-                    <div className="flex items-center gap-3">
-                      <div className="flex items-center gap-1.5">
-                        <Checkbox
-                          id={`provider-allow-${option.value}`}
-                          checked={isAllowed}
-                          disabled={state.ui.isPending}
-                          onCheckedChange={(checked) =>
-                            handleAllowToggle(option.value, checked === true)
-                          }
-                        />
-                        <Label
-                          htmlFor={`provider-allow-${option.value}`}
-                          className="cursor-pointer text-xs font-normal text-muted-foreground"
-                        >
-                          {t("sections.routing.clientRestrictions.allowAction")}
-                        </Label>
-                      </div>
-                      <div className="flex items-center gap-1.5">
-                        <Checkbox
-                          id={`provider-block-${option.value}`}
-                          checked={isBlocked}
-                          disabled={state.ui.isPending}
-                          onCheckedChange={(checked) =>
-                            handleBlockToggle(option.value, checked === true)
-                          }
-                        />
-                        <Label
-                          htmlFor={`provider-block-${option.value}`}
-                          className="cursor-pointer text-xs font-normal text-muted-foreground"
-                        >
-                          {t("sections.routing.clientRestrictions.blockAction")}
-                        </Label>
-                      </div>
-                    </div>
-                  </div>
-                );
-              })}
-            </div>
-          </FieldGroup>
+            <ToggleRow
+              icon={Info}
+              label={t("sections.routing.clientRestrictions.toggleLabel")}
+              description={t("sections.routing.clientRestrictions.toggleDesc")}
+            >
+              <Switch
+                checked={clientRestrictionsEnabled}
+                onCheckedChange={handleClientRestrictionsEnabledChange}
+                disabled={state.ui.isPending}
+              />
+            </ToggleRow>
 
-          <FieldGroup label={t("sections.routing.clientRestrictions.customAllowedLabel")}>
-            <TagInput
-              value={customAllowedClients}
-              onChange={handleCustomAllowedChange}
-              placeholder={t("sections.routing.clientRestrictions.customAllowedPlaceholder")}
-              maxTagLength={64}
-              maxTags={50}
-              disabled={state.ui.isPending}
-            />
-            <p className="mt-1 text-xs text-muted-foreground">
-              {t("sections.routing.clientRestrictions.customHelp")}
-            </p>
-          </FieldGroup>
+            {clientRestrictionsEnabled && (
+              <div className="space-y-3">
+                <div className="space-y-1 rounded-md border bg-muted/30 p-3">
+                  <p className="text-xs text-muted-foreground">
+                    {t("sections.routing.clientRestrictions.priorityNote")}
+                  </p>
+                  <p className="text-xs text-muted-foreground">
+                    {t("sections.routing.clientRestrictions.customHelp")}
+                  </p>
+                </div>
 
-          <FieldGroup label={t("sections.routing.clientRestrictions.customBlockedLabel")}>
-            <TagInput
-              value={customBlockedClients}
-              onChange={handleCustomBlockedChange}
-              placeholder={t("sections.routing.clientRestrictions.customBlockedPlaceholder")}
-              maxTagLength={64}
-              maxTags={50}
-              disabled={state.ui.isPending}
-            />
-            <p className="mt-1 text-xs text-muted-foreground">
-              {t("sections.routing.clientRestrictions.customHelp")}
-            </p>
-          </FieldGroup>
+                <ClientRestrictionsEditor
+                  allowed={allowedClients}
+                  blocked={blockedClients}
+                  onAllowedChange={(next) =>
+                    dispatch({ type: "SET_ALLOWED_CLIENTS", payload: next })
+                  }
+                  onBlockedChange={(next) =>
+                    dispatch({ type: "SET_BLOCKED_CLIENTS", payload: next })
+                  }
+                  allowedLabel={t("sections.routing.clientRestrictions.allowedLabel")}
+                  blockedLabel={t("sections.routing.clientRestrictions.blockedLabel")}
+                  allowedPlaceholder={t(
+                    "sections.routing.clientRestrictions.customAllowedPlaceholder"
+                  )}
+                  blockedPlaceholder={t(
+                    "sections.routing.clientRestrictions.customBlockedPlaceholder"
+                  )}
+                  disabled={state.ui.isPending}
+                  getPresetLabel={(presetValue) =>
+                    t(`sections.routing.clientRestrictions.presetClients.${presetValue}`)
+                  }
+                />
+              </div>
+            )}
+          </div>
         </SectionCard>
 
         {/* Scheduling Parameters */}
diff --git a/src/app/global-error.tsx b/src/app/global-error.tsx
index b2aaaf137..1902fcb35 100644
--- a/src/app/global-error.tsx
+++ b/src/app/global-error.tsx
@@ -37,7 +37,7 @@ export default function GlobalError({
             flexDirection: "column",
             alignItems: "center",
             justifyContent: "center",
-            minHeight: "100vh",
+            minHeight: "var(--cch-viewport-height, 100vh)",
             fontFamily: "system-ui, sans-serif",
             backgroundColor: "#f8f9fa",
             padding: "20px",
diff --git a/src/components/form/client-restrictions-editor.tsx b/src/components/form/client-restrictions-editor.tsx
new file mode 100644
index 000000000..0c0065e51
--- /dev/null
+++ b/src/components/form/client-restrictions-editor.tsx
@@ -0,0 +1,156 @@
+"use client";
+
+import { useId } from "react";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Label } from "@/components/ui/label";
+import { TagInput } from "@/components/ui/tag-input";
+import {
+  CLIENT_RESTRICTION_PRESET_OPTIONS,
+  isPresetSelected,
+  mergePresetAndCustomClients,
+  removePresetValues,
+  splitPresetAndCustomClients,
+  togglePresetSelection,
+} from "@/lib/client-restrictions/client-presets";
+import { cn } from "@/lib/utils";
+
+interface ClientRestrictionListEditorProps {
+  label: string;
+  values: string[];
+  placeholder?: string;
+  disabled?: boolean;
+  getPresetLabel: (presetValue: string) => string;
+  onTogglePreset: (presetValue: string, checked: boolean) => void;
+  onCustomChange: (customValues: string[]) => void;
+  className?: string;
+}
+
+function ClientRestrictionListEditor({
+  label,
+  values,
+  placeholder,
+  disabled,
+  getPresetLabel,
+  onTogglePreset,
+  onCustomChange,
+  className,
+}: ClientRestrictionListEditorProps) {
+  const idPrefix = useId();
+  const { customValues } = splitPresetAndCustomClients(values);
+
+  return (
+    <div className={cn("space-y-3", className)}>
+      <div className="text-sm font-medium text-foreground">{label}</div>
+      <div className="space-y-2 rounded-md border p-3">
+        {CLIENT_RESTRICTION_PRESET_OPTIONS.map((option) => {
+          const checked = isPresetSelected(values, option.value);
+          const checkboxId = `${idPrefix}-${option.value}`;
+          return (
+            <div key={option.value} className="flex items-center gap-2">
+              <Checkbox
+                id={checkboxId}
+                checked={checked}
+                disabled={disabled}
+                onCheckedChange={(next) => onTogglePreset(option.value, next === true)}
+              />
+              <Label htmlFor={checkboxId} className="cursor-pointer text-sm font-normal">
+                {getPresetLabel(option.value)}
+              </Label>
+            </div>
+          );
+        })}
+      </div>
+
+      <div className="space-y-1">
+        <TagInput
+          value={customValues}
+          onChange={onCustomChange}
+          placeholder={placeholder}
+          maxTagLength={64}
+          maxTags={50}
+          disabled={disabled}
+          validateTag={() => true}
+        />
+      </div>
+    </div>
+  );
+}
+
+export interface ClientRestrictionsEditorProps {
+  allowed: string[];
+  blocked: string[];
+  onAllowedChange: (next: string[]) => void;
+  onBlockedChange: (next: string[]) => void;
+  allowedLabel: string;
+  blockedLabel: string;
+  allowedPlaceholder?: string;
+  blockedPlaceholder?: string;
+  disabled?: boolean;
+  getPresetLabel: (presetValue: string) => string;
+  className?: string;
+}
+
+export function ClientRestrictionsEditor({
+  allowed,
+  blocked,
+  onAllowedChange,
+  onBlockedChange,
+  allowedLabel,
+  blockedLabel,
+  allowedPlaceholder,
+  blockedPlaceholder,
+  disabled,
+  getPresetLabel,
+  className,
+}: ClientRestrictionsEditorProps) {
+  const handleAllowToggle = (presetValue: string, checked: boolean) => {
+    const nextAllowed = togglePresetSelection(allowed, presetValue, checked);
+    onAllowedChange(nextAllowed);
+
+    if (checked) {
+      const nextBlocked = removePresetValues(blocked, presetValue);
+      onBlockedChange(nextBlocked);
+    }
+  };
+
+  const handleBlockToggle = (presetValue: string, checked: boolean) => {
+    const nextBlocked = togglePresetSelection(blocked, presetValue, checked);
+    onBlockedChange(nextBlocked);
+
+    if (checked) {
+      const nextAllowed = removePresetValues(allowed, presetValue);
+      onAllowedChange(nextAllowed);
+    }
+  };
+
+  const handleAllowedCustomChange = (customValues: string[]) => {
+    onAllowedChange(mergePresetAndCustomClients(allowed, customValues));
+  };
+
+  const handleBlockedCustomChange = (customValues: string[]) => {
+    onBlockedChange(mergePresetAndCustomClients(blocked, customValues));
+  };
+
+  return (
+    <div className={cn("grid grid-cols-1 gap-4 sm:grid-cols-2", className)}>
+      <ClientRestrictionListEditor
+        label={allowedLabel}
+        values={allowed}
+        placeholder={allowedPlaceholder}
+        disabled={disabled}
+        getPresetLabel={getPresetLabel}
+        onTogglePreset={handleAllowToggle}
+        onCustomChange={handleAllowedCustomChange}
+      />
+      <ClientRestrictionListEditor
+        label={blockedLabel}
+        values={blocked}
+        placeholder={blockedPlaceholder}
+        disabled={disabled}
+        getPresetLabel={getPresetLabel}
+        onTogglePreset={handleBlockToggle}
+        onCustomChange={handleBlockedCustomChange}
+      />
+    </div>
+  );
+}
diff --git a/tests/unit/lib/endpoint-circuit-breaker.test.ts b/tests/unit/lib/endpoint-circuit-breaker.test.ts
index cea073fc6..67009732b 100644
--- a/tests/unit/lib/endpoint-circuit-breaker.test.ts
+++ b/tests/unit/lib/endpoint-circuit-breaker.test.ts
@@ -51,6 +51,9 @@ describe("endpoint-circuit-breaker", () => {
     vi.doMock("@/lib/notification/notifier", () => ({
       sendCircuitBreakerAlert: sendAlertMock,
     }));
+    vi.doMock("@/repository", () => ({
+      findProviderEndpointById: vi.fn(async () => null),
+    }));
     vi.doMock("@/lib/redis/endpoint-circuit-breaker-state", () => ({
       loadEndpointCircuitState: loadMock,
       saveEndpointCircuitState: saveMock,
@@ -114,9 +117,10 @@ describe("endpoint-circuit-breaker", () => {
     // 导致 sendAlertMock 被额外调用而产生偶发失败。这里用真实计时器让事件循环前进，确保告警任务尽快落地。
     vi.useRealTimers();
     const startedAt = Date.now();
-    while (sendAlertMock.mock.calls.length === 0 && Date.now() - startedAt < 1000) {
+    while (sendAlertMock.mock.calls.length === 0 && Date.now() - startedAt < 5000) {
       await new Promise<void>((resolve) => setTimeout(resolve, 0));
     }
+    expect(sendAlertMock.mock.calls.length).toBeGreaterThan(0);
   });
 
   test("recordEndpointSuccess: closed 且 failureCount>0 时应清零", async () => {
@@ -395,8 +399,12 @@ describe("endpoint-circuit-breaker", () => {
       getEnvConfig: () => ({ ENABLE_ENDPOINT_CIRCUIT_BREAKER: true }),
     }));
     vi.doMock("@/lib/logger", () => ({ logger: createLoggerMock() }));
+    const sendAlertMock = vi.fn(async () => {});
     vi.doMock("@/lib/notification/notifier", () => ({
-      sendCircuitBreakerAlert: vi.fn(async () => {}),
+      sendCircuitBreakerAlert: sendAlertMock,
+    }));
+    vi.doMock("@/repository", () => ({
+      findProviderEndpointById: vi.fn(async () => null),
     }));
     vi.doMock("@/lib/redis/endpoint-circuit-breaker-state", () => ({
       loadEndpointCircuitState: vi.fn(async () => redisState),
@@ -436,6 +444,14 @@ describe("endpoint-circuit-breaker", () => {
     expect(redisState!.circuitState).toBe("open");
     expect(redisState!.circuitOpenUntil).toBe(originalOpenUntil); // unchanged!
     expect(redisState!.failureCount).toBe(4);
+
+    // recordEndpointFailure 在打开熔断时会 non-blocking 触发告警；避免告警任务跨测试“借用”后续 mock。
+    vi.useRealTimers();
+    const startedAt = Date.now();
+    while (sendAlertMock.mock.calls.length === 0 && Date.now() - startedAt < 5000) {
+      await new Promise<void>((resolve) => setTimeout(resolve, 0));
+    }
+    expect(sendAlertMock).toHaveBeenCalledTimes(1);
   });
 
   test("getEndpointCircuitStateSync returns correct state for known and unknown endpoints", async () => {
@@ -445,8 +461,12 @@ describe("endpoint-circuit-breaker", () => {
       getEnvConfig: () => ({ ENABLE_ENDPOINT_CIRCUIT_BREAKER: true }),
     }));
     vi.doMock("@/lib/logger", () => ({ logger: createLoggerMock() }));
+    const sendAlertMock = vi.fn(async () => {});
     vi.doMock("@/lib/notification/notifier", () => ({
-      sendCircuitBreakerAlert: vi.fn(async () => {}),
+      sendCircuitBreakerAlert: sendAlertMock,
+    }));
+    vi.doMock("@/repository", () => ({
+      findProviderEndpointById: vi.fn(async () => null),
     }));
     vi.doMock("@/lib/redis/endpoint-circuit-breaker-state", () => ({
       loadEndpointCircuitState: vi.fn(async () => null),
@@ -466,6 +486,13 @@ describe("endpoint-circuit-breaker", () => {
     await recordEndpointFailure(200, new Error("b"));
     await recordEndpointFailure(200, new Error("c"));
     expect(getEndpointCircuitStateSync(200)).toBe("open");
+
+    // 打开熔断会触发异步告警；确保该任务在用例结束前完成，避免串台。
+    const startedAt = Date.now();
+    while (sendAlertMock.mock.calls.length === 0 && Date.now() - startedAt < 5000) {
+      await new Promise<void>((resolve) => setTimeout(resolve, 0));
+    }
+    expect(sendAlertMock).toHaveBeenCalledTimes(1);
   });
 
   describe("ENABLE_ENDPOINT_CIRCUIT_BREAKER disabled", () => {

From cc61d0940e2818a1b2b18e5ee904687942ac3b7f Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 19:27:35 +0800
Subject: [PATCH 14/27] =?UTF-8?q?fix(ui,test):=20=E5=A4=84=E7=90=86=20Code?=
 =?UTF-8?q?Rabbit=20=E5=A4=8D=E5=AE=A1=E5=BB=BA=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/routing-section.tsx              |  4 +---
 src/app/global-error.tsx                      |  2 ++
 .../form/client-restrictions-editor.tsx       | 16 +++++++++++--
 .../unit/lib/endpoint-circuit-breaker.test.ts | 24 +++++++++----------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index d6d01ecf5..f8d4bd31d 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -78,9 +78,7 @@ export function RoutingSection() {
     useState(hasAnyClientRestrictions);
 
   useEffect(() => {
-    if (hasAnyClientRestrictions) {
-      setClientRestrictionsEnabled(true);
-    }
+    setClientRestrictionsEnabled(hasAnyClientRestrictions);
   }, [hasAnyClientRestrictions]);
 
   const handleClientRestrictionsEnabledChange = (enabled: boolean) => {
diff --git a/src/app/global-error.tsx b/src/app/global-error.tsx
index 1902fcb35..b0ab5a7ef 100644
--- a/src/app/global-error.tsx
+++ b/src/app/global-error.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import "./globals.css";
+
 import { isNetworkError } from "@/lib/utils/error-detection";
 
 /**
diff --git a/src/components/form/client-restrictions-editor.tsx b/src/components/form/client-restrictions-editor.tsx
index 0c0065e51..f09ac41d8 100644
--- a/src/components/form/client-restrictions-editor.tsx
+++ b/src/components/form/client-restrictions-editor.tsx
@@ -124,11 +124,23 @@ export function ClientRestrictionsEditor({
   };
 
   const handleAllowedCustomChange = (customValues: string[]) => {
-    onAllowedChange(mergePresetAndCustomClients(allowed, customValues));
+    const blockedMerged = mergePresetAndCustomClients(
+      blocked,
+      splitPresetAndCustomClients(blocked).customValues
+    );
+    const blockedValueSet = new Set(blockedMerged);
+    const filteredCustomValues = customValues.filter((value) => !blockedValueSet.has(value));
+    onAllowedChange(mergePresetAndCustomClients(allowed, filteredCustomValues));
   };
 
   const handleBlockedCustomChange = (customValues: string[]) => {
-    onBlockedChange(mergePresetAndCustomClients(blocked, customValues));
+    const allowedMerged = mergePresetAndCustomClients(
+      allowed,
+      splitPresetAndCustomClients(allowed).customValues
+    );
+    const allowedValueSet = new Set(allowedMerged);
+    const filteredCustomValues = customValues.filter((value) => !allowedValueSet.has(value));
+    onBlockedChange(mergePresetAndCustomClients(blocked, filteredCustomValues));
   };
 
   return (
diff --git a/tests/unit/lib/endpoint-circuit-breaker.test.ts b/tests/unit/lib/endpoint-circuit-breaker.test.ts
index 67009732b..8ad6fc4d9 100644
--- a/tests/unit/lib/endpoint-circuit-breaker.test.ts
+++ b/tests/unit/lib/endpoint-circuit-breaker.test.ts
@@ -25,6 +25,13 @@ async function flushPromises(rounds = 2): Promise<void> {
   }
 }
 
+async function waitForMockCalled(mock: ReturnType<typeof vi.fn>, timeoutMs = 5000): Promise<void> {
+  const startedAt = Date.now();
+  while (mock.mock.calls.length === 0 && Date.now() - startedAt < timeoutMs) {
+    await new Promise<void>((resolve) => setTimeout(resolve, 0));
+  }
+}
+
 afterEach(() => {
   vi.useRealTimers();
   delete process.env.ENDPOINT_CIRCUIT_HEALTH_CACHE_MAX_SIZE;
@@ -116,11 +123,8 @@ describe("endpoint-circuit-breaker", () => {
     // 在 CI/bun 环境下，告警 Promise 可能在下一个测试开始后才完成，从而“借用”后续用例的 module mock，
     // 导致 sendAlertMock 被额外调用而产生偶发失败。这里用真实计时器让事件循环前进，确保告警任务尽快落地。
     vi.useRealTimers();
-    const startedAt = Date.now();
-    while (sendAlertMock.mock.calls.length === 0 && Date.now() - startedAt < 5000) {
-      await new Promise<void>((resolve) => setTimeout(resolve, 0));
-    }
-    expect(sendAlertMock.mock.calls.length).toBeGreaterThan(0);
+    await waitForMockCalled(sendAlertMock);
+    expect(sendAlertMock).toHaveBeenCalledTimes(1);
   });
 
   test("recordEndpointSuccess: closed 且 failureCount>0 时应清零", async () => {
@@ -447,10 +451,7 @@ describe("endpoint-circuit-breaker", () => {
 
     // recordEndpointFailure 在打开熔断时会 non-blocking 触发告警；避免告警任务跨测试“借用”后续 mock。
     vi.useRealTimers();
-    const startedAt = Date.now();
-    while (sendAlertMock.mock.calls.length === 0 && Date.now() - startedAt < 5000) {
-      await new Promise<void>((resolve) => setTimeout(resolve, 0));
-    }
+    await waitForMockCalled(sendAlertMock);
     expect(sendAlertMock).toHaveBeenCalledTimes(1);
   });
 
@@ -488,10 +489,7 @@ describe("endpoint-circuit-breaker", () => {
     expect(getEndpointCircuitStateSync(200)).toBe("open");
 
     // 打开熔断会触发异步告警；确保该任务在用例结束前完成，避免串台。
-    const startedAt = Date.now();
-    while (sendAlertMock.mock.calls.length === 0 && Date.now() - startedAt < 5000) {
-      await new Promise<void>((resolve) => setTimeout(resolve, 0));
-    }
+    await waitForMockCalled(sendAlertMock);
     expect(sendAlertMock).toHaveBeenCalledTimes(1);
   });
 

From a98ec3a6d4fd97f2b577ca00ac26d56f3a8492f7 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 19:48:10 +0800
Subject: [PATCH 15/27] =?UTF-8?q?fix(ui):=20=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E8=BE=93=E5=85=A5=E8=A1=A5=E9=BD=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forms/provider-form/sections/routing-section.tsx   | 10 ++++++++++
 src/components/form/client-restrictions-editor.tsx     |  7 +++++++
 tests/unit/lib/endpoint-circuit-breaker.test.ts        |  1 +
 3 files changed, 18 insertions(+)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index f8d4bd31d..6f12ac7b0 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -282,6 +282,16 @@ export function RoutingSection() {
                   getPresetLabel={(presetValue) =>
                     t(`sections.routing.clientRestrictions.presetClients.${presetValue}`)
                   }
+                  onInvalidTag={(_tag, reason) => {
+                    const messages: Record<string, string> = {
+                      empty: tUI("emptyTag"),
+                      duplicate: tUI("duplicateTag"),
+                      too_long: tUI("tooLong", { max: 64 }),
+                      invalid_format: tUI("invalidFormat"),
+                      max_tags: tUI("maxTags"),
+                    };
+                    toast.error(messages[reason] || reason);
+                  }}
                 />
               </div>
             )}
diff --git a/src/components/form/client-restrictions-editor.tsx b/src/components/form/client-restrictions-editor.tsx
index f09ac41d8..bd592a646 100644
--- a/src/components/form/client-restrictions-editor.tsx
+++ b/src/components/form/client-restrictions-editor.tsx
@@ -22,6 +22,7 @@ interface ClientRestrictionListEditorProps {
   getPresetLabel: (presetValue: string) => string;
   onTogglePreset: (presetValue: string, checked: boolean) => void;
   onCustomChange: (customValues: string[]) => void;
+  onInvalidTag?: (tag: string, reason: string) => void;
   className?: string;
 }
 
@@ -33,6 +34,7 @@ function ClientRestrictionListEditor({
   getPresetLabel,
   onTogglePreset,
   onCustomChange,
+  onInvalidTag,
   className,
 }: ClientRestrictionListEditorProps) {
   const idPrefix = useId();
@@ -70,6 +72,7 @@ function ClientRestrictionListEditor({
           maxTags={50}
           disabled={disabled}
           validateTag={() => true}
+          onInvalidTag={onInvalidTag}
         />
       </div>
     </div>
@@ -87,6 +90,7 @@ export interface ClientRestrictionsEditorProps {
   blockedPlaceholder?: string;
   disabled?: boolean;
   getPresetLabel: (presetValue: string) => string;
+  onInvalidTag?: (tag: string, reason: string) => void;
   className?: string;
 }
 
@@ -101,6 +105,7 @@ export function ClientRestrictionsEditor({
   blockedPlaceholder,
   disabled,
   getPresetLabel,
+  onInvalidTag,
   className,
 }: ClientRestrictionsEditorProps) {
   const handleAllowToggle = (presetValue: string, checked: boolean) => {
@@ -153,6 +158,7 @@ export function ClientRestrictionsEditor({
         getPresetLabel={getPresetLabel}
         onTogglePreset={handleAllowToggle}
         onCustomChange={handleAllowedCustomChange}
+        onInvalidTag={onInvalidTag}
       />
       <ClientRestrictionListEditor
         label={blockedLabel}
@@ -162,6 +168,7 @@ export function ClientRestrictionsEditor({
         getPresetLabel={getPresetLabel}
         onTogglePreset={handleBlockToggle}
         onCustomChange={handleBlockedCustomChange}
+        onInvalidTag={onInvalidTag}
       />
     </div>
   );
diff --git a/tests/unit/lib/endpoint-circuit-breaker.test.ts b/tests/unit/lib/endpoint-circuit-breaker.test.ts
index 8ad6fc4d9..7a29a1551 100644
--- a/tests/unit/lib/endpoint-circuit-breaker.test.ts
+++ b/tests/unit/lib/endpoint-circuit-breaker.test.ts
@@ -489,6 +489,7 @@ describe("endpoint-circuit-breaker", () => {
     expect(getEndpointCircuitStateSync(200)).toBe("open");
 
     // 打开熔断会触发异步告警；确保该任务在用例结束前完成，避免串台。
+    vi.useRealTimers();
     await waitForMockCalled(sendAlertMock);
     expect(sendAlertMock).toHaveBeenCalledTimes(1);
   });

From 5a1290d18000c948d39b5a9b92af209f2877caa1 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 20:01:30 +0800
Subject: [PATCH 16/27] =?UTF-8?q?fix(ui):=20=E6=94=B9=E5=96=84=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=95=86=E8=A1=A8=E5=8D=95=E7=9A=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E9=99=90=E5=88=B6=E4=B8=8E=E6=A8=A1=E5=9E=8B=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/routing-section.tsx              |  90 ++++++------
 .../_components/model-multi-select.tsx        |   2 +-
 .../form/client-restrictions-editor.tsx       | 139 +++++++-----------
 3 files changed, 97 insertions(+), 134 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index 6f12ac7b0..9c0df935b 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -194,48 +194,50 @@ export function RoutingSection() {
 
             {/* Allowed Models */}
             <FieldGroup label={t("sections.routing.modelWhitelist.label")}>
-              <ModelMultiSelect
-                providerType={state.routing.providerType}
-                selectedModels={state.routing.allowedModels}
-                onChange={(value: string[]) =>
-                  dispatch({ type: "SET_ALLOWED_MODELS", payload: value })
-                }
-                disabled={state.ui.isPending}
-                providerUrl={state.basic.url}
-                apiKey={state.basic.key}
-                proxyUrl={state.network.proxyUrl}
-                proxyFallbackToDirect={state.network.proxyFallbackToDirect}
-                providerId={isEdit ? provider?.id : undefined}
-              />
-              {state.routing.allowedModels.length > 0 && (
-                <div className="flex flex-wrap gap-1 p-2 bg-muted/50 rounded-md">
-                  {state.routing.allowedModels.slice(0, 5).map((model) => (
-                    <Badge key={model} variant="outline" className="font-mono text-xs">
-                      {model}
-                    </Badge>
-                  ))}
-                  {state.routing.allowedModels.length > 5 && (
-                    <Badge variant="secondary" className="text-xs">
-                      {t("sections.routing.modelWhitelist.moreModels", {
-                        count: state.routing.allowedModels.length - 5,
+              <div className="space-y-2">
+                <ModelMultiSelect
+                  providerType={state.routing.providerType}
+                  selectedModels={state.routing.allowedModels}
+                  onChange={(value: string[]) =>
+                    dispatch({ type: "SET_ALLOWED_MODELS", payload: value })
+                  }
+                  disabled={state.ui.isPending}
+                  providerUrl={state.basic.url}
+                  apiKey={state.basic.key}
+                  proxyUrl={state.network.proxyUrl}
+                  proxyFallbackToDirect={state.network.proxyFallbackToDirect}
+                  providerId={isEdit ? provider?.id : undefined}
+                />
+                {state.routing.allowedModels.length > 0 && (
+                  <div className="flex flex-wrap gap-1 p-2 bg-muted/50 rounded-md">
+                    {state.routing.allowedModels.slice(0, 5).map((model) => (
+                      <Badge key={model} variant="outline" className="font-mono text-xs">
+                        {model}
+                      </Badge>
+                    ))}
+                    {state.routing.allowedModels.length > 5 && (
+                      <Badge variant="secondary" className="text-xs">
+                        {t("sections.routing.modelWhitelist.moreModels", {
+                          count: state.routing.allowedModels.length - 5,
+                        })}
+                      </Badge>
+                    )}
+                  </div>
+                )}
+                <p className="text-xs text-muted-foreground">
+                  {state.routing.allowedModels.length === 0 ? (
+                    <span className="text-green-600">
+                      {t("sections.routing.modelWhitelist.allowAll")}
+                    </span>
+                  ) : (
+                    <span>
+                      {t("sections.routing.modelWhitelist.selectedOnly", {
+                        count: state.routing.allowedModels.length,
                       })}
-                    </Badge>
+                    </span>
                   )}
-                </div>
-              )}
-              <p className="text-xs text-muted-foreground">
-                {state.routing.allowedModels.length === 0 ? (
-                  <span className="text-green-600">
-                    {t("sections.routing.modelWhitelist.allowAll")}
-                  </span>
-                ) : (
-                  <span>
-                    {t("sections.routing.modelWhitelist.selectedOnly", {
-                      count: state.routing.allowedModels.length,
-                    })}
-                  </span>
-                )}
-              </p>
+                </p>
+              </div>
             </FieldGroup>
 
             <ToggleRow
@@ -272,12 +274,8 @@ export function RoutingSection() {
                   }
                   allowedLabel={t("sections.routing.clientRestrictions.allowedLabel")}
                   blockedLabel={t("sections.routing.clientRestrictions.blockedLabel")}
-                  allowedPlaceholder={t(
-                    "sections.routing.clientRestrictions.customAllowedPlaceholder"
-                  )}
-                  blockedPlaceholder={t(
-                    "sections.routing.clientRestrictions.customBlockedPlaceholder"
-                  )}
+                  allowedPlaceholder={t("sections.routing.clientRestrictions.allowedPlaceholder")}
+                  blockedPlaceholder={t("sections.routing.clientRestrictions.blockedPlaceholder")}
                   disabled={state.ui.isPending}
                   getPresetLabel={(presetValue) =>
                     t(`sections.routing.clientRestrictions.presetClients.${presetValue}`)
diff --git a/src/app/[locale]/settings/providers/_components/model-multi-select.tsx b/src/app/[locale]/settings/providers/_components/model-multi-select.tsx
index 4effd3f3f..dd763f604 100644
--- a/src/app/[locale]/settings/providers/_components/model-multi-select.tsx
+++ b/src/app/[locale]/settings/providers/_components/model-multi-select.tsx
@@ -222,7 +222,7 @@ export function ModelMultiSelect({
         </Button>
       </PopoverTrigger>
       <PopoverContent
-        className="w-[400px] p-0 flex flex-col"
+        className="w-[400px] max-w-[calc(100vw-2rem)] p-0 flex flex-col"
         align="start"
         onWheel={(e) => e.stopPropagation()}
         onTouchMove={(e) => e.stopPropagation()}
diff --git a/src/components/form/client-restrictions-editor.tsx b/src/components/form/client-restrictions-editor.tsx
index bd592a646..a30241835 100644
--- a/src/components/form/client-restrictions-editor.tsx
+++ b/src/components/form/client-restrictions-editor.tsx
@@ -1,27 +1,31 @@
 "use client";
 
-import { useId } from "react";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Label } from "@/components/ui/label";
-import { TagInput } from "@/components/ui/tag-input";
-import {
-  CLIENT_RESTRICTION_PRESET_OPTIONS,
-  isPresetSelected,
-  mergePresetAndCustomClients,
-  removePresetValues,
-  splitPresetAndCustomClients,
-  togglePresetSelection,
-} from "@/lib/client-restrictions/client-presets";
+import { TagInput, type TagInputSuggestion } from "@/components/ui/tag-input";
+import { CLIENT_RESTRICTION_PRESET_OPTIONS } from "@/lib/client-restrictions/client-presets";
 import { cn } from "@/lib/utils";
 
+function uniqueOrdered(values: string[]): string[] {
+  const seen = new Set<string>();
+  const result: string[] = [];
+
+  for (const value of values) {
+    const trimmed = value.trim();
+    if (!trimmed) continue;
+    if (seen.has(trimmed)) continue;
+    seen.add(trimmed);
+    result.push(trimmed);
+  }
+
+  return result;
+}
+
 interface ClientRestrictionListEditorProps {
   label: string;
   values: string[];
   placeholder?: string;
   disabled?: boolean;
-  getPresetLabel: (presetValue: string) => string;
-  onTogglePreset: (presetValue: string, checked: boolean) => void;
-  onCustomChange: (customValues: string[]) => void;
+  suggestions: TagInputSuggestion[];
+  onChange: (next: string[]) => void;
   onInvalidTag?: (tag: string, reason: string) => void;
   className?: string;
 }
@@ -31,50 +35,25 @@ function ClientRestrictionListEditor({
   values,
   placeholder,
   disabled,
-  getPresetLabel,
-  onTogglePreset,
-  onCustomChange,
+  suggestions,
+  onChange,
   onInvalidTag,
   className,
 }: ClientRestrictionListEditorProps) {
-  const idPrefix = useId();
-  const { customValues } = splitPresetAndCustomClients(values);
-
   return (
     <div className={cn("space-y-3", className)}>
       <div className="text-sm font-medium text-foreground">{label}</div>
-      <div className="space-y-2 rounded-md border p-3">
-        {CLIENT_RESTRICTION_PRESET_OPTIONS.map((option) => {
-          const checked = isPresetSelected(values, option.value);
-          const checkboxId = `${idPrefix}-${option.value}`;
-          return (
-            <div key={option.value} className="flex items-center gap-2">
-              <Checkbox
-                id={checkboxId}
-                checked={checked}
-                disabled={disabled}
-                onCheckedChange={(next) => onTogglePreset(option.value, next === true)}
-              />
-              <Label htmlFor={checkboxId} className="cursor-pointer text-sm font-normal">
-                {getPresetLabel(option.value)}
-              </Label>
-            </div>
-          );
-        })}
-      </div>
-
-      <div className="space-y-1">
-        <TagInput
-          value={customValues}
-          onChange={onCustomChange}
-          placeholder={placeholder}
-          maxTagLength={64}
-          maxTags={50}
-          disabled={disabled}
-          validateTag={() => true}
-          onInvalidTag={onInvalidTag}
-        />
-      </div>
+      <TagInput
+        value={values}
+        onChange={onChange}
+        placeholder={placeholder}
+        maxTagLength={64}
+        maxTags={50}
+        disabled={disabled}
+        validateTag={() => true}
+        onInvalidTag={onInvalidTag}
+        suggestions={suggestions}
+      />
     </div>
   );
 }
@@ -108,46 +87,34 @@ export function ClientRestrictionsEditor({
   onInvalidTag,
   className,
 }: ClientRestrictionsEditorProps) {
-  const handleAllowToggle = (presetValue: string, checked: boolean) => {
-    const nextAllowed = togglePresetSelection(allowed, presetValue, checked);
+  const suggestions: TagInputSuggestion[] = CLIENT_RESTRICTION_PRESET_OPTIONS.map((option) => ({
+    value: option.value,
+    label: getPresetLabel(option.value),
+    keywords: [...option.aliases],
+  }));
+
+  const handleAllowedChange = (next: string[]) => {
+    const nextAllowed = uniqueOrdered(next);
     onAllowedChange(nextAllowed);
 
-    if (checked) {
-      const nextBlocked = removePresetValues(blocked, presetValue);
+    const allowedSet = new Set(nextAllowed);
+    const nextBlocked = blocked.filter((value) => !allowedSet.has(value));
+    if (nextBlocked.length !== blocked.length) {
       onBlockedChange(nextBlocked);
     }
   };
 
-  const handleBlockToggle = (presetValue: string, checked: boolean) => {
-    const nextBlocked = togglePresetSelection(blocked, presetValue, checked);
+  const handleBlockedChange = (next: string[]) => {
+    const nextBlocked = uniqueOrdered(next);
     onBlockedChange(nextBlocked);
 
-    if (checked) {
-      const nextAllowed = removePresetValues(allowed, presetValue);
+    const blockedSet = new Set(nextBlocked);
+    const nextAllowed = allowed.filter((value) => !blockedSet.has(value));
+    if (nextAllowed.length !== allowed.length) {
       onAllowedChange(nextAllowed);
     }
   };
 
-  const handleAllowedCustomChange = (customValues: string[]) => {
-    const blockedMerged = mergePresetAndCustomClients(
-      blocked,
-      splitPresetAndCustomClients(blocked).customValues
-    );
-    const blockedValueSet = new Set(blockedMerged);
-    const filteredCustomValues = customValues.filter((value) => !blockedValueSet.has(value));
-    onAllowedChange(mergePresetAndCustomClients(allowed, filteredCustomValues));
-  };
-
-  const handleBlockedCustomChange = (customValues: string[]) => {
-    const allowedMerged = mergePresetAndCustomClients(
-      allowed,
-      splitPresetAndCustomClients(allowed).customValues
-    );
-    const allowedValueSet = new Set(allowedMerged);
-    const filteredCustomValues = customValues.filter((value) => !allowedValueSet.has(value));
-    onBlockedChange(mergePresetAndCustomClients(blocked, filteredCustomValues));
-  };
-
   return (
     <div className={cn("grid grid-cols-1 gap-4 sm:grid-cols-2", className)}>
       <ClientRestrictionListEditor
@@ -155,9 +122,8 @@ export function ClientRestrictionsEditor({
         values={allowed}
         placeholder={allowedPlaceholder}
         disabled={disabled}
-        getPresetLabel={getPresetLabel}
-        onTogglePreset={handleAllowToggle}
-        onCustomChange={handleAllowedCustomChange}
+        suggestions={suggestions}
+        onChange={handleAllowedChange}
         onInvalidTag={onInvalidTag}
       />
       <ClientRestrictionListEditor
@@ -165,9 +131,8 @@ export function ClientRestrictionsEditor({
         values={blocked}
         placeholder={blockedPlaceholder}
         disabled={disabled}
-        getPresetLabel={getPresetLabel}
-        onTogglePreset={handleBlockToggle}
-        onCustomChange={handleBlockedCustomChange}
+        suggestions={suggestions}
+        onChange={handleBlockedChange}
         onInvalidTag={onInvalidTag}
       />
     </div>

From 38fb9718440597786f4cfbf19c010a981f6687ea Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 22:30:42 +0800
Subject: [PATCH 17/27] =?UTF-8?q?perf(ui):=20Provider=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=97=A0=E6=95=88=E9=87=8D=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/routing-section.tsx              | 12 ++-
 .../_components/model-multi-select.tsx        | 73 +++++++++++--------
 .../form/client-restrictions-editor.tsx       | 15 ++--
 3 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index 9c0df935b..24d1a56a4 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -3,7 +3,7 @@
 import { motion } from "framer-motion";
 import { Info, Layers, Route, Scale, Settings, Timer } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { ClientRestrictionsEditor } from "@/components/form/client-restrictions-editor";
 import { Badge } from "@/components/ui/badge";
@@ -89,6 +89,12 @@ export function RoutingSection() {
     }
   };
 
+  const getClientRestrictionPresetLabel = useCallback(
+    (presetValue: string) =>
+      t(`sections.routing.clientRestrictions.presetClients.${presetValue}`),
+    [t]
+  );
+
   return (
     <TooltipProvider>
       <motion.div
@@ -277,9 +283,7 @@ export function RoutingSection() {
                   allowedPlaceholder={t("sections.routing.clientRestrictions.allowedPlaceholder")}
                   blockedPlaceholder={t("sections.routing.clientRestrictions.blockedPlaceholder")}
                   disabled={state.ui.isPending}
-                  getPresetLabel={(presetValue) =>
-                    t(`sections.routing.clientRestrictions.presetClients.${presetValue}`)
-                  }
+                  getPresetLabel={getClientRestrictionPresetLabel}
                   onInvalidTag={(_tag, reason) => {
                     const messages: Record<string, string> = {
                       empty: tUI("emptyTag"),
diff --git a/src/app/[locale]/settings/providers/_components/model-multi-select.tsx b/src/app/[locale]/settings/providers/_components/model-multi-select.tsx
index dd763f604..41f3e9976 100644
--- a/src/app/[locale]/settings/providers/_components/model-multi-select.tsx
+++ b/src/app/[locale]/settings/providers/_components/model-multi-select.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { Check, ChevronsUpDown, Cloud, Database, Loader2, Plus, RefreshCw } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { getAvailableModelsByProviderType } from "@/actions/model-prices";
 import { fetchUpstreamModels, getUnmaskedProviderKey } from "@/actions/providers";
 import { Badge } from "@/components/ui/badge";
@@ -40,6 +40,38 @@ interface ModelMultiSelectProps {
   providerId?: number;
 }
 
+function ModelSourceIndicator({
+  loading,
+  isUpstream,
+  label,
+  description,
+}: {
+  loading: boolean;
+  isUpstream: boolean;
+  label: string;
+  description: string;
+}) {
+  if (loading) return null;
+
+  const Icon = isUpstream ? Cloud : Database;
+
+  return (
+    <TooltipProvider>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <div className="flex items-center gap-1.5 px-2 py-1 rounded-md bg-muted/50 text-xs text-muted-foreground">
+            <Icon className="h-3 w-3" />
+            <span>{label}</span>
+          </div>
+        </TooltipTrigger>
+        <TooltipContent side="top" className="max-w-[200px]">
+          <p className="text-xs">{description}</p>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}
+
 export function ModelMultiSelect({
   providerType,
   selectedModels,
@@ -58,7 +90,7 @@ export function ModelMultiSelect({
   const [modelSource, setModelSource] = useState<ModelSource>("loading");
   const [customModel, setCustomModel] = useState("");
 
-  const displayedModels = (() => {
+  const displayedModels = useMemo(() => {
     const seen = new Set<string>();
     const merged: string[] = [];
 
@@ -76,7 +108,7 @@ export function ModelMultiSelect({
     }
 
     return merged;
-  })();
+  }, [availableModels, selectedModels]);
 
   // 供应商类型到显示名称的映射
   const getProviderTypeLabel = (type: string): string => {
@@ -162,31 +194,9 @@ export function ModelMultiSelect({
     setCustomModel("");
   };
 
-  // 数据来源指示器
-  const SourceIndicator = () => {
-    if (loading) return null;
-
-    const isUpstream = modelSource === "upstream";
-    const Icon = isUpstream ? Cloud : Database;
-    const label = isUpstream ? t("sourceUpstream") : t("sourceFallback");
-    const description = isUpstream ? t("sourceUpstreamDesc") : t("sourceFallbackDesc");
-
-    return (
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <div className="flex items-center gap-1.5 px-2 py-1 rounded-md bg-muted/50 text-xs text-muted-foreground">
-              <Icon className="h-3 w-3" />
-              <span>{label}</span>
-            </div>
-          </TooltipTrigger>
-          <TooltipContent side="top" className="max-w-[200px]">
-            <p className="text-xs">{description}</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    );
-  };
+  const isUpstream = modelSource === "upstream";
+  const sourceLabel = isUpstream ? t("sourceUpstream") : t("sourceFallback");
+  const sourceDescription = isUpstream ? t("sourceUpstreamDesc") : t("sourceFallbackDesc");
 
   return (
     <Popover open={open} onOpenChange={setOpen}>
@@ -238,7 +248,12 @@ export function ModelMultiSelect({
                 <CommandGroup>
                   <div className="flex items-center justify-between gap-2 p-2">
                     <div className="flex items-center gap-2">
-                      <SourceIndicator />
+                      <ModelSourceIndicator
+                        loading={loading}
+                        isUpstream={isUpstream}
+                        label={sourceLabel}
+                        description={sourceDescription}
+                      />
                       <TooltipProvider>
                         <Tooltip>
                           <TooltipTrigger asChild>
diff --git a/src/components/form/client-restrictions-editor.tsx b/src/components/form/client-restrictions-editor.tsx
index a30241835..7ff09a3c4 100644
--- a/src/components/form/client-restrictions-editor.tsx
+++ b/src/components/form/client-restrictions-editor.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useMemo } from "react";
 import { TagInput, type TagInputSuggestion } from "@/components/ui/tag-input";
 import { CLIENT_RESTRICTION_PRESET_OPTIONS } from "@/lib/client-restrictions/client-presets";
 import { cn } from "@/lib/utils";
@@ -87,11 +88,15 @@ export function ClientRestrictionsEditor({
   onInvalidTag,
   className,
 }: ClientRestrictionsEditorProps) {
-  const suggestions: TagInputSuggestion[] = CLIENT_RESTRICTION_PRESET_OPTIONS.map((option) => ({
-    value: option.value,
-    label: getPresetLabel(option.value),
-    keywords: [...option.aliases],
-  }));
+  const suggestions: TagInputSuggestion[] = useMemo(
+    () =>
+      CLIENT_RESTRICTION_PRESET_OPTIONS.map((option) => ({
+        value: option.value,
+        label: getPresetLabel(option.value),
+        keywords: [...option.aliases],
+      })),
+    [getPresetLabel]
+  );
 
   const handleAllowedChange = (next: string[]) => {
     const nextAllowed = uniqueOrdered(next);

From 059ecd7329f9eb1c92bae3f0db0b28d35325cf55 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:31:19 +0000
Subject: [PATCH 18/27] chore: format code (fix-issue-799-mobile-ui-38fb971)

---
 .../forms/provider-form/sections/routing-section.tsx           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index 24d1a56a4..3749a4a67 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -90,8 +90,7 @@ export function RoutingSection() {
   };
 
   const getClientRestrictionPresetLabel = useCallback(
-    (presetValue: string) =>
-      t(`sections.routing.clientRestrictions.presetClients.${presetValue}`),
+    (presetValue: string) => t(`sections.routing.clientRestrictions.presetClients.${presetValue}`),
     [t]
   );
 

From bc9cdf544907305768cdccf9e9a56b3b0e757544 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Mon, 23 Feb 2026 23:01:05 +0800
Subject: [PATCH 19/27] =?UTF-8?q?fix(build):=20standalone=20=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E8=BF=90=E8=A1=8C=E8=A1=A5=E9=BD=90=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/copy-version-to-standalone.cjs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/scripts/copy-version-to-standalone.cjs b/scripts/copy-version-to-standalone.cjs
index a8776bdcc..7147dcd9a 100644
--- a/scripts/copy-version-to-standalone.cjs
+++ b/scripts/copy-version-to-standalone.cjs
@@ -1,6 +1,17 @@
 const fs = require("node:fs");
 const path = require("node:path");
 
+function copyDirIfExists(srcDir, dstDir) {
+  if (!fs.existsSync(srcDir)) {
+    console.warn(`[copy-standalone] Skip missing dir: ${srcDir}`);
+    return;
+  }
+
+  fs.mkdirSync(path.dirname(dstDir), { recursive: true });
+  fs.cpSync(srcDir, dstDir, { recursive: true, force: true });
+  console.log(`[copy-standalone] Copied ${srcDir} -> ${dstDir}`);
+}
+
 const src = path.resolve(process.cwd(), "VERSION");
 const dstDir = path.resolve(process.cwd(), ".next", "standalone");
 const dst = path.join(dstDir, "VERSION");
@@ -13,3 +24,11 @@ if (!fs.existsSync(src)) {
 fs.mkdirSync(dstDir, { recursive: true });
 fs.copyFileSync(src, dst);
 console.log(`[copy-version] Copied VERSION -> ${dst}`);
+
+// Make standalone output self-contained for local `node .next/standalone/server.js` runs.
+// Next.js standalone requires `.next/static` and `public` to exist next to `server.js`.
+copyDirIfExists(
+  path.resolve(process.cwd(), ".next", "static"),
+  path.resolve(dstDir, ".next", "static")
+);
+copyDirIfExists(path.resolve(process.cwd(), "public"), path.resolve(dstDir, "public"));

From c147c91a2018153b0b52af117aaac3c8e45da62d Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 09:53:59 +0800
Subject: [PATCH 20/27] =?UTF-8?q?fix(ui):=20=E8=B0=83=E6=95=B4=E6=80=9D?=
 =?UTF-8?q?=E8=80=83=E9=A2=84=E7=AE=97/=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E6=80=9D=E8=80=83=E6=8F=90=E7=A4=BA=E8=A7=A6=E5=8F=91=E4=B8=8E?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/adaptive-thinking-editor.tsx  | 190 ++++++++++--------
 .../_components/thinking-budget-editor.tsx    |  88 ++++----
 .../ui/__tests__/calendar-highlight.test.tsx  |  20 +-
 .../providers/thinking-budget-editor.test.tsx |  22 +-
 4 files changed, 182 insertions(+), 138 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx b/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx
index f7537553c..d7d525b25 100644
--- a/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx
+++ b/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx
@@ -71,104 +71,126 @@ export function AdaptiveThinkingEditor({
           <SmartInputWrapper
             label={t("sections.routing.anthropicOverrides.adaptiveThinking.effort.label")}
           >
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <div className="flex gap-2 items-center">
-                  <Select
-                    value={config.effort}
-                    onValueChange={(val) =>
-                      handleEffortChange(val as AnthropicAdaptiveThinkingEffort)
-                    }
-                    disabled={disabled}
+            <div className="flex gap-2 items-center">
+              <Select
+                value={config.effort}
+                onValueChange={(val) => handleEffortChange(val as AnthropicAdaptiveThinkingEffort)}
+                disabled={disabled}
+              >
+                <SelectTrigger className="w-40">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {(["low", "medium", "high", "max"] as const).map((level) => (
+                    <SelectItem key={level} value={level}>
+                      {t(
+                        `sections.routing.anthropicOverrides.adaptiveThinking.effort.options.${level}`
+                      )}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <button
+                    type="button"
+                    aria-label={t(
+                      "sections.routing.anthropicOverrides.adaptiveThinking.effort.help"
+                    )}
+                    className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
                   >
-                    <SelectTrigger className="w-40">
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {(["low", "medium", "high", "max"] as const).map((level) => (
-                        <SelectItem key={level} value={level}>
-                          {t(
-                            `sections.routing.anthropicOverrides.adaptiveThinking.effort.options.${level}`
-                          )}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                  <Info className="h-4 w-4 text-muted-foreground shrink-0" />
-                </div>
-              </TooltipTrigger>
-              <TooltipContent side="top" className="max-w-xs">
-                <p className="text-sm">
-                  {t("sections.routing.anthropicOverrides.adaptiveThinking.effort.help")}
-                </p>
-              </TooltipContent>
-            </Tooltip>
+                    <Info className="h-4 w-4 shrink-0" />
+                  </button>
+                </TooltipTrigger>
+                <TooltipContent side="top" sideOffset={4} className="max-w-xs">
+                  <p className="leading-relaxed">
+                    {t("sections.routing.anthropicOverrides.adaptiveThinking.effort.help")}
+                  </p>
+                </TooltipContent>
+              </Tooltip>
+            </div>
           </SmartInputWrapper>
 
           <SmartInputWrapper
             label={t("sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.label")}
           >
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <div className="flex gap-2 items-center">
-                  <Select
-                    value={config.modelMatchMode}
-                    onValueChange={(val) =>
-                      handleModeChange(val as AnthropicAdaptiveThinkingModelMatchMode)
-                    }
-                    disabled={disabled}
+            <div className="flex gap-2 items-center">
+              <Select
+                value={config.modelMatchMode}
+                onValueChange={(val) =>
+                  handleModeChange(val as AnthropicAdaptiveThinkingModelMatchMode)
+                }
+                disabled={disabled}
+              >
+                <SelectTrigger className="w-40">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="all">
+                    {t(
+                      "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.all"
+                    )}
+                  </SelectItem>
+                  <SelectItem value="specific">
+                    {t(
+                      "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.specific"
+                    )}
+                  </SelectItem>
+                </SelectContent>
+              </Select>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <button
+                    type="button"
+                    aria-label={t(
+                      "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.help"
+                    )}
+                    className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
                   >
-                    <SelectTrigger className="w-40">
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="all">
-                        {t(
-                          "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.all"
-                        )}
-                      </SelectItem>
-                      <SelectItem value="specific">
-                        {t(
-                          "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.specific"
-                        )}
-                      </SelectItem>
-                    </SelectContent>
-                  </Select>
-                  <Info className="h-4 w-4 text-muted-foreground shrink-0" />
-                </div>
-              </TooltipTrigger>
-              <TooltipContent side="top" className="max-w-xs">
-                <p className="text-sm">
-                  {t("sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.help")}
-                </p>
-              </TooltipContent>
-            </Tooltip>
+                    <Info className="h-4 w-4 shrink-0" />
+                  </button>
+                </TooltipTrigger>
+                <TooltipContent side="top" sideOffset={4} className="max-w-xs">
+                  <p className="leading-relaxed">
+                    {t("sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.help")}
+                  </p>
+                </TooltipContent>
+              </Tooltip>
+            </div>
           </SmartInputWrapper>
 
           {config.modelMatchMode === "specific" && (
             <SmartInputWrapper
               label={t("sections.routing.anthropicOverrides.adaptiveThinking.models.label")}
             >
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <div className="flex gap-2 items-center">
-                    <TagInput
-                      value={config.models}
-                      onChange={handleModelsChange}
-                      placeholder={t(
-                        "sections.routing.anthropicOverrides.adaptiveThinking.models.placeholder"
+              <div className="flex gap-2 items-center">
+                <TagInput
+                  value={config.models}
+                  onChange={handleModelsChange}
+                  placeholder={t(
+                    "sections.routing.anthropicOverrides.adaptiveThinking.models.placeholder"
+                  )}
+                  disabled={disabled}
+                />
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <button
+                      type="button"
+                      aria-label={t(
+                        "sections.routing.anthropicOverrides.adaptiveThinking.models.help"
                       )}
-                      disabled={disabled}
-                    />
-                    <Info className="h-4 w-4 text-muted-foreground shrink-0" />
-                  </div>
-                </TooltipTrigger>
-                <TooltipContent side="top" className="max-w-xs">
-                  <p className="text-sm">
-                    {t("sections.routing.anthropicOverrides.adaptiveThinking.models.help")}
-                  </p>
-                </TooltipContent>
-              </Tooltip>
+                      className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+                    >
+                      <Info className="h-4 w-4 shrink-0" />
+                    </button>
+                  </TooltipTrigger>
+                  <TooltipContent side="top" sideOffset={4} className="max-w-xs">
+                    <p className="leading-relaxed">
+                      {t("sections.routing.anthropicOverrides.adaptiveThinking.models.help")}
+                    </p>
+                  </TooltipContent>
+                </Tooltip>
+              </div>
             </SmartInputWrapper>
           )}
         </div>
diff --git a/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx b/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx
index 826a154c5..d197eb74b 100644
--- a/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx
+++ b/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx
@@ -45,46 +45,52 @@ export function ThinkingBudgetEditor({
   };
 
   return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <div className="flex gap-2 items-center">
-          <Select value={mode} onValueChange={handleModeChange} disabled={disabled}>
-            <SelectTrigger className="w-40">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="inherit">{t(`${prefix}.options.inherit`)}</SelectItem>
-              <SelectItem value="custom">{t(`${prefix}.options.custom`)}</SelectItem>
-            </SelectContent>
-          </Select>
-          {mode !== "inherit" && (
-            <>
-              <Input
-                type="number"
-                value={value}
-                onChange={handleInputChange}
-                placeholder={t(`${prefix}.placeholder`)}
-                disabled={disabled}
-                min="1024"
-                max="32000"
-                className="flex-1"
-              />
-              <button
-                type="button"
-                onClick={handleMaxOut}
-                className="px-3 py-2 text-xs bg-primary/10 hover:bg-primary/20 text-primary rounded-md transition-colors whitespace-nowrap"
-                disabled={disabled}
-              >
-                {t(`${prefix}.maxOutButton`)}
-              </button>
-            </>
-          )}
-          <Info className="h-4 w-4 text-muted-foreground shrink-0" />
-        </div>
-      </TooltipTrigger>
-      <TooltipContent side="top" className="max-w-xs">
-        <p className="text-sm">{t(`${prefix}.help`)}</p>
-      </TooltipContent>
-    </Tooltip>
+    <div className="flex gap-2 items-center">
+      <Select value={mode} onValueChange={handleModeChange} disabled={disabled}>
+        <SelectTrigger className="w-40">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="inherit">{t(`${prefix}.options.inherit`)}</SelectItem>
+          <SelectItem value="custom">{t(`${prefix}.options.custom`)}</SelectItem>
+        </SelectContent>
+      </Select>
+      {mode !== "inherit" && (
+        <>
+          <Input
+            type="number"
+            value={value}
+            onChange={handleInputChange}
+            placeholder={t(`${prefix}.placeholder`)}
+            disabled={disabled}
+            min="1024"
+            max="32000"
+            className="flex-1"
+          />
+          <button
+            type="button"
+            onClick={handleMaxOut}
+            className="px-3 py-2 text-xs bg-primary/10 hover:bg-primary/20 text-primary rounded-md transition-colors whitespace-nowrap"
+            disabled={disabled}
+          >
+            {t(`${prefix}.maxOutButton`)}
+          </button>
+        </>
+      )}
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <button
+            type="button"
+            aria-label={t(`${prefix}.help`)}
+            className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+          >
+            <Info className="h-4 w-4 shrink-0" />
+          </button>
+        </TooltipTrigger>
+        <TooltipContent side="top" sideOffset={4} className="max-w-xs">
+          <p className="leading-relaxed">{t(`${prefix}.help`)}</p>
+        </TooltipContent>
+      </Tooltip>
+    </div>
   );
 }
diff --git a/src/components/ui/__tests__/calendar-highlight.test.tsx b/src/components/ui/__tests__/calendar-highlight.test.tsx
index 1dcb8b0d3..938239bc9 100644
--- a/src/components/ui/__tests__/calendar-highlight.test.tsx
+++ b/src/components/ui/__tests__/calendar-highlight.test.tsx
@@ -65,8 +65,9 @@ describe("Calendar highlight classes", () => {
 
   test("Calendar range_start className should use primary-based highlight", () => {
     const startDate = new Date();
-    const endDate = new Date();
-    endDate.setDate(endDate.getDate() + 5);
+    startDate.setDate(10);
+    const endDate = new Date(startDate);
+    endDate.setDate(15);
 
     const { container, unmount } = render(
       <Calendar mode="range" selected={{ from: startDate, to: endDate }} />
@@ -89,8 +90,9 @@ describe("Calendar highlight classes", () => {
 
   test("Calendar range_middle className should use primary-based highlight", () => {
     const startDate = new Date();
-    const endDate = new Date();
-    endDate.setDate(endDate.getDate() + 5);
+    startDate.setDate(10);
+    const endDate = new Date(startDate);
+    endDate.setDate(15);
 
     const { container, unmount } = render(
       <Calendar mode="range" selected={{ from: startDate, to: endDate }} />
@@ -113,8 +115,9 @@ describe("Calendar highlight classes", () => {
 
   test("Calendar range_end className should use primary-based highlight", () => {
     const startDate = new Date();
-    const endDate = new Date();
-    endDate.setDate(endDate.getDate() + 5);
+    startDate.setDate(10);
+    const endDate = new Date(startDate);
+    endDate.setDate(15);
 
     const { container, unmount } = render(
       <Calendar mode="range" selected={{ from: startDate, to: endDate }} />
@@ -137,8 +140,9 @@ describe("Calendar highlight classes", () => {
 
   test("CalendarDayButton should have primary-based highlight classes for range states", () => {
     const startDate = new Date();
-    const endDate = new Date();
-    endDate.setDate(endDate.getDate() + 5);
+    startDate.setDate(10);
+    const endDate = new Date(startDate);
+    endDate.setDate(15);
 
     const { container, unmount } = render(
       <Calendar mode="range" selected={{ from: startDate, to: endDate }} />
diff --git a/tests/unit/settings/providers/thinking-budget-editor.test.tsx b/tests/unit/settings/providers/thinking-budget-editor.test.tsx
index 3965822b4..0b645f308 100644
--- a/tests/unit/settings/providers/thinking-budget-editor.test.tsx
+++ b/tests/unit/settings/providers/thinking-budget-editor.test.tsx
@@ -94,8 +94,12 @@ describe("ThinkingBudgetEditor", () => {
 
     // No number input when inherit
     expect(container.querySelector('input[type="number"]')).toBeNull();
-    // No max-out button when inherit
-    expect(container.querySelector("button")).toBeNull();
+    // No max-out button when inherit (help button always exists)
+    const buttons = Array.from(container.querySelectorAll("button"));
+    expect(buttons.some((b) => b.textContent?.includes("maxOutButton"))).toBe(false);
+
+    // Help icon should exist
+    expect(container.querySelector('[data-testid="info-icon"]')).toBeTruthy();
 
     unmount();
   });
@@ -110,7 +114,9 @@ describe("ThinkingBudgetEditor", () => {
     expect(input).toBeTruthy();
     expect(input.value).toBe("15000");
 
-    const maxButton = container.querySelector("button");
+    const maxButton = Array.from(container.querySelectorAll("button")).find((b) =>
+      b.textContent?.includes("maxOutButton")
+    );
     expect(maxButton).toBeTruthy();
     expect(maxButton?.textContent).toContain("maxOutButton");
 
@@ -159,7 +165,10 @@ describe("ThinkingBudgetEditor", () => {
       <ThinkingBudgetEditor {...defaultProps} value="10000" onChange={onChange} />
     );
 
-    const maxButton = container.querySelector("button") as HTMLButtonElement;
+    const maxButton = Array.from(container.querySelectorAll("button")).find((b) =>
+      b.textContent?.includes("maxOutButton")
+    ) as HTMLButtonElement;
+    expect(maxButton).toBeTruthy();
 
     act(() => {
       maxButton.click();
@@ -225,7 +234,10 @@ describe("ThinkingBudgetEditor", () => {
     const input = container.querySelector('input[type="number"]') as HTMLInputElement;
     expect(input.disabled).toBe(true);
 
-    const maxButton = container.querySelector("button") as HTMLButtonElement;
+    const maxButton = Array.from(container.querySelectorAll("button")).find((b) =>
+      b.textContent?.includes("maxOutButton")
+    ) as HTMLButtonElement;
+    expect(maxButton).toBeTruthy();
     expect(maxButton.disabled).toBe(true);
 
     unmount();

From eef2765e3c6ba79d77c050cee346f62bc8f8802c Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 10:35:44 +0800
Subject: [PATCH 21/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Provider=20=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E9=A1=B9=E4=B8=8B=E6=8B=89=E5=AE=BD=E5=BA=A6=E4=B8=8E?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/adaptive-thinking-editor.tsx  | 190 ++++++++----------
 .../sections/basic-info-section.tsx           |   2 +-
 .../sections/routing-section.tsx              |   8 +-
 .../_components/thinking-budget-editor.tsx    |  88 ++++----
 4 files changed, 133 insertions(+), 155 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx b/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx
index d7d525b25..bbae95bc4 100644
--- a/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx
+++ b/src/app/[locale]/settings/providers/_components/adaptive-thinking-editor.tsx
@@ -71,126 +71,104 @@ export function AdaptiveThinkingEditor({
           <SmartInputWrapper
             label={t("sections.routing.anthropicOverrides.adaptiveThinking.effort.label")}
           >
-            <div className="flex gap-2 items-center">
-              <Select
-                value={config.effort}
-                onValueChange={(val) => handleEffortChange(val as AnthropicAdaptiveThinkingEffort)}
-                disabled={disabled}
-              >
-                <SelectTrigger className="w-40">
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent>
-                  {(["low", "medium", "high", "max"] as const).map((level) => (
-                    <SelectItem key={level} value={level}>
-                      {t(
-                        `sections.routing.anthropicOverrides.adaptiveThinking.effort.options.${level}`
-                      )}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    aria-label={t(
-                      "sections.routing.anthropicOverrides.adaptiveThinking.effort.help"
-                    )}
-                    className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <div className="flex gap-2 items-center">
+                  <Select
+                    value={config.effort}
+                    onValueChange={(val) =>
+                      handleEffortChange(val as AnthropicAdaptiveThinkingEffort)
+                    }
+                    disabled={disabled}
                   >
-                    <Info className="h-4 w-4 shrink-0" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top" sideOffset={4} className="max-w-xs">
-                  <p className="leading-relaxed">
-                    {t("sections.routing.anthropicOverrides.adaptiveThinking.effort.help")}
-                  </p>
-                </TooltipContent>
-              </Tooltip>
-            </div>
+                    <SelectTrigger className="flex-1 min-w-0">
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {(["low", "medium", "high", "max"] as const).map((level) => (
+                        <SelectItem key={level} value={level}>
+                          {t(
+                            `sections.routing.anthropicOverrides.adaptiveThinking.effort.options.${level}`
+                          )}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <Info className="h-4 w-4 text-muted-foreground shrink-0" />
+                </div>
+              </TooltipTrigger>
+              <TooltipContent side="top" className="max-w-xs">
+                <p className="text-sm">
+                  {t("sections.routing.anthropicOverrides.adaptiveThinking.effort.help")}
+                </p>
+              </TooltipContent>
+            </Tooltip>
           </SmartInputWrapper>
 
           <SmartInputWrapper
             label={t("sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.label")}
           >
-            <div className="flex gap-2 items-center">
-              <Select
-                value={config.modelMatchMode}
-                onValueChange={(val) =>
-                  handleModeChange(val as AnthropicAdaptiveThinkingModelMatchMode)
-                }
-                disabled={disabled}
-              >
-                <SelectTrigger className="w-40">
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="all">
-                    {t(
-                      "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.all"
-                    )}
-                  </SelectItem>
-                  <SelectItem value="specific">
-                    {t(
-                      "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.specific"
-                    )}
-                  </SelectItem>
-                </SelectContent>
-              </Select>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    aria-label={t(
-                      "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.help"
-                    )}
-                    className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <div className="flex gap-2 items-center">
+                  <Select
+                    value={config.modelMatchMode}
+                    onValueChange={(val) =>
+                      handleModeChange(val as AnthropicAdaptiveThinkingModelMatchMode)
+                    }
+                    disabled={disabled}
                   >
-                    <Info className="h-4 w-4 shrink-0" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top" sideOffset={4} className="max-w-xs">
-                  <p className="leading-relaxed">
-                    {t("sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.help")}
-                  </p>
-                </TooltipContent>
-              </Tooltip>
-            </div>
+                    <SelectTrigger className="flex-1 min-w-0">
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="all">
+                        {t(
+                          "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.all"
+                        )}
+                      </SelectItem>
+                      <SelectItem value="specific">
+                        {t(
+                          "sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.options.specific"
+                        )}
+                      </SelectItem>
+                    </SelectContent>
+                  </Select>
+                  <Info className="h-4 w-4 text-muted-foreground shrink-0" />
+                </div>
+              </TooltipTrigger>
+              <TooltipContent side="top" className="max-w-xs">
+                <p className="text-sm">
+                  {t("sections.routing.anthropicOverrides.adaptiveThinking.modelMatchMode.help")}
+                </p>
+              </TooltipContent>
+            </Tooltip>
           </SmartInputWrapper>
 
           {config.modelMatchMode === "specific" && (
             <SmartInputWrapper
               label={t("sections.routing.anthropicOverrides.adaptiveThinking.models.label")}
             >
-              <div className="flex gap-2 items-center">
-                <TagInput
-                  value={config.models}
-                  onChange={handleModelsChange}
-                  placeholder={t(
-                    "sections.routing.anthropicOverrides.adaptiveThinking.models.placeholder"
-                  )}
-                  disabled={disabled}
-                />
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <button
-                      type="button"
-                      aria-label={t(
-                        "sections.routing.anthropicOverrides.adaptiveThinking.models.help"
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <div className="flex gap-2 items-center">
+                    <TagInput
+                      value={config.models}
+                      onChange={handleModelsChange}
+                      placeholder={t(
+                        "sections.routing.anthropicOverrides.adaptiveThinking.models.placeholder"
                       )}
-                      className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-                    >
-                      <Info className="h-4 w-4 shrink-0" />
-                    </button>
-                  </TooltipTrigger>
-                  <TooltipContent side="top" sideOffset={4} className="max-w-xs">
-                    <p className="leading-relaxed">
-                      {t("sections.routing.anthropicOverrides.adaptiveThinking.models.help")}
-                    </p>
-                  </TooltipContent>
-                </Tooltip>
-              </div>
+                      disabled={disabled}
+                    />
+                    <Info className="h-4 w-4 text-muted-foreground shrink-0" />
+                  </div>
+                </TooltipTrigger>
+                <TooltipContent side="top" className="max-w-xs">
+                  <p className="text-sm">
+                    {t("sections.routing.anthropicOverrides.adaptiveThinking.models.help")}
+                  </p>
+                </TooltipContent>
+              </Tooltip>
             </SmartInputWrapper>
           )}
         </div>
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/basic-info-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/basic-info-section.tsx
index 48c048042..7b7fa29df 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/basic-info-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/basic-info-section.tsx
@@ -85,7 +85,7 @@ export function BasicInfoSection({ autoUrlPending, endpointPool }: BasicInfoSect
                   })
                 }
               >
-                <SelectTrigger className="w-40">
+                <SelectTrigger className="w-full">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index 3749a4a67..fccf32b4e 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -667,7 +667,13 @@ export function RoutingSection() {
                     }}
                     disabled={state.ui.isPending}
                   >
-                    <SelectTrigger className="w-40">
+                    <SelectTrigger
+                      className={
+                        state.routing.anthropicMaxTokensPreference === "inherit"
+                          ? "flex-1 min-w-0"
+                          : "w-40"
+                      }
+                    >
                       <SelectValue />
                     </SelectTrigger>
                     <SelectContent>
diff --git a/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx b/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx
index d197eb74b..4fc8c8eee 100644
--- a/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx
+++ b/src/app/[locale]/settings/providers/_components/thinking-budget-editor.tsx
@@ -45,52 +45,46 @@ export function ThinkingBudgetEditor({
   };
 
   return (
-    <div className="flex gap-2 items-center">
-      <Select value={mode} onValueChange={handleModeChange} disabled={disabled}>
-        <SelectTrigger className="w-40">
-          <SelectValue />
-        </SelectTrigger>
-        <SelectContent>
-          <SelectItem value="inherit">{t(`${prefix}.options.inherit`)}</SelectItem>
-          <SelectItem value="custom">{t(`${prefix}.options.custom`)}</SelectItem>
-        </SelectContent>
-      </Select>
-      {mode !== "inherit" && (
-        <>
-          <Input
-            type="number"
-            value={value}
-            onChange={handleInputChange}
-            placeholder={t(`${prefix}.placeholder`)}
-            disabled={disabled}
-            min="1024"
-            max="32000"
-            className="flex-1"
-          />
-          <button
-            type="button"
-            onClick={handleMaxOut}
-            className="px-3 py-2 text-xs bg-primary/10 hover:bg-primary/20 text-primary rounded-md transition-colors whitespace-nowrap"
-            disabled={disabled}
-          >
-            {t(`${prefix}.maxOutButton`)}
-          </button>
-        </>
-      )}
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <button
-            type="button"
-            aria-label={t(`${prefix}.help`)}
-            className="inline-flex items-center justify-center rounded-md p-1 text-muted-foreground hover:text-foreground hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-          >
-            <Info className="h-4 w-4 shrink-0" />
-          </button>
-        </TooltipTrigger>
-        <TooltipContent side="top" sideOffset={4} className="max-w-xs">
-          <p className="leading-relaxed">{t(`${prefix}.help`)}</p>
-        </TooltipContent>
-      </Tooltip>
-    </div>
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <div className="flex gap-2 items-center">
+          <Select value={mode} onValueChange={handleModeChange} disabled={disabled}>
+            <SelectTrigger className={mode === "inherit" ? "flex-1 min-w-0" : "w-40"}>
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="inherit">{t(`${prefix}.options.inherit`)}</SelectItem>
+              <SelectItem value="custom">{t(`${prefix}.options.custom`)}</SelectItem>
+            </SelectContent>
+          </Select>
+          {mode !== "inherit" && (
+            <>
+              <Input
+                type="number"
+                value={value}
+                onChange={handleInputChange}
+                placeholder={t(`${prefix}.placeholder`)}
+                disabled={disabled}
+                min="1024"
+                max="32000"
+                className="flex-1"
+              />
+              <button
+                type="button"
+                onClick={handleMaxOut}
+                className="px-3 py-2 text-xs bg-primary/10 hover:bg-primary/20 text-primary rounded-md transition-colors whitespace-nowrap"
+                disabled={disabled}
+              >
+                {t(`${prefix}.maxOutButton`)}
+              </button>
+            </>
+          )}
+          <Info className="h-4 w-4 text-muted-foreground shrink-0" />
+        </div>
+      </TooltipTrigger>
+      <TooltipContent side="top" className="max-w-xs">
+        <p className="text-sm">{t(`${prefix}.help`)}</p>
+      </TooltipContent>
+    </Tooltip>
   );
 }

From a7573cb89d0edb87999188cb9a1b2d1fb44f65c9 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 12:03:59 +0800
Subject: [PATCH 22/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20TagInput=20=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=BB=BA=E8=AE=AE=E5=90=8E=E4=B8=8B=E6=8B=89=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/__tests__/tag-input-dialog.test.tsx    | 42 +++++++++++++++++++
 src/components/ui/tag-input.tsx               | 16 +++----
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/components/ui/__tests__/tag-input-dialog.test.tsx b/src/components/ui/__tests__/tag-input-dialog.test.tsx
index f725bf3b1..58f625ac2 100644
--- a/src/components/ui/__tests__/tag-input-dialog.test.tsx
+++ b/src/components/ui/__tests__/tag-input-dialog.test.tsx
@@ -94,6 +94,48 @@ describe("TagInput inside Dialog", () => {
     unmount();
   });
 
+  test("keeps suggestions open after selecting a suggestion", async () => {
+    const { unmount } = render(<DialogTagInput />);
+
+    const input = document.querySelector("input");
+    expect(input).not.toBeNull();
+
+    await act(async () => {
+      input?.focus();
+      await new Promise((resolve) => setTimeout(resolve, 50));
+    });
+
+    const dialogContent = document.querySelector('[data-slot="dialog-content"]');
+    expect(dialogContent).not.toBeNull();
+
+    const findSuggestion = (label: string) =>
+      Array.from(dialogContent?.querySelectorAll("button") ?? []).find(
+        (button) => button.textContent === label
+      );
+
+    const first = findSuggestion("Tag 1");
+    expect(first).not.toBeNull();
+
+    await act(async () => {
+      first?.dispatchEvent(new MouseEvent("mousedown", { bubbles: true }));
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    const second = findSuggestion("Tag 2");
+    expect(second).not.toBeNull();
+
+    await act(async () => {
+      second?.dispatchEvent(new MouseEvent("mousedown", { bubbles: true }));
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    const dialogContentAfterClicks = document.querySelector('[data-slot="dialog-content"]');
+    expect(dialogContentAfterClicks?.textContent).toContain("tag1");
+    expect(dialogContentAfterClicks?.textContent).toContain("tag2");
+
+    unmount();
+  });
+
   test("supports keyboard selection within dialog", async () => {
     const { container, unmount } = render(<DialogTagInput />);
 
diff --git a/src/components/ui/tag-input.tsx b/src/components/ui/tag-input.tsx
index 7b14f1e39..406f01468 100644
--- a/src/components/ui/tag-input.tsx
+++ b/src/components/ui/tag-input.tsx
@@ -160,19 +160,19 @@ export function TagInput({
 
     const handleClickOutside = (e: MouseEvent) => {
       const target = e.target as Node;
-      if (
-        containerRef.current &&
-        !containerRef.current.contains(target) &&
-        dropdownRef.current &&
-        !dropdownRef.current.contains(target)
-      ) {
+      const isInContainer = containerRef.current?.contains(target) ?? false;
+      const isInDropdown = dropdownRef.current?.contains(target) ?? false;
+
+      // 使用 capture 阶段监听，避免点击建议项后 React 同步更新导致 target 节点被移除，
+      // 进而被误判为“点击了外部”并关闭下拉列表。
+      if (!isInContainer && !isInDropdown) {
         setShowSuggestions(false);
         setHighlightedIndex(-1);
       }
     };
 
-    document.addEventListener("mousedown", handleClickOutside);
-    return () => document.removeEventListener("mousedown", handleClickOutside);
+    document.addEventListener("mousedown", handleClickOutside, true);
+    return () => document.removeEventListener("mousedown", handleClickOutside, true);
   }, [showSuggestions]);
 
   const inputMinWidthClass = normalizedMaxVisible === undefined ? "min-w-[120px]" : "min-w-[60px]";

From 348c5f72ca829bc4d41189e5531ba17e44a044fc Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 14:09:02 +0800
Subject: [PATCH 23/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=9B=BE=E6=A0=87=E9=98=BB=E6=8C=A1=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forms/provider-form/sections/routing-section.tsx         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index fccf32b4e..242d182c6 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -547,7 +547,10 @@ export function RoutingSection() {
                           )}
                         </SelectContent>
                       </Select>
-                      <Info className="absolute right-10 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+                      <Info
+                        aria-hidden="true"
+                        className="pointer-events-none absolute right-10 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground"
+                      />
                     </div>
                   </TooltipTrigger>
                   <TooltipContent side="top" className="max-w-xs">

From 72fb6ba9c680ab1c4b48d16c3ba288987fb8ff29 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 14:21:17 +0800
Subject: [PATCH 24/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/forms/provider-form/components/form-tab-nav.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
index 90ee3afad..6f4a51f23 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/components/form-tab-nav.tsx
@@ -274,7 +274,7 @@ export function FormTabNav({
         >
           <motion.div
             className="h-full bg-primary"
-            initial={{ width: stepProgressWidth }}
+            initial={false}
             animate={{ width: stepProgressWidth }}
             transition={{ type: "spring", stiffness: 300, damping: 30 }}
           />

From 1e194ee1ca4a557de572aae121494c52b86306e6 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 18:42:29 +0800
Subject: [PATCH 25/27] =?UTF-8?q?test(e2e):=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=20Cookie=20=E8=A7=A3=E6=9E=90=E4=B8=8E=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/e2e/_helpers/auth.ts                    | 95 ++++++++++++++++++-
 .../unit/auth/split-set-cookie-header.test.ts | 35 +++++++
 2 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 tests/unit/auth/split-set-cookie-header.test.ts

diff --git a/tests/e2e/_helpers/auth.ts b/tests/e2e/_helpers/auth.ts
index e840b83b6..0a2df6d16 100644
--- a/tests/e2e/_helpers/auth.ts
+++ b/tests/e2e/_helpers/auth.ts
@@ -2,6 +2,78 @@ function resolveAppOrigin(apiBaseUrl: string): string {
   return apiBaseUrl.replace(/\/api\/actions\/?$/, "");
 }
 
+export function splitSetCookieHeader(combined: string): string[] {
+  const cookies: string[] = [];
+  let start = 0;
+  let inExpires = false;
+  let inQuotes = false;
+  let escapeNext = false;
+
+  function isExpiresStart(index: number): boolean {
+    if (combined.slice(index, index + 8).toLowerCase() !== "expires=") return false;
+    if (index === 0) return true;
+    const prev = combined[index - 1];
+    return prev === ";" || prev === " " || prev === "\t";
+  }
+
+  for (let i = 0; i < combined.length; i++) {
+    const ch = combined[i];
+
+    if (inQuotes) {
+      if (escapeNext) {
+        escapeNext = false;
+        continue;
+      }
+      if (ch === "\\") {
+        escapeNext = true;
+        continue;
+      }
+      if (ch === '"') {
+        inQuotes = false;
+      }
+      continue;
+    }
+
+    if (ch === '"') {
+      inQuotes = true;
+      continue;
+    }
+
+    if (!inExpires && isExpiresStart(i)) {
+      inExpires = true;
+      i += 7;
+      continue;
+    }
+
+    if (inExpires && ch === ";") {
+      inExpires = false;
+      continue;
+    }
+
+    if (ch !== ",") continue;
+
+    const next = combined.slice(i + 1);
+    const looksLikeCookieStart = /^\s*[^;\s]+=/.test(next);
+    if (!looksLikeCookieStart) {
+      continue;
+    }
+
+    const part = combined.slice(start, i).trim();
+    if (part) {
+      cookies.push(part);
+    }
+    start = i + 1;
+    inExpires = false;
+  }
+
+  const last = combined.slice(start).trim();
+  if (last) {
+    cookies.push(last);
+  }
+
+  return cookies;
+}
+
 function getSetCookieHeaders(response: Response): string[] {
   const headersWithGetSetCookie = response.headers as unknown as {
     getSetCookie?: () => string[];
@@ -15,10 +87,7 @@ function getSetCookieHeaders(response: Response): string[] {
   const combined = response.headers.get("set-cookie");
   if (!combined) return [];
 
-  return combined
-    .split(/,(?=[^;]+?=)/g)
-    .map((s) => s.trim())
-    .filter(Boolean);
+  return splitSetCookieHeader(combined);
 }
 
 function extractCookieValue(setCookieHeader: string, cookieName: string): string | null {
@@ -42,6 +111,21 @@ async function sleep(ms: number): Promise<void> {
   await new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+function shouldRetryFetchError(error: unknown): boolean {
+  if (!(error instanceof Error)) return false;
+
+  const cause = (error as { cause?: unknown }).cause;
+  if (cause && typeof cause === "object") {
+    const code = (cause as { code?: unknown }).code;
+    if (typeof code === "string") {
+      return ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "EAI_AGAIN", "ENOTFOUND"].includes(code);
+    }
+  }
+
+  const message = error.message.toLowerCase();
+  return message.includes("fetch failed") || message.includes("network");
+}
+
 export async function loginAndGetAuthToken(apiBaseUrl: string, key: string): Promise<string> {
   const origin = resolveAppOrigin(apiBaseUrl);
 
@@ -59,6 +143,9 @@ export async function loginAndGetAuthToken(apiBaseUrl: string, key: string): Pro
       });
     } catch (error) {
       lastError = error;
+      if (!shouldRetryFetchError(error)) {
+        break;
+      }
       if (attempt >= maxAttempts) {
         break;
       }
diff --git a/tests/unit/auth/split-set-cookie-header.test.ts b/tests/unit/auth/split-set-cookie-header.test.ts
new file mode 100644
index 000000000..088f60b0f
--- /dev/null
+++ b/tests/unit/auth/split-set-cookie-header.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from "vitest";
+import { splitSetCookieHeader } from "../../e2e/_helpers/auth";
+
+describe("splitSetCookieHeader", () => {
+  it("returns empty array for empty input", () => {
+    expect(splitSetCookieHeader("")).toEqual([]);
+    expect(splitSetCookieHeader("   ")).toEqual([]);
+  });
+
+  it("splits cookies on comma separators", () => {
+    expect(splitSetCookieHeader("a=1; Path=/, b=2; Path=/")).toEqual([
+      "a=1; Path=/",
+      "b=2; Path=/",
+    ]);
+  });
+
+  it("does not split RFC 1123 Expires commas", () => {
+    expect(
+      splitSetCookieHeader("a=1; Expires=Wed, 21 Oct 2015 07:28:00 GMT; Path=/, b=2; Path=/")
+    ).toEqual(["a=1; Expires=Wed, 21 Oct 2015 07:28:00 GMT; Path=/", "b=2; Path=/"]);
+  });
+
+  it("splits when Expires is the last attribute", () => {
+    expect(splitSetCookieHeader("a=1; Expires=Wed, 21 Oct 2015 07:28:00 GMT, b=2; Path=/")).toEqual(
+      ["a=1; Expires=Wed, 21 Oct 2015 07:28:00 GMT", "b=2; Path=/"]
+    );
+  });
+
+  it("does not split commas inside quoted cookie values", () => {
+    expect(splitSetCookieHeader('a="x, y=z"; Path=/, b=2; Path=/')).toEqual([
+      'a="x, y=z"; Path=/',
+      "b=2; Path=/",
+    ]);
+  });
+});

From 8ad5970c4751bb26e6a6c00bef0247da282fdfea Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 19:04:46 +0800
Subject: [PATCH 26/27] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E9=99=90=E5=88=B6=E5=BC=80=E5=85=B3=E4=B8=8E?=
 =?UTF-8?q?=20E2E=20=E9=87=8D=E8=AF=95=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/routing-section.tsx              |  8 ++++--
 tests/e2e/_helpers/auth.ts                    | 28 +++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
index 242d182c6..946e39561 100644
--- a/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
+++ b/src/app/[locale]/settings/providers/_components/forms/provider-form/sections/routing-section.tsx
@@ -74,11 +74,13 @@ export function RoutingSection() {
   const allowedClients = state.routing.allowedClients;
   const blockedClients = state.routing.blockedClients;
   const hasAnyClientRestrictions = allowedClients.length > 0 || blockedClients.length > 0;
-  const [clientRestrictionsEnabled, setClientRestrictionsEnabled] =
-    useState(hasAnyClientRestrictions);
+  const [clientRestrictionsEnabled, setClientRestrictionsEnabled] = useState(
+    () => hasAnyClientRestrictions
+  );
 
   useEffect(() => {
-    setClientRestrictionsEnabled(hasAnyClientRestrictions);
+    if (!hasAnyClientRestrictions) return;
+    setClientRestrictionsEnabled(true);
   }, [hasAnyClientRestrictions]);
 
   const handleClientRestrictionsEnabledChange = (enabled: boolean) => {
diff --git a/tests/e2e/_helpers/auth.ts b/tests/e2e/_helpers/auth.ts
index 0a2df6d16..cb56512d6 100644
--- a/tests/e2e/_helpers/auth.ts
+++ b/tests/e2e/_helpers/auth.ts
@@ -114,16 +114,34 @@ async function sleep(ms: number): Promise<void> {
 function shouldRetryFetchError(error: unknown): boolean {
   if (!(error instanceof Error)) return false;
 
-  const cause = (error as { cause?: unknown }).cause;
+  const retryCodes = new Set([
+    "ECONNREFUSED",
+    "ECONNRESET",
+    "ETIMEDOUT",
+    "EAI_AGAIN",
+    "ENOTFOUND",
+    "UND_ERR_CONNECT_TIMEOUT",
+    "UND_ERR_HEADERS_TIMEOUT",
+    "UND_ERR_BODY_TIMEOUT",
+    "UND_ERR_SOCKET",
+  ]);
+
+  const errorWithCause = error as { cause?: unknown; code?: unknown };
+  const maybeCodes: unknown[] = [errorWithCause.code];
+
+  const cause = errorWithCause.cause;
   if (cause && typeof cause === "object") {
-    const code = (cause as { code?: unknown }).code;
-    if (typeof code === "string") {
-      return ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "EAI_AGAIN", "ENOTFOUND"].includes(code);
+    maybeCodes.push((cause as { code?: unknown }).code);
+  }
+
+  for (const code of maybeCodes) {
+    if (typeof code === "string" && retryCodes.has(code)) {
+      return true;
     }
   }
 
   const message = error.message.toLowerCase();
-  return message.includes("fetch failed") || message.includes("network");
+  return message.includes("fetch failed");
 }
 
 export async function loginAndGetAuthToken(apiBaseUrl: string, key: string): Promise<string> {

From e05288b4a680d0a65d191c89844f777bbaea82e5 Mon Sep 17 00:00:00 2001
From: tesgth032 <tesgth032@users.noreply.github.com>
Date: Tue, 24 Feb 2026 19:27:08 +0800
Subject: [PATCH 27/27] =?UTF-8?q?test(e2e):=20=E6=94=B6=E6=95=9B=20fetch?=
 =?UTF-8?q?=20retry=20=E7=9A=84=E9=94=99=E8=AF=AF=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/e2e/_helpers/auth.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/_helpers/auth.ts b/tests/e2e/_helpers/auth.ts
index cb56512d6..48eee2455 100644
--- a/tests/e2e/_helpers/auth.ts
+++ b/tests/e2e/_helpers/auth.ts
@@ -119,7 +119,6 @@ function shouldRetryFetchError(error: unknown): boolean {
     "ECONNRESET",
     "ETIMEDOUT",
     "EAI_AGAIN",
-    "ENOTFOUND",
     "UND_ERR_CONNECT_TIMEOUT",
     "UND_ERR_HEADERS_TIMEOUT",
     "UND_ERR_BODY_TIMEOUT",
@@ -127,17 +126,21 @@ function shouldRetryFetchError(error: unknown): boolean {
   ]);
 
   const errorWithCause = error as { cause?: unknown; code?: unknown };
-  const maybeCodes: unknown[] = [errorWithCause.code];
+  const maybeCodes: string[] = [];
+  if (typeof errorWithCause.code === "string") {
+    maybeCodes.push(errorWithCause.code);
+  }
 
   const cause = errorWithCause.cause;
   if (cause && typeof cause === "object") {
-    maybeCodes.push((cause as { code?: unknown }).code);
+    const causeCode = (cause as { code?: unknown }).code;
+    if (typeof causeCode === "string") {
+      maybeCodes.push(causeCode);
+    }
   }
 
-  for (const code of maybeCodes) {
-    if (typeof code === "string" && retryCodes.has(code)) {
-      return true;
-    }
+  if (maybeCodes.length > 0) {
+    return maybeCodes.some((code) => retryCodes.has(code));
   }
 
   const message = error.message.toLowerCase();