diff --git a/.gitignore b/.gitignore
index dcf2e2b0a7..74b904d433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,7 @@ public/sw.js
 public/sw.js.map
 public/workbox-*.js
 public/workbox-*.js.map
+.env*
+
+# Local Netlify folder
+.netlify
diff --git a/package.json b/package.json
index c8c89f9f77..55809f806a 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "bs58": "^6.0.0",
     "clsx": "^2.0.0",
     "crypto-js": "^4.2.0",
+    "gsap": "^3.15.0",
     "he": "^1.2.0",
     "hls.js": "^1.6.10",
     "lucide-react": "^0.438.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 07a1699412..f8d935e3c8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,6 +41,9 @@ importers:
       crypto-js:
         specifier: ^4.2.0
         version: 4.2.0
+      gsap:
+        specifier: ^3.15.0
+        version: 3.15.0
       he:
         specifier: ^1.2.0
         version: 1.2.0
@@ -2919,6 +2922,9 @@ packages:
   graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
+  gsap@3.15.0:
+    resolution: {integrity: sha512-dMW4CWBTUK1AEEDeZc1g4xpPGIrSf9fJF960qbTZmN/QwZIWY5wgliS6JWl9/25fpTGJrMRtSjGtOmPnfjZB+A==}
+
   hard-rejection@2.1.0:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
     engines: {node: '>=6'}
@@ -8445,6 +8451,8 @@ snapshots:
 
   graphemer@1.4.0: {}
 
+  gsap@3.15.0: {}
+
   hard-rejection@2.1.0: {}
 
   has-bigints@1.1.0: {}
diff --git a/public/icons/icon-192x192.png b/public/icons/icon-192x192.png
index 7a7f4937cf..58a5940055 100644
Binary files a/public/icons/icon-192x192.png and b/public/icons/icon-192x192.png differ
diff --git a/public/icons/icon-256x256.png b/public/icons/icon-256x256.png
index c93533462d..c6375f4363 100644
Binary files a/public/icons/icon-256x256.png and b/public/icons/icon-256x256.png differ
diff --git a/public/icons/icon-384x384.png b/public/icons/icon-384x384.png
index a627740364..f8591871a7 100644
Binary files a/public/icons/icon-384x384.png and b/public/icons/icon-384x384.png differ
diff --git a/public/icons/icon-512x512.png b/public/icons/icon-512x512.png
index 784f5176cd..67b96d1666 100644
Binary files a/public/icons/icon-512x512.png and b/public/icons/icon-512x512.png differ
diff --git a/public/logo.png b/public/logo.png
index 184fdaca37..65428c494f 100644
Binary files a/public/logo.png and b/public/logo.png differ
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
index 830fffee7d..4518e0ce42 100644
--- a/src/app/admin/page.tsx
+++ b/src/app/admin/page.tsx
@@ -2032,6 +2032,8 @@ const VideoSourceConfig = ({
   const { isLoading, withLoading } = useLoadingState();
   const [sources, setSources] = useState<DataSource[]>([]);
   const [showAddForm, setShowAddForm] = useState(false);
+  const [showBatchForm, setShowBatchForm] = useState(false);
+  const [batchText, setBatchText] = useState('');
   const [orderChanged, setOrderChanged] = useState(false);
   const [newSource, setNewSource] = useState<DataSource>({
     name: '',
@@ -2164,6 +2166,67 @@ const VideoSourceConfig = ({
     });
   };
 
+  const handleBatchImport = () => {
+    if (!batchText.trim()) return;
+    withLoading('batchAddSources', async () => {
+      let parsed: unknown;
+      try {
+        parsed = JSON.parse(batchText);
+      } catch {
+        throw new Error('JSON 格式不正确');
+      }
+
+      let sources: { key: string; name: string; api: string; detail?: string }[] = [];
+      if (Array.isArray(parsed)) {
+        sources = parsed as { key: string; name: string; api: string; detail?: string }[];
+      } else if (parsed && typeof parsed === 'object') {
+        const map =
+          'api_site' in parsed &&
+          parsed.api_site &&
+          typeof parsed.api_site === 'object'
+            ? (parsed as { api_site: Record<string, { name?: string; api?: string; detail?: string }> }).api_site
+            : (parsed as Record<string, { name?: string; api?: string; detail?: string }>);
+        sources = Object.entries(map).map(([key, site]) => {
+          const item =
+            site && typeof site === 'object'
+              ? site
+              : { name: key, api: '' };
+          return {
+            key,
+            name: item.name || key,
+            api: item.api || '',
+            detail: item.detail,
+          };
+        });
+      }
+
+      const resp = await fetch('/api/admin/source', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ action: 'batch_add', sources }),
+      });
+      const data = await resp.json().catch(() => ({}));
+      if (!resp.ok) {
+        throw new Error(data.error || `导入失败: ${resp.status}`);
+      }
+      await refreshConfig();
+      setBatchText('');
+      setShowBatchForm(false);
+      showAlert({
+        type: 'success',
+        title: '批量导入完成',
+        message: `新增 ${data.added || 0} 个，跳过 ${data.skipped || 0} 个`,
+        timer: 2500,
+      });
+    }).catch((err) => {
+      showAlert({
+        type: 'error',
+        title: '批量导入失败',
+        message: err instanceof Error ? err.message : '导入失败',
+      });
+    });
+  };
+
   const handleDragEnd = (event: any) => {
     const { active, over } = event;
     if (!over || active.id === over.id) return;
@@ -2561,7 +2624,19 @@ const VideoSourceConfig = ({
               )}
             </button>
             <button
-              onClick={() => setShowAddForm(!showAddForm)}
+              onClick={() => {
+                setShowBatchForm(!showBatchForm);
+                if (!showBatchForm) setShowAddForm(false);
+              }}
+              className={showBatchForm ? buttonStyles.secondary : buttonStyles.primary}
+            >
+              {showBatchForm ? '取消' : '批量导入'}
+            </button>
+            <button
+              onClick={() => {
+                setShowAddForm(!showAddForm);
+                if (!showAddForm) setShowBatchForm(false);
+              }}
               className={showAddForm ? buttonStyles.secondary : buttonStyles.success}
             >
               {showAddForm ? '取消' : '添加视频源'}
@@ -2622,7 +2697,35 @@ const VideoSourceConfig = ({
         </div>
       )}
 
-
+      {showBatchForm && (
+        <div className='p-4 bg-gray-50 dark:bg-gray-900 rounded-lg border border-gray-200 dark:border-gray-700 space-y-4'>
+          <p className='text-sm text-gray-600 dark:text-gray-400'>
+            粘贴你自己的源列表。支持数组、配置文件里的 api_site 对象，或 key-对象 映射。
+          </p>
+          <textarea
+            value={batchText}
+            onChange={(e) => setBatchText(e.target.value)}
+            rows={10}
+            placeholder={`{
+  "mysource": {
+    "name": "自有源",
+    "api": "https://your-source.example.com/api.php/provide/vod",
+    "detail": ""
+  }
+}`}
+            className='w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-800 text-gray-900 dark:text-gray-100 font-mono text-sm'
+          />
+          <div className='flex justify-end'>
+            <button
+              onClick={handleBatchImport}
+              disabled={!batchText.trim() || isLoading('batchAddSources')}
+              className={`w-full sm:w-auto px-4 py-2 ${!batchText.trim() || isLoading('batchAddSources') ? buttonStyles.disabled : buttonStyles.success}`}
+            >
+              {isLoading('batchAddSources') ? '导入中...' : '导入'}
+            </button>
+          </div>
+        </div>
+      )}
 
       {/* 视频源表格 */}
       <div className='border border-gray-200 dark:border-gray-700 rounded-lg max-h-[28rem] overflow-y-auto overflow-x-auto relative' data-table="source-list">
diff --git a/src/app/api/admin/source/route.ts b/src/app/api/admin/source/route.ts
index dafacfbde6..6bb934da56 100644
--- a/src/app/api/admin/source/route.ts
+++ b/src/app/api/admin/source/route.ts
@@ -3,13 +3,13 @@
 import { NextRequest, NextResponse } from 'next/server';
 
 import { getAuthInfoFromCookie } from '@/lib/auth';
-import { getConfig } from '@/lib/config';
+import { getConfig, setCachedConfig } from '@/lib/config';
 import { db } from '@/lib/db';
 
 export const runtime = 'nodejs';
 
 // 支持的操作类型
-type Action = 'add' | 'disable' | 'enable' | 'delete' | 'sort' | 'batch_disable' | 'batch_enable' | 'batch_delete';
+type Action = 'add' | 'disable' | 'enable' | 'delete' | 'sort' | 'batch_add' | 'batch_disable' | 'batch_enable' | 'batch_delete';
 
 interface BaseBody {
   action?: Action;
@@ -37,7 +37,7 @@ export async function POST(request: NextRequest) {
     const username = authInfo.username;
 
     // 基础校验
-    const ACTIONS: Action[] = ['add', 'disable', 'enable', 'delete', 'sort', 'batch_disable', 'batch_enable', 'batch_delete'];
+    const ACTIONS: Action[] = ['add', 'disable', 'enable', 'delete', 'sort', 'batch_add', 'batch_disable', 'batch_enable', 'batch_delete'];
     if (!username || !action || !ACTIONS.includes(action)) {
       return NextResponse.json({ error: '参数格式错误' }, { status: 400 });
     }
@@ -79,6 +79,53 @@ export async function POST(request: NextRequest) {
         });
         break;
       }
+      case 'batch_add': {
+        const { sources } = body as {
+          sources?: {
+            key?: string;
+            name?: string;
+            api?: string;
+            detail?: string;
+          }[];
+        };
+        if (!Array.isArray(sources) || sources.length === 0) {
+          return NextResponse.json(
+            { error: '缺少 sources 参数或为空' },
+            { status: 400 }
+          );
+        }
+
+        const existing = new Set(adminConfig.SourceConfig.map((s) => s.key));
+        let added = 0;
+        let skipped = 0;
+
+        sources.forEach((item) => {
+          const key = item.key?.trim();
+          const name = item.name?.trim();
+          const api = item.api?.trim();
+          if (!key || !name || !api || existing.has(key)) {
+            skipped += 1;
+            return;
+          }
+          existing.add(key);
+          adminConfig.SourceConfig.push({
+            key,
+            name,
+            api,
+            detail: item.detail?.trim() || undefined,
+            from: 'custom',
+            disabled: false,
+          });
+          added += 1;
+        });
+
+        await db.saveAdminConfig(adminConfig);
+        await setCachedConfig(adminConfig);
+        return NextResponse.json(
+          { ok: true, added, skipped },
+          { headers: { 'Cache-Control': 'no-store' } }
+        );
+      }
       case 'disable': {
         const { key } = body as { key?: string };
         if (!key)
@@ -225,6 +272,7 @@ export async function POST(request: NextRequest) {
 
     // 持久化到存储
     await db.saveAdminConfig(adminConfig);
+    await setCachedConfig(adminConfig);
 
     return NextResponse.json(
       { ok: true },
diff --git a/src/app/api/admin/source/validate/route.ts b/src/app/api/admin/source/validate/route.ts
index 12e63e4f0b..fc99fdc921 100644
--- a/src/app/api/admin/source/validate/route.ts
+++ b/src/app/api/admin/source/validate/route.ts
@@ -3,8 +3,8 @@
 import { NextRequest, NextResponse } from 'next/server';
 
 import { getAuthInfoFromCookie } from '@/lib/auth';
-import { getConfig } from '@/lib/config';
-import { API_CONFIG } from '@/lib/config';
+import { parseCmsResponse } from '@/lib/cms';
+import { API_CONFIG, getConfig } from '@/lib/config';
 
 export const runtime = 'nodejs';
 
@@ -90,18 +90,13 @@ export async function GET(request: NextRequest) {
               throw new Error(`HTTP ${response.status}`);
             }
 
-            const data = await response.json() as any;
+            const data = parseCmsResponse(await response.text());
 
             // 检查结果是否有效
             let status: 'valid' | 'no_results' | 'invalid';
-            if (
-              data &&
-              data.list &&
-              Array.isArray(data.list) &&
-              data.list.length > 0
-            ) {
+            if (data.list.length > 0) {
               // 检查是否有标题包含搜索词的结果
-              const validResults = data.list.filter((item: any) => {
+              const validResults = data.list.filter((item) => {
                 const title = item.vod_name || '';
                 return title.toLowerCase().includes(searchKeyword.toLowerCase());
               });
diff --git a/src/app/api/login/route.ts b/src/app/api/login/route.ts
index ba08e3ec96..e262313bce 100644
--- a/src/app/api/login/route.ts
+++ b/src/app/api/login/route.ts
@@ -119,9 +119,9 @@ export async function POST(req: NextRequest) {
       // 验证成功，设置认证cookie
       const response = NextResponse.json({ ok: true });
       const cookieValue = await generateAuthCookie(
-        undefined,
+        process.env.USERNAME || 'local',
         password,
-        'user',
+        'owner',
         true
       ); // localstorage 模式包含 password
       const expires = new Date();
diff --git a/src/app/api/playrecords/route.ts b/src/app/api/playrecords/route.ts
index da2082da77..ab83aca365 100644
--- a/src/app/api/playrecords/route.ts
+++ b/src/app/api/playrecords/route.ts
@@ -4,34 +4,62 @@ import { NextRequest, NextResponse } from 'next/server';
 
 import { getAuthInfoFromCookie } from '@/lib/auth';
 import { getConfig } from '@/lib/config';
-import { db } from '@/lib/db';
+import { db, parseStorageKey } from '@/lib/db';
 import { PlayRecord } from '@/lib/types';
 
 export const runtime = 'nodejs';
 
+const STORAGE_TYPE = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
+
+function resolveUsername(
+  authInfo: { username?: string } | null
+): string | null {
+  if (authInfo?.username) {
+    return authInfo.username;
+  }
+  if (STORAGE_TYPE === 'localstorage') {
+    return process.env.USERNAME || 'local';
+  }
+  return null;
+}
+
+async function ensureUserAllowed(username: string) {
+  if (STORAGE_TYPE === 'localstorage') {
+    return null;
+  }
+  if (username === process.env.USERNAME) {
+    return null;
+  }
+  const config = await getConfig();
+  const user = config.UserConfig?.Users?.find((u) => u.username === username);
+  if (!user) {
+    return NextResponse.json({ error: '用户不存在' }, { status: 401 });
+  }
+  if (user.banned) {
+    return NextResponse.json({ error: '用户已被封禁' }, { status: 401 });
+  }
+  return null;
+}
+
 export async function GET(request: NextRequest) {
   try {
     // 从 cookie 获取用户信息
     const authInfo = getAuthInfoFromCookie(request);
-    if (!authInfo || !authInfo.username) {
+    const username = resolveUsername(authInfo);
+    if (!authInfo || !username) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
-    const config = await getConfig();
-    if (authInfo.username !== process.env.USERNAME) {
-      // 非站长，检查用户存在或被封禁
-      const user = config.UserConfig.Users.find(
-        (u) => u.username === authInfo.username
-      );
-      if (!user) {
-        return NextResponse.json({ error: '用户不存在' }, { status: 401 });
-      }
-      if (user.banned) {
-        return NextResponse.json({ error: '用户已被封禁' }, { status: 401 });
-      }
+    const denied = await ensureUserAllowed(username);
+    if (denied) {
+      return denied;
+    }
+
+    if (STORAGE_TYPE === 'localstorage') {
+      return NextResponse.json({}, { status: 200 });
     }
 
-    const records = await db.getAllPlayRecords(authInfo.username);
+    const records = await db.getAllPlayRecords(username);
     return NextResponse.json(records, { status: 200 });
   } catch (err) {
     console.error('获取播放记录失败', err);
@@ -46,22 +74,14 @@ export async function POST(request: NextRequest) {
   try {
     // 从 cookie 获取用户信息
     const authInfo = getAuthInfoFromCookie(request);
-    if (!authInfo || !authInfo.username) {
+    const username = resolveUsername(authInfo);
+    if (!authInfo || !username) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
-    const config = await getConfig();
-    if (authInfo.username !== process.env.USERNAME) {
-      // 非站长，检查用户存在或被封禁
-      const user = config.UserConfig.Users.find(
-        (u) => u.username === authInfo.username
-      );
-      if (!user) {
-        return NextResponse.json({ error: '用户不存在' }, { status: 401 });
-      }
-      if (user.banned) {
-        return NextResponse.json({ error: '用户已被封禁' }, { status: 401 });
-      }
+    const denied = await ensureUserAllowed(username);
+    if (denied) {
+      return denied;
     }
 
     const body = await request.json();
@@ -74,35 +94,57 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    // 验证播放记录数据
-    if (!record.title || !record.source_name || record.index < 1) {
+    const parsedKey = parseStorageKey(key);
+    if (!parsedKey) {
       return NextResponse.json(
-        { error: 'Invalid record data' },
+        { error: 'Invalid key format' },
         { status: 400 }
       );
     }
 
-    // 从key中解析source和id
-    const [source, id] = key.split('+');
-    if (!source || !id) {
+    const index = Number(record.index);
+    const title = String(record.title || '').trim();
+    const sourceName = String(record.source_name || '').trim();
+    if (!title || !sourceName || !Number.isFinite(index) || index < 1) {
       return NextResponse.json(
-        { error: 'Invalid key format' },
+        { error: 'Invalid record data' },
         { status: 400 }
       );
     }
 
     const finalRecord = {
       ...record,
+      title,
+      source_name: sourceName,
+      year: String(record.year || ''),
+      cover: record.cover || '',
+      index: Math.max(1, Math.floor(index)),
+      total_episodes: Math.max(1, Number(record.total_episodes) || 1),
+      play_time: Math.max(0, Number(record.play_time) || 0),
+      total_time: Math.max(0, Number(record.total_time) || 0),
       save_time: record.save_time ?? Date.now(),
+      search_title: record.search_title || title,
     } as PlayRecord;
 
-    await db.savePlayRecord(authInfo.username, source, id, finalRecord);
+    if (STORAGE_TYPE === 'localstorage') {
+      return NextResponse.json({ success: true }, { status: 200 });
+    }
+
+    await db.savePlayRecord(
+      username,
+      parsedKey.source,
+      parsedKey.id,
+      finalRecord
+    );
 
     return NextResponse.json({ success: true }, { status: 200 });
   } catch (err) {
     console.error('保存播放记录失败', err);
     return NextResponse.json(
-      { error: 'Internal Server Error' },
+      {
+        error: '保存播放记录失败',
+        details: (err as Error).message,
+      },
       { status: 500 }
     );
   }
@@ -112,39 +154,33 @@ export async function DELETE(request: NextRequest) {
   try {
     // 从 cookie 获取用户信息
     const authInfo = getAuthInfoFromCookie(request);
-    if (!authInfo || !authInfo.username) {
+    const username = resolveUsername(authInfo);
+    if (!authInfo || !username) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
-    const config = await getConfig();
-    if (authInfo.username !== process.env.USERNAME) {
-      // 非站长，检查用户存在或被封禁
-      const user = config.UserConfig.Users.find(
-        (u) => u.username === authInfo.username
-      );
-      if (!user) {
-        return NextResponse.json({ error: '用户不存在' }, { status: 401 });
-      }
-      if (user.banned) {
-        return NextResponse.json({ error: '用户已被封禁' }, { status: 401 });
-      }
+    const denied = await ensureUserAllowed(username);
+    if (denied) {
+      return denied;
+    }
+
+    if (STORAGE_TYPE === 'localstorage') {
+      return NextResponse.json({ success: true }, { status: 200 });
     }
 
-    const username = authInfo.username;
     const { searchParams } = new URL(request.url);
     const key = searchParams.get('key');
 
     if (key) {
-      // 如果提供了 key，删除单条播放记录
-      const [source, id] = key.split('+');
-      if (!source || !id) {
+      const parsedKey = parseStorageKey(key);
+      if (!parsedKey) {
         return NextResponse.json(
           { error: 'Invalid key format' },
           { status: 400 }
         );
       }
 
-      await db.deletePlayRecord(username, source, id);
+      await db.deletePlayRecord(username, parsedKey.source, parsedKey.id);
     } else {
       // 未提供 key，则清空全部播放记录
       await db.deleteAllPlayRecords(username);
diff --git a/src/app/api/register/route.ts b/src/app/api/register/route.ts
new file mode 100644
index 0000000000..bf0a17f0f5
--- /dev/null
+++ b/src/app/api/register/route.ts
@@ -0,0 +1,66 @@
+/* eslint-disable no-console */
+
+import { NextRequest, NextResponse } from 'next/server';
+
+import { getConfig, setCachedConfig } from '@/lib/config';
+import { db } from '@/lib/db';
+
+export const runtime = 'nodejs';
+
+const STORAGE_TYPE =
+  (process.env.NEXT_PUBLIC_STORAGE_TYPE as
+    | 'localstorage'
+    | 'redis'
+    | 'upstash'
+    | 'kvrocks'
+    | undefined) || 'localstorage';
+
+// ponytail: 开放注册开关，站长在 Vercel env 加 NEXT_PUBLIC_ENABLE_REGISTER=true 即开
+const REGISTER_OPEN =
+  process.env.NEXT_PUBLIC_ENABLE_REGISTER === 'true';
+
+function validName(u: string) {
+  return /^[a-zA-Z0-9_\u4e00-\u9fa5]{2,20}$/.test(u);
+}
+
+export async function GET() {
+  return NextResponse.json({ open: STORAGE_TYPE !== 'localstorage' && REGISTER_OPEN });
+}
+
+export async function POST(req: NextRequest) {
+  if (STORAGE_TYPE === 'localstorage') {
+    return NextResponse.json({ error: '当前模式不支持注册' }, { status: 400 });
+  }
+  if (!REGISTER_OPEN) {
+    return NextResponse.json({ error: '暂未开放注册' }, { status: 403 });
+  }
+  try {
+    const { username, password } = await req.json();
+    if (!username || typeof username !== 'string' || !validName(username)) {
+      return NextResponse.json({ error: '用户名需 2-20 位：字母/数字/_/中文' }, { status: 400 });
+    }
+    if (!password || typeof password !== 'string' || password.length < 4 || password.length > 32) {
+      return NextResponse.json({ error: '密码需 4-32 位' }, { status: 400 });
+    }
+    if (username === process.env.USERNAME) {
+      return NextResponse.json({ error: '用户名已存在' }, { status: 400 });
+    }
+    if (await db.checkUserExist(username)) {
+      return NextResponse.json({ error: '用户名已存在' }, { status: 400 });
+    }
+    await db.registerUser(username, password);
+
+    // 同步进管理员配置的用户列表（沿用 admin/user add 的结构）
+    const adminConfig = await getConfig();
+    if (!adminConfig.UserConfig.Users.find((u) => u.username === username)) {
+      adminConfig.UserConfig.Users.push({ username, role: 'user' } as never);
+      await db.saveAdminConfig(adminConfig);
+      // 刷新内存缓存：下次 getConfig 读到最新
+      await setCachedConfig(adminConfig);
+    }
+    return NextResponse.json({ ok: true });
+  } catch (e) {
+    console.error('注册失败:', e);
+    return NextResponse.json({ error: '注册失败，请稍后重试' }, { status: 500 });
+  }
+}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 56c5fea7bc..ca8d29c29d 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -18,7 +18,7 @@ export const dynamic = 'force-dynamic';
 export async function generateMetadata(): Promise<Metadata> {
   const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
   const config = await getConfig();
-  let siteName = process.env.NEXT_PUBLIC_SITE_NAME || 'MoonTV';
+  let siteName = process.env.NEXT_PUBLIC_SITE_NAME || 'MeowTV';
   if (storageType !== 'localstorage') {
     siteName = config.SiteConfig.SiteName;
   }
@@ -41,7 +41,7 @@ export default async function RootLayout({
 }) {
   const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
 
-  let siteName = process.env.NEXT_PUBLIC_SITE_NAME || 'MoonTV';
+  let siteName = process.env.NEXT_PUBLIC_SITE_NAME || 'MeowTV';
   let announcement =
     process.env.ANNOUNCEMENT ||
     '本网站仅提供影视信息搜索服务，所有内容均来自第三方网站。本站不存储任何视频资源，不对任何内容的准确性、合法性、完整性负责。';
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index 1c22541beb..3254576611 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -85,6 +85,9 @@ function LoginPageClient() {
   const [error, setError] = useState<string | null>(null);
   const [loading, setLoading] = useState(false);
   const [shouldAskUsername, setShouldAskUsername] = useState(false);
+  // ponytail: 注册开关由 /api/register 下发，默认关
+  const [registerOpen, setRegisterOpen] = useState(false);
+  const [mode, setMode] = useState<'login' | 'register'>('login');
 
   const { siteName } = useSite();
 
@@ -94,6 +97,10 @@ function LoginPageClient() {
       const storageType = (window as any).RUNTIME_CONFIG?.STORAGE_TYPE;
       setShouldAskUsername(storageType && storageType !== 'localstorage');
     }
+    fetch('/api/register')
+      .then((r) => r.json())
+      .then((d) => setRegisterOpen(!!d.open))
+      .catch(() => undefined);
   }, []);
 
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
@@ -104,7 +111,9 @@ function LoginPageClient() {
 
     try {
       setLoading(true);
-      const res = await fetch('/api/login', {
+      // ponytail: 注册走 /api/register，成功后切回登录态
+      const url = mode === 'register' ? '/api/register' : '/api/login';
+      const res = await fetch(url, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
@@ -114,6 +123,12 @@ function LoginPageClient() {
       });
 
       if (res.ok) {
+        if (mode === 'register') {
+          setMode('login');
+          setError(null);
+          setPassword('');
+          return;
+        }
         router.replace(sanitizeRedirect(searchParams.get('redirect')));
       } else {
         const data = await res.json().catch(() => ({}));
@@ -182,9 +197,48 @@ function LoginPageClient() {
             }
             className='inline-flex w-full justify-center rounded-lg bg-green-600 py-3 text-base font-semibold text-white shadow-lg transition-all duration-200 hover:from-green-600 hover:to-blue-600 disabled:cursor-not-allowed disabled:opacity-50'
           >
-            {loading ? '登录中...' : '登录'}
+            {loading
+              ? mode === 'register'
+                ? '注册中...'
+                : '登录中...'
+              : mode === 'register'
+                ? '注册'
+                : '登录'}
           </button>
         </form>
+        {registerOpen && (
+          <p className='mt-6 text-center text-sm text-gray-500 dark:text-gray-400'>
+            {mode === 'login' ? (
+              <>
+                还没有账号？
+                <button
+                  type='button'
+                  className='ml-1 font-semibold text-green-600 hover:underline'
+                  onClick={() => {
+                    setMode('register');
+                    setError(null);
+                  }}
+                >
+                  去注册
+                </button>
+              </>
+            ) : (
+              <>
+                已有账号？
+                <button
+                  type='button'
+                  className='ml-1 font-semibold text-green-600 hover:underline'
+                  onClick={() => {
+                    setMode('login');
+                    setError(null);
+                  }}
+                >
+                  去登录
+                </button>
+              </>
+            )}
+          </p>
+        )}
       </div>
 
       {/* 版本信息显示 */}
diff --git a/src/app/play/page.tsx b/src/app/play/page.tsx
index 8003e33014..ce014bdc4f 100644
--- a/src/app/play/page.tsx
+++ b/src/app/play/page.tsx
@@ -1082,8 +1082,7 @@ function PlayPageClient() {
       !artPlayerRef.current ||
       !currentSourceRef.current ||
       !currentIdRef.current ||
-      !videoTitleRef.current ||
-      !detailRef.current?.source_name
+      !videoTitleRef.current
     ) {
       return;
     }
@@ -1100,11 +1099,12 @@ function PlayPageClient() {
     try {
       await savePlayRecord(currentSourceRef.current, currentIdRef.current, {
         title: videoTitleRef.current,
-        source_name: detailRef.current?.source_name || '',
-        year: detailRef.current?.year,
+        source_name:
+          detailRef.current?.source_name || currentSourceRef.current || '',
+        year: String(detailRef.current?.year || ''),
         cover: detailRef.current?.poster || '',
-        index: currentEpisodeIndexRef.current + 1, // 转换为1基索引
-        total_episodes: detailRef.current?.episodes.length || 1,
+        index: Math.max(1, (currentEpisodeIndexRef.current || 0) + 1),
+        total_episodes: Math.max(1, detailRef.current?.episodes?.length || 1),
         play_time: Math.floor(currentTime),
         total_time: Math.floor(duration),
         save_time: Date.now(),
diff --git a/src/app/warning/page.tsx b/src/app/warning/page.tsx
index b3dfa95f37..072b05872b 100644
--- a/src/app/warning/page.tsx
+++ b/src/app/warning/page.tsx
@@ -1,7 +1,7 @@
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
-  title: '安全警告 - MoonTV',
+  title: '安全警告 - MeowTV',
   description: '站点安全配置警告',
 };
 
diff --git a/src/components/SiteProvider.tsx b/src/components/SiteProvider.tsx
index 3223a31cd6..39c8a0bd89 100644
--- a/src/components/SiteProvider.tsx
+++ b/src/components/SiteProvider.tsx
@@ -4,7 +4,7 @@ import { createContext, ReactNode, useContext } from 'react';
 
 const SiteContext = createContext<{ siteName: string; announcement?: string }>({
   // 默认值
-  siteName: 'MoonTV',
+  siteName: 'MeowTV',
   announcement:
     '本网站仅提供影视信息搜索服务，所有内容均来自第三方网站。本站不存储任何视频资源，不对任何内容的准确性、合法性、完整性负责。',
 });
diff --git a/src/lib/cms.ts b/src/lib/cms.ts
new file mode 100644
index 0000000000..becc14e0bf
--- /dev/null
+++ b/src/lib/cms.ts
@@ -0,0 +1,135 @@
+export interface CmsVideoItem {
+  vod_id: string;
+  vod_name: string;
+  vod_pic: string;
+  vod_remarks?: string;
+  vod_play_url?: string;
+  vod_class?: string;
+  vod_year?: string;
+  vod_content?: string;
+  vod_douban_id?: number;
+  type_name?: string;
+}
+
+export interface CmsPayload {
+  list: CmsVideoItem[];
+  pagecount?: number;
+}
+
+const PLAY_URL_RE = /\.(m3u8|mp4)(\?|#|$)/i;
+
+function xmlTag(block: string, tag: string): string {
+  const match = block.match(
+    new RegExp(
+      `<${tag}(?:\\s[^>]*)?>(?:<!\\[CDATA\\[)?([\\s\\S]*?)(?:\\]\\]>)?<\\/${tag}>`,
+      'i'
+    )
+  );
+  return match?.[1]?.trim() ?? '';
+}
+
+function parseCmsXml(xml: string): CmsPayload {
+  const pagecount = Number(
+    xml.match(/pagecount=["']?(\d+)/i)?.[1] ||
+      xml.match(/<pagecount>(\d+)/i)?.[1] ||
+      1
+  );
+
+  const list = Array.from(xml.matchAll(/<video>([\s\S]*?)<\/video>/gi)).map(
+    (match) => {
+      const block = match[1];
+      const dd = Array.from(
+        block.matchAll(/<dd\b[^>]*>(?:<!\[CDATA\[)?([\s\S]*?)(?:\]\]>)?<\/dd>/gi)
+      )
+        .map((item) => item[1].trim())
+        .filter(Boolean)
+        .join('$$$');
+
+      return {
+        vod_id: xmlTag(block, 'id'),
+        vod_name: xmlTag(block, 'name'),
+        vod_pic: xmlTag(block, 'pic'),
+        vod_year: xmlTag(block, 'year'),
+        vod_content: xmlTag(block, 'des') || xmlTag(block, 'content'),
+        vod_class: xmlTag(block, 'type') || xmlTag(block, 'class'),
+        type_name: xmlTag(block, 'type'),
+        vod_play_url: dd || xmlTag(block, 'dl'),
+        vod_remarks: xmlTag(block, 'note'),
+      };
+    }
+  );
+
+  return { list, pagecount };
+}
+
+export function parseCmsResponse(text: string): CmsPayload {
+  const trimmed = text.trim();
+  if (!trimmed) {
+    return { list: [] };
+  }
+
+  if (trimmed.startsWith('{') || trimmed.startsWith('[')) {
+    const data = JSON.parse(trimmed) as {
+      list?: CmsVideoItem[];
+      pagecount?: number;
+    };
+    return {
+      list: Array.isArray(data.list) ? data.list : [],
+      pagecount: data.pagecount,
+    };
+  }
+
+  if (trimmed.startsWith('<')) {
+    return parseCmsXml(trimmed);
+  }
+
+  try {
+    const data = JSON.parse(trimmed) as {
+      list?: CmsVideoItem[];
+      pagecount?: number;
+    };
+    return {
+      list: Array.isArray(data.list) ? data.list : [],
+      pagecount: data.pagecount,
+    };
+  } catch {
+    return parseCmsXml(trimmed);
+  }
+}
+
+export function extractPlaylists(vodPlayUrl?: string): {
+  episodes: string[];
+  titles: string[];
+} {
+  let episodes: string[] = [];
+  let titles: string[] = [];
+
+  if (!vodPlayUrl) {
+    return { episodes, titles };
+  }
+
+  vodPlayUrl.split('$$$').forEach((group) => {
+    const matchEpisodes: string[] = [];
+    const matchTitles: string[] = [];
+
+    group.split('#').forEach((item, index) => {
+      const separator = item.indexOf('$');
+      const title =
+        separator >= 0 ? item.slice(0, separator).trim() : `第${index + 1}集`;
+      const url =
+        separator >= 0 ? item.slice(separator + 1).trim() : item.trim();
+
+      if (url && PLAY_URL_RE.test(url)) {
+        matchTitles.push(title || `第${matchEpisodes.length + 1}集`);
+        matchEpisodes.push(url);
+      }
+    });
+
+    if (matchEpisodes.length > episodes.length) {
+      episodes = matchEpisodes;
+      titles = matchTitles;
+    }
+  });
+
+  return { episodes, titles };
+}
diff --git a/src/lib/config.ts b/src/lib/config.ts
index 56641fd35e..2c4b2f53b3 100644
--- a/src/lib/config.ts
+++ b/src/lib/config.ts
@@ -207,7 +207,7 @@ async function getInitConfig(configFile: string, subConfig: {
     ConfigFile: configFile,
     ConfigSubscribtion: subConfig,
     SiteConfig: {
-      SiteName: process.env.NEXT_PUBLIC_SITE_NAME || 'MoonTV',
+      SiteName: process.env.NEXT_PUBLIC_SITE_NAME || 'MeowTV',
       Announcement:
         process.env.ANNOUNCEMENT ||
         '本网站仅提供影视信息搜索服务，所有内容均来自第三方网站。本站不存储任何视频资源，不对任何内容的准确性、合法性、完整性负责。',
diff --git a/src/lib/db.client.ts b/src/lib/db.client.ts
index 147a3da104..58ad5915bd 100644
--- a/src/lib/db.client.ts
+++ b/src/lib/db.client.ts
@@ -79,18 +79,16 @@ const CACHE_VERSION = '1.0.0';
 const CACHE_EXPIRE_TIME = 60 * 60 * 1000; // 一小时缓存过期
 
 // ---- 环境变量 ----
-const STORAGE_TYPE = (() => {
-  const raw =
-    (typeof window !== 'undefined' &&
-      (window as any).RUNTIME_CONFIG?.STORAGE_TYPE) ||
-    (process.env.STORAGE_TYPE as
-      | 'localstorage'
-      | 'redis'
-      | 'upstash'
-      | undefined) ||
-    'localstorage';
-  return raw;
-})();
+function getStorageType(): string {
+  if (typeof window !== 'undefined') {
+    return (
+      (window as any).RUNTIME_CONFIG?.STORAGE_TYPE ||
+      process.env.NEXT_PUBLIC_STORAGE_TYPE ||
+      'localstorage'
+    );
+  }
+  return process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
+}
 
 // ---------------- 搜索历史相关常量 ----------------
 // 搜索历史最大保存条数
@@ -398,6 +396,18 @@ class HybridCacheManager {
 // 获取缓存管理器实例
 const cacheManager = HybridCacheManager.getInstance();
 
+let lastPlayRecordErrorAt = 0;
+
+function notifyPlayRecordError(message: string, err: unknown) {
+  console.error(message, err);
+  const now = Date.now();
+  if (now - lastPlayRecordErrorAt < 10000) {
+    return;
+  }
+  lastPlayRecordErrorAt = now;
+  triggerGlobalError(message);
+}
+
 // ---- 错误处理辅助函数 ----
 /**
  * 数据库操作失败时的通用错误处理
@@ -405,10 +415,13 @@ const cacheManager = HybridCacheManager.getInstance();
  */
 async function handleDatabaseOperationFailure(
   dataType: 'playRecords' | 'favorites' | 'searchHistory',
-  error: any
+  error: any,
+  options?: { silent?: boolean }
 ): Promise<void> {
   console.error(`数据库操作失败 (${dataType}):`, error);
-  triggerGlobalError(`数据库操作失败`);
+  if (!options?.silent) {
+    triggerGlobalError(`数据库操作失败`);
+  }
 
   try {
     let freshData: any;
@@ -461,7 +474,10 @@ async function fetchWithAuth(
   url: string,
   options?: RequestInit
 ): Promise<Response> {
-  const res = await fetch(url, options);
+  const res = await fetch(url, {
+    ...options,
+    credentials: 'include',
+  });
   if (!res.ok) {
     // 如果是 401 未授权，跳转到登录页面
     if (res.status === 401) {
@@ -480,7 +496,18 @@ async function fetchWithAuth(
       window.location.href = loginUrl.toString();
       throw new Error('用户未授权，已跳转到登录页面');
     }
-    throw new Error(`请求 ${url} 失败: ${res.status}`);
+    let detail = '';
+    try {
+      const data = await res.json();
+      detail = data.details || data.error || '';
+    } catch {
+      // ignore
+    }
+    throw new Error(
+      detail
+        ? `请求 ${url} 失败: ${res.status} ${detail}`
+        : `请求 ${url} 失败: ${res.status}`
+    );
   }
   return res;
 }
@@ -497,6 +524,37 @@ export function generateStorageKey(source: string, id: string): string {
   return `${source}+${id}`;
 }
 
+function readLocalPlayRecords(): Record<string, PlayRecord> {
+  if (typeof window === 'undefined') return {};
+  try {
+    const raw = localStorage.getItem(PLAY_RECORDS_KEY);
+    if (!raw) return {};
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== 'object') return {};
+    return parsed as Record<string, PlayRecord>;
+  } catch {
+    return {};
+  }
+}
+
+function writeLocalPlayRecords(records: Record<string, PlayRecord>): void {
+  localStorage.setItem(PLAY_RECORDS_KEY, JSON.stringify(records));
+}
+
+function mergePlayRecords(
+  primary: Record<string, PlayRecord>,
+  secondary: Record<string, PlayRecord>
+): Record<string, PlayRecord> {
+  const merged = { ...primary };
+  Object.entries(secondary).forEach(([key, record]) => {
+    const current = merged[key];
+    if (!current || (record.save_time || 0) >= (current.save_time || 0)) {
+      merged[key] = record;
+    }
+  });
+  return merged;
+}
+
 // ---- API ----
 /**
  * 读取全部播放记录。
@@ -510,7 +568,7 @@ export async function getAllPlayRecords(): Promise<Record<string, PlayRecord>> {
   }
 
   // 数据库存储模式：使用混合缓存策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 优先从缓存获取数据
     const cachedData = cacheManager.getCachedPlayRecords();
 
@@ -519,19 +577,20 @@ export async function getAllPlayRecords(): Promise<Record<string, PlayRecord>> {
       fetchFromApi<Record<string, PlayRecord>>(`/api/playrecords`)
         .then((freshData) => {
           // 只有数据真正不同时才更新缓存
-          if (JSON.stringify(cachedData) !== JSON.stringify(freshData)) {
-            cacheManager.cachePlayRecords(freshData);
+          const merged = mergePlayRecords(freshData, readLocalPlayRecords());
+          if (JSON.stringify(cachedData) !== JSON.stringify(merged)) {
+            cacheManager.cachePlayRecords(merged);
+            writeLocalPlayRecords(merged);
             // 触发数据更新事件，供组件监听
             window.dispatchEvent(
               new CustomEvent('playRecordsUpdated', {
-                detail: freshData,
+                detail: merged,
               })
             );
           }
         })
         .catch((err) => {
           console.warn('后台同步播放记录失败:', err);
-          triggerGlobalError('后台同步播放记录失败');
         });
 
       return cachedData;
@@ -541,12 +600,14 @@ export async function getAllPlayRecords(): Promise<Record<string, PlayRecord>> {
         const freshData = await fetchFromApi<Record<string, PlayRecord>>(
           `/api/playrecords`
         );
-        cacheManager.cachePlayRecords(freshData);
-        return freshData;
+        const merged = mergePlayRecords(freshData, readLocalPlayRecords());
+        cacheManager.cachePlayRecords(merged);
+        writeLocalPlayRecords(merged);
+        return merged;
       } catch (err) {
         console.error('获取播放记录失败:', err);
         triggerGlobalError('获取播放记录失败');
-        return {};
+        return mergePlayRecords({}, readLocalPlayRecords());
       }
     }
   }
@@ -575,7 +636,7 @@ export async function savePlayRecord(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedRecords = cacheManager.getCachedPlayRecords() || {};
     cachedRecords[key] = record;
@@ -588,7 +649,17 @@ export async function savePlayRecord(
       })
     );
 
-    // 异步同步到数据库
+    let localOk = false;
+    try {
+      writeLocalPlayRecords(
+        mergePlayRecords(readLocalPlayRecords(), { [key]: record })
+      );
+      localOk = true;
+    } catch (localErr) {
+      console.warn('本地播放记录备份失败:', localErr);
+    }
+
+    // 异步同步到数据库。失败时保留本地记录，避免把刚写入的进度冲掉。
     try {
       await fetchWithAuth('/api/playrecords', {
         method: 'POST',
@@ -598,8 +669,11 @@ export async function savePlayRecord(
         body: JSON.stringify({ key, record }),
       });
     } catch (err) {
-      await handleDatabaseOperationFailure('playRecords', err);
-      triggerGlobalError('保存播放记录失败');
+      if (localOk) {
+        console.error('云端保存播放记录失败，已保留本地进度', err);
+        return;
+      }
+      notifyPlayRecordError('保存播放记录失败', err);
       throw err;
     }
     return;
@@ -612,9 +686,10 @@ export async function savePlayRecord(
   }
 
   try {
-    const allRecords = await getAllPlayRecords();
-    allRecords[key] = record;
-    localStorage.setItem(PLAY_RECORDS_KEY, JSON.stringify(allRecords));
+    const allRecords = mergePlayRecords(readLocalPlayRecords(), {
+      [key]: record,
+    });
+    writeLocalPlayRecords(allRecords);
     window.dispatchEvent(
       new CustomEvent('playRecordsUpdated', {
         detail: allRecords,
@@ -638,7 +713,7 @@ export async function deletePlayRecord(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedRecords = cacheManager.getCachedPlayRecords() || {};
     delete cachedRecords[key];
@@ -699,7 +774,7 @@ export async function getSearchHistory(): Promise<string[]> {
   }
 
   // 数据库存储模式：使用混合缓存策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 优先从缓存获取数据
     const cachedData = cacheManager.getCachedSearchHistory();
 
@@ -761,7 +836,7 @@ export async function addSearchHistory(keyword: string): Promise<void> {
   if (!trimmed) return;
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedHistory = cacheManager.getCachedSearchHistory() || [];
     const newHistory = [trimmed, ...cachedHistory.filter((k) => k !== trimmed)];
@@ -821,7 +896,7 @@ export async function addSearchHistory(keyword: string): Promise<void> {
  */
 export async function clearSearchHistory(): Promise<void> {
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     cacheManager.cacheSearchHistory([]);
 
@@ -862,7 +937,7 @@ export async function deleteSearchHistory(keyword: string): Promise<void> {
   if (!trimmed) return;
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedHistory = cacheManager.getCachedSearchHistory() || [];
     const newHistory = cachedHistory.filter((k) => k !== trimmed);
@@ -920,7 +995,7 @@ export async function getAllFavorites(): Promise<Record<string, Favorite>> {
   }
 
   // 数据库存储模式：使用混合缓存策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 优先从缓存获取数据
     const cachedData = cacheManager.getCachedFavorites();
 
@@ -985,7 +1060,7 @@ export async function saveFavorite(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedFavorites = cacheManager.getCachedFavorites() || {};
     cachedFavorites[key] = favorite;
@@ -1048,7 +1123,7 @@ export async function deleteFavorite(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedFavorites = cacheManager.getCachedFavorites() || {};
     delete cachedFavorites[key];
@@ -1107,7 +1182,7 @@ export async function isFavorited(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：使用混合缓存策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     const cachedFavorites = cacheManager.getCachedFavorites();
 
     if (cachedFavorites) {
@@ -1158,7 +1233,7 @@ export async function isFavorited(
  */
 export async function clearAllPlayRecords(): Promise<void> {
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     cacheManager.cachePlayRecords({});
 
@@ -1199,7 +1274,7 @@ export async function clearAllPlayRecords(): Promise<void> {
  */
 export async function clearAllFavorites(): Promise<void> {
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     cacheManager.cacheFavorites({});
 
@@ -1241,7 +1316,7 @@ export async function clearAllFavorites(): Promise<void> {
  * 用于用户登出时清理缓存
  */
 export function clearUserCache(): void {
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     cacheManager.clearUserCache();
   }
 }
@@ -1251,7 +1326,7 @@ export function clearUserCache(): void {
  * 强制从服务器重新获取数据并更新缓存
  */
 export async function refreshAllCache(): Promise<void> {
-  if (STORAGE_TYPE === 'localstorage') return;
+  if (getStorageType() === 'localstorage') return;
 
   try {
     // 并行刷新所有数据
@@ -1315,7 +1390,7 @@ export function getCacheStatus(): {
   hasSkipConfigs: boolean;
   username: string | null;
 } {
-  if (STORAGE_TYPE === 'localstorage') {
+  if (getStorageType() === 'localstorage') {
     return {
       hasPlayRecords: false,
       hasFavorites: false,
@@ -1378,7 +1453,7 @@ export function subscribeToDataUpdates<T>(
  * 适合在应用启动时调用，提升后续访问速度
  */
 export async function preloadUserData(): Promise<void> {
-  if (STORAGE_TYPE === 'localstorage') return;
+  if (getStorageType() === 'localstorage') return;
 
   // 检查是否已有有效缓存，避免重复请求
   const status = getCacheStatus();
@@ -1416,7 +1491,7 @@ export async function getSkipConfig(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：使用混合缓存策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 优先从缓存获取数据
     const cachedData = cacheManager.getCachedSkipConfigs();
 
@@ -1481,7 +1556,7 @@ export async function saveSkipConfig(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedConfigs = cacheManager.getCachedSkipConfigs() || {};
     cachedConfigs[key] = config;
@@ -1544,7 +1619,7 @@ export async function getAllSkipConfigs(): Promise<Record<string, SkipConfig>> {
   }
 
   // 数据库存储模式：使用混合缓存策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 优先从缓存获取数据
     const cachedData = cacheManager.getCachedSkipConfigs();
 
@@ -1608,7 +1683,7 @@ export async function deleteSkipConfig(
   const key = generateStorageKey(source, id);
 
   // 数据库存储模式：乐观更新策略（包括 redis 和 upstash）
-  if (STORAGE_TYPE !== 'localstorage') {
+  if (getStorageType() !== 'localstorage') {
     // 立即更新缓存
     const cachedConfigs = cacheManager.getCachedSkipConfigs() || {};
     delete cachedConfigs[key];
diff --git a/src/lib/db.ts b/src/lib/db.ts
index f413c18d97..55a616b463 100644
--- a/src/lib/db.ts
+++ b/src/lib/db.ts
@@ -45,6 +45,19 @@ export function generateStorageKey(source: string, id: string): string {
   return `${source}+${id}`;
 }
 
+export function parseStorageKey(
+  key: string
+): { source: string; id: string } | null {
+  const sep = key.indexOf('+');
+  if (sep <= 0 || sep === key.length - 1) {
+    return null;
+  }
+  return {
+    source: key.slice(0, sep),
+    id: key.slice(sep + 1),
+  };
+}
+
 // 导出便捷方法
 export class DbManager {
   private storage: IStorage;
@@ -89,6 +102,10 @@ export class DbManager {
     id: string,
     record: PlayRecord
   ): Promise<void> {
+    if (!this.storage) {
+      throw new Error('当前存储模式不支持服务端播放记录');
+    }
+    await this.ensureMigrated();
     const key = generateStorageKey(source, id);
     await this.storage.setPlayRecord(userName, key, record);
   }
@@ -96,6 +113,9 @@ export class DbManager {
   async getAllPlayRecords(userName: string): Promise<{
     [key: string]: PlayRecord;
   }> {
+    if (!this.storage) {
+      return {};
+    }
     await this.ensureMigrated();
     return this.storage.getAllPlayRecords(userName);
   }
@@ -199,7 +219,10 @@ export class DbManager {
 
   // 获取全部用户名
   async getAllUsers(): Promise<string[]> {
-    if (typeof (this.storage as any).getAllUsers === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).getAllUsers === 'function'
+    ) {
       return (this.storage as any).getAllUsers();
     }
     return [];
@@ -207,14 +230,20 @@ export class DbManager {
 
   // ---------- 管理员配置 ----------
   async getAdminConfig(): Promise<AdminConfig | null> {
-    if (typeof (this.storage as any).getAdminConfig === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).getAdminConfig === 'function'
+    ) {
       return (this.storage as any).getAdminConfig();
     }
     return null;
   }
 
   async saveAdminConfig(config: AdminConfig): Promise<void> {
-    if (typeof (this.storage as any).setAdminConfig === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).setAdminConfig === 'function'
+    ) {
       await (this.storage as any).setAdminConfig(config);
     }
   }
@@ -225,7 +254,10 @@ export class DbManager {
     source: string,
     id: string
   ): Promise<SkipConfig | null> {
-    if (typeof (this.storage as any).getSkipConfig === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).getSkipConfig === 'function'
+    ) {
       return (this.storage as any).getSkipConfig(userName, source, id);
     }
     return null;
@@ -237,7 +269,10 @@ export class DbManager {
     id: string,
     config: SkipConfig
   ): Promise<void> {
-    if (typeof (this.storage as any).setSkipConfig === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).setSkipConfig === 'function'
+    ) {
       await (this.storage as any).setSkipConfig(userName, source, id, config);
     }
   }
@@ -247,7 +282,10 @@ export class DbManager {
     source: string,
     id: string
   ): Promise<void> {
-    if (typeof (this.storage as any).deleteSkipConfig === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).deleteSkipConfig === 'function'
+    ) {
       await (this.storage as any).deleteSkipConfig(userName, source, id);
     }
   }
@@ -255,7 +293,10 @@ export class DbManager {
   async getAllSkipConfigs(
     userName: string
   ): Promise<{ [key: string]: SkipConfig }> {
-    if (typeof (this.storage as any).getAllSkipConfigs === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).getAllSkipConfigs === 'function'
+    ) {
       return (this.storage as any).getAllSkipConfigs(userName);
     }
     return {};
@@ -263,7 +304,10 @@ export class DbManager {
 
   // ---------- 数据清理 ----------
   async clearAllData(): Promise<void> {
-    if (typeof (this.storage as any).clearAllData === 'function') {
+    if (
+      this.storage &&
+      typeof (this.storage as any).clearAllData === 'function'
+    ) {
       await (this.storage as any).clearAllData();
     } else {
       throw new Error('存储类型不支持清空数据操作');
diff --git a/src/lib/downstream.ts b/src/lib/downstream.ts
index f98f705423..e5e9f7d8b0 100644
--- a/src/lib/downstream.ts
+++ b/src/lib/downstream.ts
@@ -1,23 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+import { extractPlaylists, parseCmsResponse } from '@/lib/cms';
 import { API_CONFIG, ApiSite, getConfig } from '@/lib/config';
 import { getCachedSearchPage, setCachedSearchPage } from '@/lib/search-cache';
 import { SearchResult } from '@/lib/types';
 import { cleanHtmlTags } from '@/lib/utils';
 
-interface ApiSearchItem {
-  vod_id: string;
-  vod_name: string;
-  vod_pic: string;
-  vod_remarks?: string;
-  vod_play_url?: string;
-  vod_class?: string;
-  vod_year?: string;
-  vod_content?: string;
-  vod_douban_id?: number;
-  type_name?: string;
-}
-
 /**
  * 通用的带缓存搜索函数
  */
@@ -57,51 +45,19 @@ async function searchWithCache(
       return { results: [] };
     }
 
-    const data = await response.json();
-    if (
-      !data ||
-      !data.list ||
-      !Array.isArray(data.list) ||
-      data.list.length === 0
-    ) {
+    const data = parseCmsResponse(await response.text());
+    if (!data.list.length) {
       // 空结果不做负缓存要求，这里不写入缓存
       return { results: [] };
     }
 
     // 处理结果数据
-    const allResults = data.list.map((item: ApiSearchItem) => {
-      let episodes: string[] = [];
-      let titles: string[] = [];
-
-      // 使用正则表达式从 vod_play_url 提取 m3u8 链接
-      if (item.vod_play_url) {
-        // 先用 $$$ 分割
-        const vod_play_url_array = item.vod_play_url.split('$$$');
-        // 分集之间#分割，标题和播放链接 $ 分割
-        vod_play_url_array.forEach((url: string) => {
-          const matchEpisodes: string[] = [];
-          const matchTitles: string[] = [];
-          const title_url_array = url.split('#');
-          title_url_array.forEach((title_url: string) => {
-            const episode_title_url = title_url.split('$');
-            if (
-              episode_title_url.length === 2 &&
-              episode_title_url[1].endsWith('.m3u8')
-            ) {
-              matchTitles.push(episode_title_url[0]);
-              matchEpisodes.push(episode_title_url[1]);
-            }
-          });
-          if (matchEpisodes.length > episodes.length) {
-            episodes = matchEpisodes;
-            titles = matchTitles;
-          }
-        });
-      }
+    const allResults = data.list.map((item) => {
+      const { episodes, titles } = extractPlaylists(item.vod_play_url);
 
       return {
         id: item.vod_id.toString(),
-        title: item.vod_name.trim().replace(/\s+/g, ' '),
+        title: (item.vod_name || '').trim().replace(/\s+/g, ' '),
         poster: item.vod_pic,
         episodes,
         episodes_titles: titles,
@@ -117,8 +73,10 @@ async function searchWithCache(
       };
     });
 
-    // 过滤掉集数为 0 的结果
-    const results = allResults.filter((result: SearchResult) => result.episodes.length > 0);
+    // 搜索列表未必带播放地址，无分集的结果仍展示，详情页再补全
+    const results = allResults.filter(
+      (result: SearchResult) => Boolean(result.id && result.title)
+    );
 
     const pageCount = page === 1 ? data.pagecount || 1 : undefined;
     // 写入缓存（成功）
@@ -221,46 +179,16 @@ export async function getDetailFromApi(
     throw new Error(`详情请求失败: ${response.status}`);
   }
 
-  const data = await response.json();
+  const data = parseCmsResponse(await response.text());
 
-  if (
-    !data ||
-    !data.list ||
-    !Array.isArray(data.list) ||
-    data.list.length === 0
-  ) {
+  if (!data.list.length) {
     throw new Error('获取到的详情内容无效');
   }
 
   const videoDetail = data.list[0];
-  let episodes: string[] = [];
-  let titles: string[] = [];
-
-  // 处理播放源拆分
-  if (videoDetail.vod_play_url) {
-    // 先用 $$$ 分割
-    const vod_play_url_array = videoDetail.vod_play_url.split('$$$');
-    // 分集之间#分割，标题和播放链接 $ 分割
-    vod_play_url_array.forEach((url: string) => {
-      const matchEpisodes: string[] = [];
-      const matchTitles: string[] = [];
-      const title_url_array = url.split('#');
-      title_url_array.forEach((title_url: string) => {
-        const episode_title_url = title_url.split('$');
-        if (
-          episode_title_url.length === 2 &&
-          episode_title_url[1].endsWith('.m3u8')
-        ) {
-          matchTitles.push(episode_title_url[0]);
-          matchEpisodes.push(episode_title_url[1]);
-        }
-      });
-      if (matchEpisodes.length > episodes.length) {
-        episodes = matchEpisodes;
-        titles = matchTitles;
-      }
-    });
-  }
+  const playlists = extractPlaylists(videoDetail.vod_play_url);
+  const titles = playlists.titles;
+  let episodes = playlists.episodes;
 
   // 如果播放源为空，则尝试从内容中解析 m3u8
   if (episodes.length === 0 && videoDetail.vod_content) {
@@ -280,7 +208,7 @@ export async function getDetailFromApi(
     year: videoDetail.vod_year
       ? videoDetail.vod_year.match(/\d{4}/)?.[0] || ''
       : 'unknown',
-    desc: cleanHtmlTags(videoDetail.vod_content),
+    desc: cleanHtmlTags(videoDetail.vod_content || ''),
     type_name: videoDetail.type_name,
     douban_id: videoDetail.vod_douban_id,
   };
diff --git a/src/lib/redis-base.db.ts b/src/lib/redis-base.db.ts
index e50d3f8a37..4a654d4f81 100644
--- a/src/lib/redis-base.db.ts
+++ b/src/lib/redis-base.db.ts
@@ -32,6 +32,7 @@ function createRetryWrapper(clientName: string, getClient: () => RedisClientType
   ): Promise<T> {
     for (let i = 0; i < maxRetries; i++) {
       try {
+        await ensureRedisReady(getClient(), clientName);
         return await operation();
       } catch (err: any) {
         const isLastAttempt = i === maxRetries - 1;
@@ -39,8 +40,14 @@ function createRetryWrapper(clientName: string, getClient: () => RedisClientType
           err.message?.includes('Connection') ||
           err.message?.includes('ECONNREFUSED') ||
           err.message?.includes('ENOTFOUND') ||
+          err.message?.includes('closed') ||
+          err.message?.includes('not open') ||
+          err.message?.includes('The client is closed') ||
+          err.message?.includes('ClientClosedError') ||
+          err.message?.includes('ready timeout') ||
           err.code === 'ECONNRESET' ||
-          err.code === 'EPIPE';
+          err.code === 'EPIPE' ||
+          err.code === 'NR_CLOSED';
 
         if (isConnectionError && !isLastAttempt) {
           console.log(
@@ -53,10 +60,7 @@ function createRetryWrapper(clientName: string, getClient: () => RedisClientType
 
           // 尝试重新连接
           try {
-            const client = getClient();
-            if (!client.isOpen) {
-              await client.connect();
-            }
+            await ensureRedisReady(getClient(), clientName);
           } catch (reconnectErr) {
             console.error('Failed to reconnect:', reconnectErr);
           }
@@ -72,6 +76,47 @@ function createRetryWrapper(clientName: string, getClient: () => RedisClientType
   };
 }
 
+async function ensureRedisReady(
+  client: RedisClientType,
+  clientName: string
+): Promise<void> {
+  if (client.isReady) {
+    return;
+  }
+
+  if (!client.isOpen) {
+    try {
+      await client.connect();
+    } catch (connectErr: any) {
+      const msg = String(connectErr?.message || '');
+      if (!/already|OPEN|connecting/i.test(msg)) {
+        throw connectErr;
+      }
+    }
+  }
+
+  if (client.isReady) {
+    return;
+  }
+
+  await new Promise<void>((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      client.off('ready', onReady);
+      reject(new Error(`${clientName} ready timeout`));
+    }, 8000);
+    const onReady = () => {
+      clearTimeout(timeout);
+      resolve();
+    };
+    client.once('ready', onReady);
+    if (client.isReady) {
+      clearTimeout(timeout);
+      client.off('ready', onReady);
+      resolve();
+    }
+  });
+}
+
 // 创建客户端的工厂函数
 export function createRedisClient(config: RedisConnectionConfig, globalSymbol: symbol): RedisClientType {
   let client: RedisClientType | undefined = (global as any)[globalSymbol];
@@ -171,24 +216,40 @@ export abstract class BaseRedisStorage implements IStorage {
     key: string,
     record: PlayRecord
   ): Promise<void> {
-    await this.withRetry(() =>
-      this.client.hSet(this.prHashKey(userName), key, JSON.stringify(record))
-    );
+    const hashKey = this.prHashKey(userName);
+    const payload = JSON.stringify(record);
+    try {
+      await this.withRetry(() => this.client.hSet(hashKey, key, payload));
+    } catch (err: any) {
+      if (String(err?.message || '').includes('WRONGTYPE')) {
+        await this.withRetry(() => this.client.del(hashKey));
+        await this.withRetry(() => this.client.hSet(hashKey, key, payload));
+        return;
+      }
+      throw err;
+    }
   }
 
   async getAllPlayRecords(
     userName: string
   ): Promise<Record<string, PlayRecord>> {
-    const all = await this.withRetry(() =>
-      this.client.hGetAll(this.prHashKey(userName))
-    );
-    const result: Record<string, PlayRecord> = {};
-    for (const [field, raw] of Object.entries(all)) {
-      if (raw) {
-        result[field] = JSON.parse(raw) as PlayRecord;
+    try {
+      const all = await this.withRetry(() =>
+        this.client.hGetAll(this.prHashKey(userName))
+      );
+      const result: Record<string, PlayRecord> = {};
+      for (const [field, raw] of Object.entries(all)) {
+        if (raw) {
+          result[field] = JSON.parse(raw) as PlayRecord;
+        }
+      }
+      return result;
+    } catch (err: any) {
+      if (String(err?.message || '').includes('WRONGTYPE')) {
+        return {};
       }
+      throw err;
     }
-    return result;
   }
 
   async deletePlayRecord(userName: string, key: string): Promise<void> {
diff --git a/src/lib/upstash.db.ts b/src/lib/upstash.db.ts
index 3d2c52db06..accb69ea41 100644
--- a/src/lib/upstash.db.ts
+++ b/src/lib/upstash.db.ts
@@ -81,9 +81,20 @@ export class UpstashRedisStorage implements IStorage {
     key: string,
     record: PlayRecord
   ): Promise<void> {
-    await withRetry(() =>
-      this.client.hset(this.prHashKey(userName), { [key]: record })
-    );
+    try {
+      await withRetry(() =>
+        this.client.hset(this.prHashKey(userName), { [key]: record })
+      );
+    } catch (err: any) {
+      if (String(err?.message || '').includes('WRONGTYPE')) {
+        await withRetry(() => this.client.del(this.prHashKey(userName)));
+        await withRetry(() =>
+          this.client.hset(this.prHashKey(userName), { [key]: record })
+        );
+        return;
+      }
+      throw err;
+    }
   }
 
   async getAllPlayRecords(
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 6a68fdd824..8842dabb05 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -19,6 +19,59 @@ const config: Config = {
         primary: ['Inter', ...defaultTheme.fontFamily.sans],
       },
       colors: {
+        // ponytail: 品牌粉，全站 green/emerald/lime 语义类重定向到此
+        'pastel-pink': {
+          50: '#fff1f4',
+          100: '#ffe3e9',
+          200: '#ffd3df',
+          300: '#ffa2bb',
+          400: '#fe6e99',
+          500: '#f83b78',
+          600: '#e51964',
+          700: '#c20e55',
+          800: '#a20f4e',
+          900: '#8a1148',
+          950: '#4d0424',
+        },
+        green: {
+          50: '#fff1f4',
+          100: '#ffe3e9',
+          200: '#ffd3df',
+          300: '#ffa2bb',
+          400: '#fe6e99',
+          500: '#f83b78',
+          600: '#e51964',
+          700: '#c20e55',
+          800: '#a20f4e',
+          900: '#8a1148',
+          950: '#4d0424',
+        },
+        emerald: {
+          50: '#fff1f4',
+          100: '#ffe3e9',
+          200: '#ffd3df',
+          300: '#ffa2bb',
+          400: '#fe6e99',
+          500: '#f83b78',
+          600: '#e51964',
+          700: '#c20e55',
+          800: '#a20f4e',
+          900: '#8a1148',
+          950: '#4d0424',
+        },
+        lime: {
+          50: '#fff1f4',
+          100: '#ffe3e9',
+          200: '#ffd3df',
+          300: '#ffa2bb',
+          400: '#fe6e99',
+          500: '#f83b78',
+          600: '#e51964',
+          700: '#c20e55',
+          800: '#a20f4e',
+          900: '#8a1148',
+          950: '#4d0424',
+        },
         primary: {
           50: '#f0f9ff',
           100: '#e0f2fe',