fix(chat-export): 修复批量导出默认范围与会话选择异常

- 修复未选中会话时导出弹窗落入无效默认范围的问题

- 支持按全部、群聊、单聊快速切换批量导出范围，并默认选中当前筛选结果

- 优化会话列表整行点击、高亮反馈和选择去重逻辑

README.md

@@ -10,7 +10,7 @@
     <img src="https://img.shields.io/github/stars/LifeArchiveProject/WeChatDataAnalysis" alt="Stars" />
     <img src="https://gh-down-badges.linkof.link/LifeArchiveProject/WeChatDataAnalysis" alt="Downloads" />
     <img src="https://img.shields.io/github/forks/LifeArchiveProject/WeChatDataAnalysis" alt="Forks" />
-    <a href="https://qm.qq.com/q/VQEQ7PcGkk"><img src="https://img.shields.io/badge/QQ%20Group-WeChatDataAnalysis-12B7F5?logo=tencentqq&logoColor=white" alt="QQ Group" /></a>
+    <a href="https://qm.qq.com/q/VQEQ7PcGkk"><img src="https://img.shields.io/badge/QQ Group-WeChatDataAnalysis-12B7F5?logo=tencentqq&logoColor=white" alt="QQ Group" /></a>
     <img src="https://img.shields.io/badge/Python-3776AB?logo=Python&logoColor=white" alt="Python" />
     <img src="https://img.shields.io/badge/Vue.js-4FC08D?logo=Vue.js&logoColor=white" alt="Vue.js" />
     <img src="https://img.shields.io/badge/SQLite-003B57?logo=SQLite&logoColor=white" alt="SQLite" />

frontend/components/chat/ChatOverlays.vue

@@ -1290,52 +1290,77 @@
           </div>
 
           <div class="space-y-5">
-            <div class="flex flex-wrap items-end gap-6">
+            <div class="flex flex-wrap items-end gap-3 xl:flex-nowrap">
               <div>
                 <div class="text-sm font-medium text-gray-800 mb-2">范围</div>
-                <div class="flex flex-wrap gap-2 text-sm text-gray-700">
-                  <label class="flex items-center gap-1.5 px-3 py-1.5 rounded-md border cursor-pointer transition-colors" :class="exportScope === 'current' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
-                    <input type="radio" value="current" v-model="exportScope" class="hidden" />
-                    <span>当前会话</span>
-                  </label>
-                  <label class="flex items-center gap-1.5 px-3 py-1.5 rounded-md border cursor-pointer transition-colors" :class="exportScope === 'selected' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
-                    <input type="radio" value="selected" v-model="exportScope" class="hidden" />
-                    <span>选择会话（批量）</span>
-                  </label>
+                <div class="flex flex-wrap items-center gap-2 text-sm text-gray-700">
+                  <button
+                    type="button"
+                    class="px-2.5 py-1 text-xs rounded-md border transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+                    :class="exportScope === 'current' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'"
+                    :disabled="!selectedContact?.username"
+                    @click="exportScope = 'current'"
+                  >
+                    当前会话
+                  </button>
+                  <button
+                    type="button"
+                    class="px-2.5 py-1 text-xs rounded-md border transition-colors"
+                    :class="exportScope === 'selected' && exportListTab === 'all' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'"
+                    @click="onExportBatchScopeClick('all')"
+                  >
+                    全部 {{ exportContactCounts.total }}
+                  </button>
+                  <button
+                    type="button"
+                    class="px-2.5 py-1 text-xs rounded-md border transition-colors"
+                    :class="exportScope === 'selected' && exportListTab === 'groups' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'"
+                    @click="onExportBatchScopeClick('groups')"
+                  >
+                    群聊 {{ exportContactCounts.groups }}
+                  </button>
+                  <button
+                    type="button"
+                    class="px-2.5 py-1 text-xs rounded-md border transition-colors"
+                    :class="exportScope === 'selected' && exportListTab === 'singles' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'"
+                    @click="onExportBatchScopeClick('singles')"
+                  >
+                    单聊 {{ exportContactCounts.singles }}
+                  </button>
                 </div>
               </div>
 
               <div>
                 <div class="text-sm font-medium text-gray-800 mb-2">格式</div>
                 <div class="flex items-center gap-2 text-sm text-gray-700">
-                  <label class="flex items-center gap-1.5 px-3 py-1.5 rounded-md border cursor-pointer transition-colors" :class="exportFormat === 'json' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
+                  <label class="flex items-center gap-1 px-2.5 py-1 text-xs rounded-md border cursor-pointer transition-colors" :class="exportFormat === 'json' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
                     <input type="radio" value="json" v-model="exportFormat" class="hidden" />
                     <span>JSON</span>
                   </label>
-                  <label class="flex items-center gap-1.5 px-3 py-1.5 rounded-md border cursor-pointer transition-colors" :class="exportFormat === 'txt' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
+                  <label class="flex items-center gap-1 px-2.5 py-1 text-xs rounded-md border cursor-pointer transition-colors" :class="exportFormat === 'txt' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
                     <input type="radio" value="txt" v-model="exportFormat" class="hidden" />
                     <span>TXT</span>
                   </label>
-                  <label class="flex items-center gap-1.5 px-3 py-1.5 rounded-md border cursor-pointer transition-colors" :class="exportFormat === 'html' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
+                  <label class="flex items-center gap-1 px-2.5 py-1 text-xs rounded-md border cursor-pointer transition-colors" :class="exportFormat === 'html' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white border-gray-200 text-gray-700 hover:bg-gray-50'">
                     <input type="radio" value="html" v-model="exportFormat" class="hidden" />
                     <span>HTML</span>
                   </label>
                 </div>
               </div>
 
-              <div class="flex-1 min-w-[320px]">
+              <div class="flex-1 min-w-[280px]">
                 <div class="text-sm font-medium text-gray-800 mb-2">时间范围（可选）</div>
-                <div class="flex items-center gap-2 flex-wrap">
+                <div class="flex items-center gap-1.5 flex-wrap">
                   <input
                     v-model="exportStartLocal"
                     type="datetime-local"
-                    class="px-2.5 py-1.5 text-sm rounded-md border border-gray-200 focus:outline-none focus:ring-2 focus:ring-[#03C160]/30"
+                    class="px-2 py-1 text-xs rounded-md border border-gray-200 focus:outline-none focus:ring-2 focus:ring-[#03C160]/30"
                   />
                   <span class="text-gray-400">-</span>
                   <input
                     v-model="exportEndLocal"
                     type="datetime-local"
-                    class="px-2.5 py-1.5 text-sm rounded-md border border-gray-200 focus:outline-none focus:ring-2 focus:ring-[#03C160]/30"
+                    class="px-2 py-1 text-xs rounded-md border border-gray-200 focus:outline-none focus:ring-2 focus:ring-[#03C160]/30"
                   />
                 </div>
               </div>
@@ -1367,32 +1392,8 @@
             </div>
 
             <div v-if="exportScope === 'selected'" class="mt-3">
-              <div class="flex items-center gap-2 mb-2">
-                <button
-                  type="button"
-                  class="text-xs px-2 py-1 rounded border border-gray-200"
-                  :class="exportListTab === 'all' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white hover:bg-gray-50 text-gray-700'"
-                  @click="exportListTab = 'all'"
-                >
-                  全部 {{ exportContactCounts.total }}
-                </button>
-                <button
-                  type="button"
-                  class="text-xs px-2 py-1 rounded border border-gray-200"
-                  :class="exportListTab === 'groups' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white hover:bg-gray-50 text-gray-700'"
-                  @click="exportListTab = 'groups'"
-                >
-                  群聊 {{ exportContactCounts.groups }}
-                </button>
-                <button
-                  type="button"
-                  class="text-xs px-2 py-1 rounded border border-gray-200"
-                  :class="exportListTab === 'singles' ? 'bg-[#03C160] text-white border-[#03C160]' : 'bg-white hover:bg-gray-50 text-gray-700'"
-                  @click="exportListTab = 'singles'"
-                >
-                  单聊 {{ exportContactCounts.singles }}
-                </button>
-                <div class="ml-auto text-xs text-gray-500">点击 tab 筛选</div>
+              <div class="mb-2 text-xs text-gray-500">
+                点击上方范围可筛选并默认全选当前结果，再次点击可取消全选；下方整行可点选会话
               </div>
               <div class="flex items-center gap-2 mb-2">
                 <input
@@ -1404,26 +1405,27 @@
                 />
               </div>
               <div class="border border-gray-200 rounded-md max-h-56 overflow-y-auto">
-                <div
+                <label
                   v-for="c in exportFilteredContacts"
                   :key="c.username"
-                  class="px-3 py-2 border-b border-gray-100 flex items-center gap-2 hover:bg-gray-50"
+                  class="px-3 py-2 border-b border-gray-100 flex items-center gap-2 cursor-pointer transition-colors"
+                  :class="isExportContactSelected(c.username) ? 'bg-[#03C160]/5 hover:bg-[#03C160]/10' : 'hover:bg-gray-50'"
                 >
-                  <input type="checkbox" :value="c.username" v-model="exportSelectedUsernames" />
+                  <input type="checkbox" :value="c.username" v-model="exportSelectedUsernames" class="cursor-pointer" />
                   <div class="w-9 h-9 rounded-md overflow-hidden bg-gray-200 flex-shrink-0" :class="{ 'privacy-blur': privacyMode }">
                     <img v-if="c.avatar" :src="c.avatar" :alt="c.name + '头像'" class="w-full h-full object-cover" referrerpolicy="no-referrer" @error="onAvatarError($event, c)" />
                     <div v-else class="w-full h-full flex items-center justify-center text-xs font-bold text-gray-600">
                       {{ (c.name || c.username || '?').charAt(0) }}
                     </div>
                   </div>
-                  <div class="min-w-0" :class="{ 'privacy-blur': privacyMode }">
+                  <div class="min-w-0 flex-1" :class="{ 'privacy-blur': privacyMode }">
                     <div class="text-sm text-gray-800 truncate">
                       {{ c.name }}
                       <span class="text-xs text-gray-500">{{ c.isGroup ? '（群）' : '' }}</span>
                     </div>
                     <div class="text-xs text-gray-500 truncate">{{ c.username }}</div>
                   </div>
-                </div>
+                </label>
                 <div v-if="exportFilteredContacts.length === 0" class="px-3 py-3 text-sm text-gray-500">
                   无匹配会话
                 </div>

frontend/composables/chat/useChatExport.js

@@ -73,20 +73,35 @@ export const useChatExport = ({ api, apiBase, contacts, selectedAccount, selecte
     return Math.round(clamp01(done / total) * 100)
   })
 
-  const exportFilteredContacts = computed(() => {
-    const query = String(exportSearchQuery.value || '').trim().toLowerCase()
+  const normalizeExportSelectedUsernames = (list) => {
+    const seen = new Set()
+    return (Array.isArray(list) ? list : []).reduce((acc, item) => {
+      const username = String(item || '').trim()
+      if (!username || seen.has(username)) return acc
+      seen.add(username)
+      acc.push(username)
+      return acc
+    }, [])
+  }
+
+  const getExportFilteredContacts = ({ tab = exportListTab.value, query = exportSearchQuery.value } = {}) => {
+    const normalizedQuery = String(query || '').trim().toLowerCase()
     let list = Array.isArray(contacts.value) ? contacts.value : []
 
-    const tab = String(exportListTab.value || 'all')
-    if (tab === 'groups') list = list.filter((contact) => !!contact?.isGroup)
-    if (tab === 'singles') list = list.filter((contact) => !contact?.isGroup)
+    const normalizedTab = String(tab || 'all')
+    if (normalizedTab === 'groups') list = list.filter((contact) => !!contact?.isGroup)
+    if (normalizedTab === 'singles') list = list.filter((contact) => !contact?.isGroup)
 
-    if (!query) return list
+    if (!normalizedQuery) return list
     return list.filter((contact) => {
       const name = String(contact?.name || '').toLowerCase()
       const username = String(contact?.username || '').toLowerCase()
-      return name.includes(query) || username.includes(query)
+      return name.includes(normalizedQuery) || username.includes(normalizedQuery)
     })
+  }
+
+  const exportFilteredContacts = computed(() => {
+    return getExportFilteredContacts()
   })
 
   const exportContactCounts = computed(() => {
@@ -96,6 +111,60 @@ export const useChatExport = ({ api, apiBase, contacts, selectedAccount, selecte
     return { total, groups, singles: total - groups }
   })
 
+  const exportSelectedUsernameSet = computed(() => {
+    return new Set(normalizeExportSelectedUsernames(exportSelectedUsernames.value))
+  })
+
+  const setExportSelectedUsernames = (list) => {
+    exportSelectedUsernames.value = normalizeExportSelectedUsernames(list)
+  }
+
+  const getExportFilteredUsernames = (tab = exportListTab.value) => {
+    return getExportFilteredContacts({ tab })
+      .map((contact) => String(contact?.username || '').trim())
+      .filter(Boolean)
+  }
+
+  const selectExportFilteredContacts = (tab = exportListTab.value) => {
+    setExportSelectedUsernames(getExportFilteredUsernames(tab))
+  }
+
+  const clearExportFilteredContacts = () => {
+    setExportSelectedUsernames([])
+  }
+
+  const areExportFilteredContactsAllSelected = (tab = exportListTab.value) => {
+    const usernames = getExportFilteredUsernames(tab)
+    if (usernames.length !== exportSelectedUsernameSet.value.size) return false
+    return usernames.every((username) => exportSelectedUsernameSet.value.has(username))
+  }
+
+  const onExportListTabClick = (tab) => {
+    const nextTab = String(tab || 'all')
+    const isSameTab = String(exportListTab.value || 'all') === nextTab
+    exportListTab.value = nextTab
+
+    if (isSameTab) {
+      if (areExportFilteredContactsAllSelected(nextTab)) {
+        clearExportFilteredContacts(nextTab)
+      } else {
+        selectExportFilteredContacts(nextTab)
+      }
+      return
+    }
+
+    selectExportFilteredContacts(nextTab)
+  }
+
+  const isExportContactSelected = (username) => {
+    return exportSelectedUsernameSet.value.has(String(username || '').trim())
+  }
+
+  const onExportBatchScopeClick = (tab) => {
+    exportScope.value = 'selected'
+    onExportListTabClick(tab)
+  }
+
   const isDesktopExportRuntime = () => {
     return !!(process.client && window?.wechatDesktop?.chooseDirectory)
   }
@@ -269,12 +338,17 @@ export const useChatExport = ({ api, apiBase, contacts, selectedAccount, selecte
     exportModalOpen.value = true
     exportError.value = ''
     exportSaveMsg.value = ''
+    exportSearchQuery.value = ''
     exportListTab.value = 'all'
+    exportSelectedUsernames.value = []
     exportStartLocal.value = ''
     exportEndLocal.value = ''
     exportMessageTypes.value = exportMessageTypeOptions.map((item) => item.value)
     exportAutoSavedFor.value = ''
-    exportScope.value = selectedContact.value?.username ? 'current' : 'all'
+    exportScope.value = selectedContact.value?.username ? 'current' : 'selected'
+    if (!selectedContact.value?.username) {
+      selectExportFilteredContacts('all')
+    }
   }
 
   const closeExportModal = () => {
@@ -296,6 +370,12 @@ export const useChatExport = ({ api, apiBase, contacts, selectedAccount, selecte
     }
   })
 
+  watch(exportScope, (scope, previousScope) => {
+    if (scope !== 'selected' || previousScope === 'selected') return
+    if (exportSelectedUsernames.value.length > 0) return
+    selectExportFilteredContacts(exportListTab.value)
+  })
+
   watch(
     () => ({
       exportId: String(exportJob.value?.exportId || ''),
@@ -447,6 +527,9 @@ export const useChatExport = ({ api, apiBase, contacts, selectedAccount, selecte
     exportCurrentPercent,
     exportFilteredContacts,
     exportContactCounts,
+    onExportBatchScopeClick,
+    onExportListTabClick,
+    isExportContactSelected,
     hasWebExportFolder,
     chooseExportFolder,
     getExportDownloadUrl,

src/wechat_decrypt_tool/chat_helpers.py

@@ -24,6 +24,17 @@ logger = get_logger(__name__)
 
 _OUTPUT_DATABASES_DIR = get_output_databases_dir()
 _DEBUG_SESSIONS = os.environ.get("WECHAT_TOOL_DEBUG_SESSIONS", "0") == "1"
+_SQLITE_HEADER = b"SQLite format 3\x00"
+
+
+def _is_valid_decrypted_sqlite(path: Path) -> bool:
+    try:
+        if not path.exists() or (not path.is_file()):
+            return False
+        with path.open("rb") as f:
+            return f.read(len(_SQLITE_HEADER)) == _SQLITE_HEADER
+    except Exception:
+        return False
 
 
 def _list_decrypted_accounts() -> list[str]:
@@ -34,7 +45,7 @@ def _list_decrypted_accounts() -> list[str]:
     for p in _OUTPUT_DATABASES_DIR.iterdir():
         if not p.is_dir():
             continue
-        if (p / "session.db").exists() and (p / "contact.db").exists():
+        if _is_valid_decrypted_sqlite(p / "session.db") and _is_valid_decrypted_sqlite(p / "contact.db"):
             accounts.append(p.name)
 
     accounts.sort()
@@ -49,7 +60,9 @@ def _resolve_account_dir(account: Optional[str]) -> Path:
             detail="No decrypted databases found. Please decrypt first.",
         )
 
-    selected = account or accounts[0]
+    selected = str(account or "").strip() or accounts[0]
+    if selected not in accounts:
+        raise HTTPException(status_code=404, detail="Account not found.")
     base = _OUTPUT_DATABASES_DIR.resolve()
     candidate = (_OUTPUT_DATABASES_DIR / selected).resolve()
 

src/wechat_decrypt_tool/media_helpers.py

@@ -24,6 +24,17 @@ logger = get_logger(__name__)
 
 # 运行时输出目录（桌面端可通过 WECHAT_TOOL_DATA_DIR 指向可写目录）
 _PACKAGE_ROOT = Path(__file__).resolve().parent
+_SQLITE_HEADER = b"SQLite format 3\x00"
+
+
+def _is_valid_decrypted_sqlite(path: Path) -> bool:
+    try:
+        if not path.exists() or (not path.is_file()):
+            return False
+        with path.open("rb") as f:
+            return f.read(len(_SQLITE_HEADER)) == _SQLITE_HEADER
+    except Exception:
+        return False
 
 
 def _list_decrypted_accounts() -> list[str]:
@@ -36,7 +47,7 @@ def _list_decrypted_accounts() -> list[str]:
     for p in output_db_dir.iterdir():
         if not p.is_dir():
             continue
-        if (p / "session.db").exists() and (p / "contact.db").exists():
+        if _is_valid_decrypted_sqlite(p / "session.db") and _is_valid_decrypted_sqlite(p / "contact.db"):
             accounts.append(p.name)
 
     accounts.sort()
@@ -53,7 +64,9 @@ def _resolve_account_dir(account: Optional[str]) -> Path:
             detail="No decrypted databases found. Please decrypt first.",
         )
 
-    selected = account or accounts[0]
+    selected = str(account or "").strip() or accounts[0]
+    if selected not in accounts:
+        raise HTTPException(status_code=404, detail="Account not found.")
     base = output_db_dir.resolve()
     candidate = (output_db_dir / selected).resolve()
 

src/wechat_decrypt_tool/routers/decrypt.py

@@ -14,7 +14,7 @@ from ..app_paths import get_output_databases_dir
 from ..logging_config import get_logger
 from ..path_fix import PathFixRoute
 from ..key_store import upsert_account_keys_in_store
-from ..wechat_decrypt import WeChatDatabaseDecryptor, decrypt_wechat_databases
+from ..wechat_decrypt import WeChatDatabaseDecryptor, decrypt_wechat_databases, scan_account_databases_from_path
 
 logger = get_logger(__name__)
 
@@ -79,6 +79,8 @@ async def decrypt_databases(request: DecryptRequest):
             "account_results": results.get("account_results", {}),
         }
 
+    except HTTPException:
+        raise
     except Exception as e:
         logger.error(f"解密API异常: {str(e)}")
         raise HTTPException(status_code=500, detail=str(e))
@@ -126,44 +128,17 @@ async def decrypt_databases_stream(
         yield _sse({"type": "scanning", "message": "正在扫描数据库文件..."})
         await asyncio.sleep(0)
 
-        account_name = "unknown_account"
-        path_parts = storage_path.parts
-        account_patterns = ["wxid_"]
-        for part in path_parts:
-            for pattern in account_patterns:
-                if part.startswith(pattern):
-                    parts = part.split("_")
-                    if len(parts) >= 3:
-                        account_name = "_".join(parts[:-1])
-                    else:
-                        account_name = part
-                    break
-            if account_name != "unknown_account":
-                break
-
-        if account_name == "unknown_account":
-            for part in reversed(path_parts):
-                if part != "db_storage" and len(part) > 3:
-                    account_name = part
-                    break
-
-        databases: list[dict] = []
-        for root, _dirs, files in os.walk(storage_path):
-            if "db_storage" not in str(root):
-                continue
-            for file_name in files:
-                if not file_name.endswith(".db"):
-                    continue
-                if file_name in ["key_info.db"]:
-                    continue
-                db_path = os.path.join(root, file_name)
-                databases.append({"path": db_path, "name": file_name, "account": account_name})
-
-        if not databases:
-            yield _sse({"type": "error", "message": "未找到微信数据库文件！请检查 db_storage_path 是否正确"})
+        scan_result = scan_account_databases_from_path(p)
+        if scan_result["status"] == "error":
+            payload = {"type": "error", "message": scan_result["message"]}
+            detected_accounts = scan_result.get("detected_accounts") or []
+            if detected_accounts:
+                payload["detected_accounts"] = detected_accounts
+            yield _sse(payload)
             return
 
-        account_databases = {account_name: databases}
+        account_databases = scan_result.get("account_databases", {})
+        account_sources = scan_result.get("account_sources", {})
         total_databases = sum(len(dbs) for dbs in account_databases.values())
 
         yield _sse({"type": "start", "total": total_databases, "message": f"开始解密 {total_databases} 个数据库"})
@@ -193,12 +168,9 @@ async def decrypt_databases_stream(
 
             # Save a hint for later UI (same as non-stream endpoint).
             try:
-                source_db_storage_path = p
-                wxid_dir = ""
-                if storage_path.name.lower() == "db_storage":
-                    wxid_dir = str(storage_path.parent)
-                else:
-                    wxid_dir = str(storage_path)
+                source_info = account_sources.get(account, {})
+                source_db_storage_path = str(source_info.get("db_storage_path") or p)
+                wxid_dir = str(source_info.get("wxid_dir") or "")
                 (account_output_dir / "_source.json").write_text(
                     json.dumps({"db_storage_path": source_db_storage_path, "wxid_dir": wxid_dir}, ensure_ascii=False, indent=2),
                     encoding="utf-8",

src/wechat_decrypt_tool/wcdb_realtime.py

@@ -26,25 +26,41 @@ _DEFAULT_WCDB_API_DLL = _NATIVE_DIR / "wcdb_api.dll"
 _WCDB_API_DLL_SELECTED: Optional[Path] = None
 
 
+def _is_project_wcdb_api_dll_path(path: Path) -> bool:
+    try:
+        resolved = path.resolve(strict=False)
+    except Exception:
+        resolved = path
+
+    try:
+        default_resolved = _DEFAULT_WCDB_API_DLL.resolve(strict=False)
+    except Exception:
+        default_resolved = _DEFAULT_WCDB_API_DLL
+
+    if resolved == default_resolved:
+        return True
+
+    parts = tuple(str(part).lower() for part in resolved.parts)
+    allowed_suffixes = (
+        ("backend", "native", "wcdb_api.dll"),
+        ("wechat_decrypt_tool", "native", "wcdb_api.dll"),
+    )
+    return any(parts[-len(suffix) :] == suffix for suffix in allowed_suffixes)
+
+
 def _candidate_wcdb_api_dll_paths() -> list[Path]:
-    """Return possible locations for wcdb_api.dll (prefer WeFlow's newer build when present)."""
+    """Return allowed locations for wcdb_api.dll."""
     cands: list[Path] = []
 
     env = str(os.environ.get("WECHAT_TOOL_WCDB_API_DLL_PATH", "") or "").strip()
     if env:
-        cands.append(Path(env))
+        env_path = Path(env)
+        if _is_project_wcdb_api_dll_path(env_path):
+            cands.append(env_path)
+        else:
+            logger.warning("[wcdb] ignore external wcdb_api.dll override: %s", env_path)
 
-    # Repo checkout convenience: reuse bundled WeFlow / echotrace DLLs when available.
-    try:
-        repo_root = Path(__file__).resolve().parents[2]
-    except Exception:
-        repo_root = Path.cwd()
-
-    for p in [
-        repo_root / "WeFlow" / "resources" / "wcdb_api.dll",
-        repo_root / "echotrace" / "assets" / "dll" / "wcdb_api.dll",
-        _DEFAULT_WCDB_API_DLL,
-    ]:
+    for p in (_DEFAULT_WCDB_API_DLL,):
         if p not in cands:
             cands.append(p)
 

src/wechat_decrypt_tool/wechat_decrypt.py

@@ -27,6 +27,169 @@ from .app_paths import get_output_databases_dir
 # SQLite文件头
 SQLITE_HEADER = b"SQLite format 3\x00"
 
+
+def _normalize_account_name(name: str) -> str:
+    value = str(name or "").strip()
+    if not value:
+        return "unknown_account"
+
+    if value.startswith("wxid_"):
+        parts = value.split("_")
+        if len(parts) >= 3:
+            trimmed = "_".join(parts[:-1]).strip()
+            if trimmed:
+                return trimmed
+
+    return value
+
+
+def _derive_account_name_from_path(path: Path) -> str:
+    try:
+        target = path.resolve()
+    except Exception:
+        target = path
+
+    for part in target.parts:
+        part_str = str(part or "").strip()
+        if part_str.startswith("wxid_"):
+            return _normalize_account_name(part_str)
+
+    for part in reversed(target.parts):
+        part_str = str(part or "").strip()
+        if not part_str or part_str.lower() == "db_storage" or len(part_str) <= 3:
+            continue
+        return _normalize_account_name(part_str)
+
+    return "unknown_account"
+
+
+def _resolve_db_storage_roots(storage_path: Path) -> list[Path]:
+    try:
+        target = storage_path.resolve()
+    except Exception:
+        target = storage_path
+
+    if not target.exists():
+        return []
+
+    current = target if target.is_dir() else target.parent
+    probe = current
+    while True:
+        if probe.name.lower() == "db_storage":
+            return [probe]
+        parent = probe.parent
+        if parent == probe:
+            break
+        probe = parent
+
+    roots: list[Path] = []
+    try:
+        for root, dirs, _files in os.walk(current):
+            root_path = Path(root)
+            if root_path.name.lower() != "db_storage":
+                continue
+            roots.append(root_path)
+            dirs[:] = []
+    except Exception:
+        return []
+
+    uniq: list[Path] = []
+    seen: set[str] = set()
+    for root in roots:
+        key = str(root)
+        if key in seen:
+            continue
+        seen.add(key)
+        uniq.append(root)
+    uniq.sort(key=lambda p: str(p).lower())
+    return uniq
+
+
+def scan_account_databases_from_path(db_storage_path: str) -> dict:
+    storage_path = Path(str(db_storage_path or "").strip())
+    if not storage_path.exists():
+        return {
+            "status": "error",
+            "message": f"指定的数据库路径不存在: {db_storage_path}",
+            "account_databases": {},
+            "account_sources": {},
+            "detected_accounts": [],
+        }
+
+    db_roots = _resolve_db_storage_roots(storage_path)
+    if not db_roots:
+        return {
+            "status": "error",
+            "message": "未找到微信数据库文件！请确保路径指向具体账号的 db_storage 目录。",
+            "account_databases": {},
+            "account_sources": {},
+            "detected_accounts": [],
+        }
+
+    detected_accounts = [
+        {
+            "account": _derive_account_name_from_path(root),
+            "db_storage_path": str(root),
+            "wxid_dir": str(root.parent),
+        }
+        for root in db_roots
+    ]
+
+    if len(db_roots) > 1:
+        account_names = ", ".join(
+            [str(item.get("account") or item.get("db_storage_path") or "").strip() for item in detected_accounts]
+        )
+        return {
+            "status": "error",
+            "message": (
+                "检测到多个账号目录，请选择具体账号的 db_storage 目录后再解密，"
+                f"不要直接选择上级目录。当前检测到: {account_names}"
+            ),
+            "account_databases": {},
+            "account_sources": {},
+            "detected_accounts": detected_accounts,
+        }
+
+    db_root = db_roots[0]
+    account_name = _derive_account_name_from_path(db_root)
+    databases: list[dict] = []
+    for root, _dirs, files in os.walk(db_root):
+        for file_name in files:
+            if not file_name.endswith(".db"):
+                continue
+            if file_name in ["key_info.db"]:
+                continue
+            db_path = os.path.join(root, file_name)
+            databases.append(
+                {
+                    "path": db_path,
+                    "name": file_name,
+                    "account": account_name,
+                }
+            )
+
+    if not databases:
+        return {
+            "status": "error",
+            "message": "未找到微信数据库文件！请检查 db_storage_path 是否正确",
+            "account_databases": {},
+            "account_sources": {},
+            "detected_accounts": detected_accounts,
+        }
+
+    return {
+        "status": "success",
+        "message": "",
+        "account_databases": {account_name: databases},
+        "account_sources": {
+            account_name: {
+                "db_storage_path": str(db_root),
+                "wxid_dir": str(db_root.parent),
+            }
+        },
+        "detected_accounts": detected_accounts,
+    }
+
 def setup_logging():
     """设置日志配置 - 已弃用，使用统一的日志配置"""
     from .logging_config import setup_logging as unified_setup_logging
@@ -259,75 +422,28 @@ def decrypt_wechat_databases(db_storage_path: str = None, key: str = None) -> di
 
     # 查找数据库文件并按账号组织
     account_databases = {}  # {account_name: [db_info, ...]}
+    account_sources = {}
+    detected_accounts = []
 
     if db_storage_path:
-        # 使用指定路径查找数据库
-        storage_path = Path(db_storage_path)
-
-        if storage_path.exists():
-            # 尝试从路径中提取账号名
-            account_name = "unknown_account"
-            path_parts = storage_path.parts
-
-            # 常见的微信账号格式模式
-            account_patterns = ['wxid_']
-
-            for part in path_parts:
-                # 检查是否匹配已知的账号格式
-                for pattern in account_patterns:
-                    if part.startswith(pattern):
-                        # 提取主要部分，去掉后面的随机后缀
-                        # 例如：wxid_v4mbduwqtzpt22_1e7a -> wxid_v4mbduwqtzpt22
-                        parts = part.split('_')
-                        if len(parts) >= 3:  # wxid_主要部分_随机后缀
-                            account_name = '_'.join(parts[:-1])  # 去掉最后一个随机部分
-                        else:
-                            account_name = part  # 如果格式不符合预期，保留原名
-                        break
-                if account_name != "unknown_account":
-                    break
-
-            # 如果没有匹配到已知格式，使用包含数据库的目录名
-            if account_name == "unknown_account":
-                # 查找包含db_storage的父目录作为账号名
-                for part in reversed(path_parts):
-                    if part != "db_storage" and len(part) > 3:
-                        account_name = part
-                        break
-
-            databases = []
-            # 使用递归查找，与自动检测逻辑一致
-            for root, dirs, files in os.walk(storage_path):
-                # 只处理db_storage目录下的数据库文件
-                if "db_storage" not in str(root):
-                    continue
-                for file_name in files:
-                    if not file_name.endswith(".db"):
-                        continue
-                    # 排除不需要解密的数据库
-                    if file_name in ["key_info.db"]:
-                        continue
-                    db_path = os.path.join(root, file_name)
-                    databases.append({
-                        'path': db_path,
-                        'name': file_name,
-                        'account': account_name
-                    })
-
-            if databases:
-                account_databases[account_name] = databases
-                logger.info(f"在指定路径找到账号 {account_name} 的 {len(databases)} 个数据库文件")
-        else:
+        scan_result = scan_account_databases_from_path(db_storage_path)
+        detected_accounts = scan_result.get("detected_accounts", [])
+        if scan_result["status"] == "error":
             return {
                 "status": "error",
-                "message": f"指定的数据库路径不存在: {db_storage_path}",
+                "message": scan_result["message"],
                 "total_databases": 0,
                 "successful_count": 0,
                 "failed_count": 0,
                 "output_directory": str(base_output_dir.absolute()),
                 "processed_files": [],
-                "failed_files": []
+                "failed_files": [],
+                "detected_accounts": scan_result.get("detected_accounts", []),
             }
+        account_databases = scan_result.get("account_databases", {})
+        account_sources = scan_result.get("account_sources", {})
+        for account_name, databases in account_databases.items():
+            logger.info(f"在指定路径找到账号 {account_name} 的 {len(databases)} 个数据库文件")
     else:
         # 不再支持自动检测，要求用户提供具体的db_storage_path
         return {
@@ -387,14 +503,9 @@ def decrypt_wechat_databases(db_storage_path: str = None, key: str = None) -> di
         logger.info(f"账号 {account_name} 输出目录: {account_output_dir}")
 
         try:
-            source_db_storage_path = str(db_storage_path or "")
-            wxid_dir = ""
-            if db_storage_path:
-                sp = Path(db_storage_path)
-                if sp.name.lower() == "db_storage":
-                    wxid_dir = str(sp.parent)
-                else:
-                    wxid_dir = str(sp)
+            source_info = account_sources.get(account_name, {})
+            source_db_storage_path = str(source_info.get("db_storage_path") or db_storage_path or "")
+            wxid_dir = str(source_info.get("wxid_dir") or "")
             (account_output_dir / "_source.json").write_text(
                 json.dumps(
                     {
@@ -473,7 +584,8 @@ def decrypt_wechat_databases(db_storage_path: str = None, key: str = None) -> di
         "output_directory": str(base_output_dir.absolute()),
         "processed_files": processed_files,
         "failed_files": failed_files,
-        "account_results": account_results  # 新增：按账号的详细结果
+        "account_results": account_results,  # 新增：按账号的详细结果
+        "detected_accounts": detected_accounts,
     }
 
     logger.info("=" * 60)

tests/test_wcdb_realtime_dll_path_selection.py

@@ -0,0 +1,45 @@
+import os
+import sys
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+
+ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(ROOT / "src"))
+
+from wechat_decrypt_tool import wcdb_realtime
+
+
+class TestWcdbRealtimeDllPathSelection(unittest.TestCase):
+    def setUp(self) -> None:
+        wcdb_realtime._WCDB_API_DLL_SELECTED = None
+
+    def tearDown(self) -> None:
+        wcdb_realtime._WCDB_API_DLL_SELECTED = None
+
+    def test_resolve_prefers_project_dll_over_weflow(self) -> None:
+        weflow_dll = ROOT / "WeFlow" / "resources" / "wcdb_api.dll"
+        self.assertTrue(weflow_dll.exists())
+        self.assertTrue(wcdb_realtime._DEFAULT_WCDB_API_DLL.exists())
+
+        with patch.dict(os.environ, {"WECHAT_TOOL_WCDB_API_DLL_PATH": str(weflow_dll)}, clear=False):
+            resolved = wcdb_realtime._resolve_wcdb_api_dll_path()
+
+        self.assertEqual(
+            resolved.resolve(),
+            wcdb_realtime._DEFAULT_WCDB_API_DLL.resolve(),
+        )
+
+    def test_resolve_accepts_project_packaged_override(self) -> None:
+        packaged_dll = ROOT / "desktop" / "resources" / "backend" / "native" / "wcdb_api.dll"
+        self.assertTrue(packaged_dll.exists())
+
+        with patch.dict(os.environ, {"WECHAT_TOOL_WCDB_API_DLL_PATH": str(packaged_dll)}, clear=False):
+            resolved = wcdb_realtime._resolve_wcdb_api_dll_path()
+
+        self.assertEqual(resolved.resolve(), packaged_dll.resolve())
+
+
+if __name__ == "__main__":
+    unittest.main()