feat(api): 添加ChatGPT API服务和CPA多池管理功能

- 实现FastAPI应用框架，支持CORS跨域和认证中间件
- 添加图像生成、聊天补全和响应创建等API端点
- 集成账户管理系统，支持账户创建、删除、刷新和更新操作
- 实现CPA多池配置管理，支持远程文件浏览和批量导入功能
- 添加账户限制监控器，自动检查和刷新受限账户
- 提供Web前端静态资源服务和版本信息接口
- 实现安全的密钥验证机制和账户数据脱敏处理
- 支持多线程并发处理图像生成请求
- 添加详细的API文档和错误处理机制

services/api.py

@@ -13,7 +13,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from services.account_service import account_service
 from services.chatgpt_service import ChatGPTService
 from services.config import config
-from services.cpa_service import cpa_service, cpa_config, fetch_tokens_for_pool, fetch_pool_status
+from services.cpa_service import cpa_config, cpa_import_service, list_remote_files
 
 from services.image_service import ImageGenerationError
 from services.version import get_app_version
@@ -69,24 +69,21 @@ class ResponseCreateRequest(BaseModel):
     tool_choice: object | None = None
     stream: bool | None = None
 
-    class CPAConfigUpdateRequest(BaseModel):
-        base_url: str | None = None
-
-    secret_key: str | None = None
-
 
 class CPAPoolCreateRequest(BaseModel):
     name: str = ""
     base_url: str = ""
     secret_key: str = ""
-    enabled: bool = True
 
 
 class CPAPoolUpdateRequest(BaseModel):
     name: str | None = None
     base_url: str | None = None
     secret_key: str | None = None
-    enabled: bool | None = None
+
+
+class CPAImportRequest(BaseModel):
+    names: list[str] = Field(default_factory=list)
 
 
 def build_model_item(model_id: str) -> dict[str, object]:
@@ -98,6 +95,20 @@ def build_model_item(model_id: str) -> dict[str, object]:
     }
 
 
+def sanitize_cpa_pool(pool: dict | None) -> dict | None:
+    if not isinstance(pool, dict):
+        return None
+    return {
+        key: value
+        for key, value in pool.items()
+        if key != "secret_key"
+    }
+
+
+def sanitize_cpa_pools(pools: list[dict]) -> list[dict]:
+    return [sanitized for pool in pools if (sanitized := sanitize_cpa_pool(pool)) is not None]
+
+
 def extract_bearer_token(authorization: str | None) -> str:
     scheme, _, value = str(authorization or "").partition(" ")
     if scheme.lower() != "bearer" or not value.strip():
@@ -283,7 +294,7 @@ def create_app() -> FastAPI:
     @router.get("/api/cpa/pools")
     async def list_cpa_pools(authorization: str | None = Header(default=None)):
         require_auth_key(authorization)
-        return {"pools": cpa_config.list_pools()}
+        return {"pools": sanitize_cpa_pools(cpa_config.list_pools())}
 
     @router.post("/api/cpa/pools")
     async def create_cpa_pool(
@@ -299,10 +310,8 @@ def create_app() -> FastAPI:
             name=body.name,
             base_url=body.base_url,
             secret_key=body.secret_key,
-            enabled=body.enabled,
         )
-        cpa_service.invalidate_cache()
-        return {"pool": pool, "pools": cpa_config.list_pools()}
+        return {"pool": sanitize_cpa_pool(pool), "pools": sanitize_cpa_pools(cpa_config.list_pools())}
 
     @router.post("/api/cpa/pools/{pool_id}")
     async def update_cpa_pool(
@@ -314,8 +323,7 @@ def create_app() -> FastAPI:
         pool = cpa_config.update_pool(pool_id, body.model_dump(exclude_none=True))
         if pool is None:
             raise HTTPException(status_code=404, detail={"error": "pool not found"})
-        cpa_service.invalidate_cache()
-        return {"pool": pool, "pools": cpa_config.list_pools()}
+        return {"pool": sanitize_cpa_pool(pool), "pools": sanitize_cpa_pools(cpa_config.list_pools())}
 
     @router.delete("/api/cpa/pools/{pool_id}")
     async def delete_cpa_pool(
@@ -325,11 +333,10 @@ def create_app() -> FastAPI:
         require_auth_key(authorization)
         if not cpa_config.delete_pool(pool_id):
             raise HTTPException(status_code=404, detail={"error": "pool not found"})
-        cpa_service.invalidate_cache()
-        return {"pools": cpa_config.list_pools()}
+        return {"pools": sanitize_cpa_pools(cpa_config.list_pools())}
 
-    @router.get("/api/cpa/pools/{pool_id}/status")
-    async def cpa_pool_status(
+    @router.get("/api/cpa/pools/{pool_id}/files")
+    async def cpa_pool_files(
             pool_id: str,
             authorization: str | None = Header(default=None),
     ):
@@ -337,38 +344,32 @@ def create_app() -> FastAPI:
         pool = cpa_config.get_pool(pool_id)
         if pool is None:
             raise HTTPException(status_code=404, detail={"error": "pool not found"})
-        result = await run_in_threadpool(fetch_pool_status, pool)
-        return result
+        files = await run_in_threadpool(list_remote_files, pool)
+        return {"pool_id": pool_id, "files": files}
 
-    @router.post("/api/cpa/pools/{pool_id}/sync")
-    async def cpa_pool_sync(
+    @router.post("/api/cpa/pools/{pool_id}/import")
+    async def cpa_pool_import(
             pool_id: str,
+            body: CPAImportRequest,
             authorization: str | None = Header(default=None),
     ):
-        """Pull tokens from a specific CPA pool and import into local account pool."""
         require_auth_key(authorization)
         pool = cpa_config.get_pool(pool_id)
         if pool is None:
             raise HTTPException(status_code=404, detail={"error": "pool not found"})
-        tokens = await run_in_threadpool(fetch_tokens_for_pool, pool)
-        if not tokens:
-            raise HTTPException(status_code=502, detail={"error": "No tokens returned from CPA"})
-        result = account_service.add_accounts(tokens)
-        refresh_result = account_service.refresh_accounts(tokens)
-        return {
-            **result,
-            "refreshed": refresh_result.get("refreshed", 0),
-            "errors": refresh_result.get("errors", []),
-            "items": refresh_result.get("items", result.get("items", [])),
-        }
+        try:
+            job = cpa_import_service.start_import(pool, body.names)
+        except ValueError as exc:
+            raise HTTPException(status_code=400, detail={"error": str(exc)}) from exc
+        return {"import_job": job}
 
-    @router.get("/api/cpa/status")
-    async def cpa_global_status(authorization: str | None = Header(default=None)):
+    @router.get("/api/cpa/pools/{pool_id}/import")
+    async def cpa_pool_import_progress(pool_id: str, authorization: str | None = Header(default=None)):
         require_auth_key(authorization)
-        if not cpa_config.has_usable:
-            return {"enabled": False, "pools": 0, "tokens": 0}
-        tokens = await run_in_threadpool(cpa_service.fetch_all_tokens)
-        return {"enabled": True, "pools": len(cpa_config.usable_pools()), "tokens": len(tokens)}
+        pool = cpa_config.get_pool(pool_id)
+        if pool is None:
+            raise HTTPException(status_code=404, detail={"error": "pool not found"})
+        return {"import_job": pool.get("import_job")}
 
     app.include_router(router)
 

services/cpa_service.py

@@ -1,66 +1,84 @@
-"""CLIProxyAPI integration — fetch access_tokens from multiple remote CPA instances."""
+"""CLIProxyAPI integration for browsing remote auth files and importing selected tokens."""
 
 from __future__ import annotations
 
 import json
-import time
+import threading
 import uuid
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from datetime import datetime, timezone
 from pathlib import Path
 from threading import Lock
-from typing import Any
 
 from curl_cffi.requests import Session
 
-from services.config import config, DATA_DIR
+from services.account_service import account_service
+from services.config import DATA_DIR
 
 
 CPA_CONFIG_FILE = DATA_DIR / "cpa_config.json"
 
 
-# ── Pool entry type ──────────────────────────────────────────────────
-
-def _new_pool_id() -> str:
+def _new_id() -> str:
     return uuid.uuid4().hex[:12]
 
 
+def _now_iso() -> str:
+    return datetime.now(timezone.utc).isoformat()
+
+
+def _normalize_import_job(raw: object, *, fail_unfinished: bool) -> dict | None:
+    if not isinstance(raw, dict):
+        return None
+    status = str(raw.get("status") or "failed").strip() or "failed"
+    if fail_unfinished and status in {"pending", "running"}:
+        status = "failed"
+    return {
+        "job_id": str(raw.get("job_id") or uuid.uuid4().hex).strip(),
+        "status": status,
+        "created_at": str(raw.get("created_at") or _now_iso()).strip() or _now_iso(),
+        "updated_at": str(raw.get("updated_at") or raw.get("created_at") or _now_iso()).strip() or _now_iso(),
+        "total": int(raw.get("total") or 0),
+        "completed": int(raw.get("completed") or 0),
+        "added": int(raw.get("added") or 0),
+        "skipped": int(raw.get("skipped") or 0),
+        "refreshed": int(raw.get("refreshed") or 0),
+        "failed": int(raw.get("failed") or 0),
+        "errors": raw.get("errors") if isinstance(raw.get("errors"), list) else [],
+    }
+
+
 def _normalize_pool(raw: dict) -> dict:
     return {
-        "id": str(raw.get("id") or _new_pool_id()).strip(),
+        "id": str(raw.get("id") or _new_id()).strip(),
         "name": str(raw.get("name") or "").strip(),
         "base_url": str(raw.get("base_url") or "").strip(),
         "secret_key": str(raw.get("secret_key") or "").strip(),
-        "enabled": bool(raw.get("enabled", True)),
+        "import_job": _normalize_import_job(raw.get("import_job"), fail_unfinished=True),
     }
 
 
-def _is_pool_usable(pool: dict) -> bool:
-    return bool(pool.get("enabled") and pool.get("base_url") and pool.get("secret_key"))
-
+def _management_headers(secret_key: str) -> dict[str, str]:
+    return {
+        "Authorization": f"Bearer {secret_key}",
+        "Accept": "application/json",
+    }
 
-# ── Persisted multi-pool config ─────────────────────────────────────
 
 class CPAConfig:
-    """Manages a list of CPA pool entries persisted to ``cpa_config.json``."""
-
     def __init__(self, store_file: Path):
         self._store_file = store_file
         self._lock = Lock()
         self._pools: list[dict] = self._load()
 
-    # -- persistence ---------------------------------------------------
-
     def _load(self) -> list[dict]:
         if not self._store_file.exists():
             return []
         try:
             raw = json.loads(self._store_file.read_text(encoding="utf-8"))
-            # Migrate from old single-pool format
             if isinstance(raw, dict) and "base_url" in raw:
                 pool = _normalize_pool(raw)
-                if pool["base_url"]:
-                    return [pool]
-                return []
+                return [pool] if pool["base_url"] else []
             if isinstance(raw, list):
                 return [_normalize_pool(item) for item in raw if isinstance(item, dict)]
         except Exception:
@@ -69,32 +87,21 @@ class CPAConfig:
 
     def _save(self) -> None:
         self._store_file.parent.mkdir(parents=True, exist_ok=True)
-        self._store_file.write_text(
-            json.dumps(self._pools, ensure_ascii=False, indent=2) + "\n",
-            encoding="utf-8",
-        )
-
-    # -- public API ----------------------------------------------------
+        self._store_file.write_text(json.dumps(self._pools, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
 
     def list_pools(self) -> list[dict]:
         with self._lock:
-            return [dict(p) for p in self._pools]
+            return [dict(pool) for pool in self._pools]
 
     def get_pool(self, pool_id: str) -> dict | None:
         with self._lock:
-            for p in self._pools:
-                if p["id"] == pool_id:
-                    return dict(p)
+            for pool in self._pools:
+                if pool["id"] == pool_id:
+                    return dict(pool)
         return None
 
-    def add_pool(self, name: str, base_url: str, secret_key: str, enabled: bool = True) -> dict:
-        pool = _normalize_pool({
-            "id": _new_pool_id(),
-            "name": name,
-            "base_url": base_url,
-            "secret_key": secret_key,
-            "enabled": enabled,
-        })
+    def add_pool(self, name: str, base_url: str, secret_key: str) -> dict:
+        pool = _normalize_pool({"id": _new_id(), "name": name, "base_url": base_url, "secret_key": secret_key})
         with self._lock:
             self._pools.append(pool)
             self._save()
@@ -102,240 +109,206 @@ class CPAConfig:
 
     def update_pool(self, pool_id: str, updates: dict) -> dict | None:
         with self._lock:
-            for i, p in enumerate(self._pools):
-                if p["id"] == pool_id:
-                    merged = {**p, **{k: v for k, v in updates.items() if v is not None}, "id": pool_id}
-                    self._pools[i] = _normalize_pool(merged)
-                    self._save()
-                    return dict(self._pools[i])
+            for index, pool in enumerate(self._pools):
+                if pool["id"] != pool_id:
+                    continue
+                merged = {**pool, **{key: value for key, value in updates.items() if value is not None}, "id": pool_id}
+                self._pools[index] = _normalize_pool(merged)
+                self._save()
+                return dict(self._pools[index])
         return None
 
     def delete_pool(self, pool_id: str) -> bool:
         with self._lock:
             before = len(self._pools)
-            self._pools = [p for p in self._pools if p["id"] != pool_id]
+            self._pools = [pool for pool in self._pools if pool["id"] != pool_id]
             if len(self._pools) < before:
                 self._save()
                 return True
         return False
 
-    def usable_pools(self) -> list[dict]:
+    def set_import_job(self, pool_id: str, import_job: dict | None) -> dict | None:
         with self._lock:
-            return [dict(p) for p in self._pools if _is_pool_usable(p)]
+            for index, pool in enumerate(self._pools):
+                if pool["id"] != pool_id:
+                    continue
+                next_pool = dict(pool)
+                next_pool["import_job"] = _normalize_import_job(import_job, fail_unfinished=False)
+                self._pools[index] = next_pool
+                self._save()
+                return dict(next_pool)
+        return None
 
-    @property
-    def has_usable(self) -> bool:
+    def get_import_job(self, pool_id: str) -> dict | None:
         with self._lock:
-            return any(_is_pool_usable(p) for p in self._pools)
-
-
-# ── CPA fetcher (per-pool) ──────────────────────────────────────────
-
-def _management_headers(secret_key: str) -> dict[str, str]:
-    return {
-        "Authorization": f"Bearer {secret_key}",
-        "Accept": "application/json",
-    }
-
-
-def _extract_access_token(auth_file: dict[str, Any]) -> str | None:
-    for key in ("access_token", "token", "accessToken", "access-token"):
-        value = str(auth_file.get(key) or "").strip()
-        if value:
-            return value
-    for wrapper_key in ("data", "content", "credential", "auth", "credentials"):
-        nested = auth_file.get(wrapper_key)
-        if isinstance(nested, dict):
-            for key in ("access_token", "token", "accessToken", "access-token"):
-                value = str(nested.get(key) or "").strip()
-                if value:
-                    return value
-    for value in auth_file.values():
-        if isinstance(value, str) and value.strip().startswith("eyJ") and len(value.strip()) > 100:
-            return value.strip()
-    return None
-
-
-def _resolve_file_list(payload: Any) -> list[dict]:
-    if isinstance(payload, list):
-        return [item for item in payload if isinstance(item, dict)]
-    if isinstance(payload, dict):
-        for key in ("files", "auth_files", "auth-files", "data", "items"):
-            candidate = payload.get(key)
-            if isinstance(candidate, list):
-                return [item for item in candidate if isinstance(item, dict)]
-        return [payload]
-    return []
-
-
-def _fetch_file_detail(session: Session, base_url: str, secret_key: str, file_name: str) -> dict | None:
-    url = f"{base_url.rstrip('/')}/v0/management/auth-files/download"
-    try:
-        response = session.get(url, headers=_management_headers(secret_key), params={"name": file_name}, timeout=15)
-        if not response.ok:
-            return None
-        data = response.json()
-        return data if isinstance(data, dict) else None
-    except Exception:
+            for pool in self._pools:
+                if pool["id"] == pool_id:
+                    job = pool.get("import_job")
+                    return dict(job) if isinstance(job, dict) else None
         return None
 
 
-def fetch_tokens_for_pool(pool: dict) -> list[str]:
-    """Fetch all access_tokens from a single CPA pool."""
-    base_url = pool.get("base_url") or ""
-    secret_key = pool.get("secret_key") or ""
+def list_remote_files(pool: dict) -> list[dict]:
+    base_url = str(pool.get("base_url") or "").strip()
+    secret_key = str(pool.get("secret_key") or "").strip()
     if not base_url or not secret_key:
         return []
 
-    pool_name = pool.get("name") or pool.get("id") or "?"
     url = f"{base_url.rstrip('/')}/v0/management/auth-files"
-    print(f"[cpa-service] [{pool_name}] fetching from {url}")
-
-    session = Session(verify=config.tls_verify)
+    session = Session(verify=True)
     try:
         response = session.get(url, headers=_management_headers(secret_key), timeout=30)
         if not response.ok:
-            print(f"[cpa-service] [{pool_name}] HTTP {response.status_code}")
-            return []
+            raise RuntimeError(f"remote list failed: HTTP {response.status_code}")
+        payload = response.json()
+    finally:
+        session.close()
+
+    files = payload.get("files") if isinstance(payload, dict) else None
+    if not isinstance(files, list):
+        raise RuntimeError("remote list payload is invalid")
+
+    items: list[dict] = []
+    for item in files:
+        if not isinstance(item, dict):
+            continue
+        name = str(item.get("name") or "").strip()
+        email = str(item.get("email") or item.get("account") or "").strip()
+        if not name:
+            continue
+        items.append({"name": name, "email": email})
+    return items
+
+
+def fetch_remote_access_token(pool: dict, file_name: str) -> tuple[str | None, str | None]:
+    base_url = str(pool.get("base_url") or "").strip()
+    secret_key = str(pool.get("secret_key") or "").strip()
+    file_name = str(file_name or "").strip()
+    if not base_url or not secret_key or not file_name:
+        return None, "invalid request"
+
+    url = f"{base_url.rstrip('/')}/v0/management/auth-files/download"
+    session = Session(verify=True)
+    try:
+        response = session.get(url, headers=_management_headers(secret_key), params={"name": file_name}, timeout=30)
+        if not response.ok:
+            return None, f"HTTP {response.status_code}"
         payload = response.json()
     except Exception as exc:
-        print(f"[cpa-service] [{pool_name}] error: {exc}")
-        return []
+        return None, str(exc)
+    finally:
+        session.close()
 
-    file_entries = _resolve_file_list(payload)
-    active_entries = [
-        e for e in file_entries
-        if not e.get("disabled") and not e.get("unavailable")
-        and e.get("status") in (None, "", "active")
-        and e.get("type") in (None, "", "codex")
-    ]
-    print(f"[cpa-service] [{pool_name}] {len(active_entries)} active codex entries")
-
-    tokens: list[str] = []
-    seen: set[str] = set()
-    need_download: list[dict] = []
-
-    for entry in active_entries:
-        token = _extract_access_token(entry)
-        if token and token not in seen:
-            seen.add(token)
-            tokens.append(token)
-        else:
-            need_download.append(entry)
-
-    if need_download:
-        max_workers = min(10, len(need_download))
-        try:
-            with ThreadPoolExecutor(max_workers=max_workers) as executor:
-                future_map = {}
-                for entry in need_download:
-                    file_name = str(entry.get("name") or entry.get("id") or "").strip()
-                    if not file_name:
-                        continue
-                    future = executor.submit(_fetch_file_detail, session, base_url, secret_key, file_name)
-                    future_map[future] = file_name
-
-                for future in as_completed(future_map):
-                    detail = future.result()
-                    if detail is None:
-                        continue
-                    content = detail.get("content")
-                    if isinstance(content, str):
-                        try:
-                            parsed = json.loads(content)
-                            if isinstance(parsed, dict):
-                                detail = {**detail, **parsed}
-                        except Exception:
-                            pass
-                    token = _extract_access_token(detail)
-                    if token and token not in seen:
-                        seen.add(token)
-                        tokens.append(token)
-        except Exception as exc:
-            print(f"[cpa-service] [{pool_name}] concurrent fetch error: {exc}")
-
-    session.close()
-    print(f"[cpa-service] [{pool_name}] extracted {len(tokens)} token(s)")
-    return tokens
-
-
-def fetch_pool_status(pool: dict) -> dict:
-    """Test a single pool and return status info."""
-    tokens = fetch_tokens_for_pool(pool)
-    return {"pool_id": pool["id"], "tokens": len(tokens)}
-
-
-# ── Aggregated CPA service ──────────────────────────────────────────
-
-class CPAService:
-    """Aggregates tokens from all usable CPA pools with caching."""
+    if not isinstance(payload, dict):
+        return None, "invalid payload"
 
+    access_token = str(payload.get("access_token") or "").strip()
+    if not access_token:
+        return None, "missing access_token"
+    return access_token, None
+
+
+class CPAImportService:
     def __init__(self, cpa_config: CPAConfig):
         self._config = cpa_config
-        self._lock = Lock()
-        self._tokens: list[str] = []
-        self._index = 0
-        self._last_refresh: float = 0
-        self._cache_ttl = 300
-
-    @property
-    def enabled(self) -> bool:
-        return self._config.has_usable
-
-    def fetch_all_tokens(self) -> list[str]:
-        """Fetch tokens from all usable pools concurrently."""
-        pools = self._config.usable_pools()
-        if not pools:
-            return []
 
-        all_tokens: list[str] = []
-        seen: set[str] = set()
+    def start_import(self, pool: dict, selected_files: list[str]) -> dict:
+        names = [str(name or "").strip() for name in selected_files if str(name or "").strip()]
+        if not names:
+            raise ValueError("selected files is required")
+
+        pool_id = str(pool.get("id") or "").strip()
+        job = {
+            "job_id": uuid.uuid4().hex,
+            "status": "pending",
+            "created_at": _now_iso(),
+            "updated_at": _now_iso(),
+            "total": len(names),
+            "completed": 0,
+            "added": 0,
+            "skipped": 0,
+            "refreshed": 0,
+            "failed": 0,
+            "errors": [],
+        }
+        saved_pool = self._config.set_import_job(pool_id, job)
+        if saved_pool is None:
+            raise ValueError("pool not found")
+
+        thread = threading.Thread(
+            target=self._run_import,
+            args=(pool_id, pool, names),
+            name=f"cpa-import-{pool_id}",
+            daemon=True,
+        )
+        thread.start()
+        return dict(saved_pool.get("import_job") or job)
 
-        max_workers = min(5, len(pools))
+    def _update_job(self, pool_id: str, **updates) -> dict | None:
+        current = self._config.get_import_job(pool_id)
+        if current is None:
+            return None
+        next_job = {**current, **updates, "updated_at": _now_iso()}
+        pool = self._config.set_import_job(pool_id, next_job)
+        if pool is None:
+            return None
+        job = pool.get("import_job")
+        return dict(job) if isinstance(job, dict) else None
+
+    def _append_error(self, pool_id: str, file_name: str, message: str) -> None:
+        current = self._config.get_import_job(pool_id)
+        if current is None:
+            return
+        errors = list(current.get("errors") or [])
+        errors.append({"name": file_name, "error": message})
+        self._update_job(pool_id, errors=errors, failed=len(errors))
+
+    def _run_import(self, pool_id: str, pool: dict, names: list[str]) -> None:
+        self._update_job(pool_id, status="running")
+
+        tokens: list[str] = []
+        max_workers = min(16, max(1, len(names)))
         with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            future_map = {executor.submit(fetch_tokens_for_pool, pool): pool for pool in pools}
+            future_map = {executor.submit(fetch_remote_access_token, pool, name): name for name in names}
             for future in as_completed(future_map):
+                file_name = future_map[future]
                 try:
-                    tokens = future.result()
-                    for token in tokens:
-                        if token not in seen:
-                            seen.add(token)
-                            all_tokens.append(token)
+                    token, error = future.result()
                 except Exception as exc:
-                    pool = future_map[future]
-                    print(f"[cpa-service] pool {pool.get('name', pool.get('id'))} error: {exc}")
-
-        print(f"[cpa-service] total {len(all_tokens)} token(s) from {len(pools)} pool(s)")
-        return all_tokens
-
-    def get_token(self, excluded_tokens: set[str] | None = None) -> str | None:
-        with self._lock:
-            now = time.time()
-            if not self._tokens or (now - self._last_refresh) > self._cache_ttl:
-                self._tokens = self.fetch_all_tokens()
-                self._last_refresh = now
-                if self._tokens:
-                    self._index = 0
-
-            excluded = {t for t in (excluded_tokens or set()) if t}
-            available = [t for t in self._tokens if t not in excluded]
-            if not available:
-                return None
-
-            token = available[self._index % len(available)]
-            self._index += 1
-            return token
-
-    def invalidate_cache(self) -> None:
-        with self._lock:
-            self._last_refresh = 0
-
+                    token, error = None, str(exc)
+
+                if token:
+                    tokens.append(token)
+                else:
+                    self._append_error(pool_id, file_name, error or "unknown error")
+
+                current = self._config.get_import_job(pool_id) or {}
+                failed = len(current.get("errors") or [])
+                self._update_job(pool_id, completed=int(current.get("completed") or 0) + 1, failed=failed)
+
+        if not tokens:
+            current = self._config.get_import_job(pool_id) or {}
+            self._update_job(
+                pool_id,
+                status="failed",
+                completed=int(current.get("total") or 0),
+                failed=len(current.get("errors") or []),
+            )
+            return
+
+        add_result = account_service.add_accounts(tokens)
+        refresh_result = account_service.refresh_accounts(tokens)
+        current = self._config.get_import_job(pool_id) or {}
+        self._update_job(
+            pool_id,
+            status="completed",
+            completed=len(names),
+            added=int(add_result.get("added") or 0),
+            skipped=int(add_result.get("skipped") or 0),
+            refreshed=int(refresh_result.get("refreshed") or 0),
+            failed=len(current.get("errors") or []),
+        )
 
-# ── Singletons ──────────────────────────────────────────────────────
 
 cpa_config = CPAConfig(CPA_CONFIG_FILE)
-cpa_service = CPAService(cpa_config)
-
-if cpa_config.has_usable:
-    pools = cpa_config.usable_pools()
-    print(f"[cpa-service] {len(pools)} usable pool(s) configured")
+cpa_import_service = CPAImportService(cpa_config)

web/src/app/settings/page.tsx

@@ -1,18 +1,16 @@
 "use client";
 
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import {
-  CheckCircle2,
   Eye,
   EyeOff,
+  Import,
   Link2,
   LoaderCircle,
   Pencil,
   Plus,
-  Power,
-  PowerOff,
-  RefreshCw,
   Save,
+  Search,
   ServerCog,
   Trash2,
   Unplug,
@@ -22,6 +20,7 @@ import { toast } from "sonner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   Dialog,
   DialogContent,
@@ -31,26 +30,50 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import {
   createCPAPool,
   deleteCPAPool,
-  fetchCPAPoolStatus,
+  fetchCPAPoolFiles,
   fetchCPAPools,
-  syncCPAPool,
+  startCPAImport,
   updateCPAPool,
   type CPAPool,
+  type CPARemoteFile,
 } from "@/lib/api";
-import { cn } from "@/lib/utils";
 
-type PoolStatus = { pool_id: string; tokens: number };
+const PAGE_SIZE_OPTIONS = ["50", "100", "200"] as const;
+
+function normalizeFiles(items: CPARemoteFile[]) {
+  const seen = new Set<string>();
+  const files: CPARemoteFile[] = [];
+  for (const item of items) {
+    const name = String(item.name || "").trim();
+    if (!name || seen.has(name)) {
+      continue;
+    }
+    seen.add(name);
+    files.push({
+      name,
+      email: String(item.email || "").trim(),
+    });
+  }
+  return files;
+}
 
 export default function SettingsPage() {
   const didLoadRef = useRef(false);
+  const pollTimerRef = useRef<number | null>(null);
+
   const [pools, setPools] = useState<CPAPool[]>([]);
-  const [poolStatuses, setPoolStatuses] = useState<Record<string, PoolStatus>>({});
   const [isLoading, setIsLoading] = useState(true);
 
-  // Dialog state
   const [dialogOpen, setDialogOpen] = useState(false);
   const [editingPool, setEditingPool] = useState<CPAPool | null>(null);
   const [formName, setFormName] = useState("");
@@ -59,30 +82,73 @@ export default function SettingsPage() {
   const [showSecret, setShowSecret] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
 
-  // Per-pool loading states
-  const [testingId, setTestingId] = useState<string | null>(null);
-  const [syncingId, setSyncingId] = useState<string | null>(null);
   const [deletingId, setDeletingId] = useState<string | null>(null);
-  const [togglingId, setTogglingId] = useState<string | null>(null);
+  const [loadingFilesId, setLoadingFilesId] = useState<string | null>(null);
+
+  const [browserOpen, setBrowserOpen] = useState(false);
+  const [browserPool, setBrowserPool] = useState<CPAPool | null>(null);
+  const [remoteFiles, setRemoteFiles] = useState<CPARemoteFile[]>([]);
+  const [selectedNames, setSelectedNames] = useState<string[]>([]);
+  const [fileQuery, setFileQuery] = useState("");
+  const [filePage, setFilePage] = useState(1);
+  const [pageSize, setPageSize] = useState<(typeof PAGE_SIZE_OPTIONS)[number]>("100");
+  const [isStartingImport, setIsStartingImport] = useState(false);
 
   const loadPools = async () => {
     setIsLoading(true);
     try {
-      const data = await fetchCPAPools();
-      setPools(data.pools);
+      const poolData = await fetchCPAPools();
+      setPools(poolData.pools);
     } catch (error) {
-      toast.error(error instanceof Error ? error.message : "加载 CPA 配置失败");
+      toast.error(error instanceof Error ? error.message : "加载 CPA 连接失败");
     } finally {
       setIsLoading(false);
     }
   };
 
   useEffect(() => {
-    if (didLoadRef.current) return;
+    if (didLoadRef.current) {
+      return;
+    }
     didLoadRef.current = true;
     void loadPools();
   }, []);
 
+  useEffect(() => {
+    const runningPoolIds = pools
+      .filter((pool) => pool.import_job?.status === "pending" || pool.import_job?.status === "running")
+      .map((pool) => pool.id);
+    const hasRunningJobs = runningPoolIds.length > 0;
+    if (!hasRunningJobs) {
+      if (pollTimerRef.current !== null) {
+        window.clearInterval(pollTimerRef.current);
+        pollTimerRef.current = null;
+      }
+      return;
+    }
+
+    pollTimerRef.current = window.setInterval(() => {
+      void fetchCPAPools()
+        .then((poolData) => {
+          setPools(poolData.pools);
+        })
+        .catch((error) => {
+          if (pollTimerRef.current !== null) {
+            window.clearInterval(pollTimerRef.current);
+            pollTimerRef.current = null;
+          }
+          toast.error(error instanceof Error ? error.message : "查询导入进度失败");
+        });
+    }, 1500);
+
+    return () => {
+      if (pollTimerRef.current !== null) {
+        window.clearInterval(pollTimerRef.current);
+        pollTimerRef.current = null;
+      }
+    };
+  }, [pools]);
+
   const openAddDialog = () => {
     setEditingPool(null);
     setFormName("");
@@ -96,7 +162,7 @@ export default function SettingsPage() {
     setEditingPool(pool);
     setFormName(pool.name);
     setFormBaseUrl(pool.base_url);
-    setFormSecretKey(pool.secret_key);
+    setFormSecretKey("");
     setShowSecret(false);
     setDialogOpen(true);
   };
@@ -106,20 +172,21 @@ export default function SettingsPage() {
       toast.error("请输入 CPA 地址");
       return;
     }
-    if (!formSecretKey.trim()) {
+    if (!editingPool && !formSecretKey.trim()) {
       toast.error("请输入 Secret Key");
       return;
     }
+
     setIsSaving(true);
     try {
       if (editingPool) {
         const data = await updateCPAPool(editingPool.id, {
           name: formName.trim(),
           base_url: formBaseUrl.trim(),
-          secret_key: formSecretKey.trim(),
+          secret_key: formSecretKey.trim() || undefined,
         });
         setPools(data.pools);
-        toast.success("号池已更新");
+        toast.success("连接已更新");
       } else {
         const data = await createCPAPool({
           name: formName.trim(),
@@ -127,7 +194,7 @@ export default function SettingsPage() {
           secret_key: formSecretKey.trim(),
         });
         setPools(data.pools);
-        toast.success("号池已添加");
+        toast.success("连接已添加");
       }
       setDialogOpen(false);
     } catch (error) {
@@ -137,25 +204,12 @@ export default function SettingsPage() {
     }
   };
 
-  const handleToggle = async (pool: CPAPool) => {
-    setTogglingId(pool.id);
-    try {
-      const data = await updateCPAPool(pool.id, { enabled: !pool.enabled });
-      setPools(data.pools);
-      toast.success(pool.enabled ? "已禁用" : "已启用");
-    } catch (error) {
-      toast.error(error instanceof Error ? error.message : "操作失败");
-    } finally {
-      setTogglingId(null);
-    }
-  };
-
   const handleDelete = async (pool: CPAPool) => {
     setDeletingId(pool.id);
     try {
       const data = await deleteCPAPool(pool.id);
       setPools(data.pools);
-      toast.success("号池已删除");
+      toast.success("连接已删除");
     } catch (error) {
       toast.error(error instanceof Error ? error.message : "删除失败");
     } finally {
@@ -163,43 +217,83 @@ export default function SettingsPage() {
     }
   };
 
-  const handleTest = async (pool: CPAPool) => {
-    setTestingId(pool.id);
+  const handleBrowseFiles = async (pool: CPAPool) => {
+    setLoadingFilesId(pool.id);
     try {
-      const result = await fetchCPAPoolStatus(pool.id);
-      setPoolStatuses((prev) => ({ ...prev, [pool.id]: result }));
-      if (result.tokens > 0) {
-        toast.success(`连接成功，获取到 ${result.tokens} 个 token`);
-      } else {
-        toast.warning("连接成功，但未获取到 token");
-      }
+      const data = await fetchCPAPoolFiles(pool.id);
+      const files = normalizeFiles(data.files);
+      setBrowserPool(pool);
+      setRemoteFiles(files);
+      setSelectedNames([]);
+      setFileQuery("");
+      setFilePage(1);
+      setBrowserOpen(true);
+      toast.success(`读取成功，共 ${files.length} 个远程账号`);
     } catch (error) {
-      toast.error(error instanceof Error ? error.message : "连接测试失败");
+      toast.error(error instanceof Error ? error.message : "读取远程账号失败");
     } finally {
-      setTestingId(null);
+      setLoadingFilesId(null);
     }
   };
 
-  const handleSync = async (pool: CPAPool) => {
-    setSyncingId(pool.id);
-    try {
-      const result = await syncCPAPool(pool.id);
-      if ((result.errors?.length ?? 0) > 0) {
-        toast.warning(
-          `同步完成：新增 ${result.added}，刷新 ${result.refreshed}，失败 ${result.errors.length}`,
-        );
-      } else {
-        toast.success(`同步完成：新增 ${result.added}，跳过 ${result.skipped}，刷新 ${result.refreshed}`);
+  const filteredFiles = useMemo(() => {
+    const query = fileQuery.trim().toLowerCase();
+    if (!query) {
+      return remoteFiles;
+    }
+    return remoteFiles.filter((item) => {
+      return item.email.toLowerCase().includes(query) || item.name.toLowerCase().includes(query);
+    });
+  }, [fileQuery, remoteFiles]);
+
+  const currentPageSize = Number(pageSize);
+  const filePageCount = Math.max(1, Math.ceil(filteredFiles.length / currentPageSize));
+  const safeFilePage = Math.min(filePage, filePageCount);
+  const pagedFiles = filteredFiles.slice((safeFilePage - 1) * currentPageSize, safeFilePage * currentPageSize);
+  const allFilteredSelected = filteredFiles.length > 0 && filteredFiles.every((item) => selectedNames.includes(item.name));
+
+  const toggleFile = (name: string, checked: boolean) => {
+    setSelectedNames((prev) => {
+      if (checked) {
+        return Array.from(new Set([...prev, name]));
       }
+      return prev.filter((item) => item !== name);
+    });
+  };
+
+  const handleToggleSelectAllFiltered = (checked: boolean) => {
+    if (checked) {
+      setSelectedNames(Array.from(new Set([...selectedNames, ...filteredFiles.map((item) => item.name)])));
+      return;
+    }
+    const filteredSet = new Set(filteredFiles.map((item) => item.name));
+    setSelectedNames((prev) => prev.filter((name) => !filteredSet.has(name)));
+  };
+
+  const handleStartImport = async () => {
+    if (!browserPool) {
+      return;
+    }
+    if (selectedNames.length === 0) {
+      toast.error("请先选择要导入的账号");
+      return;
+    }
+
+    setIsStartingImport(true);
+    try {
+      const result = await startCPAImport(browserPool.id, selectedNames);
+      setPools((prev) =>
+        prev.map((pool) => (pool.id === browserPool.id ? { ...pool, import_job: result.import_job } : pool)),
+      );
+      setBrowserOpen(false);
+      toast.success("导入任务已启动");
     } catch (error) {
-      toast.error(error instanceof Error ? error.message : "同步失败");
+      toast.error(error instanceof Error ? error.message : "启动导入失败");
     } finally {
-      setSyncingId(null);
+      setIsStartingImport(false);
     }
   };
 
-  const enabledCount = pools.filter((p) => p.enabled).length;
-
   return (
     <>
       <section className="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
@@ -218,27 +312,15 @@ export default function SettingsPage() {
                   <ServerCog className="size-5 text-stone-600" />
                 </div>
                 <div>
-                  <h2 className="text-lg font-semibold tracking-tight">CPA 号池管理</h2>
-                  <p className="text-sm text-stone-500">
-                    连接多个 CLIProxyAPI 实例，自动获取 access_token 用于生图
-                  </p>
+                  <h2 className="text-lg font-semibold tracking-tight">CPA 连接管理</h2>
+                  <p className="text-sm text-stone-500">先配置连接，再按需查询远程账号并选择导入到本地号池。</p>
                 </div>
               </div>
               <div className="flex items-center gap-2">
-                {pools.length > 0 && (
-                  <Badge
-                    variant={enabledCount > 0 ? "success" : "secondary"}
-                    className="rounded-md px-2.5 py-1"
-                  >
-                    {enabledCount}/{pools.length} 启用
-                  </Badge>
-                )}
-                <Button
-                  className="h-9 rounded-xl bg-stone-950 px-4 text-white hover:bg-stone-800"
-                  onClick={openAddDialog}
-                >
+                {pools.length > 0 ? <Badge className="rounded-md px-2.5 py-1">{pools.length} 个连接</Badge> : null}
+                <Button className="h-9 rounded-xl bg-stone-950 px-4 text-white hover:bg-stone-800" onClick={openAddDialog}>
                   <Plus className="size-4" />
-                  添加号池
+                  添加连接
                 </Button>
               </div>
             </div>
@@ -251,63 +333,23 @@ export default function SettingsPage() {
               <div className="flex flex-col items-center justify-center gap-3 rounded-xl bg-stone-50 px-6 py-10 text-center">
                 <ServerCog className="size-8 text-stone-300" />
                 <div className="space-y-1">
-                  <p className="text-sm font-medium text-stone-600">暂无 CPA 号池</p>
-                  <p className="text-sm text-stone-400">点击「添加号池」连接你的 CLIProxyAPI 实例</p>
+                  <p className="text-sm font-medium text-stone-600">暂无 CPA 连接</p>
+                  <p className="text-sm text-stone-400">点击「添加连接」保存你的 CLIProxyAPI 信息。</p>
                 </div>
               </div>
             ) : (
               <div className="space-y-3">
                 {pools.map((pool) => {
-                  const status = poolStatuses[pool.id];
-                  const isBusy =
-                    testingId === pool.id ||
-                    syncingId === pool.id ||
-                    deletingId === pool.id ||
-                    togglingId === pool.id;
-
+                  const isBusy = deletingId === pool.id || loadingFilesId === pool.id;
+                  const importJob = pool.import_job ?? null;
                   return (
-                    <div
-                      key={pool.id}
-                      className={cn(
-                        "flex flex-col gap-3 rounded-xl border px-4 py-3 transition",
-                        pool.enabled
-                          ? "border-stone-200 bg-white"
-                          : "border-stone-100 bg-stone-50 opacity-60",
-                      )}
-                    >
-                      <div className="flex items-center justify-between">
-                        <div className="flex items-center gap-3">
-                          <div
-                            className={cn(
-                              "size-2.5 rounded-full",
-                              pool.enabled ? "bg-emerald-500" : "bg-stone-300",
-                            )}
-                          />
-                          <div>
-                            <div className="text-sm font-medium text-stone-800">
-                              {pool.name || pool.base_url}
-                            </div>
-                            {pool.name && (
-                              <div className="text-xs text-stone-400">{pool.base_url}</div>
-                            )}
-                          </div>
+                    <div key={pool.id} className="flex flex-col gap-3 rounded-xl border border-stone-200 bg-white px-4 py-3">
+                      <div className="flex items-center justify-between gap-3">
+                        <div className="min-w-0">
+                          <div className="text-sm font-medium text-stone-800">{pool.name || pool.base_url}</div>
+                          <div className="truncate text-xs text-stone-400">{pool.base_url}</div>
                         </div>
                         <div className="flex items-center gap-1">
-                          <button
-                            type="button"
-                            className="rounded-lg p-2 text-stone-400 transition hover:bg-stone-100 hover:text-stone-700"
-                            onClick={() => void handleToggle(pool)}
-                            disabled={isBusy}
-                            title={pool.enabled ? "禁用" : "启用"}
-                          >
-                            {togglingId === pool.id ? (
-                              <LoaderCircle className="size-4 animate-spin" />
-                            ) : pool.enabled ? (
-                              <Power className="size-4" />
-                            ) : (
-                              <PowerOff className="size-4" />
-                            )}
-                          </button>
                           <button
                             type="button"
                             className="rounded-lg p-2 text-stone-400 transition hover:bg-stone-100 hover:text-stone-700"
@@ -324,50 +366,60 @@ export default function SettingsPage() {
                             disabled={isBusy}
                             title="删除"
                           >
-                            {deletingId === pool.id ? (
-                              <LoaderCircle className="size-4 animate-spin" />
-                            ) : (
-                              <Trash2 className="size-4" />
-                            )}
+                            {deletingId === pool.id ? <LoaderCircle className="size-4 animate-spin" /> : <Trash2 className="size-4" />}
                           </button>
                         </div>
                       </div>
 
-                      {pool.enabled && (
-                        <div className="flex items-center gap-2">
-                          <Button
-                            variant="outline"
-                            className="h-8 rounded-lg border-stone-200 bg-white px-3 text-xs text-stone-600"
-                            onClick={() => void handleTest(pool)}
-                            disabled={isBusy}
-                          >
-                            {testingId === pool.id ? (
-                              <LoaderCircle className="size-3.5 animate-spin" />
-                            ) : (
-                              <RefreshCw className="size-3.5" />
-                            )}
-                            测试连接
-                          </Button>
-                          <Button
-                            variant="outline"
-                            className="h-8 rounded-lg border-stone-200 bg-white px-3 text-xs text-stone-600"
-                            onClick={() => void handleSync(pool)}
-                            disabled={isBusy}
-                          >
-                            {syncingId === pool.id ? (
-                              <LoaderCircle className="size-3.5 animate-spin" />
-                            ) : (
-                              <RefreshCw className="size-3.5" />
-                            )}
-                            同步到号池
-                          </Button>
-                          {status && (
-                            <span className="text-xs text-stone-400">
-                              可用 Token: {status.tokens}
-                            </span>
-                          )}
+                      <div className="flex items-center gap-2">
+                        <Button
+                          variant="outline"
+                          className="h-8 rounded-lg border-stone-200 bg-white px-3 text-xs text-stone-600"
+                          onClick={() => void handleBrowseFiles(pool)}
+                          disabled={isBusy}
+                        >
+                          {loadingFilesId === pool.id ? <LoaderCircle className="size-3.5 animate-spin" /> : <Import className="size-3.5" />}
+                          同步
+                        </Button>
+                      </div>
+
+                      {importJob ? (
+                        <div className="space-y-2 rounded-xl bg-stone-50 px-3 py-3">
+                          <div className="text-xs font-medium tracking-[0.16em] text-stone-400 uppercase">导入任务</div>
+                          {(() => {
+                            const progress = importJob.total > 0 ? Math.round((importJob.completed / importJob.total) * 100) : 0;
+                            return (
+                              <div className="rounded-lg border border-stone-200 bg-white px-3 py-3">
+                                <div className="flex items-center justify-between gap-3">
+                                  <div className="min-w-0">
+                                    <div className="text-sm font-medium text-stone-700">
+                                      状态 {importJob.status}，已处理 {importJob.completed}/{importJob.total}
+                                    </div>
+                                    <div className="truncate text-xs text-stone-400">
+                                      任务 {importJob.job_id.slice(0, 8)} · {importJob.created_at}
+                                    </div>
+                                  </div>
+                                  <Badge
+                                    variant={importJob.status === "completed" ? "success" : importJob.status === "failed" ? "danger" : "info"}
+                                    className="rounded-md"
+                                  >
+                                    {progress}%
+                                  </Badge>
+                                </div>
+                                <div className="mt-3 h-2 overflow-hidden rounded-full bg-stone-200">
+                                  <div className="h-full rounded-full bg-stone-900 transition-all" style={{ width: `${progress}%` }} />
+                                </div>
+                                <div className="mt-2 flex flex-wrap gap-2 text-xs text-stone-500">
+                                  <span>新增 {importJob.added}</span>
+                                  <span>跳过 {importJob.skipped}</span>
+                                  <span>刷新 {importJob.refreshed}</span>
+                                  <span>失败 {importJob.failed}</span>
+                                </div>
+                              </div>
+                            );
+                          })()}
                         </div>
-                      )}
+                      ) : null}
                     </div>
                   );
                 })}
@@ -377,24 +429,22 @@ export default function SettingsPage() {
             <div className="rounded-xl bg-stone-50 px-4 py-3 text-sm leading-6 text-stone-500">
               <p className="font-medium text-stone-600">使用说明</p>
               <ul className="mt-1 list-inside list-disc space-y-0.5">
-                <li>添加多个 CPA 号池后，生图请求会自动从所有启用的号池获取 token</li>
-                <li>也可以点击「同步到号池」将某个 CPA 的 token 导入本地号池管理</li>
-                <li>CPA 需要开启 remote-management 并设置 allow-remote: true</li>
-                <li>同步 token 不会影响 CPA 原有的登录态</li>
-                <li>禁用或删除号池即可停止从该 CPA 获取 token</li>
+                <li>页面进入后先读取系统里已配置的 CPA 连接。</li>
+                <li>点击某个连接的「同步」后，会先读取远程账号列表并展示给前端选择。</li>
+                <li>确认选择后，后端后台下载对应 access_token 并导入本地号池。</li>
+                <li>前端只轮询导入进度，不直接参与 download。</li>
               </ul>
             </div>
           </CardContent>
         </Card>
       </section>
 
-      {/* Add / Edit Dialog */}
       <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
         <DialogContent showCloseButton={false} className="rounded-2xl p-6">
           <DialogHeader className="gap-2">
-            <DialogTitle>{editingPool ? "编辑号池" : "添加号池"}</DialogTitle>
+            <DialogTitle>{editingPool ? "编辑连接" : "添加连接"}</DialogTitle>
             <DialogDescription className="text-sm leading-6">
-              {editingPool ? "修改 CPA 号池的连接信息" : "添加一个新的 CLIProxyAPI 号池"}
+              {editingPool ? "修改 CPA 连接信息" : "添加一个新的 CLIProxyAPI 连接"}
             </DialogDescription>
           </DialogHeader>
           <div className="space-y-4">
@@ -402,7 +452,7 @@ export default function SettingsPage() {
               <label className="text-sm font-medium text-stone-700">名称（可选）</label>
               <Input
                 value={formName}
-                onChange={(e) => setFormName(e.target.value)}
+                onChange={(event) => setFormName(event.target.value)}
                 placeholder="例如：主号池、备用池"
                 className="h-11 rounded-xl border-stone-200 bg-white"
               />
@@ -414,7 +464,7 @@ export default function SettingsPage() {
               </label>
               <Input
                 value={formBaseUrl}
-                onChange={(e) => setFormBaseUrl(e.target.value)}
+                onChange={(event) => setFormBaseUrl(event.target.value)}
                 placeholder="http://your-cpa-host:8317"
                 className="h-11 rounded-xl border-stone-200 bg-white"
               />
@@ -428,14 +478,14 @@ export default function SettingsPage() {
                 <Input
                   type={showSecret ? "text" : "password"}
                   value={formSecretKey}
-                  onChange={(e) => setFormSecretKey(e.target.value)}
-                  placeholder="CPA 管理密钥"
+                  onChange={(event) => setFormSecretKey(event.target.value)}
+                  placeholder={editingPool ? "留空则不修改密钥" : "CPA 管理密钥"}
                   className="h-11 rounded-xl border-stone-200 bg-white pr-10"
                 />
                 <button
                   type="button"
                   className="absolute top-1/2 right-3 -translate-y-1/2 text-stone-400 transition hover:text-stone-600"
-                  onClick={() => setShowSecret(!showSecret)}
+                  onClick={() => setShowSecret((prev) => !prev)}
                 >
                   {showSecret ? <EyeOff className="size-4" /> : <Eye className="size-4" />}
                 </button>
@@ -462,6 +512,136 @@ export default function SettingsPage() {
           </DialogFooter>
         </DialogContent>
       </Dialog>
+
+      <Dialog open={browserOpen} onOpenChange={setBrowserOpen}>
+        <DialogContent showCloseButton={false} className="max-h-[90vh] max-w-5xl rounded-2xl p-6">
+          <DialogHeader className="gap-2">
+            <DialogTitle>选择要导入的账号</DialogTitle>
+            <DialogDescription className="text-sm leading-6">
+              {browserPool ? `来自 ${browserPool.name || browserPool.base_url}` : "读取到的远程账号列表"}
+            </DialogDescription>
+          </DialogHeader>
+
+          <div className="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
+            <div className="relative min-w-[260px]">
+              <Search className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-stone-400" />
+              <Input
+                value={fileQuery}
+                onChange={(event) => {
+                  setFileQuery(event.target.value);
+                  setFilePage(1);
+                }}
+                placeholder="搜索 email 或文件名"
+                className="h-10 rounded-xl border-stone-200 bg-white pl-10"
+              />
+            </div>
+            <div className="flex items-center gap-2">
+              <Select
+                value={pageSize}
+                onValueChange={(value) => {
+                  setPageSize(value as (typeof PAGE_SIZE_OPTIONS)[number]);
+                  setFilePage(1);
+                }}
+              >
+                <SelectTrigger className="h-10 w-[120px] rounded-xl border-stone-200 bg-white">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {PAGE_SIZE_OPTIONS.map((item) => (
+                    <SelectItem key={item} value={item}>
+                      {item} / 页
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <Button
+                variant="outline"
+                className="h-10 rounded-xl border-stone-200 bg-white px-4 text-stone-700"
+                onClick={() => handleToggleSelectAllFiltered(!allFilteredSelected)}
+              >
+                {allFilteredSelected ? "取消全选" : "全选筛选结果"}
+              </Button>
+            </div>
+          </div>
+
+          <div className="rounded-xl border border-stone-200">
+            <div className="flex items-center justify-between border-b border-stone-100 px-4 py-3 text-sm text-stone-500">
+              <div className="flex items-center gap-3">
+                <Checkbox checked={allFilteredSelected} onCheckedChange={(checked) => handleToggleSelectAllFiltered(Boolean(checked))} />
+                <span>筛选结果 {filteredFiles.length} 个</span>
+              </div>
+              <span>已选 {selectedNames.length} 个</span>
+            </div>
+            <div className="max-h-[420px] overflow-auto">
+              {pagedFiles.length === 0 ? (
+                <div className="flex items-center justify-center py-12 text-sm text-stone-400">没有匹配的远程账号</div>
+              ) : (
+                <div className="divide-y divide-stone-100">
+                  {pagedFiles.map((item) => (
+                    <label key={item.name} className="flex cursor-pointer items-center gap-3 px-4 py-3 hover:bg-stone-50">
+                      <Checkbox
+                        checked={selectedNames.includes(item.name)}
+                        onCheckedChange={(checked) => toggleFile(item.name, Boolean(checked))}
+                      />
+                      <div className="min-w-0">
+                        <div className="truncate text-sm font-medium text-stone-700">{item.email || item.name}</div>
+                        <div className="truncate text-xs text-stone-400">{item.name}</div>
+                      </div>
+                    </label>
+                  ))}
+                </div>
+              )}
+            </div>
+          </div>
+
+          <div className="flex items-center justify-between text-sm text-stone-500">
+            <span>
+              第 {filteredFiles.length === 0 ? 0 : (safeFilePage - 1) * currentPageSize + 1} -{" "}
+              {Math.min(safeFilePage * currentPageSize, filteredFiles.length)} 条，共 {filteredFiles.length} 条
+            </span>
+            <div className="flex items-center gap-2">
+              <Button
+                variant="outline"
+                className="h-9 rounded-xl border-stone-200 bg-white px-3"
+                onClick={() => setFilePage((prev) => Math.max(1, prev - 1))}
+                disabled={safeFilePage <= 1}
+              >
+                上一页
+              </Button>
+              <span>
+                {safeFilePage}/{filePageCount}
+              </span>
+              <Button
+                variant="outline"
+                className="h-9 rounded-xl border-stone-200 bg-white px-3"
+                onClick={() => setFilePage((prev) => Math.min(filePageCount, prev + 1))}
+                disabled={safeFilePage >= filePageCount}
+              >
+                下一页
+              </Button>
+            </div>
+          </div>
+
+          <DialogFooter className="pt-2">
+            <Button
+              variant="secondary"
+              className="h-10 rounded-xl bg-stone-100 px-5 text-stone-700 hover:bg-stone-200"
+              onClick={() => setBrowserOpen(false)}
+              disabled={isStartingImport}
+            >
+              取消
+            </Button>
+            <Button
+              className="h-10 rounded-xl bg-stone-950 px-5 text-white hover:bg-stone-800"
+              onClick={() => void handleStartImport()}
+              disabled={isStartingImport || selectedNames.length === 0}
+            >
+              {isStartingImport ? <LoaderCircle className="size-4 animate-spin" /> : <Import className="size-4" />}
+              导入选中账号
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </>
   );
 }

web/src/lib/api.ts

@@ -123,21 +123,33 @@ export type CPAPool = {
   id: string;
   name: string;
   base_url: string;
-  secret_key: string;
-  enabled: boolean;
+  import_job?: CPAImportJob | null;
 };
 
-export type CPAStatus = {
-  enabled: boolean;
-  pools: number;
-  tokens: number;
+export type CPARemoteFile = {
+  name: string;
+  email: string;
+};
+
+export type CPAImportJob = {
+  job_id: string;
+  status: "pending" | "running" | "completed" | "failed";
+  created_at: string;
+  updated_at: string;
+  total: number;
+  completed: number;
+  added: number;
+  skipped: number;
+  refreshed: number;
+  failed: number;
+  errors: Array<{ name: string; error: string }>;
 };
 
 export async function fetchCPAPools() {
   return httpRequest<{ pools: CPAPool[] }>("/api/cpa/pools");
 }
 
-export async function createCPAPool(pool: { name: string; base_url: string; secret_key: string; enabled?: boolean }) {
+export async function createCPAPool(pool: { name: string; base_url: string; secret_key: string }) {
   return httpRequest<{ pool: CPAPool; pools: CPAPool[] }>("/api/cpa/pools", {
     method: "POST",
     body: pool,
@@ -146,7 +158,7 @@ export async function createCPAPool(pool: { name: string; base_url: string; secr
 
 export async function updateCPAPool(
   poolId: string,
-  updates: { name?: string; base_url?: string; secret_key?: string; enabled?: boolean },
+  updates: { name?: string; base_url?: string; secret_key?: string },
 ) {
   return httpRequest<{ pool: CPAPool; pools: CPAPool[] }>(`/api/cpa/pools/${poolId}`, {
     method: "POST",
@@ -160,20 +172,17 @@ export async function deleteCPAPool(poolId: string) {
   });
 }
 
-export async function fetchCPAPoolStatus(poolId: string) {
-  return httpRequest<{ pool_id: string; tokens: number }>(`/api/cpa/pools/${poolId}/status`);
+export async function fetchCPAPoolFiles(poolId: string) {
+  return httpRequest<{ pool_id: string; files: CPARemoteFile[] }>(`/api/cpa/pools/${poolId}/files`);
 }
 
-export async function syncCPAPool(poolId: string) {
-  return httpRequest<{
-    added: number;
-    skipped: number;
-    refreshed: number;
-    errors: Array<{ access_token: string; error: string }>;
-    items: Account[];
-  }>(`/api/cpa/pools/${poolId}/sync`, { method: "POST" });
+export async function startCPAImport(poolId: string, names: string[]) {
+  return httpRequest<{ import_job: CPAImportJob | null }>(`/api/cpa/pools/${poolId}/import`, {
+    method: "POST",
+    body: { names },
+  });
 }
 
-export async function fetchCPAGlobalStatus() {
-  return httpRequest<CPAStatus>("/api/cpa/status");
+export async function fetchCPAPoolImportJob(poolId: string) {
+  return httpRequest<{ import_job: CPAImportJob | null }>(`/api/cpa/pools/${poolId}/import`);
 }