chore: merge upstream main into fork main

2026-04-11 23:15:51 +00:00 · 2026-04-10 20:45:04 +08:00
parent 079779c2c6 b00264d060
commit 36bed846b2
62 changed files with 1693 additions and 901 deletions
--- a/src/pages/ChatPage.scss
+++ b/src/pages/ChatPage.scss
@@ -1965,6 +1965,10 @@
      color: var(--on-primary);
      border-radius: 18px 18px 4px 18px;
    }
+
+    .bubble-body {
+      align-items: flex-end;
+    }
  }

  // 对方发送的消息 - 左侧白色
@@ -1974,6 +1978,10 @@
      color: var(--text-primary);
      border-radius: 18px 18px 18px 4px;
    }
+
+    .bubble-body {
+      align-items: flex-start;
+    }
  }

  &.system {
@@ -2038,6 +2046,12 @@
  white-space: pre-wrap;
 }

+// 让文字气泡按内容收缩，不被群昵称行宽度牵连
+.message-bubble:not(.system) .bubble-content {
+  width: fit-content;
+  max-width: 100%;
+}
+
 // 表情包消息
 .message-bubble.emoji {
  .bubble-content {
--- a/src/pages/ChatPage.tsx
+++ b/src/pages/ChatPage.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react'
 import { Search, MessageSquare, AlertCircle, Loader2, RefreshCw, X, ChevronDown, ChevronLeft, Info, Calendar, Database, Hash, Play, Pause, Image as ImageIcon, Mic, CheckCircle, Copy, Check, CheckSquare, Download, BarChart3, Edit2, Trash2, BellOff, Users, FolderClosed, UserCheck, Crown, Aperture, Newspaper } from 'lucide-react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate, useLocation } from 'react-router-dom'
 import { createPortal } from 'react-dom'
 import { Virtuoso, type VirtuosoHandle } from 'react-virtuoso'
 import { useShallow } from 'zustand/react/shallow'
@@ -1142,6 +1142,7 @@ function ChatPage(props: ChatPageProps) {
  const normalizedStandaloneInitialContactType = useMemo(() => String(standaloneInitialContactType || '').trim().toLowerCase(), [standaloneInitialContactType])
  const shouldHideStandaloneDetailButton = standaloneSessionWindow && normalizedStandaloneSource === 'export'
  const navigate = useNavigate()
+  const location = useLocation()

  const {
    isConnected,
@@ -5350,6 +5351,19 @@ function ChatPage(props: ChatPageProps) {
    selectSessionById
  ])

+  // 监听URL参数中的sessionId，用于通知点击导航
+  useEffect(() => {
+    if (standaloneSessionWindow) return // standalone模式由上面的useEffect处理
+    const params = new URLSearchParams(location.search)
+    const urlSessionId = params.get('sessionId')
+    if (!urlSessionId) return
+    if (!isConnected || isConnecting) return
+    if (currentSessionId === urlSessionId) return
+    selectSessionById(urlSessionId)
+    // 选中后清除URL参数，避免影响后续用户手动切换会话
+    navigate('/chat', { replace: true })
+  }, [standaloneSessionWindow, location.search, isConnected, isConnecting, currentSessionId, selectSessionById, navigate])
+
  useEffect(() => {
    if (!standaloneSessionWindow || !normalizedInitialSessionId) return
    if (!isConnected || isConnecting) {
--- a/src/pages/ExportPage.tsx
+++ b/src/pages/ExportPage.tsx
@@ -1621,6 +1621,7 @@ function ExportPage() {
  const [exportDefaultFormat, setExportDefaultFormat] = useState<TextExportFormat>('excel')
  const [exportDefaultAvatars, setExportDefaultAvatars] = useState(true)
  const [exportDefaultDateRangeSelection, setExportDefaultDateRangeSelection] = useState<ExportDateRangeSelection>(() => createDefaultExportDateRangeSelection())
+  const [exportDefaultFileNamingMode, setExportDefaultFileNamingMode] = useState<configService.ExportFileNamingMode>('classic')
  const [exportDefaultMedia, setExportDefaultMedia] = useState<configService.ExportDefaultMediaConfig>({
    images: true,
    videos: true,
@@ -2270,7 +2271,7 @@ function ExportPage() {
    setIsBaseConfigLoading(true)
    let isReady = true
    try {
-      const [savedPath, savedFormat, savedAvatars, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedImageDeepSearchOnMiss, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, savedWriteLayout, savedSessionNameWithTypePrefix, savedDefaultDateRange, exportCacheScope] = await Promise.all([
+      const [savedPath, savedFormat, savedAvatars, savedMedia, savedVoiceAsText, savedExcelCompactColumns, savedTxtColumns, savedConcurrency, savedImageDeepSearchOnMiss, savedSessionMap, savedContentMap, savedSessionRecordMap, savedSnsPostCount, savedWriteLayout, savedSessionNameWithTypePrefix, savedDefaultDateRange, savedFileNamingMode, exportCacheScope] = await Promise.all([
        configService.getExportPath(),
        configService.getExportDefaultFormat(),
        configService.getExportDefaultAvatars(),
@@ -2287,6 +2288,7 @@ function ExportPage() {
        configService.getExportWriteLayout(),
        configService.getExportSessionNamePrefixEnabled(),
        configService.getExportDefaultDateRange(),
+        configService.getExportDefaultFileNamingMode(),
        ensureExportCacheScope()
      ])

@@ -2318,6 +2320,7 @@ function ExportPage() {
      setExportDefaultExcelCompactColumns(savedExcelCompactColumns ?? true)
      setExportDefaultConcurrency(savedConcurrency ?? 2)
      setExportDefaultImageDeepSearchOnMiss(savedImageDeepSearchOnMiss ?? true)
+      setExportDefaultFileNamingMode(savedFileNamingMode ?? 'classic')
      const resolvedDefaultDateRange = resolveExportDateRangeConfig(savedDefaultDateRange)
      setExportDefaultDateRangeSelection(resolvedDefaultDateRange)
      setTimeRangeSelection(resolvedDefaultDateRange)
@@ -4397,6 +4400,7 @@ function ExportPage() {
      displayNamePreference: options.displayNamePreference,
      exportConcurrency: options.exportConcurrency,
      imageDeepSearchOnMiss: options.imageDeepSearchOnMiss,
+      fileNamingMode: exportDefaultFileNamingMode,
      sessionLayout,
      sessionNameWithTypePrefix,
      dateRange: options.useAllTime
@@ -7089,6 +7093,9 @@ function ExportPage() {
    if (patch.dateRange) {
      setExportDefaultDateRangeSelection(patch.dateRange)
    }
+    if (patch.fileNamingMode) {
+      setExportDefaultFileNamingMode(patch.fileNamingMode)
+    }
    if (patch.media) {
      const mediaPatch = patch.media
      setExportDefaultMedia(mediaPatch)
--- a/src/pages/ResourcesPage.tsx
+++ b/src/pages/ResourcesPage.tsx
@@ -1,6 +1,7 @@
 import { forwardRef, memo, useCallback, useEffect, useMemo, useRef, useState, type HTMLAttributes } from 'react'
 import { Calendar, Image as ImageIcon, Loader2, PlayCircle, RefreshCw, Trash2, UserRound } from 'lucide-react'
 import { VirtuosoGrid } from 'react-virtuoso'
+import { finishBackgroundTask, registerBackgroundTask, updateBackgroundTask } from '../services/backgroundTaskMonitor'
 import './ResourcesPage.scss'

 type MediaTab = 'image' | 'video'
@@ -35,10 +36,14 @@ type DialogState = {
  onConfirm?: (() => void) | null
 }

-const PAGE_SIZE = 120
-const MAX_IMAGE_CACHE_RESOLVE_PER_TICK = 18
-const MAX_IMAGE_CACHE_PRELOAD_PER_TICK = 36
-const MAX_VIDEO_POSTER_RESOLVE_PER_TICK = 4
+const PAGE_SIZE = 96
+const MAX_IMAGE_CACHE_RESOLVE_PER_TICK = 12
+const MAX_IMAGE_CACHE_PRELOAD_PER_TICK = 24
+const MAX_VIDEO_POSTER_RESOLVE_PER_TICK = 3
+const INITIAL_IMAGE_PRELOAD_END = 48
+const INITIAL_IMAGE_RESOLVE_END = 12
+const TASK_PROGRESS_UPDATE_MIN_INTERVAL_MS = 250
+const TASK_PROGRESS_UPDATE_MAX_STEPS = 100

 const GridList = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(function GridList(props, ref) {
  const { className = '', ...rest } = props
@@ -409,7 +414,13 @@ function ResourcesPage() {
    }

    try {
-      await window.electronAPI.chat.connect()
+      if (reset) {
+        const connectResult = await window.electronAPI.chat.connect()
+        if (!connectResult.success) {
+          setError(connectResult.error || '连接数据库失败')
+          return
+        }
+      }
      const requestOffset = reset ? 0 : nextOffset
      const streamResult = await window.electronAPI.chat.getMediaStream({
        sessionId: selectedContact === 'all' ? undefined : selectedContact,
@@ -524,7 +535,6 @@ function ResourcesPage() {
    let cancelled = false
    const run = async () => {
      try {
-        await window.electronAPI.chat.connect()
        const sessionResult = await window.electronAPI.chat.getSessions()
        if (!cancelled && sessionResult.success && Array.isArray(sessionResult.sessions)) {
          const initialNameMap: Record<string, string> = {}
@@ -674,7 +684,10 @@ function ResourcesPage() {
    resolvingImageCacheBatchRef.current = true
    void (async () => {
      try {
-        const result = await window.electronAPI.image.resolveCacheBatch(payloads, { disableUpdateCheck: true })
+        const result = await window.electronAPI.image.resolveCacheBatch(payloads, {
+          disableUpdateCheck: true,
+          allowCacheIndex: false
+        })
        const rows = Array.isArray(result?.rows) ? result.rows : []
        const pathPatch: Record<string, string> = {}
        const updatePatch: Record<string, boolean> = {}
@@ -741,7 +754,10 @@ function ResourcesPage() {
      if (payloads.length >= MAX_IMAGE_CACHE_PRELOAD_PER_TICK) break
    }
    if (payloads.length === 0) return
-    void window.electronAPI.image.preload(payloads, { allowDecrypt: false })
+    void window.electronAPI.image.preload(payloads, {
+      allowDecrypt: false,
+      allowCacheIndex: false
+    })
  }, [displayItems])

  const resolveItemVideoMd5 = useCallback(async (item: MediaStreamItem): Promise<string> => {
@@ -813,14 +829,18 @@ function ResourcesPage() {
    if (!pending) return
    pendingRangeRef.current = null
    if (tab === 'image') {
-      preloadImageCacheRange(pending.start - 8, pending.end + 32)
-      resolveImageCacheRange(pending.start - 2, pending.end + 8)
+      preloadImageCacheRange(pending.start - 4, pending.end + 20)
+      resolveImageCacheRange(pending.start - 1, pending.end + 6)
      return
    }
    resolvePosterRange(pending.start, pending.end)
  }, [preloadImageCacheRange, resolveImageCacheRange, resolvePosterRange, tab])

  const scheduleRangeResolve = useCallback((start: number, end: number) => {
+    const previous = pendingRangeRef.current
+    if (previous && start >= previous.start && end <= previous.end) {
+      return
+    }
    pendingRangeRef.current = { start, end }
    if (rangeTimerRef.current !== null) {
      window.clearTimeout(rangeTimerRef.current)
@@ -832,8 +852,8 @@ function ResourcesPage() {
  useEffect(() => {
    if (displayItems.length === 0) return
    if (tab === 'image') {
-      preloadImageCacheRange(0, Math.min(displayItems.length - 1, 80))
-      resolveImageCacheRange(0, Math.min(displayItems.length - 1, 20))
+      preloadImageCacheRange(0, Math.min(displayItems.length - 1, INITIAL_IMAGE_PRELOAD_END))
+      resolveImageCacheRange(0, Math.min(displayItems.length - 1, INITIAL_IMAGE_RESOLVE_END))
      return
    }
    resolvePosterRange(0, Math.min(displayItems.length - 1, 12))
@@ -1057,25 +1077,61 @@ function ResourcesPage() {

    setBatchBusy(true)
    let success = 0
+    let failed = 0
    const previewPatch: Record<string, string> = {}
    const updatePatch: Record<string, boolean> = {}
+    const taskId = registerBackgroundTask({
+      sourcePage: 'other',
+      title: '资源页图片批量解密',
+      detail: `正在解密图片（0/${imageItems.length}）`,
+      progressText: `0 / ${imageItems.length}`,
+      cancelable: false
+    })
    try {
+      let completed = 0
+      const progressStep = Math.max(1, Math.floor(imageItems.length / TASK_PROGRESS_UPDATE_MAX_STEPS))
+      let lastProgressBucket = 0
+      let lastProgressUpdateAt = Date.now()
+      const updateTaskProgress = (force: boolean = false) => {
+        const now = Date.now()
+        const bucket = Math.floor(completed / progressStep)
+        const crossedBucket = bucket !== lastProgressBucket
+        const intervalReached = now - lastProgressUpdateAt >= TASK_PROGRESS_UPDATE_MIN_INTERVAL_MS
+        if (!force && !crossedBucket && !intervalReached) return
+        updateBackgroundTask(taskId, {
+          detail: `正在解密图片（${completed}/${imageItems.length}）`,
+          progressText: `${completed} / ${imageItems.length}`
+        })
+        lastProgressBucket = bucket
+        lastProgressUpdateAt = now
+      }
      for (const item of imageItems) {
-        if (!item.imageMd5 && !item.imageDatName) continue
+        if (!item.imageMd5 && !item.imageDatName) {
+          failed += 1
+          completed += 1
+          updateTaskProgress()
+          continue
+        }
        const result = await window.electronAPI.image.decrypt({
          sessionId: item.sessionId,
          imageMd5: item.imageMd5 || undefined,
          imageDatName: item.imageDatName || undefined,
          force: true
        })
-        if (!result?.success) continue
-        success += 1
-        if (result.localPath) {
-          const key = getItemKey(item)
-          previewPatch[key] = result.localPath
-          updatePatch[key] = isLikelyThumbnailPreview(result.localPath)
+        if (!result?.success) {
+          failed += 1
+        } else {
+          success += 1
+          if (result.localPath) {
+            const key = getItemKey(item)
+            previewPatch[key] = result.localPath
+            updatePatch[key] = isLikelyThumbnailPreview(result.localPath)
+          }
        }
+        completed += 1
+        updateTaskProgress()
      }
+      updateTaskProgress(true)

      if (Object.keys(previewPatch).length > 0) {
        setPreviewPathMap((prev) => ({ ...prev, ...previewPatch }))
@@ -1083,8 +1139,17 @@ function ResourcesPage() {
      if (Object.keys(updatePatch).length > 0) {
        setPreviewUpdateMap((prev) => ({ ...prev, ...updatePatch }))
      }
-      setActionMessage(`批量解密完成：成功 ${success}，失败 ${imageItems.length - success}`)
-      showAlert(`批量解密完成：成功 ${success}，失败 ${imageItems.length - success}`, '批量解密完成')
+      setActionMessage(`批量解密完成：成功 ${success}，失败 ${failed}`)
+      showAlert(`批量解密完成：成功 ${success}，失败 ${failed}`, '批量解密完成')
+      finishBackgroundTask(taskId, success > 0 || failed === 0 ? 'completed' : 'failed', {
+        detail: `资源页图片批量解密完成：成功 ${success}，失败 ${failed}`,
+        progressText: `成功 ${success} / 失败 ${failed}`
+      })
+    } catch (e) {
+      finishBackgroundTask(taskId, 'failed', {
+        detail: `资源页图片批量解密失败：${String(e)}`
+      })
+      showAlert(`批量解密失败：${String(e)}`, '批量解密失败')
    } finally {
      setBatchBusy(false)
    }
--- a/src/pages/SettingsPage.tsx
+++ b/src/pages/SettingsPage.tsx
@@ -238,23 +238,6 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
  const [aiInsightTelegramToken, setAiInsightTelegramToken] = useState('')
  const [aiInsightTelegramChatIds, setAiInsightTelegramChatIds] = useState('')

-  const [isWayland, setIsWayland] = useState(false)
-  useEffect(() => {
-    const checkWaylandStatus = async () => {
-      if (window.electronAPI?.app?.checkWayland) {
-        try {
-          const wayland = await window.electronAPI.app.checkWayland()
-          setIsWayland(wayland)
-        } catch (e) {
-          console.error('检查 Wayland 状态失败:', e)
-        }
-      }
-    }
-    checkWaylandStatus()
-  }, [])
-
-
-
  // 检查 Hello 可用性
  useEffect(() => {
    setHelloAvailable(isWindows)
@@ -1474,13 +1457,11 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
            {
              value: 'quote-top' as const,
              label: '引用在上',
-              description: '更接近当前 WeFlow 风格',
              successMessage: '已切换为引用在上样式'
            },
            {
              value: 'quote-bottom' as const,
              label: '正文在上',
-              description: '更接近微信 / 密语风格',
              successMessage: '已切换为正文在上样式'
            }
          ].map(option => {
@@ -1530,7 +1511,6 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
                <div className="quote-layout-card-footer">
                  <div className="quote-layout-card-title-group">
                    <span className="quote-layout-card-title">{option.label}</span>
-                    <span className="quote-layout-card-desc">{option.description}</span>
                  </div>
                </div>
              </button>
@@ -1672,7 +1652,7 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
      <div className="tab-content">
        <div className="form-group">
          <label>新消息通知</label>
-          <span className="form-hint">开启后，收<EFBFBD><EFBFBD><EFBFBD>新消息时将显示桌面弹窗通知</span>
+          <span className="form-hint">开启后，收到新消息时将显示桌面弹窗通知</span>
          <div className="log-toggle-line">
            <span className="log-status">{notificationEnabled ? '已开启' : '已关闭'}</span>
            <label className="switch" htmlFor="notification-enabled-toggle">
@@ -1696,11 +1676,6 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
        <div className="form-group">
          <label>通知显示位置</label>
          <span className="form-hint">选择通知弹窗在屏幕上的显示位置</span>
-          {isWayland && (
-              <span className="form-hint" style={{ color: '#ff4d4f', marginTop: '4px', display: 'block' }}>
-              ⚠️ 注意：Wayland 环境下该配置可能无效！
-            </span>
-          )}
          <div className="custom-select">
            <div
              className={`custom-select-trigger ${positionDropdownOpen ? 'open' : ''}`}
@@ -3676,7 +3651,7 @@ function SettingsPage({ onClose }: SettingsPageProps = {}) {
          <div className="updates-hero-main">
            <span className="updates-chip">当前版本</span>
            <h2>{appVersion || '...'}</h2>
-            <p>{updateInfo?.hasUpdate ? `发现新版本 v${updateInfo.version}` : '当前已是最新版本，可手动检查更<EFBFBD><EFBFBD><EFBFBD>'}</p>
+            <p>{updateInfo?.hasUpdate ? `发现新版本 v${updateInfo.version}` : '当前已是最新版本，可手动检查更新'}</p>
          </div>
          <div className="updates-hero-action">
            {updateInfo?.hasUpdate ? (
--- a/src/pages/WelcomePage.tsx
+++ b/src/pages/WelcomePage.tsx
@@ -31,6 +31,7 @@ const steps = [
  { id: 'image', title: '图片密钥', desc: '获取 XOR 与 AES 密钥' },
  { id: 'security', title: '安全防护', desc: '保护你的数据' }
 ]
+type SetupStepId = typeof steps[number]['id']

 interface WelcomePageProps {
  standalone?: boolean
@@ -438,6 +439,48 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
    }
  }

+  const jumpToStep = (stepId: SetupStepId) => {
+    const targetIndex = steps.findIndex(step => step.id === stepId)
+    if (targetIndex >= 0) setStepIndex(targetIndex)
+  }
+
+  const validateDbStepBeforeNext = async (): Promise<string | null> => {
+    if (!dbPath) return '数据库目录步骤未完成：请先选择数据库目录'
+    if (dbPathValidationError) return `数据库目录步骤配置有误：${dbPathValidationError}`
+    try {
+      const wxids = await window.electronAPI.dbPath.scanWxids(dbPath)
+      if (!Array.isArray(wxids) || wxids.length === 0) {
+        return '数据库目录步骤配置有误：当前目录下未找到可用账号数据（缺少 db_storage），请重新选择微信数据目录'
+      }
+    } catch (e) {
+      return `数据库目录步骤配置有误：目录读取失败，请确认该路径可访问（${String(e)}）`
+    }
+    return null
+  }
+
+  const findConfigIssueBeforeConnect = async (): Promise<{ stepId: SetupStepId; message: string } | null> => {
+    const dbIssue = await validateDbStepBeforeNext()
+    if (dbIssue) return { stepId: 'db', message: dbIssue }
+
+    let scannedWxids: Array<{ wxid: string }> = []
+    try {
+      scannedWxids = await window.electronAPI.dbPath.scanWxids(dbPath)
+    } catch {
+      scannedWxids = []
+    }
+
+    if (!wxid) {
+      return { stepId: 'key', message: '解密密钥步骤未完成：请先选择微信账号 (wxid)' }
+    }
+    if (!scannedWxids.some(item => item.wxid === wxid)) {
+      return { stepId: 'key', message: `解密密钥步骤配置有误：微信账号「${wxid}」不在当前数据库目录中，请重新选择账号` }
+    }
+    if (!decryptKey || decryptKey.length !== 64) {
+      return { stepId: 'key', message: '解密密钥步骤未完成：请填写 64 位解密密钥' }
+    }
+    return null
+  }
+
  const canGoNext = () => {
    if (currentStep.id === 'intro') return true
    if (currentStep.id === 'db') return Boolean(dbPath) && !dbPathValidationError
@@ -453,7 +496,15 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
    return false
  }

-  const handleNext = () => {
+  const handleNext = async () => {
+    if (currentStep.id === 'db') {
+      const dbStepIssue = await validateDbStepBeforeNext()
+      if (dbStepIssue) {
+        setError(dbStepIssue)
+        return
+      }
+    }
+
    if (!canGoNext()) {
      if (currentStep.id === 'db' && !dbPath) setError('请先选择数据库目录')
      else if (currentStep.id === 'db' && dbPathValidationError) setError(dbPathValidationError)
@@ -473,9 +524,12 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
  }

  const handleConnect = async () => {
-    if (!dbPath) { setError('请先选择数据库目录'); return }
-    if (!wxid) { setError('请填写微信ID'); return }
-    if (!decryptKey || decryptKey.length !== 64) { setError('请填写 64 位解密密钥'); return }
+    const configIssue = await findConfigIssueBeforeConnect()
+    if (configIssue) {
+      setError(configIssue.message)
+      jumpToStep(configIssue.stepId)
+      return
+    }

    setIsConnecting(true)
    setError('')
@@ -484,7 +538,19 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
    try {
      const result = await window.electronAPI.wcdb.testConnection(dbPath, decryptKey, wxid)
      if (!result.success) {
-        setError(result.error || 'WCDB 连接失败')
+        const errorMessage = result.error || 'WCDB 连接失败'
+        if (errorMessage.includes('-3001')) {
+          const fallbackIssue = await findConfigIssueBeforeConnect()
+          if (fallbackIssue) {
+            setError(fallbackIssue.message)
+            jumpToStep(fallbackIssue.stepId)
+          } else {
+            setError(`数据库目录步骤配置有误：${errorMessage}`)
+            jumpToStep('db')
+          }
+        } else {
+          setError(errorMessage)
+        }
        setLoading(false)
        return
      }