支持联系人签名、标签分组、地区获取；优化导出效果

feat: 导出联系人标签和详细描述

.github/workflows/release.yml

@@ -119,7 +119,43 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          npx electron-builder --publish always
+          npx electron-builder --win nsis --x64 --publish always '--config.artifactName=${productName}-${version}-x64-Setup.${ext}'
+
+  release-windows-arm64:
+    runs-on: windows-latest
+
+    steps:
+      - name: Check out git repository
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Install Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: 24
+          cache: 'npm'
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Sync version with tag
+        shell: bash
+        run: |
+          VERSION=${GITHUB_REF_NAME#v}
+          echo "Syncing package.json version to $VERSION"
+          npm version $VERSION --no-git-tag-version --allow-same-version
+
+      - name: Build Frontend & Type Check
+        run: |
+          npx tsc
+          npx vite build
+
+      - name: Package and Publish Windows arm64
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          npx electron-builder --win nsis --arm64 --publish always '--config.publish.channel=latest-arm64' '--config.artifactName=${productName}-${version}-arm64-Setup.${ext}'
 
   update-release-notes:
     runs-on: ubuntu-latest
@@ -127,6 +163,7 @@ jobs:
       - release-mac-arm64
       - release-linux
       - release
+      - release-windows-arm64
 
     steps:
       - name: Generate release notes with platform download links
@@ -147,10 +184,15 @@ jobs:
             echo "$ASSETS_JSON" | jq -r --arg p "$pattern" '[.assets[].name | select(test($p))][0] // ""'
           }
 
-          WINDOWS_ASSET="$(pick_asset "\\.exe$")"
+          WINDOWS_ASSET="$(echo "$ASSETS_JSON" | jq -r '[.assets[].name | select(test("x64.*\\.exe$"))][0] // ""')"
+          if [ -z "$WINDOWS_ASSET" ]; then
+            WINDOWS_ASSET="$(echo "$ASSETS_JSON" | jq -r '[.assets[].name | select(test("\\.exe$")) | select(test("arm64") | not)][0] // ""')"
+          fi
+          WINDOWS_ARM64_ASSET="$(echo "$ASSETS_JSON" | jq -r '[.assets[].name | select(test("arm64.*\\.exe$"))][0] // ""')"
           MAC_ASSET="$(pick_asset "\\.dmg$")"
           LINUX_DEB_ASSET="$(pick_asset "\\.deb$")"
           LINUX_TAR_ASSET="$(pick_asset "\\.tar\\.gz$")"
+          LINUX_APPIMAGE_ASSET="$(pick_asset "\\.AppImage$")"
 
           build_link() {
             local name="$1"
@@ -160,9 +202,11 @@ jobs:
           }
 
           WINDOWS_URL="$(build_link "$WINDOWS_ASSET")"
+          WINDOWS_ARM64_URL="$(build_link "$WINDOWS_ARM64_ASSET")"
           MAC_URL="$(build_link "$MAC_ASSET")"
           LINUX_DEB_URL="$(build_link "$LINUX_DEB_ASSET")"
           LINUX_TAR_URL="$(build_link "$LINUX_TAR_ASSET")"
+          LINUX_APPIMAGE_URL="$(build_link "$LINUX_APPIMAGE_ASSET")"
 
           cat > release_notes.md <<EOF
           ## 更新日志
@@ -172,10 +216,18 @@ jobs:
           [点击加入 Telegram 频道](https://t.me/weflow_cc)
 
           ## 下载
-          - Windows （Win10+）: ${WINDOWS_URL:-$RELEASE_PAGE}
+          - Windows x64（Win10+）: ${WINDOWS_URL:-$RELEASE_PAGE}
+          - Windows arm64: ${WINDOWS_ARM64_URL:-$RELEASE_PAGE}
           - macOS（M系列芯片）: ${MAC_URL:-$RELEASE_PAGE}
-          - Linux (.deb): ${LINUX_DEB_URL:-$RELEASE_PAGE}
+          - Linux (.deb) (即将废弃): ${LINUX_DEB_URL:-$RELEASE_PAGE}
           - Linux (.tar.gz): ${LINUX_TAR_URL:-$RELEASE_PAGE}
+          - linux (.AppImage): ${LINUX_APPIMAGE_URL:-$RELEASE_PAGE}
+
+          ## macOS 安装提示（未知来源）
+          - 若打开时提示“来自未知开发者”或“无法验证开发者”，请到「系统设置 -> 隐私与安全性」中允许打开该应用。
+          - 如果仍被系统拦截，请在终端执行以下命令去除隔离标记：
+          - `xattr -dr com.apple.quarantine "/Applications/WeFlow.app"`
+          - 执行后重新打开 WeFlow。
 
           > 如果某个平台链接暂时未生成，可进入完整发布页查看全部资源：$RELEASE_PAGE
           EOF

.gitignore

@@ -70,3 +70,4 @@ resources/wx_send
 概述.md
 pnpm-lock.yaml
 /pnpm-workspace.yaml
+wechat-research-site

README.md

@@ -43,9 +43,19 @@ WeFlow 是一个**完全本地**的微信**实时**聊天记录查看、分析
 - HTTP API 接口（供开发者集成）
 - 查看完整能力清单：[详细功能](#详细功能清单)
 
+## 支持平台与设备
+
+
+| 平台 | 设备/架构 | 安装包 |
+|------|----------|--------|
+| Windows | Windows10+、x64（amd64） | `.exe` |
+| macOS | Apple Silicon（M 系列，arm64） | `.dmg` |
+| Linux | x64 设备（amd64） | `.deb`、`.tar.gz` |
+
+
 ## 快速开始
 
-若你只想使用成品版本，可前往 Release 下载并安装。
+若你只想使用成品版本，可前往 [Releases](https://github.com/hicccc77/WeFlow/releases) 下载并安装。
 
 ## 详细功能清单
 
@@ -94,14 +104,8 @@ npm install
 # 3. 运行应用（开发模式）
 npm run dev
 
-# 4. 打包可执行文件
-npm run build
 ```
 
-打包产物在 `release` 目录下。
-
-
-
 ## 致谢
 
 - [密语 CipherTalk](https://github.com/ILoveBingLu/miyu) 为本项目提供了基础框架

electron/main.ts

@@ -36,6 +36,10 @@ import { messagePushService } from './services/messagePushService'
 autoUpdater.autoDownload = false
 autoUpdater.autoInstallOnAppQuit = true
 autoUpdater.disableDifferentialDownload = true  // 禁用差分更新，强制全量下载
+// Windows x64 与 arm64 使用不同更新通道，避免 latest.yml 互相覆盖导致下错架构安装包。
+if (process.platform === 'win32' && process.arch === 'arm64') {
+  autoUpdater.channel = 'latest-arm64'
+}
 const AUTO_UPDATE_ENABLED =
   process.env.AUTO_UPDATE_ENABLED === 'true' ||
   process.env.AUTO_UPDATE_ENABLED === '1' ||
@@ -122,6 +126,81 @@ let isDownloadInProgress = false
 let downloadProgressHandler: ((progress: any) => void) | null = null
 let downloadedHandler: (() => void) | null = null
 
+const normalizeReleaseNotes = (rawReleaseNotes: unknown): string => {
+  const merged = (() => {
+    if (typeof rawReleaseNotes === 'string') {
+      return rawReleaseNotes
+    }
+    if (Array.isArray(rawReleaseNotes)) {
+      return rawReleaseNotes
+        .map((item) => {
+          if (!item || typeof item !== 'object') return ''
+          const note = (item as { note?: unknown }).note
+          return typeof note === 'string' ? note : ''
+        })
+        .filter(Boolean)
+        .join('\n\n')
+    }
+    return ''
+  })()
+
+  if (!merged.trim()) return ''
+
+  const shouldStripReleaseSection = (headingRaw: string): boolean => {
+    const heading = headingRaw.trim().toLowerCase()
+    if (heading === '下载' || heading === 'download') return true
+
+    const compactHeading = heading.replace(/\s+/g, '')
+    if (compactHeading.startsWith('macos安装提示')) return true
+    if (compactHeading.startsWith('mac安装提示')) return true
+    return false
+  }
+
+  // 兼容 electron-updater 直接返回 HTML 的场景
+  const removeDownloadSectionFromHtml = (input: string): string => {
+    return input
+      .replace(
+        /<h[1-6][^>]*>\s*(?:下载|download)\s*<\/h[1-6]>\s*[\s\S]*?(?=<h[1-6]\b|$)/gi,
+        ''
+      )
+      .replace(
+        /<h[1-6][^>]*>\s*(?:mac\s*os|mac)\s*安装提示(?:\s*[（(]\s*未知来源\s*[）)])?\s*<\/h[1-6]>\s*[\s\S]*?(?=<h[1-6]\b|$)/gi,
+        ''
+      )
+  }
+
+  // 兼容 Markdown 场景（Action 最终 release note 模板）
+  const removeDownloadSectionFromMarkdown = (input: string): string => {
+    const lines = input.split(/\r?\n/)
+    const output: string[] = []
+    let skipSection = false
+
+    for (const line of lines) {
+      const headingMatch = line.match(/^\s*#{1,6}\s*(.+?)\s*$/)
+      if (headingMatch) {
+        if (shouldStripReleaseSection(headingMatch[1])) {
+          skipSection = true
+          continue
+        }
+        if (skipSection) {
+          skipSection = false
+        }
+      }
+      if (!skipSection) {
+        output.push(line)
+      }
+    }
+
+    return output.join('\n')
+  }
+
+  const cleaned = removeDownloadSectionFromMarkdown(removeDownloadSectionFromHtml(merged))
+    .replace(/\n{3,}/g, '\n\n')
+    .trim()
+
+  return cleaned
+}
+
 type AnnualReportYearsLoadStrategy = 'cache' | 'native' | 'hybrid'
 type AnnualReportYearsLoadPhase = 'cache' | 'native' | 'scan' | 'done'
 
@@ -1043,6 +1122,13 @@ function registerIpcHandlers() {
     return app.getVersion()
   })
 
+  ipcMain.handle('app:checkWayland', async () => {
+    if (process.platform !== 'linux') return false;
+
+    const sessionType = process.env.XDG_SESSION_TYPE?.toLowerCase();
+    return Boolean(process.env.WAYLAND_DISPLAY || sessionType === 'wayland');
+  })
+
   ipcMain.handle('log:getPath', async () => {
     return join(app.getPath('userData'), 'logs', 'wcdb.log')
   })
@@ -1114,7 +1200,7 @@ function registerIpcHandlers() {
           return {
             hasUpdate: true,
             version: latestVersion,
-            releaseNotes: result.updateInfo.releaseNotes as string || ''
+            releaseNotes: normalizeReleaseNotes(result.updateInfo.releaseNotes)
           }
         }
       }
@@ -1459,8 +1545,8 @@ function registerIpcHandlers() {
     return await chatService.resolveTransferDisplayNames(chatroomId, payerUsername, receiverUsername)
   })
 
-  ipcMain.handle('chat:getContacts', async () => {
-    return await chatService.getContacts()
+  ipcMain.handle('chat:getContacts', async (_, options?: { lite?: boolean }) => {
+    return await chatService.getContacts(options)
   })
 
   ipcMain.handle('chat:getCachedMessages', async (_, sessionId: string) => {
@@ -2567,7 +2653,7 @@ function checkForUpdatesOnStartup() {
           // 通知渲染进程有新版本
           mainWindow.webContents.send('app:updateAvailable', {
             version: latestVersion,
-            releaseNotes: result.updateInfo.releaseNotes || ''
+            releaseNotes: normalizeReleaseNotes(result.updateInfo.releaseNotes)
           })
         }
       }

electron/preload.ts

@@ -63,7 +63,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
     onUpdateAvailable: (callback: (info: { version: string; releaseNotes: string }) => void) => {
       ipcRenderer.on('app:updateAvailable', (_, info) => callback(info))
       return () => ipcRenderer.removeAllListeners('app:updateAvailable')
-    }
+    },
+    checkWayland: () => ipcRenderer.invoke('app:checkWayland'),
   },
 
   // 日志
@@ -224,7 +225,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
       ipcRenderer.on('chat:voiceTranscriptPartial', listener)
       return () => ipcRenderer.removeListener('chat:voiceTranscriptPartial', listener)
     },
-    getContacts: () => ipcRenderer.invoke('chat:getContacts'),
+    getContacts: (options?: { lite?: boolean }) => ipcRenderer.invoke('chat:getContacts', options),
     getMessage: (sessionId: string, localId: number) =>
       ipcRenderer.invoke('chat:getMessage', sessionId, localId),
     searchMessages: (keyword: string, sessionId?: string, limit?: number, offset?: number, beginTimestamp?: number, endTimestamp?: number) =>

electron/services/chatService.ts

@@ -6,7 +6,7 @@ import * as https from 'https'
 import * as http from 'http'
 import * as fzstd from 'fzstd'
 import * as crypto from 'crypto'
-import { app, BrowserWindow } from 'electron'
+import { app, BrowserWindow, dialog } from 'electron'
 import { ConfigService } from './config'
 import { wcdbService } from './wcdbService'
 import { MessageCacheService } from './messageCacheService'
@@ -16,6 +16,7 @@ import { GroupMyMessageCountCacheService, GroupMyMessageCountCacheEntry } from '
 import { exportCardDiagnosticsService } from './exportCardDiagnosticsService'
 import { voiceTranscribeService } from './voiceTranscribeService'
 import { ImageDecryptService } from './imageDecryptService'
+import { CONTACT_REGION_LOOKUP_DATA } from './contactRegionLookupData'
 import { LRUCache } from '../utils/LRUCache.js'
 
 export interface ChatSession {
@@ -153,10 +154,17 @@ export interface ContactInfo {
   remark?: string
   nickname?: string
   alias?: string
+  labels?: string[]
+  detailDescription?: string
+  region?: string
   avatarUrl?: string
   type: 'friend' | 'group' | 'official' | 'former_friend' | 'other'
 }
 
+interface GetContactsOptions {
+  lite?: boolean
+}
+
 interface ExportSessionStats {
   totalMessages: number
   voiceMessages: number
@@ -292,6 +300,22 @@ class ChatService {
   private readonly allGroupSessionIdsCacheTtlMs = 5 * 60 * 1000
   private groupMyMessageCountCacheScope = ''
   private groupMyMessageCountMemoryCache = new Map<string, GroupMyMessageCountCacheEntry>()
+  private initFailureDialogShown = false
+  private readonly contactExtendedFieldCandidates = [
+    'label_list', 'labelList', 'labels', 'label_names', 'labelNames', 'tags', 'tag_list', 'tagList',
+    'detail_description', 'detailDescription', 'description', 'desc', 'contact_description', 'contactDescription', 'signature', 'sign',
+    'country', 'province', 'city', 'region',
+    'profile', 'introduction', 'phone', 'mobile', 'telephone', 'tel', 'vcard', 'card_info', 'cardInfo',
+    'extra_buffer', 'extraBuffer'
+  ]
+  private readonly contactExtendedFieldCandidateSet = new Set(this.contactExtendedFieldCandidates.map((name) => name.toLowerCase()))
+  private contactExtendedSelectableColumns: string[] | null = null
+  private contactLabelNameMapCache: Map<number, string> | null = null
+  private contactLabelNameMapCacheAt = 0
+  private readonly contactLabelNameMapCacheTtlMs = 10 * 60 * 1000
+  private contactsLoadInFlight: { mode: 'lite' | 'full'; promise: Promise<{ success: boolean; contacts?: ContactInfo[]; error?: string }> } | null = null
+  private readonly contactDisplayNameCollator = new Intl.Collator('zh-CN')
+  private readonly slowGetContactsLogThresholdMs = 1200
 
   constructor() {
     this.configService = new ConfigService()
@@ -338,6 +362,55 @@ class ChatService {
     return true
   }
 
+  private extractErrorCode(message?: string): number | null {
+    const text = String(message || '').trim()
+    if (!text) return null
+    const match = text.match(/(?:错误码\s*[:：]\s*|\()(-?\d{2,6})(?:\)|\b)/)
+    if (!match) return null
+    const parsed = Number(match[1])
+    return Number.isFinite(parsed) ? parsed : null
+  }
+
+  private toCodeOnlyMessage(rawMessage?: string, fallbackCode = -3999): string {
+    const code = this.extractErrorCode(rawMessage) ?? fallbackCode
+    return `错误码: ${code}`
+  }
+
+  private async maybeShowInitFailureDialog(errorMessage: string): Promise<void> {
+    if (!app.isPackaged) return
+    if (this.initFailureDialogShown) return
+
+    const code = this.extractErrorCode(errorMessage)
+    if (code === null) return
+    const isSecurityCode =
+      code === -101 ||
+      code === -102 ||
+      code === -2299 ||
+      code === -2301 ||
+      code === -2302 ||
+      code === -1006 ||
+      (code <= -2201 && code >= -2212)
+    if (!isSecurityCode) return
+
+    this.initFailureDialogShown = true
+    const detail = [
+      `错误码: ${code}`
+    ].join('\n')
+
+    try {
+      await dialog.showMessageBox({
+        type: 'error',
+        title: 'WeFlow 启动失败',
+        message: '启动失败，请反馈错误码。',
+        detail,
+        buttons: ['确定'],
+        noLink: true
+      })
+    } catch {
+      // 弹窗失败不阻断主流程
+    }
+  }
+
   /**
    * 连接数据库
    */
@@ -362,7 +435,9 @@ class ChatService {
       const cleanedWxid = this.cleanAccountDirName(wxid)
       const openOk = await wcdbService.open(dbPath, decryptKey, cleanedWxid)
       if (!openOk) {
-        return { success: false, error: 'WCDB 打开失败，请检查路径和密钥' }
+        const detailedError = this.toCodeOnlyMessage(await wcdbService.getLastInitError())
+        await this.maybeShowInitFailureDialog(detailedError)
+        return { success: false, error: detailedError }
       }
 
       this.connected = true
@@ -376,7 +451,7 @@ class ChatService {
       return { success: true }
     } catch (e) {
       console.error('ChatService: 连接数据库失败:', e)
-      return { success: false, error: String(e) }
+      return { success: false, error: this.toCodeOnlyMessage(String(e), -3998) }
     }
   }
 
@@ -1215,25 +1290,61 @@ class ChatService {
   /**
    * 获取通讯录列表
    */
-  async getContacts(): Promise<{ success: boolean; contacts?: ContactInfo[]; error?: string }> {
+  async getContacts(options?: GetContactsOptions): Promise<{ success: boolean; contacts?: ContactInfo[]; error?: string }> {
+    const mode: 'lite' | 'full' = options?.lite ? 'lite' : 'full'
+    const inFlight = this.contactsLoadInFlight
+    if (inFlight && (inFlight.mode === mode || (mode === 'lite' && inFlight.mode === 'full'))) {
+      return await inFlight.promise
+    }
+
+    const promise = this.getContactsInternal(options)
+    this.contactsLoadInFlight = { mode, promise }
     try {
+      return await promise
+    } finally {
+      if (this.contactsLoadInFlight?.promise === promise) {
+        this.contactsLoadInFlight = null
+      }
+    }
+  }
+
+  private async getContactsInternal(options?: GetContactsOptions): Promise<{ success: boolean; contacts?: ContactInfo[]; error?: string }> {
+    const isLiteMode = options?.lite === true
+    const startedAt = Date.now()
+    const stageDurations: Array<{ stage: string; ms: number }> = []
+    const captureStage = (stage: string, stageStartedAt: number) => {
+      stageDurations.push({ stage, ms: Date.now() - stageStartedAt })
+    }
+
+    try {
+      const connectStartedAt = Date.now()
       const connectResult = await this.ensureConnected()
+      captureStage('ensureConnected', connectStartedAt)
       if (!connectResult.success) {
         return { success: false, error: connectResult.error }
       }
 
+      const contactsCompactStartedAt = Date.now()
       const contactResult = await wcdbService.getContactsCompact()
+      captureStage('getContactsCompact', contactsCompactStartedAt)
 
       if (!contactResult.success || !contactResult.contacts) {
         console.error('查询联系人失败:', contactResult.error)
         return { success: false, error: contactResult.error || '查询联系人失败' }
       }
 
+      let rows = contactResult.contacts as Record<string, any>[]
+      if (!isLiteMode) {
+        const hydrateStartedAt = Date.now()
+        rows = await this.hydrateContactsWithExtendedFields(rows)
+        captureStage('hydrateContactsWithExtendedFields', hydrateStartedAt)
+      }
 
-      const rows = contactResult.contacts as Record<string, any>[]
       // 获取会话表的最后联系时间用于排序
+      const sessionsStartedAt = Date.now()
       const lastContactTimeMap = new Map<string, number>()
       const sessionResult = await wcdbService.getSessions()
+      captureStage('getSessions', sessionsStartedAt)
       if (sessionResult.success && sessionResult.sessions) {
         for (const session of sessionResult.sessions as any[]) {
           const username = session.username || session.user_name || session.userName || ''
@@ -1245,9 +1356,14 @@ class ChatService {
       }
 
       // 转换为ContactInfo
+      const transformStartedAt = Date.now()
       const contacts: (ContactInfo & { lastContactTime: number })[] = []
-      const excludeNames = new Set(['medianote', 'floatbottle', 'qmessage', 'qqmail', 'fmessage'])
-
+      let contactLabelNameMap = new Map<number, string>()
+      if (!isLiteMode) {
+        const labelMapStartedAt = Date.now()
+        contactLabelNameMap = await this.getContactLabelNameMap()
+        captureStage('getContactLabelNameMap', labelMapStartedAt)
+      }
       for (const row of rows) {
         const username = String(row.username || '').trim()
 
@@ -1261,7 +1377,7 @@ class ChatService {
           type = 'group'
         } else if (username.startsWith('gh_')) {
           type = 'official'
-        } else if (localType === 1 && !excludeNames.has(username)) {
+        } else if (localType === 1 && !FRIEND_EXCLUDE_USERNAMES.has(username)) {
           type = 'friend'
         } else if (localType === 0 && quanPin) {
           type = 'former_friend'
@@ -1270,6 +1386,9 @@ class ChatService {
         }
 
         const displayName = row.remark || row.nick_name || row.alias || username
+        const labels = isLiteMode ? [] : this.parseContactLabels(row, contactLabelNameMap)
+        const detailDescription = isLiteMode ? '' : this.getContactSignature(row)
+        const region = isLiteMode ? '' : this.getContactRegion(row)
 
         contacts.push({
           username,
@@ -1277,16 +1396,19 @@ class ChatService {
           remark: row.remark || undefined,
           nickname: row.nick_name || undefined,
           alias: row.alias || undefined,
+          labels: labels.length > 0 ? labels : undefined,
+          detailDescription: detailDescription || undefined,
+          region: region || undefined,
           avatarUrl: undefined,
           type,
           lastContactTime: lastContactTimeMap.get(username) || 0
         })
       }
-
-
+      captureStage('transformContacts', transformStartedAt)
 
 
       // 按最近联系时间排序
+      const sortStartedAt = Date.now()
       contacts.sort((a, b) => {
         const timeA = a.lastContactTime || 0
         const timeB = b.lastContactTime || 0
@@ -1295,13 +1417,22 @@ class ChatService {
         }
         if (timeA && !timeB) return -1
         if (!timeA && timeB) return 1
-        return a.displayName.localeCompare(b.displayName, 'zh-CN')
+        return this.contactDisplayNameCollator.compare(a.displayName, b.displayName)
       })
+      captureStage('sortContacts', sortStartedAt)
 
       // 移除临时的lastContactTime字段
+      const finalizeStartedAt = Date.now()
       const result = contacts.map(({ lastContactTime, ...rest }) => rest)
+      captureStage('finalizeResult', finalizeStartedAt)
 
-
+      const totalMs = Date.now() - startedAt
+      if (totalMs >= this.slowGetContactsLogThresholdMs) {
+        const stageSummary = stageDurations
+          .map((item) => `${item.stage}=${item.ms}ms`)
+          .join(', ')
+        console.warn(`[ChatService] getContacts(${isLiteMode ? 'lite' : 'full'}) 慢查询 total=${totalMs}ms, ${stageSummary}`)
+      }
       return { success: true, contacts: result }
     } catch (e) {
       console.error('ChatService: 获取通讯录失败:', e)
@@ -1828,6 +1959,568 @@ class ChatService {
     return Number.isFinite(parsed) ? parsed : fallback
   }
 
+  private hasAnyContactExtendedFieldKey(row: Record<string, any>): boolean {
+    for (const key of Object.keys(row || {})) {
+      if (this.contactExtendedFieldCandidateSet.has(String(key || '').toLowerCase())) {
+        return true
+      }
+    }
+    return false
+  }
+
+  private async hydrateContactsWithExtendedFields(rows: Record<string, any>[]): Promise<Record<string, any>[]> {
+    if (!Array.isArray(rows) || rows.length === 0) return rows
+    const hasAnyExtendedFieldKey = rows.some((row) => this.hasAnyContactExtendedFieldKey(row || {}))
+    if (hasAnyExtendedFieldKey) {
+      // wcdb_get_contacts_compact 可能只给“部分联系人”返回 extra_buffer。
+      // 只有在每一行都能拿到可解析的 extra_buffer 时才跳过补偿查询。
+      const allRowsHaveUsableExtraBuffer = rows.every((row) => this.toExtraBufferBytes(row || {}) !== null)
+      if (allRowsHaveUsableExtraBuffer) return rows
+    }
+
+    try {
+      let selectableColumns = this.contactExtendedSelectableColumns
+      if (!selectableColumns) {
+        const tableInfoResult = await wcdbService.execQuery('contact', null, 'PRAGMA table_info(contact)')
+        if (!tableInfoResult.success || !Array.isArray(tableInfoResult.rows)) {
+          return rows
+        }
+
+        const availableColumns = new Map<string, string>()
+        for (const tableInfoRow of tableInfoResult.rows as Record<string, any>[]) {
+          const rawName = tableInfoRow.name ?? tableInfoRow.column_name ?? tableInfoRow.columnName
+          const name = String(rawName || '').trim()
+          if (!name) continue
+          availableColumns.set(name.toLowerCase(), name)
+        }
+
+        const resolvedColumns: string[] = []
+        const seenColumns = new Set<string>()
+        for (const candidate of this.contactExtendedFieldCandidates) {
+          const actual = availableColumns.get(candidate.toLowerCase())
+          if (!actual) continue
+          const normalized = actual.toLowerCase()
+          if (seenColumns.has(normalized)) continue
+          seenColumns.add(normalized)
+          resolvedColumns.push(actual)
+        }
+
+        this.contactExtendedSelectableColumns = resolvedColumns
+        selectableColumns = resolvedColumns
+      }
+
+      if (!selectableColumns || selectableColumns.length === 0) return rows
+
+      const selectColumns = ['username', ...selectableColumns]
+      const sql = `SELECT ${selectColumns.map((column) => this.quoteSqlIdentifier(column)).join(', ')} FROM contact WHERE username IS NOT NULL AND username != ''`
+      const extendedResult = await wcdbService.execQuery('contact', null, sql)
+      if (!extendedResult.success || !Array.isArray(extendedResult.rows) || extendedResult.rows.length === 0) {
+        return rows
+      }
+
+      const extendedByUsername = new Map<string, Record<string, any>>()
+      for (const extendedRow of extendedResult.rows as Record<string, any>[]) {
+        const username = String(extendedRow.username || '').trim()
+        if (!username) continue
+        extendedByUsername.set(username, extendedRow)
+      }
+      if (extendedByUsername.size === 0) return rows
+
+      return rows.map((row) => {
+        const username = String(row.username || row.user_name || row.userName || '').trim()
+        if (!username) return row
+        const extended = extendedByUsername.get(username)
+        if (!extended) return row
+        return {
+          ...extended,
+          ...row
+        }
+      })
+    } catch (error) {
+      console.warn('联系人扩展字段补偿查询失败:', error)
+      return rows
+    }
+  }
+
+  private async getContactLabelNameMap(): Promise<Map<number, string>> {
+    const now = Date.now()
+    if (this.contactLabelNameMapCache && now - this.contactLabelNameMapCacheAt <= this.contactLabelNameMapCacheTtlMs) {
+      return new Map(this.contactLabelNameMapCache)
+    }
+
+    const labelMap = new Map<number, string>()
+    try {
+      const tableInfoResult = await wcdbService.execQuery('contact', null, 'PRAGMA table_info(contact_label)')
+      if (!tableInfoResult.success || !Array.isArray(tableInfoResult.rows) || tableInfoResult.rows.length === 0) {
+        this.contactLabelNameMapCache = labelMap
+        this.contactLabelNameMapCacheAt = now
+        return labelMap
+      }
+
+      const availableColumns = new Map<string, string>()
+      for (const tableInfoRow of tableInfoResult.rows as Record<string, any>[]) {
+        const rawName = tableInfoRow.name ?? tableInfoRow.column_name ?? tableInfoRow.columnName
+        const name = String(rawName || '').trim()
+        if (!name) continue
+        availableColumns.set(name.toLowerCase(), name)
+      }
+
+      const pickColumn = (candidates: string[]): string | null => {
+        for (const candidate of candidates) {
+          const actual = availableColumns.get(candidate.toLowerCase())
+          if (actual) return actual
+        }
+        return null
+      }
+
+      const idColumn = pickColumn(['label_id_', 'label_id', 'labelId', 'labelid', 'id'])
+      const nameColumn = pickColumn(['label_name_', 'label_name', 'labelName', 'labelname', 'name'])
+      if (!idColumn || !nameColumn) {
+        this.contactLabelNameMapCache = labelMap
+        this.contactLabelNameMapCacheAt = now
+        return labelMap
+      }
+
+      const sql = `SELECT ${this.quoteSqlIdentifier(idColumn)} AS label_id, ${this.quoteSqlIdentifier(nameColumn)} AS label_name FROM contact_label`
+      const result = await wcdbService.execQuery('contact', null, sql)
+      if (result.success && Array.isArray(result.rows)) {
+        for (const row of result.rows as Record<string, any>[]) {
+          const id = Number(String(row.label_id ?? row.labelId ?? '').trim())
+          const name = String(row.label_name ?? row.labelName ?? '').trim()
+          if (Number.isFinite(id) && id > 0 && name) {
+            labelMap.set(Math.floor(id), name)
+          }
+        }
+      }
+    } catch (error) {
+      console.warn('读取 contact_label 失败:', error)
+    }
+
+    this.contactLabelNameMapCache = labelMap
+    this.contactLabelNameMapCacheAt = now
+    return new Map(labelMap)
+  }
+
+  private toExtraBufferBytes(row: Record<string, any>): Buffer | null {
+    const raw = this.getRowField(row, ['extra_buffer', 'extraBuffer'])
+    if (raw === undefined || raw === null) return null
+    if (Buffer.isBuffer(raw)) return raw.length > 0 ? raw : null
+    if (raw instanceof Uint8Array) return raw.length > 0 ? Buffer.from(raw) : null
+    if (Array.isArray(raw)) {
+      const bytes = Buffer.from(raw)
+      return bytes.length > 0 ? bytes : null
+    }
+
+    const text = String(raw || '').trim()
+    if (!text) return null
+    const compact = text.replace(/\s+/g, '')
+    if (compact.length >= 2 && compact.length % 2 === 0 && /^[0-9a-fA-F]+$/.test(compact)) {
+      try {
+        const bytes = Buffer.from(compact, 'hex')
+        return bytes.length > 0 ? bytes : null
+      } catch {
+        return null
+      }
+    }
+    return null
+  }
+
+  private readProtoVarint(buffer: Buffer, offset: number): { value: number; nextOffset: number } | null {
+    if (!buffer || offset < 0 || offset >= buffer.length) return null
+    let value = 0
+    let shift = 0
+    let index = offset
+    while (index < buffer.length) {
+      const byte = buffer[index]
+      index += 1
+      value += (byte & 0x7f) * Math.pow(2, shift)
+      if ((byte & 0x80) === 0) {
+        return { value, nextOffset: index }
+      }
+      shift += 7
+      if (shift > 56) return null
+    }
+    return null
+  }
+
+  private extractExtraBufferTopLevelFieldStrings(row: Record<string, any>, targetField: number): string[] {
+    const bytes = this.toExtraBufferBytes(row)
+    if (!bytes || !Number.isFinite(targetField) || targetField <= 0) return []
+    const values: string[] = []
+    let offset = 0
+    while (offset < bytes.length) {
+      const tagResult = this.readProtoVarint(bytes, offset)
+      if (!tagResult) break
+      offset = tagResult.nextOffset
+      const fieldNumber = Math.floor(tagResult.value / 8)
+      const wireType = tagResult.value & 0x07
+
+      if (wireType === 0) {
+        const varint = this.readProtoVarint(bytes, offset)
+        if (!varint) break
+        offset = varint.nextOffset
+        continue
+      }
+
+      if (wireType === 1) {
+        if (offset + 8 > bytes.length) break
+        offset += 8
+        continue
+      }
+
+      if (wireType === 2) {
+        const lengthResult = this.readProtoVarint(bytes, offset)
+        if (!lengthResult) break
+        const payloadLength = Math.floor(lengthResult.value)
+        offset = lengthResult.nextOffset
+        if (payloadLength < 0 || offset + payloadLength > bytes.length) break
+        const payload = bytes.subarray(offset, offset + payloadLength)
+        offset += payloadLength
+        if (fieldNumber === targetField) {
+          const text = payload.toString('utf-8').replace(/\u0000/g, '').trim()
+          if (text) values.push(text)
+        }
+        continue
+      }
+
+      if (wireType === 5) {
+        if (offset + 4 > bytes.length) break
+        offset += 4
+        continue
+      }
+
+      break
+    }
+    return values
+  }
+
+  private parseContactLabelsFromExtraBuffer(row: Record<string, any>, labelNameMap?: Map<number, string>): string[] {
+    const labelNames: string[] = []
+    const seen = new Set<string>()
+    const texts = this.extractExtraBufferTopLevelFieldStrings(row, 30)
+    for (const text of texts) {
+      const matches = text.match(/\d+/g) || []
+      for (const match of matches) {
+        const id = Number(match)
+        if (!Number.isFinite(id) || id <= 0) continue
+        const labelName = labelNameMap?.get(Math.floor(id))
+        if (!labelName) continue
+        if (seen.has(labelName)) continue
+        seen.add(labelName)
+        labelNames.push(labelName)
+      }
+    }
+    return labelNames
+  }
+
+  private parseContactLabels(row: Record<string, any>, labelNameMap?: Map<number, string>): string[] {
+    const raw = this.getRowField(row, [
+      'label_list', 'labelList', 'labels', 'label_names', 'labelNames', 'tags', 'tag_list', 'tagList'
+    ])
+    const normalizedFromValue = (value: unknown): string[] => {
+      if (Array.isArray(value)) {
+        return Array.from(new Set(value.map((item) => String(item || '').trim()).filter(Boolean)))
+      }
+      const text = String(value || '').trim()
+      if (!text) return []
+      return Array.from(new Set(
+        text
+          .replace(/[；;、|]+/g, ',')
+          .split(',')
+          .map((item) => item.trim())
+          .filter(Boolean)
+      ))
+    }
+
+    const direct = normalizedFromValue(raw)
+    if (direct.length > 0) return direct
+
+    for (const [key, value] of Object.entries(row)) {
+      const normalizedKey = key.toLowerCase()
+      if (!normalizedKey.includes('label') && !normalizedKey.includes('tag')) continue
+      if (normalizedKey.includes('img') || normalizedKey.includes('head')) continue
+      const fallback = normalizedFromValue(value)
+      if (fallback.length > 0) return fallback
+    }
+
+    const extraBufferLabels = this.parseContactLabelsFromExtraBuffer(row, labelNameMap)
+    if (extraBufferLabels.length > 0) return extraBufferLabels
+
+    return []
+  }
+
+  private getContactSignature(row: Record<string, any>): string {
+    const normalize = (raw: unknown): string => {
+      const text = String(raw || '').replace(/\u0000/g, '').trim()
+      if (!text) return ''
+      const lower = text.toLowerCase()
+      if (lower === '-' || lower === '--' || lower === '—' || lower === 'null' || lower === 'undefined' || lower === 'none') {
+        return ''
+      }
+      return text
+    }
+
+    const value = this.getRowField(row, [
+      'signature', 'sign', 'personal_signature', 'personalSignature', 'profile', 'introduction',
+      'detail_description', 'detailDescription', 'description', 'desc', 'contact_description', 'contactDescription'
+    ])
+    const direct = normalize(value)
+    if (direct) return direct
+
+    for (const [key, rawValue] of Object.entries(row)) {
+      const normalizedKey = key.toLowerCase()
+      const isCandidate =
+        normalizedKey.includes('sign') ||
+        normalizedKey.includes('signature') ||
+        normalizedKey.includes('profile') ||
+        normalizedKey.includes('intro') ||
+        normalizedKey.includes('description') ||
+        normalizedKey.includes('detail') ||
+        normalizedKey.includes('desc')
+      if (!isCandidate) continue
+      if (
+        normalizedKey.includes('avatar') ||
+        normalizedKey.includes('img') ||
+        normalizedKey.includes('head') ||
+        normalizedKey.includes('label') ||
+        normalizedKey.includes('tag')
+      ) continue
+      const text = normalize(rawValue)
+      if (text) return text
+    }
+
+    // contact.extra_buffer field 4: 个性签名兜底
+    const signatures = this.extractExtraBufferTopLevelFieldStrings(row, 4)
+    for (const signature of signatures) {
+      const text = normalize(signature)
+      if (!text) continue
+      return text
+    }
+
+    return ''
+  }
+
+  private normalizeContactRegionPart(raw: unknown): string {
+    const text = String(raw || '').replace(/\u0000/g, '').trim()
+    if (!text) return ''
+    const lower = text.toLowerCase()
+    if (lower === '-' || lower === '--' || lower === '—' || lower === 'null' || lower === 'undefined' || lower === 'none') {
+      return ''
+    }
+    return text
+  }
+
+  private normalizeRegionLookupKey(raw: string): string {
+    return String(raw || '')
+      .toLowerCase()
+      .replace(/[^a-z0-9\u4e00-\u9fa5]+/g, '')
+  }
+
+  private buildRegionLookupCandidates(raw: string): string[] {
+    const normalized = this.normalizeRegionLookupKey(raw)
+    if (!normalized) return []
+
+    const candidates = new Set<string>([normalized])
+    const withoutTrailingDigits = normalized.replace(/\d+$/g, '')
+    if (withoutTrailingDigits) candidates.add(withoutTrailingDigits)
+
+    return Array.from(candidates)
+  }
+
+  private normalizeChineseProvinceName(raw: string): string {
+    const text = String(raw || '').trim()
+    if (!text) return ''
+    return text
+      .replace(/特别行政区$/g, '')
+      .replace(/维吾尔自治区$/g, '')
+      .replace(/壮族自治区$/g, '')
+      .replace(/回族自治区$/g, '')
+      .replace(/自治区$/g, '')
+      .replace(/省$/g, '')
+      .replace(/市$/g, '')
+      .trim()
+  }
+
+  private normalizeChineseCityName(raw: string): string {
+    const text = String(raw || '').trim()
+    if (!text) return ''
+    return text
+      .replace(/特别行政区$/g, '')
+      .replace(/自治州$/g, '')
+      .replace(/地区$/g, '')
+      .replace(/盟$/g, '')
+      .replace(/林区$/g, '')
+      .replace(/市$/g, '')
+      .trim()
+  }
+
+  private resolveProvinceLookupKey(raw: string): string {
+    const candidates = this.buildRegionLookupCandidates(raw)
+    if (candidates.length === 0) return ''
+
+    for (const candidate of candidates) {
+      const byName = CONTACT_REGION_LOOKUP_DATA.provinceKeyByName[candidate]
+      if (byName) return byName
+      if (CONTACT_REGION_LOOKUP_DATA.provinceNameByKey[candidate]) return candidate
+    }
+
+    return candidates[0]
+  }
+
+  private toChineseCountryName(raw: string): string {
+    const text = this.normalizeContactRegionPart(raw)
+    if (!text) return ''
+
+    const candidates = this.buildRegionLookupCandidates(text)
+    for (const candidate of candidates) {
+      const mapped = CONTACT_REGION_LOOKUP_DATA.countryNameByKey[candidate]
+      if (mapped) return mapped
+    }
+    return text
+  }
+
+  private toChineseProvinceName(raw: string): string {
+    const text = this.normalizeContactRegionPart(raw)
+    if (!text) return ''
+
+    const candidates = this.buildRegionLookupCandidates(text)
+    if (candidates.length === 0) return text
+    const provinceKey = this.resolveProvinceLookupKey(text)
+    const mappedFromCandidates = candidates
+      .map((candidate) => CONTACT_REGION_LOOKUP_DATA.provinceNameByKey[candidate])
+      .find(Boolean)
+    const mapped = CONTACT_REGION_LOOKUP_DATA.provinceNameByKey[provinceKey] || mappedFromCandidates
+    if (mapped) return mapped
+
+    if (/[\u4e00-\u9fa5]/.test(text)) {
+      return this.normalizeChineseProvinceName(text) || text
+    }
+
+    return text
+  }
+
+  private toChineseCityName(raw: string, provinceRaw?: string): string {
+    const text = this.normalizeContactRegionPart(raw)
+    if (!text) return ''
+
+    const candidates = this.buildRegionLookupCandidates(text)
+    if (candidates.length === 0) return text
+
+    const provinceKey = this.resolveProvinceLookupKey(String(provinceRaw || ''))
+    if (provinceKey) {
+      const byProvince = CONTACT_REGION_LOOKUP_DATA.cityNameByProvinceKey[provinceKey]
+      if (byProvince) {
+        for (const candidate of candidates) {
+          const mappedInProvince = byProvince[candidate]
+          if (mappedInProvince) return mappedInProvince
+        }
+      }
+    }
+
+    for (const candidate of candidates) {
+      const mapped = CONTACT_REGION_LOOKUP_DATA.cityNameByKey[candidate]
+      if (mapped) return mapped
+    }
+
+    if (/[\u4e00-\u9fa5]/.test(text)) {
+      return this.normalizeChineseCityName(text) || text
+    }
+
+    return text
+  }
+
+  private toChineseRegionText(raw: string): string {
+    const text = this.normalizeContactRegionPart(raw)
+    if (!text) return ''
+    const tokens = text
+      .split(/[\s,，、/|·]+/)
+      .map((item) => this.normalizeContactRegionPart(item))
+      .filter(Boolean)
+    if (tokens.length === 0) return text
+
+    let provinceContext = ''
+    const mapped = tokens.map((token) => {
+      const country = this.toChineseCountryName(token)
+      if (country !== token) return country
+
+      const province = this.toChineseProvinceName(token)
+      if (province !== token) {
+        provinceContext = province
+        return province
+      }
+
+      const city = this.toChineseCityName(token, provinceContext)
+      if (city !== token) return city
+
+      return token
+    })
+    return mapped.join(' ').trim()
+  }
+
+  private shouldHideCountryInRegion(country: string, hasProvinceOrCity: boolean): boolean {
+    if (!country) return true
+    const normalized = country.toLowerCase()
+    if (normalized === 'cn' || normalized === 'chn' || normalized === 'china' || normalized === '中国') {
+      return hasProvinceOrCity
+    }
+    return false
+  }
+
+  private getContactRegion(row: Record<string, any>): string {
+    const pickByTokens = (tokens: string[]): string => {
+      for (const [key, value] of Object.entries(row || {})) {
+        const normalizedKey = String(key || '').toLowerCase()
+        if (!normalizedKey) continue
+        if (normalizedKey.includes('avatar') || normalizedKey.includes('img') || normalizedKey.includes('head')) continue
+        if (!tokens.some((token) => normalizedKey.includes(token))) continue
+        const text = this.normalizeContactRegionPart(value)
+        if (text) return text
+      }
+      return ''
+    }
+
+    const directCountry = this.normalizeContactRegionPart(this.getRowField(row, ['country', 'Country'])) || pickByTokens(['country'])
+    const directProvince = this.normalizeContactRegionPart(this.getRowField(row, ['province', 'Province'])) || pickByTokens(['province'])
+    const directCity = this.normalizeContactRegionPart(this.getRowField(row, ['city', 'City'])) || pickByTokens(['city'])
+    const directRegion =
+      this.normalizeContactRegionPart(this.getRowField(row, ['region', 'Region', 'location', 'area'])) ||
+      pickByTokens(['region', 'location', 'area', 'addr', 'address'])
+
+    if (directRegion) {
+      const normalizedRegion = this.toChineseRegionText(directRegion)
+      const parts = normalizedRegion
+        .split(/\s+/)
+        .map((item) => this.normalizeContactRegionPart(item))
+        .filter(Boolean)
+      if (parts.length > 1 && this.shouldHideCountryInRegion(parts[0], true)) {
+        return parts.slice(1).join(' ').trim()
+      }
+      return normalizedRegion
+    }
+
+    const fallbackCountry = this.normalizeContactRegionPart(this.extractExtraBufferTopLevelFieldStrings(row, 5)[0] || '')
+    const fallbackProvince = this.normalizeContactRegionPart(this.extractExtraBufferTopLevelFieldStrings(row, 6)[0] || '')
+    const fallbackCity = this.normalizeContactRegionPart(this.extractExtraBufferTopLevelFieldStrings(row, 7)[0] || '')
+
+    const country = this.toChineseCountryName(directCountry || fallbackCountry)
+    const province = this.toChineseProvinceName(directProvince || fallbackProvince)
+    const city = this.toChineseCityName(directCity || fallbackCity, directProvince || fallbackProvince)
+
+    const hasProvinceOrCity = Boolean(province || city)
+    const parts: string[] = []
+    if (!this.shouldHideCountryInRegion(country, hasProvinceOrCity)) {
+      parts.push(country)
+    }
+    if (province) {
+      parts.push(province)
+    }
+    if (city && city !== province) {
+      parts.push(city)
+    }
+
+    return parts.join(' ').trim()
+  }
+
   private normalizeUnsignedIntegerToken(raw: any): string | undefined {
     if (raw === undefined || raw === null || raw === '') return undefined
 
@@ -5003,7 +5696,17 @@ class ChatService {
 
       const contact = await this.getContact(username)
       const avatarResult = await wcdbService.getAvatarUrls([username])
-      const avatarUrl = avatarResult.success && avatarResult.map ? avatarResult.map[username] : undefined
+      let avatarUrl = avatarResult.success && avatarResult.map ? avatarResult.map[username] : undefined
+      if (!this.isValidAvatarUrl(avatarUrl)) {
+        avatarUrl = undefined
+      }
+      if (!avatarUrl) {
+        const headImageAvatars = await this.getAvatarsFromHeadImageDb([username])
+        const fallbackAvatarUrl = headImageAvatars[username]
+        if (this.isValidAvatarUrl(fallbackAvatarUrl)) {
+          avatarUrl = fallbackAvatarUrl
+        }
+      }
       const displayName = contact?.remark || contact?.nickName || contact?.alias || cached?.displayName || username
       const cacheEntry: ContactCacheEntry = {
         avatarUrl,
@@ -5034,14 +5737,35 @@ class ChatService {
       }
 
       // 如果是群聊，尝试获取群昵称
-      let groupNicknames: Record<string, string> = {}
+      const groupNicknames = new Map<string, string>()
       if (chatroomId.endsWith('@chatroom')) {
         const nickResult = await wcdbService.getGroupNicknames(chatroomId)
         if (nickResult.success && nickResult.nicknames) {
-          groupNicknames = nickResult.nicknames
+          const nicknameBuckets = new Map<string, Set<string>>()
+          for (const [memberIdRaw, nicknameRaw] of Object.entries(nickResult.nicknames)) {
+            const memberId = String(memberIdRaw || '').trim().toLowerCase()
+            const nickname = String(nicknameRaw || '').trim()
+            if (!memberId || !nickname) continue
+            const slot = nicknameBuckets.get(memberId)
+            if (slot) {
+              slot.add(nickname)
+            } else {
+              nicknameBuckets.set(memberId, new Set([nickname]))
+            }
+          }
+          for (const [memberId, nicknameSet] of nicknameBuckets.entries()) {
+            if (nicknameSet.size !== 1) continue
+            groupNicknames.set(memberId, Array.from(nicknameSet)[0])
+          }
         }
       }
 
+      const lookupGroupNickname = (username?: string | null): string => {
+        const key = String(username || '').trim().toLowerCase()
+        if (!key) return ''
+        return groupNicknames.get(key) || ''
+      }
+
       // 获取当前用户 wxid，用于识别"自己"
       const myWxid = this.configService.get('myWxid')
       const cleanedMyWxid = myWxid ? this.cleanAccountDirName(myWxid) : ''
@@ -5051,7 +5775,7 @@ class ChatService {
         // 特判：如果是当前用户自己（contact 表通常不包含自己）
         if (myWxid && (username === myWxid || username === cleanedMyWxid)) {
           // 先查群昵称中是否有自己
-          const myGroupNick = groupNicknames[username]
+          const myGroupNick = lookupGroupNickname(username) || lookupGroupNickname(myWxid)
           if (myGroupNick) return myGroupNick
           // 尝试从缓存获取自己的昵称
           const cached = this.avatarCache.get(username) || this.avatarCache.get(myWxid)
@@ -5060,7 +5784,7 @@ class ChatService {
         }
 
         // 先查群昵称
-        const groupNick = groupNicknames[username]
+        const groupNick = lookupGroupNickname(username)
         if (groupNick) return groupNick
 
         // 再查联系人信息
@@ -5471,6 +6195,13 @@ class ChatService {
           avatarUrl = avatarCandidate
         }
       }
+      if (!avatarUrl) {
+        const headImageAvatars = await this.getAvatarsFromHeadImageDb([normalizedSessionId])
+        const fallbackAvatarUrl = headImageAvatars[normalizedSessionId]
+        if (this.isValidAvatarUrl(fallbackAvatarUrl)) {
+          avatarUrl = fallbackAvatarUrl
+        }
+      }
 
       if (!Number.isFinite(messageCount)) {
         messageCount = messageCountResult.status === 'fulfilled' &&

electron/services/config.ts

@@ -34,6 +34,7 @@ interface ConfigSchema {
   autoTranscribeVoice: boolean
   transcribeLanguages: string[]
   exportDefaultConcurrency: number
+  exportDefaultImageDeepSearchOnMiss: boolean
   analyticsExcludedUsernames: string[]
 
   // 安全相关
@@ -52,6 +53,7 @@ interface ConfigSchema {
   notificationFilterList: string[]
   messagePushEnabled: boolean
   windowCloseBehavior: 'ask' | 'tray' | 'quit'
+  quoteLayout: 'quote-top' | 'quote-bottom'
   wordCloudExcludeWords: string[]
 }
 
@@ -106,6 +108,7 @@ export class ConfigService {
       autoTranscribeVoice: false,
       transcribeLanguages: ['zh'],
       exportDefaultConcurrency: 4,
+      exportDefaultImageDeepSearchOnMiss: true,
       analyticsExcludedUsernames: [],
       authEnabled: false,
       authPassword: '',
@@ -118,6 +121,7 @@ export class ConfigService {
       notificationFilterList: [],
       messagePushEnabled: false,
       windowCloseBehavior: 'ask',
+      quoteLayout: 'quote-top',
       wordCloudExcludeWords: []
     }
 

electron/services/contactExportService.ts

@@ -93,6 +93,9 @@ class ContactExportService {
                 displayName: c.displayName,
                 remark: c.remark,
                 nickname: c.nickname,
+                alias: c.alias,
+                labels: Array.isArray(c.labels) ? c.labels : [],
+                detailDescription: c.detailDescription,
                 type: c.type
             }))
         }
@@ -103,12 +106,15 @@ class ContactExportService {
      * 导出为CSV格式
      */
     private async exportToCSV(contacts: any[], outputPath: string): Promise<void> {
-        const headers = ['用户名', '显示名称', '备注', '昵称', '类型']
+        const headers = ['用户名', '显示名称', '备注', '昵称', '微信号', '标签', '详细描述', '类型']
         const rows = contacts.map(c => [
             c.username || '',
             c.displayName || '',
             c.remark || '',
             c.nickname || '',
+            c.alias || '',
+            Array.isArray(c.labels) ? c.labels.join(' | ') : '',
+            c.detailDescription || '',
             this.getTypeLabel(c.type)
         ])
 
@@ -137,9 +143,13 @@ class ContactExportService {
                     lines.push(`NICKNAME:${c.nickname}`)
                 }
 
-                // 备注
-                if (c.remark) {
-                    lines.push(`NOTE:${c.remark}`)
+                const noteParts = [
+                    c.remark ? String(c.remark) : '',
+                    Array.isArray(c.labels) && c.labels.length > 0 ? `标签: ${c.labels.join(', ')}` : '',
+                    c.detailDescription ? `详细描述: ${c.detailDescription}` : ''
+                ].filter(Boolean)
+                if (noteParts.length > 0) {
+                    lines.push(`NOTE:${noteParts.join('\\n')}`)
                 }
 
                 // 微信ID

electron/services/exportService.ts

@@ -105,6 +105,7 @@ export interface ExportOptions {
   sessionNameWithTypePrefix?: boolean
   displayNamePreference?: 'group-nickname' | 'remark' | 'nickname'
   exportConcurrency?: number
+  imageDeepSearchOnMiss?: boolean
 }
 
 const TXT_COLUMN_DEFINITIONS: Array<{ id: string; label: string }> = [
@@ -259,12 +260,20 @@ class ExportService {
   private mediaFileCacheReadyDirs = new Set<string>()
   private mediaExportTelemetry: MediaExportTelemetry | null = null
   private mediaRunSourceDedupMap = new Map<string, string>()
+  private mediaRunMissingImageKeys = new Set<string>()
   private mediaFileCacheCleanupPending: Promise<void> | null = null
   private mediaFileCacheLastCleanupAt = 0
   private readonly mediaFileCacheCleanupIntervalMs = 30 * 60 * 1000
   private readonly mediaFileCacheMaxBytes = 6 * 1024 * 1024 * 1024
   private readonly mediaFileCacheMaxFiles = 120000
   private readonly mediaFileCacheTtlMs = 45 * 24 * 60 * 60 * 1000
+  private emojiCaptionCache = new Map<string, string | null>()
+  private emojiCaptionPending = new Map<string, Promise<string | null>>()
+  private emojiMd5ByCdnCache = new Map<string, string | null>()
+  private emojiMd5ByCdnPending = new Map<string, Promise<string | null>>()
+  private emoticonDbPathCache: string | null = null
+  private emoticonDbPathCacheToken = ''
+  private readonly emojiCaptionLookupConcurrency = 8
 
   constructor() {
     this.configService = new ConfigService()
@@ -517,11 +526,13 @@ class ExportService {
   private resetMediaRuntimeState(): void {
     this.mediaExportTelemetry = this.createEmptyMediaTelemetry()
     this.mediaRunSourceDedupMap.clear()
+    this.mediaRunMissingImageKeys.clear()
   }
 
   private clearMediaRuntimeState(): void {
     this.mediaExportTelemetry = null
     this.mediaRunSourceDedupMap.clear()
+    this.mediaRunMissingImageKeys.clear()
   }
 
   private getMediaTelemetrySnapshot(): Partial<ExportProgress> {
@@ -915,7 +926,7 @@ class ExportService {
 
   private shouldDecodeMessageContentInFastMode(localType: number): boolean {
     // 这些类型在文本导出里只需要占位符，无需解码完整 XML / 压缩内容
-    if (localType === 3 || localType === 34 || localType === 42 || localType === 43 || localType === 47) {
+    if (localType === 3 || localType === 34 || localType === 42 || localType === 43) {
       return false
     }
     return true
@@ -989,6 +1000,312 @@ class ExportService {
     return `${localType}_${this.getStableMessageKey(msg)}`
   }
 
+  private getImageMissingRunCacheKey(
+    sessionId: string,
+    imageMd5?: unknown,
+    imageDatName?: unknown,
+    imageDeepSearchOnMiss = true
+  ): string | null {
+    const normalizedSessionId = String(sessionId || '').trim()
+    const normalizedImageMd5 = String(imageMd5 || '').trim().toLowerCase()
+    const normalizedImageDatName = String(imageDatName || '').trim().toLowerCase()
+    if (!normalizedSessionId) return null
+    if (!normalizedImageMd5 && !normalizedImageDatName) return null
+
+    const primaryToken = normalizedImageMd5 || normalizedImageDatName
+    const secondaryToken = normalizedImageMd5 && normalizedImageDatName && normalizedImageDatName !== normalizedImageMd5
+      ? normalizedImageDatName
+      : ''
+    const lookupMode = imageDeepSearchOnMiss ? 'deep' : 'hardlink'
+    return `${lookupMode}\u001f${normalizedSessionId}\u001f${primaryToken}\u001f${secondaryToken}`
+  }
+
+  private normalizeEmojiMd5(value: unknown): string | undefined {
+    const md5 = String(value || '').trim().toLowerCase()
+    if (!/^[a-f0-9]{32}$/.test(md5)) return undefined
+    return md5
+  }
+
+  private normalizeEmojiCaption(value: unknown): string | null {
+    const caption = String(value || '').trim()
+    if (!caption) return null
+    return caption
+  }
+
+  private formatEmojiSemanticText(caption?: string | null): string {
+    const normalizedCaption = this.normalizeEmojiCaption(caption)
+    if (!normalizedCaption) return '[表情包]'
+    return `[表情包：${normalizedCaption}]`
+  }
+
+  private extractLooseHexMd5(content: string): string | undefined {
+    if (!content) return undefined
+    const keyedMatch =
+      /(?:emoji|sticker|md5)[^a-fA-F0-9]{0,32}([a-fA-F0-9]{32})/i.exec(content) ||
+      /([a-fA-F0-9]{32})/i.exec(content)
+    return this.normalizeEmojiMd5(keyedMatch?.[1] || keyedMatch?.[0])
+  }
+
+  private normalizeEmojiCdnUrl(value: unknown): string | undefined {
+    let url = String(value || '').trim()
+    if (!url) return undefined
+    url = url.replace(/&amp;/g, '&')
+    try {
+      if (url.includes('%')) {
+        url = decodeURIComponent(url)
+      }
+    } catch {
+      // keep original URL if decoding fails
+    }
+    return url.trim() || undefined
+  }
+
+  private resolveStrictEmoticonDbPath(): string | null {
+    const dbPath = String(this.configService.get('dbPath') || '').trim()
+    const rawWxid = String(this.configService.get('myWxid') || '').trim()
+    const cleanedWxid = this.cleanAccountDirName(rawWxid)
+    const token = `${dbPath}::${rawWxid}::${cleanedWxid}`
+    if (token === this.emoticonDbPathCacheToken) {
+      return this.emoticonDbPathCache
+    }
+    this.emoticonDbPathCacheToken = token
+    this.emoticonDbPathCache = null
+
+    const dbStoragePath =
+      this.resolveDbStoragePathForExport(dbPath, cleanedWxid) ||
+      this.resolveDbStoragePathForExport(dbPath, rawWxid)
+    if (!dbStoragePath) return null
+
+    const strictPath = path.join(dbStoragePath, 'emoticon', 'emoticon.db')
+    if (fs.existsSync(strictPath)) {
+      this.emoticonDbPathCache = strictPath
+      return strictPath
+    }
+    return null
+  }
+
+  private resolveDbStoragePathForExport(basePath: string, wxid: string): string | null {
+    if (!basePath) return null
+    const normalized = basePath.replace(/[\\/]+$/, '')
+    if (normalized.toLowerCase().endsWith('db_storage') && fs.existsSync(normalized)) {
+      return normalized
+    }
+    const direct = path.join(normalized, 'db_storage')
+    if (fs.existsSync(direct)) {
+      return direct
+    }
+    if (!wxid) return null
+
+    const viaWxid = path.join(normalized, wxid, 'db_storage')
+    if (fs.existsSync(viaWxid)) {
+      return viaWxid
+    }
+
+    try {
+      const entries = fs.readdirSync(normalized)
+      const lowerWxid = wxid.toLowerCase()
+      const candidates = entries.filter((entry) => {
+        const entryPath = path.join(normalized, entry)
+        try {
+          if (!fs.statSync(entryPath).isDirectory()) return false
+        } catch {
+          return false
+        }
+        const lowerEntry = entry.toLowerCase()
+        return lowerEntry === lowerWxid || lowerEntry.startsWith(`${lowerWxid}_`)
+      })
+      for (const entry of candidates) {
+        const candidate = path.join(normalized, entry, 'db_storage')
+        if (fs.existsSync(candidate)) {
+          return candidate
+        }
+      }
+    } catch {
+      // keep null
+    }
+
+    return null
+  }
+
+  private async queryEmojiMd5ByCdnUrlFallback(cdnUrlRaw: string): Promise<string | null> {
+    const cdnUrl = this.normalizeEmojiCdnUrl(cdnUrlRaw)
+    if (!cdnUrl) return null
+    const emoticonDbPath = this.resolveStrictEmoticonDbPath()
+    if (!emoticonDbPath) return null
+
+    const candidates = Array.from(new Set([
+      cdnUrl,
+      cdnUrl.replace(/&/g, '&amp;')
+    ]))
+
+    for (const candidate of candidates) {
+      const escaped = candidate.replace(/'/g, "''")
+      const result = await wcdbService.execQuery(
+        'message',
+        emoticonDbPath,
+        `SELECT md5, lower(hex(md5)) AS md5_hex FROM kNonStoreEmoticonTable WHERE cdn_url = '${escaped}' COLLATE NOCASE LIMIT 1`
+      )
+      const row = result.success && Array.isArray(result.rows) ? result.rows[0] : null
+      const md5 = this.normalizeEmojiMd5(this.getRowField(row || {}, ['md5', 'md5_hex']))
+      if (md5) return md5
+    }
+
+    return null
+  }
+
+  private async getEmojiMd5ByCdnUrl(cdnUrlRaw: string): Promise<string | null> {
+    const cdnUrl = this.normalizeEmojiCdnUrl(cdnUrlRaw)
+    if (!cdnUrl) return null
+
+    if (this.emojiMd5ByCdnCache.has(cdnUrl)) {
+      return this.emojiMd5ByCdnCache.get(cdnUrl) ?? null
+    }
+
+    const pending = this.emojiMd5ByCdnPending.get(cdnUrl)
+    if (pending) return pending
+
+    const task = (async (): Promise<string | null> => {
+      try {
+        return await this.queryEmojiMd5ByCdnUrlFallback(cdnUrl)
+      } catch {
+        return null
+      }
+    })()
+
+    this.emojiMd5ByCdnPending.set(cdnUrl, task)
+    try {
+      const md5 = await task
+      this.emojiMd5ByCdnCache.set(cdnUrl, md5)
+      return md5
+    } finally {
+      this.emojiMd5ByCdnPending.delete(cdnUrl)
+    }
+  }
+
+  private async getEmojiCaptionByMd5(md5Raw: string): Promise<string | null> {
+    const md5 = this.normalizeEmojiMd5(md5Raw)
+    if (!md5) return null
+
+    if (this.emojiCaptionCache.has(md5)) {
+      return this.emojiCaptionCache.get(md5) ?? null
+    }
+
+    const pending = this.emojiCaptionPending.get(md5)
+    if (pending) return pending
+
+    const task = (async (): Promise<string | null> => {
+      try {
+        const nativeResult = await wcdbService.getEmoticonCaptionStrict(md5)
+        if (nativeResult.success) {
+          const nativeCaption = this.normalizeEmojiCaption(nativeResult.caption)
+          if (nativeCaption) return nativeCaption
+        }
+      } catch {
+        // ignore and return null
+      }
+      return null
+    })()
+
+    this.emojiCaptionPending.set(md5, task)
+    try {
+      const caption = await task
+      if (caption) {
+        this.emojiCaptionCache.set(md5, caption)
+      } else {
+        this.emojiCaptionCache.delete(md5)
+      }
+      return caption
+    } finally {
+      this.emojiCaptionPending.delete(md5)
+    }
+  }
+
+  private async hydrateEmojiCaptionsForMessages(
+    sessionId: string,
+    messages: any[],
+    control?: ExportTaskControl
+  ): Promise<void> {
+    if (!Array.isArray(messages) || messages.length === 0) return
+
+    // 某些环境下游标行缺失 47 的 md5，先按 localId 回填详情再做 caption 查询。
+    await this.backfillMediaFieldsFromMessageDetail(sessionId, messages, new Set([47]), control)
+
+    const unresolvedByUrl = new Map<string, any[]>()
+
+    const uniqueMd5s = new Set<string>()
+    let scanIndex = 0
+    for (const msg of messages) {
+      if ((scanIndex++ & 0x7f) === 0) {
+        this.throwIfStopRequested(control)
+      }
+      if (Number(msg?.localType) !== 47) continue
+
+      const content = String(msg?.content || '')
+      const normalizedMd5 = this.normalizeEmojiMd5(msg?.emojiMd5)
+        || this.extractEmojiMd5(content)
+        || this.extractLooseHexMd5(content)
+      const normalizedCdnUrl = this.normalizeEmojiCdnUrl(msg?.emojiCdnUrl || this.extractEmojiUrl(content))
+      if (normalizedCdnUrl) {
+        msg.emojiCdnUrl = normalizedCdnUrl
+      }
+      if (!normalizedMd5) {
+        if (normalizedCdnUrl) {
+          const bucket = unresolvedByUrl.get(normalizedCdnUrl) || []
+          bucket.push(msg)
+          unresolvedByUrl.set(normalizedCdnUrl, bucket)
+        } else {
+          msg.emojiMd5 = undefined
+          msg.emojiCaption = undefined
+        }
+        continue
+      }
+
+      msg.emojiMd5 = normalizedMd5
+      uniqueMd5s.add(normalizedMd5)
+    }
+
+    const unresolvedUrls = Array.from(unresolvedByUrl.keys())
+    if (unresolvedUrls.length > 0) {
+      await parallelLimit(unresolvedUrls, this.emojiCaptionLookupConcurrency, async (url, index) => {
+        if ((index & 0x0f) === 0) {
+          this.throwIfStopRequested(control)
+        }
+        const resolvedMd5 = await this.getEmojiMd5ByCdnUrl(url)
+        if (!resolvedMd5) return
+        const attached = unresolvedByUrl.get(url) || []
+        for (const msg of attached) {
+          msg.emojiMd5 = resolvedMd5
+          uniqueMd5s.add(resolvedMd5)
+        }
+      })
+    }
+
+    const md5List = Array.from(uniqueMd5s)
+    if (md5List.length > 0) {
+      await parallelLimit(md5List, this.emojiCaptionLookupConcurrency, async (md5, index) => {
+        if ((index & 0x0f) === 0) {
+          this.throwIfStopRequested(control)
+        }
+        await this.getEmojiCaptionByMd5(md5)
+      })
+    }
+
+    let assignIndex = 0
+    for (const msg of messages) {
+      if ((assignIndex++ & 0x7f) === 0) {
+        this.throwIfStopRequested(control)
+      }
+      if (Number(msg?.localType) !== 47) continue
+      const md5 = this.normalizeEmojiMd5(msg?.emojiMd5)
+      if (!md5) {
+        msg.emojiCaption = undefined
+        continue
+      }
+      const caption = this.emojiCaptionCache.get(md5) ?? null
+      msg.emojiCaption = caption || undefined
+    }
+  }
+
   private async ensureConnected(): Promise<{ success: boolean; cleanedWxid?: string; error?: string }> {
     const wxid = this.configService.get('myWxid')
     const dbPath = this.configService.get('dbPath')
@@ -1087,33 +1404,60 @@ class ExportService {
   }
 
   /**
-   * 获取群成员群昵称。优先使用 DLL，必要时回退到 `contact.chat_room.ext_buffer` 解析。
+   * 获取群成员群昵称。后端结果为唯一业务真值，前端仅做冲突净化防串号。
    */
   async getGroupNicknamesForRoom(chatroomId: string, candidates: string[] = []): Promise<Map<string, string>> {
-    const nicknameMap = new Map<string, string>()
-
     try {
       const dllResult = await wcdbService.getGroupNicknames(chatroomId)
-      if (dllResult.success && dllResult.nicknames) {
-        this.mergeGroupNicknameEntries(nicknameMap, Object.entries(dllResult.nicknames))
+      if (!dllResult.success || !dllResult.nicknames) {
+        return new Map<string, string>()
       }
+      return this.buildTrustedGroupNicknameMap(Object.entries(dllResult.nicknames), candidates)
     } catch (e) {
       console.error('getGroupNicknamesForRoom dll error:', e)
+      return new Map<string, string>()
+    }
+  }
+
+  private normalizeGroupNicknameIdentity(value: string): string {
+    const raw = String(value || '').trim()
+    if (!raw) return ''
+    return raw.toLowerCase()
+  }
+
+  private buildTrustedGroupNicknameMap(
+    entries: Iterable<[string, string]>,
+    candidates: string[] = []
+  ): Map<string, string> {
+    const candidateSet = new Set(
+      this.buildGroupNicknameIdCandidates(candidates)
+        .map((id) => this.normalizeGroupNicknameIdentity(id))
+        .filter(Boolean)
+    )
+
+    const buckets = new Map<string, Set<string>>()
+    for (const [memberIdRaw, nicknameRaw] of entries) {
+      const identity = this.normalizeGroupNicknameIdentity(memberIdRaw || '')
+      if (!identity) continue
+      if (candidateSet.size > 0 && !candidateSet.has(identity)) continue
+
+      const nickname = this.normalizeGroupNickname(nicknameRaw || '')
+      if (!nickname) continue
+
+      const slot = buckets.get(identity)
+      if (slot) {
+        slot.add(nickname)
+      } else {
+        buckets.set(identity, new Set([nickname]))
+      }
     }
 
-    try {
-      const result = await wcdbService.getChatRoomExtBuffer(chatroomId)
-      if (!result.success || !result.extBuffer) {
-        return nicknameMap
-      }
-      const extBuffer = this.decodeExtBuffer(result.extBuffer)
-      if (!extBuffer) return nicknameMap
-      this.mergeGroupNicknameEntries(nicknameMap, this.parseGroupNicknamesFromExtBuffer(extBuffer, candidates).entries())
-      return nicknameMap
-    } catch (e) {
-      console.error('getGroupNicknamesForRoom error:', e)
-      return nicknameMap
+    const trusted = new Map<string, string>()
+    for (const [identity, nicknameSet] of buckets.entries()) {
+      if (nicknameSet.size !== 1) continue
+      trusted.set(identity, Array.from(nicknameSet)[0])
     }
+    return trusted
   }
 
   private mergeGroupNicknameEntries(
@@ -1363,8 +1707,6 @@ class ExportService {
       const raw = String(rawValue || '').trim()
       if (!raw) continue
       set.add(raw)
-      const cleaned = this.cleanAccountDirName(raw)
-      if (cleaned && cleaned !== raw) set.add(cleaned)
     }
     return Array.from(set)
   }
@@ -1373,29 +1715,20 @@ class ExportService {
     const idCandidates = this.buildGroupNicknameIdCandidates(candidates)
     if (idCandidates.length === 0) return ''
 
+    let resolved = ''
     for (const id of idCandidates) {
-      const exact = this.normalizeGroupNickname(groupNicknamesMap.get(id) || '')
-      if (exact) return exact
-      const lower = this.normalizeGroupNickname(groupNicknamesMap.get(id.toLowerCase()) || '')
-      if (lower) return lower
-    }
-
-    for (const id of idCandidates) {
-      const lower = id.toLowerCase()
-      let found = ''
-      let matched = 0
-      for (const [key, value] of groupNicknamesMap.entries()) {
-        if (String(key || '').toLowerCase() !== lower) continue
-        const normalized = this.normalizeGroupNickname(value || '')
-        if (!normalized) continue
-        found = normalized
-        matched += 1
-        if (matched > 1) return ''
+      const normalizedId = this.normalizeGroupNicknameIdentity(id)
+      if (!normalizedId) continue
+      const candidateNickname = this.normalizeGroupNickname(groupNicknamesMap.get(normalizedId) || '')
+      if (!candidateNickname) continue
+      if (!resolved) {
+        resolved = candidateNickname
+        continue
       }
-      if (matched === 1 && found) return found
+      if (resolved !== candidateNickname) return ''
     }
 
-    return ''
+    return resolved
   }
 
   /**
@@ -1574,8 +1907,12 @@ class ExportService {
     createTime?: number,
     myWxid?: string,
     senderWxid?: string,
-    isSend?: boolean
+    isSend?: boolean,
+    emojiCaption?: string
   ): string | null {
+    if (!content && localType === 47) {
+      return this.formatEmojiSemanticText(emojiCaption)
+    }
     if (!content) return null
 
     const normalizedContent = this.normalizeAppMessageContent(content)
@@ -1601,7 +1938,7 @@ class ExportService {
       }
       case 42: return '[名片]'
       case 43: return '[视频]'
-      case 47: return '[动画表情]'
+      case 47: return this.formatEmojiSemanticText(emojiCaption)
       case 48: {
         const normalized48 = this.normalizeAppMessageContent(content)
         const locPoiname = this.extractXmlAttribute(normalized48, 'location', 'poiname') || this.extractXmlValue(normalized48, 'poiname') || this.extractXmlValue(normalized48, 'poiName')
@@ -1711,7 +2048,8 @@ class ExportService {
     voiceTranscript?: string,
     myWxid?: string,
     senderWxid?: string,
-    isSend?: boolean
+    isSend?: boolean,
+    emojiCaption?: string
   ): string {
     const safeContent = content || ''
 
@@ -1741,6 +2079,9 @@ class ExportService {
       const seconds = lengthValue ? this.parseDurationSeconds(lengthValue) : null
       return seconds ? `[视频]${seconds}s` : '[视频]'
     }
+    if (localType === 47) {
+      return this.formatEmojiSemanticText(emojiCaption)
+    }
     if (localType === 48) {
       const normalized = this.normalizeAppMessageContent(safeContent)
       const locPoiname = this.extractXmlAttribute(normalized, 'location', 'poiname') || this.extractXmlValue(normalized, 'poiname') || this.extractXmlValue(normalized, 'poiName')
@@ -2481,7 +2822,7 @@ class ExportService {
       case 3: return '[图片]'
       case 34: return '[语音消息]'
       case 43: return '[视频]'
-      case 47: return '[动画表情]'
+      case 47: return '[表情包]'
       case 49:
       case 8: return title ? `[文件] ${title}` : '[文件]'
       case 17: return item.chatRecordDesc || title || '[聊天记录]'
@@ -2622,7 +2963,7 @@ class ExportService {
           displayContent = '[视频]'
           break
         case '47':
-          displayContent = '[动画表情]'
+          displayContent = '[表情包]'
           break
         case '49':
           displayContent = '[链接]'
@@ -2935,7 +3276,17 @@ class ExportService {
     return rendered.join('')
   }
 
-  private formatHtmlMessageText(content: string, localType: number, myWxid?: string, senderWxid?: string, isSend?: boolean): string {
+  private formatHtmlMessageText(
+    content: string,
+    localType: number,
+    myWxid?: string,
+    senderWxid?: string,
+    isSend?: boolean,
+    emojiCaption?: string
+  ): string {
+    if (!content && localType === 47) {
+      return this.formatEmojiSemanticText(emojiCaption)
+    }
     if (!content) return ''
 
     if (localType === 1) {
@@ -2943,10 +3294,10 @@ class ExportService {
     }
 
     if (localType === 34) {
-      return this.parseMessageContent(content, localType, undefined, undefined, myWxid, senderWxid, isSend) || ''
+      return this.parseMessageContent(content, localType, undefined, undefined, myWxid, senderWxid, isSend, emojiCaption) || ''
     }
 
-    return this.formatPlainExportContent(content, localType, { exportVoiceAsText: false }, undefined, myWxid, senderWxid, isSend)
+    return this.formatPlainExportContent(content, localType, { exportVoiceAsText: false }, undefined, myWxid, senderWxid, isSend, emojiCaption)
   }
 
   private extractHtmlLinkCard(content: string, localType: number): { title: string; url: string } | null {
@@ -3014,6 +3365,7 @@ class ExportService {
       exportVoiceAsText?: boolean
       includeVideoPoster?: boolean
       includeVoiceWithTranscript?: boolean
+      imageDeepSearchOnMiss?: boolean
       dirCache?: Set<string>
     }
   ): Promise<MediaExportItem | null> {
@@ -3021,7 +3373,14 @@ class ExportService {
 
     // 图片消息
     if (localType === 3 && options.exportImages) {
-      const result = await this.exportImage(msg, sessionId, mediaRootDir, mediaRelativePrefix, options.dirCache)
+      const result = await this.exportImage(
+        msg,
+        sessionId,
+        mediaRootDir,
+        mediaRelativePrefix,
+        options.dirCache,
+        options.imageDeepSearchOnMiss !== false
+      )
       if (result) {
       }
       return result
@@ -3067,7 +3426,8 @@ class ExportService {
     sessionId: string,
     mediaRootDir: string,
     mediaRelativePrefix: string,
-    dirCache?: Set<string>
+    dirCache?: Set<string>,
+    imageDeepSearchOnMiss = true
   ): Promise<MediaExportItem | null> {
     try {
       const imagesDir = path.join(mediaRootDir, mediaRelativePrefix, 'images')
@@ -3084,16 +3444,34 @@ class ExportService {
         return null
       }
 
+      const missingRunCacheKey = this.getImageMissingRunCacheKey(
+        sessionId,
+        imageMd5,
+        imageDatName,
+        imageDeepSearchOnMiss
+      )
+      if (missingRunCacheKey && this.mediaRunMissingImageKeys.has(missingRunCacheKey)) {
+        return null
+      }
+
       const result = await imageDecryptService.decryptImage({
         sessionId,
         imageMd5,
         imageDatName,
         force: true,  // 导出优先高清，失败再回退缩略图
-        preferFilePath: true
+        preferFilePath: true,
+        hardlinkOnly: !imageDeepSearchOnMiss
       })
 
       if (!result.success || !result.localPath) {
         console.log(`[Export] 图片解密失败 (localId=${msg.localId}): imageMd5=${imageMd5}, imageDatName=${imageDatName}, error=${result.error || '未知'}`)
+        if (!imageDeepSearchOnMiss) {
+          console.log(`[Export] 未命中 hardlink（已关闭缺图深度搜索）→ 将显示 [图片] 占位符`)
+          if (missingRunCacheKey) {
+            this.mediaRunMissingImageKeys.add(missingRunCacheKey)
+          }
+          return null
+        }
         // 尝试获取缩略图
         const thumbResult = await imageDecryptService.resolveCachedImage({
           sessionId,
@@ -3114,6 +3492,9 @@ class ExportService {
             result.localPath = cachedThumb
           } else {
             console.log(`[Export] 所有方式均失败 → 将显示 [图片] 占位符`)
+            if (missingRunCacheKey) {
+              this.mediaRunMissingImageKeys.add(missingRunCacheKey)
+            }
             return null
           }
         }
@@ -3487,8 +3868,11 @@ class ExportService {
    */
   private extractEmojiMd5(content: string): string | undefined {
     if (!content) return undefined
-    const match = /md5="([^"]+)"/i.exec(content) || /<md5>([^<]+)<\/md5>/i.exec(content)
-    return match?.[1]
+    const match =
+      /md5\s*=\s*['"]([a-fA-F0-9]{32})['"]/i.exec(content) ||
+      /md5\s*=\s*([a-fA-F0-9]{32})/i.exec(content) ||
+      /<md5>([a-fA-F0-9]{32})<\/md5>/i.exec(content)
+    return this.normalizeEmojiMd5(match?.[1]) || this.extractLooseHexMd5(content)
   }
 
   private extractVideoMd5(content: string): string | undefined {
@@ -3777,6 +4161,7 @@ class ExportService {
           let locationPoiname: string | undefined
           let locationLabel: string | undefined
           let chatRecordList: any[] | undefined
+          let emojiCaption: string | undefined
 
           if (localType === 48 && content) {
             const locationMeta = this.extractLocationMeta(content, localType)
@@ -3788,22 +4173,30 @@ class ExportService {
             }
           }
 
+          if (localType === 47) {
+            emojiCdnUrl = String(row.emoji_cdn_url || row.emojiCdnUrl || '').trim() || undefined
+            emojiMd5 = this.normalizeEmojiMd5(row.emoji_md5 || row.emojiMd5) || undefined
+            const packedInfoRaw = String(row.packed_info || row.packedInfo || row.PackedInfo || '')
+            const reserved0Raw = String(row.reserved0 || row.Reserved0 || '')
+            const supplementalPayload = `${this.decodeMaybeCompressed(packedInfoRaw)}\n${this.decodeMaybeCompressed(reserved0Raw)}`
+            if (content) {
+              emojiCdnUrl = emojiCdnUrl || this.extractEmojiUrl(content)
+              emojiMd5 = emojiMd5 || this.normalizeEmojiMd5(this.extractEmojiMd5(content))
+            }
+            emojiCdnUrl = emojiCdnUrl || this.extractEmojiUrl(supplementalPayload)
+            emojiMd5 = emojiMd5 || this.extractEmojiMd5(supplementalPayload) || this.extractLooseHexMd5(supplementalPayload)
+          }
+
           if (collectMode === 'full' || collectMode === 'media-fast') {
             // 优先复用游标返回的字段，缺失时再回退到 XML 解析。
             imageMd5 = String(row.image_md5 || row.imageMd5 || '').trim() || undefined
             imageDatName = String(row.image_dat_name || row.imageDatName || '').trim() || undefined
-            emojiCdnUrl = String(row.emoji_cdn_url || row.emojiCdnUrl || '').trim() || undefined
-            emojiMd5 = String(row.emoji_md5 || row.emojiMd5 || '').trim() || undefined
             videoMd5 = String(row.video_md5 || row.videoMd5 || '').trim() || undefined
 
             if (localType === 3 && content) {
               // 图片消息
               imageMd5 = imageMd5 || this.extractImageMd5(content)
               imageDatName = imageDatName || this.extractImageDatName(content)
-            } else if (localType === 47 && content) {
-              // 动画表情
-              emojiCdnUrl = emojiCdnUrl || this.extractEmojiUrl(content)
-              emojiMd5 = emojiMd5 || this.extractEmojiMd5(content)
             } else if (localType === 43 && content) {
               // 视频消息
               videoMd5 = videoMd5 || this.extractVideoMd5(content)
@@ -3830,6 +4223,7 @@ class ExportService {
             imageDatName,
             emojiCdnUrl,
             emojiMd5,
+            emojiCaption,
             videoMd5,
             locationLat,
             locationLng,
@@ -3898,7 +4292,7 @@ class ExportService {
     const needsBackfill = rows.filter((msg) => {
       if (!targetMediaTypes.has(msg.localType)) return false
       if (msg.localType === 3) return !msg.imageMd5 && !msg.imageDatName
-      if (msg.localType === 47) return !msg.emojiMd5 && !msg.emojiCdnUrl
+      if (msg.localType === 47) return !msg.emojiMd5
       if (msg.localType === 43) return !msg.videoMd5
       return false
     })
@@ -3915,9 +4309,16 @@ class ExportService {
         if (!detail.success || !detail.message) return
 
         const row = detail.message as any
-        const rawMessageContent = row.message_content ?? row.messageContent ?? row.msg_content ?? row.msgContent ?? ''
-        const rawCompressContent = row.compress_content ?? row.compressContent ?? row.msg_compress_content ?? row.msgCompressContent ?? ''
+        const rawMessageContent = this.getRowField(row, [
+          'message_content', 'messageContent', 'msg_content', 'msgContent', 'strContent', 'content', 'WCDB_CT_message_content'
+        ]) ?? ''
+        const rawCompressContent = this.getRowField(row, [
+          'compress_content', 'compressContent', 'msg_compress_content', 'msgCompressContent', 'WCDB_CT_compress_content'
+        ]) ?? ''
         const content = this.decodeMessageContent(rawMessageContent, rawCompressContent)
+        const packedInfoRaw = this.getRowField(row, ['packed_info', 'packedInfo', 'PackedInfo', 'WCDB_CT_packed_info']) ?? ''
+        const reserved0Raw = this.getRowField(row, ['reserved0', 'Reserved0', 'WCDB_CT_Reserved0']) ?? ''
+        const supplementalPayload = `${this.decodeMaybeCompressed(String(packedInfoRaw || ''))}\n${this.decodeMaybeCompressed(String(reserved0Raw || ''))}`
 
         if (msg.localType === 3) {
           const imageMd5 = String(row.image_md5 || row.imageMd5 || '').trim() || this.extractImageMd5(content)
@@ -3928,8 +4329,15 @@ class ExportService {
         }
 
         if (msg.localType === 47) {
-          const emojiMd5 = String(row.emoji_md5 || row.emojiMd5 || '').trim() || this.extractEmojiMd5(content)
-          const emojiCdnUrl = String(row.emoji_cdn_url || row.emojiCdnUrl || '').trim() || this.extractEmojiUrl(content)
+          const emojiMd5 =
+            this.normalizeEmojiMd5(row.emoji_md5 || row.emojiMd5) ||
+            this.extractEmojiMd5(content) ||
+            this.extractEmojiMd5(supplementalPayload) ||
+            this.extractLooseHexMd5(supplementalPayload)
+          const emojiCdnUrl =
+            String(row.emoji_cdn_url || row.emojiCdnUrl || '').trim() ||
+            this.extractEmojiUrl(content) ||
+            this.extractEmojiUrl(supplementalPayload)
           if (emojiMd5) msg.emojiMd5 = emojiMd5
           if (emojiCdnUrl) msg.emojiCdnUrl = emojiCdnUrl
           return
@@ -4409,6 +4817,8 @@ class ExportService {
         return { success: false, error: '该会话在指定时间范围内没有消息' }
       }
 
+      await this.hydrateEmojiCaptionsForMessages(sessionId, allMessages, control)
+
       const voiceMessages = options.exportVoiceAsText
         ? allMessages.filter(msg => msg.localType === 34)
         : []
@@ -4511,6 +4921,7 @@ class ExportService {
               exportEmojis: options.exportEmojis,
               exportVoiceAsText: options.exportVoiceAsText,
               includeVideoPoster: options.format === 'html',
+              imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
               dirCache: mediaDirCache
             })
             mediaCache.set(mediaKey, mediaItem)
@@ -4634,7 +5045,8 @@ class ExportService {
             msg.createTime,
             cleanedMyWxid,
             msg.senderUsername,
-            msg.isSend
+            msg.isSend,
+            msg.emojiCaption
           )
         }
 
@@ -4726,7 +5138,7 @@ class ExportService {
                 break
               case 47:
                 recordType = 5 // EMOJI
-                recordContent = '[动画表情]'
+                recordContent = '[表情包]'
                 break
               default:
                 recordType = 0
@@ -4936,6 +5348,8 @@ class ExportService {
         return { success: false, error: '该会话在指定时间范围内没有消息' }
       }
 
+      await this.hydrateEmojiCaptionsForMessages(sessionId, collected.rows, control)
+
       const voiceMessages = options.exportVoiceAsText
         ? collected.rows.filter(msg => msg.localType === 34)
         : []
@@ -5010,6 +5424,7 @@ class ExportService {
               exportEmojis: options.exportEmojis,
               exportVoiceAsText: options.exportVoiceAsText,
               includeVideoPoster: options.format === 'html',
+              imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
               dirCache: mediaDirCache
             })
             mediaCache.set(mediaKey, mediaItem)
@@ -5114,7 +5529,7 @@ class ExportService {
 
         if (msg.localType === 34 && options.exportVoiceAsText) {
           content = voiceTranscriptMap.get(this.getStableMessageKey(msg)) || '[语音消息 - 转文字失败]'
-        } else if (mediaItem) {
+        } else if (mediaItem && msg.localType !== 47) {
           content = mediaItem.relativePath
         } else {
           content = this.parseMessageContent(
@@ -5124,7 +5539,8 @@ class ExportService {
             undefined,
             cleanedMyWxid,
             msg.senderUsername,
-            msg.isSend
+            msg.isSend,
+            msg.emojiCaption
           )
         }
 
@@ -5185,6 +5601,12 @@ class ExportService {
           senderAvatarKey: msg.senderUsername
         }
 
+        if (msg.localType === 47) {
+          if (msg.emojiMd5) msgObj.emojiMd5 = msg.emojiMd5
+          if (msg.emojiCdnUrl) msgObj.emojiCdnUrl = msg.emojiCdnUrl
+          if (msg.emojiCaption) msgObj.emojiCaption = msg.emojiCaption
+        }
+
         const platformMessageId = this.getExportPlatformMessageId(msg)
         if (platformMessageId) msgObj.platformMessageId = platformMessageId
 
@@ -5420,6 +5842,9 @@ class ExportService {
           if (message.linkTitle) compactMessage.linkTitle = message.linkTitle
           if (message.linkUrl) compactMessage.linkUrl = message.linkUrl
           if (message.linkThumb) compactMessage.linkThumb = message.linkThumb
+          if (message.emojiMd5) compactMessage.emojiMd5 = message.emojiMd5
+          if (message.emojiCdnUrl) compactMessage.emojiCdnUrl = message.emojiCdnUrl
+          if (message.emojiCaption) compactMessage.emojiCaption = message.emojiCaption
           if (message.finderTitle) compactMessage.finderTitle = message.finderTitle
           if (message.finderDesc) compactMessage.finderDesc = message.finderDesc
           if (message.finderUsername) compactMessage.finderUsername = message.finderUsername
@@ -5650,6 +6075,8 @@ class ExportService {
         return { success: false, error: '该会话在指定时间范围内没有消息' }
       }
 
+      await this.hydrateEmojiCaptionsForMessages(sessionId, collected.rows, control)
+
       const voiceMessages = options.exportVoiceAsText
         ? collected.rows.filter(msg => msg.localType === 34)
         : []
@@ -5850,6 +6277,7 @@ class ExportService {
               exportEmojis: options.exportEmojis,
               exportVoiceAsText: options.exportVoiceAsText,
               includeVideoPoster: options.format === 'html',
+              imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
               dirCache: mediaDirCache
             })
             mediaCache.set(mediaKey, mediaItem)
@@ -6007,9 +6435,10 @@ class ExportService {
             voiceTranscriptMap.get(this.getStableMessageKey(msg)),
             cleanedMyWxid,
             msg.senderUsername,
-            msg.isSend
+            msg.isSend,
+            msg.emojiCaption
           )
-          : (mediaItem?.relativePath
+          : ((msg.localType !== 47 ? mediaItem?.relativePath : undefined)
             || this.formatPlainExportContent(
               msg.content,
               msg.localType,
@@ -6017,7 +6446,8 @@ class ExportService {
               voiceTranscriptMap.get(this.getStableMessageKey(msg)),
               cleanedMyWxid,
               msg.senderUsername,
-              msg.isSend
+              msg.isSend,
+              msg.emojiCaption
             ))
 
         // 转账消息：追加 "谁转账给谁" 信息
@@ -6269,9 +6699,10 @@ class ExportService {
             voiceTranscriptMap.get(this.getStableMessageKey(msg)),
             cleanedMyWxid,
             msg.senderUsername,
-            msg.isSend
+            msg.isSend,
+            msg.emojiCaption
           )
-          : (mediaItem?.relativePath
+          : ((msg.localType !== 47 ? mediaItem?.relativePath : undefined)
             || this.formatPlainExportContent(
               msg.content,
               msg.localType,
@@ -6279,7 +6710,8 @@ class ExportService {
               voiceTranscriptMap.get(this.getStableMessageKey(msg)),
               cleanedMyWxid,
               msg.senderUsername,
-              msg.isSend
+              msg.isSend,
+              msg.emojiCaption
             ))
 
         let enrichedContentValue = contentValue
@@ -6468,6 +6900,8 @@ class ExportService {
         return { success: false, error: '该会话在指定时间范围内没有消息' }
       }
 
+      await this.hydrateEmojiCaptionsForMessages(sessionId, collected.rows, control)
+
       const voiceMessages = options.exportVoiceAsText
         ? collected.rows.filter(msg => msg.localType === 34)
         : []
@@ -6551,6 +6985,7 @@ class ExportService {
               exportEmojis: options.exportEmojis,
               exportVoiceAsText: options.exportVoiceAsText,
               includeVideoPoster: options.format === 'html',
+              imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
               dirCache: mediaDirCache
             })
             mediaCache.set(mediaKey, mediaItem)
@@ -6635,9 +7070,10 @@ class ExportService {
             voiceTranscriptMap.get(this.getStableMessageKey(msg)),
             cleanedMyWxid,
             msg.senderUsername,
-            msg.isSend
+            msg.isSend,
+            msg.emojiCaption
           )
-          : (mediaItem?.relativePath
+          : ((msg.localType !== 47 ? mediaItem?.relativePath : undefined)
             || this.formatPlainExportContent(
               msg.content,
               msg.localType,
@@ -6645,7 +7081,8 @@ class ExportService {
               voiceTranscriptMap.get(this.getStableMessageKey(msg)),
               cleanedMyWxid,
               msg.senderUsername,
-              msg.isSend
+              msg.isSend,
+              msg.emojiCaption
             ))
 
         // 转账消息：追加 "谁转账给谁" 信息
@@ -6828,6 +7265,8 @@ class ExportService {
         return { success: false, error: '该会话在指定时间范围内没有消息' }
       }
 
+      await this.hydrateEmojiCaptionsForMessages(sessionId, collected.rows, control)
+
       const senderUsernames = new Set<string>()
       let senderScanIndex = 0
       for (const msg of collected.rows) {
@@ -6916,6 +7355,7 @@ class ExportService {
               exportEmojis: options.exportEmojis,
               exportVoiceAsText: options.exportVoiceAsText,
               includeVideoPoster: options.format === 'html',
+              imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
               dirCache: mediaDirCache
             })
             mediaCache.set(mediaKey, mediaItem)
@@ -7046,7 +7486,8 @@ class ExportService {
             msg.createTime,
             cleanedMyWxid,
             msg.senderUsername,
-            msg.isSend
+            msg.isSend,
+            msg.emojiCaption
           ) || '')
         const src = this.getWeCloneSource(msg, typeName, mediaItem)
         const platformMessageId = this.getExportPlatformMessageId(msg) || ''
@@ -7255,6 +7696,8 @@ class ExportService {
       }
       const totalMessages = collected.rows.length
 
+      await this.hydrateEmojiCaptionsForMessages(sessionId, collected.rows, control)
+
       const senderUsernames = new Set<string>()
       let senderScanIndex = 0
       for (const msg of collected.rows) {
@@ -7334,6 +7777,7 @@ class ExportService {
               includeVideoPoster: options.format === 'html',
               includeVoiceWithTranscript: true,
               exportVideos: options.exportVideos,
+              imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
               dirCache: mediaDirCache
             })
             mediaCache.set(mediaKey, mediaItem)
@@ -7545,12 +7989,13 @@ class ExportService {
           msg.localType,
           cleanedMyWxid,
           msg.senderUsername,
-          msg.isSend
+          msg.isSend,
+          msg.emojiCaption
         )
         if (msg.localType === 34 && useVoiceTranscript) {
           textContent = voiceTranscriptMap.get(this.getStableMessageKey(msg)) || '[语音消息 - 转文字失败]'
         }
-        if (mediaItem && (msg.localType === 3 || msg.localType === 47)) {
+        if (mediaItem && msg.localType === 3) {
           textContent = ''
         }
         if (this.isTransferExportContent(textContent) && msg.content) {

electron/services/groupAnalyticsService.ts

@@ -257,34 +257,60 @@ class GroupAnalyticsService {
   }
 
   /**
-   * 从 DLL 获取群成员的群昵称
+   * 从后端获取群成员群昵称，并在前端进行唯一性净化防串号。
    */
   private async getGroupNicknamesForRoom(chatroomId: string, candidates: string[] = []): Promise<Map<string, string>> {
-    const nicknameMap = new Map<string, string>()
-
     try {
       const dllResult = await wcdbService.getGroupNicknames(chatroomId)
-      if (dllResult.success && dllResult.nicknames) {
-        this.mergeGroupNicknameEntries(nicknameMap, Object.entries(dllResult.nicknames))
+      if (!dllResult.success || !dllResult.nicknames) {
+        return new Map<string, string>()
       }
+      return this.buildTrustedGroupNicknameMap(Object.entries(dllResult.nicknames), candidates)
     } catch (e) {
       console.error('getGroupNicknamesForRoom dll error:', e)
+      return new Map<string, string>()
     }
+  }
 
-    try {
-      const result = await wcdbService.getChatRoomExtBuffer(chatroomId)
-      if (!result.success || !result.extBuffer) {
-        return nicknameMap
+  private normalizeGroupNicknameIdentity(value: string): string {
+    const raw = String(value || '').trim()
+    if (!raw) return ''
+    return raw.toLowerCase()
+  }
+
+  private buildTrustedGroupNicknameMap(
+    entries: Iterable<[string, string]>,
+    candidates: string[] = []
+  ): Map<string, string> {
+    const candidateSet = new Set(
+      this.buildGroupNicknameIdCandidates(candidates)
+        .map((id) => this.normalizeGroupNicknameIdentity(id))
+        .filter(Boolean)
+    )
+
+    const buckets = new Map<string, Set<string>>()
+    for (const [memberIdRaw, nicknameRaw] of entries) {
+      const identity = this.normalizeGroupNicknameIdentity(memberIdRaw || '')
+      if (!identity) continue
+      if (candidateSet.size > 0 && !candidateSet.has(identity)) continue
+
+      const nickname = this.normalizeGroupNickname(nicknameRaw || '')
+      if (!nickname) continue
+
+      const slot = buckets.get(identity)
+      if (slot) {
+        slot.add(nickname)
+      } else {
+        buckets.set(identity, new Set([nickname]))
       }
-
-      const extBuffer = this.decodeExtBuffer(result.extBuffer)
-      if (!extBuffer) return nicknameMap
-      this.mergeGroupNicknameEntries(nicknameMap, this.parseGroupNicknamesFromExtBuffer(extBuffer, candidates).entries())
-      return nicknameMap
-    } catch (e) {
-      console.error('getGroupNicknamesForRoom error:', e)
-      return nicknameMap
     }
+
+    const trusted = new Map<string, string>()
+    for (const [identity, nicknameSet] of buckets.entries()) {
+      if (nicknameSet.size !== 1) continue
+      trusted.set(identity, Array.from(nicknameSet)[0])
+    }
+    return trusted
   }
 
   private mergeGroupNicknameEntries(
@@ -475,6 +501,16 @@ class GroupAnalyticsService {
     return Array.from(set)
   }
 
+  private buildGroupNicknameIdCandidates(values: Array<string | undefined | null>): string[] {
+    const set = new Set<string>()
+    for (const rawValue of values) {
+      const raw = String(rawValue || '').trim()
+      if (!raw) continue
+      set.add(raw)
+    }
+    return Array.from(set)
+  }
+
   private toNonNegativeInteger(value: unknown): number {
     const parsed = Number(value)
     if (!Number.isFinite(parsed)) return 0
@@ -663,30 +699,23 @@ class GroupAnalyticsService {
   }
 
   private resolveGroupNicknameByCandidates(groupNicknames: Map<string, string>, candidates: string[]): string {
-    const idCandidates = this.buildIdCandidates(candidates)
+    const idCandidates = this.buildGroupNicknameIdCandidates(candidates)
     if (idCandidates.length === 0) return ''
 
+    let resolved = ''
     for (const id of idCandidates) {
-      const exact = this.normalizeGroupNickname(groupNicknames.get(id) || '')
-      if (exact) return exact
-    }
-
-    for (const id of idCandidates) {
-      const lower = id.toLowerCase()
-      let found = ''
-      let matched = 0
-      for (const [key, value] of groupNicknames.entries()) {
-        if (String(key || '').toLowerCase() !== lower) continue
-        const normalized = this.normalizeGroupNickname(value || '')
-        if (!normalized) continue
-        found = normalized
-        matched += 1
-        if (matched > 1) return ''
+      const normalizedId = this.normalizeGroupNicknameIdentity(id)
+      if (!normalizedId) continue
+      const candidateNickname = this.normalizeGroupNickname(groupNicknames.get(normalizedId) || '')
+      if (!candidateNickname) continue
+      if (!resolved) {
+        resolved = candidateNickname
+        continue
       }
-      if (matched === 1 && found) return found
+      if (resolved !== candidateNickname) return ''
     }
 
-    return ''
+    return resolved
   }
 
   private sanitizeWorksheetName(name: string): string {

electron/services/httpService.ts

@@ -1017,13 +1017,31 @@ class HttpService {
   }
 
   private lookupGroupNickname(groupNicknamesMap: Map<string, string>, sender: string): string {
-    if (!sender) return ''
-    const cleaned = this.normalizeAccountId(sender)
-    return groupNicknamesMap.get(sender)
-      || groupNicknamesMap.get(sender.toLowerCase())
-      || groupNicknamesMap.get(cleaned)
-      || groupNicknamesMap.get(cleaned.toLowerCase())
-      || ''
+    const key = String(sender || '').trim().toLowerCase()
+    if (!key) return ''
+    return groupNicknamesMap.get(key) || ''
+  }
+
+  private buildTrustedGroupNicknameMap(nicknames: Record<string, string>): Map<string, string> {
+    const buckets = new Map<string, Set<string>>()
+    for (const [memberIdRaw, nicknameRaw] of Object.entries(nicknames || {})) {
+      const memberId = String(memberIdRaw || '').trim().toLowerCase()
+      const nickname = String(nicknameRaw || '').trim()
+      if (!memberId || !nickname) continue
+      const slot = buckets.get(memberId)
+      if (slot) {
+        slot.add(nickname)
+      } else {
+        buckets.set(memberId, new Set([nickname]))
+      }
+    }
+
+    const trusted = new Map<string, string>()
+    for (const [memberId, nicknameSet] of buckets.entries()) {
+      if (nicknameSet.size !== 1) continue
+      trusted.set(memberId, Array.from(nicknameSet)[0])
+    }
+    return trusted
   }
 
   private resolveChatLabSenderInfo(
@@ -1094,21 +1112,7 @@ class HttpService {
       try {
         const result = await wcdbService.getGroupNicknames(talkerId)
         if (result.success && result.nicknames) {
-          groupNicknamesMap = new Map()
-          for (const [memberIdRaw, nicknameRaw] of Object.entries(result.nicknames)) {
-            const memberId = String(memberIdRaw || '').trim()
-            const nickname = String(nicknameRaw || '').trim()
-            if (!memberId || !nickname) continue
-
-            groupNicknamesMap.set(memberId, nickname)
-            groupNicknamesMap.set(memberId.toLowerCase(), nickname)
-
-            const cleaned = this.normalizeAccountId(memberId)
-            if (cleaned) {
-              groupNicknamesMap.set(cleaned, nickname)
-              groupNicknamesMap.set(cleaned.toLowerCase(), nickname)
-            }
-          }
+          groupNicknamesMap = this.buildTrustedGroupNicknameMap(result.nicknames)
         }
       } catch (e) {
         console.error('[HttpService] Failed to get group nicknames:', e)
@@ -1226,7 +1230,7 @@ class HttpService {
    * 映射 Type 49 子类型
    */
   private mapType49(msg: Message): number {
-    const xmlType = msg.xmlType
+    const xmlType = this.resolveType49Subtype(msg)
 
     switch (xmlType) {
       case '5': // 链接
@@ -1250,10 +1254,97 @@ class HttpService {
     }
   }
 
+  private extractType49Subtype(rawContent: string): string {
+    const content = String(rawContent || '')
+    if (!content) return ''
+
+    const appmsgMatch = /<appmsg[\s\S]*?>([\s\S]*?)<\/appmsg>/i.exec(content)
+    if (appmsgMatch) {
+      const appmsgInner = appmsgMatch[1]
+        .replace(/<refermsg[\s\S]*?<\/refermsg>/gi, '')
+        .replace(/<patMsg[\s\S]*?<\/patMsg>/gi, '')
+      const typeMatch = /<type>([\s\S]*?)<\/type>/i.exec(appmsgInner)
+      if (typeMatch) {
+        return typeMatch[1].replace(/<!\[CDATA\[/g, '').replace(/\]\]>/g, '').trim()
+      }
+    }
+
+    const fallbackMatch = /<type>([\s\S]*?)<\/type>/i.exec(content)
+    if (fallbackMatch) {
+      return fallbackMatch[1].replace(/<!\[CDATA\[/g, '').replace(/\]\]>/g, '').trim()
+    }
+
+    return ''
+  }
+
+  private resolveType49Subtype(msg: Message): string {
+    const xmlType = String(msg.xmlType || '').trim()
+    if (xmlType) return xmlType
+
+    const extractedType = this.extractType49Subtype(msg.rawContent)
+    if (extractedType) return extractedType
+
+    switch (msg.appMsgKind) {
+      case 'official-link':
+      case 'link':
+        return '5'
+      case 'file':
+        return '6'
+      case 'chat-record':
+        return '19'
+      case 'miniapp':
+        return '33'
+      case 'quote':
+        return '57'
+      case 'transfer':
+        return '2000'
+      case 'red-packet':
+        return '2001'
+      case 'music':
+        return '3'
+      default:
+        if (msg.linkUrl) return '5'
+        if (msg.fileName) return '6'
+        return ''
+    }
+  }
+
+  private getType49Content(msg: Message): string {
+    const subtype = this.resolveType49Subtype(msg)
+    const title = msg.linkTitle || msg.fileName || ''
+
+    switch (subtype) {
+      case '5':
+      case '49':
+        return title ? `[链接] ${title}` : '[链接]'
+      case '6':
+        return title ? `[文件] ${title}` : '[文件]'
+      case '19':
+        return title ? `[聊天记录] ${title}` : '[聊天记录]'
+      case '33':
+      case '36':
+        return title ? `[小程序] ${title}` : '[小程序]'
+      case '57':
+        return msg.parsedContent || title || '[引用消息]'
+      case '2000':
+        return title ? `[转账] ${title}` : '[转账]'
+      case '2001':
+        return title ? `[红包] ${title}` : '[红包]'
+      case '3':
+        return title ? `[音乐] ${title}` : '[音乐]'
+      default:
+        return msg.parsedContent || title || '[消息]'
+    }
+  }
+
   /**
    * 获取消息内容
    */
   private getMessageContent(msg: Message): string | null {
+    if (msg.localType === 49) {
+      return this.getType49Content(msg)
+    }
+
     // 优先使用已解析的内容
     if (msg.parsedContent) {
       return msg.parsedContent
@@ -1276,7 +1367,7 @@ class HttpService {
       case 48:
         return '[位置]'
       case 49:
-        return msg.linkTitle || msg.fileName || '[消息]'
+        return this.getType49Content(msg)
       default:
         return msg.rawContent || null
     }
@@ -1302,4 +1393,3 @@ class HttpService {
 }
 
 export const httpService = new HttpService()
-

electron/services/imageDecryptService.ts

@@ -64,6 +64,7 @@ type CachedImagePayload = {
 
 type DecryptImagePayload = CachedImagePayload & {
   force?: boolean
+  hardlinkOnly?: boolean
 }
 
 export class ImageDecryptService {
@@ -158,7 +159,9 @@ export class ImageDecryptService {
   }
 
   async decryptImage(payload: DecryptImagePayload): Promise<DecryptResult> {
-    await this.ensureCacheIndexed()
+    if (!payload.hardlinkOnly) {
+      await this.ensureCacheIndexed()
+    }
     const cacheKeys = this.getCacheKeys(payload)
     const cacheKey = cacheKeys[0]
     if (!cacheKey) {
@@ -180,14 +183,16 @@ export class ImageDecryptService {
         }
       }
 
-      for (const key of cacheKeys) {
-        const existingHd = this.findCachedOutput(key, true, payload.sessionId)
-        if (!existingHd || this.isThumbnailPath(existingHd)) continue
-        this.cacheResolvedPaths(cacheKey, payload.imageMd5, payload.imageDatName, existingHd)
-        this.clearUpdateFlags(cacheKey, payload.imageMd5, payload.imageDatName)
-        const localPath = this.resolveLocalPathForPayload(existingHd, payload.preferFilePath)
-        this.emitCacheResolved(payload, cacheKey, this.resolveEmitPath(existingHd, payload.preferFilePath))
-        return { success: true, localPath }
+      if (!payload.hardlinkOnly) {
+        for (const key of cacheKeys) {
+          const existingHd = this.findCachedOutput(key, true, payload.sessionId)
+          if (!existingHd || this.isThumbnailPath(existingHd)) continue
+          this.cacheResolvedPaths(cacheKey, payload.imageMd5, payload.imageDatName, existingHd)
+          this.clearUpdateFlags(cacheKey, payload.imageMd5, payload.imageDatName)
+          const localPath = this.resolveLocalPathForPayload(existingHd, payload.preferFilePath)
+          this.emitCacheResolved(payload, cacheKey, this.resolveEmitPath(existingHd, payload.preferFilePath))
+          return { success: true, localPath }
+        }
       }
     }
 
@@ -255,7 +260,7 @@ export class ImageDecryptService {
     payload: DecryptImagePayload,
     cacheKey: string
   ): Promise<DecryptResult> {
-    this.logInfo('开始解密图片', { md5: payload.imageMd5, datName: payload.imageDatName, force: payload.force })
+    this.logInfo('开始解密图片', { md5: payload.imageMd5, datName: payload.imageDatName, force: payload.force, hardlinkOnly: payload.hardlinkOnly === true })
     try {
       const wxid = this.configService.get('myWxid')
       const dbPath = this.configService.get('dbPath')
@@ -275,7 +280,11 @@ export class ImageDecryptService {
         payload.imageMd5,
         payload.imageDatName,
         payload.sessionId,
-        { allowThumbnail: !payload.force, skipResolvedCache: Boolean(payload.force) }
+        {
+          allowThumbnail: !payload.force,
+          skipResolvedCache: Boolean(payload.force),
+          hardlinkOnly: payload.hardlinkOnly === true
+        }
       )
 
       // 如果要求高清图但没找到，直接返回提示
@@ -298,18 +307,20 @@ export class ImageDecryptService {
         return { success: true, localPath, isThumb }
       }
 
-      // 查找已缓存的解密文件
-      const existing = this.findCachedOutput(cacheKey, payload.force, payload.sessionId)
-      if (existing) {
-        this.logInfo('找到已解密文件', { existing, isHd: this.isHdPath(existing) })
-        const isHd = this.isHdPath(existing)
-        // 如果要求高清但找到的是缩略图，继续解密高清图
-        if (!(payload.force && !isHd)) {
-          this.cacheResolvedPaths(cacheKey, payload.imageMd5, payload.imageDatName, existing)
-          const localPath = this.resolveLocalPathForPayload(existing, payload.preferFilePath)
-          const isThumb = this.isThumbnailPath(existing)
-          this.emitCacheResolved(payload, cacheKey, this.resolveEmitPath(existing, payload.preferFilePath))
-          return { success: true, localPath, isThumb }
+      // 查找已缓存的解密文件（hardlink-only 模式下跳过全缓存目录扫描）
+      if (!payload.hardlinkOnly) {
+        const existing = this.findCachedOutput(cacheKey, payload.force, payload.sessionId)
+        if (existing) {
+          this.logInfo('找到已解密文件', { existing, isHd: this.isHdPath(existing) })
+          const isHd = this.isHdPath(existing)
+          // 如果要求高清但找到的是缩略图，继续解密高清图
+          if (!(payload.force && !isHd)) {
+            this.cacheResolvedPaths(cacheKey, payload.imageMd5, payload.imageDatName, existing)
+            const localPath = this.resolveLocalPathForPayload(existing, payload.preferFilePath)
+            const isThumb = this.isThumbnailPath(existing)
+            this.emitCacheResolved(payload, cacheKey, this.resolveEmitPath(existing, payload.preferFilePath))
+            return { success: true, localPath, isThumb }
+          }
         }
       }
 
@@ -467,15 +478,17 @@ export class ImageDecryptService {
     imageMd5?: string,
     imageDatName?: string,
     sessionId?: string,
-    options?: { allowThumbnail?: boolean; skipResolvedCache?: boolean }
+    options?: { allowThumbnail?: boolean; skipResolvedCache?: boolean; hardlinkOnly?: boolean }
   ): Promise<string | null> {
     const allowThumbnail = options?.allowThumbnail ?? true
     const skipResolvedCache = options?.skipResolvedCache ?? false
+    const hardlinkOnly = options?.hardlinkOnly ?? false
     this.logInfo('[ImageDecrypt] resolveDatPath', {
       imageMd5,
       imageDatName,
       allowThumbnail,
-      skipResolvedCache
+      skipResolvedCache,
+      hardlinkOnly
     })
 
     if (!skipResolvedCache) {
@@ -500,7 +513,7 @@ export class ImageDecryptService {
     }
 
     // 1. 通过 MD5 快速定位 (MsgAttach 目录)
-    if (imageMd5) {
+    if (!hardlinkOnly && allowThumbnail && imageMd5) {
       const res = await this.fastProbabilisticSearch(join(accountDir, 'msg', 'attach'), imageMd5, allowThumbnail)
       if (res) return res
       if (imageDatName && imageDatName !== imageMd5 && this.looksLikeMd5(imageDatName)) {
@@ -510,7 +523,7 @@ export class ImageDecryptService {
     }
 
     // 2. 如果 imageDatName 看起来像 MD5，也尝试快速定位
-    if (!imageMd5 && imageDatName && this.looksLikeMd5(imageDatName)) {
+    if (!hardlinkOnly && allowThumbnail && !imageMd5 && imageDatName && this.looksLikeMd5(imageDatName)) {
       const res = await this.fastProbabilisticSearch(join(accountDir, 'msg', 'attach'), imageDatName, allowThumbnail)
       if (res) return res
     }
@@ -587,6 +600,11 @@ export class ImageDecryptService {
       this.logInfo('[ImageDecrypt] hardlink miss (datName)', { imageDatName })
     }
 
+    if (hardlinkOnly) {
+      this.logInfo('[ImageDecrypt] resolveDatPath miss (hardlink-only)', { imageMd5, imageDatName })
+      return null
+    }
+
     // 如果要求高清图但 hardlink 没找到，也不要搜索了（搜索太慢）
     if (!allowThumbnail) {
       return null

electron/services/keyServiceLinux.ts

@@ -1,7 +1,7 @@
 import { app } from 'electron'
 import { join } from 'path'
 import { existsSync, readdirSync, statSync, readFileSync } from 'fs'
-import { execFile, exec } from 'child_process'
+import { execFile, exec, spawn } from 'child_process'
 import { promisify } from 'util'
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
@@ -45,33 +45,104 @@ export class KeyServiceLinux {
       onStatus?: (message: string, level: number) => void
   ): Promise<DbKeyResult> {
     try {
+      // 1. 构造一个包含常用系统命令路径的环境变量，防止打包后找不到命令
+      const envWithPath = {
+        ...process.env,
+        PATH: `${process.env.PATH || ''}:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin`
+      };
+
       onStatus?.('正在尝试结束当前微信进程...', 0)
-      await execAsync('killall -9 wechat wechat-bin xwechat').catch(() => {})
+      console.log('[Debug] 开始执行进程清理逻辑...');
+
+      try {
+        const { stdout, stderr } = await execAsync('killall -9 wechat wechat-bin xwechat', { env: envWithPath });
+        console.log(`[Debug] killall 成功退出. stdout: ${stdout}, stderr: ${stderr}`);
+      } catch (err: any) {
+        // 命令如果没找到进程通常会返回 code 1，这也是正常的，但我们需要记录下来
+        console.log(`[Debug] killall 报错或未找到进程: ${err.message}`);
+
+        // Fallback: 尝试使用 pkill 兜底
+        try {
+          console.log('[Debug] 尝试使用备用命令 pkill...');
+          await execAsync('pkill -9 -x "wechat|wechat-bin|xwechat"', { env: envWithPath });
+          console.log('[Debug] pkill 执行完成');
+        } catch (e: any) {
+          console.log(`[Debug] pkill 报错或未找到进程: ${e.message}`);
+        }
+      }
+
       // 稍微等待进程完全退出
       await new Promise(r => setTimeout(r, 1000))
 
       onStatus?.('正在尝试拉起微信...', 0)
-      const startCmds = [
-        'nohup wechat >/dev/null 2>&1 &',
-        'nohup wechat-bin >/dev/null 2>&1 &',
-        'nohup xwechat >/dev/null 2>&1 &'
+
+      const cleanEnv = { ...process.env };
+      delete cleanEnv.ELECTRON_RUN_AS_NODE;
+      delete cleanEnv.ELECTRON_NO_ATTACH_CONSOLE;
+      delete cleanEnv.APPDIR;
+      delete cleanEnv.APPIMAGE;
+
+      const wechatBins = [
+        'wechat',
+        'wechat-bin',
+        'xwechat',
+        '/opt/wechat/wechat',
+        '/usr/bin/wechat',
+        '/opt/apps/com.tencent.wechat/files/wechat'
       ]
-      for (const cmd of startCmds) execAsync(cmd).catch(() => {})
+
+      for (const binName of wechatBins) {
+        try {
+          const child = spawn(binName, [], {
+            detached: true,
+            stdio: 'ignore',
+            env: cleanEnv
+          });
+
+          child.on('error', (err) => {
+            console.log(`[Debug] 拉起 ${binName} 失败:`, err.message);
+          });
+
+          child.unref();
+          console.log(`[Debug] 尝试拉起 ${binName} 完毕`);
+        } catch (e: any) {
+          console.log(`[Debug] 尝试拉起 ${binName} 发生异常:`, e.message);
+        }
+      }
 
       onStatus?.('等待微信进程出现...', 0)
       let pid = 0
       for (let i = 0; i < 15; i++) { // 最多等 15 秒
         await new Promise(r => setTimeout(r, 1000))
-        const { stdout } = await execAsync('pidof wechat wechat-bin xwechat').catch(() => ({ stdout: '' }))
-        const pids = stdout.trim().split(/\s+/).filter(p => p)
-        if (pids.length > 0) {
-          pid = parseInt(pids[0], 10)
-          break
+
+        try {
+          const { stdout } = await execAsync('pidof wechat wechat-bin xwechat', { env: envWithPath });
+          const pids = stdout.trim().split(/\s+/).filter(p => p);
+          if (pids.length > 0) {
+            pid = parseInt(pids[0], 10);
+            console.log(`[Debug] 第 ${i + 1} 秒，通过 pidof 成功获取 PID: ${pid}`);
+            break;
+          }
+        } catch (err: any) {
+          console.log(`[Debug] 第 ${i + 1} 秒，pidof 失败: ${err.message.split('\n')[0]}`);
+
+          // Fallback: 使用 pgrep 兜底
+          try {
+            const { stdout: pgrepOut } = await execAsync('pgrep -x "wechat|wechat-bin|xwechat"', { env: envWithPath });
+            const pids = pgrepOut.trim().split(/\s+/).filter(p => p);
+            if (pids.length > 0) {
+              pid = parseInt(pids[0], 10);
+              console.log(`[Debug] 第 ${i + 1} 秒，通过 pgrep 成功获取 PID: ${pid}`);
+              break;
+            }
+          } catch (e: any) {
+            console.log(`[Debug] 第 ${i + 1} 秒，pgrep 也失败: ${e.message.split('\n')[0]}`);
+          }
         }
       }
 
       if (!pid) {
-        const err = '未能自动启动微信，请手动启动并登录。'
+        const err = '未能自动启动微信，或获取PID失败，请查看控制台日志或手动启动并登录。'
         onStatus?.(err, 2)
         return { success: false, error: err }
       }
@@ -82,6 +153,7 @@ export class KeyServiceLinux {
 
       return await this.getDbKey(pid, onStatus)
     } catch (err: any) {
+      console.error('[Debug] 自动获取流程彻底崩溃:', err);
       const errMsg = '自动获取微信 PID 失败: ' + err.message
       onStatus?.(errMsg, 2)
       return { success: false, error: errMsg }

electron/services/messagePushService.ts

@@ -304,11 +304,8 @@ class MessagePushService {
     }
 
     const groupNicknames = await this.getGroupNicknames(chatroomId)
-    const normalizedSender = this.normalizeAccountId(senderUsername)
-    const nickname = groupNicknames[senderUsername]
-      || groupNicknames[senderUsername.toLowerCase()]
-      || groupNicknames[normalizedSender]
-      || groupNicknames[normalizedSender.toLowerCase()]
+    const senderKey = senderUsername.toLowerCase()
+    const nickname = groupNicknames[senderKey]
 
     if (nickname) {
       return nickname
@@ -328,22 +325,33 @@ class MessagePushService {
     }
 
     const result = await wcdbService.getGroupNicknames(cacheKey)
-    const nicknames = result.success && result.nicknames ? result.nicknames : {}
+    const nicknames = result.success && result.nicknames
+      ? this.sanitizeGroupNicknames(result.nicknames)
+      : {}
     this.groupNicknameCache.set(cacheKey, { nicknames, updatedAt: Date.now() })
     return nicknames
   }
 
-  private normalizeAccountId(value: string): string {
-    const trimmed = String(value || '').trim()
-    if (!trimmed) return trimmed
-
-    if (trimmed.toLowerCase().startsWith('wxid_')) {
-      const match = trimmed.match(/^(wxid_[^_]+)/i)
-      return match ? match[1] : trimmed
+  private sanitizeGroupNicknames(nicknames: Record<string, string>): Record<string, string> {
+    const buckets = new Map<string, Set<string>>()
+    for (const [memberIdRaw, nicknameRaw] of Object.entries(nicknames || {})) {
+      const memberId = String(memberIdRaw || '').trim().toLowerCase()
+      const nickname = String(nicknameRaw || '').trim()
+      if (!memberId || !nickname) continue
+      const slot = buckets.get(memberId)
+      if (slot) {
+        slot.add(nickname)
+      } else {
+        buckets.set(memberId, new Set([nickname]))
+      }
     }
 
-    const suffixMatch = trimmed.match(/^(.+)_([a-zA-Z0-9]{4})$/)
-    return suffixMatch ? suffixMatch[1] : trimmed
+    const trusted: Record<string, string> = {}
+    for (const [memberId, nicknameSet] of buckets.entries()) {
+      if (nicknameSet.size !== 1) continue
+      trusted[memberId] = Array.from(nicknameSet)[0]
+    }
+    return trusted
   }
 
   private isRecentMessage(messageKey: string): boolean {

electron/services/snsService.ts

@@ -27,6 +27,17 @@ export interface SnsMedia {
     livePhoto?: SnsLivePhoto
 }
 
+export interface SnsLocation {
+    latitude?: number
+    longitude?: number
+    city?: string
+    country?: string
+    poiName?: string
+    poiAddress?: string
+    poiAddressName?: string
+    label?: string
+}
+
 export interface SnsPost {
     id: string
     tid?: string       // 数据库主键（雪花 ID），用于精确删除
@@ -39,6 +50,7 @@ export interface SnsPost {
     media: SnsMedia[]
     likes: string[]
     comments: { id: string; nickname: string; content: string; refCommentId: string; refNickname?: string; emojis?: { url: string; md5: string; width: number; height: number; encryptUrl?: string; aesKey?: string }[] }[]
+    location?: SnsLocation
     rawXml?: string
     linkTitle?: string
     linkUrl?: string
@@ -287,6 +299,17 @@ function parseCommentsFromXml(xml: string): ParsedCommentItem[] {
     return comments
 }
 
+const decodeXmlText = (text: string): string => {
+    if (!text) return ''
+    return text
+        .replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g, '$1')
+        .replace(/&amp;/gi, '&')
+        .replace(/&lt;/gi, '<')
+        .replace(/&gt;/gi, '>')
+        .replace(/&quot;/gi, '"')
+        .replace(/&#39;/gi, "'")
+}
+
 class SnsService {
     private configService: ConfigService
     private contactCache: ContactCacheService
@@ -647,6 +670,110 @@ class SnsService {
         return { media, videoKey }
     }
 
+    private toOptionalNumber(value: unknown): number | undefined {
+        if (typeof value === 'number' && Number.isFinite(value)) return value
+        if (typeof value !== 'string') return undefined
+        const trimmed = value.trim()
+        if (!trimmed) return undefined
+        const parsed = Number.parseFloat(trimmed)
+        return Number.isFinite(parsed) ? parsed : undefined
+    }
+
+    private normalizeLocation(input: unknown): SnsLocation | undefined {
+        if (!input || typeof input !== 'object') return undefined
+
+        const row = input as Record<string, unknown>
+        const normalizeText = (value: unknown): string | undefined => {
+            if (typeof value !== 'string') return undefined
+            return this.toOptionalString(decodeXmlText(value))
+        }
+
+        const location: SnsLocation = {}
+        const latitude = this.toOptionalNumber(row.latitude ?? row.lat ?? row.x)
+        const longitude = this.toOptionalNumber(row.longitude ?? row.lng ?? row.y)
+        const city = normalizeText(row.city)
+        const country = normalizeText(row.country)
+        const poiName = normalizeText(row.poiName ?? row.poiname)
+        const poiAddress = normalizeText(row.poiAddress ?? row.poiaddress)
+        const poiAddressName = normalizeText(row.poiAddressName ?? row.poiaddressname)
+        const label = normalizeText(row.label)
+
+        if (latitude !== undefined) location.latitude = latitude
+        if (longitude !== undefined) location.longitude = longitude
+        if (city) location.city = city
+        if (country) location.country = country
+        if (poiName) location.poiName = poiName
+        if (poiAddress) location.poiAddress = poiAddress
+        if (poiAddressName) location.poiAddressName = poiAddressName
+        if (label) location.label = label
+
+        return Object.keys(location).length > 0 ? location : undefined
+    }
+
+    private parseLocationFromXml(xml: string): SnsLocation | undefined {
+        if (!xml) return undefined
+
+        try {
+            const locationTagMatch = xml.match(/<location\b([^>]*)>/i)
+            const locationAttrs = locationTagMatch?.[1] || ''
+            const readAttr = (name: string): string | undefined => {
+                if (!locationAttrs) return undefined
+                const match = locationAttrs.match(new RegExp(`${name}\\s*=\\s*["']([\\s\\S]*?)["']`, 'i'))
+                if (!match?.[1]) return undefined
+                return this.toOptionalString(decodeXmlText(match[1]))
+            }
+            const readTag = (name: string): string | undefined => {
+                const match = xml.match(new RegExp(`<${name}>([\\s\\S]*?)<\\/${name}>`, 'i'))
+                if (!match?.[1]) return undefined
+                return this.toOptionalString(decodeXmlText(match[1]))
+            }
+
+            const location: SnsLocation = {}
+            const latitude = this.toOptionalNumber(readAttr('latitude') || readAttr('x') || readTag('latitude') || readTag('x'))
+            const longitude = this.toOptionalNumber(readAttr('longitude') || readAttr('y') || readTag('longitude') || readTag('y'))
+            const city = readAttr('city') || readTag('city')
+            const country = readAttr('country') || readTag('country')
+            const poiName = readAttr('poiName') || readAttr('poiname') || readTag('poiName') || readTag('poiname')
+            const poiAddress = readAttr('poiAddress') || readAttr('poiaddress') || readTag('poiAddress') || readTag('poiaddress')
+            const poiAddressName = readAttr('poiAddressName') || readAttr('poiaddressname') || readTag('poiAddressName') || readTag('poiaddressname')
+            const label = readAttr('label') || readTag('label')
+
+            if (latitude !== undefined) location.latitude = latitude
+            if (longitude !== undefined) location.longitude = longitude
+            if (city) location.city = city
+            if (country) location.country = country
+            if (poiName) location.poiName = poiName
+            if (poiAddress) location.poiAddress = poiAddress
+            if (poiAddressName) location.poiAddressName = poiAddressName
+            if (label) location.label = label
+
+            return Object.keys(location).length > 0 ? location : undefined
+        } catch (e) {
+            console.error('[SnsService] 解析位置 XML 失败:', e)
+            return undefined
+        }
+    }
+
+    private mergeLocation(primary?: SnsLocation, fallback?: SnsLocation): SnsLocation | undefined {
+        if (!primary && !fallback) return undefined
+
+        const merged: SnsLocation = {}
+        const setValue = <K extends keyof SnsLocation>(key: K, value: SnsLocation[K] | undefined) => {
+            if (value !== undefined) merged[key] = value
+        }
+
+        setValue('latitude', primary?.latitude ?? fallback?.latitude)
+        setValue('longitude', primary?.longitude ?? fallback?.longitude)
+        setValue('city', primary?.city ?? fallback?.city)
+        setValue('country', primary?.country ?? fallback?.country)
+        setValue('poiName', primary?.poiName ?? fallback?.poiName)
+        setValue('poiAddress', primary?.poiAddress ?? fallback?.poiAddress)
+        setValue('poiAddressName', primary?.poiAddressName ?? fallback?.poiAddressName)
+        setValue('label', primary?.label ?? fallback?.label)
+
+        return Object.keys(merged).length > 0 ? merged : undefined
+    }
+
     private getSnsCacheDir(): string {
         const cachePath = this.configService.getCacheBasePath()
         const snsCacheDir = join(cachePath, 'sns_cache')
@@ -948,7 +1075,12 @@ class SnsService {
         const enrichedTimeline = result.timeline.map((post: any) => {
             const contact = this.contactCache.get(post.username)
             const isVideoPost = post.type === 15
-            const videoKey = extractVideoKey(post.rawXml || '')
+            const rawXml = post.rawXml || ''
+            const videoKey = extractVideoKey(rawXml)
+            const location = this.mergeLocation(
+                this.normalizeLocation((post as { location?: unknown }).location),
+                this.parseLocationFromXml(rawXml)
+            )
 
             const fixedMedia = (post.media || []).map((m: any) => ({
                 url: fixSnsUrl(m.url, m.token, isVideoPost),
@@ -971,7 +1103,6 @@ class SnsService {
             // 如果 DLL 评论缺少表情包信息，回退到从 rawXml 重新解析
             const dllComments: any[] = post.comments || []
             const hasEmojisInDll = dllComments.some((c: any) => c.emojis && c.emojis.length > 0)
-            const rawXml = post.rawXml || ''
 
             let finalComments: any[]
             if (dllComments.length > 0 && (hasEmojisInDll || !rawXml)) {
@@ -990,7 +1121,8 @@ class SnsService {
                 avatarUrl: contact?.avatarUrl,
                 nickname: post.nickname || contact?.displayName || post.username,
                 media: fixedMedia,
-                comments: finalComments
+                comments: finalComments,
+                location
             }
         })
 
@@ -1346,6 +1478,7 @@ class SnsService {
                         })),
                         likes: p.likes,
                         comments: p.comments,
+                        location: p.location,
                         linkTitle: (p as any).linkTitle,
                         linkUrl: (p as any).linkUrl
                     }))
@@ -1397,6 +1530,7 @@ class SnsService {
                         })),
                         likes: post.likes,
                         comments: post.comments,
+                        location: post.location,
                         likesDetail,
                         commentsDetail,
                         linkTitle: (post as any).linkTitle,
@@ -1479,6 +1613,27 @@ class SnsService {
             const ch = name.charAt(0)
             return escapeHtml(ch || '?')
         }
+        const normalizeLocationText = (value?: string): string => (
+            decodeXmlText(String(value || '')).replace(/\s+/g, ' ').trim()
+        )
+        const resolveLocationText = (location?: SnsLocation): string => {
+            if (!location) return ''
+            const primaryCandidates = [
+                normalizeLocationText(location.poiName),
+                normalizeLocationText(location.poiAddressName),
+                normalizeLocationText(location.label),
+                normalizeLocationText(location.poiAddress)
+            ].filter(Boolean)
+            const primary = primaryCandidates[0] || ''
+            const region = [
+                normalizeLocationText(location.country),
+                normalizeLocationText(location.city)
+            ].filter(Boolean).join(' ')
+            if (primary && region && !primary.includes(region)) {
+                return `${primary} · ${region}`
+            }
+            return primary || region
+        }
 
         let filterInfo = ''
         if (filters.keyword) filterInfo += `关键词: "${escapeHtml(filters.keyword)}" `
@@ -1502,6 +1657,10 @@ class SnsService {
             const linkHtml = post.linkTitle && post.linkUrl
                 ? `<a class="lk" href="${escapeHtml(post.linkUrl)}" target="_blank"><span class="lk-t">${escapeHtml(post.linkTitle)}</span><span class="lk-a">›</span></a>`
                 : ''
+            const locationText = resolveLocationText(post.location)
+            const locationHtml = locationText
+                ? `<div class="loc"><span class="loc-i">📍</span><span class="loc-t">${escapeHtml(locationText)}</span></div>`
+                : ''
 
             const likesHtml = post.likes.length > 0
                 ? `<div class="interactions"><div class="likes">♥ ${post.likes.map(l => `<span>${escapeHtml(l)}</span>`).join('、')}</div></div>`
@@ -1524,6 +1683,7 @@ ${avatarHtml}
 <div class="body">
 <div class="hd"><span class="nick">${escapeHtml(post.nickname)}</span><span class="tm">${formatTime(post.createTime)}</span></div>
 ${post.contentDesc ? `<div class="txt">${escapeHtml(post.contentDesc)}</div>` : ''}
+${locationHtml}
 ${mediaHtml ? `<div class="mg ${gridClass}">${mediaHtml}</div>` : ''}
 ${linkHtml}
 ${likesHtml}
@@ -1559,6 +1719,9 @@ body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI","PingFang SC","Hira
 .nick{font-size:15px;font-weight:700;color:var(--accent);margin-bottom:2px}
 .tm{font-size:12px;color:var(--t3)}
 .txt{font-size:15px;line-height:1.6;white-space:pre-wrap;word-break:break-word;margin-bottom:12px}
+.loc{display:flex;align-items:flex-start;gap:6px;font-size:13px;color:var(--t2);margin:-4px 0 12px}
+.loc-i{line-height:1.3}
+.loc-t{line-height:1.45;word-break:break-word}
 
 /* 媒体网格 */
 .mg{display:grid;gap:6px;margin-bottom:12px;max-width:320px}

electron/services/voiceTranscribeService.ts

@@ -273,8 +273,20 @@ export class VoiceTranscribeService {
         })
 
         worker.on('error', (err: Error) => resolve({ success: false, error: String(err) }))
-        worker.on('exit', (code: number) => {
-          if (code !== 0) resolve({ success: false, error: `Worker exited with code ${code}` })
+        worker.on('exit', (code: number | null, signal: string | null) => {
+          if (code === null || signal === 'SIGSEGV') {
+
+            console.error(`[VoiceTranscribe] Worker 异常崩溃，信号: ${signal}。可能是由于底层 C++ 运行库在当前系统上发生段错误。`);
+            resolve({
+              success: false,
+              error: 'SEGFAULT_ERROR'
+            });
+            return;
+          }
+
+          if (code !== 0) {
+            resolve({ success: false, error: `Worker exited with code ${code}` });
+          }
         })
 
       } catch (error) {

electron/services/wcdbCore.ts

@@ -68,6 +68,8 @@ export class WcdbCore {
   private wcdbListMediaDbs: any = null
   private wcdbGetMessageById: any = null
   private wcdbGetEmoticonCdnUrl: any = null
+  private wcdbGetEmoticonCaption: any = null
+  private wcdbGetEmoticonCaptionStrict: any = null
   private wcdbGetDbStatus: any = null
   private wcdbGetVoiceData: any = null
   private wcdbGetVoiceDataBatch: any = null
@@ -124,6 +126,10 @@ export class WcdbCore {
     this.writeLog(`[bootstrap] setPaths resourcesPath=${resourcesPath} userDataPath=${userDataPath}`, true)
   }
 
+  getLastInitError(): string | null {
+    return lastDllInitError
+  }
+
   setLogEnabled(enabled: boolean): void {
     this.logEnabled = enabled
     this.writeLog(`[bootstrap] setLogEnabled=${enabled ? '1' : '0'} env.WCDB_LOG_ENABLED=${process.env.WCDB_LOG_ENABLED || ''}`, true)
@@ -264,8 +270,9 @@ export class WcdbCore {
   private getDllPath(): string {
     const isMac = process.platform === 'darwin'
     const isLinux = process.platform === 'linux'
+    const isArm64 = process.arch === 'arm64'
     const libName = isMac ? 'libwcdb_api.dylib' : isLinux ? 'libwcdb_api.so' : 'wcdb_api.dll'
-    const subDir = isMac ? 'macos' : isLinux ? 'linux' : ''
+    const subDir = isMac ? 'macos' : isLinux ? 'linux' : (isArm64 ? 'arm64' : '')
     
     const envDllPath = process.env.WCDB_DLL_PATH
     if (envDllPath && envDllPath.length > 0) {
@@ -296,6 +303,10 @@ export class WcdbCore {
     return candidates[0] || libName
   }
 
+  private formatInitProtectionError(code: number): string {
+    return `错误码: ${code}`
+  }
+
   private isLogEnabled(): boolean {
     // 移除 Worker 线程的日志禁用逻辑，允许在 Worker 中记录日志
     if (process.env.WCDB_LOG_ENABLED === '1') return true
@@ -617,11 +628,13 @@ export class WcdbCore {
         }
       }
 
+      this.writeLog(`[bootstrap] koffi.load begin path=${dllPath}`, true)
       this.lib = this.koffi.load(dllPath)
+      this.writeLog('[bootstrap] koffi.load ok', true)
 
       // InitProtection (Added for security)
       try {
-        this.wcdbInitProtection = this.lib.func('bool InitProtection(const char* resourcePath)')
+        this.wcdbInitProtection = this.lib.func('int32 InitProtection(const char* resourcePath)')
 
         // 尝试多个可能的资源路径
         const resourcePaths = [
@@ -634,26 +647,40 @@ export class WcdbCore {
         ].filter(Boolean)
 
         let protectionOk = false
+        let protectionCode = -1
+        let bestFailCode: number | null = null
+        const scoreFailCode = (code: number): number => {
+          if (code >= -2212 && code <= -2201) return 0 // manifest/signature/hash failures
+          if (code === -102 || code === -101 || code === -1006) return 1
+          return 2
+        }
         for (const resPath of resourcePaths) {
           try {
-            // 
-            protectionOk = this.wcdbInitProtection(resPath)
-            if (protectionOk) {
-              // 
+            this.writeLog(`[bootstrap] InitProtection call path=${resPath}`, true)
+            protectionCode = Number(this.wcdbInitProtection(resPath))
+            if (protectionCode === 0) {
+              protectionOk = true
               break
             }
+            if (bestFailCode === null || scoreFailCode(protectionCode) < scoreFailCode(bestFailCode)) {
+              bestFailCode = protectionCode
+            }
+            this.writeLog(`[bootstrap] InitProtection rc=${protectionCode} path=${resPath}`, true)
           } catch (e) {
-            // console.warn(`[WCDB] InitProtection 失败 (${resPath}):`, e)
+            this.writeLog(`[bootstrap] InitProtection exception path=${resPath}: ${String(e)}`, true)
           }
         }
 
         if (!protectionOk) {
-          // console.warn('[WCDB] Core security check failed - 继续运行但可能不稳定')
-          // this.writeLog('InitProtection 失败，继续运行')
-          // 不返回 false，允许继续运行
+          const finalCode = bestFailCode ?? protectionCode
+          lastDllInitError = this.formatInitProtectionError(finalCode)
+          this.writeLog(`[bootstrap] InitProtection failed finalCode=${finalCode}`, true)
+          return false
         }
       } catch (e) {
-        // console.warn('InitProtection symbol not found:', e)
+        lastDllInitError = this.formatInitProtectionError(-2301)
+        this.writeLog(`[bootstrap] InitProtection symbol load failed: ${String(e)}`, true)
+        return false
       }
 
       // 定义类型
@@ -852,6 +879,22 @@ export class WcdbCore {
       // wcdb_status wcdb_get_emoticon_cdn_url(wcdb_handle handle, const char* db_path, const char* md5, char** out_url)
       this.wcdbGetEmoticonCdnUrl = this.lib.func('int32 wcdb_get_emoticon_cdn_url(int64 handle, const char* dbPath, const char* md5, _Out_ void** outUrl)')
 
+      // wcdb_status wcdb_get_emoticon_caption(wcdb_handle handle, const char* db_path, const char* md5, char** out_caption)
+      try {
+        this.wcdbGetEmoticonCaption = this.lib.func('int32 wcdb_get_emoticon_caption(int64 handle, const char* dbPath, const char* md5, _Out_ void** outCaption)')
+      } catch (e) {
+        this.wcdbGetEmoticonCaption = null
+        this.writeLog(`[diag:emoji] symbol missing wcdb_get_emoticon_caption: ${String(e)}`, true)
+      }
+
+      // wcdb_status wcdb_get_emoticon_caption_strict(wcdb_handle handle, const char* md5, char** out_caption)
+      try {
+        this.wcdbGetEmoticonCaptionStrict = this.lib.func('int32 wcdb_get_emoticon_caption_strict(int64 handle, const char* md5, _Out_ void** outCaption)')
+      } catch (e) {
+        this.wcdbGetEmoticonCaptionStrict = null
+        this.writeLog(`[diag:emoji] symbol missing wcdb_get_emoticon_caption_strict: ${String(e)}`, true)
+      }
+
       // wcdb_status wcdb_list_message_dbs(wcdb_handle handle, char** out_json)
       this.wcdbListMessageDbs = this.lib.func('int32 wcdb_list_message_dbs(int64 handle, _Out_ void** outJson)')
 
@@ -1055,7 +1098,7 @@ export class WcdbCore {
       const initResult = this.wcdbInit()
       if (initResult !== 0) {
         console.error('WCDB 初始化失败:', initResult)
-        lastDllInitError = `初始化失败（错误码: ${initResult}）`
+        lastDllInitError = this.formatInitProtectionError(initResult)
         return false
       }
 
@@ -1066,14 +1109,7 @@ export class WcdbCore {
       const errorMsg = e instanceof Error ? e.message : String(e)
       console.error('WCDB 初始化异常:', errorMsg)
       this.writeLog(`WCDB 初始化异常: ${errorMsg}`, true)
-      lastDllInitError = errorMsg
-      // 检查是否是常见的 VC++ 运行时缺失错误
-      if (errorMsg.includes('126') || errorMsg.includes('找不到指定的模块') ||
-        errorMsg.includes('The specified module could not be found')) {
-        lastDllInitError = '可能缺少 Visual C++ 运行时库。请安装 Microsoft Visual C++ Redistributable (x64)。'
-      } else if (errorMsg.includes('193') || errorMsg.includes('不是有效的 Win32 应用程序')) {
-        lastDllInitError = 'DLL 架构不匹配。请确保使用 64 位版本的应用程序。'
-      }
+      lastDllInitError = this.formatInitProtectionError(-2302)
       return false
     }
   }
@@ -1100,8 +1136,7 @@ export class WcdbCore {
       if (!this.initialized) {
         const initOk = await this.initialize()
         if (!initOk) {
-          // 返回更详细的错误信息，帮助用户诊断问题
-          const detailedError = lastDllInitError || 'WCDB 初始化失败'
+          const detailedError = lastDllInitError || this.formatInitProtectionError(-2303)
           return { success: false, error: detailedError }
         }
       }
@@ -1111,7 +1146,7 @@ export class WcdbCore {
       this.writeLog(`testConnection dbPath=${dbPath} wxid=${wxid} dbStorage=${dbStoragePath || 'null'}`)
 
       if (!dbStoragePath || !existsSync(dbStoragePath)) {
-        return { success: false, error: `数据库目录不存在: ${dbPath}` }
+        return { success: false, error: this.formatInitProtectionError(-3001) }
       }
 
       // 递归查找 session.db
@@ -1119,7 +1154,7 @@ export class WcdbCore {
       this.writeLog(`testConnection sessionDb=${sessionDbPath || 'null'}`)
 
       if (!sessionDbPath) {
-        return { success: false, error: `未找到 session.db 文件` }
+        return { success: false, error: this.formatInitProtectionError(-3002) }
       }
 
       // 分配输出参数内存
@@ -1128,17 +1163,13 @@ export class WcdbCore {
 
       if (result !== 0) {
         await this.printLogs()
-        let errorMsg = '数据库打开失败'
-        if (result === -1) errorMsg = '参数错误'
-        else if (result === -2) errorMsg = '密钥错误'
-        else if (result === -3) errorMsg = '数据库打开失败'
         this.writeLog(`testConnection openAccount failed code=${result}`)
-        return { success: false, error: `${errorMsg} (错误码: ${result})` }
+        return { success: false, error: this.formatInitProtectionError(result) }
       }
 
       const tempHandle = handleOut[0]
       if (tempHandle <= 0) {
-        return { success: false, error: '无效的数据库句柄' }
+        return { success: false, error: this.formatInitProtectionError(-3003) }
       }
 
       // 测试成功：使用 shutdown 清理资源（包括测试句柄）
@@ -1167,7 +1198,7 @@ export class WcdbCore {
     } catch (e) {
       console.error('测试连接异常:', e)
       this.writeLog(`testConnection exception: ${String(e)}`)
-      return { success: false, error: String(e) }
+      return { success: false, error: this.formatInitProtectionError(-3004) }
     }
   }
 
@@ -1359,6 +1390,7 @@ export class WcdbCore {
    */
   async open(dbPath: string, hexKey: string, wxid: string): Promise<boolean> {
     try {
+      lastDllInitError = null
       if (!this.initialized) {
         const initOk = await this.initialize()
         if (!initOk) return false
@@ -1386,6 +1418,7 @@ export class WcdbCore {
       if (!dbStoragePath || !existsSync(dbStoragePath)) {
         console.error('数据库目录不存在:', dbPath)
         this.writeLog(`open failed: dbStorage not found for ${dbPath}`)
+        lastDllInitError = this.formatInitProtectionError(-3001)
         return false
       }
 
@@ -1394,6 +1427,7 @@ export class WcdbCore {
       if (!sessionDbPath) {
         console.error('未找到 session.db 文件')
         this.writeLog('open failed: session.db not found')
+        lastDllInitError = this.formatInitProtectionError(-3002)
         return false
       }
 
@@ -1404,11 +1438,13 @@ export class WcdbCore {
         console.error('打开数据库失败:', result)
         await this.printLogs()
         this.writeLog(`open failed: openAccount code=${result}`)
+        lastDllInitError = this.formatInitProtectionError(result)
         return false
       }
 
       const handle = handleOut[0]
       if (handle <= 0) {
+        lastDllInitError = this.formatInitProtectionError(-3003)
         return false
       }
 
@@ -1418,6 +1454,7 @@ export class WcdbCore {
       this.currentWxid = wxid
       this.currentDbStoragePath = dbStoragePath
       this.initialized = true
+      lastDllInitError = null
       if (this.wcdbSetMyWxid && wxid) {
         try {
           this.wcdbSetMyWxid(this.handle, wxid)
@@ -1435,6 +1472,7 @@ export class WcdbCore {
     } catch (e) {
       console.error('打开数据库异常:', e)
       this.writeLog(`open exception: ${String(e)}`)
+      lastDllInitError = this.formatInitProtectionError(-3004)
       return false
     }
   }
@@ -2700,6 +2738,48 @@ export class WcdbCore {
     }
   }
 
+  async getEmoticonCaption(dbPath: string, md5: string): Promise<{ success: boolean; caption?: string; error?: string }> {
+    if (!this.ensureReady()) {
+      return { success: false, error: 'WCDB 未连接' }
+    }
+    if (!this.wcdbGetEmoticonCaption) {
+      return { success: false, error: '接口未就绪: wcdb_get_emoticon_caption' }
+    }
+    try {
+      const outPtr = [null as any]
+      const result = this.wcdbGetEmoticonCaption(this.handle, dbPath || '', md5, outPtr)
+      if (result !== 0 || !outPtr[0]) {
+        return { success: false, error: `获取表情释义失败: ${result}` }
+      }
+      const captionStr = this.decodeJsonPtr(outPtr[0])
+      if (captionStr === null) return { success: false, error: '解析表情释义失败' }
+      return { success: true, caption: captionStr || undefined }
+    } catch (e) {
+      return { success: false, error: String(e) }
+    }
+  }
+
+  async getEmoticonCaptionStrict(md5: string): Promise<{ success: boolean; caption?: string; error?: string }> {
+    if (!this.ensureReady()) {
+      return { success: false, error: 'WCDB 未连接' }
+    }
+    if (!this.wcdbGetEmoticonCaptionStrict) {
+      return { success: false, error: '接口未就绪: wcdb_get_emoticon_caption_strict' }
+    }
+    try {
+      const outPtr = [null as any]
+      const result = this.wcdbGetEmoticonCaptionStrict(this.handle, md5, outPtr)
+      if (result !== 0 || !outPtr[0]) {
+        return { success: false, error: `获取表情释义失败(strict): ${result}` }
+      }
+      const captionStr = this.decodeJsonPtr(outPtr[0])
+      if (captionStr === null) return { success: false, error: '解析表情释义失败(strict)' }
+      return { success: true, caption: captionStr || undefined }
+    } catch (e) {
+      return { success: false, error: String(e) }
+    }
+  }
+
   async listMessageDbs(): Promise<{ success: boolean; data?: string[]; error?: string }> {
     if (!this.ensureReady()) return { success: false, error: 'WCDB 未连接' }
     try {

electron/services/wcdbService.ts

@@ -164,6 +164,10 @@ export class WcdbService {
     return this.callWorker('open', { dbPath, hexKey, wxid })
   }
 
+  async getLastInitError(): Promise<string | null> {
+    return this.callWorker('getLastInitError')
+  }
+
   /**
    * 关闭数据库连接
    */
@@ -455,6 +459,20 @@ export class WcdbService {
     return this.callWorker('getEmoticonCdnUrl', { dbPath, md5 })
   }
 
+  /**
+   * 获取表情包释义
+   */
+  async getEmoticonCaption(dbPath: string, md5: string): Promise<{ success: boolean; caption?: string; error?: string }> {
+    return this.callWorker('getEmoticonCaption', { dbPath, md5 })
+  }
+
+  /**
+   * 获取表情包释义（严格 DLL 接口）
+   */
+  async getEmoticonCaptionStrict(md5: string): Promise<{ success: boolean; caption?: string; error?: string }> {
+    return this.callWorker('getEmoticonCaptionStrict', { md5 })
+  }
+
   /**
    * 列出消息数据库
    */

electron/wcdbWorker.ts

@@ -37,6 +37,9 @@ if (parentPort) {
                 case 'open':
                     result = await core.open(payload.dbPath, payload.hexKey, payload.wxid)
                     break
+                case 'getLastInitError':
+                    result = core.getLastInitError()
+                    break
                 case 'close':
                     core.close()
                     result = { success: true }
@@ -170,6 +173,12 @@ if (parentPort) {
                 case 'getEmoticonCdnUrl':
                     result = await core.getEmoticonCdnUrl(payload.dbPath, payload.md5)
                     break
+                case 'getEmoticonCaption':
+                    result = await core.getEmoticonCaption(payload.dbPath, payload.md5)
+                    break
+                case 'getEmoticonCaptionStrict':
+                    result = await core.getEmoticonCaptionStrict(payload.md5)
+                    break
                 case 'listMessageDbs':
                     result = await core.listMessageDbs()
                     break

package.json

@@ -95,6 +95,7 @@
     "linux": {
       "icon": "public/icon.png",
       "target": [
+        "appimage",
         "deb",
         "tar.gz"
       ],

src/App.tsx

@@ -104,6 +104,44 @@ function App() {
   // 数据收集同意状态
   const [showAnalyticsConsent, setShowAnalyticsConsent] = useState(false)
 
+  const [showWaylandWarning, setShowWaylandWarning] = useState(false)
+
+  useEffect(() => {
+    const checkWaylandStatus = async () => {
+      try {
+        // 防止在非客户端环境报错，先检查 API 是否存在
+        if (!window.electronAPI?.app?.checkWayland) return
+
+        // 通过 configService 检查是否已经弹过窗
+        const hasWarned = await window.electronAPI.config.get('waylandWarningShown')
+
+        if (!hasWarned) {
+          const isWayland = await window.electronAPI.app.checkWayland()
+          if (isWayland) {
+            setShowWaylandWarning(true)
+          }
+        }
+      } catch (e) {
+        console.error('检查 Wayland 状态失败:', e)
+      }
+    }
+
+    // 只有在协议同意之后并且已经进入主应用流程才检查
+    if (!isAgreementWindow && !isOnboardingWindow && !agreementLoading) {
+      checkWaylandStatus()
+    }
+  }, [isAgreementWindow, isOnboardingWindow, agreementLoading])
+
+  const handleDismissWaylandWarning = async () => {
+    try {
+      // 记录到本地配置中，下次不再提示
+      await window.electronAPI.config.set('waylandWarningShown', true)
+    } catch (e) {
+      console.error('保存 Wayland 提示状态失败:', e)
+    }
+    setShowWaylandWarning(false)
+  }
+
   useEffect(() => {
     if (location.pathname !== '/settings') {
       settingsBackgroundRef.current = location
@@ -432,6 +470,8 @@ function App() {
     checkLock()
   }, [isAgreementWindow, isOnboardingWindow, isVideoPlayerWindow])
 
+
+
   // 独立协议窗口
   if (isAgreementWindow) {
     return <AgreementPage />
@@ -614,6 +654,33 @@ function App() {
         </div>
       )}
 
+      {showWaylandWarning && (
+          <div className="agreement-overlay">
+            <div className="agreement-modal">
+              <div className="agreement-header">
+                <Shield size={32} />
+                <h2>环境兼容性提示 (Wayland)</h2>
+              </div>
+              <div className="agreement-content">
+                <div className="agreement-text">
+                  <p>检测到您当前正在使用 <strong>Wayland</strong> 显示服务器。</p>
+                  <p>在 Wayland 环境下，出于系统级的安全与设计机制，<strong>应用程序无法直接控制新弹出窗口的位置</strong>。</p>
+                  <p>这可能导致某些独立窗口（如消息通知、图片查看器等）出现位置随机、或不受控制的情况。这是底层机制导致的，对此我们无能为力。</p>
+                  <br />
+                  <p>如果您觉得窗口位置异常严重影响了使用体验，建议尝试：</p>
+                  <p>1. 在系统登录界面，将会话切换回 <strong>X11 (Xorg)</strong> 模式。</p>
+                  <p>2. 修改您的桌面管理器 (WM/DE) 配置，强制指定该应用程序的窗口规则。</p>
+                </div>
+              </div>
+              <div className="agreement-footer">
+                <div className="agreement-actions">
+                  <button className="btn btn-primary" onClick={handleDismissWaylandWarning}>我知道了，不再提示</button>
+                </div>
+              </div>
+            </div>
+          </div>
+      )}
+
       {/* 更新提示对话框 */}
       <UpdateDialog
         open={showUpdateDialog}

src/components/Sns/SnsPostItem.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useMemo, useEffect } from 'react'
 import { createPortal } from 'react-dom'
-import { Heart, ChevronRight, ImageIcon, Code, Trash2 } from 'lucide-react'
-import { SnsPost, SnsLinkCardData } from '../../types/sns'
+import { Heart, ChevronRight, ImageIcon, Code, Trash2, MapPin } from 'lucide-react'
+import { SnsPost, SnsLinkCardData, SnsLocation } from '../../types/sns'
 import { Avatar } from '../Avatar'
 import { SnsMediaGrid } from './SnsMediaGrid'
 import { getEmojiPath } from 'wechat-emojis'
@@ -134,6 +134,30 @@ const buildLinkCardData = (post: SnsPost): SnsLinkCardData | null => {
     }
 }
 
+const buildLocationText = (location?: SnsLocation): string => {
+    if (!location) return ''
+
+    const normalize = (value?: string): string => (
+        decodeHtmlEntities(String(value || '')).replace(/\s+/g, ' ').trim()
+    )
+
+    const primary = [
+        normalize(location.poiName),
+        normalize(location.poiAddressName),
+        normalize(location.label),
+        normalize(location.poiAddress)
+    ].find(Boolean) || ''
+
+    const region = [normalize(location.country), normalize(location.city)]
+        .filter(Boolean)
+        .join(' ')
+
+    if (primary && region && !primary.includes(region)) {
+        return `${primary} · ${region}`
+    }
+    return primary || region
+}
+
 const SnsLinkCard = ({ card }: { card: SnsLinkCardData }) => {
     const [thumbFailed, setThumbFailed] = useState(false)
     const hostname = useMemo(() => {
@@ -254,6 +278,7 @@ export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDeb
     const [deleting, setDeleting] = useState(false)
     const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
     const linkCard = buildLinkCardData(post)
+    const locationText = useMemo(() => buildLocationText(post.location), [post.location])
     const hasVideoMedia = post.type === 15 || post.media.some((item) => isSnsVideoUrl(item.url))
     const showLinkCard = Boolean(linkCard) && post.media.length <= 1 && !hasVideoMedia
     const showMediaGrid = post.media.length > 0 && !showLinkCard
@@ -379,6 +404,13 @@ export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDeb
                     <div className="post-text">{renderTextWithEmoji(decodeHtmlEntities(post.contentDesc))}</div>
                 )}
 
+                {locationText && (
+                    <div className="post-location" title={locationText}>
+                        <MapPin size={14} />
+                        <span className="post-location-text">{locationText}</span>
+                    </div>
+                )}
+
                 {showLinkCard && linkCard && (
                     <SnsLinkCard card={linkCard} />
                 )}

src/pages/ChatPage.scss

@@ -625,7 +625,7 @@
 
           .bubble-content {
             background: var(--primary-gradient);
-            color: #fff;
+            color: var(--on-primary);
             border-radius: 18px 18px 4px 18px;
             padding: 10px 14px;
             font-size: 14px;
@@ -1962,7 +1962,7 @@
 
     .bubble-content {
       background: var(--primary);
-      color: white;
+      color: var(--on-primary);
       border-radius: 18px 18px 4px 18px;
     }
   }
@@ -2420,7 +2420,6 @@
   background: rgba(0, 0, 0, 0.04);
   border-left: 2px solid var(--primary);
   padding: 6px 10px;
-  margin-bottom: 8px;
   border-radius: 4px;
   font-size: 13px;
 
@@ -2454,15 +2453,15 @@
 
 // 自己发送的消息中的引用样式
 .message-bubble.sent .quoted-message {
-  background: rgba(255, 255, 255, 0.15);
-  border-left-color: rgba(255, 255, 255, 0.5);
+  background: color-mix(in srgb, var(--on-primary) 12%, var(--primary));
+  border-left-color: color-mix(in srgb, var(--on-primary) 36%, var(--primary));
 
   .quoted-sender {
-    color: rgba(255, 255, 255, 0.9);
+    color: color-mix(in srgb, var(--on-primary) 92%, var(--primary));
   }
 
   .quoted-text {
-    color: rgba(255, 255, 255, 0.8);
+    color: color-mix(in srgb, var(--on-primary) 80%, var(--primary));
   }
 }
 
@@ -2482,6 +2481,14 @@
 
 .bubble-content {
   -webkit-app-region: no-drag;
+
+  &.quote-layout-top .quoted-message {
+    margin-bottom: 8px;
+  }
+
+  &.quote-layout-bottom .quoted-message {
+    margin-top: 8px;
+  }
 }
 
 // 时间分隔

src/pages/ChatPage.tsx

@@ -52,6 +52,8 @@ interface GlobalMsgPrefixCacheEntry {
   completed: boolean
 }
 
+type QuoteLayout = configService.QuoteLayout
+
 const GLOBAL_MSG_PER_SESSION_LIMIT = 10
 const GLOBAL_MSG_SEED_LIMIT = 120
 const GLOBAL_MSG_BACKFILL_CONCURRENCY = 3
@@ -7556,6 +7558,7 @@ function MessageBubble({
   const [senderAvatarUrl, setSenderAvatarUrl] = useState<string | undefined>(undefined)
   const [senderName, setSenderName] = useState<string | undefined>(undefined)
   const [quotedSenderName, setQuotedSenderName] = useState<string | undefined>(undefined)
+  const [quoteLayout, setQuoteLayout] = useState<QuoteLayout>('quote-top')
   const senderProfileRequestSeqRef = useRef(0)
   const [emojiError, setEmojiError] = useState(false)
   const [emojiLoading, setEmojiLoading] = useState(false)
@@ -7611,6 +7614,12 @@ function MessageBubble({
   const [voiceWaveform, setVoiceWaveform] = useState<number[]>([])
   const voiceAutoDecryptTriggered = useRef(false)
 
+
+  const [systemAlert, setSystemAlert] = useState<{
+    title: string;
+    message: React.ReactNode;
+  } | null>(null)
+
   // 转账消息双方名称
   const [transferPayerName, setTransferPayerName] = useState<string | undefined>(undefined)
   const [transferReceiverName, setTransferReceiverName] = useState<string | undefined>(undefined)
@@ -8290,9 +8299,9 @@ function MessageBubble({
       }
 
       const result = await window.electronAPI.chat.getVoiceTranscript(
-        session.username,
-        String(message.localId),
-        message.createTime
+          session.username,
+          String(message.localId),
+          message.createTime
       )
 
       if (result.success) {
@@ -8300,6 +8309,21 @@ function MessageBubble({
         voiceTranscriptCache.set(voiceTranscriptCacheKey, transcriptText)
         setVoiceTranscript(transcriptText)
       } else {
+        if (result.error === 'SEGFAULT_ERROR') {
+          console.warn('[ChatPage] 捕获到语音引擎底层段错误');
+
+          setSystemAlert({
+            title: '引擎崩溃提示',
+            message: (
+                <>
+                  语音识别引擎发生底层崩溃 (Segmentation Fault)。<br /><br />
+                  如果您使用的是 Linux 等自定义程度较高的系统，请检查 <code>sherpa-onnx</code> 的相关系统动态链接库 (如 glibc 等) 是否兼容。
+                </>
+            )
+          });
+
+        }
+
         setVoiceTranscriptError(true)
         voiceTranscriptRequestedRef.current = false
       }
@@ -8528,6 +8552,18 @@ function MessageBubble({
     myWxid
   ])
 
+  useEffect(() => {
+    let cancelled = false
+    void configService.getQuoteLayout().then((layout) => {
+      if (!cancelled) setQuoteLayout(layout)
+    }).catch(() => {
+      if (!cancelled) setQuoteLayout('quote-top')
+    })
+    return () => {
+      cancelled = true
+    }
+  }, [])
+
   const locationMessageMeta = useMemo(() => {
     if (message.localType !== 48) return null
     const raw = message.rawContent || ''
@@ -8563,6 +8599,31 @@ function MessageBubble({
   // 是否有引用消息
   const hasQuote = quotedContent.length > 0
   const displayQuotedSenderName = quotedSenderName || quotedSenderFallbackName
+  const renderBubbleWithQuote = useCallback((quotedNode: React.ReactNode, messageNode: React.ReactNode) => {
+    const quoteFirst = quoteLayout !== 'quote-bottom'
+    return (
+      <div className={`bubble-content ${quoteFirst ? 'quote-layout-top' : 'quote-layout-bottom'}`}>
+        {quoteFirst ? (
+          <>
+            {quotedNode}
+            {messageNode}
+          </>
+        ) : (
+          <>
+            {messageNode}
+            {quotedNode}
+          </>
+        )}
+      </div>
+    )
+  }, [quoteLayout])
+
+  const renderQuotedMessageBlock = useCallback((contentNode: React.ReactNode) => (
+    <div className="quoted-message">
+      {displayQuotedSenderName && <span className="quoted-sender">{displayQuotedSenderName}</span>}
+      <span className="quoted-text">{contentNode}</span>
+    </div>
+  ), [displayQuotedSenderName])
 
   const handlePlayVideo = useCallback(async () => {
     if (!videoInfo?.videoUrl) return
@@ -9002,13 +9063,10 @@ function MessageBubble({
         }
 
         return (
-          <div className="bubble-content">
-            <div className="quoted-message">
-              {displayQuotedSenderName && <span className="quoted-sender">{displayQuotedSenderName}</span>}
-              <span className="quoted-text">{renderReferContent()}</span>
-            </div>
+          renderBubbleWithQuote(
+            renderQuotedMessageBlock(renderReferContent()),
             <div className="message-text">{renderTextWithEmoji(cleanMessageContent(replyText))}</div>
-          </div>
+          )
         )
       }
 
@@ -9101,13 +9159,10 @@ function MessageBubble({
         const replyText = message.linkTitle || q('title') || cleanedParsedContent || ''
         const referContent = message.quotedContent || q('refermsg > content') || ''
         return (
-          <div className="bubble-content">
-            <div className="quoted-message">
-              {displayQuotedSenderName && <span className="quoted-sender">{displayQuotedSenderName}</span>}
-              <span className="quoted-text">{renderTextWithEmoji(cleanMessageContent(referContent))}</span>
-            </div>
+          renderBubbleWithQuote(
+            renderQuotedMessageBlock(renderTextWithEmoji(cleanMessageContent(referContent))),
             <div className="message-text">{renderTextWithEmoji(cleanMessageContent(replyText))}</div>
-          </div>
+          )
         )
       }
 
@@ -9317,13 +9372,10 @@ function MessageBubble({
         }
 
         return (
-          <div className="bubble-content">
-            <div className="quoted-message">
-              {displayQuotedSenderName && <span className="quoted-sender">{displayQuotedSenderName}</span>}
-              <span className="quoted-text">{renderReferContent2()}</span>
-            </div>
+          renderBubbleWithQuote(
+            renderQuotedMessageBlock(renderReferContent2()),
             <div className="message-text">{renderTextWithEmoji(cleanMessageContent(replyText))}</div>
-          </div>
+          )
         )
       }
 
@@ -9602,14 +9654,9 @@ function MessageBubble({
 
     // 带引用的消息
     if (hasQuote) {
-      return (
-        <div className="bubble-content">
-          <div className="quoted-message">
-            {displayQuotedSenderName && <span className="quoted-sender">{displayQuotedSenderName}</span>}
-            <span className="quoted-text">{renderTextWithEmoji(cleanMessageContent(quotedContent))}</span>
-          </div>
-          <div className="message-text">{renderTextWithEmoji(cleanedParsedContent)}</div>
-        </div>
+      return renderBubbleWithQuote(
+        renderQuotedMessageBlock(renderTextWithEmoji(cleanMessageContent(quotedContent))),
+        <div className="message-text">{renderTextWithEmoji(cleanedParsedContent)}</div>
       )
     }
 
@@ -9699,6 +9746,31 @@ function MessageBubble({
             {isSelected && <Check size={14} strokeWidth={3} />}
           </div>
         )}
+        {systemAlert && createPortal(
+            <div className="modal-overlay" onClick={() => setSystemAlert(null)} style={{ zIndex: 99999 }}>
+              <div className="delete-confirm-card" onClick={(e) => e.stopPropagation()} style={{ maxWidth: '400px' }}>
+                <div className="confirm-icon">
+                  <AlertCircle size={32} color="var(--danger)" />
+                </div>
+                <div className="confirm-content">
+                  <h3>{systemAlert.title}</h3>
+                  <p style={{ marginTop: '12px', lineHeight: '1.6', fontSize: '14px', color: 'var(--text-secondary)' }}>
+                    {systemAlert.message}
+                  </p>
+                </div>
+                <div className="confirm-actions" style={{ justifyContent: 'center', marginTop: '24px' }}>
+                  <button
+                      className="btn-primary"
+                      onClick={() => setSystemAlert(null)}
+                      style={{ padding: '8px 32px' }}
+                  >
+                    确认
+                  </button>
+                </div>
+              </div>
+            </div>,
+            document.body
+        )}
       </div>
     </>
   )

src/pages/ContactsPage.tsx

@@ -18,7 +18,7 @@ const AVATAR_ENRICH_BATCH_SIZE = 80
 const SEARCH_DEBOUNCE_MS = 120
 const VIRTUAL_ROW_HEIGHT = 76
 const VIRTUAL_OVERSCAN = 10
-const DEFAULT_CONTACTS_LOAD_TIMEOUT_MS = 3000
+const DEFAULT_CONTACTS_LOAD_TIMEOUT_MS = 10000
 const AVATAR_RECHECK_INTERVAL_MS = 24 * 60 * 60 * 1000
 
 interface ContactsLoadSession {
@@ -397,6 +397,10 @@ function ContactsPage() {
                         displayName: contact.displayName,
                         remark: contact.remark,
                         nickname: contact.nickname,
+                        alias: contact.alias,
+                        labels: contact.labels,
+                        detailDescription: contact.detailDescription,
+                        region: contact.region,
                         type: contact.type
                     }))
                 ).catch((error) => {
@@ -1110,6 +1114,16 @@ function ContactsPage() {
                             <div className="detail-row"><span className="detail-label">用户名</span><span className="detail-value">{selectedContact.username}</span></div>
                             <div className="detail-row"><span className="detail-label">昵称</span><span className="detail-value">{selectedContact.nickname || selectedContact.displayName}</span></div>
                             {selectedContact.remark && <div className="detail-row"><span className="detail-label">备注</span><span className="detail-value">{selectedContact.remark}</span></div>}
+                            {selectedContact.alias && <div className="detail-row"><span className="detail-label">微信号</span><span className="detail-value">{selectedContact.alias}</span></div>}
+                            {selectedContact.labels && selectedContact.labels.length > 0 && (
+                                <div className="detail-row"><span className="detail-label">标签</span><span className="detail-value">{selectedContact.labels.join('、')}</span></div>
+                            )}
+                            {selectedContact.detailDescription && (
+                                <div className="detail-row"><span className="detail-label">个性签名</span><span className="detail-value">{selectedContact.detailDescription}</span></div>
+                            )}
+                            {selectedContact.region && (
+                                <div className="detail-row"><span className="detail-label">地区</span><span className="detail-value">{selectedContact.region}</span></div>
+                            )}
                             <div className="detail-row"><span className="detail-label">类型</span><span className="detail-value">{getContactTypeName(selectedContact.type)}</span></div>
                             {selectedContactSupportsSns && (
                                 <div className="detail-row">

src/pages/ExportPage.tsx

@@ -49,6 +49,7 @@ import { SnsPostItem } from '../components/Sns/SnsPostItem'
 import { ContactSnsTimelineDialog } from '../components/Sns/ContactSnsTimelineDialog'
 import { ExportDateRangeDialog } from '../components/Export/ExportDateRangeDialog'
 import { ExportDefaultsSettingsForm, type ExportDefaultsSettingsPatch } from '../components/Export/ExportDefaultsSettingsForm'
+import { Avatar } from '../components/Avatar'
 import type { SnsPost } from '../types/sns'
 import {
   cloneExportDateRange,
@@ -92,6 +93,7 @@ interface ExportOptions {
   txtColumns: string[]
   displayNamePreference: DisplayNamePreference
   exportConcurrency: number
+  imageDeepSearchOnMiss: boolean
 }
 
 interface SessionRow extends AppChatSession {
@@ -537,6 +539,14 @@ const getAvatarLetter = (name: string): string => {
   return [...name][0] || '?'
 }
 
+const normalizeExportAvatarUrl = (value?: string | null): string | undefined => {
+  const normalized = String(value || '').trim()
+  if (!normalized) return undefined
+  const lower = normalized.toLowerCase()
+  if (lower === 'null' || lower === 'undefined') return undefined
+  return normalized
+}
+
 const toComparableNameSet = (values: Array<string | undefined | null>): Set<string> => {
   const set = new Set<string>()
   for (const value of values) {
@@ -558,7 +568,7 @@ const createTaskId = (): string => `task-${Date.now()}-${Math.random().toString(
 const CONTACT_ENRICH_TIMEOUT_MS = 7000
 const EXPORT_SNS_STATS_CACHE_STALE_MS = 12 * 60 * 60 * 1000
 const EXPORT_AVATAR_ENRICH_BATCH_SIZE = 80
-const DEFAULT_CONTACTS_LOAD_TIMEOUT_MS = 3000
+const DEFAULT_CONTACTS_LOAD_TIMEOUT_MS = 10000
 const EXPORT_REENTER_SESSION_SOFT_REFRESH_MS = 5 * 60 * 1000
 const EXPORT_REENTER_CONTACTS_SOFT_REFRESH_MS = 5 * 60 * 1000
 const EXPORT_REENTER_SNS_SOFT_REFRESH_MS = 3 * 60 * 1000
@@ -1026,7 +1036,7 @@ const toSessionRowsWithContacts = (
           kind: toKindByContact(contact),
           wechatId: contact.username,
           displayName: contact.displayName || session?.displayName || contact.username,
-          avatarUrl: contact.avatarUrl || session?.avatarUrl,
+          avatarUrl: session?.avatarUrl || contact.avatarUrl,
           hasSession: Boolean(session)
         } as SessionRow
       })
@@ -1046,7 +1056,7 @@ const toSessionRowsWithContacts = (
         kind: toKindByContactType(session, contact),
         wechatId: contact?.username || session.username,
         displayName: contact?.displayName || session.displayName || session.username,
-        avatarUrl: contact?.avatarUrl || session.avatarUrl,
+        avatarUrl: session.avatarUrl || contact?.avatarUrl,
         hasSession: true
       } as SessionRow
     })
@@ -1593,6 +1603,7 @@ function ExportPage() {
   const [exportDefaultVoiceAsText, setExportDefaultVoiceAsText] = useState(false)
   const [exportDefaultExcelCompactColumns, setExportDefaultExcelCompactColumns] = useState(true)
   const [exportDefaultConcurrency, setExportDefaultConcurrency] = useState(2)
+  const [exportDefaultImageDeepSearchOnMiss, setExportDefaultImageDeepSearchOnMiss] = useState(true)
 
   const [options, setOptions] = useState<ExportOptions>({
     format: 'json',
@@ -1611,7 +1622,8 @@ function ExportPage() {
     excelCompactColumns: true,
     txtColumns: defaultTxtColumns,
     displayNamePreference: 'remark',
-    exportConcurrency: 2
+    exportConcurrency: 2,
+    imageDeepSearchOnMiss: true
   })
 
   const [exportDialog, setExportDialog] = useState<ExportDialogState>({
@@ -1710,6 +1722,7 @@ function ExportPage() {
     startIndex: 0,
     endIndex: -1
   })
+  const avatarHydrationRequestedRef = useRef<Set<string>>(new Set())
   const sessionMutualFriendsMetricsRef = useRef<Record<string, SessionMutualFriendsMetric>>({})
   const sessionMutualFriendsDirectMetricsRef = useRef<Record<string, SessionMutualFriendsMetric>>({})
   const sessionMutualFriendsQueueRef = useRef<string[]>([])
@@ -1915,7 +1928,7 @@ function ExportPage() {
 
     setIsContactsListLoading(true)
     try {
-      const contactsResult = await window.electronAPI.chat.getContacts()
+      const contactsResult = await window.electronAPI.chat.getContacts({ lite: true })
       if (contactsLoadVersionRef.current !== loadVersion) return
 
       if (contactsResult.success && contactsResult.contacts) {
@@ -1954,6 +1967,7 @@ function ExportPage() {
             displayName: contact.displayName,
             remark: contact.remark,
             nickname: contact.nickname,
+            alias: contact.alias,
             type: contact.type
           }))
         ).catch((error) => {
@@ -1995,6 +2009,94 @@ function ExportPage() {
     }
   }, [ensureExportCacheScope, syncContactTypeCounts])
 
+  const hydrateVisibleContactAvatars = useCallback(async (usernames: string[]) => {
+    const targets = Array.from(new Set(
+      (usernames || [])
+        .map((username) => String(username || '').trim())
+        .filter(Boolean)
+    )).filter((username) => {
+      if (avatarHydrationRequestedRef.current.has(username)) return false
+      const contact = contactsList.find((item) => item.username === username)
+      const session = sessions.find((item) => item.username === username)
+      const existingAvatarUrl = normalizeExportAvatarUrl(contact?.avatarUrl || session?.avatarUrl)
+      return !existingAvatarUrl
+    })
+
+    if (targets.length === 0) return
+    targets.forEach((username) => avatarHydrationRequestedRef.current.add(username))
+
+    const settled = await Promise.allSettled(
+      targets.map(async (username) => {
+        const profile = await window.electronAPI.chat.getContactAvatar(username)
+        return {
+          username,
+          avatarUrl: normalizeExportAvatarUrl(profile?.avatarUrl),
+          displayName: profile?.displayName ? String(profile.displayName).trim() : undefined
+        }
+      })
+    )
+
+    const avatarPatches = new Map<string, { avatarUrl?: string; displayName?: string }>()
+    for (const item of settled) {
+      if (item.status !== 'fulfilled') continue
+      const { username, avatarUrl, displayName } = item.value
+      if (!avatarUrl && !displayName) continue
+      avatarPatches.set(username, { avatarUrl, displayName })
+    }
+    if (avatarPatches.size === 0) return
+
+    const now = Date.now()
+    setContactsList((prev) => prev.map((contact) => {
+      const patch = avatarPatches.get(contact.username)
+      if (!patch) return contact
+      return {
+        ...contact,
+        displayName: patch.displayName || contact.displayName,
+        avatarUrl: patch.avatarUrl || contact.avatarUrl
+      }
+    }))
+    setSessions((prev) => prev.map((session) => {
+      const patch = avatarPatches.get(session.username)
+      if (!patch) return session
+      return {
+        ...session,
+        displayName: patch.displayName || session.displayName,
+        avatarUrl: patch.avatarUrl || session.avatarUrl
+      }
+    }))
+    setSessionDetail((prev) => {
+      if (!prev) return prev
+      const patch = avatarPatches.get(prev.wxid)
+      if (!patch) return prev
+      return {
+        ...prev,
+        displayName: patch.displayName || prev.displayName,
+        avatarUrl: patch.avatarUrl || prev.avatarUrl
+      }
+    })
+
+    let avatarCacheChanged = false
+    for (const [username, patch] of avatarPatches.entries()) {
+      if (!patch.avatarUrl) continue
+      const previous = contactsAvatarCacheRef.current[username]
+      if (previous?.avatarUrl === patch.avatarUrl) continue
+      contactsAvatarCacheRef.current[username] = {
+        avatarUrl: patch.avatarUrl,
+        updatedAt: now,
+        checkedAt: now
+      }
+      avatarCacheChanged = true
+    }
+    if (avatarCacheChanged) {
+      setAvatarCacheUpdatedAt(now)
+      const scopeKey = exportCacheScopeRef.current
+      if (scopeKey) {
+        void configService.setContactsAvatarCache(scopeKey, contactsAvatarCacheRef.current).catch(() => {})
+      }
+    }
+  }, [contactsList, sessions])
+
+
   useEffect(() => {
     if (!isExportRoute) return
     let cancelled = false
@@ -2138,7 +2240,7 @@ function ExportPage() {
     setIsBaseConfigLoading(true)
     let isReady = true
     try {
-      const [savedPath, savedFormat, savedAvatars, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, savedWriteLayout, savedSessionNameWithTypePrefix, savedDefaultDateRange, exportCacheScope] = await Promise.all([
+      const [savedPath, savedFormat, savedAvatars, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedImageDeepSearchOnMiss, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, savedWriteLayout, savedSessionNameWithTypePrefix, savedDefaultDateRange, exportCacheScope] = await Promise.all([
         configService.getExportPath(),
         configService.getExportDefaultFormat(),
         configService.getExportDefaultAvatars(),
@@ -2147,6 +2249,7 @@ function ExportPage() {
         configService.getExportDefaultExcelCompactColumns(),
         configService.getExportDefaultTxtColumns(),
         configService.getExportDefaultConcurrency(),
+        configService.getExportDefaultImageDeepSearchOnMiss(),
         configService.getExportLastSessionRunMap(),
         configService.getExportLastContentRunMap(),
         configService.getExportSessionRecordMap(),
@@ -2183,6 +2286,7 @@ function ExportPage() {
       setExportDefaultVoiceAsText(savedVoiceAsText ?? false)
       setExportDefaultExcelCompactColumns(savedExcelCompactColumns ?? true)
       setExportDefaultConcurrency(savedConcurrency ?? 2)
+      setExportDefaultImageDeepSearchOnMiss(savedImageDeepSearchOnMiss ?? true)
       const resolvedDefaultDateRange = resolveExportDateRangeConfig(savedDefaultDateRange)
       setExportDefaultDateRangeSelection(resolvedDefaultDateRange)
       setTimeRangeSelection(resolvedDefaultDateRange)
@@ -2215,7 +2319,8 @@ function ExportPage() {
         exportVoiceAsText: savedVoiceAsText ?? prev.exportVoiceAsText,
         excelCompactColumns: savedExcelCompactColumns ?? prev.excelCompactColumns,
         txtColumns,
-        exportConcurrency: savedConcurrency ?? prev.exportConcurrency
+        exportConcurrency: savedConcurrency ?? prev.exportConcurrency,
+        imageDeepSearchOnMiss: savedImageDeepSearchOnMiss ?? prev.imageDeepSearchOnMiss
       }))
     } catch (error) {
       isReady = false
@@ -3677,7 +3782,7 @@ function ExportPage() {
 
             if (isStale()) return
             if (detailStatsPriorityRef.current) return
-            const contactsResult = await withTimeout(window.electronAPI.chat.getContacts(), CONTACT_ENRICH_TIMEOUT_MS)
+            const contactsResult = await withTimeout(window.electronAPI.chat.getContacts({ lite: true }), CONTACT_ENRICH_TIMEOUT_MS)
             if (isStale()) return
 
             const contactsFromNetwork: ContactInfo[] = contactsResult?.success && contactsResult.contacts ? contactsResult.contacts : []
@@ -3818,10 +3923,12 @@ function ExportPage() {
               displayName: contact.displayName || contact.username,
               remark: contact.remark,
               nickname: contact.nickname,
+              alias: contact.alias,
               type: contact.type
             }))
 
             const persistAt = Date.now()
+            setContactsList(contactsForPersist)
             setSessions(nextSessions)
             sessionsHydratedAtRef.current = persistAt
             if (hasNetworkContactsSnapshot && contactsCachePayload.length > 0) {
@@ -3989,7 +4096,8 @@ function ExportPage() {
         exportEmojis: exportDefaultMedia.emojis,
         exportVoiceAsText: exportDefaultVoiceAsText,
         excelCompactColumns: exportDefaultExcelCompactColumns,
-        exportConcurrency: exportDefaultConcurrency
+        exportConcurrency: exportDefaultConcurrency,
+        imageDeepSearchOnMiss: exportDefaultImageDeepSearchOnMiss
       }
 
       if (payload.scope === 'sns') {
@@ -4022,7 +4130,8 @@ function ExportPage() {
     exportDefaultAvatars,
     exportDefaultMedia,
     exportDefaultVoiceAsText,
-    exportDefaultConcurrency
+    exportDefaultConcurrency,
+    exportDefaultImageDeepSearchOnMiss
   ])
 
   const closeExportDialog = useCallback(() => {
@@ -4241,6 +4350,7 @@ function ExportPage() {
       txtColumns: options.txtColumns,
       displayNamePreference: options.displayNamePreference,
       exportConcurrency: options.exportConcurrency,
+      imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
       sessionLayout,
       sessionNameWithTypePrefix,
       dateRange: options.useAllTime
@@ -4833,6 +4943,8 @@ function ExportPage() {
     await configService.setExportDefaultExcelCompactColumns(options.excelCompactColumns)
     await configService.setExportDefaultTxtColumns(options.txtColumns)
     await configService.setExportDefaultConcurrency(options.exportConcurrency)
+    await configService.setExportDefaultImageDeepSearchOnMiss(options.imageDeepSearchOnMiss)
+    setExportDefaultImageDeepSearchOnMiss(options.imageDeepSearchOnMiss)
   }
 
   const openSingleExport = useCallback((session: SessionRow) => {
@@ -5369,6 +5481,11 @@ function ExportPage() {
     const endIndex = Number.isFinite(range?.endIndex) ? Math.max(startIndex, Math.floor(range.endIndex)) : startIndex
     sessionMediaMetricVisibleRangeRef.current = { startIndex, endIndex }
     sessionMutualFriendsVisibleRangeRef.current = { startIndex, endIndex }
+    void hydrateVisibleContactAvatars(
+      filteredContacts
+        .slice(startIndex, endIndex + 1)
+        .map((contact) => contact.username)
+    )
     const visibleTargets = collectVisibleSessionMetricTargets(filteredContacts)
     if (visibleTargets.length === 0) return
     enqueueSessionMediaMetricRequests(visibleTargets, { front: true })
@@ -5384,10 +5501,23 @@ function ExportPage() {
     enqueueSessionMediaMetricRequests,
     enqueueSessionMutualFriendsRequests,
     filteredContacts,
+    hydrateVisibleContactAvatars,
     scheduleSessionMediaMetricWorker,
     scheduleSessionMutualFriendsWorker
   ])
 
+  useEffect(() => {
+    if (filteredContacts.length === 0) return
+    const bootstrapTargets = filteredContacts.slice(0, 24).map((contact) => contact.username)
+    void hydrateVisibleContactAvatars(bootstrapTargets)
+  }, [filteredContacts, hydrateVisibleContactAvatars])
+
+  useEffect(() => {
+    const sessionId = String(sessionDetail?.wxid || '').trim()
+    if (!sessionId) return
+    void hydrateVisibleContactAvatars([sessionId])
+  }, [hydrateVisibleContactAvatars, sessionDetail?.wxid])
+
   useEffect(() => {
     if (activeTaskCount > 0) return
     if (filteredContacts.length === 0) return
@@ -5582,6 +5712,45 @@ function ExportPage() {
     return map
   }, [contactsList])
 
+  useEffect(() => {
+    if (!showSessionDetailPanel) return
+    const sessionId = String(sessionDetail?.wxid || '').trim()
+    if (!sessionId) return
+
+    const mappedSession = sessionRowByUsername.get(sessionId)
+    const mappedContact = contactByUsername.get(sessionId)
+    if (!mappedSession && !mappedContact) return
+
+    setSessionDetail((prev) => {
+      if (!prev || prev.wxid !== sessionId) return prev
+
+      const nextDisplayName = mappedSession?.displayName || mappedContact?.displayName || prev.displayName || sessionId
+      const nextRemark = mappedContact?.remark ?? prev.remark
+      const nextNickName = mappedContact?.nickname ?? prev.nickName
+      const nextAlias = mappedContact?.alias ?? prev.alias
+      const nextAvatarUrl = mappedSession?.avatarUrl || mappedContact?.avatarUrl || prev.avatarUrl
+
+      if (
+        nextDisplayName === prev.displayName &&
+        nextRemark === prev.remark &&
+        nextNickName === prev.nickName &&
+        nextAlias === prev.alias &&
+        nextAvatarUrl === prev.avatarUrl
+      ) {
+        return prev
+      }
+
+      return {
+        ...prev,
+        displayName: nextDisplayName,
+        remark: nextRemark,
+        nickName: nextNickName,
+        alias: nextAlias,
+        avatarUrl: nextAvatarUrl
+      }
+    })
+  }, [contactByUsername, sessionDetail?.wxid, sessionRowByUsername, showSessionDetailPanel])
+
   const currentSessionExportRecords = useMemo(() => {
     const sessionId = String(sessionDetail?.wxid || '').trim()
     if (!sessionId) return [] as configService.ExportSessionRecordEntry[]
@@ -5700,7 +5869,7 @@ function ExportPage() {
         displayName: mappedSession?.displayName || mappedContact?.displayName || prev?.displayName || normalizedSessionId,
         remark: sameSession ? prev?.remark : mappedContact?.remark,
         nickName: sameSession ? prev?.nickName : mappedContact?.nickname,
-        alias: sameSession ? prev?.alias : undefined,
+        alias: sameSession ? prev?.alias : mappedContact?.alias,
         avatarUrl: mappedSession?.avatarUrl || mappedContact?.avatarUrl || (sameSession ? prev?.avatarUrl : undefined),
         messageCount: initialMessageCount ?? (sameSession ? prev.messageCount : Number.NaN),
         voiceMessages: metricVoice ?? (sameSession ? prev?.voiceMessages : undefined),
@@ -5987,7 +6156,11 @@ function ExportPage() {
       loadSnsUserPostCounts({ force: true })
     ])
 
-    if (String(sessionDetail?.wxid || '').trim()) {
+    const currentDetailSessionId = showSessionDetailPanel
+      ? String(sessionDetail?.wxid || '').trim()
+      : ''
+    if (currentDetailSessionId) {
+      await loadSessionDetail(currentDetailSessionId)
       void loadSessionRelationStats({ forceRefresh: true })
     }
   }, [
@@ -5998,11 +6171,13 @@ function ExportPage() {
     filteredContacts,
     isSessionCountStageReady,
     loadContactsList,
+    loadSessionDetail,
     loadSessionRelationStats,
     loadSnsStats,
     loadSnsUserPostCounts,
     resetSessionMutualFriendsLoader,
     scheduleSessionMutualFriendsWorker,
+    showSessionDetailPanel,
     sessionDetail?.wxid
   ])
 
@@ -6270,6 +6445,10 @@ function ExportPage() {
   const useCollapsedSessionFormatSelector = isSessionScopeDialog || isContentTextDialog
   const shouldShowFormatSection = !isContentScopeDialog || isContentTextDialog
   const shouldShowMediaSection = !isContentScopeDialog
+  const shouldShowImageDeepSearchToggle = exportDialog.scope !== 'sns' && (
+    (isSessionScopeDialog && options.exportImages) ||
+    (isContentScopeDialog && exportDialog.contentType === 'image')
+  )
   const avatarExportStatusLabel = options.exportAvatars ? '已开启聊天消息导出带头像' : '已关闭聊天消息导出带头像'
   const contentTextDialogSummary = '此模式只导出聊天文本，不包含图片语音视频表情包等多媒体文件。'
   const activeDialogFormatLabel = exportDialog.scope === 'sns'
@@ -6567,11 +6746,12 @@ function ExportPage() {
               </button>
             </div>
             <div className="contact-avatar">
-              {contact.avatarUrl ? (
-                <img src={contact.avatarUrl} alt="" loading="lazy" />
-              ) : (
-                <span>{getAvatarLetter(contact.displayName)}</span>
-              )}
+              <Avatar
+                src={normalizeExportAvatarUrl(contact.avatarUrl)}
+                name={contact.displayName}
+                size="100%"
+                shape="rounded"
+              />
             </div>
             <div className="contact-info">
               <div className="contact-name">{contact.displayName}</div>
@@ -7454,11 +7634,12 @@ function ExportPage() {
                 <div className="session-mutual-friends-header">
                   <div className="session-mutual-friends-header-main">
                     <div className="session-mutual-friends-avatar">
-                      {sessionMutualFriendsDialogTarget.avatarUrl ? (
-                        <img src={sessionMutualFriendsDialogTarget.avatarUrl} alt="" />
-                      ) : (
-                        <span>{getAvatarLetter(sessionMutualFriendsDialogTarget.displayName)}</span>
-                      )}
+                      <Avatar
+                        src={normalizeExportAvatarUrl(sessionMutualFriendsDialogTarget.avatarUrl)}
+                        name={sessionMutualFriendsDialogTarget.displayName}
+                        size="100%"
+                        shape="rounded"
+                      />
                     </div>
                     <div className="session-mutual-friends-meta">
                       <h4>{sessionMutualFriendsDialogTarget.displayName} 的共同好友</h4>
@@ -7539,11 +7720,12 @@ function ExportPage() {
               <div className="detail-header">
                 <div className="detail-header-main">
                   <div className="detail-header-avatar">
-                    {sessionDetail?.avatarUrl ? (
-                      <img src={sessionDetail.avatarUrl} alt="" />
-                    ) : (
-                      <span>{getAvatarLetter(sessionDetail?.displayName || sessionDetail?.wxid || '')}</span>
-                    )}
+                    <Avatar
+                      src={normalizeExportAvatarUrl(sessionDetail?.avatarUrl)}
+                      name={sessionDetail?.displayName || sessionDetail?.wxid || ''}
+                      size="100%"
+                      shape="rounded"
+                    />
                   </div>
                   <div className="detail-header-meta">
                     <h4>{sessionDetail?.displayName || '会话详情'}</h4>
@@ -7986,6 +8168,26 @@ function ExportPage() {
                 </div>
               )}
 
+              {shouldShowImageDeepSearchToggle && (
+                <div className="dialog-section">
+                  <div className="dialog-switch-row">
+                    <div className="dialog-switch-copy">
+                      <h4>缺图时深度搜索</h4>
+                      <div className="format-note">关闭后仅尝试 hardlink 命中，未命中将直接显示占位符，导出速度更快。</div>
+                    </div>
+                    <button
+                      type="button"
+                      className={`dialog-switch ${options.imageDeepSearchOnMiss ? 'on' : ''}`}
+                      aria-pressed={options.imageDeepSearchOnMiss}
+                      aria-label="切换缺图时深度搜索"
+                      onClick={() => setOptions(prev => ({ ...prev, imageDeepSearchOnMiss: !prev.imageDeepSearchOnMiss }))}
+                    >
+                      <span className="dialog-switch-thumb" />
+                    </button>
+                  </div>
+                </div>
+              )}
+
               {isSessionScopeDialog && (
                 <div className="dialog-section">
                   <div className="dialog-switch-row">

src/pages/SettingsPage.scss

@@ -1145,6 +1145,185 @@
   }
 }
 
+.quote-layout-group {
+  margin-top: 14px;
+}
+
+.quote-layout-picker {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  gap: 12px;
+  margin-top: 10px;
+}
+
+.quote-layout-card {
+  position: relative;
+  border: 1px solid var(--border-color);
+  border-radius: 14px;
+  padding: 14px 14px 12px;
+  background: color-mix(in srgb, var(--primary) 6%, var(--bg-primary));
+  color: inherit;
+  cursor: pointer;
+  text-align: left;
+  transition: border-color 0.18s ease, box-shadow 0.18s ease, background 0.18s ease;
+
+  &:hover {
+    border-color: color-mix(in srgb, var(--primary) 32%, var(--border-color));
+  }
+
+  &.active {
+    border-color: color-mix(in srgb, var(--primary) 68%, var(--border-color));
+    box-shadow: 0 0 0 2px color-mix(in srgb, var(--primary) 12%, transparent);
+    background: color-mix(in srgb, var(--primary) 10%, var(--bg-primary));
+  }
+}
+
+.quote-layout-card-check {
+  position: absolute;
+  top: 12px;
+  left: 12px;
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  border: 1.5px solid color-mix(in srgb, var(--primary) 46%, var(--border-color));
+  background: transparent;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  transition: all 0.2s ease;
+
+  &::after {
+    content: '';
+    width: 7px;
+    height: 7px;
+    border-radius: 50%;
+    background: color-mix(in srgb, var(--primary) 78%, #6f8653);
+    transform: scale(0);
+    transition: transform 0.2s ease;
+  }
+
+  &.active {
+    border-color: color-mix(in srgb, var(--primary) 78%, var(--border-color));
+  }
+
+  &.active::after {
+    transform: scale(1);
+  }
+}
+
+.quote-layout-preview-shell {
+  padding-left: 22px;
+  min-height: 72px;
+}
+
+.quote-layout-preview-chat {
+  display: flex;
+  align-items: flex-start;
+}
+
+.quote-layout-preview-chat .message-bubble {
+  display: flex;
+  gap: 10px;
+  max-width: 70%;
+  align-items: flex-start;
+}
+
+.quote-layout-preview-chat .message-bubble.sent {
+  flex-direction: row-reverse;
+}
+
+.quote-layout-preview-chat .message-bubble.sent .bubble-content {
+  background: var(--primary);
+  color: var(--on-primary);
+  border-radius: 18px 18px 4px 18px;
+}
+
+.quote-layout-preview-chat .bubble-content {
+  padding: 10px 14px;
+  font-size: 14px;
+  line-height: 1.6;
+  word-break: break-word;
+  white-space: pre-wrap;
+}
+
+.quote-layout-preview-chat .message-text {
+  font-size: 14px;
+  line-height: 1.6;
+}
+
+.quote-layout-preview-chat .quoted-message {
+  background: rgba(0, 0, 0, 0.04);
+  border-left: 2px solid var(--primary);
+  padding: 6px 10px;
+  border-radius: 4px;
+  font-size: 13px;
+}
+
+.quote-layout-preview-chat .quoted-sender {
+  color: var(--primary);
+  font-weight: 500;
+  margin-right: 4px;
+}
+
+.quote-layout-preview-chat .quoted-sender::after {
+  content: ':';
+}
+
+.quote-layout-preview-chat .quoted-text {
+  color: var(--text-secondary);
+  white-space: pre-wrap;
+}
+
+.quote-layout-preview-chat .message-bubble.sent .quoted-message {
+  background: color-mix(in srgb, var(--on-primary) 12%, var(--primary));
+  border-left-color: color-mix(in srgb, var(--on-primary) 36%, var(--primary));
+}
+
+.quote-layout-preview-chat .message-bubble.sent .quoted-sender {
+  color: color-mix(in srgb, var(--on-primary) 92%, var(--primary));
+}
+
+.quote-layout-preview-chat .message-bubble.sent .quoted-text {
+  color: color-mix(in srgb, var(--on-primary) 80%, var(--primary));
+}
+
+.quote-layout-preview-chat .bubble-content.quote-layout-top .quoted-message {
+  margin-bottom: 8px;
+}
+
+.quote-layout-preview-chat .bubble-content.quote-layout-bottom .quoted-message {
+  margin-top: 8px;
+}
+
+.quote-layout-card-footer {
+  margin-top: 8px;
+  padding-left: 22px;
+}
+
+.quote-layout-card-title-group {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.quote-layout-card-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text-primary);
+}
+
+.quote-layout-card-desc {
+  font-size: 11px;
+  color: var(--text-tertiary);
+}
+
+@media (max-width: 760px) {
+  .quote-layout-picker {
+    grid-template-columns: 1fr;
+  }
+}
+
 .theme-grid {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));

src/pages/SettingsPage.tsx

@@ -32,6 +32,7 @@ const tabs: { id: SettingsTab; label: string; icon: React.ElementType }[] = [
 
 const isMac = navigator.userAgent.toLowerCase().includes('mac')
 const isLinux = navigator.userAgent.toLowerCase().includes('linux')
+const isWindows = !isMac && !isLinux
 
 const dbDirName = isMac ? '2.0b4.0.9 目录' : 'xwechat_files 目录'
 const dbPathPlaceholder = isMac
@@ -118,6 +119,7 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
   const [notificationFilterMode, setNotificationFilterMode] = useState<'all' | 'whitelist' | 'blacklist'>('all')
   const [notificationFilterList, setNotificationFilterList] = useState<string[]>([])
   const [windowCloseBehavior, setWindowCloseBehavior] = useState<configService.WindowCloseBehavior>('ask')
+  const [quoteLayout, setQuoteLayout] = useState<configService.QuoteLayout>('quote-top')
   const [filterSearchKeyword, setFilterSearchKeyword] = useState('')
   const [filterModeDropdownOpen, setFilterModeDropdownOpen] = useState(false)
   const [positionDropdownOpen, setPositionDropdownOpen] = useState(false)
@@ -175,11 +177,24 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
 
   const isClearingCache = isClearingAnalyticsCache || isClearingImageCache || isClearingAllCache
 
+  const [isWayland, setIsWayland] = useState(false)
+  useEffect(() => {
+    const checkWaylandStatus = async () => {
+      if (window.electronAPI?.app?.checkWayland) {
+        try {
+          const wayland = await window.electronAPI.app.checkWayland()
+          setIsWayland(wayland)
+        } catch (e) {
+          console.error('检查 Wayland 状态失败:', e)
+        }
+      }
+    }
+    checkWaylandStatus()
+  }, [])
+
   // 检查 Hello 可用性
   useEffect(() => {
-    if (window.PublicKeyCredential) {
-      void PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable().then(setHelloAvailable)
-    }
+    setHelloAvailable(isWindows)
   }, [])
 
   // 检查 HTTP API 服务状态
@@ -299,6 +314,7 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
       const savedNotificationFilterList = await configService.getNotificationFilterList()
       const savedMessagePushEnabled = await configService.getMessagePushEnabled()
       const savedWindowCloseBehavior = await configService.getWindowCloseBehavior()
+      const savedQuoteLayout = await configService.getQuoteLayout()
 
       const savedAuthEnabled = await window.electronAPI.auth.verifyEnabled()
       const savedAuthUseHello = await configService.getAuthUseHello()
@@ -336,6 +352,7 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
       setNotificationFilterList(savedNotificationFilterList)
       setMessagePushEnabled(savedMessagePushEnabled)
       setWindowCloseBehavior(savedWindowCloseBehavior)
+      setQuoteLayout(savedQuoteLayout)
 
       const savedExcludeWords = await configService.getWordCloudExcludeWords()
       setWordCloudExcludeWords(savedExcludeWords)
@@ -1043,6 +1060,79 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
         ))}
       </div>
 
+      <div className="form-group quote-layout-group">
+        <label>引用消息样式</label>
+        <span className="form-hint">选择聊天中引用消息与正文的上下顺序，下方预览会同步展示布局差异。</span>
+        <div className="quote-layout-picker" role="radiogroup" aria-label="引用样式选择">
+          {[
+            {
+              value: 'quote-top' as const,
+              label: '引用在上',
+              description: '更接近当前 WeFlow 风格',
+              successMessage: '已切换为引用在上样式'
+            },
+            {
+              value: 'quote-bottom' as const,
+              label: '正文在上',
+              description: '更接近微信 / 密语风格',
+              successMessage: '已切换为正文在上样式'
+            }
+          ].map(option => {
+            const selected = quoteLayout === option.value
+            const isQuoteBottom = option.value === 'quote-bottom'
+
+            return (
+              <button
+                key={option.value}
+                type="button"
+                className={`quote-layout-card ${selected ? 'active' : ''}`}
+                onClick={async () => {
+                  if (selected) return
+                  setQuoteLayout(option.value)
+                  await configService.setQuoteLayout(option.value)
+                  showMessage(option.successMessage, true)
+                }}
+                role="radio"
+                aria-checked={selected}
+              >
+                <span className={`quote-layout-card-check ${selected ? 'active' : ''}`} aria-hidden="true" />
+                <div className="quote-layout-preview-shell">
+                  <div className="quote-layout-preview-chat">
+                    <div className="message-bubble sent">
+                      <div className={`bubble-content ${isQuoteBottom ? 'quote-layout-bottom' : 'quote-layout-top'}`}>
+                        {isQuoteBottom ? (
+                          <>
+                            <div className="message-text">拍得真不错!</div>
+                            <div className="quoted-message">
+                              <span className="quoted-sender">张三</span>
+                              <span className="quoted-text">那天去爬山的照片...</span>
+                            </div>
+                          </>
+                        ) : (
+                          <>
+                            <div className="quoted-message">
+                              <span className="quoted-sender">张三</span>
+                              <span className="quoted-text">那天去爬山的照片...</span>
+                            </div>
+                            <div className="message-text">拍得真不错!</div>
+                          </>
+                        )}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div className="quote-layout-card-footer">
+                  <div className="quote-layout-card-title-group">
+                    <span className="quote-layout-card-title">{option.label}</span>
+                    <span className="quote-layout-card-desc">{option.description}</span>
+                  </div>
+                </div>
+              </button>
+            )
+          })}
+        </div>
+      </div>
+
       <div className="divider" />
 
       <div className="form-group">
@@ -1169,6 +1259,11 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
         <div className="form-group">
           <label>通知显示位置</label>
           <span className="form-hint">选择通知弹窗在屏幕上的显示位置</span>
+          {isWayland && (
+              <span className="form-hint" style={{ color: '#ff4d4f', marginTop: '4px', display: 'block' }}>
+              ⚠️ 注意：Wayland 环境下该配置可能无效！
+            </span>
+          )}
           <div className="custom-select">
             <div
               className={`custom-select-trigger ${positionDropdownOpen ? 'open' : ''}`}
@@ -1652,34 +1747,49 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
   )
 
   const renderCacheTab = () => (
-    <div className="tab-content">
-      <p className="section-desc">管理应用缓存数据</p>
-      <div className="form-group">
-        <label>缓存目录 <span className="optional">(可选)</span></label>
-        <span className="form-hint">留空使用默认目录</span>
-        <input
-          type="text"
-          placeholder="留空使用默认目录"
-          value={cachePath}
-          onChange={(e) => {
-            const value = e.target.value
-            setCachePath(value)
-            scheduleConfigSave('cachePath', () => configService.setCachePath(value))
-          }}
-        />
-        <div className="btn-row">
-          <button className="btn btn-secondary" onClick={handleSelectCachePath}><FolderOpen size={16} /> 浏览选择</button>
-          <button
-            className="btn btn-secondary"
-            onClick={async () => {
-              setCachePath('')
-              await configService.setCachePath('')
-            }}
-          >
-            <RotateCcw size={16} /> 恢复默认
-          </button>
+      <div className="tab-content">
+        <p className="section-desc">管理应用缓存数据</p>
+        <div className="form-group">
+          <label>缓存目录 <span className="optional">(可选)</span></label>
+          <span className="form-hint">留空使用默认目录</span>
+          <input
+              type="text"
+              placeholder="留空使用默认目录"
+              value={cachePath}
+              onChange={(e) => {
+                const value = e.target.value
+                setCachePath(value)
+                scheduleConfigSave('cachePath', () => configService.setCachePath(value))
+              }}
+          />
+
+          <div style={{ marginTop: '8px', fontSize: '13px', color: 'var(--text-secondary)' }}>
+            当前缓存位置：
+            <code style={{
+              background: 'var(--bg-secondary)',
+              padding: '3px 6px',
+              borderRadius: '4px',
+              userSelect: 'all',
+              wordBreak: 'break-all',
+              marginLeft: '4px'
+            }}>
+              {cachePath || (isMac ? '~/Documents/WeFlow' : isLinux ? '~/Documents/WeFlow' : '系统 文档\\WeFlow 目录')}
+            </code>
+          </div>
+
+          <div className="btn-row" style={{ marginTop: '12px' }}>
+            <button className="btn btn-secondary" onClick={handleSelectCachePath}><FolderOpen size={16} /> 浏览选择</button>
+            <button
+                className="btn btn-secondary"
+                onClick={async () => {
+                  setCachePath('')
+                  await configService.setCachePath('')
+                }}
+            >
+              <RotateCcw size={16} /> 恢复默认
+            </button>
+          </div>
         </div>
-      </div>
 
       <div className="btn-row">
         <button className="btn btn-secondary" onClick={handleClearAnalyticsCache} disabled={isClearingCache}>
@@ -1928,33 +2038,29 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
       showMessage('请输入当前密码以开启 Hello', false)
       return
     }
+    if (!isWindows) {
+      showMessage('当前系统不支持 Windows Hello', false)
+      return
+    }
     setIsSettingHello(true)
     try {
-      const challenge = new Uint8Array(32)
-      window.crypto.getRandomValues(challenge)
-
-      const credential = await navigator.credentials.create({
-        publicKey: {
-          challenge,
-          rp: { name: 'WeFlow', id: 'localhost' },
-          user: { id: new Uint8Array([1]), name: 'user', displayName: 'User' },
-          pubKeyCredParams: [{ alg: -7, type: 'public-key' }],
-          authenticatorSelection: { userVerification: 'required' },
-          timeout: 60000
-        }
-      })
-
-      if (credential) {
-        // 存储密码作为 Hello Secret，以便 Hello 解锁时能派生密钥
-        await window.electronAPI.auth.setHelloSecret(helloPassword)
-        setAuthUseHello(true)
-        setHelloPassword('')
-        showMessage('Windows Hello 设置成功', true)
+      const verifyResult = await window.electronAPI.auth.hello('请验证您的身份以开启 Windows Hello')
+      if (!verifyResult.success) {
+        showMessage(verifyResult.error || 'Windows Hello 验证失败', false)
+        return
       }
+
+      const saveResult = await window.electronAPI.auth.setHelloSecret(helloPassword)
+      if (!saveResult.success) {
+        showMessage('Windows Hello 配置保存失败', false)
+        return
+      }
+
+      setAuthUseHello(true)
+      setHelloPassword('')
+      showMessage('Windows Hello 设置成功', true)
     } catch (e: any) {
-      if (e.name !== 'NotAllowedError') {
-        showMessage(`Windows Hello 设置失败: ${e.message}`, false)
-      }
+      showMessage(`Windows Hello 设置失败: ${e?.message || String(e)}`, false)
     } finally {
       setIsSettingHello(false)
     }

src/pages/SnsPage.scss

@@ -759,6 +759,26 @@
     margin-bottom: 12px;
 }
 
+.post-location {
+    display: flex;
+    align-items: flex-start;
+    gap: 6px;
+    margin: -4px 0 12px;
+    font-size: 13px;
+    line-height: 1.45;
+    color: var(--text-secondary);
+
+    svg {
+        flex-shrink: 0;
+        margin-top: 1px;
+        color: var(--text-tertiary);
+    }
+}
+
+.post-location-text {
+    word-break: break-word;
+}
+
 .post-media-container {
     margin-bottom: 12px;
 }

src/pages/WelcomePage.tsx

@@ -13,6 +13,7 @@ import './WelcomePage.scss'
 
 const isMac = navigator.userAgent.toLowerCase().includes('mac')
 const isLinux = navigator.userAgent.toLowerCase().includes('linux')
+const isWindows = !isMac && !isLinux
 
 const dbDirName = isMac ? '2.0b4.0.9 目录' : 'xwechat_files 目录'
 const dbPathPlaceholder = isMac
@@ -46,6 +47,19 @@ const formatDbKeyFailureMessage = (error?: string, logs?: string[]): string => {
   return `${base}；最近状态：${tailLogs.join(' | ')}`
 }
 
+const normalizeDbKeyStatusMessage = (message: string): string => {
+  if (isWindows && message.includes('Hook安装成功')) {
+    return '已准备就绪，现在登录微信或退出登录后重新登录微信'
+  }
+  return message
+}
+
+const isDbKeyReadyMessage = (message: string): boolean => (
+  message.includes('现在可以登录')
+  || message.includes('Hook安装成功')
+  || message.includes('已准备就绪，现在登录微信或退出登录后重新登录微信')
+)
+
 function WelcomePage({ standalone = false }: WelcomePageProps) {
   const navigate = useNavigate()
   const { isDbConnected, setDbConnected, setLoading } = useAppStore()
@@ -89,9 +103,7 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
 
   // 检查 Hello 可用性
   useEffect(() => {
-    if (window.PublicKeyCredential) {
-      void PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable().then(setHelloAvailable)
-    }
+    setHelloAvailable(isWindows)
   }, [])
 
   async function sha256(message: string) {
@@ -103,35 +115,27 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
   }
 
   const handleSetupHello = async () => {
+    if (!isWindows) {
+      setError('当前系统不支持 Windows Hello')
+      return
+    }
+    if (!authPassword || authPassword !== authConfirmPassword) {
+      setError('请先设置并确认应用密码，再开启 Windows Hello')
+      return
+    }
+
     setIsSettingHello(true)
     try {
-      // 注册凭证 (WebAuthn)
-      const challenge = new Uint8Array(32)
-      window.crypto.getRandomValues(challenge)
-
-      const credential = await navigator.credentials.create({
-        publicKey: {
-          challenge,
-          rp: { name: 'WeFlow', id: 'localhost' },
-          user: {
-            id: new Uint8Array([1]),
-            name: 'user',
-            displayName: 'User'
-          },
-          pubKeyCredParams: [{ alg: -7, type: 'public-key' }],
-          authenticatorSelection: { userVerification: 'required' },
-          timeout: 60000
-        }
-      })
-
-      if (credential) {
-        setEnableHello(true)
-        // 成功提示?
+      const result = await window.electronAPI.auth.hello('请验证您的身份以开启 Windows Hello')
+      if (!result.success) {
+        setError(`Windows Hello 设置失败: ${result.error || '验证失败'}`)
+        return
       }
+
+      setEnableHello(true)
+      setError('')
     } catch (e: any) {
-      if (e.name !== 'NotAllowedError') {
-        setError('Windows Hello 设置失败: ' + e.message)
-      }
+      setError(`Windows Hello 设置失败: ${e?.message || String(e)}`)
     } finally {
       setIsSettingHello(false)
     }
@@ -139,8 +143,9 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
 
   useEffect(() => {
     const removeDb = window.electronAPI.key.onDbKeyStatus((payload: { message: string; level: number }) => {
-      setDbKeyStatus(payload.message)
-      if (payload.message.includes('现在可以登录') || payload.message.includes('Hook安装成功')) {
+      const normalizedMessage = normalizeDbKeyStatusMessage(payload.message)
+      setDbKeyStatus(normalizedMessage)
+      if (isDbKeyReadyMessage(normalizedMessage)) {
         window.electronAPI.notification?.show({
           title: 'WeFlow 准备就绪',
           content: '现在可以登录微信了',
@@ -487,7 +492,17 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
         const hash = await sha256(authPassword)
         await configService.setAuthEnabled(true)
         await configService.setAuthPassword(hash)
-        await configService.setAuthUseHello(enableHello)
+        if (enableHello) {
+          const helloResult = await window.electronAPI.auth.setHelloSecret(authPassword)
+          if (!helloResult.success) {
+            setError('Windows Hello 配置保存失败')
+            setLoading(false)
+            return
+          }
+        } else {
+          await window.electronAPI.auth.clearHelloSecret()
+          await configService.setAuthUseHello(false)
+        }
       }
 
       await configService.setOnboardingDone(true)
@@ -761,8 +776,7 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
                   )}
                 </div>
 
-                {dbKeyStatus && <div className={`status-message ${dbKeyStatus.includes('现在可以登录') || dbKeyStatus.includes('Hook安装成功') ? 'is-success' : ''}`}>{dbKeyStatus}</div>}
-                <div className="field-hint">点击自动获取后微信将重启，请留意弹窗提示</div>
+                {dbKeyStatus && <div className={`status-message ${isDbKeyReadyMessage(dbKeyStatus) ? 'is-success' : ''}`}>{dbKeyStatus}</div>}
               </div>
             )}
 

src/services/config.ts

@@ -34,6 +34,7 @@ export const CONFIG_KEYS = {
   EXPORT_DEFAULT_EXCEL_COMPACT_COLUMNS: 'exportDefaultExcelCompactColumns',
   EXPORT_DEFAULT_TXT_COLUMNS: 'exportDefaultTxtColumns',
   EXPORT_DEFAULT_CONCURRENCY: 'exportDefaultConcurrency',
+  EXPORT_DEFAULT_IMAGE_DEEP_SEARCH_ON_MISS: 'exportDefaultImageDeepSearchOnMiss',
   EXPORT_WRITE_LAYOUT: 'exportWriteLayout',
   EXPORT_SESSION_NAME_PREFIX_ENABLED: 'exportSessionNamePrefixEnabled',
   EXPORT_LAST_SESSION_RUN_MAP: 'exportLastSessionRunMap',
@@ -65,6 +66,7 @@ export const CONFIG_KEYS = {
   NOTIFICATION_FILTER_LIST: 'notificationFilterList',
   MESSAGE_PUSH_ENABLED: 'messagePushEnabled',
   WINDOW_CLOSE_BEHAVIOR: 'windowCloseBehavior',
+  QUOTE_LAYOUT: 'quoteLayout',
 
   // 词云
   WORD_CLOUD_EXCLUDE_WORDS: 'wordCloudExcludeWords',
@@ -89,6 +91,7 @@ export interface ExportDefaultMediaConfig {
 }
 
 export type WindowCloseBehavior = 'ask' | 'tray' | 'quit'
+export type QuoteLayout = 'quote-top' | 'quote-bottom'
 
 const DEFAULT_EXPORT_MEDIA_CONFIG: ExportDefaultMediaConfig = {
   images: true,
@@ -462,6 +465,18 @@ export async function setExportDefaultConcurrency(concurrency: number): Promise<
   await config.set(CONFIG_KEYS.EXPORT_DEFAULT_CONCURRENCY, concurrency)
 }
 
+// 获取缺图时是否深度搜索（默认导出行为）
+export async function getExportDefaultImageDeepSearchOnMiss(): Promise<boolean | null> {
+  const value = await config.get(CONFIG_KEYS.EXPORT_DEFAULT_IMAGE_DEEP_SEARCH_ON_MISS)
+  if (typeof value === 'boolean') return value
+  return null
+}
+
+// 设置缺图时是否深度搜索（默认导出行为）
+export async function setExportDefaultImageDeepSearchOnMiss(enabled: boolean): Promise<void> {
+  await config.set(CONFIG_KEYS.EXPORT_DEFAULT_IMAGE_DEEP_SEARCH_ON_MISS, enabled)
+}
+
 export type ExportWriteLayout = 'A' | 'B' | 'C'
 
 export async function getExportWriteLayout(): Promise<ExportWriteLayout> {
@@ -647,6 +662,10 @@ export interface ContactsListCacheContact {
   displayName: string
   remark?: string
   nickname?: string
+  alias?: string
+  labels?: string[]
+  detailDescription?: string
+  region?: string
   type: 'friend' | 'group' | 'official' | 'former_friend' | 'other'
 }
 
@@ -1121,16 +1140,18 @@ export async function setSnsPageCache(
 export async function getContactsLoadTimeoutMs(): Promise<number> {
   const value = await config.get(CONFIG_KEYS.CONTACTS_LOAD_TIMEOUT_MS)
   if (typeof value === 'number' && Number.isFinite(value) && value >= 1000 && value <= 60000) {
-    return Math.floor(value)
+    const normalized = Math.floor(value)
+    // 兼容历史默认值 3000ms：自动提升到新的更稳妥阈值。
+    return normalized === 3000 ? 10000 : normalized
   }
-  return 3000
+  return 10000
 }
 
 // 设置通讯录加载超时阈值（毫秒）
 export async function setContactsLoadTimeoutMs(timeoutMs: number): Promise<void> {
   const normalized = Number.isFinite(timeoutMs)
     ? Math.min(60000, Math.max(1000, Math.floor(timeoutMs)))
-    : 3000
+    : 10000
   await config.set(CONFIG_KEYS.CONTACTS_LOAD_TIMEOUT_MS, normalized)
 }
 
@@ -1159,6 +1180,12 @@ export async function getContactsListCache(scopeKey: string): Promise<ContactsLi
       displayName,
       remark: typeof item.remark === 'string' ? item.remark : undefined,
       nickname: typeof item.nickname === 'string' ? item.nickname : undefined,
+      alias: typeof item.alias === 'string' ? item.alias : undefined,
+      labels: Array.isArray(item.labels)
+        ? Array.from(new Set(item.labels.map((label) => String(label || '').trim()).filter(Boolean)))
+        : undefined,
+      detailDescription: typeof item.detailDescription === 'string' ? (item.detailDescription.trim() || undefined) : undefined,
+      region: typeof item.region === 'string' ? (item.region.trim() || undefined) : undefined,
       type: (type === 'friend' || type === 'group' || type === 'official' || type === 'former_friend' || type === 'other')
         ? type
         : 'other'
@@ -1192,6 +1219,12 @@ export async function setContactsListCache(scopeKey: string, contacts: ContactsL
       displayName,
       remark: contact?.remark ? String(contact.remark) : undefined,
       nickname: contact?.nickname ? String(contact.nickname) : undefined,
+      alias: contact?.alias ? String(contact.alias) : undefined,
+      labels: Array.isArray(contact?.labels)
+        ? Array.from(new Set(contact.labels.map((label) => String(label || '').trim()).filter(Boolean)))
+        : undefined,
+      detailDescription: contact?.detailDescription ? (String(contact.detailDescription).trim() || undefined) : undefined,
+      region: contact?.region ? (String(contact.region).trim() || undefined) : undefined,
       type
     })
   }
@@ -1396,6 +1429,16 @@ export async function setWindowCloseBehavior(behavior: WindowCloseBehavior): Pro
   await config.set(CONFIG_KEYS.WINDOW_CLOSE_BEHAVIOR, behavior)
 }
 
+export async function getQuoteLayout(): Promise<QuoteLayout> {
+  const value = await config.get(CONFIG_KEYS.QUOTE_LAYOUT)
+  if (value === 'quote-bottom') return value
+  return 'quote-top'
+}
+
+export async function setQuoteLayout(layout: QuoteLayout): Promise<void> {
+  await config.set(CONFIG_KEYS.QUOTE_LAYOUT, layout)
+}
+
 // 获取词云排除词列表
 export async function getWordCloudExcludeWords(): Promise<string[]> {
   const value = await config.get(CONFIG_KEYS.WORD_CLOUD_EXCLUDE_WORDS)

src/types/electron.d.ts

@@ -61,6 +61,7 @@ export interface ElectronAPI {
     ignoreUpdate: (version: string) => Promise<{ success: boolean }>
     onDownloadProgress: (callback: (progress: number) => void) => () => void
     onUpdateAvailable: (callback: (info: { version: string; releaseNotes: string }) => void) => () => void
+    checkWayland: () => Promise<boolean>
   }
   notification: {
     show: (data: { title: string; content: string; avatarUrl?: string; sessionId: string }) => Promise<{ success?: boolean; error?: string } | void>
@@ -218,7 +219,7 @@ export interface ElectronAPI {
     updateMessage: (sessionId: string, localId: number, createTime: number, newContent: string) => Promise<{ success: boolean; error?: string }>
     deleteMessage: (sessionId: string, localId: number, createTime: number, dbPathHint?: string) => Promise<{ success: boolean; error?: string }>
     resolveTransferDisplayNames: (chatroomId: string, payerUsername: string, receiverUsername: string) => Promise<{ payerName: string; receiverName: string }>
-    getContacts: () => Promise<{
+    getContacts: (options?: { lite?: boolean }) => Promise<{
       success: boolean
       contacts?: ContactInfo[]
       error?: string
@@ -790,6 +791,16 @@ export interface ElectronAPI {
         }>
         likes: Array<string>
         comments: Array<{ id: string; nickname: string; content: string; refCommentId: string; refNickname?: string; emojis?: Array<{ url: string; md5: string; width: number; height: number; encryptUrl?: string; aesKey?: string }> }>
+        location?: {
+          latitude?: number
+          longitude?: number
+          city?: string
+          country?: string
+          poiName?: string
+          poiAddress?: string
+          poiAddressName?: string
+          label?: string
+        }
         rawXml?: string
       }>
       error?: string
@@ -852,6 +863,7 @@ export interface ExportOptions {
   sessionNameWithTypePrefix?: boolean
   displayNamePreference?: 'group-nickname' | 'remark' | 'nickname'
   exportConcurrency?: number
+  imageDeepSearchOnMiss?: boolean
 }
 
 export interface ExportProgress {

src/types/models.ts

@@ -37,6 +37,9 @@ export interface ContactInfo {
   remark?: string
   nickname?: string
   alias?: string
+  labels?: string[]
+  detailDescription?: string
+  region?: string
   avatarUrl?: string
   type: 'friend' | 'group' | 'official' | 'former_friend' | 'other'
 }

src/types/sns.ts

@@ -34,6 +34,17 @@ export interface SnsComment {
     emojis?: SnsCommentEmoji[]
 }
 
+export interface SnsLocation {
+    latitude?: number
+    longitude?: number
+    city?: string
+    country?: string
+    poiName?: string
+    poiAddress?: string
+    poiAddressName?: string
+    label?: string
+}
+
 export interface SnsPost {
     id: string
     tid?: string       // 数据库主键（雪花 ID），用于精确删除
@@ -46,6 +57,7 @@ export interface SnsPost {
     media: SnsMedia[]
     likes: string[]
     comments: SnsComment[]
+    location?: SnsLocation
     rawXml?: string
     linkTitle?: string
     linkUrl?: string

vite.config.ts

@@ -4,6 +4,10 @@ import electron from 'vite-plugin-electron'
 import renderer from 'vite-plugin-electron-renderer'
 import { resolve } from 'path'
 
+const handleElectronOnStart = (options: { reload: () => void }) => {
+  options.reload()
+}
+
 export default defineConfig({
   base: './',
   server: {
@@ -23,6 +27,7 @@ export default defineConfig({
     electron([
       {
         entry: 'electron/main.ts',
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron',
@@ -43,6 +48,7 @@ export default defineConfig({
       },
       {
         entry: 'electron/annualReportWorker.ts',
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron',
@@ -61,6 +67,7 @@ export default defineConfig({
       },
       {
         entry: 'electron/dualReportWorker.ts',
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron',
@@ -79,6 +86,7 @@ export default defineConfig({
       },
       {
         entry: 'electron/imageSearchWorker.ts',
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron',
@@ -93,6 +101,7 @@ export default defineConfig({
       },
       {
         entry: 'electron/wcdbWorker.ts',
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron',
@@ -112,6 +121,7 @@ export default defineConfig({
       },
       {
         entry: 'electron/transcribeWorker.ts',
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron',
@@ -129,6 +139,7 @@ export default defineConfig({
       },
       {
         entry: 'electron/exportWorker.ts',
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron',
@@ -149,9 +160,7 @@ export default defineConfig({
       },
       {
         entry: 'electron/preload.ts',
-        onstart(options) {
-          options.reload()
-        },
+        onstart: handleElectronOnStart,
         vite: {
           build: {
             outDir: 'dist-electron'