Revert "fix(decrypt): 修复数据库原始密钥解密与设备绑定提示"

This reverts commit bcd8f67c25.
Revert "fix(decrypt): 修复 SQLCipher 密钥兼容性回归"
2026-06-18 15:54:08 +08:00 · 2026-03-24 12:14:18 +08:00 · 2026-03-24 12:14:13 +08:00 · 2026-03-23 15:36:39 +08:00 · 2026-03-23 14:38:32 +08:00 · 2026-03-22 19:52:19 +08:00
8 changed files with 602 additions and 123 deletions
@@ -24,7 +24,7 @@

 .wechat-link-card.wechat-link-card--disabled:hover,
 .wechat-link-card-cover.wechat-link-card--disabled:hover {
-  background: #fff;
+  background: var(--merged-history-bg);
 }

 /* 滚动条样式 */
@@ -704,7 +704,7 @@
 /* 文件消息样式 - 基于红包样式覆盖 */
 .wechat-file-card {
  width: 210px;
-  background: #fff;
+  background: var(--merged-history-bg);
  cursor: pointer;
  transition: background-color 0.15s ease;
 }
@@ -728,11 +728,11 @@
  left: 13px;
  right: 13px;
  height: 1.5px;
-  background: #e8e8e8;
+  background: var(--merged-history-divider);
 }

 .wechat-file-card:hover {
-  background: #f5f5f5;
+  background: var(--merged-history-hover);
 }

 .wechat-file-card .wechat-file-info {
@@ -742,7 +742,7 @@

 .wechat-file-name {
  font-size: 14px;
-  color: #1a1a1a;
+  color: var(--merged-history-title);
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
@@ -753,7 +753,7 @@

 .wechat-file-size {
  font-size: 12px;
-  color: #b2b2b2;
+  color: var(--merged-history-footer);
  margin-top: 4px;
 }

@@ -765,12 +765,16 @@
 }

 .wechat-file-bottom {
-  border-top: 1px solid #e8e8e8;
+  border-top: 1px solid var(--merged-history-divider);
 }

 .wechat-file-bottom span {
  font-size: 12px;
-  color: #b2b2b2;
+  color: var(--merged-history-footer);
+}
+
+.wechat-file-card :is(.text-gray-500, .text-gray-400) {
+  color: var(--merged-history-preview);
 }

 .wechat-file-logo {
@@ -785,7 +789,7 @@
  width: 210px;
  min-width: 210px;
  max-width: 210px;
-  background: #fff;
+  background: var(--merged-history-bg);
  display: flex;
  flex-direction: column;
  box-sizing: border-box;
@@ -798,7 +802,7 @@
 }

 .wechat-link-card:hover {
-  background: #f5f5f5;
+  background: var(--merged-history-hover);
 }

 .wechat-link-content {
@@ -819,7 +823,7 @@

 .wechat-link-title {
  font-size: 14px;
-  color: #1a1a1a;
+  color: var(--merged-history-title);
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
@@ -830,7 +834,7 @@

 .wechat-link-desc {
  font-size: 12px;
-  color: #8c8c8c;
+  color: var(--merged-history-preview);
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
@@ -847,7 +851,7 @@
  flex: 0 0 auto;
  border-radius: 0;
  overflow: hidden;
-  background: #f2f2f2;
+  background: var(--app-surface-muted);
  align-self: flex-start;
 }

@@ -905,7 +909,7 @@

 .wechat-link-mini-header-name {
  font-size: 13px;
-  color: #7d7d7d;
+  color: var(--merged-history-preview);
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
@@ -916,7 +920,7 @@
 .wechat-link-mini-title {
  font-size: 13px;
  line-height: 1.45;
-  color: #1a1a1a;
+  color: var(--merged-history-title);
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
@@ -930,12 +934,12 @@
  min-height: 0;
  flex: 1 1 auto;
  overflow: hidden;
-  background: #f2f2f2;
+  background: var(--app-surface-muted);
  margin-top: auto;
 }

 .wechat-link-mini-preview--empty {
-  background: #f7f7f7;
+  background: var(--app-surface-soft);
 }

 .wechat-link-mini-preview-img {
@@ -964,7 +968,7 @@
  left: 12px;
  right: 12px;
  height: 1px;
-  background: #e8e8e8;
+  background: var(--merged-history-divider);
 }

 .wechat-link-mini-footer-icon {
@@ -976,7 +980,7 @@

 .wechat-link-mini-footer-text {
  font-size: 10px;
-  color: #8c8c8c;
+  color: var(--merged-history-preview);
 }

 .wechat-link-from {
@@ -996,7 +1000,7 @@
  left: 11px;
  right: 11px;
  height: 1.5px;
-  background: #e8e8e8;
+  background: var(--merged-history-divider);
 }

 .wechat-link-from-avatar {
@@ -1024,7 +1028,7 @@

 .wechat-link-from-name {
  font-size: 12px;
-  color: #b2b2b2;
+  color: var(--merged-history-footer);
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
@@ -1035,7 +1039,7 @@
  width: 137px;
  min-width: 137px;
  max-width: 137px;
-  background: #fff;
+  background: var(--merged-history-bg);
  display: flex;
  flex-direction: column;
  box-sizing: border-box;
@@ -1048,7 +1052,7 @@
 }

 .wechat-link-card-cover:hover {
-  background: #f5f5f5;
+  background: var(--merged-history-hover);
 }

 .wechat-link-cover-image-wrap {
@@ -1057,7 +1061,7 @@
  position: relative;
  overflow: hidden;
  border-radius: 4px 4px 0 0;
-  background: #f2f2f2;
+  background: var(--app-surface-muted);
  flex-shrink: 0;
 }

@@ -1126,7 +1130,7 @@
  box-sizing: border-box;
  font-size: 12px;
  line-height: 1.24;
-  color: #1a1a1a;
+  color: var(--merged-history-title);
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
@@ -1597,6 +1597,154 @@
    background-color: var(--search-panel-bg);
  }

+  .chat-overlay-dropdown,
+  .chat-context-menu,
+  .chat-floating-window,
+  .chat-edit-modal {
+    background-color: var(--app-surface-bg);
+    border: 1px solid var(--app-border);
+    color: var(--app-text-primary);
+    box-shadow: 0 20px 48px rgba(15, 23, 42, 0.16);
+  }
+
+  html[data-theme='dark'] :is(.chat-overlay-dropdown, .chat-context-menu, .chat-floating-window, .chat-edit-modal) {
+    box-shadow: 0 24px 56px rgba(0, 0, 0, 0.42);
+  }
+
+  .chat-overlay-dropdown input {
+    background-color: var(--app-input-bg);
+    border-color: var(--app-input-border);
+    color: var(--app-text-primary);
+  }
+
+  .chat-overlay-dropdown input::placeholder {
+    color: var(--app-text-muted);
+  }
+
+  .chat-overlay-dropdown :is(.bg-gray-200, .bg-gray-300),
+  .chat-floating-window :is(.bg-gray-200, .bg-gray-300) {
+    background-color: var(--app-border-soft);
+  }
+
+  .chat-overlay-dropdown :is(.border-gray-100, .border-gray-200, .border-gray-300),
+  .chat-floating-window :is(.border-gray-100, .border-gray-200, .border-gray-300) {
+    border-color: var(--app-border);
+  }
+
+  .chat-overlay-dropdown :is(.text-gray-900, .text-gray-800, .text-gray-700),
+  .chat-floating-window :is(.text-gray-900, .text-gray-800, .text-gray-700) {
+    color: var(--app-text-primary);
+  }
+
+  .chat-overlay-dropdown :is(.text-gray-600, .text-gray-500, .text-gray-400),
+  .chat-floating-window :is(.text-gray-600, .text-gray-500, .text-gray-400) {
+    color: var(--app-text-muted);
+  }
+
+  .chat-overlay-option {
+    color: var(--app-text-primary);
+    transition: background-color 0.15s ease;
+  }
+
+  .chat-overlay-option:hover {
+    background-color: var(--app-neutral-btn-hover);
+  }
+
+  .chat-overlay-option--active {
+    background-color: var(--app-surface-soft);
+  }
+
+  .chat-overlay-option--active:hover {
+    background-color: var(--app-neutral-btn-hover);
+  }
+
+  .chat-context-menu__item {
+    color: inherit;
+    transition: background-color 0.15s ease;
+  }
+
+  .chat-context-menu__item:hover {
+    background-color: var(--app-neutral-btn-hover);
+  }
+
+  .chat-context-menu :is(.border-gray-100, .border-gray-200, .border-gray-300) {
+    border-color: var(--app-border);
+  }
+
+  .chat-floating-window__header,
+  .chat-floating-window__body,
+  .chat-floating-window__row {
+    background-color: var(--app-surface-soft);
+  }
+
+  .chat-floating-window__header {
+    border-bottom: 1px solid var(--app-border);
+  }
+
+  .chat-floating-window__row {
+    border-bottom: 1px solid var(--app-border);
+  }
+
+  .chat-floating-window__title {
+    color: var(--app-text-primary);
+  }
+
+  .chat-floating-window__close {
+    color: var(--app-text-secondary);
+    transition: background-color 0.15s ease, color 0.15s ease;
+  }
+
+  .chat-floating-window__close:hover {
+    background-color: var(--app-neutral-btn-hover);
+    color: var(--app-text-primary);
+  }
+
+  .chat-floating-window .bg-white {
+    background-color: var(--app-surface-bg);
+  }
+
+  .chat-floating-window .bg-gray-50 {
+    background-color: var(--app-surface-soft);
+  }
+
+  .chat-floating-window [class*='hover:bg-gray-50']:hover {
+    background-color: var(--app-neutral-btn-hover);
+  }
+
+  .chat-edit-modal :is(.border-gray-100, .border-gray-200, .border-gray-300) {
+    border-color: var(--app-border);
+  }
+
+  .chat-edit-modal .bg-white {
+    background-color: var(--app-surface-bg);
+  }
+
+  .chat-edit-modal .bg-gray-50 {
+    background-color: var(--app-surface-soft);
+  }
+
+  .chat-edit-modal :is(.text-gray-900, .text-gray-800, .text-gray-700) {
+    color: var(--app-text-primary);
+  }
+
+  .chat-edit-modal :is(.text-gray-600, .text-gray-500, .text-gray-400) {
+    color: var(--app-text-muted);
+  }
+
+  .chat-edit-modal :is(input:not([type='checkbox']):not([type='radio']), textarea, select) {
+    background-color: var(--app-input-bg);
+    border-color: var(--app-input-border);
+    color: var(--app-text-primary);
+  }
+
+  .chat-edit-modal :is(input:not([type='checkbox']):not([type='radio']), textarea, select)::placeholder {
+    color: var(--app-text-muted);
+  }
+
+  .chat-edit-modal [class*='hover:bg-gray-50']:hover {
+    background-color: var(--app-neutral-btn-hover);
+  }
+
  .search-input-combined {
    background-color: var(--search-input-bg);
    border-color: var(--search-input-border);
@@ -267,4 +267,10 @@ const openLocation = () => {
  width: 100%;
  height: 100%;
 }
+
+html[data-theme='dark'] .wechat-location-card-wrap {
+  --location-card-bg: var(--merged-history-bg);
+  --location-card-text: var(--merged-history-title);
+  --location-card-muted: var(--merged-history-preview);
+}
 </style>
@@ -258,7 +258,7 @@

                <div
                  v-if="messageSearchSenderDropdownOpen"
-                  class="absolute left-0 right-0 mt-1 bg-white border border-gray-200 rounded-md shadow-lg z-50 overflow-hidden"
+                  class="chat-overlay-dropdown absolute left-0 right-0 mt-1 rounded-md z-50 overflow-hidden"
                >
                  <div class="p-2 border-b border-gray-100">
                    <input
@@ -274,8 +274,8 @@
                  <div class="max-h-64 overflow-y-auto">
                    <button
                      type="button"
-                      class="w-full flex items-center gap-2 px-2 py-1.5 text-left text-xs hover:bg-gray-50"
-                      :class="!messageSearchSender ? 'bg-gray-50' : ''"
+                      class="chat-overlay-option w-full flex items-center gap-2 px-2 py-1.5 text-left text-xs"
+                      :class="!messageSearchSender ? 'chat-overlay-option--active' : ''"
                      @click="selectMessageSearchSender('')"
                    >
                      <span class="w-6 h-6 rounded-md overflow-hidden bg-gray-200 flex-shrink-0 flex items-center justify-center text-[10px] text-gray-500">
@@ -298,8 +298,8 @@
                        v-for="s in filteredMessageSearchSenderOptions"
                        :key="s.username"
                        type="button"
-                        class="w-full flex items-center gap-2 px-2 py-1.5 text-left text-xs hover:bg-gray-50"
-                        :class="messageSearchSender === s.username ? 'bg-gray-50' : ''"
+                        class="chat-overlay-option w-full flex items-center gap-2 px-2 py-1.5 text-left text-xs"
+                        :class="messageSearchSender === s.username ? 'chat-overlay-option--active' : ''"
                        @click="selectMessageSearchSender(s.username)"
                      >
                        <div class="w-6 h-6 rounded-md overflow-hidden bg-gray-300 flex-shrink-0" :class="{ 'privacy-blur': privacyMode }">
@@ -560,29 +560,29 @@
      @mousedown="focusFloatingWindow(win.id)"
    >
      <div
-        class="bg-[#f7f7f7] rounded-xl shadow-xl overflow-hidden border border-gray-200 flex flex-col"
+        class="chat-floating-window rounded-xl overflow-hidden flex flex-col"
        :style="{ width: win.width + 'px', height: win.height + 'px' }"
      >
        <div
-          class="px-3 py-2 bg-[#f7f7f7] border-b border-gray-200 flex items-center justify-between select-none cursor-move"
+          class="chat-floating-window__header px-3 py-2 flex items-center justify-between select-none cursor-move"
          @mousedown.stop="startFloatingWindowDrag(win.id, $event)"
          @touchstart.stop="startFloatingWindowDrag(win.id, $event)"
        >
-          <div class="text-sm text-[#161616] truncate min-w-0">{{ win.title || (win.kind === 'link' ? '链接' : '聊天记录') }}</div>
+          <div class="chat-floating-window__title text-sm truncate min-w-0">{{ win.title || (win.kind === 'link' ? '链接' : '聊天记录') }}</div>
          <button
            type="button"
-            class="p-2 rounded hover:bg-black/5 flex-shrink-0"
+            class="chat-floating-window__close p-2 rounded flex-shrink-0"
            @click.stop="closeFloatingWindow(win.id)"
            aria-label="关闭"
            title="关闭"
          >
-            <svg class="w-5 h-5 text-gray-700" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
            </svg>
          </button>
        </div>

-        <div class="flex-1 overflow-auto bg-[#f7f7f7]">
+        <div class="chat-floating-window__body flex-1 overflow-auto">
          <!-- Chat history window -->
          <template v-if="win.kind === 'chatHistory'">
            <div v-if="win.loading" class="text-xs text-gray-500 text-center py-2">加载中...</div>
@@ -593,7 +593,7 @@
              <div
                v-for="(rec, idx) in win.records"
                :key="rec.id || idx"
-                class="px-4 py-3 flex gap-3 border-b border-gray-100 bg-[#f7f7f7]"
+                class="chat-floating-window__row px-4 py-3 flex gap-3"
              >
                <div class="w-9 h-9 rounded-md overflow-hidden bg-gray-200 flex-shrink-0" :class="{ 'privacy-blur': privacyMode }">
                  <img
@@ -1087,19 +1087,19 @@
    <div
      v-if="contextMenu.visible"
      ref="contextMenuElement"
-      class="fixed z-[12000] max-h-[calc(100vh-16px)] overflow-y-auto bg-white border border-gray-200 rounded-md shadow-lg text-sm"
+      class="chat-context-menu fixed z-[12000] max-h-[calc(100vh-16px)] overflow-y-auto rounded-md text-sm"
      :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
      @click.stop
    >
      <button
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100"
+        class="chat-context-menu__item block w-full text-left px-3 py-2"
        type="button"
        @click="onCopyMessageTextClick"
      >
        复制文本
      </button>
      <button
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100"
+        class="chat-context-menu__item block w-full text-left px-3 py-2"
        type="button"
        @click="onCopyMessageJsonClick"
      >
@@ -1107,14 +1107,14 @@
      </button>
      <button
        v-if="contextMenu.message?.renderType === 'quote' && contextMenu.message?.quoteServerId"
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100"
+        class="chat-context-menu__item block w-full text-left px-3 py-2"
        type="button"
        @click="onLocateQuotedMessageClick"
      >
        定位引用消息
      </button>
      <button
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100"
+        class="chat-context-menu__item block w-full text-left px-3 py-2"
        type="button"
        :disabled="contextMenu.disabled"
        :class="contextMenu.disabled ? 'opacity-50 cursor-not-allowed' : ''"
@@ -1127,7 +1127,7 @@

      <button
        v-if="contextMenu.message?.id"
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100"
+        class="chat-context-menu__item block w-full text-left px-3 py-2"
        type="button"
        @click="onEditMessageClick"
      >
@@ -1135,7 +1135,7 @@
      </button>
      <button
        v-if="contextMenu.message?.id"
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100"
+        class="chat-context-menu__item block w-full text-left px-3 py-2"
        type="button"
        @click="onEditMessageFieldsClick"
      >
@@ -1143,7 +1143,7 @@
      </button>
      <button
        v-if="contextMenu.editStatus?.modified"
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100 text-red-600"
+        class="chat-context-menu__item block w-full text-left px-3 py-2 text-red-600"
        type="button"
        @click="onResetEditedMessageClick"
      >
@@ -1151,7 +1151,7 @@
      </button>
      <button
        v-if="contextMenu.message?.id"
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100"
+        class="chat-context-menu__item block w-full text-left px-3 py-2"
        type="button"
        @click="onRepairMessageSenderAsMeClick"
      >
@@ -1159,7 +1159,7 @@
      </button>
      <button
        v-if="contextMenu.message?.id"
-        class="block w-full text-left px-3 py-2 hover:bg-gray-100 text-orange-600"
+        class="chat-context-menu__item block w-full text-left px-3 py-2 text-orange-600"
        type="button"
        @click="onFlipWechatMessageDirectionClick"
      >
@@ -1171,7 +1171,7 @@
    <!-- 修改消息弹窗 -->
    <div v-if="messageEditModal.open" class="fixed inset-0 z-[11000] flex items-center justify-center">
      <div class="absolute inset-0 bg-black/40" @click="closeMessageEditModal"></div>
-      <div class="relative w-[860px] max-w-[95vw] bg-white rounded-lg shadow-xl border border-gray-200 overflow-hidden">
+      <div class="chat-edit-modal relative w-[860px] max-w-[95vw] rounded-lg overflow-hidden">
        <div class="px-5 py-4 border-b border-gray-200 flex items-center">
          <div class="text-base font-medium text-gray-900">{{ messageEditModal.mode === 'content' ? '修改消息' : '编辑源码' }}</div>
          <button class="ml-auto text-gray-400 hover:text-gray-600" type="button" @click="closeMessageEditModal">
@@ -1218,7 +1218,7 @@
    <!-- 字段编辑弹窗 -->
    <div v-if="messageFieldsModal.open" class="fixed inset-0 z-[11000] flex items-center justify-center">
      <div class="absolute inset-0 bg-black/40" @click="closeMessageFieldsModal"></div>
-      <div class="relative w-[920px] max-w-[95vw] bg-white rounded-lg shadow-xl border border-gray-200 overflow-hidden">
+      <div class="chat-edit-modal relative w-[920px] max-w-[95vw] rounded-lg overflow-hidden">
        <div class="px-5 py-4 border-b border-gray-200 flex items-center">
          <div class="text-base font-medium text-gray-900">字段编辑</div>
          <button class="ml-auto text-gray-400 hover:text-gray-600" type="button" @click="closeMessageFieldsModal">
@@ -116,7 +116,7 @@ export default defineComponent({
              flexDirection: 'column',
              boxSizing: 'border-box',
              flex: '0 0 auto',
-              background: '#fff',
+              background: 'var(--merged-history-bg)',
              border: 'none',
              boxShadow: 'none',
              textDecoration: 'none',
@@ -167,7 +167,7 @@ export default defineComponent({
              flexDirection: 'column',
              boxSizing: 'border-box',
              flex: '0 0 auto',
-              background: '#fff',
+              background: 'var(--merged-history-bg)',
              border: 'none',
              boxShadow: 'none',
              textDecoration: 'none',
@@ -236,7 +236,7 @@ export default defineComponent({
            flexDirection: 'column',
            boxSizing: 'border-box',
            flex: '0 0 auto',
-            background: '#fff',
+            background: 'var(--merged-history-bg)',
            border: 'none',
            boxShadow: 'none',
            textDecoration: 'none',
@@ -49,7 +49,7 @@

          <div
            v-if="contactProfileCardOpen && contactProfileCardMessageId === String(message.id ?? '')"
-            class="absolute z-40 w-[360px] max-w-[88vw] bg-white rounded-lg shadow-xl border border-gray-200 overflow-hidden"
+            class="chat-contact-card absolute z-40 w-[360px] max-w-[88vw] rounded-lg overflow-hidden"
            :class="message.isSent ? 'right-0 top-[calc(100%+8px)]' : 'left-0 top-[calc(100%+8px)]'"
            @mouseenter="onContactCardMouseEnter"
            @mouseleave="onMessageAvatarMouseLeave"
@@ -146,3 +146,40 @@ export default defineComponent({
  }
 })
 </script>
+
+<style scoped>
+.chat-contact-card {
+  background-color: var(--app-surface-bg);
+  border: 1px solid var(--app-border);
+  color: var(--app-text-primary);
+  box-shadow: 0 20px 48px rgba(15, 23, 42, 0.16);
+}
+
+html[data-theme='dark'] .chat-contact-card {
+  box-shadow: 0 24px 56px rgba(0, 0, 0, 0.42);
+}
+
+.chat-contact-card .bg-white {
+  background-color: var(--app-surface-bg);
+}
+
+.chat-contact-card [class*='bg-[#F6F6F6]'] {
+  background-color: var(--app-surface-soft);
+}
+
+.chat-contact-card .bg-gray-200 {
+  background-color: var(--app-border-soft);
+}
+
+.chat-contact-card :is(.border-gray-100, .border-gray-200, .border-gray-300) {
+  border-color: var(--app-border);
+}
+
+.chat-contact-card :is(.text-gray-900, .text-gray-800, .text-gray-700) {
+  color: var(--app-text-primary);
+}
+
+.chat-contact-card :is(.text-gray-600, .text-gray-500, .text-gray-400) {
+  color: var(--app-text-muted);
+}
+</style>
@@ -186,6 +186,178 @@ def _sql_literal(value: Any) -> str:
    return "'" + s.replace("'", "''") + "'"


+def _pick_case_insensitive_value(item: Any, *keys: str) -> Any:
+    if not isinstance(item, dict):
+        return None
+    for key in keys:
+        if key in item and item[key] is not None:
+            return item[key]
+        key_lc = str(key or "").strip().lower()
+        for actual_key, actual_value in item.items():
+            if str(actual_key or "").strip().lower() == key_lc and actual_value is not None:
+                return actual_value
+    return None
+
+
+def _table_exists_case_insensitive(conn: sqlite3.Connection, table_name: str) -> bool:
+    try:
+        row = conn.execute(
+            "SELECT name FROM sqlite_master WHERE type='table' AND lower(name)=lower(?) LIMIT 1",
+            (str(table_name or "").strip(),),
+        ).fetchone()
+        return bool(row)
+    except Exception:
+        return False
+
+
+def _ensure_output_name2id_table(conn: sqlite3.Connection) -> bool:
+    if _table_exists_case_insensitive(conn, "Name2Id"):
+        return True
+    try:
+        conn.execute(
+            """
+            CREATE TABLE IF NOT EXISTS Name2Id (
+                user_name TEXT,
+                is_session INTEGER DEFAULT 1
+            )
+            """
+        )
+        conn.commit()
+        return True
+    except Exception:
+        return False
+
+
+def _best_effort_upsert_output_name2id_rows(
+    conn: sqlite3.Connection,
+    *,
+    account_name: str,
+    rows: list[dict[str, Any]],
+) -> bool:
+    if not rows:
+        return _table_exists_case_insensitive(conn, "Name2Id")
+    if not _ensure_output_name2id_table(conn):
+        return False
+    try:
+        conn.execute(
+            "INSERT OR IGNORE INTO Name2Id(user_name, is_session) VALUES (?, ?)",
+            (str(account_name or "").strip(), 1),
+        )
+    except Exception:
+        pass
+
+    wrote = False
+    for row in rows:
+        try:
+            rid = int(row.get("real_sender_id") or 0)
+        except Exception:
+            rid = 0
+        username = str(row.get("sender_username") or "").strip()
+        if rid <= 0 or not username:
+            continue
+        try:
+            conn.execute(
+                "INSERT OR IGNORE INTO Name2Id(rowid, user_name, is_session) VALUES (?, ?, ?)",
+                (rid, username, 1),
+            )
+            wrote = True
+        except Exception:
+            continue
+
+    if wrote:
+        try:
+            conn.commit()
+        except Exception:
+            return False
+    return True
+
+
+def _sync_output_name2id_from_live(
+    conn: sqlite3.Connection,
+    *,
+    rt_conn: Any,
+    msg_db_path_real: Path,
+) -> dict[str, Any]:
+    if not _ensure_output_name2id_table(conn):
+        return {"status": "missing_local_table", "rows": 0}
+
+    local_row = conn.execute("SELECT COUNT(1) AS c, COALESCE(MAX(rowid), 0) AS mx FROM Name2Id").fetchone()
+    try:
+        local_count = int((local_row["c"] if isinstance(local_row, sqlite3.Row) else local_row[0]) or 0)
+    except Exception:
+        local_count = 0
+    try:
+        local_max = int((local_row["mx"] if isinstance(local_row, sqlite3.Row) else local_row[1]) or 0)
+    except Exception:
+        local_max = 0
+
+    sql_stats = "SELECT COUNT(1) AS c, COALESCE(MAX(rowid), 0) AS mx FROM Name2Id"
+    with rt_conn.lock:
+        live_stats_rows = _wcdb_exec_query(rt_conn.handle, kind="message", path=str(msg_db_path_real), sql=sql_stats)
+
+    live_stats = live_stats_rows[0] if live_stats_rows and isinstance(live_stats_rows[0], dict) else {}
+    try:
+        live_count = int(_pick_case_insensitive_value(live_stats, "c", "count") or 0)
+    except Exception:
+        live_count = 0
+    try:
+        live_max = int(_pick_case_insensitive_value(live_stats, "mx", "max_rowid", "max") or 0)
+    except Exception:
+        live_max = 0
+
+    if local_count == live_count and local_max == live_max:
+        return {
+            "status": "up_to_date",
+            "rows": int(local_count),
+            "localCount": int(local_count),
+            "liveCount": int(live_count),
+            "localMax": int(local_max),
+            "liveMax": int(live_max),
+        }
+
+    sql_rows = "SELECT rowid AS rowid, user_name AS user_name, COALESCE(is_session, 1) AS is_session FROM Name2Id ORDER BY rowid ASC"
+    with rt_conn.lock:
+        live_rows = _wcdb_exec_query(rt_conn.handle, kind="message", path=str(msg_db_path_real), sql=sql_rows)
+
+    values: list[tuple[int, str, int]] = []
+    seen_rowids: set[int] = set()
+    for item in live_rows:
+        if not isinstance(item, dict):
+            continue
+        try:
+            rid = int(_pick_case_insensitive_value(item, "rowid") or 0)
+        except Exception:
+            rid = 0
+        username = str(_pick_case_insensitive_value(item, "user_name", "username") or "").strip()
+        try:
+            is_session = int(_pick_case_insensitive_value(item, "is_session") or 0)
+        except Exception:
+            is_session = 0
+        if rid <= 0 or not username or rid in seen_rowids:
+            continue
+        seen_rowids.add(rid)
+        values.append((rid, username, is_session))
+
+    if live_count > 0 and not values:
+        raise ValueError("Live Name2Id rows could not be decoded.")
+
+    conn.execute("DELETE FROM Name2Id")
+    if values:
+        conn.executemany(
+            "INSERT INTO Name2Id(rowid, user_name, is_session) VALUES (?, ?, ?)",
+            values,
+        )
+    conn.commit()
+    return {
+        "status": "refreshed",
+        "rows": int(len(values)),
+        "localCount": int(local_count),
+        "liveCount": int(live_count),
+        "localMax": int(local_max),
+        "liveMax": int(live_max),
+    }
+
+
 def _normalize_edit_value(col: str, value: Any, *, from_snapshot: bool = False) -> Any:
    c = str(col or "").strip().lower()
    if value is None:
@@ -1271,6 +1443,7 @@ def sync_chat_realtime_messages(
        # Some sessions may not exist in the decrypted snapshot yet; create the missing Msg_<md5> table
        # so we can insert the realtime rows and make `/api/chat/messages` work after switching off realtime.
        msg_db_path, table_name = _ensure_decrypted_message_table(account_dir, username)
+        msg_db_path_real, _res_db_path_real = _resolve_db_storage_message_paths(account_dir, msg_db_path.stem)
        logger.info(
            "[%s] resolved decrypted table account=%s username=%s db=%s table=%s",
            trace_id,
@@ -1283,6 +1456,34 @@ def sync_chat_realtime_messages(
        msg_conn = sqlite3.connect(str(msg_db_path))
        msg_conn.row_factory = sqlite3.Row
        try:
+            name2id_synced = False
+            try:
+                sync_t0 = time.perf_counter()
+                name2id_result = _sync_output_name2id_from_live(
+                    msg_conn,
+                    rt_conn=rt_conn,
+                    msg_db_path_real=msg_db_path_real,
+                )
+                sync_ms = (time.perf_counter() - sync_t0) * 1000.0
+                name2id_synced = str(name2id_result.get("status") or "") in {"up_to_date", "refreshed"}
+                logger.info(
+                    "[%s] Name2Id sync account=%s db=%s status=%s rows=%s ms=%.1f",
+                    trace_id,
+                    account_dir.name,
+                    msg_db_path.stem,
+                    str(name2id_result.get("status") or ""),
+                    int(name2id_result.get("rows") or 0),
+                    sync_ms,
+                )
+            except Exception as e:
+                logger.warning(
+                    "[%s] Name2Id sync failed account=%s db=%s error=%s",
+                    trace_id,
+                    account_dir.name,
+                    msg_db_path.stem,
+                    str(e),
+                )
+
            quoted_table = _quote_ident(table_name)
            row = msg_conn.execute(f"SELECT MAX(local_id) AS mx FROM {quoted_table}").fetchone()
            try:
@@ -1425,42 +1626,12 @@ def sync_chat_realtime_messages(

            inserted = 0
            backfilled = 0
-            if new_rows:
-                # Best-effort: keep Name2Id updated so decrypted queries can resolve sender usernames.
-                # Rowid mapping is important (message.real_sender_id joins Name2Id.rowid).
-                try:
-                    has_name2id = bool(
-                        msg_conn.execute(
-                            "SELECT name FROM sqlite_master WHERE type='table' AND lower(name)=lower('Name2Id') LIMIT 1"
-                        ).fetchone()
-                    )
-                except Exception:
-                    has_name2id = False
-
-                if has_name2id:
-                    try:
-                        msg_conn.execute(
-                            "INSERT OR IGNORE INTO Name2Id(user_name, is_session) VALUES (?, ?)",
-                            (str(account_dir.name), 1),
-                        )
-                    except Exception:
-                        pass
-
-                    for r in new_rows:
-                        try:
-                            rid = int(r.get("real_sender_id") or 0)
-                        except Exception:
-                            rid = 0
-                        su = str(r.get("sender_username") or "").strip()
-                        if rid <= 0 or not su:
-                            continue
-                        try:
-                            msg_conn.execute(
-                                "INSERT OR IGNORE INTO Name2Id(rowid, user_name, is_session) VALUES (?, ?, ?)",
-                                (rid, su, 1),
-                            )
-                        except Exception:
-                            continue
+            if new_rows and (not name2id_synced):
+                _best_effort_upsert_output_name2id_rows(
+                    msg_conn,
+                    account_name=account_dir.name,
+                    rows=new_rows,
+                )

                # Insert older -> newer to keep sqlite btree locality similar to existing data.
                values = [tuple(r.get(c) for c in insert_cols) for r in reversed(new_rows)]
@@ -1658,6 +1829,30 @@ def _sync_chat_realtime_messages_for_table(
    msg_conn = sqlite3.connect(str(msg_db_path))
    msg_conn.row_factory = sqlite3.Row
    try:
+        msg_db_path_real, _res_db_path_real = _resolve_db_storage_message_paths(account_dir, msg_db_path.stem)
+        name2id_synced = False
+        try:
+            name2id_result = _sync_output_name2id_from_live(
+                msg_conn,
+                rt_conn=rt_conn,
+                msg_db_path_real=msg_db_path_real,
+            )
+            name2id_synced = str(name2id_result.get("status") or "") in {"up_to_date", "refreshed"}
+            logger.info(
+                "[realtime] Name2Id sync account=%s db=%s status=%s rows=%s",
+                account_dir.name,
+                msg_db_path.stem,
+                str(name2id_result.get("status") or ""),
+                int(name2id_result.get("rows") or 0),
+            )
+        except Exception as e:
+            logger.warning(
+                "[realtime] Name2Id sync failed account=%s db=%s error=%s",
+                account_dir.name,
+                msg_db_path.stem,
+                str(e),
+            )
+
        quoted_table = _quote_ident(table_name)
        row = msg_conn.execute(f"SELECT MAX(local_id) AS mx FROM {quoted_table}").fetchone()
        try:
@@ -1796,40 +1991,12 @@ def _sync_chat_realtime_messages_for_table(

        inserted = 0
        backfilled = 0
-        if new_rows:
-            try:
-                has_name2id = bool(
-                    msg_conn.execute(
-                        "SELECT name FROM sqlite_master WHERE type='table' AND lower(name)=lower('Name2Id') LIMIT 1"
-                    ).fetchone()
-                )
-            except Exception:
-                has_name2id = False
-
-            if has_name2id:
-                try:
-                    msg_conn.execute(
-                        "INSERT OR IGNORE INTO Name2Id(user_name, is_session) VALUES (?, ?)",
-                        (str(account_dir.name), 1),
-                    )
-                except Exception:
-                    pass
-
-                for r in new_rows:
-                    try:
-                        rid = int(r.get("real_sender_id") or 0)
-                    except Exception:
-                        rid = 0
-                    su = str(r.get("sender_username") or "").strip()
-                    if rid <= 0 or not su:
-                        continue
-                    try:
-                        msg_conn.execute(
-                            "INSERT OR IGNORE INTO Name2Id(rowid, user_name, is_session) VALUES (?, ?, ?)",
-                            (rid, su, 1),
-                        )
-                    except Exception:
-                        continue
+        if new_rows and (not name2id_synced):
+            _best_effort_upsert_output_name2id_rows(
+                msg_conn,
+                account_name=account_dir.name,
+                rows=new_rows,
+            )

            values = [tuple(r.get(c) for c in insert_cols) for r in reversed(new_rows)]
            insert_t0 = time.perf_counter()
@@ -0,0 +1,117 @@
+import hashlib
+import sqlite3
+import sys
+import threading
+import unittest
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from unittest.mock import patch
+
+
+ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(ROOT / "src"))
+
+from wechat_decrypt_tool.routers import chat as chat_router
+
+
+class _DummyConn:
+    def __init__(self) -> None:
+        self.handle = 1
+        self.lock = threading.Lock()
+
+
+class TestChatRealtimeName2IdSync(unittest.TestCase):
+    def test_sync_repairs_name2id_even_without_new_messages(self):
+        with TemporaryDirectory() as td:
+            account_dir = Path(td) / "acc"
+            account_dir.mkdir(parents=True, exist_ok=True)
+
+            username = "wxid_friend"
+            table_name = f"Msg_{hashlib.md5(username.encode('utf-8')).hexdigest()}"
+            msg_db_path = account_dir / "message_0.db"
+
+            conn = sqlite3.connect(str(msg_db_path))
+            try:
+                conn.execute("CREATE TABLE Name2Id (user_name TEXT, is_session INTEGER DEFAULT 1)")
+                conn.execute(
+                    """
+                    CREATE TABLE "{table_name}" (
+                        local_id INTEGER PRIMARY KEY,
+                        server_id INTEGER,
+                        local_type INTEGER,
+                        sort_seq INTEGER,
+                        real_sender_id INTEGER,
+                        create_time INTEGER,
+                        message_content TEXT,
+                        compress_content BLOB,
+                        packed_info_data BLOB
+                    )
+                    """.format(table_name=table_name)
+                )
+                conn.execute("INSERT INTO Name2Id(rowid, user_name, is_session) VALUES (1, ?, 1)", ("acc",))
+                conn.execute("INSERT INTO Name2Id(rowid, user_name, is_session) VALUES (2, ?, 1)", ("wxid_old",))
+                conn.execute("INSERT INTO Name2Id(rowid, user_name, is_session) VALUES (5, ?, 1)", ("wxid_gap_tail",))
+                conn.execute(
+                    f'INSERT INTO "{table_name}" '
+                    "(local_id, server_id, local_type, sort_seq, real_sender_id, create_time, message_content, compress_content, packed_info_data) "
+                    "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                    (10, 10010, 1, 10, 3, 1710000010, "hello", None, None),
+                )
+                conn.commit()
+            finally:
+                conn.close()
+
+            live_rows = [
+                {"rowid": 1, "user_name": "acc", "is_session": 1},
+                {"rowid": 2, "user_name": "wxid_old", "is_session": 1},
+                {"rowid": 3, "user_name": "wxid_missing_a", "is_session": 1},
+                {"rowid": 4, "user_name": "wxid_missing_b", "is_session": 1},
+                {"rowid": 5, "user_name": "wxid_gap_tail", "is_session": 1},
+            ]
+
+            def _fake_exec_query(_handle, *, kind, path, sql):
+                self.assertEqual(kind, "message")
+                self.assertTrue(str(path).endswith("message_0.db"))
+                if "COUNT(1)" in sql:
+                    return [{"c": len(live_rows), "mx": 5}]
+                if "ORDER BY rowid ASC" in sql:
+                    return list(live_rows)
+                raise AssertionError(f"Unexpected SQL: {sql}")
+
+            with (
+                patch.object(chat_router, "_resolve_db_storage_message_paths", return_value=(Path(td) / "live_message_0.db", Path(td) / "message_resource.db")),
+                patch.object(chat_router, "_wcdb_exec_query", side_effect=_fake_exec_query),
+                patch.object(chat_router, "_wcdb_get_messages", return_value=[]),
+            ):
+                result = chat_router._sync_chat_realtime_messages_for_table(
+                    account_dir=account_dir,
+                    rt_conn=_DummyConn(),
+                    username=username,
+                    msg_db_path=msg_db_path,
+                    table_name=table_name,
+                    max_scan=50,
+                    backfill_limit=0,
+                )
+
+            self.assertEqual(result.get("inserted"), 0)
+
+            conn = sqlite3.connect(str(msg_db_path))
+            try:
+                rows = conn.execute("SELECT rowid, user_name FROM Name2Id ORDER BY rowid ASC").fetchall()
+            finally:
+                conn.close()
+
+            self.assertEqual(
+                rows,
+                [
+                    (1, "acc"),
+                    (2, "wxid_old"),
+                    (3, "wxid_missing_a"),
+                    (4, "wxid_missing_b"),
+                    (5, "wxid_gap_tail"),
+                ],
+            )
+
+
+if __name__ == "__main__":
+    unittest.main()