Merge remote-tracking branch 'origin/main' into codex/usage-pending-reasoning-reset-expiry-20260712

# Conflicts:
#	crates/aether-ai-formats/src/formats/openai/responses/mod.rs
#	crates/aether-usage/runtime/src/runtime.rs
#	frontend/src/features/usage/components/UsageRecordsTable.vue
#	frontend/src/features/usage/components/__tests__/UsageRecordsTable.spec.ts

frontend/src/features/providers/components/EndpointFormDialog.vue

@@ -1051,7 +1051,7 @@ import { useI18n } from '@/i18n'
 import AlertDialog from '@/components/common/AlertDialog.vue'
 import EndpointConditionEditor from './EndpointConditionEditor.vue'
 import ProxyNodeSelect from './ProxyNodeSelect.vue'
-import { getDefaultEndpointBaseUrl, getDefaultEndpointPath, normalizeEndpointApiFormat } from './endpoint-default-paths'
+import { getDefaultEndpointBaseUrl, getDefaultEndpointPath } from './endpoint-default-paths'
 import { fixedEndpointUpstreamStreamPolicy } from './endpoint-protocol-policy'
 import { useProxyNodesStore } from '@/stores/proxy-nodes'
 import {

frontend/src/features/providers/components/ProviderDetailDrawer.vue

@@ -60,12 +60,22 @@
                     <h3 class="text-sm font-semibold">
                       {{ legacyT(isKeyManagedProviderType(provider.provider_type) ? '密钥管理' : '账号管理') }}
                     </h3>
-                    <div class="flex items-center gap-2">
+                    <div class="flex flex-wrap items-center justify-end gap-2">
+                      <Button
+                        v-if="endpoints.length > 0 && provider.provider_type === 'custom'"
+                        variant="outline"
+                        size="sm"
+                        class="h-9"
+                        @click="keyBatchImportDialogOpen = true"
+                      >
+                        <ListPlus class="mr-1.5 h-3.5 w-3.5" />
+                        批量导入
+                      </Button>
                       <Button
                         v-if="endpoints.length > 0"
                         variant="outline"
                         size="sm"
-                        class="h-8"
+                        class="h-9"
                         @click="handleAddKeyToFirstEndpoint"
                       >
                         <Plus class="w-3.5 h-3.5 mr-1.5" />
@@ -279,7 +289,7 @@
                         </div>
                       </div>
                       <div
-                        v-if="getCodexResetCreditsDisplay(key)"
+                        v-if="getCodexResetCreditAvailableCount(key) !== null"
                         class="mt-3 border-t border-border/60 pt-2"
                       >
                         <div class="flex flex-wrap items-center gap-x-1 gap-y-1 text-[10px] leading-4 text-muted-foreground">
@@ -823,6 +833,16 @@
     @saved="handleKeyChanged"
   />
 
+  <ProviderKeyBatchImportDialog
+    v-if="open && provider?.provider_type === 'custom'"
+    :open="keyBatchImportDialogOpen"
+    :provider-id="provider.id"
+    :provider-name="provider.name"
+    :available-api-formats="availableKeyApiFormats"
+    @close="keyBatchImportDialogOpen = false"
+    @saved="handleKeyChanged"
+  />
+
   <!-- OAuth 账号对话框 -->
   <OAuthAccountDialog
     v-if="open && provider"
@@ -913,6 +933,7 @@ import { ref, watch, computed, nextTick } from 'vue'
 import {
   Plus,
   Key,
+  ListPlus,
   Loader2,
   GripVertical,
   ShieldX,
@@ -951,6 +972,7 @@ import AlertDialog from '@/components/common/AlertDialog.vue'
 import AntigravityQuotaDialog from '@/features/providers/components/AntigravityQuotaDialog.vue'
 import FailoverRulesDialog from '@/features/providers/components/FailoverRulesDialog.vue'
 import ProviderDetailHeader from '@/features/providers/components/ProviderDetailHeader.vue'
+import ProviderKeyBatchImportDialog from '@/features/providers/components/ProviderKeyBatchImportDialog.vue'
 import ProviderKeyActionCluster from '@/features/providers/components/ProviderKeyActionCluster.vue'
 import ProviderKeyIdentityBlock from '@/features/providers/components/ProviderKeyIdentityBlock.vue'
 import ProviderMonthlyQuotaCard from '@/features/providers/components/ProviderMonthlyQuotaCard.vue'
@@ -993,10 +1015,6 @@ import type {
 } from '@/api/endpoints/types'
 import { formatApiFormatShort } from '@/api/endpoints/types/api-format'
 import { isOAuthAccountProviderType, isKeyManagedProviderType } from '../utils/providerTypeUtils'
-import {
-  isProviderQuotaAutoRefreshCoolingDown,
-  markProviderQuotaAutoRefreshAttempt,
-} from '../utils/quotaAutoRefreshCooldown'
 import { getOAuthOrgBadge } from '@/utils/oauthIdentity'
 import { getOAuthRefreshFeedback } from '@/utils/oauthRefreshFeedback'
 import { formatCompactNumber } from '@/utils/format'
@@ -1018,10 +1036,12 @@ import {
 } from '@/utils/providerKeyStatus'
 import { getGeminiCliAccountCreditsText } from '@/utils/providerKeyQuota'
 import {
+  createCodexResetCreditIdempotencyKey,
   formatCodexResetCreditCount as formatCodexResetCreditCountLabel,
   formatCodexResetCreditExpiresAt,
   getCodexResetCreditAvailableCount as getCodexResetCreditAvailableCountFromSnapshot,
   getVisibleCodexResetCreditItems as getVisibleCodexResetCreditItemsFromSnapshot,
+  mergeCodexQuotaDisplays,
 } from './codex-reset-credit-display'
 
 // 扩展端点类型,包含密钥列表
@@ -1085,6 +1105,7 @@ const endpointDialogOpen = ref(false)
 
 // 密钥相关状态
 const keyFormDialogOpen = ref(false)
+const keyBatchImportDialogOpen = ref(false)
 const keyPermissionsDialogOpen = ref(false)
 const oauthAccountDialogOpen = ref(false)
 const oauthKeyEditDialogOpen = ref(false)
@@ -1173,6 +1194,7 @@ const multiplierSaving = ref(false)
 const hasBlockingDialogOpen = computed(() =>
   endpointDialogOpen.value ||
   keyFormDialogOpen.value ||
+  keyBatchImportDialogOpen.value ||
   keyPermissionsDialogOpen.value ||
   oauthAccountDialogOpen.value ||
   oauthKeyEditDialogOpen.value ||
@@ -1319,6 +1341,7 @@ watch(
       // 重置所有对话框状态
       endpointDialogOpen.value = false
       keyFormDialogOpen.value = false
+      keyBatchImportDialogOpen.value = false
       keyPermissionsDialogOpen.value = false
       oauthAccountDialogOpen.value = false
       oauthKeyEditDialogOpen.value = false
@@ -1600,7 +1623,7 @@ async function handleRefreshOAuth(key: EndpointAPIKey) {
     }
     // Antigravity：token 刷新后可能完成了账号激活，触发配额获取
     // （不 emit('refresh')，避免触发全局 provider 余额刷新）
-    void autoRefreshQuotaInBackground({ ignoreCooldown: true })
+    void autoRefreshQuotaInBackground()
   } catch (err: unknown) {
     showError(localizedApiError(err, 'Token 刷新失败'), legacyT('错误'))
   } finally {
@@ -1673,13 +1696,6 @@ async function handleClearOAuthInvalid(key: EndpointAPIKey) {
   }
 }
 
-function createCodexResetCreditIdempotencyKey(): string {
-  if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') {
-    return crypto.randomUUID()
-  }
-  throw new Error('浏览器不支持 crypto.randomUUID，无法生成安全幂等 ID')
-}
-
 function codexResetCreditOutcomeFeedback(
   result: Awaited<ReturnType<typeof consumeCodexResetCredit>>,
 ): { tone: 'success' | 'warning'; message: string } {
@@ -1951,20 +1967,6 @@ function getCodexQuotaDisplayFromSnapshot(quota: QuotaStatusSnapshot | null | un
   return Object.keys(display).length > 0 ? display : null
 }
 
-function getCodexQuotaDisplayUpdatedAt(display: CodexUpstreamMetadata | null | undefined): number | null {
-  const updatedAt = Number(display?.updated_at)
-  return Number.isFinite(updatedAt) ? updatedAt : null
-}
-
-function codexDisplayHasUsage(display: CodexUpstreamMetadata | null | undefined): boolean {
-  return !!display && (
-    display.primary_used_percent !== undefined
-    || display.secondary_used_percent !== undefined
-    || display.spark_primary_used_percent !== undefined
-    || display.spark_secondary_used_percent !== undefined
-  )
-}
-
 function codexDisplayHasResetCredits(display: CodexUpstreamMetadata | null | undefined): boolean {
   const count = display?.reset_credits?.available_count
   return typeof count === 'number' && Number.isFinite(count)
@@ -1973,20 +1975,7 @@ function codexDisplayHasResetCredits(display: CodexUpstreamMetadata | null | und
 function getCodexQuotaDisplay(key: EndpointAPIKey): CodexUpstreamMetadata | null {
   const snapshotDisplay = getCodexQuotaDisplayFromSnapshot(getQuotaSnapshotForProvider(key, 'codex'))
   const metadataDisplay = getCodexQuotaDisplayFromMetadata(key.upstream_metadata?.codex)
-
-  if (!snapshotDisplay) return metadataDisplay
-  if (!metadataDisplay) return snapshotDisplay
-  if (!codexDisplayHasUsage(snapshotDisplay) && codexDisplayHasUsage(metadataDisplay)) {
-    return metadataDisplay
-  }
-
-  const snapshotUpdatedAt = getCodexQuotaDisplayUpdatedAt(snapshotDisplay)
-  const metadataUpdatedAt = getCodexQuotaDisplayUpdatedAt(metadataDisplay)
-  if (metadataUpdatedAt !== null && (snapshotUpdatedAt === null || metadataUpdatedAt > snapshotUpdatedAt)) {
-    return metadataDisplay
-  }
-
-  return snapshotDisplay
+  return mergeCodexQuotaDisplays(snapshotDisplay, metadataDisplay)
 }
 
 function hasCodexQuotaDisplayData(key: EndpointAPIKey): boolean {
@@ -2479,7 +2468,7 @@ function shouldAutoRefreshCodexQuota(): boolean {
 
     if (isTokenExpiringSoon(key, now)) return true
 
-    // 只要有一个活跃 key 没有配额数据，就刷新一次
+    // reset-credit 独立于 Token 刷新；这里只按账号配额缓存决定是否后台更新
     if (!hasCodexQuotaDisplayData(key)) {
       return true
     }
@@ -2714,7 +2703,7 @@ function applyQuotaResults(
 }
 
 // 通用的自动刷新配额函数（支持 Codex、Gemini CLI、Antigravity、Kiro、Windsurf 和 ChatGPT Web）
-async function autoRefreshQuotaInBackground(options: { ignoreCooldown?: boolean } = {}) {
+async function autoRefreshQuotaInBackground() {
   const providerId = props.providerId
   if (!providerId) return
   if (refreshingQuota.value) return
@@ -2740,7 +2729,6 @@ async function autoRefreshQuotaInBackground(options: { ignoreCooldown?: boolean
     shouldRefresh = shouldAutoRefreshChatGPTWebQuota()
   }
   if (!shouldRefresh) return
-  if (!options.ignoreCooldown && isProviderQuotaAutoRefreshCoolingDown(providerId)) return
 
   let hadCachedQuota = false
   if (providerType === 'codex') {
@@ -2760,7 +2748,6 @@ async function autoRefreshQuotaInBackground(options: { ignoreCooldown?: boolean
   }
 
   refreshingQuota.value = true
-  markProviderQuotaAutoRefreshAttempt(providerId)
   try {
     const result = await refreshProviderQuota(providerId)
     const applied = applyQuotaResults(result.results)
@@ -2804,7 +2791,7 @@ async function handleKeyChanged() {
   await Promise.all([loadEndpoints(), loadMappingPreview()])
   emit('refresh')
   // 添加/修改 key 后自动获取已支持 provider 的配额（新 key 的 upstream_metadata 为空）
-  void autoRefreshQuotaInBackground({ ignoreCooldown: true })
+  void autoRefreshQuotaInBackground()
 }
 
 // 切换密钥启用状态

frontend/src/features/providers/components/ProviderKeyBatchImportDialog.vue

@@ -0,0 +1,585 @@
+<template>
+  <Dialog
+    :model-value="open"
+    title="批量导入 Key"
+    :description="providerName ? `${providerName} · 名称和 Key 均为必填` : '名称和 Key 均为必填'"
+    :icon="ListPlus"
+    size="4xl"
+    persistent
+    @update:model-value="handleDialogUpdate"
+  >
+    <div class="space-y-3.5">
+      <nav class="grid grid-cols-3 gap-1.5 rounded-xl bg-muted/40 p-1.5" aria-label="批量导入步骤">
+        <button
+          v-for="step in steps"
+          :key="step.id"
+          type="button"
+          class="flex min-h-10 items-center justify-center gap-2 rounded-lg px-2 text-xs font-medium transition-[background-color,box-shadow,color,scale] active:scale-[0.96] disabled:cursor-default disabled:opacity-50 sm:text-sm"
+          :class="currentStep === step.id
+            ? 'bg-background text-foreground shadow-[0_0_0_1px_rgb(0_0_0/0.06),0_1px_2px_rgb(0_0_0/0.06)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]'
+            : 'text-muted-foreground hover:bg-background/60 hover:text-foreground'"
+          :disabled="!canNavigateToStep(step.id)"
+          @click="goToStep(step.id)"
+        >
+          <span
+            class="flex h-5 w-5 shrink-0 items-center justify-center rounded-md text-[10px] tabular-nums"
+            :class="currentStep === step.id ? 'bg-foreground text-background' : 'bg-muted text-muted-foreground'"
+          >{{ step.id }}</span>
+          <span class="truncate">{{ step.label }}</span>
+        </button>
+      </nav>
+
+      <section
+        v-if="currentStep === 1"
+        class="overflow-hidden rounded-xl bg-background shadow-[0_0_0_1px_rgb(0_0_0/0.07),0_1px_2px_-1px_rgb(0_0_0/0.08),0_3px_8px_-3px_rgb(0_0_0/0.08)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.09)]"
+      >
+        <header class="flex min-h-14 items-center justify-between gap-3 border-b border-border/60 bg-muted/15 px-4 py-3">
+          <div class="flex min-w-0 items-center gap-3">
+            <span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-foreground text-xs font-semibold text-background">1</span>
+            <div class="min-w-0">
+              <h3 class="text-balance text-sm font-semibold text-foreground">粘贴名称与 Key</h3>
+              <p class="text-pretty text-[11px] leading-4 text-muted-foreground">每行一条，仅接受四个短横线分隔</p>
+            </div>
+          </div>
+          <Badge
+            :variant="parsed.errors.length > 0 ? 'destructive' : parsed.items.length > 0 ? 'success' : 'secondary'"
+            class="shrink-0 tabular-nums"
+          >
+            {{ inputStatusText }}
+          </Badge>
+        </header>
+
+        <div class="min-w-0">
+            <Label for="provider-key-batch-input" class="sr-only">Key 列表</Label>
+            <Textarea
+              id="provider-key-batch-input"
+              v-model="inputText"
+              class="h-[280px] min-h-[220px] max-h-[520px] !resize-y !rounded-none !border-0 !bg-transparent !px-4 !py-4 font-mono text-[13px] leading-6 !shadow-none !ring-0 focus-visible:!ring-0"
+              spellcheck="false"
+              placeholder="主账号----sk-xxxx&#10;备用账号----sk-yyyy"
+            />
+            <div
+              v-if="parsed.errors.length > 0"
+              class="mx-4 mb-3 space-y-1 rounded-lg bg-destructive/5 px-3 py-2 text-[11px] text-destructive ring-1 ring-destructive/20"
+            >
+              <div
+                v-for="(item, index) in parsed.errors.slice(0, 6)"
+                :key="`${item.lineNumber}-${index}`"
+              >
+                {{ item.lineNumber ? `第 ${item.lineNumber} 行：` : '' }}{{ item.message }}
+              </div>
+              <div v-if="parsed.errors.length > 6" class="font-medium">
+                另有 {{ parsed.errors.length - 6 }} 个问题
+              </div>
+            </div>
+            <div class="flex flex-wrap items-center gap-2 border-t border-border/50 bg-muted/10 px-4 py-2.5 text-[11px] text-muted-foreground">
+              <span class="rounded-md bg-muted px-2 py-1 font-mono text-foreground/80">名称----Key</span>
+              <span>名称和 Key 都不能为空</span>
+              <span class="ml-auto hidden tabular-nums sm:inline">已识别 {{ parsed.items.length }} 条</span>
+            </div>
+          </div>
+      </section>
+
+      <section
+        v-else-if="currentStep === 2"
+        class="overflow-hidden rounded-xl bg-background shadow-[0_0_0_1px_rgb(0_0_0/0.07),0_1px_2px_-1px_rgb(0_0_0/0.08),0_3px_8px_-3px_rgb(0_0_0/0.08)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.09)]"
+      >
+        <header class="flex min-h-[72px] items-center gap-3 px-4 py-3">
+          <span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-foreground text-xs font-semibold text-background">
+            2
+          </span>
+          <span class="min-w-0 flex-1">
+            <span class="block text-sm font-semibold">统一配置</span>
+            <span class="mt-1 flex flex-wrap gap-1.5">
+              <span
+                v-for="item in settingsSummaryItems"
+                :key="item"
+                class="rounded-md bg-muted px-2 py-0.5 text-[10px] leading-4 text-muted-foreground"
+              >{{ item }}</span>
+            </span>
+          </span>
+          <Badge :variant="selectedApiFormats.length > 0 ? 'success' : 'destructive'" class="ml-auto shrink-0 tabular-nums">
+            {{ selectedApiFormats.length }} 种格式
+          </Badge>
+        </header>
+
+        <div class="border-t border-border/60 bg-muted/10 p-3 sm:p-4">
+          <ProviderKeyImportSettingsFields
+            :auth-type="authType"
+            :api-formats="selectedApiFormats"
+            :settings="settings"
+            :available-api-formats="availableApiFormats"
+            @update:auth-type="authType = $event"
+            @update:api-formats="selectedApiFormats = $event"
+            @update:settings="updateGlobalSettings"
+          />
+        </div>
+      </section>
+
+      <section
+        v-else
+        class="overflow-hidden rounded-xl bg-background shadow-[0_0_0_1px_rgb(0_0_0/0.07),0_1px_2px_-1px_rgb(0_0_0/0.08),0_3px_8px_-3px_rgb(0_0_0/0.08)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.09)]"
+      >
+        <header class="flex min-h-[72px] items-center gap-3 border-b border-border/60 bg-muted/15 px-4 py-3">
+          <span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-foreground text-xs font-semibold text-background">3</span>
+          <div class="min-w-0 flex-1">
+            <h3 class="text-balance text-sm font-semibold">逐项确认</h3>
+            <p class="text-pretty text-[11px] leading-4 text-muted-foreground">展开任意 Key 可修改内容或设置单独配置</p>
+          </div>
+          <div class="shrink-0 text-right text-[11px] text-muted-foreground">
+            <div><span class="font-semibold tabular-nums text-foreground">{{ reviewItems.length }}</span> 个 Key</div>
+            <div v-if="customizedItemCount > 0"><span class="tabular-nums">{{ customizedItemCount }}</span> 个单独配置</div>
+          </div>
+        </header>
+
+        <div
+          v-if="reviewErrorItemCount > 0"
+          class="border-b border-destructive/15 bg-destructive/5 px-4 py-2 text-xs text-destructive"
+        >
+          {{ reviewErrorItemCount }} 个 Key 需要修正后才能导入
+        </div>
+
+        <div class="max-h-[min(52vh,520px)] divide-y divide-border/50 overflow-y-auto overscroll-contain">
+          <article
+            v-for="entry in pagedReviewItems"
+            :key="entry.item.lineNumber"
+            class="bg-background"
+          >
+            <div class="flex min-h-14 items-center gap-3 px-3 py-2 sm:px-4">
+              <span class="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-muted text-[10px] tabular-nums text-muted-foreground">
+                {{ entry.index + 1 }}
+              </span>
+              <div class="min-w-0 flex-1">
+                <div class="flex min-w-0 items-center gap-2">
+                  <span class="truncate text-xs font-semibold">{{ entry.item.name || '未填写名称' }}</span>
+                  <Badge
+                    v-if="reviewErrorsByIndex.has(entry.index)"
+                    variant="destructive"
+                    class="shrink-0 text-[10px]"
+                  >需修正</Badge>
+                </div>
+                <div class="mt-0.5 truncate font-mono text-[10px] text-muted-foreground">{{ maskSecret(entry.item.apiKey) }}</div>
+              </div>
+              <div class="hidden shrink-0 items-center gap-1.5 sm:flex">
+                <span class="rounded-md bg-muted px-2 py-0.5 text-[10px] text-muted-foreground">{{ effectiveAuthLabel(entry.item) }}</span>
+                <span class="rounded-md bg-muted px-2 py-0.5 text-[10px] text-muted-foreground">{{ effectiveFormatCount(entry.item) }} 种格式</span>
+                <span
+                  class="rounded-md px-2 py-0.5 text-[10px]"
+                  :class="entry.item.customized ? 'bg-primary/10 text-primary' : 'bg-muted text-muted-foreground'"
+                >{{ entry.item.customized ? '单独配置' : '统一配置' }}</span>
+              </div>
+              <button
+                type="button"
+                class="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg text-muted-foreground transition-[background-color,color,scale] hover:bg-muted hover:text-foreground active:scale-[0.96]"
+                :aria-label="`编辑 ${entry.item.name || `第 ${entry.index + 1} 项`}`"
+                :title="editingItemIndex === entry.index ? '收起编辑' : '编辑此 Key'"
+                @click="toggleItemEditor(entry.index)"
+              >
+                <Pencil class="h-4 w-4" />
+              </button>
+            </div>
+
+            <div
+              v-if="editingItemIndex === entry.index"
+              class="space-y-4 border-t border-border/50 bg-muted/10 p-3 sm:p-4"
+            >
+              <div class="grid gap-3 sm:grid-cols-2">
+                <div class="space-y-1.5">
+                  <Label class="text-xs">名称</Label>
+                  <Input v-model="entry.item.name" class="h-10" placeholder="必填" />
+                </div>
+                <div class="space-y-1.5">
+                  <Label class="text-xs">Key</Label>
+                  <Input v-model="entry.item.apiKey" class="h-10 font-mono text-xs" placeholder="必填" />
+                </div>
+              </div>
+
+              <div class="flex min-h-12 items-center justify-between gap-3 rounded-lg bg-background px-3 shadow-[0_0_0_1px_rgb(0_0_0/0.06)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]">
+                <div>
+                  <div class="text-xs font-medium">单独配置此 Key</div>
+                  <div class="text-[11px] text-muted-foreground">开启后覆盖第二步中的统一配置</div>
+                </div>
+                <Switch
+                  :model-value="entry.item.customized"
+                  @update:model-value="setItemCustomized(entry.item, $event)"
+                />
+              </div>
+
+              <ProviderKeyImportSettingsFields
+                v-if="entry.item.customized"
+                :auth-type="entry.item.authType"
+                :api-formats="entry.item.apiFormats"
+                :settings="entry.item.settings"
+                :available-api-formats="availableApiFormats"
+                @update:auth-type="entry.item.authType = $event"
+                @update:api-formats="entry.item.apiFormats = $event"
+                @update:settings="entry.item.settings = $event"
+              />
+
+              <div
+                v-if="reviewErrorsByIndex.has(entry.index)"
+                class="space-y-1 rounded-lg bg-destructive/5 px-3 py-2 text-[11px] text-destructive"
+              >
+                <div v-for="message in reviewErrorsByIndex.get(entry.index)" :key="message">{{ message }}</div>
+              </div>
+            </div>
+          </article>
+        </div>
+
+        <div
+          v-if="reviewPageCount > 1"
+          class="flex min-h-12 items-center justify-between gap-3 border-t border-border/60 bg-muted/10 px-3 sm:px-4"
+        >
+          <Button variant="ghost" size="sm" class="h-9" :disabled="reviewPage === 1" @click="changeReviewPage(reviewPage - 1)">
+            <ChevronLeft class="mr-1 h-4 w-4" />
+            上一页
+          </Button>
+          <span class="text-[11px] tabular-nums text-muted-foreground">{{ reviewPage }} / {{ reviewPageCount }}</span>
+          <Button variant="ghost" size="sm" class="h-9" :disabled="reviewPage === reviewPageCount" @click="changeReviewPage(reviewPage + 1)">
+            下一页
+            <ChevronRight class="ml-1 h-4 w-4" />
+          </Button>
+        </div>
+      </section>
+    </div>
+
+    <template #footer>
+      <div class="flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
+        <Button class="w-full sm:w-auto" variant="outline" :disabled="importing" @click="handleBack">
+          <ArrowLeft v-if="currentStep > 1" class="mr-2 h-4 w-4" />
+          {{ currentStep === 1 ? '取消' : '上一步' }}
+        </Button>
+        <Button class="w-full sm:w-auto" :disabled="primaryActionDisabled" @click="handlePrimaryAction">
+          <Loader2 v-if="importing" class="mr-2 h-4 w-4 animate-spin" />
+          <ListPlus v-else-if="currentStep === 3" class="mr-2 h-4 w-4" />
+          <ArrowRight v-else class="mr-2 h-4 w-4" />
+          {{ primaryActionLabel }}
+        </Button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from 'vue'
+import {
+  ArrowLeft,
+  ArrowRight,
+  ChevronLeft,
+  ChevronRight,
+  ListPlus,
+  Loader2,
+  Pencil,
+} from 'lucide-vue-next'
+import {
+  Badge,
+  Button,
+  Dialog,
+  Input,
+  Label,
+  Switch,
+  Textarea,
+} from '@/components/ui'
+import ProviderKeyImportSettingsFields from './ProviderKeyImportSettingsFields.vue'
+import { batchImportPoolKeys, type PoolKeySettingsPatch } from '@/api/endpoints/pool'
+import { useToast } from '@/composables/useToast'
+import { parseApiError } from '@/utils/errorParser'
+import { parseProviderKeyBatchImport } from '@/features/providers/utils/providerKeyBatchImport'
+
+type WizardStep = 1 | 2 | 3
+type AuthType = 'api_key' | 'bearer'
+type ImportSettings = Required<Pick<PoolKeySettingsPatch,
+  'internal_priority' | 'rpm_limit' | 'concurrent_limit' | 'cache_ttl_minutes'
+  | 'max_probe_interval_minutes' | 'is_active' | 'note' | 'proxy_node_id'
+>>
+
+interface ReviewImportItem {
+  lineNumber: number
+  name: string
+  apiKey: string
+  customized: boolean
+  authType: AuthType
+  apiFormats: string[]
+  settings: ImportSettings
+}
+
+const REVIEW_PAGE_SIZE = 50
+const steps: ReadonlyArray<{ id: WizardStep; label: string }> = [
+  { id: 1, label: '导入内容' },
+  { id: 2, label: '统一配置' },
+  { id: 3, label: '逐项确认' },
+]
+
+const props = defineProps<{
+  open: boolean
+  providerId: string
+  providerName?: string
+  availableApiFormats: string[]
+}>()
+
+const emit = defineEmits<{
+  close: []
+  saved: []
+}>()
+
+const { success, warning, error: showError } = useToast()
+const currentStep = ref<WizardStep>(1)
+const inputText = ref('')
+const importing = ref(false)
+const authType = ref<AuthType>('api_key')
+const selectedApiFormats = ref<string[]>([])
+const settings = reactive<ImportSettings>(createDefaultSettings())
+const reviewItems = ref<ReviewImportItem[]>([])
+const reviewPage = ref(1)
+const editingItemIndex = ref<number | null>(null)
+
+const parsed = computed(() => parseProviderKeyBatchImport(inputText.value))
+const canContinueInput = computed(() => (
+  parsed.value.items.length > 0 && parsed.value.errors.length === 0
+))
+const canContinueSettings = computed(() => selectedApiFormats.value.length > 0)
+const inputStatusText = computed(() => {
+  if (parsed.value.errors.length > 0) return `${parsed.value.errors.length} 个问题`
+  if (parsed.value.items.length > 0) return `${parsed.value.items.length} 条有效`
+  return '等待输入'
+})
+const reviewErrorsByIndex = computed(() => {
+  const errors = new Map<number, string[]>()
+  const seenNames = new Set<string>()
+  const seenKeys = new Set<string>()
+
+  reviewItems.value.forEach((item, index) => {
+    const messages: string[] = []
+    const name = item.name.trim()
+    const apiKey = item.apiKey.trim()
+    if (!name) messages.push('名称不能为空')
+    else if (name.length > 100) messages.push('名称不能超过 100 个字符')
+    else if (seenNames.has(name)) messages.push('名称与前面的 Key 重复')
+    else seenNames.add(name)
+
+    if (!apiKey) messages.push('Key 不能为空')
+    else if (seenKeys.has(apiKey)) messages.push('Key 与前面的 Key 重复')
+    else seenKeys.add(apiKey)
+
+    if (item.customized && item.apiFormats.length === 0) {
+      messages.push('单独配置时至少选择一种 API 格式')
+    }
+    if (messages.length > 0) errors.set(index, messages)
+  })
+  return errors
+})
+const reviewErrorItemCount = computed(() => reviewErrorsByIndex.value.size)
+const customizedItemCount = computed(() => (
+  reviewItems.value.filter(item => item.customized).length
+))
+const reviewPageCount = computed(() => (
+  Math.max(1, Math.ceil(reviewItems.value.length / REVIEW_PAGE_SIZE))
+))
+const pagedReviewItems = computed(() => {
+  const start = (reviewPage.value - 1) * REVIEW_PAGE_SIZE
+  return reviewItems.value
+    .slice(start, start + REVIEW_PAGE_SIZE)
+    .map((item, offset) => ({ item, index: start + offset }))
+})
+const canImport = computed(() => (
+  !importing.value
+  && reviewItems.value.length > 0
+  && reviewErrorsByIndex.value.size === 0
+  && canContinueSettings.value
+))
+const primaryActionDisabled = computed(() => {
+  if (importing.value) return true
+  if (currentStep.value === 1) return !canContinueInput.value
+  if (currentStep.value === 2) return !canContinueSettings.value
+  return !canImport.value
+})
+const primaryActionLabel = computed(() => {
+  if (importing.value) return '正在导入...'
+  if (currentStep.value === 1) return '下一步：统一配置'
+  if (currentStep.value === 2) return '下一步：逐项确认'
+  return `导入 ${reviewItems.value.length} 个 Key`
+})
+const settingsSummaryItems = computed(() => {
+  const rpm = settings.rpm_limit == null ? 'RPM 自适应' : `RPM ${settings.rpm_limit}`
+  const concurrent = settings.concurrent_limit == null || settings.concurrent_limit === 0
+    ? '不限并发'
+    : `并发 ${settings.concurrent_limit}`
+  const proxy = settings.proxy_node_id ? '独立代理' : '沿用 Provider 代理'
+  return [authType.value === 'bearer' ? 'Bearer' : 'API Key', rpm, concurrent, proxy]
+})
+
+watch(
+  () => props.open,
+  (open) => {
+    if (!open) return
+    currentStep.value = 1
+    inputText.value = ''
+    importing.value = false
+    authType.value = 'api_key'
+    selectedApiFormats.value = [...props.availableApiFormats]
+    Object.assign(settings, createDefaultSettings())
+    reviewItems.value = []
+    reviewPage.value = 1
+    editingItemIndex.value = null
+  },
+  { immediate: true },
+)
+
+watch(inputText, () => {
+  reviewItems.value = []
+  reviewPage.value = 1
+  editingItemIndex.value = null
+})
+
+function createDefaultSettings(): ImportSettings {
+  return {
+    internal_priority: 50,
+    rpm_limit: null,
+    concurrent_limit: null,
+    cache_ttl_minutes: 5,
+    max_probe_interval_minutes: 32,
+    is_active: true,
+    note: '',
+    proxy_node_id: '',
+  }
+}
+
+function copySettings(source: ImportSettings): ImportSettings {
+  return { ...source }
+}
+
+function buildSettingsPayload(
+  source: ImportSettings,
+  includeEmptyProxy = false,
+): PoolKeySettingsPatch {
+  return {
+    internal_priority: source.internal_priority,
+    rpm_limit: source.rpm_limit,
+    concurrent_limit: source.concurrent_limit,
+    cache_ttl_minutes: source.cache_ttl_minutes,
+    max_probe_interval_minutes: source.max_probe_interval_minutes,
+    is_active: source.is_active,
+    note: source.note.trim() || null,
+    ...((source.proxy_node_id || includeEmptyProxy)
+      ? { proxy_node_id: source.proxy_node_id || null }
+      : {}),
+  }
+}
+
+function handleDialogUpdate(value: boolean): void {
+  if (!value) emit('close')
+}
+
+function canNavigateToStep(step: WizardStep): boolean {
+  return step <= currentStep.value
+}
+
+function goToStep(step: WizardStep): void {
+  if (canNavigateToStep(step)) currentStep.value = step
+}
+
+function handleBack(): void {
+  if (currentStep.value === 1) {
+    emit('close')
+    return
+  }
+  currentStep.value = (currentStep.value - 1) as WizardStep
+}
+
+function handlePrimaryAction(): void {
+  if (primaryActionDisabled.value) return
+  if (currentStep.value === 1) {
+    currentStep.value = 2
+    return
+  }
+  if (currentStep.value === 2) {
+    prepareReviewItems()
+    currentStep.value = 3
+    return
+  }
+  void submitImport()
+}
+
+function prepareReviewItems(): void {
+  if (reviewItems.value.length > 0) return
+  reviewItems.value = parsed.value.items.map(item => ({
+    lineNumber: item.lineNumber,
+    name: item.name,
+    apiKey: item.apiKey,
+    customized: false,
+    authType: authType.value,
+    apiFormats: [...selectedApiFormats.value],
+    settings: copySettings(settings),
+  }))
+  reviewPage.value = 1
+  editingItemIndex.value = null
+}
+
+function toggleItemEditor(index: number): void {
+  editingItemIndex.value = editingItemIndex.value === index ? null : index
+}
+
+function setItemCustomized(item: ReviewImportItem, customized: boolean): void {
+  item.customized = customized
+  if (!customized) return
+  item.authType = authType.value
+  item.apiFormats = [...selectedApiFormats.value]
+  item.settings = copySettings(settings)
+}
+
+function changeReviewPage(page: number): void {
+  reviewPage.value = Math.min(Math.max(page, 1), reviewPageCount.value)
+  editingItemIndex.value = null
+}
+
+function effectiveAuthLabel(item: ReviewImportItem): string {
+  const resolved = item.customized ? item.authType : authType.value
+  return resolved === 'bearer' ? 'Bearer' : 'API Key'
+}
+
+function effectiveFormatCount(item: ReviewImportItem): number {
+  return item.customized ? item.apiFormats.length : selectedApiFormats.value.length
+}
+
+function updateGlobalSettings(nextSettings: ImportSettings): void {
+  Object.assign(settings, nextSettings)
+}
+
+function maskSecret(secret: string): string {
+  if (secret.length <= 10) return `${secret.slice(0, 3)}•••`
+  return `${secret.slice(0, 6)}••••${secret.slice(-4)}`
+}
+
+async function submitImport(): Promise<void> {
+  if (!canImport.value) return
+  importing.value = true
+  try {
+    const result = await batchImportPoolKeys(props.providerId, {
+      keys: reviewItems.value.map(item => ({
+        name: item.name.trim(),
+        api_key: item.apiKey.trim(),
+        auth_type: item.customized ? item.authType : authType.value,
+        ...(item.customized
+          ? {
+              api_formats: item.apiFormats,
+              settings: buildSettingsPayload(item.settings, true),
+            }
+          : {}),
+      })),
+      api_formats: selectedApiFormats.value,
+      settings: buildSettingsPayload(settings),
+    })
+    if (result.imported > 0) emit('saved')
+    if (result.errors.length > 0) {
+      warning(`已导入 ${result.imported} 个，${result.errors.length} 个失败`)
+      return
+    }
+    success(`已导入 ${result.imported} 个 Key`)
+    emit('close')
+  } catch (error) {
+    showError(parseApiError(error, '批量导入 Key 失败'))
+  } finally {
+    importing.value = false
+  }
+}
+</script>

frontend/src/features/providers/components/ProviderKeyImportSettingsFields.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="space-y-4">
+    <div class="space-y-2">
+      <Label class="text-xs font-medium">支持的 API 格式</Label>
+      <div class="grid gap-2 sm:grid-cols-2 lg:grid-cols-3">
+        <label
+          v-for="format in availableApiFormats"
+          :key="format"
+          class="flex min-h-10 cursor-pointer items-center gap-2 rounded-lg bg-background px-3 text-xs transition-[box-shadow,background-color]"
+          :class="apiFormats.includes(format)
+            ? 'bg-primary/5 shadow-[0_0_0_1px_rgb(0_0_0/0.10),0_1px_2px_rgb(0_0_0/0.04)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.12)]'
+            : 'shadow-[0_0_0_1px_rgb(0_0_0/0.06)] hover:bg-muted/30 hover:shadow-[0_0_0_1px_rgb(0_0_0/0.10)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]'"
+        >
+          <Checkbox
+            :checked="apiFormats.includes(format)"
+            @update:checked="(checked) => toggleApiFormat(format, checked === true)"
+          />
+          <span class="truncate">{{ formatApiFormat(format) }}</span>
+        </label>
+      </div>
+    </div>
+
+    <div class="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
+      <div class="space-y-1.5">
+        <Label class="text-xs">认证类型</Label>
+        <Select v-model="authTypeModel">
+          <SelectTrigger class="h-10">
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="api_key">API Key</SelectItem>
+            <SelectItem value="bearer">Bearer Token</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+      <div class="space-y-1.5">
+        <Label class="text-xs">优先级</Label>
+        <Input
+          :model-value="settings.internal_priority"
+          type="number"
+          min="0"
+          class="h-10"
+          @update:model-value="updateSetting('internal_priority', parseNumberInput($event, { min: 0 }) ?? 50)"
+        />
+      </div>
+      <div class="space-y-1.5">
+        <Label class="text-xs">RPM 限制</Label>
+        <Input
+          :model-value="settings.rpm_limit ?? ''"
+          type="number"
+          min="1"
+          max="10000"
+          class="h-10"
+          placeholder="自适应"
+          @update:model-value="updateSetting('rpm_limit', parseNullableNumberInput($event, { min: 1, max: 10000 }))"
+        />
+      </div>
+      <div class="space-y-1.5">
+        <Label class="text-xs">并发请求上限</Label>
+        <Input
+          :model-value="settings.concurrent_limit ?? ''"
+          type="number"
+          min="0"
+          class="h-10"
+          placeholder="不限制"
+          @update:model-value="updateSetting('concurrent_limit', parseNullableNumberInput($event, { min: 0 }))"
+        />
+      </div>
+      <div class="space-y-1.5">
+        <Label class="text-xs">缓存 TTL（分钟）</Label>
+        <Input
+          :model-value="settings.cache_ttl_minutes"
+          type="number"
+          min="0"
+          max="60"
+          class="h-10"
+          @update:model-value="updateSetting('cache_ttl_minutes', parseNumberInput($event, { min: 0, max: 60 }) ?? 5)"
+        />
+      </div>
+      <div class="space-y-1.5">
+        <Label class="text-xs">熔断探测（分钟）</Label>
+        <Input
+          :model-value="settings.max_probe_interval_minutes"
+          type="number"
+          min="0"
+          max="32"
+          class="h-10"
+          @update:model-value="updateSetting('max_probe_interval_minutes', parseNumberInput($event, { min: 0, max: 32 }) ?? 32)"
+        />
+      </div>
+    </div>
+
+    <div class="grid gap-3 sm:grid-cols-2">
+      <div class="space-y-1.5">
+        <Label class="text-xs">代理节点</Label>
+        <ProxyNodeSelect
+          :model-value="settings.proxy_node_id"
+          trigger-class="h-10"
+          @update:model-value="updateSetting('proxy_node_id', $event)"
+        />
+      </div>
+      <div class="space-y-1.5">
+        <Label class="text-xs">备注</Label>
+        <Input
+          :model-value="settings.note"
+          class="h-10"
+          placeholder="可选"
+          @update:model-value="updateSetting('note', String($event))"
+        />
+      </div>
+    </div>
+
+    <div class="flex min-h-12 items-center justify-between gap-3 rounded-lg bg-background px-3 shadow-[0_0_0_1px_rgb(0_0_0/0.06),0_1px_2px_rgb(0_0_0/0.04)] dark:shadow-[0_0_0_1px_rgb(255_255_255/0.08)]">
+      <div>
+        <div class="text-xs font-medium">导入后立即启用</div>
+        <div class="text-[11px] text-muted-foreground">关闭后仍会创建，但不会进入调度</div>
+      </div>
+      <Switch
+        :model-value="settings.is_active"
+        @update:model-value="updateSetting('is_active', $event)"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import {
+  Checkbox,
+  Input,
+  Label,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+  Switch,
+} from '@/components/ui'
+import type { PoolKeySettingsPatch } from '@/api/endpoints/pool'
+import { formatApiFormat } from '@/api/endpoints/types/api-format'
+import { parseNullableNumberInput, parseNumberInput } from '@/utils/form'
+import ProxyNodeSelect from './ProxyNodeSelect.vue'
+
+type AuthType = 'api_key' | 'bearer'
+type ImportSettings = Required<Pick<PoolKeySettingsPatch,
+  'internal_priority' | 'rpm_limit' | 'concurrent_limit' | 'cache_ttl_minutes'
+  | 'max_probe_interval_minutes' | 'is_active' | 'note' | 'proxy_node_id'
+>>
+
+const props = defineProps<{
+  authType: AuthType
+  apiFormats: string[]
+  settings: ImportSettings
+  availableApiFormats: string[]
+}>()
+
+const emit = defineEmits<{
+  'update:authType': [value: AuthType]
+  'update:apiFormats': [value: string[]]
+  'update:settings': [value: ImportSettings]
+}>()
+
+const authTypeModel = computed<AuthType>({
+  get: () => props.authType,
+  set: value => emit('update:authType', value),
+})
+
+function toggleApiFormat(format: string, checked: boolean): void {
+  const selected = new Set(props.apiFormats)
+  if (checked) selected.add(format)
+  else selected.delete(format)
+  emit('update:apiFormats', props.availableApiFormats.filter(item => selected.has(item)))
+}
+
+function updateSetting<Key extends keyof ImportSettings>(
+  key: Key,
+  value: ImportSettings[Key],
+): void {
+  emit('update:settings', { ...props.settings, [key]: value })
+}
+</script>

frontend/src/features/providers/components/ProxyNodeSelect.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, onMounted } from 'vue'
 import {
   Select,
   SelectTrigger,
@@ -67,8 +67,10 @@ const nodeOptions = computed(() => {
 
 /** 供父组件调用：启用代理时懒加载节点列表 */
 function ensureLoaded() {
-  proxyNodesStore.ensureLoaded()
+  return proxyNodesStore.ensureLoaded()
 }
 
+onMounted(ensureLoaded)
+
 defineExpose({ ensureLoaded })
 </script>

frontend/src/features/providers/components/__tests__/ProxyNodeSelect.spec.ts

@@ -0,0 +1,52 @@
+import { describe, expect, it, vi } from 'vitest'
+import { createApp, defineComponent, h } from 'vue'
+
+import ProxyNodeSelect from '@/features/providers/components/ProxyNodeSelect.vue'
+import { createI18n } from '@/i18n'
+
+const proxyNodesStore = vi.hoisted(() => ({
+  loading: false,
+  nodes: [],
+  onlineNodes: [],
+  ensureLoaded: vi.fn(() => Promise.resolve()),
+}))
+
+vi.mock('@/stores/proxy-nodes', () => ({
+  useProxyNodesStore: () => proxyNodesStore,
+}))
+
+vi.mock('@/components/ui', async () => {
+  const { defineComponent, h } = await import('vue')
+  const passthrough = (name: string) => defineComponent({
+    name,
+    setup(_, { slots }) {
+      return () => h('div', slots.default?.())
+    },
+  })
+
+  return {
+    Select: passthrough('SelectStub'),
+    SelectTrigger: passthrough('SelectTriggerStub'),
+    SelectValue: passthrough('SelectValueStub'),
+    SelectContent: passthrough('SelectContentStub'),
+    SelectItem: passthrough('SelectItemStub'),
+  }
+})
+
+describe('ProxyNodeSelect', () => {
+  it('loads proxy nodes when mounted', () => {
+    const root = document.createElement('div')
+    const app = createApp(defineComponent({
+      setup() {
+        return () => h(ProxyNodeSelect, { modelValue: '' })
+      },
+    }))
+
+    app.use(createI18n())
+    app.mount(root)
+
+    expect(proxyNodesStore.ensureLoaded).toHaveBeenCalledTimes(1)
+
+    app.unmount()
+  })
+})

frontend/src/features/providers/components/__tests__/codex-reset-credit-display.spec.ts

@@ -1,14 +1,45 @@
 import { describe, expect, it } from 'vitest'
 
 import {
+  createCodexResetCreditIdempotencyKey,
   formatCodexResetCreditCount,
   formatCodexResetCreditExpiresAt,
   getCodexResetCreditAvailableCount,
   getVisibleCodexResetCreditItems,
+  mergeCodexQuotaDisplays,
 } from '@/features/providers/components/codex-reset-credit-display'
 import type { QuotaResetCreditsSnapshot } from '@/api/endpoints/types'
 
 describe('codex reset credit display helpers', () => {
+  it('keeps reset credits and usage windows when snapshot sources are partially populated', () => {
+    const merged = mergeCodexQuotaDisplays(
+      {
+        updated_at: 1_700_000_100,
+        primary_used_percent: 25,
+        reset_credits: {
+          available_count: 2,
+        },
+      },
+      {
+        updated_at: 1_700_000_000,
+        secondary_used_percent: 40,
+        reset_credits: {
+          credits: [{ id: 'credit-1', expires_at: 1_700_086_400 }],
+        },
+      },
+    )
+
+    expect(merged).toMatchObject({
+      updated_at: 1_700_000_100,
+      primary_used_percent: 25,
+      secondary_used_percent: 40,
+      reset_credits: {
+        available_count: 2,
+        credits: [{ id: 'credit-1', expires_at: 1_700_086_400 }],
+      },
+    })
+  })
+
   it('keeps zero available credits displayable but non-positive detail items hidden', () => {
     const snapshot: QuotaResetCreditsSnapshot = {
       available_count: 0,
@@ -90,4 +121,22 @@ describe('codex reset credit display helpers', () => {
     expect(getVisibleCodexResetCreditItems(snapshot, 1_700_000_300)[0]?.expiresAt)
       .toBe(1_700_000_600)
   })
+
+  it('generates a UUID v4 with secure random bytes when randomUUID is unavailable', () => {
+    const idempotencyKey = createCodexResetCreditIdempotencyKey({
+      getRandomValues(array) {
+        array.set(Array.from({ length: 16 }, (_, index) => index))
+        return array
+      },
+    })
+
+    expect(idempotencyKey).toBe('00010203-0405-4607-8809-0a0b0c0d0e0f')
+  })
+
+  it('prefers the browser randomUUID implementation when available', () => {
+    expect(createCodexResetCreditIdempotencyKey({
+      randomUUID: () => 'existing-random-uuid',
+      getRandomValues: array => array,
+    })).toBe('existing-random-uuid')
+  })
 })

frontend/src/features/providers/components/__tests__/provider-key-batch-import-layout.spec.ts

@@ -0,0 +1,43 @@
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+import { describe, expect, it } from 'vitest'
+
+function readSource(path: string): string {
+  return readFileSync(resolve(process.cwd(), path), 'utf8')
+}
+
+describe('provider key batch import UI contract', () => {
+  it('shows the entry only for custom providers', () => {
+    const source = readSource('src/features/providers/components/ProviderDetailDrawer.vue')
+
+    expect(source).toContain("provider.provider_type === 'custom'")
+    expect(source).toContain('<ProviderKeyBatchImportDialog')
+    expect(source).toContain('keyBatchImportDialogOpen')
+  })
+
+  it('uses a three-step flow with per-key review overrides', () => {
+    const source = readSource('src/features/providers/components/ProviderKeyBatchImportDialog.vue')
+
+    expect(source).toContain('parseProviderKeyBatchImport')
+    expect(source).toContain("{ id: 3, label: '逐项确认' }")
+    expect(source).toContain('ProviderKeyImportSettingsFields')
+    expect(source).toContain('REVIEW_PAGE_SIZE')
+    expect(source).toContain('item.customized')
+    expect(source).toContain('api_formats: item.apiFormats')
+    expect(source).toContain('batchImportPoolKeys')
+    expect(source).not.toContain('MAX_BATCH_IMPORT_KEYS')
+
+    const fieldsSource = readSource('src/features/providers/components/ProviderKeyImportSettingsFields.vue')
+    expect(fieldsSource).toContain('settings.max_probe_interval_minutes')
+    expect(fieldsSource).toContain('settings.proxy_node_id')
+  })
+
+  it('uses selective update_settings in pool batch management', () => {
+    const source = readSource('src/features/pool/components/PoolAccountBatchDialog.vue')
+
+    expect(source).toContain("selectedAction === 'update_settings'")
+    expect(source).toContain('buildPoolKeySettingsPatch')
+    expect(source).toContain("confirmAndExecuteAction('update_settings')")
+    expect(source).toContain('仅更新已勾选字段')
+  })
+})

frontend/src/features/providers/components/codex-reset-credit-display.ts

@@ -1,8 +1,41 @@
 import type {
+  CodexUpstreamMetadata,
   QuotaResetCreditSnapshot,
   QuotaResetCreditsSnapshot,
 } from '@/api/endpoints/types'
 
+function codexQuotaUpdatedAt(display: CodexUpstreamMetadata | null | undefined): number | null {
+  const updatedAt = Number(display?.updated_at)
+  return Number.isFinite(updatedAt) ? updatedAt : null
+}
+
+export function mergeCodexQuotaDisplays(
+  snapshotDisplay: CodexUpstreamMetadata | null | undefined,
+  metadataDisplay: CodexUpstreamMetadata | null | undefined,
+): CodexUpstreamMetadata | null {
+  if (!snapshotDisplay) return metadataDisplay ?? null
+  if (!metadataDisplay) return snapshotDisplay
+
+  const snapshotUpdatedAt = codexQuotaUpdatedAt(snapshotDisplay)
+  const metadataUpdatedAt = codexQuotaUpdatedAt(metadataDisplay)
+  const metadataIsNewer = metadataUpdatedAt !== null
+    && (snapshotUpdatedAt === null || metadataUpdatedAt > snapshotUpdatedAt)
+  const preferred = metadataIsNewer ? metadataDisplay : snapshotDisplay
+  const fallback = metadataIsNewer ? snapshotDisplay : metadataDisplay
+  const resetCredits = preferred.reset_credits || fallback.reset_credits
+    ? {
+        ...fallback.reset_credits,
+        ...preferred.reset_credits,
+      }
+    : undefined
+
+  return {
+    ...fallback,
+    ...preferred,
+    ...(resetCredits ? { reset_credits: resetCredits } : {}),
+  }
+}
+
 export interface CodexResetCreditDisplayItem {
   id?: string | null
   displayKey: string
@@ -28,6 +61,27 @@ export function formatCodexResetCreditCount(count: number | null | undefined): s
   return `共 ${count ?? 0} 次机会`
 }
 
+interface CodexResetCreditCrypto {
+  randomUUID?: () => string
+  getRandomValues: (array: Uint8Array) => Uint8Array
+}
+
+export function createCodexResetCreditIdempotencyKey(
+  cryptoSource: CodexResetCreditCrypto | undefined = globalThis.crypto,
+): string {
+  const randomUUID = cryptoSource?.randomUUID?.bind(cryptoSource)
+  if (randomUUID) return randomUUID()
+  if (!cryptoSource) {
+    throw new Error('浏览器不支持安全随机数，无法生成幂等 ID')
+  }
+
+  const bytes = cryptoSource.getRandomValues(new Uint8Array(16))
+  bytes[6] = (bytes[6] & 0x0f) | 0x40
+  bytes[8] = (bytes[8] & 0x3f) | 0x80
+  const hex = Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('')
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
+}
+
 function codexResetCreditRemainingSeconds(
   item: QuotaResetCreditSnapshot,
   snapshot: QuotaResetCreditsSnapshot,