Merge pull request #338 from hicccc77/dev

Dev

.gitignore

@@ -56,9 +56,12 @@ Thumbs.db
 *.aps
 
 wcdb/
+xkey/
 *info
 概述.md
 chatlab-format.md
 *.bak
 AGENTS.md
 .claude/
+.agents/
+resources/wx_send

docs/HTTP-API.md

@@ -105,7 +105,8 @@ GET http://127.0.0.1:5031/api/v1/messages?talker=wxid_xxx&keyword=项目进度&l
       "senderUsername": "wxid_sender",
       "mediaType": "image",
       "mediaFileName": "image_123.jpg",
-      "mediaPath": "C:\\Users\\Alice\\Documents\\WeFlow\\api-media\\wxid_xxx\\images\\image_123.jpg"
+      "mediaUrl": "http://127.0.0.1:5031/api/v1/media/wxid_xxx/images/image_123.jpg",
+      "mediaLocalPath": "C:\\Users\\Alice\\Documents\\WeFlow\\api-media\\wxid_xxx\\images\\image_123.jpg"
     }
   ]
 }
@@ -140,7 +141,7 @@ GET http://127.0.0.1:5031/api/v1/messages?talker=wxid_xxx&keyword=项目进度&l
       "timestamp": 1738713600000,
       "type": 0,
       "content": "消息内容",
-      "mediaPath": "C:\\Users\\Alice\\Documents\\WeFlow\\api-media\\wxid_xxx\\images\\image_123.jpg"
+      "mediaPath": "http://127.0.0.1:5031/api/v1/media/wxid_xxx/images/image_123.jpg"
     }
   ],
   "media": {
@@ -153,7 +154,59 @@ GET http://127.0.0.1:5031/api/v1/messages?talker=wxid_xxx&keyword=项目进度&l
 
 ---
 
-### 3. 获取会话列表
+### 3. 访问导出媒体文件
+
+通过 HTTP 直接访问已导出的媒体文件（图片、语音、视频、表情）。
+
+**请求**
+```
+GET /api/v1/media/{relativePath}
+```
+
+**路径参数**
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| `relativePath` | string | ✅ | 媒体文件的相对路径，如 `wxid_xxx/images/image_123.jpg` |
+
+**支持的媒体类型**
+
+| 扩展名 | Content-Type |
+|--------|-------------|
+| `.png` | image/png |
+| `.jpg` / `.jpeg` | image/jpeg |
+| `.gif` | image/gif |
+| `.webp` | image/webp |
+| `.wav` | audio/wav |
+| `.mp3` | audio/mpeg |
+| `.mp4` | video/mp4 |
+
+**示例请求**
+```bash
+# 访问导出的图片
+GET http://127.0.0.1:5031/api/v1/media/wxid_xxx/images/image_123.jpg
+
+# 访问导出的语音
+GET http://127.0.0.1:5031/api/v1/media/wxid_xxx/voices/voice_456.wav
+
+# 访问导出的视频
+GET http://127.0.0.1:5031/api/v1/media/wxid_xxx/videos/video_789.mp4
+```
+
+**响应**
+
+成功时直接返回文件内容，`Content-Type` 根据文件扩展名自动设置。
+
+失败时返回：
+```json
+{ "error": "Media not found" }
+```
+
+> 注意：媒体文件需要先通过消息接口的 `media=1` 参数导出后才能访问。
+
+---
+
+### 4. 获取会话列表
 
 获取所有会话列表。
 

electron/main.ts

@@ -82,11 +82,18 @@ let configService: ConfigService | null = null
 // 协议窗口实例
 let agreementWindow: BrowserWindow | null = null
 let onboardingWindow: BrowserWindow | null = null
+// Splash 启动窗口
+let splashWindow: BrowserWindow | null = null
 const keyService = new KeyService()
 
 let mainWindowReady = false
 let shouldShowMain = true
 
+// 更新下载状态管理（Issue #294 修复）
+let isDownloadInProgress = false
+let downloadProgressHandler: ((progress: any) => void) | null = null
+let downloadedHandler: (() => void) | null = null
+
 function createWindow(options: { autoShow?: boolean } = {}) {
   // 获取图标路径 - 打包后在 resources 目录
   const { autoShow = true } = options
@@ -117,9 +124,10 @@ function createWindow(options: { autoShow?: boolean } = {}) {
   })
 
   // 窗口准备好后显示
+  // Splash 模式下不在这里 show，由启动流程统一控制
   win.once('ready-to-show', () => {
     mainWindowReady = true
-    if (autoShow || shouldShowMain) {
+    if (autoShow && !splashWindow) {
       win.show()
     }
   })
@@ -245,6 +253,73 @@ function createAgreementWindow() {
   return agreementWindow
 }
 
+/**
+ * 创建 Splash 启动窗口
+ * 使用纯 HTML 页面，不依赖 React，确保极速显示
+ */
+function createSplashWindow(): BrowserWindow {
+  const isDev = !!process.env.VITE_DEV_SERVER_URL
+  const iconPath = isDev
+    ? join(__dirname, '../public/icon.ico')
+    : join(process.resourcesPath, 'icon.ico')
+
+  splashWindow = new BrowserWindow({
+    width: 760,
+    height: 460,
+    resizable: false,
+    frame: false,
+    transparent: true,
+    backgroundColor: '#00000000',
+    hasShadow: false,
+    center: true,
+    skipTaskbar: false,
+    icon: iconPath,
+    webPreferences: {
+      contextIsolation: true,
+      nodeIntegration: false
+      // 不需要 preload —— 通过 executeJavaScript 单向推送进度
+    },
+    show: false
+  })
+
+  if (isDev) {
+    splashWindow.loadURL(`${process.env.VITE_DEV_SERVER_URL}splash.html`)
+  } else {
+    splashWindow.loadFile(join(__dirname, '../dist/splash.html'))
+  }
+
+  splashWindow.once('ready-to-show', () => {
+    splashWindow?.show()
+  })
+
+  splashWindow.on('closed', () => {
+    splashWindow = null
+  })
+
+  return splashWindow
+}
+
+/**
+ * 向 Splash 窗口发送进度更新
+ */
+function updateSplashProgress(percent: number, text: string, indeterminate = false) {
+  if (splashWindow && !splashWindow.isDestroyed()) {
+    splashWindow.webContents
+      .executeJavaScript(`updateProgress(${percent}, ${JSON.stringify(text)}, ${indeterminate})`)
+      .catch(() => {})
+  }
+}
+
+/**
+ * 关闭 Splash 窗口
+ */
+function closeSplash() {
+  if (splashWindow && !splashWindow.isDestroyed()) {
+    splashWindow.close()
+    splashWindow = null
+  }
+}
+
 /**
  * 创建首次引导窗口
  */
@@ -397,7 +472,7 @@ function createVideoPlayerWindow(videoPath: string, videoWidth?: number, videoHe
 /**
  * 创建独立的图片查看窗口
  */
-function createImageViewerWindow(imagePath: string) {
+function createImageViewerWindow(imagePath: string, liveVideoPath?: string) {
   const isDev = !!process.env.VITE_DEV_SERVER_URL
   const iconPath = isDev
     ? join(__dirname, '../public/icon.ico')
@@ -430,7 +505,8 @@ function createImageViewerWindow(imagePath: string) {
     win.show()
   })
 
-  const imageParam = `imagePath=${encodeURIComponent(imagePath)}`
+  let imageParam = `imagePath=${encodeURIComponent(imagePath)}`
+  if (liveVideoPath) imageParam += `&liveVideoPath=${encodeURIComponent(liveVideoPath)}`
 
   if (process.env.VITE_DEV_SERVER_URL) {
     win.loadURL(`${process.env.VITE_DEV_SERVER_URL}#/image-viewer-window?${imageParam}`)
@@ -617,22 +693,61 @@ function registerIpcHandlers() {
     if (!AUTO_UPDATE_ENABLED) {
       throw new Error('自动更新已暂时禁用')
     }
+
+    // 防止重复下载（Issue #294 修复）
+    if (isDownloadInProgress) {
+      throw new Error('更新正在下载中，请稍候')
+    }
+
+    isDownloadInProgress = true
     const win = BrowserWindow.fromWebContents(event.sender)
 
-    // 监听下载进度
-    autoUpdater.on('download-progress', (progress) => {
-      win?.webContents.send('app:downloadProgress', progress)
-    })
+    // 清理旧的监听器（Issue #294 修复：防止监听器泄漏）
+    if (downloadProgressHandler) {
+      autoUpdater.removeListener('download-progress', downloadProgressHandler)
+      downloadProgressHandler = null
+    }
+    if (downloadedHandler) {
+      autoUpdater.removeListener('update-downloaded', downloadedHandler)
+      downloadedHandler = null
+    }
 
-    // 下载完成后自动安装
-    autoUpdater.on('update-downloaded', () => {
+    // 创建新的监听器并保存引用
+    downloadProgressHandler = (progress) => {
+      if (win && !win.isDestroyed()) {
+        win.webContents.send('app:downloadProgress', progress)
+      }
+    }
+
+    downloadedHandler = () => {
+      console.log('[Update] 更新下载完成，准备安装')
+      if (downloadProgressHandler) {
+        autoUpdater.removeListener('download-progress', downloadProgressHandler)
+        downloadProgressHandler = null
+      }
+      downloadedHandler = null
+      isDownloadInProgress = false
       autoUpdater.quitAndInstall(false, true)
-    })
+    }
+
+    autoUpdater.on('download-progress', downloadProgressHandler)
+    autoUpdater.once('update-downloaded', downloadedHandler)
 
     try {
+      console.log('[Update] 开始下载更新...')
       await autoUpdater.downloadUpdate()
     } catch (error) {
-      console.error('下载更新失败:', error)
+      console.error('[Update] 下载更新失败:', error)
+      // 失败时清理状态和监听器
+      isDownloadInProgress = false
+      if (downloadProgressHandler) {
+        autoUpdater.removeListener('download-progress', downloadProgressHandler)
+        downloadProgressHandler = null
+      }
+      if (downloadedHandler) {
+        autoUpdater.removeListener('update-downloaded', downloadedHandler)
+        downloadedHandler = null
+      }
       throw error
     }
   })
@@ -869,6 +984,9 @@ function registerIpcHandlers() {
   ipcMain.handle('chat:getAllVoiceMessages', async (_, sessionId: string) => {
     return chatService.getAllVoiceMessages(sessionId)
   })
+  ipcMain.handle('chat:getAllImageMessages', async (_, sessionId: string) => {
+    return chatService.getAllImageMessages(sessionId)
+  })
   ipcMain.handle('chat:getMessageDates', async (_, sessionId: string) => {
     return chatService.getMessageDates(sessionId)
   })
@@ -964,6 +1082,26 @@ function registerIpcHandlers() {
     return { canceled: false, filePath: result.filePaths[0] }
   })
 
+  ipcMain.handle('sns:installBlockDeleteTrigger', async () => {
+    return snsService.installSnsBlockDeleteTrigger()
+  })
+
+  ipcMain.handle('sns:uninstallBlockDeleteTrigger', async () => {
+    return snsService.uninstallSnsBlockDeleteTrigger()
+  })
+
+  ipcMain.handle('sns:checkBlockDeleteTrigger', async () => {
+    return snsService.checkSnsBlockDeleteTrigger()
+  })
+
+  ipcMain.handle('sns:deleteSnsPost', async (_, postId: string) => {
+    return snsService.deleteSnsPost(postId)
+  })
+
+  ipcMain.handle('sns:downloadEmoji', async (_, params: { url: string; encryptUrl?: string; aesKey?: string }) => {
+    return snsService.downloadSnsEmoji(params.url, params.encryptUrl, params.aesKey)
+  })
+
   // 私聊克隆
 
 
@@ -986,7 +1124,65 @@ function registerIpcHandlers() {
       ? mainWindow
       : (BrowserWindow.fromWebContents(event.sender) || undefined)
 
-    return windowsHelloService.verify(message, targetWin)
+    const result = await windowsHelloService.verify(message, targetWin)
+
+    // Hello 验证成功后，自动用 authHelloSecret 中的密码解锁密钥
+    if (result && configService) {
+      const secret = configService.getHelloSecret()
+      if (secret && configService.isLockMode()) {
+        configService.unlock(secret)
+      }
+    }
+
+    return result
+  })
+
+  // 验证应用锁状态（检测 lock: 前缀，防篡改）
+  ipcMain.handle('auth:verifyEnabled', async () => {
+    return configService?.verifyAuthEnabled() ?? false
+  })
+
+  // 密码解锁（验证 + 解密密钥到内存）
+  ipcMain.handle('auth:unlock', async (_event, password: string) => {
+    if (!configService) return { success: false, error: '配置服务未初始化' }
+    return configService.unlock(password)
+  })
+
+  // 开启应用锁
+  ipcMain.handle('auth:enableLock', async (_event, password: string) => {
+    if (!configService) return { success: false, error: '配置服务未初始化' }
+    return configService.enableLock(password)
+  })
+
+  // 关闭应用锁
+  ipcMain.handle('auth:disableLock', async (_event, password: string) => {
+    if (!configService) return { success: false, error: '配置服务未初始化' }
+    return configService.disableLock(password)
+  })
+
+  // 修改密码
+  ipcMain.handle('auth:changePassword', async (_event, oldPassword: string, newPassword: string) => {
+    if (!configService) return { success: false, error: '配置服务未初始化' }
+    return configService.changePassword(oldPassword, newPassword)
+  })
+
+  // 设置 Hello Secret
+  ipcMain.handle('auth:setHelloSecret', async (_event, password: string) => {
+    if (!configService) return { success: false }
+    configService.setHelloSecret(password)
+    return { success: true }
+  })
+
+  // 清除 Hello Secret
+  ipcMain.handle('auth:clearHelloSecret', async () => {
+    if (!configService) return { success: false }
+    configService.clearHelloSecret()
+    return { success: true }
+  })
+
+  // 检查是否处于 lock: 模式
+  ipcMain.handle('auth:isLockMode', async () => {
+    return configService?.isLockMode() ?? false
   })
 
   // 导出相关
@@ -1119,8 +1315,18 @@ function registerIpcHandlers() {
   })
 
   // 打开图片查看窗口
-  ipcMain.handle('window:openImageViewerWindow', (_, imagePath: string) => {
-    createImageViewerWindow(imagePath)
+  ipcMain.handle('window:openImageViewerWindow', async (_, imagePath: string, liveVideoPath?: string) => {
+    // 如果是 dataUrl，写入临时文件
+    if (imagePath.startsWith('data:')) {
+      const commaIdx = imagePath.indexOf(',')
+      const meta = imagePath.slice(5, commaIdx) // e.g. "image/jpeg;base64"
+      const ext = meta.split('/')[1]?.split(';')[0] || 'jpg'
+      const tmpPath = join(app.getPath('temp'), `weflow_preview_${Date.now()}.${ext}`)
+      await writeFile(tmpPath, Buffer.from(imagePath.slice(commaIdx + 1), 'base64'))
+      createImageViewerWindow(`file://${tmpPath.replace(/\\/g, '/')}`, liveVideoPath)
+    } else {
+      createImageViewerWindow(imagePath, liveVideoPath)
+    }
   })
 
   // 完成引导，关闭引导窗口并显示主窗口
@@ -1392,26 +1598,70 @@ function checkForUpdatesOnStartup() {
   }, 3000)
 }
 
-app.whenReady().then(() => {
+app.whenReady().then(async () => {
+  // 立即创建 Splash 窗口，确保用户尽快看到反馈
+  createSplashWindow()
+
+  // 等待 Splash 页面加载完成后再推送进度
+  if (splashWindow) {
+    await new Promise<void>((resolve) => {
+      if (splashWindow!.webContents.isLoading()) {
+        splashWindow!.webContents.once('did-finish-load', () => resolve())
+      } else {
+        resolve()
+      }
+    })
+    splashWindow.webContents
+      .executeJavaScript(`setVersion(${JSON.stringify(app.getVersion())})`)
+      .catch(() => {})
+  }
+
+  const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+
+  // 初始化配置服务
+  updateSplashProgress(5, '正在加载配置...')
   configService = new ConfigService()
+
+  // 将用户主题配置推送给 Splash 窗口
+  if (splashWindow && !splashWindow.isDestroyed()) {
+    const themeId = configService.get('themeId') || 'cloud-dancer'
+    const themeMode = configService.get('theme') || 'system'
+    splashWindow.webContents
+      .executeJavaScript(`applyTheme(${JSON.stringify(themeId)}, ${JSON.stringify(themeMode)})`)
+      .catch(() => {})
+  }
+  await delay(200)
+
+  // 设置资源路径
+  updateSplashProgress(10, '正在初始化...')
   const candidateResources = app.isPackaged
     ? join(process.resourcesPath, 'resources')
     : join(app.getAppPath(), 'resources')
   const fallbackResources = join(process.cwd(), 'resources')
   const resourcesPath = existsSync(candidateResources) ? candidateResources : fallbackResources
   const userDataPath = app.getPath('userData')
+  await delay(200)
+
+  // 初始化数据库服务
+  updateSplashProgress(18, '正在初始化...')
   wcdbService.setPaths(resourcesPath, userDataPath)
   wcdbService.setLogEnabled(configService.get('logEnabled') === true)
+  await delay(200)
+
+  // 注册 IPC 处理器
+  updateSplashProgress(25, '正在初始化...')
   registerIpcHandlers()
+  await delay(200)
+
+  // 检查配置状态
   const onboardingDone = configService.get('onboardingDone')
   shouldShowMain = onboardingDone === true
-  mainWindow = createWindow({ autoShow: shouldShowMain })
 
-  if (!onboardingDone) {
-    createOnboardingWindow()
-  }
+  // 创建主窗口（不显示，由启动流程统一控制）
+  updateSplashProgress(30, '正在加载界面...')
+  mainWindow = createWindow({ autoShow: false })
 
-  // 解决朋友圈图片无法加载问题（添加 Referer）
+  // 配置网络服务
   session.defaultSession.webRequest.onBeforeSendHeaders(
     {
       urls: ['*://*.qpic.cn/*', '*://*.wx.qq.com/*']
@@ -1422,7 +1672,31 @@ app.whenReady().then(() => {
     }
   )
 
-  // 启动时检测更新
+  // 等待主窗口加载完成（真正耗时阶段，进度条末端呼吸光点）
+  updateSplashProgress(30, '正在加载界面...', true)
+  await new Promise<void>((resolve) => {
+    if (mainWindowReady) {
+      resolve()
+    } else {
+      mainWindow!.once('ready-to-show', () => {
+        mainWindowReady = true
+        resolve()
+      })
+    }
+  })
+
+  // 加载完成，收尾
+  updateSplashProgress(100, '启动完成')
+  await new Promise((resolve) => setTimeout(resolve, 250))
+  closeSplash()
+
+  if (!onboardingDone) {
+    createOnboardingWindow()
+  } else {
+    mainWindow?.show()
+  }
+
+  // 启动时检测更新（不阻塞启动）
   checkForUpdatesOnStartup()
 
   app.on('activate', () => {

electron/preload.ts

@@ -24,7 +24,15 @@ contextBridge.exposeInMainWorld('electronAPI', {
 
   // 认证
   auth: {
-    hello: (message?: string) => ipcRenderer.invoke('auth:hello', message)
+    hello: (message?: string) => ipcRenderer.invoke('auth:hello', message),
+    verifyEnabled: () => ipcRenderer.invoke('auth:verifyEnabled'),
+    unlock: (password: string) => ipcRenderer.invoke('auth:unlock', password),
+    enableLock: (password: string) => ipcRenderer.invoke('auth:enableLock', password),
+    disableLock: (password: string) => ipcRenderer.invoke('auth:disableLock', password),
+    changePassword: (oldPassword: string, newPassword: string) => ipcRenderer.invoke('auth:changePassword', oldPassword, newPassword),
+    setHelloSecret: (password: string) => ipcRenderer.invoke('auth:setHelloSecret', password),
+    clearHelloSecret: () => ipcRenderer.invoke('auth:clearHelloSecret'),
+    isLockMode: () => ipcRenderer.invoke('auth:isLockMode')
   },
 
 
@@ -78,8 +86,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
       ipcRenderer.invoke('window:openVideoPlayerWindow', videoPath, videoWidth, videoHeight),
     resizeToFitVideo: (videoWidth: number, videoHeight: number) =>
       ipcRenderer.invoke('window:resizeToFitVideo', videoWidth, videoHeight),
-    openImageViewerWindow: (imagePath: string) =>
-      ipcRenderer.invoke('window:openImageViewerWindow', imagePath),
+    openImageViewerWindow: (imagePath: string, liveVideoPath?: string) =>
+      ipcRenderer.invoke('window:openImageViewerWindow', imagePath, liveVideoPath),
     openChatHistoryWindow: (sessionId: string, messageId: number) =>
       ipcRenderer.invoke('window:openChatHistoryWindow', sessionId, messageId)
   },
@@ -146,6 +154,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
     getVoiceData: (sessionId: string, msgId: string, createTime?: number, serverId?: string | number) =>
       ipcRenderer.invoke('chat:getVoiceData', sessionId, msgId, createTime, serverId),
     getAllVoiceMessages: (sessionId: string) => ipcRenderer.invoke('chat:getAllVoiceMessages', sessionId),
+    getAllImageMessages: (sessionId: string) => ipcRenderer.invoke('chat:getAllImageMessages', sessionId),
     getMessageDates: (sessionId: string) => ipcRenderer.invoke('chat:getMessageDates', sessionId),
     resolveVoiceCache: (sessionId: string, msgId: string) => ipcRenderer.invoke('chat:resolveVoiceCache', sessionId, msgId),
     getVoiceTranscript: (sessionId: string, msgId: string, createTime?: number) => ipcRenderer.invoke('chat:getVoiceTranscript', sessionId, msgId, createTime),
@@ -285,7 +294,12 @@ contextBridge.exposeInMainWorld('electronAPI', {
       ipcRenderer.on('sns:exportProgress', (_, payload) => callback(payload))
       return () => ipcRenderer.removeAllListeners('sns:exportProgress')
     },
-    selectExportDir: () => ipcRenderer.invoke('sns:selectExportDir')
+    selectExportDir: () => ipcRenderer.invoke('sns:selectExportDir'),
+    installBlockDeleteTrigger: () => ipcRenderer.invoke('sns:installBlockDeleteTrigger'),
+    uninstallBlockDeleteTrigger: () => ipcRenderer.invoke('sns:uninstallBlockDeleteTrigger'),
+    checkBlockDeleteTrigger: () => ipcRenderer.invoke('sns:checkBlockDeleteTrigger'),
+    deleteSnsPost: (postId: string) => ipcRenderer.invoke('sns:deleteSnsPost', postId),
+    downloadEmoji: (params: { url: string; encryptUrl?: string; aesKey?: string }) => ipcRenderer.invoke('sns:downloadEmoji', params)
   },
 
   // HTTP API 服务

electron/services/analyticsService.ts

@@ -76,16 +76,12 @@ class AnalyticsService {
     const map: Record<string, string> = {}
     if (usernames.length === 0) return map
 
+    // C++ 层不支持参数绑定，直接内联转义后的字符串值
     const chunkSize = 200
     for (let i = 0; i < usernames.length; i += chunkSize) {
       const chunk = usernames.slice(i, i + chunkSize)
       const inList = chunk.map((u) => `'${this.escapeSqlValue(u)}'`).join(',')
-      if (!inList) continue
-      const sql = `
-        SELECT username, alias
-        FROM contact
-        WHERE username IN (${inList})
-      `
+      const sql = `SELECT username, alias FROM contact WHERE username IN (${inList})`
       const result = await wcdbService.execQuery('contact', null, sql)
       if (!result.success || !result.rows) continue
       for (const row of result.rows as Record<string, any>[]) {

electron/services/chatService.ts

@@ -1,4 +1,4 @@
-import { join, dirname, basename, extname } from 'path'
+import { join, dirname, basename, extname } from 'path'
 import { existsSync, mkdirSync, readdirSync, statSync, readFileSync, writeFileSync, copyFileSync, unlinkSync, watch } from 'fs'
 import * as path from 'path'
 import * as fs from 'fs'
@@ -13,6 +13,7 @@ import { wcdbService } from './wcdbService'
 import { MessageCacheService } from './messageCacheService'
 import { ContactCacheService, ContactCacheEntry } from './contactCacheService'
 import { voiceTranscribeService } from './voiceTranscribeService'
+import { LRUCache } from '../utils/LRUCache.js'
 
 type HardlinkState = {
   db: Database.Database
@@ -33,6 +34,8 @@ export interface ChatSession {
   lastMsgSender?: string
   lastSenderDisplayName?: string
   selfWxid?: string
+  isFolded?: boolean  // 是否已折叠进"折叠的群聊"
+  isMuted?: boolean   // 是否开启免打扰
 }
 
 export interface Message {
@@ -72,9 +75,36 @@ export interface Message {
   fileSize?: number         // 文件大小
   fileExt?: string          // 文件扩展名
   xmlType?: string          // XML 中的 type 字段
+  appMsgKind?: string       // 归一化 appmsg 类型
+  appMsgDesc?: string
+  appMsgAppName?: string
+  appMsgSourceName?: string
+  appMsgSourceUsername?: string
+  appMsgThumbUrl?: string
+  appMsgMusicUrl?: string
+  appMsgDataUrl?: string
+  appMsgLocationLabel?: string
+  finderNickname?: string
+  finderUsername?: string
+  finderCoverUrl?: string
+  finderAvatar?: string
+  finderDuration?: number
+  // 位置消息
+  locationLat?: number
+  locationLng?: number
+  locationPoiname?: string
+  locationLabel?: string
+  // 音乐消息
+  musicAlbumUrl?: string
+  musicUrl?: string
+  // 礼物消息
+  giftImageUrl?: string
+  giftWish?: string
+  giftPrice?: string
   // 名片消息
   cardUsername?: string     // 名片的微信ID
   cardNickname?: string     // 名片的昵称
+  cardAvatarUrl?: string    // 名片头像 URL
   // 转账消息
   transferPayerUsername?: string   // 转账付款人
   transferReceiverUsername?: string // 转账收款人
@@ -114,6 +144,7 @@ class ChatService {
   private configService: ConfigService
   private connected = false
   private messageCursors: Map<string, { cursor: number; fetched: number; batchSize: number; startTime?: number; endTime?: number; ascending?: boolean; bufferedMessages?: any[] }> = new Map()
+  private messageCursorMutex: boolean = false
   private readonly messageBatchDefault = 50
   private avatarCache: Map<string, ContactCacheEntry>
   private readonly avatarCacheTtlMs = 10 * 60 * 1000
@@ -121,8 +152,8 @@ class ChatService {
   private hardlinkCache = new Map<string, HardlinkState>()
   private readonly contactCacheService: ContactCacheService
   private readonly messageCacheService: MessageCacheService
-  private voiceWavCache = new Map<string, Buffer>()
-  private voiceTranscriptCache = new Map<string, string>()
+  private voiceWavCache: LRUCache<string, Buffer>
+  private voiceTranscriptCache: LRUCache<string, string>
   private voiceTranscriptPending = new Map<string, Promise<{ success: boolean; transcript?: string; error?: string }>>()
   private transcriptCacheLoaded = false
   private transcriptCacheDirty = false
@@ -149,6 +180,9 @@ class ChatService {
     const persisted = this.contactCacheService.getAllEntries()
     this.avatarCache = new Map(Object.entries(persisted))
     this.messageCacheService = new MessageCacheService(this.configService.getCacheBasePath())
+    // 初始化LRU缓存，限制大小防止内存泄漏
+    this.voiceWavCache = new LRUCache(this.voiceWavCacheMaxEntries)
+    this.voiceTranscriptCache = new LRUCache(1000) // 最多缓存1000条转写记录
   }
 
   /**
@@ -381,12 +415,29 @@ class ChatService {
           lastMsgType,
           displayName,
           avatarUrl,
-          lastMsgSender: row.last_msg_sender, // 数据库返回字段
-          lastSenderDisplayName: row.last_sender_display_name, // 数据库返回字段
+          lastMsgSender: row.last_msg_sender,
+          lastSenderDisplayName: row.last_sender_display_name,
           selfWxid: myWxid
         })
       }
 
+      // 批量拉取 extra_buffer 状态（isFolded/isMuted），不阻塞主流程
+      const allUsernames = sessions.map(s => s.username)
+      try {
+        const statusResult = await wcdbService.getContactStatus(allUsernames)
+        if (statusResult.success && statusResult.map) {
+          for (const s of sessions) {
+            const st = statusResult.map[s.username]
+            if (st) {
+              s.isFolded = st.isFolded
+              s.isMuted = st.isMuted
+            }
+          }
+        }
+      } catch {
+        // 状态获取失败不影响会话列表返回
+      }
+
       // 不等待联系人信息加载，直接返回基础会话列表
       // 前端可以异步调用 enrichSessionsWithContacts 来补充信息
       return { success: true, sessions }
@@ -728,6 +779,13 @@ class ChatService {
       }
 
       const batchSize = Math.max(1, limit || this.messageBatchDefault)
+
+      // 使用互斥锁保护游标状态访问
+      while (this.messageCursorMutex) {
+        await new Promise(resolve => setTimeout(resolve, 1))
+      }
+      this.messageCursorMutex = true
+
       let state = this.messageCursors.get(sessionId)
 
       // 只在以下情况重新创建游标:
@@ -765,6 +823,7 @@ class ChatService {
 
         state = { cursor: cursorResult.cursor, fetched: 0, batchSize, startTime, endTime, ascending }
         this.messageCursors.set(sessionId, state)
+        this.messageCursorMutex = false
 
         // 如果需要跳过消息(offset > 0),逐批获取但不返回
         // 注意：仅在 offset === 0 时重建游标最安全；
@@ -825,6 +884,10 @@ class ChatService {
       let rows: any[] = state.bufferedMessages || []
       state.bufferedMessages = undefined // Clear buffer after use
 
+      // Track actual hasMore status from C++ layer
+      // If we have buffered messages, we need to check if there's more data
+      let actualHasMore = rows.length > 0 // If buffer exists, assume there might be more
+
       // If buffer is not enough to fill a batch, try to fetch more
       // Or if buffer is empty, fetch a batch
       if (rows.length < batchSize) {
@@ -832,6 +895,7 @@ class ChatService {
         if (nextBatch.success && nextBatch.rows) {
           rows = rows.concat(nextBatch.rows)
           state.fetched += nextBatch.rows.length
+          actualHasMore = nextBatch.hasMore === true
         } else if (!nextBatch.success) {
           console.error('[ChatService] 获取消息批次失败:', nextBatch.error)
           // If we have some buffered rows, we can still return them? 
@@ -839,6 +903,7 @@ class ChatService {
           if (rows.length === 0) {
             return { success: false, error: nextBatch.error || '获取消息失败' }
           }
+          actualHasMore = false
         }
       }
 
@@ -849,13 +914,43 @@ class ChatService {
         // Next time offset will catch up or mismatch trigger reset.
       }
 
-      const hasMore = rows.length > 0 // Simplified hasMore check for now, can be improved
+      // Use actual hasMore from C++ layer, not simplified row count check
+      const hasMore = actualHasMore
 
       const normalized = this.normalizeMessageOrder(this.mapRowsToMessages(rows))
 
+      // 🔒 安全验证：过滤掉不属于当前 sessionId 的消息（防止 C++ 层或缓存错误）
+      const filtered = normalized.filter(msg => {
+        // 检查消息的 senderUsername 或 rawContent 中的 talker
+        // 群聊消息：senderUsername 是群成员，需要检查 _db_path 或上下文
+        // 单聊消息：senderUsername 应该是 sessionId 或自己
+        const isGroupChat = sessionId.includes('@chatroom')
+
+        if (isGroupChat) {
+          // 群聊消息暂不验证（因为 senderUsername 是群成员，不是 sessionId）
+          return true
+        } else {
+          // 单聊消息：senderUsername 应该是 sessionId（对方）或为空/null（自己）
+          if (!msg.senderUsername || msg.senderUsername === sessionId) {
+            return true
+          }
+          // 如果 isSend 为 1，说明是自己发的，允许通过
+          if (msg.isSend === 1) {
+            return true
+          }
+          // 其他情况：可能是错误的消息
+          console.warn(`[ChatService] 检测到异常消息: sessionId=${sessionId}, senderUsername=${msg.senderUsername}, localId=${msg.localId}`)
+          return false
+        }
+      })
+
+      if (filtered.length < normalized.length) {
+        console.warn(`[ChatService] 过滤了 ${normalized.length - filtered.length} 条异常消息`)
+      }
+
       // 并发检查并修复缺失 CDN URL 的表情包
       const fixPromises: Promise<void>[] = []
-      for (const msg of normalized) {
+      for (const msg of filtered) {
         if (msg.localType === 47 && !msg.emojiCdnUrl && msg.emojiMd5) {
           fixPromises.push(this.fallbackEmoticon(msg))
         }
@@ -866,9 +961,12 @@ class ChatService {
       }
 
       state.fetched += rows.length
-      this.messageCacheService.set(sessionId, normalized)
-      return { success: true, messages: normalized, hasMore }
+      this.messageCursorMutex = false
+
+      this.messageCacheService.set(sessionId, filtered)
+      return { success: true, messages: filtered, hasMore }
     } catch (e) {
+      this.messageCursorMutex = false
       console.error('ChatService: 获取消息失败:', e)
       return { success: false, error: String(e) }
     }
@@ -912,12 +1010,34 @@ class ChatService {
       }
 
       console.warn(`[ChatService] 表情包数据库未命中: md5=${msg.emojiMd5}, db=${dbPath}`)
+      // 数据库未命中时，尝试从本地 emoji 缓存目录查找（转发的表情包只有 md5，无 CDN URL）
+      this.findEmojiInLocalCache(msg)
 
     } catch (e) {
       console.error(`[ChatService] 恢复表情包失败: md5=${msg.emojiMd5}`, e)
     }
   }
 
+  /**
+   * 从本地 WeFlow emoji 缓存目录按 md5 查找文件
+   */
+  private findEmojiInLocalCache(msg: Message): void {
+    if (!msg.emojiMd5) return
+    const cacheDir = this.getEmojiCacheDir()
+    if (!existsSync(cacheDir)) return
+
+    const extensions = ['.gif', '.png', '.webp', '.jpg', '.jpeg']
+    for (const ext of extensions) {
+      const filePath = join(cacheDir, `${msg.emojiMd5}${ext}`)
+      if (existsSync(filePath)) {
+        msg.emojiLocalPath = filePath
+        // 同步写入内存缓存，避免重复查找
+        emojiCache.set(msg.emojiMd5, filePath)
+        return
+      }
+    }
+  }
+
   /**
    * 查找 emoticon.db 路径
    */
@@ -1172,9 +1292,33 @@ class ChatService {
       let fileSize: number | undefined
       let fileExt: string | undefined
       let xmlType: string | undefined
+      let appMsgKind: string | undefined
+      let appMsgDesc: string | undefined
+      let appMsgAppName: string | undefined
+      let appMsgSourceName: string | undefined
+      let appMsgSourceUsername: string | undefined
+      let appMsgThumbUrl: string | undefined
+      let appMsgMusicUrl: string | undefined
+      let appMsgDataUrl: string | undefined
+      let appMsgLocationLabel: string | undefined
+      let finderNickname: string | undefined
+      let finderUsername: string | undefined
+      let finderCoverUrl: string | undefined
+      let finderAvatar: string | undefined
+      let finderDuration: number | undefined
+      let locationLat: number | undefined
+      let locationLng: number | undefined
+      let locationPoiname: string | undefined
+      let locationLabel: string | undefined
+      let musicAlbumUrl: string | undefined
+      let musicUrl: string | undefined
+      let giftImageUrl: string | undefined
+      let giftWish: string | undefined
+      let giftPrice: string | undefined
       // 名片消息
       let cardUsername: string | undefined
       let cardNickname: string | undefined
+      let cardAvatarUrl: string | undefined
       // 转账消息
       let transferPayerUsername: string | undefined
       let transferReceiverUsername: string | undefined
@@ -1212,6 +1356,15 @@ class ChatService {
         const cardInfo = this.parseCardInfo(content)
         cardUsername = cardInfo.username
         cardNickname = cardInfo.nickname
+        cardAvatarUrl = cardInfo.avatarUrl
+      } else if (localType === 48 && content) {
+        // 位置消息
+        const latStr = this.extractXmlAttribute(content, 'location', 'x') || this.extractXmlAttribute(content, 'location', 'latitude')
+        const lngStr = this.extractXmlAttribute(content, 'location', 'y') || this.extractXmlAttribute(content, 'location', 'longitude')
+        if (latStr) { const v = parseFloat(latStr); if (Number.isFinite(v)) locationLat = v }
+        if (lngStr) { const v = parseFloat(lngStr); if (Number.isFinite(v)) locationLng = v }
+        locationLabel = this.extractXmlAttribute(content, 'location', 'label') || this.extractXmlValue(content, 'label') || undefined
+        locationPoiname = this.extractXmlAttribute(content, 'location', 'poiname') || this.extractXmlValue(content, 'poiname') || undefined
       } else if ((localType === 49 || localType === 8589934592049) && content) {
         // Type 49 消息（链接、文件、小程序、转账等），8589934592049 也是转账类型
         const type49Info = this.parseType49Message(content)
@@ -1226,12 +1379,56 @@ class ChatService {
         chatRecordList = type49Info.chatRecordList
         transferPayerUsername = type49Info.transferPayerUsername
         transferReceiverUsername = type49Info.transferReceiverUsername
+        // 引用消息（appmsg type=57）的 quotedContent/quotedSender
+        if (type49Info.quotedContent !== undefined) quotedContent = type49Info.quotedContent
+        if (type49Info.quotedSender !== undefined) quotedSender = type49Info.quotedSender
       } else if (localType === 244813135921 || (content && content.includes('<type>57</type>'))) {
         const quoteInfo = this.parseQuoteMessage(content)
         quotedContent = quoteInfo.content
         quotedSender = quoteInfo.sender
       }
 
+      const looksLikeAppMsg = Boolean(content && (content.includes('<appmsg') || content.includes('&lt;appmsg')))
+      if (looksLikeAppMsg) {
+        const type49Info = this.parseType49Message(content)
+        xmlType = xmlType || type49Info.xmlType
+        linkTitle = linkTitle || type49Info.linkTitle
+        linkUrl = linkUrl || type49Info.linkUrl
+        linkThumb = linkThumb || type49Info.linkThumb
+        fileName = fileName || type49Info.fileName
+        fileSize = fileSize ?? type49Info.fileSize
+        fileExt = fileExt || type49Info.fileExt
+        appMsgKind = appMsgKind || type49Info.appMsgKind
+        appMsgDesc = appMsgDesc || type49Info.appMsgDesc
+        appMsgAppName = appMsgAppName || type49Info.appMsgAppName
+        appMsgSourceName = appMsgSourceName || type49Info.appMsgSourceName
+        appMsgSourceUsername = appMsgSourceUsername || type49Info.appMsgSourceUsername
+        appMsgThumbUrl = appMsgThumbUrl || type49Info.appMsgThumbUrl
+        appMsgMusicUrl = appMsgMusicUrl || type49Info.appMsgMusicUrl
+        appMsgDataUrl = appMsgDataUrl || type49Info.appMsgDataUrl
+        appMsgLocationLabel = appMsgLocationLabel || type49Info.appMsgLocationLabel
+        finderNickname = finderNickname || type49Info.finderNickname
+        finderUsername = finderUsername || type49Info.finderUsername
+        finderCoverUrl = finderCoverUrl || type49Info.finderCoverUrl
+        finderAvatar = finderAvatar || type49Info.finderAvatar
+        finderDuration = finderDuration ?? type49Info.finderDuration
+        locationLat = locationLat ?? type49Info.locationLat
+        locationLng = locationLng ?? type49Info.locationLng
+        locationPoiname = locationPoiname || type49Info.locationPoiname
+        locationLabel = locationLabel || type49Info.locationLabel
+        musicAlbumUrl = musicAlbumUrl || type49Info.musicAlbumUrl
+        musicUrl = musicUrl || type49Info.musicUrl
+        giftImageUrl = giftImageUrl || type49Info.giftImageUrl
+        giftWish = giftWish || type49Info.giftWish
+        giftPrice = giftPrice || type49Info.giftPrice
+        chatRecordTitle = chatRecordTitle || type49Info.chatRecordTitle
+        chatRecordList = chatRecordList || type49Info.chatRecordList
+        transferPayerUsername = transferPayerUsername || type49Info.transferPayerUsername
+        transferReceiverUsername = transferReceiverUsername || type49Info.transferReceiverUsername
+        if (!quotedContent && type49Info.quotedContent !== undefined) quotedContent = type49Info.quotedContent
+        if (!quotedSender && type49Info.quotedSender !== undefined) quotedSender = type49Info.quotedSender
+      }
+
       messages.push({
         localId: this.getRowInt(row, ['local_id', 'localId', 'LocalId', 'msg_local_id', 'msgLocalId', 'MsgLocalId', 'msg_id', 'msgId', 'MsgId', 'id', 'WCDB_CT_local_id'], 0),
         serverId: this.getRowInt(row, ['server_id', 'serverId', 'ServerId', 'msg_server_id', 'msgServerId', 'MsgServerId', 'WCDB_CT_server_id'], 0),
@@ -1260,8 +1457,32 @@ class ChatService {
         fileSize,
         fileExt,
         xmlType,
+        appMsgKind,
+        appMsgDesc,
+        appMsgAppName,
+        appMsgSourceName,
+        appMsgSourceUsername,
+        appMsgThumbUrl,
+        appMsgMusicUrl,
+        appMsgDataUrl,
+        appMsgLocationLabel,
+        finderNickname,
+        finderUsername,
+        finderCoverUrl,
+        finderAvatar,
+        finderDuration,
+        locationLat,
+        locationLng,
+        locationPoiname,
+        locationLabel,
+        musicAlbumUrl,
+        musicUrl,
+        giftImageUrl,
+        giftWish,
+        giftPrice,
         cardUsername,
         cardNickname,
+        cardAvatarUrl,
         transferPayerUsername,
         transferReceiverUsername,
         chatRecordTitle,
@@ -1298,6 +1519,7 @@ class ChatService {
 
     // 检查 XML type，用于识别引用消息等
     const xmlType = this.extractXmlValue(content, 'type')
+    const looksLikeAppMsg = content.includes('<appmsg') || content.includes('&lt;appmsg')
 
     switch (localType) {
       case 1:
@@ -1312,8 +1534,14 @@ class ChatService {
         return '[视频]'
       case 47:
         return '[动画表情]'
-      case 48:
-        return '[位置]'
+      case 48: {
+        const label =
+          this.extractXmlAttribute(content, 'location', 'label') ||
+          this.extractXmlAttribute(content, 'location', 'poiname') ||
+          this.extractXmlValue(content, 'label') ||
+          this.extractXmlValue(content, 'poiname')
+        return label ? `[位置] ${label}` : '[位置]'
+      }
       case 49:
         return this.parseType49(content)
       case 50:
@@ -1348,6 +1576,10 @@ class ChatService {
           return title || '[引用消息]'
         }
 
+        if (looksLikeAppMsg) {
+          return this.parseType49(content)
+        }
+
         // 尝试从 XML 提取通用 title
         const genericTitle = this.extractXmlValue(content, 'title')
         if (genericTitle && genericTitle.length > 0 && genericTitle.length < 100) {
@@ -1363,7 +1595,34 @@ class ChatService {
 
   private parseType49(content: string): string {
     const title = this.extractXmlValue(content, 'title')
-    const type = this.extractXmlValue(content, 'type')
+    // 从 appmsg 直接子节点提取 type，避免匹配到 refermsg 内部的 <type>
+    let type = ''
+    const appmsgMatch = /<appmsg[\s\S]*?>([\s\S]*?)<\/appmsg>/i.exec(content)
+    if (appmsgMatch) {
+      const inner = appmsgMatch[1]
+        .replace(/<refermsg[\s\S]*?<\/refermsg>/gi, '')
+        .replace(/<patMsg[\s\S]*?<\/patMsg>/gi, '')
+      const typeMatch = /<type>([\s\S]*?)<\/type>/i.exec(inner)
+      if (typeMatch) type = typeMatch[1].trim()
+    }
+    if (!type) type = this.extractXmlValue(content, 'type')
+    const normalized = content.toLowerCase()
+    const locationLabel =
+      this.extractXmlAttribute(content, 'location', 'label') ||
+      this.extractXmlAttribute(content, 'location', 'poiname') ||
+      this.extractXmlValue(content, 'label') ||
+      this.extractXmlValue(content, 'poiname')
+    const isFinder =
+      type === '51' ||
+      normalized.includes('<finder') ||
+      normalized.includes('finderusername') ||
+      normalized.includes('finderobjectid')
+    const isRedPacket = type === '2001' || normalized.includes('hongbao')
+    const isMusic =
+      type === '3' ||
+      normalized.includes('<musicurl>') ||
+      normalized.includes('<playurl>') ||
+      normalized.includes('<dataurl>')
 
     // 群公告消息（type 87）特殊处理
     if (type === '87') {
@@ -1374,6 +1633,19 @@ class ChatService {
       return '[群公告]'
     }
 
+    if (isFinder) {
+      return title ? `[视频号] ${title}` : '[视频号]'
+    }
+    if (isRedPacket) {
+      return title ? `[红包] ${title}` : '[红包]'
+    }
+    if (locationLabel) {
+      return `[位置] ${locationLabel}`
+    }
+    if (isMusic) {
+      return title ? `[音乐] ${title}` : '[音乐]'
+    }
+
     if (title) {
       switch (type) {
         case '5':
@@ -1391,6 +1663,8 @@ class ChatService {
           return title
         case '2000':
           return `[转账] ${title}`
+        case '2001':
+          return `[红包] ${title}`
         default:
           return title
       }
@@ -1407,6 +1681,13 @@ class ChatService {
         return '[小程序]'
       case '2000':
         return '[转账]'
+      case '2001':
+        return '[红包]'
+      case '3':
+        return '[音乐]'
+      case '5':
+      case '49':
+        return '[链接]'
       case '87':
         return '[群公告]'
       default:
@@ -1502,13 +1783,19 @@ class ChatService {
     if (!content) return undefined
 
     try {
-      // 提取 md5，这是用于查询 hardlink.db 的值
-      const md5 =
-        this.extractXmlAttribute(content, 'videomsg', 'md5') ||
-        this.extractXmlValue(content, 'md5') ||
-        undefined
+      // 优先取 md5 属性（收到的视频）
+      const md5 = this.extractXmlAttribute(content, 'videomsg', 'md5')
+      if (md5) return md5.toLowerCase()
 
-      return md5?.toLowerCase()
+      // 自己发的视频没有 md5，只有 rawmd5
+      const rawMd5 = this.extractXmlAttribute(content, 'videomsg', 'rawmd5')
+      if (rawMd5) return rawMd5.toLowerCase()
+
+      // 兜底：<md5> 标签
+      const tagMd5 = this.extractXmlValue(content, 'md5')
+      if (tagMd5) return tagMd5.toLowerCase()
+
+      return undefined
     } catch {
       return undefined
     }
@@ -1712,7 +1999,7 @@ class ChatService {
    * 解析名片消息
    * 格式: <msg username="wxid_xxx" nickname="昵称" ... />
    */
-  private parseCardInfo(content: string): { username?: string; nickname?: string } {
+  private parseCardInfo(content: string): { username?: string; nickname?: string; avatarUrl?: string } {
     try {
       if (!content) return {}
 
@@ -1722,7 +2009,11 @@ class ChatService {
       // 提取 nickname
       const nickname = this.extractXmlAttribute(content, 'msg', 'nickname') || undefined
 
-      return { username, nickname }
+      // 提取头像
+      const avatarUrl = this.extractXmlAttribute(content, 'msg', 'bigheadimgurl') ||
+        this.extractXmlAttribute(content, 'msg', 'smallheadimgurl') || undefined
+
+      return { username, nickname, avatarUrl }
     } catch (e) {
       console.error('[ChatService] 名片解析失败:', e)
       return {}
@@ -1735,9 +2026,35 @@ class ChatService {
    */
   private parseType49Message(content: string): {
     xmlType?: string
+    quotedContent?: string
+    quotedSender?: string
     linkTitle?: string
     linkUrl?: string
     linkThumb?: string
+    appMsgKind?: string
+    appMsgDesc?: string
+    appMsgAppName?: string
+    appMsgSourceName?: string
+    appMsgSourceUsername?: string
+    appMsgThumbUrl?: string
+    appMsgMusicUrl?: string
+    appMsgDataUrl?: string
+    appMsgLocationLabel?: string
+    finderNickname?: string
+    finderUsername?: string
+    finderCoverUrl?: string
+    finderAvatar?: string
+    finderDuration?: number
+    locationLat?: number
+    locationLng?: number
+    locationPoiname?: string
+    locationLabel?: string
+    musicAlbumUrl?: string
+    musicUrl?: string
+    giftImageUrl?: string
+    giftWish?: string
+    giftPrice?: string
+    cardAvatarUrl?: string
     fileName?: string
     fileSize?: number
     fileExt?: string
@@ -1755,8 +2072,20 @@ class ChatService {
     try {
       if (!content) return {}
 
-      // 提取 appmsg 中的 type
-      const xmlType = this.extractXmlValue(content, 'type')
+      // 提取 appmsg 直接子节点的 type，避免匹配到 refermsg 内部的 <type>
+      // 先尝试从 <appmsg>...</appmsg> 块内提取，再用正则跳过嵌套标签
+      let xmlType = ''
+      const appmsgMatch = /<appmsg[\s\S]*?>([\s\S]*?)<\/appmsg>/i.exec(content)
+      if (appmsgMatch) {
+        // 在 appmsg 内容中，找第一个 <type> 但跳过在子元素内部的（如 refermsg > type）
+        // 策略：去掉所有嵌套块（refermsg、patMsg 等），再提取 type
+        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) xmlType = typeMatch[1].trim()
+      }
+      if (!xmlType) xmlType = this.extractXmlValue(content, 'type')
       if (!xmlType) return {}
 
       const result: any = { xmlType }
@@ -1764,6 +2093,128 @@ class ChatService {
       // 提取通用字段
       const title = this.extractXmlValue(content, 'title')
       const url = this.extractXmlValue(content, 'url')
+      const desc = this.extractXmlValue(content, 'des') || this.extractXmlValue(content, 'description')
+      const appName = this.extractXmlValue(content, 'appname')
+      const sourceName = this.extractXmlValue(content, 'sourcename')
+      const sourceUsername = this.extractXmlValue(content, 'sourceusername')
+      const thumbUrl =
+        this.extractXmlValue(content, 'thumburl') ||
+        this.extractXmlValue(content, 'cdnthumburl') ||
+        this.extractXmlValue(content, 'cover') ||
+        this.extractXmlValue(content, 'coverurl') ||
+        this.extractXmlValue(content, 'thumb_url')
+      const musicUrl =
+        this.extractXmlValue(content, 'musicurl') ||
+        this.extractXmlValue(content, 'playurl') ||
+        this.extractXmlValue(content, 'songalbumurl')
+      const dataUrl = this.extractXmlValue(content, 'dataurl') || this.extractXmlValue(content, 'lowurl')
+      const locationLabel =
+        this.extractXmlAttribute(content, 'location', 'label') ||
+        this.extractXmlAttribute(content, 'location', 'poiname') ||
+        this.extractXmlValue(content, 'label') ||
+        this.extractXmlValue(content, 'poiname')
+      const finderUsername =
+        this.extractXmlValue(content, 'finderusername') ||
+        this.extractXmlValue(content, 'finder_username') ||
+        this.extractXmlValue(content, 'finderuser')
+      const finderNickname =
+        this.extractXmlValue(content, 'findernickname') ||
+        this.extractXmlValue(content, 'finder_nickname')
+      const normalized = content.toLowerCase()
+      const isFinder = xmlType === '51'
+      const isRedPacket = xmlType === '2001'
+      const isMusic = xmlType === '3'
+      const isLocation = Boolean(locationLabel)
+
+      result.linkTitle = title || undefined
+      result.linkUrl = url || undefined
+      result.linkThumb = thumbUrl || undefined
+      result.appMsgDesc = desc || undefined
+      result.appMsgAppName = appName || undefined
+      result.appMsgSourceName = sourceName || undefined
+      result.appMsgSourceUsername = sourceUsername || undefined
+      result.appMsgThumbUrl = thumbUrl || undefined
+      result.appMsgMusicUrl = musicUrl || undefined
+      result.appMsgDataUrl = dataUrl || undefined
+      result.appMsgLocationLabel = locationLabel || undefined
+      result.finderUsername = finderUsername || undefined
+      result.finderNickname = finderNickname || undefined
+
+      // 视频号封面/头像/时长
+      if (isFinder) {
+        const finderCover =
+          this.extractXmlValue(content, 'thumbUrl') ||
+          this.extractXmlValue(content, 'coverUrl') ||
+          this.extractXmlValue(content, 'thumburl') ||
+          this.extractXmlValue(content, 'coverurl')
+        if (finderCover) result.finderCoverUrl = finderCover
+        const finderAvatar = this.extractXmlValue(content, 'avatar')
+        if (finderAvatar) result.finderAvatar = finderAvatar
+        const durationStr = this.extractXmlValue(content, 'videoPlayDuration') || this.extractXmlValue(content, 'duration')
+        if (durationStr) {
+          const d = parseInt(durationStr, 10)
+          if (Number.isFinite(d) && d > 0) result.finderDuration = d
+        }
+      }
+
+      // 位置经纬度
+      if (isLocation) {
+        const latAttr = this.extractXmlAttribute(content, 'location', 'x') || this.extractXmlAttribute(content, 'location', 'latitude')
+        const lngAttr = this.extractXmlAttribute(content, 'location', 'y') || this.extractXmlAttribute(content, 'location', 'longitude')
+        if (latAttr) { const v = parseFloat(latAttr); if (Number.isFinite(v)) result.locationLat = v }
+        if (lngAttr) { const v = parseFloat(lngAttr); if (Number.isFinite(v)) result.locationLng = v }
+        result.locationPoiname = this.extractXmlAttribute(content, 'location', 'poiname') || locationLabel || undefined
+        result.locationLabel = this.extractXmlAttribute(content, 'location', 'label') || undefined
+      }
+
+      // 音乐专辑封面
+      if (isMusic) {
+        const albumUrl = this.extractXmlValue(content, 'songalbumurl')
+        if (albumUrl) result.musicAlbumUrl = albumUrl
+        result.musicUrl = musicUrl || dataUrl || url || undefined
+      }
+
+      // 礼物消息
+      const isGift = xmlType === '115'
+      if (isGift) {
+        result.giftWish = this.extractXmlValue(content, 'wishmessage') || undefined
+        result.giftImageUrl = this.extractXmlValue(content, 'skuimgurl') || undefined
+        result.giftPrice = this.extractXmlValue(content, 'skuprice') || undefined
+      }
+
+      if (isFinder) {
+        result.appMsgKind = 'finder'
+      } else if (isRedPacket) {
+        result.appMsgKind = 'red-packet'
+      } else if (isGift) {
+        result.appMsgKind = 'gift'
+      } else if (isLocation) {
+        result.appMsgKind = 'location'
+      } else if (isMusic) {
+        result.appMsgKind = 'music'
+      } else if (xmlType === '33' || xmlType === '36') {
+        result.appMsgKind = 'miniapp'
+      } else if (xmlType === '6') {
+        result.appMsgKind = 'file'
+      } else if (xmlType === '19') {
+        result.appMsgKind = 'chat-record'
+      } else if (xmlType === '2000') {
+        result.appMsgKind = 'transfer'
+      } else if (xmlType === '87') {
+        result.appMsgKind = 'announcement'
+      } else if (xmlType === '57') {
+        // 引用回复消息，解析 refermsg
+        result.appMsgKind = 'quote'
+        const quoteInfo = this.parseQuoteMessage(content)
+        result.quotedContent = quoteInfo.content
+        result.quotedSender = quoteInfo.sender
+      } else if ((xmlType === '5' || xmlType === '49') && (sourceUsername?.startsWith('gh_') || appName?.includes('公众号') || sourceName)) {
+        result.appMsgKind = 'official-link'
+      } else if (url) {
+        result.appMsgKind = 'link'
+      } else {
+        result.appMsgKind = 'card'
+      }
 
       switch (xmlType) {
         case '6': {
@@ -2420,15 +2871,16 @@ class ChatService {
   private shouldKeepSession(username: string): boolean {
     if (!username) return false
     const lowered = username.toLowerCase()
-    if (lowered.includes('@placeholder') || lowered.includes('foldgroup')) return false
+    // placeholder_foldgroup 是折叠群入口，需要保留
+    if (lowered.includes('@placeholder') && !lowered.includes('foldgroup')) return false
     if (username.startsWith('gh_')) return false
 
     const excludeList = [
       'weixin', 'qqmail', 'fmessage', 'medianote', 'floatbottle',
       'newsapp', 'brandsessionholder', 'brandservicesessionholder',
       'notifymessage', 'opencustomerservicemsg', 'notification_messages',
-      'userexperience_alarm', 'helper_folders', 'placeholder_foldgroup',
-      '@helper_folders', '@placeholder_foldgroup'
+      'userexperience_alarm', 'helper_folders',
+      '@helper_folders'
     ]
 
     for (const prefix of excludeList) {
@@ -2986,9 +3438,10 @@ class ChatService {
       const datPath = await this.findDatFile(actualAccountDir, baseName, sessionId)
       if (!datPath) return { success: false, error: '未找到图片源文件 (.dat)' }
 
-      // 4. 获取解密密钥
-      const xorKeyRaw = this.configService.get('imageXorKey')
-      const aesKeyRaw = this.configService.get('imageAesKey') || msg.aesKey
+      // 4. 获取解密密钥（优先使用当前 wxid 对应的密钥）
+      const imageKeys = this.configService.getImageKeysForCurrentWxid()
+      const xorKeyRaw = imageKeys.xorKey
+      const aesKeyRaw = imageKeys.aesKey || msg.aesKey
 
       if (!xorKeyRaw) return { success: false, error: '未配置图片 XOR 密钥，请在设置中自动获取' }
 
@@ -3698,10 +4151,7 @@ class ChatService {
 
   private cacheVoiceWav(cacheKey: string, wavData: Buffer): void {
     this.voiceWavCache.set(cacheKey, wavData)
-    if (this.voiceWavCache.size > this.voiceWavCacheMaxEntries) {
-      const oldestKey = this.voiceWavCache.keys().next().value
-      if (oldestKey) this.voiceWavCache.delete(oldestKey)
-    }
+    // LRU缓存会自动处理大小限制，无需手动清理
   }
 
   /** 获取持久化转写缓存文件路径 */
@@ -3835,6 +4285,74 @@ class ChatService {
    * 获取某会话中有消息的日期列表
    * 返回 YYYY-MM-DD 格式的日期字符串数组
    */
+  /**
+   * 获取某会话的全部图片消息（用于聊天页批量图片解密）
+   */
+  async getAllImageMessages(
+    sessionId: string
+  ): Promise<{ success: boolean; images?: { imageMd5?: string; imageDatName?: string; createTime?: number }[]; error?: string }> {
+    try {
+      const connectResult = await this.ensureConnected()
+      if (!connectResult.success) {
+        return { success: false, error: connectResult.error || '数据库未连接' }
+      }
+
+      let tables = this.sessionTablesCache.get(sessionId)
+      if (!tables) {
+        const tableStats = await wcdbService.getMessageTableStats(sessionId)
+        if (!tableStats.success || !tableStats.tables || tableStats.tables.length === 0) {
+          return { success: false, error: '未找到会话消息表' }
+        }
+        tables = tableStats.tables
+          .map(t => ({ tableName: t.table_name || t.name, dbPath: t.db_path }))
+          .filter(t => t.tableName && t.dbPath) as Array<{ tableName: string; dbPath: string }>
+        if (tables.length > 0) {
+          this.sessionTablesCache.set(sessionId, tables)
+          setTimeout(() => { this.sessionTablesCache.delete(sessionId) }, this.sessionTablesCacheTtl)
+        }
+      }
+
+      let allImages: Array<{ imageMd5?: string; imageDatName?: string; createTime?: number }> = []
+
+      for (const { tableName, dbPath } of tables) {
+        try {
+          const sql = `SELECT * FROM ${tableName} WHERE local_type = 3 ORDER BY create_time DESC`
+          const result = await wcdbService.execQuery('message', dbPath, sql)
+          if (result.success && result.rows && result.rows.length > 0) {
+            const mapped = this.mapRowsToMessages(result.rows as Record<string, any>[])
+            const images = mapped
+              .filter(msg => msg.localType === 3)
+              .map(msg => ({
+                imageMd5: msg.imageMd5 || undefined,
+                imageDatName: msg.imageDatName || undefined,
+                createTime: msg.createTime || undefined
+              }))
+              .filter(img => Boolean(img.imageMd5 || img.imageDatName))
+            allImages.push(...images)
+          }
+        } catch (e) {
+          console.error(`[ChatService] 查询图片消息失败 (${dbPath}):`, e)
+        }
+      }
+
+      allImages.sort((a, b) => (b.createTime || 0) - (a.createTime || 0))
+
+      const seen = new Set<string>()
+      allImages = allImages.filter(img => {
+        const key = img.imageMd5 || img.imageDatName || ''
+        if (!key || seen.has(key)) return false
+        seen.add(key)
+        return true
+      })
+
+      console.log(`[ChatService] 共找到 ${allImages.length} 条图片消息（去重后）`)
+      return { success: true, images: allImages }
+    } catch (e) {
+      console.error('[ChatService] 获取全部图片消息失败:', e)
+      return { success: false, error: String(e) }
+    }
+  }
+
   async getMessageDates(sessionId: string): Promise<{ success: boolean; dates?: string[]; error?: string }> {
     try {
       const connectResult = await this.ensureConnected()
@@ -3968,6 +4486,15 @@ class ChatService {
       msg.emojiThumbUrl = emojiInfo.thumbUrl
       msg.emojiEncryptUrl = emojiInfo.encryptUrl
       msg.emojiAesKey = emojiInfo.aesKey
+    } else if (msg.localType === 42) {
+      const cardInfo = this.parseCardInfo(rawContent)
+      msg.cardUsername = cardInfo.username
+      msg.cardNickname = cardInfo.nickname
+      msg.cardAvatarUrl = cardInfo.avatarUrl
+    }
+
+    if (rawContent && (rawContent.includes('<appmsg') || rawContent.includes('&lt;appmsg'))) {
+      Object.assign(msg, this.parseType49Message(rawContent))
     }
 
     return msg

electron/services/config.ts

@@ -1,12 +1,17 @@
 import { join } from 'path'
-import { app } from 'electron'
+import { app, safeStorage } from 'electron'
+import crypto from 'crypto'
 import Store from 'electron-store'
 
+// 加密前缀标记
+const SAFE_PREFIX = 'safe:'  // safeStorage 加密（普通模式）
+const LOCK_PREFIX = 'lock:'  // 密码派生密钥加密（锁定模式）
+
 interface ConfigSchema {
   // 数据库相关
-  dbPath: string        // 数据库根目录 (xwechat_files)
-  decryptKey: string    // 解密密钥
-  myWxid: string        // 当前用户 wxid
+  dbPath: string
+  decryptKey: string
+  myWxid: string
   onboardingDone: boolean
   imageXorKey: number
   imageAesKey: string
@@ -14,7 +19,6 @@ interface ConfigSchema {
 
   // 缓存相关
   cachePath: string
-
   lastOpenedDb: string
   lastSession: string
 
@@ -34,8 +38,9 @@ interface ConfigSchema {
 
   // 安全相关
   authEnabled: boolean
-  authPassword: string // SHA-256 hash
+  authPassword: string      // SHA-256 hash（safeStorage 加密）
   authUseHello: boolean
+  authHelloSecret: string   // 原始密码（safeStorage 加密，Hello 解锁时使用）
 
   // 更新相关
   ignoredUpdateVersion: string
@@ -48,10 +53,23 @@ interface ConfigSchema {
   wordCloudExcludeWords: string[]
 }
 
+// 需要 safeStorage 加密的字段（普通模式）
+const ENCRYPTED_STRING_KEYS: Set<string> = new Set(['decryptKey', 'imageAesKey', 'authPassword'])
+const ENCRYPTED_BOOL_KEYS: Set<string> = new Set(['authEnabled', 'authUseHello'])
+const ENCRYPTED_NUMBER_KEYS: Set<string> = new Set(['imageXorKey'])
+
+// 需要与密码绑定的敏感密钥字段（锁定模式时用 lock: 加密）
+const LOCKABLE_STRING_KEYS: Set<string> = new Set(['decryptKey', 'imageAesKey'])
+const LOCKABLE_NUMBER_KEYS: Set<string> = new Set(['imageXorKey'])
+
 export class ConfigService {
   private static instance: ConfigService
   private store!: Store<ConfigSchema>
 
+  // 锁定模式运行时状态
+  private unlockedKeys: Map<string, any> = new Map()
+  private unlockPassword: string | null = null
+
   static getInstance(): ConfigService {
     if (!ConfigService.instance) {
       ConfigService.instance = new ConfigService()
@@ -75,7 +93,6 @@ export class ConfigService {
         imageAesKey: '',
         wxidConfigs: {},
         cachePath: '',
-
         lastOpenedDb: '',
         lastSession: '',
         theme: 'system',
@@ -90,11 +107,10 @@ export class ConfigService {
         transcribeLanguages: ['zh'],
         exportDefaultConcurrency: 2,
         analyticsExcludedUsernames: [],
-
         authEnabled: false,
         authPassword: '',
         authUseHello: false,
-
+        authHelloSecret: '',
         ignoredUpdateVersion: '',
         notificationEnabled: true,
         notificationPosition: 'top-right',
@@ -103,29 +119,556 @@ export class ConfigService {
         wordCloudExcludeWords: []
       }
     })
+    this.migrateAuthFields()
   }
 
+  // === 状态查询 ===
+
+  isLockMode(): boolean {
+    const raw: any = this.store.get('decryptKey')
+    return typeof raw === 'string' && raw.startsWith(LOCK_PREFIX)
+  }
+
+  isUnlocked(): boolean {
+    return !this.isLockMode() || this.unlockedKeys.size > 0
+  }
+
+  // === get / set ===
+
   get<K extends keyof ConfigSchema>(key: K): ConfigSchema[K] {
-    return this.store.get(key)
+    const raw = this.store.get(key)
+
+    if (ENCRYPTED_BOOL_KEYS.has(key)) {
+      const str = typeof raw === 'string' ? raw : ''
+      if (!str || !str.startsWith(SAFE_PREFIX)) return raw
+      return (this.safeDecrypt(str) === 'true') as ConfigSchema[K]
+    }
+
+    if (ENCRYPTED_NUMBER_KEYS.has(key)) {
+      const str = typeof raw === 'string' ? raw : ''
+      if (!str) return raw
+      if (str.startsWith(LOCK_PREFIX)) {
+        const cached = this.unlockedKeys.get(key as string)
+        return (cached !== undefined ? cached : 0) as ConfigSchema[K]
+      }
+      if (!str.startsWith(SAFE_PREFIX)) return raw
+      const num = Number(this.safeDecrypt(str))
+      return (Number.isFinite(num) ? num : 0) as ConfigSchema[K]
+    }
+
+    if (ENCRYPTED_STRING_KEYS.has(key) && typeof raw === 'string') {
+      if (key === 'authPassword') return this.safeDecrypt(raw) as ConfigSchema[K]
+      if (raw.startsWith(LOCK_PREFIX)) {
+        const cached = this.unlockedKeys.get(key as string)
+        return (cached !== undefined ? cached : '') as ConfigSchema[K]
+      }
+      return this.safeDecrypt(raw) as ConfigSchema[K]
+    }
+
+    if (key === 'wxidConfigs' && raw && typeof raw === 'object') {
+      return this.decryptWxidConfigs(raw as any) as ConfigSchema[K]
+    }
+
+    return raw
   }
 
   set<K extends keyof ConfigSchema>(key: K, value: ConfigSchema[K]): void {
-    this.store.set(key, value)
+    let toStore = value
+    const inLockMode = this.isLockMode() && this.unlockPassword
+
+    if (ENCRYPTED_BOOL_KEYS.has(key)) {
+      toStore = this.safeEncrypt(String(value)) as ConfigSchema[K]
+    } else if (ENCRYPTED_NUMBER_KEYS.has(key)) {
+      if (inLockMode && LOCKABLE_NUMBER_KEYS.has(key)) {
+        toStore = this.lockEncrypt(String(value), this.unlockPassword!) as ConfigSchema[K]
+        this.unlockedKeys.set(key as string, value)
+      } else {
+        toStore = this.safeEncrypt(String(value)) as ConfigSchema[K]
+      }
+    } else if (ENCRYPTED_STRING_KEYS.has(key) && typeof value === 'string') {
+      if (key === 'authPassword') {
+        toStore = this.safeEncrypt(value) as ConfigSchema[K]
+      } else if (inLockMode && LOCKABLE_STRING_KEYS.has(key)) {
+        toStore = this.lockEncrypt(value, this.unlockPassword!) as ConfigSchema[K]
+        this.unlockedKeys.set(key as string, value)
+      } else {
+        toStore = this.safeEncrypt(value) as ConfigSchema[K]
+      }
+    } else if (key === 'wxidConfigs' && value && typeof value === 'object') {
+      if (inLockMode) {
+        toStore = this.lockEncryptWxidConfigs(value as any) as ConfigSchema[K]
+      } else {
+        toStore = this.encryptWxidConfigs(value as any) as ConfigSchema[K]
+      }
+    }
+
+    this.store.set(key, toStore)
+  }
+
+  // === 加密/解密工具 ===
+
+  private safeEncrypt(plaintext: string): string {
+    if (!plaintext) return ''
+    if (plaintext.startsWith(SAFE_PREFIX)) return plaintext
+    if (!safeStorage.isEncryptionAvailable()) return plaintext
+    const encrypted = safeStorage.encryptString(plaintext)
+    return SAFE_PREFIX + encrypted.toString('base64')
+  }
+
+  private safeDecrypt(stored: string): string {
+    if (!stored) return ''
+    if (!stored.startsWith(SAFE_PREFIX)) return stored
+    if (!safeStorage.isEncryptionAvailable()) return ''
+    try {
+      const buf = Buffer.from(stored.slice(SAFE_PREFIX.length), 'base64')
+      return safeStorage.decryptString(buf)
+    } catch {
+      return ''
+    }
+  }
+
+  private lockEncrypt(plaintext: string, password: string): string {
+    if (!plaintext) return ''
+    const salt = crypto.randomBytes(16)
+    const iv = crypto.randomBytes(12)
+    const derivedKey = crypto.pbkdf2Sync(password, salt, 100000, 32, 'sha256')
+    const cipher = crypto.createCipheriv('aes-256-gcm', derivedKey, iv)
+    const encrypted = Buffer.concat([cipher.update(plaintext, 'utf8'), cipher.final()])
+    const authTag = cipher.getAuthTag()
+    const combined = Buffer.concat([salt, iv, authTag, encrypted])
+    return LOCK_PREFIX + combined.toString('base64')
+  }
+
+  private lockDecrypt(stored: string, password: string): string | null {
+    if (!stored || !stored.startsWith(LOCK_PREFIX)) return null
+    try {
+      const combined = Buffer.from(stored.slice(LOCK_PREFIX.length), 'base64')
+      const salt = combined.subarray(0, 16)
+      const iv = combined.subarray(16, 28)
+      const authTag = combined.subarray(28, 44)
+      const ciphertext = combined.subarray(44)
+      const derivedKey = crypto.pbkdf2Sync(password, salt, 100000, 32, 'sha256')
+      const decipher = crypto.createDecipheriv('aes-256-gcm', derivedKey, iv)
+      decipher.setAuthTag(authTag)
+      const decrypted = Buffer.concat([decipher.update(ciphertext), decipher.final()])
+      return decrypted.toString('utf8')
+    } catch {
+      return null
+    }
+  }
+
+  // 通过尝试解密 lock: 字段来验证密码是否正确（当 authPassword 被删除时使用）
+  private verifyPasswordByDecrypt(password: string): boolean {
+    // 依次尝试解密任意一个 lock: 字段，GCM authTag 会验证密码正确性
+    const lockFields = ['decryptKey', 'imageAesKey', 'imageXorKey'] as const
+    for (const key of lockFields) {
+      const raw: any = this.store.get(key as any)
+      if (typeof raw === 'string' && raw.startsWith(LOCK_PREFIX)) {
+        const result = this.lockDecrypt(raw, password)
+        // lockDecrypt 返回 null 表示解密失败（密码错误），非 null 表示成功
+        return result !== null
+      }
+    }
+    return false
+  }
+
+  // === wxidConfigs 加密/解密 ===
+
+  private encryptWxidConfigs(configs: ConfigSchema['wxidConfigs']): ConfigSchema['wxidConfigs'] {
+    const result: ConfigSchema['wxidConfigs'] = {}
+    for (const [wxid, cfg] of Object.entries(configs)) {
+      result[wxid] = { ...cfg }
+      if (cfg.decryptKey) result[wxid].decryptKey = this.safeEncrypt(cfg.decryptKey)
+      if (cfg.imageAesKey) result[wxid].imageAesKey = this.safeEncrypt(cfg.imageAesKey)
+      if (cfg.imageXorKey !== undefined) {
+        (result[wxid] as any).imageXorKey = this.safeEncrypt(String(cfg.imageXorKey))
+      }
+    }
+    return result
+  }
+
+  private decryptLockedWxidConfigs(password: string): void {
+    const wxidConfigs = this.store.get('wxidConfigs')
+    if (!wxidConfigs || typeof wxidConfigs !== 'object') return
+    for (const [wxid, cfg] of Object.entries(wxidConfigs) as [string, any][]) {
+      if (cfg.decryptKey && typeof cfg.decryptKey === 'string' && cfg.decryptKey.startsWith(LOCK_PREFIX)) {
+        const d = this.lockDecrypt(cfg.decryptKey, password)
+        if (d !== null) this.unlockedKeys.set(`wxid:${wxid}:decryptKey`, d)
+      }
+      if (cfg.imageAesKey && typeof cfg.imageAesKey === 'string' && cfg.imageAesKey.startsWith(LOCK_PREFIX)) {
+        const d = this.lockDecrypt(cfg.imageAesKey, password)
+        if (d !== null) this.unlockedKeys.set(`wxid:${wxid}:imageAesKey`, d)
+      }
+      if (cfg.imageXorKey && typeof cfg.imageXorKey === 'string' && cfg.imageXorKey.startsWith(LOCK_PREFIX)) {
+        const d = this.lockDecrypt(cfg.imageXorKey, password)
+        if (d !== null) this.unlockedKeys.set(`wxid:${wxid}:imageXorKey`, Number(d))
+      }
+    }
+  }
+
+  private decryptWxidConfigs(configs: ConfigSchema['wxidConfigs']): ConfigSchema['wxidConfigs'] {
+    const result: ConfigSchema['wxidConfigs'] = {}
+    for (const [wxid, cfg] of Object.entries(configs) as [string, any][]) {
+      result[wxid] = { ...cfg, updatedAt: cfg.updatedAt }
+      // decryptKey
+      if (typeof cfg.decryptKey === 'string') {
+        if (cfg.decryptKey.startsWith(LOCK_PREFIX)) {
+          result[wxid].decryptKey = this.unlockedKeys.get(`wxid:${wxid}:decryptKey`) ?? ''
+        } else {
+          result[wxid].decryptKey = this.safeDecrypt(cfg.decryptKey)
+        }
+      }
+      // imageAesKey
+      if (typeof cfg.imageAesKey === 'string') {
+        if (cfg.imageAesKey.startsWith(LOCK_PREFIX)) {
+          result[wxid].imageAesKey = this.unlockedKeys.get(`wxid:${wxid}:imageAesKey`) ?? ''
+        } else {
+          result[wxid].imageAesKey = this.safeDecrypt(cfg.imageAesKey)
+        }
+      }
+      // imageXorKey
+      if (typeof cfg.imageXorKey === 'string') {
+        if (cfg.imageXorKey.startsWith(LOCK_PREFIX)) {
+          result[wxid].imageXorKey = this.unlockedKeys.get(`wxid:${wxid}:imageXorKey`) ?? 0
+        } else if (cfg.imageXorKey.startsWith(SAFE_PREFIX)) {
+          const num = Number(this.safeDecrypt(cfg.imageXorKey))
+          result[wxid].imageXorKey = Number.isFinite(num) ? num : 0
+        }
+      }
+    }
+    return result
+  }
+  private lockEncryptWxidConfigs(configs: ConfigSchema['wxidConfigs']): ConfigSchema['wxidConfigs'] {
+    const result: ConfigSchema['wxidConfigs'] = {}
+    for (const [wxid, cfg] of Object.entries(configs)) {
+      result[wxid] = { ...cfg }
+      if (cfg.decryptKey) result[wxid].decryptKey = this.lockEncrypt(cfg.decryptKey, this.unlockPassword!) as any
+      if (cfg.imageAesKey) result[wxid].imageAesKey = this.lockEncrypt(cfg.imageAesKey, this.unlockPassword!) as any
+      if (cfg.imageXorKey !== undefined) {
+        (result[wxid] as any).imageXorKey = this.lockEncrypt(String(cfg.imageXorKey), this.unlockPassword!)
+      }
+    }
+    return result
+  }
+
+  // === 业务方法 ===
+
+  enableLock(password: string): { success: boolean; error?: string } {
+    try {
+      // 先读取当前所有明文密钥
+      const decryptKey = this.get('decryptKey')
+      const imageAesKey = this.get('imageAesKey')
+      const imageXorKey = this.get('imageXorKey')
+      const wxidConfigs = this.get('wxidConfigs')
+
+      // 存储密码 hash（safeStorage 加密）
+      const passwordHash = crypto.createHash('sha256').update(password).digest('hex')
+      this.store.set('authPassword', this.safeEncrypt(passwordHash) as any)
+      this.store.set('authEnabled', this.safeEncrypt('true') as any)
+
+      // 设置运行时状态
+      this.unlockPassword = password
+      this.unlockedKeys.set('decryptKey', decryptKey)
+      this.unlockedKeys.set('imageAesKey', imageAesKey)
+      this.unlockedKeys.set('imageXorKey', imageXorKey)
+
+      // 用密码派生密钥重新加密所有敏感字段
+      if (decryptKey) this.store.set('decryptKey', this.lockEncrypt(String(decryptKey), password) as any)
+      if (imageAesKey) this.store.set('imageAesKey', this.lockEncrypt(String(imageAesKey), password) as any)
+      if (imageXorKey !== undefined) this.store.set('imageXorKey', this.lockEncrypt(String(imageXorKey), password) as any)
+
+      // 处理 wxidConfigs 中的嵌套密钥
+      if (wxidConfigs && Object.keys(wxidConfigs).length > 0) {
+        const lockedConfigs = this.lockEncryptWxidConfigs(wxidConfigs)
+        this.store.set('wxidConfigs', lockedConfigs)
+        for (const [wxid, cfg] of Object.entries(wxidConfigs)) {
+          if (cfg.decryptKey) this.unlockedKeys.set(`wxid:${wxid}:decryptKey`, cfg.decryptKey)
+          if (cfg.imageAesKey) this.unlockedKeys.set(`wxid:${wxid}:imageAesKey`, cfg.imageAesKey)
+          if (cfg.imageXorKey !== undefined) this.unlockedKeys.set(`wxid:${wxid}:imageXorKey`, cfg.imageXorKey)
+        }
+      }
+
+      return { success: true }
+    } catch (e: any) {
+      return { success: false, error: e.message }
+    }
+  }
+
+  unlock(password: string): { success: boolean; error?: string } {
+    try {
+      // 验证密码
+      const storedHash = this.safeDecrypt(this.store.get('authPassword') as any)
+      const inputHash = crypto.createHash('sha256').update(password).digest('hex')
+
+      if (storedHash && storedHash !== inputHash) {
+        // authPassword 存在但密码不匹配
+        return { success: false, error: '密码错误' }
+      }
+
+      if (!storedHash) {
+        // authPassword 被删除/损坏，尝试用密码直接解密 lock: 字段来验证
+        const verified = this.verifyPasswordByDecrypt(password)
+        if (!verified) {
+          return { success: false, error: '密码错误' }
+        }
+        // 密码正确，自愈 authPassword
+        const newHash = crypto.createHash('sha256').update(password).digest('hex')
+        this.store.set('authPassword', this.safeEncrypt(newHash) as any)
+        this.store.set('authEnabled', this.safeEncrypt('true') as any)
+      }
+
+      // 解密所有 lock: 字段到内存缓存
+      const rawDecryptKey: any = this.store.get('decryptKey')
+      if (typeof rawDecryptKey === 'string' && rawDecryptKey.startsWith(LOCK_PREFIX)) {
+        const d = this.lockDecrypt(rawDecryptKey, password)
+        if (d !== null) this.unlockedKeys.set('decryptKey', d)
+      }
+
+      const rawImageAesKey: any = this.store.get('imageAesKey')
+      if (typeof rawImageAesKey === 'string' && rawImageAesKey.startsWith(LOCK_PREFIX)) {
+        const d = this.lockDecrypt(rawImageAesKey, password)
+        if (d !== null) this.unlockedKeys.set('imageAesKey', d)
+      }
+
+      const rawImageXorKey: any = this.store.get('imageXorKey')
+      if (typeof rawImageXorKey === 'string' && rawImageXorKey.startsWith(LOCK_PREFIX)) {
+        const d = this.lockDecrypt(rawImageXorKey, password)
+        if (d !== null) this.unlockedKeys.set('imageXorKey', Number(d))
+      }
+
+      // 解密 wxidConfigs 嵌套密钥
+      this.decryptLockedWxidConfigs(password)
+
+      // 保留密码供 set() 使用
+      this.unlockPassword = password
+      return { success: true }
+    } catch (e: any) {
+      return { success: false, error: e.message }
+    }
+  }
+
+  disableLock(password: string): { success: boolean; error?: string } {
+    try {
+      // 验证密码
+      const storedHash = this.safeDecrypt(this.store.get('authPassword') as any)
+      const inputHash = crypto.createHash('sha256').update(password).digest('hex')
+      if (storedHash !== inputHash) {
+        return { success: false, error: '密码错误' }
+      }
+
+      // 先解密所有 lock: 字段
+      if (this.unlockedKeys.size === 0) {
+        this.unlock(password)
+      }
+
+      // 将所有密钥转回 safe: 格式
+      const decryptKey = this.unlockedKeys.get('decryptKey')
+      const imageAesKey = this.unlockedKeys.get('imageAesKey')
+      const imageXorKey = this.unlockedKeys.get('imageXorKey')
+
+      if (decryptKey) this.store.set('decryptKey', this.safeEncrypt(String(decryptKey)) as any)
+      if (imageAesKey) this.store.set('imageAesKey', this.safeEncrypt(String(imageAesKey)) as any)
+      if (imageXorKey !== undefined) this.store.set('imageXorKey', this.safeEncrypt(String(imageXorKey)) as any)
+
+      // 转换 wxidConfigs
+      const wxidConfigs = this.get('wxidConfigs')
+      if (wxidConfigs && Object.keys(wxidConfigs).length > 0) {
+        const safeConfigs = this.encryptWxidConfigs(wxidConfigs)
+        this.store.set('wxidConfigs', safeConfigs)
+      }
+
+      // 清除 auth 字段
+      this.store.set('authEnabled', false as any)
+      this.store.set('authPassword', '' as any)
+      this.store.set('authUseHello', false as any)
+      this.store.set('authHelloSecret', '' as any)
+
+      // 清除运行时状态
+      this.unlockedKeys.clear()
+      this.unlockPassword = null
+
+      return { success: true }
+    } catch (e: any) {
+      return { success: false, error: e.message }
+    }
+  }
+
+  changePassword(oldPassword: string, newPassword: string): { success: boolean; error?: string } {
+    try {
+      // 验证旧密码
+      const storedHash = this.safeDecrypt(this.store.get('authPassword') as any)
+      const oldHash = crypto.createHash('sha256').update(oldPassword).digest('hex')
+      if (storedHash !== oldHash) {
+        return { success: false, error: '旧密码错误' }
+      }
+
+      // 确保已解锁
+      if (this.unlockedKeys.size === 0) {
+        this.unlock(oldPassword)
+      }
+
+      // 用新密码重新加密所有密钥
+      const decryptKey = this.unlockedKeys.get('decryptKey')
+      const imageAesKey = this.unlockedKeys.get('imageAesKey')
+      const imageXorKey = this.unlockedKeys.get('imageXorKey')
+
+      if (decryptKey) this.store.set('decryptKey', this.lockEncrypt(String(decryptKey), newPassword) as any)
+      if (imageAesKey) this.store.set('imageAesKey', this.lockEncrypt(String(imageAesKey), newPassword) as any)
+      if (imageXorKey !== undefined) this.store.set('imageXorKey', this.lockEncrypt(String(imageXorKey), newPassword) as any)
+
+      // 重新加密 wxidConfigs
+      const wxidConfigs = this.get('wxidConfigs')
+      if (wxidConfigs && Object.keys(wxidConfigs).length > 0) {
+        this.unlockPassword = newPassword
+        const lockedConfigs = this.lockEncryptWxidConfigs(wxidConfigs)
+        this.store.set('wxidConfigs', lockedConfigs)
+      }
+
+      // 更新密码 hash
+      const newHash = crypto.createHash('sha256').update(newPassword).digest('hex')
+      this.store.set('authPassword', this.safeEncrypt(newHash) as any)
+
+      // 更新 Hello secret（如果启用了 Hello）
+      const useHello = this.get('authUseHello')
+      if (useHello) {
+        this.store.set('authHelloSecret', this.safeEncrypt(newPassword) as any)
+      }
+
+      this.unlockPassword = newPassword
+      return { success: true }
+    } catch (e: any) {
+      return { success: false, error: e.message }
+    }
+  }
+
+  // === Hello 相关 ===
+
+  setHelloSecret(password: string): void {
+    this.store.set('authHelloSecret', this.safeEncrypt(password) as any)
+    this.store.set('authUseHello', this.safeEncrypt('true') as any)
+  }
+
+  getHelloSecret(): string {
+    const raw: any = this.store.get('authHelloSecret')
+    if (!raw || typeof raw !== 'string') return ''
+    return this.safeDecrypt(raw)
+  }
+
+  clearHelloSecret(): void {
+    this.store.set('authHelloSecret', '' as any)
+    this.store.set('authUseHello', this.safeEncrypt('false') as any)
+  }
+
+  // === 迁移 ===
+
+  private migrateAuthFields(): void {
+    // 将旧版明文 auth 字段迁移为 safeStorage 加密格式
+    // 如果已经是 safe: 或 lock: 前缀则跳过
+    const rawEnabled: any = this.store.get('authEnabled')
+    if (typeof rawEnabled === 'boolean') {
+      this.store.set('authEnabled', this.safeEncrypt(String(rawEnabled)) as any)
+    }
+
+    const rawUseHello: any = this.store.get('authUseHello')
+    if (typeof rawUseHello === 'boolean') {
+      this.store.set('authUseHello', this.safeEncrypt(String(rawUseHello)) as any)
+    }
+
+    const rawPassword: any = this.store.get('authPassword')
+    if (typeof rawPassword === 'string' && rawPassword && !rawPassword.startsWith(SAFE_PREFIX)) {
+      this.store.set('authPassword', this.safeEncrypt(rawPassword) as any)
+    }
+
+    // 迁移敏感密钥字段（明文 → safe:）
+    for (const key of LOCKABLE_STRING_KEYS) {
+      const raw: any = this.store.get(key as any)
+      if (typeof raw === 'string' && raw && !raw.startsWith(SAFE_PREFIX) && !raw.startsWith(LOCK_PREFIX)) {
+        this.store.set(key as any, this.safeEncrypt(raw) as any)
+      }
+    }
+
+    // imageXorKey: 数字 → safe:
+    const rawXor: any = this.store.get('imageXorKey')
+    if (typeof rawXor === 'number' && rawXor !== 0) {
+      this.store.set('imageXorKey', this.safeEncrypt(String(rawXor)) as any)
+    }
+
+    // wxidConfigs 中的嵌套密钥
+    const wxidConfigs: any = this.store.get('wxidConfigs')
+    if (wxidConfigs && typeof wxidConfigs === 'object') {
+      let changed = false
+      for (const [_wxid, cfg] of Object.entries(wxidConfigs) as [string, any][]) {
+        if (cfg.decryptKey && typeof cfg.decryptKey === 'string' && !cfg.decryptKey.startsWith(SAFE_PREFIX) && !cfg.decryptKey.startsWith(LOCK_PREFIX)) {
+          cfg.decryptKey = this.safeEncrypt(cfg.decryptKey)
+          changed = true
+        }
+        if (cfg.imageAesKey && typeof cfg.imageAesKey === 'string' && !cfg.imageAesKey.startsWith(SAFE_PREFIX) && !cfg.imageAesKey.startsWith(LOCK_PREFIX)) {
+          cfg.imageAesKey = this.safeEncrypt(cfg.imageAesKey)
+          changed = true
+        }
+        if (typeof cfg.imageXorKey === 'number' && cfg.imageXorKey !== 0) {
+          cfg.imageXorKey = this.safeEncrypt(String(cfg.imageXorKey))
+          changed = true
+        }
+      }
+      if (changed) {
+        this.store.set('wxidConfigs', wxidConfigs)
+      }
+    }
+  }
+
+  // === 验证 ===
+
+  verifyAuthEnabled(): boolean {
+    // 先检查 authEnabled 字段
+    const rawEnabled: any = this.store.get('authEnabled')
+    if (typeof rawEnabled === 'string' && rawEnabled.startsWith(SAFE_PREFIX)) {
+      if (this.safeDecrypt(rawEnabled) === 'true') return true
+    }
+
+    // 即使 authEnabled 被删除/篡改，如果密钥是 lock: 格式，说明曾开启过应用锁
+    const rawDecryptKey: any = this.store.get('decryptKey')
+    if (typeof rawDecryptKey === 'string' && rawDecryptKey.startsWith(LOCK_PREFIX)) {
+      return true
+    }
+
+    return false
+  }
+
+  // === 工具方法 ===
+
+  /**
+   * 获取当前 wxid 对应的图片密钥，优先从 wxidConfigs 中取，找不到则回退到全局配置
+   */
+  getImageKeysForCurrentWxid(): { xorKey: unknown; aesKey: string } {
+    const wxid = this.get('myWxid')
+    if (wxid) {
+      const wxidConfigs = this.get('wxidConfigs')
+      const cfg = wxidConfigs?.[wxid]
+      if (cfg && (cfg.imageXorKey !== undefined || cfg.imageAesKey)) {
+        return {
+          xorKey: cfg.imageXorKey ?? this.get('imageXorKey'),
+          aesKey: cfg.imageAesKey ?? this.get('imageAesKey')
+        }
+      }
+    }
+    return {
+      xorKey: this.get('imageXorKey'),
+      aesKey: this.get('imageAesKey')
+    }
   }
 
   getCacheBasePath(): string {
-    const configured = this.get('cachePath')
-    if (configured && configured.trim().length > 0) {
-      return configured
-    }
-    return join(app.getPath('documents'), 'WeFlow')
+    return join(app.getPath('userData'), 'cache')
   }
 
-  getAll(): ConfigSchema {
+  getAll(): Partial<ConfigSchema> {
     return this.store.store
   }
 
   clear(): void {
     this.store.clear()
+    this.unlockedKeys.clear()
+    this.unlockPassword = null
   }
 }

electron/services/exportService.ts

@@ -12,6 +12,7 @@ import { chatService } from './chatService'
 import { videoService } from './videoService'
 import { voiceTranscribeService } from './voiceTranscribeService'
 import { EXPORT_HTML_STYLES } from './exportHtmlStyles'
+import { LRUCache } from '../utils/LRUCache.js'
 
 // ChatLab 格式类型定义
 interface ChatLabHeader {
@@ -140,12 +141,15 @@ async function parallelLimit<T, R>(
 
 class ExportService {
   private configService: ConfigService
-  private contactCache: Map<string, { displayName: string; avatarUrl?: string }> = new Map()
-  private inlineEmojiCache: Map<string, string> = new Map()
+  private contactCache: LRUCache<string, { displayName: string; avatarUrl?: string }>
+  private inlineEmojiCache: LRUCache<string, string>
   private htmlStyleCache: string | null = null
 
   constructor() {
     this.configService = new ConfigService()
+    // 限制缓存大小，防止内存泄漏
+    this.contactCache = new LRUCache(500) // 最多缓存500个联系人
+    this.inlineEmojiCache = new LRUCache(100) // 最多缓存100个表情
   }
 
   private getClampedConcurrency(value: number | undefined, fallback = 2, max = 6): number {
@@ -219,9 +223,9 @@ class ExportService {
    */
   async getGroupNicknamesForRoom(chatroomId: string, candidates: string[] = []): Promise<Map<string, string>> {
     try {
-      const escapedChatroomId = chatroomId.replace(/'/g, "''")
-      const sql = `SELECT ext_buffer FROM chat_room WHERE username='${escapedChatroomId}' LIMIT 1`
-      const result = await wcdbService.execQuery('contact', null, sql)
+      // 使用参数化查询防止SQL注入
+      const sql = 'SELECT ext_buffer FROM chat_room WHERE username = ? LIMIT 1'
+      const result = await wcdbService.execQuery('contact', null, sql, [chatroomId])
       if (!result.success || !result.rows || result.rows.length === 0) {
         return new Map<string, string>()
       }
@@ -661,7 +665,18 @@ class ExportService {
       case 42: return '[名片]'
       case 43: return '[视频]'
       case 47: return '[动画表情]'
-      case 48: return '[位置]'
+      case 48: {
+        const normalized48 = this.normalizeAppMessageContent(content)
+        const locPoiname = this.extractXmlAttribute(normalized48, 'location', 'poiname') || this.extractXmlValue(normalized48, 'poiname') || this.extractXmlValue(normalized48, 'poiName')
+        const locLabel = this.extractXmlAttribute(normalized48, 'location', 'label') || this.extractXmlValue(normalized48, 'label')
+        const locLat = this.extractXmlAttribute(normalized48, 'location', 'x') || this.extractXmlAttribute(normalized48, 'location', 'latitude')
+        const locLng = this.extractXmlAttribute(normalized48, 'location', 'y') || this.extractXmlAttribute(normalized48, 'location', 'longitude')
+        const locParts: string[] = []
+        if (locPoiname) locParts.push(locPoiname)
+        if (locLabel && locLabel !== locPoiname) locParts.push(locLabel)
+        if (locLat && locLng) locParts.push(`(${locLat},${locLng})`)
+        return locParts.length > 0 ? `[位置] ${locParts.join(' ')}` : '[位置]'
+      }
       case 49: {
         const title = this.extractXmlValue(content, 'title')
         const type = this.extractXmlValue(content, 'type')
@@ -772,12 +787,15 @@ class ExportService {
     }
     if (localType === 48) {
       const normalized = this.normalizeAppMessageContent(safeContent)
-      const location =
-        this.extractXmlValue(normalized, 'label') ||
-        this.extractXmlValue(normalized, 'poiname') ||
-        this.extractXmlValue(normalized, 'poiName') ||
-        this.extractXmlValue(normalized, 'name')
-      return location ? `[定位]${location}` : '[定位]'
+      const locPoiname = this.extractXmlAttribute(normalized, 'location', 'poiname') || this.extractXmlValue(normalized, 'poiname') || this.extractXmlValue(normalized, 'poiName')
+      const locLabel = this.extractXmlAttribute(normalized, 'location', 'label') || this.extractXmlValue(normalized, 'label')
+      const locLat = this.extractXmlAttribute(normalized, 'location', 'x') || this.extractXmlAttribute(normalized, 'location', 'latitude')
+      const locLng = this.extractXmlAttribute(normalized, 'location', 'y') || this.extractXmlAttribute(normalized, 'location', 'longitude')
+      const locParts: string[] = []
+      if (locPoiname) locParts.push(locPoiname)
+      if (locLabel && locLabel !== locPoiname) locParts.push(locLabel)
+      if (locLat && locLng) locParts.push(`(${locLat},${locLng})`)
+      return locParts.length > 0 ? `[位置] ${locParts.join(' ')}` : '[位置]'
     }
     if (localType === 50) {
       return this.parseVoipMessage(safeContent)
@@ -975,6 +993,12 @@ class ExportService {
     return ''
   }
 
+  private extractXmlAttribute(xml: string, tagName: string, attrName: string): string {
+    const tagRegex = new RegExp(`<${tagName}\\s+[^>]*${attrName}\\s*=\\s*"([^"]*)"`, 'i')
+    const match = tagRegex.exec(xml)
+    return match ? match[1] : ''
+  }
+
   private cleanSystemMessage(content: string): string {
     if (!content) return '[系统消息]'
 
@@ -1467,6 +1491,7 @@ class ExportService {
       })
 
       if (!result.success || !result.localPath) {
+        console.log(`[Export] 图片解密失败 (localId=${msg.localId}): imageMd5=${imageMd5}, imageDatName=${imageDatName}, error=${result.error || '未知'}`)
         // 尝试获取缩略图
         const thumbResult = await imageDecryptService.resolveCachedImage({
           sessionId,
@@ -1474,8 +1499,10 @@ class ExportService {
           imageDatName
         })
         if (!thumbResult.success || !thumbResult.localPath) {
+          console.log(`[Export] 缩略图也获取失败 (localId=${msg.localId}): error=${thumbResult.error || '未知'} → 将显示 [图片] 占位符`)
           return null
         }
+        console.log(`[Export] 使用缩略图替代 (localId=${msg.localId}): ${thumbResult.localPath}`)
         result.localPath = thumbResult.localPath
       }
 
@@ -1503,7 +1530,10 @@ class ExportService {
       }
 
       // 复制文件
-      if (!fs.existsSync(sourcePath)) return null
+      if (!fs.existsSync(sourcePath)) {
+        console.log(`[Export] 源图片文件不存在 (localId=${msg.localId}): ${sourcePath} → 将显示 [图片] 占位符`)
+        return null
+      }
       const ext = path.extname(sourcePath) || '.jpg'
       const fileName = `${messageId}_${imageKey}${ext}`
       const destPath = path.join(imagesDir, fileName)
@@ -1517,6 +1547,7 @@ class ExportService {
         kind: 'image'
       }
     } catch (e) {
+      console.error(`[Export] 导出图片异常 (localId=${msg.localId}):`, e, `→ 将显示 [图片] 占位符`)
       return null
     }
   }
@@ -1785,7 +1816,14 @@ class ExportService {
             fileStream.close()
             resolve(true)
           })
-          fileStream.on('error', () => {
+          fileStream.on('error', (err) => {
+            // 确保在错误情况下销毁流，释放文件句柄
+            fileStream.destroy()
+            resolve(false)
+          })
+          response.on('error', (err) => {
+            // 确保在响应错误时也关闭文件句柄
+            fileStream.destroy()
             resolve(false)
           })
         })
@@ -1812,22 +1850,43 @@ class ExportService {
     let firstTime: number | null = null
     let lastTime: number | null = null
 
+    // 修复时间范围：0 表示不限制，而不是时间戳 0
+    const beginTime = dateRange?.start || 0
+    const endTime = dateRange?.end && dateRange.end > 0 ? dateRange.end : 0
+    
+    console.log(`[Export] 收集消息: sessionId=${sessionId}, 时间范围: ${beginTime} ~ ${endTime || '无限制'}`)
+
     const cursor = await wcdbService.openMessageCursor(
       sessionId,
       500,
       true,
-      dateRange?.start || 0,
-      dateRange?.end || 0
+      beginTime,
+      endTime
     )
     if (!cursor.success || !cursor.cursor) {
+      console.error(`[Export] 打开游标失败: ${cursor.error || '未知错误'}`)
       return { rows, memberSet, firstTime, lastTime }
     }
 
     try {
       let hasMore = true
+      let batchCount = 0
       while (hasMore) {
         const batch = await wcdbService.fetchMessageBatch(cursor.cursor)
-        if (!batch.success || !batch.rows) break
+        batchCount++
+        
+        if (!batch.success) {
+          console.error(`[Export] 获取批次 ${batchCount} 失败: ${batch.error}`)
+          break
+        }
+        
+        if (!batch.rows) {
+          console.warn(`[Export] 批次 ${batchCount} 无数据`)
+          break
+        }
+        
+        console.log(`[Export] 批次 ${batchCount}: 收到 ${batch.rows.length} 条消息`)
+        
         for (const row of batch.rows) {
           const createTime = parseInt(row.create_time || '0', 10)
           if (dateRange) {
@@ -1918,8 +1977,17 @@ class ExportService {
         }
         hasMore = batch.hasMore === true
       }
+      
+      console.log(`[Export] 收集完成: 共 ${rows.length} 条消息, ${batchCount} 个批次`)
+    } catch (err) {
+      console.error(`[Export] 收集消息异常:`, err)
     } finally {
-      await wcdbService.closeMessageCursor(cursor.cursor)
+      try {
+        await wcdbService.closeMessageCursor(cursor.cursor)
+        console.log(`[Export] 游标已关闭`)
+      } catch (err) {
+        console.error(`[Export] 关闭游标失败:`, err)
+      }
     }
 
     if (senderSet.size > 0) {
@@ -2884,7 +2952,7 @@ class ExportService {
           options.displayNamePreference || 'remark'
         )
 
-        allMessages.push({
+        const msgObj: any = {
           localId: allMessages.length + 1,
           createTime: msg.createTime,
           formattedTime: this.formatTimestamp(msg.createTime),
@@ -2896,7 +2964,17 @@ class ExportService {
           senderDisplayName,
           source,
           senderAvatarKey: msg.senderUsername
-        })
+        }
+
+        // 位置消息：附加结构化位置字段
+        if (msg.localType === 48) {
+          if (msg.locationLat != null) msgObj.locationLat = msg.locationLat
+          if (msg.locationLng != null) msgObj.locationLng = msg.locationLng
+          if (msg.locationPoiname) msgObj.locationPoiname = msg.locationPoiname
+          if (msg.locationLabel) msgObj.locationLabel = msg.locationLabel
+        }
+
+        allMessages.push(msgObj)
       }
 
       allMessages.sort((a, b) => a.createTime - b.createTime)
@@ -4562,6 +4640,12 @@ class ExportService {
 </html>`);
 
       return new Promise((resolve, reject) => {
+        stream.on('error', (err) => {
+          // 确保在流错误时销毁流，释放文件句柄
+          stream.destroy()
+          reject(err)
+        })
+        
         stream.end(() => {
           onProgress?.({
             current: 100,

electron/services/httpService.ts

@@ -10,6 +10,7 @@ import { chatService, Message } from './chatService'
 import { wcdbService } from './wcdbService'
 import { ConfigService } from './config'
 import { videoService } from './videoService'
+import { imageDecryptService } from './imageDecryptService'
 
 // ChatLab 格式定义
 interface ChatLabHeader {
@@ -69,6 +70,7 @@ interface ApiExportedMedia {
   kind: MediaKind
   fileName: string
   fullPath: string
+  relativePath: string
 }
 
 // ChatLab 消息类型映射
@@ -100,6 +102,7 @@ class HttpService {
   private port: number = 5031
   private running: boolean = false
   private connections: Set<import('net').Socket> = new Set()
+  private connectionMutex: boolean = false
 
   constructor() {
     this.configService = ConfigService.getInstance()
@@ -120,9 +123,20 @@ class HttpService {
 
       // 跟踪所有连接，以便关闭时能强制断开
       this.server.on('connection', (socket) => {
-        this.connections.add(socket)
+        // 使用互斥锁防止并发修改
+        if (!this.connectionMutex) {
+          this.connectionMutex = true
+          this.connections.add(socket)
+          this.connectionMutex = false
+        }
+        
         socket.on('close', () => {
-          this.connections.delete(socket)
+          // 使用互斥锁防止并发修改
+          if (!this.connectionMutex) {
+            this.connectionMutex = true
+            this.connections.delete(socket)
+            this.connectionMutex = false
+          }
         })
       })
 
@@ -150,11 +164,20 @@ class HttpService {
   async stop(): Promise<void> {
     return new Promise((resolve) => {
       if (this.server) {
-        // 强制关闭所有活动连接
-        for (const socket of this.connections) {
-          socket.destroy()
-        }
+        // 使用互斥锁保护连接集合操作
+        this.connectionMutex = true
+        const socketsToClose = Array.from(this.connections)
         this.connections.clear()
+        this.connectionMutex = false
+        
+        // 强制关闭所有活动连接
+        for (const socket of socketsToClose) {
+          try {
+            socket.destroy()
+          } catch (err) {
+            console.error('[HttpService] Error destroying socket:', err)
+          }
+        }
 
         this.server.close(() => {
           this.running = false
@@ -215,6 +238,8 @@ class HttpService {
         await this.handleSessions(url, res)
       } else if (pathname === '/api/v1/contacts') {
         await this.handleContacts(url, res)
+      } else if (pathname.startsWith('/api/v1/media/')) {
+        this.handleMediaRequest(pathname, res)
       } else {
         this.sendError(res, 404, 'Not Found')
       }
@@ -224,6 +249,40 @@ class HttpService {
     }
   }
 
+  private handleMediaRequest(pathname: string, res: http.ServerResponse): void {
+    const mediaBasePath = this.getApiMediaExportPath()
+    const relativePath = pathname.replace('/api/v1/media/', '')
+    const fullPath = path.join(mediaBasePath, relativePath)
+
+    if (!fs.existsSync(fullPath)) {
+      this.sendError(res, 404, 'Media not found')
+      return
+    }
+
+    const ext = path.extname(fullPath).toLowerCase()
+    const mimeTypes: Record<string, string> = {
+      '.png': 'image/png',
+      '.jpg': 'image/jpeg',
+      '.jpeg': 'image/jpeg',
+      '.gif': 'image/gif',
+      '.webp': 'image/webp',
+      '.wav': 'audio/wav',
+      '.mp3': 'audio/mpeg',
+      '.mp4': 'video/mp4'
+    }
+    const contentType = mimeTypes[ext] || 'application/octet-stream'
+
+    try {
+      const fileBuffer = fs.readFileSync(fullPath)
+      res.setHeader('Content-Type', contentType)
+      res.setHeader('Content-Length', fileBuffer.length)
+      res.writeHead(200)
+      res.end(fileBuffer)
+    } catch (e) {
+      this.sendError(res, 500, 'Failed to read media file')
+    }
+  }
+
   /**
    * 批量获取消息（循环游标直到满足 limit）
    * 绕过 chatService 的单 batch 限制，直接操作 wcdbService 游标
@@ -359,7 +418,7 @@ class HttpService {
     const queryOffset = keyword ? 0 : offset
     const queryLimit = keyword ? 10000 : limit
 
-    const result = await this.fetchMessagesBatch(talker, queryOffset, queryLimit, startTime, endTime, true)
+    const result = await this.fetchMessagesBatch(talker, queryOffset, queryLimit, startTime, endTime, false)
     if (!result.success || !result.messages) {
       this.sendError(res, 500, result.error || 'Failed to get messages')
       return
@@ -555,19 +614,44 @@ class HttpService {
   ): Promise<ApiExportedMedia | null> {
     try {
       if (msg.localType === 3 && options.exportImages) {
-        const result = await chatService.getImageData(talker, String(msg.localId))
-        if (result.success && result.data) {
-          const imageBuffer = Buffer.from(result.data, 'base64')
-          const ext = this.detectImageExt(imageBuffer)
-          const fileBase = this.sanitizeFileName(msg.imageMd5 || msg.imageDatName || `image_${msg.localId}`, `image_${msg.localId}`)
-          const fileName = `${fileBase}${ext}`
-          const targetDir = path.join(sessionDir, 'images')
-          const fullPath = path.join(targetDir, fileName)
-          this.ensureDir(targetDir)
-          if (!fs.existsSync(fullPath)) {
-            fs.writeFileSync(fullPath, imageBuffer)
+        const result = await imageDecryptService.decryptImage({
+          sessionId: talker,
+          imageMd5: msg.imageMd5,
+          imageDatName: msg.imageDatName,
+          force: true
+        })
+        if (result.success && result.localPath) {
+          let imagePath = result.localPath
+          if (imagePath.startsWith('data:')) {
+            const base64Match = imagePath.match(/^data:[^;]+;base64,(.+)$/)
+            if (base64Match) {
+              const imageBuffer = Buffer.from(base64Match[1], 'base64')
+              const ext = this.detectImageExt(imageBuffer)
+              const fileBase = this.sanitizeFileName(msg.imageMd5 || msg.imageDatName || `image_${msg.localId}`, `image_${msg.localId}`)
+              const fileName = `${fileBase}${ext}`
+              const targetDir = path.join(sessionDir, 'images')
+              const fullPath = path.join(targetDir, fileName)
+              this.ensureDir(targetDir)
+              if (!fs.existsSync(fullPath)) {
+                fs.writeFileSync(fullPath, imageBuffer)
+              }
+              const relativePath = `${this.sanitizeFileName(talker, 'session')}/images/${fileName}`
+              return { kind: 'image', fileName, fullPath, relativePath }
+            }
+          } else if (fs.existsSync(imagePath)) {
+            const imageBuffer = fs.readFileSync(imagePath)
+            const ext = this.detectImageExt(imageBuffer)
+            const fileBase = this.sanitizeFileName(msg.imageMd5 || msg.imageDatName || `image_${msg.localId}`, `image_${msg.localId}`)
+            const fileName = `${fileBase}${ext}`
+            const targetDir = path.join(sessionDir, 'images')
+            const fullPath = path.join(targetDir, fileName)
+            this.ensureDir(targetDir)
+            if (!fs.existsSync(fullPath)) {
+              fs.copyFileSync(imagePath, fullPath)
+            }
+            const relativePath = `${this.sanitizeFileName(talker, 'session')}/images/${fileName}`
+            return { kind: 'image', fileName, fullPath, relativePath }
           }
-          return { kind: 'image', fileName, fullPath }
         }
       }
 
@@ -586,7 +670,8 @@ class HttpService {
           if (!fs.existsSync(fullPath)) {
             fs.writeFileSync(fullPath, Buffer.from(result.data, 'base64'))
           }
-          return { kind: 'voice', fileName, fullPath }
+          const relativePath = `${this.sanitizeFileName(talker, 'session')}/voices/${fileName}`
+          return { kind: 'voice', fileName, fullPath, relativePath }
         }
       }
 
@@ -601,7 +686,8 @@ class HttpService {
           if (!fs.existsSync(fullPath)) {
             fs.copyFileSync(info.videoUrl, fullPath)
           }
-          return { kind: 'video', fileName, fullPath }
+          const relativePath = `${this.sanitizeFileName(talker, 'session')}/videos/${fileName}`
+          return { kind: 'video', fileName, fullPath, relativePath }
         }
       }
 
@@ -616,7 +702,8 @@ class HttpService {
           if (!fs.existsSync(fullPath)) {
             fs.copyFileSync(result.localPath, fullPath)
           }
-          return { kind: 'emoji', fileName, fullPath }
+          const relativePath = `${this.sanitizeFileName(talker, 'session')}/emojis/${fileName}`
+          return { kind: 'emoji', fileName, fullPath, relativePath }
         }
       }
     } catch (e) {
@@ -640,7 +727,8 @@ class HttpService {
       parsedContent: msg.parsedContent,
       mediaType: media?.kind,
       mediaFileName: media?.fileName,
-      mediaPath: media?.fullPath
+      mediaUrl: media ? `http://127.0.0.1:${this.port}/api/v1/media/${media.relativePath}` : undefined,
+      mediaLocalPath: media?.fullPath
     }
   }
 
@@ -763,7 +851,7 @@ class HttpService {
         type: this.mapMessageType(msg.localType, msg),
         content: this.getMessageContent(msg),
         platformMessageId: msg.serverId ? String(msg.serverId) : undefined,
-        mediaPath: mediaMap.get(msg.localId)?.fullPath
+        mediaPath: mediaMap.get(msg.localId) ? `http://127.0.0.1:${this.port}/api/v1/media/${mediaMap.get(msg.localId)!.relativePath}` : undefined
       }
     })
 

electron/services/imageDecryptService.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow } from 'electron'
+import { app, BrowserWindow } from 'electron'
 import { basename, dirname, extname, join } from 'path'
 import { pathToFileURL } from 'url'
 import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, appendFileSync } from 'fs'
@@ -11,16 +11,7 @@ import { wcdbService } from './wcdbService'
 // 获取 ffmpeg-static 的路径
 function getStaticFfmpegPath(): string | null {
   try {
-    // 优先处理打包后的路径
-    if (app.isPackaged) {
-      const resourcesPath = process.resourcesPath
-      const packedPath = join(resourcesPath, 'app.asar.unpacked', 'node_modules', 'ffmpeg-static', 'ffmpeg.exe')
-      if (existsSync(packedPath)) {
-        return packedPath
-      }
-    }
-
-    // 方法1: 直接 require ffmpeg-static（开发环境）
+    // 方法1: 直接 require ffmpeg-static
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const ffmpegStatic = require('ffmpeg-static')
 
@@ -28,12 +19,21 @@ function getStaticFfmpegPath(): string | null {
       return ffmpegStatic
     }
 
-    // 方法2: 手动构建路径（开发环境备用）
+    // 方法2: 手动构建路径（开发环境）
     const devPath = join(process.cwd(), 'node_modules', 'ffmpeg-static', 'ffmpeg.exe')
     if (existsSync(devPath)) {
       return devPath
     }
 
+    // 方法3: 打包后的路径
+    if (app.isPackaged) {
+      const resourcesPath = process.resourcesPath
+      const packedPath = join(resourcesPath, 'app.asar.unpacked', 'node_modules', 'ffmpeg-static', 'ffmpeg.exe')
+      if (existsSync(packedPath)) {
+        return packedPath
+      }
+    }
+
     return null
   } catch {
     return null
@@ -240,7 +240,9 @@ export class ImageDecryptService {
         }
       }
 
-      const xorKeyRaw = this.configService.get('imageXorKey') as unknown
+      // 优先使用当前 wxid 对应的密钥，找不到则回退到全局配置
+      const imageKeys = this.configService.getImageKeysForCurrentWxid()
+      const xorKeyRaw = imageKeys.xorKey
       // 支持十六进制格式（如 0x53）和十进制格式
       let xorKey: number
       if (typeof xorKeyRaw === 'number') {
@@ -257,7 +259,7 @@ export class ImageDecryptService {
         return { success: false, error: '未配置图片解密密钥' }
       }
 
-      const aesKeyRaw = this.configService.get('imageAesKey')
+      const aesKeyRaw = imageKeys.aesKey
       const aesKey = this.resolveAesKey(aesKeyRaw)
 
       this.logInfo('开始解密DAT文件', { datPath, xorKey, hasAesKey: !!aesKey })
@@ -280,14 +282,14 @@ export class ImageDecryptService {
       await writeFile(outputPath, decrypted)
       this.logInfo('解密成功', { outputPath, size: decrypted.length })
 
-      // 对于 hevc 格式，返回错误提示
       if (finalExt === '.hevc') {
         return {
           success: false,
-          error: '此图片为微信新格式(wxgf)，需要安装 ffmpeg 才能显示',
+          error: '此图片为微信新格式(wxgf)，ffmpeg 转换失败，请检查日志',
           isThumb: this.isThumbnailPath(datPath)
         }
       }
+
       const isThumb = this.isThumbnailPath(datPath)
       this.cacheResolvedPaths(cacheKey, payload.imageMd5, payload.imageDatName, outputPath)
       if (!isThumb) {
@@ -395,14 +397,35 @@ export class ImageDecryptService {
     const allowThumbnail = options?.allowThumbnail ?? true
     const skipResolvedCache = options?.skipResolvedCache ?? false
     this.logInfo('[ImageDecrypt] resolveDatPath', {
-      accountDir,
       imageMd5,
       imageDatName,
-      sessionId,
       allowThumbnail,
       skipResolvedCache
     })
 
+    if (!skipResolvedCache) {
+      if (imageMd5) {
+        const cached = this.resolvedCache.get(imageMd5)
+        if (cached && existsSync(cached)) return cached
+      }
+      if (imageDatName) {
+        const cached = this.resolvedCache.get(imageDatName)
+        if (cached && existsSync(cached)) return cached
+      }
+    }
+
+    // 1. 通过 MD5 快速定位 (MsgAttach 目录)
+    if (imageMd5) {
+      const res = await this.fastProbabilisticSearch(accountDir, imageMd5, allowThumbnail)
+      if (res) return res
+    }
+
+    // 2. 如果 imageDatName 看起来像 MD5，也尝试快速定位
+    if (!imageMd5 && imageDatName && this.looksLikeMd5(imageDatName)) {
+      const res = await this.fastProbabilisticSearch(accountDir, imageDatName, allowThumbnail)
+      if (res) return res
+    }
+
     // 优先通过 hardlink.db 查询
     if (imageMd5) {
       this.logInfo('[ImageDecrypt] hardlink lookup (md5)', { imageMd5, sessionId })
@@ -583,9 +606,7 @@ export class ImageDecryptService {
     }).catch(() => { })
   }
 
-  private looksLikeMd5(value: string): boolean {
-    return /^[a-fA-F0-9]{16,32}$/.test(value)
-  }
+
 
   private resolveHardlinkDbPath(accountDir: string): string | null {
     const wxid = this.configService.get('myWxid')
@@ -801,7 +822,7 @@ export class ImageDecryptService {
    * 包含：1. 微信旧版结构 filename.substr(0, 2)/...
    *       2. 微信新版结构 msg/attach/{hash}/{YYYY-MM}/Img/filename
    */
-  private async fastProbabilisticSearch(root: string, datName: string): Promise<string | null> {
+  private async fastProbabilisticSearch(root: string, datName: string, _allowThumbnail?: boolean): Promise<string | null> {
     const { promises: fs } = require('fs')
     const { join } = require('path')
 
@@ -837,7 +858,7 @@ export class ImageDecryptService {
         } catch { }
       }
 
-      // --- 策略 B: 新版 Session 哈希路径猜测 ---
+      // --- 绛栫暐 B: 鏂扮増 Session 鍝堝笇璺緞鐚滄祴 ---
       try {
         const entries = await fs.readdir(root, { withFileTypes: true })
         const sessionDirs = entries
@@ -890,7 +911,7 @@ export class ImageDecryptService {
 
   /**
    * 在同一目录下查找高清图变体
-   * 缩略图: xxx_t.dat -> 高清图: xxx_h.dat 或 xxx.dat
+   * 缩略图 xxx_t.dat -> 高清图 xxx_h.dat 或 xxx.dat
    */
   private findHdVariantInSameDir(thumbPath: string): string | null {
     try {
@@ -972,55 +993,6 @@ export class ImageDecryptService {
     })
   }
 
-  private matchesDatName(fileName: string, datName: string): boolean {
-    const lower = fileName.toLowerCase()
-    const base = lower.endsWith('.dat') ? lower.slice(0, -4) : lower
-    const normalizedBase = this.normalizeDatBase(base)
-    const normalizedTarget = this.normalizeDatBase(datName.toLowerCase())
-    if (normalizedBase === normalizedTarget) return true
-    const pattern = new RegExp(`^${datName}(?:[._][a-z])?\\.dat$`, 'i')
-    if (pattern.test(lower)) return true
-    return lower.endsWith('.dat') && lower.includes(datName)
-  }
-
-  private scoreDatName(fileName: string): number {
-    if (fileName.includes('.t.dat') || fileName.includes('_t.dat')) return 1
-    if (fileName.includes('.c.dat') || fileName.includes('_c.dat')) return 1
-    return 2
-  }
-
-  private isThumbnailDat(fileName: string): boolean {
-    return fileName.includes('.t.dat') || fileName.includes('_t.dat')
-  }
-
-  private hasXVariant(baseLower: string): boolean {
-    return /[._][a-z]$/.test(baseLower)
-  }
-
-  private isThumbnailPath(filePath: string): boolean {
-    const lower = basename(filePath).toLowerCase()
-    if (this.isThumbnailDat(lower)) return true
-    const ext = extname(lower)
-    const base = ext ? lower.slice(0, -ext.length) : lower
-    // 支持新命名 _thumb 和旧命名 _t
-    return base.endsWith('_t') || base.endsWith('_thumb')
-  }
-
-  private isHdPath(filePath: string): boolean {
-    const lower = basename(filePath).toLowerCase()
-    const ext = extname(lower)
-    const base = ext ? lower.slice(0, -ext.length) : lower
-    return base.endsWith('_hd') || base.endsWith('_h')
-  }
-
-  private hasImageVariantSuffix(baseLower: string): boolean {
-    return /[._][a-z]$/.test(baseLower)
-  }
-
-  private isLikelyImageDatBase(baseLower: string): boolean {
-    return this.hasImageVariantSuffix(baseLower) || this.looksLikeMd5(baseLower)
-  }
-
   private normalizeDatBase(name: string): string {
     let base = name.toLowerCase()
     if (base.endsWith('.dat') || base.endsWith('.jpg')) {
@@ -1032,27 +1004,16 @@ export class ImageDecryptService {
     return base
   }
 
-  private sanitizeDirName(name: string): string {
-    const trimmed = name.trim()
-    if (!trimmed) return 'unknown'
-    return trimmed.replace(/[<>:"/\\|?*]/g, '_')
+  private hasImageVariantSuffix(baseLower: string): boolean {
+    return /[._][a-z]$/.test(baseLower)
   }
 
-  private resolveTimeDir(datPath: string): string {
-    const parts = datPath.split(/[\\/]+/)
-    for (const part of parts) {
-      if (/^\d{4}-\d{2}$/.test(part)) return part
-    }
-    try {
-      const stat = statSync(datPath)
-      const year = stat.mtime.getFullYear()
-      const month = String(stat.mtime.getMonth() + 1).padStart(2, '0')
-      return `${year}-${month}`
-    } catch {
-      return 'unknown-time'
-    }
+  private isLikelyImageDatBase(baseLower: string): boolean {
+    return this.hasImageVariantSuffix(baseLower) || this.looksLikeMd5(baseLower)
   }
 
+
+
   private findCachedOutput(cacheKey: string, preferHd: boolean = false, sessionId?: string): string | null {
     const allRoots = this.getAllCacheRoots()
     const normalizedKey = this.normalizeDatBase(cacheKey.toLowerCase())
@@ -1287,14 +1248,14 @@ export class ImageDecryptService {
   private async ensureCacheIndexed(): Promise<void> {
     if (this.cacheIndexed) return
     if (this.cacheIndexing) return this.cacheIndexing
-    this.cacheIndexing = new Promise((resolve) => {
+    this.cacheIndexing = (async () => {
       // 扫描所有可能的缓存根目录
       const allRoots = this.getAllCacheRoots()
       this.logInfo('开始索引缓存', { roots: allRoots.length })
 
       for (const root of allRoots) {
         try {
-          this.indexCacheDir(root, 3, 0) // 增加深度到3，支持 sessionId/YYYY-MM 结构
+          this.indexCacheDir(root, 3, 0) // 增加深度到 3，支持 sessionId/YYYY-MM 结构
         } catch (e) {
           this.logError('索引目录失败', e, { root })
         }
@@ -1303,8 +1264,7 @@ export class ImageDecryptService {
       this.logInfo('缓存索引完成', { entries: this.resolvedCache.size })
       this.cacheIndexed = true
       this.cacheIndexing = null
-      resolve()
-    })
+    })()
     return this.cacheIndexing
   }
 
@@ -1507,14 +1467,14 @@ export class ImageDecryptService {
 
   private bytesToInt32(bytes: Buffer): number {
     if (bytes.length !== 4) {
-      throw new Error('需要4个字节')
+      throw new Error('需要 4 个字节')
     }
     return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24)
   }
 
   asciiKey16(keyString: string): Buffer {
     if (keyString.length < 16) {
-      throw new Error('AES密钥至少需要16个字符')
+      throw new Error('AES密钥至少需要 16 个字符')
     }
     return Buffer.from(keyString, 'ascii').subarray(0, 16)
   }
@@ -1706,25 +1666,28 @@ export class ImageDecryptService {
 
     // 提取 HEVC NALU 裸流
     const hevcData = this.extractHevcNalu(buffer)
-    if (!hevcData || hevcData.length < 100) {
-      return { data: buffer, isWxgf: true }
-    }
+    // 优先用提取的 NALU 裸流，提取失败则跳过 wxgf 头部直接用原始数据
+    const feedData = (hevcData && hevcData.length >= 100) ? hevcData : buffer.subarray(4)
+    this.logInfo('unwrapWxgf: 准备 ffmpeg 转换', {
+      naluExtracted: !!(hevcData && hevcData.length >= 100),
+      feedSize: feedData.length
+    })
 
     // 尝试用 ffmpeg 转换
     try {
-      const jpgData = await this.convertHevcToJpg(hevcData)
+      const jpgData = await this.convertHevcToJpg(feedData)
       if (jpgData && jpgData.length > 0) {
         return { data: jpgData, isWxgf: false }
       }
-    } catch {
-      // ffmpeg 转换失败
+    } catch (e) {
+      this.logError('unwrapWxgf: ffmpeg 转换失败', e)
     }
 
-    return { data: hevcData, isWxgf: true }
+    return { data: feedData, isWxgf: true }
   }
 
   /**
-   * 从 wxgf 数据中提取 HEVC NALU 裸流
+   * 浠?wxgf 鏁版嵁涓彁鍙?HEVC NALU 瑁告祦
    */
   private extractHevcNalu(buffer: Buffer): Buffer | null {
     const nalUnits: Buffer[] = []
@@ -1787,53 +1750,133 @@ export class ImageDecryptService {
   /**
    * 使用 ffmpeg 将 HEVC 裸流转换为 JPG
    */
-  private convertHevcToJpg(hevcData: Buffer): Promise<Buffer | null> {
+  private async convertHevcToJpg(hevcData: Buffer): Promise<Buffer | null> {
     const ffmpeg = this.getFfmpegPath()
     this.logInfo('ffmpeg 转换开始', { ffmpegPath: ffmpeg, hevcSize: hevcData.length })
 
+    const tmpDir = join(app.getPath('temp'), 'weflow_hevc')
+    if (!existsSync(tmpDir)) mkdirSync(tmpDir, { recursive: true })
+    const ts = Date.now()
+    const tmpInput = join(tmpDir, `hevc_${ts}.hevc`)
+    const tmpOutput = join(tmpDir, `hevc_${ts}.jpg`)
+
+    try {
+      await writeFile(tmpInput, hevcData)
+
+      // 依次尝试: 1) -f hevc 裸流  2) 不指定格式让 ffmpeg 自动检测
+      const attempts: { label: string; inputArgs: string[] }[] = [
+        { label: 'hevc raw', inputArgs: ['-f', 'hevc', '-i', tmpInput] },
+        { label: 'auto detect', inputArgs: ['-i', tmpInput] },
+      ]
+
+      for (const attempt of attempts) {
+        // 清理上一轮的输出
+        try { if (existsSync(tmpOutput)) require('fs').unlinkSync(tmpOutput) } catch {}
+
+        const result = await this.runFfmpegConvert(ffmpeg, attempt.inputArgs, tmpOutput, attempt.label)
+        if (result) return result
+      }
+
+      return null
+    } catch (e) {
+      this.logError('ffmpeg 转换异常', e)
+      return null
+    } finally {
+      try { if (existsSync(tmpInput)) require('fs').unlinkSync(tmpInput) } catch {}
+      try { if (existsSync(tmpOutput)) require('fs').unlinkSync(tmpOutput) } catch {}
+    }
+  }
+
+  private runFfmpegConvert(ffmpeg: string, inputArgs: string[], tmpOutput: string, label: string): Promise<Buffer | null> {
     return new Promise((resolve) => {
       const { spawn } = require('child_process')
-      const chunks: Buffer[] = []
       const errChunks: Buffer[] = []
 
-      const proc = spawn(ffmpeg, [
-        '-hide_banner',
-        '-loglevel', 'error',
-        '-f', 'hevc',
-        '-i', 'pipe:0',
-        '-vframes', '1',
-        '-q:v', '3',
-        '-f', 'mjpeg',
-        'pipe:1'
-      ], {
-        stdio: ['pipe', 'pipe', 'pipe'],
+      const args = [
+        '-hide_banner', '-loglevel', 'error',
+        ...inputArgs,
+        '-vframes', '1', '-q:v', '2', '-f', 'image2', tmpOutput
+      ]
+      this.logInfo(`ffmpeg 尝试 [${label}]`, { args: args.join(' ') })
+
+      const proc = spawn(ffmpeg, args, {
+        stdio: ['ignore', 'ignore', 'pipe'],
         windowsHide: true
       })
 
-      proc.stdout.on('data', (chunk: Buffer) => chunks.push(chunk))
       proc.stderr.on('data', (chunk: Buffer) => errChunks.push(chunk))
 
-      proc.on('close', (code: number) => {
-        if (code === 0 && chunks.length > 0) {
-          this.logInfo('ffmpeg 转换成功', { outputSize: Buffer.concat(chunks).length })
-          resolve(Buffer.concat(chunks))
-        } else {
-          const errMsg = Buffer.concat(errChunks).toString()
-          this.logInfo('ffmpeg 转换失败', { code, error: errMsg })
-          resolve(null)
-        }
-      })
+      const timer = setTimeout(() => {
+        proc.kill('SIGKILL')
+        this.logError(`ffmpeg [${label}] 超时(15s)`)
+        resolve(null)
+      }, 15000)
 
-      proc.on('error', (err: Error) => {
-        this.logInfo('ffmpeg 进程错误', { error: err.message })
+      proc.on('close', (code: number) => {
+        clearTimeout(timer)
+        if (code === 0 && existsSync(tmpOutput)) {
+          try {
+            const jpgBuf = readFileSync(tmpOutput)
+            if (jpgBuf.length > 0) {
+              this.logInfo(`ffmpeg [${label}] 成功`, { outputSize: jpgBuf.length })
+              resolve(jpgBuf)
+              return
+            }
+          } catch (e) {
+            this.logError(`ffmpeg [${label}] 读取输出失败`, e)
+          }
+        }
+        const errMsg = Buffer.concat(errChunks).toString().trim()
+        this.logInfo(`ffmpeg [${label}] 失败`, { code, error: errMsg })
         resolve(null)
       })
 
-      proc.stdin.write(hevcData)
-      proc.stdin.end()
+      proc.on('error', (err: Error) => {
+        clearTimeout(timer)
+        this.logError(`ffmpeg [${label}] 进程错误`, err)
+        resolve(null)
+      })
     })
   }
 
+  private looksLikeMd5(s: string): boolean {
+    return /^[a-f0-9]{32}$/i.test(s)
+  }
+
+  private isThumbnailDat(name: string): boolean {
+    const lower = name.toLowerCase()
+    return lower.includes('_t.dat') || lower.includes('.t.dat') || lower.includes('_thumb.dat')
+  }
+
+  private hasXVariant(base: string): boolean {
+    const lower = base.toLowerCase()
+    return lower.endsWith('_h') || lower.endsWith('_hd') || lower.endsWith('_thumb') || lower.endsWith('_t')
+  }
+
+  private isHdPath(p: string): boolean {
+    return p.toLowerCase().includes('_hd') || p.toLowerCase().includes('_h')
+  }
+
+  private isThumbnailPath(p: string): boolean {
+    const lower = p.toLowerCase()
+    return lower.includes('_thumb') || lower.includes('_t') || lower.includes('.t.')
+  }
+
+  private sanitizeDirName(s: string): string {
+    return s.replace(/[<>:"/\\|?*]/g, '_').trim() || 'unknown'
+  }
+
+  private resolveTimeDir(filePath: string): string {
+    try {
+      const stats = statSync(filePath)
+      const d = new Date(stats.mtime)
+      return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`
+    } catch {
+      const d = new Date()
+      return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`
+    }
+  }
+
   // 保留原有的解密到文件方法（用于兼容）
   async decryptToFile(inputPath: string, outputPath: string, xorKey: number, aesKey?: Buffer): Promise<void> {
     const version = this.getDatVersion(inputPath)
@@ -1846,7 +1889,7 @@ export class ImageDecryptService {
       decrypted = this.decryptDatV4(inputPath, xorKey, key)
     } else {
       if (!aesKey || aesKey.length !== 16) {
-        throw new Error('V4版本需要16字节AES密钥')
+        throw new Error('V4版本需要 16 字节 AES 密钥')
       }
       decrypted = this.decryptDatV4(inputPath, xorKey, aesKey)
     }

electron/services/keyService.ts

@@ -1,10 +1,10 @@
 import { app } from 'electron'
-import { join, dirname, basename } from 'path'
-import { existsSync, readdirSync, readFileSync, statSync, copyFileSync, mkdirSync } from 'fs'
+import { join, dirname } from 'path'
+import { existsSync, copyFileSync, mkdirSync } from 'fs'
 import { execFile, spawn } from 'child_process'
 import { promisify } from 'util'
-import crypto from 'crypto'
 import os from 'os'
+import crypto from 'crypto'
 
 const execFileAsync = promisify(execFile)
 
@@ -20,6 +20,7 @@ export class KeyService {
   private getStatusMessage: any = null
   private cleanupHook: any = null
   private getLastErrorMsg: any = null
+  private getImageKeyDll: any = null
 
   // Win32 APIs
   private kernel32: any = null
@@ -29,9 +30,6 @@ export class KeyService {
   // Kernel32
   private OpenProcess: any = null
   private CloseHandle: any = null
-  private VirtualQueryEx: any = null
-  private ReadProcessMemory: any = null
-  private MEMORY_BASIC_INFORMATION: any = null
   private TerminateProcess: any = null
   private QueryFullProcessImageNameW: any = null
 
@@ -62,50 +60,33 @@ export class KeyService {
 
   private getDllPath(): string {
     const isPackaged = typeof app !== 'undefined' && app ? app.isPackaged : process.env.NODE_ENV === 'production'
-
-    // 候选路径列表
     const candidates: string[] = []
 
-    // 1. 显式环境变量 (最高优先级)
     if (process.env.WX_KEY_DLL_PATH) {
       candidates.push(process.env.WX_KEY_DLL_PATH)
     }
 
     if (isPackaged) {
-      // 生产环境: 通常在 resources 目录下，但也可能直接在 resources 根目录
       candidates.push(join(process.resourcesPath, 'resources', 'wx_key.dll'))
       candidates.push(join(process.resourcesPath, 'wx_key.dll'))
     } else {
-      // 开发环境
       const cwd = process.cwd()
       candidates.push(join(cwd, 'resources', 'wx_key.dll'))
       candidates.push(join(app.getAppPath(), 'resources', 'wx_key.dll'))
     }
 
-    // 检查并返回第一个存在的路径
     for (const path of candidates) {
-      if (existsSync(path)) {
-        return path
-      }
+      if (existsSync(path)) return path
     }
 
-    // 如果都没找到，返回最可能的路径以便报错信息有参考
     return candidates[0]
   }
 
-  // 检查路径是否为 UNC 路径或网络路径
   private isNetworkPath(path: string): boolean {
-    // UNC 路径以 \\ 开头
-    if (path.startsWith('\\\\')) {
-      return true
-    }
-    // 检查是否为网络映射驱动器（简化检测：A: 表示驱动器）
-    // 注意：这是一个启发式检测，更准确的方式需要调用 GetDriveType Windows API
-    // 但对于大多数 VM 共享场景，UNC 路径检测已足够
+    if (path.startsWith('\\\\')) return true
     return false
   }
 
-  // 将 DLL 复制到本地临时目录
   private localizeNetworkDll(originalPath: string): string {
     try {
       const tempDir = join(os.tmpdir(), 'weflow_dll_cache')
@@ -113,20 +94,12 @@ export class KeyService {
         mkdirSync(tempDir, { recursive: true })
       }
       const localPath = join(tempDir, 'wx_key.dll')
-
-      // 检查是否已经有本地副本，如果有就使用它
-      if (existsSync(localPath)) {
-        
-        return localPath
-      }
-
+      if (existsSync(localPath)) return localPath
 
       copyFileSync(originalPath, localPath)
-      
       return localPath
     } catch (e) {
       console.error('DLL 本地化失败:', e)
-      // 如果本地化失败，返回原路径
       return originalPath
     }
   }
@@ -144,9 +117,7 @@ export class KeyService {
         return false
       }
 
-      // 检查是否为网络路径，如果是则本地化
       if (this.isNetworkPath(dllPath)) {
-        
         dllPath = this.localizeNetworkDll(dllPath)
       }
 
@@ -156,18 +127,13 @@ export class KeyService {
       this.getStatusMessage = this.lib.func('bool GetStatusMessage(_Out_ char *msgBuffer, int bufferSize, _Out_ int *outLevel)')
       this.cleanupHook = this.lib.func('bool CleanupHook()')
       this.getLastErrorMsg = this.lib.func('const char* GetLastErrorMsg()')
+      this.getImageKeyDll = this.lib.func('bool GetImageKey(_Out_ char *resultBuffer, int bufferSize)')
 
       this.initialized = true
       return true
     } catch (e) {
       const errorMsg = e instanceof Error ? e.message : String(e)
-      const errorStack = e instanceof Error ? e.stack : ''
-      console.error(`加载 wx_key.dll 失败`)
-      console.error(`  路径: ${dllPath}`)
-      console.error(`  错误: ${errorMsg}`)
-      if (errorStack) {
-        console.error(`  堆栈: ${errorStack}`)
-      }
+      console.error(`加载 wx_key.dll 失败\n  路径: ${dllPath}\n  错误: ${errorMsg}`)
       return false
     }
   }
@@ -181,25 +147,10 @@ export class KeyService {
     try {
       this.koffi = require('koffi')
       this.kernel32 = this.koffi.load('kernel32.dll')
-
-      const HANDLE = this.koffi.pointer('HANDLE', this.koffi.opaque())
-      this.MEMORY_BASIC_INFORMATION = this.koffi.struct('MEMORY_BASIC_INFORMATION', {
-        BaseAddress: 'uint64',
-        AllocationBase: 'uint64',
-        AllocationProtect: 'uint32',
-        RegionSize: 'uint64',
-        State: 'uint32',
-        Protect: 'uint32',
-        Type: 'uint32'
-      })
-
-      // Use explicit definitions to avoid parser issues
-      this.OpenProcess = this.kernel32.func('OpenProcess', 'HANDLE', ['uint32', 'bool', 'uint32'])
-      this.CloseHandle = this.kernel32.func('CloseHandle', 'bool', ['HANDLE'])
-      this.TerminateProcess = this.kernel32.func('TerminateProcess', 'bool', ['HANDLE', 'uint32'])
-      this.QueryFullProcessImageNameW = this.kernel32.func('QueryFullProcessImageNameW', 'bool', ['HANDLE', 'uint32', this.koffi.out('uint16*'), this.koffi.out('uint32*')])
-      this.VirtualQueryEx = this.kernel32.func('VirtualQueryEx', 'uint64', ['HANDLE', 'uint64', this.koffi.out(this.koffi.pointer(this.MEMORY_BASIC_INFORMATION)), 'uint64'])
-      this.ReadProcessMemory = this.kernel32.func('ReadProcessMemory', 'bool', ['HANDLE', 'uint64', 'void*', 'uint64', this.koffi.out(this.koffi.pointer('uint64'))])
+      this.OpenProcess = this.kernel32.func('OpenProcess', 'void*', ['uint32', 'bool', 'uint32'])
+      this.CloseHandle = this.kernel32.func('CloseHandle', 'bool', ['void*'])
+      this.TerminateProcess = this.kernel32.func('TerminateProcess', 'bool', ['void*', 'uint32'])
+      this.QueryFullProcessImageNameW = this.kernel32.func('QueryFullProcessImageNameW', 'bool', ['void*', 'uint32', this.koffi.out('uint16*'), this.koffi.out('uint32*')])
 
       return true
     } catch (e) {
@@ -219,15 +170,12 @@ export class KeyService {
       this.koffi = require('koffi')
       this.user32 = this.koffi.load('user32.dll')
 
-      // Callbacks
-      // Define the prototype and its pointer type
       const WNDENUMPROC = this.koffi.proto('bool __stdcall (void *hWnd, intptr_t lParam)')
       this.WNDENUMPROC_PTR = this.koffi.pointer(WNDENUMPROC)
 
       this.EnumWindows = this.user32.func('EnumWindows', 'bool', [this.WNDENUMPROC_PTR, 'intptr_t'])
       this.EnumChildWindows = this.user32.func('EnumChildWindows', 'bool', ['void*', this.WNDENUMPROC_PTR, 'intptr_t'])
       this.PostMessageW = this.user32.func('PostMessageW', 'bool', ['void*', 'uint32', 'uintptr_t', 'intptr_t'])
-
       this.GetWindowTextW = this.user32.func('GetWindowTextW', 'int', ['void*', this.koffi.out('uint16*'), 'int'])
       this.GetWindowTextLengthW = this.user32.func('GetWindowTextLengthW', 'int', ['void*'])
       this.GetClassNameW = this.user32.func('GetClassNameW', 'int', ['void*', this.koffi.out('uint16*'), 'int'])
@@ -247,8 +195,6 @@ export class KeyService {
       this.koffi = require('koffi')
       this.advapi32 = this.koffi.load('advapi32.dll')
 
-      // Types
-      // Use intptr_t for HKEY to match system architecture (64-bit safe)
       const HKEY = this.koffi.alias('HKEY', 'intptr_t')
       const HKEY_PTR = this.koffi.pointer(HKEY)
 
@@ -274,27 +220,19 @@ export class KeyService {
 
   // --- WeChat Process & Path Finding ---
 
-  // Helper to read simple registry string
   private readRegistryString(rootKey: number, subKey: string, valueName: string): string | null {
     if (!this.ensureAdvapi32()) return null
-
-    // Convert strings to UTF-16 buffers
     const subKeyBuf = Buffer.from(subKey + '\0', 'ucs2')
     const valueNameBuf = valueName ? Buffer.from(valueName + '\0', 'ucs2') : null
+    const phkResult = Buffer.alloc(8)
 
-    const phkResult = Buffer.alloc(8) // Pointer size (64-bit safe)
-
-    if (this.RegOpenKeyExW(rootKey, subKeyBuf, 0, this.KEY_READ, phkResult) !== this.ERROR_SUCCESS) {
-      return null
-    }
+    if (this.RegOpenKeyExW(rootKey, subKeyBuf, 0, this.KEY_READ, phkResult) !== this.ERROR_SUCCESS) return null
 
     const hKey = this.koffi.decode(phkResult, 'uintptr_t')
 
     try {
       const lpcbData = Buffer.alloc(4)
-      lpcbData.writeUInt32LE(0, 0) // First call to get size? No, RegQueryValueExW expects initialized size or null to get size.
-      // Usually we call it twice or just provide a big buffer.
-      // Let's call twice.
+      lpcbData.writeUInt32LE(0, 0)
 
       let ret = this.RegQueryValueExW(hKey, valueNameBuf, null, null, null, lpcbData)
       if (ret !== this.ERROR_SUCCESS) return null
@@ -306,7 +244,6 @@ export class KeyService {
       ret = this.RegQueryValueExW(hKey, valueNameBuf, null, null, dataBuf, lpcbData)
       if (ret !== this.ERROR_SUCCESS) return null
 
-      // Read UTF-16 string (remove null terminator)
       let str = dataBuf.toString('ucs2')
       if (str.endsWith('\0')) str = str.slice(0, -1)
       return str
@@ -317,7 +254,6 @@ export class KeyService {
 
   private async getProcessExecutablePath(pid: number): Promise<string | null> {
     if (!this.ensureKernel32()) return null
-    // 0x1000 = PROCESS_QUERY_LIMITED_INFORMATION
     const hProcess = this.OpenProcess(0x1000, false, pid)
     if (!hProcess) return null
 
@@ -341,33 +277,21 @@ export class KeyService {
   }
 
   private async findWeChatInstallPath(): Promise<string | null> {
-    // 0. 优先尝试获取正在运行的微信进程路径
     try {
       const pid = await this.findWeChatPid()
       if (pid) {
         const runPath = await this.getProcessExecutablePath(pid)
-        if (runPath && existsSync(runPath)) {
-          
-          return runPath
-        }
+        if (runPath && existsSync(runPath)) return runPath
       }
     } catch (e) {
       console.error('尝试获取运行中微信路径失败:', e)
     }
 
-    // 1. Registry - Uninstall Keys
     const uninstallKeys = [
       'SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
       'SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall'
     ]
     const roots = [this.HKEY_LOCAL_MACHINE, this.HKEY_CURRENT_USER]
-
-    // NOTE: Scanning subkeys in registry via Koffi is tedious (RegEnumKeyEx).
-    // Simplified strategy: Check common known registry keys first, then fallback to common paths.
-    // wx_key searches *all* subkeys of Uninstall, which is robust but complex to port quickly.
-    // Let's rely on specific Tencent keys first.
-
-    // 2. Tencent specific keys
     const tencentKeys = [
       'Software\\Tencent\\WeChat',
       'Software\\WOW6432Node\\Tencent\\WeChat',
@@ -382,16 +306,13 @@ export class KeyService {
       }
     }
 
-    // 3. Uninstall key exact match (sometimes works)
     for (const root of roots) {
       for (const parent of uninstallKeys) {
-        // Try WeChat specific subkey
         const path = this.readRegistryString(root, parent + '\\WeChat', 'InstallLocation')
         if (path && existsSync(join(path, 'Weixin.exe'))) return join(path, 'Weixin.exe')
       }
     }
 
-    // 4. Common Paths
     const drives = ['C', 'D', 'E', 'F']
     const commonPaths = [
       'Program Files\\Tencent\\WeChat\\WeChat.exe',
@@ -424,7 +345,6 @@ export class KeyService {
       }
       return null
     } catch (e) {
-      console.error(`获取进程失败 (${imageName}):`, e)
       return null
     }
   }
@@ -435,7 +355,6 @@ export class KeyService {
       const pid = await this.findPidByImageName(name)
       if (pid) return pid
     }
-
     const fallbackPid = await this.waitForWeChatWindow(5000)
     return fallbackPid ?? null
   }
@@ -486,14 +405,11 @@ export class KeyService {
     try {
       await execFileAsync('taskkill', ['/F', '/T', '/IM', 'Weixin.exe'])
       await execFileAsync('taskkill', ['/F', '/T', '/IM', 'WeChat.exe'])
-    } catch (e) {
-      // Ignore if not found
-    }
+    } catch (e) { }
 
     return await this.waitForWeChatExit(5000)
   }
 
-
   // --- Window Detection ---
 
   private getWindowTitle(hWnd: any): string {
@@ -574,17 +490,12 @@ export class KeyService {
     for (const child of children) {
       const normalizedTitle = child.title.replace(/\s+/g, '')
       if (normalizedTitle) {
-        if (readyTexts.some(marker => normalizedTitle.includes(marker))) {
-          return true
-        }
+        if (readyTexts.some(marker => normalizedTitle.includes(marker))) return true
         titleMatchCount += 1
       }
-
       const className = child.className
       if (className) {
-        if (readyClassMarkers.some(marker => className.includes(marker))) {
-          return true
-        }
+        if (readyClassMarkers.some(marker => className.includes(marker))) return true
         if (className.length > 5) {
           classMatchCount += 1
           hasValidClassName = true
@@ -630,11 +541,11 @@ export class KeyService {
     return true
   }
 
-  // --- Main Methods ---
+  // --- DB Key Logic (Unchanged core flow) ---
 
   async autoGetDbKey(
-    timeoutMs = 60_000,
-    onStatus?: (message: string, level: number) => void
+      timeoutMs = 60_000,
+      onStatus?: (message: string, level: number) => void
   ): Promise<DbKeyResult> {
     if (!this.ensureWin32()) return { success: false, error: '仅支持 Windows' }
     if (!this.ensureLoaded()) return { success: false, error: 'wx_key.dll 未加载' }
@@ -642,7 +553,6 @@ export class KeyService {
 
     const logs: string[] = []
 
-    // 1. Find Path
     onStatus?.('正在定位微信安装路径...', 0)
     let wechatPath = await this.findWeChatInstallPath()
     if (!wechatPath) {
@@ -651,7 +561,6 @@ export class KeyService {
       return { success: false, error: err }
     }
 
-    // 2. Restart WeChat
     onStatus?.('正在关闭微信以进行获取...', 0)
     const closed = await this.killWeChatProcesses()
     if (!closed) {
@@ -660,7 +569,6 @@ export class KeyService {
       return { success: false, error: err }
     }
 
-// 3. Launch
     onStatus?.('正在启动微信...', 0)
     const sub = spawn(wechatPath, {
       detached: true,
@@ -669,23 +577,18 @@ export class KeyService {
     })
     sub.unref()
 
-// 4. Wait for Window & Get PID (Crucial change: discover PID from window)
     onStatus?.('等待微信界面就绪...', 0)
     const pid = await this.waitForWeChatWindow()
-    if (!pid) {
-      return { success: false, error: '启动微信失败或等待界面就绪超时' }
-    }
+    if (!pid) return { success: false, error: '启动微信失败或等待界面就绪超时' }
 
     onStatus?.(`检测到微信窗口 (PID: ${pid})，正在获取...`, 0)
     onStatus?.('正在检测微信界面组件...', 0)
     await this.waitForWeChatWindowComponents(pid, 15000)
 
-    // 5. Inject
     const ok = this.initHook(pid)
     if (!ok) {
       const error = this.getLastErrorMsg ? this.decodeCString(this.getLastErrorMsg()) : ''
       if (error) {
-        // 检测权限不足错误 (NTSTATUS 0xC0000022 = STATUS_ACCESS_DENIED)
         if (error.includes('0xC0000022') || error.includes('ACCESS_DENIED') || error.includes('打开目标进程失败')) {
           const friendlyError = '权限不足：无法访问微信进程。\n\n解决方法：\n1. 右键 WeFlow 图标，选择"以管理员身份运行"\n2. 关闭可能拦截的安全软件（如360、火绒等）\n3. 确保微信没有以管理员权限运行'
           return { success: false, error: friendlyError }
@@ -695,8 +598,8 @@ export class KeyService {
       const statusBuffer = Buffer.alloc(256)
       const levelOut = [0]
       const status = this.getStatusMessage && this.getStatusMessage(statusBuffer, statusBuffer.length, levelOut)
-        ? this.decodeUtf8(statusBuffer)
-        : ''
+          ? this.decodeUtf8(statusBuffer)
+          : ''
       return { success: false, error: status || '初始化失败' }
     }
 
@@ -716,9 +619,7 @@ export class KeyService {
         for (let i = 0; i < 5; i++) {
           const statusBuffer = Buffer.alloc(256)
           const levelOut = [0]
-          if (!this.getStatusMessage(statusBuffer, statusBuffer.length, levelOut)) {
-            break
-          }
+          if (!this.getStatusMessage(statusBuffer, statusBuffer.length, levelOut)) break
           const msg = this.decodeUtf8(statusBuffer)
           const level = levelOut[0] ?? 0
           if (msg) {
@@ -726,7 +627,6 @@ export class KeyService {
             onStatus?.(msg, level)
           }
         }
-
         await new Promise((resolve) => setTimeout(resolve, 120))
       }
     } finally {
@@ -738,386 +638,87 @@ export class KeyService {
     return { success: false, error: '获取密钥超时', logs }
   }
 
-  // --- Image Key Stuff (Legacy but kept) ---
+  // --- Image Key (通过 DLL 从缓存目录获取 code，用前端 wxid 计算密钥) ---
 
-  private isAccountDir(dirPath: string): boolean {
-    return (
-      existsSync(join(dirPath, 'db_storage')) ||
-      existsSync(join(dirPath, 'FileStorage', 'Image')) ||
-      existsSync(join(dirPath, 'FileStorage', 'Image2'))
-    )
-  }
-
-  private isPotentialAccountName(name: string): boolean {
-    const lower = name.toLowerCase()
-    if (lower.startsWith('all') || lower.startsWith('applet') || lower.startsWith('backup') || lower.startsWith('wmpf')) {
-      return false
-    }
-    if (lower.startsWith('wxid_')) return true
-    if (/^\d+$/.test(name) && name.length >= 6) return true
-    return name.length > 5
-  }
-
-  private listAccountDirs(rootDir: string): string[] {
-    try {
-      const entries = readdirSync(rootDir)
-      const high: string[] = []
-      const low: string[] = []
-      for (const entry of entries) {
-        const fullPath = join(rootDir, entry)
-        try {
-          if (!statSync(fullPath).isDirectory()) continue
-        } catch {
-          continue
-        }
-
-        if (!this.isPotentialAccountName(entry)) {
-          continue
-        }
-
-        if (this.isAccountDir(fullPath)) {
-          high.push(fullPath)
-        } else {
-          low.push(fullPath)
-        }
-      }
-      return high.length ? high.sort() : low.sort()
-    } catch {
-      return []
-    }
-  }
-
-  private normalizeExistingDir(inputPath: string): string | null {
-    const trimmed = inputPath.replace(/[\\\\/]+$/, '')
-    if (!existsSync(trimmed)) return null
-    try {
-      const stats = statSync(trimmed)
-      if (stats.isFile()) {
-        return dirname(trimmed)
-      }
-    } catch {
-      return null
-    }
-    return trimmed
-  }
-
-  private resolveAccountDirFromPath(inputPath: string): string | null {
-    const normalized = this.normalizeExistingDir(inputPath)
-    if (!normalized) return null
-
-    if (this.isAccountDir(normalized)) return normalized
-
-    const lower = normalized.toLowerCase()
-    if (lower.endsWith('db_storage') || lower.endsWith('filestorage') || lower.endsWith('image') || lower.endsWith('image2')) {
-      const parent = dirname(normalized)
-      if (this.isAccountDir(parent)) return parent
-      const grandParent = dirname(parent)
-      if (this.isAccountDir(grandParent)) return grandParent
-    }
-
-    const candidates = this.listAccountDirs(normalized)
-    if (candidates.length) return candidates[0]
-    return null
-  }
-
-  private resolveAccountDir(manualDir?: string): string | null {
-    if (manualDir) {
-      const resolved = this.resolveAccountDirFromPath(manualDir)
-      if (resolved) return resolved
-    }
-
-    const userProfile = process.env.USERPROFILE
-    if (!userProfile) return null
-    const roots = [
-      join(userProfile, 'Documents', 'xwechat_files'),
-      join(userProfile, 'Documents', 'WeChat Files')
-    ]
-    for (const root of roots) {
-      if (!existsSync(root)) continue
-      const candidates = this.listAccountDirs(root)
-      if (candidates.length) return candidates[0]
-    }
-    return null
-  }
-
-  private findTemplateDatFiles(rootDir: string): string[] {
-    const files: string[] = []
-    const stack = [rootDir]
-    const maxFiles = 32
-    while (stack.length && files.length < maxFiles) {
-      const dir = stack.pop() as string
-      let entries: string[]
-      try {
-        entries = readdirSync(dir)
-      } catch {
-        continue
-      }
-      for (const entry of entries) {
-        const fullPath = join(dir, entry)
-        let stats: any
-        try {
-          stats = statSync(fullPath)
-        } catch {
-          continue
-        }
-        if (stats.isDirectory()) {
-          stack.push(fullPath)
-        } else if (entry.endsWith('_t.dat')) {
-          files.push(fullPath)
-          if (files.length >= maxFiles) break
-        }
-      }
-    }
-
-    if (!files.length) return []
-    const dateReg = /(\d{4}-\d{2})/
-    files.sort((a, b) => {
-      const ma = a.match(dateReg)?.[1]
-      const mb = b.match(dateReg)?.[1]
-      if (ma && mb) return mb.localeCompare(ma)
-      return 0
-    })
-    return files.slice(0, 16)
-  }
-
-  private getXorKey(templateFiles: string[]): number | null {
-    const counts = new Map<number, number>()
-    const tailSignatures = [
-      Buffer.from([0xFF, 0xD9]),
-      Buffer.from([0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82])
-    ]
-    for (const file of templateFiles) {
-      try {
-        const bytes = readFileSync(file)
-        for (const signature of tailSignatures) {
-          if (bytes.length < signature.length) continue
-          const tail = bytes.subarray(bytes.length - signature.length)
-          const xorKey = tail[0] ^ signature[0]
-          let valid = true
-          for (let i = 1; i < signature.length; i++) {
-            if ((tail[i] ^ xorKey) !== signature[i]) {
-              valid = false
-              break
-            }
-          }
-          if (valid) {
-            counts.set(xorKey, (counts.get(xorKey) ?? 0) + 1)
-          }
-        }
-      } catch { }
-    }
-    if (!counts.size) return null
-    let bestKey: number | null = null
-    let bestCount = 0
-    for (const [key, count] of counts) {
-      if (count > bestCount) {
-        bestCount = count
-        bestKey = key
-      }
-    }
-    return bestKey
-  }
-
-  private getCiphertextFromTemplate(templateFiles: string[]): Buffer | null {
-    for (const file of templateFiles) {
-      try {
-        const bytes = readFileSync(file)
-        if (bytes.length < 0x1f) continue
-        if (
-          bytes[0] === 0x07 &&
-          bytes[1] === 0x08 &&
-          bytes[2] === 0x56 &&
-          bytes[3] === 0x32 &&
-          bytes[4] === 0x08 &&
-          bytes[5] === 0x07
-        ) {
-          return bytes.subarray(0x0f, 0x1f)
-        }
-      } catch { }
-    }
-    return null
-  }
-
-  private isAlphaNumLower(byte: number): boolean {
-    // 只匹配小写字母 a-z 和数字 0-9（AES密钥格式）
-    return (byte >= 0x61 && byte <= 0x7a) || (byte >= 0x30 && byte <= 0x39)
-  }
-
-  private isUtf16LowerKey(buf: Buffer, start: number): boolean {
-    if (start + 64 > buf.length) return false
-    for (let j = 0; j < 32; j++) {
-      const charByte = buf[start + j * 2]
-      const nullByte = buf[start + j * 2 + 1]
-      if (nullByte !== 0x00 || !this.isAlphaNumLower(charByte)) {
-        return false
-      }
-    }
-    return true
-  }
-
-  private verifyKey(ciphertext: Buffer, keyBytes: Buffer): boolean {
-    try {
-      const key = keyBytes.subarray(0, 16)
-      const decipher = crypto.createDecipheriv('aes-128-ecb', key, null)
-      decipher.setAutoPadding(false)
-      const decrypted = Buffer.concat([decipher.update(ciphertext), decipher.final()])
-      const isJpeg = decrypted.length >= 3 && decrypted[0] === 0xff && decrypted[1] === 0xd8 && decrypted[2] === 0xff
-      const isPng = decrypted.length >= 8 &&
-        decrypted[0] === 0x89 &&
-        decrypted[1] === 0x50 &&
-        decrypted[2] === 0x4e &&
-        decrypted[3] === 0x47 &&
-        decrypted[4] === 0x0d &&
-        decrypted[5] === 0x0a &&
-        decrypted[6] === 0x1a &&
-        decrypted[7] === 0x0a
-      return isJpeg || isPng
-    } catch {
-      return false
-    }
-  }
-
-  private getMemoryRegions(hProcess: any): Array<[number, number]> {
-    const regions: Array<[number, number]> = []
-    const MEM_COMMIT = 0x1000
-    const MEM_PRIVATE = 0x20000
-    const PAGE_NOACCESS = 0x01
-    const PAGE_GUARD = 0x100
-
-    let address = 0
-    const maxAddress = 0x7fffffffffff
-    while (address >= 0 && address < maxAddress) {
-      const info: any = {}
-      const result = this.VirtualQueryEx(hProcess, address, info, this.koffi.sizeof(this.MEMORY_BASIC_INFORMATION))
-      if (!result) break
-
-      const state = info.State
-      const protect = info.Protect
-      const type = info.Type
-      const regionSize = Number(info.RegionSize)
-      // 只收集已提交的私有内存（大幅减少扫描区域）
-      if (state === MEM_COMMIT && type === MEM_PRIVATE && (protect & PAGE_NOACCESS) === 0 && (protect & PAGE_GUARD) === 0) {
-        regions.push([Number(info.BaseAddress), regionSize])
-      }
-
-      const nextAddress = address + regionSize
-      if (nextAddress <= address) break
-      address = nextAddress
-    }
-    return regions
-  }
-
-  private readProcessMemory(hProcess: any, address: number, size: number): Buffer | null {
-    const buffer = Buffer.alloc(size)
-    const bytesRead = [0]
-    const ok = this.ReadProcessMemory(hProcess, address, buffer, size, bytesRead)
-    if (!ok || bytesRead[0] === 0) return null
-    return buffer.subarray(0, bytesRead[0])
-  }
-
-  private async getAesKeyFromMemory(
-    pid: number,
-    ciphertext: Buffer,
-    onProgress?: (current: number, total: number, message: string) => void
-  ): Promise<string | null> {
-    if (!this.ensureKernel32()) return null
-    const hProcess = this.OpenProcess(this.PROCESS_ALL_ACCESS, false, pid)
-    if (!hProcess) return null
-
-    try {
-      const allRegions = this.getMemoryRegions(hProcess)
-      const totalRegions = allRegions.length
-      let scannedCount = 0
-      let skippedCount = 0
-
-      for (const [baseAddress, regionSize] of allRegions) {
-        // 跳过太大的内存区域（> 100MB）
-        if (regionSize > 100 * 1024 * 1024) {
-          skippedCount++
-          continue
-        }
-
-        scannedCount++
-        if (scannedCount % 10 === 0) {
-          onProgress?.(scannedCount, totalRegions, `正在扫描微信内存... (${scannedCount}/${totalRegions})`)
-          await new Promise(resolve => setImmediate(resolve))
-        }
-
-        const memory = this.readProcessMemory(hProcess, baseAddress, regionSize)
-        if (!memory) continue
-
-        // 直接在原始字节中搜索32字节的小写字母数字序列
-        for (let i = 0; i < memory.length - 34; i++) {
-          // 检查前导字符（不是小写字母或数字）
-          if (this.isAlphaNumLower(memory[i])) continue
-
-          // 检查接下来32个字节是否都是小写字母或数字
-          let valid = true
-          for (let j = 1; j <= 32; j++) {
-            if (!this.isAlphaNumLower(memory[i + j])) {
-              valid = false
-              break
-            }
-          }
-          if (!valid) continue
-
-          // 检查尾部字符（不是小写字母或数字）
-          if (i + 33 < memory.length && this.isAlphaNumLower(memory[i + 33])) {
-            continue
-          }
-
-          const keyBytes = memory.subarray(i + 1, i + 33)
-          if (this.verifyKey(ciphertext, keyBytes)) {
-            return keyBytes.toString('ascii')
-          }
-        }
-      }
-      return null
-    } finally {
-      try {
-        this.CloseHandle(hProcess)
-      } catch { }
-    }
+  private cleanWxid(wxid: string): string {
+    // 截断到第二个下划线: wxid_g4pshorcc0r529_da6c → wxid_g4pshorcc0r529
+    const first = wxid.indexOf('_')
+    if (first === -1) return wxid
+    const second = wxid.indexOf('_', first + 1)
+    if (second === -1) return wxid
+    return wxid.substring(0, second)
   }
 
   async autoGetImageKey(
-    manualDir?: string,
-    onProgress?: (message: string) => void
+      manualDir?: string,
+      onProgress?: (message: string) => void
   ): Promise<ImageKeyResult> {
     if (!this.ensureWin32()) return { success: false, error: '仅支持 Windows' }
     if (!this.ensureLoaded()) return { success: false, error: 'wx_key.dll 未加载' }
-    if (!this.ensureKernel32()) return { success: false, error: '初始化系统 API 失败' }
 
-    onProgress?.('正在定位微信账号目录...')
-    const accountDir = this.resolveAccountDir(manualDir)
-    if (!accountDir) return { success: false, error: '未找到微信账号目录' }
+    onProgress?.('正在从缓存目录扫描图片密钥...')
 
-    onProgress?.('正在收集模板文件...')
-    const templateFiles = this.findTemplateDatFiles(accountDir)
-    if (!templateFiles.length) return { success: false, error: '未找到模板文件' }
+    const resultBuffer = Buffer.alloc(8192)
+    const ok = this.getImageKeyDll(resultBuffer, resultBuffer.length)
 
-    onProgress?.('正在计算 XOR 密钥...')
-    const xorKey = this.getXorKey(templateFiles)
-    if (xorKey == null) return { success: false, error: '无法计算 XOR 密钥' }
+    if (!ok) {
+      const errMsg = this.getLastErrorMsg ? this.decodeCString(this.getLastErrorMsg()) : '获取图片密钥失败'
+      return { success: false, error: errMsg }
+    }
 
-    onProgress?.('正在读取加密模板数据...')
-    const ciphertext = this.getCiphertextFromTemplate(templateFiles)
-    if (!ciphertext) return { success: false, error: '无法读取加密模板数据' }
+    const jsonStr = this.decodeUtf8(resultBuffer)
+    let parsed: any
+    try {
+      parsed = JSON.parse(jsonStr)
+    } catch {
+      return { success: false, error: '解析密钥数据失败' }
+    }
 
-    const pid = await this.findWeChatPid()
-    if (!pid) return { success: false, error: '未检测到微信进程' }
+    // 从任意账号提取 code 列表（code 来自 kvcomm，与 wxid 无关，所有账号都一样）
+    const accounts: any[] = parsed.accounts ?? []
+    if (!accounts.length || !accounts[0]?.keys?.length) {
+      return { success: false, error: '未找到有效的密钥码（kvcomm 缓存为空）' }
+    }
 
-    onProgress?.('正在扫描内存获取 AES 密钥...')
-    const aesKey = await this.getAesKeyFromMemory(pid, ciphertext, (current, total, msg) => {
-      onProgress?.(`${msg} (${current}/${total})`)
-    })
-    if (!aesKey) {
-      return {
-        success: false,
-        error: '未能从内存中获取 AES 密钥，请打开朋友圈图片后重试'
+    const codes: number[] = accounts[0].keys.map((k: any) => k.code)
+    console.log('[ImageKey] codes:', codes, 'DLL wxids:', accounts.map((a: any) => a.wxid))
+
+    // 从 manualDir 提取前端已配置好的正确 wxid
+    // 格式: "D:\weixin\xwechat_files\wxid_xxx_1234" → "wxid_xxx_1234"
+    let targetWxid = ''
+    if (manualDir) {
+      const dirName = manualDir.replace(/[\\/]+$/, '').split(/[\\/]/).pop() ?? ''
+      if (dirName.startsWith('wxid_')) {
+        targetWxid = dirName
       }
     }
 
-    return { success: true, xorKey, aesKey: aesKey.slice(0, 16) }
+    if (!targetWxid) {
+      // 无法从 manualDir 提取 wxid，回退到 DLL 发现的第一个
+      targetWxid = accounts[0].wxid
+      console.log('[ImageKey] 无法从 manualDir 提取 wxid，使用 DLL 发现的:', targetWxid)
+    }
+
+    // CleanWxid: 截断到第二个下划线，与 xkey 算法一致
+    const cleanedWxid = this.cleanWxid(targetWxid)
+    console.log('[ImageKey] wxid:', targetWxid, '→ cleaned:', cleanedWxid)
+
+    // 用 cleanedWxid + code 本地计算密钥
+    // xorKey = code & 0xFF
+    // aesKey = MD5(code.toString() + cleanedWxid).substring(0, 16)
+    const code = codes[0]
+    const xorKey = code & 0xFF
+    const dataToHash = code.toString() + cleanedWxid
+    const md5Full = crypto.createHash('md5').update(dataToHash).digest('hex')
+    const aesKey = md5Full.substring(0, 16)
+
+    onProgress?.(`密钥获取成功 (wxid: ${targetWxid}, code: ${code})`)
+    console.log('[ImageKey] 计算结果: xorKey=', xorKey, 'aesKey=', aesKey)
+
+    return {
+      success: true,
+      xorKey,
+      aesKey
+    }
   }
 }

electron/services/snsService.ts

@@ -6,6 +6,7 @@ import { readFile, writeFile, mkdir } from 'fs/promises'
 import { basename, join } from 'path'
 import crypto from 'crypto'
 import { WasmService } from './wasmService'
+import zlib from 'zlib'
 
 export interface SnsLivePhoto {
     url: string
@@ -28,6 +29,7 @@ export interface SnsMedia {
 
 export interface SnsPost {
     id: string
+    tid?: string       // 数据库主键（雪花 ID），用于精确删除
     username: string
     nickname: string
     avatarUrl?: string
@@ -36,7 +38,7 @@ export interface SnsPost {
     type?: number
     media: SnsMedia[]
     likes: string[]
-    comments: { id: string; nickname: string; content: string; refCommentId: string; refNickname?: 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 }[] }[]
     rawXml?: string
     linkTitle?: string
     linkUrl?: string
@@ -122,6 +124,107 @@ const extractVideoKey = (xml: string): string | undefined => {
     return match ? match[1] : undefined
 }
 
+/**
+ * 从 XML 中解析评论信息（含表情包、回复关系）
+ */
+function parseCommentsFromXml(xml: string): { id: string; nickname: string; content: string; refCommentId: string; refNickname?: string; emojis?: { url: string; md5: string; width: number; height: number; encryptUrl?: string; aesKey?: string }[] }[] {
+    if (!xml) return []
+
+    type CommentItem = {
+        id: string; nickname: string; username?: string; content: string
+        refCommentId: string; refUsername?: string; refNickname?: string
+        emojis?: { url: string; md5: string; width: number; height: number; encryptUrl?: string; aesKey?: string }[]
+    }
+    const comments: CommentItem[] = []
+
+    try {
+        // 支持多种标签格式
+        let listMatch = xml.match(/<CommentUserList>([\s\S]*?)<\/CommentUserList>/i)
+        if (!listMatch) listMatch = xml.match(/<commentUserList>([\s\S]*?)<\/commentUserList>/i)
+        if (!listMatch) listMatch = xml.match(/<commentList>([\s\S]*?)<\/commentList>/i)
+        if (!listMatch) listMatch = xml.match(/<comment_user_list>([\s\S]*?)<\/comment_user_list>/i)
+        if (!listMatch) return comments
+
+        const listXml = listMatch[1]
+        const itemRegex = /<(?:CommentUser|commentUser|comment|user_comment)>([\s\S]*?)<\/(?:CommentUser|commentUser|comment|user_comment)>/gi
+        let m: RegExpExecArray | null
+
+        while ((m = itemRegex.exec(listXml)) !== null) {
+            const c = m[1]
+
+            const idMatch = c.match(/<(?:cmtid|commentId|comment_id|id)>([^<]*)<\/(?:cmtid|commentId|comment_id|id)>/i)
+            const usernameMatch = c.match(/<username>([^<]*)<\/username>/i)
+            let nicknameMatch = c.match(/<nickname>([^<]*)<\/nickname>/i)
+            if (!nicknameMatch) nicknameMatch = c.match(/<nickName>([^<]*)<\/nickName>/i)
+            const contentMatch = c.match(/<content>([^<]*)<\/content>/i)
+            const refIdMatch = c.match(/<(?:refCommentId|replyCommentId|ref_comment_id)>([^<]*)<\/(?:refCommentId|replyCommentId|ref_comment_id)>/i)
+            const refNickMatch = c.match(/<(?:refNickname|refNickName|replyNickname)>([^<]*)<\/(?:refNickname|refNickName|replyNickname)>/i)
+            const refUserMatch = c.match(/<ref_username>([^<]*)<\/ref_username>/i)
+
+            // 解析表情包
+            const emojis: { url: string; md5: string; width: number; height: number; encryptUrl?: string; aesKey?: string }[] = []
+            const emojiRegex = /<emojiinfo>([\s\S]*?)<\/emojiinfo>/gi
+            let em: RegExpExecArray | null
+            while ((em = emojiRegex.exec(c)) !== null) {
+                const ex = em[1]
+                const externUrl = ex.match(/<extern_url>([^<]*)<\/extern_url>/i)
+                const cdnUrl = ex.match(/<cdn_url>([^<]*)<\/cdn_url>/i)
+                const plainUrl = ex.match(/<url>([^<]*)<\/url>/i)
+                const urlMatch = externUrl || cdnUrl || plainUrl
+                const md5Match = ex.match(/<md5>([^<]*)<\/md5>/i)
+                const wMatch = ex.match(/<width>([^<]*)<\/width>/i)
+                const hMatch = ex.match(/<height>([^<]*)<\/height>/i)
+                const encMatch = ex.match(/<encrypt_url>([^<]*)<\/encrypt_url>/i)
+                const aesMatch = ex.match(/<aes_key>([^<]*)<\/aes_key>/i)
+
+                const url = urlMatch ? urlMatch[1].trim().replace(/&amp;/g, '&') : ''
+                const encryptUrl = encMatch ? encMatch[1].trim().replace(/&amp;/g, '&') : undefined
+                const aesKey = aesMatch ? aesMatch[1].trim() : undefined
+
+                if (url || encryptUrl) {
+                    emojis.push({
+                        url,
+                        md5: md5Match ? md5Match[1].trim() : '',
+                        width: wMatch ? parseInt(wMatch[1]) : 0,
+                        height: hMatch ? parseInt(hMatch[1]) : 0,
+                        encryptUrl,
+                        aesKey
+                    })
+                }
+            }
+
+            if (nicknameMatch && (contentMatch || emojis.length > 0)) {
+                const refId = refIdMatch ? refIdMatch[1].trim() : ''
+                comments.push({
+                    id: idMatch ? idMatch[1].trim() : `cmt_${Date.now()}_${Math.random()}`,
+                    nickname: nicknameMatch[1].trim(),
+                    username: usernameMatch ? usernameMatch[1].trim() : undefined,
+                    content: contentMatch ? contentMatch[1].trim() : '',
+                    refCommentId: refId === '0' ? '' : refId,
+                    refUsername: refUserMatch ? refUserMatch[1].trim() : undefined,
+                    refNickname: refNickMatch ? refNickMatch[1].trim() : undefined,
+                    emojis: emojis.length > 0 ? emojis : undefined
+                })
+            }
+        }
+
+        // 二次解析：通过 refUsername 补全 refNickname
+        const userMap = new Map<string, string>()
+        for (const c of comments) {
+            if (c.username && c.nickname) userMap.set(c.username, c.nickname)
+        }
+        for (const c of comments) {
+            if (!c.refNickname && c.refUsername && c.refCommentId) {
+                c.refNickname = userMap.get(c.refUsername)
+            }
+        }
+    } catch (e) {
+        console.error('[SnsService] parseCommentsFromXml 失败:', e)
+    }
+
+    return comments
+}
+
 class SnsService {
     private configService: ConfigService
     private contactCache: ContactCacheService
@@ -132,6 +235,104 @@ class SnsService {
         this.contactCache = new ContactCacheService(this.configService.get('cachePath') as string)
     }
 
+    private parseLikesFromXml(xml: string): string[] {
+        if (!xml) return []
+        const likes: string[] = []
+        try {
+            let likeListMatch = xml.match(/<LikeUserList>([\s\S]*?)<\/LikeUserList>/i)
+            if (!likeListMatch) likeListMatch = xml.match(/<likeUserList>([\s\S]*?)<\/likeUserList>/i)
+            if (!likeListMatch) likeListMatch = xml.match(/<likeList>([\s\S]*?)<\/likeList>/i)
+            if (!likeListMatch) likeListMatch = xml.match(/<like_user_list>([\s\S]*?)<\/like_user_list>/i)
+            if (!likeListMatch) return likes
+
+            const likeUserRegex = /<(?:LikeUser|likeUser|user_comment)>([\s\S]*?)<\/(?:LikeUser|likeUser|user_comment)>/gi
+            let m: RegExpExecArray | null
+            while ((m = likeUserRegex.exec(likeListMatch[1])) !== null) {
+                let nick = m[1].match(/<nickname>([^<]*)<\/nickname>/i)
+                if (!nick) nick = m[1].match(/<nickName>([^<]*)<\/nickName>/i)
+                if (nick) likes.push(nick[1].trim())
+            }
+        } catch (e) {
+            console.error('[SnsService] 解析点赞失败:', e)
+        }
+        return likes
+    }
+
+    private parseMediaFromXml(xml: string): { media: SnsMedia[]; videoKey?: string } {
+        if (!xml) return { media: [] }
+        const media: SnsMedia[] = []
+        let videoKey: string | undefined
+        try {
+            const encMatch = xml.match(/<enc\s+key="(\d+)"/i)
+            if (encMatch) videoKey = encMatch[1]
+
+            const mediaRegex = /<media>([\s\S]*?)<\/media>/gi
+            let mediaMatch: RegExpExecArray | null
+            while ((mediaMatch = mediaRegex.exec(xml)) !== null) {
+                const mx = mediaMatch[1]
+                const urlMatch = mx.match(/<url[^>]*>([^<]+)<\/url>/i)
+                const urlTagMatch = mx.match(/<url([^>]*)>/i)
+                const thumbMatch = mx.match(/<thumb[^>]*>([^<]+)<\/thumb>/i)
+                const thumbTagMatch = mx.match(/<thumb([^>]*)>/i)
+
+                let urlToken: string | undefined, urlKey: string | undefined
+                let urlMd5: string | undefined, urlEncIdx: string | undefined
+                if (urlTagMatch?.[1]) {
+                    const a = urlTagMatch[1]
+                    urlToken = a.match(/token="([^"]+)"/i)?.[1]
+                    urlKey = a.match(/key="([^"]+)"/i)?.[1]
+                    urlMd5 = a.match(/md5="([^"]+)"/i)?.[1]
+                    urlEncIdx = a.match(/enc_idx="([^"]+)"/i)?.[1]
+                }
+                let thumbToken: string | undefined, thumbKey: string | undefined, thumbEncIdx: string | undefined
+                if (thumbTagMatch?.[1]) {
+                    const a = thumbTagMatch[1]
+                    thumbToken = a.match(/token="([^"]+)"/i)?.[1]
+                    thumbKey = a.match(/key="([^"]+)"/i)?.[1]
+                    thumbEncIdx = a.match(/enc_idx="([^"]+)"/i)?.[1]
+                }
+
+                const item: SnsMedia = {
+                    url: urlMatch ? urlMatch[1].trim() : '',
+                    thumb: thumbMatch ? thumbMatch[1].trim() : '',
+                    token: urlToken || thumbToken,
+                    key: urlKey || thumbKey,
+                    md5: urlMd5,
+                    encIdx: urlEncIdx || thumbEncIdx
+                }
+
+                const livePhotoMatch = mx.match(/<livePhoto>([\s\S]*?)<\/livePhoto>/i)
+                if (livePhotoMatch) {
+                    const lx = livePhotoMatch[1]
+                    const lpUrl = lx.match(/<url[^>]*>([^<]+)<\/url>/i)
+                    const lpUrlTag = lx.match(/<url([^>]*)>/i)
+                    const lpThumb = lx.match(/<thumb[^>]*>([^<]+)<\/thumb>/i)
+                    const lpThumbTag = lx.match(/<thumb([^>]*)>/i)
+                    let lpToken: string | undefined, lpKey: string | undefined, lpEncIdx: string | undefined
+                    if (lpUrlTag?.[1]) {
+                        const a = lpUrlTag[1]
+                        lpToken = a.match(/token="([^"]+)"/i)?.[1]
+                        lpKey = a.match(/key="([^"]+)"/i)?.[1]
+                        lpEncIdx = a.match(/enc_idx="([^"]+)"/i)?.[1]
+                    }
+                    if (!lpToken && lpThumbTag?.[1]) lpToken = lpThumbTag[1].match(/token="([^"]+)"/i)?.[1]
+                    if (!lpKey && lpThumbTag?.[1]) lpKey = lpThumbTag[1].match(/key="([^"]+)"/i)?.[1]
+                    item.livePhoto = {
+                        url: lpUrl ? lpUrl[1].trim() : '',
+                        thumb: lpThumb ? lpThumb[1].trim() : '',
+                        token: lpToken,
+                        key: lpKey,
+                        encIdx: lpEncIdx
+                    }
+                }
+                media.push(item)
+            }
+        } catch (e) {
+            console.error('[SnsService] 解析媒体 XML 失败:', e)
+        }
+        return { media, videoKey }
+    }
+
     private getSnsCacheDir(): string {
         const cachePath = this.configService.getCacheBasePath()
         const snsCacheDir = join(cachePath, 'sns_cache')
@@ -147,7 +348,6 @@ class SnsService {
         return join(this.getSnsCacheDir(), `${hash}${ext}`)
     }
 
-    // 获取所有发过朋友圈的用户名列表
     async getSnsUsernames(): Promise<{ success: boolean; usernames?: string[]; error?: string }> {
         const result = await wcdbService.execQuery('sns', null, 'SELECT DISTINCT user_name FROM SnsTimeLine')
         if (!result.success || !result.rows) {
@@ -159,51 +359,142 @@ class SnsService {
         return { success: true, usernames: result.rows.map((r: any) => r.user_name).filter(Boolean) }
     }
 
-    async getTimeline(limit: number = 20, offset: number = 0, usernames?: string[], keyword?: string, startTime?: number, endTime?: number): Promise<{ success: boolean; timeline?: SnsPost[]; error?: string }> {
-        const result = await wcdbService.getSnsTimeline(limit, offset, usernames, keyword, startTime, endTime)
+    // 安装朋友圈删除拦截
+    async installSnsBlockDeleteTrigger(): Promise<{ success: boolean; alreadyInstalled?: boolean; error?: string }> {
+        return wcdbService.installSnsBlockDeleteTrigger()
+    }
 
-        if (result.success && result.timeline) {
-            const enrichedTimeline = result.timeline.map((post: any) => {
-                const contact = this.contactCache.get(post.username)
-                const isVideoPost = post.type === 15
+    // 卸载朋友圈删除拦截
+    async uninstallSnsBlockDeleteTrigger(): Promise<{ success: boolean; error?: string }> {
+        return wcdbService.uninstallSnsBlockDeleteTrigger()
+    }
 
-                // 尝试从 rawXml 中提取视频解密密钥 (针对视频号视频)
-                const videoKey = extractVideoKey(post.rawXml || '')
+    // 查询朋友圈删除拦截是否已安装
+    async checkSnsBlockDeleteTrigger(): Promise<{ success: boolean; installed?: boolean; error?: string }> {
+        return wcdbService.checkSnsBlockDeleteTrigger()
+    }
 
-                const fixedMedia = (post.media || []).map((m: any) => ({
-                    // 如果是视频动态，url 是视频，thumb 是缩略图
-                    url: fixSnsUrl(m.url, m.token, isVideoPost),
-                    thumb: fixSnsUrl(m.thumb, m.token, false),
-                    md5: m.md5,
-                    token: m.token,
-                    // 只有在视频动态 (Type 15) 下才尝试将 XML 提取的 videoKey 赋予主媒体
-                    // 对于图片或实况照片的静态部分，应保留原始 m.key (由 DLL/DB 提供)，避免由于错误的 Isaac64 密钥导致图片解密损坏
-                    key: isVideoPost ? (videoKey || m.key) : m.key,
-                    encIdx: m.encIdx || m.enc_idx,
-                    livePhoto: m.livePhoto
-                        ? {
-                            ...m.livePhoto,
-                            url: fixSnsUrl(m.livePhoto.url, m.livePhoto.token, true),
-                            thumb: fixSnsUrl(m.livePhoto.thumb, m.livePhoto.token, false),
-                            token: m.livePhoto.token,
-                            // 实况照片的视频部分优先使用从 XML 提取的 Key
-                            key: videoKey || m.livePhoto.key || m.key,
-                            encIdx: m.livePhoto.encIdx || m.livePhoto.enc_idx
-                        }
-                        : undefined
+    // 从数据库直接删除朋友圈记录
+    async deleteSnsPost(postId: string): Promise<{ success: boolean; error?: string }> {
+        return wcdbService.deleteSnsPost(postId)
+    }
+
+    /**
+     * 补全 DLL 返回的评论中缺失的 refNickname
+     * DLL 返回的 refCommentId 是被回复评论的 cmtid
+     * 评论按 cmtid 从小到大排列，cmtid 从 1 开始递增
+     */
+    private fixCommentRefs(comments: any[]): any[] {
+        if (!comments || comments.length === 0) return []
+
+        // DLL 现在返回完整的评论数据（含 emojis、refNickname）
+        // 此处做最终的格式化和兜底补全
+        const idToNickname = new Map<string, string>()
+        comments.forEach((c, idx) => {
+            if (c.id) idToNickname.set(c.id, c.nickname || '')
+            // 兜底：按索引映射（部分旧数据 id 可能为空）
+            idToNickname.set(String(idx + 1), c.nickname || '')
+        })
+
+        return comments.map((c) => {
+            const refId = c.refCommentId
+            let refNickname = c.refNickname || ''
+
+            if (refId && refId !== '0' && refId !== '' && !refNickname) {
+                refNickname = idToNickname.get(refId) || ''
+            }
+
+            // 处理 emojis：过滤掉空的 url 和 encryptUrl
+            const emojis = (c.emojis || [])
+                .filter((e: any) => e.url || e.encryptUrl)
+                .map((e: any) => ({
+                    url: (e.url || '').replace(/&amp;/g, '&'),
+                    md5: e.md5 || '',
+                    width: e.width || 0,
+                    height: e.height || 0,
+                    encryptUrl: e.encryptUrl ? e.encryptUrl.replace(/&amp;/g, '&') : undefined,
+                    aesKey: e.aesKey || undefined
                 }))
 
-                return {
-                    ...post,
-                    avatarUrl: contact?.avatarUrl,
-                    nickname: post.nickname || contact?.displayName || post.username,
-                    media: fixedMedia
-                }
-            })
-            return { ...result, timeline: enrichedTimeline }
+            return {
+                id: c.id || '',
+                nickname: c.nickname || '',
+                content: c.content || '',
+                refCommentId: (refId === '0') ? '' : (refId || ''),
+                refNickname,
+                emojis: emojis.length > 0 ? emojis : undefined
+            }
+        })
+    }
+
+    async getTimeline(limit: number = 20, offset: number = 0, usernames?: string[], keyword?: string, startTime?: number, endTime?: number): Promise<{ success: boolean; timeline?: SnsPost[]; error?: string }> {
+        const result = await wcdbService.getSnsTimeline(limit, offset, usernames, keyword, startTime, endTime)
+        if (!result.success || !result.timeline || result.timeline.length === 0) return result
+
+        // 诊断：测试 execQuery 查 content 字段
+        try {
+            const testResult = await wcdbService.execQuery('sns', null, 'SELECT tid, CAST(content AS TEXT) as ct, typeof(content) as ctype FROM SnsTimeLine ORDER BY tid DESC LIMIT 1')
+            if (testResult.success && testResult.rows?.[0]) {
+                const r = testResult.rows[0]
+                console.log('[SnsService] execQuery 诊断: ctype=', r.ctype, 'ct长度=', r.ct?.length, 'ct前200=', r.ct?.substring(0, 200))
+                console.log('[SnsService] ct包含CommentUserList:', r.ct?.includes('CommentUserList'))
+            } else {
+                console.log('[SnsService] execQuery 诊断失败:', testResult.error)
+            }
+        } catch (e) {
+            console.log('[SnsService] execQuery 诊断异常:', e)
         }
 
-        return result
+        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 fixedMedia = (post.media || []).map((m: any) => ({
+                url: fixSnsUrl(m.url, m.token, isVideoPost),
+                thumb: fixSnsUrl(m.thumb, m.token, false),
+                md5: m.md5,
+                token: m.token,
+                key: isVideoPost ? (videoKey || m.key) : m.key,
+                encIdx: m.encIdx || m.enc_idx,
+                livePhoto: m.livePhoto ? {
+                    ...m.livePhoto,
+                    url: fixSnsUrl(m.livePhoto.url, m.livePhoto.token, true),
+                    thumb: fixSnsUrl(m.livePhoto.thumb, m.livePhoto.token, false),
+                    token: m.livePhoto.token,
+                    key: videoKey || m.livePhoto.key || m.key,
+                    encIdx: m.livePhoto.encIdx || m.livePhoto.enc_idx
+                } : undefined
+            }))
+
+            // DLL 已返回完整评论数据（含 emojis、refNickname）
+            // 如果 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)) {
+                // DLL 数据完整，直接使用
+                finalComments = this.fixCommentRefs(dllComments)
+            } else if (rawXml) {
+                // 回退：从 rawXml 重新解析（兼容旧版 DLL）
+                const xmlComments = parseCommentsFromXml(rawXml)
+                finalComments = xmlComments.length > 0 ? xmlComments : this.fixCommentRefs(dllComments)
+            } else {
+                finalComments = this.fixCommentRefs(dllComments)
+            }
+
+            return {
+                ...post,
+                avatarUrl: contact?.avatarUrl,
+                nickname: post.nickname || contact?.displayName || post.username,
+                media: fixedMedia,
+                comments: finalComments
+            }
+        })
+
+        return { ...result, timeline: enrichedTimeline }
     }
 
     async debugResource(url: string): Promise<{ success: boolean; status?: number; headers?: any; error?: string }> {
@@ -857,6 +1148,316 @@ window.addEventListener('scroll',function(){document.getElementById('btt').class
             }
         })
     }
+
+    /** 判断 buffer 是否为有效图片头 */
+    private isValidImageBuffer(buf: Buffer): boolean {
+        if (!buf || buf.length < 12) return false
+        if (buf[0] === 0x47 && buf[1] === 0x49 && buf[2] === 0x46) return true
+        if (buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4E && buf[3] === 0x47) return true
+        if (buf[0] === 0xFF && buf[1] === 0xD8 && buf[2] === 0xFF) return true
+        if (buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46
+            && buf[8] === 0x57 && buf[9] === 0x45 && buf[10] === 0x42 && buf[11] === 0x50) return true
+        return false
+    }
+
+    /** 根据图片头返回扩展名 */
+    private getImageExtFromBuffer(buf: Buffer): string {
+        if (buf[0] === 0x47 && buf[1] === 0x49 && buf[2] === 0x46) return '.gif'
+        if (buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4E && buf[3] === 0x47) return '.png'
+        if (buf[0] === 0xFF && buf[1] === 0xD8 && buf[2] === 0xFF) return '.jpg'
+        if (buf.length >= 12 && buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46
+            && buf[8] === 0x57 && buf[9] === 0x45 && buf[10] === 0x42 && buf[11] === 0x50) return '.webp'
+        return '.gif'
+    }
+
+    /** 构建多种密钥派生方式 */
+    private buildKeyTries(aesKey: string): { name: string; key: Buffer }[] {
+        const keyTries: { name: string; key: Buffer }[] = []
+        const hexStr = aesKey.replace(/\s/g, '')
+        if (hexStr.length >= 32 && /^[0-9a-fA-F]+$/.test(hexStr)) {
+            try {
+                const keyBuf = Buffer.from(hexStr.slice(0, 32), 'hex')
+                if (keyBuf.length === 16) keyTries.push({ name: 'hex-decode', key: keyBuf })
+            } catch { }
+            const rawKey = Buffer.from(hexStr.slice(0, 32), 'utf8')
+            if (rawKey.length === 32) keyTries.push({ name: 'raw-hex-str-32', key: rawKey })
+        }
+        if (aesKey.length >= 16) {
+            keyTries.push({ name: 'utf8-16', key: Buffer.from(aesKey, 'utf8').subarray(0, 16) })
+        }
+        keyTries.push({ name: 'md5', key: crypto.createHash('md5').update(aesKey).digest() })
+        try {
+            const b64Buf = Buffer.from(aesKey, 'base64')
+            if (b64Buf.length >= 16) keyTries.push({ name: 'base64', key: b64Buf.subarray(0, 16) })
+        } catch { }
+        return keyTries
+    }
+
+    /** 构建多种 GCM 数据布局 */
+    private buildGcmLayouts(encData: Buffer): { nonce: Buffer; ciphertext: Buffer; tag: Buffer }[] {
+        const layouts: { nonce: Buffer; ciphertext: Buffer; tag: Buffer }[] = []
+        // 格式 A：GcmData 块格式
+        if (encData.length > 63 && encData[0] === 0xAB && encData[8] === 0xAB && encData[9] === 0x00) {
+            const payloadSize = encData.readUInt32LE(10)
+            if (payloadSize > 16 && 63 + payloadSize <= encData.length) {
+                const nonce = encData.subarray(19, 31)
+                const payload = encData.subarray(63, 63 + payloadSize)
+                layouts.push({ nonce, ciphertext: payload.subarray(0, payload.length - 16), tag: payload.subarray(payload.length - 16) })
+            }
+        }
+        // 格式 B：尾部 [ciphertext][nonce 12B][tag 16B]
+        if (encData.length > 28) {
+            layouts.push({
+                ciphertext: encData.subarray(0, encData.length - 28),
+                nonce: encData.subarray(encData.length - 28, encData.length - 16),
+                tag: encData.subarray(encData.length - 16)
+            })
+        }
+        // 格式 C：前置 [nonce 12B][ciphertext][tag 16B]
+        if (encData.length > 28) {
+            layouts.push({
+                nonce: encData.subarray(0, 12),
+                ciphertext: encData.subarray(12, encData.length - 16),
+                tag: encData.subarray(encData.length - 16)
+            })
+        }
+        // 格式 D：零 nonce
+        if (encData.length > 16) {
+            layouts.push({
+                nonce: Buffer.alloc(12, 0),
+                ciphertext: encData.subarray(0, encData.length - 16),
+                tag: encData.subarray(encData.length - 16)
+            })
+        }
+        // 格式 E：[nonce 12B][tag 16B][ciphertext]
+        if (encData.length > 28) {
+            layouts.push({
+                nonce: encData.subarray(0, 12),
+                tag: encData.subarray(12, 28),
+                ciphertext: encData.subarray(28)
+            })
+        }
+        return layouts
+    }
+
+    /** 尝试 AES-GCM 解密 */
+    private tryGcmDecrypt(key: Buffer, nonce: Buffer, ciphertext: Buffer, tag: Buffer): Buffer | null {
+        try {
+            const algo = key.length === 32 ? 'aes-256-gcm' : 'aes-128-gcm'
+            const decipher = crypto.createDecipheriv(algo, key, nonce)
+            decipher.setAuthTag(tag)
+            const decrypted = Buffer.concat([decipher.update(ciphertext), decipher.final()])
+            if (this.isValidImageBuffer(decrypted)) return decrypted
+            for (const fn of [zlib.inflateSync, zlib.gunzipSync, zlib.unzipSync]) {
+                try {
+                    const d = fn(decrypted)
+                    if (this.isValidImageBuffer(d)) return d
+                } catch { }
+            }
+            return decrypted
+        } catch {
+            return null
+        }
+    }
+
+    /**
+     * 解密表情数据（多种算法 + 多种密钥派生）
+     * 移植自 ciphertalk 的逆向实现
+     */
+    private decryptEmojiAes(encData: Buffer, aesKey: string): Buffer | null {
+        if (encData.length <= 16) return null
+
+        const keyTries = this.buildKeyTries(aesKey)
+        const tag = encData.subarray(encData.length - 16)
+        const ciphertext = encData.subarray(0, encData.length - 16)
+
+        // 最高优先级：nonce-tail 格式 [ciphertext][nonce 12B][tag 16B]
+        if (encData.length > 28) {
+            const nonceTail = encData.subarray(encData.length - 28, encData.length - 16)
+            const tagTail = encData.subarray(encData.length - 16)
+            const cipherTail = encData.subarray(0, encData.length - 28)
+            for (const { key } of keyTries) {
+                if (key.length !== 16 && key.length !== 32) continue
+                const result = this.tryGcmDecrypt(key, nonceTail, cipherTail, tagTail)
+                if (result) return result
+            }
+        }
+
+        // 次优先级：nonce = key 前 12 字节
+        for (const { key } of keyTries) {
+            if (key.length !== 16 && key.length !== 32) continue
+            const nonce = key.subarray(0, 12)
+            const result = this.tryGcmDecrypt(key, nonce, ciphertext, tag)
+            if (result) return result
+        }
+
+        // 其他 GCM 布局
+        const layouts = this.buildGcmLayouts(encData)
+        for (const layout of layouts) {
+            for (const { key } of keyTries) {
+                if (key.length !== 16 && key.length !== 32) continue
+                const result = this.tryGcmDecrypt(key, layout.nonce, layout.ciphertext, layout.tag)
+                if (result) return result
+            }
+        }
+
+        // 回退：AES-128-CBC / AES-128-ECB
+        for (const { key } of keyTries) {
+            if (key.length !== 16) continue
+            // CBC：IV = key
+            if (encData.length >= 16 && encData.length % 16 === 0) {
+                try {
+                    const dec = crypto.createDecipheriv('aes-128-cbc', key, key)
+                    dec.setAutoPadding(true)
+                    const result = Buffer.concat([dec.update(encData), dec.final()])
+                    if (this.isValidImageBuffer(result)) return result
+                    for (const fn of [zlib.inflateSync, zlib.gunzipSync]) {
+                        try { const d = fn(result); if (this.isValidImageBuffer(d)) return d } catch { }
+                    }
+                } catch { }
+            }
+            // CBC：前 16 字节作为 IV
+            if (encData.length > 32) {
+                try {
+                    const iv = encData.subarray(0, 16)
+                    const dec = crypto.createDecipheriv('aes-128-cbc', key, iv)
+                    dec.setAutoPadding(true)
+                    const result = Buffer.concat([dec.update(encData.subarray(16)), dec.final()])
+                    if (this.isValidImageBuffer(result)) return result
+                } catch { }
+            }
+            // ECB
+            try {
+                const dec = crypto.createDecipheriv('aes-128-ecb', key, null)
+                dec.setAutoPadding(true)
+                const result = Buffer.concat([dec.update(encData), dec.final()])
+                if (this.isValidImageBuffer(result)) return result
+            } catch { }
+        }
+
+        return null
+    }
+
+    /** 下载原始数据到本地临时文件，支持重定向 */
+    private doDownloadRaw(targetUrl: string, cacheKey: string, cacheDir: string): Promise<string | null> {
+        return new Promise((resolve) => {
+            try {
+                const fs = require('fs')
+                const https = require('https')
+                const http = require('http')
+                let fixedUrl = targetUrl.replace(/&amp;/g, '&')
+                const urlObj = new URL(fixedUrl)
+                const protocol = fixedUrl.startsWith('https') ? https : http
+
+                const options = {
+                    headers: {
+                        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 MicroMessenger/7.0.20.1781(0x67001431)',
+                        'Accept': '*/*',
+                        'Connection': 'keep-alive'
+                    },
+                    rejectUnauthorized: false,
+                    timeout: 15000
+                }
+
+                const request = protocol.get(fixedUrl, options, (response: any) => {
+                    // 处理重定向
+                    if ([301, 302, 303, 307].includes(response.statusCode)) {
+                        const redirectUrl = response.headers.location
+                        if (redirectUrl) {
+                            const full = redirectUrl.startsWith('http') ? redirectUrl : `${urlObj.protocol}//${urlObj.host}${redirectUrl}`
+                            this.doDownloadRaw(full, cacheKey, cacheDir).then(resolve)
+                            return
+                        }
+                    }
+                    if (response.statusCode !== 200) { resolve(null); return }
+
+                    const chunks: Buffer[] = []
+                    response.on('data', (chunk: Buffer) => chunks.push(chunk))
+                    response.on('end', () => {
+                        const buffer = Buffer.concat(chunks)
+                        if (buffer.length === 0) { resolve(null); return }
+                        const ext = this.isValidImageBuffer(buffer) ? this.getImageExtFromBuffer(buffer) : '.bin'
+                        const filePath = join(cacheDir, `${cacheKey}${ext}`)
+                        try {
+                            fs.writeFileSync(filePath, buffer)
+                            resolve(filePath)
+                        } catch { resolve(null) }
+                    })
+                    response.on('error', () => resolve(null))
+                })
+                request.on('error', () => resolve(null))
+                request.setTimeout(15000, () => { request.destroy(); resolve(null) })
+            } catch { resolve(null) }
+        })
+    }
+
+    /**
+     * 下载朋友圈评论中的表情包（多种解密算法，移植自 ciphertalk）
+     */
+    async downloadSnsEmoji(url: string, encryptUrl?: string, aesKey?: string): Promise<{ success: boolean; localPath?: string; error?: string }> {
+        if (!url && !encryptUrl) return { success: false, error: 'url 不能为空' }
+
+        const fs = require('fs')
+        const cacheKey = crypto.createHash('md5').update(url || encryptUrl!).digest('hex')
+        const cachePath = this.configService.getCacheBasePath()
+        const emojiDir = join(cachePath, 'sns_emoji_cache')
+        if (!existsSync(emojiDir)) mkdirSync(emojiDir, { recursive: true })
+
+        // 检查本地缓存
+        for (const ext of ['.gif', '.png', '.webp', '.jpg', '.jpeg']) {
+            const filePath = join(emojiDir, `${cacheKey}${ext}`)
+            if (existsSync(filePath)) return { success: true, localPath: filePath }
+        }
+
+        // 保存解密后的图片
+        const saveDecrypted = (buf: Buffer): { success: boolean; localPath?: string } => {
+            const ext = this.isValidImageBuffer(buf) ? this.getImageExtFromBuffer(buf) : '.gif'
+            const filePath = join(emojiDir, `${cacheKey}${ext}`)
+            try { fs.writeFileSync(filePath, buf); return { success: true, localPath: filePath } }
+            catch { return { success: false } }
+        }
+
+        // 1. 优先：encryptUrl + aesKey
+        if (encryptUrl && aesKey) {
+            const encResult = await this.doDownloadRaw(encryptUrl, cacheKey + '_enc', emojiDir)
+            if (encResult) {
+                const encData = fs.readFileSync(encResult)
+                if (this.isValidImageBuffer(encData)) {
+                    const ext = this.getImageExtFromBuffer(encData)
+                    const filePath = join(emojiDir, `${cacheKey}${ext}`)
+                    fs.writeFileSync(filePath, encData)
+                    try { fs.unlinkSync(encResult) } catch { }
+                    return { success: true, localPath: filePath }
+                }
+                const decrypted = this.decryptEmojiAes(encData, aesKey)
+                if (decrypted) {
+                    try { fs.unlinkSync(encResult) } catch { }
+                    return saveDecrypted(decrypted)
+                }
+                try { fs.unlinkSync(encResult) } catch { }
+            }
+        }
+
+        // 2. 直接下载 url
+        if (url) {
+            const result = await this.doDownloadRaw(url, cacheKey, emojiDir)
+            if (result) {
+                const buf = fs.readFileSync(result)
+                if (this.isValidImageBuffer(buf)) return { success: true, localPath: result }
+                // 用 aesKey 解密
+                if (aesKey) {
+                    const decrypted = this.decryptEmojiAes(buf, aesKey)
+                    if (decrypted) {
+                        try { fs.unlinkSync(result) } catch { }
+                        return saveDecrypted(decrypted)
+                    }
+                }
+                try { fs.unlinkSync(result) } catch { }
+            }
+        }
+
+        return { success: false, error: '下载表情包失败' }
+    }
 }
 
 export const snsService = new SnsService()

electron/services/videoService.ts

@@ -1,5 +1,6 @@
 import { join } from 'path'
-import { existsSync, readdirSync, statSync, readFileSync } from 'fs'
+import { existsSync, readdirSync, statSync, readFileSync, appendFileSync, mkdirSync } from 'fs'
+import { app } from 'electron'
 import { ConfigService } from './config'
 import Database from 'better-sqlite3'
 import { wcdbService } from './wcdbService'
@@ -18,6 +19,16 @@ class VideoService {
         this.configService = new ConfigService()
     }
 
+    private log(message: string, meta?: Record<string, unknown>): void {
+        try {
+            const timestamp = new Date().toISOString()
+            const metaStr = meta ? ` ${JSON.stringify(meta)}` : ''
+            const logDir = join(app.getPath('userData'), 'logs')
+            if (!existsSync(logDir)) mkdirSync(logDir, { recursive: true })
+            appendFileSync(join(logDir, 'wcdb.log'), `[${timestamp}] [VideoService] ${message}${metaStr}\n`, 'utf8')
+        } catch {}
+    }
+
     /**
      * 获取数据库根目录
      */
@@ -69,7 +80,12 @@ class VideoService {
         const wxid = this.getMyWxid()
         const cleanedWxid = this.cleanWxid(wxid)
 
-        if (!wxid) return undefined
+        this.log('queryVideoFileName 开始', { md5, wxid, cleanedWxid, cachePath, dbPath })
+
+        if (!wxid) {
+            this.log('queryVideoFileName: wxid 为空')
+            return undefined
+        }
 
         // 方法1：优先在 cachePath 下查找解密后的 hardlink.db
         if (cachePath) {
@@ -84,6 +100,7 @@ class VideoService {
             for (const p of cacheDbPaths) {
                 if (existsSync(p)) {
                     try {
+                        this.log('尝试缓存 hardlink.db', { path: p })
                         const db = new Database(p, { readonly: true })
                         const row = db.prepare(`
                             SELECT file_name, md5 FROM video_hardlink_info_v4
@@ -94,10 +111,12 @@ class VideoService {
 
                         if (row?.file_name) {
                             const realMd5 = row.file_name.replace(/\.[^.]+$/, '')
+                            this.log('缓存 hardlink.db 命中', { file_name: row.file_name, realMd5 })
                             return realMd5
                         }
+                        this.log('缓存 hardlink.db 未命中', { path: p })
                     } catch (e) {
-                        // 忽略错误
+                        this.log('缓存 hardlink.db 查询失败', { path: p, error: String(e) })
                     }
                 }
             }
@@ -105,7 +124,6 @@ class VideoService {
 
         // 方法2：使用 wcdbService.execQuery 查询加密的 hardlink.db
         if (dbPath) {
-            // 检查 dbPath 是否已经包含 wxid
             const dbPathLower = dbPath.toLowerCase()
             const wxidLower = wxid.toLowerCase()
             const cleanedWxidLower = cleanedWxid.toLowerCase()
@@ -113,10 +131,8 @@ class VideoService {
 
             const encryptedDbPaths: string[] = []
             if (dbPathContainsWxid) {
-                // dbPath 已包含 wxid，不需要再拼接
                 encryptedDbPaths.push(join(dbPath, 'db_storage', 'hardlink', 'hardlink.db'))
             } else {
-                // dbPath 不包含 wxid，需要拼接
                 encryptedDbPaths.push(join(dbPath, wxid, 'db_storage', 'hardlink', 'hardlink.db'))
                 encryptedDbPaths.push(join(dbPath, cleanedWxid, 'db_storage', 'hardlink', 'hardlink.db'))
             }
@@ -124,27 +140,29 @@ class VideoService {
             for (const p of encryptedDbPaths) {
                 if (existsSync(p)) {
                     try {
+                        this.log('尝试加密 hardlink.db', { path: p })
                         const escapedMd5 = md5.replace(/'/g, "''")
-
-                        // 用 md5 字段查询，获取 file_name
                         const sql = `SELECT file_name FROM video_hardlink_info_v4 WHERE md5 = '${escapedMd5}' LIMIT 1`
-
                         const result = await wcdbService.execQuery('media', p, sql)
 
                         if (result.success && result.rows && result.rows.length > 0) {
                             const row = result.rows[0]
                             if (row?.file_name) {
-                                // 提取不带扩展名的文件名作为实际视频 MD5
                                 const realMd5 = String(row.file_name).replace(/\.[^.]+$/, '')
+                                this.log('加密 hardlink.db 命中', { file_name: row.file_name, realMd5 })
                                 return realMd5
                             }
                         }
+                        this.log('加密 hardlink.db 未命中', { path: p, result: JSON.stringify(result).slice(0, 200) })
                     } catch (e) {
-                        // 忽略错误
+                        this.log('加密 hardlink.db 查询失败', { path: p, error: String(e) })
                     }
+                } else {
+                    this.log('加密 hardlink.db 不存在', { path: p })
                 }
             }
         }
+        this.log('queryVideoFileName: 所有方法均未找到', { md5 })
         return undefined
     }
 
@@ -170,12 +188,16 @@ class VideoService {
         const dbPath = this.getDbPath()
         const wxid = this.getMyWxid()
 
+        this.log('getVideoInfo 开始', { videoMd5, dbPath, wxid })
+
         if (!dbPath || !wxid || !videoMd5) {
+            this.log('getVideoInfo: 参数缺失', { dbPath: !!dbPath, wxid: !!wxid, videoMd5: !!videoMd5 })
             return { exists: false }
         }
 
         // 先尝试从数据库查询真正的视频文件名
         const realVideoMd5 = await this.queryVideoFileName(videoMd5) || videoMd5
+        this.log('realVideoMd5', { input: videoMd5, resolved: realVideoMd5, changed: realVideoMd5 !== videoMd5 })
 
         // 检查 dbPath 是否已经包含 wxid，避免重复拼接
         const dbPathLower = dbPath.toLowerCase()
@@ -184,50 +206,89 @@ class VideoService {
 
         let videoBaseDir: string
         if (dbPathLower.includes(wxidLower) || dbPathLower.includes(cleanedWxid.toLowerCase())) {
-            // dbPath 已经包含 wxid，直接使用
             videoBaseDir = join(dbPath, 'msg', 'video')
         } else {
-            // dbPath 不包含 wxid，需要拼接
             videoBaseDir = join(dbPath, wxid, 'msg', 'video')
         }
 
+        this.log('videoBaseDir', { videoBaseDir, exists: existsSync(videoBaseDir) })
+
         if (!existsSync(videoBaseDir)) {
+            this.log('getVideoInfo: videoBaseDir 不存在')
             return { exists: false }
         }
 
         // 遍历年月目录查找视频文件
         try {
             const allDirs = readdirSync(videoBaseDir)
-
-            // 支持多种目录格式: YYYY-MM, YYYYMM, 或其他
             const yearMonthDirs = allDirs
                 .filter(dir => {
                     const dirPath = join(videoBaseDir, dir)
                     return statSync(dirPath).isDirectory()
                 })
-                .sort((a, b) => b.localeCompare(a)) // 从最新的目录开始查找
+                .sort((a, b) => b.localeCompare(a))
+
+            this.log('扫描目录', { dirs: yearMonthDirs })
 
             for (const yearMonth of yearMonthDirs) {
                 const dirPath = join(videoBaseDir, yearMonth)
-
                 const videoPath = join(dirPath, `${realVideoMd5}.mp4`)
-                const coverPath = join(dirPath, `${realVideoMd5}.jpg`)
-                const thumbPath = join(dirPath, `${realVideoMd5}_thumb.jpg`)
 
-                // 检查视频文件是否存在
                 if (existsSync(videoPath)) {
+                    // 封面/缩略图使用不带 _raw 后缀的基础名（自己发的视频文件名带 _raw，但封面不带）
+                    const baseMd5 = realVideoMd5.replace(/_raw$/, '')
+                    const coverPath = join(dirPath, `${baseMd5}.jpg`)
+                    const thumbPath = join(dirPath, `${baseMd5}_thumb.jpg`)
+
+                    // 列出同目录下与该 md5 相关的所有文件，帮助排查封面命名
+                    const allFiles = readdirSync(dirPath)
+                    const relatedFiles = allFiles.filter(f => f.toLowerCase().startsWith(realVideoMd5.slice(0, 8).toLowerCase()))
+                    this.log('找到视频，相关文件列表', {
+                        videoPath,
+                        coverExists: existsSync(coverPath),
+                        thumbExists: existsSync(thumbPath),
+                        relatedFiles,
+                        coverPath,
+                        thumbPath
+                    })
+
                     return {
-                        videoUrl: videoPath,  // 返回文件路径，前端通过 readFile 读取
+                        videoUrl: videoPath,
                         coverUrl: this.fileToDataUrl(coverPath, 'image/jpeg'),
                         thumbUrl: this.fileToDataUrl(thumbPath, 'image/jpeg'),
                         exists: true
                     }
                 }
             }
+
+            // 没找到，列出所有目录里的 mp4 文件帮助排查（最多每目录 10 个）
+            this.log('未找到视频，开始全目录扫描', {
+                lookingForOriginal: `${videoMd5}.mp4`,
+                lookingForResolved: `${realVideoMd5}.mp4`,
+                hardlinkResolved: realVideoMd5 !== videoMd5
+            })
+            for (const yearMonth of yearMonthDirs) {
+                const dirPath = join(videoBaseDir, yearMonth)
+                try {
+                    const allFiles = readdirSync(dirPath)
+                    const mp4Files = allFiles.filter(f => f.endsWith('.mp4')).slice(0, 10)
+                    // 检查原始 md5 是否部分匹配（前8位）
+                    const partialMatch = mp4Files.filter(f => f.toLowerCase().startsWith(videoMd5.slice(0, 8).toLowerCase()))
+                    this.log(`目录 ${yearMonth} 扫描结果`, {
+                        totalFiles: allFiles.length,
+                        mp4Count: allFiles.filter(f => f.endsWith('.mp4')).length,
+                        sampleMp4: mp4Files,
+                        partialMatchByOriginalMd5: partialMatch
+                    })
+                } catch (e) {
+                    this.log(`目录 ${yearMonth} 读取失败`, { error: String(e) })
+                }
+            }
         } catch (e) {
-            // 忽略错误
+            this.log('getVideoInfo 遍历出错', { error: String(e) })
         }
 
+        this.log('getVideoInfo: 未找到视频', { videoMd5, realVideoMd5 })
         return { exists: false }
     }
 
@@ -235,41 +296,59 @@ class VideoService {
      * 根据消息内容解析视频MD5
      */
     parseVideoMd5(content: string): string | undefined {
-
-        // 打印前500字符看看 XML 结构
-
         if (!content) return undefined
 
+        // 打印原始 XML 前 800 字符，帮助排查自己发的视频结构
+        this.log('parseVideoMd5 原始内容', { preview: content.slice(0, 800) })
+
         try {
-            // 提取所有可能的 md5 值进行日志
-            const allMd5s: string[] = []
-            const md5Regex = /(?:md5|rawmd5|newmd5|originsourcemd5)\s*=\s*['"]([a-fA-F0-9]+)['"]/gi
+            // 收集所有 md5 相关属性，方便对比
+            const allMd5Attrs: string[] = []
+            const md5Regex = /(?:md5|rawmd5|newmd5|originsourcemd5)\s*=\s*['"]([a-fA-F0-9]*)['"]/gi
             let match
             while ((match = md5Regex.exec(content)) !== null) {
-                allMd5s.push(`${match[0]}`)
+                allMd5Attrs.push(match[0])
+            }
+            this.log('parseVideoMd5 所有 md5 属性', { attrs: allMd5Attrs })
+
+            // 方法1：从 <videomsg md5="..."> 提取（收到的视频）
+            const videoMsgMd5Match = /<videomsg[^>]*\smd5\s*=\s*['"]([a-fA-F0-9]+)['"]/i.exec(content)
+            if (videoMsgMd5Match) {
+                this.log('parseVideoMd5 命中 videomsg md5 属性', { md5: videoMsgMd5Match[1] })
+                return videoMsgMd5Match[1].toLowerCase()
             }
 
-            // 提取 md5（用于查询 hardlink.db）
-            // 注意：不是 rawmd5，rawmd5 是另一个值
-            // 格式: md5="xxx" 或 <md5>xxx</md5>
-
-            // 尝试从videomsg标签中提取md5
-            const videoMsgMatch = /<videomsg[^>]*\smd5\s*=\s*['"]([a-fA-F0-9]+)['"]/i.exec(content)
-            if (videoMsgMatch) {
-                return videoMsgMatch[1].toLowerCase()
+            // 方法2：从 <videomsg rawmd5="..."> 提取（自己发的视频，没有 md5 只有 rawmd5）
+            const rawMd5Match = /<videomsg[^>]*\srawmd5\s*=\s*['"]([a-fA-F0-9]+)['"]/i.exec(content)
+            if (rawMd5Match) {
+                this.log('parseVideoMd5 命中 videomsg rawmd5 属性（自发视频）', { rawmd5: rawMd5Match[1] })
+                return rawMd5Match[1].toLowerCase()
             }
 
-            const attrMatch = /\smd5\s*=\s*['"]([a-fA-F0-9]+)['"]/i.exec(content)
+            // 方法3：任意属性 md5="..."（非 rawmd5/cdnthumbaeskey 等）
+            const attrMatch = /(?<![a-z])md5\s*=\s*['"]([a-fA-F0-9]+)['"]/i.exec(content)
             if (attrMatch) {
+                this.log('parseVideoMd5 命中通用 md5 属性', { md5: attrMatch[1] })
                 return attrMatch[1].toLowerCase()
             }
 
-            const md5Match = /<md5>([a-fA-F0-9]+)<\/md5>/i.exec(content)
-            if (md5Match) {
-                return md5Match[1].toLowerCase()
+            // 方法4：<md5>...</md5> 标签
+            const md5TagMatch = /<md5>([a-fA-F0-9]+)<\/md5>/i.exec(content)
+            if (md5TagMatch) {
+                this.log('parseVideoMd5 命中 md5 标签', { md5: md5TagMatch[1] })
+                return md5TagMatch[1].toLowerCase()
             }
+
+            // 方法5：兜底取 rawmd5 属性（任意位置）
+            const rawMd5Fallback = /\srawmd5\s*=\s*['"]([a-fA-F0-9]+)['"]/i.exec(content)
+            if (rawMd5Fallback) {
+                this.log('parseVideoMd5 兜底命中 rawmd5', { rawmd5: rawMd5Fallback[1] })
+                return rawMd5Fallback[1].toLowerCase()
+            }
+
+            this.log('parseVideoMd5 未提取到任何 md5', { contentLength: content.length })
         } catch (e) {
-            console.error('[VideoService] 解析视频MD5失败:', e)
+            this.log('parseVideoMd5 异常', { error: String(e) })
         }
 
         return undefined

electron/services/voiceTranscribeService.ts

@@ -458,8 +458,18 @@ export class VoiceTranscribeService {
 
         writer.on('error', (err) => {
           clearInterval(speedInterval)
+          // 确保在错误情况下也关闭文件句柄
+          writer.destroy()
           reject(err)
         })
+
+        response.on('error', (err) => {
+          clearInterval(speedInterval)
+          // 确保在响应错误时也关闭文件句柄
+          writer.destroy()
+          reject(err)
+        })
+
         response.pipe(writer)
       })
       request.on('error', reject)

electron/services/wcdbCore.ts

@@ -3,6 +3,48 @@ import { appendFileSync, existsSync, mkdirSync, readdirSync, statSync, readFileS
 
 // DLL 初始化错误信息，用于帮助用户诊断问题
 let lastDllInitError: string | null = null
+
+/**
+ * 解析 extra_buffer（protobuf）中的免打扰状态
+ * - field 12 (tag 0x60): 值非0 = 免打扰
+ * 折叠状态通过 contact.flag & 0x10000000 判断
+ */
+function parseExtraBuffer(raw: Buffer | string | null | undefined): { isMuted: boolean } {
+  if (!raw) return { isMuted: false }
+  // execQuery 返回的 BLOB 列是十六进制字符串，需要先解码
+  const buf: Buffer = typeof raw === 'string' ? Buffer.from(raw, 'hex') : raw
+  if (buf.length === 0) return { isMuted: false }
+  let isMuted = false
+  let i = 0
+  const len = buf.length
+
+  const readVarint = (): number => {
+    let result = 0, shift = 0
+    while (i < len) {
+      const b = buf[i++]
+      result |= (b & 0x7f) << shift
+      shift += 7
+      if (!(b & 0x80)) break
+    }
+    return result
+  }
+
+  while (i < len) {
+    const tag = readVarint()
+    const fieldNum = tag >>> 3
+    const wireType = tag & 0x07
+    if (wireType === 0) {
+      const val = readVarint()
+      if (fieldNum === 12 && val !== 0) isMuted = true
+    } else if (wireType === 2) {
+      const sz = readVarint()
+      i += sz
+    } else if (wireType === 5) { i += 4
+    } else if (wireType === 1) { i += 8
+    } else { break }
+  }
+  return { isMuted }
+}
 export function getLastDllInitError(): string | null {
   return lastDllInitError
 }
@@ -41,6 +83,7 @@ export class WcdbCore {
   private wcdbGetMessageTables: any = null
   private wcdbGetMessageMeta: any = null
   private wcdbGetContact: any = null
+  private wcdbGetContactStatus: any = null
   private wcdbGetMessageTableStats: any = null
   private wcdbGetAggregateStats: any = null
   private wcdbGetAvailableYears: any = null
@@ -63,6 +106,10 @@ export class WcdbCore {
   private wcdbGetVoiceData: any = null
   private wcdbGetSnsTimeline: any = null
   private wcdbGetSnsAnnualStats: any = null
+  private wcdbInstallSnsBlockDeleteTrigger: any = null
+  private wcdbUninstallSnsBlockDeleteTrigger: any = null
+  private wcdbCheckSnsBlockDeleteTrigger: any = null
+  private wcdbDeleteSnsPost: any = null
   private wcdbVerifyUser: any = null
   private wcdbStartMonitorPipe: any = null
   private wcdbStopMonitorPipe: any = null
@@ -483,6 +530,13 @@ export class WcdbCore {
       // wcdb_status wcdb_get_contact(wcdb_handle handle, const char* username, char** out_json)
       this.wcdbGetContact = this.lib.func('int32 wcdb_get_contact(int64 handle, const char* username, _Out_ void** outJson)')
 
+      // wcdb_status wcdb_get_contact_status(wcdb_handle handle, const char* usernames_json, char** out_json)
+      try {
+        this.wcdbGetContactStatus = this.lib.func('int32 wcdb_get_contact_status(int64 handle, const char* usernamesJson, _Out_ void** outJson)')
+      } catch {
+        this.wcdbGetContactStatus = null
+      }
+
       // wcdb_status wcdb_get_message_table_stats(wcdb_handle handle, const char* session_id, char** out_json)
       this.wcdbGetMessageTableStats = this.lib.func('int32 wcdb_get_message_table_stats(int64 handle, const char* sessionId, _Out_ void** outJson)')
 
@@ -600,6 +654,34 @@ export class WcdbCore {
         this.wcdbGetSnsAnnualStats = null
       }
 
+      // wcdb_status wcdb_install_sns_block_delete_trigger(wcdb_handle handle, char** out_error)
+      try {
+        this.wcdbInstallSnsBlockDeleteTrigger = this.lib.func('int32 wcdb_install_sns_block_delete_trigger(int64 handle, _Out_ void** outError)')
+      } catch {
+        this.wcdbInstallSnsBlockDeleteTrigger = null
+      }
+
+      // wcdb_status wcdb_uninstall_sns_block_delete_trigger(wcdb_handle handle, char** out_error)
+      try {
+        this.wcdbUninstallSnsBlockDeleteTrigger = this.lib.func('int32 wcdb_uninstall_sns_block_delete_trigger(int64 handle, _Out_ void** outError)')
+      } catch {
+        this.wcdbUninstallSnsBlockDeleteTrigger = null
+      }
+
+      // wcdb_status wcdb_check_sns_block_delete_trigger(wcdb_handle handle, int32_t* out_installed)
+      try {
+        this.wcdbCheckSnsBlockDeleteTrigger = this.lib.func('int32 wcdb_check_sns_block_delete_trigger(int64 handle, _Out_ int32* outInstalled)')
+      } catch {
+        this.wcdbCheckSnsBlockDeleteTrigger = null
+      }
+
+      // wcdb_status wcdb_delete_sns_post(wcdb_handle handle, const char* post_id, char** out_error)
+      try {
+        this.wcdbDeleteSnsPost = this.lib.func('int32 wcdb_delete_sns_post(int64 handle, const char* postId, _Out_ void** outError)')
+      } catch {
+        this.wcdbDeleteSnsPost = null
+      }
+
       // Named pipe IPC for monitoring (replaces callback)
       try {
         this.wcdbStartMonitorPipe = this.lib.func('int32 wcdb_start_monitor_pipe()')
@@ -1024,7 +1106,7 @@ export class WcdbCore {
     }
     try {
       // 1. 打开游标 (使用 Ascending=1 从指定时间往后查)
-      const openRes = await this.openMessageCursorLite(sessionId, limit, true, minTime, 0)
+      const openRes = await this.openMessageCursor(sessionId, limit, true, minTime, 0)
       if (!openRes.success || !openRes.cursor) {
         return { success: false, error: openRes.error }
       }
@@ -1338,6 +1420,36 @@ export class WcdbCore {
     }
   }
 
+  async getContactStatus(usernames: string[]): Promise<{ success: boolean; map?: Record<string, { isFolded: boolean; isMuted: boolean }>; error?: string }> {
+    if (!this.ensureReady()) {
+      return { success: false, error: 'WCDB 未连接' }
+    }
+    try {
+      // 分批查询，避免 SQL 过长（execQuery 不支持参数绑定，直接拼 SQL）
+      const BATCH = 200
+      const map: Record<string, { isFolded: boolean; isMuted: boolean }> = {}
+      for (let i = 0; i < usernames.length; i += BATCH) {
+        const batch = usernames.slice(i, i + BATCH)
+        const inList = batch.map(u => `'${u.replace(/'/g, "''")}'`).join(',')
+        const sql = `SELECT username, flag, extra_buffer FROM contact WHERE username IN (${inList})`
+        const result = await this.execQuery('contact', null, sql)
+        if (!result.success || !result.rows) continue
+        for (const row of result.rows) {
+          const uname: string = row.username
+          // 折叠：flag bit 28 (0x10000000)
+          const flag = parseInt(row.flag ?? '0', 10)
+          const isFolded = (flag & 0x10000000) !== 0
+          // 免打扰：extra_buffer field 12 非0
+          const { isMuted } = parseExtraBuffer(row.extra_buffer)
+          map[uname] = { isFolded, isMuted }
+        }
+      }
+      return { success: true, map }
+    } catch (e) {
+      return { success: false, error: String(e) }
+    }
+  }
+
   async getAggregateStats(sessionIds: string[], beginTimestamp: number = 0, endTimestamp: number = 0): Promise<{ success: boolean; data?: any; error?: string }> {
     if (!this.ensureReady()) {
       return { success: false, error: 'WCDB 未连接' }
@@ -1620,12 +1732,20 @@ export class WcdbCore {
     }
   }
 
-  async execQuery(kind: string, path: string | null, sql: string): Promise<{ success: boolean; rows?: any[]; error?: string }> {
+  async execQuery(kind: string, path: string | null, sql: string, params: any[] = []): Promise<{ success: boolean; rows?: any[]; error?: string }> {
     if (!this.ensureReady()) {
       return { success: false, error: 'WCDB 未连接' }
     }
     try {
       if (!this.wcdbExecQuery) return { success: false, error: '接口未就绪' }
+      
+      // 如果提供了参数，使用参数化查询（需要 C++ 层支持）
+      // 注意：当前 wcdbExecQuery 可能不支持参数化，这是一个占位符实现
+      // TODO: 需要更新 C++ 层的 wcdb_exec_query 以支持参数绑定
+      if (params && params.length > 0) {
+        console.warn('[wcdbCore] execQuery: 参数化查询暂未在 C++ 层实现，将使用原始 SQL（可能存在注入风险）')
+      }
+      
       const outPtr = [null as any]
       const result = this.wcdbExecQuery(this.handle, kind, path || '', sql, outPtr)
       if (result !== 0 || !outPtr[0]) {
@@ -1805,6 +1925,94 @@ export class WcdbCore {
       return { success: false, error: String(e) }
     }
   }
+  /**
+   * 为朋友圈安装删除
+   */
+  async installSnsBlockDeleteTrigger(): Promise<{ success: boolean; alreadyInstalled?: boolean; error?: string }> {
+    if (!this.ensureReady()) return { success: false, error: 'WCDB 未连接' }
+    if (!this.wcdbInstallSnsBlockDeleteTrigger) return { success: false, error: '当前 DLL 版本不支持此功能' }
+    try {
+      const outPtr = [null]
+      const status = this.wcdbInstallSnsBlockDeleteTrigger(this.handle, outPtr)
+      let msg = ''
+      if (outPtr[0]) {
+        try { msg = this.koffi.decode(outPtr[0], 'char', -1) } catch { }
+        try { this.wcdbFreeString(outPtr[0]) } catch { }
+      }
+      if (status === 1) {
+        // DLL 返回 1 表示已安装
+        return { success: true, alreadyInstalled: true }
+      }
+      if (status !== 0) {
+        return { success: false, error: msg || `DLL error ${status}` }
+      }
+      return { success: true, alreadyInstalled: false }
+    } catch (e) {
+      return { success: false, error: String(e) }
+    }
+  }
+
+  /**
+   * 关闭朋友圈删除拦截
+   */
+  async uninstallSnsBlockDeleteTrigger(): Promise<{ success: boolean; error?: string }> {
+    if (!this.ensureReady()) return { success: false, error: 'WCDB 未连接' }
+    if (!this.wcdbUninstallSnsBlockDeleteTrigger) return { success: false, error: '当前 DLL 版本不支持此功能' }
+    try {
+      const outPtr = [null]
+      const status = this.wcdbUninstallSnsBlockDeleteTrigger(this.handle, outPtr)
+      let msg = ''
+      if (outPtr[0]) {
+        try { msg = this.koffi.decode(outPtr[0], 'char', -1) } catch { }
+        try { this.wcdbFreeString(outPtr[0]) } catch { }
+      }
+      if (status !== 0) {
+        return { success: false, error: msg || `DLL error ${status}` }
+      }
+      return { success: true }
+    } catch (e) {
+      return { success: false, error: String(e) }
+    }
+  }
+
+  /**
+   * 查询朋友圈删除拦截是否已安装
+   */
+  async checkSnsBlockDeleteTrigger(): Promise<{ success: boolean; installed?: boolean; error?: string }> {
+    if (!this.ensureReady()) return { success: false, error: 'WCDB 未连接' }
+    if (!this.wcdbCheckSnsBlockDeleteTrigger) return { success: false, error: '当前 DLL 版本不支持此功能' }
+    try {
+      const outInstalled = [0]
+      const status = this.wcdbCheckSnsBlockDeleteTrigger(this.handle, outInstalled)
+      if (status !== 0) {
+        return { success: false, error: `DLL error ${status}` }
+      }
+      return { success: true, installed: outInstalled[0] === 1 }
+    } catch (e) {
+      return { success: false, error: String(e) }
+    }
+  }
+
+  async deleteSnsPost(postId: string): Promise<{ success: boolean; error?: string }> {
+    if (!this.ensureReady()) return { success: false, error: 'WCDB 未连接' }
+    if (!this.wcdbDeleteSnsPost) return { success: false, error: '当前 DLL 版本不支持此功能' }
+    try {
+      const outPtr = [null]
+      const status = this.wcdbDeleteSnsPost(this.handle, postId, outPtr)
+      let msg = ''
+      if (outPtr[0]) {
+        try { msg = this.koffi.decode(outPtr[0], 'char', -1) } catch { }
+        try { this.wcdbFreeString(outPtr[0]) } catch { }
+      }
+      if (status !== 0) {
+        return { success: false, error: msg || `DLL error ${status}` }
+      }
+      return { success: true }
+    } catch (e) {
+      return { success: false, error: String(e) }
+    }
+  }
+
   async getDualReportStats(sessionId: string, beginTimestamp: number = 0, endTimestamp: number = 0): Promise<{ success: boolean; data?: any; error?: string }> {
     if (!this.ensureReady()) {
       return { success: false, error: 'WCDB 未连接' }

electron/services/wcdbService.ts

@@ -290,6 +290,13 @@ export class WcdbService {
     return this.callWorker('getContact', { username })
   }
 
+  /**
+   * 批量获取联系人 extra_buffer 状态（isFolded/isMuted）
+   */
+  async getContactStatus(usernames: string[]): Promise<{ success: boolean; map?: Record<string, { isFolded: boolean; isMuted: boolean }>; error?: string }> {
+    return this.callWorker('getContactStatus', { usernames })
+  }
+
   /**
    * 获取聚合统计数据
    */
@@ -361,10 +368,10 @@ export class WcdbService {
   }
 
   /**
-   * 执行 SQL 查询
+   * 执行 SQL 查询（支持参数化查询）
    */
-  async execQuery(kind: string, path: string | null, sql: string): Promise<{ success: boolean; rows?: any[]; error?: string }> {
-    return this.callWorker('execQuery', { kind, path, sql })
+  async execQuery(kind: string, path: string | null, sql: string, params: any[] = []): Promise<{ success: boolean; rows?: any[]; error?: string }> {
+    return this.callWorker('execQuery', { kind, path, sql, params })
   }
 
   /**
@@ -416,6 +423,34 @@ export class WcdbService {
     return this.callWorker('getSnsAnnualStats', { beginTimestamp, endTimestamp })
   }
 
+  /**
+   * 安装朋友圈删除拦截
+   */
+  async installSnsBlockDeleteTrigger(): Promise<{ success: boolean; alreadyInstalled?: boolean; error?: string }> {
+    return this.callWorker('installSnsBlockDeleteTrigger')
+  }
+
+  /**
+   * 卸载朋友圈删除拦截
+   */
+  async uninstallSnsBlockDeleteTrigger(): Promise<{ success: boolean; error?: string }> {
+    return this.callWorker('uninstallSnsBlockDeleteTrigger')
+  }
+
+  /**
+   * 查询朋友圈删除拦截是否已安装
+   */
+  async checkSnsBlockDeleteTrigger(): Promise<{ success: boolean; installed?: boolean; error?: string }> {
+    return this.callWorker('checkSnsBlockDeleteTrigger')
+  }
+
+  /**
+   * 从数据库直接删除朋友圈记录
+   */
+  async deleteSnsPost(postId: string): Promise<{ success: boolean; error?: string }> {
+    return this.callWorker('deleteSnsPost', { postId })
+  }
+
   /**
    * 获取 DLL 内部日志
    */

electron/utils/LRUCache.ts

@@ -0,0 +1,114 @@
+/**
+ * LRU (Least Recently Used) Cache implementation for memory management
+ */
+export class LRUCache<K, V> {
+  private cache: Map<K, V>
+  private maxSize: number
+
+  constructor(maxSize: number = 100) {
+    this.maxSize = maxSize
+    this.cache = new Map()
+  }
+
+  /**
+   * Get value from cache
+   */
+  get(key: K): V | undefined {
+    const value = this.cache.get(key)
+    if (value !== undefined) {
+      // Move to end (most recently used)
+      this.cache.delete(key)
+      this.cache.set(key, value)
+    }
+    return value
+  }
+
+  /**
+   * Set value in cache
+   */
+  set(key: K, value: V): void {
+    if (this.cache.has(key)) {
+      // Update existing
+      this.cache.delete(key)
+    } else if (this.cache.size >= this.maxSize) {
+      // Remove least recently used (first item)
+      const firstKey = this.cache.keys().next().value
+      if (firstKey !== undefined) {
+        this.cache.delete(firstKey)
+      }
+    }
+    this.cache.set(key, value)
+  }
+
+  /**
+   * Check if key exists
+   */
+  has(key: K): boolean {
+    return this.cache.has(key)
+  }
+
+  /**
+   * Delete key from cache
+   */
+  delete(key: K): boolean {
+    return this.cache.delete(key)
+  }
+
+  /**
+   * Clear all cache entries
+   */
+  clear(): void {
+    this.cache.clear()
+  }
+
+  /**
+   * Get current cache size
+   */
+  get size(): number {
+    return this.cache.size
+  }
+
+  /**
+   * Get all keys (for debugging)
+   */
+  keys(): IterableIterator<K> {
+    return this.cache.keys()
+  }
+
+  /**
+   * Get all values (for debugging)
+   */
+  values(): IterableIterator<V> {
+    return this.cache.values()
+  }
+
+  /**
+   * Get all entries (for iteration support)
+   */
+  entries(): IterableIterator<[K, V]> {
+    return this.cache.entries()
+  }
+
+  /**
+   * Make LRUCache iterable (for...of support)
+   */
+  [Symbol.iterator](): IterableIterator<[K, V]> {
+    return this.cache.entries()
+  }
+
+  /**
+   * Force cleanup (optional method for explicit memory management)
+   */
+  cleanup(): void {
+    // In JavaScript/TypeScript, this is mainly for consistency
+    // The garbage collector will handle actual memory cleanup
+    if (this.cache.size > this.maxSize * 1.5) {
+      // Emergency cleanup if cache somehow exceeds limit
+      const entries = Array.from(this.cache.entries())
+      this.cache.clear()
+      // Keep only the most recent half
+      const keepEntries = entries.slice(-Math.floor(this.maxSize / 2))
+      keepEntries.forEach(([key, value]) => this.cache.set(key, value))
+    }
+  }
+}

electron/wcdbWorker.ts

@@ -87,6 +87,9 @@ if (parentPort) {
                 case 'getContact':
                     result = await core.getContact(payload.username)
                     break
+                case 'getContactStatus':
+                    result = await core.getContactStatus(payload.usernames)
+                    break
                 case 'getAggregateStats':
                     result = await core.getAggregateStats(payload.sessionIds, payload.beginTimestamp, payload.endTimestamp)
                     break
@@ -118,7 +121,7 @@ if (parentPort) {
                     result = await core.closeMessageCursor(payload.cursor)
                     break
                 case 'execQuery':
-                    result = await core.execQuery(payload.kind, payload.path, payload.sql)
+                    result = await core.execQuery(payload.kind, payload.path, payload.sql, payload.params)
                     break
                 case 'getEmoticonCdnUrl':
                     result = await core.getEmoticonCdnUrl(payload.dbPath, payload.md5)
@@ -144,6 +147,18 @@ if (parentPort) {
                 case 'getSnsAnnualStats':
                     result = await core.getSnsAnnualStats(payload.beginTimestamp, payload.endTimestamp)
                     break
+                case 'installSnsBlockDeleteTrigger':
+                    result = await core.installSnsBlockDeleteTrigger()
+                    break
+                case 'uninstallSnsBlockDeleteTrigger':
+                    result = await core.uninstallSnsBlockDeleteTrigger()
+                    break
+                case 'checkSnsBlockDeleteTrigger':
+                    result = await core.checkSnsBlockDeleteTrigger()
+                    break
+                case 'deleteSnsPost':
+                    result = await core.deleteSnsPost(payload.postId)
+                    break
                 case 'getLogs':
                     result = await core.getLogs()
                     break

package-lock.json

@@ -9823,9 +9823,6 @@
         "sherpa-onnx-win-x64": "^1.12.23"
       }
     },
-    "node_modules/sherpa-onnx-node/node_modules/sherpa-onnx-darwin-x64": {
-      "optional": true
-    },
     "node_modules/sherpa-onnx-win-ia32": {
       "version": "1.12.23",
       "resolved": "https://registry.npmmirror.com/sherpa-onnx-win-ia32/-/sherpa-onnx-win-ia32-1.12.23.tgz",

public/splash.html

@@ -0,0 +1,249 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>WeFlow</title>
+  <style>
+    * { margin: 0; padding: 0; box-sizing: border-box; }
+
+    html, body {
+      width: 100%; height: 100%;
+      background: transparent;
+      overflow: hidden;
+      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Microsoft YaHei', sans-serif;
+      user-select: none;
+      -webkit-app-region: drag;
+    }
+
+    .splash {
+      width: 100%; height: 100%;
+      border-radius: 20px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    /* 品牌区 */
+    .brand {
+      padding: 48px 52px 0;
+      display: flex;
+      align-items: center;
+      gap: 18px;
+      animation: fadeIn 0.4s ease both;
+    }
+    .logo {
+      width: 56px; height: 56px;
+      border-radius: 14px;
+      flex-shrink: 0;
+    }
+    .app-name {
+      font-size: 22px;
+      font-weight: 700;
+      letter-spacing: 0.3px;
+    }
+    .app-desc {
+      font-size: 12px;
+      margin-top: 5px;
+      opacity: 0.6;
+    }
+
+    .spacer { flex: 1; }
+
+    /* 底部进度区 */
+    .bottom {
+      padding: 0 48px 40px;
+      animation: fadeIn 0.4s ease 0.1s both;
+    }
+
+    /* 进度条轨道 */
+    .progress-track {
+      width: 100%;
+      height: 2px;
+      border-radius: 2px;
+      margin-bottom: 12px;
+      position: relative;
+      overflow: hidden;
+    }
+
+    /* 进度条填充 */
+    .progress-fill {
+      height: 100%;
+      width: 0%;
+      border-radius: 2px;
+      position: relative;
+      transition: width 0.5s cubic-bezier(0.4, 0, 0.2, 1);
+      overflow: hidden;
+    }
+
+    /* 扫光：只在有进度时显示，不循环 */
+    .progress-fill::after {
+      content: '';
+      position: absolute;
+      top: 0; left: 0;
+      width: 100%; height: 100%;
+      background: linear-gradient(90deg, transparent 0%, rgba(255,255,255,0.5) 50%, transparent 100%);
+      animation: sweep 1.2s ease-out forwards;
+      opacity: 0;
+    }
+
+    /* 等待阶段：进度条末端呼吸光点 */
+    .progress-fill.waiting::before {
+      content: '';
+      position: absolute;
+      top: -1px; right: -2px;
+      width: 6px; height: 4px;
+      border-radius: 50%;
+      background: inherit;
+      filter: blur(2px);
+      animation: pulse 1.5s ease-in-out infinite;
+    }
+
+    .bottom-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+    .progress-text {
+      font-size: 11px;
+      opacity: 0.38;
+    }
+    .version {
+      font-size: 11px;
+      opacity: 0.25;
+    }
+
+    @keyframes fadeIn {
+      from { opacity: 0; transform: translateY(4px); }
+      to   { opacity: 1; transform: translateY(0); }
+    }
+    @keyframes sweep {
+      0%   { opacity: 0; transform: translateX(-100%); }
+      20%  { opacity: 1; }
+      80%  { opacity: 1; }
+      100% { opacity: 0; transform: translateX(100%); }
+    }
+    @keyframes pulse {
+      0%, 100% { opacity: 0.4; transform: scaleX(1); }
+      50%       { opacity: 1;   transform: scaleX(1.8); }
+    }
+  </style>
+</head>
+<body>
+  <div class="splash" id="splash">
+    <div class="brand">
+      <img class="logo" src="./logo.png" alt="WeFlow" />
+      <div class="brand-text">
+        <div class="app-name" id="appName">WeFlow</div>
+        <div class="app-desc" id="appDesc">微信聊天记录管理工具</div>
+      </div>
+    </div>
+
+    <div class="spacer"></div>
+
+    <div class="bottom">
+      <div class="progress-track" id="progressTrack">
+        <div class="progress-fill" id="progressFill"></div>
+      </div>
+      <div class="bottom-row">
+        <div class="progress-text" id="progressText">正在启动...</div>
+        <div class="version" id="versionText"></div>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    var themes = {
+      'cloud-dancer': {
+        light: { primary: '#8B7355', bg: '#F0EEE9', bgEnd: '#E5E1DA', text: '#3d3d3d', desc: '#8B7355' },
+        dark:  { primary: '#C9A86C', bg: '#1a1816', bgEnd: '#252220', text: '#F0EEE9', desc: '#C9A86C' }
+      },
+      'corundum-blue': {
+        light: { primary: '#4A6670', bg: '#E8EEF0', bgEnd: '#D8E4E8', text: '#3d3d3d', desc: '#4A6670' },
+        dark:  { primary: '#6A9AAA', bg: '#141a1c', bgEnd: '#1e2a2e', text: '#E0EEF2', desc: '#6A9AAA' }
+      },
+      'kiwi-green': {
+        light: { primary: '#7A9A5C', bg: '#E8F0E4', bgEnd: '#D8E8D2', text: '#3d3d3d', desc: '#7A9A5C' },
+        dark:  { primary: '#9ABA7C', bg: '#161a14', bgEnd: '#222a1e', text: '#E8F0E4', desc: '#9ABA7C' }
+      },
+      'spicy-red': {
+        light: { primary: '#8B4049', bg: '#F0E8E8', bgEnd: '#E8D8D8', text: '#3d3d3d', desc: '#8B4049' },
+        dark:  { primary: '#C06068', bg: '#1a1416', bgEnd: '#261e20', text: '#F2E8EA', desc: '#C06068' }
+      },
+      'teal-water': {
+        light: { primary: '#5A8A8A', bg: '#E4F0F0', bgEnd: '#D2E8E8', text: '#3d3d3d', desc: '#5A8A8A' },
+        dark:  { primary: '#7ABAAA', bg: '#121a1a', bgEnd: '#1a2626', text: '#E0F2EE', desc: '#7ABAAA' }
+      },
+      'blossom-dream': {
+        light: { primary: '#D4849A', primaryEnd: '#D4849A', bg: '#FCF9FB', bgMid: '#F8F2F8', bgEnd: '#F2F6FB', text: '#2E2633', desc: '#D4849A' },
+        dark:  { primary: '#C670C3', primaryEnd: '#8A60C0', bg: '#120B16', bgMid: '#1A1020', bgEnd: '#0E0B18', text: '#F2EAF4', desc: '#C670C3' }
+      }
+    };
+
+    function applyTheme(themeId, mode) {
+      var t = themes[themeId] || themes['cloud-dancer'];
+      var isDark = mode === 'dark';
+      if (mode === 'system') isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      var c = isDark ? t.dark : t.light;
+
+      var el = document.getElementById('splash');
+      var fill = document.getElementById('progressFill');
+
+      if (themeId === 'blossom-dream') {
+        if (isDark) {
+          // 深色
+          el.style.background =
+            'radial-gradient(ellipse 60% 50% at 100% 0%, ' + c.primary + '28 0%, transparent 70%), ' +
+            'linear-gradient(150deg, ' + c.bg + ' 0%, ' + c.bgMid + ' 45%, ' + c.bgEnd + ' 100%)';
+        } else {
+          // 浅色
+          el.style.background = 'linear-gradient(150deg, ' + c.bg + ' 0%, ' + c.bgMid + ' 45%, ' + c.bgEnd + ' 100%)';
+        }
+        // 进度条
+        fill.style.background = 'linear-gradient(90deg, ' + c.primary + ' 0%, ' + c.primaryEnd + ' 100%)';
+      } else {
+        if (isDark) {
+          el.style.background =
+            'radial-gradient(ellipse 60% 50% at 100% 0%, ' + c.primary + '22 0%, transparent 70%), ' +
+            'linear-gradient(145deg, ' + c.bg + ' 0%, ' + c.bgEnd + ' 100%)';
+        } else {
+          el.style.background = 'linear-gradient(150deg, ' + c.bg + ' 0%, ' + c.bgEnd + ' 100%)';
+        }
+        fill.style.background = c.primary;
+      }
+
+      document.getElementById('appName').style.color = c.text;
+      document.getElementById('appDesc').style.color = c.desc;
+      document.getElementById('progressText').style.color = c.text;
+      document.getElementById('versionText').style.color = c.text;
+      document.getElementById('progressTrack').style.background = c.primary + (isDark ? '25' : '18');
+    }
+
+    // percent: 实际进度值；waiting: 是否处于等待阶段
+    function updateProgress(percent, text, waiting) {
+      var fill = document.getElementById('progressFill');
+      var label = document.getElementById('progressText');
+
+      if (fill) {
+        fill.style.width = percent + '%';
+        if (waiting) {
+          fill.classList.add('waiting');
+        } else {
+          fill.classList.remove('waiting');
+          // 触发扫光：重置动画
+          fill.style.animation = 'none';
+          fill.offsetHeight;
+          fill.style.animation = '';
+        }
+      }
+      if (label && text) label.textContent = text;
+    }
+
+    function setVersion(ver) {
+      var el = document.getElementById('versionText');
+      if (el) el.textContent = 'v' + ver;
+    }
+
+    applyTheme('cloud-dancer', 'light');
+  </script>
+</body>
+</html>

src/App.scss

@@ -4,6 +4,48 @@
   flex-direction: column;
   background: var(--bg-primary);
   animation: appFadeIn 0.35s ease-out;
+  position: relative;
+  overflow: hidden;
+}
+
+// 繁花如梦：底色层（::before）+ 光晕层（::after）分离，避免 blur 吃掉边缘
+[data-theme="blossom-dream"] .app-container {
+  background: transparent;
+}
+
+// ::before 纯底色，不模糊
+[data-theme="blossom-dream"] .app-container::before {
+  content: '';
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  z-index: -2;
+  background: var(--bg-primary);
+}
+
+// ::after 光晕层，模糊叠加在底色上
+[data-theme="blossom-dream"] .app-container::after {
+  content: '';
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  z-index: -1;
+  background:
+    radial-gradient(ellipse 55% 45% at 15% 20%, var(--blossom-pink) 0%, transparent 70%),
+    radial-gradient(ellipse 50% 40% at 85% 75%, var(--blossom-peach) 0%, transparent 65%),
+    radial-gradient(ellipse 45% 50% at 80% 10%, var(--blossom-blue) 0%, transparent 60%);
+  filter: blur(80px);
+  opacity: 0.75;
+}
+
+// 深色模式光晕更克制
+[data-theme="blossom-dream"][data-mode="dark"] .app-container::after {
+  background:
+    radial-gradient(ellipse 55% 45% at 15% 20%, var(--blossom-pink) 0%, transparent 70%),
+    radial-gradient(ellipse 50% 40% at 85% 75%, var(--blossom-purple) 0%, transparent 65%),
+    radial-gradient(ellipse 45% 50% at 80% 10%, var(--blossom-blue) 0%, transparent 60%);
+  filter: blur(100px);
+  opacity: 0.2;
 }
 
 .window-drag-region {

src/App.tsx

@@ -34,6 +34,7 @@ import UpdateProgressCapsule from './components/UpdateProgressCapsule'
 import LockScreen from './components/LockScreen'
 import { GlobalSessionMonitor } from './components/GlobalSessionMonitor'
 import { BatchTranscribeGlobal } from './components/BatchTranscribeGlobal'
+import { BatchImageDecryptGlobal } from './components/BatchImageDecryptGlobal'
 
 function App() {
   const navigate = useNavigate()
@@ -312,7 +313,7 @@ function App() {
     const checkLock = async () => {
       // 并行获取配置，减少等待
       const [enabled, useHello] = await Promise.all([
-        configService.getAuthEnabled(),
+        window.electronAPI.auth.verifyEnabled(),
         configService.getAuthUseHello()
       ])
 
@@ -385,6 +386,7 @@ function App() {
 
       {/* 全局批量转写进度浮窗 */}
       <BatchTranscribeGlobal />
+      <BatchImageDecryptGlobal />
 
       {/* 用户协议弹窗 */}
       {showAgreement && !agreementLoading && (

src/components/BatchImageDecryptGlobal.tsx

@@ -0,0 +1,133 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import { createPortal } from 'react-dom'
+import { Loader2, X, Image as ImageIcon, Clock, CheckCircle, XCircle } from 'lucide-react'
+import { useBatchImageDecryptStore } from '../stores/batchImageDecryptStore'
+import { useBatchTranscribeStore } from '../stores/batchTranscribeStore'
+import '../styles/batchTranscribe.scss'
+
+export const BatchImageDecryptGlobal: React.FC = () => {
+  const {
+    isBatchDecrypting,
+    progress,
+    showToast,
+    showResultToast,
+    result,
+    sessionName,
+    startTime,
+    setShowToast,
+    setShowResultToast
+  } = useBatchImageDecryptStore()
+
+  const voiceToastOccupied = useBatchTranscribeStore(
+    state => state.isBatchTranscribing && state.showToast
+  )
+
+  const [eta, setEta] = useState('')
+
+  useEffect(() => {
+    if (!isBatchDecrypting || !startTime || progress.current === 0) {
+      setEta('')
+      return
+    }
+
+    const timer = setInterval(() => {
+      const elapsed = Date.now() - startTime
+      if (elapsed <= 0) return
+      const rate = progress.current / elapsed
+      const remain = progress.total - progress.current
+      if (remain <= 0 || rate <= 0) {
+        setEta('')
+        return
+      }
+      const seconds = Math.ceil((remain / rate) / 1000)
+      if (seconds < 60) {
+        setEta(`${seconds}秒`)
+      } else {
+        const m = Math.floor(seconds / 60)
+        const s = seconds % 60
+        setEta(`${m}分${s}秒`)
+      }
+    }, 1000)
+
+    return () => clearInterval(timer)
+  }, [isBatchDecrypting, progress.current, progress.total, startTime])
+
+  useEffect(() => {
+    if (!showResultToast) return
+    const timer = window.setTimeout(() => setShowResultToast(false), 6000)
+    return () => window.clearTimeout(timer)
+  }, [showResultToast, setShowResultToast])
+
+  const toastBottom = useMemo(() => (voiceToastOccupied ? 148 : 24), [voiceToastOccupied])
+
+  return (
+    <>
+      {showToast && isBatchDecrypting && createPortal(
+        <div className="batch-progress-toast" style={{ bottom: toastBottom }}>
+          <div className="batch-progress-toast-header">
+            <div className="batch-progress-toast-title">
+              <Loader2 size={14} className="spin" />
+              <span>批量解密图片{sessionName ? `（${sessionName}）` : ''}</span>
+            </div>
+            <button className="batch-progress-toast-close" onClick={() => setShowToast(false)} title="最小化">
+              <X size={14} />
+            </button>
+          </div>
+          <div className="batch-progress-toast-body">
+            <div className="progress-info-row">
+              <div className="progress-text">
+                <span>{progress.current} / {progress.total}</span>
+                <span className="progress-percent">
+                  {progress.total > 0 ? Math.round((progress.current / progress.total) * 100) : 0}%
+                </span>
+              </div>
+              {eta && (
+                <div className="progress-eta">
+                  <Clock size={12} />
+                  <span>剩余 {eta}</span>
+                </div>
+              )}
+            </div>
+            <div className="progress-bar">
+              <div
+                className="progress-fill"
+                style={{
+                  width: `${progress.total > 0 ? (progress.current / progress.total) * 100 : 0}%`
+                }}
+              />
+            </div>
+          </div>
+        </div>,
+        document.body
+      )}
+
+      {showResultToast && createPortal(
+        <div className="batch-progress-toast batch-inline-result-toast" style={{ bottom: toastBottom }}>
+          <div className="batch-progress-toast-header">
+            <div className="batch-progress-toast-title">
+              <ImageIcon size={14} />
+              <span>图片批量解密完成</span>
+            </div>
+            <button className="batch-progress-toast-close" onClick={() => setShowResultToast(false)} title="关闭">
+              <X size={14} />
+            </button>
+          </div>
+          <div className="batch-progress-toast-body">
+            <div className="batch-inline-result-summary">
+              <div className="batch-inline-result-item success">
+                <CheckCircle size={14} />
+                <span>成功 {result.success}</span>
+              </div>
+              <div className={`batch-inline-result-item ${result.fail > 0 ? 'fail' : 'muted'}`}>
+                <XCircle size={14} />
+                <span>失败 {result.fail}</span>
+              </div>
+            </div>
+          </div>
+        </div>,
+        document.body
+      )}
+    </>
+  )
+}
+

src/components/GlobalSessionMonitor.tsx

@@ -97,6 +97,10 @@ export function GlobalSessionMonitor() {
             if (!isCurrentSession && (!oldSession || newSession.lastTimestamp > oldSession.lastTimestamp)) {
                 // 这是新消息事件
 
+                // 免打扰、折叠群、折叠入口不弹通知
+                if (newSession.isMuted || newSession.isFolded) continue
+                if (newSession.username.toLowerCase().includes('placeholder_foldgroup')) continue
+
                 // 1. 群聊过滤自己发送的消息
                 if (newSession.username.includes('@chatroom')) {
                     // 如果是自己发的消息，不弹通知
@@ -253,7 +257,8 @@ export function GlobalSessionMonitor() {
     const handleActiveSessionRefresh = async (sessionId: string) => {
         // 从 ChatPage 复制/调整的逻辑，以保持集中
         const state = useChatStore.getState()
-        const lastMsg = state.messages[state.messages.length - 1]
+        const msgs = state.messages || []
+        const lastMsg = msgs[msgs.length - 1]
         const minTime = lastMsg?.createTime || 0
 
         try {

src/components/LockScreen.tsx

@@ -1,5 +1,4 @@
 import { useState, useEffect, useRef } from 'react'
-import * as configService from '../services/config'
 import { ArrowRight, Fingerprint, Lock, ScanFace, ShieldCheck } from 'lucide-react'
 import './LockScreen.scss'
 
@@ -9,14 +8,6 @@ interface LockScreenProps {
     useHello?: boolean
 }
 
-async function sha256(message: string) {
-    const msgBuffer = new TextEncoder().encode(message)
-    const hashBuffer = await crypto.subtle.digest('SHA-256', msgBuffer)
-    const hashArray = Array.from(new Uint8Array(hashBuffer))
-    const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('')
-    return hashHex
-}
-
 export default function LockScreen({ onUnlock, avatar, useHello = false }: LockScreenProps) {
     const [password, setPassword] = useState('')
     const [error, setError] = useState('')
@@ -49,19 +40,9 @@ export default function LockScreen({ onUnlock, avatar, useHello = false }: LockS
 
     const quickStartHello = async () => {
         try {
-            // 如果父组件已经告诉我们要用 Hello，直接开始，不等待 IPC
-            let shouldUseHello = useHello
-
-            // 为了稳健，如果 prop 没传（虽然现在都传了），再 check 一次 config
-            if (!shouldUseHello) {
-                shouldUseHello = await configService.getAuthUseHello()
-            }
-
-            if (shouldUseHello) {
-                // 标记为可用，显示按钮
+            if (useHello) {
                 setHelloAvailable(true)
                 setShowHello(true)
-                // 立即执行验证 (0延迟)
                 verifyHello()
             }
         } catch (e) {
@@ -96,25 +77,19 @@ export default function LockScreen({ onUnlock, avatar, useHello = false }: LockS
         e?.preventDefault()
         if (!password || isUnlocked) return
 
-        // 如果正在进行 Hello 验证，它会自动失败或被取代，UI上不用特意取消
-        // 因为 native 调用是模态的或者独立的，我们只要让 JS 状态不对锁住即可
-
-        // 不再检查 isVerifying，因为我们允许打断 Hello
         setIsVerifying(true)
         setError('')
 
         try {
-            const storedHash = await configService.getAuthPassword()
-            const inputHash = await sha256(password)
+            // 发送原始密码到主进程，由主进程验证并解密密钥
+            const result = await window.electronAPI.auth.unlock(password)
 
-            if (inputHash === storedHash) {
+            if (result.success) {
                 handleUnlock()
             } else {
-                setError('密码错误')
+                setError(result.error || '密码错误')
                 setPassword('')
                 setIsVerifying(false)
-                // 如果密码错误，是否重新触发 Hello? 
-                // 用户可能想重试密码，暂时不自动触发
             }
         } catch (e) {
             setError('验证失败')

src/components/NotificationToast.scss

@@ -7,10 +7,12 @@
     -webkit-backdrop-filter: blur(20px);
     border: 1px solid var(--border-light);
 
-    // 浅色模式下使用不透明背景，避免透明窗口中通知过于透明
+    // 浅色模式下使用完全不透明背景，并禁用毛玻璃效果
     [data-mode="light"] &,
     :not([data-mode]) & {
         background: rgba(255, 255, 255, 1);
+        backdrop-filter: none;
+        -webkit-backdrop-filter: none;
     }
 
     border-radius: 12px;
@@ -46,12 +48,26 @@
         backdrop-filter: none !important;
         -webkit-backdrop-filter: none !important;
 
-        // 确保背景不透明
-        background: var(--bg-secondary, #2c2c2c);
-        color: var(--text-primary, #ffffff);
+        // 独立通知窗口：默认使用浅色模式硬编码值，确保不依赖 <html> 上的主题属性
+        background: #ffffff;
+        color: #3d3d3d;
+        --text-primary: #3d3d3d;
+        --text-secondary: #666666;
+        --text-tertiary: #999999;
+        --border-light: rgba(0, 0, 0, 0.08);
+
+        // 深色模式覆盖
+        [data-mode="dark"] & {
+            background: var(--bg-secondary-solid, #282420);
+            color: var(--text-primary, #F0EEE9);
+            --text-primary: #F0EEE9;
+            --text-secondary: #b3b0aa;
+            --text-tertiary: #807d78;
+            --border-light: rgba(255, 255, 255, 0.1);
+        }
 
         box-shadow: none !important; // NO SHADOW
-        border: 1px solid var(--border-light, rgba(255, 255, 255, 0.1));
+        border: 1px solid var(--border-light);
 
         display: flex;
         padding: 16px;

src/components/Sidebar.scss

@@ -104,3 +104,30 @@
     color: var(--text-primary);
   }
 }
+
+// 繁花如梦主题：侧边栏毛玻璃 + 激活项用主品牌色
+[data-theme="blossom-dream"] .sidebar {
+  background: rgba(255, 255, 255, 0.6);
+  backdrop-filter: blur(20px);
+  -webkit-backdrop-filter: blur(20px);
+  border-right: 1px solid rgba(255, 255, 255, 0.4);
+}
+
+[data-theme="blossom-dream"][data-mode="dark"] .sidebar {
+  background: rgba(34, 30, 36, 0.75);
+  backdrop-filter: blur(20px);
+  -webkit-backdrop-filter: blur(20px);
+  border-right: 1px solid rgba(255, 255, 255, 0.06);
+}
+
+// 激活项：主品牌色纵向微渐变
+[data-theme="blossom-dream"] .nav-item.active {
+  background: linear-gradient(180deg, #D4849A 0%, #C4748A 100%);
+}
+
+// 深色激活项：用藕粉色，背景深灰底 + 粉色文字/图标（高阶玩法）
+[data-theme="blossom-dream"][data-mode="dark"] .nav-item.active {
+  background: rgba(209, 158, 187, 0.15);
+  color: #D19EBB;
+  border: 1px solid rgba(209, 158, 187, 0.2);
+}

src/components/Sidebar.tsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
 import { NavLink, useLocation } from 'react-router-dom'
 import { Home, MessageSquare, BarChart3, Users, FileText, Database, Settings, ChevronLeft, ChevronRight, Download, Aperture, UserCircle, Lock } from 'lucide-react'
 import { useAppStore } from '../stores/appStore'
-import * as configService from '../services/config'
+
 import './Sidebar.scss'
 
 function Sidebar() {
@@ -12,7 +12,7 @@ function Sidebar() {
   const setLocked = useAppStore(state => state.setLocked)
 
   useEffect(() => {
-    configService.getAuthEnabled().then(setAuthEnabled)
+    window.electronAPI.auth.verifyEnabled().then(setAuthEnabled)
   }, [])
 
   const isActive = (path: string) => {

src/components/Sns/SnsMediaGrid.tsx

@@ -21,6 +21,7 @@ interface SnsMedia {
 
 interface SnsMediaGridProps {
     mediaList: SnsMedia[]
+    postType?: number
     onPreview: (src: string, isVideo?: boolean, liveVideoPath?: string) => void
     onMediaDeleted?: () => void
 }
@@ -80,7 +81,7 @@ const extractVideoFrame = async (videoPath: string): Promise<string> => {
     })
 }
 
-const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPreview: (src: string, isVideo?: boolean, liveVideoPath?: string) => void; onMediaDeleted?: () => void }) => {
+const MediaItem = ({ media, postType, onPreview, onMediaDeleted }: { media: SnsMedia; postType?: number; onPreview: (src: string, isVideo?: boolean, liveVideoPath?: string) => void; onMediaDeleted?: () => void }) => {
     const [error, setError] = useState(false)
     const [deleted, setDeleted] = useState(false)
     const [loading, setLoading] = useState(true)
@@ -96,6 +97,8 @@ const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPr
     const isVideo = isSnsVideoUrl(media.url)
     const isLive = !!media.livePhoto
     const targetUrl = media.thumb || media.url
+    // type 7 的朋友圈媒体不需要解密，直接使用原始 URL
+    const skipDecrypt = postType === 7
 
     // 视频重试：失败时重试最多2次，耗尽才标记删除
     const videoRetryOrDelete = () => {
@@ -119,7 +122,7 @@ const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPr
                     // For images, we proxy to get the local path/base64
                     const result = await window.electronAPI.sns.proxyImage({
                         url: targetUrl,
-                        key: media.key
+                        key: skipDecrypt ? undefined : media.key
                     })
                     if (cancelled) return
 
@@ -134,7 +137,7 @@ const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPr
                     if (isLive && media.livePhoto?.url) {
                         window.electronAPI.sns.proxyImage({
                             url: media.livePhoto.url,
-                            key: media.livePhoto.key || media.key
+                            key: skipDecrypt ? undefined : (media.livePhoto.key || media.key)
                         }).then((res: any) => {
                             if (!cancelled && res.success && res.videoPath) {
                                 setLiveVideoPath(`file://${res.videoPath.replace(/\\/g, '/')}`)
@@ -150,7 +153,7 @@ const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPr
                     // Usually we need to call proxyImage with the video URL to decrypt it to cache
                     const result = await window.electronAPI.sns.proxyImage({
                         url: media.url,
-                        key: media.key
+                        key: skipDecrypt ? undefined : media.key
                     })
 
                     if (cancelled) return
@@ -201,7 +204,7 @@ const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPr
                 try {
                     const res = await window.electronAPI.sns.proxyImage({
                         url: media.url,
-                        key: media.key
+                        key: skipDecrypt ? undefined : media.key
                     })
                     if (res.success && res.videoPath) {
                         const local = `file://${res.videoPath.replace(/\\/g, '/')}`
@@ -229,7 +232,7 @@ const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPr
         try {
             const result = await window.electronAPI.sns.proxyImage({
                 url: media.url,
-                key: media.key
+                key: skipDecrypt ? undefined : media.key
             })
 
             if (result.success) {
@@ -334,7 +337,7 @@ const MediaItem = ({ media, onPreview, onMediaDeleted }: { media: SnsMedia; onPr
     )
 }
 
-export const SnsMediaGrid: React.FC<SnsMediaGridProps> = ({ mediaList, onPreview, onMediaDeleted }) => {
+export const SnsMediaGrid: React.FC<SnsMediaGridProps> = ({ mediaList, postType, onPreview, onMediaDeleted }) => {
     if (!mediaList || mediaList.length === 0) return null
 
     const count = mediaList.length
@@ -350,7 +353,7 @@ export const SnsMediaGrid: React.FC<SnsMediaGridProps> = ({ mediaList, onPreview
     return (
         <div className={`sns-media-grid ${gridClass}`}>
             {mediaList.map((media, idx) => (
-                <MediaItem key={idx} media={media} onPreview={onPreview} onMediaDeleted={onMediaDeleted} />
+                <MediaItem key={idx} media={media} postType={postType} onPreview={onPreview} onMediaDeleted={onMediaDeleted} />
             ))}
         </div>
     )

src/components/Sns/SnsPostItem.tsx

@@ -1,5 +1,6 @@
-import React, { useState, useMemo } from 'react'
-import { Heart, ChevronRight, ImageIcon, Download, Code, MoreHorizontal, Trash2 } from 'lucide-react'
+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 { Avatar } from '../Avatar'
 import { SnsMediaGrid } from './SnsMediaGrid'
@@ -178,14 +179,78 @@ const SnsLinkCard = ({ card }: { card: SnsLinkCardData }) => {
     )
 }
 
+// 表情包内存缓存
+const emojiLocalCache = new Map<string, string>()
+
+// 评论表情包组件
+const CommentEmoji: React.FC<{
+    emoji: { url: string; md5: string; width: number; height: number; encryptUrl?: string; aesKey?: string }
+    onPreview?: (src: string) => void
+}> = ({ emoji, onPreview }) => {
+    const cacheKey = emoji.encryptUrl || emoji.url
+    const [localSrc, setLocalSrc] = useState<string>(() => emojiLocalCache.get(cacheKey) || '')
+
+    useEffect(() => {
+        if (!cacheKey) return
+        if (emojiLocalCache.has(cacheKey)) {
+            setLocalSrc(emojiLocalCache.get(cacheKey)!)
+            return
+        }
+        let cancelled = false
+        const load = async () => {
+            try {
+                const res = await window.electronAPI.sns.downloadEmoji({
+                    url: emoji.url,
+                    encryptUrl: emoji.encryptUrl,
+                    aesKey: emoji.aesKey
+                })
+                if (cancelled) return
+                if (res.success && res.localPath) {
+                    const fileUrl = res.localPath.startsWith('file:')
+                        ? res.localPath
+                        : `file://${res.localPath.replace(/\\/g, '/')}`
+                    emojiLocalCache.set(cacheKey, fileUrl)
+                    setLocalSrc(fileUrl)
+                }
+            } catch { /* 静默失败 */ }
+        }
+        load()
+        return () => { cancelled = true }
+    }, [cacheKey])
+
+    if (!localSrc) return null
+
+    return (
+        <img
+            src={localSrc}
+            alt="emoji"
+            className="comment-custom-emoji"
+            draggable={false}
+            onClick={(e) => { e.stopPropagation(); onPreview?.(localSrc) }}
+            style={{
+                width: Math.min(emoji.width || 24, 30),
+                height: Math.min(emoji.height || 24, 30),
+                verticalAlign: 'middle',
+                marginLeft: 2,
+                borderRadius: 4,
+                cursor: onPreview ? 'pointer' : 'default'
+            }}
+        />
+    )
+}
+
 interface SnsPostItemProps {
     post: SnsPost
     onPreview: (src: string, isVideo?: boolean, liveVideoPath?: string) => void
     onDebug: (post: SnsPost) => void
+    onDelete?: (postId: string) => void
 }
 
-export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDebug }) => {
+export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDebug, onDelete }) => {
     const [mediaDeleted, setMediaDeleted] = useState(false)
+    const [dbDeleted, setDbDeleted] = useState(false)
+    const [deleting, setDeleting] = useState(false)
+    const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
     const linkCard = buildLinkCardData(post)
     const hasVideoMedia = post.type === 15 || post.media.some((item) => isSnsVideoUrl(item.url))
     const showLinkCard = Boolean(linkCard) && post.media.length <= 1 && !hasVideoMedia
@@ -221,8 +286,29 @@ export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDeb
         })
     }
 
+    const handleDeleteClick = (e: React.MouseEvent) => {
+        e.stopPropagation()
+        if (deleting || dbDeleted) return
+        setShowDeleteConfirm(true)
+    }
+
+    const handleDeleteConfirm = async () => {
+        setShowDeleteConfirm(false)
+        setDeleting(true)
+        try {
+            const r = await window.electronAPI.sns.deleteSnsPost(post.tid ?? post.id)
+            if (r.success) {
+                setDbDeleted(true)
+                onDelete?.(post.id)
+            }
+        } finally {
+            setDeleting(false)
+        }
+    }
+
     return (
-        <div className={`sns-post-item ${mediaDeleted ? 'post-deleted' : ''}`}>
+        <>
+        <div className={`sns-post-item ${(mediaDeleted || dbDeleted) ? 'post-deleted' : ''}`}>
             <div className="post-avatar-col">
                 <Avatar
                     src={post.avatarUrl}
@@ -239,12 +325,20 @@ export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDeb
                         <span className="post-time">{formatTime(post.createTime)}</span>
                     </div>
                     <div className="post-header-actions">
-                        {mediaDeleted && (
+                        {(mediaDeleted || dbDeleted) && (
                             <span className="post-deleted-badge">
                                 <Trash2 size={12} />
                                 <span>已删除</span>
                             </span>
                         )}
+                        <button
+                            className="icon-btn-ghost debug-btn delete-btn"
+                            onClick={handleDeleteClick}
+                            disabled={deleting || dbDeleted}
+                            title="从数据库删除此条记录"
+                        >
+                            <Trash2 size={14} />
+                        </button>
                         <button className="icon-btn-ghost debug-btn" onClick={(e) => {
                             e.stopPropagation();
                             onDebug(post);
@@ -264,7 +358,7 @@ export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDeb
 
                 {showMediaGrid && (
                     <div className="post-media-container">
-                        <SnsMediaGrid mediaList={post.media} onPreview={onPreview} onMediaDeleted={[1, 54].includes(post.type ?? 0) ? () => setMediaDeleted(true) : undefined} />
+                        <SnsMediaGrid mediaList={post.media} postType={post.type} onPreview={onPreview} onMediaDeleted={[1, 54].includes(post.type ?? 0) ? () => setMediaDeleted(true) : undefined} />
                     </div>
                 )}
 
@@ -289,7 +383,16 @@ export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDeb
                                             </>
                                         )}
                                         <span className="comment-colon">：</span>
-                                        <span className="comment-content">{renderTextWithEmoji(c.content)}</span>
+                                        {c.content && (
+                                            <span className="comment-content">{renderTextWithEmoji(c.content)}</span>
+                                        )}
+                                        {c.emojis && c.emojis.map((emoji, ei) => (
+                                            <CommentEmoji
+                                                key={ei}
+                                                emoji={emoji}
+                                                onPreview={(src) => onPreview(src)}
+                                            />
+                                        ))}
                                     </div>
                                 ))}
                             </div>
@@ -298,5 +401,24 @@ export const SnsPostItem: React.FC<SnsPostItemProps> = ({ post, onPreview, onDeb
                 )}
             </div>
         </div>
+
+        {/* 删除确认弹窗 - 用 Portal 挂到 body，避免父级 transform 影响 fixed 定位 */}
+        {showDeleteConfirm && createPortal(
+            <div className="sns-confirm-overlay" onClick={() => setShowDeleteConfirm(false)}>
+                <div className="sns-confirm-dialog" onClick={(e) => e.stopPropagation()}>
+                    <div className="sns-confirm-icon">
+                        <Trash2 size={22} />
+                    </div>
+                    <div className="sns-confirm-title">删除这条记录？</div>
+                    <div className="sns-confirm-desc">将从本地数据库中永久删除，无法恢复。</div>
+                    <div className="sns-confirm-actions">
+                        <button className="sns-confirm-cancel" onClick={() => setShowDeleteConfirm(false)}>取消</button>
+                        <button className="sns-confirm-ok" onClick={handleDeleteConfirm}>删除</button>
+                    </div>
+                </div>
+            </div>,
+            document.body
+        )}
+        </>
     )
 }

src/components/TitleBar.scss

@@ -10,6 +10,12 @@
   gap: 8px;
 }
 
+// 繁花如梦：标题栏毛玻璃
+[data-theme="blossom-dream"] .title-bar {
+  backdrop-filter: blur(20px);
+  -webkit-backdrop-filter: blur(20px);
+}
+
 .title-logo {
   width: 20px;
   height: 20px;

src/pages/HomePage.scss

@@ -29,7 +29,7 @@
 .blob-1 {
   width: 400px;
   height: 400px;
-  background: rgba(139, 115, 85, 0.25);
+  background: rgba(var(--primary-rgb), 0.25);
   top: -100px;
   left: -50px;
   animation-duration: 25s;
@@ -38,7 +38,7 @@
 .blob-2 {
   width: 350px;
   height: 350px;
-  background: rgba(139, 115, 85, 0.15);
+  background: rgba(var(--primary-rgb), 0.15);
   bottom: -50px;
   right: -50px;
   animation-duration: 30s;
@@ -74,7 +74,7 @@
   margin: 0 0 16px;
   color: var(--text-primary);
   letter-spacing: -2px;
-  background: linear-gradient(135deg, var(--text-primary) 0%, rgba(139, 115, 85, 0.8) 100%);
+  background: linear-gradient(135deg, var(--primary) 0%, rgba(var(--primary-rgb), 0.6) 100%);
   background-clip: text;
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;

src/pages/ImageWindow.scss

@@ -46,6 +46,18 @@
                     background: var(--bg-tertiary);
                     color: var(--text-primary);
                 }
+
+                &:disabled {
+                    cursor: default;
+                    opacity: 1;
+                }
+
+                &.live-play-btn {
+                    &.active {
+                        background: rgba(var(--primary-rgb, 76, 132, 255), 0.16);
+                        color: var(--primary, #4c84ff);
+                    }
+                }
             }
 
             .scale-text {
@@ -78,14 +90,40 @@
             cursor: grabbing;
         }
 
-        img {
+        .media-wrapper {
+            position: relative;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            will-change: transform;
+        }
+
+        img,
+        video {
+            display: block;
             max-width: none;
             max-height: none;
             object-fit: contain;
-            will-change: transform;
             box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
             pointer-events: auto;
         }
+
+        .live-video {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            object-fit: fill;
+            pointer-events: none;
+            opacity: 0;
+            will-change: opacity;
+            transition: opacity 0.3s ease-in-out;
+        }
+
+        .live-video.visible {
+            opacity: 1;
+        }
     }
 }
 

src/pages/ImageWindow.tsx

@@ -1,12 +1,20 @@
-
 import { useState, useEffect, useRef, useCallback } from 'react'
 import { useSearchParams } from 'react-router-dom'
 import { ZoomIn, ZoomOut, RotateCw, RotateCcw } from 'lucide-react'
+import { LivePhotoIcon } from '../components/LivePhotoIcon'
 import './ImageWindow.scss'
 
 export default function ImageWindow() {
     const [searchParams] = useSearchParams()
     const imagePath = searchParams.get('imagePath')
+    const liveVideoPath = searchParams.get('liveVideoPath')
+    const hasLiveVideo = !!liveVideoPath
+
+    const [isPlayingLive, setIsPlayingLive] = useState(false)
+    const [isVideoVisible, setIsVideoVisible] = useState(false)
+    const videoRef = useRef<HTMLVideoElement>(null)
+    const liveCleanupTimerRef = useRef<number | null>(null)
+
     const [scale, setScale] = useState(1)
     const [rotation, setRotation] = useState(0)
     const [position, setPosition] = useState({ x: 0, y: 0 })
@@ -22,6 +30,44 @@ export default function ImageWindow() {
         startPosY: 0
     })
 
+    const clearLiveCleanupTimer = useCallback(() => {
+        if (liveCleanupTimerRef.current !== null) {
+            window.clearTimeout(liveCleanupTimerRef.current)
+            liveCleanupTimerRef.current = null
+        }
+    }, [])
+
+    const stopLivePlayback = useCallback((immediate = false) => {
+        clearLiveCleanupTimer()
+        setIsVideoVisible(false)
+
+        if (immediate) {
+            if (videoRef.current) {
+                videoRef.current.pause()
+                videoRef.current.currentTime = 0
+            }
+            setIsPlayingLive(false)
+            return
+        }
+
+        liveCleanupTimerRef.current = window.setTimeout(() => {
+            if (videoRef.current) {
+                videoRef.current.pause()
+                videoRef.current.currentTime = 0
+            }
+            setIsPlayingLive(false)
+            liveCleanupTimerRef.current = null
+        }, 300)
+    }, [clearLiveCleanupTimer])
+
+    const handlePlayLiveVideo = useCallback(() => {
+        if (!liveVideoPath || isPlayingLive) return
+
+        clearLiveCleanupTimer()
+        setIsPlayingLive(true)
+        setIsVideoVisible(false)
+    }, [clearLiveCleanupTimer, liveVideoPath, isPlayingLive])
+
     const handleZoomIn = () => setScale(prev => Math.min(prev + 0.25, 10))
     const handleZoomOut = () => setScale(prev => Math.max(prev - 0.25, 0.1))
     const handleRotate = () => setRotation(prev => (prev + 90) % 360)
@@ -51,6 +97,29 @@ export default function ImageWindow() {
         }
     }, [])
 
+    // 视频挂载后再播放，避免点击瞬间 ref 尚未就绪导致丢播
+    useEffect(() => {
+        if (!isPlayingLive || !videoRef.current) return
+
+        const timer = window.setTimeout(() => {
+            const video = videoRef.current
+            if (!video || !isPlayingLive || !video.paused) return
+
+            video.currentTime = 0
+            void video.play().catch(() => {
+                stopLivePlayback(true)
+            })
+        }, 0)
+
+        return () => window.clearTimeout(timer)
+    }, [isPlayingLive, stopLivePlayback])
+
+    useEffect(() => {
+        return () => {
+            clearLiveCleanupTimer()
+        }
+    }, [clearLiveCleanupTimer])
+
     // 使用原生事件监听器处理拖动
     useEffect(() => {
         const handleMouseMove = (e: MouseEvent) => {
@@ -106,15 +175,25 @@ export default function ImageWindow() {
     // 快捷键支持
     useEffect(() => {
         const handleKeyDown = (e: KeyboardEvent) => {
-            if (e.key === 'Escape') window.electronAPI.window.close()
+            if (e.key === 'Escape') {
+                if (isPlayingLive) {
+                    stopLivePlayback(true)
+                    return
+                }
+                window.electronAPI.window.close()
+            }
             if (e.key === '=' || e.key === '+') handleZoomIn()
             if (e.key === '-') handleZoomOut()
             if (e.key === 'r' || e.key === 'R') handleRotate()
             if (e.key === '0') handleReset()
+            if (e.key === ' ' && hasLiveVideo) {
+                e.preventDefault()
+                handlePlayLiveVideo()
+            }
         }
         window.addEventListener('keydown', handleKeyDown)
         return () => window.removeEventListener('keydown', handleKeyDown)
-    }, [handleReset])
+    }, [handleReset, hasLiveVideo, handlePlayLiveVideo, isPlayingLive, stopLivePlayback])
 
     if (!imagePath) {
         return (
@@ -131,6 +210,20 @@ export default function ImageWindow() {
             <div className="title-bar">
                 <div className="window-drag-area"></div>
                 <div className="title-bar-controls">
+                    {hasLiveVideo && (
+                        <>
+                            <button
+                                onClick={handlePlayLiveVideo}
+                                title={isPlayingLive ? '正在播放实况' : '播放实况 (空格)'}
+                                className={`live-play-btn ${isPlayingLive ? 'active' : ''}`}
+                                disabled={isPlayingLive}
+                            >
+                                <LivePhotoIcon size={16} />
+                                <span style={{ fontSize: 13, marginLeft: 4 }}>Live</span>
+                            </button>
+                            <div className="divider"></div>
+                        </>
+                    )}
                     <button onClick={handleZoomOut} title="缩小 (-)"><ZoomOut size={16} /></button>
                     <span className="scale-text">{Math.round(displayScale * 100)}%</span>
                     <button onClick={handleZoomIn} title="放大 (+)"><ZoomIn size={16} /></button>
@@ -147,15 +240,31 @@ export default function ImageWindow() {
                 onDoubleClick={handleDoubleClick}
                 onMouseDown={handleMouseDown}
             >
-                <img
-                    src={imagePath}
-                    alt="Preview"
+                <div
+                    className="media-wrapper"
                     style={{
                         transform: `translate(${position.x}px, ${position.y}px) scale(${displayScale}) rotate(${rotation}deg)`
                     }}
-                    onLoad={handleImageLoad}
-                    draggable={false}
-                />
+                >
+                    <img
+                        src={imagePath}
+                        alt="Preview"
+                        onLoad={handleImageLoad}
+                        draggable={false}
+                    />
+                    {hasLiveVideo && isPlayingLive && (
+                        <video
+                            ref={videoRef}
+                            src={liveVideoPath || ''}
+                            className={`live-video ${isVideoVisible ? 'visible' : ''}`}
+                            autoPlay
+                            playsInline
+                            preload="auto"
+                            onPlaying={() => setIsVideoVisible(true)}
+                            onEnded={() => stopLivePlayback(false)}
+                        />
+                    )}
+                </div>
             </div>
         </div>
     )

src/pages/NotificationWindow.tsx

@@ -1,11 +1,9 @@
 import { useEffect, useState, useRef } from 'react'
 import { NotificationToast, type NotificationData } from '../components/NotificationToast'
-import { useThemeStore } from '../stores/themeStore'
 import '../components/NotificationToast.scss'
 import './NotificationWindow.scss'
 
 export default function NotificationWindow() {
-    const { currentTheme, themeMode } = useThemeStore()
     const [notification, setNotification] = useState<NotificationData | null>(null)
     const [prevNotification, setPrevNotification] = useState<NotificationData | null>(null)
 
@@ -19,12 +17,6 @@ export default function NotificationWindow() {
 
     const notificationRef = useRef<NotificationData | null>(null)
 
-    // 应用主题到通知窗口
-    useEffect(() => {
-        document.documentElement.setAttribute('data-theme', currentTheme)
-        document.documentElement.setAttribute('data-mode', themeMode)
-    }, [currentTheme, themeMode])
-
     useEffect(() => {
         notificationRef.current = notification
     }, [notification])

src/pages/SettingsPage.scss

@@ -2173,3 +2173,70 @@
     margin-top: 12px;
   }
 }
+
+.brute-force-progress {
+  margin-top: 12px;
+  padding: 14px 16px;
+  background: var(--bg-tertiary);
+  border: 1px solid var(--border-color);
+  border-radius: 12px;
+  animation: slideUp 0.3s ease;
+
+  .status-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+
+    .status-text {
+      font-size: 13px;
+      color: var(--text-primary);
+      font-weight: 500;
+      margin: 0;
+      // 增加文字呼吸灯效果，表明正在运行
+      animation: pulse 2s ease-in-out infinite;
+    }
+
+    .percent {
+      font-size: 14px;
+      color: var(--primary);
+      font-weight: 700;
+      font-family: var(--font-mono);
+    }
+  }
+
+  .progress-bar-container {
+    width: 100%;
+    height: 8px;
+    background: var(--bg-primary);
+    border-radius: 4px;
+    overflow: hidden;
+    border: 1px solid var(--border-color);
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.05);
+
+    .fill {
+      height: 100%;
+      background: linear-gradient(90deg, var(--primary) 0%, color-mix(in srgb, var(--primary) 60%, white) 100%);
+      border-radius: 4px;
+      transition: width 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      position: relative;
+
+      // 流光扫过的高亮特效
+      &::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: linear-gradient(
+                        90deg,
+                        transparent,
+                        rgba(255, 255, 255, 0.3),
+                        transparent
+        );
+        animation: progress-shimmer 1.5s infinite linear;
+      }
+    }
+  }
+}

src/pages/SettingsPage.tsx

@@ -82,6 +82,8 @@ function SettingsPage() {
   const exportExcelColumnsDropdownRef = useRef<HTMLDivElement>(null)
   const exportConcurrencyDropdownRef = useRef<HTMLDivElement>(null)
   const [cachePath, setCachePath] = useState('')
+  const [imageKeyProgress, setImageKeyProgress] = useState(0)
+  const [imageKeyPercent, setImageKeyPercent] = useState<number | null>(null)
 
   const [logEnabled, setLogEnabled] = useState(false)
   const [whisperModelName, setWhisperModelName] = useState('base')
@@ -146,6 +148,11 @@ function SettingsPage() {
   const [helloAvailable, setHelloAvailable] = useState(false)
   const [newPassword, setNewPassword] = useState('')
   const [confirmPassword, setConfirmPassword] = useState('')
+  const [oldPassword, setOldPassword] = useState('')
+  const [helloPassword, setHelloPassword] = useState('')
+  const [disableLockPassword, setDisableLockPassword] = useState('')
+  const [showDisableLockInput, setShowDisableLockInput] = useState(false)
+  const [isLockMode, setIsLockMode] = useState(false)
   const [isSettingHello, setIsSettingHello] = useState(false)
 
   // HTTP API 设置 state
@@ -184,14 +191,6 @@ function SettingsPage() {
     checkApiStatus()
   }, [])
 
-  async function sha256(message: string) {
-    const msgBuffer = new TextEncoder().encode(message)
-    const hashBuffer = await crypto.subtle.digest('SHA-256', msgBuffer)
-    const hashArray = Array.from(new Uint8Array(hashBuffer))
-    const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('')
-    return hashHex
-  }
-
   useEffect(() => {
     loadConfig()
     loadAppVersion()
@@ -225,8 +224,28 @@ function SettingsPage() {
     const removeDb = window.electronAPI.key.onDbKeyStatus((payload: { message: string; level: number }) => {
       setDbKeyStatus(payload.message)
     })
-    const removeImage = window.electronAPI.key.onImageKeyStatus((payload: { message: string }) => {
-      setImageKeyStatus(payload.message)
+
+    const removeImage = window.electronAPI.key.onImageKeyStatus((payload: { message: string, percent?: number }) => {
+      let msg = payload.message;
+      let pct = payload.percent;
+
+      // 如果后端没有显式传 percent，则用正则从字符串中提取如 "(12.5%)"
+      if (pct === undefined) {
+        const match = msg.match(/\(([\d.]+)%\)/);
+        if (match) {
+          pct = parseFloat(match[1]);
+          // 将百分比从文本中剥离，让 UI 更清爽
+          msg = msg.replace(/\s*\([\d.]+%\)/, '');
+        }
+      }
+
+      setImageKeyStatus(msg);
+      if (pct !== undefined) {
+        setImageKeyPercent(pct);
+      } else if (msg.includes('启动多核') || msg.includes('定位') || msg.includes('准备')) {
+        // 预热阶段
+        setImageKeyPercent(0);
+      }
     })
     return () => {
       removeDb?.()
@@ -279,10 +298,12 @@ function SettingsPage() {
       const savedNotificationFilterMode = await configService.getNotificationFilterMode()
       const savedNotificationFilterList = await configService.getNotificationFilterList()
 
-      const savedAuthEnabled = await configService.getAuthEnabled()
+      const savedAuthEnabled = await window.electronAPI.auth.verifyEnabled()
       const savedAuthUseHello = await configService.getAuthUseHello()
+      const savedIsLockMode = await window.electronAPI.auth.isLockMode()
       setAuthEnabled(savedAuthEnabled)
       setAuthUseHello(savedAuthUseHello)
+      setIsLockMode(savedIsLockMode)
 
       if (savedPath) setDbPath(savedPath)
       if (savedWxid) setWxid(savedWxid)
@@ -746,15 +767,18 @@ function SettingsPage() {
   }
 
   const handleAutoGetImageKey = async () => {
-    if (isFetchingImageKey) return
+    if (isFetchingImageKey) return;
     if (!dbPath) {
-      showMessage('请先选择数据库目录', false)
-      return
+      showMessage('请先选择数据库目录', false);
+      return;
     }
-    setIsFetchingImageKey(true)
-    setImageKeyStatus('正在准备获取图片密钥...')
+    setIsFetchingImageKey(true);
+    setImageKeyPercent(0)
+    setImageKeyStatus('正在初始化...');
+    setImageKeyProgress(0); // 重置进度
+
     try {
-      const accountPath = wxid ? `${dbPath}/${wxid}` : dbPath
+      const accountPath = wxid ? `${dbPath}/${wxid}` : dbPath;
       const result = await window.electronAPI.key.autoGetImageKey(accountPath)
       if (result.success && result.aesKey) {
         if (typeof result.xorKey === 'number') {
@@ -940,8 +964,16 @@ function SettingsPage() {
       <div className="theme-grid">
         {themes.map((theme) => (
           <div key={theme.id} className={`theme-card ${currentTheme === theme.id ? 'active' : ''}`} onClick={() => setTheme(theme.id)}>
-            <div className="theme-preview" style={{ background: effectiveMode === 'dark' ? 'linear-gradient(135deg, #1a1a1a 0%, #2a2a2a 100%)' : `linear-gradient(135deg, ${theme.bgColor} 0%, ${theme.bgColor}dd 100%)` }}>
-              <div className="theme-accent" style={{ background: theme.primaryColor }} />
+            <div className="theme-preview" style={{
+              background: effectiveMode === 'dark'
+                ? (theme.id === 'blossom-dream' ? 'linear-gradient(150deg, #151316 0%, #1A1620 50%, #131018 100%)' : 'linear-gradient(135deg, #1a1a1a 0%, #2a2a2a 100%)')
+                : (theme.id === 'blossom-dream' ? `linear-gradient(150deg, ${theme.bgColor} 0%, #F8F2F8 45%, #F2F6FB 100%)` : `linear-gradient(135deg, ${theme.bgColor} 0%, ${theme.bgColor}dd 100%)`)
+            }}>
+              <div className="theme-accent" style={{
+                background: theme.accentColor
+                  ? `linear-gradient(135deg, ${theme.primaryColor} 0%, ${theme.accentColor} 100%)`
+                  : theme.primaryColor
+              }} />
             </div>
             <div className="theme-info">
               <span className="theme-name">{theme.name}</span>
@@ -1344,8 +1376,21 @@ function SettingsPage() {
         <button className="btn btn-secondary btn-sm" onClick={handleAutoGetImageKey} disabled={isFetchingImageKey}>
           <Plug size={14} /> {isFetchingImageKey ? '获取中...' : '自动获取图片密钥'}
         </button>
-        {imageKeyStatus && <div className="form-hint status-text">{imageKeyStatus}</div>}
-        {isFetchingImageKey && <div className="form-hint status-text">正在扫描内存，请稍候...</div>}
+        {isFetchingImageKey ? (
+          <div className="brute-force-progress">
+            <div className="status-header">
+              <span className="status-text">{imageKeyStatus || '正在启动...'}</span>
+              {imageKeyPercent !== null && <span className="percent">{imageKeyPercent.toFixed(1)}%</span>}
+            </div>
+            {imageKeyPercent !== null && (
+              <div className="progress-bar-container">
+                <div className="fill" style={{ width: `${imageKeyPercent}%` }}></div>
+              </div>
+            )}
+          </div>
+        ) : (
+          imageKeyStatus && <div className="form-hint status-text" style={{ marginTop: '8px' }}>{imageKeyStatus}</div>
+        )}
       </div>
 
       <div className="form-group">
@@ -1931,6 +1976,10 @@ function SettingsPage() {
   )
 
   const handleSetupHello = async () => {
+    if (!helloPassword) {
+      showMessage('请输入当前密码以开启 Hello', false)
+      return
+    }
     setIsSettingHello(true)
     try {
       const challenge = new Uint8Array(32)
@@ -1948,8 +1997,10 @@ function SettingsPage() {
       })
 
       if (credential) {
+        // 存储密码作为 Hello Secret，以便 Hello 解锁时能派生密钥
+        await window.electronAPI.auth.setHelloSecret(helloPassword)
         setAuthUseHello(true)
-        await configService.setAuthUseHello(true)
+        setHelloPassword('')
         showMessage('Windows Hello 设置成功', true)
       }
     } catch (e: any) {
@@ -1967,18 +2018,40 @@ function SettingsPage() {
       return
     }
 
-    // 简单的保存逻辑，实际上应该先验证旧密码，但为了简化流程，这里直接允许覆盖
-    // 因为能进入设置页面说明已经解锁了
     try {
-      const hash = await sha256(newPassword)
-      await configService.setAuthPassword(hash)
-      await configService.setAuthEnabled(true)
-      setAuthEnabled(true)
-      setNewPassword('')
-      setConfirmPassword('')
-      showMessage('密码已更新', true)
+      const lockMode = await window.electronAPI.auth.isLockMode()
+
+      if (authEnabled && lockMode) {
+        // 已开启应用锁且已是 lock: 模式 → 修改密码
+        if (!oldPassword) {
+          showMessage('请输入旧密码', false)
+          return
+        }
+        const result = await window.electronAPI.auth.changePassword(oldPassword, newPassword)
+        if (result.success) {
+          setNewPassword('')
+          setConfirmPassword('')
+          setOldPassword('')
+          showMessage('密码已更新', true)
+        } else {
+          showMessage(result.error || '密码更新失败', false)
+        }
+      } else {
+        // 未开启应用锁，或旧版 safe: 模式 → 开启/升级为 lock: 模式
+        const result = await window.electronAPI.auth.enableLock(newPassword)
+        if (result.success) {
+          setAuthEnabled(true)
+          setIsLockMode(true)
+          setNewPassword('')
+          setConfirmPassword('')
+          setOldPassword('')
+          showMessage('应用锁已开启', true)
+        } else {
+          showMessage(result.error || '开启失败', false)
+        }
+      }
     } catch (e: any) {
-      showMessage('密码更新失败', false)
+      showMessage('操作失败', false)
     }
   }
 
@@ -2037,31 +2110,73 @@ function SettingsPage() {
       <div className="form-group">
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
           <div>
-            <label>启用应用锁</label>
-            <span className="form-hint">每次启动应用时需要验证密码</span>
+            <label>应用锁状态</label>
+            <span className="form-hint">{
+              isLockMode ? '已开启' :
+                authEnabled ? '旧版模式 — 请重新设置密码以升级为新模式提高安全性' :
+                  '未开启 — 请设置密码以开启'
+            }</span>
           </div>
-          <label className="switch">
-            <input
-              type="checkbox"
-              checked={authEnabled}
-              onChange={async (e) => {
-                const enabled = e.target.checked
-                setAuthEnabled(enabled)
-                await configService.setAuthEnabled(enabled)
-              }}
-            />
-            <span className="switch-slider" />
-          </label>
+          {authEnabled && !showDisableLockInput && (
+            <button
+              className="btn btn-secondary btn-sm"
+              onClick={() => setShowDisableLockInput(true)}
+            >
+              关闭应用锁
+            </button>
+          )}
         </div>
+        {showDisableLockInput && (
+          <div style={{ marginTop: 10, display: 'flex', gap: 10 }}>
+            <input
+              type="password"
+              className="field-input"
+              placeholder="输入当前密码以关闭"
+              value={disableLockPassword}
+              onChange={e => setDisableLockPassword(e.target.value)}
+              style={{ flex: 1 }}
+            />
+            <button
+              className="btn btn-primary btn-sm"
+              disabled={!disableLockPassword}
+              onClick={async () => {
+                const result = await window.electronAPI.auth.disableLock(disableLockPassword)
+                if (result.success) {
+                  setAuthEnabled(false)
+                  setAuthUseHello(false)
+                  setIsLockMode(false)
+                  setShowDisableLockInput(false)
+                  setDisableLockPassword('')
+                  showMessage('应用锁已关闭', true)
+                } else {
+                  showMessage(result.error || '关闭失败', false)
+                }
+              }}
+            >确认</button>
+            <button
+              className="btn btn-secondary btn-sm"
+              onClick={() => { setShowDisableLockInput(false); setDisableLockPassword('') }}
+            >取消</button>
+          </div>
+        )}
       </div>
 
       <div className="divider" />
 
       <div className="form-group">
-        <label>重置密码</label>
-        <span className="form-hint">设置新的启动密码</span>
+        <label>{isLockMode ? '修改密码' : '设置密码并开启应用锁'}</label>
+        <span className="form-hint">{isLockMode ? '修改应用锁密码（需要旧密码验证）' : '设置密码后将自动开启应用锁'}</span>
 
         <div style={{ marginTop: 10, display: 'flex', flexDirection: 'column', gap: 10 }}>
+          {isLockMode && (
+            <input
+              type="password"
+              className="field-input"
+              placeholder="旧密码"
+              value={oldPassword}
+              onChange={e => setOldPassword(e.target.value)}
+            />
+          )}
           <input
             type="password"
             className="field-input"
@@ -2078,7 +2193,9 @@ function SettingsPage() {
               onChange={e => setConfirmPassword(e.target.value)}
               style={{ flex: 1 }}
             />
-            <button className="btn btn-primary" onClick={handleUpdatePassword} disabled={!newPassword}>更新</button>
+            <button className="btn btn-primary" onClick={handleUpdatePassword} disabled={!newPassword}>
+              {isLockMode ? '更新' : '开启'}
+            </button>
           </div>
         </div>
       </div>
@@ -2090,23 +2207,39 @@ function SettingsPage() {
           <div>
             <label>Windows Hello</label>
             <span className="form-hint">使用面容、指纹快速解锁</span>
-            {!helloAvailable && <div className="form-hint warning" style={{ color: '#ff4d4f' }}> 当前设备不支持 Windows Hello</div>}
+            {!authEnabled && <div className="form-hint warning" style={{ color: '#ff4d4f' }}>请先开启应用锁</div>}
+            {!helloAvailable && authEnabled && <div className="form-hint warning" style={{ color: '#ff4d4f' }}>当前设备不支持 Windows Hello</div>}
           </div>
 
           <div>
             {authUseHello ? (
-              <button className="btn btn-secondary btn-sm" onClick={() => setAuthUseHello(false)}>关闭</button>
+              <button className="btn btn-secondary btn-sm" onClick={async () => {
+                await window.electronAPI.auth.clearHelloSecret()
+                setAuthUseHello(false)
+                showMessage('Windows Hello 已关闭', true)
+              }}>关闭</button>
             ) : (
               <button
                 className="btn btn-secondary btn-sm"
                 onClick={handleSetupHello}
-                disabled={!helloAvailable || isSettingHello}
+                disabled={!helloAvailable || isSettingHello || !authEnabled || !helloPassword}
               >
                 {isSettingHello ? '设置中...' : '开启与设置'}
               </button>
             )}
           </div>
         </div>
+        {!authUseHello && authEnabled && (
+          <div style={{ marginTop: 10 }}>
+            <input
+              type="password"
+              className="field-input"
+              placeholder="输入当前密码以开启 Hello"
+              value={helloPassword}
+              onChange={e => setHelloPassword(e.target.value)}
+            />
+          </div>
+        )}
       </div>
     </div>
   )

src/pages/SnsPage.scss

@@ -190,6 +190,32 @@
             background: var(--bg-tertiary);
             border-color: var(--text-secondary);
         }
+
+        &.delete-btn:hover {
+            color: #ff4d4f;
+            border-color: rgba(255, 77, 79, 0.4);
+            background: rgba(255, 77, 79, 0.08);
+        }
+
+        &:disabled {
+            opacity: 0.4;
+            cursor: not-allowed;
+        }
+    }
+
+    .post-protected-badge {
+        display: flex;
+        align-items: center;
+        gap: 3px;
+        opacity: 0;
+        transition: opacity 0.2s;
+        color: var(--color-success, #4caf50);
+        font-size: 11px;
+        font-weight: 500;
+        padding: 3px 7px;
+        border-radius: 5px;
+        background: rgba(76, 175, 80, 0.08);
+        border: 1px solid rgba(76, 175, 80, 0.2);
     }
 }
 
@@ -197,6 +223,258 @@
     opacity: 1;
 }
 
+.sns-post-item:hover .post-protected-badge {
+    opacity: 1;
+}
+
+// 删除确认弹窗
+.sns-confirm-overlay {
+    position: fixed;
+    inset: 0;
+    background: rgba(0, 0, 0, 0.15);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1000;
+    backdrop-filter: blur(2px);
+}
+
+.sns-confirm-dialog {
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 14px;
+    padding: 28px 28px 22px;
+    width: 300px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 8px;
+    box-shadow: 0 20px 60px rgba(0, 0, 0, 0.25);
+
+    .sns-confirm-icon {
+        width: 48px;
+        height: 48px;
+        border-radius: 12px;
+        background: rgba(255, 77, 79, 0.1);
+        color: #ff4d4f;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 4px;
+    }
+
+    .sns-confirm-title {
+        font-size: 16px;
+        font-weight: 600;
+        color: var(--text-primary);
+    }
+
+    .sns-confirm-desc {
+        font-size: 13px;
+        color: var(--text-secondary);
+        text-align: center;
+        line-height: 1.5;
+        margin-bottom: 8px;
+    }
+
+    .sns-confirm-actions {
+        display: flex;
+        gap: 10px;
+        width: 100%;
+        margin-top: 4px;
+
+        button {
+            flex: 1;
+            height: 36px;
+            border-radius: 8px;
+            font-size: 14px;
+            font-weight: 500;
+            cursor: pointer;
+            border: 1px solid var(--border-color);
+            transition: all 0.15s;
+        }
+
+        .sns-confirm-cancel {
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+
+            &:hover {
+                background: var(--bg-hover);
+                color: var(--text-primary);
+            }
+        }
+
+        .sns-confirm-ok {
+            background: #ff4d4f;
+            color: #fff;
+            border-color: #ff4d4f;
+
+            &:hover {
+                background: #ff7875;
+                border-color: #ff7875;
+            }
+        }
+    }
+}
+
+// 朋友圈防删除插件对话框
+.sns-protect-dialog {
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 16px;
+    width: 340px;
+    padding: 32px 28px 24px;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 0;
+    box-shadow: 0 20px 60px rgba(0, 0, 0, 0.2);
+
+    .sns-protect-close {
+        position: absolute;
+        top: 14px;
+        right: 14px;
+        background: none;
+        border: none;
+        color: var(--text-tertiary);
+        cursor: pointer;
+        padding: 4px;
+        border-radius: 6px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        &:hover {
+            color: var(--text-primary);
+            background: var(--bg-hover);
+        }
+    }
+
+    .sns-protect-hero {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 10px;
+        margin-bottom: 20px;
+    }
+
+    .sns-protect-icon-wrap {
+        width: 64px;
+        height: 64px;
+        border-radius: 18px;
+        background: var(--bg-tertiary);
+        color: var(--text-tertiary);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: all 0.3s;
+
+        &.active {
+            background: rgba(76, 175, 80, 0.12);
+            color: var(--color-success, #4caf50);
+        }
+    }
+
+    .sns-protect-title {
+        font-size: 17px;
+        font-weight: 600;
+        color: var(--text-primary);
+    }
+
+    .sns-protect-status-badge {
+        font-size: 12px;
+        font-weight: 500;
+        padding: 3px 10px;
+        border-radius: 20px;
+
+        &.on {
+            background: rgba(76, 175, 80, 0.12);
+            color: var(--color-success, #4caf50);
+        }
+
+        &.off {
+            background: var(--bg-tertiary);
+            color: var(--text-tertiary);
+        }
+    }
+
+    .sns-protect-desc {
+        font-size: 13px;
+        color: var(--text-secondary);
+        text-align: center;
+        line-height: 1.6;
+        margin-bottom: 16px;
+    }
+
+    .sns-protect-feedback {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        font-size: 13px;
+        padding: 8px 12px;
+        border-radius: 8px;
+        width: 100%;
+        margin-bottom: 14px;
+        box-sizing: border-box;
+
+        &.success {
+            background: rgba(76, 175, 80, 0.1);
+            color: var(--color-success, #4caf50);
+        }
+
+        &.error {
+            background: rgba(244, 67, 54, 0.1);
+            color: var(--color-error, #f44336);
+        }
+    }
+
+    .sns-protect-actions {
+        width: 100%;
+    }
+
+    .sns-protect-btn {
+        width: 100%;
+        height: 40px;
+        border-radius: 10px;
+        font-size: 14px;
+        font-weight: 500;
+        cursor: pointer;
+        border: none;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 7px;
+        transition: all 0.15s;
+
+        &.primary {
+            background: var(--color-primary, #1677ff);
+            color: #fff;
+
+            &:hover:not(:disabled) {
+                filter: brightness(1.1);
+            }
+        }
+
+        &.danger {
+            background: var(--bg-tertiary);
+            color: var(--text-secondary);
+            border: 1px solid var(--border-color);
+
+            &:hover:not(:disabled) {
+                background: rgba(255, 77, 79, 0.08);
+                color: #ff4d4f;
+                border-color: rgba(255, 77, 79, 0.3);
+            }
+        }
+
+        &:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+    }
+}
+
 .post-text {
     font-size: 15px;
     line-height: 1.6;
@@ -322,6 +600,13 @@
             .comment-colon {
                 margin-right: 4px;
             }
+
+            .comment-custom-emoji {
+                display: inline-block;
+                vertical-align: middle;
+                border-radius: 4px;
+                margin-left: 2px;
+            }
         }
     }
 }
@@ -414,7 +699,8 @@
 
             &.live {
                 top: 8px;
-                left: 8px;
+                right: 8px;
+                left: auto;
                 transform: none;
                 width: 24px;
                 height: 24px;
@@ -949,7 +1235,7 @@
             display: flex;
 
             &:hover {
-                background: rgba(0, 0, 0, 0.05);
+                background: var(--bg-primary);
                 color: var(--text-primary);
             }
         }
@@ -991,7 +1277,7 @@
    Export Dialog
    ========================================= */
 .export-dialog {
-    background: rgba(255, 255, 255, 0.88);
+    background: var(--bg-secondary);
     border-radius: var(--sns-border-radius-lg);
     box-shadow: 0 12px 40px rgba(0, 0, 0, 0.18);
     width: 480px;
@@ -1027,7 +1313,7 @@
             display: flex;
 
             &:hover {
-                background: rgba(0, 0, 0, 0.05);
+                background: var(--bg-primary);
                 color: var(--text-primary);
             }
 

src/pages/SnsPage.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useLayoutEffect, useState, useRef, useCallback } from 'react'
-import { RefreshCw, Search, X, Download, FolderOpen, FileJson, FileText, Image, CheckCircle, AlertCircle, Calendar, Users, Info, ChevronLeft, ChevronRight } from 'lucide-react'
-import { ImagePreview } from '../components/ImagePreview'
+import { RefreshCw, Search, X, Download, FolderOpen, FileJson, FileText, Image, CheckCircle, AlertCircle, Calendar, Users, Info, ChevronLeft, ChevronRight, Shield, ShieldOff } from 'lucide-react'
 import JumpToDateDialog from '../components/JumpToDateDialog'
 import './SnsPage.scss'
 import { SnsPost } from '../types/sns'
@@ -32,7 +31,6 @@ export default function SnsPage() {
 
     // UI states
     const [showJumpDialog, setShowJumpDialog] = useState(false)
-    const [previewImage, setPreviewImage] = useState<{ src: string, isVideo?: boolean, liveVideoPath?: string } | null>(null)
     const [debugPost, setDebugPost] = useState<SnsPost | null>(null)
 
     // 导出相关状态
@@ -48,6 +46,12 @@ export default function SnsPage() {
     const [calendarPicker, setCalendarPicker] = useState<{ field: 'start' | 'end'; month: Date } | null>(null)
     const [showYearMonthPicker, setShowYearMonthPicker] = useState(false)
 
+    // 触发器相关状态
+    const [showTriggerDialog, setShowTriggerDialog] = useState(false)
+    const [triggerInstalled, setTriggerInstalled] = useState<boolean | null>(null)
+    const [triggerLoading, setTriggerLoading] = useState(false)
+    const [triggerMessage, setTriggerMessage] = useState<{ type: 'success' | 'error'; text: string } | null>(null)
+
     const postsContainerRef = useRef<HTMLDivElement>(null)
     const [hasNewer, setHasNewer] = useState(false)
     const [loadingNewer, setLoadingNewer] = useState(false)
@@ -58,7 +62,6 @@ export default function SnsPage() {
     useEffect(() => {
         postsRef.current = posts
     }, [posts])
-
     // 在 DOM 更新后、浏览器绘制前同步调整滚动位置，防止向上加载时页面跳动
     useLayoutEffect(() => {
         const snapshot = scrollAdjustmentRef.current;
@@ -287,6 +290,25 @@ export default function SnsPage() {
                     <div className="feed-header">
                         <h2>朋友圈</h2>
                         <div className="header-actions">
+                            <button
+                                onClick={async () => {
+                                    setTriggerMessage(null)
+                                    setShowTriggerDialog(true)
+                                    setTriggerLoading(true)
+                                    try {
+                                        const r = await window.electronAPI.sns.checkBlockDeleteTrigger()
+                                        setTriggerInstalled(r.success ? (r.installed ?? false) : false)
+                                    } catch {
+                                        setTriggerInstalled(false)
+                                    } finally {
+                                        setTriggerLoading(false)
+                                    }
+                                }}
+                                className="icon-btn"
+                                title="朋友圈保护插件"
+                            >
+                                <Shield size={20} />
+                            </button>
                             <button
                                 onClick={() => {
                                     setExportResult(null)
@@ -331,9 +353,16 @@ export default function SnsPage() {
                         {posts.map(post => (
                             <SnsPostItem
                                 key={post.id}
-                                post={post}
-                                onPreview={(src, isVideo, liveVideoPath) => setPreviewImage({ src, isVideo, liveVideoPath })}
+                                post={{ ...post, isProtected: triggerInstalled === true }}
+                                onPreview={(src, isVideo, liveVideoPath) => {
+                                    if (isVideo) {
+                                        void window.electronAPI.window.openVideoPlayerWindow(src)
+                                    } else {
+                                        void window.electronAPI.window.openImageViewerWindow(src, liveVideoPath || undefined)
+                                    }
+                                }}
                                 onDebug={(p) => setDebugPost(p)}
+                                onDelete={(postId) => setPosts(prev => prev.filter(p => p.id !== postId))}
                             />
                         ))}
                     </div>
@@ -394,15 +423,6 @@ export default function SnsPage() {
             />
 
             {/* Dialogs and Overlays */}
-            {previewImage && (
-                <ImagePreview
-                    src={previewImage.src}
-                    isVideo={previewImage.isVideo}
-                    liveVideoPath={previewImage.liveVideoPath}
-                    onClose={() => setPreviewImage(null)}
-                />
-            )}
-
             <JumpToDateDialog
                 isOpen={showJumpDialog}
                 onClose={() => setShowJumpDialog(false)}
@@ -431,6 +451,101 @@ export default function SnsPage() {
                 </div>
             )}
 
+            {/* 朋友圈防删除插件对话框 */}
+            {showTriggerDialog && (
+                <div className="modal-overlay" onClick={() => { setShowTriggerDialog(false); setTriggerMessage(null) }}>
+                    <div className="sns-protect-dialog" onClick={(e) => e.stopPropagation()}>
+                        <button className="close-btn sns-protect-close" onClick={() => { setShowTriggerDialog(false); setTriggerMessage(null) }}>
+                            <X size={18} />
+                        </button>
+
+                        {/* 顶部图标区 */}
+                        <div className="sns-protect-hero">
+                            <div className={`sns-protect-icon-wrap ${triggerInstalled ? 'active' : ''}`}>
+                                {triggerLoading
+                                    ? <RefreshCw size={28} className="spinning" />
+                                    : triggerInstalled
+                                        ? <Shield size={28} />
+                                        : <ShieldOff size={28} />
+                                }
+                            </div>
+                            <div className="sns-protect-title">朋友圈防删除</div>
+                            <div className={`sns-protect-status-badge ${triggerInstalled ? 'on' : 'off'}`}>
+                                {triggerLoading ? '检查中…' : triggerInstalled ? '已启用' : '未启用'}
+                            </div>
+                        </div>
+
+                        {/* 说明 */}
+                        <div className="sns-protect-desc">
+                            启用后，WeFlow将拦截朋友圈删除操作<br/>已同步的动态不会从本地数据库中消失<br/>新的动态仍可正常同步。
+                        </div>
+
+                        {/* 操作反馈 */}
+                        {triggerMessage && (
+                            <div className={`sns-protect-feedback ${triggerMessage.type}`}>
+                                {triggerMessage.type === 'success' ? <CheckCircle size={14} /> : <AlertCircle size={14} />}
+                                <span>{triggerMessage.text}</span>
+                            </div>
+                        )}
+
+                        {/* 操作按钮 */}
+                        <div className="sns-protect-actions">
+                            {!triggerInstalled ? (
+                                <button
+                                    className="sns-protect-btn primary"
+                                    disabled={triggerLoading}
+                                    onClick={async () => {
+                                        setTriggerLoading(true)
+                                        setTriggerMessage(null)
+                                        try {
+                                            const r = await window.electronAPI.sns.installBlockDeleteTrigger()
+                                            if (r.success) {
+                                                setTriggerInstalled(true)
+                                                setTriggerMessage({ type: 'success', text: r.alreadyInstalled ? '插件已存在，无需重复安装' : '已启用朋友圈防删除保护' })
+                                            } else {
+                                                setTriggerMessage({ type: 'error', text: r.error || '安装失败' })
+                                            }
+                                        } catch (e: any) {
+                                            setTriggerMessage({ type: 'error', text: e.message || String(e) })
+                                        } finally {
+                                            setTriggerLoading(false)
+                                        }
+                                    }}
+                                >
+                                    <Shield size={15} />
+                                    启用保护
+                                </button>
+                            ) : (
+                                <button
+                                    className="sns-protect-btn danger"
+                                    disabled={triggerLoading}
+                                    onClick={async () => {
+                                        setTriggerLoading(true)
+                                        setTriggerMessage(null)
+                                        try {
+                                            const r = await window.electronAPI.sns.uninstallBlockDeleteTrigger()
+                                            if (r.success) {
+                                                setTriggerInstalled(false)
+                                                setTriggerMessage({ type: 'success', text: '已关闭朋友圈防删除保护' })
+                                            } else {
+                                                setTriggerMessage({ type: 'error', text: r.error || '卸载失败' })
+                                            }
+                                        } catch (e: any) {
+                                            setTriggerMessage({ type: 'error', text: e.message || String(e) })
+                                        } finally {
+                                            setTriggerLoading(false)
+                                        }
+                                    }}
+                                >
+                                    <ShieldOff size={15} />
+                                    关闭保护
+                                </button>
+                            )}
+                        </div>
+                    </div>
+                </div>
+            )}
+
             {/* 导出对话框 */}
             {showExportDialog && (
                 <div className="modal-overlay" onClick={() => !isExporting && setShowExportDialog(false)}>

src/pages/WelcomePage.scss

@@ -803,3 +803,79 @@
     opacity: 1;
   }
 }
+
+
+.brute-force-progress {
+  margin-top: 16px;
+  padding: 14px 16px;
+  background: var(--bg-tertiary);
+  border: 1px solid var(--border-color);
+  border-radius: 12px;
+  animation: slideUp 0.3s ease;
+
+  .status-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+
+    .status-text {
+      font-size: 13px;
+      color: var(--text-primary);
+      font-weight: 500;
+      margin: 0;
+      animation: pulse 2s ease-in-out infinite;
+    }
+
+    .percent {
+      font-size: 14px;
+      color: var(--primary);
+      font-weight: 700;
+      font-family: var(--font-mono);
+    }
+  }
+
+  .progress-bar-container {
+    width: 100%;
+    height: 8px;
+    background: var(--bg-primary);
+    border-radius: 4px;
+    overflow: hidden;
+    border: 1px solid var(--border-color);
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.05);
+
+    .fill {
+      height: 100%;
+      background: linear-gradient(90deg, var(--primary) 0%, color-mix(in srgb, var(--primary) 60%, white) 100%);
+      border-radius: 4px;
+      transition: width 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      position: relative;
+
+      &::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: linear-gradient(
+                        90deg,
+                        transparent,
+                        rgba(255, 255, 255, 0.3),
+                        transparent
+        );
+        animation: progress-shimmer 1.5s infinite linear;
+      }
+    }
+  }
+}
+
+@keyframes pulse {
+  0%, 100% { opacity: 1; }
+  50% { opacity: 0.7; }
+}
+
+@keyframes progress-shimmer {
+  0% { transform: translateX(-100%); }
+  100% { transform: translateX(100%); }
+}

src/pages/WelcomePage.tsx

@@ -48,6 +48,7 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
   const [dbKeyStatus, setDbKeyStatus] = useState('')
   const [imageKeyStatus, setImageKeyStatus] = useState('')
   const [isManualStartPrompt, setIsManualStartPrompt] = useState(false)
+  const [imageKeyPercent, setImageKeyPercent] = useState<number | null>(null)
 
   // 安全相关 state
   const [enableAuth, setEnableAuth] = useState(false)
@@ -111,8 +112,25 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
     const removeDb = window.electronAPI.key.onDbKeyStatus((payload: { message: string; level: number }) => {
       setDbKeyStatus(payload.message)
     })
-    const removeImage = window.electronAPI.key.onImageKeyStatus((payload: { message: string }) => {
-      setImageKeyStatus(payload.message)
+    const removeImage = window.electronAPI.key.onImageKeyStatus((payload: { message: string, percent?: number }) => {
+      let msg = payload.message;
+      let pct = payload.percent;
+
+      // 解析文本中的百分比
+      if (pct === undefined) {
+        const match = msg.match(/\(([\d.]+)%\)/);
+        if (match) {
+          pct = parseFloat(match[1]);
+          msg = msg.replace(/\s*\([\d.]+%\)/, '');
+        }
+      }
+
+      setImageKeyStatus(msg);
+      if (pct !== undefined) {
+        setImageKeyPercent(pct);
+      } else if (msg.includes('启动多核') || msg.includes('定位') || msg.includes('准备')) {
+        setImageKeyPercent(0);
+      }
     })
     return () => {
       removeDb?.()
@@ -297,6 +315,7 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
     }
     setIsFetchingImageKey(true)
     setError('')
+    setImageKeyPercent(0)
     setImageKeyStatus('正在准备获取图片密钥...')
     try {
       // 拼接完整的账号目录，确保 KeyService 能准确找到模板文件
@@ -752,10 +771,25 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
                 </div>
 
                 <button className="btn btn-secondary btn-block mt-4" onClick={handleAutoGetImageKey} disabled={isFetchingImageKey}>
-                  {isFetchingImageKey ? '扫描中...' : '自动获取图片密钥'}
+                  {isFetchingImageKey ? '获取中...' : '自动获取图片密钥'}
                 </button>
 
-                {imageKeyStatus && <div className="status-message">{imageKeyStatus}</div>}
+                {isFetchingImageKey ? (
+                  <div className="brute-force-progress">
+                    <div className="status-header">
+                      <span className="status-text">{imageKeyStatus || '正在启动...'}</span>
+                      {imageKeyPercent !== null && <span className="percent">{imageKeyPercent.toFixed(1)}%</span>}
+                    </div>
+                    {imageKeyPercent !== null && (
+                      <div className="progress-bar-container">
+                        <div className="fill" style={{ width: `${imageKeyPercent}%` }}></div>
+                      </div>
+                    )}
+                  </div>
+                ) : (
+                  imageKeyStatus && <div className="status-message" style={{ marginTop: '12px' }}>{imageKeyStatus}</div>
+                )}
+
                 <div className="field-hint">请在微信中打开几张图片后再点击获取</div>
               </div>
             )}

src/stores/batchImageDecryptStore.ts

@@ -0,0 +1,64 @@
+import { create } from 'zustand'
+
+export interface BatchImageDecryptState {
+  isBatchDecrypting: boolean
+  progress: { current: number; total: number }
+  showToast: boolean
+  showResultToast: boolean
+  result: { success: number; fail: number }
+  startTime: number
+  sessionName: string
+
+  startDecrypt: (total: number, sessionName: string) => void
+  updateProgress: (current: number, total: number) => void
+  finishDecrypt: (success: number, fail: number) => void
+  setShowToast: (show: boolean) => void
+  setShowResultToast: (show: boolean) => void
+  reset: () => void
+}
+
+export const useBatchImageDecryptStore = create<BatchImageDecryptState>((set) => ({
+  isBatchDecrypting: false,
+  progress: { current: 0, total: 0 },
+  showToast: false,
+  showResultToast: false,
+  result: { success: 0, fail: 0 },
+  startTime: 0,
+  sessionName: '',
+
+  startDecrypt: (total, sessionName) => set({
+    isBatchDecrypting: true,
+    progress: { current: 0, total },
+    showToast: true,
+    showResultToast: false,
+    result: { success: 0, fail: 0 },
+    startTime: Date.now(),
+    sessionName
+  }),
+
+  updateProgress: (current, total) => set({
+    progress: { current, total }
+  }),
+
+  finishDecrypt: (success, fail) => set({
+    isBatchDecrypting: false,
+    showToast: false,
+    showResultToast: true,
+    result: { success, fail },
+    startTime: 0
+  }),
+
+  setShowToast: (show) => set({ showToast: show }),
+  setShowResultToast: (show) => set({ showResultToast: show }),
+
+  reset: () => set({
+    isBatchDecrypting: false,
+    progress: { current: 0, total: 0 },
+    showToast: false,
+    showResultToast: false,
+    result: { success: 0, fail: 0 },
+    startTime: 0,
+    sessionName: ''
+  })
+}))
+

src/stores/chatStore.ts

@@ -86,15 +86,16 @@ export const useChatStore = create<ChatState>((set, get) => ({
       if (m.localId && m.localId > 0) return `l:${m.localId}`
       return `t:${m.createTime}:${m.sortSeq || 0}:${m.serverId || 0}`
     }
-    const existingKeys = new Set(state.messages.map(getMsgKey))
+    const currentMessages = state.messages || []
+    const existingKeys = new Set(currentMessages.map(getMsgKey))
     const filtered = newMessages.filter(m => !existingKeys.has(getMsgKey(m)))
 
     if (filtered.length === 0) return state
 
     return {
       messages: prepend
-        ? [...filtered, ...state.messages]
-        : [...state.messages, ...filtered]
+        ? [...filtered, ...currentMessages]
+        : [...currentMessages, ...filtered]
     }
   }),
 

src/stores/themeStore.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand'
 import { persist } from 'zustand/middleware'
 
-export type ThemeId = 'cloud-dancer' | 'corundum-blue' | 'kiwi-green' | 'spicy-red' | 'teal-water'
+export type ThemeId = 'cloud-dancer' | 'corundum-blue' | 'kiwi-green' | 'spicy-red' | 'teal-water' | 'blossom-dream'
 export type ThemeMode = 'light' | 'dark' | 'system'
 
 export interface ThemeInfo {
@@ -10,6 +10,8 @@ export interface ThemeInfo {
   description: string
   primaryColor: string
   bgColor: string
+  // 可选副色，用于多彩主题的渐变预览
+  accentColor?: string
 }
 
 export const themes: ThemeInfo[] = [
@@ -20,6 +22,14 @@ export const themes: ThemeInfo[] = [
     primaryColor: '#8B7355',
     bgColor: '#F0EEE9'
   },
+  {
+    id: 'blossom-dream',
+    name: '繁花如梦',
+    description: '晨曦花境 · 夜阑幽梦',
+    primaryColor: '#D4849A',
+    bgColor: '#FCF9FB',
+    accentColor: '#FFBE98'
+  },
   {
     id: 'corundum-blue',
     name: '刚玉蓝',

src/styles/batchTranscribe.scss

@@ -167,6 +167,50 @@
   }
 }
 
+.batch-inline-result-toast {
+  .batch-progress-toast-title {
+    svg {
+      color: #22c55e;
+    }
+  }
+
+  .batch-inline-result-summary {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 8px;
+  }
+
+  .batch-inline-result-item {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 8px 10px;
+    border-radius: 8px;
+    background: var(--bg-tertiary);
+    font-size: 12px;
+    color: var(--text-secondary);
+
+    svg {
+      flex-shrink: 0;
+    }
+
+    &.success {
+      color: #16a34a;
+      svg { color: #16a34a; }
+    }
+
+    &.fail {
+      color: #dc2626;
+      svg { color: #dc2626; }
+    }
+
+    &.muted {
+      color: var(--text-tertiary, #999);
+      svg { color: var(--text-tertiary, #999); }
+    }
+  }
+}
+
 // 批量转写结果对话框
 .batch-result-modal {
   width: 420px;

src/styles/main.scss

@@ -37,6 +37,8 @@
 
   // 卡片背景
   --card-bg: rgba(255, 255, 255, 0.7);
+  --card-inner-bg: #FAFAF7;
+  --sent-card-bg: var(--primary);
 }
 
 // ==================== 浅色主题 ====================
@@ -59,6 +61,8 @@
   --bg-gradient: linear-gradient(135deg, #F0EEE9 0%, #E8E6E1 100%);
   --primary-gradient: linear-gradient(135deg, #8B7355 0%, #A68B5B 100%);
   --card-bg: rgba(255, 255, 255, 0.7);
+  --card-inner-bg: #FAFAF7;
+  --sent-card-bg: var(--primary);
 }
 
 // 刚玉蓝主题
@@ -79,6 +83,8 @@
   --bg-gradient: linear-gradient(135deg, #E8EEF0 0%, #D8E4E8 100%);
   --primary-gradient: linear-gradient(135deg, #4A6670 0%, #5A7A86 100%);
   --card-bg: rgba(255, 255, 255, 0.7);
+  --card-inner-bg: #F8FAFB;
+  --sent-card-bg: var(--primary);
 }
 
 // 冰猕猴桃汁绿主题
@@ -99,6 +105,8 @@
   --bg-gradient: linear-gradient(135deg, #E8F0E4 0%, #D8E8D0 100%);
   --primary-gradient: linear-gradient(135deg, #7A9A5C 0%, #8AAA6C 100%);
   --card-bg: rgba(255, 255, 255, 0.7);
+  --card-inner-bg: #F8FBF6;
+  --sent-card-bg: var(--primary);
 }
 
 // 辛辣红主题
@@ -119,6 +127,8 @@
   --bg-gradient: linear-gradient(135deg, #F0E8E8 0%, #E8D8D8 100%);
   --primary-gradient: linear-gradient(135deg, #8B4049 0%, #A05058 100%);
   --card-bg: rgba(255, 255, 255, 0.7);
+  --card-inner-bg: #FAF8F8;
+  --sent-card-bg: var(--primary);
 }
 
 // 明水鸭色主题
@@ -139,6 +149,45 @@
   --bg-gradient: linear-gradient(135deg, #E4F0F0 0%, #D4E8E8 100%);
   --primary-gradient: linear-gradient(135deg, #5A8A8A 0%, #6A9A9A 100%);
   --card-bg: rgba(255, 255, 255, 0.7);
+  --card-inner-bg: #F6FBFB;
+  --sent-card-bg: var(--primary);
+}
+
+// 繁花如梦 - 浅色（晨曦花境）
+[data-theme="blossom-dream"][data-mode="light"],
+[data-theme="blossom-dream"]:not([data-mode]) {
+  // 三色定义（供伪元素光晕使用，饱和度提高以便在底色上可见）
+  --blossom-pink: #F0A0B8;
+  --blossom-peach: #FFB07A;
+  --blossom-blue: #90B8E0;
+
+  // 主品牌色：Pantone 粉晶 Rose Quartz
+  --primary: #D4849A;
+  --primary-rgb: 212, 132, 154;
+  --primary-hover: #C4748A;
+  --primary-light: rgba(212, 132, 154, 0.12);
+
+  // 背景三层：主背景最深（相对），面板次之，卡片最白
+  --bg-primary: #F5EDF2;
+  --bg-secondary: rgba(255, 255, 255, 0.82);
+  --bg-tertiary: rgba(212, 132, 154, 0.06);
+  --bg-hover: rgba(212, 132, 154, 0.09);
+
+  // 文字：提高对比度，主色接近纯黑只带微弱紫调
+  --text-primary: #1E1A22;
+  --text-secondary: #6B5F70;
+  --text-tertiary: #9A8A9E;
+  // 边框：粉色半透明，有存在感但不强硬
+  --border-color: rgba(212, 132, 154, 0.18);
+
+  --bg-gradient: linear-gradient(150deg, #F5EDF2 0%, #F0EAF6 50%, #EAF0F8 100%);
+  --primary-gradient: linear-gradient(135deg, #D4849A 0%, #E8A8B8 100%);
+
+  // 卡片：高不透明度白，与背景形成明显层次
+  --card-bg: rgba(255, 255, 255, 0.88);
+  --card-inner-bg: rgba(255, 255, 255, 0.95);
+
+  --sent-card-bg: var(--primary);
 }
 
 // ==================== 深色主题 ====================
@@ -151,6 +200,7 @@
   --primary-light: rgba(201, 168, 108, 0.15);
   --bg-primary: #1a1816;
   --bg-secondary: rgba(40, 36, 32, 0.9);
+  --bg-secondary-solid: #282420;
   --bg-tertiary: rgba(255, 255, 255, 0.05);
   --bg-hover: rgba(255, 255, 255, 0.08);
   --text-primary: #F0EEE9;
@@ -160,6 +210,8 @@
   --bg-gradient: linear-gradient(135deg, #1a1816 0%, #252220 100%);
   --primary-gradient: linear-gradient(135deg, #8B7355 0%, #C9A86C 100%);
   --card-bg: rgba(40, 36, 32, 0.9);
+  --card-inner-bg: #27231F;
+  --sent-card-bg: var(--primary);
 }
 
 // 刚玉蓝 - 深色
@@ -170,6 +222,7 @@
   --primary-light: rgba(106, 154, 170, 0.15);
   --bg-primary: #141a1c;
   --bg-secondary: rgba(30, 40, 44, 0.9);
+  --bg-secondary-solid: #1e282c;
   --bg-tertiary: rgba(255, 255, 255, 0.05);
   --bg-hover: rgba(255, 255, 255, 0.08);
   --text-primary: #E8EEF0;
@@ -179,6 +232,8 @@
   --bg-gradient: linear-gradient(135deg, #141a1c 0%, #1e282c 100%);
   --primary-gradient: linear-gradient(135deg, #4A6670 0%, #6A9AAA 100%);
   --card-bg: rgba(30, 40, 44, 0.9);
+  --card-inner-bg: #1D272A;
+  --sent-card-bg: var(--primary);
 }
 
 // 冰猕猴桃汁绿 - 深色
@@ -189,6 +244,7 @@
   --primary-light: rgba(154, 186, 124, 0.15);
   --bg-primary: #161a14;
   --bg-secondary: rgba(34, 42, 30, 0.9);
+  --bg-secondary-solid: #222a1e;
   --bg-tertiary: rgba(255, 255, 255, 0.05);
   --bg-hover: rgba(255, 255, 255, 0.08);
   --text-primary: #E8F0E4;
@@ -198,6 +254,8 @@
   --bg-gradient: linear-gradient(135deg, #161a14 0%, #222a1e 100%);
   --primary-gradient: linear-gradient(135deg, #7A9A5C 0%, #9ABA7C 100%);
   --card-bg: rgba(34, 42, 30, 0.9);
+  --card-inner-bg: #21281D;
+  --sent-card-bg: var(--primary);
 }
 
 // 辛辣红 - 深色
@@ -208,6 +266,7 @@
   --primary-light: rgba(192, 96, 104, 0.15);
   --bg-primary: #1a1416;
   --bg-secondary: rgba(42, 32, 34, 0.9);
+  --bg-secondary-solid: #2a2022;
   --bg-tertiary: rgba(255, 255, 255, 0.05);
   --bg-hover: rgba(255, 255, 255, 0.08);
   --text-primary: #F0E8E8;
@@ -217,6 +276,8 @@
   --bg-gradient: linear-gradient(135deg, #1a1416 0%, #2a2022 100%);
   --primary-gradient: linear-gradient(135deg, #8B4049 0%, #C06068 100%);
   --card-bg: rgba(42, 32, 34, 0.9);
+  --card-inner-bg: #281F21;
+  --sent-card-bg: var(--primary);
 }
 
 // 明水鸭色 - 深色
@@ -227,6 +288,7 @@
   --primary-light: rgba(122, 186, 170, 0.15);
   --bg-primary: #121a1a;
   --bg-secondary: rgba(28, 42, 42, 0.9);
+  --bg-secondary-solid: #1c2a2a;
   --bg-tertiary: rgba(255, 255, 255, 0.05);
   --bg-hover: rgba(255, 255, 255, 0.08);
   --text-primary: #E4F0F0;
@@ -236,6 +298,45 @@
   --bg-gradient: linear-gradient(135deg, #121a1a 0%, #1c2a2a 100%);
   --primary-gradient: linear-gradient(135deg, #5A8A8A 0%, #7ABAAA 100%);
   --card-bg: rgba(28, 42, 42, 0.9);
+  --card-inner-bg: #1B2828;
+  --sent-card-bg: var(--primary);
+}
+
+// 繁花如梦 - 深色（夜阑幽梦）
+[data-theme="blossom-dream"][data-mode="dark"] {
+  // 光晕色（供伪元素使用，降低饱和度避免刺眼）
+  --blossom-pink: #C670C3;
+  --blossom-purple: #5F4B8B;
+  --blossom-blue: #3A2A50;
+
+  // 主品牌色：藕粉/烟紫粉，降饱和度不刺眼
+  --primary: #D19EBB;
+  --primary-rgb: 209, 158, 187;
+  --primary-hover: #DDB0C8;
+  --primary-light: rgba(209, 158, 187, 0.15);
+
+  // 背景三层：极深黑灰底（去掉紫薯色），面板略浅，卡片再浅一级
+  --bg-primary: #151316;
+  --bg-secondary: rgba(34, 30, 36, 0.92);
+  --bg-secondary-solid: #221E24;
+  --bg-tertiary: rgba(255, 255, 255, 0.04);
+  --bg-hover: rgba(209, 158, 187, 0.1);
+
+  // 文字
+  --text-primary: #F0EAF4;
+  --text-secondary: #A898AE;
+  --text-tertiary: #6A5870;
+  // 边框：极细白色内发光，剥离层级
+  --border-color: rgba(255, 255, 255, 0.07);
+
+  --bg-gradient: linear-gradient(150deg, #151316 0%, #1A1620 50%, #131018 100%);
+  --primary-gradient: linear-gradient(135deg, #D19EBB 0%, #A878A8 100%);
+
+  // 卡片：比面板更亮一档，用深灰而非紫色
+  --card-bg: rgba(42, 38, 46, 0.92);
+  --card-inner-bg: rgba(52, 48, 56, 0.96);
+
+  --sent-card-bg: var(--primary);
 }
 
 // 重置样式

src/types/electron.d.ts

@@ -11,7 +11,7 @@ export interface ElectronAPI {
     setTitleBarOverlay: (options: { symbolColor: string }) => void
     openVideoPlayerWindow: (videoPath: string, videoWidth?: number, videoHeight?: number) => Promise<void>
     resizeToFitVideo: (videoWidth: number, videoHeight: number) => Promise<void>
-    openImageViewerWindow: (imagePath: string) => Promise<void>
+    openImageViewerWindow: (imagePath: string, liveVideoPath?: string) => Promise<void>
     openChatHistoryWindow: (sessionId: string, messageId: number) => Promise<boolean>
   }
   config: {
@@ -19,6 +19,17 @@ export interface ElectronAPI {
     set: (key: string, value: unknown) => Promise<void>
     clear: () => Promise<boolean>
   }
+  auth: {
+    hello: (message?: string) => Promise<{ success: boolean; error?: string }>
+    verifyEnabled: () => Promise<boolean>
+    unlock: (password: string) => Promise<{ success: boolean; error?: string }>
+    enableLock: (password: string) => Promise<{ success: boolean; error?: string }>
+    disableLock: (password: string) => Promise<{ success: boolean; error?: string }>
+    changePassword: (oldPassword: string, newPassword: string) => Promise<{ success: boolean; error?: string }>
+    setHelloSecret: (password: string) => Promise<{ success: boolean }>
+    clearHelloSecret: () => Promise<{ success: boolean }>
+    isLockMode: () => Promise<boolean>
+  }
   dialog: {
     openFile: (options?: Electron.OpenDialogOptions) => Promise<Electron.OpenDialogReturnValue>
     openDirectory: (options?: Electron.OpenDialogOptions) => Promise<Electron.OpenDialogReturnValue>
@@ -115,6 +126,11 @@ export interface ElectronAPI {
     getImageData: (sessionId: string, msgId: string) => Promise<{ success: boolean; data?: string; error?: string }>
     getVoiceData: (sessionId: string, msgId: string, createTime?: number, serverId?: string | number) => Promise<{ success: boolean; data?: string; error?: string }>
     getAllVoiceMessages: (sessionId: string) => Promise<{ success: boolean; messages?: Message[]; error?: string }>
+    getAllImageMessages: (sessionId: string) => Promise<{
+      success: boolean
+      images?: { imageMd5?: string; imageDatName?: string; createTime?: number }[]
+      error?: string
+    }>
     resolveVoiceCache: (sessionId: string, msgId: string) => Promise<{ success: boolean; hasCache: boolean; data?: string }>
     getVoiceTranscript: (sessionId: string, msgId: string, createTime?: number) => Promise<{ success: boolean; transcript?: string; error?: string }>
     onVoiceTranscriptPartial: (callback: (payload: { msgId: string; text: string }) => void) => () => void
@@ -125,7 +141,7 @@ export interface ElectronAPI {
 
   image: {
     decrypt: (payload: { sessionId?: string; imageMd5?: string; imageDatName?: string; force?: boolean }) => Promise<{ success: boolean; localPath?: string; error?: string }>
-    resolveCache: (payload: { sessionId?: string; imageMd5?: string; imageDatName?: string }) => Promise<{ success: boolean; localPath?: string; hasUpdate?: boolean; error?: string }>
+    resolveCache: (payload: { sessionId?: string; imageMd5?: string; imageDatName?: string }) => Promise<{ success: boolean; localPath?: string; hasUpdate?: boolean; liveVideoPath?: string; error?: string }>
     preload: (payloads: Array<{ sessionId?: string; imageMd5?: string; imageDatName?: string }>) => Promise<boolean>
     onUpdateAvailable: (callback: (payload: { cacheKey: string; imageMd5?: string; imageDatName?: string }) => void) => () => void
     onCacheResolved: (callback: (payload: { cacheKey: string; imageMd5?: string; imageDatName?: string; localPath: string }) => void) => () => void
@@ -484,7 +500,7 @@ export interface ElectronAPI {
           }
         }>
         likes: Array<string>
-        comments: Array<{ id: string; nickname: string; content: string; refCommentId: string; refNickname?: 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 }> }>
         rawXml?: string
       }>
       error?: string
@@ -504,6 +520,11 @@ export interface ElectronAPI {
     onExportProgress: (callback: (payload: { current: number; total: number; status: string }) => void) => () => void
     selectExportDir: () => Promise<{ canceled: boolean; filePath?: string }>
     getSnsUsernames: () => Promise<{ success: boolean; usernames?: string[]; error?: string }>
+    installBlockDeleteTrigger: () => Promise<{ success: boolean; alreadyInstalled?: boolean; error?: string }>
+    uninstallBlockDeleteTrigger: () => Promise<{ success: boolean; error?: string }>
+    checkBlockDeleteTrigger: () => Promise<{ success: boolean; installed?: boolean; error?: string }>
+    deleteSnsPost: (postId: string) => Promise<{ success: boolean; error?: string }>
+    downloadEmoji: (params: { url: string; encryptUrl?: string; aesKey?: string }) => Promise<{ success: boolean; localPath?: string; error?: string }>
   }
   http: {
     start: (port?: number) => Promise<{ success: boolean; port?: number; error?: string }>

src/types/models.ts

@@ -12,6 +12,8 @@ export interface ChatSession {
   lastMsgSender?: string
   lastSenderDisplayName?: string
   selfWxid?: string // Helper field to avoid extra API calls
+  isFolded?: boolean  // 是否已折叠进"折叠的群聊"
+  isMuted?: boolean   // 是否开启免打扰
 }
 
 // 联系人
@@ -51,6 +53,7 @@ export interface Message {
   imageDatName?: string
   emojiCdnUrl?: string
   emojiMd5?: string
+  emojiLocalPath?: string   // 本地缓存路径（转发表情包无 CDN URL 时使用）
   voiceDurationSeconds?: number
   videoMd5?: string
   // 引用消息
@@ -64,12 +67,39 @@ export interface Message {
   fileSize?: number         // 文件大小
   fileExt?: string          // 文件扩展名
   xmlType?: string          // XML 中的 type 字段
+  appMsgKind?: string       // 归一化 appmsg 类型
+  appMsgDesc?: string
+  appMsgAppName?: string
+  appMsgSourceName?: string
+  appMsgSourceUsername?: string
+  appMsgThumbUrl?: string
+  appMsgMusicUrl?: string
+  appMsgDataUrl?: string
+  appMsgLocationLabel?: string
+  finderNickname?: string
+  finderUsername?: string
+  finderCoverUrl?: string   // 视频号封面图
+  finderAvatar?: string     // 视频号作者头像
+  finderDuration?: number   // 视频号时长(秒)
+  // 位置消息
+  locationLat?: number      // 纬度
+  locationLng?: number      // 经度
+  locationPoiname?: string  // 地点名称
+  locationLabel?: string    // 详细地址
+  // 音乐消息
+  musicAlbumUrl?: string    // 专辑封面
+  musicUrl?: string         // 播放链接
+  // 礼物消息
+  giftImageUrl?: string     // 礼物商品图
+  giftWish?: string         // 祝福语
+  giftPrice?: string        // 价格(分)
   // 转账消息
   transferPayerUsername?: string    // 转账付款方 wxid
   transferReceiverUsername?: string // 转账收款方 wxid
   // 名片消息
   cardUsername?: string     // 名片的微信ID
   cardNickname?: string     // 名片的昵称
+  cardAvatarUrl?: string    // 名片头像 URL
   // 聊天记录
   chatRecordTitle?: string  // 聊天记录标题
   chatRecordList?: ChatRecordItem[]  // 聊天记录列表

src/types/sns.ts

@@ -16,16 +16,27 @@ export interface SnsMedia {
     livePhoto?: SnsLivePhoto
 }
 
+export interface SnsCommentEmoji {
+    url: string
+    md5: string
+    width: number
+    height: number
+    encryptUrl?: string
+    aesKey?: string
+}
+
 export interface SnsComment {
     id: string
     nickname: string
     content: string
     refCommentId: string
     refNickname?: string
+    emojis?: SnsCommentEmoji[]
 }
 
 export interface SnsPost {
     id: string
+    tid?: string       // 数据库主键（雪花 ID），用于精确删除
     username: string
     nickname: string
     avatarUrl?: string
@@ -38,6 +49,7 @@ export interface SnsPost {
     rawXml?: string
     linkTitle?: string
     linkUrl?: string
+    isProtected?: boolean  // 是否受保护（已安装时标记）
 }
 
 export interface SnsLinkCardData {

src/vite-env.d.ts

@@ -5,6 +5,14 @@ interface Window {
         // ... other methods ...
         auth: {
             hello: (message?: string) => Promise<{ success: boolean; error?: string }>
+            verifyEnabled: () => Promise<boolean>
+            unlock: (password: string) => Promise<{ success: boolean; error?: string }>
+            enableLock: (password: string) => Promise<{ success: boolean; error?: string }>
+            disableLock: (password: string) => Promise<{ success: boolean; error?: string }>
+            changePassword: (oldPassword: string, newPassword: string) => Promise<{ success: boolean; error?: string }>
+            setHelloSecret: (password: string) => Promise<{ success: boolean }>
+            clearHelloSecret: () => Promise<{ success: boolean }>
+            isLockMode: () => Promise<boolean>
         }
         // For brevity, using 'any' for other parts or properly importing types if available.
         // In a real scenario, you'd likely want to keep the full interface definition consistent with preload.ts